From a396029270066741c9db29a428e943dc2080019f Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 26 Feb 1999 11:11:13 +0000
Subject: [PATCH] Large-scale renaming of all Win32 functions and types to use
 the standard Windows names.

---
 console/xterm.c                    |    4 +-
 controls/button.c                  |  302 ++--
 controls/combo.c                   |  628 ++++----
 controls/desktop.c                 |  104 +-
 controls/edit.c                    | 1262 +++++++--------
 controls/icontitle.c               |  102 +-
 controls/listbox.c                 |  690 ++++-----
 controls/menu.c                    |  968 ++++++------
 controls/scroll.c                  |  452 +++---
 controls/static.c                  |  218 +--
 controls/uitools.c                 |  528 +++----
 controls/widgets.c                 |   62 +-
 debugger/break.c                   |   12 +-
 debugger/db_disasm.c               |    6 +-
 debugger/dbg.y                     |    8 +-
 debugger/dbgmain.c                 |   10 +-
 debugger/hash.c                    |   18 +-
 debugger/memory.c                  |    8 +-
 debugger/msc.c                     |   50 +-
 debugger/registers.c               |    2 +-
 dlls/advapi32/advapi.c             |   10 +-
 dlls/advapi32/crypt.c              |    2 +-
 dlls/advapi32/eventlog.c           |   58 +-
 dlls/advapi32/security.c           |  136 +-
 dlls/advapi32/service.c            |   68 +-
 dlls/comctl32/animate.c            |   82 +-
 dlls/comctl32/comboex.c            |  114 +-
 dlls/comctl32/comctl32undoc.c      |  218 +--
 dlls/comctl32/commctrl.c           |  234 +--
 dlls/comctl32/datetime.c           |   32 +-
 dlls/comctl32/draglist.c           |    6 +-
 dlls/comctl32/flatsb.c             |   72 +-
 dlls/comctl32/header.c             |  584 +++----
 dlls/comctl32/hotkey.c             |  102 +-
 dlls/comctl32/imagelist.c          |  844 +++++-----
 dlls/comctl32/ipaddress.c          |  214 +--
 dlls/comctl32/listview.c           | 1138 +++++++-------
 dlls/comctl32/monthcal.c           |   28 +-
 dlls/comctl32/nativefont.c         |   28 +-
 dlls/comctl32/pager.c              |  102 +-
 dlls/comctl32/progress.c           |  100 +-
 dlls/comctl32/propsheet.c          |   54 +-
 dlls/comctl32/rebar.c              |  460 +++---
 dlls/comctl32/status.c             |  558 +++----
 dlls/comctl32/tab.c                |  396 ++---
 dlls/comctl32/toolbar.c            |  914 +++++------
 dlls/comctl32/tooltips.c           |  790 +++++-----
 dlls/comctl32/trackbar.c           |  498 +++---
 dlls/comctl32/treeview.c           |  816 +++++-----
 dlls/comctl32/updown.c             |  172 +--
 dlls/imagehlp/access.c             |  122 +-
 dlls/imagehlp/debug.c              |   32 +-
 dlls/imagehlp/imagehlp_main.c      |   26 +-
 dlls/imagehlp/integrity.c          |   28 +-
 dlls/imagehlp/internal.c           |   26 +-
 dlls/imagehlp/modify.c             |   34 +-
 dlls/imagehlp/symbol.c             |   70 +-
 dlls/msacm32/builtin.c             |    8 +-
 dlls/msacm32/driver.c              |  122 +-
 dlls/msacm32/filter.c              |   52 +-
 dlls/msacm32/format.c              |   56 +-
 dlls/msacm32/internal.c            |   98 +-
 dlls/msacm32/msacm32_main.c        |   34 +-
 dlls/msacm32/stream.c              |   32 +-
 dlls/ntdll/nt.c                    |   62 +-
 dlls/ntdll/reg.c                   |   36 +-
 dlls/ntdll/rtl.c                   |   28 +-
 dlls/psapi/psapi_main.c            |   58 +-
 dlls/rasapi32/rasapi.c             |    2 +-
 dlls/shell32/brsfolder.c           |   56 +-
 dlls/shell32/classes.c             |   22 +-
 dlls/shell32/contmenu.c            |   66 +-
 dlls/shell32/dataobject.c          |   70 +-
 dlls/shell32/enumidlist.c          |   34 +-
 dlls/shell32/folders.c             |    8 +-
 dlls/shell32/iconcache.c           |  146 +-
 dlls/shell32/pidl.c                |   82 +-
 dlls/shell32/pidl.h                |   18 +-
 dlls/shell32/shell32_main.c        |  300 ++--
 dlls/shell32/shell32_main.h        |   58 +-
 dlls/shell32/shelllink.c           |   62 +-
 dlls/shell32/shellole.c            |   28 +-
 dlls/shell32/shellord.c            |  208 +--
 dlls/shell32/shellpath.c           |  254 +--
 dlls/shell32/shlfolder.c           |   58 +-
 dlls/shell32/shlview.c             |  242 +--
 dlls/ver/ver16.c                   |   22 +-
 dlls/version/info.c                |   68 +-
 dlls/version/install.c             |   98 +-
 dlls/version/resource.c            |   62 +-
 dlls/winaspi/winaspi16.c           |    6 +-
 dlls/wnaspi32/winaspi32.c          |   30 +-
 files/async.c                      |    2 +-
 files/change.c                     |   18 +-
 files/directory.c                  |  114 +-
 files/dos_fs.c                     |  180 +--
 files/drive.c                      |   80 +-
 files/file.c                       |  298 ++--
 files/profile.c                    |  164 +-
 graphics/bitblt.c                  |   44 +-
 graphics/cache.c                   |   12 +-
 graphics/d3dviewport.c             |    4 +-
 graphics/ddraw.c                   |   96 +-
 graphics/dispdib.c                 |    6 +-
 graphics/driver.c                  |    4 +-
 graphics/env.c                     |   18 +-
 graphics/escape.c                  |   22 +-
 graphics/fontengine.c              |    8 +-
 graphics/mapping.c                 |  110 +-
 graphics/metafiledrv/bitblt.c      |   18 +-
 graphics/metafiledrv/graphics.c    |   66 +-
 graphics/metafiledrv/init.c        |   66 +-
 graphics/metafiledrv/mapping.c     |   24 +-
 graphics/metafiledrv/objects.c     |   10 +-
 graphics/metafiledrv/text.c        |   10 +-
 graphics/painting.c                |  456 +++---
 graphics/path.c                    |  184 +--
 graphics/psdrv/afm.c               |    2 +-
 graphics/psdrv/bitmap.c            |    8 +-
 graphics/psdrv/brush.c             |   12 +-
 graphics/psdrv/color.c             |    4 +-
 graphics/psdrv/driver.c            |   30 +-
 graphics/psdrv/escape.c            |    6 +-
 graphics/psdrv/font.c              |   28 +-
 graphics/psdrv/graphics.c          |   62 +-
 graphics/psdrv/init.c              |   26 +-
 graphics/psdrv/objects.c           |    4 +-
 graphics/psdrv/pen.c               |    6 +-
 graphics/psdrv/ppd.c               |   16 +-
 graphics/psdrv/ps.c                |   84 +-
 graphics/psdrv/text.c              |    8 +-
 graphics/ttydrv/init.c             |    8 +-
 graphics/win16drv/brush.c          |    2 +-
 graphics/win16drv/font.c           |   16 +-
 graphics/win16drv/graphics.c       |   34 +-
 graphics/win16drv/init.c           |   22 +-
 graphics/win16drv/objects.c        |   12 +-
 graphics/win16drv/pen.c            |    4 +-
 graphics/win16drv/prtdrv.c         |   26 +-
 graphics/win16drv/text.c           |    8 +-
 graphics/x11drv/bitblt.c           |  172 +--
 graphics/x11drv/bitmap.c           |   22 +-
 graphics/x11drv/brush.c            |    8 +-
 graphics/x11drv/clipping.c         |    4 +-
 graphics/x11drv/dib.c              |   14 +-
 graphics/x11drv/graphics.c         |  182 +--
 graphics/x11drv/init.c             |   18 +-
 graphics/x11drv/objects.c          |   18 +-
 graphics/x11drv/oembitmap.c        |   34 +-
 graphics/x11drv/pen.c              |    4 +-
 graphics/x11drv/text.c             |   22 +-
 graphics/x11drv/xfont.c            |  134 +-
 if1632/builtin.c                   |   18 +-
 if1632/commdlg.spec                |   10 +-
 if1632/compobj.spec                |    4 +-
 if1632/ddeml.spec                  |    6 +-
 if1632/display.spec                |    2 +-
 if1632/gdi.spec                    |  146 +-
 if1632/kernel.spec                 |  252 +--
 if1632/keyboard.spec               |    2 +-
 if1632/mmsystem.spec               |    4 +-
 if1632/ole2.spec                   |    2 +-
 if1632/ole2disp.spec               |    4 +-
 if1632/olesvr.spec                 |    2 +-
 if1632/relay.c                     |   14 +-
 if1632/shell.spec                  |   10 +-
 if1632/snoop.c                     |    4 +-
 if1632/sound.spec                  |    4 +-
 if1632/system.spec                 |    6 +-
 if1632/thunk.c                     |  176 +--
 if1632/toolhelp.spec               |   62 +-
 if1632/typelib.spec                |    2 +-
 if1632/user.spec                   |  144 +-
 if1632/w32sys.spec                 |    6 +-
 if1632/win32s16.spec               |    8 +-
 if1632/windebug.spec               |    2 +-
 if1632/wprocs.spec                 |   16 +-
 include/animate.h                  |    2 +-
 include/bitmap.h                   |   22 +-
 include/brush.h                    |    6 +-
 include/button.h                   |    4 +-
 include/cache.h                    |    4 +-
 include/callback.h                 |   62 +-
 include/cdrom.h                    |    4 +-
 include/class.h                    |   14 +-
 include/clipboard.h                |   20 +-
 include/color.h                    |   12 +-
 include/combo.h                    |   28 +-
 include/comboex.h                  |    2 +-
 include/commctrl.h                 | 1523 +++++++++---------
 include/commdlg.h                  |  242 +--
 include/cursoricon.h               |    6 +-
 include/d3d.h                      |   16 +-
 include/dc.h                       |   10 +-
 include/dce.h                      |   16 +-
 include/dde_proc.h                 |    6 +-
 include/ddeml.h                    |   93 +-
 include/ddraw.h                    |  110 +-
 include/debugger.h                 |   30 +-
 include/desktop.h                  |   14 +-
 include/device.h                   |    2 +-
 include/dialog.h                   |   12 +-
 include/dinput.h                   |   48 +-
 include/dosexe.h                   |    4 +-
 include/dplay.h                    |   30 +-
 include/drive.h                    |    6 +-
 include/driver.h                   |   40 +-
 include/dsound.h                   |   10 +-
 include/file.h                     |   40 +-
 include/flatthunk.h                |    2 +-
 include/font.h                     |   24 +-
 include/gdi.h                      |  168 +-
 include/global.h                   |   12 +-
 include/header.h                   |   46 +-
 include/heap.h                     |   20 +-
 include/hook.h                     |   18 +-
 include/hotkey.h                   |    6 +-
 include/imagehlp.h                 |  434 +++---
 include/imagelist.h                |   26 +-
 include/imm.h                      |    6 +-
 include/input.h                    |    4 +-
 include/ipaddress.h                |   10 +-
 include/k32obj.h                   |    6 +-
 include/libres.h                   |    6 +-
 include/listview.h                 |   34 +-
 include/lzexpand.h                 |   29 +-
 include/main.h                     |   12 +-
 include/mdi.h                      |   30 +-
 include/menu.h                     |   18 +-
 include/message.h                  |   36 +-
 include/metafile.h                 |   32 +-
 include/metafiledrv.h              |  102 +-
 include/miscemu.h                  |   18 +-
 include/mmsystem.h                 |  822 ++++------
 include/module.h                   |   48 +-
 include/mouse.h                    |    4 +-
 include/msacm.h                    |  414 ++---
 include/msacmdrv.h                 |   28 +-
 include/multimedia.h               |   20 +-
 include/nonclient.h                |   16 +-
 include/ntddk.h                    |    8 +-
 include/ntdef.h                    |    2 +-
 include/ntdll.h                    |   33 +-
 include/ole.h                      |    5 +-
 include/ole2.h                     |   23 +-
 include/oleauto.h                  |  646 +++-----
 include/olectl.h                   |   12 +-
 include/oledlg.h                   |   36 +-
 include/pager.h                    |   12 +-
 include/palette.h                  |    6 +-
 include/path.h                     |   22 +-
 include/pe_image.h                 |   42 +-
 include/peexe.h                    |   20 +-
 include/pen.h                      |    4 +-
 include/process.h                  |   78 +-
 include/progress.h                 |   10 +-
 include/prsht.h                    |  124 +-
 include/psapi.h                    |   14 +-
 include/psdrv.h                    |  182 +--
 include/queue.h                    |   42 +-
 include/ras.h                      |    8 +-
 include/rebar.h                    |   66 +-
 include/region.h                   |   38 +-
 include/scroll.h                   |   22 +-
 include/selectors.h                |    8 +-
 include/shell.h                    |  181 ++-
 include/shellapi.h                 |   20 +-
 include/shlobj.h                   |  236 +--
 include/snoop.h                    |    4 +-
 include/spy.h                      |   20 +-
 include/static.h                   |    2 +-
 include/status.h                   |   20 +-
 include/struct32.h                 |   24 +-
 include/syslevel.h                 |    2 +-
 include/tab.h                      |   28 +-
 include/task.h                     |   14 +-
 include/tchar.h                    |   16 +-
 include/thread.h                   |   16 +-
 include/toolbar.h                  |   60 +-
 include/toolhelp.h                 |   66 +-
 include/tooltips.h                 |   48 +-
 include/trackbar.h                 |   42 +-
 include/treeview.h                 |   52 +-
 include/ttydrv.h                   |   38 +-
 include/updown.h                   |   14 +-
 include/ver.h                      |    4 +-
 include/vfw.h                      |  292 ++--
 include/win.h                      |   74 +-
 include/win16drv.h                 |   46 +-
 include/winbase.h                  | 1030 ++++++------
 include/wincon.h                   |   32 +-
 include/wincrypt.h                 |    2 +-
 include/windef.h                   |    3 +-
 include/windows.h                  |    5 +-
 include/windowsx.h                 |    2 +-
 include/wine/obj_base.h            |   77 +-
 include/wine/obj_cache.h           |    4 +-
 include/wine/obj_clientserver.h    |   27 +-
 include/wine/obj_control.h         |   44 +-
 include/wine/obj_dataobject.h      |   56 +-
 include/wine/obj_dragdrop.h        |    2 +-
 include/wine/obj_inplace.h         |   67 +-
 include/wine/obj_marshal.h         |   20 +-
 include/wine/obj_misc.h            |   19 +-
 include/wine/obj_moniker.h         |   35 +-
 include/wine/obj_oleaut.h          |   30 +-
 include/wine/obj_olefont.h         |   32 +-
 include/wine/obj_propertystorage.h |   16 +-
 include/wine/obj_shelllink.h       |   36 +-
 include/wine/obj_storage.h         |  159 +-
 include/wine/shell16.h             |    3 +-
 include/wine/winbase16.h           |  125 +-
 include/wine/winesound.h           |   47 +-
 include/wine/winestring.h          |   18 +-
 include/wine/winuser16.h           |   92 +-
 include/wingdi.h                   | 1351 +++++++---------
 include/winioctl.h                 |    2 +-
 include/winnetwk.h                 |   34 +-
 include/winnt.h                    |   18 +-
 include/winpos.h                   |   44 +-
 include/winproc.h                  |   40 +-
 include/winreg.h                   |  124 +-
 include/winsock.h                  |  121 +-
 include/winspool.h                 |  101 +-
 include/wintypes.h                 |  192 +--
 include/winuser.h                  | 2319 ++++++++++++----------------
 include/winver.h                   |   20 +-
 include/winversion.h               |    2 +-
 include/wnaspi32.h                 |   44 +-
 include/wrc_rsc.h                  |   12 +-
 include/wtypes.h                   |   20 +-
 include/x11drv.h                   |  180 +--
 include/x11font.h                  |   10 +-
 ipc/dde_mem.c                      |    2 +-
 ipc/dde_proc.c                     |   22 +-
 ipc/generic_hash.c                 |   20 +-
 ipc/generic_hash.h                 |    8 +-
 ipc/wine_test_stub.c               |    6 +-
 library/winestub.c                 |    8 +-
 libtest/hello4.c                   |    4 +-
 libtest/hello5.c                   |    2 +-
 libtest/new.c                      |    2 +-
 libtest/vartest.c                  |    2 +-
 loader/dos/module.c                |   14 +-
 loader/elf.c                       |   22 +-
 loader/libres.c                    |   14 +-
 loader/main.c                      |   30 +-
 loader/module.c                    |  204 +--
 loader/ne/convert.c                |   52 +-
 loader/ne/module.c                 |   60 +-
 loader/ne/resource.c               |   20 +-
 loader/ne/segment.c                |   38 +-
 loader/pe_image.c                  |   94 +-
 loader/pe_resource.c               |   74 +-
 loader/resource.c                  |  194 +--
 loader/signal.c                    |    6 +-
 loader/task.c                      |  144 +-
 memory/atom.c                      |   64 +-
 memory/environ.c                   |   66 +-
 memory/global.c                    |  166 +-
 memory/heap.c                      |  114 +-
 memory/local.c                     |   78 +-
 memory/selector.c                  |   64 +-
 memory/string.c                    |  148 +-
 memory/virtual.c                   |  220 +--
 misc/callback.c                    |   28 +-
 misc/cdrom.c                       |    4 +-
 misc/comm.c                        |   80 +-
 misc/commdlg.c                     | 1222 +++++++--------
 misc/cpu.c                         |   26 +-
 misc/crtdll.c                      |  282 ++--
 misc/ddeml.c                       |  152 +-
 misc/error.c                       |    6 +-
 misc/imm.c                         |  202 +--
 misc/lstr.c                        |  104 +-
 misc/lzexpand.c                    |  132 +-
 misc/main.c                        |  162 +-
 misc/network.c                     |  142 +-
 misc/printdrv.c                    |  154 +-
 misc/registry.c                    |  304 ++--
 misc/shell.c                       |  194 +--
 misc/sound.c                       |   30 +-
 misc/spooler.c                     |   36 +-
 misc/spy.c                         |   36 +-
 misc/system.c                      |   16 +-
 misc/tapi32.c                      |   16 +-
 misc/toolhelp.c                    |   28 +-
 misc/version.c                     |   40 +-
 misc/w32scomb.c                    |    6 +-
 misc/w32skrnl.c                    |    2 +-
 misc/w32sys.c                      |    4 +-
 misc/win32s16.c                    |    4 +-
 misc/windebug.c                    |    2 +-
 misc/winsock.c                     |  244 +--
 misc/winsock_dns.c                 |   10 +-
 misc/wsprintf.c                    |   84 +-
 miscemu/instr.c                    |    8 +-
 miscemu/main.c                     |   20 +-
 msdos/dosmem.c                     |   34 +-
 msdos/dpmi.c                       |   16 +-
 msdos/int21.c                      |   94 +-
 msdos/int2f.c                      |    4 +-
 msdos/int5c.c                      |    2 +-
 msdos/vxd.c                        |   50 +-
 msdos/xms.c                        |    2 +-
 multimedia/audio.c                 |   10 +-
 multimedia/dplay.c                 |   32 +-
 multimedia/dsound.c                |   42 +-
 multimedia/init.c                  |    8 +-
 multimedia/joystick.c              |   24 +-
 multimedia/mcianim.c               |   14 +-
 multimedia/mciavi.c                |   16 +-
 multimedia/mcicda.c                |   10 +-
 multimedia/mcimidi.c               |   60 +-
 multimedia/mcistring.c             |   72 +-
 multimedia/mciwave.c               |   36 +-
 multimedia/midi.c                  |   66 +-
 multimedia/mmio.c                  |  126 +-
 multimedia/mmsystem.c              |  638 ++++----
 multimedia/msvideo.c               |  100 +-
 multimedia/time.c                  |   54 +-
 objects/bitmap.c                   |  200 +--
 objects/brush.c                    |   82 +-
 objects/clipping.c                 |  142 +-
 objects/color.c                    |   22 +-
 objects/cursoricon.c               |  424 ++---
 objects/dc.c                       |  190 +--
 objects/dcvalues.c                 |   56 +-
 objects/dib.c                      |  136 +-
 objects/enhmetafile.c              |  222 +--
 objects/font.c                     |  356 ++---
 objects/gdiobj.c                   |   96 +-
 objects/linedda.c                  |   18 +-
 objects/metafile.c                 |  310 ++--
 objects/palette.c                  |  162 +-
 objects/pen.c                      |   24 +-
 objects/region.c                   |  308 ++--
 objects/text.c                     |  222 +--
 ole/bindctx.c                      |   16 +-
 ole/compobj.c                      |  102 +-
 ole/filemoniker.c                  |   32 +-
 ole/ifs.c                          |   60 +-
 ole/ifs.h                          |    2 +-
 ole/itemmoniker.c                  |   34 +-
 ole/moniker.c                      |    2 +-
 ole/ole2.c                         |  126 +-
 ole/ole2disp.c                     |   34 +-
 ole/ole2nls.c                      |  218 +--
 ole/olecli.c                       |   22 +-
 ole/oledlg.c                       |   80 +-
 ole/olefont.c                      |   88 +-
 ole/oleobj.c                       |    2 +-
 ole/olesvr.c                       |   14 +-
 ole/safearray.c                    |  166 +-
 ole/stg_bigblockfile.c             |   14 +-
 ole/stg_stream.c                   |   60 +-
 ole/storage.c                      |  148 +-
 ole/storage32.c                    |  846 +++++-----
 ole/storage32.h                    |  306 ++--
 ole/typelib.c                      |   18 +-
 ole/variant.c                      |  654 ++++----
 programs/avitools/icinfo.c         |    4 +-
 programs/notepad/dialog.c          |    4 +-
 programs/notepad/lcc.h             |    4 +-
 programs/progman/group.c           |    4 +-
 programs/progman/grpfile.c         |    4 +-
 programs/progman/main.c            |   10 +-
 programs/progman/program.c         |    8 +-
 programs/view/init.c               |    2 +-
 programs/winhelp/hlp2sgml.c        |   10 +-
 programs/winhelp/hlpfile.c         |    6 +-
 programs/winhelp/winhelp.c         |    2 +-
 relay32/advapi32.spec              |  168 +-
 relay32/builtin32.c                |   26 +-
 relay32/comctl32.spec              |   46 +-
 relay32/comdlg32.spec              |   34 +-
 relay32/crtdll.spec                |    2 +-
 relay32/ddraw.spec                 |    2 +-
 relay32/dinput.spec                |    2 +-
 relay32/dsound.spec                |    2 +-
 relay32/gdi32.spec                 |  476 +++---
 relay32/imagehlp.spec              |  118 +-
 relay32/imm32.spec                 |  112 +-
 relay32/kernel32.spec              |  616 ++++----
 relay32/lz32.spec                  |   22 +-
 relay32/mpr.spec                   |   50 +-
 relay32/msacm32.spec               |   84 +-
 relay32/msvfw32.spec               |   26 +-
 relay32/ntdll.spec                 |    4 +-
 relay32/ole32.spec                 |   56 +-
 relay32/oleaut32.spec              |  324 ++--
 relay32/olecli32.spec              |   20 +-
 relay32/oledlg.spec                |   44 +-
 relay32/olesvr32.spec              |   12 +-
 relay32/rasapi32.spec              |    2 +-
 relay32/relay386.c                 |    4 +-
 relay32/shell32.spec               |  160 +-
 relay32/snoop.c                    |   24 +-
 relay32/tapi32.spec                |    4 +-
 relay32/user32.spec                |  958 ++++++------
 relay32/version.spec               |   24 +-
 relay32/winmm.spec                 |  324 ++--
 relay32/winspool.spec              |   80 +-
 relay32/wnaspi32.spec              |    4 +-
 relay32/wsock32.spec               |   76 +-
 resources/sysres.c                 |    2 +-
 resources/sysres_Ca.rc             |    4 +-
 resources/sysres_Cz.rc             |    4 +-
 resources/sysres_Da.rc             |    4 +-
 resources/sysres_De.rc             |    4 +-
 resources/sysres_En.rc             |    4 +-
 resources/sysres_Eo.rc             |    4 +-
 resources/sysres_Es.rc             |    4 +-
 resources/sysres_Fi.rc             |    4 +-
 resources/sysres_Fr.rc             |    4 +-
 resources/sysres_Hu.rc             |    4 +-
 resources/sysres_It.rc             |    4 +-
 resources/sysres_Ko.rc             |    4 +-
 resources/sysres_Nl.rc             |    4 +-
 resources/sysres_No.rc             |    4 +-
 resources/sysres_Pl.rc             |    4 +-
 resources/sysres_Po.rc             |    4 +-
 resources/sysres_Sw.rc             |    4 +-
 scheduler/client.c                 |    4 +-
 scheduler/critsection.c            |    6 +-
 scheduler/event.c                  |   48 +-
 scheduler/handle.c                 |   68 +-
 scheduler/k32obj.c                 |   24 +-
 scheduler/mutex.c                  |   22 +-
 scheduler/pipe.c                   |    4 +-
 scheduler/process.c                |  138 +-
 scheduler/semaphore.c              |   22 +-
 scheduler/synchro.c                |   32 +-
 scheduler/syslevel.c               |    2 +-
 scheduler/thread.c                 |   86 +-
 tools/build.c                      |    2 +-
 tsx11/ts_xf86vmode.c               |    2 +-
 win32/code_page.c                  |   32 +-
 win32/console.c                    |  166 +-
 win32/device.c                     |   70 +-
 win32/except.c                     |    6 +-
 win32/file.c                       |   12 +-
 win32/init.c                       |   28 +-
 win32/kernel32.c                   |  106 +-
 win32/newfns.c                     |   54 +-
 win32/ordinals.c                   |   14 +-
 win32/process.c                    |   14 +-
 win32/struct32.c                   |   64 +-
 win32/time.c                       |    6 +-
 windows/caret.c                    |   96 +-
 windows/class.c                    |  176 +--
 windows/clipboard.c                |  218 +--
 windows/dce.c                      |  174 +--
 windows/defdlg.c                   |  122 +-
 windows/defwnd.c                   |  110 +-
 windows/dialog.c                   |  476 +++---
 windows/dinput.c                   |   36 +-
 windows/display.c                  |    2 +-
 windows/driver.c                   |   76 +-
 windows/event.c                    |   12 +-
 windows/focus.c                    |   26 +-
 windows/hook.c                     |  228 +--
 windows/input.c                    |  138 +-
 windows/keyboard.c                 |    4 +-
 windows/mdi.c                      |  556 +++----
 windows/message.c                  |  402 ++---
 windows/mouse.c                    |    4 +-
 windows/msgbox.c                   |  178 +--
 windows/multimon.c                 |   76 +-
 windows/nonclient.c                |  640 ++++----
 windows/painting.c                 |  206 +--
 windows/property.c                 |   80 +-
 windows/queue.c                    |  112 +-
 windows/rect.c                     |   54 +-
 windows/scroll.c                   |  170 +-
 windows/syscolor.c                 |   40 +-
 windows/sysmetrics.c               |   16 +-
 windows/timer.c                    |   34 +-
 windows/ttydrv/clipboard.c         |    6 +-
 windows/ttydrv/event.c             |   10 +-
 windows/ttydrv/wnd.c               |   16 +-
 windows/user.c                     |   72 +-
 windows/win.c                      |  444 +++---
 windows/winhelp.c                  |   16 +-
 windows/winpos.c                   |  518 +++----
 windows/winproc.c                  |  734 ++++-----
 windows/x11drv/clipboard.c         |   30 +-
 windows/x11drv/event.c             |  118 +-
 windows/x11drv/keyboard.c          |   16 +-
 windows/x11drv/mouse.c             |    8 +-
 windows/x11drv/wnd.c               |   24 +-
 591 files changed, 29505 insertions(+), 30757 deletions(-)

diff --git a/console/xterm.c b/console/xterm.c
index 9926754a76d..8e8d200b550 100644
--- a/console/xterm.c
+++ b/console/xterm.c
@@ -22,7 +22,7 @@
 
 char console_xterm_prog[80];
 
-static BOOL32 wine_create_console(FILE **master, FILE **slave, int *pid);
+static BOOL wine_create_console(FILE **master, FILE **slave, int *pid);
 FILE *wine_openpty(int *master, int *slave, char *name,
                         struct termios *term, struct winsize *winsize);
 
@@ -106,7 +106,7 @@ void XTERM_ResizeScreen(int x, int y)
 }
 
 
-static BOOL32 wine_create_console(FILE **master, FILE **slave, int *pid)
+static BOOL wine_create_console(FILE **master, FILE **slave, int *pid)
 {
         /* There is definately a bug in this routine that causes a lot
            of garbage to be written to the screen, but I can't find it...
diff --git a/controls/button.c b/controls/button.c
index 3da2a9a74c3..080db5da494 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -12,12 +12,12 @@
 #include "wine/winuser16.h"
 #include "tweak.h"
 
-static void PB_Paint( WND *wndPtr, HDC32 hDC, WORD action );
-static void PB_PaintGrayOnGray(HDC32 hDC,HFONT32 hFont,RECT32 *rc,char *text);
-static void CB_Paint( WND *wndPtr, HDC32 hDC, WORD action );
-static void GB_Paint( WND *wndPtr, HDC32 hDC, WORD action );
-static void UB_Paint( WND *wndPtr, HDC32 hDC, WORD action );
-static void OB_Paint( WND *wndPtr, HDC32 hDC, WORD action );
+static void PB_Paint( WND *wndPtr, HDC hDC, WORD action );
+static void PB_PaintGrayOnGray(HDC hDC,HFONT hFont,RECT *rc,char *text);
+static void CB_Paint( WND *wndPtr, HDC hDC, WORD action );
+static void GB_Paint( WND *wndPtr, HDC hDC, WORD action );
+static void UB_Paint( WND *wndPtr, HDC hDC, WORD action );
+static void OB_Paint( WND *wndPtr, HDC hDC, WORD action );
 static void BUTTON_CheckAutoRadioButton( WND *wndPtr );
 
 #define MAX_BTN_TYPE  12
@@ -38,7 +38,7 @@ static const WORD maxCheckState[MAX_BTN_TYPE] =
     BUTTON_UNCHECKED    /* BS_OWNERDRAW */
 };
 
-typedef void (*pfPaint)( WND *wndPtr, HDC32 hdc, WORD action );
+typedef void (*pfPaint)( WND *wndPtr, HDC hdc, WORD action );
 
 static const pfPaint btnPaintFunc[MAX_BTN_TYPE] =
 {
@@ -58,26 +58,26 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] =
 
 #define PAINT_BUTTON(wndPtr,style,action) \
      if (btnPaintFunc[style]) { \
-         HDC32 hdc = GetDC32( (wndPtr)->hwndSelf ); \
+         HDC hdc = GetDC( (wndPtr)->hwndSelf ); \
          (btnPaintFunc[style])(wndPtr,hdc,action); \
-         ReleaseDC32( (wndPtr)->hwndSelf, hdc ); }
+         ReleaseDC( (wndPtr)->hwndSelf, hdc ); }
 
 #define BUTTON_SEND_CTLCOLOR(wndPtr,hdc) \
-    SendMessage32A( GetParent32((wndPtr)->hwndSelf), WM_CTLCOLORBTN, \
+    SendMessageA( GetParent((wndPtr)->hwndSelf), WM_CTLCOLORBTN, \
                     (hdc), (wndPtr)->hwndSelf )
 
-static HBITMAP32 hbitmapCheckBoxes = 0;
+static HBITMAP hbitmapCheckBoxes = 0;
 static WORD checkBoxWidth = 0, checkBoxHeight = 0;
 
 
 /***********************************************************************
  *           ButtonWndProc
  */
-LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
-                              WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI ButtonWndProc( HWND hWnd, UINT uMsg,
+                              WPARAM wParam, LPARAM lParam )
 {
-    RECT32 rect;
-    POINT32 pt = { LOWORD(lParam), HIWORD(lParam) };
+    RECT rect;
+    POINT pt = { LOWORD(lParam), HIWORD(lParam) };
     WND *wndPtr = WIN_FindWndPtr(hWnd);
     BUTTONINFO *infoPtr = (BUTTONINFO *)wndPtr->wExtra;
     LONG style = wndPtr->dwStyle & 0x0f;
@@ -101,9 +101,9 @@ LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
     case WM_CREATE:
         if (!hbitmapCheckBoxes)
         {
-            BITMAP32 bmp;
-            hbitmapCheckBoxes = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_CHECKBOXES));
-            GetObject32A( hbitmapCheckBoxes, sizeof(bmp), &bmp );
+            BITMAP bmp;
+            hbitmapCheckBoxes = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_CHECKBOXES));
+            GetObjectA( hbitmapCheckBoxes, sizeof(bmp), &bmp );
             checkBoxWidth  = bmp.bmWidth / 4;
             checkBoxHeight = bmp.bmHeight / 3;
         }
@@ -118,59 +118,59 @@ LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
     case WM_PAINT:
         if (btnPaintFunc[style])
         {
-            PAINTSTRUCT32 ps;
-            HDC32 hdc = wParam ? (HDC32)wParam : BeginPaint32( hWnd, &ps );
-	    SetBkMode32( hdc, OPAQUE );
+            PAINTSTRUCT ps;
+            HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps );
+	    SetBkMode( hdc, OPAQUE );
             (btnPaintFunc[style])( wndPtr, hdc, ODA_DRAWENTIRE );
-            if( !wParam ) EndPaint32( hWnd, &ps );
+            if( !wParam ) EndPaint( hWnd, &ps );
         }
         break;
 
     case WM_LBUTTONDOWN:
     case WM_LBUTTONDBLCLK:
-        SendMessage32A( hWnd, BM_SETSTATE32, TRUE, 0 );
-        SetFocus32( hWnd );
-        SetCapture32( hWnd );
+        SendMessageA( hWnd, BM_SETSTATE, TRUE, 0 );
+        SetFocus( hWnd );
+        SetCapture( hWnd );
         break;
 
     case WM_LBUTTONUP:
         ReleaseCapture();
         if (!(infoPtr->state & BUTTON_HIGHLIGHTED)) break;
-        SendMessage32A( hWnd, BM_SETSTATE32, FALSE, 0 );
-        GetClientRect32( hWnd, &rect );
-        if (PtInRect32( &rect, pt ))
+        SendMessageA( hWnd, BM_SETSTATE, FALSE, 0 );
+        GetClientRect( hWnd, &rect );
+        if (PtInRect( &rect, pt ))
         {
             switch(style)
             {
             case BS_AUTOCHECKBOX:
-                SendMessage32A( hWnd, BM_SETCHECK32,
+                SendMessageA( hWnd, BM_SETCHECK,
                                 !(infoPtr->state & BUTTON_CHECKED), 0 );
                 break;
             case BS_AUTORADIOBUTTON:
-                SendMessage32A( hWnd, BM_SETCHECK32, TRUE, 0 );
+                SendMessageA( hWnd, BM_SETCHECK, TRUE, 0 );
                 break;
             case BS_AUTO3STATE:
-                SendMessage32A( hWnd, BM_SETCHECK32,
+                SendMessageA( hWnd, BM_SETCHECK,
                                 (infoPtr->state & BUTTON_3STATE) ? 0 :
                                 ((infoPtr->state & 3) + 1), 0 );
                 break;
             }
-            SendMessage32A( GetParent32(hWnd), WM_COMMAND,
+            SendMessageA( GetParent(hWnd), WM_COMMAND,
                             MAKEWPARAM( wndPtr->wIDmenu, BN_CLICKED ), hWnd);
         }
         break;
 
     case WM_MOUSEMOVE:
-        if (GetCapture32() == hWnd)
+        if (GetCapture() == hWnd)
         {
-            GetClientRect32( hWnd, &rect );
-            SendMessage32A( hWnd, BM_SETSTATE32, PtInRect32(&rect, pt), 0 );
+            GetClientRect( hWnd, &rect );
+            SendMessageA( hWnd, BM_SETSTATE, PtInRect(&rect, pt), 0 );
         }
         break;
 
     case WM_NCHITTEST:
         if(style == BS_GROUPBOX) return HTTRANSPARENT;
-        return DefWindowProc32A( hWnd, uMsg, wParam, lParam );
+        return DefWindowProcA( hWnd, uMsg, wParam, lParam );
 
     case WM_SETTEXT:
         DEFWND_SetText( wndPtr, (LPCSTR)lParam );
@@ -191,7 +191,7 @@ LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
         infoPtr->state |= BUTTON_HASFOCUS;
 	if (style == BS_AUTORADIOBUTTON)
 	{
-	    SendMessage32A( hWnd, BM_SETCHECK32, 1, 0 );
+	    SendMessageA( hWnd, BM_SETCHECK, 1, 0 );
 	}
         PAINT_BUTTON( wndPtr, style, ODA_FOCUS );
         break;
@@ -199,15 +199,15 @@ LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
     case WM_KILLFOCUS:
         infoPtr->state &= ~BUTTON_HASFOCUS;
 	PAINT_BUTTON( wndPtr, style, ODA_FOCUS );
-	InvalidateRect32( hWnd, NULL, TRUE );
+	InvalidateRect( hWnd, NULL, TRUE );
         break;
 
     case WM_SYSCOLORCHANGE:
-        InvalidateRect32( hWnd, NULL, FALSE );
+        InvalidateRect( hWnd, NULL, FALSE );
         break;
 
     case BM_SETSTYLE16:
-    case BM_SETSTYLE32:
+    case BM_SETSTYLE:
         if ((wParam & 0x0f) >= MAX_BTN_TYPE) break;
         wndPtr->dwStyle = (wndPtr->dwStyle & 0xfffffff0) 
                            | (wParam & 0x0000000f);
@@ -216,11 +216,11 @@ LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
         break;
 
     case BM_GETCHECK16:
-    case BM_GETCHECK32:
+    case BM_GETCHECK:
         return infoPtr->state & 3;
 
     case BM_SETCHECK16:
-    case BM_SETCHECK32:
+    case BM_SETCHECK:
         if (wParam > maxCheckState[style]) wParam = maxCheckState[style];
         if ((infoPtr->state & 3) != wParam)
         {
@@ -239,11 +239,11 @@ LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
         break;
 
     case BM_GETSTATE16:
-    case BM_GETSTATE32:
+    case BM_GETSTATE:
         return infoPtr->state;
 
     case BM_SETSTATE16:
-    case BM_SETSTATE32:
+    case BM_SETSTATE:
         if (wParam)
         {
             if (infoPtr->state & BUTTON_HIGHLIGHTED) break;
@@ -258,7 +258,7 @@ LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
         break;
 
     default:
-        return DefWindowProc32A(hWnd, uMsg, wParam, lParam);
+        return DefWindowProcA(hWnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -268,87 +268,87 @@ LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
  *       Push Button Functions
  */
 
-static void PB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
+static void PB_Paint( WND *wndPtr, HDC hDC, WORD action )
 {
-    RECT32 rc;
-    HPEN32 hOldPen;
-    HBRUSH32 hOldBrush;
+    RECT rc;
+    HPEN hOldPen;
+    HBRUSH hOldBrush;
     BUTTONINFO *infoPtr = (BUTTONINFO *)wndPtr->wExtra;
 
-    GetClientRect32( wndPtr->hwndSelf, &rc );
+    GetClientRect( wndPtr->hwndSelf, &rc );
 
       /* Send WM_CTLCOLOR to allow changing the font (the colors are fixed) */
-    if (infoPtr->hFont) SelectObject32( hDC, infoPtr->hFont );
+    if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
     BUTTON_SEND_CTLCOLOR( wndPtr, hDC );
-    hOldPen = (HPEN32)SelectObject32(hDC, GetSysColorPen32(COLOR_WINDOWFRAME));
-    hOldBrush =(HBRUSH32)SelectObject32(hDC,GetSysColorBrush32(COLOR_BTNFACE));
-    SetBkMode32(hDC, TRANSPARENT);
-    Rectangle32(hDC, rc.left, rc.top, rc.right, rc.bottom);
+    hOldPen = (HPEN)SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME));
+    hOldBrush =(HBRUSH)SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE));
+    SetBkMode(hDC, TRANSPARENT);
+    Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom);
     if (action == ODA_DRAWENTIRE)
     {
-        SetPixel32( hDC, rc.left, rc.top, GetSysColor32(COLOR_WINDOW) );
-        SetPixel32( hDC, rc.left, rc.bottom-1, GetSysColor32(COLOR_WINDOW) );
-        SetPixel32( hDC, rc.right-1, rc.top, GetSysColor32(COLOR_WINDOW) );
-        SetPixel32( hDC, rc.right-1, rc.bottom-1, GetSysColor32(COLOR_WINDOW));
+        SetPixel( hDC, rc.left, rc.top, GetSysColor(COLOR_WINDOW) );
+        SetPixel( hDC, rc.left, rc.bottom-1, GetSysColor(COLOR_WINDOW) );
+        SetPixel( hDC, rc.right-1, rc.top, GetSysColor(COLOR_WINDOW) );
+        SetPixel( hDC, rc.right-1, rc.bottom-1, GetSysColor(COLOR_WINDOW));
     }
-    InflateRect32( &rc, -1, -1 );
+    InflateRect( &rc, -1, -1 );
 
     if ((wndPtr->dwStyle & 0x000f) == BS_DEFPUSHBUTTON)
     {
-        Rectangle32(hDC, rc.left, rc.top, rc.right, rc.bottom);
-        InflateRect32( &rc, -1, -1 );
+        Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom);
+        InflateRect( &rc, -1, -1 );
     }
 
     if (infoPtr->state & BUTTON_HIGHLIGHTED)
     {
         /* draw button shadow: */
-        SelectObject32(hDC, GetSysColorBrush32(COLOR_BTNSHADOW));
-        PatBlt32(hDC, rc.left, rc.top, 1, rc.bottom-rc.top, PATCOPY );
-        PatBlt32(hDC, rc.left, rc.top, rc.right-rc.left, 1, PATCOPY );
+        SelectObject(hDC, GetSysColorBrush(COLOR_BTNSHADOW));
+        PatBlt(hDC, rc.left, rc.top, 1, rc.bottom-rc.top, PATCOPY );
+        PatBlt(hDC, rc.left, rc.top, rc.right-rc.left, 1, PATCOPY );
         rc.left += 2;  /* To position the text down and right */
         rc.top  += 2;
     } else {
         rc.right++, rc.bottom++;
-	DrawEdge32( hDC, &rc, EDGE_RAISED, BF_RECT );
+	DrawEdge( hDC, &rc, EDGE_RAISED, BF_RECT );
         rc.right--, rc.bottom--;
     }
 	
     /* draw button label, if any: */
     if (wndPtr->text && wndPtr->text[0])
     {
-        LOGBRUSH32 lb;
-        GetObject32A( GetSysColorBrush32(COLOR_BTNFACE), sizeof(lb), &lb );
+        LOGBRUSH lb;
+        GetObjectA( GetSysColorBrush(COLOR_BTNFACE), sizeof(lb), &lb );
         if (wndPtr->dwStyle & WS_DISABLED &&
-            GetSysColor32(COLOR_GRAYTEXT)==lb.lbColor)
+            GetSysColor(COLOR_GRAYTEXT)==lb.lbColor)
             /* don't write gray text on gray bkg */
             PB_PaintGrayOnGray(hDC,infoPtr->hFont,&rc,wndPtr->text);
         else
         {
-            SetTextColor32( hDC, (wndPtr->dwStyle & WS_DISABLED) ?
-                                 GetSysColor32(COLOR_GRAYTEXT) :
-                                 GetSysColor32(COLOR_BTNTEXT) );
-            DrawText32A( hDC, wndPtr->text, -1, &rc,
+            SetTextColor( hDC, (wndPtr->dwStyle & WS_DISABLED) ?
+                                 GetSysColor(COLOR_GRAYTEXT) :
+                                 GetSysColor(COLOR_BTNTEXT) );
+            DrawTextA( hDC, wndPtr->text, -1, &rc,
                          DT_SINGLELINE | DT_CENTER | DT_VCENTER );
             /* do we have the focus? */
             if (infoPtr->state & BUTTON_HASFOCUS)
             {
-                RECT32 r = { 0, 0, 0, 0 };
-                INT32 xdelta, ydelta;
+                RECT r = { 0, 0, 0, 0 };
+                INT xdelta, ydelta;
 
-                DrawText32A( hDC, wndPtr->text, -1, &r,
+                DrawTextA( hDC, wndPtr->text, -1, &r,
                              DT_SINGLELINE | DT_CALCRECT );
                 xdelta = ((rc.right - rc.left) - (r.right - r.left) - 1) / 2;
                 ydelta = ((rc.bottom - rc.top) - (r.bottom - r.top) - 1) / 2;
                 if (xdelta < 0) xdelta = 0;
                 if (ydelta < 0) ydelta = 0;
-                InflateRect32( &rc, -xdelta, -ydelta );
-                DrawFocusRect32( hDC, &rc );
+                InflateRect( &rc, -xdelta, -ydelta );
+                DrawFocusRect( hDC, &rc );
             }
         }   
     }
 
-    SelectObject32( hDC, hOldPen );
-    SelectObject32( hDC, hOldBrush );
+    SelectObject( hDC, hOldPen );
+    SelectObject( hDC, hOldBrush );
 }
 
 
@@ -357,32 +357,32 @@ static void PB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
  *   using a raster brush to avoid gray text on gray background
  */
 
-void PB_PaintGrayOnGray(HDC32 hDC,HFONT32 hFont,RECT32 *rc,char *text)
+void PB_PaintGrayOnGray(HDC hDC,HFONT hFont,RECT *rc,char *text)
 {
     static const int Pattern[] = {0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55};
-    HBITMAP32 hbm  = CreateBitmap32( 8, 8, 1, 1, Pattern );
-    HDC32 hdcMem = CreateCompatibleDC32(hDC);
-    HBITMAP32 hbmMem;
-    HBRUSH32 hBr;
-    RECT32 rect,rc2;
+    HBITMAP hbm  = CreateBitmap( 8, 8, 1, 1, Pattern );
+    HDC hdcMem = CreateCompatibleDC(hDC);
+    HBITMAP hbmMem;
+    HBRUSH hBr;
+    RECT rect,rc2;
 
     rect=*rc;
-    DrawText32A( hDC, text, -1, &rect, DT_SINGLELINE | DT_CALCRECT);
+    DrawTextA( hDC, text, -1, &rect, DT_SINGLELINE | DT_CALCRECT);
     rc2=rect;
     rect.left=(rc->right-rect.right)/2;       /* for centering text bitmap */
     rect.top=(rc->bottom-rect.bottom)/2;
-    hbmMem = CreateCompatibleBitmap32( hDC,rect.right,rect.bottom );
-    SelectObject32( hdcMem, hbmMem);
-    hBr = SelectObject32( hdcMem, CreatePatternBrush32(hbm) );
-    DeleteObject32( hbm );
-    PatBlt32( hdcMem,0,0,rect.right,rect.bottom,WHITENESS);
-    if (hFont) SelectObject32( hdcMem, hFont);
-    DrawText32A( hdcMem, text, -1, &rc2, DT_SINGLELINE);  
-    PatBlt32( hdcMem,0,0,rect.right,rect.bottom,0xFA0089);
-    DeleteObject32( SelectObject32( hdcMem,hBr) );
-    BitBlt32(hDC,rect.left,rect.top,rect.right,rect.bottom,hdcMem,0,0,0x990000);
-    DeleteDC32( hdcMem);
-    DeleteObject32( hbmMem );
+    hbmMem = CreateCompatibleBitmap( hDC,rect.right,rect.bottom );
+    SelectObject( hdcMem, hbmMem);
+    hBr = SelectObject( hdcMem, CreatePatternBrush(hbm) );
+    DeleteObject( hbm );
+    PatBlt( hdcMem,0,0,rect.right,rect.bottom,WHITENESS);
+    if (hFont) SelectObject( hdcMem, hFont);
+    DrawTextA( hdcMem, text, -1, &rc2, DT_SINGLELINE);  
+    PatBlt( hdcMem,0,0,rect.right,rect.bottom,0xFA0089);
+    DeleteObject( SelectObject( hdcMem,hBr) );
+    BitBlt(hDC,rect.left,rect.top,rect.right,rect.bottom,hdcMem,0,0,0x990000);
+    DeleteDC( hdcMem);
+    DeleteObject( hbmMem );
 }
 
 
@@ -390,18 +390,18 @@ void PB_PaintGrayOnGray(HDC32 hDC,HFONT32 hFont,RECT32 *rc,char *text)
  *       Check Box & Radio Button Functions
  */
 
-static void CB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
+static void CB_Paint( WND *wndPtr, HDC hDC, WORD action )
 {
-    RECT32 rbox, rtext, client;
-    HBRUSH32 hBrush;
+    RECT rbox, rtext, client;
+    HBRUSH hBrush;
     int textlen, delta;
     BUTTONINFO *infoPtr = (BUTTONINFO *)wndPtr->wExtra;
 
     textlen = 0;
-    GetClientRect32(wndPtr->hwndSelf, &client);
+    GetClientRect(wndPtr->hwndSelf, &client);
     rbox = rtext = client;
 
-    if (infoPtr->hFont) SelectObject32( hDC, infoPtr->hFont );
+    if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
 
     /* Something is still not right, checkboxes (and edit controls)
      * in wsping32 have white backgrounds instead of dark grey.
@@ -409,7 +409,7 @@ static void CB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
      * particular case and the background is not painted at all.
      */
 
-    hBrush = GetControlBrush( wndPtr->hwndSelf, hDC, CTLCOLOR_BTN );
+    hBrush = GetControlBrush16( wndPtr->hwndSelf, hDC, CTLCOLOR_BTN );
 
     if (wndPtr->dwStyle & BS_LEFTTEXT) 
     {
@@ -429,12 +429,12 @@ static void CB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
     if (wndPtr->text) textlen = strlen( wndPtr->text );
     if (action == ODA_DRAWENTIRE || action == ODA_SELECT)
     { 
-        HDC32 hMemDC = CreateCompatibleDC32( hDC );
+        HDC hMemDC = CreateCompatibleDC( hDC );
         int x = 0, y = 0;
         delta = (rbox.bottom - rbox.top - checkBoxHeight) >> 1;
 
-        if (action == ODA_SELECT) FillRect32( hDC, &rbox, hBrush );
-        else FillRect32( hDC, &client, hBrush );
+        if (action == ODA_SELECT) FillRect( hDC, &rbox, hBrush );
+        else FillRect( hDC, &client, hBrush );
 
         if (infoPtr->state & BUTTON_HIGHLIGHTED) x += 2 * checkBoxWidth;
         if (infoPtr->state & (BUTTON_CHECKED | BUTTON_3STATE)) x += checkBoxWidth;
@@ -442,16 +442,16 @@ static void CB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
             ((wndPtr->dwStyle & 0x0f) == BS_AUTORADIOBUTTON)) y += checkBoxHeight;
         else if (infoPtr->state & BUTTON_3STATE) y += 2 * checkBoxHeight;
 
-	SelectObject32( hMemDC, hbitmapCheckBoxes );
-	BitBlt32( hDC, rbox.left, rbox.top + delta, checkBoxWidth,
+	SelectObject( hMemDC, hbitmapCheckBoxes );
+	BitBlt( hDC, rbox.left, rbox.top + delta, checkBoxWidth,
 		  checkBoxHeight, hMemDC, x, y, SRCCOPY );
-	DeleteDC32( hMemDC );
+	DeleteDC( hMemDC );
 
         if( textlen && action != ODA_SELECT )
         {
             if (wndPtr->dwStyle & WS_DISABLED)
-                SetTextColor32( hDC, GetSysColor32(COLOR_GRAYTEXT) );
-            DrawText32A( hDC, wndPtr->text, textlen, &rtext,
+                SetTextColor( hDC, GetSysColor(COLOR_GRAYTEXT) );
+            DrawTextA( hDC, wndPtr->text, textlen, &rtext,
 			 DT_SINGLELINE | DT_VCENTER );
 	    textlen = 0; /* skip DrawText() below */
         }
@@ -462,17 +462,17 @@ static void CB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
     {
 	/* again, this is what CTL3D expects */
 
-        SetRectEmpty32(&rbox);
+        SetRectEmpty(&rbox);
         if( textlen )
-            DrawText32A( hDC, wndPtr->text, textlen, &rbox,
+            DrawTextA( hDC, wndPtr->text, textlen, &rbox,
 			 DT_SINGLELINE | DT_CALCRECT );
         textlen = rbox.bottom - rbox.top;
         delta = ((rtext.bottom - rtext.top) - textlen)/2;
         rbox.bottom = (rbox.top = rtext.top + delta - 1) + textlen + 2;
         textlen = rbox.right - rbox.left;
         rbox.right = (rbox.left += --rtext.left) + textlen + 2;
-        IntersectRect32(&rbox, &rbox, &rtext);
-        DrawFocusRect32( hDC, &rbox );
+        IntersectRect(&rbox, &rbox, &rtext);
+        DrawFocusRect( hDC, &rbox );
     }
 }
 
@@ -484,18 +484,18 @@ static void CB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
  */
 static void BUTTON_CheckAutoRadioButton( WND *wndPtr )
 {
-    HWND32 parent, sibling, start;
+    HWND parent, sibling, start;
     if (!(wndPtr->dwStyle & WS_CHILD)) return;
     parent = wndPtr->parent->hwndSelf;
     /* assure that starting control is not disabled or invisible */
-    start = sibling = GetNextDlgGroupItem32( parent, wndPtr->hwndSelf, TRUE );
+    start = sibling = GetNextDlgGroupItem( parent, wndPtr->hwndSelf, TRUE );
     do
     {
         if (!sibling) break;
         if ((wndPtr->hwndSelf != sibling) &&
             ((WIN_FindWndPtr(sibling)->dwStyle & 0x0f) == BS_AUTORADIOBUTTON))
-            SendMessage32A( sibling, BM_SETCHECK32, BUTTON_UNCHECKED, 0 );
-        sibling = GetNextDlgGroupItem32( parent, sibling, FALSE );
+            SendMessageA( sibling, BM_SETCHECK, BUTTON_UNCHECKED, 0 );
+        sibling = GetNextDlgGroupItem( parent, sibling, FALSE );
     } while (sibling != start);
 }
 
@@ -504,43 +504,43 @@ static void BUTTON_CheckAutoRadioButton( WND *wndPtr )
  *       Group Box Functions
  */
 
-static void GB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
+static void GB_Paint( WND *wndPtr, HDC hDC, WORD action )
 {
-    RECT32 rc, rcFrame;
+    RECT rc, rcFrame;
     BUTTONINFO *infoPtr = (BUTTONINFO *)wndPtr->wExtra;
 
     if (action != ODA_DRAWENTIRE) return;
 
     BUTTON_SEND_CTLCOLOR( wndPtr, hDC );
 
-    GetClientRect32( wndPtr->hwndSelf, &rc);
+    GetClientRect( wndPtr->hwndSelf, &rc);
     if (TWEAK_WineLook == WIN31_LOOK) {
-        HPEN32 hPrevPen = SelectObject32( hDC,
-					  GetSysColorPen32(COLOR_WINDOWFRAME));
-	HBRUSH32 hPrevBrush = SelectObject32( hDC,
-					      GetStockObject32(NULL_BRUSH) );
-
-	Rectangle32( hDC, rc.left, rc.top + 2, rc.right - 1, rc.bottom - 1 );
-	SelectObject32( hDC, hPrevBrush );
-	SelectObject32( hDC, hPrevPen );
+        HPEN hPrevPen = SelectObject( hDC,
+					  GetSysColorPen(COLOR_WINDOWFRAME));
+	HBRUSH hPrevBrush = SelectObject( hDC,
+					      GetStockObject(NULL_BRUSH) );
+
+	Rectangle( hDC, rc.left, rc.top + 2, rc.right - 1, rc.bottom - 1 );
+	SelectObject( hDC, hPrevBrush );
+	SelectObject( hDC, hPrevPen );
     } else {
-	TEXTMETRIC32A tm;
+	TEXTMETRICA tm;
 	rcFrame = rc;
 
 	if (infoPtr->hFont)
-	    SelectObject32 (hDC, infoPtr->hFont);
-	GetTextMetrics32A (hDC, &tm);
+	    SelectObject (hDC, infoPtr->hFont);
+	GetTextMetricsA (hDC, &tm);
 	rcFrame.top += (tm.tmHeight / 2) - 1;
-	DrawEdge32 (hDC, &rcFrame, EDGE_ETCHED, BF_RECT);
+	DrawEdge (hDC, &rcFrame, EDGE_ETCHED, BF_RECT);
     }
 
     if (wndPtr->text)
     {
-	if (infoPtr->hFont) SelectObject32( hDC, infoPtr->hFont );
+	if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
         if (wndPtr->dwStyle & WS_DISABLED)
-            SetTextColor32( hDC, GetSysColor32(COLOR_GRAYTEXT) );
+            SetTextColor( hDC, GetSysColor(COLOR_GRAYTEXT) );
         rc.left += 10;
-        DrawText32A( hDC, wndPtr->text, -1, &rc, DT_SINGLELINE | DT_NOCLIP );
+        DrawTextA( hDC, wndPtr->text, -1, &rc, DT_SINGLELINE | DT_NOCLIP );
     }
 }
 
@@ -549,23 +549,23 @@ static void GB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
  *       User Button Functions
  */
 
-static void UB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
+static void UB_Paint( WND *wndPtr, HDC hDC, WORD action )
 {
-    RECT32 rc;
-    HBRUSH32 hBrush;
+    RECT rc;
+    HBRUSH hBrush;
     BUTTONINFO *infoPtr = (BUTTONINFO *)wndPtr->wExtra;
 
     if (action == ODA_SELECT) return;
 
-    GetClientRect32( wndPtr->hwndSelf, &rc);
+    GetClientRect( wndPtr->hwndSelf, &rc);
 
-    if (infoPtr->hFont) SelectObject32( hDC, infoPtr->hFont );
-    hBrush = GetControlBrush( wndPtr->hwndSelf, hDC, CTLCOLOR_BTN );
+    if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
+    hBrush = GetControlBrush16( wndPtr->hwndSelf, hDC, CTLCOLOR_BTN );
 
-    FillRect32( hDC, &rc, hBrush );
+    FillRect( hDC, &rc, hBrush );
     if ((action == ODA_FOCUS) ||
         ((action == ODA_DRAWENTIRE) && (infoPtr->state & BUTTON_HASFOCUS)))
-        DrawFocusRect32( hDC, &rc );
+        DrawFocusRect( hDC, &rc );
 }
 
 
@@ -573,10 +573,10 @@ static void UB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
  *       Ownerdrawn Button Functions
  */
 
-static void OB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
+static void OB_Paint( WND *wndPtr, HDC hDC, WORD action )
 {
     BUTTONINFO *infoPtr = (BUTTONINFO *)wndPtr->wExtra;
-    DRAWITEMSTRUCT32 dis;
+    DRAWITEMSTRUCT dis;
 
     dis.CtlType    = ODT_BUTTON;
     dis.CtlID      = wndPtr->wIDmenu;
@@ -588,7 +588,7 @@ static void OB_Paint( WND *wndPtr, HDC32 hDC, WORD action )
     dis.hwndItem   = wndPtr->hwndSelf;
     dis.hDC        = hDC;
     dis.itemData   = 0;
-    GetClientRect32( wndPtr->hwndSelf, &dis.rcItem );
-    SendMessage32A( GetParent32(wndPtr->hwndSelf), WM_DRAWITEM,
+    GetClientRect( wndPtr->hwndSelf, &dis.rcItem );
+    SendMessageA( GetParent(wndPtr->hwndSelf), WM_DRAWITEM,
                     wndPtr->wIDmenu, (LPARAM)&dis );
 }
diff --git a/controls/combo.c b/controls/combo.c
index 915ee47ddc4..5f8e1cd8bef 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -29,47 +29,47 @@
 
 #define CB_GETPTR( wnd )      (*(LPHEADCOMBO*)((wnd)->wExtra))
 #define CB_NOTIFY( lphc, code ) \
-	(SendMessage32A( (lphc)->owner, WM_COMMAND, \
+	(SendMessageA( (lphc)->owner, WM_COMMAND, \
 			 MAKEWPARAM((lphc)->self->wIDmenu, (code)), (lphc)->self->hwndSelf))
 #define CB_GETEDITTEXTLENGTH( lphc ) \
-	(SendMessage32A( (lphc)->hWndEdit, WM_GETTEXTLENGTH, 0, 0 ))
+	(SendMessageA( (lphc)->hWndEdit, WM_GETTEXTLENGTH, 0, 0 ))
 
-static HBITMAP32 	hComboBmp = 0;
-static UINT32		CBitHeight, CBitWidth;
-static UINT32		CBitOffset = 8;
+static HBITMAP 	hComboBmp = 0;
+static UINT		CBitHeight, CBitWidth;
+static UINT		CBitOffset = 8;
 
 /***********************************************************************
  *           COMBO_Init
  *
  * Load combo button bitmap.
  */
-static BOOL32 COMBO_Init()
+static BOOL COMBO_Init()
 {
-  HDC32		hDC;
+  HDC		hDC;
   
   if( hComboBmp ) return TRUE;
-  if( (hDC = CreateCompatibleDC32(0)) )
+  if( (hDC = CreateCompatibleDC(0)) )
   {
-    BOOL32	bRet = FALSE;
-    if( (hComboBmp = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_COMBO))) )
+    BOOL	bRet = FALSE;
+    if( (hComboBmp = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_COMBO))) )
     {
-      BITMAP32      bm;
-      HBITMAP32     hPrevB;
-      RECT32        r;
+      BITMAP      bm;
+      HBITMAP     hPrevB;
+      RECT        r;
 
-      GetObject32A( hComboBmp, sizeof(bm), &bm );
+      GetObjectA( hComboBmp, sizeof(bm), &bm );
       CBitHeight = bm.bmHeight;
       CBitWidth  = bm.bmWidth;
 
       TRACE(combo, "combo bitmap [%i,%i]\n", CBitWidth, CBitHeight );
 
       hPrevB = SelectObject16( hDC, hComboBmp);
-      SetRect32( &r, 0, 0, CBitWidth, CBitHeight );
-      InvertRect32( hDC, &r );
-      SelectObject32( hDC, hPrevB );
+      SetRect( &r, 0, 0, CBitWidth, CBitHeight );
+      InvertRect( hDC, &r );
+      SelectObject( hDC, hPrevB );
       bRet = TRUE;
     }
-    DeleteDC32( hDC );
+    DeleteDC( hDC );
     return bRet;
   }
   return FALSE;
@@ -85,7 +85,7 @@ static LRESULT COMBO_NCCreate(WND* wnd, LPARAM lParam)
    if ( wnd && COMBO_Init() &&
       (lphc = HeapAlloc(GetProcessHeap(), 0, sizeof(HEADCOMBO))) )
    {
-	LPCREATESTRUCT32A     lpcs = (CREATESTRUCT32A*)lParam;
+	LPCREATESTRUCTA     lpcs = (CREATESTRUCTA*)lParam;
        
 	memset( lphc, 0, sizeof(HEADCOMBO) );
        *(LPHEADCOMBO*)wnd->wExtra = lphc;
@@ -101,9 +101,9 @@ static LRESULT COMBO_NCCreate(WND* wnd, LPARAM lParam)
 	      lphc->wState |= CBF_NOTIFY;
 
 	TRACE(combo, "[0x%08x], style = %08x\n", 
-		     (UINT32)lphc, lphc->dwStyle );
+		     (UINT)lphc, lphc->dwStyle );
 
-	return (LRESULT)(UINT32)wnd->hwndSelf; 
+	return (LRESULT)(UINT)wnd->hwndSelf; 
     }
     return (LRESULT)FALSE;
 }
@@ -121,7 +121,7 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc )
        TRACE(combo,"[%04x]: freeing storage\n", CB_HWND(lphc));
 
        if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) 
-   	   DestroyWindow32( lphc->hWndLBox );
+   	   DestroyWindow( lphc->hWndLBox );
 
        HeapFree( GetProcessHeap(), 0, lphc );
        wnd->wExtra[0] = 0;
@@ -132,23 +132,23 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc )
 /***********************************************************************
  *           CBGetDefaultTextHeight
  */
-static void CBGetDefaultTextHeight( LPHEADCOMBO lphc, LPSIZE32 lpSize )
+static void CBGetDefaultTextHeight( LPHEADCOMBO lphc, LPSIZE lpSize )
 {
    if( lphc->editHeight ) /* explicitly set height */
        lpSize->cy = lphc->editHeight;
    else
    {
-       HDC32    hDC = GetDC32( lphc->self->hwndSelf );
-       HFONT32  hPrevFont = 0;
+       HDC    hDC = GetDC( lphc->self->hwndSelf );
+       HFONT  hPrevFont = 0;
 
-       if( lphc->hFont ) hPrevFont = SelectObject32( hDC, lphc->hFont );
+       if( lphc->hFont ) hPrevFont = SelectObject( hDC, lphc->hFont );
 
        GetTextExtentPoint32A( hDC, "0", 1, lpSize);
 
        lpSize->cy += lpSize->cy / 4 + 4 * SYSMETRICS_CYBORDER;
 
-       if( hPrevFont ) SelectObject32( hDC, hPrevFont );
-       ReleaseDC32( lphc->self->hwndSelf, hDC );
+       if( hPrevFont ) SelectObject( hDC, hPrevFont );
+       ReleaseDC( lphc->self->hwndSelf, hDC );
    }
    lpSize->cx = lphc->RectCombo.right - lphc->RectCombo.left;
 }
@@ -159,21 +159,21 @@ static void CBGetDefaultTextHeight( LPHEADCOMBO lphc, LPSIZE32 lpSize )
  *
  * Set up component coordinates given valid lphc->RectCombo.
  */
-static void CBCalcPlacement( LPHEADCOMBO lphc, LPRECT32 lprEdit, 
-			     LPRECT32 lprButton, LPRECT32 lprLB )
+static void CBCalcPlacement( LPHEADCOMBO lphc, LPRECT lprEdit, 
+			     LPRECT lprButton, LPRECT lprLB )
 {
-   RECT32	rect = lphc->RectCombo;
-   SIZE32	size;
+   RECT	rect = lphc->RectCombo;
+   SIZE	size;
 
    /* get combo height and width */
 
    if( CB_OWNERDRAWN(lphc) )
    {
-       UINT32	u = lphc->RectEdit.bottom - lphc->RectEdit.top;
+       UINT	u = lphc->RectEdit.bottom - lphc->RectEdit.top;
 
        if( lphc->wState & CBF_MEASUREITEM ) /* first initialization */
        {
-	   MEASUREITEMSTRUCT32        mi32;
+	   MEASUREITEMSTRUCT        mi32;
 
 	   /* calculate defaults before sending WM_MEASUREITEM */
 
@@ -187,8 +187,8 @@ static void CBCalcPlacement( LPHEADCOMBO lphc, LPRECT32 lprEdit,
 	   mi32.itemWidth  = size.cx;
 	   mi32.itemHeight = size.cy - 6; /* ownerdrawn cb is taller */
 	   mi32.itemData   = 0;
-	   SendMessage32A(lphc->owner, WM_MEASUREITEM, 
-				(WPARAM32)mi32.CtlID, (LPARAM)&mi32);
+	   SendMessageA(lphc->owner, WM_MEASUREITEM, 
+				(WPARAM)mi32.CtlID, (LPARAM)&mi32);
 	   u = 6 + (UINT16)mi32.itemHeight;
        }
        else
@@ -205,7 +205,7 @@ static void CBCalcPlacement( LPHEADCOMBO lphc, LPRECT32 lprEdit,
        lprButton->left = lprButton->right = lprButton->bottom = 0;
    else
    {
-       INT32	i = size.cx - CBitWidth - 10;	/* seems ok */
+       INT	i = size.cx - CBitWidth - 10;	/* seems ok */
 
        lprButton->right = size.cx;
        lprButton->left = (INT16)i;
@@ -250,7 +250,7 @@ static void CBCalcPlacement( LPHEADCOMBO lphc, LPRECT32 lprEdit,
 /***********************************************************************
  *           CBGetDroppedControlRect32
  */
-static void CBGetDroppedControlRect32( LPHEADCOMBO lphc, LPRECT32 lpRect)
+static void CBGetDroppedControlRect( LPHEADCOMBO lphc, LPRECT lpRect)
 {
    lpRect->left = lphc->RectCombo.left +
                       (lphc->wState & CBF_EDIT) ? CBitOffset : 0;
@@ -268,7 +268,7 @@ static LRESULT COMBO_Create( LPHEADCOMBO lphc, WND* wnd, LPARAM lParam)
   static char clbName[] = "ComboLBox";
   static char editName[] = "Edit";
 
-  LPCREATESTRUCT32A  lpcs = (CREATESTRUCT32A*)lParam;
+  LPCREATESTRUCTA  lpcs = (CREATESTRUCTA*)lParam;
   
   if( !CB_GETTYPE(lphc) ) lphc->dwStyle |= CBS_SIMPLE;
   else if( CB_GETTYPE(lphc) != CBS_DROPDOWNLIST ) lphc->wState |= CBF_EDIT;
@@ -280,10 +280,10 @@ static LRESULT COMBO_Create( LPHEADCOMBO lphc, WND* wnd, LPARAM lParam)
 
   if( lphc->owner || !(lpcs->style & WS_VISIBLE) )
   {
-      UINT32	lbeStyle;
-      RECT32	editRect, btnRect, lbRect;
+      UINT	lbeStyle;
+      RECT	editRect, btnRect, lbRect;
 
-      GetWindowRect32( wnd->hwndSelf, &lphc->RectCombo );
+      GetWindowRect( wnd->hwndSelf, &lphc->RectCombo );
 
       lphc->wState |= CBF_MEASUREITEM;
       CBCalcPlacement( lphc, &editRect, &btnRect, &lbRect );
@@ -309,24 +309,24 @@ static LRESULT COMBO_Create( LPHEADCOMBO lphc, WND* wnd, LPARAM lParam)
       else					/* popup listbox */
       {
 	lbeStyle |= WS_POPUP;
-	OffsetRect32( &lbRect, lphc->RectCombo.left, lphc->RectCombo.top );
+	OffsetRect( &lbRect, lphc->RectCombo.left, lphc->RectCombo.top );
       }
 
      /* Dropdown ComboLBox is not a child window and we cannot pass 
       * ID_CB_LISTBOX directly because it will be treated as a menu handle.
       */
 
-      lphc->hWndLBox = CreateWindowEx32A( 0, clbName, NULL, lbeStyle, 
+      lphc->hWndLBox = CreateWindowExA( 0, clbName, NULL, lbeStyle, 
 		        lbRect.left + SYSMETRICS_CXBORDER, 
 		        lbRect.top + SYSMETRICS_CYBORDER, 
 			lbRect.right - lbRect.left - 2 * SYSMETRICS_CXBORDER, 
 			lbRect.bottom - lbRect.top - 2 * SYSMETRICS_CYBORDER, 
 			lphc->self->hwndSelf, 
-		       (lphc->dwStyle & CBS_DROPDOWN)? (HMENU32)0 : (HMENU32)ID_CB_LISTBOX,
+		       (lphc->dwStyle & CBS_DROPDOWN)? (HMENU)0 : (HMENU)ID_CB_LISTBOX,
 			lphc->self->hInstance, (LPVOID)lphc );
       if( lphc->hWndLBox )
       {
-	  BOOL32	bEdit = TRUE;
+	  BOOL	bEdit = TRUE;
 	  lbeStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | ES_NOHIDESEL | ES_LEFT;
 	  if( lphc->wState & CBF_EDIT ) 
 	  {
@@ -338,10 +338,10 @@ static LRESULT COMBO_Create( LPHEADCOMBO lphc, WND* wnd, LPARAM lParam)
 		  lbeStyle |= ES_LOWERCASE;
 	      else if( lphc->dwStyle & CBS_UPPERCASE )
 		  lbeStyle |= ES_UPPERCASE;
-	      lphc->hWndEdit = CreateWindowEx32A( 0, editName, NULL, lbeStyle,
+	      lphc->hWndEdit = CreateWindowExA( 0, editName, NULL, lbeStyle,
 		  	editRect.left, editRect.top, editRect.right - editRect.left,
 			editRect.bottom - editRect.top, lphc->self->hwndSelf, 
-			(HMENU32)ID_CB_EDIT, lphc->self->hInstance, NULL );
+			(HMENU)ID_CB_EDIT, lphc->self->hInstance, NULL );
 	      if( !lphc->hWndEdit ) bEdit = FALSE;
 	  } 
 
@@ -351,7 +351,7 @@ static LRESULT COMBO_Create( LPHEADCOMBO lphc, WND* wnd, LPARAM lParam)
 	      if( CB_GETTYPE(lphc) != CBS_SIMPLE )
 	      {
 		lphc->wState |= CBF_NORESIZE;
-		SetWindowPos32( wnd->hwndSelf, 0, 0, 0, 
+		SetWindowPos( wnd->hwndSelf, 0, 0, 0, 
 				lphc->RectCombo.right - lphc->RectCombo.left,
 				lphc->RectEdit.bottom - lphc->RectEdit.top,
 				SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE );
@@ -374,48 +374,48 @@ static LRESULT COMBO_Create( LPHEADCOMBO lphc, WND* wnd, LPARAM lParam)
  *
  * Paint combo button (normal, pressed, and disabled states).
  */
-static void CBPaintButton(LPHEADCOMBO lphc, HDC32 hdc)
+static void CBPaintButton(LPHEADCOMBO lphc, HDC hdc)
 {
-    RECT32 	r;
-    UINT32 	x, y;
-    BOOL32 	bBool;
-    HDC32       hMemDC;
-    HBRUSH32    hPrevBrush;
+    RECT 	r;
+    UINT 	x, y;
+    BOOL 	bBool;
+    HDC       hMemDC;
+    HBRUSH    hPrevBrush;
     COLORREF    oldTextColor, oldBkColor;
 
     if( lphc->wState & CBF_NOREDRAW ) return;
 
-    hPrevBrush = SelectObject32(hdc, GetSysColorBrush32(COLOR_BTNFACE));
+    hPrevBrush = SelectObject(hdc, GetSysColorBrush(COLOR_BTNFACE));
     CONV_RECT16TO32( &lphc->RectButton, &r );
 
-    Rectangle32(hdc, r.left, r.top, r.right, r.bottom );
+    Rectangle(hdc, r.left, r.top, r.right, r.bottom );
     if( (bBool = lphc->wState & CBF_BUTTONDOWN) )
     {
-	DrawEdge32( hdc, &r, EDGE_SUNKEN, BF_RECT );
-	OffsetRect32( &r, 1, 1 );
+	DrawEdge( hdc, &r, EDGE_SUNKEN, BF_RECT );
+	OffsetRect( &r, 1, 1 );
     } else {
         r.top++, r.left++;
-	DrawEdge32( hdc, &r, EDGE_RAISED, BF_RECT );
+	DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT );
 	r.top--, r.left--;
     }
 
-    InflateRect32( &r, -1, -1 );	
+    InflateRect( &r, -1, -1 );	
 
     x = (r.left + r.right - CBitWidth) >> 1;
     y = (r.top + r.bottom - CBitHeight) >> 1;
 
-    InflateRect32( &r, -3, -3 );
+    InflateRect( &r, -3, -3 );
 
-    hMemDC = CreateCompatibleDC32( hdc );
-    SelectObject32( hMemDC, hComboBmp );
-    oldTextColor = SetTextColor32( hdc, GetSysColor32(COLOR_BTNFACE) );
-    oldBkColor = SetBkColor32( hdc, CB_DISABLED(lphc) ? RGB(128,128,128) :
+    hMemDC = CreateCompatibleDC( hdc );
+    SelectObject( hMemDC, hComboBmp );
+    oldTextColor = SetTextColor( hdc, GetSysColor(COLOR_BTNFACE) );
+    oldBkColor = SetBkColor( hdc, CB_DISABLED(lphc) ? RGB(128,128,128) :
 			       RGB(0,0,0) );
-    BitBlt32( hdc, x, y, 8, 8, hMemDC, 0, 0, SRCCOPY );
-    SetBkColor32( hdc, oldBkColor );
-    SetTextColor32( hdc, oldTextColor );
-    DeleteDC32( hMemDC );
-    SelectObject32( hdc, hPrevBrush );
+    BitBlt( hdc, x, y, 8, 8, hMemDC, 0, 0, SRCCOPY );
+    SetBkColor( hdc, oldBkColor );
+    SetTextColor( hdc, oldTextColor );
+    DeleteDC( hMemDC );
+    SelectObject( hdc, hPrevBrush );
 }
 
 /***********************************************************************
@@ -423,9 +423,9 @@ static void CBPaintButton(LPHEADCOMBO lphc, HDC32 hdc)
  *
  * Paint CBS_DROPDOWNLIST text field / update edit control contents.
  */
-static void CBPaintText(LPHEADCOMBO lphc, HDC32 hdc)
+static void CBPaintText(LPHEADCOMBO lphc, HDC hdc)
 {
-   INT32	id, size = 0;
+   INT	id, size = 0;
    LPSTR	pText = NULL;
 
    if( lphc->wState & CBF_NOREDRAW ) return;
@@ -433,64 +433,64 @@ static void CBPaintText(LPHEADCOMBO lphc, HDC32 hdc)
    /* follow Windows combobox that sends a bunch of text 
     * inquiries to its listbox while processing WM_PAINT. */
 
-   if( (id = SendMessage32A(lphc->hWndLBox, LB_GETCURSEL32, 0, 0) ) != LB_ERR )
+   if( (id = SendMessageA(lphc->hWndLBox, LB_GETCURSEL, 0, 0) ) != LB_ERR )
    {
-        size = SendMessage32A( lphc->hWndLBox, LB_GETTEXTLEN32, id, 0);
+        size = SendMessageA( lphc->hWndLBox, LB_GETTEXTLEN, id, 0);
         if( (pText = HeapAlloc( GetProcessHeap(), 0, size + 1)) )
 	{
-	    SendMessage32A( lphc->hWndLBox, LB_GETTEXT32, (WPARAM32)id, (LPARAM)pText );
+	    SendMessageA( lphc->hWndLBox, LB_GETTEXT, (WPARAM)id, (LPARAM)pText );
 	    pText[size] = '\0';	/* just in case */
 	} else return;
    }
 
    if( lphc->wState & CBF_EDIT )
    {
-	if( CB_HASSTRINGS(lphc) ) SetWindowText32A( lphc->hWndEdit, pText ? pText : "" );
+	if( CB_HASSTRINGS(lphc) ) SetWindowTextA( lphc->hWndEdit, pText ? pText : "" );
 	if( lphc->wState & CBF_FOCUSED ) 
-	    SendMessage32A( lphc->hWndEdit, EM_SETSEL32, 0, (LPARAM)(-1));
+	    SendMessageA( lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));
    }
    else /* paint text field ourselves */
    {
-        HBRUSH32 hPrevBrush = 0;
-	HDC32	 hDC = hdc;
+        HBRUSH hPrevBrush = 0;
+	HDC	 hDC = hdc;
 
 	if( !hDC ) 
 	{
-	    if ((hDC = GetDC32(lphc->self->hwndSelf)))
+	    if ((hDC = GetDC(lphc->self->hwndSelf)))
             {
-                HBRUSH32 hBrush = SendMessage32A( lphc->owner,
+                HBRUSH hBrush = SendMessageA( lphc->owner,
                                                   WM_CTLCOLORLISTBOX, 
                                                   hDC, lphc->self->hwndSelf );
-                hPrevBrush = SelectObject32( hDC, 
-                           (hBrush) ? hBrush : GetStockObject32(WHITE_BRUSH) );
+                hPrevBrush = SelectObject( hDC, 
+                           (hBrush) ? hBrush : GetStockObject(WHITE_BRUSH) );
             }
 	}
 	if( hDC )
 	{
-	    RECT32	rect;
-	    UINT32	itemState;
-	    HFONT32	hPrevFont = (lphc->hFont) ? SelectObject32(hDC, lphc->hFont) : 0;
+	    RECT	rect;
+	    UINT	itemState;
+	    HFONT	hPrevFont = (lphc->hFont) ? SelectObject(hDC, lphc->hFont) : 0;
 
-	    PatBlt32( hDC, (rect.left = lphc->RectEdit.left + SYSMETRICS_CXBORDER),
+	    PatBlt( hDC, (rect.left = lphc->RectEdit.left + SYSMETRICS_CXBORDER),
 			   (rect.top = lphc->RectEdit.top + SYSMETRICS_CYBORDER),
 			   (rect.right = lphc->RectEdit.right - SYSMETRICS_CXBORDER),
 			   (rect.bottom = lphc->RectEdit.bottom - SYSMETRICS_CYBORDER) - 1, PATCOPY );
-	    InflateRect32( &rect, -1, -1 );
+	    InflateRect( &rect, -1, -1 );
 
 	    if( lphc->wState & CBF_FOCUSED && 
 	        !(lphc->wState & CBF_DROPPED) )
 	    {
 		/* highlight */
 
-		FillRect32( hDC, &rect, GetSysColorBrush32(COLOR_HIGHLIGHT) );
-                SetBkColor32( hDC, GetSysColor32( COLOR_HIGHLIGHT ) );
-                SetTextColor32( hDC, GetSysColor32( COLOR_HIGHLIGHTTEXT ) );
+		FillRect( hDC, &rect, GetSysColorBrush(COLOR_HIGHLIGHT) );
+                SetBkColor( hDC, GetSysColor( COLOR_HIGHLIGHT ) );
+                SetTextColor( hDC, GetSysColor( COLOR_HIGHLIGHTTEXT ) );
 		itemState = ODS_SELECTED | ODS_FOCUS;
 	    } else itemState = 0;
 
 	    if( CB_OWNERDRAWN(lphc) )
 	    {
-		DRAWITEMSTRUCT32 dis;
+		DRAWITEMSTRUCT dis;
 
 		if( lphc->self->dwStyle & WS_DISABLED ) itemState |= ODS_DISABLED;
 
@@ -502,25 +502,25 @@ static void CBPaintText(LPHEADCOMBO lphc, HDC32 hdc)
 		dis.itemState	= itemState;
 		dis.hDC		= hDC;
 		dis.rcItem	= rect;
-		dis.itemData	= SendMessage32A( lphc->hWndLBox, LB_GETITEMDATA32, 
-						  		  (WPARAM32)id, 0 );
-		SendMessage32A( lphc->owner, WM_DRAWITEM, 
+		dis.itemData	= SendMessageA( lphc->hWndLBox, LB_GETITEMDATA, 
+						  		  (WPARAM)id, 0 );
+		SendMessageA( lphc->owner, WM_DRAWITEM, 
 				lphc->self->wIDmenu, (LPARAM)&dis );
 	    }
 	    else
 	    {
-		ExtTextOut32A( hDC, rect.left + 1, rect.top + 1,
+		ExtTextOutA( hDC, rect.left + 1, rect.top + 1,
                                ETO_OPAQUE | ETO_CLIPPED, &rect,
                                pText ? pText : "" , size, NULL );
 		if(lphc->wState & CBF_FOCUSED && !(lphc->wState & CBF_DROPPED))
-		    DrawFocusRect32( hDC, &rect );
+		    DrawFocusRect( hDC, &rect );
 	    }
 
-	    if( hPrevFont ) SelectObject32(hDC, hPrevFont );
+	    if( hPrevFont ) SelectObject(hDC, hPrevFont );
 	    if( !hdc ) 
 	    {
-		if( hPrevBrush ) SelectObject32( hDC, hPrevBrush );
-		ReleaseDC32( lphc->self->hwndSelf, hDC );
+		if( hPrevBrush ) SelectObject( hDC, hPrevBrush );
+		ReleaseDC( lphc->self->hwndSelf, hDC );
 	    }
 	}
    }
@@ -531,27 +531,27 @@ static void CBPaintText(LPHEADCOMBO lphc, HDC32 hdc)
 /***********************************************************************
  *           COMBO_Paint
  */
-static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC32 hParamDC)
+static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC)
 {
-  PAINTSTRUCT32 ps;
-  HDC32 	hDC;
+  PAINTSTRUCT ps;
+  HDC 	hDC;
   
   hDC = (hParamDC) ? hParamDC
-		   : BeginPaint32( lphc->self->hwndSelf, &ps);
+		   : BeginPaint( lphc->self->hwndSelf, &ps);
   if( hDC && !(lphc->wState & CBF_NOREDRAW) )
   {
-      HBRUSH32	hPrevBrush, hBkgBrush;
+      HBRUSH	hPrevBrush, hBkgBrush;
 
-      hBkgBrush = SendMessage32A( lphc->owner, WM_CTLCOLORLISTBOX,
+      hBkgBrush = SendMessageA( lphc->owner, WM_CTLCOLORLISTBOX,
 				  hDC, lphc->self->hwndSelf );
-      if( !hBkgBrush ) hBkgBrush = GetStockObject32(WHITE_BRUSH);
+      if( !hBkgBrush ) hBkgBrush = GetStockObject(WHITE_BRUSH);
 
-      hPrevBrush = SelectObject32( hDC, hBkgBrush );
-      if( !IsRectEmpty32(&lphc->RectButton) )
+      hPrevBrush = SelectObject( hDC, hBkgBrush );
+      if( !IsRectEmpty(&lphc->RectButton) )
       {
 	  /* paint everything to the right of the text field */
 
-	  PatBlt32( hDC, lphc->RectEdit.right, lphc->RectEdit.top,
+	  PatBlt( hDC, lphc->RectEdit.right, lphc->RectEdit.top,
 			 lphc->RectButton.right - lphc->RectEdit.right,
 			 lphc->RectEdit.bottom - lphc->RectEdit.top, PATCOPY );
           CBPaintButton( lphc, hDC );
@@ -561,17 +561,17 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC32 hParamDC)
       {
 	  /* paint text field */
 	  
-	  HPEN32 hPrevPen = SelectObject32( hDC, GetSysColorPen32(
+	  HPEN hPrevPen = SelectObject( hDC, GetSysColorPen(
 							  COLOR_WINDOWFRAME) );
 
-	  Rectangle32( hDC, lphc->RectEdit.left, lphc->RectEdit.top,
+	  Rectangle( hDC, lphc->RectEdit.left, lphc->RectEdit.top,
 		       lphc->RectEdit.right, lphc->RectButton.bottom );
-	  SelectObject32( hDC, hPrevPen );
+	  SelectObject( hDC, hPrevPen );
 	  CBPaintText( lphc, hDC );
       }
-      if( hPrevBrush ) SelectObject32( hDC, hPrevBrush );
+      if( hPrevBrush ) SelectObject( hDC, hPrevBrush );
   }
-  if( !hParamDC ) EndPaint32(lphc->self->hwndSelf, &ps);
+  if( !hParamDC ) EndPaint(lphc->self->hwndSelf, &ps);
   return 0;
 }
 
@@ -580,9 +580,9 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC32 hParamDC)
  *
  * Select listbox entry according to the contents of the edit control.
  */
-static INT32 CBUpdateLBox( LPHEADCOMBO lphc )
+static INT CBUpdateLBox( LPHEADCOMBO lphc )
 {
-   INT32	length, idx, ret;
+   INT	length, idx, ret;
    LPSTR	pText = NULL;
    
    idx = ret = LB_ERR;
@@ -595,10 +595,10 @@ static INT32 CBUpdateLBox( LPHEADCOMBO lphc )
 
    if( pText )
    {
-       if( length ) GetWindowText32A( lphc->hWndEdit, pText, length + 1);
+       if( length ) GetWindowTextA( lphc->hWndEdit, pText, length + 1);
        else pText[0] = '\0';
-       idx = SendMessage32A( lphc->hWndLBox, LB_FINDSTRING32, 
-			     (WPARAM32)(-1), (LPARAM)pText );
+       idx = SendMessageA( lphc->hWndLBox, LB_FINDSTRING, 
+			     (WPARAM)(-1), (LPARAM)pText );
        if( idx == LB_ERR ) idx = 0;	/* select first item */
        else ret = idx;
        HeapFree( GetProcessHeap(), 0, pText );
@@ -606,13 +606,13 @@ static INT32 CBUpdateLBox( LPHEADCOMBO lphc )
 
    /* select entry */
 
-   SendMessage32A( lphc->hWndLBox, LB_SETCURSEL32, (WPARAM32)idx, 0 );
+   SendMessageA( lphc->hWndLBox, LB_SETCURSEL, (WPARAM)idx, 0 );
    
    if( idx >= 0 )
    {
-       SendMessage32A( lphc->hWndLBox, LB_SETTOPINDEX32, (WPARAM32)idx, 0 );
+       SendMessageA( lphc->hWndLBox, LB_SETTOPINDEX, (WPARAM)idx, 0 );
        /* probably superfluous but Windows sends this too */
-       SendMessage32A( lphc->hWndLBox, LB_SETCARETINDEX32, (WPARAM32)idx, 0 );
+       SendMessageA( lphc->hWndLBox, LB_SETCARETINDEX, (WPARAM)idx, 0 );
    }
    return ret;
 }
@@ -622,9 +622,9 @@ static INT32 CBUpdateLBox( LPHEADCOMBO lphc )
  *
  * Copy a listbox entry to the edit control.
  */
-static void CBUpdateEdit( LPHEADCOMBO lphc , INT32 index )
+static void CBUpdateEdit( LPHEADCOMBO lphc , INT index )
 {
-   INT32	length;
+   INT	length;
    LPSTR	pText = NULL;
 
    TRACE(combo,"\t %i\n", index );
@@ -636,9 +636,9 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT32 index )
        {
            if( (pText = (LPSTR) HeapAlloc( GetProcessHeap(), 0, length + 1)) )
            {
- 	   	GetWindowText32A( lphc->hWndEdit, pText, length + 1 );
-	   	index = SendMessage32A( lphc->hWndLBox, LB_FINDSTRING32,
-				        (WPARAM32)(-1), (LPARAM)pText );
+ 	   	GetWindowTextA( lphc->hWndEdit, pText, length + 1 );
+	   	index = SendMessageA( lphc->hWndLBox, LB_FINDSTRING,
+				        (WPARAM)(-1), (LPARAM)pText );
 	   	HeapFree( GetProcessHeap(), 0, pText );
            }
        }
@@ -646,15 +646,15 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT32 index )
 
    if( index >= 0 ) /* got an entry */
    {
-       length = SendMessage32A( lphc->hWndLBox, LB_GETTEXTLEN32, (WPARAM32)index, 0);
+       length = SendMessageA( lphc->hWndLBox, LB_GETTEXTLEN, (WPARAM)index, 0);
        if( length )
        {
 	   if( (pText = (LPSTR) HeapAlloc( GetProcessHeap(), 0, length + 1)) )
 	   {
-		SendMessage32A( lphc->hWndLBox, LB_GETTEXT32, 
-				(WPARAM32)index, (LPARAM)pText );
-		SendMessage32A( lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)pText );
-		SendMessage32A( lphc->hWndEdit, EM_SETSEL32, 0, (LPARAM)(-1) );
+		SendMessageA( lphc->hWndLBox, LB_GETTEXT, 
+				(WPARAM)index, (LPARAM)pText );
+		SendMessageA( lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)pText );
+		SendMessageA( lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1) );
 		HeapFree( GetProcessHeap(), 0, pText );
 	   }
        }
@@ -668,9 +668,9 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT32 index )
  */
 static void CBDropDown( LPHEADCOMBO lphc )
 {
-   INT32	index;
-   RECT32	rect;
-   LPRECT32	pRect = NULL;
+   INT	index;
+   RECT	rect;
+   LPRECT	pRect = NULL;
 
    TRACE(combo,"[%04x]: drop down\n", CB_HWND(lphc));
 
@@ -686,16 +686,16 @@ static void CBDropDown( LPHEADCOMBO lphc )
    }
    else
    {
-       index = SendMessage32A( lphc->hWndLBox, LB_GETCURSEL32, 0, 0 );
+       index = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
        if( index == LB_ERR ) index = 0;
-       SendMessage32A( lphc->hWndLBox, LB_SETTOPINDEX32, (WPARAM32)index, 0 );
-       SendMessage32A( lphc->hWndLBox, LB_CARETON32, 0, 0 );
+       SendMessageA( lphc->hWndLBox, LB_SETTOPINDEX, (WPARAM)index, 0 );
+       SendMessageA( lphc->hWndLBox, LB_CARETON, 0, 0 );
        pRect = &lphc->RectEdit;
    }
 
    /* now set popup position */
 
-   GetWindowRect32( lphc->self->hwndSelf, &rect );
+   GetWindowRect( lphc->self->hwndSelf, &rect );
    
    rect.top += lphc->RectEdit.bottom - lphc->RectEdit.top - SYSMETRICS_CYBORDER;
    rect.bottom = rect.top + lphc->RectCombo.bottom - 
@@ -703,15 +703,15 @@ static void CBDropDown( LPHEADCOMBO lphc )
    rect.right = rect.left + lphc->RectCombo.right - lphc->RectCombo.left;
    rect.left += ( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST ) ? 0 : CBitOffset;
 
-   SetWindowPos32( lphc->hWndLBox, HWND_TOP, rect.left, rect.top, 
+   SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.top, 
 		 rect.right - rect.left, rect.bottom - rect.top, 
 		 SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOREDRAW);
 
    if( !(lphc->wState & CBF_NOREDRAW) )
        if( pRect )
-           RedrawWindow32( lphc->self->hwndSelf, pRect, 0, RDW_INVALIDATE | 
+           RedrawWindow( lphc->self->hwndSelf, pRect, 0, RDW_INVALIDATE | 
 			   RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN );
-   ShowWindow32( lphc->hWndLBox, SW_SHOWNA );
+   ShowWindow( lphc->hWndLBox, SW_SHOWNA );
 }
 
 /***********************************************************************
@@ -719,37 +719,37 @@ static void CBDropDown( LPHEADCOMBO lphc )
  *
  * Hide listbox popup.
  */
-static void CBRollUp( LPHEADCOMBO lphc, BOOL32 ok, BOOL32 bButton )
+static void CBRollUp( LPHEADCOMBO lphc, BOOL ok, BOOL bButton )
 {
-   HWND32	hWnd = lphc->self->hwndSelf;
+   HWND	hWnd = lphc->self->hwndSelf;
 
    CB_NOTIFY( lphc, (ok) ? CBN_SELENDOK : CBN_SELENDCANCEL );
 
-   if( IsWindow32( hWnd ) && CB_GETTYPE(lphc) != CBS_SIMPLE )
+   if( IsWindow( hWnd ) && CB_GETTYPE(lphc) != CBS_SIMPLE )
    {
 
-       TRACE(combo,"[%04x]: roll up [%i]\n", CB_HWND(lphc), (INT32)ok );
+       TRACE(combo,"[%04x]: roll up [%i]\n", CB_HWND(lphc), (INT)ok );
 
        /* always send WM_LBUTTONUP? */
-       SendMessage32A( lphc->hWndLBox, WM_LBUTTONUP, 0, (LPARAM)(-1) );
+       SendMessageA( lphc->hWndLBox, WM_LBUTTONUP, 0, (LPARAM)(-1) );
 
        if( lphc->wState & CBF_DROPPED ) 
        {
-	   RECT32	rect;
+	   RECT	rect;
 
 	   lphc->wState &= ~CBF_DROPPED;
-	   ShowWindow32( lphc->hWndLBox, SW_HIDE );
+	   ShowWindow( lphc->hWndLBox, SW_HIDE );
 
 	   if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
 	   {
-	       INT32 index = SendMessage32A( lphc->hWndLBox, LB_GETCURSEL32, 0, 0 );
+	       INT index = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
 	       CBUpdateEdit( lphc, index );
 	       rect = lphc->RectButton;
 	   }
 	   else 
            {
 	       if( bButton )
-	           UnionRect32( &rect, &lphc->RectButton,
+	           UnionRect( &rect, &lphc->RectButton,
 				       &lphc->RectEdit );
 	       else
 		   rect = lphc->RectEdit;
@@ -757,7 +757,7 @@ static void CBRollUp( LPHEADCOMBO lphc, BOOL32 ok, BOOL32 bButton )
 	   }
 
 	   if( bButton && !(lphc->wState & CBF_NOREDRAW) )
-	       RedrawWindow32( hWnd, &rect, 0, RDW_INVALIDATE | 
+	       RedrawWindow( hWnd, &rect, 0, RDW_INVALIDATE | 
 			       RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN );
 	   CB_NOTIFY( lphc, CBN_CLOSEUP );
        }
@@ -769,7 +769,7 @@ static void CBRollUp( LPHEADCOMBO lphc, BOOL32 ok, BOOL32 bButton )
  *
  * Used by the ComboLBox to show/hide itself in response to VK_F4, etc...
  */
-BOOL32 COMBO_FlipListbox( LPHEADCOMBO lphc, BOOL32 bRedrawButton )
+BOOL COMBO_FlipListbox( LPHEADCOMBO lphc, BOOL bRedrawButton )
 {
    if( lphc->wState & CBF_DROPPED )
    {
@@ -786,7 +786,7 @@ BOOL32 COMBO_FlipListbox( LPHEADCOMBO lphc, BOOL32 bRedrawButton )
  *
  * Edit control helper.
  */
-HWND32 COMBO_GetLBWindow( WND* pWnd )
+HWND COMBO_GetLBWindow( WND* pWnd )
 {
   LPHEADCOMBO       lphc = CB_GETPTR(pWnd);
   if( lphc ) return lphc->hWndLBox;
@@ -799,12 +799,12 @@ HWND32 COMBO_GetLBWindow( WND* pWnd )
  */
 static void CBRepaintButton( LPHEADCOMBO lphc )
 {
-   HDC32        hDC = GetDC32( lphc->self->hwndSelf );
+   HDC        hDC = GetDC( lphc->self->hwndSelf );
 
    if( hDC )
    {
        CBPaintButton( lphc, hDC );
-       ReleaseDC32( lphc->self->hwndSelf, hDC );
+       ReleaseDC( lphc->self->hwndSelf, hDC );
    }
 }
 
@@ -816,10 +816,10 @@ static void COMBO_SetFocus( LPHEADCOMBO lphc )
    if( !(lphc->wState & CBF_FOCUSED) )
    {
        if( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST )
-           SendMessage32A( lphc->hWndLBox, LB_CARETON32, 0, 0 );
+           SendMessageA( lphc->hWndLBox, LB_CARETON, 0, 0 );
 
        if( lphc->wState & CBF_EDIT )
-           SendMessage32A( lphc->hWndEdit, EM_SETSEL32, 0, (LPARAM)(-1) );
+           SendMessageA( lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1) );
        lphc->wState |= CBF_FOCUSED;
        if( !(lphc->wState & CBF_EDIT) ) CBPaintText( lphc, 0 );
 
@@ -832,23 +832,23 @@ static void COMBO_SetFocus( LPHEADCOMBO lphc )
  */
 static void COMBO_KillFocus( LPHEADCOMBO lphc )
 {
-   HWND32	hWnd = lphc->self->hwndSelf;
+   HWND	hWnd = lphc->self->hwndSelf;
 
    if( lphc->wState & CBF_FOCUSED )
    {
-       SendMessage32A( hWnd, WM_LBUTTONUP, 0, (LPARAM)(-1) );
+       SendMessageA( hWnd, WM_LBUTTONUP, 0, (LPARAM)(-1) );
 
        CBRollUp( lphc, FALSE, TRUE );
-       if( IsWindow32( hWnd ) )
+       if( IsWindow( hWnd ) )
        {
            if( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST )
-               SendMessage32A( lphc->hWndLBox, LB_CARETOFF32, 0, 0 );
+               SendMessageA( lphc->hWndLBox, LB_CARETOFF, 0, 0 );
 
  	   lphc->wState &= ~CBF_FOCUSED;
 
            /* redraw text */
            if( lphc->wState & CBF_EDIT )
-               SendMessage32A( lphc->hWndEdit, EM_SETSEL32, (WPARAM32)(-1), 0 );
+               SendMessageA( lphc->hWndEdit, EM_SETSEL, (WPARAM)(-1), 0 );
            else CBPaintText( lphc, 0 );
 
            CB_NOTIFY( lphc, CBN_KILLFOCUS );
@@ -859,7 +859,7 @@ static void COMBO_KillFocus( LPHEADCOMBO lphc )
 /***********************************************************************
  *           COMBO_Command
  */
-static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM32 wParam, HWND32 hWnd )
+static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
 {
    if( lphc->wState & CBF_EDIT && lphc->hWndEdit == hWnd )
    {
@@ -947,14 +947,14 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM32 wParam, HWND32 hWnd )
  *
  * Fixup an ownerdrawn item operation and pass it up to the combobox owner.
  */
-static LRESULT COMBO_ItemOp32( LPHEADCOMBO lphc, UINT32 msg, 
-			       WPARAM32 wParam, LPARAM lParam ) 
+static LRESULT COMBO_ItemOp( LPHEADCOMBO lphc, UINT msg, 
+			       WPARAM wParam, LPARAM lParam ) 
 {
-   HWND32	hWnd = lphc->self->hwndSelf;
+   HWND	hWnd = lphc->self->hwndSelf;
 
    TRACE(combo,"[%04x]: ownerdraw op %04x\n", CB_HWND(lphc), msg );
 
-#define lpIS    ((LPDELETEITEMSTRUCT32)lParam)
+#define lpIS    ((LPDELETEITEMSTRUCT)lParam)
 
    /* two first items are the same in all 4 structs */
    lpIS->CtlType = ODT_COMBOBOX;
@@ -967,39 +967,39 @@ static LRESULT COMBO_ItemOp32( LPHEADCOMBO lphc, UINT32 msg,
 #undef  lpIS
 	     break;
 	case WM_DRAWITEM: 
-#define lpIS    ((LPDRAWITEMSTRUCT32)lParam)
+#define lpIS    ((LPDRAWITEMSTRUCT)lParam)
 	     lpIS->hwndItem = hWnd; 
 #undef  lpIS
 	     break;
 	case WM_COMPAREITEM: 
-#define lpIS    ((LPCOMPAREITEMSTRUCT32)lParam)
+#define lpIS    ((LPCOMPAREITEMSTRUCT)lParam)
 	     lpIS->hwndItem = hWnd; 
 #undef  lpIS
 	     break;
    }
 
-   return SendMessage32A( lphc->owner, msg, lphc->self->wIDmenu, lParam );
+   return SendMessageA( lphc->owner, msg, lphc->self->wIDmenu, lParam );
 }
 
 /***********************************************************************
  *           COMBO_GetText
  */
-static LRESULT COMBO_GetText( LPHEADCOMBO lphc, UINT32 N, LPSTR lpText)
+static LRESULT COMBO_GetText( LPHEADCOMBO lphc, UINT N, LPSTR lpText)
 {
    if( lphc->wState & CBF_EDIT )
-       return SendMessage32A( lphc->hWndEdit, WM_GETTEXT, 
-			     (WPARAM32)N, (LPARAM)lpText );     
+       return SendMessageA( lphc->hWndEdit, WM_GETTEXT, 
+			     (WPARAM)N, (LPARAM)lpText );     
 
    /* get it from the listbox */
 
    if( lphc->hWndLBox )
    {
-       INT32 idx = SendMessage32A( lphc->hWndLBox, LB_GETCURSEL32, 0, 0 );
+       INT idx = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
        if( idx != LB_ERR )
        {
            LPSTR	lpBuffer;
-           INT32	length = SendMessage32A( lphc->hWndLBox, LB_GETTEXTLEN32,
-					        (WPARAM32)idx, 0 );
+           INT	length = SendMessageA( lphc->hWndLBox, LB_GETTEXTLEN,
+					        (WPARAM)idx, 0 );
 
            /* 'length' is without the terminating character */
            if( length >= N )
@@ -1009,8 +1009,8 @@ static LRESULT COMBO_GetText( LPHEADCOMBO lphc, UINT32 N, LPSTR lpText)
 
            if( lpBuffer )
            {
-	       INT32    n = SendMessage32A( lphc->hWndLBox, LB_GETTEXT32, 
-					   (WPARAM32)idx, (LPARAM)lpBuffer );
+	       INT    n = SendMessageA( lphc->hWndLBox, LB_GETTEXT, 
+					   (WPARAM)idx, (LPARAM)lpBuffer );
 
 	       /* truncate if buffer is too short */
 
@@ -1036,25 +1036,25 @@ static LRESULT COMBO_GetText( LPHEADCOMBO lphc, UINT32 N, LPSTR lpText)
  * This function sets window positions according to the updated 
  * component placement struct.
  */
-static void CBResetPos( LPHEADCOMBO lphc, LPRECT32 lbRect, BOOL32 bRedraw )
+static void CBResetPos( LPHEADCOMBO lphc, LPRECT lbRect, BOOL bRedraw )
 {
-   BOOL32	bDrop = (CB_GETTYPE(lphc) != CBS_SIMPLE);
+   BOOL	bDrop = (CB_GETTYPE(lphc) != CBS_SIMPLE);
 
    /* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of
     * sizing messages */
 
    if( lphc->wState & CBF_EDIT )
-       SetWindowPos32( lphc->hWndEdit, 0, lphc->RectEdit.left, lphc->RectEdit.top,
+       SetWindowPos( lphc->hWndEdit, 0, lphc->RectEdit.left, lphc->RectEdit.top,
                        lphc->RectEdit.right - lphc->RectEdit.left,
                        lphc->RectEdit.bottom - lphc->RectEdit.top,
                        SWP_NOZORDER | SWP_NOACTIVATE | ((bDrop) ? SWP_NOREDRAW : 0) );
 
    if( bDrop )
-       OffsetRect32( lbRect, lphc->RectCombo.left, lphc->RectCombo.top );
+       OffsetRect( lbRect, lphc->RectCombo.left, lphc->RectCombo.top );
 
    lbRect->right -= lbRect->left;	/* convert to width */
    lbRect->bottom -= lbRect->top;
-   SetWindowPos32( lphc->hWndLBox, 0, lbRect->left, lbRect->top,
+   SetWindowPos( lphc->hWndLBox, 0, lbRect->left, lbRect->top,
                    lbRect->right, lbRect->bottom, 
 		   SWP_NOACTIVATE | SWP_NOZORDER | ((bDrop) ? SWP_NOREDRAW : 0) );
 
@@ -1063,18 +1063,18 @@ static void CBResetPos( LPHEADCOMBO lphc, LPRECT32 lbRect, BOOL32 bRedraw )
        if( lphc->wState & CBF_DROPPED )
        {
            lphc->wState &= ~CBF_DROPPED;
-           ShowWindow32( lphc->hWndLBox, SW_HIDE );
+           ShowWindow( lphc->hWndLBox, SW_HIDE );
        }
 
        lphc->wState |= CBF_NORESIZE;
-       SetWindowPos32( lphc->self->hwndSelf, 0, 0, 0,
+       SetWindowPos( lphc->self->hwndSelf, 0, 0, 0,
                        lphc->RectCombo.right - lphc->RectCombo.left,
                        lphc->RectEdit.bottom - lphc->RectEdit.top,
                        SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW );
        lphc->wState &= ~CBF_NORESIZE;
 
        if( bRedraw && !(lphc->wState & CBF_NOREDRAW) )
-           RedrawWindow32( lphc->self->hwndSelf, NULL, 0,
+           RedrawWindow( lphc->self->hwndSelf, NULL, 0,
                            RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW );
    }
 }
@@ -1085,10 +1085,10 @@ static void CBResetPos( LPHEADCOMBO lphc, LPRECT32 lbRect, BOOL32 bRedraw )
  */
 static void COMBO_Size( LPHEADCOMBO lphc )
 {
-  RECT32	rect;
-  INT32		w, h;
+  RECT	rect;
+  INT		w, h;
 
-  GetWindowRect32( lphc->self->hwndSelf, &rect );
+  GetWindowRect( lphc->self->hwndSelf, &rect );
   w = rect.right - rect.left; h = rect.bottom - rect.top;
 
   TRACE(combo,"w = %i, h = %i\n", w, h );
@@ -1113,18 +1113,18 @@ static void COMBO_Size( LPHEADCOMBO lphc )
 /***********************************************************************
  *           COMBO_Font
  */
-static void COMBO_Font( LPHEADCOMBO lphc, HFONT32 hFont, BOOL32 bRedraw )
+static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw )
 {
-  RECT32        rect;
+  RECT        rect;
 
   lphc->hFont = hFont;
 
   if( lphc->wState & CBF_EDIT )
-      SendMessage32A( lphc->hWndEdit, WM_SETFONT, (WPARAM32)hFont, bRedraw );
-  SendMessage32A( lphc->hWndLBox, WM_SETFONT, (WPARAM32)hFont, bRedraw );
+      SendMessageA( lphc->hWndEdit, WM_SETFONT, (WPARAM)hFont, bRedraw );
+  SendMessageA( lphc->hWndLBox, WM_SETFONT, (WPARAM)hFont, bRedraw );
 
-  GetWindowRect32( lphc->self->hwndSelf, &rect );
-  OffsetRect32( &lphc->RectCombo, rect.left - lphc->RectCombo.left,
+  GetWindowRect( lphc->self->hwndSelf, &rect );
+  OffsetRect( &lphc->RectCombo, rect.left - lphc->RectCombo.left,
                                   rect.top - lphc->RectCombo.top );
   CBCalcPlacement( lphc, &lphc->RectEdit,
                          &lphc->RectButton, &rect );
@@ -1135,7 +1135,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT32 hFont, BOOL32 bRedraw )
 /***********************************************************************
  *           COMBO_SetItemHeight
  */
-static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT32 index, INT32 height )
+static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height )
 {
    LRESULT	lRet = CB_ERR;
 
@@ -1143,11 +1143,11 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT32 index, INT32 height
    {
        if( height < 32768 )
        {
-           RECT32	rect;
+           RECT	rect;
 
            lphc->editHeight = height;
-           GetWindowRect32( lphc->self->hwndSelf, &rect );
-           OffsetRect32( &lphc->RectCombo, rect.left - lphc->RectCombo.left,
+           GetWindowRect( lphc->self->hwndSelf, &rect );
+           OffsetRect( &lphc->RectCombo, rect.left - lphc->RectCombo.left,
 				           rect.top - lphc->RectCombo.top );
            CBCalcPlacement( lphc, &lphc->RectEdit,
 			          &lphc->RectButton, &rect );
@@ -1156,18 +1156,18 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT32 index, INT32 height
        }
    } 
    else if ( CB_OWNERDRAWN(lphc) )	/* set listbox item height */
-	lRet = SendMessage32A( lphc->hWndLBox, LB_SETITEMHEIGHT32, 
-			      (WPARAM32)index, (LPARAM)height );
+	lRet = SendMessageA( lphc->hWndLBox, LB_SETITEMHEIGHT, 
+			      (WPARAM)index, (LPARAM)height );
    return lRet;
 }
 
 /***********************************************************************
  *           COMBO_SelectString
  */
-static LRESULT COMBO_SelectString( LPHEADCOMBO lphc, INT32 start, LPCSTR pText )
+static LRESULT COMBO_SelectString( LPHEADCOMBO lphc, INT start, LPCSTR pText )
 {
-   INT32 index = SendMessage32A( lphc->hWndLBox, LB_SELECTSTRING32, 
-				 (WPARAM32)start, (LPARAM)pText );
+   INT index = SendMessageA( lphc->hWndLBox, LB_SELECTSTRING, 
+				 (WPARAM)start, (LPARAM)pText );
    if( index >= 0 )
    {
         if( lphc->wState & CBF_EDIT )
@@ -1183,9 +1183,9 @@ static LRESULT COMBO_SelectString( LPHEADCOMBO lphc, INT32 start, LPCSTR pText )
  */
 static void COMBO_LButtonDown( LPHEADCOMBO lphc, LPARAM lParam )
 {
-   POINT32     pt = { LOWORD(lParam), HIWORD(lParam) };
-   BOOL32      bButton = PtInRect32(&lphc->RectButton, pt);
-   HWND32      hWnd = lphc->self->hwndSelf;
+   POINT     pt = { LOWORD(lParam), HIWORD(lParam) };
+   BOOL      bButton = PtInRect(&lphc->RectButton, pt);
+   HWND      hWnd = lphc->self->hwndSelf;
 
    if( (CB_GETTYPE(lphc) == CBS_DROPDOWNLIST) ||
        (bButton && (CB_GETTYPE(lphc) == CBS_DROPDOWN)) )
@@ -1196,7 +1196,7 @@ static void COMBO_LButtonDown( LPHEADCOMBO lphc, LPARAM lParam )
 	   /* got a click to cancel selection */
 
            CBRollUp( lphc, TRUE, FALSE );
-	   if( !IsWindow32( hWnd ) ) return;
+	   if( !IsWindow( hWnd ) ) return;
 
            if( lphc->wState & CBF_CAPTURE )
            {
@@ -1211,7 +1211,7 @@ static void COMBO_LButtonDown( LPHEADCOMBO lphc, LPARAM lParam )
 
            lphc->wState |= CBF_CAPTURE;
            CBDropDown( lphc );
-           SetCapture32( hWnd );
+           SetCapture( hWnd );
        }
        if( bButton ) CBRepaintButton( lphc );
    }
@@ -1229,7 +1229,7 @@ static void COMBO_LButtonUp( LPHEADCOMBO lphc, LPARAM lParam )
        lphc->wState &= ~CBF_CAPTURE;
        if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
        {
-	   INT32 index = CBUpdateLBox( lphc );
+	   INT index = CBUpdateLBox( lphc );
 	   CBUpdateEdit( lphc, index );
        }
        ReleaseCapture();
@@ -1248,14 +1248,14 @@ static void COMBO_LButtonUp( LPHEADCOMBO lphc, LPARAM lParam )
  * Two things to do - track combo button and release capture when
  * pointer goes into the listbox.
  */
-static void COMBO_MouseMove( LPHEADCOMBO lphc, WPARAM32 wParam, LPARAM lParam )
+static void COMBO_MouseMove( LPHEADCOMBO lphc, WPARAM wParam, LPARAM lParam )
 {
-   POINT32  pt = { LOWORD(lParam), HIWORD(lParam) };
-   RECT32   lbRect;
+   POINT  pt = { LOWORD(lParam), HIWORD(lParam) };
+   RECT   lbRect;
 
    if( lphc->wState & CBF_BUTTONDOWN )
    {
-       BOOL32	bButton = PtInRect32(&lphc->RectButton, pt);
+       BOOL	bButton = PtInRect(&lphc->RectButton, pt);
 
        if( !bButton )
        {
@@ -1264,16 +1264,16 @@ static void COMBO_MouseMove( LPHEADCOMBO lphc, WPARAM32 wParam, LPARAM lParam )
        }
    }
 
-   GetClientRect32( lphc->hWndLBox, &lbRect );
-   MapWindowPoints32( lphc->self->hwndSelf, lphc->hWndLBox, &pt, 1 );
-   if( PtInRect32(&lbRect, pt) )
+   GetClientRect( lphc->hWndLBox, &lbRect );
+   MapWindowPoints( lphc->self->hwndSelf, lphc->hWndLBox, &pt, 1 );
+   if( PtInRect(&lbRect, pt) )
    {
        lphc->wState &= ~CBF_CAPTURE;
        ReleaseCapture();
        if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) CBUpdateLBox( lphc );
 
        /* hand over pointer tracking */
-       SendMessage32A( lphc->hWndLBox, WM_LBUTTONDOWN, wParam, lParam );
+       SendMessageA( lphc->hWndLBox, WM_LBUTTONDOWN, wParam, lParam );
    }
 }
 
@@ -1283,8 +1283,8 @@ static void COMBO_MouseMove( LPHEADCOMBO lphc, WPARAM32 wParam, LPARAM lParam )
  *
  * http://www.microsoft.com/msdn/sdk/platforms/doc/sdk/win32/ctrl/src/combobox_15.htm
  */
-LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
-                             WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI ComboWndProc( HWND hwnd, UINT message,
+                             WPARAM wParam, LPARAM lParam )
 {
     WND*	pWnd = WIN_FindWndPtr(hwnd);
    
@@ -1327,7 +1327,7 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
 		return TRUE;
 
 	case WM_SETFONT:
-		COMBO_Font( lphc, (HFONT16)wParam, (BOOL32)lParam );
+		COMBO_Font( lphc, (HFONT16)wParam, (BOOL)lParam );
 		return TRUE;
 
 	case WM_GETFONT:
@@ -1335,7 +1335,7 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
 
 	case WM_SETFOCUS:
 		if( lphc->wState & CBF_EDIT )
-		    SetFocus32( lphc->hWndEdit );
+		    SetFocus( lphc->hWndEdit );
 		else
 		    COMBO_SetFocus( lphc );
 		return TRUE;
@@ -1349,10 +1349,10 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
 		return TRUE;
 
 	case WM_COMMAND:
-		return COMBO_Command( lphc, wParam, (HWND32)lParam );
+		return COMBO_Command( lphc, wParam, (HWND)lParam );
 
 	case WM_GETTEXT:
-		return COMBO_GetText( lphc, (UINT32)wParam, (LPSTR)lParam );
+		return COMBO_GetText( lphc, (UINT)wParam, (LPSTR)lParam );
 
 	case WM_SETTEXT:
 	case WM_GETTEXTLENGTH:
@@ -1361,19 +1361,19 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
         case WM_PASTE:
 	case WM_COPY:
 		if( lphc->wState & CBF_EDIT )
-		    return SendMessage32A( lphc->hWndEdit, message, wParam, lParam );
+		    return SendMessageA( lphc->hWndEdit, message, wParam, lParam );
 		return CB_ERR;
 
 	case WM_DRAWITEM:
 	case WM_DELETEITEM:
 	case WM_COMPAREITEM:
 	case WM_MEASUREITEM:
-		return COMBO_ItemOp32( lphc, message, wParam, lParam );
+		return COMBO_ItemOp( lphc, message, wParam, lParam );
 
 	case WM_ENABLE:
 		if( lphc->wState & CBF_EDIT )
-		    EnableWindow32( lphc->hWndEdit, (BOOL32)wParam ); 
-		EnableWindow32( lphc->hWndLBox, (BOOL32)wParam );
+		    EnableWindow( lphc->hWndEdit, (BOOL)wParam ); 
+		EnableWindow( lphc->hWndLBox, (BOOL)wParam );
 		return TRUE;
 
 	case WM_SETREDRAW:
@@ -1383,8 +1383,8 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
 		    lphc->wState |= CBF_NOREDRAW;
 
 		if( lphc->wState & CBF_EDIT )
-		    SendMessage32A( lphc->hWndEdit, message, wParam, lParam );
-		SendMessage32A( lphc->hWndLBox, message, wParam, lParam );
+		    SendMessageA( lphc->hWndEdit, message, wParam, lParam );
+		SendMessageA( lphc->hWndLBox, message, wParam, lParam );
 		return 0;
 		
 	case WM_SYSKEYDOWN:
@@ -1396,12 +1396,12 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
 	case WM_CHAR:
 	case WM_KEYDOWN:
 		if( lphc->wState & CBF_EDIT )
-		    return SendMessage32A( lphc->hWndEdit, message, wParam, lParam );
+		    return SendMessageA( lphc->hWndEdit, message, wParam, lParam );
 		else
-		    return SendMessage32A( lphc->hWndLBox, message, wParam, lParam );
+		    return SendMessageA( lphc->hWndLBox, message, wParam, lParam );
 
 	case WM_LBUTTONDOWN: 
-		if( !(lphc->wState & CBF_FOCUSED) ) SetFocus32( lphc->self->hwndSelf );
+		if( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self->hwndSelf );
 		if( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam );
 		return TRUE;
 
@@ -1418,110 +1418,110 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
 
 	case CB_ADDSTRING16:
 		if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
-	case CB_ADDSTRING32:
-		return SendMessage32A( lphc->hWndLBox, LB_ADDSTRING32, 0, lParam);
+	case CB_ADDSTRING:
+		return SendMessageA( lphc->hWndLBox, LB_ADDSTRING, 0, lParam);
 
 	case CB_INSERTSTRING16:
-		wParam = (INT32)(INT16)wParam;
+		wParam = (INT)(INT16)wParam;
 		if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
-	case CB_INSERTSTRING32:
-		return SendMessage32A( lphc->hWndLBox, LB_INSERTSTRING32, wParam, lParam);
+	case CB_INSERTSTRING:
+		return SendMessageA( lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam);
 
 	case CB_DELETESTRING16:
-	case CB_DELETESTRING32:
-		return SendMessage32A( lphc->hWndLBox, LB_DELETESTRING32, wParam, 0);
+	case CB_DELETESTRING:
+		return SendMessageA( lphc->hWndLBox, LB_DELETESTRING, wParam, 0);
 
 	case CB_SELECTSTRING16:
-		wParam = (INT32)(INT16)wParam;
+		wParam = (INT)(INT16)wParam;
 		if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
-	case CB_SELECTSTRING32:
-		return COMBO_SelectString( lphc, (INT32)wParam, (LPSTR)lParam );
+	case CB_SELECTSTRING:
+		return COMBO_SelectString( lphc, (INT)wParam, (LPSTR)lParam );
 
 	case CB_FINDSTRING16:
-		wParam = (INT32)(INT16)wParam;
+		wParam = (INT)(INT16)wParam;
 		if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
-	case CB_FINDSTRING32:
-		return SendMessage32A( lphc->hWndLBox, LB_FINDSTRING32, wParam, lParam);
+	case CB_FINDSTRING:
+		return SendMessageA( lphc->hWndLBox, LB_FINDSTRING, wParam, lParam);
 
 	case CB_FINDSTRINGEXACT16:
-		wParam = (INT32)(INT16)wParam;
+		wParam = (INT)(INT16)wParam;
 		if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
-	case CB_FINDSTRINGEXACT32:
-		return SendMessage32A( lphc->hWndLBox, LB_FINDSTRINGEXACT32, 
+	case CB_FINDSTRINGEXACT:
+		return SendMessageA( lphc->hWndLBox, LB_FINDSTRINGEXACT, 
 						       wParam, lParam );
 	case CB_SETITEMHEIGHT16:
-		wParam = (INT32)(INT16)wParam;	/* signed integer */
-	case CB_SETITEMHEIGHT32:
-		return COMBO_SetItemHeight( lphc, (INT32)wParam, (INT32)lParam);
+		wParam = (INT)(INT16)wParam;	/* signed integer */
+	case CB_SETITEMHEIGHT:
+		return COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam);
 
 	case CB_GETITEMHEIGHT16:
-		wParam = (INT32)(INT16)wParam;
-	case CB_GETITEMHEIGHT32:
-		if( (INT32)wParam >= 0 )	/* listbox item */
-		    return SendMessage32A( lphc->hWndLBox, LB_GETITEMHEIGHT32, wParam, 0);
+		wParam = (INT)(INT16)wParam;
+	case CB_GETITEMHEIGHT:
+		if( (INT)wParam >= 0 )	/* listbox item */
+		    return SendMessageA( lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0);
 		return (lphc->RectEdit.bottom - lphc->RectEdit.top);
 
 	case CB_RESETCONTENT16: 
-	case CB_RESETCONTENT32:
-		SendMessage32A( lphc->hWndLBox, LB_RESETCONTENT32, 0, 0 );
+	case CB_RESETCONTENT:
+		SendMessageA( lphc->hWndLBox, LB_RESETCONTENT, 0, 0 );
 		CBPaintText( lphc, 0 );
 		return TRUE;
 
-	case CB_INITSTORAGE32:
-		return SendMessage32A( lphc->hWndLBox, LB_INITSTORAGE32, wParam, lParam);
+	case CB_INITSTORAGE:
+		return SendMessageA( lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam);
 
-	case CB_GETHORIZONTALEXTENT32:
-		return SendMessage32A( lphc->hWndLBox, LB_GETHORIZONTALEXTENT32, 0, 0);
+	case CB_GETHORIZONTALEXTENT:
+		return SendMessageA( lphc->hWndLBox, LB_GETHORIZONTALEXTENT, 0, 0);
 
-	case CB_SETHORIZONTALEXTENT32:
-		return SendMessage32A( lphc->hWndLBox, LB_SETHORIZONTALEXTENT32, wParam, 0);
+	case CB_SETHORIZONTALEXTENT:
+		return SendMessageA( lphc->hWndLBox, LB_SETHORIZONTALEXTENT, wParam, 0);
 
-	case CB_GETTOPINDEX32:
-		return SendMessage32A( lphc->hWndLBox, LB_GETTOPINDEX32, 0, 0);
+	case CB_GETTOPINDEX:
+		return SendMessageA( lphc->hWndLBox, LB_GETTOPINDEX, 0, 0);
 
-	case CB_GETLOCALE32:
-		return SendMessage32A( lphc->hWndLBox, LB_GETLOCALE32, 0, 0);
+	case CB_GETLOCALE:
+		return SendMessageA( lphc->hWndLBox, LB_GETLOCALE, 0, 0);
 
-	case CB_SETLOCALE32:
-		return SendMessage32A( lphc->hWndLBox, LB_SETLOCALE32, wParam, 0);
+	case CB_SETLOCALE:
+		return SendMessageA( lphc->hWndLBox, LB_SETLOCALE, wParam, 0);
 
-	case CB_GETDROPPEDWIDTH32:
+	case CB_GETDROPPEDWIDTH:
 		if( lphc->droppedWidth )
 		    return lphc->droppedWidth;
 		return lphc->RectCombo.right - lphc->RectCombo.left - 
 		           (lphc->wState & CBF_EDIT) ? CBitOffset : 0;
 
-	case CB_SETDROPPEDWIDTH32:
+	case CB_SETDROPPEDWIDTH:
 		if( (CB_GETTYPE(lphc) != CBS_SIMPLE) &&
-		    (INT32)wParam < 32768 ) lphc->droppedWidth = (INT32)wParam;
+		    (INT)wParam < 32768 ) lphc->droppedWidth = (INT)wParam;
 		return CB_ERR;
 
 	case CB_GETDROPPEDCONTROLRECT16:
 		lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
 		if( lParam ) 
 		{
-		    RECT32	r;
-		    CBGetDroppedControlRect32( lphc, &r );
+		    RECT	r;
+		    CBGetDroppedControlRect( lphc, &r );
 		    CONV_RECT32TO16( &r, (LPRECT16)lParam );
 		}
 		return CB_OKAY;
 
-	case CB_GETDROPPEDCONTROLRECT32:
-		if( lParam ) CBGetDroppedControlRect32(lphc, (LPRECT32)lParam );
+	case CB_GETDROPPEDCONTROLRECT:
+		if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam );
 		return CB_OKAY;
 
 	case CB_GETDROPPEDSTATE16:
-	case CB_GETDROPPEDSTATE32:
+	case CB_GETDROPPEDSTATE:
 		return (lphc->wState & CBF_DROPPED) ? TRUE : FALSE;
 
 	case CB_DIR16: 
                 lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
                 /* fall through */
-	case CB_DIR32:
-		return COMBO_Directory( lphc, (UINT32)wParam, 
-				       (LPSTR)lParam, (message == CB_DIR32));
+	case CB_DIR:
+		return COMBO_Directory( lphc, (UINT)wParam, 
+				       (LPSTR)lParam, (message == CB_DIR));
 	case CB_SHOWDROPDOWN16:
-	case CB_SHOWDROPDOWN32:
+	case CB_SHOWDROPDOWN:
 		if( CB_GETTYPE(lphc) != CBS_SIMPLE )
 		{
 		    if( wParam )
@@ -1536,17 +1536,17 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
 		return TRUE;
 
 	case CB_GETCOUNT16: 
-	case CB_GETCOUNT32:
-		return SendMessage32A( lphc->hWndLBox, LB_GETCOUNT32, 0, 0);
+	case CB_GETCOUNT:
+		return SendMessageA( lphc->hWndLBox, LB_GETCOUNT, 0, 0);
 
 	case CB_GETCURSEL16: 
-	case CB_GETCURSEL32:
-		return SendMessage32A( lphc->hWndLBox, LB_GETCURSEL32, 0, 0);
+	case CB_GETCURSEL:
+		return SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0);
 
 	case CB_SETCURSEL16:
-		wParam = (INT32)(INT16)wParam;
-	case CB_SETCURSEL32:
-		lParam = SendMessage32A( lphc->hWndLBox, LB_SETCURSEL32, wParam, 0);
+		wParam = (INT)(INT16)wParam;
+	case CB_SETCURSEL:
+		lParam = SendMessageA( lphc->hWndLBox, LB_SETCURSEL, wParam, 0);
 		if( lphc->wState & CBF_SELCHANGE )
 		{
 		    /* no LBN_SELCHANGE in this case, update manually */
@@ -1557,48 +1557,48 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
 	        return lParam;
 
 	case CB_GETLBTEXT16: 
-		wParam = (INT32)(INT16)wParam;
+		wParam = (INT)(INT16)wParam;
 		lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
-	case CB_GETLBTEXT32:
-		return SendMessage32A( lphc->hWndLBox, LB_GETTEXT32, wParam, lParam);
+	case CB_GETLBTEXT:
+		return SendMessageA( lphc->hWndLBox, LB_GETTEXT, wParam, lParam);
 
 	case CB_GETLBTEXTLEN16: 
-		wParam = (INT32)(INT16)wParam;
-	case CB_GETLBTEXTLEN32:
-		return SendMessage32A( lphc->hWndLBox, LB_GETTEXTLEN32, wParam, 0);
+		wParam = (INT)(INT16)wParam;
+	case CB_GETLBTEXTLEN:
+		return SendMessageA( lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0);
 
 	case CB_GETITEMDATA16:
-		wParam = (INT32)(INT16)wParam;
-	case CB_GETITEMDATA32:
-		return SendMessage32A( lphc->hWndLBox, LB_GETITEMDATA32, wParam, 0);
+		wParam = (INT)(INT16)wParam;
+	case CB_GETITEMDATA:
+		return SendMessageA( lphc->hWndLBox, LB_GETITEMDATA, wParam, 0);
 
 	case CB_SETITEMDATA16:
-		wParam = (INT32)(INT16)wParam;
-	case CB_SETITEMDATA32:
-		return SendMessage32A( lphc->hWndLBox, LB_SETITEMDATA32, wParam, lParam);
+		wParam = (INT)(INT16)wParam;
+	case CB_SETITEMDATA:
+		return SendMessageA( lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam);
 
 	case CB_GETEDITSEL16: 
 		wParam = lParam = 0;   /* just in case */
-	case CB_GETEDITSEL32:
+	case CB_GETEDITSEL:
 		if( lphc->wState & CBF_EDIT )
 		{
-		    INT32	a, b;
+		    INT	a, b;
 
-		    return SendMessage32A( lphc->hWndEdit, EM_GETSEL32,
-					   (wParam) ? wParam : (WPARAM32)&a,
+		    return SendMessageA( lphc->hWndEdit, EM_GETSEL,
+					   (wParam) ? wParam : (WPARAM)&a,
 					   (lParam) ? lParam : (LPARAM)&b );
 		}
 		return CB_ERR;
 
 	case CB_SETEDITSEL16: 
-	case CB_SETEDITSEL32:
+	case CB_SETEDITSEL:
 		if( lphc->wState & CBF_EDIT ) 
-		    return SendMessage32A( lphc->hWndEdit, EM_SETSEL32, 
-			  (INT32)(INT16)LOWORD(lParam), (INT32)(INT16)HIWORD(lParam) );
+		    return SendMessageA( lphc->hWndEdit, EM_SETSEL, 
+			  (INT)(INT16)LOWORD(lParam), (INT)(INT16)HIWORD(lParam) );
 		return CB_ERR;
 
 	case CB_SETEXTENDEDUI16:
-	case CB_SETEXTENDEDUI32:
+	case CB_SETEXTENDEDUI:
 		if( CB_GETTYPE(lphc) == CBS_SIMPLE ) return CB_ERR;
 
 		if( wParam )
@@ -1607,13 +1607,13 @@ LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 message,
 		return CB_OKAY;
 
 	case CB_GETEXTENDEDUI16:
-	case CB_GETEXTENDEDUI32:
+	case CB_GETEXTENDEDUI:
 		return (lphc->wState & CBF_EUI) ? TRUE : FALSE;
 
 	case (WM_USER + 0x1B):
 	        WARN(combo, "[%04x]: undocumented msg!\n", hwnd );
     }
-    return DefWindowProc32A(hwnd, message, wParam, lParam);
+    return DefWindowProcA(hwnd, message, wParam, lParam);
   }
   return CB_ERR;
 }
diff --git a/controls/desktop.c b/controls/desktop.c
index 64b8dda9d31..96f5a34882a 100644
--- a/controls/desktop.c
+++ b/controls/desktop.c
@@ -55,39 +55,39 @@ int DESKTOP_GetScreenDepth()
  *
  * Load a bitmap from a file. Used by SetDeskWallPaper().
  */
-static HBITMAP32 DESKTOP_LoadBitmap( HDC32 hdc, const char *filename )
+static HBITMAP DESKTOP_LoadBitmap( HDC hdc, const char *filename )
 {
     BITMAPFILEHEADER *fileHeader;
     BITMAPINFO *bitmapInfo;
-    HBITMAP32 hbitmap;
-    HFILE32 file;
+    HBITMAP hbitmap;
+    HFILE file;
     LPSTR buffer;
     LONG size;
 
     /* Read all the file into memory */
 
-    if ((file = _lopen32( filename, OF_READ )) == HFILE_ERROR32)
+    if ((file = _lopen( filename, OF_READ )) == HFILE_ERROR)
     {
-        UINT32 len = GetWindowsDirectory32A( NULL, 0 );
+        UINT len = GetWindowsDirectoryA( NULL, 0 );
         if (!(buffer = HeapAlloc( GetProcessHeap(), 0,
                                   len + strlen(filename) + 2 )))
             return 0;
-        GetWindowsDirectory32A( buffer, len + 1 );
+        GetWindowsDirectoryA( buffer, len + 1 );
         strcat( buffer, "\\" );
         strcat( buffer, filename );
-        file = _lopen32( buffer, OF_READ );
+        file = _lopen( buffer, OF_READ );
         HeapFree( GetProcessHeap(), 0, buffer );
     }
-    if (file == HFILE_ERROR32) return 0;
-    size = _llseek32( file, 0, 2 );
+    if (file == HFILE_ERROR) return 0;
+    size = _llseek( file, 0, 2 );
     if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size )))
     {
-	_lclose32( file );
+	_lclose( file );
 	return 0;
     }
-    _llseek32( file, 0, 0 );
-    size = _lread32( file, buffer, size );
-    _lclose32( file );
+    _llseek( file, 0, 0 );
+    size = _lread( file, buffer, size );
+    _lclose( file );
     fileHeader = (BITMAPFILEHEADER *)buffer;
     bitmapInfo = (BITMAPINFO *)(buffer + sizeof(BITMAPFILEHEADER));
     
@@ -97,7 +97,7 @@ static HBITMAP32 DESKTOP_LoadBitmap( HDC32 hdc, const char *filename )
 	HeapFree( GetProcessHeap(), 0, buffer );
 	return 0;
     }
-    hbitmap = CreateDIBitmap32( hdc, &bitmapInfo->bmiHeader, CBM_INIT,
+    hbitmap = CreateDIBitmap( hdc, &bitmapInfo->bmiHeader, CBM_INIT,
                                 buffer + fileHeader->bfOffBits,
                                 bitmapInfo, DIB_RGB_COLORS );
     HeapFree( GetProcessHeap(), 0, buffer );
@@ -110,16 +110,16 @@ static HBITMAP32 DESKTOP_LoadBitmap( HDC32 hdc, const char *filename )
  *
  * Handle the WM_ERASEBKGND message.
  */
-static LRESULT DESKTOP_DoEraseBkgnd( HWND32 hwnd, HDC32 hdc,
+static LRESULT DESKTOP_DoEraseBkgnd( HWND hwnd, HDC hdc,
                                      DESKTOP *desktopPtr )
 {
-    RECT32 rect;
+    RECT rect;
     WND*   Wnd = WIN_FindWndPtr( hwnd );
 
-    if (Wnd->hrgnUpdate > 1) DeleteObject32( Wnd->hrgnUpdate );
+    if (Wnd->hrgnUpdate > 1) DeleteObject( Wnd->hrgnUpdate );
     Wnd->hrgnUpdate = 0;
 
-    GetClientRect32( hwnd, &rect );    
+    GetClientRect( hwnd, &rect );    
 
     /* Paint desktop pattern (only if wall paper does not cover everything) */
 
@@ -128,25 +128,25 @@ static LRESULT DESKTOP_DoEraseBkgnd( HWND32 hwnd, HDC32 hdc,
 	 (desktopPtr->bitmapSize.cy < rect.bottom))))
     {
 	  /* Set colors in case pattern is a monochrome bitmap */
-	SetBkColor32( hdc, RGB(0,0,0) );
-	SetTextColor32( hdc, GetSysColor32(COLOR_BACKGROUND) );
-	FillRect32( hdc, &rect, desktopPtr->hbrushPattern );
+	SetBkColor( hdc, RGB(0,0,0) );
+	SetTextColor( hdc, GetSysColor(COLOR_BACKGROUND) );
+	FillRect( hdc, &rect, desktopPtr->hbrushPattern );
     }
 
       /* Paint wall paper */
 
     if (desktopPtr->hbitmapWallPaper)
     {
-	INT32 x, y;
-	HDC32 hMemDC = CreateCompatibleDC32( hdc );
+	INT x, y;
+	HDC hMemDC = CreateCompatibleDC( hdc );
 	
-	SelectObject32( hMemDC, desktopPtr->hbitmapWallPaper );
+	SelectObject( hMemDC, desktopPtr->hbitmapWallPaper );
 
 	if (desktopPtr->fTileWallPaper)
 	{
 	    for (y = 0; y < rect.bottom; y += desktopPtr->bitmapSize.cy)
 		for (x = 0; x < rect.right; x += desktopPtr->bitmapSize.cx)
-		    BitBlt32( hdc, x, y, desktopPtr->bitmapSize.cx,
+		    BitBlt( hdc, x, y, desktopPtr->bitmapSize.cx,
 			      desktopPtr->bitmapSize.cy, hMemDC, 0, 0, SRCCOPY );
 	}
 	else
@@ -155,10 +155,10 @@ static LRESULT DESKTOP_DoEraseBkgnd( HWND32 hwnd, HDC32 hdc,
 	    y = (rect.top + rect.bottom - desktopPtr->bitmapSize.cy) / 2;
 	    if (x < 0) x = 0;
 	    if (y < 0) y = 0;
-	    BitBlt32( hdc, x, y, desktopPtr->bitmapSize.cx,
+	    BitBlt( hdc, x, y, desktopPtr->bitmapSize.cx,
 		      desktopPtr->bitmapSize.cy, hMemDC, 0, 0, SRCCOPY );
 	}
-	DeleteDC32( hMemDC );
+	DeleteDC( hMemDC );
     }
 
     return 1;
@@ -170,8 +170,8 @@ static LRESULT DESKTOP_DoEraseBkgnd( HWND32 hwnd, HDC32 hdc,
  *
  * Window procedure for the desktop window.
  */
-LRESULT WINAPI DesktopWndProc( HWND32 hwnd, UINT32 message,
-                               WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message,
+                               WPARAM wParam, LPARAM lParam )
 {
     WND *wndPtr = WIN_FindWndPtr( hwnd );
     DESKTOP *desktopPtr = (DESKTOP *)wndPtr->wExtra;
@@ -186,14 +186,14 @@ LRESULT WINAPI DesktopWndProc( HWND32 hwnd, UINT32 message,
 	desktopPtr->hbrushPattern = 0;
 	desktopPtr->hbitmapWallPaper = 0;
 	SetDeskPattern();
-	SetDeskWallPaper32( (LPSTR)-1 );
+	SetDeskWallPaper( (LPSTR)-1 );
 	return 1;
 	
     case WM_ERASEBKGND:
 	if (X11DRV_WND_GetXRootWindow(wndPtr) == 
 	    DefaultRootWindow(display))
 	  return 1;
-	return DESKTOP_DoEraseBkgnd( hwnd, (HDC32)wParam, desktopPtr );
+	return DESKTOP_DoEraseBkgnd( hwnd, (HDC)wParam, desktopPtr );
 
     case WM_SYSCOMMAND:
 	if ((wParam & 0xfff0) != SC_CLOSE) return 0;
@@ -210,9 +210,9 @@ LRESULT WINAPI DesktopWndProc( HWND32 hwnd, UINT32 message,
  *           PaintDesktop   (USER32.415)
  *
  */
-BOOL32 WINAPI PaintDesktop(HDC32 hdc)
+BOOL WINAPI PaintDesktop(HDC hdc)
 {
-    HWND32 hwnd = GetDesktopWindow32();
+    HWND hwnd = GetDesktopWindow();
     WND *wndPtr = WIN_FindWndPtr( hwnd );
     DESKTOP *desktopPtr = (DESKTOP *)wndPtr->wExtra;
 
@@ -225,7 +225,7 @@ BOOL32 WINAPI PaintDesktop(HDC32 hdc)
 BOOL16 WINAPI SetDeskPattern(void)
 {
     char buffer[100];
-    GetProfileString32A( "desktop", "Pattern", "(None)", buffer, 100 );
+    GetProfileStringA( "desktop", "Pattern", "(None)", buffer, 100 );
     return DESKTOP_SetPattern( buffer );
 }
 
@@ -235,7 +235,7 @@ BOOL16 WINAPI SetDeskPattern(void)
  */
 BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename )
 {
-    return SetDeskWallPaper32( filename );
+    return SetDeskWallPaper( filename );
 }
 
 
@@ -244,29 +244,29 @@ BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename )
  *
  * FIXME: is there a unicode version?
  */
-BOOL32 WINAPI SetDeskWallPaper32( LPCSTR filename )
+BOOL WINAPI SetDeskWallPaper( LPCSTR filename )
 {
-    HBITMAP32 hbitmap;
-    HDC32 hdc;
+    HBITMAP hbitmap;
+    HDC hdc;
     char buffer[256];
     WND *wndPtr = WIN_GetDesktop();
     DESKTOP *desktopPtr = (DESKTOP *)wndPtr->wExtra;
 
     if (filename == (LPSTR)-1)
     {
-	GetProfileString32A( "desktop", "WallPaper", "(None)", buffer, 256 );
+	GetProfileStringA( "desktop", "WallPaper", "(None)", buffer, 256 );
 	filename = buffer;
     }
-    hdc = GetDC32( 0 );
+    hdc = GetDC( 0 );
     hbitmap = DESKTOP_LoadBitmap( hdc, filename );
-    ReleaseDC32( 0, hdc );
-    if (desktopPtr->hbitmapWallPaper) DeleteObject32( desktopPtr->hbitmapWallPaper );
+    ReleaseDC( 0, hdc );
+    if (desktopPtr->hbitmapWallPaper) DeleteObject( desktopPtr->hbitmapWallPaper );
     desktopPtr->hbitmapWallPaper = hbitmap;
-    desktopPtr->fTileWallPaper = GetProfileInt32A( "desktop", "TileWallPaper", 0 );
+    desktopPtr->fTileWallPaper = GetProfileIntA( "desktop", "TileWallPaper", 0 );
     if (hbitmap)
     {
-	BITMAP32 bmp;
-	GetObject32A( hbitmap, sizeof(bmp), &bmp );
+	BITMAP bmp;
+	GetObjectA( hbitmap, sizeof(bmp), &bmp );
 	desktopPtr->bitmapSize.cx = (bmp.bmWidth != 0) ? bmp.bmWidth : 1;
 	desktopPtr->bitmapSize.cy = (bmp.bmHeight != 0) ? bmp.bmHeight : 1;
     }
@@ -279,28 +279,28 @@ BOOL32 WINAPI SetDeskWallPaper32( LPCSTR filename )
  *
  * Set the desktop pattern.
  */
-BOOL32 DESKTOP_SetPattern( LPCSTR pattern )
+BOOL DESKTOP_SetPattern( LPCSTR pattern )
 {
     WND *wndPtr = WIN_GetDesktop();
     DESKTOP *desktopPtr = (DESKTOP *)wndPtr->wExtra;
     int pat[8];
 
-    if (desktopPtr->hbrushPattern) DeleteObject32( desktopPtr->hbrushPattern );
+    if (desktopPtr->hbrushPattern) DeleteObject( desktopPtr->hbrushPattern );
     memset( pat, 0, sizeof(pat) );
     if (pattern && sscanf( pattern, " %d %d %d %d %d %d %d %d",
 			   &pat[0], &pat[1], &pat[2], &pat[3],
 			   &pat[4], &pat[5], &pat[6], &pat[7] ))
     {
 	WORD pattern[8];
-	HBITMAP32 hbitmap;
+	HBITMAP hbitmap;
 	int i;
 
 	for (i = 0; i < 8; i++) pattern[i] = pat[i] & 0xffff;
-	hbitmap = CreateBitmap32( 8, 8, 1, 1, (LPSTR)pattern );
-	desktopPtr->hbrushPattern = CreatePatternBrush32( hbitmap );
-	DeleteObject32( hbitmap );
+	hbitmap = CreateBitmap( 8, 8, 1, 1, (LPSTR)pattern );
+	desktopPtr->hbrushPattern = CreatePatternBrush( hbitmap );
+	DeleteObject( hbitmap );
     }
-    else desktopPtr->hbrushPattern = CreateSolidBrush32( GetSysColor32(COLOR_BACKGROUND) );
+    else desktopPtr->hbrushPattern = CreateSolidBrush( GetSysColor(COLOR_BACKGROUND) );
     return TRUE;
 }
 
diff --git a/controls/edit.c b/controls/edit.c
index b53dde0a469..125ed0fdb3f 100644
--- a/controls/edit.c
+++ b/controls/edit.c
@@ -53,81 +53,81 @@ typedef enum
 } LINE_END;
 
 typedef struct tagLINEDEF {
-	INT32 length;		/* bruto length of a line in bytes */
-	INT32 net_length;	/* netto length of a line in visible characters */
+	INT length;		/* bruto length of a line in bytes */
+	INT net_length;	/* netto length of a line in visible characters */
 	LINE_END ending;
-	INT32 width;		/* width of the line in pixels */
+	INT width;		/* width of the line in pixels */
 	struct tagLINEDEF *next;
 } LINEDEF;
 
 typedef struct
 {
-	HANDLE32 heap;			/* our own heap */
+	HANDLE heap;			/* our own heap */
 	LPSTR text;			/* the actual contents of the control */
-	INT32 buffer_size;		/* the size of the buffer */
-	INT32 buffer_limit;		/* the maximum size to which the buffer may grow */
-	HFONT32 font;			/* NULL means standard system font */
-	INT32 x_offset;			/* scroll offset	for multi lines this is in pixels
+	INT buffer_size;		/* the size of the buffer */
+	INT buffer_limit;		/* the maximum size to which the buffer may grow */
+	HFONT font;			/* NULL means standard system font */
+	INT x_offset;			/* scroll offset	for multi lines this is in pixels
 								for single lines it's in characters */
-	INT32 line_height;		/* height of a screen line in pixels */
-	INT32 char_width;		/* average character width in pixels */
+	INT line_height;		/* height of a screen line in pixels */
+	INT char_width;		/* average character width in pixels */
 	DWORD style;			/* sane version of wnd->dwStyle */
 	WORD flags;			/* flags that are not in es->style or wnd->flags (EF_XXX) */
-	INT32 undo_insert_count;	/* number of characters inserted in sequence */
-	INT32 undo_position;		/* character index of the insertion and deletion */
+	INT undo_insert_count;	/* number of characters inserted in sequence */
+	INT undo_position;		/* character index of the insertion and deletion */
 	LPSTR undo_text;		/* deleted text */
-	INT32 undo_buffer_size;		/* size of the deleted text buffer */
-	INT32 selection_start;		/* == selection_end if no selection */
-	INT32 selection_end;		/* == current caret position */
+	INT undo_buffer_size;		/* size of the deleted text buffer */
+	INT selection_start;		/* == selection_end if no selection */
+	INT selection_end;		/* == current caret position */
 	CHAR password_char;		/* == 0 if no password char, and for multi line controls */
-	INT32 left_margin;		/* in pixels */
-	INT32 right_margin;		/* in pixels */
-	RECT32 format_rect;
-	INT32 region_posx;		/* Position of cursor relative to region: */
-	INT32 region_posy;		/* -1: to left, 0: within, 1: to right */
+	INT left_margin;		/* in pixels */
+	INT right_margin;		/* in pixels */
+	RECT format_rect;
+	INT region_posx;		/* Position of cursor relative to region: */
+	INT region_posy;		/* -1: to left, 0: within, 1: to right */
 	EDITWORDBREAKPROC16 word_break_proc16;
-	EDITWORDBREAKPROC32A word_break_proc32A;
-	INT32 line_count;		/* number of lines */
-	INT32 y_offset;			/* scroll offset in number of lines */
+	EDITWORDBREAKPROCA word_break_proc32A;
+	INT line_count;		/* number of lines */
+	INT y_offset;			/* scroll offset in number of lines */
 	/*
 	 *	only for multi line controls
 	 */
-	INT32 lock_count;		/* amount of re-entries in the EditWndProc */
-	INT32 tabs_count;
-	LPINT32 tabs;
-	INT32 text_width;		/* width of the widest line in pixels */
+	INT lock_count;		/* amount of re-entries in the EditWndProc */
+	INT tabs_count;
+	LPINT tabs;
+	INT text_width;		/* width of the widest line in pixels */
 	LINEDEF *first_line_def;	/* linked list of (soft) linebreaks */
 	HLOCAL16 hloc16;		/* for controls receiving EM_GETHANDLE16 */
-	HLOCAL32 hloc32;		/* for controls receiving EM_GETHANDLE */
+	HLOCAL hloc32;		/* for controls receiving EM_GETHANDLE */
 } EDITSTATE;
 
 
-#define SWAP_INT32(x,y) do { INT32 temp = (INT32)(x); (x) = (INT32)(y); (y) = temp; } while(0)
-#define ORDER_INT32(x,y) do { if ((INT32)(y) < (INT32)(x)) SWAP_INT32((x),(y)); } while(0)
+#define SWAP_INT32(x,y) do { INT temp = (INT)(x); (x) = (INT)(y); (y) = temp; } while(0)
+#define ORDER_INT(x,y) do { if ((INT)(y) < (INT)(x)) SWAP_INT32((x),(y)); } while(0)
 
-#define SWAP_UINT32(x,y) do { UINT32 temp = (UINT32)(x); (x) = (UINT32)(y); (y) = temp; } while(0)
-#define ORDER_UINT32(x,y) do { if ((UINT32)(y) < (UINT32)(x)) SWAP_UINT32((x),(y)); } while(0)
+#define SWAP_UINT32(x,y) do { UINT temp = (UINT)(x); (x) = (UINT)(y); (y) = temp; } while(0)
+#define ORDER_UINT(x,y) do { if ((UINT)(y) < (UINT)(x)) SWAP_UINT32((x),(y)); } while(0)
 
 #define DPRINTF_EDIT_NOTIFY(hwnd, str) \
 	({TRACE(edit, "notification " str " sent to hwnd=%08x\n", \
-		       (UINT32)(hwnd));})
+		       (UINT)(hwnd));})
 
 #define EDIT_SEND_CTLCOLOR(wnd,hdc) \
-	(SendMessage32A((wnd)->parent->hwndSelf, WM_CTLCOLOREDIT, \
-			(WPARAM32)(hdc), (LPARAM)(wnd)->hwndSelf))
+	(SendMessageA((wnd)->parent->hwndSelf, WM_CTLCOLOREDIT, \
+			(WPARAM)(hdc), (LPARAM)(wnd)->hwndSelf))
 #define EDIT_NOTIFY_PARENT(wnd, wNotifyCode, str) \
 	(DPRINTF_EDIT_NOTIFY((wnd)->parent->hwndSelf, str), \
-	SendMessage32A((wnd)->parent->hwndSelf, WM_COMMAND, \
+	SendMessageA((wnd)->parent->hwndSelf, WM_COMMAND, \
 			MAKEWPARAM((wnd)->wIDmenu, wNotifyCode), \
 			(LPARAM)(wnd)->hwndSelf))
 #define DPRINTF_EDIT_MSG16(str) \
 	TRACE(edit, \
 		     "16 bit : " str ": hwnd=%08x, wParam=%08x, lParam=%08x\n", \
-		     (UINT32)hwnd, (UINT32)wParam, (UINT32)lParam)
+		     (UINT)hwnd, (UINT)wParam, (UINT)lParam)
 #define DPRINTF_EDIT_MSG32(str) \
 	TRACE(edit, \
 		     "32 bit : " str ": hwnd=%08x, wParam=%08x, lParam=%08x\n", \
-		     (UINT32)hwnd, (UINT32)wParam, (UINT32)lParam)
+		     (UINT)hwnd, (UINT)wParam, (UINT)lParam)
 
 /*********************************************************************
  *
@@ -140,104 +140,104 @@ typedef struct
  *	We still like to call them internally
  *	"static __inline__" makes them more like macro's
  */
-static __inline__ BOOL32	EDIT_EM_CanUndo(WND *wnd, EDITSTATE *es);
+static __inline__ BOOL	EDIT_EM_CanUndo(WND *wnd, EDITSTATE *es);
 static __inline__ void		EDIT_EM_EmptyUndoBuffer(WND *wnd, EDITSTATE *es);
 static __inline__ void		EDIT_WM_Clear(WND *wnd, EDITSTATE *es);
 static __inline__ void		EDIT_WM_Cut(WND *wnd, EDITSTATE *es);
 /*
  *	This is the only exported function
  */
-LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
-                            WPARAM32 wParam, LPARAM lParam );
+LRESULT WINAPI EditWndProc( HWND hwnd, UINT msg,
+                            WPARAM wParam, LPARAM lParam );
 /*
  *	Helper functions only valid for one type of control
  */
 static void	EDIT_BuildLineDefs_ML(WND *wnd, EDITSTATE *es);
 static LPSTR	EDIT_GetPasswordPointer_SL(WND *wnd, EDITSTATE *es);
-static void	EDIT_MoveDown_ML(WND *wnd, EDITSTATE *es, BOOL32 extend);
-static void	EDIT_MovePageDown_ML(WND *wnd, EDITSTATE *es, BOOL32 extend);
-static void	EDIT_MovePageUp_ML(WND *wnd, EDITSTATE *es, BOOL32 extend);
-static void	EDIT_MoveUp_ML(WND *wnd, EDITSTATE *es, BOOL32 extend);
+static void	EDIT_MoveDown_ML(WND *wnd, EDITSTATE *es, BOOL extend);
+static void	EDIT_MovePageDown_ML(WND *wnd, EDITSTATE *es, BOOL extend);
+static void	EDIT_MovePageUp_ML(WND *wnd, EDITSTATE *es, BOOL extend);
+static void	EDIT_MoveUp_ML(WND *wnd, EDITSTATE *es, BOOL extend);
 /*
  *	Helper functions valid for both single line _and_ multi line controls
  */
-static INT32	EDIT_CallWordBreakProc(WND *wnd, EDITSTATE *es, INT32 start, INT32 index, INT32 count, INT32 action);
-static INT32	EDIT_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y, LPBOOL32 after_wrap);
-static void	EDIT_ConfinePoint(WND *wnd, EDITSTATE *es, LPINT32 x, LPINT32 y);
-static void	EDIT_GetLineRect(WND *wnd, EDITSTATE *es, INT32 line, INT32 scol, INT32 ecol, LPRECT32 rc);
-static void	EDIT_InvalidateText(WND *wnd, EDITSTATE *es, INT32 start, INT32 end);
+static INT	EDIT_CallWordBreakProc(WND *wnd, EDITSTATE *es, INT start, INT index, INT count, INT action);
+static INT	EDIT_CharFromPos(WND *wnd, EDITSTATE *es, INT x, INT y, LPBOOL after_wrap);
+static void	EDIT_ConfinePoint(WND *wnd, EDITSTATE *es, LPINT x, LPINT y);
+static void	EDIT_GetLineRect(WND *wnd, EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT rc);
+static void	EDIT_InvalidateText(WND *wnd, EDITSTATE *es, INT start, INT end);
 static void	EDIT_LockBuffer(WND *wnd, EDITSTATE *es);
-static BOOL32	EDIT_MakeFit(WND *wnd, EDITSTATE *es, INT32 size);
-static BOOL32	EDIT_MakeUndoFit(WND *wnd, EDITSTATE *es, INT32 size);
-static void	EDIT_MoveBackward(WND *wnd, EDITSTATE *es, BOOL32 extend);
-static void	EDIT_MoveEnd(WND *wnd, EDITSTATE *es, BOOL32 extend);
-static void	EDIT_MoveForward(WND *wnd, EDITSTATE *es, BOOL32 extend);
-static void	EDIT_MoveHome(WND *wnd, EDITSTATE *es, BOOL32 extend);
-static void	EDIT_MoveWordBackward(WND *wnd, EDITSTATE *es, BOOL32 extend);
-static void	EDIT_MoveWordForward(WND *wnd, EDITSTATE *es, BOOL32 extend);
-static void	EDIT_PaintLine(WND *wnd, EDITSTATE *es, HDC32 hdc, INT32 line, BOOL32 rev);
-static INT32	EDIT_PaintText(WND *wnd, EDITSTATE *es, HDC32 hdc, INT32 x, INT32 y, INT32 line, INT32 col, INT32 count, BOOL32 rev);
-static void	EDIT_SetCaretPos(WND *wnd, EDITSTATE *es, INT32 pos, BOOL32 after_wrap); 
-static void	EDIT_SetRectNP(WND *wnd, EDITSTATE *es, LPRECT32 lprc);
-static void	EDIT_UnlockBuffer(WND *wnd, EDITSTATE *es, BOOL32 force);
-static INT32	EDIT_WordBreakProc(LPSTR s, INT32 index, INT32 count, INT32 action);
+static BOOL	EDIT_MakeFit(WND *wnd, EDITSTATE *es, INT size);
+static BOOL	EDIT_MakeUndoFit(WND *wnd, EDITSTATE *es, INT size);
+static void	EDIT_MoveBackward(WND *wnd, EDITSTATE *es, BOOL extend);
+static void	EDIT_MoveEnd(WND *wnd, EDITSTATE *es, BOOL extend);
+static void	EDIT_MoveForward(WND *wnd, EDITSTATE *es, BOOL extend);
+static void	EDIT_MoveHome(WND *wnd, EDITSTATE *es, BOOL extend);
+static void	EDIT_MoveWordBackward(WND *wnd, EDITSTATE *es, BOOL extend);
+static void	EDIT_MoveWordForward(WND *wnd, EDITSTATE *es, BOOL extend);
+static void	EDIT_PaintLine(WND *wnd, EDITSTATE *es, HDC hdc, INT line, BOOL rev);
+static INT	EDIT_PaintText(WND *wnd, EDITSTATE *es, HDC hdc, INT x, INT y, INT line, INT col, INT count, BOOL rev);
+static void	EDIT_SetCaretPos(WND *wnd, EDITSTATE *es, INT pos, BOOL after_wrap); 
+static void	EDIT_SetRectNP(WND *wnd, EDITSTATE *es, LPRECT lprc);
+static void	EDIT_UnlockBuffer(WND *wnd, EDITSTATE *es, BOOL force);
+static INT	EDIT_WordBreakProc(LPSTR s, INT index, INT count, INT action);
 /*
  *	EM_XXX message handlers
  */
-static LRESULT	EDIT_EM_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y);
-static BOOL32	EDIT_EM_FmtLines(WND *wnd, EDITSTATE *es, BOOL32 add_eol);
-static HLOCAL32	EDIT_EM_GetHandle(WND *wnd, EDITSTATE *es);
+static LRESULT	EDIT_EM_CharFromPos(WND *wnd, EDITSTATE *es, INT x, INT y);
+static BOOL	EDIT_EM_FmtLines(WND *wnd, EDITSTATE *es, BOOL add_eol);
+static HLOCAL	EDIT_EM_GetHandle(WND *wnd, EDITSTATE *es);
 static HLOCAL16	EDIT_EM_GetHandle16(WND *wnd, EDITSTATE *es);
-static INT32	EDIT_EM_GetLine(WND *wnd, EDITSTATE *es, INT32 line, LPSTR lpch);
-static LRESULT	EDIT_EM_GetSel(WND *wnd, EDITSTATE *es, LPUINT32 start, LPUINT32 end);
+static INT	EDIT_EM_GetLine(WND *wnd, EDITSTATE *es, INT line, LPSTR lpch);
+static LRESULT	EDIT_EM_GetSel(WND *wnd, EDITSTATE *es, LPUINT start, LPUINT end);
 static LRESULT	EDIT_EM_GetThumb(WND *wnd, EDITSTATE *es);
-static INT32	EDIT_EM_LineFromChar(WND *wnd, EDITSTATE *es, INT32 index);
-static INT32	EDIT_EM_LineIndex(WND *wnd, EDITSTATE *es, INT32 line);
-static INT32	EDIT_EM_LineLength(WND *wnd, EDITSTATE *es, INT32 index);
-static BOOL32	EDIT_EM_LineScroll(WND *wnd, EDITSTATE *es, INT32 dx, INT32 dy);
-static LRESULT	EDIT_EM_PosFromChar(WND *wnd, EDITSTATE *es, INT32 index, BOOL32 after_wrap);
-static void	EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL32 can_undo, LPCSTR lpsz_replace);
-static LRESULT	EDIT_EM_Scroll(WND *wnd, EDITSTATE *es, INT32 action);
+static INT	EDIT_EM_LineFromChar(WND *wnd, EDITSTATE *es, INT index);
+static INT	EDIT_EM_LineIndex(WND *wnd, EDITSTATE *es, INT line);
+static INT	EDIT_EM_LineLength(WND *wnd, EDITSTATE *es, INT index);
+static BOOL	EDIT_EM_LineScroll(WND *wnd, EDITSTATE *es, INT dx, INT dy);
+static LRESULT	EDIT_EM_PosFromChar(WND *wnd, EDITSTATE *es, INT index, BOOL after_wrap);
+static void	EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL can_undo, LPCSTR lpsz_replace);
+static LRESULT	EDIT_EM_Scroll(WND *wnd, EDITSTATE *es, INT action);
 static void	EDIT_EM_ScrollCaret(WND *wnd, EDITSTATE *es);
-static void	EDIT_EM_SetHandle(WND *wnd, EDITSTATE *es, HLOCAL32 hloc);
+static void	EDIT_EM_SetHandle(WND *wnd, EDITSTATE *es, HLOCAL hloc);
 static void	EDIT_EM_SetHandle16(WND *wnd, EDITSTATE *es, HLOCAL16 hloc);
-static void	EDIT_EM_SetLimitText(WND *wnd, EDITSTATE *es, INT32 limit);
-static void	EDIT_EM_SetMargins(WND *wnd, EDITSTATE *es, INT32 action, INT32 left, INT32 right);
+static void	EDIT_EM_SetLimitText(WND *wnd, EDITSTATE *es, INT limit);
+static void	EDIT_EM_SetMargins(WND *wnd, EDITSTATE *es, INT action, INT left, INT right);
 static void	EDIT_EM_SetPasswordChar(WND *wnd, EDITSTATE *es, CHAR c);
-static void	EDIT_EM_SetSel(WND *wnd, EDITSTATE *es, UINT32 start, UINT32 end, BOOL32 after_wrap);
-static BOOL32	EDIT_EM_SetTabStops(WND *wnd, EDITSTATE *es, INT32 count, LPINT32 tabs);
-static BOOL32	EDIT_EM_SetTabStops16(WND *wnd, EDITSTATE *es, INT32 count, LPINT16 tabs);
-static void	EDIT_EM_SetWordBreakProc(WND *wnd, EDITSTATE *es, EDITWORDBREAKPROC32A wbp);
+static void	EDIT_EM_SetSel(WND *wnd, EDITSTATE *es, UINT start, UINT end, BOOL after_wrap);
+static BOOL	EDIT_EM_SetTabStops(WND *wnd, EDITSTATE *es, INT count, LPINT tabs);
+static BOOL	EDIT_EM_SetTabStops16(WND *wnd, EDITSTATE *es, INT count, LPINT16 tabs);
+static void	EDIT_EM_SetWordBreakProc(WND *wnd, EDITSTATE *es, EDITWORDBREAKPROCA wbp);
 static void	EDIT_EM_SetWordBreakProc16(WND *wnd, EDITSTATE *es, EDITWORDBREAKPROC16 wbp);
-static BOOL32	EDIT_EM_Undo(WND *wnd, EDITSTATE *es);
+static BOOL	EDIT_EM_Undo(WND *wnd, EDITSTATE *es);
 /*
  *	WM_XXX message handlers
  */
 static void	EDIT_WM_Char(WND *wnd, EDITSTATE *es, CHAR c, DWORD key_data);
-static void	EDIT_WM_Command(WND *wnd, EDITSTATE *es, INT32 code, INT32 id, HWND32 conrtol);
-static void	EDIT_WM_ContextMenu(WND *wnd, EDITSTATE *es, HWND32 hwnd, INT32 x, INT32 y);
+static void	EDIT_WM_Command(WND *wnd, EDITSTATE *es, INT code, INT id, HWND conrtol);
+static void	EDIT_WM_ContextMenu(WND *wnd, EDITSTATE *es, HWND hwnd, INT x, INT y);
 static void	EDIT_WM_Copy(WND *wnd, EDITSTATE *es);
-static LRESULT	EDIT_WM_Create(WND *wnd, EDITSTATE *es, LPCREATESTRUCT32A cs);
+static LRESULT	EDIT_WM_Create(WND *wnd, EDITSTATE *es, LPCREATESTRUCTA cs);
 static void	EDIT_WM_Destroy(WND *wnd, EDITSTATE *es);
-static LRESULT	EDIT_WM_EraseBkGnd(WND *wnd, EDITSTATE *es, HDC32 dc);
-static INT32	EDIT_WM_GetText(WND *wnd, EDITSTATE *es, INT32 count, LPSTR text);
-static LRESULT	EDIT_WM_HScroll(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos, HWND32 scroll_bar);
-static LRESULT	EDIT_WM_KeyDown(WND *wnd, EDITSTATE *es, INT32 key, DWORD key_data);
-static LRESULT	EDIT_WM_KillFocus(WND *wnd, EDITSTATE *es, HWND32 window_getting_focus);
-static LRESULT	EDIT_WM_LButtonDblClk(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, INT32 y);
-static LRESULT	EDIT_WM_LButtonDown(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, INT32 y);
-static LRESULT	EDIT_WM_LButtonUp(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, INT32 y);
-static LRESULT	EDIT_WM_MouseMove(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, INT32 y);
-static LRESULT	EDIT_WM_NCCreate(WND *wnd, LPCREATESTRUCT32A cs);
+static LRESULT	EDIT_WM_EraseBkGnd(WND *wnd, EDITSTATE *es, HDC dc);
+static INT	EDIT_WM_GetText(WND *wnd, EDITSTATE *es, INT count, LPSTR text);
+static LRESULT	EDIT_WM_HScroll(WND *wnd, EDITSTATE *es, INT action, INT pos, HWND scroll_bar);
+static LRESULT	EDIT_WM_KeyDown(WND *wnd, EDITSTATE *es, INT key, DWORD key_data);
+static LRESULT	EDIT_WM_KillFocus(WND *wnd, EDITSTATE *es, HWND window_getting_focus);
+static LRESULT	EDIT_WM_LButtonDblClk(WND *wnd, EDITSTATE *es, DWORD keys, INT x, INT y);
+static LRESULT	EDIT_WM_LButtonDown(WND *wnd, EDITSTATE *es, DWORD keys, INT x, INT y);
+static LRESULT	EDIT_WM_LButtonUp(WND *wnd, EDITSTATE *es, DWORD keys, INT x, INT y);
+static LRESULT	EDIT_WM_MouseMove(WND *wnd, EDITSTATE *es, DWORD keys, INT x, INT y);
+static LRESULT	EDIT_WM_NCCreate(WND *wnd, LPCREATESTRUCTA cs);
 static void	EDIT_WM_Paint(WND *wnd, EDITSTATE *es);
 static void	EDIT_WM_Paste(WND *wnd, EDITSTATE *es);
-static void	EDIT_WM_SetFocus(WND *wnd, EDITSTATE *es, HWND32 window_losing_focus);
-static void	EDIT_WM_SetFont(WND *wnd, EDITSTATE *es, HFONT32 font, BOOL32 redraw);
+static void	EDIT_WM_SetFocus(WND *wnd, EDITSTATE *es, HWND window_losing_focus);
+static void	EDIT_WM_SetFont(WND *wnd, EDITSTATE *es, HFONT font, BOOL redraw);
 static void	EDIT_WM_SetText(WND *wnd, EDITSTATE *es, LPCSTR text);
-static void	EDIT_WM_Size(WND *wnd, EDITSTATE *es, UINT32 action, INT32 width, INT32 height);
-static LRESULT	EDIT_WM_SysKeyDown(WND *wnd, EDITSTATE *es, INT32 key, DWORD key_data);
-static void	EDIT_WM_Timer(WND *wnd, EDITSTATE *es, INT32 id, TIMERPROC32 timer_proc);
-static LRESULT	EDIT_WM_VScroll(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos, HWND32 scroll_bar);
+static void	EDIT_WM_Size(WND *wnd, EDITSTATE *es, UINT action, INT width, INT height);
+static LRESULT	EDIT_WM_SysKeyDown(WND *wnd, EDITSTATE *es, INT key, DWORD key_data);
+static void	EDIT_WM_Timer(WND *wnd, EDITSTATE *es, INT id, TIMERPROC timer_proc);
+static LRESULT	EDIT_WM_VScroll(WND *wnd, EDITSTATE *es, INT action, INT pos, HWND scroll_bar);
 
 
 /*********************************************************************
@@ -245,9 +245,9 @@ static LRESULT	EDIT_WM_VScroll(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos,
  *	EM_CANUNDO
  *
  */
-static __inline__ BOOL32 EDIT_EM_CanUndo(WND *wnd, EDITSTATE *es)
+static __inline__ BOOL EDIT_EM_CanUndo(WND *wnd, EDITSTATE *es)
 {
-	return (es->undo_insert_count || lstrlen32A(es->undo_text));
+	return (es->undo_insert_count || lstrlenA(es->undo_text));
 }
 
 
@@ -299,8 +299,8 @@ static __inline__ void EDIT_WM_Cut(WND *wnd, EDITSTATE *es)
  *	names).
  *
  */
-LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
-                            WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI EditWndProc( HWND hwnd, UINT msg,
+                            WPARAM wParam, LPARAM lParam )
 {
 	WND *wnd = WIN_FindWndPtr(hwnd);
 	EDITSTATE *es = *(EDITSTATE **)((wnd)->wExtra);
@@ -314,11 +314,11 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 
 	case WM_NCCREATE:
 		DPRINTF_EDIT_MSG32("WM_NCCREATE");
-		return EDIT_WM_NCCreate(wnd, (LPCREATESTRUCT32A)lParam);
+		return EDIT_WM_NCCreate(wnd, (LPCREATESTRUCTA)lParam);
 	}
 
 	if (!es)
-		return DefWindowProc32A(hwnd, msg, wParam, lParam);
+		return DefWindowProcA(hwnd, msg, wParam, lParam);
 
 	EDIT_LockBuffer(wnd, es);
 	switch (msg) {
@@ -327,9 +327,9 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 		wParam = 0;
 		lParam = 0;
 		/* fall through */
-	case EM_GETSEL32:
+	case EM_GETSEL:
 		DPRINTF_EDIT_MSG32("EM_GETSEL");
-		result = EDIT_EM_GetSel(wnd, es, (LPUINT32)wParam, (LPUINT32)lParam);
+		result = EDIT_EM_GetSel(wnd, es, (LPUINT)wParam, (LPUINT)lParam);
 		break;
 
 	case EM_SETSEL16:
@@ -342,7 +342,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 			EDIT_EM_ScrollCaret(wnd, es);
 		result = 1;
 		break;
-	case EM_SETSEL32:
+	case EM_SETSEL:
 		DPRINTF_EDIT_MSG32("EM_SETSEL");
 		EDIT_EM_SetSel(wnd, es, wParam, lParam, FALSE);
 		result = 1;
@@ -353,65 +353,65 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 		if (lParam)
 			CONV_RECT32TO16(&es->format_rect, (LPRECT16)PTR_SEG_TO_LIN(lParam));
 		break;
-	case EM_GETRECT32:
+	case EM_GETRECT:
 		DPRINTF_EDIT_MSG32("EM_GETRECT");
 		if (lParam)
-			CopyRect32((LPRECT32)lParam, &es->format_rect);
+			CopyRect((LPRECT)lParam, &es->format_rect);
 		break;
 
 	case EM_SETRECT16:
 		DPRINTF_EDIT_MSG16("EM_SETRECT");
 		if ((es->style & ES_MULTILINE) && lParam) {
-			RECT32 rc;
+			RECT rc;
 			CONV_RECT16TO32((LPRECT16)PTR_SEG_TO_LIN(lParam), &rc);
 			EDIT_SetRectNP(wnd, es, &rc);
-			InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+			InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 		}
 		break;
-	case EM_SETRECT32:
+	case EM_SETRECT:
 		DPRINTF_EDIT_MSG32("EM_SETRECT");
 		if ((es->style & ES_MULTILINE) && lParam) {
-			EDIT_SetRectNP(wnd, es, (LPRECT32)lParam);
-			InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+			EDIT_SetRectNP(wnd, es, (LPRECT)lParam);
+			InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 		}
 		break;
 
 	case EM_SETRECTNP16:
 		DPRINTF_EDIT_MSG16("EM_SETRECTNP");
 		if ((es->style & ES_MULTILINE) && lParam) {
-			RECT32 rc;
+			RECT rc;
 			CONV_RECT16TO32((LPRECT16)PTR_SEG_TO_LIN(lParam), &rc);
 			EDIT_SetRectNP(wnd, es, &rc);
 		}
 		break;
-	case EM_SETRECTNP32:
+	case EM_SETRECTNP:
 		DPRINTF_EDIT_MSG32("EM_SETRECTNP");
 		if ((es->style & ES_MULTILINE) && lParam)
-			EDIT_SetRectNP(wnd, es, (LPRECT32)lParam);
+			EDIT_SetRectNP(wnd, es, (LPRECT)lParam);
 		break;
 
 	case EM_SCROLL16:
 		DPRINTF_EDIT_MSG16("EM_SCROLL");
 		/* fall through */
-	case EM_SCROLL32:
+	case EM_SCROLL:
 		DPRINTF_EDIT_MSG32("EM_SCROLL");
-		result = EDIT_EM_Scroll(wnd, es, (INT32)wParam);
+		result = EDIT_EM_Scroll(wnd, es, (INT)wParam);
  		break;
 
 	case EM_LINESCROLL16:
 		DPRINTF_EDIT_MSG16("EM_LINESCROLL");
-		wParam = (WPARAM32)(INT32)SHIWORD(lParam);
-		lParam = (LPARAM)(INT32)SLOWORD(lParam);
+		wParam = (WPARAM)(INT)SHIWORD(lParam);
+		lParam = (LPARAM)(INT)SLOWORD(lParam);
 		/* fall through */
-	case EM_LINESCROLL32:
+	case EM_LINESCROLL:
 		DPRINTF_EDIT_MSG32("EM_LINESCROLL");
-		result = (LRESULT)EDIT_EM_LineScroll(wnd, es, (INT32)wParam, (INT32)lParam);
+		result = (LRESULT)EDIT_EM_LineScroll(wnd, es, (INT)wParam, (INT)lParam);
 		break;
 
 	case EM_SCROLLCARET16:
 		DPRINTF_EDIT_MSG16("EM_SCROLLCARET");
 		/* fall through */
-	case EM_SCROLLCARET32:
+	case EM_SCROLLCARET:
 		DPRINTF_EDIT_MSG32("EM_SCROLLCARET");
 		EDIT_EM_ScrollCaret(wnd, es);
 		result = 1;
@@ -420,7 +420,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_GETMODIFY16:
 		DPRINTF_EDIT_MSG16("EM_GETMODIFY");
 		/* fall through */
-	case EM_GETMODIFY32:
+	case EM_GETMODIFY:
 		DPRINTF_EDIT_MSG32("EM_GETMODIFY");
 		return ((es->flags & EF_MODIFIED) != 0);
 		break;
@@ -428,7 +428,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_SETMODIFY16:
 		DPRINTF_EDIT_MSG16("EM_SETMODIFY");
 		/* fall through */
-	case EM_SETMODIFY32:
+	case EM_SETMODIFY:
 		DPRINTF_EDIT_MSG32("EM_SETMODIFY");
 		if (wParam)
 			es->flags |= EF_MODIFIED;
@@ -439,7 +439,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_GETLINECOUNT16:
 		DPRINTF_EDIT_MSG16("EM_GETLINECOUNT");
 		/* fall through */
-	case EM_GETLINECOUNT32:
+	case EM_GETLINECOUNT:
 		DPRINTF_EDIT_MSG32("EM_GETLINECOUNT");
 		result = (es->style & ES_MULTILINE) ? es->line_count : 1;
 		break;
@@ -447,27 +447,27 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_LINEINDEX16:
 		DPRINTF_EDIT_MSG16("EM_LINEINDEX");
 		if ((INT16)wParam == -1)
-			wParam = (WPARAM32)-1;
+			wParam = (WPARAM)-1;
 		/* fall through */
-	case EM_LINEINDEX32:
+	case EM_LINEINDEX:
 		DPRINTF_EDIT_MSG32("EM_LINEINDEX");
-		result = (LRESULT)EDIT_EM_LineIndex(wnd, es, (INT32)wParam);
+		result = (LRESULT)EDIT_EM_LineIndex(wnd, es, (INT)wParam);
 		break;
 
 	case EM_SETHANDLE16:
 		DPRINTF_EDIT_MSG16("EM_SETHANDLE");
 		EDIT_EM_SetHandle16(wnd, es, (HLOCAL16)wParam);
 		break;
-	case EM_SETHANDLE32:
+	case EM_SETHANDLE:
 		DPRINTF_EDIT_MSG32("EM_SETHANDLE");
-		EDIT_EM_SetHandle(wnd, es, (HLOCAL32)wParam);
+		EDIT_EM_SetHandle(wnd, es, (HLOCAL)wParam);
 		break;
 
 	case EM_GETHANDLE16:
 		DPRINTF_EDIT_MSG16("EM_GETHANDLE");
 		result = (LRESULT)EDIT_EM_GetHandle16(wnd, es);
 		break;
-	case EM_GETHANDLE32:
+	case EM_GETHANDLE:
 		DPRINTF_EDIT_MSG32("EM_GETHANDLE");
 		result = (LRESULT)EDIT_EM_GetHandle(wnd, es);
 		break;
@@ -475,7 +475,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_GETTHUMB16:
 		DPRINTF_EDIT_MSG16("EM_GETTHUMB");
 		/* fall through */
-	case EM_GETTHUMB32:
+	case EM_GETTHUMB:
 		DPRINTF_EDIT_MSG32("EM_GETTHUMB");
 		result = EDIT_EM_GetThumb(wnd, es);
 		break;
@@ -487,7 +487,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 		/* fall through */
 	case 0x00bf:
 		DPRINTF_EDIT_MSG32("undocumented 0x00bf, please report");
-		result = DefWindowProc32A(hwnd, msg, wParam, lParam);
+		result = DefWindowProcA(hwnd, msg, wParam, lParam);
 		break;
 
 	case WM_USER+16:
@@ -495,24 +495,24 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 		/* fall through */
 	case 0x00c0:
 		DPRINTF_EDIT_MSG32("undocumented 0x00c0, please report");
-		result = DefWindowProc32A(hwnd, msg, wParam, lParam);
+		result = DefWindowProcA(hwnd, msg, wParam, lParam);
 		break;
 
 	case EM_LINELENGTH16:
 		DPRINTF_EDIT_MSG16("EM_LINELENGTH");
 		/* fall through */
-	case EM_LINELENGTH32:
+	case EM_LINELENGTH:
 		DPRINTF_EDIT_MSG32("EM_LINELENGTH");
-		result = (LRESULT)EDIT_EM_LineLength(wnd, es, (INT32)wParam);
+		result = (LRESULT)EDIT_EM_LineLength(wnd, es, (INT)wParam);
 		break;
 
 	case EM_REPLACESEL16:
 		DPRINTF_EDIT_MSG16("EM_REPLACESEL");
 		lParam = (LPARAM)PTR_SEG_TO_LIN((SEGPTR)lParam);
 		/* fall through */
-	case EM_REPLACESEL32:
+	case EM_REPLACESEL:
 		DPRINTF_EDIT_MSG32("EM_REPLACESEL");
-		EDIT_EM_ReplaceSel(wnd, es, (BOOL32)wParam, (LPCSTR)lParam);
+		EDIT_EM_ReplaceSel(wnd, es, (BOOL)wParam, (LPCSTR)lParam);
 		result = 1;
 		break;
 
@@ -523,30 +523,30 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 		/* fall through */
 	case 0x00c3:
 		DPRINTF_EDIT_MSG32("undocumented 0x00c3, please report");
-		result = DefWindowProc32A(hwnd, msg, wParam, lParam);
+		result = DefWindowProcA(hwnd, msg, wParam, lParam);
 		break;
 
 	case EM_GETLINE16:
 		DPRINTF_EDIT_MSG16("EM_GETLINE");
 		lParam = (LPARAM)PTR_SEG_TO_LIN((SEGPTR)lParam);
 		/* fall through */
-	case EM_GETLINE32:
+	case EM_GETLINE:
 		DPRINTF_EDIT_MSG32("EM_GETLINE");
-		result = (LRESULT)EDIT_EM_GetLine(wnd, es, (INT32)wParam, (LPSTR)lParam);
+		result = (LRESULT)EDIT_EM_GetLine(wnd, es, (INT)wParam, (LPSTR)lParam);
 		break;
 
 	case EM_LIMITTEXT16:
 		DPRINTF_EDIT_MSG16("EM_LIMITTEXT");
 		/* fall through */
-	case EM_SETLIMITTEXT32:
+	case EM_SETLIMITTEXT:
 		DPRINTF_EDIT_MSG32("EM_SETLIMITTEXT");
-		EDIT_EM_SetLimitText(wnd, es, (INT32)wParam);
+		EDIT_EM_SetLimitText(wnd, es, (INT)wParam);
 		break;
 
 	case EM_CANUNDO16:
 		DPRINTF_EDIT_MSG16("EM_CANUNDO");
 		/* fall through */
-	case EM_CANUNDO32:
+	case EM_CANUNDO:
 		DPRINTF_EDIT_MSG32("EM_CANUNDO");
 		result = (LRESULT)EDIT_EM_CanUndo(wnd, es);
 		break;
@@ -554,7 +554,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_UNDO16:
 		DPRINTF_EDIT_MSG16("EM_UNDO");
 		/* fall through */
-	case EM_UNDO32:
+	case EM_UNDO:
 		/* fall through */
 	case WM_UNDO:
 		DPRINTF_EDIT_MSG32("EM_UNDO / WM_UNDO");
@@ -564,17 +564,17 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_FMTLINES16:
 		DPRINTF_EDIT_MSG16("EM_FMTLINES");
 		/* fall through */
-	case EM_FMTLINES32:
+	case EM_FMTLINES:
 		DPRINTF_EDIT_MSG32("EM_FMTLINES");
-		result = (LRESULT)EDIT_EM_FmtLines(wnd, es, (BOOL32)wParam);
+		result = (LRESULT)EDIT_EM_FmtLines(wnd, es, (BOOL)wParam);
 		break;
 
 	case EM_LINEFROMCHAR16:
 		DPRINTF_EDIT_MSG16("EM_LINEFROMCHAR");
 		/* fall through */
-	case EM_LINEFROMCHAR32:
+	case EM_LINEFROMCHAR:
 		DPRINTF_EDIT_MSG32("EM_LINEFROMCHAR");
-		result = (LRESULT)EDIT_EM_LineFromChar(wnd, es, (INT32)wParam);
+		result = (LRESULT)EDIT_EM_LineFromChar(wnd, es, (INT)wParam);
 		break;
 
 	/* message 0x00ca missing from specs */
@@ -584,22 +584,22 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 		/* fall through */
 	case 0x00ca:
 		DPRINTF_EDIT_MSG32("undocumented 0x00ca, please report");
-		result = DefWindowProc32A(hwnd, msg, wParam, lParam);
+		result = DefWindowProcA(hwnd, msg, wParam, lParam);
 		break;
 
 	case EM_SETTABSTOPS16:
 		DPRINTF_EDIT_MSG16("EM_SETTABSTOPS");
-		result = (LRESULT)EDIT_EM_SetTabStops16(wnd, es, (INT32)wParam, (LPINT16)PTR_SEG_TO_LIN((SEGPTR)lParam));
+		result = (LRESULT)EDIT_EM_SetTabStops16(wnd, es, (INT)wParam, (LPINT16)PTR_SEG_TO_LIN((SEGPTR)lParam));
 		break;
-	case EM_SETTABSTOPS32:
+	case EM_SETTABSTOPS:
 		DPRINTF_EDIT_MSG32("EM_SETTABSTOPS");
-		result = (LRESULT)EDIT_EM_SetTabStops(wnd, es, (INT32)wParam, (LPINT32)lParam);
+		result = (LRESULT)EDIT_EM_SetTabStops(wnd, es, (INT)wParam, (LPINT)lParam);
 		break;
 
 	case EM_SETPASSWORDCHAR16:
 		DPRINTF_EDIT_MSG16("EM_SETPASSWORDCHAR");
 		/* fall through */
-	case EM_SETPASSWORDCHAR32:
+	case EM_SETPASSWORDCHAR:
 		DPRINTF_EDIT_MSG32("EM_SETPASSWORDCHAR");
 		EDIT_EM_SetPasswordChar(wnd, es, (CHAR)wParam);
 		break;
@@ -607,7 +607,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_EMPTYUNDOBUFFER16:
 		DPRINTF_EDIT_MSG16("EM_EMPTYUNDOBUFFER");
 		/* fall through */
-	case EM_EMPTYUNDOBUFFER32:
+	case EM_EMPTYUNDOBUFFER:
 		DPRINTF_EDIT_MSG32("EM_EMPTYUNDOBUFFER");
 		EDIT_EM_EmptyUndoBuffer(wnd, es);
 		break;
@@ -616,7 +616,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 		DPRINTF_EDIT_MSG16("EM_GETFIRSTVISIBLELINE");
 		result = es->y_offset;
 		break;
-	case EM_GETFIRSTVISIBLELINE32:
+	case EM_GETFIRSTVISIBLELINE:
 		DPRINTF_EDIT_MSG32("EM_GETFIRSTVISIBLELINE");
 		result = (es->style & ES_MULTILINE) ? es->y_offset : es->x_offset;
 		break;
@@ -624,7 +624,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_SETREADONLY16:
 		DPRINTF_EDIT_MSG16("EM_SETREADONLY");
 		/* fall through */
-	case EM_SETREADONLY32:
+	case EM_SETREADONLY:
 		DPRINTF_EDIT_MSG32("EM_SETREADONLY");
 		if (wParam) {
 			wnd->dwStyle |= ES_READONLY;
@@ -640,16 +640,16 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 		DPRINTF_EDIT_MSG16("EM_SETWORDBREAKPROC");
 		EDIT_EM_SetWordBreakProc16(wnd, es, (EDITWORDBREAKPROC16)lParam);
 		break;
-	case EM_SETWORDBREAKPROC32:
+	case EM_SETWORDBREAKPROC:
 		DPRINTF_EDIT_MSG32("EM_SETWORDBREAKPROC");
-		EDIT_EM_SetWordBreakProc(wnd, es, (EDITWORDBREAKPROC32A)lParam);
+		EDIT_EM_SetWordBreakProc(wnd, es, (EDITWORDBREAKPROCA)lParam);
 		break;
 
 	case EM_GETWORDBREAKPROC16:
 		DPRINTF_EDIT_MSG16("EM_GETWORDBREAKPROC");
 		result = (LRESULT)es->word_break_proc16;
 		break;
-	case EM_GETWORDBREAKPROC32:
+	case EM_GETWORDBREAKPROC:
 		DPRINTF_EDIT_MSG32("EM_GETWORDBREAKPROC");
 		result = (LRESULT)es->word_break_proc32A;
 		break;
@@ -657,34 +657,34 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 	case EM_GETPASSWORDCHAR16:
 		DPRINTF_EDIT_MSG16("EM_GETPASSWORDCHAR");
 		/* fall through */
-	case EM_GETPASSWORDCHAR32:
+	case EM_GETPASSWORDCHAR:
 		DPRINTF_EDIT_MSG32("EM_GETPASSWORDCHAR");
 		result = es->password_char;
 		break;
 
 	/* The following EM_xxx are new to win95 and don't exist for 16 bit */
 
-	case EM_SETMARGINS32:
+	case EM_SETMARGINS:
 		DPRINTF_EDIT_MSG32("EM_SETMARGINS");
-		EDIT_EM_SetMargins(wnd, es, (INT32)wParam, SLOWORD(lParam), SHIWORD(lParam));
+		EDIT_EM_SetMargins(wnd, es, (INT)wParam, SLOWORD(lParam), SHIWORD(lParam));
 		break;
 
-	case EM_GETMARGINS32:
+	case EM_GETMARGINS:
 		DPRINTF_EDIT_MSG32("EM_GETMARGINS");
 		result = MAKELONG(es->left_margin, es->right_margin);
 		break;
 
-	case EM_GETLIMITTEXT32:
+	case EM_GETLIMITTEXT:
 		DPRINTF_EDIT_MSG32("EM_GETLIMITTEXT");
 		result = es->buffer_limit;
 		break;
 
-	case EM_POSFROMCHAR32:
+	case EM_POSFROMCHAR:
 		DPRINTF_EDIT_MSG32("EM_POSFROMCHAR");
-		result = EDIT_EM_PosFromChar(wnd, es, (INT32)wParam, FALSE);
+		result = EDIT_EM_PosFromChar(wnd, es, (INT)wParam, FALSE);
 		break;
 
-	case EM_CHARFROMPOS32:
+	case EM_CHARFROMPOS:
 		DPRINTF_EDIT_MSG32("EM_CHARFROMPOS");
 		result = EDIT_EM_CharFromPos(wnd, es, SLOWORD(lParam), SHIWORD(lParam));
 		break;
@@ -708,12 +708,12 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 
 	case WM_COMMAND:
 		DPRINTF_EDIT_MSG32("WM_COMMAND");
-		EDIT_WM_Command(wnd, es, HIWORD(wParam), LOWORD(wParam), (HWND32)lParam);
+		EDIT_WM_Command(wnd, es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam);
 		break;
 
  	case WM_CONTEXTMENU:
 		DPRINTF_EDIT_MSG32("WM_CONTEXTMENU");
-		EDIT_WM_ContextMenu(wnd, es, (HWND32)wParam, SLOWORD(lParam), SHIWORD(lParam));
+		EDIT_WM_ContextMenu(wnd, es, (HWND)wParam, SLOWORD(lParam), SHIWORD(lParam));
 		break;
 
 	case WM_COPY:
@@ -723,7 +723,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 
 	case WM_CREATE:
 		DPRINTF_EDIT_MSG32("WM_CREATE");
-		result = EDIT_WM_Create(wnd, es, (LPCREATESTRUCT32A)lParam);
+		result = EDIT_WM_Create(wnd, es, (LPCREATESTRUCTA)lParam);
 		break;
 
 	case WM_CUT:
@@ -733,12 +733,12 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 
 	case WM_ENABLE:
 		DPRINTF_EDIT_MSG32("WM_ENABLE");
-		InvalidateRect32(hwnd, NULL, TRUE);
+		InvalidateRect(hwnd, NULL, TRUE);
 		break;
 
 	case WM_ERASEBKGND:
 		DPRINTF_EDIT_MSG32("WM_ERASEBKGND");
-		result = EDIT_WM_EraseBkGnd(wnd, es, (HDC32)wParam);
+		result = EDIT_WM_EraseBkGnd(wnd, es, (HDC)wParam);
 		break;
 
 	case WM_GETFONT:
@@ -748,27 +748,27 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 
 	case WM_GETTEXT:
 		DPRINTF_EDIT_MSG32("WM_GETTEXT");
-		result = (LRESULT)EDIT_WM_GetText(wnd, es, (INT32)wParam, (LPSTR)lParam);
+		result = (LRESULT)EDIT_WM_GetText(wnd, es, (INT)wParam, (LPSTR)lParam);
 		break;
 
 	case WM_GETTEXTLENGTH:
 		DPRINTF_EDIT_MSG32("WM_GETTEXTLENGTH");
-		result = lstrlen32A(es->text);
+		result = lstrlenA(es->text);
 		break;
 
 	case WM_HSCROLL:
 		DPRINTF_EDIT_MSG32("WM_HSCROLL");
-		result = EDIT_WM_HScroll(wnd, es, LOWORD(wParam), SHIWORD(wParam), (HWND32)lParam);
+		result = EDIT_WM_HScroll(wnd, es, LOWORD(wParam), SHIWORD(wParam), (HWND)lParam);
 		break;
 
 	case WM_KEYDOWN:
 		DPRINTF_EDIT_MSG32("WM_KEYDOWN");
-		result = EDIT_WM_KeyDown(wnd, es, (INT32)wParam, (DWORD)lParam);
+		result = EDIT_WM_KeyDown(wnd, es, (INT)wParam, (DWORD)lParam);
 		break;
 
 	case WM_KILLFOCUS:
 		DPRINTF_EDIT_MSG32("WM_KILLFOCUS");
-		result = EDIT_WM_KillFocus(wnd, es, (HWND32)wParam);
+		result = EDIT_WM_KillFocus(wnd, es, (HWND)wParam);
 		break;
 
 	case WM_LBUTTONDBLCLK:
@@ -794,7 +794,7 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 		 *		modalless dialog box ???
 		 */
 		DPRINTF_EDIT_MSG32("WM_MOUSEACTIVATE");
-		SetFocus32(wnd->hwndSelf);
+		SetFocus(wnd->hwndSelf);
 		result = MA_ACTIVATE;
 		break;
 
@@ -817,12 +817,12 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 
 	case WM_SETFOCUS:
 		DPRINTF_EDIT_MSG32("WM_SETFOCUS");
-		EDIT_WM_SetFocus(wnd, es, (HWND32)wParam);
+		EDIT_WM_SetFocus(wnd, es, (HWND)wParam);
 		break;
 
 	case WM_SETFONT:
 		DPRINTF_EDIT_MSG32("WM_SETFONT");
-		EDIT_WM_SetFont(wnd, es, (HFONT32)wParam, LOWORD(lParam) != 0);
+		EDIT_WM_SetFont(wnd, es, (HFONT)wParam, LOWORD(lParam) != 0);
 		break;
 
 	case WM_SETTEXT:
@@ -833,26 +833,26 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
 
 	case WM_SIZE:
 		DPRINTF_EDIT_MSG32("WM_SIZE");
-		EDIT_WM_Size(wnd, es, (UINT32)wParam, LOWORD(lParam), HIWORD(lParam));
+		EDIT_WM_Size(wnd, es, (UINT)wParam, LOWORD(lParam), HIWORD(lParam));
 		break;
 
 	case WM_SYSKEYDOWN:
 		DPRINTF_EDIT_MSG32("WM_SYSKEYDOWN");
-		result = EDIT_WM_SysKeyDown(wnd, es, (INT32)wParam, (DWORD)lParam);
+		result = EDIT_WM_SysKeyDown(wnd, es, (INT)wParam, (DWORD)lParam);
 		break;
 
 	case WM_TIMER:
 		DPRINTF_EDIT_MSG32("WM_TIMER");
-		EDIT_WM_Timer(wnd, es, (INT32)wParam, (TIMERPROC32)lParam);
+		EDIT_WM_Timer(wnd, es, (INT)wParam, (TIMERPROC)lParam);
 		break;
 
 	case WM_VSCROLL:
 		DPRINTF_EDIT_MSG32("WM_VSCROLL");
-		result = EDIT_WM_VScroll(wnd, es, LOWORD(wParam), SHIWORD(wParam), (HWND32)(lParam));
+		result = EDIT_WM_VScroll(wnd, es, LOWORD(wParam), SHIWORD(wParam), (HWND)(lParam));
 		break;
 
 	default:
-		result = DefWindowProc32A(hwnd, msg, wParam, lParam);
+		result = DefWindowProcA(hwnd, msg, wParam, lParam);
 		break;
 	}
 	EDIT_UnlockBuffer(wnd, es, FALSE);
@@ -871,10 +871,10 @@ LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
  */
 static void EDIT_BuildLineDefs_ML(WND *wnd, EDITSTATE *es)
 {
-	HDC32 dc;
-	HFONT32 old_font = 0;
+	HDC dc;
+	HFONT old_font = 0;
 	LPSTR start, cp;
-	INT32 fw;
+	INT fw;
 	LINEDEF *current_def;
 	LINEDEF **previous_next;
 
@@ -887,9 +887,9 @@ static void EDIT_BuildLineDefs_ML(WND *wnd, EDITSTATE *es)
 	es->line_count = 0;
 	es->text_width = 0;
 
-	dc = GetDC32(wnd->hwndSelf);
+	dc = GetDC(wnd->hwndSelf);
 	if (es->font)
-		old_font = SelectObject32(dc, es->font);
+		old_font = SelectObject(dc, es->font);
 
 	fw = es->format_rect.right - es->format_rect.left;
 	start = es->text;
@@ -905,7 +905,7 @@ static void EDIT_BuildLineDefs_ML(WND *wnd, EDITSTATE *es)
 		}
 		if (!(*cp)) {
 			current_def->ending = END_0;
-			current_def->net_length = lstrlen32A(start);
+			current_def->net_length = lstrlenA(start);
 		} else if ((cp > start) && (*(cp - 1) == '\r')) {
 			current_def->ending = END_SOFT;
 			current_def->net_length = cp - start - 1;
@@ -913,18 +913,18 @@ static void EDIT_BuildLineDefs_ML(WND *wnd, EDITSTATE *es)
 			current_def->ending = END_HARD;
 			current_def->net_length = cp - start;
 		}
-		current_def->width = (INT32)LOWORD(GetTabbedTextExtent32A(dc,
+		current_def->width = (INT)LOWORD(GetTabbedTextExtentA(dc,
 					start, current_def->net_length,
 					es->tabs_count, es->tabs));
 		/* FIXME: check here for lines that are too wide even in AUTOHSCROLL (> 32767 ???) */
 		if ((!(es->style & ES_AUTOHSCROLL)) && (current_def->width > fw)) {
-			INT32 next = 0;
-			INT32 prev;
+			INT next = 0;
+			INT prev;
 			do {
 				prev = next;
 				next = EDIT_CallWordBreakProc(wnd, es, start - es->text,
 						prev + 1, current_def->net_length, WB_RIGHT);
-				current_def->width = (INT32)LOWORD(GetTabbedTextExtent32A(dc,
+				current_def->width = (INT)LOWORD(GetTabbedTextExtentA(dc,
 							start, next, es->tabs_count, es->tabs));
 			} while (current_def->width <= fw);
 			if (!prev) {
@@ -932,7 +932,7 @@ static void EDIT_BuildLineDefs_ML(WND *wnd, EDITSTATE *es)
 				do {
 					prev = next;
 					next++;
-					current_def->width = (INT32)LOWORD(GetTabbedTextExtent32A(dc,
+					current_def->width = (INT)LOWORD(GetTabbedTextExtentA(dc,
 								start, next, es->tabs_count, es->tabs));
 				} while (current_def->width <= fw);
 				if (!prev)
@@ -940,7 +940,7 @@ static void EDIT_BuildLineDefs_ML(WND *wnd, EDITSTATE *es)
 			}
 			current_def->net_length = prev;
 			current_def->ending = END_WRAP;
-			current_def->width = (INT32)LOWORD(GetTabbedTextExtent32A(dc, start,
+			current_def->width = (INT)LOWORD(GetTabbedTextExtentA(dc, start,
 						current_def->net_length, es->tabs_count, es->tabs));
 		}
 		switch (current_def->ending) {
@@ -962,8 +962,8 @@ static void EDIT_BuildLineDefs_ML(WND *wnd, EDITSTATE *es)
 		es->line_count++;
 	} while (current_def->ending != END_0);
 	if (es->font)
-		SelectObject32(dc, old_font);
-	ReleaseDC32(wnd->hwndSelf, dc);
+		SelectObject(dc, old_font);
+	ReleaseDC(wnd->hwndSelf, dc);
 }
 
 
@@ -980,12 +980,12 @@ static void EDIT_BuildLineDefs_ML(WND *wnd, EDITSTATE *es)
  *		the string under examination (we can decide this for ourselves).
  *
  */
-static INT32 EDIT_CallWordBreakProc(WND *wnd, EDITSTATE *es, INT32 start, INT32 index, INT32 count, INT32 action)
+static INT EDIT_CallWordBreakProc(WND *wnd, EDITSTATE *es, INT start, INT index, INT count, INT action)
 {
 	if (es->word_break_proc16) {
 		HLOCAL16 hloc16 = EDIT_EM_GetHandle16(wnd, es);
 		SEGPTR segptr = LocalLock16(hloc16);
-		INT32 ret = (INT32)Callbacks->CallWordBreakProc(es->word_break_proc16,
+		INT ret = (INT)Callbacks->CallWordBreakProc(es->word_break_proc16,
 						segptr + start, index, count, action);
 		LocalUnlock16(hloc16);
 		return ret;
@@ -995,7 +995,7 @@ static INT32 EDIT_CallWordBreakProc(WND *wnd, EDITSTATE *es, INT32 start, INT32
             TRACE(relay, "(wordbrk=%p,str='%s',idx=%d,cnt=%d,act=%d)\n",
                            es->word_break_proc32A, es->text + start, index,
                            count, action );
-            return (INT32)es->word_break_proc32A( es->text + start, index,
+            return (INT)es->word_break_proc32A( es->text + start, index,
                                                   count, action );
         }
 	else
@@ -1013,17 +1013,17 @@ static INT32 EDIT_CallWordBreakProc(WND *wnd, EDITSTATE *es, INT32 start, INT32
  *		The return value is only the character index
  *
  */
-static INT32 EDIT_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y, LPBOOL32 after_wrap)
+static INT EDIT_CharFromPos(WND *wnd, EDITSTATE *es, INT x, INT y, LPBOOL after_wrap)
 {
-	INT32 index;
-	HDC32 dc;
-	HFONT32 old_font = 0;
+	INT index;
+	HDC dc;
+	HFONT old_font = 0;
 
 	if (es->style & ES_MULTILINE) {
-		INT32 line = (y - es->format_rect.top) / es->line_height + es->y_offset;
-		INT32 line_index = 0;
+		INT line = (y - es->format_rect.top) / es->line_height + es->y_offset;
+		INT line_index = 0;
 		LINEDEF *line_def = es->first_line_def;
-		INT32 low, high;
+		INT low, high;
 		while ((line > 0) && line_def->next) {
 			line_index += line_def->length;
 			line_def = line_def->next;
@@ -1040,15 +1040,15 @@ static INT32 EDIT_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y, LPBOOL3
 				*after_wrap = FALSE;
 			return line_index;
 		}
-		dc = GetDC32(wnd->hwndSelf);
+		dc = GetDC(wnd->hwndSelf);
 		if (es->font)
-			old_font = SelectObject32(dc, es->font);
+			old_font = SelectObject(dc, es->font);
                     low = line_index + 1;
                     high = line_index + line_def->net_length + 1;
                     while (low < high - 1)
                     {
-                        INT32 mid = (low + high) / 2;
-			if (LOWORD(GetTabbedTextExtent32A(dc, es->text + line_index,mid - line_index, es->tabs_count, es->tabs)) > x) high = mid;
+                        INT mid = (low + high) / 2;
+			if (LOWORD(GetTabbedTextExtentA(dc, es->text + line_index,mid - line_index, es->tabs_count, es->tabs)) > x) high = mid;
                         else low = mid;
                     }
                     index = low;
@@ -1058,23 +1058,23 @@ static INT32 EDIT_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y, LPBOOL3
 							(line_def->ending == END_WRAP));
 	} else {
 		LPSTR text;
-		SIZE32 size;
+		SIZE size;
 		if (after_wrap)
 			*after_wrap = FALSE;
 		x -= es->format_rect.left;
 		if (!x)
 			return es->x_offset;
 		text = EDIT_GetPasswordPointer_SL(wnd, es);
-		dc = GetDC32(wnd->hwndSelf);
+		dc = GetDC(wnd->hwndSelf);
 		if (es->font)
-			old_font = SelectObject32(dc, es->font);
+			old_font = SelectObject(dc, es->font);
 		if (x < 0)
                 {
-                    INT32 low = 0;
-                    INT32 high = es->x_offset;
+                    INT low = 0;
+                    INT high = es->x_offset;
                     while (low < high - 1)
                     {
-                        INT32 mid = (low + high) / 2;
+                        INT mid = (low + high) / 2;
                         GetTextExtentPoint32A( dc, text + mid,
                                                es->x_offset - mid, &size );
                         if (size.cx > -x) low = mid;
@@ -1084,11 +1084,11 @@ static INT32 EDIT_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y, LPBOOL3
 		}
                 else
                 {
-                    INT32 low = es->x_offset;
-                    INT32 high = lstrlen32A(es->text) + 1;
+                    INT low = es->x_offset;
+                    INT high = lstrlenA(es->text) + 1;
                     while (low < high - 1)
                     {
-                        INT32 mid = (low + high) / 2;
+                        INT mid = (low + high) / 2;
                         GetTextExtentPoint32A( dc, text + es->x_offset,
                                                mid - es->x_offset, &size );
                         if (size.cx > x) high = mid;
@@ -1100,8 +1100,8 @@ static INT32 EDIT_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y, LPBOOL3
 			HeapFree(es->heap, 0 ,text);
 	}
 	if (es->font)
-		SelectObject32(dc, old_font);
-	ReleaseDC32(wnd->hwndSelf, dc);
+		SelectObject(dc, old_font);
+	ReleaseDC(wnd->hwndSelf, dc);
 	return index;
 }
 
@@ -1114,7 +1114,7 @@ static INT32 EDIT_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y, LPBOOL3
  *	(so CharFromPos returns the nearest _visible_ character)
  *
  */
-static void EDIT_ConfinePoint(WND *wnd, EDITSTATE *es, LPINT32 x, LPINT32 y)
+static void EDIT_ConfinePoint(WND *wnd, EDITSTATE *es, LPINT x, LPINT y)
 {
 	*x = MIN(MAX(*x, es->format_rect.left), es->format_rect.right - 1);
 	*y = MIN(MAX(*y, es->format_rect.top), es->format_rect.bottom - 1);
@@ -1129,9 +1129,9 @@ static void EDIT_ConfinePoint(WND *wnd, EDITSTATE *es, LPINT32 x, LPINT32 y)
  *	column to an ending column.
  *
  */
-static void EDIT_GetLineRect(WND *wnd, EDITSTATE *es, INT32 line, INT32 scol, INT32 ecol, LPRECT32 rc)
+static void EDIT_GetLineRect(WND *wnd, EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT rc)
 {
-	INT32 line_index =  EDIT_EM_LineIndex(wnd, es, line);
+	INT line_index =  EDIT_EM_LineIndex(wnd, es, line);
 
 	if (es->style & ES_MULTILINE)
 		rc->top = es->format_rect.top + (line - es->y_offset) * es->line_height;
@@ -1153,7 +1153,7 @@ static void EDIT_GetLineRect(WND *wnd, EDITSTATE *es, INT32 line, INT32 scol, IN
 static LPSTR EDIT_GetPasswordPointer_SL(WND *wnd, EDITSTATE *es)
 {
 	if (es->style & ES_PASSWORD) {
-		INT32 len = lstrlen32A(es->text);
+		INT len = lstrlenA(es->text);
 		LPSTR text = HeapAlloc(es->heap, 0, len + 1);
 		RtlFillMemory(text, len, es->password_char);
 		text[len] = '\0';
@@ -1181,7 +1181,7 @@ static void EDIT_LockBuffer(WND *wnd, EDITSTATE *es)
 		return;
 	if (!es->text) {
 		if (es->hloc32)
-			es->text = LocalLock32(es->hloc32);
+			es->text = LocalLock(es->hloc32);
 		else if (es->hloc16)
 			es->text = LOCAL_Lock(wnd->hInstance, es->hloc16);
 		else {
@@ -1201,14 +1201,14 @@ static void EDIT_LockBuffer(WND *wnd, EDITSTATE *es)
  *	Does the job for single-line controls only.
  *
  */
-static void EDIT_SL_InvalidateText(WND *wnd, EDITSTATE *es, INT32 start, INT32 end)
+static void EDIT_SL_InvalidateText(WND *wnd, EDITSTATE *es, INT start, INT end)
 {
-	RECT32 line_rect;
-	RECT32 rc;
+	RECT line_rect;
+	RECT rc;
 
 	EDIT_GetLineRect(wnd, es, 0, start, end, &line_rect);
-	if (IntersectRect32(&rc, &line_rect, &es->format_rect))
-		InvalidateRect32(wnd->hwndSelf, &rc, FALSE);
+	if (IntersectRect(&rc, &line_rect, &es->format_rect))
+		InvalidateRect(wnd->hwndSelf, &rc, FALSE);
 }
 
 
@@ -1220,18 +1220,18 @@ static void EDIT_SL_InvalidateText(WND *wnd, EDITSTATE *es, INT32 start, INT32 e
  *	Does the job for multi-line controls only.
  *
  */
-static void EDIT_ML_InvalidateText(WND *wnd, EDITSTATE *es, INT32 start, INT32 end)
+static void EDIT_ML_InvalidateText(WND *wnd, EDITSTATE *es, INT start, INT end)
 {
-	INT32 vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
-	INT32 sl = EDIT_EM_LineFromChar(wnd, es, start);
-	INT32 el = EDIT_EM_LineFromChar(wnd, es, end);
-	INT32 sc;
-	INT32 ec;
-	RECT32 rc1;
-	RECT32 rcWnd;
-	RECT32 rcLine;
-	RECT32 rcUpdate;
-	INT32 l;
+	INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
+	INT sl = EDIT_EM_LineFromChar(wnd, es, start);
+	INT el = EDIT_EM_LineFromChar(wnd, es, end);
+	INT sc;
+	INT ec;
+	RECT rc1;
+	RECT rcWnd;
+	RECT rcLine;
+	RECT rcUpdate;
+	INT l;
 
 	if ((el < es->y_offset) || (sl > es->y_offset + vlc))
 		return;
@@ -1246,30 +1246,30 @@ static void EDIT_ML_InvalidateText(WND *wnd, EDITSTATE *es, INT32 start, INT32 e
 		el = es->y_offset + vlc;
 		ec = EDIT_EM_LineLength(wnd, es, EDIT_EM_LineIndex(wnd, es, el));
 	}
-	GetClientRect32(wnd->hwndSelf, &rc1);
-	IntersectRect32(&rcWnd, &rc1, &es->format_rect);
+	GetClientRect(wnd->hwndSelf, &rc1);
+	IntersectRect(&rcWnd, &rc1, &es->format_rect);
 	if (sl == el) {
 		EDIT_GetLineRect(wnd, es, sl, sc, ec, &rcLine);
-		if (IntersectRect32(&rcUpdate, &rcWnd, &rcLine))
-			InvalidateRect32(wnd->hwndSelf, &rcUpdate, FALSE);
+		if (IntersectRect(&rcUpdate, &rcWnd, &rcLine))
+			InvalidateRect(wnd->hwndSelf, &rcUpdate, FALSE);
 	} else {
 		EDIT_GetLineRect(wnd, es, sl, sc,
 				EDIT_EM_LineLength(wnd, es,
 					EDIT_EM_LineIndex(wnd, es, sl)),
 				&rcLine);
-		if (IntersectRect32(&rcUpdate, &rcWnd, &rcLine))
-			InvalidateRect32(wnd->hwndSelf, &rcUpdate, FALSE);
+		if (IntersectRect(&rcUpdate, &rcWnd, &rcLine))
+			InvalidateRect(wnd->hwndSelf, &rcUpdate, FALSE);
 		for (l = sl + 1 ; l < el ; l++) {
 			EDIT_GetLineRect(wnd, es, l, 0,
 				EDIT_EM_LineLength(wnd, es,
 					EDIT_EM_LineIndex(wnd, es, l)),
 				&rcLine);
-			if (IntersectRect32(&rcUpdate, &rcWnd, &rcLine))
-				InvalidateRect32(wnd->hwndSelf, &rcUpdate, FALSE);
+			if (IntersectRect(&rcUpdate, &rcWnd, &rcLine))
+				InvalidateRect(wnd->hwndSelf, &rcUpdate, FALSE);
 		}
 		EDIT_GetLineRect(wnd, es, el, 0, ec, &rcLine);
-		if (IntersectRect32(&rcUpdate, &rcWnd, &rcLine))
-			InvalidateRect32(wnd->hwndSelf, &rcUpdate, FALSE);
+		if (IntersectRect(&rcUpdate, &rcWnd, &rcLine))
+			InvalidateRect(wnd->hwndSelf, &rcUpdate, FALSE);
 	}
 }
 
@@ -1285,15 +1285,15 @@ static void EDIT_ML_InvalidateText(WND *wnd, EDITSTATE *es, INT32 start, INT32 e
  *	start and end need not be ordered.
  *
  */
-static void EDIT_InvalidateText(WND *wnd, EDITSTATE *es, INT32 start, INT32 end)
+static void EDIT_InvalidateText(WND *wnd, EDITSTATE *es, INT start, INT end)
 {
 	if (end == start)
 		return;
 
 	if (end == -1)
-		end = lstrlen32A(es->text);
+		end = lstrlenA(es->text);
 
-	ORDER_INT32(start, end);
+	ORDER_INT(start, end);
 
 	if (es->style & ES_MULTILINE)
 		EDIT_ML_InvalidateText(wnd, es, start, end);
@@ -1309,9 +1309,9 @@ static void EDIT_InvalidateText(WND *wnd, EDITSTATE *es, INT32 start, INT32 end)
  *	Try to fit size + 1 bytes in the buffer.  Constrain to limits.
  *
  */
-static BOOL32 EDIT_MakeFit(WND *wnd, EDITSTATE *es, INT32 size)
+static BOOL EDIT_MakeFit(WND *wnd, EDITSTATE *es, INT size)
 {
-	HLOCAL32 hNew32;
+	HLOCAL hNew32;
 	HLOCAL16 hNew16;
 
 	if (size <= es->buffer_size)
@@ -1333,10 +1333,10 @@ static BOOL32 EDIT_MakeFit(WND *wnd, EDITSTATE *es, INT32 size)
 		else
 			es->buffer_size = 0;
 	} else if (es->hloc32) {
-		if ((hNew32 = LocalReAlloc32(es->hloc32, size + 1, 0))) {
+		if ((hNew32 = LocalReAlloc(es->hloc32, size + 1, 0))) {
 			TRACE(edit, "Old 32 bit handle %08x, new handle %08x\n", es->hloc32, hNew32);
 			es->hloc32 = hNew32;
-			es->buffer_size = MIN(LocalSize32(es->hloc32) - 1, es->buffer_limit);
+			es->buffer_size = MIN(LocalSize(es->hloc32) - 1, es->buffer_limit);
 		}
 	} else if (es->hloc16) {
 		if ((hNew16 = LOCAL_ReAlloc(wnd->hInstance, es->hloc16, size + 1, LMEM_MOVEABLE))) {
@@ -1365,7 +1365,7 @@ static BOOL32 EDIT_MakeFit(WND *wnd, EDITSTATE *es, INT32 size)
  *	Try to fit size + 1 bytes in the undo buffer.
  *
  */
-static BOOL32 EDIT_MakeUndoFit(WND *wnd, EDITSTATE *es, INT32 size)
+static BOOL EDIT_MakeUndoFit(WND *wnd, EDITSTATE *es, INT size)
 {
 	if (size <= es->undo_buffer_size)
 		return TRUE;
@@ -1390,9 +1390,9 @@ static BOOL32 EDIT_MakeUndoFit(WND *wnd, EDITSTATE *es, INT32 size)
  *	EDIT_MoveBackward
  *
  */
-static void EDIT_MoveBackward(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MoveBackward(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	INT32 e = es->selection_end;
+	INT e = es->selection_end;
 
 	if (e) {
 		e--;
@@ -1417,14 +1417,14 @@ static void EDIT_MoveBackward(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	x coordinate on the screen (might be a different column).
  *
  */
-static void EDIT_MoveDown_ML(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MoveDown_ML(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	INT32 s = es->selection_start;
-	INT32 e = es->selection_end;
-	BOOL32 after_wrap = (es->flags & EF_AFTER_WRAP);
+	INT s = es->selection_start;
+	INT e = es->selection_end;
+	BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
 	LRESULT pos = EDIT_EM_PosFromChar(wnd, es, e, after_wrap);
-	INT32 x = SLOWORD(pos);
-	INT32 y = SHIWORD(pos);
+	INT x = SLOWORD(pos);
+	INT y = SHIWORD(pos);
 
 	e = EDIT_CharFromPos(wnd, es, x, y + es->line_height, &after_wrap);
 	if (!extend)
@@ -1439,16 +1439,16 @@ static void EDIT_MoveDown_ML(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	EDIT_MoveEnd
  *
  */
-static void EDIT_MoveEnd(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MoveEnd(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	BOOL32 after_wrap = FALSE;
-	INT32 e;
+	BOOL after_wrap = FALSE;
+	INT e;
 
 	if (es->style & ES_MULTILINE)
 		e = EDIT_CharFromPos(wnd, es, 0x7fffffff,
 			HIWORD(EDIT_EM_PosFromChar(wnd, es, es->selection_end, es->flags & EF_AFTER_WRAP)), &after_wrap);
 	else
-		e = lstrlen32A(es->text);
+		e = lstrlenA(es->text);
 	EDIT_EM_SetSel(wnd, es, extend ? es->selection_start : e, e, after_wrap);
 	EDIT_EM_ScrollCaret(wnd, es);
 }
@@ -1459,9 +1459,9 @@ static void EDIT_MoveEnd(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	EDIT_MoveForward
  *
  */
-static void EDIT_MoveForward(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MoveForward(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	INT32 e = es->selection_end;
+	INT e = es->selection_end;
 
 	if (es->text[e]) {
 		e++;
@@ -1484,9 +1484,9 @@ static void EDIT_MoveForward(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	Home key: move to beginning of line.
  *
  */
-static void EDIT_MoveHome(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MoveHome(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	INT32 e;
+	INT e;
 
 	if (es->style & ES_MULTILINE)
 		e = EDIT_CharFromPos(wnd, es, 0x80000000,
@@ -1507,14 +1507,14 @@ static void EDIT_MoveHome(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	x coordinate on the screen (might be a different column).
  *
  */
-static void EDIT_MovePageDown_ML(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MovePageDown_ML(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	INT32 s = es->selection_start;
-	INT32 e = es->selection_end;
-	BOOL32 after_wrap = (es->flags & EF_AFTER_WRAP);
+	INT s = es->selection_start;
+	INT e = es->selection_end;
+	BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
 	LRESULT pos = EDIT_EM_PosFromChar(wnd, es, e, after_wrap);
-	INT32 x = SLOWORD(pos);
-	INT32 y = SHIWORD(pos);
+	INT x = SLOWORD(pos);
+	INT y = SHIWORD(pos);
 
 	e = EDIT_CharFromPos(wnd, es, x,
 		y + (es->format_rect.bottom - es->format_rect.top),
@@ -1535,14 +1535,14 @@ static void EDIT_MovePageDown_ML(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	x coordinate on the screen (might be a different column).
  *
  */
-static void EDIT_MovePageUp_ML(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MovePageUp_ML(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	INT32 s = es->selection_start;
-	INT32 e = es->selection_end;
-	BOOL32 after_wrap = (es->flags & EF_AFTER_WRAP);
+	INT s = es->selection_start;
+	INT e = es->selection_end;
+	BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
 	LRESULT pos = EDIT_EM_PosFromChar(wnd, es, e, after_wrap);
-	INT32 x = SLOWORD(pos);
-	INT32 y = SHIWORD(pos);
+	INT x = SLOWORD(pos);
+	INT y = SHIWORD(pos);
 
 	e = EDIT_CharFromPos(wnd, es, x,
 		y - (es->format_rect.bottom - es->format_rect.top),
@@ -1563,14 +1563,14 @@ static void EDIT_MovePageUp_ML(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	x coordinate on the screen (might be a different column).
  *
  */ 
-static void EDIT_MoveUp_ML(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MoveUp_ML(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	INT32 s = es->selection_start;
-	INT32 e = es->selection_end;
-	BOOL32 after_wrap = (es->flags & EF_AFTER_WRAP);
+	INT s = es->selection_start;
+	INT e = es->selection_end;
+	BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
 	LRESULT pos = EDIT_EM_PosFromChar(wnd, es, e, after_wrap);
-	INT32 x = SLOWORD(pos);
-	INT32 y = SHIWORD(pos);
+	INT x = SLOWORD(pos);
+	INT y = SHIWORD(pos);
 
 	e = EDIT_CharFromPos(wnd, es, x, y - es->line_height, &after_wrap);
 	if (!extend)
@@ -1585,13 +1585,13 @@ static void EDIT_MoveUp_ML(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	EDIT_MoveWordBackward
  *
  */
-static void EDIT_MoveWordBackward(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MoveWordBackward(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	INT32 s = es->selection_start;
-	INT32 e = es->selection_end;
-	INT32 l;
-	INT32 ll;
-	INT32 li;
+	INT s = es->selection_start;
+	INT e = es->selection_end;
+	INT l;
+	INT ll;
+	INT li;
 
 	l = EDIT_EM_LineFromChar(wnd, es, e);
 	ll = EDIT_EM_LineLength(wnd, es, e);
@@ -1602,7 +1602,7 @@ static void EDIT_MoveWordBackward(WND *wnd, EDITSTATE *es, BOOL32 extend)
 			e = li + EDIT_EM_LineLength(wnd, es, li);
 		}
 	} else {
-		e = li + (INT32)EDIT_CallWordBreakProc(wnd, es,
+		e = li + (INT)EDIT_CallWordBreakProc(wnd, es,
 				li, e - li, ll, WB_LEFT);
 	}
 	if (!extend)
@@ -1617,13 +1617,13 @@ static void EDIT_MoveWordBackward(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	EDIT_MoveWordForward
  *
  */
-static void EDIT_MoveWordForward(WND *wnd, EDITSTATE *es, BOOL32 extend)
+static void EDIT_MoveWordForward(WND *wnd, EDITSTATE *es, BOOL extend)
 {
-	INT32 s = es->selection_start;
-	INT32 e = es->selection_end;
-	INT32 l;
-	INT32 ll;
-	INT32 li;
+	INT s = es->selection_start;
+	INT e = es->selection_end;
+	INT l;
+	INT ll;
+	INT li;
 
 	l = EDIT_EM_LineFromChar(wnd, es, e);
 	ll = EDIT_EM_LineLength(wnd, es, e);
@@ -1647,18 +1647,18 @@ static void EDIT_MoveWordForward(WND *wnd, EDITSTATE *es, BOOL32 extend)
  *	EDIT_PaintLine
  *
  */
-static void EDIT_PaintLine(WND *wnd, EDITSTATE *es, HDC32 dc, INT32 line, BOOL32 rev)
+static void EDIT_PaintLine(WND *wnd, EDITSTATE *es, HDC dc, INT line, BOOL rev)
 {
-	INT32 s = es->selection_start;
-	INT32 e = es->selection_end;
-	INT32 li;
-	INT32 ll;
-	INT32 x;
-	INT32 y;
+	INT s = es->selection_start;
+	INT e = es->selection_end;
+	INT li;
+	INT ll;
+	INT x;
+	INT y;
 	LRESULT pos;
 
 	if (es->style & ES_MULTILINE) {
-		INT32 vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
+		INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
 		if ((line < es->y_offset) || (line > es->y_offset + vlc) || (line >= es->line_count))
 			return;
 	} else if (line)
@@ -1673,7 +1673,7 @@ static void EDIT_PaintLine(WND *wnd, EDITSTATE *es, HDC32 dc, INT32 line, BOOL32
 	ll = EDIT_EM_LineLength(wnd, es, li);
 	s = es->selection_start;
 	e = es->selection_end;
-	ORDER_INT32(s, e);
+	ORDER_INT(s, e);
 	s = MIN(li + ll, MAX(li, s));
 	e = MIN(li + ll, MAX(li, e));
 	if (rev && (s != e) &&
@@ -1691,37 +1691,37 @@ static void EDIT_PaintLine(WND *wnd, EDITSTATE *es, HDC32 dc, INT32 line, BOOL32
  *	EDIT_PaintText
  *
  */
-static INT32 EDIT_PaintText(WND *wnd, EDITSTATE *es, HDC32 dc, INT32 x, INT32 y, INT32 line, INT32 col, INT32 count, BOOL32 rev)
+static INT EDIT_PaintText(WND *wnd, EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col, INT count, BOOL rev)
 {
 	COLORREF BkColor;
 	COLORREF TextColor;
-	INT32 ret;
-	INT32 li;
-	SIZE32 size;
+	INT ret;
+	INT li;
+	SIZE size;
 
 	if (!count)
 		return 0;
-	BkColor = GetBkColor32(dc);
-	TextColor = GetTextColor32(dc);
+	BkColor = GetBkColor(dc);
+	TextColor = GetTextColor(dc);
 	if (rev) {
-		SetBkColor32(dc, GetSysColor32(COLOR_HIGHLIGHT));
-		SetTextColor32(dc, GetSysColor32(COLOR_HIGHLIGHTTEXT));
+		SetBkColor(dc, GetSysColor(COLOR_HIGHLIGHT));
+		SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT));
 	}
 	li = EDIT_EM_LineIndex(wnd, es, line);
 	if (es->style & ES_MULTILINE) {
-		ret = (INT32)LOWORD(TabbedTextOut32A(dc, x, y, es->text + li + col, count,
+		ret = (INT)LOWORD(TabbedTextOutA(dc, x, y, es->text + li + col, count,
 					es->tabs_count, es->tabs, es->format_rect.left - es->x_offset));
 	} else {
 		LPSTR text = EDIT_GetPasswordPointer_SL(wnd, es);
-		TextOut32A(dc, x, y, text + li + col, count);
+		TextOutA(dc, x, y, text + li + col, count);
 		GetTextExtentPoint32A(dc, text + li + col, count, &size);
 		ret = size.cx;
 		if (es->style & ES_PASSWORD)
 			HeapFree(es->heap, 0, text);
 	}
 	if (rev) {
-		SetBkColor32(dc, BkColor);
-		SetTextColor32(dc, TextColor);
+		SetBkColor(dc, BkColor);
+		SetTextColor(dc, TextColor);
 	}
 	return ret;
 }
@@ -1732,12 +1732,12 @@ static INT32 EDIT_PaintText(WND *wnd, EDITSTATE *es, HDC32 dc, INT32 x, INT32 y,
  *	EDIT_SetCaretPos
  *
  */
-static void EDIT_SetCaretPos(WND *wnd, EDITSTATE *es, INT32 pos,
-			     BOOL32 after_wrap)
+static void EDIT_SetCaretPos(WND *wnd, EDITSTATE *es, INT pos,
+			     BOOL after_wrap)
 {
 	LRESULT res = EDIT_EM_PosFromChar(wnd, es, pos, after_wrap);
-	INT32 x = SLOWORD(res);
-	INT32 y = SHIWORD(res);
+	INT x = SLOWORD(res);
+	INT y = SHIWORD(res);
 
 	if(x < es->format_rect.left)
 		x = es->format_rect.left;
@@ -1747,7 +1747,7 @@ static void EDIT_SetCaretPos(WND *wnd, EDITSTATE *es, INT32 pos,
 		y = es->format_rect.bottom;
 	if(y < es->format_rect.top)
 		y = es->format_rect.top;
-	SetCaretPos32(x, y);
+	SetCaretPos(x, y);
 	return;
 }
 
@@ -1760,11 +1760,11 @@ static void EDIT_SetCaretPos(WND *wnd, EDITSTATE *es, INT32 pos,
  *		it is also used to set the rect of a single line control
  *
  */
-static void EDIT_SetRectNP(WND *wnd, EDITSTATE *es, LPRECT32 rc)
+static void EDIT_SetRectNP(WND *wnd, EDITSTATE *es, LPRECT rc)
 {
-	CopyRect32(&es->format_rect, rc);
+	CopyRect(&es->format_rect, rc);
 	if (es->style & WS_BORDER) {
-		INT32 bw = GetSystemMetrics32(SM_CXBORDER) + 1;
+		INT bw = GetSystemMetrics(SM_CXBORDER) + 1;
 		if(TWEAK_WineLook == WIN31_LOOK)
 			bw += 2;
 		es->format_rect.left += bw;
@@ -1790,7 +1790,7 @@ static void EDIT_SetRectNP(WND *wnd, EDITSTATE *es, LPRECT32 rc)
  *	EDIT_UnlockBuffer
  *
  */
-static void EDIT_UnlockBuffer(WND *wnd, EDITSTATE *es, BOOL32 force)
+static void EDIT_UnlockBuffer(WND *wnd, EDITSTATE *es, BOOL force)
 {
 	if (!es) {
 		ERR(edit, "no EDITSTATE ... please report\n");
@@ -1808,7 +1808,7 @@ static void EDIT_UnlockBuffer(WND *wnd, EDITSTATE *es, BOOL32 force)
 	}
 	if (force || (es->lock_count == 1)) {
 		if (es->hloc32) {
-			LocalUnlock32(es->hloc32);
+			LocalUnlock(es->hloc32);
 			es->text = NULL;
 		} else if (es->hloc16) {
 			LOCAL_Unlock(wnd->hInstance, es->hloc16);
@@ -1830,9 +1830,9 @@ static void EDIT_UnlockBuffer(WND *wnd, EDITSTATE *es, BOOL32 force)
  *		internally, so we can decide this for ourselves.
  *
  */
-static INT32 EDIT_WordBreakProc(LPSTR s, INT32 index, INT32 count, INT32 action)
+static INT EDIT_WordBreakProc(LPSTR s, INT index, INT count, INT action)
 {
-	INT32 ret = 0;
+	INT ret = 0;
 
 	TRACE(edit, "s=%p, index=%u, count=%u, action=%d\n", 
 		     s, index, count, action);
@@ -1896,16 +1896,16 @@ static INT32 EDIT_WordBreakProc(LPSTR s, INT32 index, INT32 count, INT32 action)
  *		if outside formatting rectangle ???
  *
  */
-static LRESULT EDIT_EM_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y)
+static LRESULT EDIT_EM_CharFromPos(WND *wnd, EDITSTATE *es, INT x, INT y)
 {
-	POINT32 pt;
-	RECT32 rc;
-	INT32 index;
+	POINT pt;
+	RECT rc;
+	INT index;
 
 	pt.x = x;
 	pt.y = y;
-	GetClientRect32(wnd->hwndSelf, &rc);
-	if (!PtInRect32(&rc, pt))
+	GetClientRect(wnd->hwndSelf, &rc);
+	if (!PtInRect(&rc, pt))
 		return -1;
 
 	index = EDIT_CharFromPos(wnd, es, x, y, NULL);
@@ -1919,7 +1919,7 @@ static LRESULT EDIT_EM_CharFromPos(WND *wnd, EDITSTATE *es, INT32 x, INT32 y)
  *
  * Enable or disable soft breaks.
  */
-static BOOL32 EDIT_EM_FmtLines(WND *wnd, EDITSTATE *es, BOOL32 add_eol)
+static BOOL EDIT_EM_FmtLines(WND *wnd, EDITSTATE *es, BOOL add_eol)
 {
 	es->flags &= ~EF_USE_SOFTBRK;
 	if (add_eol) {
@@ -1946,11 +1946,11 @@ static BOOL32 EDIT_EM_FmtLines(WND *wnd, EDITSTATE *es, BOOL32 add_eol)
  *	In this function we'll try to switch to local heap.
  *
  */
-static HLOCAL32 EDIT_EM_GetHandle(WND *wnd, EDITSTATE *es)
+static HLOCAL EDIT_EM_GetHandle(WND *wnd, EDITSTATE *es)
 {
-	HLOCAL32 newBuf;
+	HLOCAL newBuf;
 	LPSTR newText;
-	INT32 newSize;
+	INT newSize;
 
 	if (!(es->style & ES_MULTILINE))
 		return 0;
@@ -1958,19 +1958,19 @@ static HLOCAL32 EDIT_EM_GetHandle(WND *wnd, EDITSTATE *es)
 	if (es->hloc32)
 		return es->hloc32;
 	else if (es->hloc16)
-		return (HLOCAL32)es->hloc16;
+		return (HLOCAL)es->hloc16;
 
-	if (!(newBuf = LocalAlloc32(LMEM_MOVEABLE, lstrlen32A(es->text) + 1))) {
+	if (!(newBuf = LocalAlloc(LMEM_MOVEABLE, lstrlenA(es->text) + 1))) {
 		ERR(edit, "could not allocate new 32 bit buffer\n");
 		return 0;
 	}
-	newSize = MIN(LocalSize32(newBuf) - 1, es->buffer_limit);
-	if (!(newText = LocalLock32(newBuf))) {
+	newSize = MIN(LocalSize(newBuf) - 1, es->buffer_limit);
+	if (!(newText = LocalLock(newBuf))) {
 		ERR(edit, "could not lock new 32 bit buffer\n");
-		LocalFree32(newBuf);
+		LocalFree(newBuf);
 		return 0;
 	}
-	lstrcpy32A(newText, es->text);
+	lstrcpyA(newText, es->text);
 	EDIT_UnlockBuffer(wnd, es, TRUE);
 	if (es->text)
 		HeapFree(es->heap, 0, es->text);
@@ -2004,7 +2004,7 @@ static HLOCAL16 EDIT_EM_GetHandle16(WND *wnd, EDITSTATE *es)
 {
 	HLOCAL16 newBuf;
 	LPSTR newText;
-	INT32 newSize;
+	INT newSize;
 
 	if (!(es->style & ES_MULTILINE))
 		return 0;
@@ -2013,14 +2013,14 @@ static HLOCAL16 EDIT_EM_GetHandle16(WND *wnd, EDITSTATE *es)
 		return es->hloc16;
 
 	if (!LOCAL_HeapSize(wnd->hInstance)) {
-		if (!LocalInit(wnd->hInstance, 0,
+		if (!LocalInit16(wnd->hInstance, 0,
 				GlobalSize16(wnd->hInstance))) {
 			ERR(edit, "could not initialize local heap\n");
 			return 0;
 		}
 		TRACE(edit, "local heap initialized\n");
 	}
-	if (!(newBuf = LOCAL_Alloc(wnd->hInstance, LMEM_MOVEABLE, lstrlen32A(es->text) + 1))) {
+	if (!(newBuf = LOCAL_Alloc(wnd->hInstance, LMEM_MOVEABLE, lstrlenA(es->text) + 1))) {
 		ERR(edit, "could not allocate new 16 bit buffer\n");
 		return 0;
 	}
@@ -2030,15 +2030,15 @@ static HLOCAL16 EDIT_EM_GetHandle16(WND *wnd, EDITSTATE *es)
 		LOCAL_Free(wnd->hInstance, newBuf);
 		return 0;
 	}
-	lstrcpy32A(newText, es->text);
+	lstrcpyA(newText, es->text);
 	EDIT_UnlockBuffer(wnd, es, TRUE);
 	if (es->text)
 		HeapFree(es->heap, 0, es->text);
 	else if (es->hloc32) {
-		while (LocalFree32(es->hloc32)) ;
-		LocalFree32(es->hloc32);
+		while (LocalFree(es->hloc32)) ;
+		LocalFree(es->hloc32);
 	}
-	es->hloc32 = (HLOCAL32)NULL;
+	es->hloc32 = (HLOCAL)NULL;
 	es->hloc16 = newBuf;
 	es->buffer_size = newSize;
 	es->text = newText;
@@ -2054,11 +2054,11 @@ static HLOCAL16 EDIT_EM_GetHandle16(WND *wnd, EDITSTATE *es)
  *	EM_GETLINE
  *
  */
-static INT32 EDIT_EM_GetLine(WND *wnd, EDITSTATE *es, INT32 line, LPSTR lpch)
+static INT EDIT_EM_GetLine(WND *wnd, EDITSTATE *es, INT line, LPSTR lpch)
 {
 	LPSTR src;
-	INT32 len;
-	INT32 i;
+	INT len;
+	INT i;
 
 	if (es->style & ES_MULTILINE) {
 		if (line >= es->line_count)
@@ -2082,12 +2082,12 @@ static INT32 EDIT_EM_GetLine(WND *wnd, EDITSTATE *es, INT32 line, LPSTR lpch)
  *	EM_GETSEL
  *
  */
-static LRESULT EDIT_EM_GetSel(WND *wnd, EDITSTATE *es, LPUINT32 start, LPUINT32 end)
+static LRESULT EDIT_EM_GetSel(WND *wnd, EDITSTATE *es, LPUINT start, LPUINT end)
 {
-	UINT32 s = es->selection_start;
-	UINT32 e = es->selection_end;
+	UINT s = es->selection_start;
+	UINT e = es->selection_end;
 
-	ORDER_UINT32(s, e);
+	ORDER_UINT(s, e);
 	if (start)
 		*start = s;
 	if (end)
@@ -2121,14 +2121,14 @@ static LRESULT EDIT_EM_GetThumb(WND *wnd, EDITSTATE *es)
  *	EM_LINEFROMCHAR
  *
  */
-static INT32 EDIT_EM_LineFromChar(WND *wnd, EDITSTATE *es, INT32 index)
+static INT EDIT_EM_LineFromChar(WND *wnd, EDITSTATE *es, INT index)
 {
-	INT32 line;
+	INT line;
 	LINEDEF *line_def;
 
 	if (!(es->style & ES_MULTILINE))
 		return 0;
-	if (index > lstrlen32A(es->text))
+	if (index > lstrlenA(es->text))
 		return es->line_count - 1;
 	if (index == -1)
 		index = MIN(es->selection_start, es->selection_end);
@@ -2150,9 +2150,9 @@ static INT32 EDIT_EM_LineFromChar(WND *wnd, EDITSTATE *es, INT32 index)
  *	EM_LINEINDEX
  *
  */
-static INT32 EDIT_EM_LineIndex(WND *wnd, EDITSTATE *es, INT32 line)
+static INT EDIT_EM_LineIndex(WND *wnd, EDITSTATE *es, INT line)
 {
-	INT32 line_index;
+	INT line_index;
 	LINEDEF *line_def;
 
 	if (!(es->style & ES_MULTILINE))
@@ -2163,7 +2163,7 @@ static INT32 EDIT_EM_LineIndex(WND *wnd, EDITSTATE *es, INT32 line)
 	line_index = 0;
 	line_def = es->first_line_def;
 	if (line == -1) {
-		INT32 index = es->selection_end - line_def->length;
+		INT index = es->selection_end - line_def->length;
 		while ((index >= 0) && line_def->next) {
 			line_index += line_def->length;
 			line_def = line_def->next;
@@ -2185,12 +2185,12 @@ static INT32 EDIT_EM_LineIndex(WND *wnd, EDITSTATE *es, INT32 line)
  *	EM_LINELENGTH
  *
  */
-static INT32 EDIT_EM_LineLength(WND *wnd, EDITSTATE *es, INT32 index)
+static INT EDIT_EM_LineLength(WND *wnd, EDITSTATE *es, INT index)
 {
 	LINEDEF *line_def;
 
 	if (!(es->style & ES_MULTILINE))
-		return lstrlen32A(es->text);
+		return lstrlenA(es->text);
 
 	if (index == -1) {
 		/* FIXME: broken
@@ -2221,9 +2221,9 @@ static INT32 EDIT_EM_LineLength(WND *wnd, EDITSTATE *es, INT32 index)
  *		function internally
  *
  */
-static BOOL32 EDIT_EM_LineScroll(WND *wnd, EDITSTATE *es, INT32 dx, INT32 dy)
+static BOOL EDIT_EM_LineScroll(WND *wnd, EDITSTATE *es, INT dx, INT dy)
 {
-	INT32 nyoff;
+	INT nyoff;
 
 	if (!(es->style & ES_MULTILINE))
 		return FALSE;
@@ -2237,12 +2237,12 @@ static BOOL32 EDIT_EM_LineScroll(WND *wnd, EDITSTATE *es, INT32 dx, INT32 dy)
 		nyoff = es->line_count - 1;
 	dy = (es->y_offset - nyoff) * es->line_height;
 	if (dx || dy) {
-		RECT32 rc1;
-		RECT32 rc;
-		GetClientRect32(wnd->hwndSelf, &rc1);
-		IntersectRect32(&rc, &rc1, &es->format_rect);
-		ScrollWindowEx32(wnd->hwndSelf, -dx, dy,
-				NULL, &rc, (HRGN32)NULL, NULL, SW_INVALIDATE);
+		RECT rc1;
+		RECT rc;
+		GetClientRect(wnd->hwndSelf, &rc1);
+		IntersectRect(&rc, &rc1, &es->format_rect);
+		ScrollWindowEx(wnd->hwndSelf, -dx, dy,
+				NULL, &rc, (HRGN)NULL, NULL, SW_INVALIDATE);
 		es->y_offset = nyoff;
 		es->x_offset += dx;
 	}
@@ -2259,27 +2259,27 @@ static BOOL32 EDIT_EM_LineScroll(WND *wnd, EDITSTATE *es, INT32 dx, INT32 dy)
  *	EM_POSFROMCHAR
  *
  */
-static LRESULT EDIT_EM_PosFromChar(WND *wnd, EDITSTATE *es, INT32 index, BOOL32 after_wrap)
+static LRESULT EDIT_EM_PosFromChar(WND *wnd, EDITSTATE *es, INT index, BOOL after_wrap)
 {
-	INT32 len = lstrlen32A(es->text);
-	INT32 l;
-	INT32 li;
-	INT32 x;
-	INT32 y = 0;
-	HDC32 dc;
-	HFONT32 old_font = 0;
-	SIZE32 size;
+	INT len = lstrlenA(es->text);
+	INT l;
+	INT li;
+	INT x;
+	INT y = 0;
+	HDC dc;
+	HFONT old_font = 0;
+	SIZE size;
 
 	index = MIN(index, len);
-	dc = GetDC32(wnd->hwndSelf);
+	dc = GetDC(wnd->hwndSelf);
 	if (es->font)
-		old_font = SelectObject32(dc, es->font);
+		old_font = SelectObject(dc, es->font);
 	if (es->style & ES_MULTILINE) {
 		l = EDIT_EM_LineFromChar(wnd, es, index);
 		y = (l - es->y_offset) * es->line_height;
 		li = EDIT_EM_LineIndex(wnd, es, l);
 		if (after_wrap && (li == index) && l) {
-			INT32 l2 = l - 1;
+			INT l2 = l - 1;
 			LINEDEF *line_def = es->first_line_def;
 			while (l2) {
 				line_def = line_def->next;
@@ -2291,7 +2291,7 @@ static LRESULT EDIT_EM_PosFromChar(WND *wnd, EDITSTATE *es, INT32 index, BOOL32
 				li = EDIT_EM_LineIndex(wnd, es, l);
 			}
 		}
-		x = LOWORD(GetTabbedTextExtent32A(dc, es->text + li, index - li,
+		x = LOWORD(GetTabbedTextExtentA(dc, es->text + li, index - li,
 				es->tabs_count, es->tabs)) - es->x_offset;
 	} else {
 		LPSTR text = EDIT_GetPasswordPointer_SL(wnd, es);
@@ -2311,8 +2311,8 @@ static LRESULT EDIT_EM_PosFromChar(WND *wnd, EDITSTATE *es, INT32 index, BOOL32
 	x += es->format_rect.left;
 	y += es->format_rect.top;
 	if (es->font)
-		SelectObject32(dc, old_font);
-	ReleaseDC32(wnd->hwndSelf, dc);
+		SelectObject(dc, old_font);
+	ReleaseDC(wnd->hwndSelf, dc);
 	return MAKELONG((INT16)x, (INT16)y);
 }
 
@@ -2324,14 +2324,14 @@ static LRESULT EDIT_EM_PosFromChar(WND *wnd, EDITSTATE *es, INT32 index, BOOL32
  *	FIXME: handle ES_NUMBER and ES_OEMCONVERT here
  *
  */
-static void EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL32 can_undo, LPCSTR lpsz_replace)
+static void EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL can_undo, LPCSTR lpsz_replace)
 {
-	INT32 strl = lstrlen32A(lpsz_replace);
-	INT32 tl = lstrlen32A(es->text);
-	INT32 utl;
-	UINT32 s;
-	UINT32 e;
-	INT32 i;
+	INT strl = lstrlenA(lpsz_replace);
+	INT tl = lstrlenA(es->text);
+	INT utl;
+	UINT s;
+	UINT e;
+	INT i;
 	LPSTR p;
 
 	s = es->selection_start;
@@ -2340,7 +2340,7 @@ static void EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL32 can_undo, LPCSTR
 	if ((s == e) && !strl)
 		return;
 
-	ORDER_UINT32(s, e);
+	ORDER_UINT(s, e);
 
 	if (!EDIT_MakeFit(wnd, es, tl - (e - s) + strl))
 		return;
@@ -2348,11 +2348,11 @@ static void EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL32 can_undo, LPCSTR
 	if (e != s) {
 		/* there is something to be deleted */
 		if (can_undo) {
-			utl = lstrlen32A(es->undo_text);
+			utl = lstrlenA(es->undo_text);
 			if (!es->undo_insert_count && (*es->undo_text && (s == es->undo_position))) {
 				/* undo-buffer is extended to the right */
 				EDIT_MakeUndoFit(wnd, es, utl + e - s);
-				lstrcpyn32A(es->undo_text + utl, es->text + s, e - s + 1);
+				lstrcpynA(es->undo_text + utl, es->text + s, e - s + 1);
 			} else if (!es->undo_insert_count && (*es->undo_text && (e == es->undo_position))) {
 				/* undo-buffer is extended to the left */
 				EDIT_MakeUndoFit(wnd, es, utl + e - s);
@@ -2364,7 +2364,7 @@ static void EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL32 can_undo, LPCSTR
 			} else {
 				/* new undo-buffer */
 				EDIT_MakeUndoFit(wnd, es, e - s);
-				lstrcpyn32A(es->undo_text, es->text + s, e - s + 1);
+				lstrcpynA(es->undo_text, es->text + s, e - s + 1);
 				es->undo_position = s;
 			}
 			/* any deletion makes the old insertion-undo invalid */
@@ -2373,7 +2373,7 @@ static void EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL32 can_undo, LPCSTR
 			EDIT_EM_EmptyUndoBuffer(wnd, es);
 
 		/* now delete */
-		lstrcpy32A(es->text + s, es->text + e);
+		lstrcpyA(es->text + s, es->text + e);
 	}
 	if (strl) {
 		/* there is an insertion */
@@ -2397,15 +2397,15 @@ static void EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL32 can_undo, LPCSTR
 			EDIT_EM_EmptyUndoBuffer(wnd, es);
 
 		/* now insert */
-		tl = lstrlen32A(es->text);
+		tl = lstrlenA(es->text);
 		for (p = es->text + tl ; p >= es->text + s ; p--)
 			p[strl] = p[0];
 		for (i = 0 , p = es->text + s ; i < strl ; i++)
 			p[i] = lpsz_replace[i];
 		if(es->style & ES_UPPERCASE)
-			CharUpperBuff32A(p, strl);
+			CharUpperBuffA(p, strl);
 		else if(es->style & ES_LOWERCASE)
-			CharLowerBuff32A(p, strl);
+			CharLowerBuffA(p, strl);
 		s += strl;
 	}
 	/* FIXME: really inefficient */
@@ -2418,7 +2418,7 @@ static void EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL32 can_undo, LPCSTR
 	EDIT_EM_ScrollCaret(wnd, es);
 
 	/* FIXME: really inefficient */
-	InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+	InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 }
 
 
@@ -2427,9 +2427,9 @@ static void EDIT_EM_ReplaceSel(WND *wnd, EDITSTATE *es, BOOL32 can_undo, LPCSTR
  *	EM_SCROLL
  *
  */
-static LRESULT EDIT_EM_Scroll(WND *wnd, EDITSTATE *es, INT32 action)
+static LRESULT EDIT_EM_Scroll(WND *wnd, EDITSTATE *es, INT action)
 {
-	INT32 dy;
+	INT dy;
 
 	if (!(es->style & ES_MULTILINE))
 		return (LRESULT)FALSE;
@@ -2472,14 +2472,14 @@ static LRESULT EDIT_EM_Scroll(WND *wnd, EDITSTATE *es, INT32 action)
 static void EDIT_EM_ScrollCaret(WND *wnd, EDITSTATE *es)
 {
 	if (es->style & ES_MULTILINE) {
-		INT32 l;
-		INT32 li;
-		INT32 vlc;
-		INT32 ww;
-		INT32 cw = es->char_width;
-		INT32 x;
-		INT32 dy = 0;
-		INT32 dx = 0;
+		INT l;
+		INT li;
+		INT vlc;
+		INT ww;
+		INT cw = es->char_width;
+		INT x;
+		INT dy = 0;
+		INT dx = 0;
 
 		l = EDIT_EM_LineFromChar(wnd, es, es->selection_end);
 		li = EDIT_EM_LineIndex(wnd, es, l);
@@ -2497,9 +2497,9 @@ static void EDIT_EM_ScrollCaret(WND *wnd, EDITSTATE *es)
 		if (dy || dx)
 			EDIT_EM_LineScroll(wnd, es, dx, dy);
 	} else {
-		INT32 x;
-		INT32 goal;
-		INT32 format_width;
+		INT x;
+		INT goal;
+		INT format_width;
 
 		if (!(es->style & ES_AUTOHSCROLL))
 			return;
@@ -2513,10 +2513,10 @@ static void EDIT_EM_ScrollCaret(WND *wnd, EDITSTATE *es)
 				x = SLOWORD(EDIT_EM_PosFromChar(wnd, es, es->selection_end, FALSE));
 			} while ((x < goal) && es->x_offset);
 			/* FIXME: use ScrollWindow() somehow to improve performance */
-			InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+			InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 		} else if (x > es->format_rect.right) {
-			INT32 x_last;
-			INT32 len = lstrlen32A(es->text);
+			INT x_last;
+			INT len = lstrlenA(es->text);
 			goal = es->format_rect.right - format_width / HSCROLL_FRACTION;
 			do {
 				es->x_offset++;
@@ -2524,7 +2524,7 @@ static void EDIT_EM_ScrollCaret(WND *wnd, EDITSTATE *es)
 				x_last = SLOWORD(EDIT_EM_PosFromChar(wnd, es, len, FALSE));
 			} while ((x > goal) && (x_last > es->format_rect.right));
 			/* FIXME: use ScrollWindow() somehow to improve performance */
-			InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+			InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 		}
 	}
 }
@@ -2537,7 +2537,7 @@ static void EDIT_EM_ScrollCaret(WND *wnd, EDITSTATE *es)
  *	FIXME:	ES_LOWERCASE, ES_UPPERCASE, ES_OEMCONVERT, ES_NUMBER ???
  *
  */
-static void EDIT_EM_SetHandle(WND *wnd, EDITSTATE *es, HLOCAL32 hloc)
+static void EDIT_EM_SetHandle(WND *wnd, EDITSTATE *es, HLOCAL hloc)
 {
 	if (!(es->style & ES_MULTILINE))
 		return;
@@ -2559,7 +2559,7 @@ static void EDIT_EM_SetHandle(WND *wnd, EDITSTATE *es, HLOCAL32 hloc)
 	es->hloc16 = (HLOCAL16)NULL;
 	es->hloc32 = hloc;
 	es->text = NULL;
-	es->buffer_size = LocalSize32(es->hloc32) - 1;
+	es->buffer_size = LocalSize(es->hloc32) - 1;
 	EDIT_LockBuffer(wnd, es);
 
 	es->x_offset = es->y_offset = 0;
@@ -2568,7 +2568,7 @@ static void EDIT_EM_SetHandle(WND *wnd, EDITSTATE *es, HLOCAL32 hloc)
 	es->flags &= ~EF_MODIFIED;
 	es->flags &= ~EF_UPDATE;
 	EDIT_BuildLineDefs_ML(wnd, es);
-	InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+	InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 	EDIT_EM_ScrollCaret(wnd, es);
 }
 
@@ -2600,7 +2600,7 @@ static void EDIT_EM_SetHandle16(WND *wnd, EDITSTATE *es, HLOCAL16 hloc)
 		HeapFree(es->heap, 0, es->text);
 
 	es->hloc16 = hloc;
-	es->hloc32 = (HLOCAL32)NULL;
+	es->hloc32 = (HLOCAL)NULL;
 	es->text = NULL;
 	es->buffer_size = LOCAL_Size(wnd->hInstance, es->hloc16) - 1;
 	EDIT_LockBuffer(wnd, es);
@@ -2611,7 +2611,7 @@ static void EDIT_EM_SetHandle16(WND *wnd, EDITSTATE *es, HLOCAL16 hloc)
 	es->flags &= ~EF_MODIFIED;
 	es->flags &= ~EF_UPDATE;
 	EDIT_BuildLineDefs_ML(wnd, es);
-	InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+	InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 	EDIT_EM_ScrollCaret(wnd, es);
 }
 
@@ -2624,7 +2624,7 @@ static void EDIT_EM_SetHandle16(WND *wnd, EDITSTATE *es, HLOCAL16 hloc)
  *	However, the windows version is not complied to yet in all of edit.c
  *
  */
-static void EDIT_EM_SetLimitText(WND *wnd, EDITSTATE *es, INT32 limit)
+static void EDIT_EM_SetLimitText(WND *wnd, EDITSTATE *es, INT limit)
 {
 	if (es->style & ES_MULTILINE) {
 		if (limit)
@@ -2649,8 +2649,8 @@ static void EDIT_EM_SetLimitText(WND *wnd, EDITSTATE *es, INT32 limit)
  * multiline controls??
  *
  */
-static void EDIT_EM_SetMargins(WND *wnd, EDITSTATE *es, INT32 action,
-			       INT32 left, INT32 right)
+static void EDIT_EM_SetMargins(WND *wnd, EDITSTATE *es, INT action,
+			       INT left, INT right)
 {
 	if (action & EC_LEFTMARGIN) {
 		if (left != EC_USEFONTINFO)
@@ -2696,7 +2696,7 @@ static void EDIT_EM_SetPasswordChar(WND *wnd, EDITSTATE *es, CHAR c)
 		wnd->dwStyle &= ~ES_PASSWORD;
 		es->style &= ~ES_PASSWORD;
 	}
-	InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+	InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 }
 
 
@@ -2709,11 +2709,11 @@ static void EDIT_EM_SetPasswordChar(WND *wnd, EDITSTATE *es, CHAR c)
  *		In other words: this handler is OK
  *
  */
-static void EDIT_EM_SetSel(WND *wnd, EDITSTATE *es, UINT32 start, UINT32 end, BOOL32 after_wrap)
+static void EDIT_EM_SetSel(WND *wnd, EDITSTATE *es, UINT start, UINT end, BOOL after_wrap)
 {
-	UINT32 old_start = es->selection_start;
-	UINT32 old_end = es->selection_end;
-	UINT32 len = lstrlen32A(es->text);
+	UINT old_start = es->selection_start;
+	UINT old_end = es->selection_end;
+	UINT len = lstrlenA(es->text);
 
 	if (start == -1) {
 		start = es->selection_end;
@@ -2731,10 +2731,10 @@ static void EDIT_EM_SetSel(WND *wnd, EDITSTATE *es, UINT32 start, UINT32 end, BO
 	if (es->flags & EF_FOCUSED)
 		EDIT_SetCaretPos(wnd, es, end, after_wrap);
 /* This is little  bit more efficient than before, not sure if it can be improved. FIXME? */
-        ORDER_UINT32(start, end);
-        ORDER_UINT32(end, old_end);
-        ORDER_UINT32(start, old_start);
-        ORDER_UINT32(old_start, old_end);
+        ORDER_UINT(start, end);
+        ORDER_UINT(end, old_end);
+        ORDER_UINT(start, old_start);
+        ORDER_UINT(old_start, old_end);
 	if (end != old_start)
         {
 /*
@@ -2764,7 +2764,7 @@ static void EDIT_EM_SetSel(WND *wnd, EDITSTATE *es, UINT32 start, UINT32 end, BO
  *	EM_SETTABSTOPS
  *
  */
-static BOOL32 EDIT_EM_SetTabStops(WND *wnd, EDITSTATE *es, INT32 count, LPINT32 tabs)
+static BOOL EDIT_EM_SetTabStops(WND *wnd, EDITSTATE *es, INT count, LPINT tabs)
 {
 	if (!(es->style & ES_MULTILINE))
 		return FALSE;
@@ -2774,8 +2774,8 @@ static BOOL32 EDIT_EM_SetTabStops(WND *wnd, EDITSTATE *es, INT32 count, LPINT32
 	if (!count)
 		es->tabs = NULL;
 	else {
-		es->tabs = HeapAlloc(es->heap, 0, count * sizeof(INT32));
-		memcpy(es->tabs, tabs, count * sizeof(INT32));
+		es->tabs = HeapAlloc(es->heap, 0, count * sizeof(INT));
+		memcpy(es->tabs, tabs, count * sizeof(INT));
 	}
 	return TRUE;
 }
@@ -2786,7 +2786,7 @@ static BOOL32 EDIT_EM_SetTabStops(WND *wnd, EDITSTATE *es, INT32 count, LPINT32
  *	EM_SETTABSTOPS16
  *
  */
-static BOOL32 EDIT_EM_SetTabStops16(WND *wnd, EDITSTATE *es, INT32 count, LPINT16 tabs)
+static BOOL EDIT_EM_SetTabStops16(WND *wnd, EDITSTATE *es, INT count, LPINT16 tabs)
 {
 	if (!(es->style & ES_MULTILINE))
 		return FALSE;
@@ -2796,8 +2796,8 @@ static BOOL32 EDIT_EM_SetTabStops16(WND *wnd, EDITSTATE *es, INT32 count, LPINT1
 	if (!count)
 		es->tabs = NULL;
 	else {
-		INT32 i;
-		es->tabs = HeapAlloc(es->heap, 0, count * sizeof(INT32));
+		INT i;
+		es->tabs = HeapAlloc(es->heap, 0, count * sizeof(INT));
 		for (i = 0 ; i < count ; i++)
 			es->tabs[i] = *tabs++;
 	}
@@ -2810,7 +2810,7 @@ static BOOL32 EDIT_EM_SetTabStops16(WND *wnd, EDITSTATE *es, INT32 count, LPINT1
  *	EM_SETWORDBREAKPROC
  *
  */
-static void EDIT_EM_SetWordBreakProc(WND *wnd, EDITSTATE *es, EDITWORDBREAKPROC32A wbp)
+static void EDIT_EM_SetWordBreakProc(WND *wnd, EDITSTATE *es, EDITWORDBREAKPROCA wbp)
 {
 	if (es->word_break_proc32A == wbp)
 		return;
@@ -2819,7 +2819,7 @@ static void EDIT_EM_SetWordBreakProc(WND *wnd, EDITSTATE *es, EDITWORDBREAKPROC3
 	es->word_break_proc16 = NULL;
 	if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) {
 		EDIT_BuildLineDefs_ML(wnd, es);
-		InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+		InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 	}
 }
 
@@ -2838,7 +2838,7 @@ static void EDIT_EM_SetWordBreakProc16(WND *wnd, EDITSTATE *es, EDITWORDBREAKPRO
 	es->word_break_proc16 = wbp;
 	if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) {
 		EDIT_BuildLineDefs_ML(wnd, es);
-		InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+		InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 	}
 }
 
@@ -2848,12 +2848,12 @@ static void EDIT_EM_SetWordBreakProc16(WND *wnd, EDITSTATE *es, EDITWORDBREAKPRO
  *	EM_UNDO / WM_UNDO
  *
  */
-static BOOL32 EDIT_EM_Undo(WND *wnd, EDITSTATE *es)
+static BOOL EDIT_EM_Undo(WND *wnd, EDITSTATE *es)
 {
-	INT32 ulength = lstrlen32A(es->undo_text);
+	INT ulength = lstrlenA(es->undo_text);
 	LPSTR utext = HeapAlloc(es->heap, 0, ulength + 1);
 
-	lstrcpy32A(utext, es->undo_text);
+	lstrcpyA(utext, es->undo_text);
 
 	TRACE(edit, "before UNDO:insertion length = %d, deletion buffer = %s\n",
 		     es->undo_insert_count, utext);
@@ -2910,13 +2910,13 @@ static void EDIT_WM_Char(WND *wnd, EDITSTATE *es, CHAR c, DWORD key_data)
  *	WM_COMMAND
  *
  */
-static void EDIT_WM_Command(WND *wnd, EDITSTATE *es, INT32 code, INT32 id, HWND32 control)
+static void EDIT_WM_Command(WND *wnd, EDITSTATE *es, INT code, INT id, HWND control)
 {
 	if (code || control)
 		return;
 
 	switch (id) {
-		case EM_UNDO32:
+		case EM_UNDO:
 			EDIT_EM_Undo(wnd, es);
 			break;
 		case WM_CUT:
@@ -2931,7 +2931,7 @@ static void EDIT_WM_Command(WND *wnd, EDITSTATE *es, INT32 code, INT32 id, HWND3
 		case WM_CLEAR:
 			EDIT_WM_Clear(wnd, es);
 			break;
-		case EM_SETSEL32:
+		case EM_SETSEL:
 			EDIT_EM_SetSel(wnd, es, 0, -1, FALSE);
 			EDIT_EM_ScrollCaret(wnd, es);
 			break;
@@ -2958,30 +2958,30 @@ static void EDIT_WM_Command(WND *wnd, EDITSTATE *es, INT32 code, INT32 id, HWND3
  *		(as we do in EDIT_WM_Command()).
  *
  */
-static void EDIT_WM_ContextMenu(WND *wnd, EDITSTATE *es, HWND32 hwnd, INT32 x, INT32 y)
+static void EDIT_WM_ContextMenu(WND *wnd, EDITSTATE *es, HWND hwnd, INT x, INT y)
 {
-	HMENU32 menu = LoadMenuIndirect32A(SYSRES_GetResPtr(SYSRES_MENU_EDITMENU));
-	HMENU32 popup = GetSubMenu32(menu, 0);
-	UINT32 start = es->selection_start;
-	UINT32 end = es->selection_end;
+	HMENU menu = LoadMenuIndirectA(SYSRES_GetResPtr(SYSRES_MENU_EDITMENU));
+	HMENU popup = GetSubMenu(menu, 0);
+	UINT start = es->selection_start;
+	UINT end = es->selection_end;
 
-	ORDER_UINT32(start, end);
+	ORDER_UINT(start, end);
 
 	/* undo */
-	EnableMenuItem32(popup, 0, MF_BYPOSITION | (EDIT_EM_CanUndo(wnd, es) ? MF_ENABLED : MF_GRAYED));
+	EnableMenuItem(popup, 0, MF_BYPOSITION | (EDIT_EM_CanUndo(wnd, es) ? MF_ENABLED : MF_GRAYED));
 	/* cut */
-	EnableMenuItem32(popup, 2, MF_BYPOSITION | ((end - start) && !(es->style & ES_PASSWORD) ? MF_ENABLED : MF_GRAYED));
+	EnableMenuItem(popup, 2, MF_BYPOSITION | ((end - start) && !(es->style & ES_PASSWORD) ? MF_ENABLED : MF_GRAYED));
 	/* copy */
-	EnableMenuItem32(popup, 3, MF_BYPOSITION | ((end - start) && !(es->style & ES_PASSWORD) ? MF_ENABLED : MF_GRAYED));
+	EnableMenuItem(popup, 3, MF_BYPOSITION | ((end - start) && !(es->style & ES_PASSWORD) ? MF_ENABLED : MF_GRAYED));
 	/* paste */
-	EnableMenuItem32(popup, 4, MF_BYPOSITION | (IsClipboardFormatAvailable32(CF_TEXT) ? MF_ENABLED : MF_GRAYED));
+	EnableMenuItem(popup, 4, MF_BYPOSITION | (IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED));
 	/* delete */
-	EnableMenuItem32(popup, 5, MF_BYPOSITION | ((end - start) ? MF_ENABLED : MF_GRAYED));
+	EnableMenuItem(popup, 5, MF_BYPOSITION | ((end - start) ? MF_ENABLED : MF_GRAYED));
 	/* select all */
-	EnableMenuItem32(popup, 7, MF_BYPOSITION | (start || (end != lstrlen32A(es->text)) ? MF_ENABLED : MF_GRAYED));
+	EnableMenuItem(popup, 7, MF_BYPOSITION | (start || (end != lstrlenA(es->text)) ? MF_ENABLED : MF_GRAYED));
 
-	TrackPopupMenu32(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, wnd->hwndSelf, NULL);
-	DestroyMenu32(menu);
+	TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, wnd->hwndSelf, NULL);
+	DestroyMenu(menu);
 }
 
 
@@ -2992,22 +2992,22 @@ static void EDIT_WM_ContextMenu(WND *wnd, EDITSTATE *es, HWND32 hwnd, INT32 x, I
  */
 static void EDIT_WM_Copy(WND *wnd, EDITSTATE *es)
 {
-	INT32 s = es->selection_start;
-	INT32 e = es->selection_end;
-	HGLOBAL32 hdst;
+	INT s = es->selection_start;
+	INT e = es->selection_end;
+	HGLOBAL hdst;
 	LPSTR dst;
 
 	if (e == s)
 		return;
-	ORDER_INT32(s, e);
-	hdst = GlobalAlloc32(GMEM_MOVEABLE, (DWORD)(e - s + 1));
-	dst = GlobalLock32(hdst);
-	lstrcpyn32A(dst, es->text + s, e - s + 1);
-	GlobalUnlock32(hdst);
-	OpenClipboard32(wnd->hwndSelf);
-	EmptyClipboard32();
-	SetClipboardData32(CF_TEXT, hdst);
-	CloseClipboard32();
+	ORDER_INT(s, e);
+	hdst = GlobalAlloc(GMEM_MOVEABLE, (DWORD)(e - s + 1));
+	dst = GlobalLock(hdst);
+	lstrcpynA(dst, es->text + s, e - s + 1);
+	GlobalUnlock(hdst);
+	OpenClipboard(wnd->hwndSelf);
+	EmptyClipboard();
+	SetClipboardData(CF_TEXT, hdst);
+	CloseClipboard();
 }
 
 
@@ -3016,7 +3016,7 @@ static void EDIT_WM_Copy(WND *wnd, EDITSTATE *es)
  *	WM_CREATE
  *
  */
-static LRESULT EDIT_WM_Create(WND *wnd, EDITSTATE *es, LPCREATESTRUCT32A cs)
+static LRESULT EDIT_WM_Create(WND *wnd, EDITSTATE *es, LPCREATESTRUCTA cs)
 {
 	/*
 	 *	To initialize some final structure members, we call some helper
@@ -3045,8 +3045,8 @@ static LRESULT EDIT_WM_Create(WND *wnd, EDITSTATE *es, LPCREATESTRUCT32A cs)
 static void EDIT_WM_Destroy(WND *wnd, EDITSTATE *es)
 {
 	if (es->hloc32) {
-		while (LocalUnlock32(es->hloc32)) ;
-		LocalFree32(es->hloc32);
+		while (LocalUnlock(es->hloc32)) ;
+		LocalFree(es->hloc32);
 	}
 	if (es->hloc16) {
 		while (LOCAL_Unlock(wnd->hInstance, es->hloc16)) ;
@@ -3063,24 +3063,24 @@ static void EDIT_WM_Destroy(WND *wnd, EDITSTATE *es)
  *	WM_ERASEBKGND
  *
  */
-static LRESULT EDIT_WM_EraseBkGnd(WND *wnd, EDITSTATE *es, HDC32 dc)
+static LRESULT EDIT_WM_EraseBkGnd(WND *wnd, EDITSTATE *es, HDC dc)
 {
-	HBRUSH32 brush;
-	RECT32 rc;
+	HBRUSH brush;
+	RECT rc;
 
-	if (!(brush = (HBRUSH32)EDIT_SEND_CTLCOLOR(wnd, dc)))
-		brush = (HBRUSH32)GetStockObject32(WHITE_BRUSH);
+	if (!(brush = (HBRUSH)EDIT_SEND_CTLCOLOR(wnd, dc)))
+		brush = (HBRUSH)GetStockObject(WHITE_BRUSH);
 
-	GetClientRect32(wnd->hwndSelf, &rc);
-	IntersectClipRect32(dc, rc.left, rc.top, rc.right, rc.bottom);
-	GetClipBox32(dc, &rc);
+	GetClientRect(wnd->hwndSelf, &rc);
+	IntersectClipRect(dc, rc.left, rc.top, rc.right, rc.bottom);
+	GetClipBox(dc, &rc);
 	/*
 	 *	FIXME:	specs say that we should UnrealizeObject() the brush,
 	 *		but the specs of UnrealizeObject() say that we shouldn't
 	 *		unrealize a stock object.  The default brush that
 	 *		DefWndProc() returns is ... a stock object.
 	 */
-	FillRect32(dc, &rc, brush);
+	FillRect(dc, &rc, brush);
 	return -1;
 }
 
@@ -3090,12 +3090,12 @@ static LRESULT EDIT_WM_EraseBkGnd(WND *wnd, EDITSTATE *es, HDC32 dc)
  *	WM_GETTEXT
  *
  */
-static INT32 EDIT_WM_GetText(WND *wnd, EDITSTATE *es, INT32 count, LPSTR text)
+static INT EDIT_WM_GetText(WND *wnd, EDITSTATE *es, INT count, LPSTR text)
 {
-	INT32 len = lstrlen32A(es->text);
+	INT len = lstrlenA(es->text);
 
 	if (count > len) {
-		lstrcpy32A(text, es->text);
+		lstrcpyA(text, es->text);
 		return len;
 	} else
 		return -1;
@@ -3111,10 +3111,10 @@ static INT32 EDIT_WM_GetText(WND *wnd, EDITSTATE *es, INT32 count, LPSTR text)
  *	undocumented parameters without us even having a scrollbar ... !?!?
  *
  */
-static LRESULT EDIT_HScroll_Hack(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos, HWND32 scroll_bar)
+static LRESULT EDIT_HScroll_Hack(WND *wnd, EDITSTATE *es, INT action, INT pos, HWND scroll_bar)
 {
-	INT32 dx = 0;
-	INT32 fw = es->format_rect.right - es->format_rect.left;
+	INT dx = 0;
+	INT fw = es->format_rect.right - es->format_rect.left;
 	LRESULT ret = 0;
 
 	if (!(es->flags & EF_HSCROLL_HACK)) {
@@ -3189,10 +3189,10 @@ static LRESULT EDIT_HScroll_Hack(WND *wnd, EDITSTATE *es, INT32 action, INT32 po
  *	WM_HSCROLL
  *
  */
-static LRESULT EDIT_WM_HScroll(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos, HWND32 scroll_bar)
+static LRESULT EDIT_WM_HScroll(WND *wnd, EDITSTATE *es, INT action, INT pos, HWND scroll_bar)
 {
-	INT32 dx;
-	INT32 fw;
+	INT dx;
+	INT fw;
 
 	if (!(es->style & ES_MULTILINE))
 		return 0;
@@ -3237,7 +3237,7 @@ static LRESULT EDIT_WM_HScroll(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos,
 	case SB_THUMBPOSITION:
 		es->flags &= ~EF_HSCROLL_TRACK;
 		if (!(dx = pos - es->x_offset)) {
-			SetScrollPos32(wnd->hwndSelf, SB_HORZ, pos, TRUE);
+			SetScrollPos(wnd->hwndSelf, SB_HORZ, pos, TRUE);
 			EDIT_NOTIFY_PARENT(wnd, EN_HSCROLL, "EN_HSCROLL");
 		}
 		break;
@@ -3259,14 +3259,14 @@ static LRESULT EDIT_WM_HScroll(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos,
  *	EDIT_CheckCombo
  *
  */
-static BOOL32 EDIT_CheckCombo(WND *wnd, UINT32 msg, INT32 key, DWORD key_data)
+static BOOL EDIT_CheckCombo(WND *wnd, UINT msg, INT key, DWORD key_data)
 {
-	HWND32 hLBox;
+	HWND hLBox;
 
-	if (WIDGETS_IsControl32(wnd->parent, BIC32_COMBO) &&
+	if (WIDGETS_IsControl(wnd->parent, BIC32_COMBO) &&
 			(hLBox = COMBO_GetLBWindow(wnd->parent))) {
-		HWND32 hCombo = wnd->parent->hwndSelf;
-		BOOL32 bUIFlip = TRUE;
+		HWND hCombo = wnd->parent->hwndSelf;
+		BOOL bUIFlip = TRUE;
 
 		TRACE(combo, "[%04x]: handling msg %04x (%04x)\n",
 			     wnd->hwndSelf, (UINT16)msg, (UINT16)key);
@@ -3274,26 +3274,26 @@ static BOOL32 EDIT_CheckCombo(WND *wnd, UINT32 msg, INT32 key, DWORD key_data)
 		switch (msg) {
 		case WM_KEYDOWN: /* Handle F4 and arrow keys */
 			if (key != VK_F4) {
-				bUIFlip = (BOOL32)SendMessage32A(hCombo, CB_GETEXTENDEDUI32, 0, 0);
-				if (SendMessage32A(hCombo, CB_GETDROPPEDSTATE32, 0, 0))
+				bUIFlip = (BOOL)SendMessageA(hCombo, CB_GETEXTENDEDUI, 0, 0);
+				if (SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0))
 					bUIFlip = FALSE;
 			}
 			if (!bUIFlip)
-				SendMessage32A(hLBox, WM_KEYDOWN, (WPARAM32)key, 0);
+				SendMessageA(hLBox, WM_KEYDOWN, (WPARAM)key, 0);
 			else {
 				/* make sure ComboLBox pops up */
-				SendMessage32A(hCombo, CB_SETEXTENDEDUI32, 0, 0);
-				SendMessage32A(hLBox, WM_KEYDOWN, VK_F4, 0);
-				SendMessage32A(hCombo, CB_SETEXTENDEDUI32, 1, 0);
+				SendMessageA(hCombo, CB_SETEXTENDEDUI, 0, 0);
+				SendMessageA(hLBox, WM_KEYDOWN, VK_F4, 0);
+				SendMessageA(hCombo, CB_SETEXTENDEDUI, 1, 0);
 			}
 			break;
 		case WM_SYSKEYDOWN: /* Handle Alt+up/down arrows */
-			bUIFlip = (BOOL32)SendMessage32A(hCombo, CB_GETEXTENDEDUI32, 0, 0);
+			bUIFlip = (BOOL)SendMessageA(hCombo, CB_GETEXTENDEDUI, 0, 0);
 			if (bUIFlip) {
-				bUIFlip = (BOOL32)SendMessage32A(hCombo, CB_GETDROPPEDSTATE32, 0, 0);
-				SendMessage32A(hCombo, CB_SHOWDROPDOWN32, (bUIFlip) ? FALSE : TRUE, 0);
+				bUIFlip = (BOOL)SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0);
+				SendMessageA(hCombo, CB_SHOWDROPDOWN, (bUIFlip) ? FALSE : TRUE, 0);
 			} else
-				SendMessage32A(hLBox, WM_KEYDOWN, VK_F4, 0);
+				SendMessageA(hLBox, WM_KEYDOWN, VK_F4, 0);
 			break;
 		}
 		return TRUE;
@@ -3310,16 +3310,16 @@ static BOOL32 EDIT_CheckCombo(WND *wnd, UINT32 msg, INT32 key, DWORD key_data)
  *	(i.e. non-printable keys) & Backspace & Delete
  *
  */
-static LRESULT EDIT_WM_KeyDown(WND *wnd, EDITSTATE *es, INT32 key, DWORD key_data)
+static LRESULT EDIT_WM_KeyDown(WND *wnd, EDITSTATE *es, INT key, DWORD key_data)
 {
-	BOOL32 shift;
-	BOOL32 control;
+	BOOL shift;
+	BOOL control;
 
-	if (GetKeyState32(VK_MENU) & 0x8000)
+	if (GetKeyState(VK_MENU) & 0x8000)
 		return 0;
 
-	shift = GetKeyState32(VK_SHIFT) & 0x8000;
-	control = GetKeyState32(VK_CONTROL) & 0x8000;
+	shift = GetKeyState(VK_SHIFT) & 0x8000;
+	control = GetKeyState(VK_CONTROL) & 0x8000;
 
 	switch (key) {
 	case VK_F4:
@@ -3420,10 +3420,10 @@ static LRESULT EDIT_WM_KeyDown(WND *wnd, EDITSTATE *es, INT32 key, DWORD key_dat
  *	WM_KILLFOCUS
  *
  */
-static LRESULT EDIT_WM_KillFocus(WND *wnd, EDITSTATE *es, HWND32 window_getting_focus)
+static LRESULT EDIT_WM_KillFocus(WND *wnd, EDITSTATE *es, HWND window_getting_focus)
 {
 	es->flags &= ~EF_FOCUSED;
-	DestroyCaret32();
+	DestroyCaret();
 	if(!(es->style & ES_NOHIDESEL))
 		EDIT_InvalidateText(wnd, es, es->selection_start, es->selection_end);
 	EDIT_NOTIFY_PARENT(wnd, EN_KILLFOCUS, "EN_KILLFOCUS");
@@ -3438,13 +3438,13 @@ static LRESULT EDIT_WM_KillFocus(WND *wnd, EDITSTATE *es, HWND32 window_getting_
  *	The caret position has been set on the WM_LBUTTONDOWN message
  *
  */
-static LRESULT EDIT_WM_LButtonDblClk(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, INT32 y)
+static LRESULT EDIT_WM_LButtonDblClk(WND *wnd, EDITSTATE *es, DWORD keys, INT x, INT y)
 {
-	INT32 s;
-	INT32 e = es->selection_end;
-	INT32 l;
-	INT32 li;
-	INT32 ll;
+	INT s;
+	INT e = es->selection_end;
+	INT l;
+	INT li;
+	INT ll;
 
 	if (!(es->flags & EF_FOCUSED))
 		return 0;
@@ -3465,21 +3465,21 @@ static LRESULT EDIT_WM_LButtonDblClk(WND *wnd, EDITSTATE *es, DWORD keys, INT32
  *	WM_LBUTTONDOWN
  *
  */
-static LRESULT EDIT_WM_LButtonDown(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, INT32 y)
+static LRESULT EDIT_WM_LButtonDown(WND *wnd, EDITSTATE *es, DWORD keys, INT x, INT y)
 {
-	INT32 e;
-	BOOL32 after_wrap;
+	INT e;
+	BOOL after_wrap;
 
 	if (!(es->flags & EF_FOCUSED))
 		return 0;
 
-	SetCapture32(wnd->hwndSelf);
+	SetCapture(wnd->hwndSelf);
 	EDIT_ConfinePoint(wnd, es, &x, &y);
 	e = EDIT_CharFromPos(wnd, es, x, y, &after_wrap);
 	EDIT_EM_SetSel(wnd, es, (keys & MK_SHIFT) ? es->selection_start : e, e, after_wrap);
 	EDIT_EM_ScrollCaret(wnd, es);
 	es->region_posx = es->region_posy = 0;
-	SetTimer32(wnd->hwndSelf, 0, 100, NULL);
+	SetTimer(wnd->hwndSelf, 0, 100, NULL);
 	return 0;
 }
 
@@ -3489,10 +3489,10 @@ static LRESULT EDIT_WM_LButtonDown(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x,
  *	WM_LBUTTONUP
  *
  */
-static LRESULT EDIT_WM_LButtonUp(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, INT32 y)
+static LRESULT EDIT_WM_LButtonUp(WND *wnd, EDITSTATE *es, DWORD keys, INT x, INT y)
 {
-	if (GetCapture32() == wnd->hwndSelf) {
-		KillTimer32(wnd->hwndSelf, 0);
+	if (GetCapture() == wnd->hwndSelf) {
+		KillTimer(wnd->hwndSelf, 0);
 		ReleaseCapture();
 	}
 	return 0;
@@ -3504,13 +3504,13 @@ static LRESULT EDIT_WM_LButtonUp(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, I
  *	WM_MOUSEMOVE
  *
  */
-static LRESULT EDIT_WM_MouseMove(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, INT32 y)
+static LRESULT EDIT_WM_MouseMove(WND *wnd, EDITSTATE *es, DWORD keys, INT x, INT y)
 {
-	INT32 e;
-	BOOL32 after_wrap;
-	INT32 prex, prey;
+	INT e;
+	BOOL after_wrap;
+	INT prex, prey;
 
-	if (GetCapture32() != wnd->hwndSelf)
+	if (GetCapture() != wnd->hwndSelf)
 		return 0;
 
 	/*
@@ -3532,7 +3532,7 @@ static LRESULT EDIT_WM_MouseMove(WND *wnd, EDITSTATE *es, DWORD keys, INT32 x, I
  *	WM_NCCREATE
  *
  */
-static LRESULT EDIT_WM_NCCreate(WND *wnd, LPCREATESTRUCT32A cs)
+static LRESULT EDIT_WM_NCCreate(WND *wnd, LPCREATESTRUCTA cs)
 {
 	EDITSTATE *es;
 
@@ -3612,63 +3612,63 @@ static LRESULT EDIT_WM_NCCreate(WND *wnd, LPCREATESTRUCT32A cs)
  */
 static void EDIT_WM_Paint(WND *wnd, EDITSTATE *es)
 {
-	PAINTSTRUCT32 ps;
-	INT32 i;
-	HDC32 dc;
-	HFONT32 old_font = 0;
-	RECT32 rc;
-	RECT32 rcLine;
-	RECT32 rcRgn;
-	BOOL32 rev = IsWindowEnabled32(wnd->hwndSelf) &&
+	PAINTSTRUCT ps;
+	INT i;
+	HDC dc;
+	HFONT old_font = 0;
+	RECT rc;
+	RECT rcLine;
+	RECT rcRgn;
+	BOOL rev = IsWindowEnabled(wnd->hwndSelf) &&
 				((es->flags & EF_FOCUSED) ||
 					(es->style & ES_NOHIDESEL));
 
 	if (es->flags & EF_UPDATE)
 		EDIT_NOTIFY_PARENT(wnd, EN_UPDATE, "EN_UPDATE");
 
-	dc = BeginPaint32(wnd->hwndSelf, &ps);
+	dc = BeginPaint(wnd->hwndSelf, &ps);
 	if(es->style & WS_BORDER) {
-		GetClientRect32(wnd->hwndSelf, &rc);
+		GetClientRect(wnd->hwndSelf, &rc);
 		if(es->style & ES_MULTILINE) {
 			if(es->style & WS_HSCROLL) rc.bottom++;
 			if(es->style & WS_VSCROLL) rc.right++;
 		}
-		Rectangle32(dc, rc.left, rc.top, rc.right, rc.bottom);
+		Rectangle(dc, rc.left, rc.top, rc.right, rc.bottom);
 	}
-	IntersectClipRect32(dc, es->format_rect.left,
+	IntersectClipRect(dc, es->format_rect.left,
 				es->format_rect.top,
 				es->format_rect.right,
 				es->format_rect.bottom);
 	if (es->style & ES_MULTILINE) {
-		GetClientRect32(wnd->hwndSelf, &rc);
-		IntersectClipRect32(dc, rc.left, rc.top, rc.right, rc.bottom);
+		GetClientRect(wnd->hwndSelf, &rc);
+		IntersectClipRect(dc, rc.left, rc.top, rc.right, rc.bottom);
 	}
 	if (es->font)
-		old_font = SelectObject32(dc, es->font);
+		old_font = SelectObject(dc, es->font);
 	EDIT_SEND_CTLCOLOR(wnd, dc);
-	if (!IsWindowEnabled32(wnd->hwndSelf))
-		SetTextColor32(dc, GetSysColor32(COLOR_GRAYTEXT));
-	GetClipBox32(dc, &rcRgn);
+	if (!IsWindowEnabled(wnd->hwndSelf))
+		SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT));
+	GetClipBox(dc, &rcRgn);
 	if (es->style & ES_MULTILINE) {
-		INT32 vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
+		INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
 		for (i = es->y_offset ; i <= MIN(es->y_offset + vlc, es->y_offset + es->line_count - 1) ; i++) {
 			EDIT_GetLineRect(wnd, es, i, 0, -1, &rcLine);
-			if (IntersectRect32(&rc, &rcRgn, &rcLine))
+			if (IntersectRect(&rc, &rcRgn, &rcLine))
 				EDIT_PaintLine(wnd, es, dc, i, rev);
 		}
 	} else {
 		EDIT_GetLineRect(wnd, es, 0, 0, -1, &rcLine);
-		if (IntersectRect32(&rc, &rcRgn, &rcLine))
+		if (IntersectRect(&rc, &rcRgn, &rcLine))
 			EDIT_PaintLine(wnd, es, dc, 0, rev);
 	}
 	if (es->font)
-		SelectObject32(dc, old_font);
+		SelectObject(dc, old_font);
 	if (es->flags & EF_FOCUSED)
 		EDIT_SetCaretPos(wnd, es, es->selection_end,
 				 es->flags & EF_AFTER_WRAP);
-	EndPaint32(wnd->hwndSelf, &ps);
+	EndPaint(wnd->hwndSelf, &ps);
 	if ((es->style & WS_VSCROLL) && !(es->flags & EF_VSCROLL_TRACK)) {
-		INT32 vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
+		INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
 		SCROLLINFO si;
 		si.cbSize	= sizeof(SCROLLINFO);
 		si.fMask	= SIF_PAGE | SIF_POS | SIF_RANGE | SIF_DISABLENOSCROLL;
@@ -3676,18 +3676,18 @@ static void EDIT_WM_Paint(WND *wnd, EDITSTATE *es)
 		si.nMax		= es->line_count + vlc - 2;
 		si.nPage	= vlc;
 		si.nPos		= es->y_offset;
-		SetScrollInfo32(wnd->hwndSelf, SB_VERT, &si, TRUE);
+		SetScrollInfo(wnd->hwndSelf, SB_VERT, &si, TRUE);
 	}
 	if ((es->style & WS_HSCROLL) && !(es->flags & EF_HSCROLL_TRACK)) {
 		SCROLLINFO si;
-		INT32 fw = es->format_rect.right - es->format_rect.left;
+		INT fw = es->format_rect.right - es->format_rect.left;
 		si.cbSize	= sizeof(SCROLLINFO);
 		si.fMask	= SIF_PAGE | SIF_POS | SIF_RANGE | SIF_DISABLENOSCROLL;
 		si.nMin		= 0;
 		si.nMax		= es->text_width + fw - 1;
 		si.nPage	= fw;
 		si.nPos		= es->x_offset;
-		SetScrollInfo32(wnd->hwndSelf, SB_HORZ, &si, TRUE);
+		SetScrollInfo(wnd->hwndSelf, SB_HORZ, &si, TRUE);
 	}
 
 	if (es->flags & EF_UPDATE) {
@@ -3704,16 +3704,16 @@ static void EDIT_WM_Paint(WND *wnd, EDITSTATE *es)
  */
 static void EDIT_WM_Paste(WND *wnd, EDITSTATE *es)
 {
-	HGLOBAL32 hsrc;
+	HGLOBAL hsrc;
 	LPSTR src;
 
-	OpenClipboard32(wnd->hwndSelf);
-	if ((hsrc = GetClipboardData32(CF_TEXT))) {
-		src = (LPSTR)GlobalLock32(hsrc);
+	OpenClipboard(wnd->hwndSelf);
+	if ((hsrc = GetClipboardData(CF_TEXT))) {
+		src = (LPSTR)GlobalLock(hsrc);
 		EDIT_EM_ReplaceSel(wnd, es, TRUE, src);
-		GlobalUnlock32(hsrc);
+		GlobalUnlock(hsrc);
 	}
-	CloseClipboard32();
+	CloseClipboard();
 }
 
 
@@ -3722,15 +3722,15 @@ static void EDIT_WM_Paste(WND *wnd, EDITSTATE *es)
  *	WM_SETFOCUS
  *
  */
-static void EDIT_WM_SetFocus(WND *wnd, EDITSTATE *es, HWND32 window_losing_focus)
+static void EDIT_WM_SetFocus(WND *wnd, EDITSTATE *es, HWND window_losing_focus)
 {
 	es->flags |= EF_FOCUSED;
-	CreateCaret32(wnd->hwndSelf, 0, 2, es->line_height);
+	CreateCaret(wnd->hwndSelf, 0, 2, es->line_height);
 	EDIT_SetCaretPos(wnd, es, es->selection_end,
 			 es->flags & EF_AFTER_WRAP);
 	if(!(es->style & ES_NOHIDESEL))
 		EDIT_InvalidateText(wnd, es, es->selection_start, es->selection_end);
-	ShowCaret32(wnd->hwndSelf);
+	ShowCaret(wnd->hwndSelf);
 	EDIT_NOTIFY_PARENT(wnd, EN_SETFOCUS, "EN_SETFOCUS");
 }
 
@@ -3744,40 +3744,40 @@ static void EDIT_WM_SetFocus(WND *wnd, EDITSTATE *es, HWND32 window_losing_focus
  * unchanged.
  *
  */
-static void EDIT_WM_SetFont(WND *wnd, EDITSTATE *es, HFONT32 font, BOOL32 redraw)
+static void EDIT_WM_SetFont(WND *wnd, EDITSTATE *es, HFONT font, BOOL redraw)
 {
-	TEXTMETRIC32A tm;
-	HDC32 dc;
-	HFONT32 old_font = 0;
+	TEXTMETRICA tm;
+	HDC dc;
+	HFONT old_font = 0;
 
 	es->font = font;
-	dc = GetDC32(wnd->hwndSelf);
+	dc = GetDC(wnd->hwndSelf);
 	if (font)
-		old_font = SelectObject32(dc, font);
-	GetTextMetrics32A(dc, &tm);
+		old_font = SelectObject(dc, font);
+	GetTextMetricsA(dc, &tm);
 	es->line_height = tm.tmHeight;
 	es->char_width = tm.tmAveCharWidth;
 	if (font)
-		SelectObject32(dc, old_font);
-	ReleaseDC32(wnd->hwndSelf, dc);
+		SelectObject(dc, old_font);
+	ReleaseDC(wnd->hwndSelf, dc);
 	if (font && (TWEAK_WineLook > WIN31_LOOK))
 		EDIT_EM_SetMargins(wnd, es, EC_LEFTMARGIN | EC_RIGHTMARGIN,
 				   EC_USEFONTINFO, EC_USEFONTINFO);
 	if (es->style & ES_MULTILINE)
 		EDIT_BuildLineDefs_ML(wnd, es);
 	else {
-		RECT32 r;
-		GetClientRect32(wnd->hwndSelf, &r);
+		RECT r;
+		GetClientRect(wnd->hwndSelf, &r);
 		EDIT_SetRectNP(wnd, es, &r);
 	}
 	if (redraw)
-		InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+		InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 	if (es->flags & EF_FOCUSED) {
-		DestroyCaret32();
-		CreateCaret32(wnd->hwndSelf, 0, 2, es->line_height);
+		DestroyCaret();
+		CreateCaret(wnd->hwndSelf, 0, 2, es->line_height);
 		EDIT_SetCaretPos(wnd, es, es->selection_end,
 				 es->flags & EF_AFTER_WRAP);
-		ShowCaret32(wnd->hwndSelf);
+		ShowCaret(wnd->hwndSelf);
 	}
 }
 
@@ -3821,13 +3821,13 @@ static void EDIT_WM_SetText(WND *wnd, EDITSTATE *es, LPCSTR text)
  *	WM_SIZE
  *
  */
-static void EDIT_WM_Size(WND *wnd, EDITSTATE *es, UINT32 action, INT32 width, INT32 height)
+static void EDIT_WM_Size(WND *wnd, EDITSTATE *es, UINT action, INT width, INT height)
 {
 	if ((action == SIZE_MAXIMIZED) || (action == SIZE_RESTORED)) {
-		RECT32 rc;
-		SetRect32(&rc, 0, 0, width, height);
+		RECT rc;
+		SetRect(&rc, 0, 0, width, height);
 		EDIT_SetRectNP(wnd, es, &rc);
-		InvalidateRect32(wnd->hwndSelf, NULL, TRUE);
+		InvalidateRect(wnd->hwndSelf, NULL, TRUE);
 	}
 }
 
@@ -3837,7 +3837,7 @@ static void EDIT_WM_Size(WND *wnd, EDITSTATE *es, UINT32 action, INT32 width, IN
  *	WM_SYSKEYDOWN
  *
  */
-static LRESULT EDIT_WM_SysKeyDown(WND *wnd, EDITSTATE *es, INT32 key, DWORD key_data)
+static LRESULT EDIT_WM_SysKeyDown(WND *wnd, EDITSTATE *es, INT key, DWORD key_data)
 {
 	if ((key == VK_BACK) && (key_data & 0x2000)) {
 		if (EDIT_EM_CanUndo(wnd, es))
@@ -3846,7 +3846,7 @@ static LRESULT EDIT_WM_SysKeyDown(WND *wnd, EDITSTATE *es, INT32 key, DWORD key_
 	} else if (key == VK_UP || key == VK_DOWN)
 		if (EDIT_CheckCombo(wnd, WM_SYSKEYDOWN, key, key_data))
 			return 0;
-	return DefWindowProc32A(wnd->hwndSelf, WM_SYSKEYDOWN, (WPARAM32)key, (LPARAM)key_data);
+	return DefWindowProcA(wnd->hwndSelf, WM_SYSKEYDOWN, (WPARAM)key, (LPARAM)key_data);
 }
 
 
@@ -3855,7 +3855,7 @@ static LRESULT EDIT_WM_SysKeyDown(WND *wnd, EDITSTATE *es, INT32 key, DWORD key_
  *	WM_TIMER
  *
  */
-static void EDIT_WM_Timer(WND *wnd, EDITSTATE *es, INT32 id, TIMERPROC32 timer_proc)
+static void EDIT_WM_Timer(WND *wnd, EDITSTATE *es, INT id, TIMERPROC timer_proc)
 {
 	if (es->region_posx < 0) {
 		EDIT_MoveBackward(wnd, es, TRUE);
@@ -3878,9 +3878,9 @@ static void EDIT_WM_Timer(WND *wnd, EDITSTATE *es, INT32 id, TIMERPROC32 timer_p
  *	undocumented parameters without us even having a scrollbar ... !?!?
  *
  */
-static LRESULT EDIT_VScroll_Hack(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos, HWND32 scroll_bar)
+static LRESULT EDIT_VScroll_Hack(WND *wnd, EDITSTATE *es, INT action, INT pos, HWND scroll_bar)
 {
-	INT32 dy = 0;
+	INT dy = 0;
 	LRESULT ret = 0;
 
 	if (!(es->flags & EF_VSCROLL_HACK)) {
@@ -3943,9 +3943,9 @@ static LRESULT EDIT_VScroll_Hack(WND *wnd, EDITSTATE *es, INT32 action, INT32 po
  *	WM_VSCROLL
  *
  */
-static LRESULT EDIT_WM_VScroll(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos, HWND32 scroll_bar)
+static LRESULT EDIT_WM_VScroll(WND *wnd, EDITSTATE *es, INT action, INT pos, HWND scroll_bar)
 {
-	INT32 dy;
+	INT dy;
 
 	if (!(es->style & ES_MULTILINE))
 		return 0;
@@ -3978,7 +3978,7 @@ static LRESULT EDIT_WM_VScroll(WND *wnd, EDITSTATE *es, INT32 action, INT32 pos,
 	case SB_THUMBPOSITION:
 		es->flags &= ~EF_VSCROLL_TRACK;
 		if (!(dy = pos - es->y_offset)) {
-			SetScrollPos32(wnd->hwndSelf, SB_VERT, pos, TRUE);
+			SetScrollPos(wnd->hwndSelf, SB_VERT, pos, TRUE);
 			EDIT_NOTIFY_PARENT(wnd, EN_VSCROLL, "EN_VSCROLL");
 		}
 		break;
diff --git a/controls/icontitle.c b/controls/icontitle.c
index a50f807d3a8..38d5b78a2f3 100644
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@@ -16,36 +16,36 @@
 
 static  LPCSTR	emptyTitleText = "<...>";
 
-	BOOL32	bMultiLineTitle;
-	HFONT32	hIconTitleFont;
+	BOOL	bMultiLineTitle;
+	HFONT	hIconTitleFont;
 
 /***********************************************************************
  *           ICONTITLE_Init
  */
-BOOL32 ICONTITLE_Init(void)
+BOOL ICONTITLE_Init(void)
 {
-    LOGFONT32A logFont;
+    LOGFONTA logFont;
 
-    SystemParametersInfo32A( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 );
-    SystemParametersInfo32A( SPI_GETICONTITLEWRAP, 0, &bMultiLineTitle, 0 );
-    hIconTitleFont = CreateFontIndirect32A( &logFont );
+    SystemParametersInfoA( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 );
+    SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &bMultiLineTitle, 0 );
+    hIconTitleFont = CreateFontIndirectA( &logFont );
     return (hIconTitleFont) ? TRUE : FALSE;
 }
 
 /***********************************************************************
  *           ICONTITLE_Create
  */
-HWND32 ICONTITLE_Create( WND* wnd )
+HWND ICONTITLE_Create( WND* wnd )
 {
     WND* wndPtr;
-    HWND32 hWnd;
+    HWND hWnd;
 
     if( wnd->dwStyle & WS_CHILD )
-	hWnd = CreateWindowEx32A( 0, ICONTITLE_CLASS_ATOM, NULL,
+	hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL,
 				  WS_CHILD | WS_CLIPSIBLINGS, 0, 0, 1, 1,
 				  wnd->parent->hwndSelf, 0, wnd->hInstance, NULL );
     else
-	hWnd = CreateWindowEx32A( 0, ICONTITLE_CLASS_ATOM, NULL,
+	hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL,
 				  WS_CLIPSIBLINGS, 0, 0, 1, 1,
 				  wnd->hwndSelf, 0, wnd->hInstance, NULL );
     wndPtr = WIN_FindWndPtr( hWnd );
@@ -62,15 +62,15 @@ HWND32 ICONTITLE_Create( WND* wnd )
 /***********************************************************************
  *           ICONTITLE_GetTitlePos
  */
-static BOOL32 ICONTITLE_GetTitlePos( WND* wnd, LPRECT32 lpRect )
+static BOOL ICONTITLE_GetTitlePos( WND* wnd, LPRECT lpRect )
 {
     LPSTR str;
-    int length = lstrlen32A( wnd->owner->text );
+    int length = lstrlenA( wnd->owner->text );
 
     if( length )
     {
 	str = HeapAlloc( GetProcessHeap(), 0, length + 1 );
-	lstrcpy32A( str, wnd->owner->text );
+	lstrcpyA( str, wnd->owner->text );
 	while( str[length - 1] == ' ' ) /* remove trailing spaces */
 	{ 
 	    str[--length] = '\0';
@@ -84,25 +84,25 @@ static BOOL32 ICONTITLE_GetTitlePos( WND* wnd, LPRECT32 lpRect )
     if( !length ) 
     {
 	str = (LPSTR)emptyTitleText;
-	length = lstrlen32A( str );
+	length = lstrlenA( str );
     }
 
     if( str )
     {
-	HDC32 hDC = GetDC32( wnd->hwndSelf );
+	HDC hDC = GetDC( wnd->hwndSelf );
 	if( hDC )
 	{
-	    HFONT32 hPrevFont = SelectObject32( hDC, hIconTitleFont );
+	    HFONT hPrevFont = SelectObject( hDC, hIconTitleFont );
 
-	    SetRect32( lpRect, 0, 0, sysMetrics[SM_CXICONSPACING] -
+	    SetRect( lpRect, 0, 0, sysMetrics[SM_CXICONSPACING] -
 		       SYSMETRICS_CXBORDER * 2, SYSMETRICS_CYBORDER * 2 );
 
-	    DrawText32A( hDC, str, length, lpRect, DT_CALCRECT |
+	    DrawTextA( hDC, str, length, lpRect, DT_CALCRECT |
 			 DT_CENTER | DT_NOPREFIX | DT_WORDBREAK |
 			 (( bMultiLineTitle ) ? 0 : DT_SINGLELINE) );
 
-	    SelectObject32( hDC, hPrevFont );
-	    ReleaseDC32( wnd->hwndSelf, hDC );
+	    SelectObject( hDC, hPrevFont );
+	    ReleaseDC( wnd->hwndSelf, hDC );
 
 	    lpRect->right += 4 * SYSMETRICS_CXBORDER - lpRect->left;
 	    lpRect->left = wnd->owner->rectWindow.left + SYSMETRICS_CXICON / 2 -
@@ -119,16 +119,16 @@ static BOOL32 ICONTITLE_GetTitlePos( WND* wnd, LPRECT32 lpRect )
 /***********************************************************************
  *           ICONTITLE_Paint
  */
-static BOOL32 ICONTITLE_Paint( WND* wnd, HDC32 hDC, BOOL32 bActive )
+static BOOL ICONTITLE_Paint( WND* wnd, HDC hDC, BOOL bActive )
 {
-    HFONT32 hPrevFont;
-    HBRUSH32 hBrush = 0;
+    HFONT hPrevFont;
+    HBRUSH hBrush = 0;
     COLORREF textColor = 0;
 
     if( bActive )
     {
-	hBrush = GetSysColorBrush32(COLOR_ACTIVECAPTION);
-	textColor = GetSysColor32(COLOR_CAPTIONTEXT);
+	hBrush = GetSysColorBrush(COLOR_ACTIVECAPTION);
+	textColor = GetSysColor(COLOR_CAPTIONTEXT);
     }
     else 
     {
@@ -137,9 +137,9 @@ static BOOL32 ICONTITLE_Paint( WND* wnd, HDC32 hDC, BOOL32 bActive )
 	    hBrush = wnd->parent->class->hbrBackground;
 	    if( hBrush )
 	    {
-		INT32 level;
-		LOGBRUSH32 logBrush;
-		GetObject32A( hBrush, sizeof(logBrush), &logBrush );
+		INT level;
+		LOGBRUSH logBrush;
+		GetObjectA( hBrush, sizeof(logBrush), &logBrush );
 		level = GetRValue(logBrush.lbColor) +
 			   GetGValue(logBrush.lbColor) +
 			      GetBValue(logBrush.lbColor);
@@ -147,36 +147,36 @@ static BOOL32 ICONTITLE_Paint( WND* wnd, HDC32 hDC, BOOL32 bActive )
 		    textColor = RGB( 0xFF, 0xFF, 0xFF );
 	    }
 	    else
-		hBrush = GetStockObject32( WHITE_BRUSH );
+		hBrush = GetStockObject( WHITE_BRUSH );
 	}
 	else
 	{
-	    hBrush = GetStockObject32( BLACK_BRUSH );
+	    hBrush = GetStockObject( BLACK_BRUSH );
 	    textColor = RGB( 0xFF, 0xFF, 0xFF );    
 	}
     }
 
-    FillWindow( wnd->parent->hwndSelf, wnd->hwndSelf, hDC, hBrush );
+    FillWindow16( wnd->parent->hwndSelf, wnd->hwndSelf, hDC, hBrush );
 
-    hPrevFont = SelectObject32( hDC, hIconTitleFont );
+    hPrevFont = SelectObject( hDC, hIconTitleFont );
     if( hPrevFont )
     {
-        RECT32  rect;
-	INT32	length;
+        RECT  rect;
+	INT	length;
 	char	buffer[80];
 
 	rect.left = rect.top = 0;
 	rect.right = wnd->rectWindow.right - wnd->rectWindow.left;
 	rect.bottom = wnd->rectWindow.bottom - wnd->rectWindow.top;
 
-	length = GetWindowText32A( wnd->owner->hwndSelf, buffer, 80 );
-        SetTextColor32( hDC, textColor );
-        SetBkMode32( hDC, TRANSPARENT );
+	length = GetWindowTextA( wnd->owner->hwndSelf, buffer, 80 );
+        SetTextColor( hDC, textColor );
+        SetBkMode( hDC, TRANSPARENT );
 	
-	DrawText32A( hDC, buffer, length, &rect, DT_CENTER | DT_NOPREFIX |
+	DrawTextA( hDC, buffer, length, &rect, DT_CENTER | DT_NOPREFIX |
 		     DT_WORDBREAK | ((bMultiLineTitle) ? 0 : DT_SINGLELINE) ); 
 
-	SelectObject32( hDC, hPrevFont );
+	SelectObject( hDC, hPrevFont );
     }
     return ( hPrevFont ) ? TRUE : FALSE;
 }
@@ -184,8 +184,8 @@ static BOOL32 ICONTITLE_Paint( WND* wnd, HDC32 hDC, BOOL32 bActive )
 /***********************************************************************
  *           IconTitleWndProc
  */
-LRESULT WINAPI IconTitleWndProc( HWND32 hWnd, UINT32 msg,
-                                 WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
+                                 WPARAM wParam, LPARAM lParam )
 {
     WND *wnd = WIN_FindWndPtr( hWnd );
 
@@ -196,10 +196,10 @@ LRESULT WINAPI IconTitleWndProc( HWND32 hWnd, UINT32 msg,
 
 	case WM_NCMOUSEMOVE:
 	case WM_NCLBUTTONDBLCLK:
-	     return SendMessage32A( wnd->owner->hwndSelf, msg, wParam, lParam );	
+	     return SendMessageA( wnd->owner->hwndSelf, msg, wParam, lParam );	
 
 	case WM_ACTIVATE:
-	     if( wParam ) SetActiveWindow32( wnd->owner->hwndSelf );
+	     if( wParam ) SetActiveWindow( wnd->owner->hwndSelf );
 	     /* fall through */
 
 	case WM_CLOSE:
@@ -208,15 +208,15 @@ LRESULT WINAPI IconTitleWndProc( HWND32 hWnd, UINT32 msg,
 	case WM_SHOWWINDOW:
 	     if( wnd && wParam )
 	     {
-		 RECT32 titleRect;
+		 RECT titleRect;
 
 		 ICONTITLE_GetTitlePos( wnd, &titleRect );
 		 if( wnd->owner->next != wnd )	/* keep icon title behind the owner */
-		     SetWindowPos32( hWnd, wnd->owner->hwndSelf, 
+		     SetWindowPos( hWnd, wnd->owner->hwndSelf, 
 				     titleRect.left, titleRect.top,
 				     titleRect.right, titleRect.bottom, SWP_NOACTIVATE );
 		 else
-		     SetWindowPos32( hWnd, 0, titleRect.left, titleRect.top,
+		     SetWindowPos( hWnd, 0, titleRect.left, titleRect.top,
 				     titleRect.right, titleRect.bottom, 
 				     SWP_NOACTIVATE | SWP_NOZORDER );
 	     }
@@ -228,17 +228,17 @@ LRESULT WINAPI IconTitleWndProc( HWND32 hWnd, UINT32 msg,
 		 WND* iconWnd = wnd->owner;
 
 		 if( iconWnd->dwStyle & WS_CHILD )
-		     lParam = SendMessage32A( iconWnd->hwndSelf, WM_ISACTIVEICON, 0, 0 );
+		     lParam = SendMessageA( iconWnd->hwndSelf, WM_ISACTIVEICON, 0, 0 );
 		 else
 		     lParam = (iconWnd->hwndSelf == GetActiveWindow16());
 
-		 if( ICONTITLE_Paint( wnd, (HDC32)wParam, (BOOL32)lParam ) )
-		     ValidateRect32( hWnd, NULL );
+		 if( ICONTITLE_Paint( wnd, (HDC)wParam, (BOOL)lParam ) )
+		     ValidateRect( hWnd, NULL );
 	         return 1;
 	     }
     }
 
-    return DefWindowProc32A( hWnd, msg, wParam, lParam );
+    return DefWindowProcA( hWnd, msg, wParam, lParam );
 }
 
 
diff --git a/controls/listbox.c b/controls/listbox.c
index f47b1252f1f..5bc1c710d2b 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -36,34 +36,34 @@
 typedef struct
 {
     LPSTR     str;       /* Item text */
-    BOOL32    selected;  /* Is item selected? */
-    UINT32    height;    /* Item height (only for OWNERDRAWVARIABLE) */
+    BOOL    selected;  /* Is item selected? */
+    UINT    height;    /* Item height (only for OWNERDRAWVARIABLE) */
     DWORD     data;      /* User data */
 } LB_ITEMDATA;
 
 /* Listbox structure */
 typedef struct
 {
-    HANDLE32      heap;           /* Heap for this listbox */
-    HWND32        owner;          /* Owner window to send notifications to */
-    UINT32        style;          /* Window style */
-    INT32         width;          /* Window width */
-    INT32         height;         /* Window height */
+    HANDLE      heap;           /* Heap for this listbox */
+    HWND        owner;          /* Owner window to send notifications to */
+    UINT        style;          /* Window style */
+    INT         width;          /* Window width */
+    INT         height;         /* Window height */
     LB_ITEMDATA  *items;          /* Array of items */
-    INT32         nb_items;       /* Number of items */
-    INT32         top_item;       /* Top visible item */
-    INT32         selected_item;  /* Selected item */
-    INT32         focus_item;     /* Item that has the focus */
-    INT32         anchor_item;    /* Anchor item for extended selection */
-    INT32         item_height;    /* Default item height */
-    INT32         page_size;      /* Items per listbox page */
-    INT32         column_width;   /* Column width for multi-column listboxes */
-    INT32         horz_extent;    /* Horizontal extent (0 if no hscroll) */
-    INT32         horz_pos;       /* Horizontal position */
-    INT32         nb_tabs;        /* Number of tabs in array */
-    INT32        *tabs;           /* Array of tabs */
-    BOOL32        caret_on;       /* Is caret on? */
-    HFONT32       font;           /* Current font */
+    INT         nb_items;       /* Number of items */
+    INT         top_item;       /* Top visible item */
+    INT         selected_item;  /* Selected item */
+    INT         focus_item;     /* Item that has the focus */
+    INT         anchor_item;    /* Anchor item for extended selection */
+    INT         item_height;    /* Default item height */
+    INT         page_size;      /* Items per listbox page */
+    INT         column_width;   /* Column width for multi-column listboxes */
+    INT         horz_extent;    /* Horizontal extent (0 if no hscroll) */
+    INT         horz_pos;       /* Horizontal position */
+    INT         nb_tabs;        /* Number of tabs in array */
+    INT        *tabs;           /* Array of tabs */
+    BOOL        caret_on;       /* Is caret on? */
+    HFONT       font;           /* Current font */
     LCID          locale;         /* Current locale for string comparisons */
     LPHEADCOMBO   lphc;		  /* ComboLBox */
 } LB_DESCR;
@@ -76,7 +76,7 @@ typedef struct
     (!IS_OWNERDRAW(descr) || ((descr)->style & LBS_HASSTRINGS))
 
 #define SEND_NOTIFICATION(wnd,descr,code) \
-    (SendMessage32A( (descr)->owner, WM_COMMAND, \
+    (SendMessageA( (descr)->owner, WM_COMMAND, \
      MAKEWPARAM((((descr)->lphc)?ID_CB_LISTBOX:(wnd)->wIDmenu), (code) ), (wnd)->hwndSelf ))
 
 /* Current timer status */
@@ -97,13 +97,13 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE;
  */
 void LISTBOX_Dump( WND *wnd )
 {
-    INT32 i;
+    INT i;
     LB_ITEMDATA *item;
     LB_DESCR *descr = *(LB_DESCR **)wnd->wExtra;
 
     DUMP( "Listbox:\n" );
     DUMP( "hwnd=%04x descr=%08x heap=%08x items=%d top=%d\n",
-	  wnd->hwndSelf, (UINT32)descr, descr->heap, descr->nb_items,
+	  wnd->hwndSelf, (UINT)descr, descr->heap, descr->nb_items,
 	  descr->top_item );
     for (i = 0, item = descr->items; i < descr->nb_items; i++, item++)
     {
@@ -118,9 +118,9 @@ void LISTBOX_Dump( WND *wnd )
  *
  * Return the current page size
  */
-static INT32 LISTBOX_GetCurrentPageSize( WND *wnd, LB_DESCR *descr )
+static INT LISTBOX_GetCurrentPageSize( WND *wnd, LB_DESCR *descr )
 {
-    INT32 i, height;
+    INT i, height;
     if (!(descr->style & LBS_OWNERDRAWVARIABLE)) return descr->page_size;
     for (i = descr->top_item, height = 0; i < descr->nb_items; i++)
     {
@@ -136,9 +136,9 @@ static INT32 LISTBOX_GetCurrentPageSize( WND *wnd, LB_DESCR *descr )
  *
  * Return the maximum possible index for the top of the listbox.
  */
-static INT32 LISTBOX_GetMaxTopIndex( WND *wnd, LB_DESCR *descr )
+static INT LISTBOX_GetMaxTopIndex( WND *wnd, LB_DESCR *descr )
 {
-    INT32 max, page;
+    INT max, page;
 
     if (descr->style & LBS_OWNERDRAWVARIABLE)
     {
@@ -194,10 +194,10 @@ static void LISTBOX_UpdateScroll( WND *wnd, LB_DESCR *descr )
         info.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
         if (descr->style & LBS_DISABLENOSCROLL)
             info.fMask |= SIF_DISABLENOSCROLL;
-        SetScrollInfo32( wnd->hwndSelf, SB_HORZ, &info, TRUE );
+        SetScrollInfo( wnd->hwndSelf, SB_HORZ, &info, TRUE );
         info.nMax = 0;
         info.fMask = SIF_RANGE;
-        SetScrollInfo32( wnd->hwndSelf, SB_VERT, &info, TRUE );
+        SetScrollInfo( wnd->hwndSelf, SB_VERT, &info, TRUE );
     }
     else
     {
@@ -208,7 +208,7 @@ static void LISTBOX_UpdateScroll( WND *wnd, LB_DESCR *descr )
         info.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
         if (descr->style & LBS_DISABLENOSCROLL)
             info.fMask |= SIF_DISABLENOSCROLL;
-        SetScrollInfo32( wnd->hwndSelf, SB_VERT, &info, TRUE );
+        SetScrollInfo( wnd->hwndSelf, SB_VERT, &info, TRUE );
 
         if (descr->horz_extent)
         {
@@ -219,7 +219,7 @@ static void LISTBOX_UpdateScroll( WND *wnd, LB_DESCR *descr )
             info.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
             if (descr->style & LBS_DISABLENOSCROLL)
                 info.fMask |= SIF_DISABLENOSCROLL;
-            SetScrollInfo32( wnd->hwndSelf, SB_HORZ, &info, TRUE );
+            SetScrollInfo( wnd->hwndSelf, SB_HORZ, &info, TRUE );
         }
     }
 }
@@ -230,19 +230,19 @@ static void LISTBOX_UpdateScroll( WND *wnd, LB_DESCR *descr )
  *
  * Set the top item of the listbox, scrolling up or down if necessary.
  */
-static LRESULT LISTBOX_SetTopItem( WND *wnd, LB_DESCR *descr, INT32 index,
-                                   BOOL32 scroll )
+static LRESULT LISTBOX_SetTopItem( WND *wnd, LB_DESCR *descr, INT index,
+                                   BOOL scroll )
 {
-    INT32 max = LISTBOX_GetMaxTopIndex( wnd, descr );
+    INT max = LISTBOX_GetMaxTopIndex( wnd, descr );
     if (index > max) index = max;
     if (index < 0) index = 0;
     if (descr->style & LBS_MULTICOLUMN) index -= index % descr->page_size;
     if (descr->top_item == index) return LB_OKAY;
     if (descr->style & LBS_MULTICOLUMN)
     {
-        INT32 diff = (descr->top_item - index) / descr->page_size * descr->column_width;
+        INT diff = (descr->top_item - index) / descr->page_size * descr->column_width;
         if (scroll && (abs(diff) < descr->width))
-            ScrollWindowEx32( wnd->hwndSelf, diff, 0, NULL, NULL, 0, NULL, 
+            ScrollWindowEx( wnd->hwndSelf, diff, 0, NULL, NULL, 0, NULL, 
                               SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN );
 
         else
@@ -250,10 +250,10 @@ static LRESULT LISTBOX_SetTopItem( WND *wnd, LB_DESCR *descr, INT32 index,
     }
     else if (scroll)
     {
-        INT32 diff;
+        INT diff;
         if (descr->style & LBS_OWNERDRAWVARIABLE)
         {
-            INT32 i;
+            INT i;
             diff = 0;
             if (index > descr->top_item)
             {
@@ -270,12 +270,12 @@ static LRESULT LISTBOX_SetTopItem( WND *wnd, LB_DESCR *descr, INT32 index,
             diff = (descr->top_item - index) * descr->item_height;
 
         if (abs(diff) < descr->height)
-            ScrollWindowEx32( wnd->hwndSelf, 0, diff, NULL, NULL, 0, NULL,
+            ScrollWindowEx( wnd->hwndSelf, 0, diff, NULL, NULL, 0, NULL,
                               SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN );
         else
             scroll = FALSE;
     }
-    if (!scroll) InvalidateRect32( wnd->hwndSelf, NULL, TRUE );
+    if (!scroll) InvalidateRect( wnd->hwndSelf, NULL, TRUE );
     descr->top_item = index;
     LISTBOX_UpdateScroll( wnd, descr );
     return LB_OKAY;
@@ -290,13 +290,13 @@ static LRESULT LISTBOX_SetTopItem( WND *wnd, LB_DESCR *descr, INT32 index,
  */
 static void LISTBOX_UpdatePage( WND *wnd, LB_DESCR *descr )
 {
-    INT32 page_size;
+    INT page_size;
 
     if ((page_size = descr->height / descr->item_height) < 1) page_size = 1;
     if (page_size == descr->page_size) return;
     descr->page_size = page_size;
     if (descr->style & LBS_MULTICOLUMN)
-        InvalidateRect32( wnd->hwndSelf, NULL, TRUE );
+        InvalidateRect( wnd->hwndSelf, NULL, TRUE );
     LISTBOX_SetTopItem( wnd, descr, descr->top_item, FALSE );
 }
 
@@ -309,9 +309,9 @@ static void LISTBOX_UpdatePage( WND *wnd, LB_DESCR *descr )
  */
 static void LISTBOX_UpdateSize( WND *wnd, LB_DESCR *descr )
 {
-    RECT32 rect;
+    RECT rect;
 
-    GetClientRect32( wnd->hwndSelf, &rect );
+    GetClientRect( wnd->hwndSelf, &rect );
     descr->width  = rect.right - rect.left;
     descr->height = rect.bottom - rect.top;
     if (!(descr->style & LBS_NOINTEGRALHEIGHT) && !IS_OWNERDRAW(descr))
@@ -322,7 +322,7 @@ static void LISTBOX_UpdateSize( WND *wnd, LB_DESCR *descr )
             TRACE(listbox, "[%04x]: changing height %d -> %d\n",
 			 wnd->hwndSelf, descr->height,
 			 descr->height - descr->height%descr->item_height );
-            SetWindowPos32( wnd->hwndSelf, 0, 0, 0,
+            SetWindowPos( wnd->hwndSelf, 0, 0, 0,
                             wnd->rectWindow.right - wnd->rectWindow.left,
                             wnd->rectWindow.bottom - wnd->rectWindow.top -
                                 (descr->height % descr->item_height),
@@ -343,15 +343,15 @@ static void LISTBOX_UpdateSize( WND *wnd, LB_DESCR *descr )
  * Get the rectangle enclosing an item, in listbox client coordinates.
  * Return 1 if the rectangle is (partially) visible, 0 if hidden, -1 on error.
  */
-static LRESULT LISTBOX_GetItemRect( WND *wnd, LB_DESCR *descr, INT32 index,
-                                    RECT32 *rect )
+static LRESULT LISTBOX_GetItemRect( WND *wnd, LB_DESCR *descr, INT index,
+                                    RECT *rect )
 {
     /* Index <= 0 is legal even on empty listboxes */
     if (index && (index >= descr->nb_items)) return -1;
-    SetRect32( rect, 0, 0, descr->width, descr->height );
+    SetRect( rect, 0, 0, descr->width, descr->height );
     if (descr->style & LBS_MULTICOLUMN)
     {
-        INT32 col = (index / descr->page_size) -
+        INT col = (index / descr->page_size) -
                         (descr->top_item / descr->page_size);
         rect->left += col * descr->column_width;
         rect->right = rect->left + descr->column_width;
@@ -360,7 +360,7 @@ static LRESULT LISTBOX_GetItemRect( WND *wnd, LB_DESCR *descr, INT32 index,
     }
     else if (descr->style & LBS_OWNERDRAWVARIABLE)
     {
-        INT32 i;
+        INT i;
         rect->right += descr->horz_pos;
         if ((index >= 0) && (index < descr->nb_items))
         {
@@ -395,15 +395,15 @@ static LRESULT LISTBOX_GetItemRect( WND *wnd, LB_DESCR *descr, INT32 index,
  *
  * Return the item nearest from point (x,y) (in client coordinates).
  */
-static INT32 LISTBOX_GetItemFromPoint( WND *wnd, LB_DESCR *descr,
-                                       INT32 x, INT32 y )
+static INT LISTBOX_GetItemFromPoint( WND *wnd, LB_DESCR *descr,
+                                       INT x, INT y )
 {
-    INT32 index = descr->top_item;
+    INT index = descr->top_item;
 
     if (!descr->nb_items) return -1;  /* No items */
     if (descr->style & LBS_OWNERDRAWVARIABLE)
     {
-        INT32 pos = 0;
+        INT pos = 0;
         if (y >= 0)
         {
             while (index < descr->nb_items)
@@ -443,21 +443,21 @@ static INT32 LISTBOX_GetItemFromPoint( WND *wnd, LB_DESCR *descr,
  *
  * Paint an item.
  */
-static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC32 hdc,
-                               const RECT32 *rect, INT32 index, UINT32 action )
+static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC hdc,
+                               const RECT *rect, INT index, UINT action )
 {
     LB_ITEMDATA *item = NULL;
     if (index < descr->nb_items) item = &descr->items[index];
 
     if (IS_OWNERDRAW(descr))
     {
-        DRAWITEMSTRUCT32 dis;
-	UINT32		 id = (descr->lphc) ? ID_CB_LISTBOX : wnd->wIDmenu;
+        DRAWITEMSTRUCT dis;
+	UINT		 id = (descr->lphc) ? ID_CB_LISTBOX : wnd->wIDmenu;
 
 	if (!item)
 	{
 	    if (action == ODA_FOCUS) 
-		DrawFocusRect32( hdc, rect );
+		DrawFocusRect( hdc, rect );
 	    else
 	        FIXME(listbox,"called with an out of bounds index %d(%d) in owner draw, Not good.\n",index,descr->nb_items);
 	    return;
@@ -472,7 +472,7 @@ static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC32 hdc,
         if (item && item->selected) dis.itemState |= ODS_SELECTED;
         if ((descr->focus_item == index) &&
             (descr->caret_on) &&
-            (GetFocus32() == wnd->hwndSelf)) dis.itemState |= ODS_FOCUS;
+            (GetFocus() == wnd->hwndSelf)) dis.itemState |= ODS_FOCUS;
         if (wnd->dwStyle & WS_DISABLED) dis.itemState |= ODS_DISABLED;
         dis.itemData     = item ? item->data : 0;
         dis.rcItem       = *rect;
@@ -481,7 +481,7 @@ static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC32 hdc,
 		     wnd->hwndSelf, index, item ? item->str : "", action,
 		     dis.itemState, rect->left, rect->top,
 		     rect->right, rect->bottom );
-        SendMessage32A(descr->owner, WM_DRAWITEM, id, (LPARAM)&dis);
+        SendMessageA(descr->owner, WM_DRAWITEM, id, (LPARAM)&dis);
     }
     else
     {
@@ -489,13 +489,13 @@ static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC32 hdc,
 
         if (action == ODA_FOCUS)
         {
-            DrawFocusRect32( hdc, rect );
+            DrawFocusRect( hdc, rect );
             return;
         }
         if (item && item->selected)
         {
-            oldBk = SetBkColor32( hdc, GetSysColor32( COLOR_HIGHLIGHT ) );
-            oldText = SetTextColor32( hdc, GetSysColor32(COLOR_HIGHLIGHTTEXT));
+            oldBk = SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) );
+            oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
         }
 
         TRACE(listbox, "[%04x]: painting %d (%s) action=%02x "
@@ -503,29 +503,29 @@ static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC32 hdc,
 		     wnd->hwndSelf, index, item ? item->str : "", action,
 		     rect->left, rect->top, rect->right, rect->bottom );
         if (!item)
-            ExtTextOut32A( hdc, rect->left + 1, rect->top + 1,
+            ExtTextOutA( hdc, rect->left + 1, rect->top + 1,
                            ETO_OPAQUE | ETO_CLIPPED, rect, NULL, 0, NULL );
         else if (!(descr->style & LBS_USETABSTOPS)) 
-	    ExtTextOut32A( hdc, rect->left + 1, rect->top + 1,
+	    ExtTextOutA( hdc, rect->left + 1, rect->top + 1,
 			   ETO_OPAQUE | ETO_CLIPPED, rect, item->str,
 			   strlen(item->str), NULL );
         else
 	{
 	    /* Output empty string to paint background in the full width. */
-	    ExtTextOut32A( hdc, rect->left + 1, rect->top + 1,
+	    ExtTextOutA( hdc, rect->left + 1, rect->top + 1,
                            ETO_OPAQUE | ETO_CLIPPED, rect, NULL, 0, NULL );
-	    TabbedTextOut32A( hdc, rect->left + 1 , rect->top + 1,
+	    TabbedTextOutA( hdc, rect->left + 1 , rect->top + 1,
 			      item->str, strlen(item->str), 
 			      descr->nb_tabs, descr->tabs, 0);
 	}
         if (item && item->selected)
         {
-            SetBkColor32( hdc, oldBk );
-            SetTextColor32( hdc, oldText );
+            SetBkColor( hdc, oldBk );
+            SetTextColor( hdc, oldText );
         }
         if ((descr->focus_item == index) &&
             (descr->caret_on) &&
-            (GetFocus32() == wnd->hwndSelf)) DrawFocusRect32( hdc, rect );
+            (GetFocus() == wnd->hwndSelf)) DrawFocusRect( hdc, rect );
     }
 }
 
@@ -535,7 +535,7 @@ static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC32 hdc,
  *
  * Change the redraw flag.
  */
-static void LISTBOX_SetRedraw( WND *wnd, LB_DESCR *descr, BOOL32 on )
+static void LISTBOX_SetRedraw( WND *wnd, LB_DESCR *descr, BOOL on )
 {
     if (on)
     {
@@ -552,35 +552,35 @@ static void LISTBOX_SetRedraw( WND *wnd, LB_DESCR *descr, BOOL32 on )
  *
  * Repaint a single item synchronously.
  */
-static void LISTBOX_RepaintItem( WND *wnd, LB_DESCR *descr, INT32 index,
-                                 UINT32 action )
+static void LISTBOX_RepaintItem( WND *wnd, LB_DESCR *descr, INT index,
+                                 UINT action )
 {
-    HDC32 hdc;
-    RECT32 rect;
-    HFONT32 oldFont = 0;
-    HBRUSH32 hbrush, oldBrush = 0;
+    HDC hdc;
+    RECT rect;
+    HFONT oldFont = 0;
+    HBRUSH hbrush, oldBrush = 0;
 
     if (descr->style & LBS_NOREDRAW) return;
     if (LISTBOX_GetItemRect( wnd, descr, index, &rect ) != 1) return;
-    if (!(hdc = GetDCEx32( wnd->hwndSelf, 0, DCX_CACHE ))) return;
-    if (descr->font) oldFont = SelectObject32( hdc, descr->font );
-    hbrush = SendMessage32A( descr->owner, WM_CTLCOLORLISTBOX,
+    if (!(hdc = GetDCEx( wnd->hwndSelf, 0, DCX_CACHE ))) return;
+    if (descr->font) oldFont = SelectObject( hdc, descr->font );
+    hbrush = SendMessageA( descr->owner, WM_CTLCOLORLISTBOX,
                              hdc, (LPARAM)wnd->hwndSelf );
-    if (hbrush) oldBrush = SelectObject32( hdc, hbrush );
+    if (hbrush) oldBrush = SelectObject( hdc, hbrush );
     if (wnd->dwStyle & WS_DISABLED)
-        SetTextColor32( hdc, GetSysColor32( COLOR_GRAYTEXT ) );
-    SetWindowOrgEx32( hdc, descr->horz_pos, 0, NULL );
+        SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) );
+    SetWindowOrgEx( hdc, descr->horz_pos, 0, NULL );
     LISTBOX_PaintItem( wnd, descr, hdc, &rect, index, action );
-    if (oldFont) SelectObject32( hdc, oldFont );
-    if (oldBrush) SelectObject32( hdc, oldBrush );
-    ReleaseDC32( wnd->hwndSelf, hdc );
+    if (oldFont) SelectObject( hdc, oldFont );
+    if (oldBrush) SelectObject( hdc, oldBrush );
+    ReleaseDC( wnd->hwndSelf, hdc );
 }
 
 
 /***********************************************************************
  *           LISTBOX_InitStorage
  */
-static LRESULT LISTBOX_InitStorage( WND *wnd, LB_DESCR *descr, INT32 nb_items,
+static LRESULT LISTBOX_InitStorage( WND *wnd, LB_DESCR *descr, INT nb_items,
                                     DWORD bytes )
 {
     LB_ITEMDATA *item;
@@ -603,8 +603,8 @@ static LRESULT LISTBOX_InitStorage( WND *wnd, LB_DESCR *descr, INT32 nb_items,
 /***********************************************************************
  *           LISTBOX_SetTabStops
  */
-static BOOL32 LISTBOX_SetTabStops( WND *wnd, LB_DESCR *descr, INT32 count,
-                                   LPINT32 tabs, BOOL32 short_ints )
+static BOOL LISTBOX_SetTabStops( WND *wnd, LB_DESCR *descr, INT count,
+                                   LPINT tabs, BOOL short_ints )
 {
     if (!(descr->style & LBS_USETABSTOPS)) return TRUE;
     if (descr->tabs) HeapFree( descr->heap, 0, descr->tabs );
@@ -614,12 +614,12 @@ static BOOL32 LISTBOX_SetTabStops( WND *wnd, LB_DESCR *descr, INT32 count,
         return TRUE;
     }
     /* FIXME: count = 1 */
-    if (!(descr->tabs = (INT32 *)HeapAlloc( descr->heap, 0,
-                                            descr->nb_tabs * sizeof(INT32) )))
+    if (!(descr->tabs = (INT *)HeapAlloc( descr->heap, 0,
+                                            descr->nb_tabs * sizeof(INT) )))
         return FALSE;
     if (short_ints)
     {
-        INT32 i;
+        INT i;
         LPINT16 p = (LPINT16)tabs;
 	dbg_decl_str(listbox, 256);
 
@@ -631,7 +631,7 @@ static BOOL32 LISTBOX_SetTabStops( WND *wnd, LB_DESCR *descr, INT32 count,
         TRACE(listbox, "[%04x]: settabstops %s\n", 
 		     wnd->hwndSelf, dbg_str(listbox));
     }
-    else memcpy( descr->tabs, tabs, descr->nb_tabs * sizeof(INT32) );
+    else memcpy( descr->tabs, tabs, descr->nb_tabs * sizeof(INT) );
     /* FIXME: repaint the window? */
     return TRUE;
 }
@@ -640,7 +640,7 @@ static BOOL32 LISTBOX_SetTabStops( WND *wnd, LB_DESCR *descr, INT32 count,
 /***********************************************************************
  *           LISTBOX_GetText
  */
-static LRESULT LISTBOX_GetText( WND *wnd, LB_DESCR *descr, INT32 index,
+static LRESULT LISTBOX_GetText( WND *wnd, LB_DESCR *descr, INT index,
                                 LPSTR buffer )
 {
     if ((index < 0) || (index >= descr->nb_items)) return LB_ERR;
@@ -648,7 +648,7 @@ static LRESULT LISTBOX_GetText( WND *wnd, LB_DESCR *descr, INT32 index,
     {
         if (!buffer)
 		return strlen(descr->items[index].str);
-        lstrcpy32A( buffer, descr->items[index].str );
+        lstrcpyA( buffer, descr->items[index].str );
         return strlen(buffer);
     } else {
     	if (buffer)
@@ -664,10 +664,10 @@ static LRESULT LISTBOX_GetText( WND *wnd, LB_DESCR *descr, INT32 index,
  * Find the nearest string located before a given string in sort order.
  * If 'exact' is TRUE, return an error if we don't get an exact match.
  */
-static INT32 LISTBOX_FindStringPos( WND *wnd, LB_DESCR *descr, LPCSTR str,
-                                    BOOL32 exact )
+static INT LISTBOX_FindStringPos( WND *wnd, LB_DESCR *descr, LPCSTR str,
+                                    BOOL exact )
 {
-    INT32 index, min, max, res = -1;
+    INT index, min, max, res = -1;
 
     if (!(descr->style & LBS_SORT)) return -1;  /* Add it at the end */
     min = 0;
@@ -676,11 +676,11 @@ static INT32 LISTBOX_FindStringPos( WND *wnd, LB_DESCR *descr, LPCSTR str,
     {
         index = (min + max) / 2;
         if (HAS_STRINGS(descr))
-            res = lstrcmpi32A( descr->items[index].str, str );
+            res = lstrcmpiA( descr->items[index].str, str );
         else
         {
-            COMPAREITEMSTRUCT32 cis;
-	    UINT32		id = (descr->lphc) ? ID_CB_LISTBOX : wnd->wIDmenu;
+            COMPAREITEMSTRUCT cis;
+	    UINT		id = (descr->lphc) ? ID_CB_LISTBOX : wnd->wIDmenu;
 
             cis.CtlType    = ODT_LISTBOX;
             cis.CtlID      = id;
@@ -690,7 +690,7 @@ static INT32 LISTBOX_FindStringPos( WND *wnd, LB_DESCR *descr, LPCSTR str,
             cis.itemID2    = -1;
             cis.itemData2  = (DWORD)str;
             cis.dwLocaleId = descr->locale;
-            res = SendMessage32A( descr->owner, WM_COMPAREITEM,
+            res = SendMessageA( descr->owner, WM_COMPAREITEM,
                                   id, (LPARAM)&cis );
         }
         if (!res) return index;
@@ -707,9 +707,9 @@ static INT32 LISTBOX_FindStringPos( WND *wnd, LB_DESCR *descr, LPCSTR str,
  * Find the nearest string located before a given string in directory
  * sort order (i.e. first files, then directories, then drives).
  */
-static INT32 LISTBOX_FindFileStrPos( WND *wnd, LB_DESCR *descr, LPCSTR str )
+static INT LISTBOX_FindFileStrPos( WND *wnd, LB_DESCR *descr, LPCSTR str )
 {
-    INT32 min, max, res = -1;
+    INT min, max, res = -1;
 
     if (!HAS_STRINGS(descr))
         return LISTBOX_FindStringPos( wnd, descr, str, FALSE );
@@ -717,7 +717,7 @@ static INT32 LISTBOX_FindFileStrPos( WND *wnd, LB_DESCR *descr, LPCSTR str )
     max = descr->nb_items;
     while (min != max)
     {
-        INT32 index = (min + max) / 2;
+        INT index = (min + max) / 2;
         const char *p = descr->items[index].str;
         if (*p == '[')  /* drive or directory */
         {
@@ -730,13 +730,13 @@ static INT32 LISTBOX_FindFileStrPos( WND *wnd, LB_DESCR *descr, LPCSTR str )
             else  /* directory */
             {
                 if (str[1] == '-') res = 1;
-                else res = lstrcmpi32A( str, p );
+                else res = lstrcmpiA( str, p );
             }
         }
         else  /* filename */
         {
             if (*str == '[') res = 1;
-            else res = lstrcmpi32A( str, p );
+            else res = lstrcmpiA( str, p );
         }
         if (!res) return index;
         if (res < 0) max = index;
@@ -751,10 +751,10 @@ static INT32 LISTBOX_FindFileStrPos( WND *wnd, LB_DESCR *descr, LPCSTR str )
  *
  * Find the item beginning with a given string.
  */
-static INT32 LISTBOX_FindString( WND *wnd, LB_DESCR *descr, INT32 start,
-                                 LPCSTR str, BOOL32 exact )
+static INT LISTBOX_FindString( WND *wnd, LB_DESCR *descr, INT start,
+                                 LPCSTR str, BOOL exact )
 {
-    INT32 i;
+    INT i;
     LB_ITEMDATA *item;
 
     if (start >= descr->nb_items) start = -1;
@@ -765,9 +765,9 @@ static INT32 LISTBOX_FindString( WND *wnd, LB_DESCR *descr, INT32 start,
         if (exact)
         {
             for (i = start + 1; i < descr->nb_items; i++, item++)
-                if (!lstrcmpi32A( str, item->str )) return i;
+                if (!lstrcmpiA( str, item->str )) return i;
             for (i = 0, item = descr->items; i <= start; i++, item++)
-                if (!lstrcmpi32A( str, item->str )) return i;
+                if (!lstrcmpiA( str, item->str )) return i;
         }
         else
         {
@@ -775,20 +775,20 @@ static INT32 LISTBOX_FindString( WND *wnd, LB_DESCR *descr, INT32 start,
 #define CHECK_DRIVE(item) \
     if ((item)->str[0] == '[') \
     { \
-        if (!lstrncmpi32A( str, (item)->str+1, len )) return i; \
-        if (((item)->str[1] == '-') && !lstrncmpi32A(str,(item)->str+2,len)) \
+        if (!lstrncmpiA( str, (item)->str+1, len )) return i; \
+        if (((item)->str[1] == '-') && !lstrncmpiA(str,(item)->str+2,len)) \
         return i; \
     }
 
-            INT32 len = strlen(str);
+            INT len = strlen(str);
             for (i = start + 1; i < descr->nb_items; i++, item++)
             {
-               if (!lstrncmpi32A( str, item->str, len )) return i;
+               if (!lstrncmpiA( str, item->str, len )) return i;
                CHECK_DRIVE(item);
             }
             for (i = 0, item = descr->items; i <= start; i++, item++)
             {
-               if (!lstrncmpi32A( str, item->str, len )) return i;
+               if (!lstrncmpiA( str, item->str, len )) return i;
                CHECK_DRIVE(item);
             }
 #undef CHECK_DRIVE
@@ -815,7 +815,7 @@ static INT32 LISTBOX_FindString( WND *wnd, LB_DESCR *descr, INT32 start,
  */
 static LRESULT LISTBOX_GetSelCount( WND *wnd, LB_DESCR *descr )
 {
-    INT32 i, count;
+    INT i, count;
     LB_ITEMDATA *item = descr->items;
 
     if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR;
@@ -831,7 +831,7 @@ static LRESULT LISTBOX_GetSelCount( WND *wnd, LB_DESCR *descr )
 static LRESULT LISTBOX_GetSelItems16( WND *wnd, LB_DESCR *descr, INT16 max,
                                       LPINT16 array )
 {
-    INT32 i, count;
+    INT i, count;
     LB_ITEMDATA *item = descr->items;
 
     if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR;
@@ -844,10 +844,10 @@ static LRESULT LISTBOX_GetSelItems16( WND *wnd, LB_DESCR *descr, INT16 max,
 /***********************************************************************
  *           LISTBOX_GetSelItems32
  */
-static LRESULT LISTBOX_GetSelItems32( WND *wnd, LB_DESCR *descr, INT32 max,
-                                      LPINT32 array )
+static LRESULT LISTBOX_GetSelItems( WND *wnd, LB_DESCR *descr, INT max,
+                                      LPINT array )
 {
-    INT32 i, count;
+    INT i, count;
     LB_ITEMDATA *item = descr->items;
 
     if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR;
@@ -860,32 +860,32 @@ static LRESULT LISTBOX_GetSelItems32( WND *wnd, LB_DESCR *descr, INT32 max,
 /***********************************************************************
  *           LISTBOX_Paint
  */
-static LRESULT LISTBOX_Paint( WND *wnd, LB_DESCR *descr, HDC32 hdc )
+static LRESULT LISTBOX_Paint( WND *wnd, LB_DESCR *descr, HDC hdc )
 {
-    INT32 i, col_pos = descr->page_size - 1;
-    RECT32 rect;
-    HFONT32 oldFont = 0;
-    HBRUSH32 hbrush, oldBrush = 0;
+    INT i, col_pos = descr->page_size - 1;
+    RECT rect;
+    HFONT oldFont = 0;
+    HBRUSH hbrush, oldBrush = 0;
 
-    SetRect32( &rect, 0, 0, descr->width, descr->height );
+    SetRect( &rect, 0, 0, descr->width, descr->height );
     if (descr->style & LBS_NOREDRAW) return 0;
     if (descr->style & LBS_MULTICOLUMN)
         rect.right = rect.left + descr->column_width;
     else if (descr->horz_pos)
     {
-        SetWindowOrgEx32( hdc, descr->horz_pos, 0, NULL );
+        SetWindowOrgEx( hdc, descr->horz_pos, 0, NULL );
         rect.right += descr->horz_pos;
     }
 
-    if (descr->font) oldFont = SelectObject32( hdc, descr->font );
-    hbrush = SendMessage32A( descr->owner, WM_CTLCOLORLISTBOX,
+    if (descr->font) oldFont = SelectObject( hdc, descr->font );
+    hbrush = SendMessageA( descr->owner, WM_CTLCOLORLISTBOX,
                              hdc, (LPARAM)wnd->hwndSelf );
-    if (hbrush) oldBrush = SelectObject32( hdc, hbrush );
+    if (hbrush) oldBrush = SelectObject( hdc, hbrush );
     if (wnd->dwStyle & WS_DISABLED)
-        SetTextColor32( hdc, GetSysColor32( COLOR_GRAYTEXT ) );
+        SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) );
 
     if (!descr->nb_items && (descr->focus_item != -1) && descr->caret_on &&
-        (GetFocus32() == wnd->hwndSelf))
+        (GetFocus() == wnd->hwndSelf))
     {
         /* Special case for empty listbox: paint focus rect */
         rect.bottom = rect.top + descr->item_height;
@@ -909,11 +909,11 @@ static LRESULT LISTBOX_Paint( WND *wnd, LB_DESCR *descr, HDC32 hdc )
             if (!IS_OWNERDRAW(descr))
             {
                 /* Clear the bottom of the column */
-                SetBkColor32( hdc, GetSysColor32( COLOR_WINDOW ) );
+                SetBkColor( hdc, GetSysColor( COLOR_WINDOW ) );
                 if (rect.top < descr->height)
                 {
                     rect.bottom = descr->height;
-                    ExtTextOut32A( hdc, 0, 0, ETO_OPAQUE | ETO_CLIPPED,
+                    ExtTextOutA( hdc, 0, 0, ETO_OPAQUE | ETO_CLIPPED,
                                    &rect, NULL, 0, NULL );
                 }
             }
@@ -934,11 +934,11 @@ static LRESULT LISTBOX_Paint( WND *wnd, LB_DESCR *descr, HDC32 hdc )
     if (!IS_OWNERDRAW(descr))
     {
         /* Clear the remainder of the client area */
-        SetBkColor32( hdc, GetSysColor32( COLOR_WINDOW ) );
+        SetBkColor( hdc, GetSysColor( COLOR_WINDOW ) );
         if (rect.top < descr->height)
         {
             rect.bottom = descr->height;
-            ExtTextOut32A( hdc, 0, 0, ETO_OPAQUE | ETO_CLIPPED,
+            ExtTextOutA( hdc, 0, 0, ETO_OPAQUE | ETO_CLIPPED,
                            &rect, NULL, 0, NULL );
         }
         if (rect.right < descr->width)
@@ -947,12 +947,12 @@ static LRESULT LISTBOX_Paint( WND *wnd, LB_DESCR *descr, HDC32 hdc )
             rect.right  = descr->width;
             rect.top    = 0;
             rect.bottom = descr->height;
-            ExtTextOut32A( hdc, 0, 0, ETO_OPAQUE | ETO_CLIPPED,
+            ExtTextOutA( hdc, 0, 0, ETO_OPAQUE | ETO_CLIPPED,
                            &rect, NULL, 0, NULL );
         }
     }
-    if (oldFont) SelectObject32( hdc, oldFont );
-    if (oldBrush) SelectObject32( hdc, oldBrush );
+    if (oldFont) SelectObject( hdc, oldFont );
+    if (oldBrush) SelectObject( hdc, oldBrush );
     return 0;
 }
 
@@ -963,21 +963,21 @@ static LRESULT LISTBOX_Paint( WND *wnd, LB_DESCR *descr, HDC32 hdc )
  * Invalidate all items from a given item. If the specified item is not
  * visible, nothing happens.
  */
-static void LISTBOX_InvalidateItems( WND *wnd, LB_DESCR *descr, INT32 index )
+static void LISTBOX_InvalidateItems( WND *wnd, LB_DESCR *descr, INT index )
 {
-    RECT32 rect;
+    RECT rect;
 
     if (LISTBOX_GetItemRect( wnd, descr, index, &rect ) == 1)
     {
         rect.bottom = descr->height;
-        InvalidateRect32( wnd->hwndSelf, &rect, TRUE );
+        InvalidateRect( wnd->hwndSelf, &rect, TRUE );
         if (descr->style & LBS_MULTICOLUMN)
         {
             /* Repaint the other columns */
             rect.left  = rect.right;
             rect.right = descr->width;
             rect.top   = 0;
-            InvalidateRect32( wnd->hwndSelf, &rect, TRUE );
+            InvalidateRect( wnd->hwndSelf, &rect, TRUE );
         }
     }
 }
@@ -986,7 +986,7 @@ static void LISTBOX_InvalidateItems( WND *wnd, LB_DESCR *descr, INT32 index )
 /***********************************************************************
  *           LISTBOX_GetItemHeight
  */
-static LRESULT LISTBOX_GetItemHeight( WND *wnd, LB_DESCR *descr, INT32 index )
+static LRESULT LISTBOX_GetItemHeight( WND *wnd, LB_DESCR *descr, INT index )
 {
     if (descr->style & LBS_OWNERDRAWVARIABLE)
     {
@@ -1000,8 +1000,8 @@ static LRESULT LISTBOX_GetItemHeight( WND *wnd, LB_DESCR *descr, INT32 index )
 /***********************************************************************
  *           LISTBOX_SetItemHeight
  */
-static LRESULT LISTBOX_SetItemHeight( WND *wnd, LB_DESCR *descr, INT32 index,
-                                      UINT32 height )
+static LRESULT LISTBOX_SetItemHeight( WND *wnd, LB_DESCR *descr, INT index,
+                                      UINT height )
 {
     if (!height) height = 1;
 
@@ -1021,7 +1021,7 @@ static LRESULT LISTBOX_SetItemHeight( WND *wnd, LB_DESCR *descr, INT32 index,
         descr->item_height = height;
         LISTBOX_UpdatePage( wnd, descr );
         LISTBOX_UpdateScroll( wnd, descr );
-        InvalidateRect32( wnd->hwndSelf, 0, TRUE );
+        InvalidateRect( wnd->hwndSelf, 0, TRUE );
     }
     return LB_OKAY;
 }
@@ -1030,9 +1030,9 @@ static LRESULT LISTBOX_SetItemHeight( WND *wnd, LB_DESCR *descr, INT32 index,
 /***********************************************************************
  *           LISTBOX_SetHorizontalPos
  */
-static void LISTBOX_SetHorizontalPos( WND *wnd, LB_DESCR *descr, INT32 pos )
+static void LISTBOX_SetHorizontalPos( WND *wnd, LB_DESCR *descr, INT pos )
 {
-    INT32 diff;
+    INT diff;
 
     if (pos > descr->horz_extent - descr->width)
         pos = descr->horz_extent - descr->width;
@@ -1043,10 +1043,10 @@ static void LISTBOX_SetHorizontalPos( WND *wnd, LB_DESCR *descr, INT32 pos )
     descr->horz_pos = pos;
     LISTBOX_UpdateScroll( wnd, descr );
     if (abs(diff) < descr->width)
-        ScrollWindowEx32( wnd->hwndSelf, diff, 0, NULL, NULL, 0, NULL,
+        ScrollWindowEx( wnd->hwndSelf, diff, 0, NULL, NULL, 0, NULL,
                           SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN );
     else
-        InvalidateRect32( wnd->hwndSelf, NULL, TRUE );
+        InvalidateRect( wnd->hwndSelf, NULL, TRUE );
 }
 
 
@@ -1054,7 +1054,7 @@ static void LISTBOX_SetHorizontalPos( WND *wnd, LB_DESCR *descr, INT32 pos )
  *           LISTBOX_SetHorizontalExtent
  */
 static LRESULT LISTBOX_SetHorizontalExtent( WND *wnd, LB_DESCR *descr,
-                                            UINT32 extent )
+                                            UINT extent )
 {
     if (!descr->horz_extent || (descr->style & LBS_MULTICOLUMN))
         return LB_OKAY;
@@ -1074,7 +1074,7 @@ static LRESULT LISTBOX_SetHorizontalExtent( WND *wnd, LB_DESCR *descr,
 /***********************************************************************
  *           LISTBOX_SetColumnWidth
  */
-static LRESULT LISTBOX_SetColumnWidth( WND *wnd, LB_DESCR *descr, UINT32 width)
+static LRESULT LISTBOX_SetColumnWidth( WND *wnd, LB_DESCR *descr, UINT width)
 {
     width += 2;  /* For left and right margin */
     if (width == descr->column_width) return LB_OKAY;
@@ -1091,23 +1091,23 @@ static LRESULT LISTBOX_SetColumnWidth( WND *wnd, LB_DESCR *descr, UINT32 width)
  *
  * Returns the item height.
  */
-static INT32 LISTBOX_SetFont( WND *wnd, LB_DESCR *descr, HFONT32 font )
+static INT LISTBOX_SetFont( WND *wnd, LB_DESCR *descr, HFONT font )
 {
-    HDC32 hdc;
-    HFONT32 oldFont = 0;
-    TEXTMETRIC32A tm;
+    HDC hdc;
+    HFONT oldFont = 0;
+    TEXTMETRICA tm;
 
     descr->font = font;
 
-    if (!(hdc = GetDCEx32( wnd->hwndSelf, 0, DCX_CACHE )))
+    if (!(hdc = GetDCEx( wnd->hwndSelf, 0, DCX_CACHE )))
     {
         ERR(listbox, "unable to get DC.\n" );
         return 16;
     }
-    if (font) oldFont = SelectObject32( hdc, font );
-    GetTextMetrics32A( hdc, &tm );
-    if (oldFont) SelectObject32( hdc, oldFont );
-    ReleaseDC32( wnd->hwndSelf, hdc );
+    if (font) oldFont = SelectObject( hdc, font );
+    GetTextMetricsA( hdc, &tm );
+    if (oldFont) SelectObject( hdc, oldFont );
+    ReleaseDC( wnd->hwndSelf, hdc );
     if (!IS_OWNERDRAW(descr))
         LISTBOX_SetItemHeight( wnd, descr, 0, tm.tmHeight );
     return tm.tmHeight ;
@@ -1119,15 +1119,15 @@ static INT32 LISTBOX_SetFont( WND *wnd, LB_DESCR *descr, HFONT32 font )
  *
  * Make sure that a given item is partially or fully visible.
  */
-static void LISTBOX_MakeItemVisible( WND *wnd, LB_DESCR *descr, INT32 index,
-                                     BOOL32 fully )
+static void LISTBOX_MakeItemVisible( WND *wnd, LB_DESCR *descr, INT index,
+                                     BOOL fully )
 {
-    INT32 top;
+    INT top;
 
     if (index <= descr->top_item) top = index;
     else if (descr->style & LBS_MULTICOLUMN)
     {
-        INT32 cols = descr->width;
+        INT cols = descr->width;
         if (!fully) cols += descr->column_width - 1;
         if (cols >= descr->column_width) cols /= descr->column_width;
         else cols = 1;
@@ -1136,7 +1136,7 @@ static void LISTBOX_MakeItemVisible( WND *wnd, LB_DESCR *descr, INT32 index,
     }
     else if (descr->style & LBS_OWNERDRAWVARIABLE)
     {
-        INT32 height = fully ? descr->items[index].height : 1;
+        INT height = fully ? descr->items[index].height : 1;
         for (top = index; top > descr->top_item; top--)
             if ((height += descr->items[top-1].height) > descr->height) break;
     }
@@ -1156,10 +1156,10 @@ static void LISTBOX_MakeItemVisible( WND *wnd, LB_DESCR *descr, INT32 index,
  *
  * Select a range of items. Should only be used on a MULTIPLESEL listbox.
  */
-static LRESULT LISTBOX_SelectItemRange( WND *wnd, LB_DESCR *descr, INT32 first,
-                                        INT32 last, BOOL32 on )
+static LRESULT LISTBOX_SelectItemRange( WND *wnd, LB_DESCR *descr, INT first,
+                                        INT last, BOOL on )
 {
-    INT32 i;
+    INT i;
 
     /* A few sanity checks */
 
@@ -1200,19 +1200,19 @@ static LRESULT LISTBOX_SelectItemRange( WND *wnd, LB_DESCR *descr, INT32 first,
  *   index must be between 0 and descr->nb_items-1, or LB_ERR is returned.
  *
  */
-static LRESULT LISTBOX_SetCaretIndex( WND *wnd, LB_DESCR *descr, INT32 index,
-                                      BOOL32 fully_visible )
+static LRESULT LISTBOX_SetCaretIndex( WND *wnd, LB_DESCR *descr, INT index,
+                                      BOOL fully_visible )
 {
-    INT32 oldfocus = descr->focus_item;          
+    INT oldfocus = descr->focus_item;          
 
     if ((index < 0) || (index >= descr->nb_items)) return LB_ERR;
     if (index == oldfocus) return LB_OKAY;
     descr->focus_item = index;
-    if ((oldfocus != -1) && descr->caret_on && (GetFocus32() == wnd->hwndSelf))
+    if ((oldfocus != -1) && descr->caret_on && (GetFocus() == wnd->hwndSelf))
         LISTBOX_RepaintItem( wnd, descr, oldfocus, ODA_FOCUS );
 
     LISTBOX_MakeItemVisible( wnd, descr, index, fully_visible );
-    if (descr->caret_on && (GetFocus32() == wnd->hwndSelf))
+    if (descr->caret_on && (GetFocus() == wnd->hwndSelf))
         LISTBOX_RepaintItem( wnd, descr, index, ODA_FOCUS );
 
     return LB_OKAY;
@@ -1222,8 +1222,8 @@ static LRESULT LISTBOX_SetCaretIndex( WND *wnd, LB_DESCR *descr, INT32 index,
 /***********************************************************************
  *           LISTBOX_SetSelection
  */
-static LRESULT LISTBOX_SetSelection( WND *wnd, LB_DESCR *descr, INT32 index,
-                                     BOOL32 on, BOOL32 send_notify )
+static LRESULT LISTBOX_SetSelection( WND *wnd, LB_DESCR *descr, INT index,
+                                     BOOL on, BOOL send_notify )
 {
     if ((index < -1) || (index >= descr->nb_items)) return LB_ERR;
     if (descr->style & LBS_MULTIPLESEL)
@@ -1235,7 +1235,7 @@ static LRESULT LISTBOX_SetSelection( WND *wnd, LB_DESCR *descr, INT32 index,
     }
     else
     {
-        INT32 oldsel = descr->selected_item;
+        INT oldsel = descr->selected_item;
         if (index == oldsel) return LB_OKAY;
         if (oldsel != -1) descr->items[oldsel].selected = FALSE;
         if (index != -1) descr->items[index].selected = TRUE;
@@ -1257,16 +1257,16 @@ static LRESULT LISTBOX_SetSelection( WND *wnd, LB_DESCR *descr, INT32 index,
  *
  * Change the caret position and extend the selection to the new caret.
  */
-static void LISTBOX_MoveCaret( WND *wnd, LB_DESCR *descr, INT32 index,
-                               BOOL32 fully_visible )
+static void LISTBOX_MoveCaret( WND *wnd, LB_DESCR *descr, INT index,
+                               BOOL fully_visible )
 {
     LISTBOX_SetCaretIndex( wnd, descr, index, fully_visible );
     if (descr->style & LBS_EXTENDEDSEL)
     {
         if (descr->anchor_item != -1)
         {
-            INT32 first = MIN( descr->focus_item, descr->anchor_item );
-            INT32 last  = MAX( descr->focus_item, descr->anchor_item );
+            INT first = MIN( descr->focus_item, descr->anchor_item );
+            INT last  = MAX( descr->focus_item, descr->anchor_item );
             if (first > 0)
                 LISTBOX_SelectItemRange( wnd, descr, 0, first - 1, FALSE );
             LISTBOX_SelectItemRange( wnd, descr, last + 1, -1, FALSE );
@@ -1284,11 +1284,11 @@ static void LISTBOX_MoveCaret( WND *wnd, LB_DESCR *descr, INT32 index,
 /***********************************************************************
  *           LISTBOX_InsertItem
  */
-static LRESULT LISTBOX_InsertItem( WND *wnd, LB_DESCR *descr, INT32 index,
+static LRESULT LISTBOX_InsertItem( WND *wnd, LB_DESCR *descr, INT index,
                                    LPSTR str, DWORD data )
 {
     LB_ITEMDATA *item;
-    INT32 max_items;
+    INT max_items;
 
     if (index == -1) index = descr->nb_items;
     else if ((index < 0) || (index > descr->nb_items)) return LB_ERR;
@@ -1323,15 +1323,15 @@ static LRESULT LISTBOX_InsertItem( WND *wnd, LB_DESCR *descr, INT32 index,
 
     if (descr->style & LBS_OWNERDRAWVARIABLE)
     {
-        MEASUREITEMSTRUCT32 mis;
-	UINT32		    id = (descr->lphc) ? ID_CB_LISTBOX : wnd->wIDmenu;
+        MEASUREITEMSTRUCT mis;
+	UINT		    id = (descr->lphc) ? ID_CB_LISTBOX : wnd->wIDmenu;
 
         mis.CtlType    = ODT_LISTBOX;
         mis.CtlID      = id;
         mis.itemID     = index;
         mis.itemData   = descr->items[index].data;
         mis.itemHeight = descr->item_height;
-        SendMessage32A( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis );
+        SendMessageA( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis );
         item->height = mis.itemHeight ? mis.itemHeight : 1;
         TRACE(listbox, "[%04x]: measure item %d (%s) = %d\n",
 		     wnd->hwndSelf, index, str ? str : "", item->height );
@@ -1361,7 +1361,7 @@ static LRESULT LISTBOX_InsertItem( WND *wnd, LB_DESCR *descr, INT32 index,
 /***********************************************************************
  *           LISTBOX_InsertString
  */
-static LRESULT LISTBOX_InsertString( WND *wnd, LB_DESCR *descr, INT32 index,
+static LRESULT LISTBOX_InsertString( WND *wnd, LB_DESCR *descr, INT index,
                                      LPCSTR str )
 {
     LPSTR new_str = NULL;
@@ -1396,7 +1396,7 @@ static LRESULT LISTBOX_InsertString( WND *wnd, LB_DESCR *descr, INT32 index,
  *
  * Delete the content of an item. 'index' must be a valid index.
  */
-static void LISTBOX_DeleteItem( WND *wnd, LB_DESCR *descr, INT32 index )
+static void LISTBOX_DeleteItem( WND *wnd, LB_DESCR *descr, INT index )
 {
     /* Note: Win 3.1 only sends DELETEITEM on owner-draw items,
      *       while Win95 sends it for all items with user data.
@@ -1405,15 +1405,15 @@ static void LISTBOX_DeleteItem( WND *wnd, LB_DESCR *descr, INT32 index )
      */
     if (IS_OWNERDRAW(descr) || descr->items[index].data)
     {
-        DELETEITEMSTRUCT32 dis;
-	UINT32		   id = (descr->lphc) ? ID_CB_LISTBOX : wnd->wIDmenu;
+        DELETEITEMSTRUCT dis;
+	UINT		   id = (descr->lphc) ? ID_CB_LISTBOX : wnd->wIDmenu;
 
         dis.CtlType  = ODT_LISTBOX;
         dis.CtlID    = id;
         dis.itemID   = index;
         dis.hwndItem = wnd->hwndSelf;
         dis.itemData = descr->items[index].data;
-        SendMessage32A( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis );
+        SendMessageA( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis );
     }
     if (HAS_STRINGS(descr) && descr->items[index].str)
         HeapFree( descr->heap, 0, descr->items[index].str );
@@ -1425,10 +1425,10 @@ static void LISTBOX_DeleteItem( WND *wnd, LB_DESCR *descr, INT32 index )
  *
  * Remove an item from the listbox and delete its content.
  */
-static LRESULT LISTBOX_RemoveItem( WND *wnd, LB_DESCR *descr, INT32 index )
+static LRESULT LISTBOX_RemoveItem( WND *wnd, LB_DESCR *descr, INT index )
 {
     LB_ITEMDATA *item;
-    INT32 max_items;
+    INT max_items;
 
     if (index == -1) index = descr->nb_items - 1;
     else if ((index < 0) || (index >= descr->nb_items)) return LB_ERR;
@@ -1476,7 +1476,7 @@ static LRESULT LISTBOX_RemoveItem( WND *wnd, LB_DESCR *descr, INT32 index )
  */
 static void LISTBOX_ResetContent( WND *wnd, LB_DESCR *descr )
 {
-    INT32 i;
+    INT i;
 
     for (i = 0; i < descr->nb_items; i++) LISTBOX_DeleteItem( wnd, descr, i );
     if (descr->items) HeapFree( descr->heap, 0, descr->items );
@@ -1487,14 +1487,14 @@ static void LISTBOX_ResetContent( WND *wnd, LB_DESCR *descr )
     descr->anchor_item   = -1;
     descr->items         = NULL;
     LISTBOX_UpdateScroll( wnd, descr );
-    InvalidateRect32( wnd->hwndSelf, NULL, TRUE );
+    InvalidateRect( wnd->hwndSelf, NULL, TRUE );
 }
 
 
 /***********************************************************************
  *           LISTBOX_SetCount
  */
-static LRESULT LISTBOX_SetCount( WND *wnd, LB_DESCR *descr, INT32 count )
+static LRESULT LISTBOX_SetCount( WND *wnd, LB_DESCR *descr, INT count )
 {
     LRESULT ret;
 
@@ -1519,15 +1519,15 @@ static LRESULT LISTBOX_SetCount( WND *wnd, LB_DESCR *descr, INT32 count )
 /***********************************************************************
  *           LISTBOX_Directory
  */
-static LRESULT LISTBOX_Directory( WND *wnd, LB_DESCR *descr, UINT32 attrib,
-                                  LPCSTR filespec, BOOL32 long_names )
+static LRESULT LISTBOX_Directory( WND *wnd, LB_DESCR *descr, UINT attrib,
+                                  LPCSTR filespec, BOOL long_names )
 {
-    HANDLE32 handle;
+    HANDLE handle;
     LRESULT ret = LB_OKAY;
-    WIN32_FIND_DATA32A entry;
+    WIN32_FIND_DATAA entry;
     int pos;
 
-    if ((handle = FindFirstFile32A(filespec,&entry)) == INVALID_HANDLE_VALUE32)
+    if ((handle = FindFirstFileA(filespec,&entry)) == INVALID_HANDLE_VALUE)
     {
         if (GetLastError() != ERROR_NO_MORE_FILES) return LB_ERR;
     }
@@ -1555,12 +1555,12 @@ static LRESULT LISTBOX_Directory( WND *wnd, LB_DESCR *descr, UINT32 attrib,
                 if (long_names) strcpy( buffer, entry.cFileName );
                 else strcpy( buffer, entry.cAlternateFileName );
             }
-            if (!long_names) CharLower32A( buffer );
+            if (!long_names) CharLowerA( buffer );
             pos = LISTBOX_FindFileStrPos( wnd, descr, buffer );
             if ((ret = LISTBOX_InsertString( wnd, descr, pos, buffer )) < 0)
                 break;
-        } while (FindNextFile32A( handle, &entry ));
-        FindClose32( handle );
+        } while (FindNextFileA( handle, &entry ));
+        FindClose( handle );
     }
 
     if ((ret >= 0) && (attrib & DDL_DRIVES))
@@ -1582,7 +1582,7 @@ static LRESULT LISTBOX_Directory( WND *wnd, LB_DESCR *descr, UINT32 attrib,
  *           LISTBOX_HandleVScroll
  */
 static LRESULT LISTBOX_HandleVScroll( WND *wnd, LB_DESCR *descr,
-                                      WPARAM32 wParam, LPARAM lParam )
+                                      WPARAM wParam, LPARAM lParam )
 {
     SCROLLINFO info;
 
@@ -1609,7 +1609,7 @@ static LRESULT LISTBOX_HandleVScroll( WND *wnd, LB_DESCR *descr,
     case SB_THUMBTRACK:
         info.cbSize = sizeof(info);
         info.fMask = SIF_TRACKPOS;
-        GetScrollInfo32( wnd->hwndSelf, SB_VERT, &info );
+        GetScrollInfo( wnd->hwndSelf, SB_VERT, &info );
         LISTBOX_SetTopItem( wnd, descr, info.nTrackPos, TRUE );
         break;
     case SB_TOP:
@@ -1627,10 +1627,10 @@ static LRESULT LISTBOX_HandleVScroll( WND *wnd, LB_DESCR *descr,
  *           LISTBOX_HandleHScroll
  */
 static LRESULT LISTBOX_HandleHScroll( WND *wnd, LB_DESCR *descr,
-                                      WPARAM32 wParam, LPARAM lParam )
+                                      WPARAM wParam, LPARAM lParam )
 {
     SCROLLINFO info;
-    INT32 page;
+    INT page;
 
     if (descr->style & LBS_MULTICOLUMN)
     {
@@ -1663,7 +1663,7 @@ static LRESULT LISTBOX_HandleHScroll( WND *wnd, LB_DESCR *descr,
         case SB_THUMBTRACK:
             info.cbSize = sizeof(info);
             info.fMask  = SIF_TRACKPOS;
-            GetScrollInfo32( wnd->hwndSelf, SB_VERT, &info );
+            GetScrollInfo( wnd->hwndSelf, SB_VERT, &info );
             LISTBOX_SetTopItem( wnd, descr, info.nTrackPos*descr->page_size,
                                 TRUE );
             break;
@@ -1699,7 +1699,7 @@ static LRESULT LISTBOX_HandleHScroll( WND *wnd, LB_DESCR *descr,
         case SB_THUMBTRACK:
             info.cbSize = sizeof(info);
             info.fMask = SIF_TRACKPOS;
-            GetScrollInfo32( wnd->hwndSelf, SB_HORZ, &info );
+            GetScrollInfo( wnd->hwndSelf, SB_HORZ, &info );
             LISTBOX_SetHorizontalPos( wnd, descr, info.nTrackPos );
             break;
         case SB_LEFT:
@@ -1719,12 +1719,12 @@ static LRESULT LISTBOX_HandleHScroll( WND *wnd, LB_DESCR *descr,
  *           LISTBOX_HandleLButtonDown
  */
 static LRESULT LISTBOX_HandleLButtonDown( WND *wnd, LB_DESCR *descr,
-                                          WPARAM32 wParam, INT32 x, INT32 y )
+                                          WPARAM wParam, INT x, INT y )
 {
-    INT32 index = LISTBOX_GetItemFromPoint( wnd, descr, x, y );
+    INT index = LISTBOX_GetItemFromPoint( wnd, descr, x, y );
     TRACE(listbox, "[%04x]: lbuttondown %d,%d item %d\n",
 		 wnd->hwndSelf, x, y, index );
-    if (!descr->caret_on && (GetFocus32() == wnd->hwndSelf)) return 0;
+    if (!descr->caret_on && (GetFocus() == wnd->hwndSelf)) return 0;
     if (index != -1)
     {
         if (descr->style & LBS_EXTENDEDSEL)
@@ -1747,21 +1747,21 @@ static LRESULT LISTBOX_HandleLButtonDown( WND *wnd, LB_DESCR *descr,
         }
     }
 
-    if( !descr->lphc ) SetFocus32( wnd->hwndSelf );
-    else SetFocus32( (descr->lphc->hWndEdit) ? descr->lphc->hWndEdit
+    if( !descr->lphc ) SetFocus( wnd->hwndSelf );
+    else SetFocus( (descr->lphc->hWndEdit) ? descr->lphc->hWndEdit
                                              : descr->lphc->self->hwndSelf ) ;
 
-    SetCapture32( wnd->hwndSelf );
+    SetCapture( wnd->hwndSelf );
     if (index != -1 && !descr->lphc)
     {
         if (descr->style & LBS_NOTIFY )
-            SendMessage32A( descr->owner, WM_LBTRACKPOINT, index,
+            SendMessageA( descr->owner, WM_LBTRACKPOINT, index,
                             MAKELPARAM( x, y ) );
         if (wnd->dwExStyle & WS_EX_DRAGDETECT)
         {
-            POINT32 pt = { x, y };
-            if (DragDetect32( wnd->hwndSelf, pt ))
-                SendMessage32A( descr->owner, WM_BEGINDRAG, 0, 0 );
+            POINT pt = { x, y };
+            if (DragDetect( wnd->hwndSelf, pt ))
+                SendMessageA( descr->owner, WM_BEGINDRAG, 0, 0 );
         }
     }
     return 0;
@@ -1774,9 +1774,9 @@ static LRESULT LISTBOX_HandleLButtonDown( WND *wnd, LB_DESCR *descr,
 static LRESULT LISTBOX_HandleLButtonUp( WND *wnd, LB_DESCR *descr )
 {
     if (LISTBOX_Timer != LB_TIMER_NONE)
-        KillSystemTimer32( wnd->hwndSelf, LB_TIMER_ID );
+        KillSystemTimer( wnd->hwndSelf, LB_TIMER_ID );
     LISTBOX_Timer = LB_TIMER_NONE;
-    if (GetCapture32() == wnd->hwndSelf)
+    if (GetCapture() == wnd->hwndSelf)
     {
         ReleaseCapture();
         if (descr->style & LBS_NOTIFY)
@@ -1793,7 +1793,7 @@ static LRESULT LISTBOX_HandleLButtonUp( WND *wnd, LB_DESCR *descr )
  * Return TRUE if scrolling should continue.
  */
 static LRESULT LISTBOX_HandleTimer( WND *wnd, LB_DESCR *descr,
-                                    INT32 index, TIMER_DIRECTION dir )
+                                    INT index, TIMER_DIRECTION dir )
 {
     switch(dir)
     {
@@ -1831,7 +1831,7 @@ static LRESULT LISTBOX_HandleSystemTimer( WND *wnd, LB_DESCR *descr )
 {
     if (!LISTBOX_HandleTimer( wnd, descr, descr->focus_item, LISTBOX_Timer ))
     {
-        KillSystemTimer32( wnd->hwndSelf, LB_TIMER_ID );
+        KillSystemTimer( wnd->hwndSelf, LB_TIMER_ID );
         LISTBOX_Timer = LB_TIMER_NONE;
     }
     return 0;
@@ -1844,9 +1844,9 @@ static LRESULT LISTBOX_HandleSystemTimer( WND *wnd, LB_DESCR *descr )
  * WM_MOUSEMOVE handler.
  */
 static void LISTBOX_HandleMouseMove( WND *wnd, LB_DESCR *descr,
-                                     INT32 x, INT32 y )
+                                     INT x, INT y )
 {
-    INT32 index;
+    INT index;
     TIMER_DIRECTION dir;
 
     if (descr->style & LBS_MULTICOLUMN)
@@ -1881,9 +1881,9 @@ static void LISTBOX_HandleMouseMove( WND *wnd, LB_DESCR *descr,
     /* Start/stop the system timer */
 
     if (dir != LB_TIMER_NONE)
-        SetSystemTimer32( wnd->hwndSelf, LB_TIMER_ID, LB_SCROLL_TIMEOUT, NULL);
+        SetSystemTimer( wnd->hwndSelf, LB_TIMER_ID, LB_SCROLL_TIMEOUT, NULL);
     else if (LISTBOX_Timer != LB_TIMER_NONE)
-        KillSystemTimer32( wnd->hwndSelf, LB_TIMER_ID );
+        KillSystemTimer( wnd->hwndSelf, LB_TIMER_ID );
     LISTBOX_Timer = dir;
 }
 
@@ -1891,12 +1891,12 @@ static void LISTBOX_HandleMouseMove( WND *wnd, LB_DESCR *descr,
 /***********************************************************************
  *           LISTBOX_HandleKeyDown
  */
-static LRESULT LISTBOX_HandleKeyDown( WND *wnd, LB_DESCR *descr, WPARAM32 wParam )
+static LRESULT LISTBOX_HandleKeyDown( WND *wnd, LB_DESCR *descr, WPARAM wParam )
 {
-    INT32 caret = -1;
+    INT caret = -1;
     if (descr->style & LBS_WANTKEYBOARDINPUT)
     {
-        caret = SendMessage32A( descr->owner, WM_VKEYTOITEM,
+        caret = SendMessageA( descr->owner, WM_VKEYTOITEM,
                                 MAKEWPARAM(LOWORD(wParam), descr->focus_item),
                                 wnd->hwndSelf );
         if (caret == -2) return 0;
@@ -1930,7 +1930,7 @@ static LRESULT LISTBOX_HandleKeyDown( WND *wnd, LB_DESCR *descr, WPARAM32 wParam
     case VK_PRIOR:
         if (descr->style & LBS_MULTICOLUMN)
         {
-            INT32 page = descr->width / descr->column_width;
+            INT page = descr->width / descr->column_width;
             if (page < 1) page = 1;
             caret = descr->focus_item - (page * descr->page_size) + 1;
         }
@@ -1940,7 +1940,7 @@ static LRESULT LISTBOX_HandleKeyDown( WND *wnd, LB_DESCR *descr, WPARAM32 wParam
     case VK_NEXT:
         if (descr->style & LBS_MULTICOLUMN)
         {
-            INT32 page = descr->width / descr->column_width;
+            INT page = descr->width / descr->column_width;
             if (page < 1) page = 1;
             caret = descr->focus_item + (page * descr->page_size) - 1;
         }
@@ -1971,7 +1971,7 @@ static LRESULT LISTBOX_HandleKeyDown( WND *wnd, LB_DESCR *descr, WPARAM32 wParam
     if (caret >= 0)
     {
         if ((descr->style & LBS_EXTENDEDSEL) &&
-            !(GetKeyState32( VK_SHIFT ) & 0x8000))
+            !(GetKeyState( VK_SHIFT ) & 0x8000))
             descr->anchor_item = caret;
         LISTBOX_MoveCaret( wnd, descr, caret, TRUE );
         if (descr->style & LBS_NOTIFY)
@@ -1992,14 +1992,14 @@ static LRESULT LISTBOX_HandleKeyDown( WND *wnd, LB_DESCR *descr, WPARAM32 wParam
  *           LISTBOX_HandleChar
  */
 static LRESULT LISTBOX_HandleChar( WND *wnd, LB_DESCR *descr,
-                                   WPARAM32 wParam )
+                                   WPARAM wParam )
 {
-    INT32 caret = -1;
+    INT caret = -1;
     char str[2] = { wParam & 0xff, '\0' };
 
     if (descr->style & LBS_WANTKEYBOARDINPUT)
     {
-        caret = SendMessage32A( descr->owner, WM_CHARTOITEM,
+        caret = SendMessageA( descr->owner, WM_CHARTOITEM,
                                 MAKEWPARAM(LOWORD(wParam), descr->focus_item),
                                 wnd->hwndSelf );
         if (caret == -2) return 0;
@@ -2019,11 +2019,11 @@ static LRESULT LISTBOX_HandleChar( WND *wnd, LB_DESCR *descr,
 /***********************************************************************
  *           LISTBOX_Create
  */
-static BOOL32 LISTBOX_Create( WND *wnd, LPHEADCOMBO lphc )
+static BOOL LISTBOX_Create( WND *wnd, LPHEADCOMBO lphc )
 {
     LB_DESCR *descr;
-    MEASUREITEMSTRUCT32 mis;
-    RECT32 rect;
+    MEASUREITEMSTRUCT mis;
+    RECT rect;
 
     if (!(descr = HeapAlloc( GetProcessHeap(), 0, sizeof(*descr) )))
         return FALSE;
@@ -2032,8 +2032,8 @@ static BOOL32 LISTBOX_Create( WND *wnd, LPHEADCOMBO lphc )
         HeapFree( GetProcessHeap(), 0, descr );
         return FALSE;
     }
-    GetClientRect32( wnd->hwndSelf, &rect );
-    descr->owner         = GetParent32( wnd->hwndSelf );
+    GetClientRect( wnd->hwndSelf, &rect );
+    descr->owner         = GetParent( wnd->hwndSelf );
     descr->style         = wnd->dwStyle;
     descr->width         = rect.right - rect.left;
     descr->height        = rect.bottom - rect.top;
@@ -2080,7 +2080,7 @@ static BOOL32 LISTBOX_Create( WND *wnd, LPHEADCOMBO lphc )
 	}
 	else
 	{
-	    UINT32	id = (descr->lphc ) ? ID_CB_LISTBOX : wnd->wIDmenu;
+	    UINT	id = (descr->lphc ) ? ID_CB_LISTBOX : wnd->wIDmenu;
 
             mis.CtlType    = ODT_LISTBOX;
             mis.CtlID      = id;
@@ -2088,7 +2088,7 @@ static BOOL32 LISTBOX_Create( WND *wnd, LPHEADCOMBO lphc )
             mis.itemWidth  =  0;
             mis.itemData   =  0;
             mis.itemHeight = descr->item_height;
-            SendMessage32A( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis );
+            SendMessageA( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis );
             descr->item_height = mis.itemHeight ? mis.itemHeight : 1;
 	}
     }
@@ -2100,7 +2100,7 @@ static BOOL32 LISTBOX_Create( WND *wnd, LPHEADCOMBO lphc )
 /***********************************************************************
  *           LISTBOX_Destroy
  */
-static BOOL32 LISTBOX_Destroy( WND *wnd, LB_DESCR *descr )
+static BOOL LISTBOX_Destroy( WND *wnd, LB_DESCR *descr )
 {
     LISTBOX_ResetContent( wnd, descr );
     HeapDestroy( descr->heap );
@@ -2113,8 +2113,8 @@ static BOOL32 LISTBOX_Destroy( WND *wnd, LB_DESCR *descr )
 /***********************************************************************
  *           ListBoxWndProc
  */
-LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
-                               WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI ListBoxWndProc( HWND hwnd, UINT msg,
+                               WPARAM wParam, LPARAM lParam )
 {
     LRESULT ret;
     LB_DESCR *descr;
@@ -2131,7 +2131,7 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
             return 0;
         }
         /* Ignore all other messages before we get a WM_CREATE */
-        return DefWindowProc32A( hwnd, msg, wParam, lParam );
+        return DefWindowProcA( hwnd, msg, wParam, lParam );
     }
 
     TRACE(listbox, "[%04x]: msg %s wp %08x lp %08lx\n",
@@ -2139,139 +2139,139 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
     switch(msg)
     {
     case LB_RESETCONTENT16:
-    case LB_RESETCONTENT32:
+    case LB_RESETCONTENT:
         LISTBOX_ResetContent( wnd, descr );
         return 0;
 
     case LB_ADDSTRING16:
         if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
         /* fall through */
-    case LB_ADDSTRING32:
+    case LB_ADDSTRING:
         wParam = LISTBOX_FindStringPos( wnd, descr, (LPCSTR)lParam, FALSE );
         return LISTBOX_InsertString( wnd, descr, wParam, (LPCSTR)lParam );
 
     case LB_INSERTSTRING16:
         if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
-        wParam = (INT32)(INT16)wParam;
+        wParam = (INT)(INT16)wParam;
         /* fall through */
-    case LB_INSERTSTRING32:
+    case LB_INSERTSTRING:
         return LISTBOX_InsertString( wnd, descr, wParam, (LPCSTR)lParam );
 
     case LB_ADDFILE16:
         if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
         /* fall through */
-    case LB_ADDFILE32:
+    case LB_ADDFILE:
         wParam = LISTBOX_FindFileStrPos( wnd, descr, (LPCSTR)lParam );
         return LISTBOX_InsertString( wnd, descr, wParam, (LPCSTR)lParam );
 
     case LB_DELETESTRING16:
-    case LB_DELETESTRING32:
+    case LB_DELETESTRING:
         return LISTBOX_RemoveItem( wnd, descr, wParam );
 
     case LB_GETITEMDATA16:
-    case LB_GETITEMDATA32:
-        if (((INT32)wParam < 0) || ((INT32)wParam >= descr->nb_items))
+    case LB_GETITEMDATA:
+        if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items))
             return LB_ERR;
         return descr->items[wParam].data;
 
     case LB_SETITEMDATA16:
-    case LB_SETITEMDATA32:
-        if (((INT32)wParam < 0) || ((INT32)wParam >= descr->nb_items))
+    case LB_SETITEMDATA:
+        if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items))
             return LB_ERR;
         descr->items[wParam].data = (DWORD)lParam;
         return LB_OKAY;
 
     case LB_GETCOUNT16:
-    case LB_GETCOUNT32:
+    case LB_GETCOUNT:
         return descr->nb_items;
 
     case LB_GETTEXT16:
         lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
         /* fall through */
-    case LB_GETTEXT32:
+    case LB_GETTEXT:
         return LISTBOX_GetText( wnd, descr, wParam, (LPSTR)lParam );
 
     case LB_GETTEXTLEN16:
         /* fall through */
-    case LB_GETTEXTLEN32:
+    case LB_GETTEXTLEN:
         if (wParam >= descr->nb_items) return LB_ERR;
         return (HAS_STRINGS(descr) ? strlen(descr->items[wParam].str)
                                    : sizeof(DWORD));
 
     case LB_GETCURSEL16:
-    case LB_GETCURSEL32:
+    case LB_GETCURSEL:
         return descr->selected_item;
 
     case LB_GETTOPINDEX16:
-    case LB_GETTOPINDEX32:
+    case LB_GETTOPINDEX:
         return descr->top_item;
 
     case LB_GETITEMHEIGHT16:
-    case LB_GETITEMHEIGHT32:
+    case LB_GETITEMHEIGHT:
         return LISTBOX_GetItemHeight( wnd, descr, wParam );
 
     case LB_SETITEMHEIGHT16:
         lParam = LOWORD(lParam);
         /* fall through */
-    case LB_SETITEMHEIGHT32:
+    case LB_SETITEMHEIGHT:
         return LISTBOX_SetItemHeight( wnd, descr, wParam, lParam );
 
-    case LB_ITEMFROMPOINT32:
+    case LB_ITEMFROMPOINT:
         {
-            POINT32 pt = { LOWORD(lParam), HIWORD(lParam) };
-            RECT32 rect = { 0, 0, descr->width, descr->height };
+            POINT pt = { LOWORD(lParam), HIWORD(lParam) };
+            RECT rect = { 0, 0, descr->width, descr->height };
             return MAKELONG( LISTBOX_GetItemFromPoint(wnd, descr, pt.x, pt.y),
-                             PtInRect32( &rect, pt ) );
+                             PtInRect( &rect, pt ) );
         }
 
     case LB_SETCARETINDEX16:
-    case LB_SETCARETINDEX32:
+    case LB_SETCARETINDEX:
         return LISTBOX_SetCaretIndex( wnd, descr, wParam, !lParam );
 
     case LB_GETCARETINDEX16:
-    case LB_GETCARETINDEX32:
+    case LB_GETCARETINDEX:
         return descr->focus_item;
 
     case LB_SETTOPINDEX16:
-    case LB_SETTOPINDEX32:
+    case LB_SETTOPINDEX:
         return LISTBOX_SetTopItem( wnd, descr, wParam, TRUE );
 
     case LB_SETCOLUMNWIDTH16:
-    case LB_SETCOLUMNWIDTH32:
+    case LB_SETCOLUMNWIDTH:
         return LISTBOX_SetColumnWidth( wnd, descr, wParam );
 
     case LB_GETITEMRECT16:
         {
-            RECT32 rect;
+            RECT rect;
             ret = LISTBOX_GetItemRect( wnd, descr, (INT16)wParam, &rect );
             CONV_RECT32TO16( &rect, (RECT16 *)PTR_SEG_TO_LIN(lParam) );
         }
         return ret;
 
-    case LB_GETITEMRECT32:
-        return LISTBOX_GetItemRect( wnd, descr, wParam, (RECT32 *)lParam );
+    case LB_GETITEMRECT:
+        return LISTBOX_GetItemRect( wnd, descr, wParam, (RECT *)lParam );
 
     case LB_FINDSTRING16:
-        wParam = (INT32)(INT16)wParam;
+        wParam = (INT)(INT16)wParam;
         if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
         /* fall through */
-    case LB_FINDSTRING32:
+    case LB_FINDSTRING:
         return LISTBOX_FindString( wnd, descr, wParam, (LPCSTR)lParam, FALSE );
 
     case LB_FINDSTRINGEXACT16:
-        wParam = (INT32)(INT16)wParam;
+        wParam = (INT)(INT16)wParam;
         if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
         /* fall through */
-    case LB_FINDSTRINGEXACT32:
+    case LB_FINDSTRINGEXACT:
         return LISTBOX_FindString( wnd, descr, wParam, (LPCSTR)lParam, TRUE );
 
     case LB_SELECTSTRING16:
-        wParam = (INT32)(INT16)wParam;
+        wParam = (INT)(INT16)wParam;
         if (HAS_STRINGS(descr)) lParam = (LPARAM)PTR_SEG_TO_LIN(lParam);
         /* fall through */
-    case LB_SELECTSTRING32:
+    case LB_SELECTSTRING:
         {
-            INT32 index = LISTBOX_FindString( wnd, descr, wParam,
+            INT index = LISTBOX_FindString( wnd, descr, wParam,
                                               (LPCSTR)lParam, FALSE );
             if (index == LB_ERR) return LB_ERR;
             LISTBOX_SetSelection( wnd, descr, index, TRUE, FALSE );
@@ -2279,39 +2279,39 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
         }
 
     case LB_GETSEL16:
-        wParam = (INT32)(INT16)wParam;
+        wParam = (INT)(INT16)wParam;
         /* fall through */
-    case LB_GETSEL32:
-        if (((INT32)wParam < 0) || ((INT32)wParam >= descr->nb_items))
+    case LB_GETSEL:
+        if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items))
             return LB_ERR;
         return descr->items[wParam].selected;
 
     case LB_SETSEL16:
-        lParam = (INT32)(INT16)lParam;
+        lParam = (INT)(INT16)lParam;
         /* fall through */
-    case LB_SETSEL32:
+    case LB_SETSEL:
         return LISTBOX_SetSelection( wnd, descr, lParam, wParam, FALSE );
 
     case LB_SETCURSEL16:
-        wParam = (INT32)(INT16)wParam;
+        wParam = (INT)(INT16)wParam;
         /* fall through */
-    case LB_SETCURSEL32:
+    case LB_SETCURSEL:
         LISTBOX_SetCaretIndex( wnd, descr, wParam, TRUE );  
         return LISTBOX_SetSelection( wnd, descr, wParam, TRUE, FALSE );
 
     case LB_GETSELCOUNT16:
-    case LB_GETSELCOUNT32:
+    case LB_GETSELCOUNT:
         return LISTBOX_GetSelCount( wnd, descr );
 
     case LB_GETSELITEMS16:
         return LISTBOX_GetSelItems16( wnd, descr, wParam,
                                       (LPINT16)PTR_SEG_TO_LIN(lParam) );
 
-    case LB_GETSELITEMS32:
-        return LISTBOX_GetSelItems32( wnd, descr, wParam, (LPINT32)lParam );
+    case LB_GETSELITEMS:
+        return LISTBOX_GetSelItems( wnd, descr, wParam, (LPINT)lParam );
 
     case LB_SELITEMRANGE16:
-    case LB_SELITEMRANGE32:
+    case LB_SELITEMRANGE:
         if (LOWORD(lParam) <= HIWORD(lParam))
             return LISTBOX_SelectItemRange( wnd, descr, LOWORD(lParam),
                                             HIWORD(lParam), wParam );
@@ -2320,74 +2320,74 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
                                             LOWORD(lParam), wParam );
 
     case LB_SELITEMRANGEEX16:
-    case LB_SELITEMRANGEEX32:
-        if ((INT32)lParam >= (INT32)wParam)
+    case LB_SELITEMRANGEEX:
+        if ((INT)lParam >= (INT)wParam)
             return LISTBOX_SelectItemRange( wnd, descr, wParam, lParam, TRUE );
         else
             return LISTBOX_SelectItemRange( wnd, descr, lParam, wParam, FALSE);
 
     case LB_GETHORIZONTALEXTENT16:
-    case LB_GETHORIZONTALEXTENT32:
+    case LB_GETHORIZONTALEXTENT:
         return descr->horz_extent;
 
     case LB_SETHORIZONTALEXTENT16:
-    case LB_SETHORIZONTALEXTENT32:
+    case LB_SETHORIZONTALEXTENT:
         return LISTBOX_SetHorizontalExtent( wnd, descr, wParam );
 
     case LB_GETANCHORINDEX16:
-    case LB_GETANCHORINDEX32:
+    case LB_GETANCHORINDEX:
         return descr->anchor_item;
 
     case LB_SETANCHORINDEX16:
-        wParam = (INT32)(INT16)wParam;
+        wParam = (INT)(INT16)wParam;
         /* fall through */
-    case LB_SETANCHORINDEX32:
-        if (((INT32)wParam < -1) || ((INT32)wParam >= descr->nb_items))
+    case LB_SETANCHORINDEX:
+        if (((INT)wParam < -1) || ((INT)wParam >= descr->nb_items))
             return LB_ERR;
-        descr->anchor_item = (INT32)wParam;
+        descr->anchor_item = (INT)wParam;
         return LB_OKAY;
 
     case LB_DIR16:
         return LISTBOX_Directory( wnd, descr, wParam,
                                   (LPCSTR)PTR_SEG_TO_LIN(lParam), FALSE );
 
-    case LB_DIR32:
+    case LB_DIR:
         return LISTBOX_Directory( wnd, descr, wParam, (LPCSTR)lParam, TRUE );
 
-    case LB_GETLOCALE32:
+    case LB_GETLOCALE:
         return descr->locale;
 
-    case LB_SETLOCALE32:
+    case LB_SETLOCALE:
         descr->locale = (LCID)wParam;  /* FIXME: should check for valid lcid */
         return LB_OKAY;
 
-    case LB_INITSTORAGE32:
+    case LB_INITSTORAGE:
         return LISTBOX_InitStorage( wnd, descr, wParam, (DWORD)lParam );
 
-    case LB_SETCOUNT32:
-        return LISTBOX_SetCount( wnd, descr, (INT32)wParam );
+    case LB_SETCOUNT:
+        return LISTBOX_SetCount( wnd, descr, (INT)wParam );
 
     case LB_SETTABSTOPS16:
-        return LISTBOX_SetTabStops( wnd, descr, (INT32)(INT16)wParam,
-                                    (LPINT32)PTR_SEG_TO_LIN(lParam), TRUE );
+        return LISTBOX_SetTabStops( wnd, descr, (INT)(INT16)wParam,
+                                    (LPINT)PTR_SEG_TO_LIN(lParam), TRUE );
 
-    case LB_SETTABSTOPS32:
+    case LB_SETTABSTOPS:
         return LISTBOX_SetTabStops( wnd, descr, wParam,
-                                    (LPINT32)lParam, FALSE );
+                                    (LPINT)lParam, FALSE );
 
     case LB_CARETON16:
-    case LB_CARETON32:
+    case LB_CARETON:
         if (descr->caret_on) return LB_OKAY;
         descr->caret_on = TRUE;
-        if ((descr->focus_item != -1) && (GetFocus32() == wnd->hwndSelf))
+        if ((descr->focus_item != -1) && (GetFocus() == wnd->hwndSelf))
             LISTBOX_RepaintItem( wnd, descr, descr->focus_item, ODA_FOCUS );
         return LB_OKAY;
 
     case LB_CARETOFF16:
-    case LB_CARETOFF32:
+    case LB_CARETOFF:
         if (!descr->caret_on) return LB_OKAY;
         descr->caret_on = FALSE;
-        if ((descr->focus_item != -1) && (GetFocus32() == wnd->hwndSelf))
+        if ((descr->focus_item != -1) && (GetFocus() == wnd->hwndSelf))
             LISTBOX_RepaintItem( wnd, descr, descr->focus_item, ODA_FOCUS );
         return LB_OKAY;
 
@@ -2395,7 +2395,7 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
         return LISTBOX_Destroy( wnd, descr );
 
     case WM_ENABLE:
-        InvalidateRect32( hwnd, NULL, TRUE );
+        InvalidateRect( hwnd, NULL, TRUE );
         return 0;
 
     case WM_SETREDRAW:
@@ -2407,11 +2407,11 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
 
     case WM_PAINT:
         {
-            PAINTSTRUCT32 ps;
-            HDC32 hdc = ( wParam ) ? ((HDC32)wParam)
-				   :  BeginPaint32( hwnd, &ps );
+            PAINTSTRUCT ps;
+            HDC hdc = ( wParam ) ? ((HDC)wParam)
+				   :  BeginPaint( hwnd, &ps );
             ret = LISTBOX_Paint( wnd, descr, hdc );
-            if( !wParam ) EndPaint32( hwnd, &ps );
+            if( !wParam ) EndPaint( hwnd, &ps );
         }
         return ret;
 
@@ -2423,8 +2423,8 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
         return descr->font;
 
     case WM_SETFONT:
-        LISTBOX_SetFont( wnd, descr, (HFONT32)wParam );
-        if (lParam) InvalidateRect32( wnd->hwndSelf, 0, TRUE );
+        LISTBOX_SetFont( wnd, descr, (HFONT)wParam );
+        if (lParam) InvalidateRect( wnd->hwndSelf, 0, TRUE );
         return 0;
 
     case WM_SETFOCUS:
@@ -2457,7 +2457,7 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
         return 0;
 
     case WM_MOUSEMOVE:
-        if (GetCapture32() == hwnd)
+        if (GetCapture() == hwnd)
             LISTBOX_HandleMouseMove( wnd, descr, (INT16)LOWORD(lParam),
                                      (INT16)HIWORD(lParam) );
         return 0;
@@ -2477,16 +2477,16 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
     case WM_ERASEBKGND:
         if (IS_OWNERDRAW(descr))
         {
-            RECT32 rect = { 0, 0, descr->width, descr->height };
-            HBRUSH32 hbrush = SendMessage32A( descr->owner, WM_CTLCOLORLISTBOX,
+            RECT rect = { 0, 0, descr->width, descr->height };
+            HBRUSH hbrush = SendMessageA( descr->owner, WM_CTLCOLORLISTBOX,
                                               wParam, (LPARAM)wnd->hwndSelf );
-            if (hbrush) FillRect32( (HDC32)wParam, &rect, hbrush );
+            if (hbrush) FillRect( (HDC)wParam, &rect, hbrush );
         }
         return 1;
 
     case WM_DROPFILES:
         if( !descr->lphc ) 
-	    return SendMessage32A( descr->owner, msg, wParam, lParam );
+	    return SendMessageA( descr->owner, msg, wParam, lParam );
 	break;
 
     case WM_DROPOBJECT:
@@ -2498,20 +2498,20 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
             LPDRAGINFO dragInfo = (LPDRAGINFO)PTR_SEG_TO_LIN( (SEGPTR)lParam );
             dragInfo->l = LISTBOX_GetItemFromPoint( wnd, descr, dragInfo->pt.x,
                                                 dragInfo->pt.y );
-            return SendMessage32A( descr->owner, msg, wParam, lParam );
+            return SendMessageA( descr->owner, msg, wParam, lParam );
         }
 	break;
 
     case WM_NCCREATE:
 	if (TWEAK_WineLook > WIN31_LOOK)
 	    wnd->dwExStyle |= WS_EX_CLIENTEDGE;
-        return DefWindowProc32A( hwnd, msg, wParam, lParam );
+        return DefWindowProcA( hwnd, msg, wParam, lParam );
 
     default:
         if ((msg >= WM_USER) && (msg < 0xc000))
             WARN(listbox, "[%04x]: unknown msg %04x wp %08x lp %08lx\n",
 			 hwnd, msg, wParam, lParam );
-        return DefWindowProc32A( hwnd, msg, wParam, lParam );
+        return DefWindowProcA( hwnd, msg, wParam, lParam );
     }
     return 0;
 }
@@ -2519,7 +2519,7 @@ LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
 /***********************************************************************
  *           COMBO_Directory
  */
-LRESULT COMBO_Directory( LPHEADCOMBO lphc, UINT32 attrib, LPSTR dir, BOOL32 bLong)
+LRESULT COMBO_Directory( LPHEADCOMBO lphc, UINT attrib, LPSTR dir, BOOL bLong)
 {
     WND *wnd = WIN_FindWndPtr( lphc->hWndLBox );
 
@@ -2530,7 +2530,7 @@ LRESULT COMBO_Directory( LPHEADCOMBO lphc, UINT32 attrib, LPSTR dir, BOOL32 bLon
 	{
 	    LRESULT	lRet = LISTBOX_Directory( wnd, descr, attrib, dir, bLong );
 
-	    RedrawWindow32( lphc->self->hwndSelf, NULL, 0, 
+	    RedrawWindow( lphc->self->hwndSelf, NULL, 0, 
 			    RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW );
 	    return lRet;
 	}
@@ -2544,8 +2544,8 @@ LRESULT COMBO_Directory( LPHEADCOMBO lphc, UINT32 attrib, LPSTR dir, BOOL32 bLon
  *  NOTE: in Windows, winproc address of the ComboLBox is the same 
  *	  as that of the Listbox.
  */
-LRESULT WINAPI ComboLBWndProc( HWND32 hwnd, UINT32 msg,
-                               WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI ComboLBWndProc( HWND hwnd, UINT msg,
+                               WPARAM wParam, LPARAM lParam )
 {
     LRESULT lRet = 0;
     WND *wnd = WIN_FindWndPtr( hwnd );
@@ -2564,9 +2564,9 @@ LRESULT WINAPI ComboLBWndProc( HWND32 hwnd, UINT32 msg,
 	    switch( msg )
 	    {
 		case WM_CREATE:
-#define lpcs	((LPCREATESTRUCT32A)lParam)
+#define lpcs	((LPCREATESTRUCTA)lParam)
 		     TRACE(combo, "\tpassed parent handle = 0x%08x\n", 
-				  (UINT32)lpcs->lpCreateParams);
+				  (UINT)lpcs->lpCreateParams);
 
 		     lphc = (LPHEADCOMBO)(lpcs->lpCreateParams);
 #undef  lpcs
@@ -2601,7 +2601,7 @@ LRESULT WINAPI ComboLBWndProc( HWND32 hwnd, UINT32 msg,
 		     return LISTBOX_HandleKeyDown( wnd, descr, wParam );
 
 		case LB_SETCURSEL16:
-		case LB_SETCURSEL32:
+		case LB_SETCURSEL:
 		     lRet = ListBoxWndProc( hwnd, msg, wParam, lParam );
 		     return (lRet == LB_ERR) ? lRet : descr->selected_item; 
 
@@ -2614,7 +2614,7 @@ LRESULT WINAPI ComboLBWndProc( HWND32 hwnd, UINT32 msg,
 		     return ListBoxWndProc( hwnd, msg, wParam, lParam );
 	    }
         }
-        lRet = DefWindowProc32A( hwnd, msg, wParam, lParam );
+        lRet = DefWindowProcA( hwnd, msg, wParam, lParam );
 
         TRACE(combo,"\t default on msg [%04x]\n", (UINT16)msg );
     }
diff --git a/controls/menu.c b/controls/menu.c
index b1a14455f67..d6f36bfb253 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -44,17 +44,17 @@
 /* Menu item structure */
 typedef struct {
     /* ----------- MENUITEMINFO Stuff ----------- */
-    UINT32 fType;		/* Item type. */
-    UINT32 fState;		/* Item state.  */
-    UINT32 wID;			/* Item id.  */
-    HMENU32 hSubMenu;		/* Pop-up menu.  */
-    HBITMAP32 hCheckBit;	/* Bitmap when checked.  */
-    HBITMAP32 hUnCheckBit;	/* Bitmap when unchecked.  */
+    UINT fType;		/* Item type. */
+    UINT fState;		/* Item state.  */
+    UINT wID;			/* Item id.  */
+    HMENU hSubMenu;		/* Pop-up menu.  */
+    HBITMAP hCheckBit;	/* Bitmap when checked.  */
+    HBITMAP hUnCheckBit;	/* Bitmap when unchecked.  */
     LPSTR text;			/* Item text or bitmap handle.  */
     DWORD dwItemData;		/* Application defined.  */
     /* ----------- Wine stuff ----------- */
-    RECT32      rect;          /* Item area (relative to menu window) */
-    UINT32      xTab;          /* X position of text after Tab */
+    RECT      rect;          /* Item area (relative to menu window) */
+    UINT      xTab;          /* X position of text after Tab */
 } MENUITEM;
 
 /* Popup menu structure */
@@ -65,9 +65,9 @@ typedef struct {
     WORD	Width;        /* Width of the whole menu */
     WORD	Height;       /* Height of the whole menu */
     WORD	nItems;       /* Number of items in the menu */
-    HWND32      hWnd;         /* Window containing the menu */
+    HWND      hWnd;         /* Window containing the menu */
     MENUITEM   *items;        /* Array of menu items */
-    UINT32      FocusedItem;  /* Currently focused item */
+    UINT      FocusedItem;  /* Currently focused item */
     WORD	defitem;      /* default item position. Unused (except for set/get)*/
 } POPUPMENU, *LPPOPUPMENU;
 
@@ -79,11 +79,11 @@ typedef struct {
 
 typedef struct
 {
-    UINT32	trackFlags;
-    HMENU32	hCurrentMenu; /* current submenu (can be equal to hTopMenu)*/
-    HMENU32	hTopMenu;     /* initial menu */
-    HWND32	hOwnerWnd;    /* where notifications are sent */
-    POINT32	pt;
+    UINT	trackFlags;
+    HMENU	hCurrentMenu; /* current submenu (can be equal to hTopMenu)*/
+    HMENU	hTopMenu;     /* initial menu */
+    HWND	hOwnerWnd;    /* where notifications are sent */
+    POINT	pt;
 } MTRACKER;
 
 #define MENU_MAGIC   0x554d  /* 'MU' */
@@ -134,30 +134,30 @@ typedef struct
 static WORD check_bitmap_width = 0, check_bitmap_height = 0;
 static WORD arrow_bitmap_width = 0, arrow_bitmap_height = 0;
 
-static HBITMAP32 hStdRadioCheck = 0;
-static HBITMAP32 hStdCheck = 0;
-static HBITMAP32 hStdMnArrow = 0;
+static HBITMAP hStdRadioCheck = 0;
+static HBITMAP hStdCheck = 0;
+static HBITMAP hStdMnArrow = 0;
 
 // Minimze/restore/close buttons to be inserted in menubar
-static HBITMAP32 hBmpMinimize = 0;
-static HBITMAP32 hBmpMinimizeD = 0;
-static HBITMAP32 hBmpMaximize = 0;
-static HBITMAP32 hBmpMaximizeD = 0;
-static HBITMAP32 hBmpClose = 0;
-static HBITMAP32 hBmpCloseD = 0;
+static HBITMAP hBmpMinimize = 0;
+static HBITMAP hBmpMinimizeD = 0;
+static HBITMAP hBmpMaximize = 0;
+static HBITMAP hBmpMaximizeD = 0;
+static HBITMAP hBmpClose = 0;
+static HBITMAP hBmpCloseD = 0;
 
 
-static HBRUSH32 hShadeBrush = 0;
-static HMENU32 MENU_DefSysPopup = 0;  /* Default system menu popup */
+static HBRUSH hShadeBrush = 0;
+static HMENU MENU_DefSysPopup = 0;  /* Default system menu popup */
 
 /* Use global popup window because there's no way 2 menus can
  * be tracked at the same time.  */ 
 
 static WND* pTopPopupWnd   = 0;
-static UINT32 uSubPWndLevel = 0;
+static UINT uSubPWndLevel = 0;
 
   /* Flag set by EndMenu() to force an exit from menu tracking */
-static BOOL32 fEndMenu = FALSE;
+static BOOL fEndMenu = FALSE;
 
 
 /***********************************************************************
@@ -183,7 +183,7 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
     dbg_decl_str(menu, 256);
 
     if (mp) {
-	UINT32 flags = mp->fType;
+	UINT flags = mp->fType;
 	int typ = MENU_ITEM_TYPE(flags);
 	dsprintf(menu, "{ ID=0x%x", mp->wID);
 	if (flags & MF_POPUP)
@@ -257,9 +257,9 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
  *
  * Return the default system menu.
  */
-static HMENU32 MENU_CopySysPopup(void)
+static HMENU MENU_CopySysPopup(void)
 {
-    HMENU32 hMenu = LoadMenuIndirect32A(SYSRES_GetResPtr(SYSRES_MENU_SYSMENU));
+    HMENU hMenu = LoadMenuIndirectA(SYSRES_GetResPtr(SYSRES_MENU_SYSMENU));
 
     if( hMenu ) {
         POPUPMENU* menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu);
@@ -285,23 +285,23 @@ static HMENU32 MENU_CopySysPopup(void)
  * However, the real system menu handle is sometimes seen in the 
  * WM_MENUSELECT paramemters (and Word 6 likes it this way).
  */
-HMENU32 MENU_GetSysMenu( HWND32 hWnd, HMENU32 hPopupMenu )
+HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu )
 {
-    HMENU32 hMenu;
+    HMENU hMenu;
 
-    if ((hMenu = CreateMenu32()))
+    if ((hMenu = CreateMenu()))
     {
 	POPUPMENU *menu = (POPUPMENU*) USER_HEAP_LIN_ADDR(hMenu);
 	menu->wFlags = MF_SYSMENU;
 	menu->hWnd = hWnd;
 
-	if (hPopupMenu == (HMENU32)(-1))
+	if (hPopupMenu == (HMENU)(-1))
 	    hPopupMenu = MENU_CopySysPopup();
 	else if( !hPopupMenu ) hPopupMenu = MENU_DefSysPopup; 
 
 	if (hPopupMenu)
 	{
-	    InsertMenu32A( hMenu, -1, MF_SYSMENU | MF_POPUP | MF_BYPOSITION, hPopupMenu, NULL );
+	    InsertMenuA( hMenu, -1, MF_SYSMENU | MF_POPUP | MF_BYPOSITION, hPopupMenu, NULL );
 
             menu->items[0].fType = MF_SYSMENU | MF_POPUP;
             menu->items[0].fState = 0;
@@ -311,7 +311,7 @@ HMENU32 MENU_GetSysMenu( HWND32 hWnd, HMENU32 hPopupMenu )
 	    TRACE(menu,"GetSysMenu hMenu=%04x (%04x)\n", hMenu, hPopupMenu );
 	    return hMenu;
 	}
-	DestroyMenu32( hMenu );
+	DestroyMenu( hMenu );
     }
     ERR(menu, "failed to load system menu!\n");
     return 0;
@@ -323,30 +323,30 @@ HMENU32 MENU_GetSysMenu( HWND32 hWnd, HMENU32 hPopupMenu )
  *
  * Menus initialisation.
  */
-BOOL32 MENU_Init()
+BOOL MENU_Init()
 {
-    HBITMAP32 hBitmap;
+    HBITMAP hBitmap;
     static unsigned char shade_bits[16] = { 0x55, 0, 0xAA, 0,
 					    0x55, 0, 0xAA, 0,
 					    0x55, 0, 0xAA, 0,
 					    0x55, 0, 0xAA, 0 };
 
     /* Load menu bitmaps */
-    hStdCheck = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_CHECK));
-    hStdRadioCheck = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_RADIOCHECK));
-    hStdMnArrow = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_MNARROW));
+    hStdCheck = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_CHECK));
+    hStdRadioCheck = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_RADIOCHECK));
+    hStdMnArrow = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_MNARROW));
     /* Load system buttons bitmaps */
-    hBmpMinimize = LoadBitmap32A(0,MAKEINTRESOURCE32A(OBM_REDUCE));
-    hBmpMinimizeD = LoadBitmap32A(0,MAKEINTRESOURCE32A(OBM_REDUCED));
-    hBmpMaximize = LoadBitmap32A(0,MAKEINTRESOURCE32A(OBM_RESTORE));
-    hBmpMaximizeD = LoadBitmap32A(0,MAKEINTRESOURCE32A(OBM_RESTORED));
-    hBmpClose = LoadBitmap32A(0,MAKEINTRESOURCE32A(OBM_CLOSE));
-    hBmpCloseD = LoadBitmap32A(0,MAKEINTRESOURCE32A(OBM_CLOSED));
+    hBmpMinimize = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_REDUCE));
+    hBmpMinimizeD = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_REDUCED));
+    hBmpMaximize = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_RESTORE));
+    hBmpMaximizeD = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_RESTORED));
+    hBmpClose = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_CLOSE));
+    hBmpCloseD = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_CLOSED));
 
     if (hStdCheck)
     {
-	BITMAP32 bm;
-	GetObject32A( hStdCheck, sizeof(bm), &bm );
+	BITMAP bm;
+	GetObjectA( hStdCheck, sizeof(bm), &bm );
 	check_bitmap_width = bm.bmWidth;
 	check_bitmap_height = bm.bmHeight;
     } else
@@ -358,18 +358,18 @@ BOOL32 MENU_Init()
 
     if (hStdMnArrow)
 	{
-	 BITMAP32 bm;
-	    GetObject32A( hStdMnArrow, sizeof(bm), &bm );
+	 BITMAP bm;
+	    GetObjectA( hStdMnArrow, sizeof(bm), &bm );
 	    arrow_bitmap_width = bm.bmWidth;
 	    arrow_bitmap_height = bm.bmHeight;
     } else
 	 return FALSE;
 
-    if ((hBitmap = CreateBitmap32( 8, 8, 1, 1, shade_bits)))
+    if ((hBitmap = CreateBitmap( 8, 8, 1, 1, shade_bits)))
 	    {
-		if((hShadeBrush = CreatePatternBrush32( hBitmap )))
+		if((hShadeBrush = CreatePatternBrush( hBitmap )))
 		{
-		    DeleteObject32( hBitmap );
+		    DeleteObject( hBitmap );
 	      if ((MENU_DefSysPopup = MENU_CopySysPopup()))
 		   return TRUE;
 	}
@@ -383,22 +383,22 @@ BOOL32 MENU_Init()
  *
  * Grey the appropriate items in System menu.
  */
-static void MENU_InitSysMenuPopup( HMENU32 hmenu, DWORD style, DWORD clsStyle )
+static void MENU_InitSysMenuPopup( HMENU hmenu, DWORD style, DWORD clsStyle )
 {
-    BOOL32 gray;
+    BOOL gray;
 
     gray = !(style & WS_THICKFRAME) || (style & (WS_MAXIMIZE | WS_MINIMIZE));
-    EnableMenuItem32( hmenu, SC_SIZE, (gray ? MF_GRAYED : MF_ENABLED) );
+    EnableMenuItem( hmenu, SC_SIZE, (gray ? MF_GRAYED : MF_ENABLED) );
     gray = ((style & WS_MAXIMIZE) != 0);
-    EnableMenuItem32( hmenu, SC_MOVE, (gray ? MF_GRAYED : MF_ENABLED) );
+    EnableMenuItem( hmenu, SC_MOVE, (gray ? MF_GRAYED : MF_ENABLED) );
     gray = !(style & WS_MINIMIZEBOX) || (style & WS_MINIMIZE);
-    EnableMenuItem32( hmenu, SC_MINIMIZE, (gray ? MF_GRAYED : MF_ENABLED) );
+    EnableMenuItem( hmenu, SC_MINIMIZE, (gray ? MF_GRAYED : MF_ENABLED) );
     gray = !(style & WS_MAXIMIZEBOX) || (style & WS_MAXIMIZE);
-    EnableMenuItem32( hmenu, SC_MAXIMIZE, (gray ? MF_GRAYED : MF_ENABLED) );
+    EnableMenuItem( hmenu, SC_MAXIMIZE, (gray ? MF_GRAYED : MF_ENABLED) );
     gray = !(style & (WS_MAXIMIZE | WS_MINIMIZE));
-    EnableMenuItem32( hmenu, SC_RESTORE, (gray ? MF_GRAYED : MF_ENABLED) );
+    EnableMenuItem( hmenu, SC_RESTORE, (gray ? MF_GRAYED : MF_ENABLED) );
     gray = (clsStyle & CS_NOCLOSE) != 0;
-    EnableMenuItem32( hmenu, SC_CLOSE, (gray ? MF_GRAYED : MF_ENABLED) );
+    EnableMenuItem( hmenu, SC_CLOSE, (gray ? MF_GRAYED : MF_ENABLED) );
 }
 
 
@@ -409,11 +409,11 @@ static void MENU_InitSysMenuPopup( HMENU32 hmenu, DWORD style, DWORD clsStyle )
  *
  *****************************************************************************/
 
-static UINT32  MENU_GetStartOfNextColumn(
-    HMENU32  hMenu )
+static UINT  MENU_GetStartOfNextColumn(
+    HMENU  hMenu )
 {
     POPUPMENU  *menu = (POPUPMENU *)USER_HEAP_LIN_ADDR(hMenu);
-    UINT32  i = menu->FocusedItem + 1;
+    UINT  i = menu->FocusedItem + 1;
 
     if(!menu)
 	return NO_SELECTED_ITEM;
@@ -437,11 +437,11 @@ static UINT32  MENU_GetStartOfNextColumn(
  *
  *****************************************************************************/
 
-static UINT32  MENU_GetStartOfPrevColumn(
-    HMENU32  hMenu )
+static UINT  MENU_GetStartOfPrevColumn(
+    HMENU  hMenu )
 {
     POPUPMENU const  *menu = (POPUPMENU *)USER_HEAP_LIN_ADDR(hMenu);
-    UINT32  i;
+    UINT  i;
 
     if( !menu )
 	return NO_SELECTED_ITEM;
@@ -476,10 +476,10 @@ static UINT32  MENU_GetStartOfPrevColumn(
  * Find a menu item. Return a pointer on the item, and modifies *hmenu
  * in case the item was in a sub-menu.
  */
-static MENUITEM *MENU_FindItem( HMENU32 *hmenu, UINT32 *nPos, UINT32 wFlags )
+static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags )
 {
     POPUPMENU *menu;
-    UINT32 i;
+    UINT i;
 
     if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(*hmenu))) return NULL;
     if (wFlags & MF_BYPOSITION)
@@ -499,7 +499,7 @@ static MENUITEM *MENU_FindItem( HMENU32 *hmenu, UINT32 *nPos, UINT32 wFlags )
 	    }
 	    else if (item->fType & MF_POPUP)
 	    {
-		HMENU32 hsubmenu = item->hSubMenu;
+		HMENU hsubmenu = item->hSubMenu;
 		MENUITEM *subitem = MENU_FindItem( &hsubmenu, nPos, wFlags );
 		if (subitem)
 		{
@@ -530,11 +530,11 @@ static void MENU_FreeItemData( MENUITEM* item )
  * an arbitrary system menu.
  */
 static MENUITEM *MENU_FindItemByCoords( POPUPMENU *menu, 
-					POINT32 pt, UINT32 *pos )
+					POINT pt, UINT *pos )
 {
     MENUITEM *item;
     WND *wndPtr;
-    UINT32 i;
+    UINT i;
 
     if (!(wndPtr = WIN_FindWndPtr( menu->hWnd ))) return NULL;
     pt.x -= wndPtr->rectWindow.left;
@@ -559,15 +559,15 @@ static MENUITEM *MENU_FindItemByCoords( POPUPMENU *menu,
  * Find the menu item selected by a key press.
  * Return item id, -1 if none, -2 if we should close the menu.
  */
-static UINT32 MENU_FindItemByKey( HWND32 hwndOwner, HMENU32 hmenu, 
-				  UINT32 key, BOOL32 forceMenuChar )
+static UINT MENU_FindItemByKey( HWND hwndOwner, HMENU hmenu, 
+				  UINT key, BOOL forceMenuChar )
 {
     TRACE(menu,"\tlooking for '%c' in [%04x]\n", (char)key, (UINT16)hmenu );
 
-    if (!IsMenu32( hmenu )) 
+    if (!IsMenu( hmenu )) 
     {
 	WND* w = WIN_FindWndPtr(hwndOwner);
-	hmenu = GetSubMenu32(w->hSysMenu, 0);
+	hmenu = GetSubMenu(w->hSysMenu, 0);
     }
 
     if (hmenu)
@@ -578,7 +578,7 @@ static UINT32 MENU_FindItemByKey( HWND32 hwndOwner, HMENU32 hmenu,
 
 	if( !forceMenuChar )
 	{
-	     UINT32 i;
+	     UINT i;
 
 	     key = toupper(key);
 	     for (i = 0; i < menu->nItems; i++, item++)
@@ -595,12 +595,12 @@ static UINT32 MENU_FindItemByKey( HWND32 hwndOwner, HMENU32 hmenu,
 		}
 	     }
 	}
-	menuchar = SendMessage32A( hwndOwner, WM_MENUCHAR, 
+	menuchar = SendMessageA( hwndOwner, WM_MENUCHAR, 
                                    MAKEWPARAM( key, menu->wFlags ), hmenu );
 	if (HIWORD(menuchar) == 2) return LOWORD(menuchar);
-	if (HIWORD(menuchar) == 1) return (UINT32)(-2);
+	if (HIWORD(menuchar) == 1) return (UINT)(-2);
     }
-    return (UINT32)(-1);
+    return (UINT)(-1);
 }
 /***********************************************************************
  *           MENU_LoadMagicItem
@@ -608,7 +608,7 @@ static UINT32 MENU_FindItemByKey( HWND32 hwndOwner, HMENU32 hmenu,
  * Load the bitmap associated with the magic menu item and its style
  */
 
-static HBITMAP32 MENU_LoadMagicItem(UINT32 id,BOOL32 hilite)
+static HBITMAP MENU_LoadMagicItem(UINT id,BOOL hilite)
 {
     // Magic menu item id's section
     // These magic id's are used by windows to insert "standard" mdi
@@ -631,8 +631,8 @@ static HBITMAP32 MENU_LoadMagicItem(UINT32 id,BOOL32 hilite)
  *
  * Calculate the size of the menu item and store it in lpitem->rect.
  */
-static void MENU_CalcItemSize( HDC32 hdc, MENUITEM *lpitem, HWND32 hwndOwner,
-			       INT32 orgX, INT32 orgY, BOOL32 menuBar )
+static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
+			       INT orgX, INT orgY, BOOL menuBar )
 {
     DWORD dwSize;
     char *p;
@@ -642,17 +642,17 @@ static void MENU_CalcItemSize( HDC32 hdc, MENUITEM *lpitem, HWND32 hwndOwner,
     debug_print_menuitem("MENU_CalcItemSize: menuitem:", lpitem, 
 			 (menuBar ? " (MenuBar)" : ""));
 
-    SetRect32( &lpitem->rect, orgX, orgY, orgX, orgY );
+    SetRect( &lpitem->rect, orgX, orgY, orgX, orgY );
 
     if (lpitem->fType & MF_OWNERDRAW)
     {
-        MEASUREITEMSTRUCT32 mis;
+        MEASUREITEMSTRUCT mis;
         mis.CtlType    = ODT_MENU;
         mis.itemID     = lpitem->wID;
         mis.itemData   = (DWORD)lpitem->text;
         mis.itemHeight = 16;
         mis.itemWidth  = 30;
-        SendMessage32A( hwndOwner, WM_MEASUREITEM, 0, (LPARAM)&mis );
+        SendMessageA( hwndOwner, WM_MEASUREITEM, 0, (LPARAM)&mis );
         lpitem->rect.bottom += mis.itemHeight;
         lpitem->rect.right  += mis.itemWidth;
         TRACE(menu, "%08x %dx%d\n",
@@ -675,8 +675,8 @@ static void MENU_CalcItemSize( HDC32 hdc, MENUITEM *lpitem, HWND32 hwndOwner,
 
     if (lpitem->fType & MF_BITMAP)
     {
-	BITMAP32 bm;
-        HBITMAP32 resBmp = 0;
+	BITMAP bm;
+        HBITMAP resBmp = 0;
 
         // Check if there is a magic menu item associated with this item
         if((LOWORD((int)lpitem->text))<6)
@@ -685,9 +685,9 @@ static void MENU_CalcItemSize( HDC32 hdc, MENUITEM *lpitem, HWND32 hwndOwner,
                                         (lpitem->fType & MF_HILITE));
         }
         else
-            resBmp = (HBITMAP32)lpitem->text;
+            resBmp = (HBITMAP)lpitem->text;
 
-        if (GetObject32A(resBmp, sizeof(bm), &bm ))
+        if (GetObjectA(resBmp, sizeof(bm), &bm ))
         {
             lpitem->rect.right  += bm.bmWidth;
             lpitem->rect.bottom += bm.bmHeight;
@@ -702,7 +702,7 @@ static void MENU_CalcItemSize( HDC32 hdc, MENUITEM *lpitem, HWND32 hwndOwner,
 
     if (IS_STRING_ITEM( lpitem->fType ))
     {
-        dwSize = GetTextExtent( hdc, lpitem->text, strlen(lpitem->text) );
+        dwSize = GetTextExtent16( hdc, lpitem->text, strlen(lpitem->text) );
         lpitem->rect.right  += LOWORD(dwSize);
 	if (TWEAK_WineLook == WIN31_LOOK)
             lpitem->rect.bottom += MAX( HIWORD(dwSize), SYSMETRICS_CYMENU );
@@ -715,7 +715,7 @@ static void MENU_CalcItemSize( HDC32 hdc, MENUITEM *lpitem, HWND32 hwndOwner,
         {
             /* Item contains a tab (only meaningful in popup menus) */
             lpitem->xTab = check_bitmap_width + MENU_TAB_SPACE + 
-                LOWORD( GetTextExtent( hdc, lpitem->text,
+                LOWORD( GetTextExtent16( hdc, lpitem->text,
                                        (int)(p - lpitem->text) ));
             lpitem->rect.right += MENU_TAB_SPACE;
         }
@@ -735,16 +735,16 @@ static void MENU_CalcItemSize( HDC32 hdc, MENUITEM *lpitem, HWND32 hwndOwner,
  *
  * Calculate the size of a popup menu.
  */
-static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop, HWND32 hwndOwner )
+static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop, HWND hwndOwner )
 {
     MENUITEM *lpitem;
-    HDC32 hdc;
+    HDC hdc;
     int start, i;
     int orgX, orgY, maxX, maxTab, maxTabWidth;
 
     lppop->Width = lppop->Height = 0;
     if (lppop->nItems == 0) return;
-    hdc = GetDC32( 0 );
+    hdc = GetDC( 0 );
     start = 0;
     maxX = SYSMETRICS_CXBORDER;
     while (start < lppop->nItems)
@@ -791,7 +791,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop, HWND32 hwndOwner )
 	lppop->Height++;
 
     lppop->Width  = maxX;
-    ReleaseDC32( 0, hdc );
+    ReleaseDC( 0, hdc );
 }
 
 
@@ -804,8 +804,8 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop, HWND32 hwndOwner )
  *
  * Calculate the size of the menu bar.
  */
-static void MENU_MenuBarCalcSize( HDC32 hdc, LPRECT32 lprect,
-                                  LPPOPUPMENU lppop, HWND32 hwndOwner )
+static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect,
+                                  LPPOPUPMENU lppop, HWND hwndOwner )
 {
     MENUITEM *lpitem;
     int start, i, orgX, orgY, maxY, helpPos;
@@ -876,16 +876,16 @@ static void MENU_MenuBarCalcSize( HDC32 hdc, LPRECT32 lprect,
  *
  * Draw a single menu item.
  */
-static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
-			       UINT32 height, BOOL32 menuBar, UINT32 odaction )
+static void MENU_DrawMenuItem( HWND hwnd, HDC hdc, MENUITEM *lpitem,
+			       UINT height, BOOL menuBar, UINT odaction )
 {
-    RECT32 rect;
+    RECT rect;
 
     debug_print_menuitem("MENU_DrawMenuItem: ", lpitem, "");
 
     if (lpitem->fType & MF_SYSMENU)
     {
-	if( !IsIconic32(hwnd) ) {
+	if( !IsIconic(hwnd) ) {
 	    if (TWEAK_WineLook > WIN31_LOOK)
 		NC_DrawSysButton95( hwnd, hdc,
 				    lpitem->fState &
@@ -901,7 +901,7 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
 
     if (lpitem->fType & MF_OWNERDRAW)
     {
-        DRAWITEMSTRUCT32 dis;
+        DRAWITEMSTRUCT dis;
 
         dis.CtlType   = ODT_MENU;
         dis.itemID    = lpitem->wID;
@@ -919,7 +919,7 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
 	      dis.itemState, dis.itemAction, dis.hwndItem, dis.hDC,
 	      dis.rcItem.left, dis.rcItem.top, dis.rcItem.right,
 	      dis.rcItem.bottom );
-        SendMessage32A( GetWindow32(hwnd,GW_OWNER), WM_DRAWITEM, 0, (LPARAM)&dis );
+        SendMessageA( GetWindow(hwnd,GW_OWNER), WM_DRAWITEM, 0, (LPARAM)&dis );
         return;
     }
 
@@ -942,11 +942,11 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
     }
 
      if ((lpitem->fState & MF_HILITE) && !(lpitem->fType & MF_BITMAP) )
-	FillRect32( hdc, &rect, GetSysColorBrush32(COLOR_HIGHLIGHT) );
+	FillRect( hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT) );
     else
-	FillRect32( hdc, &rect, GetSysColorBrush32(COLOR_MENU) );
+	FillRect( hdc, &rect, GetSysColorBrush(COLOR_MENU) );
 
-    SetBkMode32( hdc, TRANSPARENT );
+    SetBkMode( hdc, TRANSPARENT );
 
       /* Draw the separator bar (if any) */
 
@@ -954,31 +954,31 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
     {
 	/* vertical separator */
 	if (TWEAK_WineLook > WIN31_LOOK) {
-	    RECT32 rc = rect;
+	    RECT rc = rect;
 	    rc.top = 3;
 	    rc.bottom = height - 3;
-	    DrawEdge32 (hdc, &rc, EDGE_ETCHED, BF_LEFT);
+	    DrawEdge (hdc, &rc, EDGE_ETCHED, BF_LEFT);
 	}
 	else {
-	    SelectObject32( hdc, GetSysColorPen32(COLOR_WINDOWFRAME) );
-	    MoveTo( hdc, rect.left, 0 );
-	    LineTo32( hdc, rect.left, height );
+	    SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
+	    MoveTo16( hdc, rect.left, 0 );
+	    LineTo( hdc, rect.left, height );
 	}
     }
     if (lpitem->fType & MF_SEPARATOR)
     {
 	/* horizontal separator */
 	if (TWEAK_WineLook > WIN31_LOOK) {
-	    RECT32 rc = rect;
+	    RECT rc = rect;
 	    rc.left++;
 	    rc.right--;
 	    rc.top += SEPARATOR_HEIGHT / 2;
-	    DrawEdge32 (hdc, &rc, EDGE_ETCHED, BF_TOP);
+	    DrawEdge (hdc, &rc, EDGE_ETCHED, BF_TOP);
 	}
 	else {
-	    SelectObject32( hdc, GetSysColorPen32(COLOR_WINDOWFRAME) );
-	    MoveTo( hdc, rect.left, rect.top + SEPARATOR_HEIGHT/2 );
-	    LineTo32( hdc, rect.right, rect.top + SEPARATOR_HEIGHT/2 );
+	    SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
+	    MoveTo16( hdc, rect.left, rect.top + SEPARATOR_HEIGHT/2 );
+	    LineTo( hdc, rect.right, rect.top + SEPARATOR_HEIGHT/2 );
 	}
 
 	return;
@@ -989,23 +989,23 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
      if ((lpitem->fState & MF_HILITE) && !(lpitem->fType & MF_BITMAP) )
     {
 	if (lpitem->fState & MF_GRAYED)
-	    SetTextColor32( hdc, GetSysColor32( COLOR_GRAYTEXT ) );
+	    SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) );
 	else
-	    SetTextColor32( hdc, GetSysColor32( COLOR_HIGHLIGHTTEXT ) );
-	SetBkColor32( hdc, GetSysColor32( COLOR_HIGHLIGHT ) );
+	    SetTextColor( hdc, GetSysColor( COLOR_HIGHLIGHTTEXT ) );
+	SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) );
     }
     else
     {
 	if (lpitem->fState & MF_GRAYED)
-	    SetTextColor32( hdc, GetSysColor32( COLOR_GRAYTEXT ) );
+	    SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) );
 	else
-	    SetTextColor32( hdc, GetSysColor32( COLOR_MENUTEXT ) );
-	SetBkColor32( hdc, GetSysColor32( COLOR_MENU ) );
+	    SetTextColor( hdc, GetSysColor( COLOR_MENUTEXT ) );
+	SetBkColor( hdc, GetSysColor( COLOR_MENU ) );
     }
 
     if (!menuBar)
     {
-	INT32	y = rect.top + rect.bottom;
+	INT	y = rect.top + rect.bottom;
 
 	  /* Draw the check mark
 	   *
@@ -1015,39 +1015,39 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
 
 	if (lpitem->fState & MF_CHECKED)
 	{
-	    HBITMAP32 bm =
+	    HBITMAP bm =
 		 lpitem->hCheckBit ? lpitem->hCheckBit :
 		 ((lpitem->fType & MFT_RADIOCHECK)
 		  ? hStdRadioCheck : hStdCheck);
-	    HDC32 hdcMem = CreateCompatibleDC32( hdc );
+	    HDC hdcMem = CreateCompatibleDC( hdc );
 
-	    SelectObject32( hdcMem, bm );
-            BitBlt32( hdc, rect.left, (y - check_bitmap_height) / 2,
+	    SelectObject( hdcMem, bm );
+            BitBlt( hdc, rect.left, (y - check_bitmap_height) / 2,
 		      check_bitmap_width, check_bitmap_height,
 		      hdcMem, 0, 0, SRCCOPY );
-	    DeleteDC32( hdcMem );
+	    DeleteDC( hdcMem );
         } else if (lpitem->hUnCheckBit) {
-	    HDC32 hdcMem = CreateCompatibleDC32( hdc );
+	    HDC hdcMem = CreateCompatibleDC( hdc );
 
-	    SelectObject32( hdcMem, lpitem->hUnCheckBit );
-            BitBlt32( hdc, rect.left, (y - check_bitmap_height) / 2,
+	    SelectObject( hdcMem, lpitem->hUnCheckBit );
+            BitBlt( hdc, rect.left, (y - check_bitmap_height) / 2,
 		      check_bitmap_width, check_bitmap_height,
 		      hdcMem, 0, 0, SRCCOPY );
-	    DeleteDC32( hdcMem );
+	    DeleteDC( hdcMem );
 	}
 
 	  /* Draw the popup-menu arrow */
 
 	if (lpitem->fType & MF_POPUP)
 	{
-	    HDC32 hdcMem = CreateCompatibleDC32( hdc );
+	    HDC hdcMem = CreateCompatibleDC( hdc );
 
-	    SelectObject32( hdcMem, hStdMnArrow );
-            BitBlt32( hdc, rect.right - arrow_bitmap_width - 1,
+	    SelectObject( hdcMem, hStdMnArrow );
+            BitBlt( hdc, rect.right - arrow_bitmap_width - 1,
 		      (y - arrow_bitmap_height) / 2,
 		      arrow_bitmap_width, arrow_bitmap_height,
 		      hdcMem, 0, 0, SRCCOPY );
-	    DeleteDC32( hdcMem );
+	    DeleteDC( hdcMem );
 	}
 
 	rect.left += check_bitmap_width;
@@ -1058,9 +1058,9 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
 
     if (lpitem->fType & MF_BITMAP)
     {
-        HBITMAP32 resBmp = 0;
+        HBITMAP resBmp = 0;
 
-        HDC32 hdcMem = CreateCompatibleDC32( hdc );
+        HDC hdcMem = CreateCompatibleDC( hdc );
 
         // Check if there is a magic menu item associated with this item
         // and load the appropriate bitmap
@@ -1070,12 +1070,12 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
                                         (lpitem->fState & MF_HILITE));
         }
         else
-            resBmp = (HBITMAP32)lpitem->text;
+            resBmp = (HBITMAP)lpitem->text;
         
-        SelectObject32(hdcMem,resBmp );
-	BitBlt32( hdc, rect.left, rect.top+3, rect.right - rect.left+3,
+        SelectObject(hdcMem,resBmp );
+	BitBlt( hdc, rect.left, rect.top+3, rect.right - rect.left+3,
 		  rect.bottom - rect.top, hdcMem, 0, 0, SRCCOPY );
-	DeleteDC32( hdcMem );
+	DeleteDC( hdcMem );
         
 	return;
 
@@ -1099,7 +1099,7 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
 	}
 
 	if((TWEAK_WineLook == WIN31_LOOK) || !(lpitem->fState & MF_GRAYED)) {
-	    DrawText32A( hdc, lpitem->text, i, &rect,
+	    DrawTextA( hdc, lpitem->text, i, &rect,
 			 DT_LEFT | DT_VCENTER | DT_SINGLELINE );
 	}
 	else {
@@ -1109,16 +1109,16 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
 		++rect.top;
 		++rect.right;
 		++rect.bottom;
-		SetTextColor32(hdc, RGB(0xff, 0xff, 0xff));
-		DrawText32A( hdc, lpitem->text, i, &rect,
+		SetTextColor(hdc, RGB(0xff, 0xff, 0xff));
+		DrawTextA( hdc, lpitem->text, i, &rect,
 			     DT_LEFT | DT_VCENTER | DT_SINGLELINE );
 		--rect.left;
 		--rect.top;
 		--rect.right;
 		--rect.bottom;
 	    }
-	    SetTextColor32(hdc, RGB(0x80, 0x80, 0x80));
-	    DrawText32A( hdc, lpitem->text, i, &rect,
+	    SetTextColor(hdc, RGB(0x80, 0x80, 0x80));
+	    DrawTextA( hdc, lpitem->text, i, &rect,
 			 DT_LEFT | DT_VCENTER | DT_SINGLELINE );
 	}
 
@@ -1127,10 +1127,10 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
 	    if (lpitem->text[i] == '\t')
 	    {
 		rect.left = lpitem->xTab;
-		DrawText32A( hdc, lpitem->text + i + 1, -1, &rect,
+		DrawTextA( hdc, lpitem->text + i + 1, -1, &rect,
                              DT_LEFT | DT_VCENTER | DT_SINGLELINE );
 	    }
-	    else DrawText32A( hdc, lpitem->text + i + 1, -1, &rect,
+	    else DrawTextA( hdc, lpitem->text + i + 1, -1, &rect,
                               DT_RIGHT | DT_VCENTER | DT_SINGLELINE );
 	}
     }
@@ -1142,51 +1142,51 @@ static void MENU_DrawMenuItem( HWND32 hwnd, HDC32 hdc, MENUITEM *lpitem,
  *
  * Paint a popup menu.
  */
-static void MENU_DrawPopupMenu( HWND32 hwnd, HDC32 hdc, HMENU32 hmenu )
+static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
 {
-    HBRUSH32 hPrevBrush = 0;
-    RECT32 rect;
+    HBRUSH hPrevBrush = 0;
+    RECT rect;
 
-    GetClientRect32( hwnd, &rect );
+    GetClientRect( hwnd, &rect );
 
 /*    if(!TWEAK_Win95Look) { */
 	rect.bottom -= POPUP_YSHADE * SYSMETRICS_CYBORDER;
 	rect.right -= POPUP_XSHADE * SYSMETRICS_CXBORDER;
 /*    } */
 
-    if((hPrevBrush = SelectObject32( hdc, GetSysColorBrush32(COLOR_MENU) )))
+    if((hPrevBrush = SelectObject( hdc, GetSysColorBrush(COLOR_MENU) )))
     {
-	HPEN32 hPrevPen;
+	HPEN hPrevPen;
 	
-	Rectangle32( hdc, rect.left, rect.top, rect.right, rect.bottom );
+	Rectangle( hdc, rect.left, rect.top, rect.right, rect.bottom );
 
-	hPrevPen = SelectObject32( hdc, GetStockObject32( NULL_PEN ) );
+	hPrevPen = SelectObject( hdc, GetStockObject( NULL_PEN ) );
 	if( hPrevPen )
 	{
-	    INT32 ropPrev, i;
+	    INT ropPrev, i;
 	    POPUPMENU *menu;
 
 	    /* draw 3-d shade */
 	    if(TWEAK_WineLook == WIN31_LOOK) {
-		SelectObject32( hdc, hShadeBrush );
-		SetBkMode32( hdc, TRANSPARENT );
-		ropPrev = SetROP232( hdc, R2_MASKPEN );
+		SelectObject( hdc, hShadeBrush );
+		SetBkMode( hdc, TRANSPARENT );
+		ropPrev = SetROP2( hdc, R2_MASKPEN );
 
 		i = rect.right;		/* why SetBrushOrg() doesn't? */
-		PatBlt32( hdc, i & 0xfffffffe,
+		PatBlt( hdc, i & 0xfffffffe,
 			  rect.top + POPUP_YSHADE*SYSMETRICS_CYBORDER, 
 			  i%2 + POPUP_XSHADE*SYSMETRICS_CXBORDER,
 			  rect.bottom - rect.top, 0x00a000c9 );
 		i = rect.bottom;
-		PatBlt32( hdc, rect.left + POPUP_XSHADE*SYSMETRICS_CXBORDER,
+		PatBlt( hdc, rect.left + POPUP_XSHADE*SYSMETRICS_CXBORDER,
 			  i & 0xfffffffe,rect.right - rect.left,
 			  i%2 + POPUP_YSHADE*SYSMETRICS_CYBORDER, 0x00a000c9 );
-		SelectObject32( hdc, hPrevPen );
-		SelectObject32( hdc, hPrevBrush );
-		SetROP232( hdc, ropPrev );
+		SelectObject( hdc, hPrevPen );
+		SelectObject( hdc, hPrevBrush );
+		SetROP2( hdc, ropPrev );
 	    }
 	    else
-		DrawEdge32 (hdc, &rect, EDGE_RAISED, BF_RECT);
+		DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT);
 
 	    /* draw menu items */
 
@@ -1194,14 +1194,14 @@ static void MENU_DrawPopupMenu( HWND32 hwnd, HDC32 hdc, HMENU32 hmenu )
 	    if (menu && menu->nItems)
 	    {
 		MENUITEM *item;
-		UINT32 u;
+		UINT u;
 
 		for (u = menu->nItems, item = menu->items; u > 0; u--, item++)
 		    MENU_DrawMenuItem( hwnd, hdc, item, menu->Height, FALSE,
 				       ODA_DRAWENTIRE );
 
 	    }
-	} else SelectObject32( hdc, hPrevBrush );
+	} else SelectObject( hdc, hPrevBrush );
     }
 }
 
@@ -1211,11 +1211,11 @@ static void MENU_DrawPopupMenu( HWND32 hwnd, HDC32 hdc, HMENU32 hmenu )
  *
  * Paint a menu bar. Returns the height of the menu bar.
  */
-UINT32 MENU_DrawMenuBar( HDC32 hDC, LPRECT32 lprect, HWND32 hwnd,
-                         BOOL32 suppress_draw)
+UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd,
+                         BOOL suppress_draw)
 {
     LPPOPUPMENU lppop;
-    UINT32 i;
+    UINT i;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
     
     lppop = (LPPOPUPMENU) USER_HEAP_LIN_ADDR( (HMENU16)wndPtr->wIDmenu );
@@ -1226,17 +1226,17 @@ UINT32 MENU_DrawMenuBar( HDC32 hDC, LPRECT32 lprect, HWND32 hwnd,
     lprect->bottom = lprect->top + lppop->Height;
     if (suppress_draw) return lppop->Height;
     
-    FillRect32(hDC, lprect, GetSysColorBrush32(COLOR_MENU) );
+    FillRect(hDC, lprect, GetSysColorBrush(COLOR_MENU) );
 
     if (TWEAK_WineLook == WIN31_LOOK) {
-	SelectObject32( hDC, GetSysColorPen32(COLOR_WINDOWFRAME) );
-	MoveTo( hDC, lprect->left, lprect->bottom );
-	LineTo32( hDC, lprect->right, lprect->bottom );
+	SelectObject( hDC, GetSysColorPen(COLOR_WINDOWFRAME) );
+	MoveTo16( hDC, lprect->left, lprect->bottom );
+	LineTo( hDC, lprect->right, lprect->bottom );
     }
     else {
-	SelectObject32( hDC, GetSysColorPen32(COLOR_3DFACE));
-	MoveTo( hDC, lprect->left, lprect->bottom );
-	LineTo32( hDC, lprect->right, lprect->bottom );
+	SelectObject( hDC, GetSysColorPen(COLOR_3DFACE));
+	MoveTo16( hDC, lprect->left, lprect->bottom );
+	LineTo( hDC, lprect->right, lprect->bottom );
     }
 
     if (lppop->nItems == 0) return SYSMETRICS_CYMENU;
@@ -1252,7 +1252,7 @@ UINT32 MENU_DrawMenuBar( HDC32 hDC, LPRECT32 lprect, HWND32 hwnd,
 /***********************************************************************
  *	     MENU_PatchResidentPopup
  */
-BOOL32 MENU_PatchResidentPopup( HQUEUE16 checkQueue, WND* checkWnd )
+BOOL MENU_PatchResidentPopup( HQUEUE16 checkQueue, WND* checkWnd )
 {
     if( pTopPopupWnd )
     {
@@ -1307,8 +1307,8 @@ BOOL32 MENU_PatchResidentPopup( HQUEUE16 checkQueue, WND* checkWnd )
  *
  * Display a popup menu.
  */
-static BOOL32 MENU_ShowPopup( HWND32 hwndOwner, HMENU32 hmenu, UINT32 id,
-                              INT32 x, INT32 y, INT32 xanchor, INT32 yanchor )
+static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id,
+                              INT x, INT y, INT xanchor, INT yanchor )
 {
     POPUPMENU 	*menu;
     WND 	*wndOwner = NULL;
@@ -1322,7 +1322,7 @@ static BOOL32 MENU_ShowPopup( HWND32 hwndOwner, HMENU32 hmenu, UINT32 id,
 
     if( (wndOwner = WIN_FindWndPtr( hwndOwner )) )
     {
-	UINT32	width, height;
+	UINT	width, height;
 
 	MENU_PopupMenuCalcSize( menu, hwndOwner );
 
@@ -1357,7 +1357,7 @@ static BOOL32 MENU_ShowPopup( HWND32 hwndOwner, HMENU32 hmenu, UINT32 id,
 	{
 	    assert( uSubPWndLevel == 0 );
 
-	    pTopPopupWnd = WIN_FindWndPtr(CreateWindow32A( POPUPMENU_CLASS_ATOM, NULL,
+	    pTopPopupWnd = WIN_FindWndPtr(CreateWindowA( POPUPMENU_CLASS_ATOM, NULL,
 					  WS_POPUP, x, y, width, height,
 					  hwndOwner, 0, wndOwner->hInstance,
 					  (LPVOID)hmenu ));
@@ -1369,7 +1369,7 @@ static BOOL32 MENU_ShowPopup( HWND32 hwndOwner, HMENU32 hmenu, UINT32 id,
 	    {
 		/* create a new window for the submenu */
 
-		menu->hWnd = CreateWindow32A( POPUPMENU_CLASS_ATOM, NULL,
+		menu->hWnd = CreateWindowA( POPUPMENU_CLASS_ATOM, NULL,
 					  WS_POPUP, x, y, width, height,
 					  menu->hWnd, 0, wndOwner->hInstance,
 					  (LPVOID)hmenu );
@@ -1384,7 +1384,7 @@ static BOOL32 MENU_ShowPopup( HWND32 hwndOwner, HMENU32 hmenu, UINT32 id,
 
 		/* adjust its size */
 
-	        SetWindowPos32( menu->hWnd, 0, x, y, width, height,
+	        SetWindowPos( menu->hWnd, 0, x, y, width, height,
 				SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOREDRAW);
 	    }
 
@@ -1392,9 +1392,9 @@ static BOOL32 MENU_ShowPopup( HWND32 hwndOwner, HMENU32 hmenu, UINT32 id,
 
       /* Display the window */
 
-	SetWindowPos32( menu->hWnd, HWND_TOP, 0, 0, 0, 0,
+	SetWindowPos( menu->hWnd, HWND_TOP, 0, 0, 0, 0,
 			SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE );
-	UpdateWindow32( menu->hWnd );
+	UpdateWindow( menu->hWnd );
 	return TRUE;
     }
     return FALSE;
@@ -1404,11 +1404,11 @@ static BOOL32 MENU_ShowPopup( HWND32 hwndOwner, HMENU32 hmenu, UINT32 id,
 /***********************************************************************
  *           MENU_SelectItem
  */
-static void MENU_SelectItem( HWND32 hwndOwner, HMENU32 hmenu, UINT32 wIndex,
-                             BOOL32 sendMenuSelect )
+static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex,
+                             BOOL sendMenuSelect )
 {
     LPPOPUPMENU lppop;
-    HDC32 hdc;
+    HDC hdc;
 
     lppop = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu );
     if (!lppop->nItems) return;
@@ -1418,8 +1418,8 @@ static void MENU_SelectItem( HWND32 hwndOwner, HMENU32 hmenu, UINT32 wIndex,
 	wIndex = NO_SELECTED_ITEM;
 
     if (lppop->FocusedItem == wIndex) return;
-    if (lppop->wFlags & MF_POPUP) hdc = GetDC32( lppop->hWnd );
-    else hdc = GetDCEx32( lppop->hWnd, 0, DCX_CACHE | DCX_WINDOW);
+    if (lppop->wFlags & MF_POPUP) hdc = GetDC( lppop->hWnd );
+    else hdc = GetDCEx( lppop->hWnd, 0, DCX_CACHE | DCX_WINDOW);
 
       /* Clear previous highlighted item */
     if (lppop->FocusedItem != NO_SELECTED_ITEM) 
@@ -1450,7 +1450,7 @@ static void MENU_SelectItem( HWND32 hwndOwner, HMENU32 hmenu, UINT32 wIndex,
         SendMessage16( hwndOwner, WM_MENUSELECT, hmenu,
                        MAKELONG( lppop->wFlags | MF_MOUSESELECT, hmenu ) ); 
     }
-    ReleaseDC32( lppop->hWnd, hdc );
+    ReleaseDC( lppop->hWnd, hdc );
 }
 
 
@@ -1461,9 +1461,9 @@ static void MENU_SelectItem( HWND32 hwndOwner, HMENU32 hmenu, UINT32 wIndex,
  * If there is no selection then it should select the last item if
  * offset is ITEM_PREV or the first item if offset is ITEM_NEXT.
  */
-static void MENU_MoveSelection( HWND32 hwndOwner, HMENU32 hmenu, INT32 offset )
+static void MENU_MoveSelection( HWND hwndOwner, HMENU hmenu, INT offset )
 {
-    INT32 i;
+    INT i;
     POPUPMENU *menu;
 
     menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu );
@@ -1497,7 +1497,7 @@ static void MENU_MoveSelection( HWND32 hwndOwner, HMENU32 hmenu, INT32 offset )
  * Set an item flags, id and text ptr. Called by InsertMenu() and
  * ModifyMenu().
  */
-static BOOL32 MENU_SetItemData( MENUITEM *item, UINT32 flags, UINT32 id,
+static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT id,
                                 LPCSTR str )
 {
     LPSTR prevText = IS_STRING_ITEM(item->fType) ? item->text : NULL;
@@ -1524,7 +1524,7 @@ static BOOL32 MENU_SetItemData( MENUITEM *item, UINT32 flags, UINT32 id,
             item->text = text;
         }
     }
-    else if (flags & MF_BITMAP) item->text = (LPSTR)(HBITMAP32)LOWORD(str);
+    else if (flags & MF_BITMAP) item->text = (LPSTR)(HBITMAP)LOWORD(str);
     else item->text = NULL;
 
     if (flags & MF_OWNERDRAW) 
@@ -1533,7 +1533,7 @@ static BOOL32 MENU_SetItemData( MENUITEM *item, UINT32 flags, UINT32 id,
         item->dwItemData = 0;
 
     if ((item->fType & MF_POPUP) && (flags & MF_POPUP) && (item->hSubMenu != id) )
-	DestroyMenu32( item->hSubMenu );   /* ModifyMenu() spec */
+	DestroyMenu( item->hSubMenu );   /* ModifyMenu() spec */
 
     if (flags & MF_POPUP)
     {
@@ -1576,7 +1576,7 @@ static BOOL32 MENU_SetItemData( MENUITEM *item, UINT32 flags, UINT32 id,
  *
  * Insert a new item into a menu.
  */
-static MENUITEM *MENU_InsertItem( HMENU32 hMenu, UINT32 pos, UINT32 flags )
+static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags )
 {
     MENUITEM *newItems;
     POPUPMENU *menu;
@@ -1591,7 +1591,7 @@ static MENUITEM *MENU_InsertItem( HMENU32 hMenu, UINT32 pos, UINT32 flags )
     /* Find where to insert new item */
 
     if ((flags & MF_BYPOSITION) &&
-        ((pos == (UINT32)-1) || (pos == menu->nItems)))
+        ((pos == (UINT)-1) || (pos == menu->nItems)))
     {
         /* Special case: append to menu */
         /* Some programs specify the menu length to do that */
@@ -1642,7 +1642,7 @@ static MENUITEM *MENU_InsertItem( HMENU32 hMenu, UINT32 pos, UINT32 flags )
  * Parse a standard menu resource and add items to the menu.
  * Return a pointer to the end of the resource.
  */
-static LPCSTR MENU_ParseResource( LPCSTR res, HMENU32 hMenu, BOOL32 unicode )
+static LPCSTR MENU_ParseResource( LPCSTR res, HMENU hMenu, BOOL unicode )
 {
     WORD flags, id = 0;
     LPCSTR str;
@@ -1660,20 +1660,20 @@ static LPCSTR MENU_ParseResource( LPCSTR res, HMENU32 hMenu, BOOL32 unicode )
             ERR(menu, "not a string item %04x\n", flags );
         str = res;
         if (!unicode) res += strlen(str) + 1;
-        else res += (lstrlen32W((LPCWSTR)str) + 1) * sizeof(WCHAR);
+        else res += (lstrlenW((LPCWSTR)str) + 1) * sizeof(WCHAR);
         if (flags & MF_POPUP)
         {
-            HMENU32 hSubMenu = CreatePopupMenu32();
+            HMENU hSubMenu = CreatePopupMenu();
             if (!hSubMenu) return NULL;
             if (!(res = MENU_ParseResource( res, hSubMenu, unicode )))
                 return NULL;
-            if (!unicode) AppendMenu32A( hMenu, flags, (UINT32)hSubMenu, str );
-            else AppendMenu32W( hMenu, flags, (UINT32)hSubMenu, (LPCWSTR)str );
+            if (!unicode) AppendMenuA( hMenu, flags, (UINT)hSubMenu, str );
+            else AppendMenuW( hMenu, flags, (UINT)hSubMenu, (LPCWSTR)str );
         }
         else  /* Not a popup */
         {
-            if (!unicode) AppendMenu32A( hMenu, flags, id, *str ? str : NULL );
-            else AppendMenu32W( hMenu, flags, id,
+            if (!unicode) AppendMenuA( hMenu, flags, id, *str ? str : NULL );
+            else AppendMenuW( hMenu, flags, id,
                                 *(LPCWSTR)str ? (LPCWSTR)str : NULL );
         }
     } while (!(flags & MF_END));
@@ -1687,11 +1687,11 @@ static LPCSTR MENU_ParseResource( LPCSTR res, HMENU32 hMenu, BOOL32 unicode )
  * Parse an extended menu resource and add items to the menu.
  * Return a pointer to the end of the resource.
  */
-static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU32 hMenu)
+static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU hMenu)
 {
     WORD resinfo;
     do {
-	MENUITEMINFO32W mii;
+	MENUITEMINFOW mii;
 
 	mii.cbSize = sizeof(mii);
 	mii.fMask = MIIM_STATE | MIIM_ID | MIIM_TYPE;
@@ -1706,7 +1706,7 @@ static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU32 hMenu)
 	/* Align the text on a word boundary.  */
 	res += (~((int)res - 1)) & 1;
 	mii.dwTypeData = (LPWSTR) res;
-	res += (1 + lstrlen32W(mii.dwTypeData)) * sizeof(WCHAR);
+	res += (1 + lstrlenW(mii.dwTypeData)) * sizeof(WCHAR);
 	/* Align the following fields on a dword boundary.  */
 	res += (~((int)res - 1)) & 3;
 
@@ -1722,17 +1722,17 @@ static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU32 hMenu)
 	if (resinfo & 1) {	/* Pop-up? */
 	    DWORD helpid = GET_DWORD(res); /* FIXME: use this.  */
 	    res += sizeof(DWORD);
-	    mii.hSubMenu = CreatePopupMenu32();
+	    mii.hSubMenu = CreatePopupMenu();
 	    if (!mii.hSubMenu)
 		return NULL;
 	    if (!(res = MENUEX_ParseResource(res, mii.hSubMenu))) {
-		DestroyMenu32(mii.hSubMenu);
+		DestroyMenu(mii.hSubMenu);
                 return NULL;
         }
 	    mii.fMask |= MIIM_SUBMENU;
 	    mii.fType |= MF_POPUP;
         }
-	InsertMenuItem32W(hMenu, -1, MF_BYPOSITION, &mii);
+	InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii);
     } while (!(resinfo & MF_END));
     return res;
 }
@@ -1743,7 +1743,7 @@ static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU32 hMenu)
  *
  * Return the handle of the selected sub-popup menu (if any).
  */
-static HMENU32 MENU_GetSubPopup( HMENU32 hmenu )
+static HMENU MENU_GetSubPopup( HMENU hmenu )
 {
     POPUPMENU *menu;
     MENUITEM *item;
@@ -1764,14 +1764,14 @@ static HMENU32 MENU_GetSubPopup( HMENU32 hmenu )
  *
  * Hide the sub-popup menus of this menu.
  */
-static void MENU_HideSubPopups( HWND32 hwndOwner, HMENU32 hmenu,
-                                BOOL32 sendMenuSelect )
+static void MENU_HideSubPopups( HWND hwndOwner, HMENU hmenu,
+                                BOOL sendMenuSelect )
 {
     POPUPMENU *menu = (POPUPMENU*) USER_HEAP_LIN_ADDR( hmenu );;
 
     if (menu && uSubPWndLevel)
     {
-	HMENU32 hsubmenu;
+	HMENU hsubmenu;
 	POPUPMENU *submenu;
 	MENUITEM *item;
 
@@ -1790,12 +1790,12 @@ static void MENU_HideSubPopups( HWND32 hwndOwner, HMENU32 hmenu,
 
 	if (submenu->hWnd == pTopPopupWnd->hwndSelf ) 
 	{
-	    ShowWindow32( submenu->hWnd, SW_HIDE );
+	    ShowWindow( submenu->hWnd, SW_HIDE );
 	    uSubPWndLevel = 0;
 	}
 	else
 	{
-	    DestroyWindow32( submenu->hWnd );
+	    DestroyWindow( submenu->hWnd );
 	    submenu->hWnd = 0;
 	}
     }
@@ -1808,14 +1808,14 @@ static void MENU_HideSubPopups( HWND32 hwndOwner, HMENU32 hmenu,
  * Display the sub-menu of the selected item of this menu.
  * Return the handle of the submenu, or hmenu if no submenu to display.
  */
-static HMENU32 MENU_ShowSubPopup( HWND32 hwndOwner, HMENU32 hmenu,
-                                  BOOL32 selectFirst )
+static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu,
+                                  BOOL selectFirst )
 {
-    RECT32 rect;
+    RECT rect;
     POPUPMENU *menu;
     MENUITEM *item;
     WND *wndPtr;
-    HDC32 hdc;
+    HDC hdc;
 
     if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu ))) return hmenu;
 
@@ -1838,11 +1838,11 @@ static HMENU32 MENU_ShowSubPopup( HWND32 hwndOwner, HMENU32 hmenu,
     /* correct item if modified as a reaction to WM_INITMENUPOPUP-message */
     if (!(item->fState & MF_HILITE)) 
     {
-        if (menu->wFlags & MF_POPUP) hdc = GetDC32( menu->hWnd );
-        else hdc = GetDCEx32( menu->hWnd, 0, DCX_CACHE | DCX_WINDOW);
+        if (menu->wFlags & MF_POPUP) hdc = GetDC( menu->hWnd );
+        else hdc = GetDCEx( menu->hWnd, 0, DCX_CACHE | DCX_WINDOW);
         item->fState |= MF_HILITE;
         MENU_DrawMenuItem( menu->hWnd, hdc, item, menu->Height, !(menu->wFlags & MF_POPUP), ODA_DRAWENTIRE ); 
-	ReleaseDC32( menu->hWnd, hdc );
+	ReleaseDC( menu->hWnd, hdc );
     }
     if (!item->rect.top && !item->rect.left && !item->rect.bottom && !item->rect.right)
       item->rect = rect;
@@ -1888,32 +1888,32 @@ static HMENU32 MENU_ShowSubPopup( HWND32 hwndOwner, HMENU32 hmenu,
  *
  * Walks menu chain trying to find a menu pt maps to.
  */
-static HMENU32 MENU_PtMenu( HMENU32 hMenu, POINT16 pt )
+static HMENU MENU_PtMenu( HMENU hMenu, POINT16 pt )
 {
    POPUPMENU *menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hMenu );
-   register UINT32 ht = menu->FocusedItem;
+   register UINT ht = menu->FocusedItem;
 
    /* try subpopup first (if any) */
     ht = (ht != NO_SELECTED_ITEM &&
           (menu->items[ht].fType & MF_POPUP) &&
           (menu->items[ht].fState & MF_MOUSESELECT))
-        ? (UINT32) MENU_PtMenu(menu->items[ht].hSubMenu, pt) : 0;
+        ? (UINT) MENU_PtMenu(menu->items[ht].hSubMenu, pt) : 0;
 
    if( !ht )	/* check the current window (avoiding WM_HITTEST) */
    {
-	ht = (UINT32)NC_HandleNCHitTest( menu->hWnd, pt );
+	ht = (UINT)NC_HandleNCHitTest( menu->hWnd, pt );
 	if( menu->wFlags & MF_POPUP )
-	    ht =  (ht != (UINT32)HTNOWHERE && 
-		   ht != (UINT32)HTERROR) ? (UINT32)hMenu : 0;
+	    ht =  (ht != (UINT)HTNOWHERE && 
+		   ht != (UINT)HTERROR) ? (UINT)hMenu : 0;
 	else
 	{
 	    WND* wndPtr = WIN_FindWndPtr(menu->hWnd);
 
-	    ht = ( ht == HTSYSMENU ) ? (UINT32)(wndPtr->hSysMenu)
-		 : ( ht == HTMENU ) ? (UINT32)(wndPtr->wIDmenu) : 0;
+	    ht = ( ht == HTSYSMENU ) ? (UINT)(wndPtr->hSysMenu)
+		 : ( ht == HTMENU ) ? (UINT)(wndPtr->wIDmenu) : 0;
 	}
    }
-   return (HMENU32)ht;
+   return (HMENU)ht;
 }
 /***********************************************************************
  *           MENU_ExecFocusedItem
@@ -1922,7 +1922,7 @@ static HMENU32 MENU_PtMenu( HMENU32 hMenu, POINT16 pt )
  * Return the wID of the executed item. Otherwise, zero indicating
  * that no menu item wase executed;
  */
-static INT32 MENU_ExecFocusedItem( MTRACKER* pmt, HMENU32 hMenu )
+static INT MENU_ExecFocusedItem( MTRACKER* pmt, HMENU hMenu )
 {
     MENUITEM *item;
     POPUPMENU *menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hMenu );
@@ -1963,7 +1963,7 @@ static INT32 MENU_ExecFocusedItem( MTRACKER* pmt, HMENU32 hMenu )
  *
  * Helper function for menu navigation routines.
  */
-static void MENU_SwitchTracking( MTRACKER* pmt, HMENU32 hPtMenu, UINT32 id )
+static void MENU_SwitchTracking( MTRACKER* pmt, HMENU hPtMenu, UINT id )
 {
     POPUPMENU *ptmenu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hPtMenu );
     POPUPMENU *topmenu = (POPUPMENU *) USER_HEAP_LIN_ADDR( pmt->hTopMenu );
@@ -1987,11 +1987,11 @@ static void MENU_SwitchTracking( MTRACKER* pmt, HMENU32 hPtMenu, UINT32 id )
  *
  * Return TRUE if we can go on with menu tracking.
  */
-static BOOL32 MENU_ButtonDown( MTRACKER* pmt, HMENU32 hPtMenu )
+static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu )
 {
     if (hPtMenu)
     {
-	UINT32 id = 0;
+	UINT id = 0;
 	POPUPMENU *ptmenu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hPtMenu );
 	MENUITEM *item;
 
@@ -2041,11 +2041,11 @@ static BOOL32 MENU_ButtonDown( MTRACKER* pmt, HMENU32 hPtMenu )
  * 0 otherwise.
  * A zero return value indicates that we can't go on with menu tracking.
  */
-static INT32 MENU_ButtonUp( MTRACKER* pmt, HMENU32 hPtMenu )
+static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu )
 {
     if (hPtMenu)
     {
-	UINT32 id = 0;
+	UINT id = 0;
 	POPUPMENU *ptmenu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hPtMenu );
 	MENUITEM *item;
 
@@ -2078,9 +2078,9 @@ static INT32 MENU_ButtonUp( MTRACKER* pmt, HMENU32 hPtMenu )
  *
  * Return TRUE if we can go on with menu tracking.
  */
-static BOOL32 MENU_MouseMove( MTRACKER* pmt, HMENU32 hPtMenu )
+static BOOL MENU_MouseMove( MTRACKER* pmt, HMENU hPtMenu )
 {
-    UINT32 id = NO_SELECTED_ITEM;
+    UINT id = NO_SELECTED_ITEM;
     POPUPMENU *ptmenu = NULL;
 
     if( hPtMenu )
@@ -2111,7 +2111,7 @@ static BOOL32 MENU_MouseMove( MTRACKER* pmt, HMENU32 hPtMenu )
  *
  * NOTE: WM_NEXTMENU documented in Win32 is a bit different.
  */
-static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT32 vk )
+static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk )
 {
     POPUPMENU *menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( pmt->hTopMenu );
 
@@ -2119,9 +2119,9 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT32 vk )
         (vk == VK_RIGHT && menu->FocusedItem == menu->nItems - 1))
     {
 	WND*    wndPtr;
-	HMENU32 hNewMenu;
-	HWND32  hNewWnd;
-	UINT32  id = 0;
+	HMENU hNewMenu;
+	HWND  hNewWnd;
+	UINT  id = 0;
 	LRESULT l = SendMessage16( pmt->hOwnerWnd, WM_NEXTMENU, (WPARAM16)vk, 
 		(IS_SYSTEM_MENU(menu)) ? GetSubMenu16(pmt->hTopMenu,0) : pmt->hTopMenu );
 
@@ -2158,7 +2158,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT32 vk )
 	{
 	    hNewMenu = LOWORD(l); hNewWnd = HIWORD(l);
 
-	    if( IsMenu32(hNewMenu) && IsWindow32(hNewWnd) )
+	    if( IsMenu(hNewMenu) && IsWindow(hNewWnd) )
 	    {
 		wndPtr = WIN_FindWndPtr(hNewWnd);
 
@@ -2208,7 +2208,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT32 vk )
  * The idea is not to show the popup if the next input message is
  * going to hide it anyway.
  */
-static BOOL32 MENU_SuspendPopup( MTRACKER* pmt, UINT16 uMsg )
+static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT16 uMsg )
 {
     MSG16 msg;
 
@@ -2248,8 +2248,8 @@ static BOOL32 MENU_SuspendPopup( MTRACKER* pmt, UINT16 uMsg )
 static void MENU_KeyLeft( MTRACKER* pmt )
 {
     POPUPMENU *menu;
-    HMENU32 hmenutmp, hmenuprev;
-    UINT32  prevcol;
+    HMENU hmenutmp, hmenuprev;
+    UINT  prevcol;
 
     hmenuprev = hmenutmp = pmt->hTopMenu;
     menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenutmp );
@@ -2300,9 +2300,9 @@ static void MENU_KeyLeft( MTRACKER* pmt )
  */
 static void MENU_KeyRight( MTRACKER* pmt )
 {
-    HMENU32 hmenutmp;
+    HMENU hmenutmp;
     POPUPMENU *menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( pmt->hTopMenu );
-    UINT32  nextcol;
+    UINT  nextcol;
 
     TRACE(menu, "MENU_KeyRight called, cur %x (%s), top %x (%s).\n",
 		  pmt->hCurrentMenu,
@@ -2354,13 +2354,13 @@ static void MENU_KeyRight( MTRACKER* pmt )
  *
  * Menu tracking code.
  */
-static INT32 MENU_TrackMenu( HMENU32 hmenu, UINT32 wFlags, INT32 x, INT32 y,
-                              HWND32 hwnd, const RECT32 *lprect )
+static INT MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
+                              HWND hwnd, const RECT *lprect )
 {
-    MSG32 msg;
+    MSG msg;
     POPUPMENU *menu;
-    BOOL32 fRemove;
-    INT32 executedMenuId = 0;
+    BOOL fRemove;
+    INT executedMenuId = 0;
     MTRACKER mt = { 0, hmenu, hmenu, hwnd, {x, y} };	/* control struct */
 
     fEndMenu = FALSE;
@@ -2381,7 +2381,7 @@ static INT32 MENU_TrackMenu( HMENU32 hmenu, UINT32 wFlags, INT32 x, INT32 y,
 	if (!MSG_InternalGetMessage( &msg, msg.hwnd, mt.hOwnerWnd,
 				     MSGF_MENU, PM_NOREMOVE, TRUE )) break;
 
-        TranslateMessage32( &msg );
+        TranslateMessage( &msg );
         mt.pt = msg.pt;
 
         fRemove = FALSE;
@@ -2498,7 +2498,7 @@ static INT32 MENU_TrackMenu( HMENU32 hmenu, UINT32 wFlags, INT32 x, INT32 y,
 
 	    case WM_CHAR:
 		{
-		    UINT32	pos;
+		    UINT	pos;
 
 		    if (msg.wParam == '\r' || msg.wParam == ' ')
 		    {
@@ -2514,8 +2514,8 @@ static INT32 MENU_TrackMenu( HMENU32 hmenu, UINT32 wFlags, INT32 x, INT32 y,
 
 		    pos = MENU_FindItemByKey( mt.hOwnerWnd, mt.hCurrentMenu, 
                                               LOWORD(msg.wParam), FALSE );
-		    if (pos == (UINT32)-2) fEndMenu = TRUE;
-		    else if (pos == (UINT32)-1) MessageBeep32(0);
+		    if (pos == (UINT)-2) fEndMenu = TRUE;
+		    else if (pos == (UINT)-1) MessageBeep(0);
 		    else
 		    {
 			MENU_SelectItem( mt.hOwnerWnd, mt.hCurrentMenu, pos, TRUE );
@@ -2528,7 +2528,7 @@ static INT32 MENU_TrackMenu( HMENU32 hmenu, UINT32 wFlags, INT32 x, INT32 y,
 	}
 	else
 	{
-	    DispatchMessage32A( &msg );
+	    DispatchMessageA( &msg );
 	}
 
 	if (!fEndMenu) fRemove = TRUE;
@@ -2536,19 +2536,19 @@ static INT32 MENU_TrackMenu( HMENU32 hmenu, UINT32 wFlags, INT32 x, INT32 y,
 	/* finally remove message from the queue */
 
         if (fRemove && !(mt.trackFlags & TF_SKIPREMOVE) )
-	    PeekMessage32A( &msg, 0, msg.message, msg.message, PM_REMOVE );
+	    PeekMessageA( &msg, 0, msg.message, msg.message, PM_REMOVE );
 	else mt.trackFlags &= ~TF_SKIPREMOVE;
     }
 
     ReleaseCapture();
-    if( IsWindow32( mt.hOwnerWnd ) )
+    if( IsWindow( mt.hOwnerWnd ) )
     {
 	MENU_HideSubPopups( mt.hOwnerWnd, mt.hTopMenu, FALSE );
 
 	menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( mt.hTopMenu );
 	if (menu && menu->wFlags & MF_POPUP) 
 	{
-	    ShowWindow32( menu->hWnd, SW_HIDE );
+	    ShowWindow( menu->hWnd, SW_HIDE );
 	    uSubPWndLevel = 0;
 	}
 	MENU_SelectItem( mt.hOwnerWnd, mt.hTopMenu, NO_SELECTED_ITEM, FALSE );
@@ -2563,9 +2563,9 @@ static INT32 MENU_TrackMenu( HMENU32 hmenu, UINT32 wFlags, INT32 x, INT32 y,
 /***********************************************************************
  *           MENU_InitTracking
  */
-static BOOL32 MENU_InitTracking(HWND32 hWnd, HMENU32 hMenu)
+static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu)
 {
-    HideCaret32(0);
+    HideCaret(0);
     SendMessage16( hWnd, WM_ENTERMENULOOP, 0, 0 );
     SendMessage16( hWnd, WM_SETCURSOR, hWnd, HTCAPTION );
     SendMessage16( hWnd, WM_INITMENU, hMenu, 0 );
@@ -2577,19 +2577,19 @@ static BOOL32 MENU_InitTracking(HWND32 hWnd, HMENU32 hMenu)
  *
  * Menu-bar tracking upon a mouse event. Called from NC_HandleSysCommand().
  */
-void MENU_TrackMouseMenuBar( WND* wndPtr, INT32 ht, POINT32 pt )
+void MENU_TrackMouseMenuBar( WND* wndPtr, INT ht, POINT pt )
 {
-    HWND32  hWnd = wndPtr->hwndSelf;
-    HMENU32 hMenu = (ht == HTSYSMENU) ? wndPtr->hSysMenu : wndPtr->wIDmenu;
+    HWND  hWnd = wndPtr->hwndSelf;
+    HMENU hMenu = (ht == HTSYSMENU) ? wndPtr->hSysMenu : wndPtr->wIDmenu;
 
-    if (IsMenu32(hMenu))
+    if (IsMenu(hMenu))
     {
 	MENU_InitTracking( hWnd, hMenu );
 	MENU_TrackMenu( hMenu, TPM_ENTERIDLEEX | TPM_BUTTONDOWN | 
 		        TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, hWnd, NULL );
 
 	SendMessage16( hWnd, WM_EXITMENULOOP, 0, 0 );
-	ShowCaret32(0);
+	ShowCaret(0);
     }
 }
 
@@ -2599,10 +2599,10 @@ void MENU_TrackMouseMenuBar( WND* wndPtr, INT32 ht, POINT32 pt )
  *
  * Menu-bar tracking upon a keyboard event. Called from NC_HandleSysCommand().
  */
-void MENU_TrackKbdMenuBar( WND* wndPtr, UINT32 wParam, INT32 vkey)
+void MENU_TrackKbdMenuBar( WND* wndPtr, UINT wParam, INT vkey)
 {
-   UINT32 uItem = NO_SELECTED_ITEM;
-   HMENU32 hTrackMenu; 
+   UINT uItem = NO_SELECTED_ITEM;
+   HMENU hTrackMenu; 
 
     /* find window that has a menu */
  
@@ -2622,7 +2622,7 @@ void MENU_TrackKbdMenuBar( WND* wndPtr, UINT32 wParam, INT32 vkey)
     else
 	hTrackMenu = wndPtr->wIDmenu;
 
-    if (IsMenu32( hTrackMenu ))
+    if (IsMenu( hTrackMenu ))
     {
 	MENU_InitTracking( wndPtr->hwndSelf, hTrackMenu );
 
@@ -2630,9 +2630,9 @@ void MENU_TrackKbdMenuBar( WND* wndPtr, UINT32 wParam, INT32 vkey)
         {
             uItem = MENU_FindItemByKey( wndPtr->hwndSelf, hTrackMenu, 
 					vkey, (wParam & HTSYSMENU) );
-	    if( uItem >= (UINT32)(-2) )
+	    if( uItem >= (UINT)(-2) )
 	    {
-	        if( uItem == (UINT32)(-1) ) MessageBeep32(0);
+	        if( uItem == (UINT)(-1) ) MessageBeep(0);
 		hTrackMenu = 0;
 	    }
         }
@@ -2650,7 +2650,7 @@ void MENU_TrackKbdMenuBar( WND* wndPtr, UINT32 wParam, INT32 vkey)
 			    0, 0, wndPtr->hwndSelf, NULL );
 	}
         SendMessage16( wndPtr->hwndSelf, WM_EXITMENULOOP, 0, 0 );
-        ShowCaret32(0);
+        ShowCaret(0);
     }
 }
 
@@ -2661,10 +2661,10 @@ void MENU_TrackKbdMenuBar( WND* wndPtr, UINT32 wParam, INT32 vkey)
 BOOL16 WINAPI TrackPopupMenu16( HMENU16 hMenu, UINT16 wFlags, INT16 x, INT16 y,
                            INT16 nReserved, HWND16 hWnd, const RECT16 *lpRect )
 {
-    RECT32 r;
+    RECT r;
     if (lpRect)
    	 CONV_RECT16TO32( lpRect, &r );
-    return TrackPopupMenu32( hMenu, wFlags, x, y, nReserved, hWnd,
+    return TrackPopupMenu( hMenu, wFlags, x, y, nReserved, hWnd,
                              lpRect ? &r : NULL );
 }
 
@@ -2672,27 +2672,27 @@ BOOL16 WINAPI TrackPopupMenu16( HMENU16 hMenu, UINT16 wFlags, INT16 x, INT16 y,
 /**********************************************************************
  *           TrackPopupMenu32   (USER32.549)
  */
-BOOL32 WINAPI TrackPopupMenu32( HMENU32 hMenu, UINT32 wFlags, INT32 x, INT32 y,
-                           INT32 nReserved, HWND32 hWnd, const RECT32 *lpRect )
+BOOL WINAPI TrackPopupMenu( HMENU hMenu, UINT wFlags, INT x, INT y,
+                           INT nReserved, HWND hWnd, const RECT *lpRect )
 {
-    BOOL32 ret = FALSE;
+    BOOL ret = FALSE;
 
-    HideCaret32(0);
+    HideCaret(0);
     SendMessage16( hWnd, WM_INITMENUPOPUP, (WPARAM16)hMenu, 0);
     if (MENU_ShowPopup( hWnd, hMenu, 0, x, y, 0, 0 )) 
 	ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpRect );
-    ShowCaret32(0);
+    ShowCaret(0);
     return ret;
 }
 
 /**********************************************************************
  *           TrackPopupMenuEx   (USER32.550)
  */
-BOOL32 WINAPI TrackPopupMenuEx( HMENU32 hMenu, UINT32 wFlags, INT32 x, INT32 y,
-                                HWND32 hWnd, LPTPMPARAMS lpTpm )
+BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y,
+                                HWND hWnd, LPTPMPARAMS lpTpm )
 {
     FIXME(menu, "not fully implemented\n" );
-    return TrackPopupMenu32( hMenu, wFlags, x, y, 0, hWnd,
+    return TrackPopupMenu( hMenu, wFlags, x, y, 0, hWnd,
                              lpTpm ? &lpTpm->rcExclude : NULL );
 }
 
@@ -2701,7 +2701,7 @@ BOOL32 WINAPI TrackPopupMenuEx( HMENU32 hMenu, UINT32 wFlags, INT32 x, INT32 y,
  *
  * NOTE: Windows has totally different (and undocumented) popup wndproc.
  */
-LRESULT WINAPI PopupMenuWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
+LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
                                  LPARAM lParam )
 {    
     WND* wndPtr = WIN_FindWndPtr(hwnd);
@@ -2710,8 +2710,8 @@ LRESULT WINAPI PopupMenuWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
     {
     case WM_CREATE:
 	{
-	    CREATESTRUCT32A *cs = (CREATESTRUCT32A*)lParam;
-	    SetWindowLong32A( hwnd, 0, (LONG)cs->lpCreateParams );
+	    CREATESTRUCTA *cs = (CREATESTRUCTA*)lParam;
+	    SetWindowLongA( hwnd, 0, (LONG)cs->lpCreateParams );
 	    return 0;
 	}
 
@@ -2720,11 +2720,11 @@ LRESULT WINAPI PopupMenuWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 
     case WM_PAINT:
 	{
-	    PAINTSTRUCT32 ps;
-	    BeginPaint32( hwnd, &ps );
+	    PAINTSTRUCT ps;
+	    BeginPaint( hwnd, &ps );
 	    MENU_DrawPopupMenu( hwnd, ps.hdc,
-                                (HMENU32)GetWindowLong32A( hwnd, 0 ) );
-	    EndPaint32( hwnd, &ps );
+                                (HMENU)GetWindowLongA( hwnd, 0 ) );
+	    EndPaint( hwnd, &ps );
 	    return 0;
 	}
     case WM_ERASEBKGND:
@@ -2753,24 +2753,24 @@ LRESULT WINAPI PopupMenuWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 
 	if( wParam )
 	{
-	    if( !(*(HMENU32*)wndPtr->wExtra) )
+	    if( !(*(HMENU*)wndPtr->wExtra) )
 		ERR(menu,"no menu to display\n");
 	}
 	else
-	    *(HMENU32*)wndPtr->wExtra = 0;
+	    *(HMENU*)wndPtr->wExtra = 0;
 	break;
 
     case MM_SETMENUHANDLE:
 
-	*(HMENU32*)wndPtr->wExtra = (HMENU32)wParam;
+	*(HMENU*)wndPtr->wExtra = (HMENU)wParam;
         break;
 
     case MM_GETMENUHANDLE:
 
-	return *(HMENU32*)wndPtr->wExtra;
+	return *(HMENU*)wndPtr->wExtra;
 
     default:
-	return DefWindowProc32A( hwnd, message, wParam, lParam );
+	return DefWindowProcA( hwnd, message, wParam, lParam );
     }
     return 0;
 }
@@ -2781,11 +2781,11 @@ LRESULT WINAPI PopupMenuWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
  *
  * Compute the size of the menu bar height. Used by NC_HandleNCCalcSize().
  */
-UINT32 MENU_GetMenuBarHeight( HWND32 hwnd, UINT32 menubarWidth,
-                              INT32 orgX, INT32 orgY )
+UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth,
+                              INT orgX, INT orgY )
 {
-    HDC32 hdc;
-    RECT32 rectBar;
+    HDC hdc;
+    RECT rectBar;
     WND *wndPtr;
     LPPOPUPMENU lppop;
 
@@ -2795,10 +2795,10 @@ UINT32 MENU_GetMenuBarHeight( HWND32 hwnd, UINT32 menubarWidth,
     if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0;
     if (!(lppop = (LPPOPUPMENU)USER_HEAP_LIN_ADDR((HMENU16)wndPtr->wIDmenu)))
       return 0;
-    hdc = GetDCEx32( hwnd, 0, DCX_CACHE | DCX_WINDOW );
-    SetRect32(&rectBar, orgX, orgY, orgX+menubarWidth, orgY+SYSMETRICS_CYMENU);
+    hdc = GetDCEx( hwnd, 0, DCX_CACHE | DCX_WINDOW );
+    SetRect(&rectBar, orgX, orgY, orgX+menubarWidth, orgY+SYSMETRICS_CYMENU);
     MENU_MenuBarCalcSize( hdc, &rectBar, lppop, hwnd );
-    ReleaseDC32( hwnd, hdc );
+    ReleaseDC( hwnd, hdc );
     return lppop->Height;
 }
 
@@ -2832,42 +2832,42 @@ BOOL16 WINAPI ChangeMenu16( HMENU16 hMenu, UINT16 pos, SEGPTR data,
 /*******************************************************************
  *         ChangeMenu32A    (USER32.23)
  */
-BOOL32 WINAPI ChangeMenu32A( HMENU32 hMenu, UINT32 pos, LPCSTR data,
-                             UINT32 id, UINT32 flags )
+BOOL WINAPI ChangeMenuA( HMENU hMenu, UINT pos, LPCSTR data,
+                             UINT id, UINT flags )
 {
     TRACE(menu,"menu=%08x pos=%d data=%08lx id=%08x flags=%08x\n",
                   hMenu, pos, (DWORD)data, id, flags );
-    if (flags & MF_APPEND) return AppendMenu32A( hMenu, flags & ~MF_APPEND,
+    if (flags & MF_APPEND) return AppendMenuA( hMenu, flags & ~MF_APPEND,
                                                  id, data );
-    if (flags & MF_DELETE) return DeleteMenu32(hMenu, pos, flags & ~MF_DELETE);
-    if (flags & MF_CHANGE) return ModifyMenu32A(hMenu, pos, flags & ~MF_CHANGE,
+    if (flags & MF_DELETE) return DeleteMenu(hMenu, pos, flags & ~MF_DELETE);
+    if (flags & MF_CHANGE) return ModifyMenuA(hMenu, pos, flags & ~MF_CHANGE,
                                                 id, data );
-    if (flags & MF_REMOVE) return RemoveMenu32( hMenu,
+    if (flags & MF_REMOVE) return RemoveMenu( hMenu,
                                               flags & MF_BYPOSITION ? pos : id,
                                               flags & ~MF_REMOVE );
     /* Default: MF_INSERT */
-    return InsertMenu32A( hMenu, pos, flags, id, data );
+    return InsertMenuA( hMenu, pos, flags, id, data );
 }
 
 
 /*******************************************************************
  *         ChangeMenu32W    (USER32.24)
  */
-BOOL32 WINAPI ChangeMenu32W( HMENU32 hMenu, UINT32 pos, LPCWSTR data,
-                             UINT32 id, UINT32 flags )
+BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data,
+                             UINT id, UINT flags )
 {
     TRACE(menu,"menu=%08x pos=%d data=%08lx id=%08x flags=%08x\n",
                   hMenu, pos, (DWORD)data, id, flags );
-    if (flags & MF_APPEND) return AppendMenu32W( hMenu, flags & ~MF_APPEND,
+    if (flags & MF_APPEND) return AppendMenuW( hMenu, flags & ~MF_APPEND,
                                                  id, data );
-    if (flags & MF_DELETE) return DeleteMenu32(hMenu, pos, flags & ~MF_DELETE);
-    if (flags & MF_CHANGE) return ModifyMenu32W(hMenu, pos, flags & ~MF_CHANGE,
+    if (flags & MF_DELETE) return DeleteMenu(hMenu, pos, flags & ~MF_DELETE);
+    if (flags & MF_CHANGE) return ModifyMenuW(hMenu, pos, flags & ~MF_CHANGE,
                                                 id, data );
-    if (flags & MF_REMOVE) return RemoveMenu32( hMenu,
+    if (flags & MF_REMOVE) return RemoveMenu( hMenu,
                                               flags & MF_BYPOSITION ? pos : id,
                                               flags & ~MF_REMOVE );
     /* Default: MF_INSERT */
-    return InsertMenu32W( hMenu, pos, flags, id, data );
+    return InsertMenuW( hMenu, pos, flags, id, data );
 }
 
 
@@ -2876,14 +2876,14 @@ BOOL32 WINAPI ChangeMenu32W( HMENU32 hMenu, UINT32 pos, LPCWSTR data,
  */
 BOOL16 WINAPI CheckMenuItem16( HMENU16 hMenu, UINT16 id, UINT16 flags )
 {
-    return (BOOL16)CheckMenuItem32( hMenu, id, flags );
+    return (BOOL16)CheckMenuItem( hMenu, id, flags );
 }
 
 
 /*******************************************************************
  *         CheckMenuItem32    (USER32.46)
  */
-DWORD WINAPI CheckMenuItem32( HMENU32 hMenu, UINT32 id, UINT32 flags )
+DWORD WINAPI CheckMenuItem( HMENU hMenu, UINT id, UINT flags )
 {
     MENUITEM *item;
     DWORD ret;
@@ -2902,23 +2902,23 @@ DWORD WINAPI CheckMenuItem32( HMENU32 hMenu, UINT32 id, UINT32 flags )
  */
 UINT16 WINAPI EnableMenuItem16( HMENU16 hMenu, UINT16 wItemID, UINT16 wFlags )
 {
-    return EnableMenuItem32( hMenu, wItemID, wFlags );
+    return EnableMenuItem( hMenu, wItemID, wFlags );
 }
 
 
 /**********************************************************************
  *         EnableMenuItem32    (USER32.170)
  */
-UINT32 WINAPI EnableMenuItem32( HMENU32 hMenu, UINT32 wItemID, UINT32 wFlags )
+UINT WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags )
 {
-    UINT32    oldflags;
+    UINT    oldflags;
     MENUITEM *item;
 
     TRACE(menu,"(%04x, %04X, %04X) !\n", 
 		 hMenu, wItemID, wFlags);
 
     if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags )))
-	return (UINT32)-1;
+	return (UINT)-1;
 
     oldflags = item->fState & (MF_GRAYED | MF_DISABLED);
     item->fState ^= (oldflags ^ wFlags) & (MF_GRAYED | MF_DISABLED);
@@ -2932,15 +2932,15 @@ UINT32 WINAPI EnableMenuItem32( HMENU32 hMenu, UINT32 wItemID, UINT32 wFlags )
 INT16 WINAPI GetMenuString16( HMENU16 hMenu, UINT16 wItemID,
                               LPSTR str, INT16 nMaxSiz, UINT16 wFlags )
 {
-    return GetMenuString32A( hMenu, wItemID, str, nMaxSiz, wFlags );
+    return GetMenuStringA( hMenu, wItemID, str, nMaxSiz, wFlags );
 }
 
 
 /*******************************************************************
  *         GetMenuString32A    (USER32.268)
  */
-INT32 WINAPI GetMenuString32A( HMENU32 hMenu, UINT32 wItemID,
-                               LPSTR str, INT32 nMaxSiz, UINT32 wFlags )
+INT WINAPI GetMenuStringA( HMENU hMenu, UINT wItemID,
+                               LPSTR str, INT nMaxSiz, UINT wFlags )
 {
     MENUITEM *item;
 
@@ -2950,7 +2950,7 @@ INT32 WINAPI GetMenuString32A( HMENU32 hMenu, UINT32 wItemID,
     str[0] = '\0';
     if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0;
     if (!IS_STRING_ITEM(item->fType)) return 0;
-    lstrcpyn32A( str, item->text, nMaxSiz );
+    lstrcpynA( str, item->text, nMaxSiz );
     TRACE(menu, "returning '%s'\n", str );
     return strlen(str);
 }
@@ -2959,8 +2959,8 @@ INT32 WINAPI GetMenuString32A( HMENU32 hMenu, UINT32 wItemID,
 /*******************************************************************
  *         GetMenuString32W    (USER32.269)
  */
-INT32 WINAPI GetMenuString32W( HMENU32 hMenu, UINT32 wItemID,
-                               LPWSTR str, INT32 nMaxSiz, UINT32 wFlags )
+INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID,
+                               LPWSTR str, INT nMaxSiz, UINT wFlags )
 {
     MENUITEM *item;
 
@@ -2971,7 +2971,7 @@ INT32 WINAPI GetMenuString32W( HMENU32 hMenu, UINT32 wItemID,
     if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0;
     if (!IS_STRING_ITEM(item->fType)) return 0;
     lstrcpynAtoW( str, item->text, nMaxSiz );
-    return lstrlen32W(str);
+    return lstrlenW(str);
 }
 
 
@@ -2981,15 +2981,15 @@ INT32 WINAPI GetMenuString32W( HMENU32 hMenu, UINT32 wItemID,
 BOOL16 WINAPI HiliteMenuItem16( HWND16 hWnd, HMENU16 hMenu, UINT16 wItemID,
                                 UINT16 wHilite )
 {
-    return HiliteMenuItem32( hWnd, hMenu, wItemID, wHilite );
+    return HiliteMenuItem( hWnd, hMenu, wItemID, wHilite );
 }
 
 
 /**********************************************************************
  *         HiliteMenuItem32    (USER32.318)
  */
-BOOL32 WINAPI HiliteMenuItem32( HWND32 hWnd, HMENU32 hMenu, UINT32 wItemID,
-                                UINT32 wHilite )
+BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID,
+                                UINT wHilite )
 {
     LPPOPUPMENU menu;
     TRACE(menu,"(%04x, %04x, %04x, %04x);\n", 
@@ -3008,14 +3008,14 @@ BOOL32 WINAPI HiliteMenuItem32( HWND32 hWnd, HMENU32 hMenu, UINT32 wItemID,
  */
 UINT16 WINAPI GetMenuState16( HMENU16 hMenu, UINT16 wItemID, UINT16 wFlags )
 {
-    return GetMenuState32( hMenu, wItemID, wFlags );
+    return GetMenuState( hMenu, wItemID, wFlags );
 }
 
 
 /**********************************************************************
  *         GetMenuState32    (USER32.267)
  */
-UINT32 WINAPI GetMenuState32( HMENU32 hMenu, UINT32 wItemID, UINT32 wFlags )
+UINT WINAPI GetMenuState( HMENU hMenu, UINT wItemID, UINT wFlags )
 {
     MENUITEM *item;
     TRACE(menu,"(%04x, %04x, %04x);\n", 
@@ -3054,7 +3054,7 @@ INT16 WINAPI GetMenuItemCount16( HMENU16 hMenu )
 /**********************************************************************
  *         GetMenuItemCount32    (USER32.262)
  */
-INT32 WINAPI GetMenuItemCount32( HMENU32 hMenu )
+INT WINAPI GetMenuItemCount( HMENU hMenu )
 {
     LPPOPUPMENU	menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu);
     if (!IS_A_MENU(menu)) return -1;
@@ -3081,7 +3081,7 @@ UINT16 WINAPI GetMenuItemID16( HMENU16 hMenu, INT16 nPos )
 /**********************************************************************
  *         GetMenuItemID32    (USER32.263)
  */
-UINT32 WINAPI GetMenuItemID32( HMENU32 hMenu, INT32 nPos )
+UINT WINAPI GetMenuItemID( HMENU hMenu, INT nPos )
 {
     LPPOPUPMENU	menu;
 
@@ -3098,20 +3098,20 @@ UINT32 WINAPI GetMenuItemID32( HMENU32 hMenu, INT32 nPos )
 BOOL16 WINAPI InsertMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags,
                             UINT16 id, SEGPTR data )
 {
-    UINT32 pos32 = (UINT32)pos;
-    if ((pos == (UINT16)-1) && (flags & MF_BYPOSITION)) pos32 = (UINT32)-1;
+    UINT pos32 = (UINT)pos;
+    if ((pos == (UINT16)-1) && (flags & MF_BYPOSITION)) pos32 = (UINT)-1;
     if (IS_STRING_ITEM(flags) && data)
-        return InsertMenu32A( hMenu, pos32, flags, id,
+        return InsertMenuA( hMenu, pos32, flags, id,
                               (LPSTR)PTR_SEG_TO_LIN(data) );
-    return InsertMenu32A( hMenu, pos32, flags, id, (LPSTR)data );
+    return InsertMenuA( hMenu, pos32, flags, id, (LPSTR)data );
 }
 
 
 /*******************************************************************
  *         InsertMenu32A    (USER32.322)
  */
-BOOL32 WINAPI InsertMenu32A( HMENU32 hMenu, UINT32 pos, UINT32 flags,
-                             UINT32 id, LPCSTR str )
+BOOL WINAPI InsertMenuA( HMENU hMenu, UINT pos, UINT flags,
+                             UINT id, LPCSTR str )
 {
     MENUITEM *item;
 
@@ -3127,7 +3127,7 @@ BOOL32 WINAPI InsertMenu32A( HMENU32 hMenu, UINT32 pos, UINT32 flags,
 
     if (!(MENU_SetItemData( item, flags, id, str )))
     {
-        RemoveMenu32( hMenu, pos, flags );
+        RemoveMenu( hMenu, pos, flags );
         return FALSE;
     }
 
@@ -3142,19 +3142,19 @@ BOOL32 WINAPI InsertMenu32A( HMENU32 hMenu, UINT32 pos, UINT32 flags,
 /*******************************************************************
  *         InsertMenu32W    (USER32.325)
  */
-BOOL32 WINAPI InsertMenu32W( HMENU32 hMenu, UINT32 pos, UINT32 flags,
-                             UINT32 id, LPCWSTR str )
+BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags,
+                             UINT id, LPCWSTR str )
 {
-    BOOL32 ret;
+    BOOL ret;
 
     if (IS_STRING_ITEM(flags) && str)
     {
         LPSTR newstr = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-        ret = InsertMenu32A( hMenu, pos, flags, id, newstr );
+        ret = InsertMenuA( hMenu, pos, flags, id, newstr );
         HeapFree( GetProcessHeap(), 0, newstr );
         return ret;
     }
-    else return InsertMenu32A( hMenu, pos, flags, id, (LPCSTR)str );
+    else return InsertMenuA( hMenu, pos, flags, id, (LPCSTR)str );
 }
 
 
@@ -3170,20 +3170,20 @@ BOOL16 WINAPI AppendMenu16(HMENU16 hMenu, UINT16 flags, UINT16 id, SEGPTR data)
 /*******************************************************************
  *         AppendMenu32A    (USER32.5)
  */
-BOOL32 WINAPI AppendMenu32A( HMENU32 hMenu, UINT32 flags,
-                             UINT32 id, LPCSTR data )
+BOOL WINAPI AppendMenuA( HMENU hMenu, UINT flags,
+                             UINT id, LPCSTR data )
 {
-    return InsertMenu32A( hMenu, -1, flags | MF_BYPOSITION, id, data );
+    return InsertMenuA( hMenu, -1, flags | MF_BYPOSITION, id, data );
 }
 
 
 /*******************************************************************
  *         AppendMenu32W    (USER32.6)
  */
-BOOL32 WINAPI AppendMenu32W( HMENU32 hMenu, UINT32 flags,
-                             UINT32 id, LPCWSTR data )
+BOOL WINAPI AppendMenuW( HMENU hMenu, UINT flags,
+                             UINT id, LPCWSTR data )
 {
-    return InsertMenu32W( hMenu, -1, flags | MF_BYPOSITION, id, data );
+    return InsertMenuW( hMenu, -1, flags | MF_BYPOSITION, id, data );
 }
 
 
@@ -3192,14 +3192,14 @@ BOOL32 WINAPI AppendMenu32W( HMENU32 hMenu, UINT32 flags,
  */
 BOOL16 WINAPI RemoveMenu16( HMENU16 hMenu, UINT16 nPos, UINT16 wFlags )
 {
-    return RemoveMenu32( hMenu, nPos, wFlags );
+    return RemoveMenu( hMenu, nPos, wFlags );
 }
 
 
 /**********************************************************************
  *         RemoveMenu32    (USER32.441)
  */
-BOOL32 WINAPI RemoveMenu32( HMENU32 hMenu, UINT32 nPos, UINT32 wFlags )
+BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags )
 {
     LPPOPUPMENU	menu;
     MENUITEM *item;
@@ -3237,20 +3237,20 @@ BOOL32 WINAPI RemoveMenu32( HMENU32 hMenu, UINT32 nPos, UINT32 wFlags )
  */
 BOOL16 WINAPI DeleteMenu16( HMENU16 hMenu, UINT16 nPos, UINT16 wFlags )
 {
-    return DeleteMenu32( hMenu, nPos, wFlags );
+    return DeleteMenu( hMenu, nPos, wFlags );
 }
 
 
 /**********************************************************************
  *         DeleteMenu32    (USER32.129)
  */
-BOOL32 WINAPI DeleteMenu32( HMENU32 hMenu, UINT32 nPos, UINT32 wFlags )
+BOOL WINAPI DeleteMenu( HMENU hMenu, UINT nPos, UINT wFlags )
 {
     MENUITEM *item = MENU_FindItem( &hMenu, &nPos, wFlags );
     if (!item) return FALSE;
-    if (item->fType & MF_POPUP) DestroyMenu32( item->hSubMenu );
+    if (item->fType & MF_POPUP) DestroyMenu( item->hSubMenu );
       /* nPos is now the position of the item */
-    RemoveMenu32( hMenu, nPos, wFlags | MF_BYPOSITION );
+    RemoveMenu( hMenu, nPos, wFlags | MF_BYPOSITION );
     return TRUE;
 }
 
@@ -3262,17 +3262,17 @@ BOOL16 WINAPI ModifyMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags,
                             UINT16 id, SEGPTR data )
 {
     if (IS_STRING_ITEM(flags))
-        return ModifyMenu32A( hMenu, pos, flags, id,
+        return ModifyMenuA( hMenu, pos, flags, id,
                               (LPSTR)PTR_SEG_TO_LIN(data) );
-    return ModifyMenu32A( hMenu, pos, flags, id, (LPSTR)data );
+    return ModifyMenuA( hMenu, pos, flags, id, (LPSTR)data );
 }
 
 
 /*******************************************************************
  *         ModifyMenu32A    (USER32.397)
  */
-BOOL32 WINAPI ModifyMenu32A( HMENU32 hMenu, UINT32 pos, UINT32 flags,
-                             UINT32 id, LPCSTR str )
+BOOL WINAPI ModifyMenuA( HMENU hMenu, UINT pos, UINT flags,
+                             UINT id, LPCSTR str )
 {
     MENUITEM *item;
 
@@ -3296,19 +3296,19 @@ BOOL32 WINAPI ModifyMenu32A( HMENU32 hMenu, UINT32 pos, UINT32 flags,
 /*******************************************************************
  *         ModifyMenu32W    (USER32.398)
  */
-BOOL32 WINAPI ModifyMenu32W( HMENU32 hMenu, UINT32 pos, UINT32 flags,
-                             UINT32 id, LPCWSTR str )
+BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags,
+                             UINT id, LPCWSTR str )
 {
-    BOOL32 ret;
+    BOOL ret;
 
     if (IS_STRING_ITEM(flags) && str)
     {
         LPSTR newstr = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-        ret = ModifyMenu32A( hMenu, pos, flags, id, newstr );
+        ret = ModifyMenuA( hMenu, pos, flags, id, newstr );
         HeapFree( GetProcessHeap(), 0, newstr );
         return ret;
     }
-    else return ModifyMenu32A( hMenu, pos, flags, id, (LPCSTR)str );
+    else return ModifyMenuA( hMenu, pos, flags, id, (LPCSTR)str );
 }
 
 
@@ -3317,19 +3317,19 @@ BOOL32 WINAPI ModifyMenu32W( HMENU32 hMenu, UINT32 pos, UINT32 flags,
  */
 HMENU16 WINAPI CreatePopupMenu16(void)
 {
-    return CreatePopupMenu32();
+    return CreatePopupMenu();
 }
 
 
 /**********************************************************************
  *         CreatePopupMenu32    (USER32.82)
  */
-HMENU32 WINAPI CreatePopupMenu32(void)
+HMENU WINAPI CreatePopupMenu(void)
 {
-    HMENU32 hmenu;
+    HMENU hmenu;
     POPUPMENU *menu;
 
-    if (!(hmenu = CreateMenu32())) return 0;
+    if (!(hmenu = CreateMenu())) return 0;
     menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu );
     menu->wFlags |= MF_POPUP;
     return hmenu;
@@ -3351,15 +3351,15 @@ DWORD WINAPI GetMenuCheckMarkDimensions(void)
 BOOL16 WINAPI SetMenuItemBitmaps16( HMENU16 hMenu, UINT16 nPos, UINT16 wFlags,
                                     HBITMAP16 hNewUnCheck, HBITMAP16 hNewCheck)
 {
-    return SetMenuItemBitmaps32( hMenu, nPos, wFlags, hNewUnCheck, hNewCheck );
+    return SetMenuItemBitmaps( hMenu, nPos, wFlags, hNewUnCheck, hNewCheck );
 }
 
 
 /**********************************************************************
  *         SetMenuItemBitmaps32    (USER32.490)
  */
-BOOL32 WINAPI SetMenuItemBitmaps32( HMENU32 hMenu, UINT32 nPos, UINT32 wFlags,
-                                    HBITMAP32 hNewUnCheck, HBITMAP32 hNewCheck)
+BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags,
+                                    HBITMAP hNewUnCheck, HBITMAP hNewCheck)
 {
     MENUITEM *item;
     TRACE(menu,"(%04x, %04x, %04x, %04x, %04x)\n",
@@ -3385,16 +3385,16 @@ BOOL32 WINAPI SetMenuItemBitmaps32( HMENU32 hMenu, UINT32 nPos, UINT32 wFlags,
  */
 HMENU16 WINAPI CreateMenu16(void)
 {
-    return CreateMenu32();
+    return CreateMenu();
 }
 
 
 /**********************************************************************
  *         CreateMenu32    (USER32.81)
  */
-HMENU32 WINAPI CreateMenu32(void)
+HMENU WINAPI CreateMenu(void)
 {
-    HMENU32 hMenu;
+    HMENU hMenu;
     LPPOPUPMENU menu;
     if (!(hMenu = USER_HEAP_ALLOC( sizeof(POPUPMENU) ))) return 0;
     menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu);
@@ -3417,14 +3417,14 @@ HMENU32 WINAPI CreateMenu32(void)
  */
 BOOL16 WINAPI DestroyMenu16( HMENU16 hMenu )
 {
-    return DestroyMenu32( hMenu );
+    return DestroyMenu( hMenu );
 }
 
 
 /**********************************************************************
  *         DestroyMenu32    (USER32.134)
  */
-BOOL32 WINAPI DestroyMenu32( HMENU32 hMenu )
+BOOL WINAPI DestroyMenu( HMENU hMenu )
 {
     TRACE(menu,"(%04x)\n", hMenu);
 
@@ -3434,8 +3434,8 @@ BOOL32 WINAPI DestroyMenu32( HMENU32 hMenu )
     {
 	LPPOPUPMENU lppop = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu);
 
-	if( pTopPopupWnd && (hMenu == *(HMENU32*)pTopPopupWnd->wExtra) )
-	  *(UINT32*)pTopPopupWnd->wExtra = 0;
+	if( pTopPopupWnd && (hMenu == *(HMENU*)pTopPopupWnd->wExtra) )
+	  *(UINT*)pTopPopupWnd->wExtra = 0;
 
 	if (IS_A_MENU( lppop ))
 	{
@@ -3443,7 +3443,7 @@ BOOL32 WINAPI DestroyMenu32( HMENU32 hMenu )
 
 	    if ((lppop->wFlags & MF_POPUP) && lppop->hWnd &&
 	        (!pTopPopupWnd || (lppop->hWnd != pTopPopupWnd->hwndSelf)))
-	        DestroyWindow32( lppop->hWnd );
+	        DestroyWindow( lppop->hWnd );
 
 	    if (lppop->items)	/* recursively destroy submenus */
 	    {
@@ -3451,7 +3451,7 @@ BOOL32 WINAPI DestroyMenu32( HMENU32 hMenu )
 	        MENUITEM *item = lppop->items;
 	        for (i = lppop->nItems; i > 0; i--, item++)
 	        {
-	            if (item->fType & MF_POPUP) DestroyMenu32(item->hSubMenu);
+	            if (item->fType & MF_POPUP) DestroyMenu(item->hSubMenu);
 		    MENU_FreeItemData( item );
 	        }
 	        HeapFree( SystemHeap, 0, lppop->items );
@@ -3469,14 +3469,14 @@ BOOL32 WINAPI DestroyMenu32( HMENU32 hMenu )
  */
 HMENU16 WINAPI GetSystemMenu16( HWND16 hWnd, BOOL16 bRevert )
 {
-    return GetSystemMenu32( hWnd, bRevert );
+    return GetSystemMenu( hWnd, bRevert );
 }
 
 
 /**********************************************************************
  *         GetSystemMenu32    (USER32.291)
  */
-HMENU32 WINAPI GetSystemMenu32( HWND32 hWnd, BOOL32 bRevert )
+HMENU WINAPI GetSystemMenu( HWND hWnd, BOOL bRevert )
 {
     WND *wndPtr = WIN_FindWndPtr( hWnd );
 
@@ -3486,7 +3486,7 @@ HMENU32 WINAPI GetSystemMenu32( HWND32 hWnd, BOOL32 bRevert )
 	{
 	    if( bRevert )
 	    {
-		DestroyMenu32(wndPtr->hSysMenu); 
+		DestroyMenu(wndPtr->hSysMenu); 
 		wndPtr->hSysMenu = 0;
 	    }
 	    else
@@ -3499,7 +3499,7 @@ HMENU32 WINAPI GetSystemMenu32( HWND32 hWnd, BOOL32 bRevert )
 	}
 
 	if(!wndPtr->hSysMenu && (wndPtr->dwStyle & WS_SYSMENU) )
-	    wndPtr->hSysMenu = MENU_GetSysMenu( hWnd, (HMENU32)(-1) );
+	    wndPtr->hSysMenu = MENU_GetSysMenu( hWnd, (HMENU)(-1) );
 
 	if( wndPtr->hSysMenu )
 	    return GetSubMenu16(wndPtr->hSysMenu, 0);
@@ -3513,20 +3513,20 @@ HMENU32 WINAPI GetSystemMenu32( HWND32 hWnd, BOOL32 bRevert )
  */
 BOOL16 WINAPI SetSystemMenu16( HWND16 hwnd, HMENU16 hMenu )
 {
-    return SetSystemMenu32( hwnd, hMenu );
+    return SetSystemMenu( hwnd, hMenu );
 }
 
 
 /*******************************************************************
  *         SetSystemMenu32    (USER32.508)
  */
-BOOL32 WINAPI SetSystemMenu32( HWND32 hwnd, HMENU32 hMenu )
+BOOL WINAPI SetSystemMenu( HWND hwnd, HMENU hMenu )
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
     if (wndPtr)
     {
-	if (wndPtr->hSysMenu) DestroyMenu32( wndPtr->hSysMenu );
+	if (wndPtr->hSysMenu) DestroyMenu( wndPtr->hSysMenu );
 	wndPtr->hSysMenu = MENU_GetSysMenu( hwnd, hMenu );
 	return TRUE;
     }
@@ -3549,11 +3549,11 @@ HMENU16 WINAPI GetMenu16( HWND16 hWnd )
 /**********************************************************************
  *         GetMenu32    (USER32.257)
  */
-HMENU32 WINAPI GetMenu32( HWND32 hWnd ) 
+HMENU WINAPI GetMenu( HWND hWnd ) 
 { 
     WND * wndPtr = WIN_FindWndPtr(hWnd);
     if (wndPtr && !(wndPtr->dwStyle & WS_CHILD)) 
-	return (HMENU32)wndPtr->wIDmenu;
+	return (HMENU)wndPtr->wIDmenu;
     return 0;
 }
 
@@ -3563,14 +3563,14 @@ HMENU32 WINAPI GetMenu32( HWND32 hWnd )
  */
 BOOL16 WINAPI SetMenu16( HWND16 hWnd, HMENU16 hMenu )
 {
-    return SetMenu32( hWnd, hMenu );
+    return SetMenu( hWnd, hMenu );
 }
 
 
 /**********************************************************************
  *         SetMenu32    (USER32.487)
  */
-BOOL32 WINAPI SetMenu32( HWND32 hWnd, HMENU32 hMenu )
+BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu )
 {
     WND * wndPtr = WIN_FindWndPtr(hWnd);
 
@@ -3578,9 +3578,9 @@ BOOL32 WINAPI SetMenu32( HWND32 hWnd, HMENU32 hMenu )
 
     if (wndPtr && !(wndPtr->dwStyle & WS_CHILD))
     {
-	if (GetCapture32() == hWnd) ReleaseCapture();
+	if (GetCapture() == hWnd) ReleaseCapture();
 
-	wndPtr->wIDmenu = (UINT32)hMenu;
+	wndPtr->wIDmenu = (UINT)hMenu;
 	if (hMenu != 0)
 	{
 	    LPPOPUPMENU lpmenu;
@@ -3590,8 +3590,8 @@ BOOL32 WINAPI SetMenu32( HWND32 hWnd, HMENU32 hMenu )
             lpmenu->wFlags &= ~MF_POPUP;  /* Can't be a popup */
             lpmenu->Height = 0;  /* Make sure we recalculate the size */
 	}
-	if (IsWindowVisible32(hWnd))
-            SetWindowPos32( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
+	if (IsWindowVisible(hWnd))
+            SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
                         SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );
 	return TRUE;
     }
@@ -3605,19 +3605,19 @@ BOOL32 WINAPI SetMenu32( HWND32 hWnd, HMENU32 hMenu )
  */
 HMENU16 WINAPI GetSubMenu16( HMENU16 hMenu, INT16 nPos )
 {
-    return GetSubMenu32( hMenu, nPos );
+    return GetSubMenu( hMenu, nPos );
 }
 
 
 /**********************************************************************
  *         GetSubMenu32    (USER32.288)
  */
-HMENU32 WINAPI GetSubMenu32( HMENU32 hMenu, INT32 nPos )
+HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos )
 {
     LPPOPUPMENU lppop;
 
     if (!(lppop = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu))) return 0;
-    if ((UINT32)nPos >= lppop->nItems) return 0;
+    if ((UINT)nPos >= lppop->nItems) return 0;
     if (!(lppop->items[nPos].fType & MF_POPUP)) return 0;
     return lppop->items[nPos].hSubMenu;
 }
@@ -3628,14 +3628,14 @@ HMENU32 WINAPI GetSubMenu32( HMENU32 hMenu, INT32 nPos )
  */
 void WINAPI DrawMenuBar16( HWND16 hWnd )
 {
-    DrawMenuBar32( hWnd );
+    DrawMenuBar( hWnd );
 }
 
 
 /**********************************************************************
  *         DrawMenuBar32    (USER32.161)
  */
-BOOL32 WINAPI DrawMenuBar32( HWND32 hWnd )
+BOOL WINAPI DrawMenuBar( HWND hWnd )
 {
     LPPOPUPMENU lppop;
     WND *wndPtr = WIN_FindWndPtr(hWnd);
@@ -3645,7 +3645,7 @@ BOOL32 WINAPI DrawMenuBar32( HWND32 hWnd )
         if (lppop == NULL) return FALSE;
 
         lppop->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */
-        SetWindowPos32( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
+        SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
                         SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );
         return TRUE;
     }
@@ -3665,10 +3665,10 @@ void WINAPI EndMenu(void)
 /***********************************************************************
  *           LookupMenuHandle   (USER.217)
  */
-HMENU16 WINAPI LookupMenuHandle( HMENU16 hmenu, INT16 id )
+HMENU16 WINAPI LookupMenuHandle16( HMENU16 hmenu, INT16 id )
 {
-    HMENU32 hmenu32 = hmenu;
-    UINT32 id32 = id;
+    HMENU hmenu32 = hmenu;
+    UINT id32 = id;
     if (!MENU_FindItem( &hmenu32, &id32, MF_BYCOMMAND )) return 0;
     else return hmenu32;
 }
@@ -3696,7 +3696,7 @@ HMENU16 WINAPI LoadMenu16( HINSTANCE16 instance, SEGPTR name )
     
     /* check for Win32 module */
     if (HIWORD(instance))
-        return LoadMenu32A(instance,PTR_SEG_TO_LIN(name));
+        return LoadMenuA(instance,PTR_SEG_TO_LIN(name));
     instance = GetExePtr( instance );
 
     if (!(hRsrc = FindResource16( instance, name, RT_MENU16 ))) return 0;
@@ -3710,22 +3710,22 @@ HMENU16 WINAPI LoadMenu16( HINSTANCE16 instance, SEGPTR name )
 /*****************************************************************
  *        LoadMenu32A   (USER32.370)
  */
-HMENU32 WINAPI LoadMenu32A( HINSTANCE32 instance, LPCSTR name )
+HMENU WINAPI LoadMenuA( HINSTANCE instance, LPCSTR name )
 {
-    HRSRC32 hrsrc = FindResource32A( instance, name, RT_MENU32A );
+    HRSRC hrsrc = FindResourceA( instance, name, RT_MENUA );
     if (!hrsrc) return 0;
-    return LoadMenuIndirect32A( (LPCVOID)LoadResource32( instance, hrsrc ));
+    return LoadMenuIndirectA( (LPCVOID)LoadResource( instance, hrsrc ));
 }
 
 
 /*****************************************************************
  *        LoadMenu32W   (USER32.373)
  */
-HMENU32 WINAPI LoadMenu32W( HINSTANCE32 instance, LPCWSTR name )
+HMENU WINAPI LoadMenuW( HINSTANCE instance, LPCWSTR name )
 {
-    HRSRC32 hrsrc = FindResource32W( instance, name, RT_MENU32W );
+    HRSRC hrsrc = FindResourceW( instance, name, RT_MENUW );
     if (!hrsrc) return 0;
-    return LoadMenuIndirect32W( (LPCVOID)LoadResource32( instance, hrsrc ));
+    return LoadMenuIndirectW( (LPCVOID)LoadResource( instance, hrsrc ));
 }
 
 
@@ -3748,10 +3748,10 @@ HMENU16 WINAPI LoadMenuIndirect16( LPCVOID template )
     }
     offset = GET_WORD(p);
     p += sizeof(WORD) + offset;
-    if (!(hMenu = CreateMenu32())) return 0;
+    if (!(hMenu = CreateMenu())) return 0;
     if (!MENU_ParseResource( p, hMenu, FALSE ))
     {
-        DestroyMenu32( hMenu );
+        DestroyMenu( hMenu );
         return 0;
     }
     return hMenu;
@@ -3761,7 +3761,7 @@ HMENU16 WINAPI LoadMenuIndirect16( LPCVOID template )
 /**********************************************************************
  *	    LoadMenuIndirect32A    (USER32.371)
  */
-HMENU32 WINAPI LoadMenuIndirect32A( LPCVOID template )
+HMENU WINAPI LoadMenuIndirectA( LPCVOID template )
 {
     HMENU16 hMenu;
     WORD version, offset;
@@ -3775,20 +3775,20 @@ HMENU32 WINAPI LoadMenuIndirect32A( LPCVOID template )
       case 0:
 	offset = GET_WORD(p);
 	p += sizeof(WORD) + offset;
-	if (!(hMenu = CreateMenu32())) return 0;
+	if (!(hMenu = CreateMenu())) return 0;
 	if (!MENU_ParseResource( p, hMenu, TRUE ))
 	  {
-	    DestroyMenu32( hMenu );
+	    DestroyMenu( hMenu );
 	    return 0;
 	  }
 	return hMenu;
       case 1:
 	offset = GET_WORD(p);
 	p += sizeof(WORD) + offset;
-	if (!(hMenu = CreateMenu32())) return 0;
+	if (!(hMenu = CreateMenu())) return 0;
 	if (!MENUEX_ParseResource( p, hMenu))
 	  {
-	    DestroyMenu32( hMenu );
+	    DestroyMenu( hMenu );
 	    return 0;
 	  }
 	return hMenu;
@@ -3802,10 +3802,10 @@ HMENU32 WINAPI LoadMenuIndirect32A( LPCVOID template )
 /**********************************************************************
  *	    LoadMenuIndirect32W    (USER32.372)
  */
-HMENU32 WINAPI LoadMenuIndirect32W( LPCVOID template )
+HMENU WINAPI LoadMenuIndirectW( LPCVOID template )
 {
     /* FIXME: is there anything different between A and W? */
-    return LoadMenuIndirect32A( template );
+    return LoadMenuIndirectA( template );
 }
 
 
@@ -3822,7 +3822,7 @@ BOOL16 WINAPI IsMenu16( HMENU16 hmenu )
 /**********************************************************************
  *		IsMenu32    (USER32.346)
  */
-BOOL32 WINAPI IsMenu32(HMENU32 hmenu)
+BOOL WINAPI IsMenu(HMENU hmenu)
 {
     LPPOPUPMENU menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hmenu);
     return IS_A_MENU(menu);
@@ -3832,10 +3832,10 @@ BOOL32 WINAPI IsMenu32(HMENU32 hmenu)
  *		GetMenuItemInfo32_common
  */
 
-static BOOL32 GetMenuItemInfo32_common ( HMENU32 hmenu, UINT32 item,
-					 BOOL32 bypos,
-					 LPMENUITEMINFO32A lpmii,
-					 BOOL32 unicode)
+static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item,
+					 BOOL bypos,
+					 LPMENUITEMINFOA lpmii,
+					 BOOL unicode)
 {
   MENUITEM *menu = MENU_FindItem (&hmenu, &item, bypos? MF_BYPOSITION : 0);
     debug_print_menuitem("GetMenuItemInfo32_common: ", menu, "");
@@ -3852,7 +3852,7 @@ static BOOL32 GetMenuItemInfo32_common ( HMENU32 hmenu, UINT32 item,
 				 menu->text,
 				 lpmii->cch);
 		else
-		    lstrcpyn32A(lpmii->dwTypeData,
+		    lstrcpynA(lpmii->dwTypeData,
 				menu->text,
 				lpmii->cch);
 	}
@@ -3887,29 +3887,29 @@ static BOOL32 GetMenuItemInfo32_common ( HMENU32 hmenu, UINT32 item,
 /**********************************************************************
  *		GetMenuItemInfo32A    (USER32.264)
  */
-BOOL32 WINAPI GetMenuItemInfo32A( HMENU32 hmenu, UINT32 item, BOOL32 bypos,
-                                  LPMENUITEMINFO32A lpmii)
+BOOL WINAPI GetMenuItemInfoA( HMENU hmenu, UINT item, BOOL bypos,
+                                  LPMENUITEMINFOA lpmii)
 {
-    return GetMenuItemInfo32_common (hmenu, item, bypos, lpmii, FALSE);
+    return GetMenuItemInfo_common (hmenu, item, bypos, lpmii, FALSE);
 }
 
 /**********************************************************************
  *		GetMenuItemInfo32W    (USER32.265)
  */
-BOOL32 WINAPI GetMenuItemInfo32W( HMENU32 hmenu, UINT32 item, BOOL32 bypos,
-                                  LPMENUITEMINFO32W lpmii)
+BOOL WINAPI GetMenuItemInfoW( HMENU hmenu, UINT item, BOOL bypos,
+                                  LPMENUITEMINFOW lpmii)
 {
-    return GetMenuItemInfo32_common (hmenu, item, bypos,
-                                     (LPMENUITEMINFO32A)lpmii, TRUE);
+    return GetMenuItemInfo_common (hmenu, item, bypos,
+                                     (LPMENUITEMINFOA)lpmii, TRUE);
 }
 
 /**********************************************************************
  *		SetMenuItemInfo32_common
  */
 
-static BOOL32 SetMenuItemInfo32_common(MENUITEM * menu,
-				       const MENUITEMINFO32A *lpmii,
-				       BOOL32 unicode)
+static BOOL SetMenuItemInfo_common(MENUITEM * menu,
+				       const MENUITEMINFOA *lpmii,
+				       BOOL unicode)
 {
     if (!menu) return FALSE;
 
@@ -3965,27 +3965,27 @@ static BOOL32 SetMenuItemInfo32_common(MENUITEM * menu,
 /**********************************************************************
  *		SetMenuItemInfo32A    (USER32.491)
  */
-BOOL32 WINAPI SetMenuItemInfo32A(HMENU32 hmenu, UINT32 item, BOOL32 bypos,
-                                 const MENUITEMINFO32A *lpmii) 
+BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos,
+                                 const MENUITEMINFOA *lpmii) 
 {
-    return SetMenuItemInfo32_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0),
+    return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0),
 				    lpmii, FALSE);
 }
 
 /**********************************************************************
  *		SetMenuItemInfo32W    (USER32.492)
  */
-BOOL32 WINAPI SetMenuItemInfo32W(HMENU32 hmenu, UINT32 item, BOOL32 bypos,
-                                 const MENUITEMINFO32W *lpmii)
+BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos,
+                                 const MENUITEMINFOW *lpmii)
 {
-    return SetMenuItemInfo32_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0),
-				    (const MENUITEMINFO32A*)lpmii, TRUE);
+    return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0),
+				    (const MENUITEMINFOA*)lpmii, TRUE);
 }
 
 /**********************************************************************
  *		SetMenuDefaultItem32    (USER32.489)
  */
-BOOL32 WINAPI SetMenuDefaultItem32(HMENU32 hmenu, UINT32 item, UINT32 bypos)
+BOOL WINAPI SetMenuDefaultItem(HMENU hmenu, UINT item, UINT bypos)
 {
     MENUITEM *menuitem = MENU_FindItem(&hmenu, &item, bypos);
     POPUPMENU *menu;
@@ -4004,7 +4004,7 @@ BOOL32 WINAPI SetMenuDefaultItem32(HMENU32 hmenu, UINT32 item, UINT32 bypos)
 /**********************************************************************
  *		GetMenuDefaultItem32    (USER32.260)
  */
-UINT32 WINAPI GetMenuDefaultItem32(HMENU32 hmenu, UINT32 bypos, UINT32 flags)
+UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags)
 {
     POPUPMENU *menu;
 
@@ -4030,7 +4030,7 @@ UINT32 WINAPI GetMenuDefaultItem32(HMENU32 hmenu, UINT32 bypos, UINT32 flags)
 BOOL16 WINAPI InsertMenuItem16( HMENU16 hmenu, UINT16 pos, BOOL16 byposition,
                                 const MENUITEMINFO16 *mii )
 {
-    MENUITEMINFO32A miia;
+    MENUITEMINFOA miia;
 
     miia.cbSize        = sizeof(miia);
     miia.fMask         = mii->fMask;
@@ -4045,41 +4045,41 @@ BOOL16 WINAPI InsertMenuItem16( HMENU16 hmenu, UINT16 pos, BOOL16 byposition,
     miia.cch           = mii->cch;
     if (IS_STRING_ITEM(miia.fType))
         miia.dwTypeData = PTR_SEG_TO_LIN(miia.dwTypeData);
-    return InsertMenuItem32A( hmenu, pos, byposition, &miia );
+    return InsertMenuItemA( hmenu, pos, byposition, &miia );
 }
 
 
 /**********************************************************************
  *		InsertMenuItem32A    (USER32.323)
  */
-BOOL32 WINAPI InsertMenuItem32A(HMENU32 hMenu, UINT32 uItem, BOOL32 bypos,
-                                const MENUITEMINFO32A *lpmii)
+BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos,
+                                const MENUITEMINFOA *lpmii)
 {
     MENUITEM *item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 );
-    return SetMenuItemInfo32_common(item, lpmii, FALSE);
+    return SetMenuItemInfo_common(item, lpmii, FALSE);
 }
 
 
 /**********************************************************************
  *		InsertMenuItem32W    (USER32.324)
  */
-BOOL32 WINAPI InsertMenuItem32W(HMENU32 hMenu, UINT32 uItem, BOOL32 bypos,
-                                const MENUITEMINFO32W *lpmii)
+BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos,
+                                const MENUITEMINFOW *lpmii)
 {
     MENUITEM *item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 );
-    return SetMenuItemInfo32_common(item, (const MENUITEMINFO32A*)lpmii, TRUE);
+    return SetMenuItemInfo_common(item, (const MENUITEMINFOA*)lpmii, TRUE);
 }
 
 /**********************************************************************
  *		CheckMenuRadioItem32    (USER32.47)
  */
 
-BOOL32 WINAPI CheckMenuRadioItem32(HMENU32 hMenu,
-				   UINT32 first, UINT32 last, UINT32 check,
-				   UINT32 bypos)
+BOOL WINAPI CheckMenuRadioItem(HMENU hMenu,
+				   UINT first, UINT last, UINT check,
+				   UINT bypos)
 {
      MENUITEM *mifirst, *milast, *micheck;
-     HMENU32 mfirst = hMenu, mlast = hMenu, mcheck = hMenu;
+     HMENU mfirst = hMenu, mlast = hMenu, mcheck = hMenu;
 
      TRACE(menu, "ox%x: %d-%d, check %d, bypos=%d\n",
 		  hMenu, first, last, check, bypos);
@@ -4117,7 +4117,7 @@ BOOL16 WINAPI CheckMenuRadioItem16(HMENU16 hMenu,
 				   UINT16 first, UINT16 last, UINT16 check,
 				   BOOL16 bypos)
 {
-     return CheckMenuRadioItem32 (hMenu, first, last, check, bypos);
+     return CheckMenuRadioItem (hMenu, first, last, check, bypos);
 }
 
 /**********************************************************************
@@ -4128,12 +4128,12 @@ BOOL16 WINAPI CheckMenuRadioItem16(HMENU16 hMenu,
  *                 always on the upper left side of the application.
  *                 
  */
-BOOL32 WINAPI GetMenuItemRect32 (HWND32 hwnd, HMENU32 hMenu, UINT32 uItem,
-				 LPRECT32 rect)
+BOOL WINAPI GetMenuItemRect (HWND hwnd, HMENU hMenu, UINT uItem,
+				 LPRECT rect)
 {
      POPUPMENU *itemMenu;
      MENUITEM *item;
-     HWND32 referenceHwnd;
+     HWND referenceHwnd;
 
      TRACE(menu, "(0x%x,0x%x,%d,%p)\n", hwnd, hMenu, uItem, rect);
 
@@ -4156,7 +4156,7 @@ BOOL32 WINAPI GetMenuItemRect32 (HWND32 hwnd, HMENU32 hMenu, UINT32 uItem,
 
      *rect = item->rect;
 
-     MapWindowPoints32(referenceHwnd, 0, (LPPOINT32)rect, 2);
+     MapWindowPoints(referenceHwnd, 0, (LPPOINT)rect, 2);
 
      return TRUE;
 }
@@ -4168,11 +4168,11 @@ BOOL32 WINAPI GetMenuItemRect32 (HWND32 hwnd, HMENU32 hMenu, UINT32 uItem,
 BOOL16 WINAPI GetMenuItemRect16 (HWND16 hwnd, HMENU16 hMenu, UINT16 uItem,
 				 LPRECT16 rect)
 {
-     RECT32 r32;
-     BOOL32 res;
+     RECT r32;
+     BOOL res;
 
      if (!rect) return FALSE;
-     res = GetMenuItemRect32 (hwnd, hMenu, uItem, &r32);
+     res = GetMenuItemRect (hwnd, hMenu, uItem, &r32);
      CONV_RECT32TO16 (&r32, rect);
      return res;
 }
@@ -4182,14 +4182,14 @@ BOOL16 WINAPI GetMenuItemRect16 (HWND16 hwnd, HMENU16 hMenu, UINT16 uItem,
  */
 BOOL16 WINAPI SetMenuContextHelpId16( HMENU16 hMenu, DWORD dwContextHelpId)
 {
-	return SetMenuContextHelpId32( hMenu, dwContextHelpId );
+	return SetMenuContextHelpId( hMenu, dwContextHelpId );
 }
 
 
 /**********************************************************************
  *         SetMenuContextHelpId32    (USER32.488)
  */
-BOOL32 WINAPI SetMenuContextHelpId32( HMENU32 hMenu, DWORD dwContextHelpId)
+BOOL WINAPI SetMenuContextHelpId( HMENU hMenu, DWORD dwContextHelpId)
 {
         FIXME(menu, "SetMenuContextHelpId, stub\n");
 	return 0;
@@ -4206,7 +4206,7 @@ DWORD WINAPI GetMenuContextHelpId16( HMENU16 hMenu )
 /**********************************************************************
  *         GetMenuContextHelpId32    (USER32.488)
  */
-DWORD WINAPI GetMenuContextHelpId32( HMENU32 hMenu )
+DWORD WINAPI GetMenuContextHelpId( HMENU hMenu )
 {
         FIXME(menu, "GetMenuContextHelpId, stub\n");
         return 0;
diff --git a/controls/scroll.c b/controls/scroll.c
index 4a89de12c8c..b157d621b51 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -13,18 +13,18 @@
 #include "debug.h"
 
 
-static HBITMAP32 hUpArrow = 0;
-static HBITMAP32 hDnArrow = 0;
-static HBITMAP32 hLfArrow = 0;
-static HBITMAP32 hRgArrow = 0;
-static HBITMAP32 hUpArrowD = 0;
-static HBITMAP32 hDnArrowD = 0;
-static HBITMAP32 hLfArrowD = 0;
-static HBITMAP32 hRgArrowD = 0;
-static HBITMAP32 hUpArrowI = 0;
-static HBITMAP32 hDnArrowI = 0;
-static HBITMAP32 hLfArrowI = 0;
-static HBITMAP32 hRgArrowI = 0;
+static HBITMAP hUpArrow = 0;
+static HBITMAP hDnArrow = 0;
+static HBITMAP hLfArrow = 0;
+static HBITMAP hRgArrow = 0;
+static HBITMAP hUpArrowD = 0;
+static HBITMAP hDnArrowD = 0;
+static HBITMAP hLfArrowD = 0;
+static HBITMAP hRgArrowD = 0;
+static HBITMAP hUpArrowI = 0;
+static HBITMAP hDnArrowI = 0;
+static HBITMAP hLfArrowI = 0;
+static HBITMAP hRgArrowI = 0;
 
 #define TOP_ARROW(flags,pressed) \
    (((flags)&ESB_DISABLE_UP) ? hUpArrowI : ((pressed) ? hUpArrowD:hUpArrow))
@@ -72,47 +72,47 @@ enum SCROLL_HITTEST
 #define SA_SSI_REPAINT_ARROWS	0x0008
 
  /* Thumb-tracking info */
-static HWND32 SCROLL_TrackingWin = 0;
-static INT32  SCROLL_TrackingBar = 0;
-static INT32  SCROLL_TrackingPos = 0;
-static INT32  SCROLL_TrackingVal = 0;
+static HWND SCROLL_TrackingWin = 0;
+static INT  SCROLL_TrackingBar = 0;
+static INT  SCROLL_TrackingPos = 0;
+static INT  SCROLL_TrackingVal = 0;
  /* Hit test code of the last button-down event */
 static enum SCROLL_HITTEST SCROLL_trackHitTest;
-static BOOL32 SCROLL_trackVertical;
+static BOOL SCROLL_trackVertical;
 
  /* Is the moving thumb being displayed? */
-static BOOL32 SCROLL_MovingThumb = FALSE;
+static BOOL SCROLL_MovingThumb = FALSE;
 
  /* Local functions */
-static BOOL32 SCROLL_ShowScrollBar( HWND32 hwnd, INT32 nBar, 
-				    BOOL32 fShowH, BOOL32 fShowV );
-static INT32 SCROLL_SetScrollInfo( HWND32 hwnd, INT32 nBar, 
-				   const SCROLLINFO *info, INT32 *action );
+static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, 
+				    BOOL fShowH, BOOL fShowV );
+static INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, 
+				   const SCROLLINFO *info, INT *action );
 
 /***********************************************************************
  *           SCROLL_LoadBitmaps
  */
 static void SCROLL_LoadBitmaps(void)
 {
-    hUpArrow  = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_UPARROW) );
-    hDnArrow  = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_DNARROW) );
-    hLfArrow  = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_LFARROW) );
-    hRgArrow  = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_RGARROW) );
-    hUpArrowD = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_UPARROWD) );
-    hDnArrowD = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_DNARROWD) );
-    hLfArrowD = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_LFARROWD) );
-    hRgArrowD = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_RGARROWD) );
-    hUpArrowI = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_UPARROWI) );
-    hDnArrowI = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_DNARROWI) );
-    hLfArrowI = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_LFARROWI) );
-    hRgArrowI = LoadBitmap32A( 0, MAKEINTRESOURCE32A(OBM_RGARROWI) );
+    hUpArrow  = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_UPARROW) );
+    hDnArrow  = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_DNARROW) );
+    hLfArrow  = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_LFARROW) );
+    hRgArrow  = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_RGARROW) );
+    hUpArrowD = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_UPARROWD) );
+    hDnArrowD = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_DNARROWD) );
+    hLfArrowD = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_LFARROWD) );
+    hRgArrowD = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_RGARROWD) );
+    hUpArrowI = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_UPARROWI) );
+    hDnArrowI = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_DNARROWI) );
+    hLfArrowI = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_LFARROWI) );
+    hRgArrowI = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_RGARROWI) );
 }
 
 
 /***********************************************************************
  *           SCROLL_GetPtrScrollInfo
  */
-static SCROLLBAR_INFO *SCROLL_GetPtrScrollInfo( WND* wndPtr, INT32 nBar )
+static SCROLLBAR_INFO *SCROLL_GetPtrScrollInfo( WND* wndPtr, INT nBar )
 {
     SCROLLBAR_INFO *infoPtr;
 
@@ -144,7 +144,7 @@ static SCROLLBAR_INFO *SCROLL_GetPtrScrollInfo( WND* wndPtr, INT32 nBar )
 /***********************************************************************
  *           SCROLL_GetScrollInfo
  */
-static SCROLLBAR_INFO *SCROLL_GetScrollInfo( HWND32 hwnd, INT32 nBar )
+static SCROLLBAR_INFO *SCROLL_GetScrollInfo( HWND hwnd, INT nBar )
 {
    WND *wndPtr = WIN_FindWndPtr( hwnd );
    return SCROLL_GetPtrScrollInfo( wndPtr, nBar );
@@ -162,12 +162,12 @@ static SCROLLBAR_INFO *SCROLL_GetScrollInfo( HWND32 hwnd, INT32 nBar )
  * relative to the left or to the top.
  * Return TRUE if the scrollbar is vertical, FALSE if horizontal.
  */
-static BOOL32 SCROLL_GetScrollBarRect( HWND32 hwnd, INT32 nBar, RECT32 *lprect,
-                                       INT32 *arrowSize, INT32 *thumbSize,
-                                       INT32 *thumbPos )
+static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect,
+                                       INT *arrowSize, INT *thumbSize,
+                                       INT *thumbPos )
 {
-    INT32 pixels;
-    BOOL32 vertical;
+    INT pixels;
+    BOOL vertical;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
 
     switch(nBar)
@@ -199,7 +199,7 @@ static BOOL32 SCROLL_GetScrollBarRect( HWND32 hwnd, INT32 nBar, RECT32 *lprect,
 	break;
 
       case SB_CTL:
-	GetClientRect32( hwnd, lprect );
+	GetClientRect( hwnd, lprect );
         vertical = ((wndPtr->dwStyle & SBS_VERT) != 0);
 	break;
 
@@ -240,7 +240,7 @@ static BOOL32 SCROLL_GetScrollBarRect( HWND32 hwnd, INT32 nBar, RECT32 *lprect,
         }
         else
         {
-            INT32 max = info->MaxVal - MAX( info->Page-1, 0 );
+            INT max = info->MaxVal - MAX( info->Page-1, 0 );
             if (info->MinVal >= max)
                 *thumbPos = *arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
             else
@@ -258,11 +258,11 @@ static BOOL32 SCROLL_GetScrollBarRect( HWND32 hwnd, INT32 nBar, RECT32 *lprect,
  * Compute the current scroll position based on the thumb position in pixels
  * from the top of the scroll-bar.
  */
-static UINT32 SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT32 *rect,
-                                  BOOL32 vertical, INT32 pos )
+static UINT SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT *rect,
+                                  BOOL vertical, INT pos )
 {
-    INT32 thumbSize;
-    INT32 pixels = vertical ? rect->bottom-rect->top : rect->right-rect->left;
+    INT thumbSize;
+    INT pixels = vertical ? rect->bottom-rect->top : rect->right-rect->left;
 
     if ((pixels -= 2*(SYSMETRICS_CXVSCROLL - SCROLL_ARROW_THUMB_OVERLAP)) <= 0)
         return infoPtr->MinVal;
@@ -287,9 +287,9 @@ static UINT32 SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT32 *rect,
 /***********************************************************************
  *           SCROLL_PtInRectEx
  */
-static BOOL32 SCROLL_PtInRectEx( LPRECT32 lpRect, POINT32 pt, BOOL32 vertical )
+static BOOL SCROLL_PtInRectEx( LPRECT lpRect, POINT pt, BOOL vertical )
 {
-    RECT32 rect = *lpRect;
+    RECT rect = *lpRect;
 
     if (vertical)
     {
@@ -301,13 +301,13 @@ static BOOL32 SCROLL_PtInRectEx( LPRECT32 lpRect, POINT32 pt, BOOL32 vertical )
 	rect.top -= lpRect->bottom - lpRect->top;
 	rect.bottom += lpRect->bottom - lpRect->top;
     }
-    return PtInRect32( &rect, pt );
+    return PtInRect( &rect, pt );
 }
 
 /***********************************************************************
  *           SCROLL_ClipPos
  */
-static POINT32 SCROLL_ClipPos( LPRECT32 lpRect, POINT32 pt )
+static POINT SCROLL_ClipPos( LPRECT lpRect, POINT pt )
 {
     if( pt.x < lpRect->left )
 	pt.x = lpRect->left;
@@ -330,17 +330,17 @@ static POINT32 SCROLL_ClipPos( LPRECT32 lpRect, POINT32 pt )
  *
  * Scroll-bar hit testing (don't confuse this with WM_NCHITTEST!).
  */
-static enum SCROLL_HITTEST SCROLL_HitTest( HWND32 hwnd, INT32 nBar,
-                                           POINT32 pt, BOOL32 bDragging )
+static enum SCROLL_HITTEST SCROLL_HitTest( HWND hwnd, INT nBar,
+                                           POINT pt, BOOL bDragging )
 {
-    INT32 arrowSize, thumbSize, thumbPos;
-    RECT32 rect;
+    INT arrowSize, thumbSize, thumbPos;
+    RECT rect;
 
-    BOOL32 vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
+    BOOL vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
                                            &arrowSize, &thumbSize, &thumbPos );
 
     if ( (bDragging && !SCROLL_PtInRectEx( &rect, pt, vertical )) ||
-	 (!PtInRect32( &rect, pt )) ) return SCROLL_NOWHERE;
+	 (!PtInRect( &rect, pt )) ) return SCROLL_NOWHERE;
 
     if (vertical)
     {
@@ -369,40 +369,40 @@ static enum SCROLL_HITTEST SCROLL_HitTest( HWND32 hwnd, INT32 nBar,
  *
  * Draw the scroll bar arrows.
  */
-static void SCROLL_DrawArrows( HDC32 hdc, SCROLLBAR_INFO *infoPtr,
-                               RECT32 *rect, INT32 arrowSize, BOOL32 vertical,
-                               BOOL32 top_pressed, BOOL32 bottom_pressed )
+static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr,
+                               RECT *rect, INT arrowSize, BOOL vertical,
+                               BOOL top_pressed, BOOL bottom_pressed )
 {
-    HDC32 hdcMem = CreateCompatibleDC32( hdc );
-    HBITMAP32 hbmpPrev = SelectObject32( hdcMem, vertical ?
+    HDC hdcMem = CreateCompatibleDC( hdc );
+    HBITMAP hbmpPrev = SelectObject( hdcMem, vertical ?
                                     TOP_ARROW(infoPtr->flags, top_pressed)
                                     : LEFT_ARROW(infoPtr->flags, top_pressed));
 
-    SetStretchBltMode32( hdc, STRETCH_DELETESCANS );
-    StretchBlt32( hdc, rect->left, rect->top,
+    SetStretchBltMode( hdc, STRETCH_DELETESCANS );
+    StretchBlt( hdc, rect->left, rect->top,
                   vertical ? rect->right-rect->left : arrowSize,
                   vertical ? arrowSize : rect->bottom-rect->top,
                   hdcMem, 0, 0,
                   SYSMETRICS_CXVSCROLL, SYSMETRICS_CYHSCROLL,
                   SRCCOPY );
 
-    SelectObject32( hdcMem, vertical ?
+    SelectObject( hdcMem, vertical ?
                     BOTTOM_ARROW( infoPtr->flags, bottom_pressed )
                     : RIGHT_ARROW( infoPtr->flags, bottom_pressed ) );
     if (vertical)
-        StretchBlt32( hdc, rect->left, rect->bottom - arrowSize,
+        StretchBlt( hdc, rect->left, rect->bottom - arrowSize,
                       rect->right - rect->left, arrowSize,
                       hdcMem, 0, 0,
                       SYSMETRICS_CXVSCROLL, SYSMETRICS_CYHSCROLL,
                       SRCCOPY );
     else
-        StretchBlt32( hdc, rect->right - arrowSize, rect->top,
+        StretchBlt( hdc, rect->right - arrowSize, rect->top,
                       arrowSize, rect->bottom - rect->top,
                       hdcMem, 0, 0,
                       SYSMETRICS_CXVSCROLL, SYSMETRICS_CYHSCROLL,
                       SRCCOPY );
-    SelectObject32( hdcMem, hbmpPrev );
-    DeleteDC32( hdcMem );
+    SelectObject( hdcMem, hbmpPrev );
+    DeleteDC( hdcMem );
 }
 
 
@@ -411,10 +411,10 @@ static void SCROLL_DrawArrows( HDC32 hdc, SCROLLBAR_INFO *infoPtr,
  *
  * Draw the moving thumb rectangle.
  */
-static void SCROLL_DrawMovingThumb( HDC32 hdc, RECT32 *rect, BOOL32 vertical,
-                                    INT32 arrowSize, INT32 thumbSize )
+static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical,
+                                    INT arrowSize, INT thumbSize )
 {
-    RECT32 r = *rect;
+    RECT r = *rect;
     if (vertical)
     {
         r.top += SCROLL_TrackingPos;
@@ -437,7 +437,7 @@ static void SCROLL_DrawMovingThumb( HDC32 hdc, RECT32 *rect, BOOL32 vertical,
 	                                                          - thumbSize;
         r.right = r.left + thumbSize;
     }
-    DrawFocusRect32( hdc, &r );
+    DrawFocusRect( hdc, &r );
     SCROLL_MovingThumb = !SCROLL_MovingThumb;
 }
 
@@ -447,31 +447,31 @@ static void SCROLL_DrawMovingThumb( HDC32 hdc, RECT32 *rect, BOOL32 vertical,
  *
  * Draw the scroll bar interior (everything except the arrows).
  */
-static void SCROLL_DrawInterior( HWND32 hwnd, HDC32 hdc, INT32 nBar, 
-                                 RECT32 *rect, INT32 arrowSize,
-                                 INT32 thumbSize, INT32 thumbPos,
-                                 UINT32 flags, BOOL32 vertical,
-                                 BOOL32 top_selected, BOOL32 bottom_selected )
+static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, 
+                                 RECT *rect, INT arrowSize,
+                                 INT thumbSize, INT thumbPos,
+                                 UINT flags, BOOL vertical,
+                                 BOOL top_selected, BOOL bottom_selected )
 {
-    RECT32 r;
+    RECT r;
 
       /* Select the correct brush and pen */
 
-    SelectObject32( hdc, GetSysColorPen32(COLOR_WINDOWFRAME) );
+    SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
     if ((flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH)
     {
           /* This ought to be the color of the parent window */
-        SelectObject32( hdc, GetSysColorBrush32(COLOR_WINDOW) );
+        SelectObject( hdc, GetSysColorBrush(COLOR_WINDOW) );
     }
     else
     {
         if (nBar == SB_CTL)  /* Only scrollbar controls send WM_CTLCOLOR */
         {
-            HBRUSH32 hbrush = SendMessage32A(GetParent32(hwnd),
+            HBRUSH hbrush = SendMessageA(GetParent(hwnd),
                                              WM_CTLCOLORSCROLLBAR, hdc, hwnd );
-            SelectObject32( hdc, hbrush );
+            SelectObject( hdc, hbrush );
         }
-        else SelectObject32( hdc, GetSysColorBrush32(COLOR_SCROLLBAR) );
+        else SelectObject( hdc, GetSysColorBrush(COLOR_SCROLLBAR) );
     }
 
       /* Calculate the scroll rectangle */
@@ -490,25 +490,25 @@ static void SCROLL_DrawInterior( HWND32 hwnd, HDC32 hdc, INT32 nBar,
 
       /* Draw the scroll bar frame */
 
-    Rectangle32( hdc, r.left, r.top, r.right, r.bottom );
+    Rectangle( hdc, r.left, r.top, r.right, r.bottom );
 
       /* Draw the scroll rectangles and thumb */
 
     if (!thumbPos)  /* No thumb to draw */
     {
-        PatBlt32( hdc, r.left+1, r.top+1, r.right - r.left - 2,
+        PatBlt( hdc, r.left+1, r.top+1, r.right - r.left - 2,
                   r.bottom - r.top - 2, PATCOPY );
         return;
     }
 
     if (vertical)
     {
-        PatBlt32( hdc, r.left + 1, r.top + 1,
+        PatBlt( hdc, r.left + 1, r.top + 1,
                   r.right - r.left - 2,
                   thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP) - 1,
                   top_selected ? 0x0f0000 : PATCOPY );
         r.top += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
-        PatBlt32( hdc, r.left + 1, r.top + thumbSize,
+        PatBlt( hdc, r.left + 1, r.top + thumbSize,
                   r.right - r.left - 2,
                   r.bottom - r.top - thumbSize - 1,
                   bottom_selected ? 0x0f0000 : PATCOPY );
@@ -516,12 +516,12 @@ static void SCROLL_DrawInterior( HWND32 hwnd, HDC32 hdc, INT32 nBar,
     }
     else  /* horizontal */
     {
-        PatBlt32( hdc, r.left + 1, r.top + 1,
+        PatBlt( hdc, r.left + 1, r.top + 1,
                   thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP) - 1,
                   r.bottom - r.top - 2,
                   top_selected ? 0x0f0000 : PATCOPY );
         r.left += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
-        PatBlt32( hdc, r.left + thumbSize, r.top + 1,
+        PatBlt( hdc, r.left + thumbSize, r.top + 1,
                   r.right - r.left - thumbSize - 1,
                   r.bottom - r.top - 2,
                   bottom_selected ? 0x0f0000 : PATCOPY );
@@ -530,10 +530,10 @@ static void SCROLL_DrawInterior( HWND32 hwnd, HDC32 hdc, INT32 nBar,
 
       /* Draw the thumb */
 
-    SelectObject32( hdc, GetSysColorBrush32(COLOR_BTNFACE) );
-    Rectangle32( hdc, r.left, r.top, r.right, r.bottom );
+    SelectObject( hdc, GetSysColorBrush(COLOR_BTNFACE) );
+    Rectangle( hdc, r.left, r.top, r.right, r.bottom );
     r.top++, r.left++;
-    DrawEdge32( hdc, &r, EDGE_RAISED, BF_RECT );
+    DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT );
     if (SCROLL_MovingThumb &&
         (SCROLL_TrackingWin == hwnd) &&
         (SCROLL_TrackingBar == nBar))
@@ -549,12 +549,12 @@ static void SCROLL_DrawInterior( HWND32 hwnd, HDC32 hdc, INT32 nBar,
  *
  * Redraw the whole scrollbar.
  */
-void SCROLL_DrawScrollBar( HWND32 hwnd, HDC32 hdc, INT32 nBar, 
-			   BOOL32 arrows, BOOL32 interior )
+void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, 
+			   BOOL arrows, BOOL interior )
 {
-    INT32 arrowSize, thumbSize, thumbPos;
-    RECT32 rect;
-    BOOL32 vertical;
+    INT arrowSize, thumbSize, thumbPos;
+    RECT rect;
+    BOOL vertical;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
     SCROLLBAR_INFO *infoPtr = SCROLL_GetPtrScrollInfo( wndPtr, nBar );
 
@@ -570,7 +570,7 @@ void SCROLL_DrawScrollBar( HWND32 hwnd, HDC32 hdc, INT32 nBar,
 
     if (arrows && arrowSize)
     {
-	if( vertical == SCROLL_trackVertical && GetCapture32() == hwnd )
+	if( vertical == SCROLL_trackVertical && GetCapture() == hwnd )
 	    SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical,
 			       (SCROLL_trackHitTest == SCROLL_TOP_ARROW),
 			       (SCROLL_trackHitTest == SCROLL_BOTTOM_ARROW) );
@@ -590,15 +590,15 @@ void SCROLL_DrawScrollBar( HWND32 hwnd, HDC32 hdc, INT32 nBar,
  * Repaint the scroll bar interior after a SetScrollRange() or
  * SetScrollPos() call.
  */
-static void SCROLL_RefreshScrollBar( HWND32 hwnd, INT32 nBar, 
-				     BOOL32 arrows, BOOL32 interior )
+static void SCROLL_RefreshScrollBar( HWND hwnd, INT nBar, 
+				     BOOL arrows, BOOL interior )
 {
-    HDC32 hdc = GetDCEx32( hwnd, 0,
+    HDC hdc = GetDCEx( hwnd, 0,
                            DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW) );
     if (!hdc) return;
 
     SCROLL_DrawScrollBar( hwnd, hdc, nBar, arrows, interior );
-    ReleaseDC32( hwnd, hdc );
+    ReleaseDC( hwnd, hdc );
 }
 
 
@@ -607,10 +607,10 @@ static void SCROLL_RefreshScrollBar( HWND32 hwnd, INT32 nBar,
  *
  * Handle a keyboard event (only for SB_CTL scrollbars).
  */
-static void SCROLL_HandleKbdEvent( HWND32 hwnd, WPARAM32 wParam )
+static void SCROLL_HandleKbdEvent( HWND hwnd, WPARAM wParam )
 {
     WND *wndPtr = WIN_FindWndPtr( hwnd );
-    WPARAM32 msg;
+    WPARAM msg;
     
     switch(wParam)
     {
@@ -623,7 +623,7 @@ static void SCROLL_HandleKbdEvent( HWND32 hwnd, WPARAM32 wParam )
     default:
         return;
     }
-    SendMessage32A( GetParent32(hwnd),
+    SendMessageA( GetParent(hwnd),
                     (wndPtr->dwStyle & SBS_VERT) ? WM_VSCROLL : WM_HSCROLL,
                     msg, hwnd );
 }
@@ -636,33 +636,33 @@ static void SCROLL_HandleKbdEvent( HWND32 hwnd, WPARAM32 wParam )
  * 'pt' is the location of the mouse event in client (for SB_CTL) or
  * windows coordinates.
  */
-void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
+void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
 {
       /* Previous mouse position for timer events */
-    static POINT32 prevPt;
+    static POINT prevPt;
       /* Thumb position when tracking started. */
-    static UINT32 trackThumbPos;
+    static UINT trackThumbPos;
       /* Position in the scroll-bar of the last button-down event. */
-    static INT32 lastClickPos;
+    static INT lastClickPos;
       /* Position in the scroll-bar of the last mouse event. */
-    static INT32 lastMousePos;
+    static INT lastMousePos;
 
     enum SCROLL_HITTEST hittest;
-    HWND32 hwndOwner, hwndCtl;
-    BOOL32 vertical;
-    INT32 arrowSize, thumbSize, thumbPos;
-    RECT32 rect;
-    HDC32 hdc;
+    HWND hwndOwner, hwndCtl;
+    BOOL vertical;
+    INT arrowSize, thumbSize, thumbPos;
+    RECT rect;
+    HDC hdc;
 
     SCROLLBAR_INFO *infoPtr = SCROLL_GetScrollInfo( hwnd, nBar );
     if (!infoPtr) return;
     if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) 
 		  return;
 
-    hdc = GetDCEx32( hwnd, 0, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW));
+    hdc = GetDCEx( hwnd, 0, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW));
     vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
                                         &arrowSize, &thumbSize, &thumbPos );
-    hwndOwner = (nBar == SB_CTL) ? GetParent32(hwnd) : hwnd;
+    hwndOwner = (nBar == SB_CTL) ? GetParent(hwnd) : hwnd;
     hwndCtl   = (nBar == SB_CTL) ? hwnd : 0;
 
     switch(msg)
@@ -674,8 +674,8 @@ void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
           lastMousePos  = lastClickPos;
           trackThumbPos = thumbPos;
           prevPt = pt;
-          SetCapture32( hwnd );
-          if (nBar == SB_CTL) SetFocus32( hwnd );
+          SetCapture( hwnd );
+          if (nBar == SB_CTL) SetFocus( hwnd );
           break;
 
       case WM_MOUSEMOVE:
@@ -712,14 +712,14 @@ void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
         {
             if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
             {
-                SendMessage32A( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
+                SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 SB_LINEUP, hwndCtl );
-                SetSystemTimer32( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+                SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
                                   SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-                                  (TIMERPROC32)0 );
+                                  (TIMERPROC)0 );
             }
         }
-        else KillSystemTimer32( hwnd, SCROLL_TIMER );
+        else KillSystemTimer( hwnd, SCROLL_TIMER );
         break;
 
     case SCROLL_TOP_RECT:
@@ -730,14 +730,14 @@ void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
         {
             if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
             {
-                SendMessage32A( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
+                SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 SB_PAGEUP, hwndCtl );
-                SetSystemTimer32( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+                SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
                                   SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-                                  (TIMERPROC32)0 );
+                                  (TIMERPROC)0 );
             }
         }
-        else KillSystemTimer32( hwnd, SCROLL_TIMER );
+        else KillSystemTimer( hwnd, SCROLL_TIMER );
         break;
 
     case SCROLL_THUMB:
@@ -758,7 +758,7 @@ void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
         }
         else  /* WM_MOUSEMOVE */
         {
-            UINT32 pos;
+            UINT pos;
 
             if (!SCROLL_PtInRectEx( &rect, pt, vertical )) pos = lastClickPos;
             else
@@ -775,7 +775,7 @@ void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
                 SCROLL_TrackingVal = SCROLL_GetThumbVal( infoPtr, &rect,
                                                          vertical,
                                                          SCROLL_TrackingPos );
-                SendMessage32A( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
+                SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal),
                                 hwndCtl );
                 SCROLL_DrawMovingThumb( hdc, &rect, vertical,
@@ -792,14 +792,14 @@ void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
         {
             if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
             {
-                SendMessage32A( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
+                SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 SB_PAGEDOWN, hwndCtl );
-                SetSystemTimer32( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+                SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
                                   SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-                                  (TIMERPROC32)0 );
+                                  (TIMERPROC)0 );
             }
         }
-        else KillSystemTimer32( hwnd, SCROLL_TIMER );
+        else KillSystemTimer( hwnd, SCROLL_TIMER );
         break;
         
     case SCROLL_BOTTOM_ARROW:
@@ -809,14 +809,14 @@ void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
         {
             if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
             {
-                SendMessage32A( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
+                SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 SB_LINEDOWN, hwndCtl );
-                SetSystemTimer32( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+                SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
                                   SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-                                  (TIMERPROC32)0 );
+                                  (TIMERPROC)0 );
             }
         }
-        else KillSystemTimer32( hwnd, SCROLL_TIMER );
+        else KillSystemTimer( hwnd, SCROLL_TIMER );
         break;
     }
 
@@ -827,31 +827,31 @@ void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar, UINT32 msg, POINT32 pt)
 
         if (hittest == SCROLL_THUMB)
         {
-            UINT32 val = SCROLL_GetThumbVal( infoPtr, &rect, vertical,
+            UINT val = SCROLL_GetThumbVal( infoPtr, &rect, vertical,
                                  trackThumbPos + lastMousePos - lastClickPos );
-            SendMessage32A( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
+            SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                             MAKEWPARAM( SB_THUMBPOSITION, val ), hwndCtl );
         }
         else
-            SendMessage32A( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
+            SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                             SB_ENDSCROLL, hwndCtl );
     }
 
-    ReleaseDC32( hwnd, hdc );
+    ReleaseDC( hwnd, hdc );
 }
 
 
 /***********************************************************************
  *           ScrollBarWndProc
  */
-LRESULT WINAPI ScrollBarWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
+LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam,
                                  LPARAM lParam )
 {
     switch(message)
     {
     case WM_CREATE:
         {
-	    CREATESTRUCT32A *lpCreat = (CREATESTRUCT32A *)lParam;
+	    CREATESTRUCTA *lpCreat = (CREATESTRUCTA *)lParam;
             if (lpCreat->style & SBS_SIZEBOX)
             {
                 FIXME(scroll, "Unimplemented style SBS_SIZEBOX.\n" );
@@ -861,10 +861,10 @@ LRESULT WINAPI ScrollBarWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 	    if (lpCreat->style & SBS_VERT)
             {
                 if (lpCreat->style & SBS_LEFTALIGN)
-                    MoveWindow32( hwnd, lpCreat->x, lpCreat->y,
+                    MoveWindow( hwnd, lpCreat->x, lpCreat->y,
                                   SYSMETRICS_CXVSCROLL+1, lpCreat->cy, FALSE );
                 else if (lpCreat->style & SBS_RIGHTALIGN)
-                    MoveWindow32( hwnd, 
+                    MoveWindow( hwnd, 
                                   lpCreat->x+lpCreat->cx-SYSMETRICS_CXVSCROLL-1,
                                   lpCreat->y,
                                   SYSMETRICS_CXVSCROLL+1, lpCreat->cy, FALSE );
@@ -872,10 +872,10 @@ LRESULT WINAPI ScrollBarWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
             else  /* SBS_HORZ */
             {
                 if (lpCreat->style & SBS_TOPALIGN)
-                    MoveWindow32( hwnd, lpCreat->x, lpCreat->y,
+                    MoveWindow( hwnd, lpCreat->x, lpCreat->y,
                                   lpCreat->cx, SYSMETRICS_CYHSCROLL+1, FALSE );
                 else if (lpCreat->style & SBS_BOTTOMALIGN)
-                    MoveWindow32( hwnd, 
+                    MoveWindow( hwnd, 
                                   lpCreat->x,
                                   lpCreat->y+lpCreat->cy-SYSMETRICS_CYHSCROLL-1,
                                   lpCreat->cx, SYSMETRICS_CYHSCROLL+1, FALSE );
@@ -890,7 +890,7 @@ LRESULT WINAPI ScrollBarWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
     case WM_MOUSEMOVE:
     case WM_SYSTIMER:
         {
-            POINT32 pt;
+            POINT pt;
             CONV_POINT16TO32( (POINT16 *)&lParam, &pt );
             SCROLL_HandleScrollEvent( hwnd, SB_CTL, message, pt );
         }
@@ -908,51 +908,51 @@ LRESULT WINAPI ScrollBarWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 
     case WM_PAINT:
         {
-            PAINTSTRUCT32 ps;
-            HDC32 hdc = BeginPaint32( hwnd, &ps );
+            PAINTSTRUCT ps;
+            HDC hdc = BeginPaint( hwnd, &ps );
             SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, TRUE, TRUE );
-            EndPaint32( hwnd, &ps );
+            EndPaint( hwnd, &ps );
         }
         break;
 
     case SBM_SETPOS16:
-    case SBM_SETPOS32:
-        return SetScrollPos32( hwnd, SB_CTL, wParam, (BOOL32)lParam );
+    case SBM_SETPOS:
+        return SetScrollPos( hwnd, SB_CTL, wParam, (BOOL)lParam );
 
     case SBM_GETPOS16:
-    case SBM_GETPOS32:
-        return GetScrollPos32( hwnd, SB_CTL );
+    case SBM_GETPOS:
+        return GetScrollPos( hwnd, SB_CTL );
 
     case SBM_SETRANGE16:
-        SetScrollRange32( hwnd, SB_CTL, LOWORD(lParam), HIWORD(lParam),
+        SetScrollRange( hwnd, SB_CTL, LOWORD(lParam), HIWORD(lParam),
                           wParam  /* FIXME: Is this correct? */ );
         return 0;
 
-    case SBM_SETRANGE32:
-        SetScrollRange32( hwnd, SB_CTL, wParam, lParam, FALSE );
+    case SBM_SETRANGE:
+        SetScrollRange( hwnd, SB_CTL, wParam, lParam, FALSE );
         return 0;  /* FIXME: return previous position */
 
     case SBM_GETRANGE16:
         FIXME(scroll, "don't know how to handle SBM_GETRANGE16 (wp=%04x,lp=%08lx)\n", wParam, lParam );
         return 0;
 
-    case SBM_GETRANGE32:
-        GetScrollRange32( hwnd, SB_CTL, (LPINT32)wParam, (LPINT32)lParam );
+    case SBM_GETRANGE:
+        GetScrollRange( hwnd, SB_CTL, (LPINT)wParam, (LPINT)lParam );
         return 0;
 
     case SBM_ENABLE_ARROWS16:
-    case SBM_ENABLE_ARROWS32:
-        return EnableScrollBar32( hwnd, SB_CTL, wParam );
+    case SBM_ENABLE_ARROWS:
+        return EnableScrollBar( hwnd, SB_CTL, wParam );
 
-    case SBM_SETRANGEREDRAW32:
-        SetScrollRange32( hwnd, SB_CTL, wParam, lParam, TRUE );
+    case SBM_SETRANGEREDRAW:
+        SetScrollRange( hwnd, SB_CTL, wParam, lParam, TRUE );
         return 0;  /* FIXME: return previous position */
         
-    case SBM_SETSCROLLINFO32:
-        return SetScrollInfo32( hwnd, SB_CTL, (SCROLLINFO *)lParam, wParam );
+    case SBM_SETSCROLLINFO:
+        return SetScrollInfo( hwnd, SB_CTL, (SCROLLINFO *)lParam, wParam );
 
-    case SBM_GETSCROLLINFO32:
-        return GetScrollInfo32( hwnd, SB_CTL, (SCROLLINFO *)lParam );
+    case SBM_GETSCROLLINFO:
+        return GetScrollInfo( hwnd, SB_CTL, (SCROLLINFO *)lParam );
 
     case 0x00e5:
     case 0x00e7:
@@ -970,7 +970,7 @@ LRESULT WINAPI ScrollBarWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
         if (message >= WM_USER)
             WARN(scroll, "unknown msg %04x wp=%04x lp=%08lx\n",
 			 message, wParam, lParam );
-        return DefWindowProc32A( hwnd, message, wParam, lParam );
+        return DefWindowProcA( hwnd, message, wParam, lParam );
     }
     return 0;
 }
@@ -982,7 +982,7 @@ LRESULT WINAPI ScrollBarWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 INT16 WINAPI SetScrollInfo16( HWND16 hwnd, INT16 nBar, const SCROLLINFO *info,
                               BOOL16 bRedraw )
 {
-    return (INT16)SetScrollInfo32( hwnd, nBar, info, bRedraw );
+    return (INT16)SetScrollInfo( hwnd, nBar, info, bRedraw );
 }
 
 
@@ -1000,14 +1000,14 @@ INT16 WINAPI SetScrollInfo16( HWND16 hwnd, INT16 nBar, const SCROLLINFO *info,
  *  (corresponding to the 76 different positions of the window on
  *  the text), and info->nPage=25.
  */
-INT32 WINAPI SetScrollInfo32( 
-HWND32 hwnd /* [I] Handle of window whose scrollbar will be affected */, 
-INT32 nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */, 
+INT WINAPI SetScrollInfo( 
+HWND hwnd /* [I] Handle of window whose scrollbar will be affected */, 
+INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */, 
 const SCROLLINFO *info /* [I] Specifies what to change and new values */,
-BOOL32 bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
+BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
 {
-    INT32 action;
-    INT32 retVal = SCROLL_SetScrollInfo( hwnd, nBar, info, &action );
+    INT action;
+    INT retVal = SCROLL_SetScrollInfo( hwnd, nBar, info, &action );
 
     if( action & SA_SSI_HIDE )
 	SCROLL_ShowScrollBar( hwnd, nBar, FALSE, FALSE );
@@ -1025,14 +1025,14 @@ BOOL32 bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
     return retVal;
 }
 
-INT32 SCROLL_SetScrollInfo( HWND32 hwnd, INT32 nBar, 
-			    const SCROLLINFO *info, INT32 *action  )
+INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, 
+			    const SCROLLINFO *info, INT *action  )
 {
     /* Update the scrollbar state and set action flags according to 
      * what has to be done graphics wise. */
 
     SCROLLBAR_INFO *infoPtr;
-    UINT32 new_flags;
+    UINT new_flags;
 
     dbg_decl_str(scroll, 256);
 
@@ -1075,7 +1075,7 @@ INT32 SCROLL_SetScrollInfo( HWND32 hwnd, INT32 nBar,
 
         /* Invalid range -> range is set to (0,0) */
         if ((info->nMin > info->nMax) ||
-            ((UINT32)(info->nMax - info->nMin) >= 0x80000000))
+            ((UINT)(info->nMax - info->nMin) >= 0x80000000))
         {
             infoPtr->MinVal = 0;
             infoPtr->MaxVal = 0;
@@ -1157,7 +1157,7 @@ done:
  */
 BOOL16 WINAPI GetScrollInfo16( HWND16 hwnd, INT16 nBar, LPSCROLLINFO info )
 {
-    return GetScrollInfo32( hwnd, nBar, info );
+    return GetScrollInfo( hwnd, nBar, info );
 }
 
 
@@ -1168,9 +1168,9 @@ BOOL16 WINAPI GetScrollInfo16( HWND16 hwnd, INT16 nBar, LPSCROLLINFO info )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI GetScrollInfo32( 
-  HWND32 hwnd /* [I] Handle of window */ , 
-  INT32 nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */, 
+BOOL WINAPI GetScrollInfo( 
+  HWND hwnd /* [I] Handle of window */ , 
+  INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */, 
   LPSCROLLINFO info /* [IO] (info.fMask [I] specifies which values are to retrieve) */)
 {
     SCROLLBAR_INFO *infoPtr;
@@ -1199,7 +1199,7 @@ BOOL32 WINAPI GetScrollInfo32(
 INT16 WINAPI SetScrollPos16( HWND16 hwnd, INT16 nBar, INT16 nPos,
                              BOOL16 bRedraw )
 {
-    return (INT16)SetScrollPos32( hwnd, nBar, nPos, bRedraw );
+    return (INT16)SetScrollPos( hwnd, nBar, nPos, bRedraw );
 }
 
 
@@ -1214,22 +1214,22 @@ INT16 WINAPI SetScrollPos16( HWND16 hwnd, INT16 nBar, INT16 nPos,
  *    Note the ambiguity when 0 is returned.  Use GetLastError
  *    to make sure there was an error (and to know which one).
  */
-INT32 WINAPI SetScrollPos32( 
-HWND32 hwnd /* [I] Handle of window whose scrollbar will be affected */,
-INT32 nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */,
-INT32 nPos /* [I] New value */,
-BOOL32 bRedraw /* [I] Should scrollbar be redrawn afterwards ? */ )
+INT WINAPI SetScrollPos( 
+HWND hwnd /* [I] Handle of window whose scrollbar will be affected */,
+INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */,
+INT nPos /* [I] New value */,
+BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */ )
 {
     SCROLLINFO info;
     SCROLLBAR_INFO *infoPtr;
-    INT32 oldPos;
+    INT oldPos;
 
     if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return 0;
     oldPos      = infoPtr->CurVal;
     info.cbSize = sizeof(info);
     info.nPos   = nPos;
     info.fMask  = SIF_POS;
-    SetScrollInfo32( hwnd, nBar, &info, bRedraw );
+    SetScrollInfo( hwnd, nBar, &info, bRedraw );
     return oldPos;
 }
 
@@ -1239,7 +1239,7 @@ BOOL32 bRedraw /* [I] Should scrollbar be redrawn afterwards ? */ )
  */
 INT16 WINAPI GetScrollPos16( HWND16 hwnd, INT16 nBar )
 {
-    return (INT16)GetScrollPos32( hwnd, nBar );
+    return (INT16)GetScrollPos( hwnd, nBar );
 }
 
 
@@ -1254,9 +1254,9 @@ INT16 WINAPI GetScrollPos16( HWND16 hwnd, INT16 nBar )
  *    Note the ambiguity when 0 is returned.  Use GetLastError
  *    to make sure there was an error (and to know which one).
  */
-INT32 WINAPI GetScrollPos32( 
-HWND32 hwnd, /* [I] Handle of window */
-INT32 nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */)
+INT WINAPI GetScrollPos( 
+HWND hwnd, /* [I] Handle of window */
+INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */)
 {
     SCROLLBAR_INFO *infoPtr;
 
@@ -1272,8 +1272,8 @@ void WINAPI SetScrollRange16( HWND16 hwnd, INT16 nBar,
                               INT16 MinVal, INT16 MaxVal, BOOL16 bRedraw )
 {
     /* Invalid range -> range is set to (0,0) */
-    if ((INT32)MaxVal - (INT32)MinVal > 0x7fff) MinVal = MaxVal = 0;
-    SetScrollRange32( hwnd, nBar, MinVal, MaxVal, bRedraw );
+    if ((INT)MaxVal - (INT)MinVal > 0x7fff) MinVal = MaxVal = 0;
+    SetScrollRange( hwnd, nBar, MinVal, MaxVal, bRedraw );
 }
 
 
@@ -1282,12 +1282,12 @@ void WINAPI SetScrollRange16( HWND16 hwnd, INT16 nBar,
  *
  * RETURNS STD
  */
-BOOL32 WINAPI SetScrollRange32( 
-HWND32 hwnd, /* [I] Handle of window whose scrollbar will be affected */
-INT32 nBar, /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */
-INT32 MinVal, /* [I] New minimum value */
-INT32 MaxVal, /* [I] New maximum value */
-BOOL32 bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
+BOOL WINAPI SetScrollRange( 
+HWND hwnd, /* [I] Handle of window whose scrollbar will be affected */
+INT nBar, /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */
+INT MinVal, /* [I] New minimum value */
+INT MaxVal, /* [I] New maximum value */
+BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
 {
     SCROLLINFO info;
 
@@ -1295,7 +1295,7 @@ BOOL32 bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
     info.nMin   = MinVal;
     info.nMax   = MaxVal;
     info.fMask  = SIF_RANGE;
-    SetScrollInfo32( hwnd, nBar, &info, bRedraw );
+    SetScrollInfo( hwnd, nBar, &info, bRedraw );
     return TRUE;
 }
 
@@ -1305,10 +1305,10 @@ BOOL32 bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
  *
  * Updates both scrollbars at the same time. Used by MDI CalcChildScroll().
  */
-INT32 SCROLL_SetNCSbState(WND* wndPtr, int vMin, int vMax, int vPos,
+INT SCROLL_SetNCSbState(WND* wndPtr, int vMin, int vMax, int vPos,
 				       int hMin, int hMax, int hPos)
 {
-    INT32 vA, hA;
+    INT vA, hA;
     SCROLLINFO vInfo, hInfo;
  
     vInfo.cbSize = hInfo.cbSize = sizeof(SCROLLINFO);
@@ -1340,8 +1340,8 @@ INT32 SCROLL_SetNCSbState(WND* wndPtr, int vMin, int vMax, int vPos,
 BOOL16 WINAPI GetScrollRange16( HWND16 hwnd, INT16 nBar,
                                 LPINT16 lpMin, LPINT16 lpMax)
 {
-    INT32 min, max;
-    BOOL16 ret = GetScrollRange32( hwnd, nBar, &min, &max );
+    INT min, max;
+    BOOL16 ret = GetScrollRange( hwnd, nBar, &min, &max );
     if (lpMin) *lpMin = min;
     if (lpMax) *lpMax = max;
     return ret;
@@ -1353,11 +1353,11 @@ BOOL16 WINAPI GetScrollRange16( HWND16 hwnd, INT16 nBar,
  *
  * RETURNS STD
  */
-BOOL32 WINAPI GetScrollRange32( 
-HWND32 hwnd, /* [I] Handle of window */
-INT32 nBar, /* [I] One of SB_HORZ, SB_VERT, or SB_CTL  */
-LPINT32 lpMin, /* [O] Where to store minimum value */
-LPINT32 lpMax /* [O] Where to store maximum value */)
+BOOL WINAPI GetScrollRange( 
+HWND hwnd, /* [I] Handle of window */
+INT nBar, /* [I] One of SB_HORZ, SB_VERT, or SB_CTL  */
+LPINT lpMin, /* [O] Where to store minimum value */
+LPINT lpMax /* [O] Where to store maximum value */)
 {
     SCROLLBAR_INFO *infoPtr;
 
@@ -1379,8 +1379,8 @@ LPINT32 lpMax /* [O] Where to store maximum value */)
  * Back-end for ShowScrollBar(). Returns FALSE if no action was taken.
  * NOTE: fShowV/fShowH must be zero when nBar is SB_HORZ/SB_VERT.
  */
-BOOL32 SCROLL_ShowScrollBar( HWND32 hwnd, INT32 nBar, 
-			     BOOL32 fShowH, BOOL32 fShowV )
+BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, 
+			     BOOL fShowH, BOOL fShowV )
 {
     WND *wndPtr = WIN_FindWndPtr( hwnd );
 
@@ -1391,7 +1391,7 @@ BOOL32 SCROLL_ShowScrollBar( HWND32 hwnd, INT32 nBar,
     switch(nBar)
     {
     case SB_CTL:
-        ShowWindow32( hwnd, fShowH ? SW_SHOW : SW_HIDE );
+        ShowWindow( hwnd, fShowH ? SW_SHOW : SW_HIDE );
         return TRUE;
 
     case SB_BOTH:
@@ -1428,7 +1428,7 @@ BOOL32 SCROLL_ShowScrollBar( HWND32 hwnd, INT32 nBar,
 
     if( fShowH || fShowV ) /* frame has been changed, let the window redraw itself */
     {
-	SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE
+	SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE
                     | SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );
         return TRUE;
     }
@@ -1452,10 +1452,10 @@ void WINAPI ShowScrollBar16( HWND16 hwnd, INT16 nBar, BOOL16 fShow )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI ShowScrollBar32(
-HWND32 hwnd, /* [I] Handle of window whose scrollbar(s) will be affected   */
-INT32 nBar, /* [I] One of SB_HORZ, SB_VERT, SB_BOTH or SB_CTL */
-BOOL32 fShow /* [I] TRUE = show, FALSE = hide  */)
+BOOL WINAPI ShowScrollBar(
+HWND hwnd, /* [I] Handle of window whose scrollbar(s) will be affected   */
+INT nBar, /* [I] One of SB_HORZ, SB_VERT, SB_BOTH or SB_CTL */
+BOOL fShow /* [I] TRUE = show, FALSE = hide  */)
 {
     SCROLL_ShowScrollBar( hwnd, nBar, (nBar == SB_VERT) ? 0 : fShow,
                                       (nBar == SB_HORZ) ? 0 : fShow );
@@ -1468,16 +1468,16 @@ BOOL32 fShow /* [I] TRUE = show, FALSE = hide  */)
  */
 BOOL16 WINAPI EnableScrollBar16( HWND16 hwnd, INT16 nBar, UINT16 flags )
 {
-    return EnableScrollBar32( hwnd, nBar, flags );
+    return EnableScrollBar( hwnd, nBar, flags );
 }
 
 
 /*************************************************************************
  *           EnableScrollBar32   (USER32.171)
  */
-BOOL32 WINAPI EnableScrollBar32( HWND32 hwnd, INT32 nBar, UINT32 flags )
+BOOL WINAPI EnableScrollBar( HWND hwnd, INT nBar, UINT flags )
 {
-    BOOL32 bFineWithMe;
+    BOOL bFineWithMe;
     SCROLLBAR_INFO *infoPtr;
 
     TRACE(scroll, "%04x %d %d\n", hwnd, nBar, flags );
diff --git a/controls/static.c b/controls/static.c
index 82812d3afdf..c7c21d0ae28 100644
--- a/controls/static.c
+++ b/controls/static.c
@@ -14,16 +14,16 @@
 #include "debug.h"
 #include "tweak.h"
 
-static void STATIC_PaintTextfn( WND *wndPtr, HDC32 hdc );
-static void STATIC_PaintRectfn( WND *wndPtr, HDC32 hdc );
-static void STATIC_PaintIconfn( WND *wndPtr, HDC32 hdc );
-static void STATIC_PaintBitmapfn( WND *wndPtr, HDC32 hdc );
-static void STATIC_PaintEtchedfn( WND *wndPtr, HDC32 hdc );
+static void STATIC_PaintTextfn( WND *wndPtr, HDC hdc );
+static void STATIC_PaintRectfn( WND *wndPtr, HDC hdc );
+static void STATIC_PaintIconfn( WND *wndPtr, HDC hdc );
+static void STATIC_PaintBitmapfn( WND *wndPtr, HDC hdc );
+static void STATIC_PaintEtchedfn( WND *wndPtr, HDC hdc );
 
 static COLORREF color_windowframe, color_background, color_window;
 
 
-typedef void (*pfPaint)( WND *, HDC32 );
+typedef void (*pfPaint)( WND *, HDC );
 
 static pfPaint staticPaintFunc[SS_TYPEMASK+1] =
 {
@@ -69,7 +69,7 @@ static HICON16 STATIC_SetIcon( WND *wndPtr, HICON16 hicon )
     infoPtr->hIcon = hicon;
     if (hicon)
     {
-        SetWindowPos32( wndPtr->hwndSelf, 0, 0, 0, info->nWidth, info->nHeight,
+        SetWindowPos( wndPtr->hwndSelf, 0, 0, 0, info->nWidth, info->nHeight,
                         SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
         GlobalUnlock16( hicon );
     }
@@ -96,7 +96,7 @@ static HICON16 STATIC_SetBitmap( WND *wndPtr, HICON16 hicon )
     infoPtr->hIcon = hicon;
     if (hicon)
     {
-        SetWindowPos32( wndPtr->hwndSelf, 0, 0, 0, info->bitmap.bmWidth, info->bitmap.bmHeight,
+        SetWindowPos( wndPtr->hwndSelf, 0, 0, 0, info->bitmap.bmWidth, info->bitmap.bmHeight,
                         SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
     }
     GDI_HEAP_UNLOCK( hicon );
@@ -120,7 +120,7 @@ static HICON16 STATIC_LoadIcon( WND *wndPtr, LPCSTR name )
 	    hicon = LoadIcon16( wndPtr->hInstance, SEGPTR_GET(segname) );
 	    SEGPTR_FREE(segname);
 	} else
-	    hicon = LoadIcon32A( wndPtr->hInstance, name );
+	    hicon = LoadIconA( wndPtr->hInstance, name );
     } else {
         LPSTR segname = SEGPTR_STRDUP(name);
 
@@ -130,7 +130,7 @@ static HICON16 STATIC_LoadIcon( WND *wndPtr, LPCSTR name )
         SEGPTR_FREE(segname);
     }
     if (!hicon)
-	hicon = LoadIcon32A( 0, name );
+	hicon = LoadIconA( 0, name );
     return hicon;
 }
 
@@ -145,16 +145,16 @@ static HBITMAP16 STATIC_LoadBitmap( WND *wndPtr, LPCSTR name )
 
     if (wndPtr->flags & WIN_ISWIN32)
     {
-        hbitmap = LoadBitmap32A( wndPtr->hInstance, name );
+        hbitmap = LoadBitmapA( wndPtr->hInstance, name );
         if (!hbitmap)  /* Try OEM icon (FIXME: is this right?) */
-            hbitmap = LoadBitmap32A( 0, name );
+            hbitmap = LoadBitmapA( 0, name );
     }
     else
     {
         LPSTR segname = SEGPTR_STRDUP(name);
         hbitmap = LoadBitmap16( wndPtr->hInstance, SEGPTR_GET(segname) );
         if (!hbitmap)  /* Try OEM icon (FIXME: is this right?) */
-            hbitmap = LoadBitmap32A( 0, segname );
+            hbitmap = LoadBitmapA( 0, segname );
         SEGPTR_FREE(segname);
     }
     return hbitmap;
@@ -164,7 +164,7 @@ static HBITMAP16 STATIC_LoadBitmap( WND *wndPtr, LPCSTR name )
 /***********************************************************************
  *           StaticWndProc
  */
-LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
+LRESULT WINAPI StaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam,
                               LPARAM lParam )
 {
     LRESULT lResult = 0;
@@ -175,7 +175,7 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
     switch (uMsg)
     {
     case WM_NCCREATE: {
-        CREATESTRUCT32A *cs = (CREATESTRUCT32A *)lParam;
+        CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam;
 
 	if ((TWEAK_WineLook > WIN31_LOOK) && (wndPtr->dwStyle & SS_SUNKEN))
 	    wndPtr->dwExStyle |= WS_EX_STATICEDGE;
@@ -204,7 +204,7 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
 		);
 		return 1;
 	}
-        return DefWindowProc32A( hWnd, uMsg, wParam, lParam );
+        return DefWindowProcA( hWnd, uMsg, wParam, lParam );
     }
     case WM_CREATE:
         if (style < 0L || style > SS_TYPEMASK)
@@ -214,9 +214,9 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
             break;
         }
         /* initialise colours */
-        color_windowframe  = GetSysColor32(COLOR_WINDOWFRAME);
-        color_background   = GetSysColor32(COLOR_BACKGROUND);
-        color_window       = GetSysColor32(COLOR_WINDOW);
+        color_windowframe  = GetSysColor(COLOR_WINDOWFRAME);
+        color_background   = GetSysColor(COLOR_BACKGROUND);
+        color_window       = GetSysColor(COLOR_WINDOW);
         break;
 
     case WM_NCDESTROY:
@@ -230,29 +230,29 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
  * GlobalFree16 the handle.
  */
         } else {
-            lResult = DefWindowProc32A( hWnd, uMsg, wParam, lParam );
+            lResult = DefWindowProcA( hWnd, uMsg, wParam, lParam );
 	}
         break;
 
     case WM_PAINT:
         {
-            PAINTSTRUCT32 ps;
-            BeginPaint32( hWnd, &ps );
+            PAINTSTRUCT ps;
+            BeginPaint( hWnd, &ps );
             if (staticPaintFunc[style])
                 (staticPaintFunc[style])( wndPtr, ps.hdc );
-            EndPaint32( hWnd, &ps );
+            EndPaint( hWnd, &ps );
         }
         break;
 
     case WM_ENABLE:
-        InvalidateRect32( hWnd, NULL, FALSE );
+        InvalidateRect( hWnd, NULL, FALSE );
         break;
 
     case WM_SYSCOLORCHANGE:
-        color_windowframe  = GetSysColor32(COLOR_WINDOWFRAME);
-        color_background   = GetSysColor32(COLOR_BACKGROUND);
-        color_window       = GetSysColor32(COLOR_WINDOW);
-        InvalidateRect32( hWnd, NULL, TRUE );
+        color_windowframe  = GetSysColor(COLOR_WINDOWFRAME);
+        color_background   = GetSysColor(COLOR_BACKGROUND);
+        color_window       = GetSysColor(COLOR_WINDOW);
+        InvalidateRect( hWnd, NULL, TRUE );
         break;
 
     case WM_SETTEXT:
@@ -263,8 +263,8 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
             STATIC_SetBitmap(wndPtr,STATIC_LoadBitmap(wndPtr,(LPCSTR)lParam ));
 	else
             DEFWND_SetText( wndPtr, (LPCSTR)lParam );
-        InvalidateRect32( hWnd, NULL, FALSE );
-        UpdateWindow32( hWnd );
+        InvalidateRect( hWnd, NULL, FALSE );
+        UpdateWindow( hWnd );
         break;
 
     case WM_SETFONT:
@@ -273,8 +273,8 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
         infoPtr->hFont = (HFONT16)wParam;
         if (LOWORD(lParam))
         {
-            InvalidateRect32( hWnd, NULL, FALSE );
-            UpdateWindow32( hWnd );
+            InvalidateRect( hWnd, NULL, FALSE );
+            UpdateWindow( hWnd );
         }
         break;
 
@@ -289,25 +289,25 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
 
     case STM_GETIMAGE:
     case STM_GETICON16:
-    case STM_GETICON32:
+    case STM_GETICON:
         return infoPtr->hIcon;
 
     case STM_SETIMAGE:
     	/* FIXME: handle wParam */
-        lResult = STATIC_SetBitmap( wndPtr, (HBITMAP32)lParam );
-        InvalidateRect32( hWnd, NULL, FALSE );
-        UpdateWindow32( hWnd );
+        lResult = STATIC_SetBitmap( wndPtr, (HBITMAP)lParam );
+        InvalidateRect( hWnd, NULL, FALSE );
+        UpdateWindow( hWnd );
 	break;
 
     case STM_SETICON16:
-    case STM_SETICON32:
+    case STM_SETICON:
         lResult = STATIC_SetIcon( wndPtr, (HICON16)wParam );
-        InvalidateRect32( hWnd, NULL, FALSE );
-        UpdateWindow32( hWnd );
+        InvalidateRect( hWnd, NULL, FALSE );
+        UpdateWindow( hWnd );
         break;
 
     default:
-        lResult = DefWindowProc32A(hWnd, uMsg, wParam, lParam);
+        lResult = DefWindowProcA(hWnd, uMsg, wParam, lParam);
         break;
     }
     
@@ -315,16 +315,16 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
 }
 
 
-static void STATIC_PaintTextfn( WND *wndPtr, HDC32 hdc )
+static void STATIC_PaintTextfn( WND *wndPtr, HDC hdc )
 {
-    RECT32 rc;
-    HBRUSH32 hBrush;
+    RECT rc;
+    HBRUSH hBrush;
     WORD wFormat;
 
     LONG style = wndPtr->dwStyle;
     STATICINFO *infoPtr = (STATICINFO *)wndPtr->wExtra;
 
-    GetClientRect32( wndPtr->hwndSelf, &rc);
+    GetClientRect( wndPtr->hwndSelf, &rc);
 
     switch (style & SS_TYPEMASK)
     {
@@ -355,133 +355,133 @@ static void STATIC_PaintTextfn( WND *wndPtr, HDC32 hdc )
     if (style & SS_NOPREFIX)
 	wFormat |= DT_NOPREFIX;
 
-    if (infoPtr->hFont) SelectObject32( hdc, infoPtr->hFont );
-    hBrush = SendMessage32A( GetParent32(wndPtr->hwndSelf), WM_CTLCOLORSTATIC,
+    if (infoPtr->hFont) SelectObject( hdc, infoPtr->hFont );
+    hBrush = SendMessageA( GetParent(wndPtr->hwndSelf), WM_CTLCOLORSTATIC,
                              hdc, wndPtr->hwndSelf );
-    if (!hBrush) hBrush = GetStockObject32(WHITE_BRUSH);
-    FillRect32( hdc, &rc, hBrush );
-    if (wndPtr->text) DrawText32A( hdc, wndPtr->text, -1, &rc, wFormat );
+    if (!hBrush) hBrush = GetStockObject(WHITE_BRUSH);
+    FillRect( hdc, &rc, hBrush );
+    if (wndPtr->text) DrawTextA( hdc, wndPtr->text, -1, &rc, wFormat );
 }
 
-static void STATIC_PaintRectfn( WND *wndPtr, HDC32 hdc )
+static void STATIC_PaintRectfn( WND *wndPtr, HDC hdc )
 {
-    RECT32 rc;
-    HBRUSH32 hBrush;
+    RECT rc;
+    HBRUSH hBrush;
 
-    GetClientRect32( wndPtr->hwndSelf, &rc);
+    GetClientRect( wndPtr->hwndSelf, &rc);
     
     switch (wndPtr->dwStyle & SS_TYPEMASK)
     {
     case SS_BLACKRECT:
-	hBrush = CreateSolidBrush32(color_windowframe);
-        FillRect32( hdc, &rc, hBrush );
+	hBrush = CreateSolidBrush(color_windowframe);
+        FillRect( hdc, &rc, hBrush );
 	break;
     case SS_GRAYRECT:
-	hBrush = CreateSolidBrush32(color_background);
-        FillRect32( hdc, &rc, hBrush );
+	hBrush = CreateSolidBrush(color_background);
+        FillRect( hdc, &rc, hBrush );
 	break;
     case SS_WHITERECT:
-	hBrush = CreateSolidBrush32(color_window);
-        FillRect32( hdc, &rc, hBrush );
+	hBrush = CreateSolidBrush(color_window);
+        FillRect( hdc, &rc, hBrush );
 	break;
     case SS_BLACKFRAME:
-	hBrush = CreateSolidBrush32(color_windowframe);
-        FrameRect32( hdc, &rc, hBrush );
+	hBrush = CreateSolidBrush(color_windowframe);
+        FrameRect( hdc, &rc, hBrush );
 	break;
     case SS_GRAYFRAME:
-	hBrush = CreateSolidBrush32(color_background);
-        FrameRect32( hdc, &rc, hBrush );
+	hBrush = CreateSolidBrush(color_background);
+        FrameRect( hdc, &rc, hBrush );
 	break;
     case SS_WHITEFRAME:
-	hBrush = CreateSolidBrush32(color_window);
-        FrameRect32( hdc, &rc, hBrush );
+	hBrush = CreateSolidBrush(color_window);
+        FrameRect( hdc, &rc, hBrush );
 	break;
     default:
         return;
     }
-    DeleteObject32( hBrush );
+    DeleteObject( hBrush );
 }
 
 
-static void STATIC_PaintIconfn( WND *wndPtr, HDC32 hdc )
+static void STATIC_PaintIconfn( WND *wndPtr, HDC hdc )
 {
-    RECT32 rc;
-    HBRUSH32 hbrush;
+    RECT rc;
+    HBRUSH hbrush;
     STATICINFO *infoPtr = (STATICINFO *)wndPtr->wExtra;
 
-    GetClientRect32( wndPtr->hwndSelf, &rc );
-    hbrush = SendMessage32A( GetParent32(wndPtr->hwndSelf), WM_CTLCOLORSTATIC,
+    GetClientRect( wndPtr->hwndSelf, &rc );
+    hbrush = SendMessageA( GetParent(wndPtr->hwndSelf), WM_CTLCOLORSTATIC,
                              hdc, wndPtr->hwndSelf );
-    FillRect32( hdc, &rc, hbrush );
-    if (infoPtr->hIcon) DrawIcon32( hdc, rc.left, rc.top, infoPtr->hIcon );
+    FillRect( hdc, &rc, hbrush );
+    if (infoPtr->hIcon) DrawIcon( hdc, rc.left, rc.top, infoPtr->hIcon );
 }
 
-static void STATIC_PaintBitmapfn(WND *wndPtr, HDC32 hdc )
+static void STATIC_PaintBitmapfn(WND *wndPtr, HDC hdc )
 {
-    RECT32 rc;
-    HBRUSH32 hbrush;
+    RECT rc;
+    HBRUSH hbrush;
     STATICINFO *infoPtr = (STATICINFO *)wndPtr->wExtra;
-    HDC32 hMemDC;
-    HBITMAP32 oldbitmap;
+    HDC hMemDC;
+    HBITMAP oldbitmap;
 
-    GetClientRect32( wndPtr->hwndSelf, &rc );
-    hbrush = SendMessage32A( GetParent32(wndPtr->hwndSelf), WM_CTLCOLORSTATIC,
+    GetClientRect( wndPtr->hwndSelf, &rc );
+    hbrush = SendMessageA( GetParent(wndPtr->hwndSelf), WM_CTLCOLORSTATIC,
                              hdc, wndPtr->hwndSelf );
-    FillRect32( hdc, &rc, hbrush );
+    FillRect( hdc, &rc, hbrush );
     if (infoPtr->hIcon) {
         BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_HEAP_LOCK( infoPtr->hIcon );
 
 	if (!bmp) return;
-        if (!(hMemDC = CreateCompatibleDC32( hdc ))) return;
+        if (!(hMemDC = CreateCompatibleDC( hdc ))) return;
 
-	oldbitmap = SelectObject32(hMemDC,infoPtr->hIcon);
-	BitBlt32(hdc,bmp->size.cx,bmp->size.cy,bmp->bitmap.bmWidth,bmp->bitmap.bmHeight,hMemDC,0,0,SRCCOPY);
-	DeleteDC32(hMemDC);
+	oldbitmap = SelectObject(hMemDC,infoPtr->hIcon);
+	BitBlt(hdc,bmp->size.cx,bmp->size.cy,bmp->bitmap.bmWidth,bmp->bitmap.bmHeight,hMemDC,0,0,SRCCOPY);
+	DeleteDC(hMemDC);
         GDI_HEAP_UNLOCK(infoPtr->hIcon);
     }
 }
 
 
-static void STATIC_PaintEtchedfn( WND *wndPtr, HDC32 hdc )
+static void STATIC_PaintEtchedfn( WND *wndPtr, HDC hdc )
 {
-    RECT32 rc;
-    HBRUSH32 hbrush;
-    HPEN32 hpen;
+    RECT rc;
+    HBRUSH hbrush;
+    HPEN hpen;
 
     if (TWEAK_WineLook == WIN31_LOOK)
 	return;
 
-    GetClientRect32( wndPtr->hwndSelf, &rc );
-    hbrush = SendMessage32A( GetParent32(wndPtr->hwndSelf), WM_CTLCOLORSTATIC,
+    GetClientRect( wndPtr->hwndSelf, &rc );
+    hbrush = SendMessageA( GetParent(wndPtr->hwndSelf), WM_CTLCOLORSTATIC,
                              hdc, wndPtr->hwndSelf );
-    FillRect32( hdc, &rc, hbrush );
+    FillRect( hdc, &rc, hbrush );
 
     switch (wndPtr->dwStyle & SS_TYPEMASK)
     {
 	case SS_ETCHEDHORZ:
-	    hpen = SelectObject32 (hdc, GetSysColorPen32 (COLOR_3DSHADOW));
-	    MoveToEx32 (hdc, rc.left, rc.bottom / 2 - 1, NULL);
-	    LineTo32 (hdc, rc.right - 1, rc.bottom / 2 - 1);
-	    SelectObject32 (hdc, GetSysColorPen32 (COLOR_3DHIGHLIGHT));
-	    MoveToEx32 (hdc, rc.left, rc.bottom / 2, NULL);
-	    LineTo32 (hdc, rc.right, rc.bottom / 2);
-	    LineTo32 (hdc, rc.right, rc.bottom / 2 - 1);
-	    SelectObject32 (hdc, hpen);
+	    hpen = SelectObject (hdc, GetSysColorPen (COLOR_3DSHADOW));
+	    MoveToEx (hdc, rc.left, rc.bottom / 2 - 1, NULL);
+	    LineTo (hdc, rc.right - 1, rc.bottom / 2 - 1);
+	    SelectObject (hdc, GetSysColorPen (COLOR_3DHIGHLIGHT));
+	    MoveToEx (hdc, rc.left, rc.bottom / 2, NULL);
+	    LineTo (hdc, rc.right, rc.bottom / 2);
+	    LineTo (hdc, rc.right, rc.bottom / 2 - 1);
+	    SelectObject (hdc, hpen);
 	    break;
 
 	case SS_ETCHEDVERT:
-	    hpen = SelectObject32 (hdc, GetSysColorPen32 (COLOR_3DSHADOW));
-	    MoveToEx32 (hdc, rc.right / 2 - 1, rc.top, NULL);
-	    LineTo32 (hdc, rc.right / 2 - 1, rc.bottom - 1);
-	    SelectObject32 (hdc, GetSysColorPen32 (COLOR_3DHIGHLIGHT));
-	    MoveToEx32 (hdc, rc.right / 2, rc.top, NULL);
-	    LineTo32 (hdc, rc.right / 2, rc.bottom);
-	    LineTo32 (hdc, rc.right / 2 -1 , rc.bottom);
-	    SelectObject32 (hdc, hpen); 
+	    hpen = SelectObject (hdc, GetSysColorPen (COLOR_3DSHADOW));
+	    MoveToEx (hdc, rc.right / 2 - 1, rc.top, NULL);
+	    LineTo (hdc, rc.right / 2 - 1, rc.bottom - 1);
+	    SelectObject (hdc, GetSysColorPen (COLOR_3DHIGHLIGHT));
+	    MoveToEx (hdc, rc.right / 2, rc.top, NULL);
+	    LineTo (hdc, rc.right / 2, rc.bottom);
+	    LineTo (hdc, rc.right / 2 -1 , rc.bottom);
+	    SelectObject (hdc, hpen); 
 	    break;
 
 	case SS_ETCHEDFRAME:
-	    DrawEdge32 (hdc, &rc, EDGE_ETCHED, BF_RECT);
+	    DrawEdge (hdc, &rc, EDGE_ETCHED, BF_RECT);
 	    break;
     }
 }
diff --git a/controls/uitools.c b/controls/uitools.c
index 28dc63e48b7..84067a6916a 100644
--- a/controls/uitools.c
+++ b/controls/uitools.c
@@ -97,28 +97,28 @@ static const char LTRBInnerFlat[] = {
  *
  * See also comments with UITOOLS_DrawRectEdge()
  */
-static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc, 
-				     UINT32 uType, UINT32 uFlags)
+static BOOL UITOOLS95_DrawDiagEdge(HDC hdc, LPRECT rc, 
+				     UINT uType, UINT uFlags)
 {
-    POINT32 Points[4];
+    POINT Points[4];
     char InnerI, OuterI;
-    HPEN32 InnerPen, OuterPen;
-    POINT32 SavePoint;
-    HPEN32 SavePen;
+    HPEN InnerPen, OuterPen;
+    POINT SavePoint;
+    HPEN SavePen;
     int spx, spy;
     int epx, epy;
     int Width = rc->right - rc->left;
     int Height= rc->bottom - rc->top;
     int SmallDiam = Width > Height ? Height : Width;
-    BOOL32 retval = !(   ((uType & BDR_INNER) == BDR_INNER
+    BOOL retval = !(   ((uType & BDR_INNER) == BDR_INNER
                        || (uType & BDR_OUTER) == BDR_OUTER)
                       && !(uFlags & (BF_FLAT|BF_MONO)) );
     int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0)
             + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0);
 
     /* Init some vars */
-    OuterPen = InnerPen = (HPEN32)GetStockObject32(NULL_PEN);
-    SavePen = (HPEN32)SelectObject32(hdc, InnerPen);
+    OuterPen = InnerPen = (HPEN)GetStockObject(NULL_PEN);
+    SavePen = (HPEN)SelectObject(hdc, InnerPen);
     spx = spy = epx = epy = 0; /* Satisfy the compiler... */
     
     /* Determine the colors of the edges */
@@ -159,10 +159,10 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
         }
     }
 
-    if(InnerI != -1) InnerPen = GetSysColorPen32(InnerI);
-    if(OuterI != -1) OuterPen = GetSysColorPen32(OuterI);
+    if(InnerI != -1) InnerPen = GetSysColorPen(InnerI);
+    if(OuterI != -1) OuterPen = GetSysColorPen(OuterI);
 
-    MoveToEx32(hdc, 0, 0, &SavePoint);
+    MoveToEx(hdc, 0, 0, &SavePoint);
 
     /* Don't ask me why, but this is what is visible... */
     /* This must be possible to do much simpler, but I fail to */
@@ -210,11 +210,11 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
         break;
     }
 
-    MoveToEx32(hdc, spx, spy, NULL);
-    SelectObject32(hdc, OuterPen);
-    LineTo32(hdc, epx, epy);
+    MoveToEx(hdc, spx, spy, NULL);
+    SelectObject(hdc, OuterPen);
+    LineTo(hdc, epx, epy);
 
-    SelectObject32(hdc, InnerPen);
+    SelectObject(hdc, InnerPen);
 
     switch(uFlags & (BF_RECT|BF_DIAGONAL))
     {
@@ -222,8 +222,8 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
     case (BF_DIAGONAL|BF_BOTTOM):
     case BF_DIAGONAL:
     case (BF_DIAGONAL|BF_LEFT):
-        MoveToEx32(hdc, spx-1, spy, NULL);
-        LineTo32(hdc, epx, epy-1);
+        MoveToEx(hdc, spx-1, spy, NULL);
+        LineTo(hdc, epx, epy-1);
         Points[0].x = spx-add;
         Points[0].y = spy;
         Points[1].x = rc->left;
@@ -234,8 +234,8 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
         break;
 
     case BF_DIAGONAL_ENDBOTTOMRIGHT:
-        MoveToEx32(hdc, spx-1, spy, NULL);
-        LineTo32(hdc, epx, epy+1);
+        MoveToEx(hdc, spx-1, spy, NULL);
+        LineTo(hdc, epx, epy+1);
         Points[0].x = spx-add;
         Points[0].y = spy;
         Points[1].x = rc->left;
@@ -249,8 +249,8 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
     case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP|BF_LEFT):
     case BF_DIAGONAL_ENDTOPRIGHT:
     case (BF_DIAGONAL|BF_RIGHT|BF_TOP|BF_LEFT):
-        MoveToEx32(hdc, spx+1, spy, NULL);
-        LineTo32(hdc, epx, epy+1);
+        MoveToEx(hdc, spx+1, spy, NULL);
+        LineTo(hdc, epx, epy+1);
         Points[0].x = epx-1;
         Points[0].y = epy+1+add;
         Points[1].x = rc->right-1;
@@ -262,8 +262,8 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
         break;
 
     case BF_DIAGONAL_ENDTOPLEFT:
-        MoveToEx32(hdc, spx, spy-1, NULL);
-        LineTo32(hdc, epx+1, epy);
+        MoveToEx(hdc, spx, spy-1, NULL);
+        LineTo(hdc, epx+1, epy);
         Points[0].x = epx+1+add;
         Points[0].y = epy+1;
         Points[1].x = rc->right-1;
@@ -277,8 +277,8 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
     case (BF_DIAGONAL|BF_TOP):
     case (BF_DIAGONAL|BF_BOTTOM|BF_TOP):
     case (BF_DIAGONAL|BF_BOTTOM|BF_TOP|BF_LEFT):
-        MoveToEx32(hdc, spx+1, spy-1, NULL);
-        LineTo32(hdc, epx, epy);
+        MoveToEx(hdc, spx+1, spy-1, NULL);
+        LineTo(hdc, epx, epy);
         Points[0].x = epx-1;
         Points[0].y = epy+1;
         Points[1].x = rc->right-1;
@@ -292,8 +292,8 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
     case (BF_DIAGONAL|BF_RIGHT):
     case (BF_DIAGONAL|BF_RIGHT|BF_LEFT):
     case (BF_DIAGONAL|BF_RIGHT|BF_LEFT|BF_BOTTOM):
-        MoveToEx32(hdc, spx, spy, NULL);
-        LineTo32(hdc, epx-1, epy+1);
+        MoveToEx(hdc, spx, spy, NULL);
+        LineTo(hdc, epx-1, epy+1);
         Points[0].x = spx;
         Points[0].y = spy;
         Points[1].x = rc->left;
@@ -307,17 +307,17 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
     /* Fill the interior if asked */
     if((uFlags & BF_MIDDLE) && retval)
     {
-        HBRUSH32 hbsave;
-        HBRUSH32 hb = GetSysColorBrush32(uFlags & BF_MONO ? COLOR_WINDOW
+        HBRUSH hbsave;
+        HBRUSH hb = GetSysColorBrush(uFlags & BF_MONO ? COLOR_WINDOW
 					 :COLOR_BTNFACE);
-        HPEN32 hpsave;
-        HPEN32 hp = GetSysColorPen32(uFlags & BF_MONO ? COLOR_WINDOW
+        HPEN hpsave;
+        HPEN hp = GetSysColorPen(uFlags & BF_MONO ? COLOR_WINDOW
 				     : COLOR_BTNFACE);
-        hbsave = (HBRUSH32)SelectObject32(hdc, hb);
-        hpsave = (HPEN32)SelectObject32(hdc, hp);
-        Polygon32(hdc, Points, 4);
-        SelectObject32(hdc, hbsave);
-        SelectObject32(hdc, hpsave);
+        hbsave = (HBRUSH)SelectObject(hdc, hb);
+        hpsave = (HPEN)SelectObject(hdc, hp);
+        Polygon(hdc, Points, 4);
+        SelectObject(hdc, hbsave);
+        SelectObject(hdc, hpsave);
     }
 
     /* Adjust rectangle if asked */
@@ -330,8 +330,8 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
     }
 
     /* Cleanup */
-    SelectObject32(hdc, SavePen);
-    MoveToEx32(hdc, SavePoint.x, SavePoint.y, NULL);
+    SelectObject(hdc, SavePen);
+    MoveToEx(hdc, SavePoint.x, SavePoint.y, NULL);
 
     return retval;
 }
@@ -410,27 +410,27 @@ static BOOL32 UITOOLS95_DrawDiagEdge(HDC32 hdc, LPRECT32 rc,
  */
 
 
-static BOOL32 UITOOLS95_DrawRectEdge(HDC32 hdc, LPRECT32 rc, 
-				     UINT32 uType, UINT32 uFlags)
+static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, 
+				     UINT uType, UINT uFlags)
 {
     char LTInnerI, LTOuterI;
     char RBInnerI, RBOuterI;
-    HPEN32 LTInnerPen, LTOuterPen;
-    HPEN32 RBInnerPen, RBOuterPen;
-    RECT32 InnerRect = *rc;
-    POINT32 SavePoint;
-    HPEN32 SavePen;
+    HPEN LTInnerPen, LTOuterPen;
+    HPEN RBInnerPen, RBOuterPen;
+    RECT InnerRect = *rc;
+    POINT SavePoint;
+    HPEN SavePen;
     int LBpenplus = 0;
     int LTpenplus = 0;
     int RTpenplus = 0;
     int RBpenplus = 0;
-    BOOL32 retval = !(   ((uType & BDR_INNER) == BDR_INNER
+    BOOL retval = !(   ((uType & BDR_INNER) == BDR_INNER
                        || (uType & BDR_OUTER) == BDR_OUTER)
                       && !(uFlags & (BF_FLAT|BF_MONO)) );
         
     /* Init some vars */
-    LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = (HPEN32)GetStockObject32(NULL_PEN);
-    SavePen = (HPEN32)SelectObject32(hdc, LTInnerPen);
+    LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = (HPEN)GetStockObject(NULL_PEN);
+    SavePen = (HPEN)SelectObject(hdc, LTInnerPen);
 
     /* Determine the colors of the edges */
     if(uFlags & BF_MONO)
@@ -463,65 +463,65 @@ static BOOL32 UITOOLS95_DrawRectEdge(HDC32 hdc, LPRECT32 rc,
     if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) RBpenplus = 1;
     if((uFlags & BF_TOPLEFT) == BF_TOPLEFT)         LTpenplus = 1;
 
-    if(LTInnerI != -1) LTInnerPen = GetSysColorPen32(LTInnerI);
-    if(LTOuterI != -1) LTOuterPen = GetSysColorPen32(LTOuterI);
-    if(RBInnerI != -1) RBInnerPen = GetSysColorPen32(RBInnerI);
-    if(RBOuterI != -1) RBOuterPen = GetSysColorPen32(RBOuterI);
+    if(LTInnerI != -1) LTInnerPen = GetSysColorPen(LTInnerI);
+    if(LTOuterI != -1) LTOuterPen = GetSysColorPen(LTOuterI);
+    if(RBInnerI != -1) RBInnerPen = GetSysColorPen(RBInnerI);
+    if(RBOuterI != -1) RBOuterPen = GetSysColorPen(RBOuterI);
 
     if((uFlags & BF_MIDDLE) && retval)
     {
-        FillRect32(hdc, &InnerRect, GetSysColorBrush32(uFlags & BF_MONO ? 
+        FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ? 
 					    COLOR_WINDOW : COLOR_BTNFACE));
     }
 
-    MoveToEx32(hdc, 0, 0, &SavePoint);
+    MoveToEx(hdc, 0, 0, &SavePoint);
 
     /* Draw the outer edge */
-    SelectObject32(hdc, LTOuterPen);
+    SelectObject(hdc, LTOuterPen);
     if(uFlags & BF_TOP)
     {
-        MoveToEx32(hdc, InnerRect.left, InnerRect.top, NULL);
-        LineTo32(hdc, InnerRect.right, InnerRect.top);
+        MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL);
+        LineTo(hdc, InnerRect.right, InnerRect.top);
     }
     if(uFlags & BF_LEFT)
     {
-        MoveToEx32(hdc, InnerRect.left, InnerRect.top, NULL);
-        LineTo32(hdc, InnerRect.left, InnerRect.bottom);
+        MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL);
+        LineTo(hdc, InnerRect.left, InnerRect.bottom);
     }
-    SelectObject32(hdc, RBOuterPen);
+    SelectObject(hdc, RBOuterPen);
     if(uFlags & BF_BOTTOM)
     {
-        MoveToEx32(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL);
-        LineTo32(hdc, InnerRect.left-1, InnerRect.bottom-1);
+        MoveToEx(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL);
+        LineTo(hdc, InnerRect.left-1, InnerRect.bottom-1);
     }
     if(uFlags & BF_RIGHT)
     {
-        MoveToEx32(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL);
-        LineTo32(hdc, InnerRect.right-1, InnerRect.top-1);
+        MoveToEx(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL);
+        LineTo(hdc, InnerRect.right-1, InnerRect.top-1);
     }
 
     /* Draw the inner edge */
-    SelectObject32(hdc, LTInnerPen);
+    SelectObject(hdc, LTInnerPen);
     if(uFlags & BF_TOP)
     {
-        MoveToEx32(hdc, InnerRect.left+LTpenplus, InnerRect.top+1, NULL);
-        LineTo32(hdc, InnerRect.right-RTpenplus, InnerRect.top+1);
+        MoveToEx(hdc, InnerRect.left+LTpenplus, InnerRect.top+1, NULL);
+        LineTo(hdc, InnerRect.right-RTpenplus, InnerRect.top+1);
     }
     if(uFlags & BF_LEFT)
     {
-        MoveToEx32(hdc, InnerRect.left+1, InnerRect.top+LTpenplus, NULL);
-        LineTo32(hdc, InnerRect.left+1, InnerRect.bottom-LBpenplus);
+        MoveToEx(hdc, InnerRect.left+1, InnerRect.top+LTpenplus, NULL);
+        LineTo(hdc, InnerRect.left+1, InnerRect.bottom-LBpenplus);
     }
-    SelectObject32(hdc, RBInnerPen);
+    SelectObject(hdc, RBInnerPen);
     if(uFlags & BF_BOTTOM)
     {
-        MoveToEx32(hdc, InnerRect.right-1-RBpenplus, InnerRect.bottom-2, NULL);
-        LineTo32(hdc, InnerRect.left-1+LBpenplus, InnerRect.bottom-2);
+        MoveToEx(hdc, InnerRect.right-1-RBpenplus, InnerRect.bottom-2, NULL);
+        LineTo(hdc, InnerRect.left-1+LBpenplus, InnerRect.bottom-2);
     }
     if(uFlags & BF_RIGHT)
     {
-        MoveToEx32(hdc, InnerRect.right-2, InnerRect.bottom-1-RBpenplus, NULL);
-        LineTo32(hdc, InnerRect.right-2, InnerRect.top-1+RTpenplus);
+        MoveToEx(hdc, InnerRect.right-2, InnerRect.bottom-1-RBpenplus, NULL);
+        LineTo(hdc, InnerRect.right-2, InnerRect.top-1+RTpenplus);
     }
 
     /* Adjust rectangle if asked */
@@ -536,8 +536,8 @@ static BOOL32 UITOOLS95_DrawRectEdge(HDC32 hdc, LPRECT32 rc,
     }
 
     /* Cleanup */
-    SelectObject32(hdc, SavePen);
-    MoveToEx32(hdc, SavePoint.x, SavePoint.y, NULL);
+    SelectObject(hdc, SavePen);
+    MoveToEx(hdc, SavePoint.x, SavePoint.y, NULL);
     return retval;
 }
 
@@ -547,11 +547,11 @@ static BOOL32 UITOOLS95_DrawRectEdge(HDC32 hdc, LPRECT32 rc,
  */
 BOOL16 WINAPI DrawEdge16( HDC16 hdc, LPRECT16 rc, UINT16 edge, UINT16 flags )
 {
-    RECT32 rect32;
-    BOOL32 ret;
+    RECT rect32;
+    BOOL ret;
 
     CONV_RECT16TO32( rc, &rect32 );
-    ret = DrawEdge32( hdc, &rect32, edge, flags );
+    ret = DrawEdge( hdc, &rect32, edge, flags );
     CONV_RECT32TO16( &rect32, rc );
     return ret;
 }
@@ -559,7 +559,7 @@ BOOL16 WINAPI DrawEdge16( HDC16 hdc, LPRECT16 rc, UINT16 edge, UINT16 flags )
 /**********************************************************************
  *          DrawEdge32   (USER32.155)
  */
-BOOL32 WINAPI DrawEdge32( HDC32 hdc, LPRECT32 rc, UINT32 edge, UINT32 flags )
+BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags )
 {
     TRACE(graphics, "%04x %d,%d-%d,%d %04x %04x\n",
 	  hdc, rc->left, rc->top, rc->right, rc->bottom, edge, flags );
@@ -576,7 +576,7 @@ BOOL32 WINAPI DrawEdge32( HDC32 hdc, LPRECT32 rc, UINT32 edge, UINT32 flags )
  *
  * Utility to create a square rectangle and returning the width
  */
-static int UITOOLS_MakeSquareRect(LPRECT32 src, LPRECT32 dst)
+static int UITOOLS_MakeSquareRect(LPRECT src, LPRECT dst)
 {
     int Width  = src->right - src->left;
     int Height = src->bottom - src->top;
@@ -609,10 +609,10 @@ static int UITOOLS_MakeSquareRect(LPRECT32 src, LPRECT32 dst)
  * however there because MS uses a TrueType font (Marlett) to draw
  * the buttons.
  */
-static BOOL32 UITOOLS95_DFC_ButtonPush(HDC32 dc, LPRECT32 r, UINT32 uFlags)
+static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags)
 {
-    UINT32 edge;
-    RECT32 myr = *r;
+    UINT edge;
+    RECT myr = *r;
 
     if(uFlags & (DFCS_PUSHED | DFCS_CHECKED | DFCS_FLAT))
         edge = EDGE_SUNKEN;
@@ -626,22 +626,22 @@ static BOOL32 UITOOLS95_DFC_ButtonPush(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         else
             UITOOLS95_DrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST);
 
-        if(GetSysColor32(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255))
+        if(GetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255))
         {
-            HBITMAP32 hbm = CreateBitmap32(8, 8, 1, 1, wPattern_AA55);
-            HBRUSH32 hbsave;
-            HBRUSH32 hb = CreatePatternBrush32(hbm);
-
-            FillRect32(dc, &myr, GetSysColorBrush32(COLOR_BTNFACE));
-            hbsave = (HBRUSH32)SelectObject32(dc, hb);
-            PatBlt32(dc, myr.left, myr.top, myr.right-myr.left, myr.bottom-myr.top, 0x00FA0089);
-            SelectObject32(dc, hbsave);
-            DeleteObject32(hb);
-            DeleteObject32(hbm);
+            HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55);
+            HBRUSH hbsave;
+            HBRUSH hb = CreatePatternBrush(hbm);
+
+            FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
+            hbsave = (HBRUSH)SelectObject(dc, hb);
+            PatBlt(dc, myr.left, myr.top, myr.right-myr.left, myr.bottom-myr.top, 0x00FA0089);
+            SelectObject(dc, hbsave);
+            DeleteObject(hb);
+            DeleteObject(hbm);
         }
         else
         {
-            FillRect32(dc, &myr, GetSysColorBrush32(COLOR_BTNHIGHLIGHT));
+            FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
         }
     }
     else
@@ -649,7 +649,7 @@ static BOOL32 UITOOLS95_DFC_ButtonPush(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         if(uFlags & DFCS_MONO)
         {
             UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST);
-            FillRect32(dc, &myr, GetSysColorBrush32(COLOR_BTNFACE));
+            FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
         }
         else
         {
@@ -681,9 +681,9 @@ static BOOL32 UITOOLS95_DFC_ButtonPush(HDC32 dc, LPRECT32 r, UINT32 uFlags)
  */
 #define DFC_CHECKPOINTSMAX      6
 
-static BOOL32 UITOOLS95_DFC_ButtonCheck(HDC32 dc, LPRECT32 r, UINT32 uFlags)
+static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags)
 {
-    RECT32 myr;
+    RECT myr;
     int SmallDiam = UITOOLS_MakeSquareRect(r, &myr);
     int BorderShrink = SmallDiam / 16;
 
@@ -694,7 +694,7 @@ static BOOL32 UITOOLS95_DFC_ButtonCheck(HDC32 dc, LPRECT32 r, UINT32 uFlags)
     /* 100% equivalent. */
     if(uFlags & (DFCS_FLAT|DFCS_MONO))
     {
-        FillRect32(dc, &myr, GetSysColorBrush32(COLOR_WINDOWFRAME));
+        FillRect(dc, &myr, GetSysColorBrush(COLOR_WINDOWFRAME));
         myr.left   += 2 * BorderShrink;
         myr.right  -= 2 * BorderShrink;
         myr.top    += 2 * BorderShrink;
@@ -702,55 +702,55 @@ static BOOL32 UITOOLS95_DFC_ButtonCheck(HDC32 dc, LPRECT32 r, UINT32 uFlags)
     }
     else
     {
-        FillRect32(dc, &myr, GetSysColorBrush32(COLOR_BTNHIGHLIGHT));
+        FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
         myr.right  -= BorderShrink;
         myr.bottom -= BorderShrink;
-        FillRect32(dc, &myr, GetSysColorBrush32(COLOR_BTNSHADOW));
+        FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNSHADOW));
         myr.left   += BorderShrink;
         myr.top    += BorderShrink;
-        FillRect32(dc, &myr, GetSysColorBrush32(COLOR_3DLIGHT));
+        FillRect(dc, &myr, GetSysColorBrush(COLOR_3DLIGHT));
         myr.right  -= BorderShrink;
         myr.bottom -= BorderShrink;
-        FillRect32(dc, &myr, GetSysColorBrush32(COLOR_3DDKSHADOW));
+        FillRect(dc, &myr, GetSysColorBrush(COLOR_3DDKSHADOW));
         myr.left   += BorderShrink;
         myr.top    += BorderShrink;
     }
 
     if(uFlags & (DFCS_INACTIVE|DFCS_PUSHED))
     {
-        FillRect32(dc, &myr, GetSysColorBrush32(COLOR_BTNFACE));
+        FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
     }
     else if(uFlags & DFCS_CHECKED)
     {
-        if(GetSysColor32(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255))
+        if(GetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255))
         {
-            HBITMAP32 hbm = CreateBitmap32(8, 8, 1, 1, wPattern_AA55);
-            HBRUSH32 hbsave;
-            HBRUSH32 hb = CreatePatternBrush32(hbm);
-
-            FillRect32(dc, &myr, GetSysColorBrush32(COLOR_BTNFACE));
-            hbsave = (HBRUSH32)SelectObject32(dc, hb);
-            PatBlt32(dc, myr.left, myr.top, myr.right-myr.left, myr.bottom-myr.top, 0x00FA0089);
-            SelectObject32(dc, hbsave);
-            DeleteObject32(hb);
-            DeleteObject32(hbm);
+            HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55);
+            HBRUSH hbsave;
+            HBRUSH hb = CreatePatternBrush(hbm);
+
+            FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
+            hbsave = (HBRUSH)SelectObject(dc, hb);
+            PatBlt(dc, myr.left, myr.top, myr.right-myr.left, myr.bottom-myr.top, 0x00FA0089);
+            SelectObject(dc, hbsave);
+            DeleteObject(hb);
+            DeleteObject(hbm);
         }
         else
         {
-            FillRect32(dc, &myr, GetSysColorBrush32(COLOR_BTNHIGHLIGHT));
+            FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
         }
     }
     else
     {
-        FillRect32(dc, &myr, GetSysColorBrush32(COLOR_WINDOW));
+        FillRect(dc, &myr, GetSysColorBrush(COLOR_WINDOW));
     }
 
     if(uFlags & DFCS_CHECKED)
     {
-        POINT32 CheckPoints[DFC_CHECKPOINTSMAX];
+        POINT CheckPoints[DFC_CHECKPOINTSMAX];
         int i;
-        HBRUSH32 hbsave;
-        HPEN32 hpsave;
+        HBRUSH hbsave;
+        HPEN hpsave;
 
         /* FIXME: This comes very close to M$'s checkmark, but not */
         /* exactly... When small or large there is a few pixels */
@@ -770,11 +770,11 @@ static BOOL32 UITOOLS95_DFC_ButtonCheck(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         CheckPoints[5].y = CheckPoints[0].y + 3*SmallDiam/16;
 
         i = (uFlags & DFCS_INACTIVE) || (uFlags & 0xff) == DFCS_BUTTON3STATE ? COLOR_BTNSHADOW : COLOR_WINDOWTEXT;
-        hbsave = (HBRUSH32)SelectObject32(dc, GetSysColorBrush32(i));
-        hpsave = (HPEN32)SelectObject32(dc, GetSysColorPen32(i));
-        Polygon32(dc, CheckPoints, DFC_CHECKPOINTSMAX);
-        SelectObject32(dc, hpsave);
-        SelectObject32(dc, hbsave);
+        hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i));
+        hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i));
+        Polygon(dc, CheckPoints, DFC_CHECKPOINTSMAX);
+        SelectObject(dc, hpsave);
+        SelectObject(dc, hbsave);
     }
     return TRUE;
 }
@@ -789,14 +789,14 @@ static BOOL32 UITOOLS95_DFC_ButtonCheck(HDC32 dc, LPRECT32 r, UINT32 uFlags)
  * however there because MS uses a TrueType font (Marlett) to draw
  * the buttons.
  */
-static BOOL32 UITOOLS95_DFC_ButtonRadio(HDC32 dc, LPRECT32 r, UINT32 uFlags)
+static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags)
 {
-    RECT32 myr;
+    RECT myr;
     int i;
     int SmallDiam = UITOOLS_MakeSquareRect(r, &myr);
     int BorderShrink = SmallDiam / 16;
-    HPEN32 hpsave;
-    HBRUSH32 hbsave;
+    HPEN hpsave;
+    HBRUSH hbsave;
     int xe, ye;
     int xc, yc;
 
@@ -804,7 +804,7 @@ static BOOL32 UITOOLS95_DFC_ButtonRadio(HDC32 dc, LPRECT32 r, UINT32 uFlags)
 
     if((uFlags & 0xff) == DFCS_BUTTONRADIOIMAGE)
     {
-        FillRect32(dc, r, (HBRUSH32)GetStockObject32(BLACK_BRUSH));
+        FillRect(dc, r, (HBRUSH)GetStockObject(BLACK_BRUSH));
     }
 
     xe = myr.left;
@@ -822,44 +822,44 @@ static BOOL32 UITOOLS95_DFC_ButtonRadio(HDC32 dc, LPRECT32 r, UINT32 uFlags)
 
     if((uFlags & 0xff) == DFCS_BUTTONRADIOMASK)
     {
-        hbsave = (HBRUSH32)SelectObject32(dc, GetStockObject32(BLACK_BRUSH));
-        Pie32(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
-        SelectObject32(dc, hbsave);
+        hbsave = (HBRUSH)SelectObject(dc, GetStockObject(BLACK_BRUSH));
+        Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
+        SelectObject(dc, hbsave);
     }
     else
     {
         if(uFlags & (DFCS_FLAT|DFCS_MONO))
         {
-            hpsave = (HPEN32)SelectObject32(dc, GetSysColorPen32(COLOR_WINDOWFRAME));
-            hbsave = (HBRUSH32)SelectObject32(dc, GetSysColorBrush32(COLOR_WINDOWFRAME));
-            Pie32(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
-            SelectObject32(dc, hbsave);
-            SelectObject32(dc, hpsave);
+            hpsave = (HPEN)SelectObject(dc, GetSysColorPen(COLOR_WINDOWFRAME));
+            hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(COLOR_WINDOWFRAME));
+            Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
+            SelectObject(dc, hbsave);
+            SelectObject(dc, hpsave);
         }
         else
         {
-            hpsave = (HPEN32)SelectObject32(dc, GetSysColorPen32(COLOR_BTNHIGHLIGHT));
-            hbsave = (HBRUSH32)SelectObject32(dc, GetSysColorBrush32(COLOR_BTNHIGHLIGHT));
-            Pie32(dc, myr.left, myr.top, myr.right, myr.bottom, myr.left-1, myr.bottom, myr.right-1, myr.top);
+            hpsave = (HPEN)SelectObject(dc, GetSysColorPen(COLOR_BTNHIGHLIGHT));
+            hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
+            Pie(dc, myr.left, myr.top, myr.right, myr.bottom, myr.left-1, myr.bottom, myr.right-1, myr.top);
 
-            SelectObject32(dc, GetSysColorPen32(COLOR_BTNSHADOW));
-            SelectObject32(dc, GetSysColorBrush32(COLOR_BTNSHADOW));
-            Pie32(dc, myr.left, myr.top, myr.right, myr.bottom, myr.right+1, myr.top, myr.left+1, myr.bottom);
+            SelectObject(dc, GetSysColorPen(COLOR_BTNSHADOW));
+            SelectObject(dc, GetSysColorBrush(COLOR_BTNSHADOW));
+            Pie(dc, myr.left, myr.top, myr.right, myr.bottom, myr.right+1, myr.top, myr.left+1, myr.bottom);
 
             myr.left   += BorderShrink;
             myr.right  -= BorderShrink;
             myr.top    += BorderShrink;
             myr.bottom -= BorderShrink;
 
-            SelectObject32(dc, GetSysColorPen32(COLOR_3DLIGHT));
-            SelectObject32(dc, GetSysColorBrush32(COLOR_3DLIGHT));
-            Pie32(dc, myr.left, myr.top, myr.right, myr.bottom, myr.left-1, myr.bottom, myr.right-1, myr.top);
+            SelectObject(dc, GetSysColorPen(COLOR_3DLIGHT));
+            SelectObject(dc, GetSysColorBrush(COLOR_3DLIGHT));
+            Pie(dc, myr.left, myr.top, myr.right, myr.bottom, myr.left-1, myr.bottom, myr.right-1, myr.top);
 
-            SelectObject32(dc, GetSysColorPen32(COLOR_3DDKSHADOW));
-            SelectObject32(dc, GetSysColorBrush32(COLOR_3DDKSHADOW));
-            Pie32(dc, myr.left, myr.top, myr.right, myr.bottom, myr.right+1, myr.top, myr.left+1, myr.bottom);
-            SelectObject32(dc, hbsave);
-            SelectObject32(dc, hpsave);
+            SelectObject(dc, GetSysColorPen(COLOR_3DDKSHADOW));
+            SelectObject(dc, GetSysColorBrush(COLOR_3DDKSHADOW));
+            Pie(dc, myr.left, myr.top, myr.right, myr.bottom, myr.right+1, myr.top, myr.left+1, myr.bottom);
+            SelectObject(dc, hbsave);
+            SelectObject(dc, hpsave);
         }
 
         i = 10*SmallDiam/16;
@@ -868,11 +868,11 @@ static BOOL32 UITOOLS95_DFC_ButtonRadio(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         myr.top    = yc - i+i/2;
         myr.bottom = yc + i/2;
         i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE;
-        hpsave = (HPEN32)SelectObject32(dc, GetSysColorPen32(i));
-        hbsave = (HBRUSH32)SelectObject32(dc, GetSysColorBrush32(i));
-        Pie32(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
-        SelectObject32(dc, hbsave);
-        SelectObject32(dc, hpsave);
+        hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i));
+        hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i));
+        Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
+        SelectObject(dc, hbsave);
+        SelectObject(dc, hpsave);
     }
 
     if(uFlags & DFCS_CHECKED)
@@ -885,11 +885,11 @@ static BOOL32 UITOOLS95_DFC_ButtonRadio(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         myr.bottom = yc + i/2;
 
         i = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_WINDOWTEXT;
-        hbsave = (HBRUSH32)SelectObject32(dc, GetSysColorBrush32(i));
-        hpsave = (HPEN32)SelectObject32(dc, GetSysColorPen32(i));
-        Pie32(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
-        SelectObject32(dc, hpsave);
-        SelectObject32(dc, hbsave);
+        hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i));
+        hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i));
+        Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
+        SelectObject(dc, hpsave);
+        SelectObject(dc, hbsave);
     }
 
     /* FIXME: M$ has a polygon in the center at relative points: */
@@ -910,7 +910,7 @@ static BOOL32 UITOOLS95_DFC_ButtonRadio(HDC32 dc, LPRECT32 r, UINT32 uFlags)
 /***********************************************************************
  *           UITOOLS_DrawFrameButton
  */
-static BOOL32 UITOOLS95_DrawFrameButton(HDC32 hdc, LPRECT32 rc, UINT32 uState)
+static BOOL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState)
 {
     switch(uState & 0xff)
     {
@@ -939,26 +939,26 @@ static BOOL32 UITOOLS95_DrawFrameButton(HDC32 hdc, LPRECT32 rc, UINT32 uState)
  * Draw caption buttons (win95), coming from DrawFrameControl()
  */
 
-static BOOL32 UITOOLS95_DrawFrameCaption(HDC32 dc, LPRECT32 r, UINT32 uFlags)
+static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
 {
-    POINT32 Line1[10];
-    POINT32 Line2[10];
+    POINT Line1[10];
+    POINT Line2[10];
     int Line1N;
     int Line2N;
-    RECT32 myr;
+    RECT myr;
     int SmallDiam = UITOOLS_MakeSquareRect(r, &myr)-2;
     int i;
-    HBRUSH32 hbsave;
-    HPEN32 hpsave;
-    HFONT32 hfsave, hf;
+    HBRUSH hbsave;
+    HPEN hpsave;
+    HFONT hfsave, hf;
     int xc = (myr.left+myr.right)/2;
     int yc = (myr.top+myr.bottom)/2;
     int edge, move;
     char str[2] = "?";
-    UINT32 alignsave;
+    UINT alignsave;
     int bksave;
     COLORREF clrsave;
-    SIZE32 size;
+    SIZE size;
 
     UITOOLS95_DFC_ButtonPush(dc, r, uFlags & 0xff00);
 
@@ -983,28 +983,28 @@ static BOOL32 UITOOLS95_DrawFrameCaption(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         /* This one breaks the flow */
         /* FIXME: We need the Marlett font in order to get this right. */
 
-        hf = CreateFont32A(-SmallDiam, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE,
+        hf = CreateFontA(-SmallDiam, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE,
                         ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
                         DEFAULT_QUALITY, FIXED_PITCH|FF_DONTCARE, "System");
-        alignsave = SetTextAlign32(dc, TA_TOP|TA_LEFT);
-        bksave = SetBkMode32(dc, TRANSPARENT);
-        clrsave = GetTextColor32(dc);
-        hfsave = (HFONT32)SelectObject32(dc, hf);
+        alignsave = SetTextAlign(dc, TA_TOP|TA_LEFT);
+        bksave = SetBkMode(dc, TRANSPARENT);
+        clrsave = GetTextColor(dc);
+        hfsave = (HFONT)SelectObject(dc, hf);
         GetTextExtentPoint32A(dc, str, 1, &size);
 
         if(uFlags & DFCS_INACTIVE)
         {
-            SetTextColor32(dc, GetSysColor32(COLOR_BTNHIGHLIGHT));
-            TextOut32A(dc, xc-size.cx/2+1, yc-size.cy/2+1, str, 1);
+            SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT));
+            TextOutA(dc, xc-size.cx/2+1, yc-size.cy/2+1, str, 1);
         }
-        SetTextColor32(dc, GetSysColor32(uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT));
-        TextOut32A(dc, xc-size.cx/2, yc-size.cy/2, str, 1);
-
-        SelectObject32(dc, hfsave);
-        SetTextColor32(dc, clrsave);
-        SetBkMode32(dc, bksave);
-        SetTextAlign32(dc, alignsave);
-        DeleteObject32(hf);
+        SetTextColor(dc, GetSysColor(uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT));
+        TextOutA(dc, xc-size.cx/2, yc-size.cy/2, str, 1);
+
+        SelectObject(dc, hfsave);
+        SetTextColor(dc, clrsave);
+        SetBkMode(dc, bksave);
+        SetTextAlign(dc, alignsave);
+        DeleteObject(hf);
         return TRUE;
 
     case DFCS_CAPTIONMIN:
@@ -1071,13 +1071,13 @@ static BOOL32 UITOOLS95_DrawFrameCaption(HDC32 dc, LPRECT32 r, UINT32 uFlags)
     if(uFlags & DFCS_INACTIVE)
     {
         /* If we have an inactive button, then you see a shadow */
-        hbsave = (HBRUSH32)SelectObject32(dc, GetSysColorBrush32(COLOR_BTNHIGHLIGHT));
-        hpsave = (HPEN32)SelectObject32(dc, GetSysColorPen32(COLOR_BTNHIGHLIGHT));
-        Polygon32(dc, Line1, Line1N);
+        hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
+        hpsave = (HPEN)SelectObject(dc, GetSysColorPen(COLOR_BTNHIGHLIGHT));
+        Polygon(dc, Line1, Line1N);
         if(Line2N > 0)
-            Polygon32(dc, Line2, Line2N);
-        SelectObject32(dc, hpsave);
-        SelectObject32(dc, hbsave);
+            Polygon(dc, Line2, Line2N);
+        SelectObject(dc, hpsave);
+        SelectObject(dc, hbsave);
     }
 
     /* Correct for the shadow shift */
@@ -1094,14 +1094,14 @@ static BOOL32 UITOOLS95_DrawFrameCaption(HDC32 dc, LPRECT32 r, UINT32 uFlags)
 
     /* Make the final picture */
     i = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT;
-    hbsave = (HBRUSH32)SelectObject32(dc, GetSysColorBrush32(i));
-    hpsave = (HPEN32)SelectObject32(dc, GetSysColorPen32(i));
+    hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i));
+    hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i));
 
-    Polygon32(dc, Line1, Line1N);
+    Polygon(dc, Line1, Line1N);
     if(Line2N > 0)
-        Polygon32(dc, Line2, Line2N);
-    SelectObject32(dc, hpsave);
-    SelectObject32(dc, hbsave);
+        Polygon(dc, Line2, Line2N);
+    SelectObject(dc, hpsave);
+    SelectObject(dc, hbsave);
 
     return TRUE;
 }
@@ -1112,14 +1112,14 @@ static BOOL32 UITOOLS95_DrawFrameCaption(HDC32 dc, LPRECT32 r, UINT32 uFlags)
  *
  * Draw a scroll-bar control coming from DrawFrameControl()
  */
-static BOOL32 UITOOLS95_DrawFrameScroll(HDC32 dc, LPRECT32 r, UINT32 uFlags)
+static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags)
 {
-    POINT32 Line[4];
-    RECT32 myr;
+    POINT Line[4];
+    RECT myr;
     int SmallDiam = UITOOLS_MakeSquareRect(r, &myr) - 2;
     int i;
-    HBRUSH32 hbsave, hb, hb2;
-    HPEN32 hpsave, hp, hp2;
+    HBRUSH hbsave, hb, hb2;
+    HPEN hpsave, hp, hp2;
     int tri = 310*SmallDiam/1000;
     int d46, d93;
 
@@ -1161,19 +1161,19 @@ static BOOL32 UITOOLS95_DrawFrameScroll(HDC32 dc, LPRECT32 r, UINT32 uFlags)
     case DFCS_SCROLLSIZEGRIP:
         /* This one breaks the flow... */
         UITOOLS95_DrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0));
-        hpsave = (HPEN32)SelectObject32(dc, GetStockObject32(NULL_PEN));
-        hbsave = (HBRUSH32)SelectObject32(dc, GetStockObject32(NULL_BRUSH));
+        hpsave = (HPEN)SelectObject(dc, GetStockObject(NULL_PEN));
+        hbsave = (HBRUSH)SelectObject(dc, GetStockObject(NULL_BRUSH));
         if(uFlags & (DFCS_MONO|DFCS_FLAT))
         {
-            hp = hp2 = GetSysColorPen32(COLOR_WINDOWFRAME);
-            hb = hb2 = GetSysColorBrush32(COLOR_WINDOWFRAME);
+            hp = hp2 = GetSysColorPen(COLOR_WINDOWFRAME);
+            hb = hb2 = GetSysColorBrush(COLOR_WINDOWFRAME);
         }
         else
         {
-            hp  = GetSysColorPen32(COLOR_BTNHIGHLIGHT);
-            hp2 = GetSysColorPen32(COLOR_BTNSHADOW);
-            hb  = GetSysColorBrush32(COLOR_BTNHIGHLIGHT);
-            hb2 = GetSysColorBrush32(COLOR_BTNSHADOW);
+            hp  = GetSysColorPen(COLOR_BTNHIGHLIGHT);
+            hp2 = GetSysColorPen(COLOR_BTNSHADOW);
+            hb  = GetSysColorBrush(COLOR_BTNHIGHLIGHT);
+            hb2 = GetSysColorBrush(COLOR_BTNSHADOW);
         }
         Line[0].x = Line[1].x = r->right-1;
         Line[2].y = Line[3].y = r->bottom-1;
@@ -1185,51 +1185,51 @@ static BOOL32 UITOOLS95_DrawFrameScroll(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         Line[3].x = r->right - i - 1;
         Line[1].y = Line[0].y + d46;
         Line[2].x = Line[3].x + d46;
-        SelectObject32(dc, hb);
-        SelectObject32(dc, hp);
-        Polygon32(dc, Line, 4);
+        SelectObject(dc, hb);
+        SelectObject(dc, hp);
+        Polygon(dc, Line, 4);
 
         Line[1].y++; Line[2].x++;
         Line[0].y = Line[1].y + d93;
         Line[3].x = Line[2].x + d93;
-        SelectObject32(dc, hb2);
-        SelectObject32(dc, hp2);
-        Polygon32(dc, Line, 4);
+        SelectObject(dc, hb2);
+        SelectObject(dc, hp2);
+        Polygon(dc, Line, 4);
 
         i = 398*SmallDiam/750;
         Line[0].y = r->bottom - i - 1;
         Line[3].x = r->right - i - 1;
         Line[1].y = Line[0].y + d46;
         Line[2].x = Line[3].x + d46;
-        SelectObject32(dc, hb);
-        SelectObject32(dc, hp);
-        Polygon32(dc, Line, 4);
+        SelectObject(dc, hb);
+        SelectObject(dc, hp);
+        Polygon(dc, Line, 4);
 
         Line[1].y++; Line[2].x++;
         Line[0].y = Line[1].y + d93;
         Line[3].x = Line[2].x + d93;
-        SelectObject32(dc, hb2);
-        SelectObject32(dc, hp2);
-        Polygon32(dc, Line, 4);
+        SelectObject(dc, hb2);
+        SelectObject(dc, hp2);
+        Polygon(dc, Line, 4);
 
         i = 210*SmallDiam/750;
         Line[0].y = r->bottom - i - 1;
         Line[3].x = r->right - i - 1;
         Line[1].y = Line[0].y + d46;
         Line[2].x = Line[3].x + d46;
-        SelectObject32(dc, hb);
-        SelectObject32(dc, hp);
-        Polygon32(dc, Line, 4);
+        SelectObject(dc, hb);
+        SelectObject(dc, hp);
+        Polygon(dc, Line, 4);
 
         Line[1].y++; Line[2].x++;
         Line[0].y = Line[1].y + d93;
         Line[3].x = Line[2].x + d93;
-        SelectObject32(dc, hb2);
-        SelectObject32(dc, hp2);
-        Polygon32(dc, Line, 4);
+        SelectObject(dc, hb2);
+        SelectObject(dc, hp2);
+        Polygon(dc, Line, 4);
 
-        SelectObject32(dc, hpsave);
-        SelectObject32(dc, hbsave);
+        SelectObject(dc, hpsave);
+        SelectObject(dc, hbsave);
         return TRUE;
 
     default:
@@ -1242,11 +1242,11 @@ static BOOL32 UITOOLS95_DrawFrameScroll(HDC32 dc, LPRECT32 r, UINT32 uFlags)
 
     if(uFlags & DFCS_INACTIVE)
     {
-        hbsave = (HBRUSH32)SelectObject32(dc, GetSysColorBrush32(COLOR_BTNHIGHLIGHT));
-        hpsave = (HPEN32)SelectObject32(dc, GetSysColorPen32(COLOR_BTNHIGHLIGHT));
-        Polygon32(dc, Line, 3);
-        SelectObject32(dc, hpsave);
-        SelectObject32(dc, hbsave);
+        hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
+        hpsave = (HPEN)SelectObject(dc, GetSysColorPen(COLOR_BTNHIGHLIGHT));
+        Polygon(dc, Line, 3);
+        SelectObject(dc, hpsave);
+        SelectObject(dc, hbsave);
     }
 
     for(i = 0; i < 3; i++)
@@ -1256,11 +1256,11 @@ static BOOL32 UITOOLS95_DrawFrameScroll(HDC32 dc, LPRECT32 r, UINT32 uFlags)
     }
 
     i = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT;
-    hbsave = (HBRUSH32)SelectObject32(dc, GetSysColorBrush32(i));
-    hpsave = (HPEN32)SelectObject32(dc, GetSysColorPen32(i));
-    Polygon32(dc, Line, 3);
-    SelectObject32(dc, hpsave);
-    SelectObject32(dc, hbsave);
+    hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i));
+    hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i));
+    Polygon(dc, Line, 3);
+    SelectObject(dc, hpsave);
+    SelectObject(dc, hbsave);
 
     return TRUE;
 }
@@ -1270,27 +1270,27 @@ static BOOL32 UITOOLS95_DrawFrameScroll(HDC32 dc, LPRECT32 r, UINT32 uFlags)
  *
  * Draw a menu control coming from DrawFrameControl()
  */
-static BOOL32 UITOOLS95_DrawFrameMenu(HDC32 dc, LPRECT32 r, UINT32 uFlags)
+static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
 {
-    POINT32 Points[6];
-    RECT32 myr;
+    POINT Points[6];
+    RECT myr;
     int SmallDiam = UITOOLS_MakeSquareRect(r, &myr);
     int i;
-    HBRUSH32 hbsave;
-    HPEN32 hpsave;
+    HBRUSH hbsave;
+    HPEN hpsave;
     int xe, ye;
     int xc, yc;
-    BOOL32 retval = TRUE;
+    BOOL retval = TRUE;
 
     /* Using black and white seems to be utterly wrong, but win95 doesn't */
     /* use anything else. I think I tried all sys-colors to change things */
     /* without luck. It seems as if this behavior is inherited from the */
     /* win31 DFC() implementation... (you remember, B/W menus). */
 
-    FillRect32(dc, r, (HBRUSH32)GetStockObject32(WHITE_BRUSH));
+    FillRect(dc, r, (HBRUSH)GetStockObject(WHITE_BRUSH));
 
-    hbsave = (HBRUSH32)SelectObject32(dc, GetStockObject32(BLACK_BRUSH));
-    hpsave = (HPEN32)SelectObject32(dc, GetStockObject32(BLACK_PEN));
+    hbsave = (HBRUSH)SelectObject(dc, GetStockObject(BLACK_BRUSH));
+    hpsave = (HPEN)SelectObject(dc, GetStockObject(BLACK_PEN));
 
     switch(uFlags & 0xff)
     {
@@ -1301,7 +1301,7 @@ static BOOL32 UITOOLS95_DrawFrameMenu(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         Points[0].y = Points[2].y - i;
         Points[1].y = Points[2].y + i;
         Points[0].x = Points[1].x = Points[2].x - i;
-        Polygon32(dc, Points, 3);
+        Polygon(dc, Points, 3);
         break;
 
     case DFCS_MENUBULLET:
@@ -1315,7 +1315,7 @@ static BOOL32 UITOOLS95_DrawFrameMenu(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         myr.right  = xc + i/2;
         myr.top    = yc - i+i/2;
         myr.bottom = yc + i/2;
-        Pie32(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
+        Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
         break;
 
     case DFCS_MENUCHECK:
@@ -1331,7 +1331,7 @@ static BOOL32 UITOOLS95_DrawFrameMenu(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         Points[4].y = Points[1].y + 3*SmallDiam/16;
         Points[5].x = Points[0].x;
         Points[5].y = Points[0].y + 3*SmallDiam/16;
-        Polygon32(dc, Points, 6);
+        Polygon(dc, Points, 6);
         break;
 
     default:
@@ -1340,8 +1340,8 @@ static BOOL32 UITOOLS95_DrawFrameMenu(HDC32 dc, LPRECT32 r, UINT32 uFlags)
         break;
     }
 
-    SelectObject32(dc, hpsave);
-    SelectObject32(dc, hbsave);
+    SelectObject(dc, hpsave);
+    SelectObject(dc, hbsave);
     return retval;
 }
 
@@ -1352,11 +1352,11 @@ static BOOL32 UITOOLS95_DrawFrameMenu(HDC32 dc, LPRECT32 r, UINT32 uFlags)
 BOOL16 WINAPI DrawFrameControl16( HDC16 hdc, LPRECT16 rc, UINT16 uType,
                                   UINT16 uState )
 {
-    RECT32 rect32;
-    BOOL32 ret;
+    RECT rect32;
+    BOOL ret;
 
     CONV_RECT16TO32( rc, &rect32 );
-    ret = DrawFrameControl32( hdc, &rect32, uType, uState );
+    ret = DrawFrameControl( hdc, &rect32, uType, uState );
     CONV_RECT32TO16( &rect32, rc );
     return ret;
 }
@@ -1365,11 +1365,11 @@ BOOL16 WINAPI DrawFrameControl16( HDC16 hdc, LPRECT16 rc, UINT16 uType,
 /**********************************************************************
  *          DrawFrameControl32  (USER32.158)
  */
-BOOL32 WINAPI DrawFrameControl32( HDC32 hdc, LPRECT32 rc, UINT32 uType,
-                                  UINT32 uState )
+BOOL WINAPI DrawFrameControl( HDC hdc, LPRECT rc, UINT uType,
+                                  UINT uState )
 {
     /* Win95 doesn't support drawing in other mapping modes */
-    if(GetMapMode32(hdc) != MM_TEXT)
+    if(GetMapMode(hdc) != MM_TEXT)
         return FALSE;
         
     switch(uType)
diff --git a/controls/widgets.c b/controls/widgets.c
index fc409afd88d..f93207ed660 100644
--- a/controls/widgets.c
+++ b/controls/widgets.c
@@ -19,64 +19,64 @@
 
 /* Window procedures */
 
-extern LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
-                                   WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 msg,
-                                    WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI ComboLBWndProc( HWND32 hwnd, UINT32 msg,
-                                      WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
-                                      WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI PopupMenuWndProc( HWND32 hwnd, UINT32 msg,
-                                        WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI IconTitleWndProc( HWND32 hwnd, UINT32 msg,
-                                        WPARAM32 wParam, LPARAM lParam );
+extern LRESULT WINAPI EditWndProc( HWND hwnd, UINT msg,
+                                   WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI ComboWndProc( HWND hwnd, UINT msg,
+                                    WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI ComboLBWndProc( HWND hwnd, UINT msg,
+                                      WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI ListBoxWndProc( HWND hwnd, UINT msg,
+                                      WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT msg,
+                                        WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI IconTitleWndProc( HWND hwnd, UINT msg,
+                                        WPARAM wParam, LPARAM lParam );
 
 /* Built-in classes */
 
-static WNDCLASS32A WIDGETS_BuiltinClasses[BIC32_NB_CLASSES] =
+static WNDCLASSA WIDGETS_BuiltinClasses[BIC32_NB_CLASSES] =
 {
     /* BIC32_BUTTON */
     { CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC,
       ButtonWndProc, 0, sizeof(BUTTONINFO), 0, 0,
-      (HCURSOR32)IDC_ARROW32A, 0, 0, "Button" },
+      (HCURSOR)IDC_ARROWA, 0, 0, "Button" },
     /* BIC32_EDIT */
     { CS_GLOBALCLASS | CS_DBLCLKS /*| CS_PARENTDC*/,
       EditWndProc, 0, sizeof(void *), 0, 0,
-      (HCURSOR32)IDC_IBEAM32A, 0, 0, "Edit" },
+      (HCURSOR)IDC_IBEAMA, 0, 0, "Edit" },
     /* BIC32_LISTBOX */
     { CS_GLOBALCLASS | CS_DBLCLKS /*| CS_PARENTDC*/,
       ListBoxWndProc, 0, sizeof(void *), 0, 0,
-      (HCURSOR32)IDC_ARROW32A, 0, 0, "ListBox" },
+      (HCURSOR)IDC_ARROWA, 0, 0, "ListBox" },
     /* BIC32_COMBO */
     { CS_GLOBALCLASS | CS_PARENTDC | CS_DBLCLKS, 
       ComboWndProc, 0, sizeof(void *), 0, 0,
-      (HCURSOR32)IDC_ARROW32A, 0, 0, "ComboBox" },
+      (HCURSOR)IDC_ARROWA, 0, 0, "ComboBox" },
     /* BIC32_COMBOLB */
     { CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS, ComboLBWndProc,
-      0, sizeof(void *), 0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, "ComboLBox" },
+      0, sizeof(void *), 0, 0, (HCURSOR)IDC_ARROWA, 0, 0, "ComboLBox" },
     /* BIC32_POPUPMENU */
-    { CS_GLOBALCLASS | CS_SAVEBITS, PopupMenuWndProc, 0, sizeof(HMENU32),
-      0, 0, (HCURSOR32)IDC_ARROW32A, NULL_BRUSH, 0, POPUPMENU_CLASS_NAME },
+    { CS_GLOBALCLASS | CS_SAVEBITS, PopupMenuWndProc, 0, sizeof(HMENU),
+      0, 0, (HCURSOR)IDC_ARROWA, NULL_BRUSH, 0, POPUPMENU_CLASS_NAME },
     /* BIC32_STATIC */
     { CS_GLOBALCLASS | CS_PARENTDC, StaticWndProc,
-      0, sizeof(STATICINFO), 0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, "Static" },
+      0, sizeof(STATICINFO), 0, 0, (HCURSOR)IDC_ARROWA, 0, 0, "Static" },
     /* BIC32_SCROLL */
     { CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC,
       ScrollBarWndProc, 0, sizeof(SCROLLBAR_INFO), 0, 0,
-      (HCURSOR32)IDC_ARROW32A, 0, 0, "ScrollBar"},
+      (HCURSOR)IDC_ARROWA, 0, 0, "ScrollBar"},
     /* BIC32_MDICLIENT */
     { CS_GLOBALCLASS, MDIClientWndProc,
       0, sizeof(MDICLIENTINFO), 0, 0, 0, STOCK_LTGRAY_BRUSH, 0, "MDIClient" },
     /* BIC32_DESKTOP */
     { CS_GLOBALCLASS, DesktopWndProc, 0, sizeof(DESKTOP),
-      0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, DESKTOP_CLASS_NAME },
+      0, 0, (HCURSOR)IDC_ARROWA, 0, 0, DESKTOP_CLASS_NAME },
     /* BIC32_DIALOG */
-    { CS_GLOBALCLASS | CS_SAVEBITS, DefDlgProc32A, 0, DLGWINDOWEXTRA,
-      0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, DIALOG_CLASS_NAME },
+    { CS_GLOBALCLASS | CS_SAVEBITS, DefDlgProcA, 0, DLGWINDOWEXTRA,
+      0, 0, (HCURSOR)IDC_ARROWA, 0, 0, DIALOG_CLASS_NAME },
     /* BIC32_ICONTITLE */
     { CS_GLOBALCLASS, IconTitleWndProc, 0, 0, 
-      0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, ICONTITLE_CLASS_NAME }
+      0, 0, (HCURSOR)IDC_ARROWA, 0, 0, ICONTITLE_CLASS_NAME }
 };
 
 static ATOM bicAtomTable[BIC32_NB_CLASSES];
@@ -86,10 +86,10 @@ static ATOM bicAtomTable[BIC32_NB_CLASSES];
  * 
  * Initialize the built-in window classes.
  */
-BOOL32 WIDGETS_Init(void)
+BOOL WIDGETS_Init(void)
 {
     int i;
-    WNDCLASS32A *cls = WIDGETS_BuiltinClasses;
+    WNDCLASSA *cls = WIDGETS_BuiltinClasses;
 
     /* Create builtin classes */
 
@@ -99,8 +99,8 @@ BOOL32 WIDGETS_Init(void)
         /* Just to make sure the string is > 0x10000 */
         strcpy( name, (char *)cls->lpszClassName );
         cls->lpszClassName = name;
-        cls->hCursor = LoadCursor32A( 0, (LPCSTR)cls->hCursor );
-        if (!(bicAtomTable[i] = RegisterClass32A( cls ))) return FALSE;
+        cls->hCursor = LoadCursorA( 0, (LPCSTR)cls->hCursor );
+        if (!(bicAtomTable[i] = RegisterClassA( cls ))) return FALSE;
     }
 
     return TRUE;
@@ -112,7 +112,7 @@ BOOL32 WIDGETS_Init(void)
  *
  * Check whether pWnd is a built-in control or not.
  */
-BOOL32	WIDGETS_IsControl32( WND* pWnd, BUILTIN_CLASS32 cls )
+BOOL	WIDGETS_IsControl( WND* pWnd, BUILTIN_CLASS32 cls )
 {
     assert( cls < BIC32_NB_CLASSES );
     return (pWnd->class->atomName == bicAtomTable[cls]);
diff --git a/debugger/break.c b/debugger/break.c
index b0252deb7f0..4db5a38174b 100644
--- a/debugger/break.c
+++ b/debugger/break.c
@@ -71,7 +71,7 @@ static void DEBUG_SetOpcode( const DBG_ADDR *addr, BYTE op )
  * Determine if the instruction at CS:EIP is an instruction that
  * we need to step over (like a call or a repetitive string move).
  */
-static BOOL32 DEBUG_IsStepOverInstr()
+static BOOL DEBUG_IsStepOverInstr()
 {
     BYTE *instr = (BYTE *)CTX_SEG_OFF_TO_LIN( &DEBUG_context,
                                               CS_reg(&DEBUG_context),
@@ -139,7 +139,7 @@ static BOOL32 DEBUG_IsStepOverInstr()
  * Determine if the instruction at CS:EIP is an instruction that
  * is a function return.
  */
-BOOL32 DEBUG_IsFctReturn(void)
+BOOL DEBUG_IsFctReturn(void)
 {
     BYTE *instr = (BYTE *)CTX_SEG_OFF_TO_LIN( &DEBUG_context,
                                               CS_reg(&DEBUG_context),
@@ -164,7 +164,7 @@ BOOL32 DEBUG_IsFctReturn(void)
  *
  * Set or remove all the breakpoints.
  */
-void DEBUG_SetBreakpoints( BOOL32 set )
+void DEBUG_SetBreakpoints( BOOL set )
 {
     int i;
 
@@ -291,7 +291,7 @@ void DEBUG_DelBreakpoint( int num )
  *
  * Enable or disable a break point.
  */
-void DEBUG_EnableBreakpoint( int num, BOOL32 enable )
+void DEBUG_EnableBreakpoint( int num, BOOL enable )
 {
     if ((num <= 0) || (num >= next_bp) || !breakpoints[num].in_use)
     {
@@ -357,7 +357,7 @@ void DEBUG_AddTaskEntryBreakpoint( HTASK16 hTask )
         if (!(pModule->flags & NE_FFLAGS_WIN32))  /* NE module */
         {
             addr.seg =
-		GlobalHandleToSel(NE_SEG_TABLE(pModule)[pModule->cs-1].hSeg);
+		GlobalHandleToSel16(NE_SEG_TABLE(pModule)[pModule->cs-1].hSeg);
             addr.off = pModule->ip;
             fprintf( stderr, "Win16 task '%s': ", NE_MODULE_NAME( pModule ) );
             DEBUG_AddBreakpoint( &addr );
@@ -382,7 +382,7 @@ void DEBUG_AddTaskEntryBreakpoint( HTASK16 hTask )
  * Determine if we should continue execution after a SIGTRAP signal when
  * executing in the given mode.
  */
-BOOL32 DEBUG_ShouldContinue( enum exec_mode mode, int * count )
+BOOL DEBUG_ShouldContinue( enum exec_mode mode, int * count )
 {
     DBG_ADDR addr;
     DBG_ADDR cond_addr;
diff --git a/debugger/db_disasm.c b/debugger/db_disasm.c
index 0345b039d8c..62e121d3ddd 100644
--- a/debugger/db_disasm.c
+++ b/debugger/db_disasm.c
@@ -68,14 +68,14 @@
 /*
  * Switch to disassemble 16-bit code.
  */
-static BOOL32 db_disasm_16 = FALSE;
+static BOOL db_disasm_16 = FALSE;
 
 /*
  * Flag to indicate whether we need to display instruction,
  * or whether we just need to know the address of the next
  * instruction.
  */
-static BOOL32 db_display = FALSE;
+static BOOL db_display = FALSE;
 
 /*
  * Size attributes
@@ -1152,7 +1152,7 @@ void DEBUG_Disasm( DBG_ADDR *addr, int display )
 	int	i_size;
 	int	i_mode;
 	int	regmodrm = 0;
-	BOOL32  first;
+	BOOL  first;
 	int	displ;
 	int	prefix;
 	int	imm;
diff --git a/debugger/dbg.y b/debugger/dbg.y
index 8f74fad4f59..5f87f5c0874 100644
--- a/debugger/dbg.y
+++ b/debugger/dbg.y
@@ -415,10 +415,10 @@ void mode_command(int newmode)
 static void DEBUG_Main( int signal )
 {
     static int loaded_symbols = 0;
-    static BOOL32 in_debugger = FALSE;
+    static BOOL in_debugger = FALSE;
     char SymbolTableFile[256];
     int newmode;
-    BOOL32 ret_ok;
+    BOOL ret_ok;
 #ifdef YYDEBUG
     yydebug = 0;
 #endif
@@ -573,10 +573,10 @@ static void DEBUG_Main( int signal )
 /***********************************************************************
  *           DebugBreak   (KERNEL.203) (KERNEL32.181)
  */
-void DebugBreak( CONTEXT *regs )
+void DebugBreak16( CONTEXT *regs )
 {
     char module[10];
-    if (!GetModuleName( GetCurrentTask(), module, sizeof(module) ))
+    if (!GetModuleName16( GetCurrentTask(), module, sizeof(module) ))
         strcpy( module, "???" );
     fprintf( stderr, "%s called DebugBreak\n", module );
     DEBUG_context = *regs;
diff --git a/debugger/dbgmain.c b/debugger/dbgmain.c
index c372c0c7f28..bb5e012acd6 100644
--- a/debugger/dbgmain.c
+++ b/debugger/dbgmain.c
@@ -66,7 +66,7 @@ void QUEUE_DumpQueue( HQUEUE16 hQueue )
   exit(0);
 }
 
-void WIN_DumpWindow( HWND32 hwnd )
+void WIN_DumpWindow( HWND hwnd )
 {
   exit(0);
 }
@@ -87,7 +87,7 @@ void QUEUE_WalkQueues()
   exit(0);
 }
 
-void WIN_WalkWindows( HWND32 hwnd, int indent )
+void WIN_WalkWindows( HWND hwnd, int indent )
 {
   exit(0);
 }
@@ -112,12 +112,12 @@ LPVOID     GlobalLock16(HGLOBAL16 h)
   exit(0);
 }
 
-BOOL16 ModuleFirst(MODULEENTRY *lpModule)
+BOOL16 ModuleFirst16(MODULEENTRY *lpModule)
 {
   return 0;
 }
 
-BOOL16 ModuleNext(MODULEENTRY *lpModule)
+BOOL16 ModuleNext16(MODULEENTRY *lpModule)
 {
   return 0;
 }
@@ -127,7 +127,7 @@ BOOL16     IsBadReadPtr16(SEGPTR s,UINT16 o)
   exit(0);
 }
 
-BOOL32     IsBadReadPtr32(LPCVOID s,UINT32 o)
+BOOL     IsBadReadPtr(LPCVOID s,UINT o)
 {
   exit(0);
 }
diff --git a/debugger/hash.c b/debugger/hash.c
index f4c18ed5d53..57a094b06af 100644
--- a/debugger/hash.c
+++ b/debugger/hash.c
@@ -58,7 +58,7 @@ struct name_hash
 };
 
 
-static BOOL32 DEBUG_GetStackSymbolValue( const char * name, DBG_ADDR *addr );
+static BOOL DEBUG_GetStackSymbolValue( const char * name, DBG_ADDR *addr );
 static int sortlist_valid = FALSE;
 
 static int sorttab_nsym;
@@ -285,7 +285,7 @@ DEBUG_AddSymbol( const char * name, const DBG_ADDR *addr, const char * source,
     return new;
 }
 
-BOOL32 DEBUG_Normalize(struct name_hash * nh )
+BOOL DEBUG_Normalize(struct name_hash * nh )
 {
 
   /*
@@ -319,7 +319,7 @@ BOOL32 DEBUG_Normalize(struct name_hash * nh )
  *
  * Get the address of a named symbol.
  */
-BOOL32 DEBUG_GetSymbolValue( const char * name, const int lineno, 
+BOOL DEBUG_GetSymbolValue( const char * name, const int lineno, 
 			     DBG_ADDR *addr, int bp_flag )
 {
     char buffer[256];
@@ -368,7 +368,7 @@ BOOL32 DEBUG_GetSymbolValue( const char * name, const int lineno,
  *
  * Get the address of a named symbol.
  */
-BOOL32 DEBUG_GetLineNumberAddr( struct name_hash * nh, const int lineno, 
+BOOL DEBUG_GetLineNumberAddr( struct name_hash * nh, const int lineno, 
 				DBG_ADDR *addr, int bp_flag )
 {
     int i;
@@ -416,7 +416,7 @@ BOOL32 DEBUG_GetLineNumberAddr( struct name_hash * nh, const int lineno,
  *
  * Set the address of a named symbol.
  */
-BOOL32 DEBUG_SetSymbolValue( const char * name, const DBG_ADDR *addr )
+BOOL DEBUG_SetSymbolValue( const char * name, const DBG_ADDR *addr )
 {
     char buffer[256];
     struct name_hash *nh;
@@ -795,7 +795,7 @@ static void DEBUG_LoadEntryPoints16( HMODULE16 hModule, NE_MODULE *pModule,
  *
  * Load the entry points of a Win32 module into the hash table.
  */
-static void DEBUG_LoadEntryPoints32( HMODULE32 hModule, const char *name )
+static void DEBUG_LoadEntryPoints32( HMODULE hModule, const char *name )
 {
 #define RVA(x) (hModule+(DWORD)(x))
 
@@ -879,12 +879,12 @@ void DEBUG_LoadEntryPoints(void)
 {
     MODULEENTRY entry;
     NE_MODULE *pModule;
-    BOOL32 ok;
+    BOOL ok;
     WINE_MODREF	*wm;
     int rowcount = 3;
 
     fprintf( stderr, "   " );
-    for (ok = ModuleFirst(&entry); ok; ok = ModuleNext(&entry))
+    for (ok = ModuleFirst16(&entry); ok; ok = ModuleNext16(&entry))
     {
         if (!(pModule = NE_GetPtr( entry.hModule ))) continue;
         if (!(pModule->flags & NE_FFLAGS_WIN32))  /* NE module */
@@ -1237,7 +1237,7 @@ DEBUG_GetFuncInfo( struct list_id * ret, const char * filename,
  * Get the address of a named symbol from the current stack frame.
  */
 static
-BOOL32 DEBUG_GetStackSymbolValue( const char * name, DBG_ADDR *addr )
+BOOL DEBUG_GetStackSymbolValue( const char * name, DBG_ADDR *addr )
 {
   struct name_hash * curr_func;
   unsigned int	     ebp;
diff --git a/debugger/memory.c b/debugger/memory.c
index e36e76ff5b1..c9e69e32ad5 100644
--- a/debugger/memory.c
+++ b/debugger/memory.c
@@ -21,7 +21,7 @@
  ************************************************************/
 
 #if defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__)
-BOOL32 DEBUG_checkmap_bad( const char *addr, size_t size, int rwflag)
+BOOL DEBUG_checkmap_bad( const char *addr, size_t size, int rwflag)
 {
   FILE *fp;
   char buf[80];      /* temporary line buffer */
@@ -86,7 +86,7 @@ BOOL32 DEBUG_checkmap_bad( const char *addr, size_t size, int rwflag)
 }
 #else  /* linux || FreeBSD */
 /* FIXME: code needed for BSD et al. */
-BOOL32 DEBUG_checkmap_bad(char *addr, size_t size, int rwflag)
+BOOL DEBUG_checkmap_bad(char *addr, size_t size, int rwflag)
 {
     return FALSE;
 }
@@ -98,7 +98,7 @@ BOOL32 DEBUG_checkmap_bad(char *addr, size_t size, int rwflag)
  *
  * Check if we are allowed to read memory at 'address'.
  */
-BOOL32 DEBUG_IsBadReadPtr( const DBG_ADDR *address, int size )
+BOOL DEBUG_IsBadReadPtr( const DBG_ADDR *address, int size )
 {
     if (!IS_SELECTOR_V86(address->seg))
     if (address->seg)  /* segmented addr */
@@ -116,7 +116,7 @@ BOOL32 DEBUG_IsBadReadPtr( const DBG_ADDR *address, int size )
  *
  * Check if we are allowed to write memory at 'address'.
  */
-BOOL32 DEBUG_IsBadWritePtr( const DBG_ADDR *address, int size )
+BOOL DEBUG_IsBadWritePtr( const DBG_ADDR *address, int size )
 {
     if (!IS_SELECTOR_V86(address->seg))
     if (address->seg)  /* segmented addr */
diff --git a/debugger/msc.c b/debugger/msc.c
index 4fb40d62971..50e35d9e89c 100644
--- a/debugger/msc.c
+++ b/debugger/msc.c
@@ -47,13 +47,13 @@ static void LocateDebugInfoFile(char *filename, char *dbg_filename)
     file = strrchr(filename, '\\');
     if( file == NULL ) file = filename; else file++;
 
-    if (GetEnvironmentVariable32A("_NT_SYMBOL_PATH", str1, sizeof(str1)))
-	if (SearchPath32A(str1, file, NULL, sizeof(str2), str2, &name_part))
+    if (GetEnvironmentVariableA("_NT_SYMBOL_PATH", str1, sizeof(str1)))
+	if (SearchPathA(str1, file, NULL, sizeof(str2), str2, &name_part))
 	    goto ok;
-    if (GetEnvironmentVariable32A("_NT_ALT_SYMBOL_PATH", str1, sizeof(str1)))
-	if (SearchPath32A(str1, file, NULL, sizeof(str2), str2, &name_part))
+    if (GetEnvironmentVariableA("_NT_ALT_SYMBOL_PATH", str1, sizeof(str1)))
+	if (SearchPathA(str1, file, NULL, sizeof(str2), str2, &name_part))
 	    goto ok;
-    if (SearchPath32A(NULL, file, NULL, sizeof(str2), str2, &name_part))
+    if (SearchPathA(NULL, file, NULL, sizeof(str2), str2, &name_part))
 	goto ok;
     else
     {
@@ -270,16 +270,16 @@ union codeview_type
 
 };
 
-#define S_BPREL32	0x200
-#define S_LDATA32	0x201
-#define S_GDATA32	0x202
-#define S_PUB32		0x203
-#define S_LPROC32	0x204
-#define S_GPROC32	0x205
-#define S_THUNK32	0x206
-#define S_BLOCK32	0x207
-#define S_WITH32	0x208
-#define S_LABEL32	0x209
+#define S_BPREL	0x200
+#define S_LDATA	0x201
+#define S_GDATA	0x202
+#define S_PUB		0x203
+#define S_LPROC	0x204
+#define S_GPROC	0x205
+#define S_THUNK	0x206
+#define S_BLOCK	0x207
+#define S_WITH	0x208
+#define S_LABEL	0x209
 
 #define S_PROCREF	0x400
 #define S_DATAREF	0x401
@@ -546,7 +546,7 @@ struct deferred_debug_info
 	char				* module_name;
 	char				* dbg_info;
 	int				  dbg_size;
-        HMODULE32                         module;
+        HMODULE                         module;
 	PIMAGE_DEBUG_DIRECTORY           dbgdir;
         PIMAGE_SECTION_HEADER	          sectp;
 	int				  nsect;
@@ -918,7 +918,7 @@ DEBUG_InitCVDataTypes()
  * We don't fully process it here for performance reasons.
  */
 int
-DEBUG_RegisterDebugInfo( HMODULE32 hModule, const char *module_name)
+DEBUG_RegisterDebugInfo( HMODULE hModule, const char *module_name)
 {
   int			  has_codeview = FALSE;
   int			  rtn = FALSE;
@@ -1001,7 +1001,7 @@ DEBUG_RegisterDebugInfo( HMODULE32 hModule, const char *module_name)
                  * debug information. (Note the DataDirectory is mapped, not its content)
                  */
  
-                 if (GetModuleFileName32A(hModule, fn, sizeof(fn)) > 0 &&
+                 if (GetModuleFileNameA(hModule, fn, sizeof(fn)) > 0 &&
                     DOSFS_GetFullName(fn, TRUE, &full_name) &&
                     (fd = open(full_name.long_name, O_RDONLY)) > 0)
                 {
@@ -1675,9 +1675,9 @@ DEBUG_SnarfCodeView(      struct deferred_debug_info * deefer,
       memset(symname, 0, sizeof(symname));
       switch(sym->generic.id)
 	{
-	case S_GDATA32:
-	case S_LDATA32:
-	case S_PUB32:
+	case S_GDATA:
+	case S_LDATA:
+	case S_PUB:
 	  /*
 	   * First, a couple of sanity checks.
 	   */
@@ -1704,7 +1704,7 @@ DEBUG_SnarfCodeView(      struct deferred_debug_info * deefer,
 	    sym->data.offset;
 	  DEBUG_AddSymbol( symname, &new_addr, NULL, SYM_WIN32 | SYM_DATA );
 	  break;
-	case S_THUNK32:
+	case S_THUNK:
 	  /*
 	   * Sort of like a global function, but it just points
 	   * to a thunk, which is a stupid name for what amounts to
@@ -1720,8 +1720,8 @@ DEBUG_SnarfCodeView(      struct deferred_debug_info * deefer,
 				       SYM_WIN32 | SYM_FUNC);
 	  DEBUG_SetSymbolSize(thunk_sym, sym->thunk.thunk_len);
 	  break;
-	case S_GPROC32:
-	case S_LPROC32:
+	case S_GPROC:
+	case S_LPROC:
 	  /*
 	   * Global and static functions.
 	   */
@@ -1785,7 +1785,7 @@ DEBUG_SnarfCodeView(      struct deferred_debug_info * deefer,
 	  DEBUG_SetSymbolBPOff(curr_func, sym->proc.debug_start);
 	  DEBUG_SetSymbolSize(curr_func, sym->proc.proc_len);
 	  break;
-	case S_BPREL32:
+	case S_BPREL:
 	  /*
 	   * Function parameters and stack variables.
 	   */
diff --git a/debugger/registers.c b/debugger/registers.c
index 2e4a0de0d29..dd843d7b6b2 100644
--- a/debugger/registers.c
+++ b/debugger/registers.c
@@ -297,7 +297,7 @@ void DEBUG_InfoRegisters(void)
  * Make sure all registers have a correct value for returning from
  * the signal handler.
  */
-BOOL32 DEBUG_ValidateRegisters(void)
+BOOL DEBUG_ValidateRegisters(void)
 {
     WORD cs, ds;
 
diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
index 2e8691034df..f48f9f1d13b 100644
--- a/dlls/advapi32/advapi.c
+++ b/dlls/advapi32/advapi.c
@@ -18,8 +18,8 @@
 /******************************************************************************
  * GetUserName32A [ADVAPI32.67]
  */
-BOOL32 WINAPI
-GetUserName32A( LPSTR lpszName, LPDWORD lpSize )
+BOOL WINAPI
+GetUserNameA( LPSTR lpszName, LPDWORD lpSize )
 {
   size_t len;
   char *name;
@@ -46,12 +46,12 @@ GetUserName32A( LPSTR lpszName, LPDWORD lpSize )
  *   lpszName []
  *   lpSize   []
  */
-BOOL32 WINAPI
-GetUserName32W( LPWSTR lpszName, LPDWORD lpSize )
+BOOL WINAPI
+GetUserNameW( LPWSTR lpszName, LPDWORD lpSize )
 {
 	LPSTR name = (LPSTR)HeapAlloc( GetProcessHeap(), 0, *lpSize );
 	DWORD	size = *lpSize;
-	BOOL32 res = GetUserName32A(name,lpSize);
+	BOOL res = GetUserNameA(name,lpSize);
 
 	lstrcpynAtoW(lpszName,name,size);
         HeapFree( GetProcessHeap(), 0, name );
diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index b1cd7a8e01f..9174c1f0fa2 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -20,7 +20,7 @@
  * RETURNS TRUE on success, FALSE on failure.
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 CryptAcquireContextA( HCRYPTPROV *phProv, LPCSTR pszContainer,
 		      LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags)
 {
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index 37cb8d4058c..e313ed52751 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -14,7 +14,7 @@
 /******************************************************************************
  * BackupEventLog32A [ADVAPI32.15]
  */
-BOOL32 WINAPI BackupEventLog32A( HANDLE32 hEventLog, LPCSTR lpBackupFileName )
+BOOL WINAPI BackupEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -27,8 +27,8 @@ BOOL32 WINAPI BackupEventLog32A( HANDLE32 hEventLog, LPCSTR lpBackupFileName )
  *   hEventLog        []
  *   lpBackupFileName []
  */
-BOOL32 WINAPI
-BackupEventLog32W( HANDLE32 hEventLog, LPCWSTR lpBackupFileName )
+BOOL WINAPI
+BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -37,7 +37,7 @@ BackupEventLog32W( HANDLE32 hEventLog, LPCWSTR lpBackupFileName )
 /******************************************************************************
  * ClearEventLog32A [ADVAPI32.19]
  */
-BOOL32 WINAPI ClearEventLog32A ( HANDLE32 hEventLog, LPCSTR lpBackupFileName )
+BOOL WINAPI ClearEventLogA ( HANDLE hEventLog, LPCSTR lpBackupFileName )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -46,7 +46,7 @@ BOOL32 WINAPI ClearEventLog32A ( HANDLE32 hEventLog, LPCSTR lpBackupFileName )
 /******************************************************************************
  * ClearEventLog32W [ADVAPI32.20]
  */
-BOOL32 WINAPI ClearEventLog32W ( HANDLE32 hEventLog, LPCWSTR lpBackupFileName )
+BOOL WINAPI ClearEventLogW ( HANDLE hEventLog, LPCWSTR lpBackupFileName )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -55,7 +55,7 @@ BOOL32 WINAPI ClearEventLog32W ( HANDLE32 hEventLog, LPCWSTR lpBackupFileName )
 /******************************************************************************
  * CloseEventLog32 [ADVAPI32.21]
  */
-BOOL32 WINAPI CloseEventLog32 ( HANDLE32 hEventLog )
+BOOL WINAPI CloseEventLog ( HANDLE hEventLog )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -70,7 +70,7 @@ BOOL32 WINAPI CloseEventLog32 ( HANDLE32 hEventLog )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI DeregisterEventSource32( HANDLE32 hEventLog )
+BOOL WINAPI DeregisterEventSource( HANDLE hEventLog )
 {
     FIXME(advapi, "(%d): stub\n",hEventLog);
     return TRUE;
@@ -83,8 +83,8 @@ BOOL32 WINAPI DeregisterEventSource32( HANDLE32 hEventLog )
  *   hEventLog       []
  *   NumberOfRecords []
  */
-BOOL32 WINAPI
-GetNumberOfEventLogRecords32( HANDLE32 hEventLog, PDWORD NumberOfRecords )
+BOOL WINAPI
+GetNumberOfEventLogRecords( HANDLE hEventLog, PDWORD NumberOfRecords )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -97,8 +97,8 @@ GetNumberOfEventLogRecords32( HANDLE32 hEventLog, PDWORD NumberOfRecords )
  *   hEventLog    []
  *   OldestRecord []
  */
-BOOL32 WINAPI
-GetOldestEventLogRecord32( HANDLE32 hEventLog, PDWORD OldestRecord )
+BOOL WINAPI
+GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord )
 {
 	FIXME(advapi,":stub\n");
 	return TRUE;
@@ -111,7 +111,7 @@ GetOldestEventLogRecord32( HANDLE32 hEventLog, PDWORD OldestRecord )
  *   hEventLog []
  *   hEvent    []
  */
-BOOL32 WINAPI NotifyChangeEventLog32( HANDLE32 hEventLog, HANDLE32 hEvent )
+BOOL WINAPI NotifyChangeEventLog( HANDLE hEventLog, HANDLE hEvent )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -120,8 +120,8 @@ BOOL32 WINAPI NotifyChangeEventLog32( HANDLE32 hEventLog, HANDLE32 hEvent )
 /******************************************************************************
  * OpenBackupEventLog32A [ADVAPI32.105]
  */
-HANDLE32 WINAPI
-OpenBackupEventLog32A( LPCSTR lpUNCServerName, LPCSTR lpFileName )
+HANDLE WINAPI
+OpenBackupEventLogA( LPCSTR lpUNCServerName, LPCSTR lpFileName )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -134,8 +134,8 @@ OpenBackupEventLog32A( LPCSTR lpUNCServerName, LPCSTR lpFileName )
  *   lpUNCServerName []
  *   lpFileName      []
  */
-HANDLE32 WINAPI
-OpenBackupEventLog32W( LPCWSTR lpUNCServerName, LPCWSTR lpFileName )
+HANDLE WINAPI
+OpenBackupEventLogW( LPCWSTR lpUNCServerName, LPCWSTR lpFileName )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -144,7 +144,7 @@ OpenBackupEventLog32W( LPCWSTR lpUNCServerName, LPCWSTR lpFileName )
 /******************************************************************************
  * OpenEventLog32A [ADVAPI32.107]
  */
-HANDLE32 WINAPI OpenEventLog32A(LPCSTR uncname,LPCSTR source) 
+HANDLE WINAPI OpenEventLogA(LPCSTR uncname,LPCSTR source) 
 {
 	FIXME(advapi,"(%s,%s),stub!\n",uncname,source);
 	return 0xcafe4242;
@@ -157,8 +157,8 @@ HANDLE32 WINAPI OpenEventLog32A(LPCSTR uncname,LPCSTR source)
  *   uncname []
  *   source  []
  */
-HANDLE32 WINAPI
-OpenEventLog32W( LPCWSTR uncname, LPCWSTR source )
+HANDLE WINAPI
+OpenEventLogW( LPCWSTR uncname, LPCWSTR source )
 {
 	FIXME(advapi,"stub\n");
 	return TRUE;
@@ -167,7 +167,7 @@ OpenEventLog32W( LPCWSTR uncname, LPCWSTR source )
 /******************************************************************************
  * ReadEventLog32A [ADVAPI32.124]
  */
-BOOL32 WINAPI ReadEventLog32A( HANDLE32 hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
+BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
     LPVOID lpBuffer, DWORD nNumberOfBytesToRead, DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded )
 {
 	FIXME(advapi,"stub\n");
@@ -186,8 +186,8 @@ BOOL32 WINAPI ReadEventLog32A( HANDLE32 hEventLog, DWORD dwReadFlags, DWORD dwRe
  *   pnBytesRead              []
  *   pnMinNumberOfBytesNeeded []
  */
-BOOL32 WINAPI
-ReadEventLog32W( HANDLE32 hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
+BOOL WINAPI
+ReadEventLogW( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
                  LPVOID lpBuffer, DWORD nNumberOfBytesToRead, 
                  DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded )
 {
@@ -198,11 +198,11 @@ ReadEventLog32W( HANDLE32 hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
 /******************************************************************************
  * RegisterEventSource32A [ADVAPI32.174]
  */
-HANDLE32 WINAPI RegisterEventSource32A( LPCSTR lpUNCServerName, LPCSTR lpSourceName )
+HANDLE WINAPI RegisterEventSourceA( LPCSTR lpUNCServerName, LPCSTR lpSourceName )
 {
     LPWSTR lpUNCServerNameW = HEAP_strdupAtoW(GetProcessHeap(),0,lpUNCServerName);
     LPWSTR lpSourceNameW = HEAP_strdupAtoW(GetProcessHeap(),0,lpSourceName);
-    HANDLE32 ret = RegisterEventSource32W(lpUNCServerNameW,lpSourceNameW);
+    HANDLE ret = RegisterEventSourceW(lpUNCServerNameW,lpSourceNameW);
     HeapFree(GetProcessHeap(),0,lpSourceNameW);
     HeapFree(GetProcessHeap(),0,lpUNCServerNameW);
     return ret;
@@ -220,8 +220,8 @@ HANDLE32 WINAPI RegisterEventSource32A( LPCSTR lpUNCServerName, LPCSTR lpSourceN
  *    Success: Handle
  *    Failure: NULL
  */
-HANDLE32 WINAPI
-RegisterEventSource32W( LPCWSTR lpUNCServerName, LPCWSTR lpSourceName )
+HANDLE WINAPI
+RegisterEventSourceW( LPCWSTR lpUNCServerName, LPCWSTR lpSourceName )
 {
     FIXME(advapi, "(%s,%s): stub\n", debugstr_w(lpUNCServerName),
           debugstr_w(lpSourceName));
@@ -231,7 +231,7 @@ RegisterEventSource32W( LPCWSTR lpUNCServerName, LPCWSTR lpSourceName )
 /******************************************************************************
  * ReportEvent32A [ADVAPI32.178]
  */
-BOOL32 WINAPI ReportEvent32A ( HANDLE32 hEventLog, WORD wType, WORD wCategory, DWORD dwEventID,
+BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID,
     PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCSTR *lpStrings, LPVOID lpRawData)
 {
 	FIXME(advapi,"stub\n");
@@ -252,8 +252,8 @@ BOOL32 WINAPI ReportEvent32A ( HANDLE32 hEventLog, WORD wType, WORD wCategory, D
  *   lpStrings   []
  *   lpRawData   []
  */
-BOOL32 WINAPI
-ReportEvent32W( HANDLE32 hEventLog, WORD wType, WORD wCategory, 
+BOOL WINAPI
+ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, 
                 DWORD dwEventID, PSID lpUserSid, WORD wNumStrings, 
                 DWORD dwDataSize, LPCWSTR *lpStrings, LPVOID lpRawData )
 {
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 9f4d5e9f23e..e01f08838a3 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -21,18 +21,18 @@
 	}
 
 /* FIXME: move it to a header */
-BOOL32 WINAPI IsValidSid (PSID pSid);
-BOOL32 WINAPI EqualSid (PSID pSid1, PSID pSid2);
-BOOL32 WINAPI EqualPrefixSid (PSID pSid1, PSID pSid2);
+BOOL WINAPI IsValidSid (PSID pSid);
+BOOL WINAPI EqualSid (PSID pSid1, PSID pSid2);
+BOOL WINAPI EqualPrefixSid (PSID pSid1, PSID pSid2);
 DWORD  WINAPI GetSidLengthRequired (BYTE nSubAuthorityCount);
-BOOL32 WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, BYTE nSubAuthorityCount, DWORD nSubAuthority0, DWORD nSubAuthority1, DWORD nSubAuthority2, DWORD nSubAuthority3,    DWORD nSubAuthority4, DWORD nSubAuthority5, DWORD nSubAuthority6, DWORD nSubAuthority7, PSID *pSid);
+BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, BYTE nSubAuthorityCount, DWORD nSubAuthority0, DWORD nSubAuthority1, DWORD nSubAuthority2, DWORD nSubAuthority3,    DWORD nSubAuthority4, DWORD nSubAuthority5, DWORD nSubAuthority6, DWORD nSubAuthority7, PSID *pSid);
 VOID*  WINAPI FreeSid(PSID pSid);
-BOOL32 WINAPI InitializeSid (PSID pSid, PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, BYTE nSubAuthorityCount);
+BOOL WINAPI InitializeSid (PSID pSid, PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, BYTE nSubAuthorityCount);
 PSID_IDENTIFIER_AUTHORITY WINAPI GetSidIdentifierAuthority(PSID pSid);
 DWORD* WINAPI GetSidSubAuthority(PSID pSid, DWORD nSubAuthority);
 BYTE*  WINAPI GetSidSubAuthorityCount(PSID pSid);
 DWORD  WINAPI GetLengthSid(PSID pSid);
-BOOL32 WINAPI CopySid(DWORD nDestinationSidLength, PSID pDestinationSid, PSID pSourceSid);
+BOOL WINAPI CopySid(DWORD nDestinationSidLength, PSID pDestinationSid, PSID pSourceSid);
 
 /*	##############################
 	######	TOKEN FUNCTIONS ######
@@ -50,9 +50,9 @@ BOOL32 WINAPI CopySid(DWORD nDestinationSidLength, PSID pDestinationSid, PSID pS
  *
  * RETURNS STD
  */
-BOOL32 WINAPI
-OpenProcessToken( HANDLE32 ProcessHandle, DWORD DesiredAccess, 
-                  HANDLE32 *TokenHandle )
+BOOL WINAPI
+OpenProcessToken( HANDLE ProcessHandle, DWORD DesiredAccess, 
+                  HANDLE *TokenHandle )
 {
 	FIXME(advapi,"(%08x,%08lx,%p): stub\n",ProcessHandle,DesiredAccess, TokenHandle);
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -70,8 +70,8 @@ OpenProcessToken( HANDLE32 ProcessHandle, DWORD DesiredAccess,
  *   PreviousState        []
  *   ReturnLength         []
  */
-BOOL32 WINAPI
-AdjustTokenPrivileges( HANDLE32 TokenHandle, BOOL32 DisableAllPrivileges,
+BOOL WINAPI
+AdjustTokenPrivileges( HANDLE TokenHandle, BOOL DisableAllPrivileges,
                        LPVOID NewState, DWORD BufferLength, 
                        LPVOID PreviousState, LPDWORD ReturnLength )
 {	FIXME(advapi, "stub\n"); 
@@ -88,9 +88,9 @@ AdjustTokenPrivileges( HANDLE32 TokenHandle, BOOL32 DisableAllPrivileges,
  *   openasself    []
  *   thandle       []
  */
-BOOL32 WINAPI
-OpenThreadToken( HANDLE32 thread, DWORD desiredaccess, BOOL32 openasself,
-                 HANDLE32 *thandle )
+BOOL WINAPI
+OpenThreadToken( HANDLE thread, DWORD desiredaccess, BOOL openasself,
+                 HANDLE *thandle )
 {
 	FIXME(advapi,"(%08x,%08lx,%d,%p): stub!\n",
 	      thread,desiredaccess,openasself,thandle);
@@ -111,8 +111,8 @@ OpenThreadToken( HANDLE32 thread, DWORD desiredaccess, BOOL32 openasself,
  * FIXME
  *   tokeninfoclas should be TOKEN_INFORMATION_CLASS
  */
-BOOL32 WINAPI
-GetTokenInformation( HANDLE32 token, DWORD tokeninfoclass, LPVOID tokeninfo,
+BOOL WINAPI
+GetTokenInformation( HANDLE token, DWORD tokeninfoclass, LPVOID tokeninfo,
                      DWORD tokeninfolength, LPDWORD retlen )
 {
 	FIXME(advapi,"(%08x,%ld,%p,%ld,%p): stub\n",
@@ -141,7 +141,7 @@ GetTokenInformation( HANDLE32 token, DWORD tokeninfoclass, LPVOID tokeninfo,
  *   nSubAuthority7       []
  *   pSid                 []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 AllocateAndInitializeSid( PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
                           BYTE nSubAuthorityCount,
                           DWORD nSubAuthority0, DWORD nSubAuthority1,
@@ -200,7 +200,7 @@ FreeSid( PSID pSid )
  *   pDestinationSid       []
  *   pSourceSid            []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 CopySid( DWORD nDestinationSidLength, PSID pDestinationSid, PSID pSourceSid )
 {
 
@@ -221,7 +221,7 @@ CopySid( DWORD nDestinationSidLength, PSID pDestinationSid, PSID pSourceSid )
  * PARAMS
  *   pSid []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 IsValidSid( PSID pSid )
 {
     if (!pSid || pSid->Revision != SID_REVISION)
@@ -237,7 +237,7 @@ IsValidSid( PSID pSid )
  *   pSid1 []
  *   pSid2 []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 EqualSid( PSID pSid1, PSID pSid2 )
 {
     if (!IsValidSid(pSid1) || !IsValidSid(pSid2))
@@ -255,7 +255,7 @@ EqualSid( PSID pSid1, PSID pSid2 )
 /******************************************************************************
  * EqualPrefixSid [ADVAPI32.39]
  */
-BOOL32 WINAPI EqualPrefixSid (PSID pSid1, PSID pSid2) {
+BOOL WINAPI EqualPrefixSid (PSID pSid1, PSID pSid2) {
     if (!IsValidSid(pSid1) || !IsValidSid(pSid2))
         return FALSE;
 
@@ -287,7 +287,7 @@ GetSidLengthRequired( BYTE nSubAuthorityCount )
  * PARAMS
  *   pIdentifierAuthority []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 InitializeSid (PSID pSid, PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
                     BYTE nSubAuthorityCount)
 {
@@ -366,7 +366,7 @@ GetLengthSid (PSID pSid)
  *   pDescr   []
  *   revision []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 InitializeSecurityDescriptor( SECURITY_DESCRIPTOR *pDescr, DWORD revision )
 {
 	CallWin32ToNt (RtlCreateSecurityDescriptor(pDescr, revision ));
@@ -387,9 +387,9 @@ DWORD WINAPI GetSecurityDescriptorLength( SECURITY_DESCRIPTOR *pDescr)
  *   pOwner            []
  *   lpbOwnerDefaulted []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 GetSecurityDescriptorOwner( SECURITY_DESCRIPTOR *pDescr, PSID *pOwner,
-			    LPBOOL32 lpbOwnerDefaulted )
+			    LPBOOL lpbOwnerDefaulted )
 {
 	CallWin32ToNt (RtlGetOwnerSecurityDescriptor( pDescr, pOwner, (PBOOLEAN)lpbOwnerDefaulted ));
 }
@@ -399,26 +399,26 @@ GetSecurityDescriptorOwner( SECURITY_DESCRIPTOR *pDescr, PSID *pOwner,
  *
  * PARAMS
  */
-BOOL32 SetSecurityDescriptorOwner( PSECURITY_DESCRIPTOR pSecurityDescriptor, 
-				   PSID pOwner, BOOL32 bOwnerDefaulted)
+BOOL SetSecurityDescriptorOwner( PSECURITY_DESCRIPTOR pSecurityDescriptor, 
+				   PSID pOwner, BOOL bOwnerDefaulted)
 {
 	CallWin32ToNt (RtlSetOwnerSecurityDescriptor(pSecurityDescriptor, pOwner, bOwnerDefaulted));
 }
 /******************************************************************************
  * GetSecurityDescriptorGroup			[ADVAPI32.54]
  */
-BOOL32 WINAPI GetSecurityDescriptorGroup(
+BOOL WINAPI GetSecurityDescriptorGroup(
 	PSECURITY_DESCRIPTOR SecurityDescriptor,
 	PSID *Group,
-	LPBOOL32 GroupDefaulted)
+	LPBOOL GroupDefaulted)
 {
 	CallWin32ToNt (RtlGetGroupSecurityDescriptor(SecurityDescriptor, Group, (PBOOLEAN)GroupDefaulted));
 }	
 /******************************************************************************
  * SetSecurityDescriptorGroup
  */
-BOOL32 WINAPI SetSecurityDescriptorGroup ( PSECURITY_DESCRIPTOR SecurityDescriptor,
-					   PSID Group, BOOL32 GroupDefaulted)
+BOOL WINAPI SetSecurityDescriptorGroup ( PSECURITY_DESCRIPTOR SecurityDescriptor,
+					   PSID Group, BOOL GroupDefaulted)
 {
 	CallWin32ToNt (RtlSetGroupSecurityDescriptor( SecurityDescriptor, Group, GroupDefaulted));
 }
@@ -429,7 +429,7 @@ BOOL32 WINAPI SetSecurityDescriptorGroup ( PSECURITY_DESCRIPTOR SecurityDescript
  * PARAMS
  *   lpsecdesc []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 IsValidSecurityDescriptor( PSECURITY_DESCRIPTOR SecurityDescriptor )
 {
 	CallWin32ToNt (RtlValidSecurityDescriptor(SecurityDescriptor));
@@ -438,11 +438,11 @@ IsValidSecurityDescriptor( PSECURITY_DESCRIPTOR SecurityDescriptor )
 /******************************************************************************
  *  GetSecurityDescriptorDacl			[ADVAPI.91]
  */
-BOOL32 WINAPI GetSecurityDescriptorDacl(
+BOOL WINAPI GetSecurityDescriptorDacl(
 	IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
-	OUT LPBOOL32 lpbDaclPresent,
+	OUT LPBOOL lpbDaclPresent,
 	OUT PACL *pDacl,
-	OUT LPBOOL32 lpbDaclDefaulted)
+	OUT LPBOOL lpbDaclDefaulted)
 {
 	CallWin32ToNt (RtlGetDaclSecurityDescriptor(pSecurityDescriptor, (PBOOLEAN)lpbDaclPresent,
 					       pDacl, (PBOOLEAN)lpbDaclDefaulted));
@@ -451,20 +451,20 @@ BOOL32 WINAPI GetSecurityDescriptorDacl(
 /******************************************************************************
  *  SetSecurityDescriptorDacl			[ADVAPI.224]
  */
-BOOL32 WINAPI 
-SetSecurityDescriptorDacl ( PSECURITY_DESCRIPTOR lpsd, BOOL32 daclpresent,
-			    PACL dacl, BOOL32 dacldefaulted )
+BOOL WINAPI 
+SetSecurityDescriptorDacl ( PSECURITY_DESCRIPTOR lpsd, BOOL daclpresent,
+			    PACL dacl, BOOL dacldefaulted )
 {
 	CallWin32ToNt (RtlSetDaclSecurityDescriptor (lpsd, daclpresent, dacl, dacldefaulted ));
 }	
 /**************************************************************************
  * SetSecurityDescriptorSacl			[NTDLL.488]
  */
-BOOL32  WINAPI SetSecurityDescriptorSacl (
+BOOL  WINAPI SetSecurityDescriptorSacl (
 	PSECURITY_DESCRIPTOR lpsd,
-	BOOL32 saclpresent,
+	BOOL saclpresent,
 	PACL sacl,
-	BOOL32 sacldefaulted)
+	BOOL sacldefaulted)
 {
 	CallWin32ToNt (RtlSetSaclSecurityDescriptor(lpsd, saclpresent, sacl, sacldefaulted));
 }
@@ -476,7 +476,7 @@ BOOL32  WINAPI SetSecurityDescriptorSacl (
  *   lpselfsecdesc []
  *   lpbuflen      []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 MakeSelfRelativeSD( PSECURITY_DESCRIPTOR lpabssecdesc,
                     PSECURITY_DESCRIPTOR lpselfsecdesc, LPDWORD lpbuflen )
 {
@@ -488,7 +488,7 @@ MakeSelfRelativeSD( PSECURITY_DESCRIPTOR lpabssecdesc,
  * GetSecurityDescriptorControl32			[ADVAPI32]
  */
 
-BOOL32 GetSecurityDescriptorControl32 ( PSECURITY_DESCRIPTOR  pSecurityDescriptor,
+BOOL GetSecurityDescriptorControl ( PSECURITY_DESCRIPTOR  pSecurityDescriptor,
 		 /* fixme: PSECURITY_DESCRIPTOR_CONTROL*/ LPVOID pControl, LPDWORD lpdwRevision)
 {	FIXME(advapi,"(%p,%p,%p),stub!\n",pSecurityDescriptor,pControl,lpdwRevision);
 	return 1;
@@ -513,8 +513,8 @@ BOOL32 GetSecurityDescriptorControl32 ( PSECURITY_DESCRIPTOR  pSecurityDescripto
  *
  * RETURNS STD
  */
-BOOL32 WINAPI
-LookupPrivilegeValue32W( LPCWSTR lpSystemName, LPCWSTR lpName, LPVOID lpLuid )
+BOOL WINAPI
+LookupPrivilegeValueW( LPCWSTR lpSystemName, LPCWSTR lpName, LPVOID lpLuid )
 {
     FIXME(advapi,"(%s,%s,%p): stub\n",debugstr_w(lpSystemName), 
                   debugstr_w(lpName), lpLuid);
@@ -524,12 +524,12 @@ LookupPrivilegeValue32W( LPCWSTR lpSystemName, LPCWSTR lpName, LPVOID lpLuid )
 /******************************************************************************
  * LookupPrivilegeValue32A			[ADVAPI32.92]
  */
-BOOL32 WINAPI
-LookupPrivilegeValue32A( LPCSTR lpSystemName, LPCSTR lpName, LPVOID lpLuid )
+BOOL WINAPI
+LookupPrivilegeValueA( LPCSTR lpSystemName, LPCSTR lpName, LPVOID lpLuid )
 {
     LPWSTR lpSystemNameW = HEAP_strdupAtoW(GetProcessHeap(), 0, lpSystemName);
     LPWSTR lpNameW = HEAP_strdupAtoW(GetProcessHeap(), 0, lpName);
-    BOOL32 ret = LookupPrivilegeValue32W( lpSystemNameW, lpNameW, lpLuid);
+    BOOL ret = LookupPrivilegeValueW( lpSystemNameW, lpNameW, lpLuid);
     HeapFree(GetProcessHeap(), 0, lpNameW);
     HeapFree(GetProcessHeap(), 0, lpSystemNameW);
     return ret;
@@ -542,8 +542,8 @@ LookupPrivilegeValue32A( LPCSTR lpSystemName, LPCSTR lpName, LPVOID lpLuid )
  * The information obtained is constrained by the callers access rights and
  * privileges
  */
-BOOL32 WINAPI
-GetFileSecurity32A( LPCSTR lpFileName, 
+BOOL WINAPI
+GetFileSecurityA( LPCSTR lpFileName, 
                     SECURITY_INFORMATION RequestedInformation,
                     PSECURITY_DESCRIPTOR pSecurityDescriptor,
                     DWORD nLength, LPDWORD lpnLengthNeeded )
@@ -566,8 +566,8 @@ GetFileSecurity32A( LPCSTR lpFileName,
  *   nLength              []
  *   lpnLengthNeeded      []
  */
-BOOL32 WINAPI
-GetFileSecurity32W( LPCWSTR lpFileName, 
+BOOL WINAPI
+GetFileSecurityW( LPCWSTR lpFileName, 
                     SECURITY_INFORMATION RequestedInformation,
                     PSECURITY_DESCRIPTOR pSecurityDescriptor,
                     DWORD nLength, LPDWORD lpnLengthNeeded )
@@ -580,8 +580,8 @@ GetFileSecurity32W( LPCWSTR lpFileName,
 /******************************************************************************
  * LookupAccountSid32A [ADVAPI32.86]
  */
-BOOL32 WINAPI
-LookupAccountSid32A( LPCSTR system, PSID sid, LPCSTR account,
+BOOL WINAPI
+LookupAccountSidA( LPCSTR system, PSID sid, LPCSTR account,
                      LPDWORD accountSize, LPCSTR domain, LPDWORD domainSize,
                      PSID_NAME_USE name_use )
 {
@@ -603,8 +603,8 @@ LookupAccountSid32A( LPCSTR system, PSID sid, LPCSTR account,
  *   domainSize  []
  *   name_use    []
  */
-BOOL32 WINAPI
-LookupAccountSid32W( LPCWSTR system, PSID sid, LPCWSTR account, 
+BOOL WINAPI
+LookupAccountSidW( LPCWSTR system, PSID sid, LPCWSTR account, 
                      LPDWORD accountSize, LPCWSTR domain, LPDWORD domainSize,
                      PSID_NAME_USE name_use )
 {
@@ -618,7 +618,7 @@ LookupAccountSid32W( LPCWSTR system, PSID sid, LPCWSTR account,
  * SetFileSecurity32A [ADVAPI32.182]
  * Sets the security of a file or directory
  */
-BOOL32 WINAPI SetFileSecurity32A( LPCSTR lpFileName,
+BOOL WINAPI SetFileSecurityA( LPCSTR lpFileName,
                                 SECURITY_INFORMATION RequestedInformation,
                                 PSECURITY_DESCRIPTOR pSecurityDescriptor)
 {
@@ -635,8 +635,8 @@ BOOL32 WINAPI SetFileSecurity32A( LPCSTR lpFileName,
  *   RequestedInformation []
  *   pSecurityDescriptor  []
  */
-BOOL32 WINAPI
-SetFileSecurity32W( LPCWSTR lpFileName, 
+BOOL WINAPI
+SetFileSecurityW( LPCWSTR lpFileName, 
                     SECURITY_INFORMATION RequestedInformation,
                     PSECURITY_DESCRIPTOR pSecurityDescriptor )
 {
@@ -650,7 +650,7 @@ SetFileSecurity32W( LPCWSTR lpFileName,
  * PARAMS
  *   x1 []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 QueryWindows31FilesMigration( DWORD x1 )
 {
 	FIXME(advapi,"(%ld):stub\n",x1);
@@ -666,7 +666,7 @@ QueryWindows31FilesMigration( DWORD x1 )
  *   x3 []
  *   x4 []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 SynchronizeWindows31FilesAndWindowsNTRegistry( DWORD x1, DWORD x2, DWORD x3,
                                                DWORD x4 )
 {
@@ -683,7 +683,7 @@ SynchronizeWindows31FilesAndWindowsNTRegistry( DWORD x1, DWORD x2, DWORD x3,
  *   x3 []
  *   x4 []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 LsaOpenPolicy( DWORD x1, DWORD x2, DWORD x3, DWORD x4 )
 {
 	FIXME(advapi,"(0x%08lx,0x%08lx,0x%08lx,0x%08lx):stub\n",x1,x2,x3,x4);
@@ -696,7 +696,7 @@ LsaOpenPolicy( DWORD x1, DWORD x2, DWORD x3, DWORD x4 )
  * PARAMS
  *   x1 []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 NotifyBootConfigStatus( DWORD x1 )
 {
 	FIXME(advapi,"(0x%08lx):stub\n",x1);
@@ -709,7 +709,7 @@ NotifyBootConfigStatus( DWORD x1 )
  * PARAMS
  *   void []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 RevertToSelf( void )
 {
 	FIXME(advapi,"(), stub\n");
@@ -719,8 +719,8 @@ RevertToSelf( void )
 /******************************************************************************
  * ImpersonateSelf [ADVAPI32.71]
  */
-BOOL32 WINAPI
-ImpersonateSelf32(DWORD/*SECURITY_IMPERSONATION_LEVEL*/ ImpersonationLevel)
+BOOL WINAPI
+ImpersonateSelf(DWORD/*SECURITY_IMPERSONATION_LEVEL*/ ImpersonationLevel)
 {
     FIXME(advapi, "(%08lx), stub\n", ImpersonationLevel);
     return TRUE;
@@ -729,8 +729,8 @@ ImpersonateSelf32(DWORD/*SECURITY_IMPERSONATION_LEVEL*/ ImpersonationLevel)
 /******************************************************************************
  * AccessCheck32 [ADVAPI32.71]
  */
-BOOL32 WINAPI
-AccessCheck32(PSECURITY_DESCRIPTOR pSecurityDescriptor, HANDLE32 ClientToken, DWORD DesiredAccess, LPVOID/*LPGENERIC_MAPPING*/ GenericMapping, LPVOID/*LPPRIVILEGE_SET*/ PrivilegeSet, LPDWORD PrivilegeSetLength, LPDWORD GrantedAccess, LPBOOL32 AccessStatus)
+BOOL WINAPI
+AccessCheck(PSECURITY_DESCRIPTOR pSecurityDescriptor, HANDLE ClientToken, DWORD DesiredAccess, LPVOID/*LPGENERIC_MAPPING*/ GenericMapping, LPVOID/*LPPRIVILEGE_SET*/ PrivilegeSet, LPDWORD PrivilegeSetLength, LPDWORD GrantedAccess, LPBOOL AccessStatus)
 {
     FIXME(advapi, "(%p, %04x, %08lx, %p, %p, %p, %p, %p), stub\n", pSecurityDescriptor, ClientToken, DesiredAccess, GenericMapping, PrivilegeSet, PrivilegeSetLength, GrantedAccess, AccessStatus);
     *AccessStatus = TRUE;
diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index c8ce36fa157..1d5c3738a4b 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -19,8 +19,8 @@ typedef VOID (WINAPI *LPHANDLER_FUNCTION)( DWORD dwControl);
 /******************************************************************************
  * EnumServicesStatus32A [ADVAPI32.38]
  */
-BOOL32 WINAPI
-EnumServicesStatus32A( HANDLE32 hSCManager, DWORD dwServiceType,
+BOOL WINAPI
+EnumServicesStatusA( HANDLE hSCManager, DWORD dwServiceType,
                        DWORD dwServiceState, LPVOID lpServices,
                        DWORD cbBufSize, LPDWORD pcbBytesNeeded,
                        LPDWORD lpServicesReturned, LPDWORD lpResumeHandle )
@@ -34,9 +34,9 @@ EnumServicesStatus32A( HANDLE32 hSCManager, DWORD dwServiceType,
 /******************************************************************************
  * StartServiceCtrlDispatcher32A [ADVAPI32.196]
  */
-BOOL32 WINAPI
-StartServiceCtrlDispatcher32A( LPSERVICE_TABLE_ENTRY32A servent )
-{	LPSERVICE_TABLE_ENTRY32A ptr = servent;
+BOOL WINAPI
+StartServiceCtrlDispatcherA( LPSERVICE_TABLE_ENTRYA servent )
+{	LPSERVICE_TABLE_ENTRYA ptr = servent;
 
 	while (ptr->lpServiceName)
 	{ FIXME(advapi,"%s at %p\n", ptr->lpServiceName, ptr);
@@ -51,10 +51,10 @@ StartServiceCtrlDispatcher32A( LPSERVICE_TABLE_ENTRY32A servent )
  * PARAMS
  *   servent []
  */
-BOOL32 WINAPI
-StartServiceCtrlDispatcher32W( LPSERVICE_TABLE_ENTRY32W servent )
-{	LPSERVICE_TABLE_ENTRY32W ptr = servent;
-	LPSERVICE_MAIN_FUNCTION32W fpMain;
+BOOL WINAPI
+StartServiceCtrlDispatcherW( LPSERVICE_TABLE_ENTRYW servent )
+{	LPSERVICE_TABLE_ENTRYW ptr = servent;
+	LPSERVICE_MAIN_FUNCTIONW fpMain;
 	
 	while (ptr->lpServiceName)
 	{ FIXME(advapi,"%s at %p): STUB.\n", debugstr_w(ptr->lpServiceName),ptr);
@@ -96,7 +96,7 @@ RegisterServiceCtrlHandlerW( LPWSTR lpServiceName,
  *   hService []
  *   lpStatus []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus )
 {	FIXME(advapi,"%lx %p\n",hService, lpStatus);
 	TRACE(advapi,"\tType:%lx\n",lpStatus->dwServiceType);
@@ -112,13 +112,13 @@ SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus )
 /******************************************************************************
  * OpenSCManager32A [ADVAPI32.110]
  */
-HANDLE32 WINAPI
-OpenSCManager32A( LPCSTR lpMachineName, LPCSTR lpDatabaseName,
+HANDLE WINAPI
+OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName,
                   DWORD dwDesiredAccess )
 {   
     LPWSTR lpMachineNameW = HEAP_strdupAtoW(GetProcessHeap(),0,lpMachineName);
     LPWSTR lpDatabaseNameW = HEAP_strdupAtoW(GetProcessHeap(),0,lpDatabaseName);
-    DWORD ret = OpenSCManager32W(lpMachineNameW,lpDatabaseNameW,
+    DWORD ret = OpenSCManagerW(lpMachineNameW,lpDatabaseNameW,
                                  dwDesiredAccess);
     HeapFree(GetProcessHeap(),0,lpDatabaseNameW);
     HeapFree(GetProcessHeap(),0,lpMachineNameW);
@@ -141,8 +141,8 @@ OpenSCManager32A( LPCSTR lpMachineName, LPCSTR lpDatabaseName,
  *   Success: Handle to service control manager database
  *   Failure: NULL
  */
-HANDLE32 WINAPI
-OpenSCManager32W( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName,
+HANDLE WINAPI
+OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName,
                   DWORD dwDesiredAccess )
 {
     FIXME(advapi,"(%s,%s,0x%08lx): stub\n", debugstr_w(lpMachineName), 
@@ -157,7 +157,7 @@ OpenSCManager32W( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName,
  * PARAMS
  *   lpluid []
  */
-BOOL32 WINAPI
+BOOL WINAPI
 AllocateLocallyUniqueId( PLUID lpluid )
 {
 	lpluid->LowPart = time(NULL);
@@ -180,8 +180,8 @@ AllocateLocallyUniqueId( PLUID lpluid )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI
-ControlService( HANDLE32 hService, DWORD dwControl, 
+BOOL WINAPI
+ControlService( HANDLE hService, DWORD dwControl, 
                 LPSERVICE_STATUS lpServiceStatus )
 {
     FIXME(advapi, "(%d,%ld,%p): stub\n",hService,dwControl,lpServiceStatus);
@@ -201,8 +201,8 @@ ControlService( HANDLE32 hService, DWORD dwControl,
  *
  * RETURNS STD
  */
-BOOL32 WINAPI
-CloseServiceHandle( HANDLE32 hSCObject )
+BOOL WINAPI
+CloseServiceHandle( HANDLE hSCObject )
 {
     FIXME(advapi, "(%d): stub\n", hSCObject);
     return TRUE;
@@ -212,12 +212,12 @@ CloseServiceHandle( HANDLE32 hSCObject )
 /******************************************************************************
  * OpenService32A [ADVAPI32.112]
  */
-HANDLE32 WINAPI
-OpenService32A( HANDLE32 hSCManager, LPCSTR lpServiceName, 
+HANDLE WINAPI
+OpenServiceA( HANDLE hSCManager, LPCSTR lpServiceName, 
                 DWORD dwDesiredAccess )
 {
     LPWSTR lpServiceNameW = HEAP_strdupAtoW(GetProcessHeap(),0,lpServiceName);
-    DWORD ret = OpenService32W( hSCManager, lpServiceNameW, dwDesiredAccess);
+    DWORD ret = OpenServiceW( hSCManager, lpServiceNameW, dwDesiredAccess);
     HeapFree(GetProcessHeap(),0,lpServiceNameW);
     return ret;
 }
@@ -240,8 +240,8 @@ OpenService32A( HANDLE32 hSCManager, LPCSTR lpServiceName,
  *    Success: Handle to the service
  *    Failure: NULL
  */
-HANDLE32 WINAPI
-OpenService32W(HANDLE32 hSCManager, LPCWSTR lpServiceName,
+HANDLE WINAPI
+OpenServiceW(HANDLE hSCManager, LPCWSTR lpServiceName,
                DWORD dwDesiredAccess)
 {
     FIXME(advapi, "(%d,%p,%ld): stub\n",hSCManager, lpServiceName,
@@ -254,7 +254,7 @@ OpenService32W(HANDLE32 hSCManager, LPCWSTR lpServiceName,
  * CreateService32A [ADVAPI32.29]
  */
 DWORD WINAPI
-CreateService32A( DWORD hSCManager, LPCSTR lpServiceName,
+CreateServiceA( DWORD hSCManager, LPCSTR lpServiceName,
                   LPCSTR lpDisplayName, DWORD dwDesiredAccess, 
                   DWORD dwServiceType, DWORD dwStartType, 
                   DWORD dwErrorControl, LPCSTR lpBinaryPathName,
@@ -279,8 +279,8 @@ CreateService32A( DWORD hSCManager, LPCSTR lpServiceName,
  * NOTES
  *    hService should be SC_HANDLE
  */
-BOOL32 WINAPI
-DeleteService( HANDLE32 hService )
+BOOL WINAPI
+DeleteService( HANDLE hService )
 {
     FIXME(advapi, "(%d): stub\n",hService);
     return TRUE;
@@ -293,8 +293,8 @@ DeleteService( HANDLE32 hService )
  * NOTES
  *    How do we convert lpServiceArgVectors to use the 32W version?
  */
-BOOL32 WINAPI
-StartService32A( HANDLE32 hService, DWORD dwNumServiceArgs,
+BOOL WINAPI
+StartServiceA( HANDLE hService, DWORD dwNumServiceArgs,
                  LPCSTR *lpServiceArgVectors )
 {
     FIXME(advapi, "(%d,%ld,%p): stub\n",hService,dwNumServiceArgs,lpServiceArgVectors);
@@ -316,8 +316,8 @@ StartService32A( HANDLE32 hService, DWORD dwNumServiceArgs,
  * NOTES
  *   hService should be SC_HANDLE
  */
-BOOL32 WINAPI
-StartService32W( HANDLE32 hService, DWORD dwNumServiceArgs,
+BOOL WINAPI
+StartServiceW( HANDLE hService, DWORD dwNumServiceArgs,
                  LPCWSTR *lpServiceArgVectors )
 {
     FIXME(advapi, "(%d,%ld,%p): stub\n",hService,dwNumServiceArgs,
@@ -336,8 +336,8 @@ StartService32W( HANDLE32 hService, DWORD dwNumServiceArgs,
  *   hService should be SC_HANDLE
  *   lpservicestatus should be LPSERVICE_STATUS
  */
-BOOL32 WINAPI
-QueryServiceStatus( HANDLE32 hService, LPVOID lpservicestatus )
+BOOL WINAPI
+QueryServiceStatus( HANDLE hService, LPVOID lpservicestatus )
 {
 	FIXME(advapi,"(%d,%p),stub!\n",hService,lpservicestatus);
 	return TRUE;
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index bf44427ab75..d8ac4affb1f 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -22,21 +22,21 @@
 #define ANIMATE_GetInfoPtr(wndPtr) ((ANIMATE_INFO *)wndPtr->wExtra[0])
 
 
-static BOOL32
-ANIMATE_LoadRes32A (ANIMATE_INFO *infoPtr, HINSTANCE32 hInst, LPSTR lpName)
+static BOOL
+ANIMATE_LoadResA (ANIMATE_INFO *infoPtr, HINSTANCE hInst, LPSTR lpName)
 {
-    HRSRC32 hrsrc;
-    HGLOBAL32 handle;
+    HRSRC hrsrc;
+    HGLOBAL handle;
 
-    hrsrc = FindResource32A (hInst, lpName, "AVI");
+    hrsrc = FindResourceA (hInst, lpName, "AVI");
     if (!hrsrc)
 	return FALSE;
 
-    handle = LoadResource32 (hInst, hrsrc);
+    handle = LoadResource (hInst, hrsrc);
     if (!handle)
 	return FALSE;
 
-    infoPtr->lpAvi = LockResource32 (handle);
+    infoPtr->lpAvi = LockResource (handle);
     if (!infoPtr->lpAvi)
 	return FALSE;
 
@@ -44,19 +44,19 @@ ANIMATE_LoadRes32A (ANIMATE_INFO *infoPtr, HINSTANCE32 hInst, LPSTR lpName)
 }
 
 
-static BOOL32
-ANIMATE_LoadFile32A (ANIMATE_INFO *infoPtr, LPSTR lpName)
+static BOOL
+ANIMATE_LoadFileA (ANIMATE_INFO *infoPtr, LPSTR lpName)
 {
-    HANDLE32 handle;
+    HANDLE handle;
 
     infoPtr->hFile =
-	CreateFile32A (lpName, GENERIC_READ, 0, NULL, OPEN_EXISTING,
+	CreateFileA (lpName, GENERIC_READ, 0, NULL, OPEN_EXISTING,
 		       FILE_ATTRIBUTE_NORMAL, 0);
     if (!infoPtr->hFile)
 	return FALSE;
 
     handle =
-	CreateFileMapping32A (infoPtr->hFile, NULL, PAGE_READONLY | SEC_COMMIT,
+	CreateFileMappingA (infoPtr->hFile, NULL, PAGE_READONLY | SEC_COMMIT,
 			      0, 0, NULL);
     if (!handle) {
 	CloseHandle (infoPtr->hFile);
@@ -84,7 +84,7 @@ ANIMATE_Free (ANIMATE_INFO *infoPtr)
 	infoPtr->lpAvi = NULL;
     }
     else {
-	GlobalFree32 ((HGLOBAL32)infoPtr->lpAvi);
+	GlobalFree ((HGLOBAL)infoPtr->lpAvi);
 	infoPtr->lpAvi = NULL;
     }
 }
@@ -99,10 +99,10 @@ ANIMATE_GetAviInfo (infoPtr)
 
 
 static LRESULT
-ANIMATE_Open32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+ANIMATE_OpenA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(wndPtr);
-    HINSTANCE32 hInstance = (HINSTANCE32)wParam;
+    HINSTANCE hInstance = (HINSTANCE)wParam;
 
     ANIMATE_Free (infoPtr);
 
@@ -114,14 +114,14 @@ ANIMATE_Open32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (HIWORD(lParam)) {
 	FIXME (animate, "(\"%s\") empty stub!\n", (LPSTR)lParam);
 
-	if (ANIMATE_LoadRes32A (infoPtr, hInstance, (LPSTR)lParam)) {
+	if (ANIMATE_LoadResA (infoPtr, hInstance, (LPSTR)lParam)) {
 
 	    FIXME (animate, "AVI resource found!\n");
 
 	}
 	else {
 	    FIXME (animate, "No AVI resource found!\n");
-	    if (ANIMATE_LoadFile32A (infoPtr, (LPSTR)lParam)) {
+	    if (ANIMATE_LoadFileA (infoPtr, (LPSTR)lParam)) {
 		FIXME (animate, "AVI file found!\n");
 	    }
 	    else {
@@ -133,8 +133,8 @@ ANIMATE_Open32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     else {
 	FIXME (animate, "(%u) empty stub!\n", (WORD)LOWORD(lParam));
 
-	if (ANIMATE_LoadRes32A (infoPtr, hInstance,
-				MAKEINTRESOURCE32A((INT32)lParam))) {
+	if (ANIMATE_LoadResA (infoPtr, hInstance,
+				MAKEINTRESOURCEA((INT)lParam))) {
 	    FIXME (animate, "AVI resource found!\n");
 	}
 	else {
@@ -153,12 +153,12 @@ ANIMATE_Open32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-ANIMATE_Play (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+ANIMATE_Play (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(wndPtr); */
-    INT32 nFrom   = (INT32)LOWORD(lParam);
-    INT32 nTo     = (INT32)HIWORD(lParam);
-    INT32 nRepeat = (INT32)wParam;
+    INT nFrom   = (INT)LOWORD(lParam);
+    INT nTo     = (INT)HIWORD(lParam);
+    INT nRepeat = (INT)wParam;
 
 #if 0
     /* nothing opened */
@@ -185,7 +185,7 @@ ANIMATE_Play (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-ANIMATE_Stop (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+ANIMATE_Stop (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(wndPtr); */
 
@@ -201,7 +201,7 @@ ANIMATE_Stop (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-ANIMATE_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+ANIMATE_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     ANIMATE_INFO *infoPtr;
 
@@ -227,7 +227,7 @@ ANIMATE_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-ANIMATE_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+ANIMATE_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(wndPtr);
 
@@ -244,7 +244,7 @@ ANIMATE_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 #if 0
 static LRESULT
-ANIMATE_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+ANIMATE_EraseBackground (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(wndPtr);
 /*
@@ -262,14 +262,14 @@ ANIMATE_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-ANIMATE_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+ANIMATE_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
     switch (uMsg)
     {
-	case ACM_OPEN32A:
-	    return ANIMATE_Open32A (wndPtr, wParam, lParam);
+	case ACM_OPENA:
+	    return ANIMATE_OpenA (wndPtr, wParam, lParam);
 
 /*	case ACM_OPEN32W: */
 /*	    return ANIMATE_Open32W (wndPtr, wParam, lParam); */
@@ -301,7 +301,7 @@ ANIMATE_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (animate, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -310,27 +310,27 @@ ANIMATE_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 ANIMATE_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (ANIMATE_CLASS32A)) return;
+    if (GlobalFindAtomA (ANIMATE_CLASSA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS;
-    wndClass.lpfnWndProc   = (WNDPROC32)ANIMATE_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)ANIMATE_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(ANIMATE_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_BTNFACE + 1);
-    wndClass.lpszClassName = ANIMATE_CLASS32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+    wndClass.lpszClassName = ANIMATE_CLASSA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 ANIMATE_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (ANIMATE_CLASS32A))
-	UnregisterClass32A (ANIMATE_CLASS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (ANIMATE_CLASSA))
+	UnregisterClassA (ANIMATE_CLASSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 9f16aacc4b9..c3d3c0e8fa2 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -30,7 +30,7 @@
 
 
 __inline__ static LRESULT
-COMBOEX_GetComboControl (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_GetComboControl (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
 
@@ -41,21 +41,21 @@ COMBOEX_GetComboControl (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-COMBOEX_GetEditControl (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_GetEditControl (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
 
     if ((wndPtr->dwStyle & CBS_DROPDOWNLIST) != CBS_DROPDOWN)
 	return 0;
 
-    TRACE (comboex, "-- 0x%x\n", GetDlgItem32 (infoPtr->hwndCombo, ID_CB_EDIT));
+    TRACE (comboex, "-- 0x%x\n", GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT));
 
-    return (LRESULT)GetDlgItem32 (infoPtr->hwndCombo, ID_CB_EDIT);
+    return (LRESULT)GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT);
 }
 
 
 __inline__ static LRESULT
-COMBOEX_GetExtendedStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_GetExtendedStyle (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
 
@@ -64,7 +64,7 @@ COMBOEX_GetExtendedStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-COMBOEX_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_GetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
 
@@ -77,7 +77,7 @@ COMBOEX_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-COMBOEX_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_InsertItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr); */
 
@@ -89,7 +89,7 @@ COMBOEX_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-COMBOEX_SetExtendedStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_SetExtendedStyle (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
     DWORD dwTemp;
@@ -111,7 +111,7 @@ COMBOEX_SetExtendedStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-COMBOEX_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_SetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
     HIMAGELIST himlTemp;
@@ -126,7 +126,7 @@ COMBOEX_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-COMBOEX_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_SetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr); */
 
@@ -140,21 +140,21 @@ COMBOEX_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-COMBOEX_Forward (WND *wndPtr, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_Forward (WND *wndPtr, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
 
     FIXME (comboex, "(0x%x 0x%x 0x%lx): stub\n", uMsg, wParam, lParam);
 
     if (infoPtr->hwndCombo)    
-	return SendMessage32A (infoPtr->hwndCombo, uMsg, wParam, lParam);
+	return SendMessageA (infoPtr->hwndCombo, uMsg, wParam, lParam);
 
     return 0;
 }
 
 
 static LRESULT
-COMBOEX_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr;
     DWORD dwComboStyle;
@@ -182,9 +182,9 @@ COMBOEX_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	wndPtr->dwStyle & (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
 
     infoPtr->hwndCombo =
-	CreateWindow32A ("ComboBox", "",
+	CreateWindowA ("ComboBox", "",
 			 WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | dwComboStyle,
-			 0, 0, 0, 0, wndPtr->hwndSelf, (HMENU32)1,
+			 0, 0, 0, 0, wndPtr->hwndSelf, (HMENU)1,
 			 wndPtr->hInstance, NULL);
 
 
@@ -193,13 +193,13 @@ COMBOEX_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-COMBOEX_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
 
 
     if (infoPtr->hwndCombo)
-	DestroyWindow32 (infoPtr->hwndCombo);
+	DestroyWindow (infoPtr->hwndCombo);
 
 
 
@@ -212,14 +212,14 @@ COMBOEX_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-COMBOEX_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
-    RECT32 rect;
+    RECT rect;
 
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 
-    MoveWindow32 (infoPtr->hwndCombo, 0, 0, rect.right -rect.left,
+    MoveWindow (infoPtr->hwndCombo, 0, 0, rect.right -rect.left,
 		  rect.bottom - rect.top, TRUE);
 
     return 0;
@@ -227,7 +227,7 @@ COMBOEX_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-COMBOEX_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -253,8 +253,8 @@ COMBOEX_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case CBEM_HASEDITCHANGED:
 */
 
-	case CBEM_INSERTITEM32A:
-	    return COMBOEX_InsertItem32A (wndPtr, wParam, lParam);
+	case CBEM_INSERTITEMA:
+	    return COMBOEX_InsertItemA (wndPtr, wParam, lParam);
 
 /*	case CBEM_INSERTITEM32W: */
 
@@ -264,33 +264,33 @@ COMBOEX_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case CBEM_SETIMAGELIST:
 	    return COMBOEX_SetImageList (wndPtr, wParam, lParam);
 
-	case CBEM_SETITEM32A:
-	    return COMBOEX_SetItem32A (wndPtr, wParam, lParam);
+	case CBEM_SETITEMA:
+	    return COMBOEX_SetItemA (wndPtr, wParam, lParam);
 
 /*	case CBEM_SETITEM32W:
 	case CBEM_SETUNICODEFORMAT:
 */
 
-	case CB_DELETESTRING32:
-	case CB_FINDSTRINGEXACT32:
-	case CB_GETCOUNT32:
-	case CB_GETCURSEL32:
-	case CB_GETDROPPEDCONTROLRECT32:
-	case CB_GETDROPPEDSTATE32:
-	case CB_GETITEMDATA32:
-	case CB_GETITEMHEIGHT32:
-	case CB_GETLBTEXT32:
-	case CB_GETLBTEXTLEN32:
-	case CB_GETEXTENDEDUI32:
-	case CB_LIMITTEXT32:
-	case CB_RESETCONTENT32:
-	case CB_SELECTSTRING32:
-	case CB_SETCURSEL32:
-	case CB_SETDROPPEDWIDTH32:
-	case CB_SETEXTENDEDUI32:
-	case CB_SETITEMDATA32:
-	case CB_SETITEMHEIGHT32:
-	case CB_SHOWDROPDOWN32:
+	case CB_DELETESTRING:
+	case CB_FINDSTRINGEXACT:
+	case CB_GETCOUNT:
+	case CB_GETCURSEL:
+	case CB_GETDROPPEDCONTROLRECT:
+	case CB_GETDROPPEDSTATE:
+	case CB_GETITEMDATA:
+	case CB_GETITEMHEIGHT:
+	case CB_GETLBTEXT:
+	case CB_GETLBTEXTLEN:
+	case CB_GETEXTENDEDUI:
+	case CB_LIMITTEXT:
+	case CB_RESETCONTENT:
+	case CB_SELECTSTRING:
+	case CB_SETCURSEL:
+	case CB_SETDROPPEDWIDTH:
+	case CB_SETEXTENDEDUI:
+	case CB_SETITEMDATA:
+	case CB_SETITEMHEIGHT:
+	case CB_SHOWDROPDOWN:
 	    return COMBOEX_Forward (wndPtr, uMsg, wParam, lParam);
 
 
@@ -307,7 +307,7 @@ COMBOEX_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (comboex, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -316,27 +316,27 @@ COMBOEX_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 COMBOEX_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (WC_COMBOBOXEX32A)) return;
+    if (GlobalFindAtomA (WC_COMBOBOXEXA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC32)COMBOEX_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)COMBOEX_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(COMBOEX_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_WINDOW + 1);
-    wndClass.lpszClassName = WC_COMBOBOXEX32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndClass.lpszClassName = WC_COMBOBOXEXA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 COMBOEX_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (WC_COMBOBOXEX32A))
-	UnregisterClass32A (WC_COMBOBOXEX32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (WC_COMBOBOXEXA))
+	UnregisterClassA (WC_COMBOBOXEXA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index c83956d4a0a..580d8742c60 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -23,7 +23,7 @@
 #include "debug.h"
 
 
-extern HANDLE32 COMCTL32_hHeap; /* handle to the private heap */
+extern HANDLE COMCTL32_hHeap; /* handle to the private heap */
 
 /*
  * We put some function prototypes here that don't seem to belong in
@@ -50,26 +50,26 @@ extern LPWSTR WINAPI strstrw(LPCWSTR, LPCWSTR);
  *     No more information available yet!
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags,
 	   PFNDPACOMPARE pfnCompare, LPVOID pfnParam5, LPARAM lParam)
 {
     /* LPVOID *pWork1, *pWork2; */
-    INT32  nCount1, nCount2;
+    INT  nCount1, nCount2;
 
     TRACE (commctrl, "(%p %p %08lx %p %p %08lx): stub!\n",
 	   hdpa1, hdpa2, dwFlags, pfnCompare, pfnParam5, lParam);
 
-    if (IsBadWritePtr32 (hdpa1, sizeof(DPA)))
+    if (IsBadWritePtr (hdpa1, sizeof(DPA)))
 	return FALSE;
 
-    if (IsBadWritePtr32 (hdpa2, sizeof(DPA)))
+    if (IsBadWritePtr (hdpa2, sizeof(DPA)))
 	return FALSE;
 
-    if (IsBadCodePtr32 ((FARPROC32)pfnCompare))
+    if (IsBadCodePtr ((FARPROC)pfnCompare))
 	return FALSE;
 
-    if (IsBadCodePtr32 ((FARPROC32)pfnParam5))
+    if (IsBadCodePtr ((FARPROC)pfnParam5))
 	return FALSE;
 
     if (dwFlags & DPAM_SORT) {
@@ -190,7 +190,7 @@ COMCTL32_ReAlloc (LPVOID lpSrc, DWORD dwSize)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 COMCTL32_Free (LPVOID lpMem)
 {
     TRACE (commctrl, "(%p)\n", lpMem);
@@ -251,7 +251,7 @@ typedef struct tagMRU
 } MRU, *HMRU;
 
 LPVOID WINAPI
-CreateMRUListLazy32A (LPMRUINFO lpmi, DWORD dwParam2,
+CreateMRUListLazyA (LPMRUINFO lpmi, DWORD dwParam2,
 		    DWORD dwParam3, DWORD dwParam4);
 
 
@@ -265,26 +265,26 @@ CreateMRUListLazy32A (LPMRUINFO lpmi, DWORD dwParam2,
  */
 
 LPVOID WINAPI
-CreateMRUList32A (LPMRUINFO lpmi)
+CreateMRUListA (LPMRUINFO lpmi)
 {
-     return CreateMRUListLazy32A (lpmi, 0, 0, 0);
+     return CreateMRUListLazyA (lpmi, 0, 0, 0);
 }
 
 
 DWORD WINAPI
-FreeMRUList32A (HMRU hmru)
+FreeMRUListA (HMRU hmru)
 {
     FIXME (commctrl, "(%p) empty stub!\n", hmru);
 
 #if 0
     if (!(hmru->dwParam1 & 1001)) {
-	RegSetValueEx32A (hmru->hKeyMRU, "MRUList", 0, REG_SZ,
+	RegSetValueExA (hmru->hKeyMRU, "MRUList", 0, REG_SZ,
 			  hmru->lpszMRUString,
-			  lstrlen32A (hmru->lpszMRUString));
+			  lstrlenA (hmru->lpszMRUString));
     }
 
 
-    RegClosKey32 (hmru->hkeyMRU
+    RegClosKey (hmru->hkeyMRU
     COMCTL32_Free32 (hmru->lpszMRUString);
 #endif
 
@@ -316,7 +316,7 @@ FindMRUData (DWORD dwParam1, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4)
 
 
 LPVOID WINAPI
-CreateMRUListLazy32A (LPMRUINFO lpmi, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4)
+CreateMRUListLazyA (LPMRUINFO lpmi, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4)
 {
     /* DWORD  dwLocal1;   *
      * HKEY   hkeyResult; *
@@ -360,15 +360,15 @@ CreateMRUListLazy32A (LPMRUINFO lpmi, DWORD dwParam2, DWORD dwParam3, DWORD dwPa
  * RETURNS
  */
 
-INT32 WINAPI
-Str_GetPtr32A (LPCSTR lpSrc, LPSTR lpDest, INT32 nMaxLen)
+INT WINAPI
+Str_GetPtrA (LPCSTR lpSrc, LPSTR lpDest, INT nMaxLen)
 {
-    INT32 len;
+    INT len;
 
     TRACE (commctrl, "(%p %p %d)\n", lpSrc, lpDest, nMaxLen);
 
     if (!lpDest && lpSrc)
-	return lstrlen32A (lpSrc);
+	return lstrlenA (lpSrc);
 
     if (nMaxLen == 0)
 	return 0;
@@ -378,7 +378,7 @@ Str_GetPtr32A (LPCSTR lpSrc, LPSTR lpDest, INT32 nMaxLen)
 	return 0;
     }
 
-    len = lstrlen32A (lpSrc);
+    len = lstrlenA (lpSrc);
     if (len >= nMaxLen)
 	len = nMaxLen - 1;
 
@@ -399,16 +399,16 @@ Str_GetPtr32A (LPCSTR lpSrc, LPSTR lpDest, INT32 nMaxLen)
  * RETURNS
  */
 
-BOOL32 WINAPI
-Str_SetPtr32A (LPSTR *lppDest, LPCSTR lpSrc)
+BOOL WINAPI
+Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc)
 {
     TRACE (commctrl, "(%p %p)\n", lppDest, lpSrc);
  
     if (lpSrc) {
-	LPSTR ptr = COMCTL32_ReAlloc (*lppDest, lstrlen32A (lpSrc) + 1);
+	LPSTR ptr = COMCTL32_ReAlloc (*lppDest, lstrlenA (lpSrc) + 1);
 	if (!ptr)
 	    return FALSE;
-	lstrcpy32A (ptr, lpSrc);
+	lstrcpyA (ptr, lpSrc);
 	*lppDest = ptr;
     }
     else {
@@ -433,15 +433,15 @@ Str_SetPtr32A (LPSTR *lppDest, LPCSTR lpSrc)
  * RETURNS
  */
 
-INT32 WINAPI
-Str_GetPtr32W (LPCWSTR lpSrc, LPWSTR lpDest, INT32 nMaxLen)
+INT WINAPI
+Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen)
 {
-    INT32 len;
+    INT len;
 
     TRACE (commctrl, "(%p %p %d)\n", lpSrc, lpDest, nMaxLen);
 
     if (!lpDest && lpSrc)
-	return lstrlen32W (lpSrc);
+	return lstrlenW (lpSrc);
 
     if (nMaxLen == 0)
 	return 0;
@@ -451,7 +451,7 @@ Str_GetPtr32W (LPCWSTR lpSrc, LPWSTR lpDest, INT32 nMaxLen)
 	return 0;
     }
 
-    len = lstrlen32W (lpSrc);
+    len = lstrlenW (lpSrc);
     if (len >= nMaxLen)
 	len = nMaxLen - 1;
 
@@ -472,17 +472,17 @@ Str_GetPtr32W (LPCWSTR lpSrc, LPWSTR lpDest, INT32 nMaxLen)
  * RETURNS
  */
 
-BOOL32 WINAPI
-Str_SetPtr32W (LPWSTR *lppDest, LPCWSTR lpSrc)
+BOOL WINAPI
+Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc)
 {
     TRACE (commctrl, "(%p %p)\n", lppDest, lpSrc);
  
     if (lpSrc) {
-	INT32 len = lstrlen32W (lpSrc) + 1;
+	INT len = lstrlenW (lpSrc) + 1;
 	LPWSTR ptr = COMCTL32_ReAlloc (*lppDest, len * sizeof(WCHAR));
 	if (!ptr)
 	    return FALSE;
-	lstrcpy32W (ptr, lpSrc);
+	lstrcpyW (ptr, lpSrc);
 	*lppDest = ptr;
     }
     else {
@@ -515,7 +515,7 @@ Str_SetPtr32W (LPWSTR *lppDest, LPCWSTR lpSrc)
  */
 
 HDSA WINAPI
-DSA_Create (INT32 nSize, INT32 nGrow)
+DSA_Create (INT nSize, INT nGrow)
 {
     HDSA hdsa;
 
@@ -546,7 +546,7 @@ DSA_Create (INT32 nSize, INT32 nGrow)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 DSA_Destroy (const HDSA hdsa)
 {
     TRACE (commctrl, "(%p)\n", hdsa);
@@ -574,8 +574,8 @@ DSA_Destroy (const HDSA hdsa)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-DSA_GetItem (const HDSA hdsa, INT32 nIndex, LPVOID pDest)
+BOOL WINAPI
+DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest)
 {
     LPVOID pSrc;
 
@@ -608,7 +608,7 @@ DSA_GetItem (const HDSA hdsa, INT32 nIndex, LPVOID pDest)
  */
 
 LPVOID WINAPI
-DSA_GetItemPtr (const HDSA hdsa, INT32 nIndex)
+DSA_GetItemPtr (const HDSA hdsa, INT nIndex)
 {
     LPVOID pSrc;
 
@@ -642,10 +642,10 @@ DSA_GetItemPtr (const HDSA hdsa, INT32 nIndex)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-DSA_SetItem (const HDSA hdsa, INT32 nIndex, LPVOID pSrc)
+BOOL WINAPI
+DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
 {
-    INT32  nSize, nNewItems;
+    INT  nSize, nNewItems;
     LPVOID pDest, lpTemp;
     
     TRACE (commctrl, "(%p %d %p)\n", hdsa, nIndex, pSrc);
@@ -662,7 +662,7 @@ DSA_SetItem (const HDSA hdsa, INT32 nIndex, LPVOID pSrc)
 	else {
 	    /* resize the block of memory */
 	    nNewItems =
-		hdsa->nGrow * ((INT32)((nIndex - 1) / hdsa->nGrow) + 1);
+		hdsa->nGrow * ((INT)((nIndex - 1) / hdsa->nGrow) + 1);
 	    nSize = hdsa->nItemSize * nNewItems;
 
 	    lpTemp = (LPVOID)COMCTL32_ReAlloc (hdsa->pData, nSize);
@@ -697,10 +697,10 @@ DSA_SetItem (const HDSA hdsa, INT32 nIndex, LPVOID pSrc)
  *     Failure: -1
  */
 
-INT32 WINAPI
-DSA_InsertItem (const HDSA hdsa, INT32 nIndex, LPVOID pSrc)
+INT WINAPI
+DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
 {
-    INT32   nNewItems, nSize, i;
+    INT   nNewItems, nSize, i;
     LPVOID  lpTemp, lpDest;
     LPDWORD p;
     
@@ -711,7 +711,7 @@ DSA_InsertItem (const HDSA hdsa, INT32 nIndex, LPVOID pSrc)
 
     for (i = 0; i < hdsa->nItemSize; i += 4) {
 	p = *(DWORD**)(pSrc + i);
-	if (IsBadStringPtr32A ((char*)p, 256))
+	if (IsBadStringPtrA ((char*)p, 256))
 	    TRACE (commctrl, "-- %d=%p\n", i, (DWORD*)p);
 	else
 	    TRACE (commctrl, "-- %d=%p [%s]\n", i, p, debugstr_a((char*)p));
@@ -767,11 +767,11 @@ DSA_InsertItem (const HDSA hdsa, INT32 nIndex, LPVOID pSrc)
  *     Failure: -1
  */
 
-INT32 WINAPI
-DSA_DeleteItem (const HDSA hdsa, INT32 nIndex)
+INT WINAPI
+DSA_DeleteItem (const HDSA hdsa, INT nIndex)
 {
     LPVOID lpDest,lpSrc;
-    INT32  nSize;
+    INT  nSize;
     
     TRACE (commctrl, "(%p %d)\n", hdsa, nIndex);
 
@@ -821,7 +821,7 @@ DSA_DeleteItem (const HDSA hdsa, INT32 nIndex)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 DSA_DeleteAllItems (const HDSA hdsa)
 {
     TRACE (commctrl, "(%p)\n", hdsa);
@@ -856,7 +856,7 @@ DSA_DeleteAllItems (const HDSA hdsa)
  */
 
 HDPA WINAPI
-DPA_Create (INT32 nGrow)
+DPA_Create (INT nGrow)
 {
     HDPA hdpa;
 
@@ -888,7 +888,7 @@ DPA_Create (INT32 nGrow)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 DPA_Destroy (const HDPA hdpa)
 {
     TRACE (commctrl, "(%p)\n", hdpa);
@@ -917,8 +917,8 @@ DPA_Destroy (const HDPA hdpa)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-DPA_Grow (const HDPA hdpa, INT32 nGrow)
+BOOL WINAPI
+DPA_Grow (const HDPA hdpa, INT nGrow)
 {
     TRACE (commctrl, "(%p %d)\n", hdpa, nGrow);
 
@@ -954,7 +954,7 @@ DPA_Grow (const HDPA hdpa, INT32 nGrow)
 HDPA WINAPI
 DPA_Clone (const HDPA hdpa, const HDPA hdpaNew)
 {
-    INT32 nNewItems, nSize;
+    INT nNewItems, nSize;
     HDPA hdpaTemp;
 
     if (!hdpa)
@@ -982,7 +982,7 @@ DPA_Clone (const HDPA hdpa, const HDPA hdpaNew)
 
     /* create a new pointer array */
     nNewItems = hdpaTemp->nGrow *
-		((INT32)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1);
+		((INT)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1);
     nSize = nNewItems * sizeof(LPVOID);
     hdpaTemp->ptrs =
 	(LPVOID*)HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize);
@@ -1012,7 +1012,7 @@ DPA_Clone (const HDPA hdpa, const HDPA hdpaNew)
  */
 
 LPVOID WINAPI
-DPA_GetPtr (const HDPA hdpa, INT32 i)
+DPA_GetPtr (const HDPA hdpa, INT i)
 {
     TRACE (commctrl, "(%p %d)\n", hdpa, i);
 
@@ -1043,10 +1043,10 @@ DPA_GetPtr (const HDPA hdpa, INT32 i)
  *     Failure: -1
  */
 
-INT32 WINAPI
+INT WINAPI
 DPA_GetPtrIndex (const HDPA hdpa, LPVOID p)
 {
-    INT32 i;
+    INT i;
 
     if (!hdpa->ptrs)
 	return -1;
@@ -1075,10 +1075,10 @@ DPA_GetPtrIndex (const HDPA hdpa, LPVOID p)
  *     Failure: -1
  */
 
-INT32 WINAPI
-DPA_InsertPtr (const HDPA hdpa, INT32 i, LPVOID p)
+INT WINAPI
+DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p)
 {
-    INT32   nNewItems, nSize, nIndex = 0;
+    INT   nNewItems, nSize, nIndex = 0;
     LPVOID  *lpTemp, *lpDest;
 
     TRACE (commctrl, "(%p %d %p)\n", hdpa, i, p);
@@ -1148,8 +1148,8 @@ DPA_InsertPtr (const HDPA hdpa, INT32 i, LPVOID p)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-DPA_SetPtr (const HDPA hdpa, INT32 i, LPVOID p)
+BOOL WINAPI
+DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p)
 {
     LPVOID *lpTemp;
     
@@ -1166,9 +1166,9 @@ DPA_SetPtr (const HDPA hdpa, INT32 i, LPVOID p)
 	}
 	else {
 	    /* resize the block of memory */
-	    INT32 nNewItems =
-		hdpa->nGrow * ((INT32)((i - 1) / hdpa->nGrow) + 1);
-	    INT32 nSize = nNewItems * sizeof(LPVOID);
+	    INT nNewItems =
+		hdpa->nGrow * ((INT)((i - 1) / hdpa->nGrow) + 1);
+	    INT nSize = nNewItems * sizeof(LPVOID);
 
 	    lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
 					   hdpa->ptrs, nSize);
@@ -1202,10 +1202,10 @@ DPA_SetPtr (const HDPA hdpa, INT32 i, LPVOID p)
  */
 
 LPVOID WINAPI
-DPA_DeletePtr (const HDPA hdpa, INT32 i)
+DPA_DeletePtr (const HDPA hdpa, INT i)
 {
     LPVOID *lpDest, *lpSrc, lpTemp = NULL;
-    INT32  nSize;
+    INT  nSize;
     
     TRACE (commctrl, "(%p %d)\n", hdpa, i);
 
@@ -1228,7 +1228,7 @@ DPA_DeletePtr (const HDPA hdpa, INT32 i)
     
     /* free memory ?*/
     if ((hdpa->nMaxCount - hdpa->nItemCount) >= hdpa->nGrow) {
-	INT32 nNewItems = MIN(hdpa->nGrow * 2, hdpa->nItemCount);
+	INT nNewItems = MIN(hdpa->nGrow * 2, hdpa->nItemCount);
 	nSize = nNewItems * sizeof(LPVOID);
 	lpDest = (LPVOID)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
 				      hdpa->ptrs, nSize);
@@ -1256,7 +1256,7 @@ DPA_DeletePtr (const HDPA hdpa, INT32 i)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 DPA_DeleteAllPtrs (const HDPA hdpa)
 {
     TRACE (commctrl, "(%p)\n", hdpa);
@@ -1293,11 +1293,11 @@ DPA_DeleteAllPtrs (const HDPA hdpa)
  */
 
 static VOID
-DPA_QuickSort (LPVOID *lpPtrs, INT32 l, INT32 r,
+DPA_QuickSort (LPVOID *lpPtrs, INT l, INT r,
 	       PFNDPACOMPARE pfnCompare, LPARAM lParam)
 {
     LPVOID t, v;
-    INT32  i, j;
+    INT  i, j;
 
     TRACE (commctrl, "l=%i r=%i\n", l, r);
  
@@ -1334,7 +1334,7 @@ DPA_QuickSort (LPVOID *lpPtrs, INT32 l, INT32 r,
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam)
 {
     if (!hdpa || !pfnCompare)
@@ -1373,9 +1373,9 @@ DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam)
  *     If something goes wrong, blame HIM not ME! (Eric Kohl)
  */
 
-INT32 WINAPI
-DPA_Search (const HDPA hdpa, LPVOID pFind, INT32 nStart,
-	    PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT32 uOptions)
+INT WINAPI
+DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart,
+	    PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions)
 {
     if (!hdpa || !pfnCompare || !pFind)
 	return -1;
@@ -1385,7 +1385,7 @@ DPA_Search (const HDPA hdpa, LPVOID pFind, INT32 nStart,
 
     if (uOptions & DPAS_SORTED) {
 	/* array is sorted --> use binary search */
-	INT32 l, r, x, n;
+	INT l, r, x, n;
 	LPVOID *lpPtr;
 
 	TRACE (commctrl, "binary search\n");
@@ -1419,7 +1419,7 @@ DPA_Search (const HDPA hdpa, LPVOID pFind, INT32 nStart,
     else {
 	/* array is not sorted --> use linear search */
 	LPVOID *lpPtr;
-	INT32  nIndex;
+	INT  nIndex;
 
 	TRACE (commctrl, "linear search\n");
 	
@@ -1453,7 +1453,7 @@ DPA_Search (const HDPA hdpa, LPVOID pFind, INT32 nStart,
  */
 
 HDPA WINAPI
-DPA_CreateEx (INT32 nGrow, HANDLE32 hHeap)
+DPA_CreateEx (INT nGrow, HANDLE hHeap)
 {
     HDPA hdpa;
 
@@ -1485,8 +1485,8 @@ DPA_CreateEx (INT32 nGrow, HANDLE32 hHeap)
 
 typedef struct tagNOTIFYDATA
 {
-    HWND32 hwndFrom;
-    HWND32 hwndTo;
+    HWND hwndFrom;
+    HWND hwndTo;
     DWORD  dwParam3;
     DWORD  dwParam4;
     DWORD  dwParam5;
@@ -1499,11 +1499,11 @@ typedef struct tagNOTIFYDATA
  */
 
 static LRESULT
-DoNotify (LPNOTIFYDATA lpNotify, UINT32 uCode, LPNMHDR lpHdr)
+DoNotify (LPNOTIFYDATA lpNotify, UINT uCode, LPNMHDR lpHdr)
 {
     NMHDR nmhdr;
     LPNMHDR lpNmh = NULL;
-    UINT32 idFrom = 0;
+    UINT idFrom = 0;
 
     TRACE (commctrl, "(0x%04x 0x%04x %d %p 0x%08lx)\n",
 	   lpNotify->hwndFrom, lpNotify->hwndTo, uCode, lpHdr,
@@ -1518,11 +1518,11 @@ DoNotify (LPNOTIFYDATA lpNotify, UINT32 uCode, LPNMHDR lpHdr)
     }
     else {
 	if (lpNotify->hwndFrom) {
-	    HWND32 hwndParent = GetParent32 (lpNotify->hwndFrom);
+	    HWND hwndParent = GetParent (lpNotify->hwndFrom);
 	    if (hwndParent) {
-		hwndParent = GetWindow32 (lpNotify->hwndFrom, GW_OWNER);
+		hwndParent = GetWindow (lpNotify->hwndFrom, GW_OWNER);
 		if (hwndParent)
-		    idFrom = GetDlgCtrlID32 (lpNotify->hwndFrom);
+		    idFrom = GetDlgCtrlID (lpNotify->hwndFrom);
 	    }
 	}
 
@@ -1533,7 +1533,7 @@ DoNotify (LPNOTIFYDATA lpNotify, UINT32 uCode, LPNMHDR lpHdr)
 	lpNmh->code = uCode;
     }
 
-    return SendMessage32A (lpNotify->hwndTo, WM_NOTIFY, idFrom, (LPARAM)lpNmh);
+    return SendMessageA (lpNotify->hwndTo, WM_NOTIFY, idFrom, (LPARAM)lpNmh);
 }
 
 
@@ -1552,8 +1552,8 @@ DoNotify (LPNOTIFYDATA lpNotify, UINT32 uCode, LPNMHDR lpHdr)
  */
 
 LRESULT WINAPI
-COMCTL32_SendNotify (HWND32 hwndFrom, HWND32 hwndTo,
-		     UINT32 uCode, LPNMHDR lpHdr)
+COMCTL32_SendNotify (HWND hwndFrom, HWND hwndTo,
+		     UINT uCode, LPNMHDR lpHdr)
 {
     NOTIFYDATA notify;
 
@@ -1585,19 +1585,19 @@ COMCTL32_SendNotify (HWND32 hwndFrom, HWND32 hwndTo,
  */
 
 LRESULT WINAPI
-COMCTL32_SendNotifyEx (HWND32 hwndTo, HWND32 hwndFrom, UINT32 uCode,
+COMCTL32_SendNotifyEx (HWND hwndTo, HWND hwndFrom, UINT uCode,
 		       LPNMHDR lpHdr, DWORD dwParam5)
 {
     NOTIFYDATA notify;
-    HWND32 hwndNotify;
+    HWND hwndNotify;
 
     TRACE (commctrl, "(0x%04x 0x%04x %d %p 0x%08lx)\n",
 	   hwndFrom, hwndTo, uCode, lpHdr, dwParam5);
 
     hwndNotify = hwndTo;
     if (!hwndTo) {
-	if (IsWindow32 (hwndFrom)) {
-	    hwndNotify = GetParent32 (hwndFrom);
+	if (IsWindow (hwndFrom)) {
+	    hwndNotify = GetParent (hwndFrom);
 	    if (!hwndNotify)
 		return 0;
 	}
@@ -1631,7 +1631,7 @@ COMCTL32_StrChrA (LPCSTR lpString, CHAR cChar)
 LPSTR WINAPI
 COMCTL32_StrStrIA (LPCSTR lpStr1, LPCSTR lpStr2)
 {
-    INT32 len1, len2, i;
+    INT len1, len2, i;
     CHAR  first;
 
     if (*lpStr2 == 0)
@@ -1661,7 +1661,7 @@ COMCTL32_StrStrIA (LPCSTR lpStr1, LPCSTR lpStr2)
  * StrToIntA [COMCTL32.357] Converts a string to a signed integer.
  */
 
-INT32 WINAPI
+INT WINAPI
 COMCTL32_StrToIntA (LPSTR lpString)
 {
     return atoi(lpString);
@@ -1685,7 +1685,7 @@ COMCTL32_StrToIntA (LPSTR lpString)
 VOID WINAPI
 DPA_EnumCallback (const HDPA hdpa, DPAENUMPROC enumProc, LPARAM lParam)
 {
-    INT32 i;
+    INT i;
 
     TRACE (commctrl, "(%p %p %08lx)\n", hdpa, enumProc, lParam);
 
@@ -1718,7 +1718,7 @@ DPA_EnumCallback (const HDPA hdpa, DPAENUMPROC enumProc, LPARAM lParam)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 DPA_DestroyCallback (const HDPA hdpa, DPAENUMPROC enumProc, LPARAM lParam)
 {
     TRACE (commctrl, "(%p %p %08lx)\n", hdpa, enumProc, lParam);
@@ -1746,7 +1746,7 @@ DPA_DestroyCallback (const HDPA hdpa, DPAENUMPROC enumProc, LPARAM lParam)
 VOID WINAPI
 DSA_EnumCallback (const HDSA hdsa, DSAENUMPROC enumProc, LPARAM lParam)
 {
-    INT32 i;
+    INT i;
 
     TRACE (commctrl, "(%p %p %08lx)\n", hdsa, enumProc, lParam);
 
@@ -1780,7 +1780,7 @@ DSA_EnumCallback (const HDSA hdsa, DSAENUMPROC enumProc, LPARAM lParam)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 DSA_DestroyCallback (const HDSA hdsa, DSAENUMPROC enumProc, LPARAM lParam)
 {
     TRACE (commctrl, "(%p %p %08lx)\n", hdsa, enumProc, lParam);
@@ -1794,7 +1794,7 @@ DSA_DestroyCallback (const HDSA hdsa, DSAENUMPROC enumProc, LPARAM lParam)
  * StrCSpnA [COMCTL32.356]
  *
  */
-INT32 WINAPI COMCTL32_StrCSpnA( LPCSTR lpStr, LPCSTR lpSet) {
+INT WINAPI COMCTL32_StrCSpnA( LPCSTR lpStr, LPCSTR lpSet) {
   return strcspn(lpStr, lpSet);
 }
 
@@ -1810,16 +1810,16 @@ LPWSTR WINAPI COMCTL32_StrChrW( LPCWSTR lpStart, WORD wMatch) {
  * StrCmpNA [COMCTL32.352]
  *
  */
-INT32 WINAPI COMCTL32_StrCmpNA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar) {
-  return lstrncmp32A(lpStr1, lpStr2, nChar);
+INT WINAPI COMCTL32_StrCmpNA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar) {
+  return lstrncmpA(lpStr1, lpStr2, nChar);
 }
 
 /**************************************************************************
  * StrCmpNW [COMCTL32.360]
  *
  */
-INT32 WINAPI COMCTL32_StrCmpNW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
-  return lstrncmp32W(lpStr1, lpStr2, nChar);
+INT WINAPI COMCTL32_StrCmpNW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
+  return lstrncmpW(lpStr1, lpStr2, nChar);
 }
 
 /**************************************************************************
@@ -1858,7 +1858,7 @@ LPWSTR WINAPI COMCTL32_StrStrW( LPCWSTR lpFirst, LPCWSTR lpSrch) {
  * StrSpnW [COMCTL32.364]
  *
  */
-INT32 WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
+INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
   LPWSTR lpLoop = lpStr;
 
   /* validate ptr */
@@ -1868,9 +1868,9 @@ INT32 WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
 
   for(; (*lpLoop != 0); lpLoop++)
     if( CRTDLL_wcschr(lpSet, *(WORD*)lpLoop))
-      return (INT32)(lpLoop-lpStr);
+      return (INT)(lpLoop-lpStr);
   
-  return (INT32)(lpLoop-lpStr);
+  return (INT)(lpLoop-lpStr);
 }
 
 
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 53308305299..b27f3a2d5dc 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -34,7 +34,7 @@
 #include "winerror.h"
 
 
-HANDLE32 COMCTL32_hHeap = (HANDLE32)NULL;
+HANDLE COMCTL32_hHeap = (HANDLE)NULL;
 DWORD    COMCTL32_dwProcessesAttached = 0;
 LPSTR    COMCTL32_aSubclass = (LPSTR)NULL;
 
@@ -52,8 +52,8 @@ LPSTR    COMCTL32_aSubclass = (LPSTR)NULL;
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-COMCTL32_LibMain (HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI
+COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     TRACE (commctrl, "%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
@@ -65,7 +65,7 @@ COMCTL32_LibMain (HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 		TRACE (commctrl, "Heap created: 0x%x\n", COMCTL32_hHeap);
 
 		/* add global subclassing atom (used by 'tooltip' and 'updown') */
-		COMCTL32_aSubclass = (LPSTR)(DWORD)GlobalAddAtom32A ("CC32SubclassInfo");
+		COMCTL32_aSubclass = (LPSTR)(DWORD)GlobalAddAtomA ("CC32SubclassInfo");
 		TRACE (commctrl, "Subclassing atom added: %p\n",
 		       COMCTL32_aSubclass);
 
@@ -123,7 +123,7 @@ COMCTL32_LibMain (HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 		/* destroy private heap */
 		HeapDestroy (COMCTL32_hHeap);
 		TRACE (commctrl, "Heap destroyed: 0x%x\n", COMCTL32_hHeap);
-		COMCTL32_hHeap = (HANDLE32)NULL;
+		COMCTL32_hHeap = (HANDLE)NULL;
 	    }
 	    break;
     }
@@ -160,12 +160,12 @@ COMCTL32_LibMain (HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
  */
 
 VOID WINAPI
-MenuHelp (UINT32 uMsg, WPARAM32 wParam, LPARAM lParam, HMENU32 hMainMenu,
-	  HINSTANCE32 hInst, HWND32 hwndStatus, LPUINT32 lpwIDs)
+MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
+	  HINSTANCE hInst, HWND hwndStatus, LPUINT lpwIDs)
 {
-    UINT32 uMenuID = 0;
+    UINT uMenuID = 0;
 
-    if (!IsWindow32 (hwndStatus))
+    if (!IsWindow (hwndStatus))
 	return;
 
     switch (uMsg) {
@@ -176,25 +176,25 @@ MenuHelp (UINT32 uMsg, WPARAM32 wParam, LPARAM lParam, HMENU32 hMainMenu,
             if ((HIWORD(wParam) == 0xFFFF) && (lParam == 0)) {
                 /* menu was closed */
 		TRACE (commctrl, "menu was closed!\n");
-                SendMessage32A (hwndStatus, SB_SIMPLE, FALSE, 0);
+                SendMessageA (hwndStatus, SB_SIMPLE, FALSE, 0);
             }
 	    else {
 		/* menu item was selected */
 		if (HIWORD(wParam) & MF_POPUP)
-		    uMenuID = (UINT32)*(lpwIDs+1);
+		    uMenuID = (UINT)*(lpwIDs+1);
 		else
-		    uMenuID = (UINT32)LOWORD(wParam);
+		    uMenuID = (UINT)LOWORD(wParam);
 		TRACE (commctrl, "uMenuID = %u\n", uMenuID);
 
 		if (uMenuID) {
 		    CHAR szText[256];
 
-		    if (!LoadString32A (hInst, uMenuID, szText, 256))
+		    if (!LoadStringA (hInst, uMenuID, szText, 256))
 			szText[0] = '\0';
 
-		    SendMessage32A (hwndStatus, SB_SETTEXT32A,
+		    SendMessageA (hwndStatus, SB_SETTEXTA,
 				    255 | SBT_NOBORDERS, (LPARAM)szText);
-		    SendMessage32A (hwndStatus, SB_SIMPLE, TRUE, 0);
+		    SendMessageA (hwndStatus, SB_SIMPLE, TRUE, 0);
 		}
 	    }
 	    break;
@@ -236,10 +236,10 @@ MenuHelp (UINT32 uMsg, WPARAM32 wParam, LPARAM lParam, HMENU32 hMainMenu,
  *     Each subsequent pair consists of a menu id and control id.
  */
 
-BOOL32 WINAPI
-ShowHideMenuCtl (HWND32 hwnd, UINT32 uFlags, LPINT32 lpInfo)
+BOOL WINAPI
+ShowHideMenuCtl (HWND hwnd, UINT uFlags, LPINT lpInfo)
 {
-    LPINT32 lpMenuId;
+    LPINT lpMenuId;
 
     TRACE (commctrl, "%x, %x, %p\n", hwnd, uFlags, lpInfo);
 
@@ -254,22 +254,22 @@ ShowHideMenuCtl (HWND32 hwnd, UINT32 uFlags, LPINT32 lpInfo)
     while (*lpMenuId != uFlags)
 	lpMenuId += 2;
 
-    if (GetMenuState32 (lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) {
+    if (GetMenuState (lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) {
 	/* uncheck menu item */
-	CheckMenuItem32 (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED);
+	CheckMenuItem (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED);
 
 	/* hide control */
 	lpMenuId++;
-	SetWindowPos32 (GetDlgItem32 (hwnd, *lpMenuId), 0, 0, 0, 0, 0,
+	SetWindowPos (GetDlgItem (hwnd, *lpMenuId), 0, 0, 0, 0, 0,
 			SWP_HIDEWINDOW);
     }
     else {
 	/* check menu item */
-	CheckMenuItem32 (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED);
+	CheckMenuItem (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED);
 
 	/* show control */
 	lpMenuId++;
-	SetWindowPos32 (GetDlgItem32 (hwnd, *lpMenuId), 0, 0, 0, 0, 0,
+	SetWindowPos (GetDlgItem (hwnd, *lpMenuId), 0, 0, 0, 0, 0,
 			SWP_SHOWWINDOW);
     }
 
@@ -297,16 +297,16 @@ ShowHideMenuCtl (HWND32 hwnd, UINT32 uFlags, LPINT32 lpInfo)
  */
 
 VOID WINAPI
-GetEffectiveClientRect (HWND32 hwnd, LPRECT32 lpRect, LPINT32 lpInfo)
+GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo)
 {
-    RECT32 rcCtrl;
-    INT32  *lpRun;
-    HWND32 hwndCtrl;
+    RECT rcCtrl;
+    INT  *lpRun;
+    HWND hwndCtrl;
 
     TRACE (commctrl, "(0x%08lx 0x%08lx 0x%08lx)\n",
 	   (DWORD)hwnd, (DWORD)lpRect, (DWORD)lpInfo);
 
-    GetClientRect32 (hwnd, lpRect);
+    GetClientRect (hwnd, lpRect);
     lpRun = lpInfo;
 
     do {
@@ -314,12 +314,12 @@ GetEffectiveClientRect (HWND32 hwnd, LPRECT32 lpRect, LPINT32 lpInfo)
 	if (*lpRun == 0)
 	    return;
 	lpRun++;
-	hwndCtrl = GetDlgItem32 (hwnd, *lpRun);
-	if (GetWindowLong32A (hwndCtrl, GWL_STYLE) & WS_VISIBLE) {
+	hwndCtrl = GetDlgItem (hwnd, *lpRun);
+	if (GetWindowLongA (hwndCtrl, GWL_STYLE) & WS_VISIBLE) {
 	    TRACE (commctrl, "control id 0x%x\n", *lpRun);
-	    GetWindowRect32 (hwndCtrl, &rcCtrl);
-	    MapWindowPoints32 ((HWND32)0, hwnd, (LPPOINT32)&rcCtrl, 2);
-	    SubtractRect32 (lpRect, lpRect, &rcCtrl);
+	    GetWindowRect (hwndCtrl, &rcCtrl);
+	    MapWindowPoints ((HWND)0, hwnd, (LPPOINT)&rcCtrl, 2);
+	    SubtractRect (lpRect, lpRect, &rcCtrl);
 	}
 	lpRun++;
     } while (*lpRun);
@@ -346,26 +346,26 @@ GetEffectiveClientRect (HWND32 hwnd, LPRECT32 lpRect, LPINT32 lpInfo)
  */
 
 VOID WINAPI
-DrawStatusText32A (HDC32 hdc, LPRECT32 lprc, LPCSTR text, UINT32 style)
+DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style)
 {
-    RECT32 r = *lprc;
-    UINT32 border = BDR_SUNKENOUTER;
+    RECT r = *lprc;
+    UINT border = BDR_SUNKENOUTER;
 
     if (style == SBT_POPOUT)
       border = BDR_RAISEDOUTER;
     else if (style == SBT_NOBORDERS)
       border = 0;
 
-    DrawEdge32 (hdc, &r, border, BF_RECT|BF_ADJUST|BF_MIDDLE);
+    DrawEdge (hdc, &r, border, BF_RECT|BF_ADJUST|BF_MIDDLE);
 
     /* now draw text */
     if (text) {
-      int oldbkmode = SetBkMode32 (hdc, TRANSPARENT);
+      int oldbkmode = SetBkMode (hdc, TRANSPARENT);
       r.left += 3;
-      DrawText32A (hdc, text, lstrlen32A(text),
+      DrawTextA (hdc, text, lstrlenA(text),
 		   &r, DT_LEFT|DT_VCENTER|DT_SINGLELINE);  
       if (oldbkmode != TRANSPARENT)
-	SetBkMode32(hdc, oldbkmode);
+	SetBkMode(hdc, oldbkmode);
     }
 }
 
@@ -386,10 +386,10 @@ DrawStatusText32A (HDC32 hdc, LPRECT32 lprc, LPCSTR text, UINT32 style)
  */
 
 VOID WINAPI
-DrawStatusText32W (HDC32 hdc, LPRECT32 lprc, LPCWSTR text, UINT32 style)
+DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style)
 {
     LPSTR p = HEAP_strdupWtoA (GetProcessHeap (), 0, text);
-    DrawStatusText32A (hdc, lprc, p, style);
+    DrawStatusTextA (hdc, lprc, p, style);
     HeapFree (GetProcessHeap (), 0, p );
 }
 
@@ -410,12 +410,12 @@ DrawStatusText32W (HDC32 hdc, LPRECT32 lprc, LPCWSTR text, UINT32 style)
  *     Failure: 0
  */
 
-HWND32 WINAPI
-CreateStatusWindow32A (INT32 style, LPCSTR text, HWND32 parent, UINT32 wid)
+HWND WINAPI
+CreateStatusWindowA (INT style, LPCSTR text, HWND parent, UINT wid)
 {
-    return CreateWindow32A(STATUSCLASSNAME32A, text, style, 
-			   CW_USEDEFAULT32, CW_USEDEFAULT32,
-			   CW_USEDEFAULT32, CW_USEDEFAULT32, 
+    return CreateWindowA(STATUSCLASSNAMEA, text, style, 
+			   CW_USEDEFAULT, CW_USEDEFAULT,
+			   CW_USEDEFAULT, CW_USEDEFAULT, 
 			   parent, wid, 0, 0);
 }
 
@@ -434,12 +434,12 @@ CreateStatusWindow32A (INT32 style, LPCSTR text, HWND32 parent, UINT32 wid)
  *     Failure: 0
  */
 
-HWND32 WINAPI
-CreateStatusWindow32W (INT32 style, LPCWSTR text, HWND32 parent, UINT32 wid)
+HWND WINAPI
+CreateStatusWindowW (INT style, LPCWSTR text, HWND parent, UINT wid)
 {
-    return CreateWindow32W(STATUSCLASSNAME32W, text, style,
-			   CW_USEDEFAULT32, CW_USEDEFAULT32,
-			   CW_USEDEFAULT32, CW_USEDEFAULT32,
+    return CreateWindowW(STATUSCLASSNAMEW, text, style,
+			   CW_USEDEFAULT, CW_USEDEFAULT,
+			   CW_USEDEFAULT, CW_USEDEFAULT,
 			   parent, wid, 0, 0);
 }
 
@@ -466,18 +466,18 @@ CreateStatusWindow32W (INT32 style, LPCWSTR text, HWND32 parent, UINT32 wid)
  *     Failure: 0
  */
 
-HWND32 WINAPI
-CreateUpDownControl (DWORD style, INT32 x, INT32 y, INT32 cx, INT32 cy,
-		     HWND32 parent, INT32 id, HINSTANCE32 inst,
-		     HWND32 buddy, INT32 maxVal, INT32 minVal, INT32 curVal)
+HWND WINAPI
+CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy,
+		     HWND parent, INT id, HINSTANCE inst,
+		     HWND buddy, INT maxVal, INT minVal, INT curVal)
 {
-    HWND32 hUD =
-	CreateWindow32A (UPDOWN_CLASS32A, 0, style, x, y, cx, cy,
+    HWND hUD =
+	CreateWindowA (UPDOWN_CLASSA, 0, style, x, y, cx, cy,
 			 parent, id, inst, 0);
     if (hUD) {
-	SendMessage32A (hUD, UDM_SETBUDDY, buddy, 0);
-	SendMessage32A (hUD, UDM_SETRANGE, 0, MAKELONG(maxVal, minVal));
-	SendMessage32A (hUD, UDM_SETPOS, 0, MAKELONG(curVal, 0));     
+	SendMessageA (hUD, UDM_SETBUDDY, buddy, 0);
+	SendMessageA (hUD, UDM_SETRANGE16, 0, MAKELONG(maxVal, minVal));
+	SendMessageA (hUD, UDM_SETPOS, 0, MAKELONG(curVal, 0));     
     }
 
     return hUD;
@@ -524,10 +524,10 @@ InitCommonControls (VOID)
  *     The Win95 controls are registered at the DLL's initialization.
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls)
 {
-    INT32 cCount;
+    INT cCount;
     DWORD dwMask;
 
     if (!lpInitCtrls)
@@ -613,52 +613,52 @@ InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls)
  *     Failure: 0
  */
 
-HWND32 WINAPI
-CreateToolbarEx (HWND32 hwnd, DWORD style, UINT32 wID, INT32 nBitmaps,
-                 HINSTANCE32 hBMInst, UINT32 wBMID, LPCTBBUTTON lpButtons,
-                 INT32 iNumButtons, INT32 dxButton, INT32 dyButton,
-                 INT32 dxBitmap, INT32 dyBitmap, UINT32 uStructSize)
+HWND WINAPI
+CreateToolbarEx (HWND hwnd, DWORD style, UINT wID, INT nBitmaps,
+                 HINSTANCE hBMInst, UINT wBMID, LPCTBBUTTON lpButtons,
+                 INT iNumButtons, INT dxButton, INT dyButton,
+                 INT dxBitmap, INT dyBitmap, UINT uStructSize)
 {
-    HWND32 hwndTB =
-        CreateWindowEx32A (0, TOOLBARCLASSNAME32A, "", style, 0, 0, 0, 0,
-			   hwnd, (HMENU32)wID, 0, NULL);
+    HWND hwndTB =
+        CreateWindowExA (0, TOOLBARCLASSNAMEA, "", style, 0, 0, 0, 0,
+			   hwnd, (HMENU)wID, 0, NULL);
     if(hwndTB) {
 	TBADDBITMAP tbab;
 
-        SendMessage32A (hwndTB, TB_BUTTONSTRUCTSIZE,
-			(WPARAM32)uStructSize, 0);
+        SendMessageA (hwndTB, TB_BUTTONSTRUCTSIZE,
+			(WPARAM)uStructSize, 0);
 
 	/* set bitmap and button size */
 	if (hBMInst == HINST_COMMCTRL) {
 	    if (wBMID & 1) {
-		SendMessage32A (hwndTB, TB_SETBITMAPSIZE, 0,
+		SendMessageA (hwndTB, TB_SETBITMAPSIZE, 0,
 				MAKELPARAM(26, 25));
-		SendMessage32A (hwndTB, TB_SETBUTTONSIZE, 0,
+		SendMessageA (hwndTB, TB_SETBUTTONSIZE, 0,
 				MAKELPARAM(33, 32));
 	    }
 	    else {
-		SendMessage32A (hwndTB, TB_SETBITMAPSIZE, 0,
+		SendMessageA (hwndTB, TB_SETBITMAPSIZE, 0,
 				MAKELPARAM(16, 15));
-		SendMessage32A (hwndTB, TB_SETBUTTONSIZE, 0,
+		SendMessageA (hwndTB, TB_SETBUTTONSIZE, 0,
 				MAKELPARAM(23, 22));
 	    }
 	}
 	else {
-	    SendMessage32A (hwndTB, TB_SETBITMAPSIZE, 0,
+	    SendMessageA (hwndTB, TB_SETBITMAPSIZE, 0,
 			    MAKELPARAM((WORD)dyBitmap, (WORD)dxBitmap));
-	    SendMessage32A (hwndTB, TB_SETBUTTONSIZE, 0,
+	    SendMessageA (hwndTB, TB_SETBUTTONSIZE, 0,
 			    MAKELPARAM((WORD)dyButton, (WORD)dxButton));
 	}
 
 	/* add bitmaps */
 	tbab.hInst = hBMInst;
 	tbab.nID   = wBMID;
-	SendMessage32A (hwndTB, TB_ADDBITMAP,
-			(WPARAM32)nBitmaps, (LPARAM)&tbab);
+	SendMessageA (hwndTB, TB_ADDBITMAP,
+			(WPARAM)nBitmaps, (LPARAM)&tbab);
 
 	/* add buttons */
-	SendMessage32A (hwndTB, TB_ADDBUTTONS32A,
-			(WPARAM32)iNumButtons, (LPARAM)lpButtons);
+	SendMessageA (hwndTB, TB_ADDBUTTONSA,
+			(WPARAM)iNumButtons, (LPARAM)lpButtons);
     }
 
     return hwndTB;
@@ -680,18 +680,18 @@ CreateToolbarEx (HWND32 hwnd, DWORD style, UINT32 wID, INT32 nBitmaps,
  *     Failure: 0
  */
 
-HBITMAP32 WINAPI
-CreateMappedBitmap (HINSTANCE32 hInstance, INT32 idBitmap, UINT32 wFlags,
-		    LPCOLORMAP lpColorMap, INT32 iNumMaps)
+HBITMAP WINAPI
+CreateMappedBitmap (HINSTANCE hInstance, INT idBitmap, UINT wFlags,
+		    LPCOLORMAP lpColorMap, INT iNumMaps)
 {
-    HGLOBAL32 hglb;
-    HRSRC32 hRsrc;
+    HGLOBAL hglb;
+    HRSRC hRsrc;
     LPBITMAPINFOHEADER lpBitmap, lpBitmapInfo;
-    UINT32 nSize, nColorTableSize;
+    UINT nSize, nColorTableSize;
     DWORD *pColorTable;
-    INT32 iColor, i, iMaps, nWidth, nHeight;
-    HDC32 hdcScreen;
-    HBITMAP32 hbm;
+    INT iColor, i, iMaps, nWidth, nHeight;
+    HDC hdcScreen;
+    HBITMAP hbm;
     LPCOLORMAP sysColorMap;
     COLORMAP internalColorMap[4] =
 	{{0x000000, 0}, {0x808080, 0}, {0xC0C0C0, 0}, {0xFFFFFF, 0}};
@@ -702,32 +702,32 @@ CreateMappedBitmap (HINSTANCE32 hInstance, INT32 idBitmap, UINT32 wFlags,
 	sysColorMap = lpColorMap;
     }
     else {
-	internalColorMap[0].to = GetSysColor32 (COLOR_BTNTEXT);
-	internalColorMap[1].to = GetSysColor32 (COLOR_BTNSHADOW);
-	internalColorMap[2].to = GetSysColor32 (COLOR_BTNFACE);
-	internalColorMap[3].to = GetSysColor32 (COLOR_BTNHIGHLIGHT);
+	internalColorMap[0].to = GetSysColor (COLOR_BTNTEXT);
+	internalColorMap[1].to = GetSysColor (COLOR_BTNSHADOW);
+	internalColorMap[2].to = GetSysColor (COLOR_BTNFACE);
+	internalColorMap[3].to = GetSysColor (COLOR_BTNHIGHLIGHT);
 	iMaps = 4;
 	sysColorMap = (LPCOLORMAP)internalColorMap;
     }
 
-    hRsrc = FindResource32A (hInstance, (LPSTR)idBitmap, RT_BITMAP32A);
+    hRsrc = FindResourceA (hInstance, (LPSTR)idBitmap, RT_BITMAPA);
     if (hRsrc == 0)
 	return 0;
-    hglb = LoadResource32 (hInstance, hRsrc);
+    hglb = LoadResource (hInstance, hRsrc);
     if (hglb == 0)
 	return 0;
-    lpBitmap = (LPBITMAPINFOHEADER)LockResource32 (hglb);
+    lpBitmap = (LPBITMAPINFOHEADER)LockResource (hglb);
     if (lpBitmap == NULL)
 	return 0;
 
     nColorTableSize = (1 << lpBitmap->biBitCount);
     nSize = lpBitmap->biSize + nColorTableSize * sizeof(RGBQUAD);
-    lpBitmapInfo = (LPBITMAPINFOHEADER)GlobalAlloc32 (GMEM_FIXED, nSize);
+    lpBitmapInfo = (LPBITMAPINFOHEADER)GlobalAlloc (GMEM_FIXED, nSize);
     if (lpBitmapInfo == NULL)
 	return 0;
     RtlMoveMemory (lpBitmapInfo, lpBitmap, nSize);
 
-    pColorTable = (DWORD*)(((LPBYTE)lpBitmapInfo)+(UINT32)lpBitmapInfo->biSize);
+    pColorTable = (DWORD*)(((LPBYTE)lpBitmapInfo)+(UINT)lpBitmapInfo->biSize);
 
     for (iColor = 0; iColor < nColorTableSize; iColor++) {
 	for (i = 0; i < iMaps; i++) {
@@ -745,24 +745,24 @@ CreateMappedBitmap (HINSTANCE32 hInstance, INT32 idBitmap, UINT32 wFlags,
 	}
     }
 
-    nWidth  = (INT32)lpBitmapInfo->biWidth;
-    nHeight = (INT32)lpBitmapInfo->biHeight;
-    hdcScreen = GetDC32 ((HWND32)0);
-    hbm = CreateCompatibleBitmap32 (hdcScreen, nWidth, nHeight);
+    nWidth  = (INT)lpBitmapInfo->biWidth;
+    nHeight = (INT)lpBitmapInfo->biHeight;
+    hdcScreen = GetDC ((HWND)0);
+    hbm = CreateCompatibleBitmap (hdcScreen, nWidth, nHeight);
     if (hbm) {
-	HDC32 hdcDst = CreateCompatibleDC32 (hdcScreen);
-	HBITMAP32 hbmOld = SelectObject32 (hdcDst, hbm);
+	HDC hdcDst = CreateCompatibleDC (hdcScreen);
+	HBITMAP hbmOld = SelectObject (hdcDst, hbm);
 	LPBYTE lpBits = (LPBYTE)(lpBitmap + 1);
 	lpBits += (1 << (lpBitmapInfo->biBitCount)) * sizeof(RGBQUAD);
-	StretchDIBits32 (hdcDst, 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight,
+	StretchDIBits (hdcDst, 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight,
 		         lpBits, (LPBITMAPINFO)lpBitmapInfo, DIB_RGB_COLORS,
 		         SRCCOPY);
-	SelectObject32 (hdcDst, hbmOld);
-	DeleteDC32 (hdcDst);
+	SelectObject (hdcDst, hbmOld);
+	DeleteDC (hdcDst);
     }
-    ReleaseDC32 ((HWND32)0, hdcScreen);
-    GlobalFree32 ((HGLOBAL32)lpBitmapInfo);
-    FreeResource32 (hglb);
+    ReleaseDC ((HWND)0, hdcScreen);
+    GlobalFree ((HGLOBAL)lpBitmapInfo);
+    FreeResource (hglb);
 
     return hbm;
 }
@@ -789,10 +789,10 @@ CreateMappedBitmap (HINSTANCE32 hInstance, INT32 idBitmap, UINT32 wFlags,
  *     Do not use this functions anymore. Use CreateToolbarEx instead.
  */
 
-HWND32 WINAPI
-CreateToolbar (HWND32 hwnd, DWORD style, UINT32 wID, INT32 nBitmaps,
-	       HINSTANCE32 hBMInst, UINT32 wBMID,
-	       LPCOLDTBBUTTON lpButtons,INT32 iNumButtons)
+HWND WINAPI
+CreateToolbar (HWND hwnd, DWORD style, UINT wID, INT nBitmaps,
+	       HINSTANCE hBMInst, UINT wBMID,
+	       LPCOLDTBBUTTON lpButtons,INT iNumButtons)
 {
     return CreateToolbarEx (hwnd, style | CCS_NODIVIDER, wID, nBitmaps,
 			    hBMInst, wBMID, (LPCTBBUTTON)lpButtons,
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 9e702b528cd..bb5a01670d8 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -28,7 +28,7 @@
 
 
 static LRESULT
-DATETIME_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+DATETIME_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     DATETIME_INFO *infoPtr;
 
@@ -55,7 +55,7 @@ DATETIME_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-DATETIME_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+DATETIME_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr(wndPtr);
 
@@ -69,7 +69,7 @@ DATETIME_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-DATETIME_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -92,11 +92,11 @@ DATETIME_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
         FIXME (datetime, "Unimplemented msg DTM_SETRANGE\n");
         return 1;
 
-    case DTM_SETFORMAT32A:
+    case DTM_SETFORMATA:
         FIXME (datetime, "Unimplemented msg DTM_SETFORMAT32A\n");
         return 1;
 
-    case DTM_SETFORMAT32W:
+    case DTM_SETFORMATW:
         FIXME (datetime, "Unimplemented msg DTM_SETFORMAT32W\n");
         return 1;
 
@@ -130,7 +130,7 @@ DATETIME_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (datetime, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -139,27 +139,27 @@ DATETIME_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 DATETIME_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (DATETIMEPICK_CLASS32A)) return;
+    if (GlobalFindAtomA (DATETIMEPICK_CLASSA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC32)DATETIME_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)DATETIME_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(DATETIME_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_WINDOW + 1);
-    wndClass.lpszClassName = DATETIMEPICK_CLASS32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndClass.lpszClassName = DATETIMEPICK_CLASSA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 DATETIME_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (DATETIMEPICK_CLASS32A))
-	UnregisterClass32A (DATETIMEPICK_CLASS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (DATETIMEPICK_CLASSA))
+	UnregisterClassA (DATETIMEPICK_CLASSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c
index 8b099121b3f..e45ec70f60e 100644
--- a/dlls/comctl32/draglist.c
+++ b/dlls/comctl32/draglist.c
@@ -16,7 +16,7 @@
 #include "debug.h"
 
 
-BOOL32 WINAPI MakeDragList (HWND32 hwndLB)
+BOOL WINAPI MakeDragList (HWND hwndLB)
 {
     FIXME (commctrl, "(0x%x)\n", hwndLB);
 
@@ -25,7 +25,7 @@ BOOL32 WINAPI MakeDragList (HWND32 hwndLB)
 }
 
 
-VOID WINAPI DrawInsert (HWND32 hwndParent, HWND32 hwndLB, INT32 nItem)
+VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem)
 {
     FIXME (commctrl, "(0x%x 0x%x %d)\n", hwndParent, hwndLB, nItem);
 
@@ -33,7 +33,7 @@ VOID WINAPI DrawInsert (HWND32 hwndParent, HWND32 hwndLB, INT32 nItem)
 }
 
 
-INT32 WINAPI LBItemFromPt (HWND32 hwndLB, POINT32 pt, BOOL32 bAutoScroll)
+INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll)
 {
     FIXME (commctrl, "(0x%x %ld x %ld %s)\n",
 	   hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c
index 982a1c45090..ad484a3d2e9 100644
--- a/dlls/comctl32/flatsb.c
+++ b/dlls/comctl32/flatsb.c
@@ -24,85 +24,85 @@
 #define FlatSB_GetInfoPtr(wndPtr) ((FLATSB_INFO*)wndPtr->wExtra[0])
 
 
-BOOL32 WINAPI 
-FlatSB_EnableScrollBar(HWND32 hwnd, INT32 dummy, UINT32 dummy2)
+BOOL WINAPI 
+FlatSB_EnableScrollBar(HWND hwnd, INT dummy, UINT dummy2)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
-BOOL32 WINAPI 
-FlatSB_ShowScrollBar(HWND32 hwnd, INT32 code, BOOL32 flag)
+BOOL WINAPI 
+FlatSB_ShowScrollBar(HWND hwnd, INT code, BOOL flag)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
-BOOL32 WINAPI 
-FlatSB_GetScrollRange(HWND32 hwnd, INT32 code, LPINT32 min, LPINT32 max)
+BOOL WINAPI 
+FlatSB_GetScrollRange(HWND hwnd, INT code, LPINT min, LPINT max)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
-BOOL32 WINAPI 
-FlatSB_GetScrollInfo(HWND32 hwnd, INT32 code, LPSCROLLINFO info)
+BOOL WINAPI 
+FlatSB_GetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
-INT32 WINAPI 
-FlatSB_GetScrollPos(HWND32 hwnd, INT32 code)
+INT WINAPI 
+FlatSB_GetScrollPos(HWND hwnd, INT code)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
-BOOL32 WINAPI 
-FlatSB_GetScrollProp(HWND32 hwnd, INT32 propIndex, LPINT32 prop)
+BOOL WINAPI 
+FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
 
-INT32 WINAPI 
-FlatSB_SetScrollPos(HWND32 hwnd, INT32 code, INT32 pos, BOOL32 fRedraw)
+INT WINAPI 
+FlatSB_SetScrollPos(HWND hwnd, INT code, INT pos, BOOL fRedraw)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
-INT32 WINAPI 
-FlatSB_SetScrollInfo(HWND32 hwnd, INT32 code, LPSCROLLINFO info, BOOL32 fRedraw)
+INT WINAPI 
+FlatSB_SetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info, BOOL fRedraw)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
-INT32 WINAPI 
-FlatSB_SetScrollRange(HWND32 hwnd, INT32 code, INT32 min, INT32 max, BOOL32 fRedraw)
+INT WINAPI 
+FlatSB_SetScrollRange(HWND hwnd, INT code, INT min, INT max, BOOL fRedraw)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
-BOOL32 WINAPI 
-FlatSB_SetScrollProp(HWND32 hwnd, UINT32 index, INT32 newValue, BOOL32 flag)
+BOOL WINAPI 
+FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
 
-BOOL32 WINAPI InitializeFlatSB(HWND32 hwnd)
+BOOL WINAPI InitializeFlatSB(HWND hwnd)
 {
     FIXME(commctrl,"stub\n");
     return 0;
 }
 
-HRESULT WINAPI UninitializeFlatSB(HWND32 hwnd)
+HRESULT WINAPI UninitializeFlatSB(HWND hwnd)
 {
     FIXME(commctrl,"stub\n");
     return 0;
@@ -111,14 +111,14 @@ HRESULT WINAPI UninitializeFlatSB(HWND32 hwnd)
 
 
 static LRESULT
-FlatSB_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+FlatSB_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     return 0;
 }
 
 
 static LRESULT
-FlatSB_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+FlatSB_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     return 0;
 }
@@ -127,7 +127,7 @@ FlatSB_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-FlatSB_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -144,7 +144,7 @@ FlatSB_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (datetime, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -153,27 +153,27 @@ FlatSB_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 FLATSB_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (FLATSB_CLASS32A)) return;
+    if (GlobalFindAtomA (FLATSB_CLASSA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC32)FlatSB_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)FlatSB_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(FLATSB_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_WINDOW + 1);
-    wndClass.lpszClassName = FLATSB_CLASS32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndClass.lpszClassName = FLATSB_CLASSA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 FLATSB_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (FLATSB_CLASS32A))
-	UnregisterClass32A (FLATSB_CLASS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (FLATSB_CLASSA))
+	UnregisterClassA (FLATSB_CLASSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index a570378b719..280e61b156e 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -36,13 +36,13 @@
 #define HEADER_GetInfoPtr(wndPtr) ((HEADER_INFO *)wndPtr->wExtra[0])
 
 
-static INT32
-HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack)
+static INT
+HEADER_DrawItem (WND *wndPtr, HDC hdc, INT iItem, BOOL bHotTrack)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
     HEADER_ITEM *phdi = &infoPtr->items[iItem];
-    RECT32 r;
-    INT32  oldBkMode;
+    RECT r;
+    INT  oldBkMode;
 
     r = phdi->rect;
     if (r.right - r.left == 0)
@@ -50,20 +50,20 @@ HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack)
 
     if (wndPtr->dwStyle & HDS_BUTTONS) {
 	if (phdi->bDown) {
-	    DrawEdge32 (hdc, &r, BDR_RAISEDOUTER,
+	    DrawEdge (hdc, &r, BDR_RAISEDOUTER,
 			BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST);
 	    r.left += 2;
             r.top  += 2;
 	}
 	else
-	    DrawEdge32 (hdc, &r, EDGE_RAISED,
+	    DrawEdge (hdc, &r, EDGE_RAISED,
 			BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST);
     }
     else
-        DrawEdge32 (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST);
+        DrawEdge (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST);
 
     if (phdi->fmt & HDF_OWNERDRAW) {
-	DRAWITEMSTRUCT32 dis;
+	DRAWITEMSTRUCT dis;
 	dis.CtlType    = ODT_HEADER;
 	dis.CtlID      = wndPtr->wIDmenu;
 	dis.itemID     = iItem;
@@ -73,11 +73,11 @@ HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack)
 	dis.hDC        = hdc;
 	dis.rcItem     = r;
 	dis.itemData   = phdi->lParam;
-	SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_DRAWITEM,
-			(WPARAM32)wndPtr->wIDmenu, (LPARAM)&dis);
+	SendMessageA (GetParent (wndPtr->hwndSelf), WM_DRAWITEM,
+			(WPARAM)wndPtr->wIDmenu, (LPARAM)&dis);
     }
     else {
-        UINT32 uTextJustify = DT_LEFT;
+        UINT uTextJustify = DT_LEFT;
 
         if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_CENTER)
             uTextJustify = DT_CENTER;
@@ -85,11 +85,11 @@ HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack)
             uTextJustify = DT_RIGHT;
 
 	if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) {
-	    BITMAP32 bmp;
-	    HDC32    hdcBitmap;
-	    INT32    yD, yS, cx, cy, rx, ry;
+	    BITMAP bmp;
+	    HDC    hdcBitmap;
+	    INT    yD, yS, cx, cy, rx, ry;
 
-	    GetObject32A (phdi->hbm, sizeof(BITMAP32), (LPVOID)&bmp);
+	    GetObjectA (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp);
 
 	    ry = r.bottom - r.top;
 	    rx = r.right - r.left;
@@ -113,25 +113,25 @@ HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack)
 		cx = rx - 6;
 	    }
 
-	    hdcBitmap = CreateCompatibleDC32 (hdc);
-	    SelectObject32 (hdcBitmap, phdi->hbm);
-	    BitBlt32 (hdc, r.left + 3, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY);
-	    DeleteDC32 (hdcBitmap);
+	    hdcBitmap = CreateCompatibleDC (hdc);
+	    SelectObject (hdcBitmap, phdi->hbm);
+	    BitBlt (hdc, r.left + 3, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY);
+	    DeleteDC (hdcBitmap);
 
 	    r.left += (bmp.bmWidth + 3);
 	}
 
 
 	if ((phdi->fmt & HDF_BITMAP_ON_RIGHT) && (phdi->hbm)) {
-	    BITMAP32 bmp;
-	    HDC32    hdcBitmap;
-	    INT32    xD, yD, yS, cx, cy, rx, ry, tx;
-	    RECT32   textRect;
+	    BITMAP bmp;
+	    HDC    hdcBitmap;
+	    INT    xD, yD, yS, cx, cy, rx, ry, tx;
+	    RECT   textRect;
 
-	    GetObject32A (phdi->hbm, sizeof(BITMAP32), (LPVOID)&bmp);
+	    GetObjectA (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp);
 
 	    textRect = r;
-            DrawText32W (hdc, phdi->pszText, lstrlen32W (phdi->pszText),
+            DrawTextW (hdc, phdi->pszText, lstrlenW (phdi->pszText),
 	   	  &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT);
 	    tx = textRect.right - textRect.left;
 	    ry = r.bottom - r.top;
@@ -166,10 +166,10 @@ HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack)
 		}
 	    }
 
-	    hdcBitmap = CreateCompatibleDC32 (hdc);
-	    SelectObject32 (hdcBitmap, phdi->hbm);
-	    BitBlt32 (hdc, xD, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY);
-	    DeleteDC32 (hdcBitmap);
+	    hdcBitmap = CreateCompatibleDC (hdc);
+	    SelectObject (hdcBitmap, phdi->hbm);
+	    BitBlt (hdc, xD, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY);
+	    DeleteDC (hdcBitmap);
 	}
 
 	if (phdi->fmt & HDF_IMAGE) {
@@ -179,14 +179,14 @@ HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack)
 	}
 
         if ((phdi->fmt & HDF_STRING) && (phdi->pszText)) {
-            oldBkMode = SetBkMode32(hdc, TRANSPARENT);
+            oldBkMode = SetBkMode(hdc, TRANSPARENT);
             r.left += 3;
 	    r.right -= 3;
-	    SetTextColor32 (hdc, bHotTrack ? COLOR_HIGHLIGHT : COLOR_BTNTEXT);
-            DrawText32W (hdc, phdi->pszText, lstrlen32W (phdi->pszText),
+	    SetTextColor (hdc, bHotTrack ? COLOR_HIGHLIGHT : COLOR_BTNTEXT);
+            DrawTextW (hdc, phdi->pszText, lstrlenW (phdi->pszText),
 	   	  &r, uTextJustify|DT_VCENTER|DT_SINGLELINE);
             if (oldBkMode != TRANSPARENT)
-                SetBkMode32(hdc, oldBkMode);
+                SetBkMode(hdc, oldBkMode);
         }
     }
     return phdi->rect.right;
@@ -194,23 +194,23 @@ HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack)
 
 
 static void 
-HEADER_Refresh (WND *wndPtr, HDC32 hdc)
+HEADER_Refresh (WND *wndPtr, HDC hdc)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    HFONT32 hFont, hOldFont;
-    RECT32 rect;
-    HBRUSH32 hbrBk;
-    INT32 i, x;
+    HFONT hFont, hOldFont;
+    RECT rect;
+    HBRUSH hbrBk;
+    INT i, x;
 
     /* get rect for the bar, adjusted for the border */
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 
-    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject32 (SYSTEM_FONT);
-    hOldFont = SelectObject32 (hdc, hFont);
+    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
+    hOldFont = SelectObject (hdc, hFont);
 
     /* draw Background */
-    hbrBk = GetSysColorBrush32(COLOR_3DFACE);
-    FillRect32(hdc, &rect, hbrBk);
+    hbrBk = GetSysColorBrush(COLOR_3DFACE);
+    FillRect(hdc, &rect, hbrBk);
 
     x = rect.left;
     for (i = 0; i < infoPtr->uNumItem; i++) {
@@ -220,25 +220,25 @@ HEADER_Refresh (WND *wndPtr, HDC32 hdc)
     if ((x <= rect.right) && (infoPtr->uNumItem > 0)) {
         rect.left = x;
         if (wndPtr->dwStyle & HDS_BUTTONS)
-            DrawEdge32 (hdc, &rect, EDGE_RAISED, BF_TOP|BF_LEFT|BF_BOTTOM|BF_SOFT);
+            DrawEdge (hdc, &rect, EDGE_RAISED, BF_TOP|BF_LEFT|BF_BOTTOM|BF_SOFT);
         else
-            DrawEdge32 (hdc, &rect, EDGE_ETCHED, BF_BOTTOM);
+            DrawEdge (hdc, &rect, EDGE_ETCHED, BF_BOTTOM);
     }
 
-    SelectObject32 (hdc, hOldFont);
+    SelectObject (hdc, hOldFont);
 }
 
 
 static void
-HEADER_RefreshItem (WND *wndPtr, HDC32 hdc, INT32 iItem)
+HEADER_RefreshItem (WND *wndPtr, HDC hdc, INT iItem)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    HFONT32 hFont, hOldFont;
+    HFONT hFont, hOldFont;
 
-    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject32 (SYSTEM_FONT);
-    hOldFont = SelectObject32 (hdc, hFont);
+    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
+    hOldFont = SelectObject (hdc, hFont);
     HEADER_DrawItem (wndPtr, hdc, iItem, FALSE);
-    SelectObject32 (hdc, hOldFont);
+    SelectObject (hdc, hOldFont);
 }
 
 
@@ -247,13 +247,13 @@ HEADER_SetItemBounds (WND *wndPtr)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
     HEADER_ITEM *phdi;
-    RECT32 rect;
+    RECT rect;
     int i, x;
 
     if (infoPtr->uNumItem == 0)
         return;
 
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 
     x = rect.left;
     for (i = 0; i < infoPtr->uNumItem; i++) {
@@ -268,7 +268,7 @@ HEADER_SetItemBounds (WND *wndPtr)
 
 
 static void
-HEADER_ForceItemBounds (WND *wndPtr, INT32 cy)
+HEADER_ForceItemBounds (WND *wndPtr, INT cy)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
     HEADER_ITEM *phdi;
@@ -290,18 +290,18 @@ HEADER_ForceItemBounds (WND *wndPtr, INT32 cy)
 
 
 static void
-HEADER_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pItem)
+HEADER_InternalHitTest (WND *wndPtr, LPPOINT lpPt, UINT *pFlags, INT *pItem)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    RECT32 rect, rcTest;
-    INT32  iCount, width;
-    BOOL32 bNoWidth;
+    RECT rect, rcTest;
+    INT  iCount, width;
+    BOOL bNoWidth;
 
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 
     *pFlags = 0;
     bNoWidth = FALSE;
-    if (PtInRect32 (&rect, *lpPt))
+    if (PtInRect (&rect, *lpPt))
     {
 	if (infoPtr->uNumItem == 0) {
 	    *pFlags |= HHT_NOWHERE;
@@ -318,7 +318,7 @@ HEADER_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pIte
 		    bNoWidth = TRUE;
 		    continue;
 		}
-		if (PtInRect32 (&rect, *lpPt)) {
+		if (PtInRect (&rect, *lpPt)) {
 		    if (width <= 2 * DIVIDER_WIDTH) {
 			*pFlags |= HHT_ONHEADER;
 			*pItem = iCount;
@@ -328,7 +328,7 @@ HEADER_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pIte
 		    if (iCount > 0) {
 			rcTest = rect;
 			rcTest.right = rcTest.left + DIVIDER_WIDTH;
-			if (PtInRect32 (&rcTest, *lpPt)) {
+			if (PtInRect (&rcTest, *lpPt)) {
 			    if (bNoWidth) {
 				*pFlags |= HHT_ONDIVOPEN;
 				*pItem = iCount - 1;
@@ -345,7 +345,7 @@ HEADER_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pIte
 		    }
 		    rcTest = rect;
 		    rcTest.left = rcTest.right - DIVIDER_WIDTH;
-		    if (PtInRect32 (&rcTest, *lpPt)) {
+		    if (PtInRect (&rcTest, *lpPt)) {
 			*pFlags |= HHT_ONDIVIDER;
 			*pItem = iCount;
 			TRACE (header, "ON DIVIDER %d\n", *pItem);
@@ -363,7 +363,7 @@ HEADER_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pIte
 	    rect = infoPtr->items[infoPtr->uNumItem-1].rect;
 	    rect.left = rect.right;
 	    rect.right += DIVIDER_WIDTH;
-	    if (PtInRect32 (&rect, *lpPt)) {
+	    if (PtInRect (&rect, *lpPt)) {
 		if (bNoWidth) {
 		    *pFlags |= HHT_ONDIVOPEN;
 		    *pItem = infoPtr->uNumItem - 1;
@@ -411,25 +411,25 @@ HEADER_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pIte
 
 
 static void
-HEADER_DrawTrackLine (WND *wndPtr, HDC32 hdc, INT32 x)
+HEADER_DrawTrackLine (WND *wndPtr, HDC hdc, INT x)
 {
-    RECT32 rect;
-    HPEN32 hOldPen;
-    INT32  oldRop;
-
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
-
-    hOldPen = SelectObject32 (hdc, GetStockObject32 (BLACK_PEN));
-    oldRop = SetROP232 (hdc, R2_XORPEN);
-    MoveToEx32 (hdc, x, rect.top, NULL);
-    LineTo32 (hdc, x, rect.bottom);
-    SetROP232 (hdc, oldRop);
-    SelectObject32 (hdc, hOldPen);
+    RECT rect;
+    HPEN hOldPen;
+    INT  oldRop;
+
+    GetClientRect (wndPtr->hwndSelf, &rect);
+
+    hOldPen = SelectObject (hdc, GetStockObject (BLACK_PEN));
+    oldRop = SetROP2 (hdc, R2_XORPEN);
+    MoveToEx (hdc, x, rect.top, NULL);
+    LineTo (hdc, x, rect.bottom);
+    SetROP2 (hdc, oldRop);
+    SelectObject (hdc, hOldPen);
 }
 
 
-static BOOL32
-HEADER_SendSimpleNotify (WND *wndPtr, UINT32 code)
+static BOOL
+HEADER_SendSimpleNotify (WND *wndPtr, UINT code)
 {
     NMHDR nmhdr;
 
@@ -437,17 +437,17 @@ HEADER_SendSimpleNotify (WND *wndPtr, UINT32 code)
     nmhdr.idFrom   = wndPtr->wIDmenu;
     nmhdr.code     = code;
 
-    return (BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-				   (WPARAM32)nmhdr.idFrom, (LPARAM)&nmhdr);
+    return (BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+				   (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
 }
 
 
-static BOOL32
-HEADER_SendHeaderNotify (WND *wndPtr, UINT32 code, INT32 iItem)
+static BOOL
+HEADER_SendHeaderNotify (WND *wndPtr, UINT code, INT iItem)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);   
-    NMHEADER32A nmhdr;
-    HDITEM32A nmitem;
+    NMHEADERA nmhdr;
+    HDITEMA nmitem;
 
     nmhdr.hdr.hwndFrom = wndPtr->hwndSelf;
     nmhdr.hdr.idFrom = wndPtr->wIDmenu;
@@ -467,15 +467,15 @@ HEADER_SendHeaderNotify (WND *wndPtr, UINT32 code, INT32 iItem)
     nmitem.iOrder = infoPtr->items[iItem].iOrder;
     nmitem.iImage = infoPtr->items[iItem].iImage;
 
-    return (BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-				   (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmhdr);
+    return (BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+				   (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmhdr);
 }
 
 
-static BOOL32
-HEADER_SendClickNotify (WND *wndPtr, UINT32 code, INT32 iItem)
+static BOOL
+HEADER_SendClickNotify (WND *wndPtr, UINT code, INT iItem)
 {
-    NMHEADER32A nmhdr;
+    NMHEADERA nmhdr;
 
     nmhdr.hdr.hwndFrom = wndPtr->hwndSelf;
     nmhdr.hdr.idFrom = wndPtr->wIDmenu;
@@ -484,13 +484,13 @@ HEADER_SendClickNotify (WND *wndPtr, UINT32 code, INT32 iItem)
     nmhdr.iButton = 0;
     nmhdr.pitem = NULL;
 
-    return (BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-				   (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmhdr);
+    return (BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+				   (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmhdr);
 }
 
 
 static LRESULT
-HEADER_CreateDragImage (WND *wndPtr, WPARAM32 wParam)
+HEADER_CreateDragImage (WND *wndPtr, WPARAM wParam)
 {
     FIXME (header, "empty stub!\n");
     return 0;
@@ -498,15 +498,15 @@ HEADER_CreateDragImage (WND *wndPtr, WPARAM32 wParam)
 
 
 static LRESULT
-HEADER_DeleteItem (WND *wndPtr, WPARAM32 wParam)
+HEADER_DeleteItem (WND *wndPtr, WPARAM wParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    INT32 iItem = (INT32)wParam;
-    HDC32 hdc;
+    INT iItem = (INT)wParam;
+    HDC hdc;
 
     TRACE(header, "[iItem=%d]\n", iItem);
     
-    if ((iItem < 0) || (iItem >= (INT32)infoPtr->uNumItem))
+    if ((iItem < 0) || (iItem >= (INT)infoPtr->uNumItem))
         return FALSE;
 
     if (infoPtr->uNumItem == 1) {
@@ -543,9 +543,9 @@ HEADER_DeleteItem (WND *wndPtr, WPARAM32 wParam)
 
     HEADER_SetItemBounds (wndPtr);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     HEADER_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
     
     return TRUE;
 }
@@ -561,16 +561,16 @@ HEADER_GetImageList (WND *wndPtr)
 
 
 static LRESULT
-HEADER_GetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_GetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    HDITEM32A   *phdi = (HDITEM32A*)lParam;
-    INT32       nItem = (INT32)wParam;
+    HDITEMA   *phdi = (HDITEMA*)lParam;
+    INT       nItem = (INT)wParam;
     HEADER_ITEM *lpItem;
 
     if (!phdi)
 	return FALSE;
-    if ((nItem < 0) || (nItem >= (INT32)infoPtr->uNumItem))
+    if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
         return FALSE;
 
     TRACE (header, "[nItem=%d]\n", nItem);
@@ -592,10 +592,10 @@ HEADER_GetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	phdi->lParam = lpItem->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-	if (lpItem->pszText != LPSTR_TEXTCALLBACK32W)
+	if (lpItem->pszText != LPSTR_TEXTCALLBACKW)
 	    lstrcpynWtoA (phdi->pszText, lpItem->pszText, phdi->cchTextMax);
 	else
-	    phdi->pszText = LPSTR_TEXTCALLBACK32A;
+	    phdi->pszText = LPSTR_TEXTCALLBACKA;
     }
 
     if (phdi->mask & HDI_IMAGE)
@@ -609,16 +609,16 @@ HEADER_GetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HEADER_GetItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_GetItemW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    HDITEM32W   *phdi = (HDITEM32W*)lParam;
-    INT32       nItem = (INT32)wParam;
+    HDITEMW   *phdi = (HDITEMW*)lParam;
+    INT       nItem = (INT)wParam;
     HEADER_ITEM *lpItem;
 
     if (!phdi)
 	return FALSE;
-    if ((nItem < 0) || (nItem >= (INT32)infoPtr->uNumItem))
+    if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
         return FALSE;
 
     TRACE (header, "[nItem=%d]\n", nItem);
@@ -640,10 +640,10 @@ HEADER_GetItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	phdi->lParam = lpItem->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-	if (lpItem->pszText != LPSTR_TEXTCALLBACK32W)
-	    lstrcpyn32W (phdi->pszText, lpItem->pszText, phdi->cchTextMax);
+	if (lpItem->pszText != LPSTR_TEXTCALLBACKW)
+	    lstrcpynW (phdi->pszText, lpItem->pszText, phdi->cchTextMax);
 	else
-	    phdi->pszText = LPSTR_TEXTCALLBACK32W;
+	    phdi->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_IMAGE)
@@ -665,13 +665,13 @@ HEADER_GetItemCount (WND *wndPtr)
 
 
 static LRESULT
-HEADER_GetItemRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_GetItemRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    INT32 iItem = (INT32)wParam;
-    LPRECT32 lpRect = (LPRECT32)lParam;
+    INT iItem = (INT)wParam;
+    LPRECT lpRect = (LPRECT)lParam;
 
-    if ((iItem < 0) || (iItem >= (INT32)infoPtr->uNumItem))
+    if ((iItem < 0) || (iItem >= (INT)infoPtr->uNumItem))
         return FALSE;
 
     lpRect->left   = infoPtr->items[iItem].rect.left;
@@ -695,7 +695,7 @@ HEADER_GetUnicodeFormat (WND *wndPtr)
 
 
 static LRESULT
-HEADER_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_HitTest (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     LPHDHITTESTINFO phti = (LPHDHITTESTINFO)lParam;
 
@@ -706,14 +706,14 @@ HEADER_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HEADER_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_InsertItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    HDITEM32A   *phdi = (HDITEM32A*)lParam;
-    INT32       nItem = (INT32)wParam;
+    HDITEMA   *phdi = (HDITEMA*)lParam;
+    INT       nItem = (INT)wParam;
     HEADER_ITEM *lpItem;
-    HDC32       hdc;
-    INT32       len;
+    HDC       hdc;
+    INT       len;
 
     if ((phdi == NULL) || (nItem < 0))
 	return -1;
@@ -752,13 +752,13 @@ HEADER_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lpItem->cxy = phdi->cxy;
 
     if (phdi->mask & HDI_TEXT) {
-	if (phdi->pszText != LPSTR_TEXTCALLBACK32A) {
-	    len = lstrlen32A (phdi->pszText);
+	if (phdi->pszText != LPSTR_TEXTCALLBACKA) {
+	    len = lstrlenA (phdi->pszText);
 	    lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
 	    lstrcpyAtoW (lpItem->pszText, phdi->pszText);
 	}
 	else
-	    lpItem->pszText = LPSTR_TEXTCALLBACK32W;
+	    lpItem->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_FORMAT)
@@ -781,23 +781,23 @@ HEADER_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     HEADER_SetItemBounds (wndPtr);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     HEADER_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return nItem;
 }
 
 
 static LRESULT
-HEADER_InsertItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_InsertItemW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    HDITEM32W   *phdi = (HDITEM32W*)lParam;
-    INT32       nItem = (INT32)wParam;
+    HDITEMW   *phdi = (HDITEMW*)lParam;
+    INT       nItem = (INT)wParam;
     HEADER_ITEM *lpItem;
-    HDC32       hdc;
-    INT32       len;
+    HDC       hdc;
+    INT       len;
 
     if ((phdi == NULL) || (nItem < 0))
 	return -1;
@@ -836,13 +836,13 @@ HEADER_InsertItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lpItem->cxy = phdi->cxy;
 
     if (phdi->mask & HDI_TEXT) {
-	if (phdi->pszText != LPSTR_TEXTCALLBACK32W) {
-	    len = lstrlen32W (phdi->pszText);
+	if (phdi->pszText != LPSTR_TEXTCALLBACKW) {
+	    len = lstrlenW (phdi->pszText);
 	    lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-	    lstrcpy32W (lpItem->pszText, phdi->pszText);
+	    lstrcpyW (lpItem->pszText, phdi->pszText);
 	}
 	else
-	    lpItem->pszText = LPSTR_TEXTCALLBACK32W;
+	    lpItem->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_FORMAT)
@@ -865,16 +865,16 @@ HEADER_InsertItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     HEADER_SetItemBounds (wndPtr);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     HEADER_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return nItem;
 }
 
 
 static LRESULT
-HEADER_Layout (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_Layout (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
     LPHDLAYOUT lpLayout = (LPHDLAYOUT)lParam;
@@ -898,7 +898,7 @@ HEADER_Layout (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     /* hack */
 #ifdef __HDM_LAYOUT_HACK__
-    MoveWindow32 (lpLayout->pwpos->hwnd, lpLayout->pwpos->x, lpLayout->pwpos->y,
+    MoveWindow (lpLayout->pwpos->hwnd, lpLayout->pwpos->x, lpLayout->pwpos->y,
                   lpLayout->pwpos->cx, lpLayout->pwpos->cy, TRUE);
 #endif
 
@@ -907,7 +907,7 @@ HEADER_Layout (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HEADER_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_SetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
     HIMAGELIST himlOld;
@@ -922,22 +922,22 @@ HEADER_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HEADER_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_SetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    HDITEM32A *phdi = (HDITEM32A*)lParam;
-    INT32 nItem = (INT32)wParam;
+    HDITEMA *phdi = (HDITEMA*)lParam;
+    INT nItem = (INT)wParam;
     HEADER_ITEM *lpItem;
-    HDC32 hdc;
+    HDC hdc;
 
     if (phdi == NULL)
 	return FALSE;
-    if ((nItem < 0) || (nItem >= (INT32)infoPtr->uNumItem))
+    if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
         return FALSE;
 
     TRACE (header, "[nItem=%d]\n", nItem);
 
-    if (HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGING32A, nItem))
+    if (HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGINGA, nItem))
 	return FALSE;
 
     lpItem = (HEADER_ITEM*)&infoPtr->items[nItem];
@@ -951,19 +951,19 @@ HEADER_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lpItem->lParam = phdi->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-	if (phdi->pszText != LPSTR_TEXTCALLBACK32A) {
+	if (phdi->pszText != LPSTR_TEXTCALLBACKA) {
 	    if (lpItem->pszText) {
 		COMCTL32_Free (lpItem->pszText);
 		lpItem->pszText = NULL;
 	    }
 	    if (phdi->pszText) {
-		INT32 len = lstrlen32A (phdi->pszText);
+		INT len = lstrlenA (phdi->pszText);
 		lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
 		lstrcpyAtoW (lpItem->pszText, phdi->pszText);
 	    }
 	}
 	else
-	    lpItem->pszText = LPSTR_TEXTCALLBACK32W;
+	    lpItem->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_WIDTH)
@@ -975,34 +975,34 @@ HEADER_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (phdi->mask & HDI_ORDER)
 	lpItem->iOrder = phdi->iOrder;
 
-    HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGED32A, nItem);
+    HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGEDA, nItem);
 
     HEADER_SetItemBounds (wndPtr);
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     HEADER_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-HEADER_SetItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_SetItemW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    HDITEM32W *phdi = (HDITEM32W*)lParam;
-    INT32 nItem = (INT32)wParam;
+    HDITEMW *phdi = (HDITEMW*)lParam;
+    INT nItem = (INT)wParam;
     HEADER_ITEM *lpItem;
-    HDC32 hdc;
+    HDC hdc;
 
     if (phdi == NULL)
 	return FALSE;
-    if ((nItem < 0) || (nItem >= (INT32)infoPtr->uNumItem))
+    if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
         return FALSE;
 
     TRACE (header, "[nItem=%d]\n", nItem);
 
-    if (HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGING32A, nItem))
+    if (HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGINGA, nItem))
 	return FALSE;
 
     lpItem = (HEADER_ITEM*)&infoPtr->items[nItem];
@@ -1016,19 +1016,19 @@ HEADER_SetItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lpItem->lParam = phdi->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-	if (phdi->pszText != LPSTR_TEXTCALLBACK32W) {
+	if (phdi->pszText != LPSTR_TEXTCALLBACKW) {
 	    if (lpItem->pszText) {
 		COMCTL32_Free (lpItem->pszText);
 		lpItem->pszText = NULL;
 	    }
 	    if (phdi->pszText) {
-		INT32 len = lstrlen32W (phdi->pszText);
+		INT len = lstrlenW (phdi->pszText);
 		lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-		lstrcpy32W (lpItem->pszText, phdi->pszText);
+		lstrcpyW (lpItem->pszText, phdi->pszText);
 	    }
 	}
 	else
-	    lpItem->pszText = LPSTR_TEXTCALLBACK32W;
+	    lpItem->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_WIDTH)
@@ -1040,12 +1040,12 @@ HEADER_SetItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (phdi->mask & HDI_ORDER)
 	lpItem->iOrder = phdi->iOrder;
 
-    HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGED32A, nItem);
+    HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGEDA, nItem);
 
     HEADER_SetItemBounds (wndPtr);
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     HEADER_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
@@ -1055,24 +1055,24 @@ HEADER_SetItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-HEADER_SetUnicodeFormat (WND *wndPtr, WPARAM32 wParam)
+HEADER_SetUnicodeFormat (WND *wndPtr, WPARAM wParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    BOOL32 bTemp = infoPtr->bUnicode;
+    BOOL bTemp = infoPtr->bUnicode;
 
-    infoPtr->bUnicode = (BOOL32)wParam;
+    infoPtr->bUnicode = (BOOL)wParam;
 
     return bTemp;
 }
 
 
 static LRESULT
-HEADER_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr;
-    TEXTMETRIC32A tm;
-    HFONT32 hOldFont;
-    HDC32   hdc;
+    TEXTMETRICA tm;
+    HFONT hOldFont;
+    HDC   hdc;
 
     infoPtr = (HEADER_INFO *)COMCTL32_Alloc (sizeof(HEADER_INFO));
     wndPtr->wExtra[0] = (DWORD)infoPtr;
@@ -1081,9 +1081,9 @@ HEADER_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->nHeight = 20;
     infoPtr->hFont = 0;
     infoPtr->items = 0;
-    infoPtr->hcurArrow = LoadCursor32A (0, IDC_ARROW32A);
-    infoPtr->hcurDivider = LoadCursor32A (0, IDC_SIZEWE32A);
-    infoPtr->hcurDivopen = LoadCursor32A (0, IDC_SIZENS32A);
+    infoPtr->hcurArrow = LoadCursorA (0, IDC_ARROWA);
+    infoPtr->hcurDivider = LoadCursorA (0, IDC_SIZEWEA);
+    infoPtr->hcurDivopen = LoadCursorA (0, IDC_SIZENSA);
     infoPtr->bPressed  = FALSE;
     infoPtr->bTracking = FALSE;
     infoPtr->iMoveItem = 0;
@@ -1091,28 +1091,28 @@ HEADER_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->iHotItem = -1;
     infoPtr->bUnicode = IsWindowUnicode (wndPtr->hwndSelf);
 
-    hdc = GetDC32 (0);
-    hOldFont = SelectObject32 (hdc, GetStockObject32 (SYSTEM_FONT));
-    GetTextMetrics32A (hdc, &tm);
+    hdc = GetDC (0);
+    hOldFont = SelectObject (hdc, GetStockObject (SYSTEM_FONT));
+    GetTextMetricsA (hdc, &tm);
     infoPtr->nHeight = tm.tmHeight + VERT_BORDER;
-    SelectObject32 (hdc, hOldFont);
-    ReleaseDC32 (0, hdc);
+    SelectObject (hdc, hOldFont);
+    ReleaseDC (0, hdc);
 
     return 0;
 }
 
 
 static LRESULT
-HEADER_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
     HEADER_ITEM *lpItem;
-    INT32 nItem;
+    INT nItem;
 
     if (infoPtr->items) {
 	lpItem = (HEADER_ITEM*)infoPtr->items;
         for (nItem = 0; nItem < infoPtr->uNumItem; nItem++, lpItem++) {
-	    if ((lpItem->pszText) && (lpItem->pszText != LPSTR_TEXTCALLBACK32W))
+	    if ((lpItem->pszText) && (lpItem->pszText != LPSTR_TEXTCALLBACKW))
 		COMCTL32_Free (lpItem->pszText);
         }
         COMCTL32_Free (infoPtr->items);
@@ -1137,40 +1137,40 @@ HEADER_GetFont (WND *wndPtr)
 
 
 static LRESULT
-HEADER_LButtonDblClk (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_LButtonDblClk (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    POINT32 pt;
-    UINT32  flags;
-    INT32   nItem;
+    POINT pt;
+    UINT  flags;
+    INT   nItem;
 
-    pt.x = (INT32)LOWORD(lParam); 
-    pt.y = (INT32)HIWORD(lParam);
+    pt.x = (INT)LOWORD(lParam); 
+    pt.y = (INT)HIWORD(lParam);
     HEADER_InternalHitTest (wndPtr, &pt, &flags, &nItem);
 
     if ((wndPtr->dwStyle & HDS_BUTTONS) && (flags == HHT_ONHEADER))
-	HEADER_SendHeaderNotify (wndPtr, HDN_ITEMDBLCLICK32A, nItem);
+	HEADER_SendHeaderNotify (wndPtr, HDN_ITEMDBLCLICKA, nItem);
     else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN))
-	HEADER_SendHeaderNotify (wndPtr, HDN_DIVIDERDBLCLICK32A, nItem);
+	HEADER_SendHeaderNotify (wndPtr, HDN_DIVIDERDBLCLICKA, nItem);
 
     return 0;
 }
 
 
 static LRESULT
-HEADER_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_LButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    POINT32 pt;
-    UINT32  flags;
-    INT32   nItem;
-    HDC32   hdc;
+    POINT pt;
+    UINT  flags;
+    INT   nItem;
+    HDC   hdc;
 
-    pt.x = (INT32)LOWORD(lParam); 
-    pt.y = (INT32)HIWORD(lParam);
+    pt.x = (INT)LOWORD(lParam); 
+    pt.y = (INT)HIWORD(lParam);
     HEADER_InternalHitTest (wndPtr, &pt, &flags, &nItem);
 
     if ((wndPtr->dwStyle & HDS_BUTTONS) && (flags == HHT_ONHEADER)) {
-	SetCapture32 (wndPtr->hwndSelf);
+	SetCapture (wndPtr->hwndSelf);
 	infoPtr->bCaptured = TRUE;   
 	infoPtr->bPressed  = TRUE;
 	infoPtr->iMoveItem = nItem;
@@ -1178,15 +1178,15 @@ HEADER_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	infoPtr->items[nItem].bDown = TRUE;
 
 	/* Send WM_CUSTOMDRAW */
-	hdc = GetDC32 (wndPtr->hwndSelf);
+	hdc = GetDC (wndPtr->hwndSelf);
 	HEADER_RefreshItem (wndPtr, hdc, nItem);
-	ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	ReleaseDC (wndPtr->hwndSelf, hdc);
 
 	TRACE (header, "Pressed item %d!\n", nItem);
     } 
     else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) {
-	if (!(HEADER_SendHeaderNotify (wndPtr, HDN_BEGINTRACK32A, nItem))) {
-	    SetCapture32 (wndPtr->hwndSelf);
+	if (!(HEADER_SendHeaderNotify (wndPtr, HDN_BEGINTRACKA, nItem))) {
+	    SetCapture (wndPtr->hwndSelf);
 	    infoPtr->bCaptured = TRUE;   
 	    infoPtr->bTracking = TRUE;
 	    infoPtr->iMoveItem = nItem;
@@ -1195,9 +1195,9 @@ HEADER_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 	    if (!(wndPtr->dwStyle & HDS_FULLDRAG)) {
 		infoPtr->xOldTrack = infoPtr->items[nItem].rect.right;
-		hdc = GetDC32 (wndPtr->hwndSelf);
+		hdc = GetDC (wndPtr->hwndSelf);
 		HEADER_DrawTrackLine (wndPtr, hdc, infoPtr->xOldTrack);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
 	    }
 
 	    TRACE (header, "Begin tracking item %d!\n", nItem);
@@ -1209,26 +1209,26 @@ HEADER_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HEADER_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_LButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    POINT32 pt;
-    UINT32  flags;
-    INT32   nItem, nWidth;
-    HDC32   hdc;
+    POINT pt;
+    UINT  flags;
+    INT   nItem, nWidth;
+    HDC   hdc;
 
-    pt.x = (INT32)LOWORD(lParam);
-    pt.y = (INT32)HIWORD(lParam);
+    pt.x = (INT)LOWORD(lParam);
+    pt.y = (INT)HIWORD(lParam);
     HEADER_InternalHitTest (wndPtr, &pt, &flags, &nItem);
 
     if (infoPtr->bPressed) {
 	if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER)) {
 	    infoPtr->items[infoPtr->iMoveItem].bDown = FALSE;
-	    hdc = GetDC32 (wndPtr->hwndSelf);
+	    hdc = GetDC (wndPtr->hwndSelf);
 	    HEADER_RefreshItem (wndPtr, hdc, infoPtr->iMoveItem);
-	    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	    ReleaseDC (wndPtr->hwndSelf, hdc);
 
-	    HEADER_SendClickNotify (wndPtr, HDN_ITEMCLICK32A, infoPtr->iMoveItem);
+	    HEADER_SendClickNotify (wndPtr, HDN_ITEMCLICKA, infoPtr->iMoveItem);
 	}
 	TRACE (header, "Released item %d!\n", infoPtr->iMoveItem);
 	infoPtr->bPressed = FALSE;
@@ -1237,26 +1237,26 @@ HEADER_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	TRACE (header, "End tracking item %d!\n", infoPtr->iMoveItem);
 	infoPtr->bTracking = FALSE;
 
-	HEADER_SendHeaderNotify (wndPtr, HDN_ENDTRACK32A, infoPtr->iMoveItem);
+	HEADER_SendHeaderNotify (wndPtr, HDN_ENDTRACKA, infoPtr->iMoveItem);
 
 	if (!(wndPtr->dwStyle & HDS_FULLDRAG)) {
-	    hdc = GetDC32 (wndPtr->hwndSelf);
+	    hdc = GetDC (wndPtr->hwndSelf);
 	    HEADER_DrawTrackLine (wndPtr, hdc, infoPtr->xOldTrack);
-	    ReleaseDC32 (wndPtr->hwndSelf, hdc);
-	    if (HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGING32A, infoPtr->iMoveItem))
+	    ReleaseDC (wndPtr->hwndSelf, hdc);
+	    if (HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGINGA, infoPtr->iMoveItem))
 		infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth;
 	    else {
 		nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
 		if (nWidth < 0)
 		    nWidth = 0;
 		infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
-		HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGED32A, infoPtr->iMoveItem);
+		HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGEDA, infoPtr->iMoveItem);
 	    }
 
 	    HEADER_SetItemBounds (wndPtr);
-	    hdc = GetDC32 (wndPtr->hwndSelf);
+	    hdc = GetDC (wndPtr->hwndSelf);
 	    HEADER_Refresh (wndPtr, hdc);
-	    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	    ReleaseDC (wndPtr->hwndSelf, hdc);
 	}
     }
 
@@ -1271,16 +1271,16 @@ HEADER_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HEADER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_MouseMove (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    POINT32 pt;
-    UINT32  flags;
-    INT32   nItem, nWidth;
-    HDC32   hdc;
+    POINT pt;
+    UINT  flags;
+    INT   nItem, nWidth;
+    HDC   hdc;
 
-    pt.x = (INT32)LOWORD(lParam);
-    pt.y = (INT32)HIWORD(lParam);
+    pt.x = (INT)LOWORD(lParam);
+    pt.y = (INT)HIWORD(lParam);
     HEADER_InternalHitTest (wndPtr, &pt, &flags, &nItem);
 
     if ((wndPtr->dwStyle & HDS_BUTTONS) && (wndPtr->dwStyle & HDS_HOTTRACK)) {
@@ -1288,9 +1288,9 @@ HEADER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	    infoPtr->iHotItem = nItem;
 	else
 	    infoPtr->iHotItem = -1;
-	hdc = GetDC32 (wndPtr->hwndSelf);
+	hdc = GetDC (wndPtr->hwndSelf);
 	HEADER_Refresh (wndPtr, hdc);
-	ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     if (infoPtr->bCaptured) {
@@ -1299,31 +1299,31 @@ HEADER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		infoPtr->items[infoPtr->iMoveItem].bDown = TRUE;
 	    else
 		infoPtr->items[infoPtr->iMoveItem].bDown = FALSE;
-	    hdc = GetDC32 (wndPtr->hwndSelf);
+	    hdc = GetDC (wndPtr->hwndSelf);
 	    HEADER_RefreshItem (wndPtr, hdc, infoPtr->iMoveItem);
-	    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	    ReleaseDC (wndPtr->hwndSelf, hdc);
 
 	    TRACE (header, "Moving pressed item %d!\n", infoPtr->iMoveItem);
 	}
 	else if (infoPtr->bTracking) {
 	    if (wndPtr->dwStyle & HDS_FULLDRAG) {
-		if (HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGING32A, infoPtr->iMoveItem))
+		if (HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGINGA, infoPtr->iMoveItem))
 		    infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth;
 		else {
 		    nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
 		    if (nWidth < 0)
 			nWidth = 0;
 		    infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
-		    HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGED32A,
+		    HEADER_SendHeaderNotify (wndPtr, HDN_ITEMCHANGEDA,
 					     infoPtr->iMoveItem);
 		}
 		HEADER_SetItemBounds (wndPtr);
-		hdc = GetDC32 (wndPtr->hwndSelf);
+		hdc = GetDC (wndPtr->hwndSelf);
 		HEADER_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
 	    }
 	    else {
-		hdc = GetDC32 (wndPtr->hwndSelf);
+		hdc = GetDC (wndPtr->hwndSelf);
 		HEADER_DrawTrackLine (wndPtr, hdc, infoPtr->xOldTrack);
 		infoPtr->xOldTrack = pt.x + infoPtr->xTrackOffset;
 		if (infoPtr->xOldTrack < infoPtr->items[infoPtr->iMoveItem].rect.left)
@@ -1331,10 +1331,10 @@ HEADER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		infoPtr->items[infoPtr->iMoveItem].cxy = 
 		    infoPtr->xOldTrack - infoPtr->items[infoPtr->iMoveItem].rect.left;
 		HEADER_DrawTrackLine (wndPtr, hdc, infoPtr->xOldTrack);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
 	    }
 
-	    HEADER_SendHeaderNotify (wndPtr, HDN_TRACK32A, infoPtr->iMoveItem);
+	    HEADER_SendHeaderNotify (wndPtr, HDN_TRACKA, infoPtr->iMoveItem);
 	    TRACE (header, "Tracking item %d!\n", infoPtr->iMoveItem);
 	}
     }
@@ -1348,76 +1348,76 @@ HEADER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HEADER_Paint (WND *wndPtr, WPARAM32 wParam)
+HEADER_Paint (WND *wndPtr, WPARAM wParam)
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
+    HDC hdc;
+    PAINTSTRUCT ps;
 
-    hdc = wParam==0 ? BeginPaint32 (wndPtr->hwndSelf, &ps) : (HDC32)wParam;
+    hdc = wParam==0 ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam;
     HEADER_Refresh (wndPtr, hdc);
     if(!wParam)
-	EndPaint32 (wndPtr->hwndSelf, &ps);
+	EndPaint (wndPtr->hwndSelf, &ps);
     return 0;
 }
 
 
 static LRESULT
-HEADER_RButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_RButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     return HEADER_SendSimpleNotify (wndPtr, NM_RCLICK);
 }
 
 
 static LRESULT
-HEADER_SetCursor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_SetCursor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    POINT32 pt;
-    UINT32  flags;
-    INT32   nItem;
+    POINT pt;
+    UINT  flags;
+    INT   nItem;
 
     TRACE (header, "code=0x%X  id=0x%X\n", LOWORD(lParam), HIWORD(lParam));
 
-    GetCursorPos32 (&pt);
-    ScreenToClient32 (wndPtr->hwndSelf, &pt);
+    GetCursorPos (&pt);
+    ScreenToClient (wndPtr->hwndSelf, &pt);
 
     HEADER_InternalHitTest (wndPtr, &pt, &flags, &nItem);
 
     if (flags == HHT_ONDIVIDER)
-        SetCursor32 (infoPtr->hcurDivider);
+        SetCursor (infoPtr->hcurDivider);
     else if (flags == HHT_ONDIVOPEN)
-        SetCursor32 (infoPtr->hcurDivopen);
+        SetCursor (infoPtr->hcurDivopen);
     else
-        SetCursor32 (infoPtr->hcurArrow);
+        SetCursor (infoPtr->hcurArrow);
 
     return 0;
 }
 
 
 static LRESULT
-HEADER_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HEADER_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr(wndPtr);
-    TEXTMETRIC32A tm;
-    HFONT32 hFont, hOldFont;
-    HDC32 hdc;
+    TEXTMETRICA tm;
+    HFONT hFont, hOldFont;
+    HDC hdc;
 
-    infoPtr->hFont = (HFONT32)wParam;
+    infoPtr->hFont = (HFONT)wParam;
 
-    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject32 (SYSTEM_FONT);
+    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
 
-    hdc = GetDC32 (0);
-    hOldFont = SelectObject32 (hdc, hFont);
-    GetTextMetrics32A (hdc, &tm);
+    hdc = GetDC (0);
+    hOldFont = SelectObject (hdc, hFont);
+    GetTextMetricsA (hdc, &tm);
     infoPtr->nHeight = tm.tmHeight + VERT_BORDER;
-    SelectObject32 (hdc, hOldFont);
-    ReleaseDC32 (0, hdc);
+    SelectObject (hdc, hOldFont);
+    ReleaseDC (0, hdc);
 
     if (lParam) {
         HEADER_ForceItemBounds (wndPtr, infoPtr->nHeight);
-        hdc = GetDC32 (wndPtr->hwndSelf);
+        hdc = GetDC (wndPtr->hwndSelf);
         HEADER_Refresh (wndPtr, hdc);
-        ReleaseDC32 (wndPtr->hwndSelf, hdc);
+        ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -1425,7 +1425,7 @@ HEADER_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
+HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -1439,11 +1439,11 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
 	case HDM_GETIMAGELIST:
 	    return HEADER_GetImageList (wndPtr);
 
-	case HDM_GETITEM32A:
-	    return HEADER_GetItem32A (wndPtr, wParam, lParam);
+	case HDM_GETITEMA:
+	    return HEADER_GetItemA (wndPtr, wParam, lParam);
 
-	case HDM_GETITEM32W:
-	    return HEADER_GetItem32W (wndPtr, wParam, lParam);
+	case HDM_GETITEMW:
+	    return HEADER_GetItemW (wndPtr, wParam, lParam);
 
 	case HDM_GETITEMCOUNT:
 	    return HEADER_GetItemCount (wndPtr);
@@ -1459,11 +1459,11 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
 	case HDM_HITTEST:
 	    return HEADER_HitTest (wndPtr, wParam, lParam);
 
-	case HDM_INSERTITEM32A:
-	    return HEADER_InsertItem32A (wndPtr, wParam, lParam);
+	case HDM_INSERTITEMA:
+	    return HEADER_InsertItemA (wndPtr, wParam, lParam);
 
-	case HDM_INSERTITEM32W:
-	    return HEADER_InsertItem32W (wndPtr, wParam, lParam);
+	case HDM_INSERTITEMW:
+	    return HEADER_InsertItemW (wndPtr, wParam, lParam);
 
 	case HDM_LAYOUT:
 	    return HEADER_Layout (wndPtr, wParam, lParam);
@@ -1471,11 +1471,11 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
 	case HDM_SETIMAGELIST:
 	    return HEADER_SetImageList (wndPtr, wParam, lParam);
 
-	case HDM_SETITEM32A:
-	    return HEADER_SetItem32A (wndPtr, wParam, lParam);
+	case HDM_SETITEMA:
+	    return HEADER_SetItemA (wndPtr, wParam, lParam);
 
-	case HDM_SETITEM32W:
-	    return HEADER_SetItem32W (wndPtr, wParam, lParam);
+	case HDM_SETITEMW:
+	    return HEADER_SetItemW (wndPtr, wParam, lParam);
 
 /*	case HDM_SETORDERARRAY: */
 
@@ -1528,7 +1528,7 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
             if (msg >= WM_USER) 
 		ERR (header, "unknown msg %04x wp=%04x lp=%08lx\n",
 		     msg, wParam, lParam );
-	    return DefWindowProc32A (hwnd, msg, wParam, lParam);
+	    return DefWindowProcA (hwnd, msg, wParam, lParam);
     }
     return 0;
 }
@@ -1537,26 +1537,26 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
 VOID
 HEADER_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (WC_HEADER32A)) return;
+    if (GlobalFindAtomA (WC_HEADERA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS;
-    wndClass.lpfnWndProc   = (WNDPROC32)HEADER_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)HEADER_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(HEADER_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.lpszClassName = WC_HEADER32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.lpszClassName = WC_HEADERA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 HEADER_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (WC_HEADER32A))
-	UnregisterClass32A (WC_HEADER32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (WC_HEADERA))
+	UnregisterClassA (WC_HEADERA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
index e9a3438428b..a2e5d28722e 100644
--- a/dlls/comctl32/hotkey.c
+++ b/dlls/comctl32/hotkey.c
@@ -32,11 +32,11 @@
 
 
 static LRESULT
-HOTKEY_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HOTKEY_INFO *infoPtr;
-    TEXTMETRIC32A tm;
-    HDC32 hdc;
+    TEXTMETRICA tm;
+    HDC hdc;
 
     /* allocate memory for info structure */
     infoPtr = (HOTKEY_INFO *)COMCTL32_Alloc (sizeof(HOTKEY_INFO));
@@ -56,17 +56,17 @@ HOTKEY_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     /* initialize info structure */
 
     /* get default font height */
-    hdc = GetDC32 (wndPtr->hwndSelf);
-    GetTextMetrics32A (hdc, &tm);
+    hdc = GetDC (wndPtr->hwndSelf);
+    GetTextMetricsA (hdc, &tm);
     infoPtr->nHeight = tm.tmHeight;
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return 0;
 }
 
 
 static LRESULT
-HOTKEY_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
 
@@ -80,27 +80,27 @@ HOTKEY_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HOTKEY_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_EraseBackground (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
-    HBRUSH32 hBrush;
-    RECT32   rc;
+    HBRUSH hBrush;
+    RECT   rc;
 
     hBrush =
-	(HBRUSH32)SendMessage32A (wndPtr->parent->hwndSelf, WM_CTLCOLOREDIT,
+	(HBRUSH)SendMessageA (wndPtr->parent->hwndSelf, WM_CTLCOLOREDIT,
 				  wParam, (LPARAM)wndPtr->hwndSelf);
     if (hBrush)
-	hBrush = (HBRUSH32)GetStockObject32 (WHITE_BRUSH);
-    GetClientRect32 (wndPtr->hwndSelf, &rc);
+	hBrush = (HBRUSH)GetStockObject (WHITE_BRUSH);
+    GetClientRect (wndPtr->hwndSelf, &rc);
 
-    FillRect32 ((HDC32)wParam, &rc, hBrush);
+    FillRect ((HDC)wParam, &rc, hBrush);
 
     return -1;
 }
 
 
 __inline__ static LRESULT
-HOTKEY_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_GetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
 
@@ -109,7 +109,7 @@ HOTKEY_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HOTKEY_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_KeyDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
 
@@ -120,7 +120,7 @@ HOTKEY_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	case VK_DELETE:
 	case VK_ESCAPE:
 	case VK_BACK:
-	    return DefWindowProc32A (wndPtr->hwndSelf, WM_KEYDOWN, wParam, lParam);
+	    return DefWindowProcA (wndPtr->hwndSelf, WM_KEYDOWN, wParam, lParam);
 
 	case VK_SHIFT:
 	case VK_CONTROL:
@@ -138,7 +138,7 @@ HOTKEY_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HOTKEY_KeyUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_KeyUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
 
@@ -149,34 +149,34 @@ HOTKEY_KeyUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HOTKEY_KillFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_KillFocus (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
 
     infoPtr->bFocus = FALSE;
-    DestroyCaret32 ();
+    DestroyCaret ();
 
     return 0;
 }
 
 
 static LRESULT
-HOTKEY_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_LButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 /*    HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
 
-    SetFocus32 (wndPtr->hwndSelf);
+    SetFocus (wndPtr->hwndSelf);
 
     return 0;
 }
 
 
 __inline__ static LRESULT
-HOTKEY_NCCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_NCCreate (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     wndPtr->dwExStyle |= WS_EX_CLIENTEDGE;
 
-    return DefWindowProc32A (wndPtr->hwndSelf, WM_NCCREATE, wParam, lParam);
+    return DefWindowProcA (wndPtr->hwndSelf, WM_NCCREATE, wParam, lParam);
 }
 
 
@@ -184,18 +184,18 @@ HOTKEY_NCCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HOTKEY_SetFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_SetFocus (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
 
     infoPtr->bFocus = TRUE;
 
 
-    CreateCaret32 (wndPtr->hwndSelf, (HBITMAP32)0, 1, infoPtr->nHeight);
+    CreateCaret (wndPtr->hwndSelf, (HBITMAP)0, 1, infoPtr->nHeight);
 
-    SetCaretPos32 (1, 1);
+    SetCaretPos (1, 1);
 
-    ShowCaret32 (wndPtr->hwndSelf);
+    ShowCaret (wndPtr->hwndSelf);
 
 
     return 0;
@@ -203,25 +203,25 @@ HOTKEY_SetFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-HOTKEY_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
-    TEXTMETRIC32A tm;
-    HDC32 hdc;
-    HFONT32 hOldFont = 0;
+    TEXTMETRICA tm;
+    HDC hdc;
+    HFONT hOldFont = 0;
 
-    infoPtr->hFont = (HFONT32)wParam;
+    infoPtr->hFont = (HFONT)wParam;
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     if (infoPtr->hFont)
-	hOldFont = SelectObject32 (hdc, infoPtr->hFont);
+	hOldFont = SelectObject (hdc, infoPtr->hFont);
 
-    GetTextMetrics32A (hdc, &tm);
+    GetTextMetricsA (hdc, &tm);
     infoPtr->nHeight = tm.tmHeight;
 
     if (infoPtr->hFont)
-	SelectObject32 (hdc, hOldFont);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	SelectObject (hdc, hOldFont);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     if (LOWORD(lParam)) {
 
@@ -234,7 +234,7 @@ HOTKEY_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HOTKEY_SysKeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_SysKeyDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
 
@@ -245,7 +245,7 @@ HOTKEY_SysKeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	case VK_DELETE:
 	case VK_ESCAPE:
 	case VK_BACK:
-	    return DefWindowProc32A (wndPtr->hwndSelf, WM_SYSKEYDOWN, wParam, lParam);
+	    return DefWindowProcA (wndPtr->hwndSelf, WM_SYSKEYDOWN, wParam, lParam);
 
 	case VK_SHIFT:
 	case VK_CONTROL:
@@ -263,7 +263,7 @@ HOTKEY_SysKeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-HOTKEY_SysKeyUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_SysKeyUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
 
@@ -275,7 +275,7 @@ HOTKEY_SysKeyUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -333,7 +333,7 @@ HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (hotkey, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -342,27 +342,27 @@ HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 HOTKEY_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (HOTKEY_CLASS32A)) return;
+    if (GlobalFindAtomA (HOTKEY_CLASSA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC32)HOTKEY_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)HOTKEY_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(HOTKEY_INFO *);
     wndClass.hCursor       = 0;
     wndClass.hbrBackground = 0;
-    wndClass.lpszClassName = HOTKEY_CLASS32A;
+    wndClass.lpszClassName = HOTKEY_CLASSA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 HOTKEY_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (HOTKEY_CLASS32A))
-	UnregisterClass32A (HOTKEY_CLASS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (HOTKEY_CLASSA))
+	UnregisterClassA (HOTKEY_CLASSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 540ae42d244..2c39afd622c 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -46,15 +46,15 @@
 /* internal image list data used for Drag & Drop operations */
 
 static HIMAGELIST himlInternalDrag = NULL;
-static INT32      nInternalDragHotspotX = 0;
-static INT32      nInternalDragHotspotY = 0;
+static INT      nInternalDragHotspotX = 0;
+static INT      nInternalDragHotspotY = 0;
 
-static HWND32     hwndInternalDrag = 0;
-static INT32      xInternalPos = 0;
-static INT32      yInternalPos = 0;
+static HWND     hwndInternalDrag = 0;
+static INT      xInternalPos = 0;
+static INT      yInternalPos = 0;
 
-static HDC32      hdcBackBuffer = 0;
-static HBITMAP32  hbmBackBuffer = 0;
+static HDC      hdcBackBuffer = 0;
+static HBITMAP  hbmBackBuffer = 0;
 
 
 /*************************************************************************
@@ -74,52 +74,52 @@ static HBITMAP32  hbmBackBuffer = 0;
  */
 
 static VOID
-IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT32 nImageCount)
+IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount)
 {
-    HDC32     hdcImageList, hdcBitmap;
-    HBITMAP32 hbmNewBitmap;
-    INT32     nNewWidth, nNewCount;
+    HDC     hdcImageList, hdcBitmap;
+    HBITMAP hbmNewBitmap;
+    INT     nNewWidth, nNewCount;
 
     TRACE(imagelist, "Create expanded bitmaps!\n");
 
     nNewCount = himl->cCurImage + nImageCount + himl->cGrow;
     nNewWidth = nNewCount * himl->cx;
 
-    hdcImageList = CreateCompatibleDC32 (0);
-    hdcBitmap = CreateCompatibleDC32 (0);
+    hdcImageList = CreateCompatibleDC (0);
+    hdcBitmap = CreateCompatibleDC (0);
 
     hbmNewBitmap =
-        CreateBitmap32 (nNewWidth, himl->cy, 1, himl->uBitsPixel, NULL);
+        CreateBitmap (nNewWidth, himl->cy, 1, himl->uBitsPixel, NULL);
     if (hbmNewBitmap == 0)
         ERR (imagelist, "creating new image bitmap!\n");
 
-    SelectObject32 (hdcImageList, himl->hbmImage);
-    SelectObject32 (hdcBitmap, hbmNewBitmap);
-    BitBlt32 (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, himl->cy,
+    SelectObject (hdcImageList, himl->hbmImage);
+    SelectObject (hdcBitmap, hbmNewBitmap);
+    BitBlt (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, himl->cy,
               hdcImageList, 0, 0, SRCCOPY);
 
-    DeleteObject32 (himl->hbmImage);
+    DeleteObject (himl->hbmImage);
     himl->hbmImage = hbmNewBitmap;
 
     if (himl->hbmMask) {
         hbmNewBitmap = 
-            CreateBitmap32 (nNewWidth, himl->cy, 1, 1, NULL);
+            CreateBitmap (nNewWidth, himl->cy, 1, 1, NULL);
 
         if (hbmNewBitmap == 0)
             ERR (imagelist, "creating new mask bitmap!");
 
-        SelectObject32 (hdcImageList, himl->hbmMask);
-        SelectObject32 (hdcBitmap, hbmNewBitmap);
-        BitBlt32 (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, himl->cy,
+        SelectObject (hdcImageList, himl->hbmMask);
+        SelectObject (hdcBitmap, hbmNewBitmap);
+        BitBlt (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, himl->cy,
                   hdcImageList, 0, 0, SRCCOPY);
-        DeleteObject32 (himl->hbmMask);
+        DeleteObject (himl->hbmMask);
         himl->hbmMask = hbmNewBitmap;
     }
 
     himl->cMaxImage = nNewCount;
 
-    DeleteDC32 (hdcImageList);
-    DeleteDC32 (hdcBitmap);
+    DeleteDC (hdcImageList);
+    DeleteDC (hdcBitmap);
 }
 
 
@@ -138,18 +138,18 @@ IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT32 nImageCount)
  *     Failure: -1
  */
 
-INT32 WINAPI
-ImageList_Add (HIMAGELIST himl,	HBITMAP32 hbmImage, HBITMAP32 hbmMask)
+INT WINAPI
+ImageList_Add (HIMAGELIST himl,	HBITMAP hbmImage, HBITMAP hbmMask)
 {
-    HDC32    hdcSrc, hdcDst;
-    INT32    nFirstIndex, nImageCount;
-    INT32    nStartX;
-    BITMAP32 bmp;
+    HDC    hdcSrc, hdcDst;
+    INT    nFirstIndex, nImageCount;
+    INT    nStartX;
+    BITMAP bmp;
 
     if (!himl || !hbmImage)
 	return -1;
 
-    GetObject32A (hbmImage, sizeof(BITMAP32), (LPVOID)&bmp);
+    GetObjectA (hbmImage, sizeof(BITMAP), (LPVOID)&bmp);
     nImageCount = bmp.bmWidth / himl->cx;
 
     if (himl->cCurImage + nImageCount >= himl->cMaxImage)
@@ -157,36 +157,36 @@ ImageList_Add (HIMAGELIST himl,	HBITMAP32 hbmImage, HBITMAP32 hbmMask)
 
     nStartX = himl->cCurImage * himl->cx;
 
-    hdcSrc = CreateCompatibleDC32 (0);
-    hdcDst = CreateCompatibleDC32 (0);
+    hdcSrc = CreateCompatibleDC (0);
+    hdcDst = CreateCompatibleDC (0);
 
     /* copy image bitmap */
-    SelectObject32 (hdcDst, himl->hbmImage);
-    SelectObject32 (hdcSrc, hbmImage);
-    BitBlt32 (hdcDst, himl->cCurImage * himl->cx, 0,
+    SelectObject (hdcDst, himl->hbmImage);
+    SelectObject (hdcSrc, hbmImage);
+    BitBlt (hdcDst, himl->cCurImage * himl->cx, 0,
               bmp.bmWidth, himl->cy, hdcSrc, 0, 0, SRCCOPY);
           
     if (himl->hbmMask) {
         if (hbmMask) {
 	    /* copy mask bitmap */
-            SelectObject32 (hdcDst, himl->hbmMask);
-            SelectObject32 (hdcSrc, hbmMask);
-            BitBlt32 (hdcDst, nStartX, 0, bmp.bmWidth, himl->cy,
+            SelectObject (hdcDst, himl->hbmMask);
+            SelectObject (hdcSrc, hbmMask);
+            BitBlt (hdcDst, nStartX, 0, bmp.bmWidth, himl->cy,
 		      hdcSrc, 0, 0, SRCCOPY);
         }
         else {
 	    /* copy monochrome image to the mask bitmap */
-            SelectObject32 (hdcDst, himl->hbmMask);
-            SelectObject32 (hdcSrc, hbmImage);
-	    SetBkColor32 (hdcSrc, GetNearestColor32 (hdcSrc,
-			  GetPixel32 (hdcSrc, 0, 0)));
-	    BitBlt32 (hdcDst, nStartX, 0, bmp.bmWidth, himl->cy,
+            SelectObject (hdcDst, himl->hbmMask);
+            SelectObject (hdcSrc, hbmImage);
+	    SetBkColor (hdcSrc, GetNearestColor (hdcSrc,
+			  GetPixel (hdcSrc, 0, 0)));
+	    BitBlt (hdcDst, nStartX, 0, bmp.bmWidth, himl->cy,
 		      hdcSrc, nStartX, 0, SRCCOPY);
         }
     }
 
-    DeleteDC32 (hdcSrc);
-    DeleteDC32 (hdcDst);
+    DeleteDC (hdcSrc);
+    DeleteDC (hdcDst);
 
     nFirstIndex = himl->cCurImage;
     himl->cCurImage += nImageCount;
@@ -209,8 +209,8 @@ ImageList_Add (HIMAGELIST himl,	HBITMAP32 hbmImage, HBITMAP32 hbmMask)
  *     Failure: -1
  */
 
-INT32 WINAPI
-ImageList_AddIcon (HIMAGELIST himl, HICON32 hIcon)
+INT WINAPI
+ImageList_AddIcon (HIMAGELIST himl, HICON hIcon)
 {
     return ImageList_ReplaceIcon (himl, -1, hIcon);
 }
@@ -232,17 +232,17 @@ ImageList_AddIcon (HIMAGELIST himl, HICON32 hIcon)
  *     Failure: -1
  */
 
-INT32 WINAPI
-ImageList_AddMasked (HIMAGELIST himl, HBITMAP32 hBitmap, COLORREF clrMask)
+INT WINAPI
+ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask)
 {
-    HDC32    hdcImage, hdcMask, hdcBitmap;
-    INT32    nIndex, nImageCount;
-    BITMAP32 bmp;
+    HDC    hdcImage, hdcMask, hdcBitmap;
+    INT    nIndex, nImageCount;
+    BITMAP bmp;
 
     if (himl == NULL)
 	return -1;
 
-    if (!GetObject32A (hBitmap, sizeof(BITMAP32), &bmp))
+    if (!GetObjectA (hBitmap, sizeof(BITMAP), &bmp))
 	return -1;
 
     nImageCount = bmp.bmWidth / himl->cx;
@@ -253,32 +253,32 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP32 hBitmap, COLORREF clrMask)
     nIndex = himl->cCurImage;
     himl->cCurImage += nImageCount;
 
-    hdcImage  = CreateCompatibleDC32 (0);
-    hdcBitmap = CreateCompatibleDC32 (0);
+    hdcImage  = CreateCompatibleDC (0);
+    hdcBitmap = CreateCompatibleDC (0);
 
-    SelectObject32 (hdcBitmap, hBitmap);
-    SelectObject32 (hdcImage, himl->hbmImage);
-    BitBlt32 (hdcImage, nIndex * himl->cx, 0, bmp.bmWidth, himl->cy,
+    SelectObject (hdcBitmap, hBitmap);
+    SelectObject (hdcImage, himl->hbmImage);
+    BitBlt (hdcImage, nIndex * himl->cx, 0, bmp.bmWidth, himl->cy,
               hdcBitmap, 0, 0, SRCCOPY);
 
     if (himl->hbmMask) {
 	COLORREF bkColor = (clrMask != CLR_DEFAULT) ? clrMask :
-	    GetNearestColor32 (hdcBitmap, GetPixel32 (hdcBitmap, 0, 0));
+	    GetNearestColor (hdcBitmap, GetPixel (hdcBitmap, 0, 0));
 
 	/* create mask from image */
-        hdcMask = CreateCompatibleDC32 (0);
-        SelectObject32 (hdcMask, himl->hbmMask);
+        hdcMask = CreateCompatibleDC (0);
+        SelectObject (hdcMask, himl->hbmMask);
 
 	/* create monochrome image to the mask bitmap */
-	SetBkColor32 (hdcBitmap, bkColor);
-	BitBlt32 (hdcMask, nIndex * himl->cx, 0, bmp.bmWidth, himl->cy,
+	SetBkColor (hdcBitmap, bkColor);
+	BitBlt (hdcMask, nIndex * himl->cx, 0, bmp.bmWidth, himl->cy,
 		  hdcBitmap, 0, 0, SRCCOPY);
 
-        DeleteDC32 (hdcMask);
+        DeleteDC (hdcMask);
     }
 
-    DeleteDC32 (hdcImage);
-    DeleteDC32 (hdcBitmap);
+    DeleteDC (hdcImage);
+    DeleteDC (hdcBitmap);
   
     return nIndex;
 }
@@ -301,11 +301,11 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP32 hBitmap, COLORREF clrMask)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-ImageList_BeginDrag (HIMAGELIST himlTrack, INT32 iTrack,
-	             INT32 dxHotspot, INT32 dyHotspot)
+BOOL WINAPI
+ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack,
+	             INT dxHotspot, INT dyHotspot)
 {
-    HDC32 hdcSrc, hdcDst;
+    HDC hdcSrc, hdcDst;
 
     FIXME(imagelist, "partially implemented!\n");
 
@@ -326,23 +326,23 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT32 iTrack,
     nInternalDragHotspotX = dxHotspot;
     nInternalDragHotspotY = dyHotspot;
 
-    hdcSrc = CreateCompatibleDC32 (0);
-    hdcDst = CreateCompatibleDC32 (0);
+    hdcSrc = CreateCompatibleDC (0);
+    hdcDst = CreateCompatibleDC (0);
 
     /* copy image */
-    SelectObject32 (hdcSrc, himlTrack->hbmImage);
-    SelectObject32 (hdcDst, himlInternalDrag->hbmImage);
-    StretchBlt32 (hdcDst, 0, 0, himlInternalDrag->cx, himlInternalDrag->cy, hdcSrc,
+    SelectObject (hdcSrc, himlTrack->hbmImage);
+    SelectObject (hdcDst, himlInternalDrag->hbmImage);
+    StretchBlt (hdcDst, 0, 0, himlInternalDrag->cx, himlInternalDrag->cy, hdcSrc,
                   iTrack * himlTrack->cx, 0, himlTrack->cx, himlTrack->cy, SRCCOPY);
 
     /* copy mask */
-    SelectObject32 (hdcSrc, himlTrack->hbmMask);
-    SelectObject32 (hdcDst, himlInternalDrag->hbmMask);
-    StretchBlt32 (hdcDst, 0, 0, himlInternalDrag->cx, himlInternalDrag->cy, hdcSrc,
+    SelectObject (hdcSrc, himlTrack->hbmMask);
+    SelectObject (hdcDst, himlInternalDrag->hbmMask);
+    StretchBlt (hdcDst, 0, 0, himlInternalDrag->cx, himlInternalDrag->cy, hdcSrc,
                   iTrack * himlTrack->cx, 0, himlTrack->cx, himlTrack->cy, SRCCOPY);
 
-    DeleteDC32 (hdcSrc);
-    DeleteDC32 (hdcDst);
+    DeleteDC (hdcSrc);
+    DeleteDC (hdcDst);
 
     himlInternalDrag->cCurImage = 1;
 
@@ -373,11 +373,11 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT32 iTrack,
  *     Could this feature become a bug??? ;-)
  */
 
-BOOL32 WINAPI
-ImageList_Copy (HIMAGELIST himlDst, INT32 iDst,	HIMAGELIST himlSrc,
-		INT32 iSrc, INT32 uFlags)
+BOOL WINAPI
+ImageList_Copy (HIMAGELIST himlDst, INT iDst,	HIMAGELIST himlSrc,
+		INT iSrc, INT uFlags)
 {
-    HDC32 hdcSrc, hdcDst;    
+    HDC hdcSrc, hdcDst;    
 
     TRACE(imagelist, "iDst=%d  iSrc=%d\n", iDst, iSrc);
 
@@ -388,91 +388,91 @@ ImageList_Copy (HIMAGELIST himlDst, INT32 iDst,	HIMAGELIST himlSrc,
     if ((iSrc < 0) || (iSrc >= himlSrc->cCurImage))
 	return FALSE;
 
-    hdcSrc = CreateCompatibleDC32 (0);
+    hdcSrc = CreateCompatibleDC (0);
     if (himlDst == himlSrc)
         hdcDst = hdcSrc;
     else
-        hdcDst = CreateCompatibleDC32 (0);
+        hdcDst = CreateCompatibleDC (0);
 
     if (uFlags & ILCF_SWAP) {
         /* swap */
-        HBITMAP32 hbmTempImage, hbmTempMask;
+        HBITMAP hbmTempImage, hbmTempMask;
 
         /* create temporary bitmaps */
-        hbmTempImage = CreateBitmap32 (himlSrc->cx, himlSrc->cy, 1,
+        hbmTempImage = CreateBitmap (himlSrc->cx, himlSrc->cy, 1,
                                        himlSrc->uBitsPixel, NULL);
-        hbmTempMask = CreateBitmap32 (himlSrc->cx, himlSrc->cy, 1,
+        hbmTempMask = CreateBitmap (himlSrc->cx, himlSrc->cy, 1,
 				      1, NULL);
 
         /* copy (and stretch) destination to temporary bitmaps.(save) */
         /* image */
-        SelectObject32 (hdcSrc, himlDst->hbmImage);
-        SelectObject32 (hdcDst, hbmTempImage);
-        StretchBlt32 (hdcDst, 0, 0, himlSrc->cx, himlSrc->cy,
+        SelectObject (hdcSrc, himlDst->hbmImage);
+        SelectObject (hdcDst, hbmTempImage);
+        StretchBlt (hdcDst, 0, 0, himlSrc->cx, himlSrc->cy,
                       hdcSrc, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
                       SRCCOPY);
         /* mask */
-        SelectObject32 (hdcSrc, himlDst->hbmMask);
-        SelectObject32 (hdcDst, hbmTempMask);
-        StretchBlt32 (hdcDst, 0, 0, himlSrc->cx, himlSrc->cy,
+        SelectObject (hdcSrc, himlDst->hbmMask);
+        SelectObject (hdcDst, hbmTempMask);
+        StretchBlt (hdcDst, 0, 0, himlSrc->cx, himlSrc->cy,
                       hdcSrc, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
                       SRCCOPY);
 
         /* copy (and stretch) source to destination */
         /* image */
-        SelectObject32 (hdcSrc, himlSrc->hbmImage);
-        SelectObject32 (hdcDst, himlDst->hbmImage);
-        StretchBlt32 (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+        SelectObject (hdcSrc, himlSrc->hbmImage);
+        SelectObject (hdcDst, himlDst->hbmImage);
+        StretchBlt (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
                       hdcSrc, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                       SRCCOPY);
         /* mask */
-        SelectObject32 (hdcSrc, himlSrc->hbmMask);
-        SelectObject32 (hdcDst, himlDst->hbmMask);
-        StretchBlt32 (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+        SelectObject (hdcSrc, himlSrc->hbmMask);
+        SelectObject (hdcDst, himlDst->hbmMask);
+        StretchBlt (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
                       hdcSrc, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                       SRCCOPY);
 
         /* copy (without stretching) temporary bitmaps to source (restore) */
         /* image */
-        SelectObject32 (hdcSrc, hbmTempImage);
-        SelectObject32 (hdcDst, himlSrc->hbmImage);
-        BitBlt32 (hdcDst, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
+        SelectObject (hdcSrc, hbmTempImage);
+        SelectObject (hdcDst, himlSrc->hbmImage);
+        BitBlt (hdcDst, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                   hdcSrc, 0, 0, SRCCOPY);
         /* mask */
-        SelectObject32 (hdcSrc, hbmTempMask);
-        SelectObject32 (hdcDst, himlSrc->hbmMask);
-        BitBlt32 (hdcDst, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
+        SelectObject (hdcSrc, hbmTempMask);
+        SelectObject (hdcDst, himlSrc->hbmMask);
+        BitBlt (hdcDst, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                   hdcSrc, 0, 0, SRCCOPY);
 
         /* delete temporary bitmaps */
-        DeleteObject32 (hbmTempMask);
-        DeleteObject32 (hbmTempImage);
+        DeleteObject (hbmTempMask);
+        DeleteObject (hbmTempImage);
     }
     else {
         /* copy image */
-        SelectObject32 (hdcSrc, himlSrc->hbmImage);
+        SelectObject (hdcSrc, himlSrc->hbmImage);
         if (himlSrc == himlDst)
             hdcDst = hdcSrc;
         else
-            SelectObject32 (hdcDst, himlDst->hbmImage);
-        StretchBlt32 (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+            SelectObject (hdcDst, himlDst->hbmImage);
+        StretchBlt (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
                       hdcSrc, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                       SRCCOPY);
 
         /* copy mask */
-        SelectObject32 (hdcSrc, himlSrc->hbmMask);
+        SelectObject (hdcSrc, himlSrc->hbmMask);
         if (himlSrc == himlDst)
             hdcDst = hdcSrc;
         else
-            SelectObject32 (hdcDst, himlDst->hbmMask);
-        StretchBlt32 (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+            SelectObject (hdcDst, himlDst->hbmMask);
+        StretchBlt (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
                       hdcSrc, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                       SRCCOPY);
     }
 
-    DeleteDC32 (hdcSrc);
+    DeleteDC (hdcSrc);
     if (himlSrc != himlDst)
-        DeleteDC32 (hdcDst);
+        DeleteDC (hdcDst);
 
     return TRUE;
 }
@@ -494,13 +494,13 @@ ImageList_Copy (HIMAGELIST himlDst, INT32 iDst,	HIMAGELIST himlSrc,
  */
 
 HIMAGELIST WINAPI
-ImageList_Create (INT32 cx, INT32 cy, UINT32 flags,
-		  INT32 cInitial, INT32 cGrow)
+ImageList_Create (INT cx, INT cy, UINT flags,
+		  INT cInitial, INT cGrow)
 {
     HIMAGELIST himl;
-    HDC32      hdc;
-    INT32      nCount;
-    HBITMAP32  hbmTemp;
+    HDC      hdc;
+    INT      nCount;
+    HBITMAP  hbmTemp;
     static WORD aBitBlend25[] = 
         {0xAA, 0x00, 0x55, 0x00, 0xAA, 0x00, 0x55, 0x00};
 
@@ -527,14 +527,14 @@ ImageList_Create (INT32 cx, INT32 cy, UINT32 flags,
     for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++)
         himl->nOvlIdx[nCount] = -1;
 
-    hdc = CreateCompatibleDC32 (0);
-    himl->uBitsPixel = (UINT32)GetDeviceCaps32 (hdc, BITSPIXEL);
-    DeleteDC32 (hdc);
+    hdc = CreateCompatibleDC (0);
+    himl->uBitsPixel = (UINT)GetDeviceCaps (hdc, BITSPIXEL);
+    DeleteDC (hdc);
 
     TRACE(imagelist, "Image: %d Bits per Pixel\n", himl->uBitsPixel);
 
     himl->hbmImage =
-        CreateBitmap32 (himl->cx * himl->cMaxImage, himl->cy,
+        CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
                         1, himl->uBitsPixel, NULL);
     if (himl->hbmImage == 0) {
         ERR(imagelist, "Error creating image bitmap!\n");
@@ -542,12 +542,12 @@ ImageList_Create (INT32 cx, INT32 cy, UINT32 flags,
     }
 
     if (himl->flags & ILC_MASK) {
-        himl->hbmMask = CreateBitmap32 (himl->cx * himl->cMaxImage, himl->cy,
+        himl->hbmMask = CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
 					1, 1, NULL);
         if (himl->hbmMask == 0) {
             ERR(imagelist, "Error creating mask bitmap!\n");
             if (himl->hbmImage)
-                DeleteObject32 (himl->hbmImage);
+                DeleteObject (himl->hbmImage);
             return NULL;
         }
     }
@@ -555,13 +555,13 @@ ImageList_Create (INT32 cx, INT32 cy, UINT32 flags,
         himl->hbmMask = 0;
 
     /* create blending brushes */
-    hbmTemp = CreateBitmap32 (8, 8, 1, 1, &aBitBlend25);
-    himl->hbrBlend25 = CreatePatternBrush32 (hbmTemp);
-    DeleteObject32 (hbmTemp);
+    hbmTemp = CreateBitmap (8, 8, 1, 1, &aBitBlend25);
+    himl->hbrBlend25 = CreatePatternBrush (hbmTemp);
+    DeleteObject (hbmTemp);
 
-    hbmTemp = CreateBitmap32 (8, 8, 1, 1, &aBitBlend50);
-    himl->hbrBlend50 = CreatePatternBrush32 (hbmTemp);
-    DeleteObject32 (hbmTemp);
+    hbmTemp = CreateBitmap (8, 8, 1, 1, &aBitBlend50);
+    himl->hbrBlend50 = CreatePatternBrush (hbmTemp);
+    DeleteObject (hbmTemp);
 
     return himl;
 }
@@ -580,7 +580,7 @@ ImageList_Create (INT32 cx, INT32 cy, UINT32 flags,
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 ImageList_Destroy (HIMAGELIST himl)
 { 
     if (!himl)
@@ -588,15 +588,15 @@ ImageList_Destroy (HIMAGELIST himl)
 
     /* delete image bitmaps */
     if (himl->hbmImage)
-        DeleteObject32 (himl->hbmImage);
+        DeleteObject (himl->hbmImage);
     if (himl->hbmMask)
-        DeleteObject32 (himl->hbmMask);
+        DeleteObject (himl->hbmMask);
 
     /* delete blending brushes */
     if (himl->hbrBlend25)
-        DeleteObject32 (himl->hbrBlend25);
+        DeleteObject (himl->hbrBlend25);
     if (himl->hbrBlend50)
-        DeleteObject32 (himl->hbrBlend50);
+        DeleteObject (himl->hbrBlend50);
         
     COMCTL32_Free (himl);
 
@@ -623,8 +623,8 @@ ImageList_Destroy (HIMAGELIST himl)
  *     the client area.
  */
 
-BOOL32 WINAPI
-ImageList_DragEnter (HWND32 hwndLock, INT32 x, INT32 y)
+BOOL WINAPI
+ImageList_DragEnter (HWND hwndLock, INT x, INT y)
 {
     if (himlInternalDrag == NULL)
 	return FALSE;
@@ -632,13 +632,13 @@ ImageList_DragEnter (HWND32 hwndLock, INT32 x, INT32 y)
     if (hwndLock)
 	hwndInternalDrag = hwndLock;
     else
-	hwndInternalDrag = GetDesktopWindow32 ();
+	hwndInternalDrag = GetDesktopWindow ();
 
     xInternalPos = x;
     yInternalPos = y;
 
-    hdcBackBuffer = CreateCompatibleDC32 (0);
-    hbmBackBuffer = CreateCompatibleBitmap32 (hdcBackBuffer,
+    hdcBackBuffer = CreateCompatibleDC (0);
+    hbmBackBuffer = CreateCompatibleBitmap (hdcBackBuffer,
 		himlInternalDrag->cx, himlInternalDrag->cy);
 
     ImageList_DragShowNolock (TRUE);
@@ -660,18 +660,18 @@ ImageList_DragEnter (HWND32 hwndLock, INT32 x, INT32 y)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-ImageList_DragLeave (HWND32 hwndLock)
+BOOL WINAPI
+ImageList_DragLeave (HWND hwndLock)
 {
     if (hwndLock)
 	hwndInternalDrag = hwndLock;
     else
-	hwndInternalDrag = GetDesktopWindow32 ();
+	hwndInternalDrag = GetDesktopWindow ();
 
     ImageList_DragShowNolock (FALSE);
 
-    DeleteDC32 (hdcBackBuffer);
-    DeleteObject32 (hbmBackBuffer);
+    DeleteDC (hdcBackBuffer);
+    DeleteObject (hbmBackBuffer);
 
     return TRUE;
 }
@@ -695,8 +695,8 @@ ImageList_DragLeave (HWND32 hwndLock)
  *     the client area.
  */
 
-BOOL32 WINAPI
-ImageList_DragMove (INT32 x, INT32 y)
+BOOL WINAPI
+ImageList_DragMove (INT x, INT y)
 {
     ImageList_DragShowNolock (FALSE);
 
@@ -725,15 +725,15 @@ ImageList_DragMove (INT32 x, INT32 y)
  *     semi-stub.
  */
 
-BOOL32 WINAPI
-ImageList_DragShowNolock (BOOL32 bShow)
+BOOL WINAPI
+ImageList_DragShowNolock (BOOL bShow)
 {
-    HDC32 hdcDrag;
+    HDC hdcDrag;
 
     FIXME (imagelist, "semi-stub!\n");
     TRACE (imagelist, "bShow=0x%X!\n", bShow);
 
-    hdcDrag = GetDCEx32 (hwndInternalDrag, 0,
+    hdcDrag = GetDCEx (hwndInternalDrag, 0,
 			 DCX_WINDOW | DCX_CACHE | DCX_LOCKWINDOWUPDATE);
 
     if (bShow) {
@@ -751,7 +751,7 @@ ImageList_DragShowNolock (BOOL32 bShow)
 
     }
 
-    ReleaseDC32 (hwndInternalDrag, hdcDrag);
+    ReleaseDC (hwndInternalDrag, hdcDrag);
 
     return FALSE;
 }
@@ -779,9 +779,9 @@ ImageList_DragShowNolock (BOOL32 bShow)
  *     ImageList_DrawIndirect.
  */
 
-BOOL32 WINAPI
-ImageList_Draw (HIMAGELIST himl, INT32 i, HDC32 hdc,
-		INT32 x, INT32 y, UINT32 fStyle)
+BOOL WINAPI
+ImageList_Draw (HIMAGELIST himl, INT i, HDC hdc,
+		INT x, INT y, UINT fStyle)
 {
     IMAGELISTDRAWPARAMS imldp;
 
@@ -832,10 +832,10 @@ ImageList_Draw (HIMAGELIST himl, INT32 i, HDC32 hdc,
  *     ImageList_DrawIndirect.
  */
 
-BOOL32 WINAPI
-ImageList_DrawEx (HIMAGELIST himl, INT32 i, HDC32 hdc, INT32 x, INT32 y,
-		  INT32 dx, INT32 dy, COLORREF rgbBk, COLORREF rgbFg,
-		  UINT32 fStyle)
+BOOL WINAPI
+ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y,
+		  INT dx, INT dy, COLORREF rgbBk, COLORREF rgbFg,
+		  UINT fStyle)
 {
     IMAGELISTDRAWPARAMS imldp;
 
@@ -871,22 +871,22 @@ ImageList_DrawEx (HIMAGELIST himl, INT32 i, HDC32 hdc, INT32 x, INT32 y,
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
 {
     HIMAGELIST himlLocal;
-    HDC32      hdcImageList, hdcTempImage;
-    HBITMAP32  hbmTempImage;
-    HBRUSH32   hBrush, hOldBrush;
-    INT32      cx, cy;
-    INT32      nOvlIdx;
+    HDC      hdcImageList, hdcTempImage;
+    HBITMAP  hbmTempImage;
+    HBRUSH   hBrush, hOldBrush;
+    INT      cx, cy;
+    INT      nOvlIdx;
     COLORREF   clrBlend;
-    BOOL32     bImage;       /* draw image ? */
-    BOOL32     bImageTrans;  /* draw image transparent ? */
-    BOOL32     bMask;        /* draw mask ? */
-    BOOL32     bMaskTrans;   /* draw mask transparent ? */
-    BOOL32     bBlend25;
-    BOOL32     bBlend50;
+    BOOL     bImage;       /* draw image ? */
+    BOOL     bImageTrans;  /* draw image transparent ? */
+    BOOL     bMask;        /* draw mask ? */
+    BOOL     bMaskTrans;   /* draw mask transparent ? */
+    BOOL     bBlend25;
+    BOOL     bBlend50;
 
     if (pimldp == NULL)
 	return FALSE;
@@ -944,15 +944,15 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
     else if (pimldp->fStyle & ILD_BLEND25)
         bBlend25 = TRUE;
 
-    hdcImageList = CreateCompatibleDC32 (0);
+    hdcImageList = CreateCompatibleDC (0);
 
     if (bMask)
     {
 	/* draw the mask */
-	SelectObject32 (hdcImageList, himlLocal->hbmMask);
-	SetBkColor32 (hdcImageList, RGB(255, 255, 255));
-	SetTextColor32 (hdcImageList, RGB(0, 0, 0));
-	BitBlt32 (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
+	SelectObject (hdcImageList, himlLocal->hbmMask);
+	SetBkColor (hdcImageList, RGB(255, 255, 255));
+	SetTextColor (hdcImageList, RGB(0, 0, 0));
+	BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
 		  hdcImageList, himlLocal->cx * pimldp->i, 0,
 		  bMaskTrans ? SRCAND : SRCCOPY);
     }
@@ -960,66 +960,66 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
     if (bImage)
     {
 	/* draw the image */
-	SelectObject32 (hdcImageList, himlLocal->hbmImage);
+	SelectObject (hdcImageList, himlLocal->hbmImage);
 
         if (!bImageTrans)
         {
-            hBrush = CreateSolidBrush32 (himlLocal->clrBk);
-            hOldBrush = SelectObject32 (pimldp->hdcDst, hBrush);
-            PatBlt32 (pimldp->hdcDst, pimldp->x, pimldp->y,
+            hBrush = CreateSolidBrush (himlLocal->clrBk);
+            hOldBrush = SelectObject (pimldp->hdcDst, hBrush);
+            PatBlt (pimldp->hdcDst, pimldp->x, pimldp->y,
                       cx, cy, PATCOPY);
-            DeleteObject32 (SelectObject32 (pimldp->hdcDst, hOldBrush));
+            DeleteObject (SelectObject (pimldp->hdcDst, hOldBrush));
         }
 
-        BitBlt32 (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
+        BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
                   hdcImageList, himlLocal->cx * pimldp->i, 0, SRCPAINT);
 
         if (bBlend25 || bBlend50)
         {
             if (pimldp->rgbFg == CLR_DEFAULT)
-                clrBlend = GetSysColor32 (COLOR_HIGHLIGHT);
+                clrBlend = GetSysColor (COLOR_HIGHLIGHT);
             else
                 clrBlend = pimldp->rgbFg;
 
-            hdcTempImage = CreateCompatibleDC32 (0);
-            hbmTempImage = CreateBitmap32 (himlLocal->cx, himlLocal->cy,
+            hdcTempImage = CreateCompatibleDC (0);
+            hbmTempImage = CreateBitmap (himlLocal->cx, himlLocal->cy,
                                            1, himlLocal->uBitsPixel, NULL);
-            SelectObject32 (hdcTempImage, hbmTempImage);
+            SelectObject (hdcTempImage, hbmTempImage);
 
 
             /* mask */
-            SelectObject32 (hdcTempImage,
+            SelectObject (hdcTempImage,
                             bBlend50 ? himlLocal->hbrBlend50 : himlLocal->hbrBlend25);
-            PatBlt32 (hdcTempImage, 0, 0, himlLocal->cx, himlLocal->cy, PATCOPY);
+            PatBlt (hdcTempImage, 0, 0, himlLocal->cx, himlLocal->cy, PATCOPY);
 
-            SelectObject32 (hdcImageList, himlLocal->hbmMask);
-            BitBlt32 (hdcTempImage, 0, 0, himlLocal->cx,
+            SelectObject (hdcImageList, himlLocal->hbmMask);
+            BitBlt (hdcTempImage, 0, 0, himlLocal->cx,
                       himlLocal->cy, hdcImageList, 
                       pimldp->i * himlLocal->cx, 0, SRCPAINT);
 
-            BitBlt32 (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
+            BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
 		      hdcTempImage, 0, 0, SRCAND);
 
             /* fill */
-            hBrush = CreateSolidBrush32 (clrBlend);
-            SelectObject32 (hdcTempImage, hBrush);
-            PatBlt32 (hdcTempImage, 0, 0, himlLocal->cx, himlLocal->cy, PATCOPY);
-            DeleteObject32 (hBrush);
+            hBrush = CreateSolidBrush (clrBlend);
+            SelectObject (hdcTempImage, hBrush);
+            PatBlt (hdcTempImage, 0, 0, himlLocal->cx, himlLocal->cy, PATCOPY);
+            DeleteObject (hBrush);
 
-            SelectObject32 (hdcTempImage,
+            SelectObject (hdcTempImage,
                             bBlend50 ? himlLocal->hbrBlend50 : himlLocal->hbrBlend25);
-            PatBlt32 (hdcTempImage, 0, 0, himlLocal->cx, himlLocal->cy, 0x0A0329);
+            PatBlt (hdcTempImage, 0, 0, himlLocal->cx, himlLocal->cy, 0x0A0329);
 
-            SelectObject32 (hdcImageList, himlLocal->hbmMask);
-            BitBlt32 (hdcTempImage, 0, 0, himlLocal->cx,
+            SelectObject (hdcImageList, himlLocal->hbmMask);
+            BitBlt (hdcTempImage, 0, 0, himlLocal->cx,
                       himlLocal->cy, hdcImageList, 
                       pimldp->i * himlLocal->cx, 0, SRCPAINT);
 
-            BitBlt32 (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
+            BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
                       hdcTempImage, 0, 0, SRCPAINT);
 
-            DeleteObject32 (hbmTempImage);
-            DeleteDC32 (hdcTempImage);
+            DeleteObject (hbmTempImage);
+            DeleteDC (hdcTempImage);
         }
     }   
 
@@ -1030,20 +1030,20 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
 	    nOvlIdx = pimldp->himl->nOvlIdx[nOvlIdx - 1];
 	    if ((nOvlIdx >= 0) && (nOvlIdx <= pimldp->himl->cCurImage)) {
 		if (pimldp->himl->hbmMask) {  
-                    SelectObject32 (hdcImageList, pimldp->himl->hbmMask);
-                    BitBlt32 (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
+                    SelectObject (hdcImageList, pimldp->himl->hbmMask);
+                    BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
                               hdcImageList, pimldp->himl->cx * nOvlIdx, 0,
 			      SRCAND);
 		}  
-                SelectObject32 (hdcImageList, pimldp->himl->hbmImage);
-                BitBlt32 (pimldp->hdcDst, pimldp->x, pimldp->y,
+                SelectObject (hdcImageList, pimldp->himl->hbmImage);
+                BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y,
                           cx, cy, hdcImageList,
                           pimldp->himl->cx * nOvlIdx, 0, SRCPAINT);
             }
         }
     }
 
-    DeleteDC32 (hdcImageList);
+    DeleteDC (hdcImageList);
   
     return TRUE;
 }
@@ -1064,7 +1064,7 @@ HIMAGELIST WINAPI
 ImageList_Duplicate (HIMAGELIST himlSrc)
 {
     HIMAGELIST himlDst;
-    HDC32 hdcSrc, hdcDst;
+    HDC hdcSrc, hdcDst;
 
     if (himlSrc == NULL) {
         ERR (imagelist, "Invalid image list handle!\n");
@@ -1076,23 +1076,23 @@ ImageList_Duplicate (HIMAGELIST himlSrc)
 
     if (himlDst)
     {
-        hdcSrc = CreateCompatibleDC32 (0);
-        hdcDst = CreateCompatibleDC32 (0);
-        SelectObject32 (hdcSrc, himlSrc->hbmImage);
-        SelectObject32 (hdcDst, himlDst->hbmImage);
-        BitBlt32 (hdcDst, 0, 0, himlSrc->cCurImage * himlSrc->cx, himlSrc->cy,
+        hdcSrc = CreateCompatibleDC (0);
+        hdcDst = CreateCompatibleDC (0);
+        SelectObject (hdcSrc, himlSrc->hbmImage);
+        SelectObject (hdcDst, himlDst->hbmImage);
+        BitBlt (hdcDst, 0, 0, himlSrc->cCurImage * himlSrc->cx, himlSrc->cy,
                   hdcSrc, 0, 0, SRCCOPY);
 
         if (himlDst->hbmMask)
         {
-            SelectObject32 (hdcSrc, himlSrc->hbmMask);
-            SelectObject32 (hdcDst, himlDst->hbmMask);
-            BitBlt32 (hdcDst, 0, 0, himlSrc->cCurImage * himlSrc->cx,
+            SelectObject (hdcSrc, himlSrc->hbmMask);
+            SelectObject (hdcDst, himlDst->hbmMask);
+            BitBlt (hdcDst, 0, 0, himlSrc->cCurImage * himlSrc->cx,
                       himlSrc->cy, hdcSrc, 0, 0, SRCCOPY);
         }
 
-        DeleteDC32 (hdcDst);
-        DeleteDC32 (hdcSrc);
+        DeleteDC (hdcDst);
+        DeleteDC (hdcSrc);
     }
 
     return himlDst;
@@ -1115,7 +1115,7 @@ ImageList_Duplicate (HIMAGELIST himlSrc)
  *     semi-stub.
  */
 
-BOOL32 WINAPI
+BOOL WINAPI
 ImageList_EndDrag (VOID)
 {
     FIXME (imagelist, "semi-stub!\n");
@@ -1176,7 +1176,7 @@ ImageList_GetBkColor (HIMAGELIST himl)
  */
 
 HIMAGELIST WINAPI
-ImageList_GetDragImage (POINT32 *ppt, POINT32 *pptHotspot)
+ImageList_GetDragImage (POINT *ppt, POINT *pptHotspot)
 {
     FIXME (imagelist, "semi-stub!\n");
 
@@ -1202,52 +1202,52 @@ ImageList_GetDragImage (POINT32 *ppt, POINT32 *pptHotspot)
  *     Failure: NULL
  */
 
-HICON32 WINAPI
-ImageList_GetIcon (HIMAGELIST himl, INT32 i, UINT32 fStyle)
+HICON WINAPI
+ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle)
 {
-    ICONINFO32 ii;
-    HICON32  hIcon;
-    HDC32    hdcSrc, hdcDst;
-    INT32    nWidth, nHeight;
+    ICONINFO ii;
+    HICON  hIcon;
+    HDC    hdcSrc, hdcDst;
+    INT    nWidth, nHeight;
 
     if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage))
 	return 0;
 
-    nWidth = GetSystemMetrics32 (SM_CXICON);
-    nHeight = GetSystemMetrics32 (SM_CYICON);
+    nWidth = GetSystemMetrics (SM_CXICON);
+    nHeight = GetSystemMetrics (SM_CYICON);
 
-    hdcSrc = CreateCompatibleDC32(0);
-    hdcDst = CreateCompatibleDC32(0);
+    hdcSrc = CreateCompatibleDC(0);
+    hdcDst = CreateCompatibleDC(0);
 
     ii.fIcon = TRUE;
     ii.xHotspot = nWidth / 2;
     ii.yHotspot = nHeight / 2;
-    ii.hbmMask  = CreateCompatibleBitmap32 (hdcDst, nWidth, nHeight);
-    ii.hbmColor = CreateCompatibleBitmap32 (hdcDst, nWidth, nHeight);
+    ii.hbmMask  = CreateCompatibleBitmap (hdcDst, nWidth, nHeight);
+    ii.hbmColor = CreateCompatibleBitmap (hdcDst, nWidth, nHeight);
 
 
     /* draw mask*/
-    SelectObject32 (hdcDst, ii.hbmMask);
+    SelectObject (hdcDst, ii.hbmMask);
     if (himl->hbmMask) {
-	SelectObject32 (hdcSrc, himl->hbmMask);
-	BitBlt32 (hdcDst, 0, 0, nWidth, nHeight,
+	SelectObject (hdcSrc, himl->hbmMask);
+	BitBlt (hdcDst, 0, 0, nWidth, nHeight,
 		  hdcSrc, i * himl->cx, 0, SRCCOPY);
     }
     else
-	PatBlt32 (hdcDst, 0, 0, nWidth, nHeight, BLACKNESS);
+	PatBlt (hdcDst, 0, 0, nWidth, nHeight, BLACKNESS);
 
     /* draw image*/
-    SelectObject32 (hdcDst, ii.hbmColor);
-    SelectObject32 (hdcSrc, himl->hbmImage);
-    BitBlt32 (hdcDst, 0, 0, nWidth, nHeight,
+    SelectObject (hdcDst, ii.hbmColor);
+    SelectObject (hdcSrc, himl->hbmImage);
+    BitBlt (hdcDst, 0, 0, nWidth, nHeight,
 	      hdcSrc, i * himl->cx, 0, SRCCOPY);
 
     hIcon = CreateIconIndirect (&ii);    
 
-    DeleteDC32 (hdcSrc);
-    DeleteDC32 (hdcDst);
-    DeleteObject32 (ii.hbmMask);
-    DeleteObject32 (ii.hbmColor);
+    DeleteDC (hdcSrc);
+    DeleteDC (hdcDst);
+    DeleteObject (ii.hbmMask);
+    DeleteObject (ii.hbmColor);
 
     return hIcon;
 }
@@ -1271,8 +1271,8 @@ ImageList_GetIcon (HIMAGELIST himl, INT32 i, UINT32 fStyle)
  *     All images in an image list have the same size.
  */
 
-BOOL32 WINAPI
-ImageList_GetIconSize (HIMAGELIST himl, INT32 *cx, INT32 *cy)
+BOOL WINAPI
+ImageList_GetIconSize (HIMAGELIST himl, INT *cx, INT *cy)
 {
     if (himl == NULL)
 	return FALSE;
@@ -1301,7 +1301,7 @@ ImageList_GetIconSize (HIMAGELIST himl, INT32 *cx, INT32 *cy)
  *     Failure: 0
  */
 
-INT32 WINAPI
+INT WINAPI
 ImageList_GetImageCount (HIMAGELIST himl)
 {
     if (himl == NULL)
@@ -1326,8 +1326,8 @@ ImageList_GetImageCount (HIMAGELIST himl)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-ImageList_GetImageInfo (HIMAGELIST himl, INT32 i, IMAGEINFO *pImageInfo)
+BOOL WINAPI
+ImageList_GetImageInfo (HIMAGELIST himl, INT i, IMAGEINFO *pImageInfo)
 {
     if ((himl == NULL) || (pImageInfo == NULL))
 	return FALSE;
@@ -1364,8 +1364,8 @@ ImageList_GetImageInfo (HIMAGELIST himl, INT32 i, IMAGEINFO *pImageInfo)
  *    This is an UNDOCUMENTED function!!!
  */
 
-BOOL32 WINAPI
-ImageList_GetImageRect (HIMAGELIST himl, INT32 i, LPRECT32 lpRect)
+BOOL WINAPI
+ImageList_GetImageRect (HIMAGELIST himl, INT i, LPRECT lpRect)
 {
     if ((himl == NULL) || (lpRect == NULL))
 	return FALSE;
@@ -1404,42 +1404,42 @@ ImageList_GetImageRect (HIMAGELIST himl, INT32 i, LPRECT32 lpRect)
  */
 
 HIMAGELIST WINAPI
-ImageList_LoadImage32A (HINSTANCE32 hi, LPCSTR lpbmp, INT32 cx,	INT32 cGrow,
-			COLORREF clrMask, UINT32 uType,	UINT32 uFlags)
+ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx,	INT cGrow,
+			COLORREF clrMask, UINT uType,	UINT uFlags)
 {
     HIMAGELIST himl = NULL;
-    HANDLE32   handle;
-    INT32      nImageCount;
+    HANDLE   handle;
+    INT      nImageCount;
 
-    handle = LoadImage32A (hi, lpbmp, uType, 0, 0, uFlags);
+    handle = LoadImageA (hi, lpbmp, uType, 0, 0, uFlags);
     if (!handle) {
         ERR (imagelist, "Error loading image!\n");
         return NULL;
     }
 
     if (uType == IMAGE_BITMAP) {
-        BITMAP32 bmp;
-        GetObject32A (handle, sizeof(BITMAP32), &bmp);
+        BITMAP bmp;
+        GetObjectA (handle, sizeof(BITMAP), &bmp);
         nImageCount = bmp.bmWidth / cx;
 
         himl = ImageList_Create (cx, bmp.bmHeight, ILC_MASK | ILC_COLOR,
                                  nImageCount, cGrow);
-        ImageList_AddMasked (himl, (HBITMAP32)handle, clrMask);
+        ImageList_AddMasked (himl, (HBITMAP)handle, clrMask);
     }
     else if ((uType == IMAGE_ICON) || (uType == IMAGE_CURSOR)) {
-        ICONINFO32 ii;
-        BITMAP32 bmp;
+        ICONINFO ii;
+        BITMAP bmp;
 
-        GetIconInfo32 (handle, &ii);
-        GetObject32A (ii.hbmColor, sizeof(BITMAP32), (LPVOID)&bmp);
+        GetIconInfo (handle, &ii);
+        GetObjectA (ii.hbmColor, sizeof(BITMAP), (LPVOID)&bmp);
         himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
-        DeleteObject32 (ii.hbmColor);
-        DeleteObject32 (ii.hbmMask);
+        DeleteObject (ii.hbmColor);
+        DeleteObject (ii.hbmMask);
     }
 
-    DeleteObject32 (handle);
+    DeleteObject (handle);
     
     return himl;
 }
@@ -1468,42 +1468,42 @@ ImageList_LoadImage32A (HINSTANCE32 hi, LPCSTR lpbmp, INT32 cx,	INT32 cGrow,
  */
 
 HIMAGELIST WINAPI
-ImageList_LoadImage32W (HINSTANCE32 hi, LPCWSTR lpbmp, INT32 cx, INT32 cGrow,
-			COLORREF clrMask, UINT32 uType,	UINT32 uFlags)
+ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow,
+			COLORREF clrMask, UINT uType,	UINT uFlags)
 {
     HIMAGELIST himl = NULL;
-    HANDLE32   handle;
-    INT32      nImageCount;
+    HANDLE   handle;
+    INT      nImageCount;
 
-    handle = LoadImage32W (hi, lpbmp, uType, 0, 0, uFlags);
+    handle = LoadImageW (hi, lpbmp, uType, 0, 0, uFlags);
     if (!handle) {
         ERR (imagelist, "Error loading image!\n");
         return NULL;
     }
 
     if (uType == IMAGE_BITMAP) {
-        BITMAP32 bmp;
-        GetObject32A (handle, sizeof(BITMAP32), &bmp);
+        BITMAP bmp;
+        GetObjectA (handle, sizeof(BITMAP), &bmp);
         nImageCount = bmp.bmWidth / cx;
 
         himl = ImageList_Create (cx, bmp.bmHeight, ILC_MASK | ILC_COLOR,
                                  nImageCount, cGrow);
-        ImageList_AddMasked (himl, (HBITMAP32)handle, clrMask);
+        ImageList_AddMasked (himl, (HBITMAP)handle, clrMask);
     }
     else if ((uType == IMAGE_ICON) || (uType == IMAGE_CURSOR)) {
-        ICONINFO32 ii;
-        BITMAP32 bmp;
+        ICONINFO ii;
+        BITMAP bmp;
 
-        GetIconInfo32 (handle, &ii);
-        GetObject32A (ii.hbmMask, sizeof(BITMAP32), (LPVOID)&bmp);
+        GetIconInfo (handle, &ii);
+        GetObjectA (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
         himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
-        DeleteObject32 (ii.hbmColor);
-        DeleteObject32 (ii.hbmMask);
+        DeleteObject (ii.hbmColor);
+        DeleteObject (ii.hbmMask);
     }
 
-    DeleteObject32 (handle);
+    DeleteObject (handle);
     
     return himl;
 }
@@ -1529,14 +1529,14 @@ ImageList_LoadImage32W (HINSTANCE32 hi, LPCWSTR lpbmp, INT32 cx, INT32 cGrow,
  */
 
 HIMAGELIST WINAPI
-ImageList_Merge (HIMAGELIST himl1, INT32 i1, HIMAGELIST himl2, INT32 i2,
-		 INT32 dx, INT32 dy)
+ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2,
+		 INT dx, INT dy)
 {
     HIMAGELIST himlDst = NULL;
-    HDC32      hdcSrcImage, hdcDstImage;
-    INT32      cxDst, cyDst;
-    INT32      xOff1, yOff1, xOff2, yOff2;
-    INT32      nX1, nX2;
+    HDC      hdcSrcImage, hdcDstImage;
+    INT      cxDst, cyDst;
+    INT      xOff1, yOff1, xOff2, yOff2;
+    INT      nX1, nX2;
 
     if ((himl1 == NULL) || (himl2 == NULL))
 	return NULL;
@@ -1587,41 +1587,41 @@ ImageList_Merge (HIMAGELIST himl1, INT32 i1, HIMAGELIST himl2, INT32 i2,
     himlDst = ImageList_Create (cxDst, cyDst, ILC_MASK | ILC_COLOR, 1, 1);
 
     if (himlDst) {
-        hdcSrcImage = CreateCompatibleDC32 (0);
-        hdcDstImage = CreateCompatibleDC32 (0);
+        hdcSrcImage = CreateCompatibleDC (0);
+        hdcDstImage = CreateCompatibleDC (0);
         nX1 = i1 * himl1->cx;
         nX2 = i2 * himl2->cx;
         
         /* copy image */
-        SelectObject32 (hdcSrcImage, himl1->hbmImage);
-        SelectObject32 (hdcDstImage, himlDst->hbmImage);
-        BitBlt32 (hdcDstImage, 0, 0, cxDst, cyDst, 
+        SelectObject (hdcSrcImage, himl1->hbmImage);
+        SelectObject (hdcDstImage, himlDst->hbmImage);
+        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst, 
                   hdcSrcImage, 0, 0, BLACKNESS);
-        BitBlt32 (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
+        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
                   hdcSrcImage, nX1, 0, SRCCOPY);
 
-        SelectObject32 (hdcSrcImage, himl2->hbmMask);
-        BitBlt32 (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
+        SelectObject (hdcSrcImage, himl2->hbmMask);
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
                   hdcSrcImage, nX2, 0, SRCAND);
 
-        SelectObject32 (hdcSrcImage, himl2->hbmImage);
-        BitBlt32 (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
+        SelectObject (hdcSrcImage, himl2->hbmImage);
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
                   hdcSrcImage, nX2, 0, SRCPAINT);
 
         /* copy mask */
-        SelectObject32 (hdcSrcImage, himl1->hbmMask);
-        SelectObject32 (hdcDstImage, himlDst->hbmMask);
-        BitBlt32 (hdcDstImage, 0, 0, cxDst, cyDst, 
+        SelectObject (hdcSrcImage, himl1->hbmMask);
+        SelectObject (hdcDstImage, himlDst->hbmMask);
+        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst, 
                   hdcSrcImage, 0, 0, WHITENESS);
-        BitBlt32 (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
+        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
                   hdcSrcImage, nX1, 0, SRCCOPY);
 
-        SelectObject32 (hdcSrcImage, himl2->hbmMask);
-        BitBlt32 (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
+        SelectObject (hdcSrcImage, himl2->hbmMask);
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
                   hdcSrcImage, nX2, 0, SRCAND);
 
-        DeleteDC32 (hdcSrcImage);
-        DeleteDC32 (hdcDstImage);
+        DeleteDC (hdcSrcImage);
+        DeleteDC (hdcDstImage);
     }
    
     return himlDst;
@@ -1648,7 +1648,7 @@ ImageList_Merge (HIMAGELIST himl1, INT32 i1, HIMAGELIST himl2, INT32 i2,
  *     empty stub.
  */
 
-HIMAGELIST WINAPI ImageList_Read (LPSTREAM32 pstm)
+HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm)
 {
     FIXME (imagelist, "empty stub!\n");
 
@@ -1669,12 +1669,12 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM32 pstm)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-ImageList_Remove (HIMAGELIST himl, INT32 i)
+BOOL WINAPI
+ImageList_Remove (HIMAGELIST himl, INT i)
 {
-    HBITMAP32 hbmNewImage, hbmNewMask;
-    HDC32     hdcSrc, hdcDst;
-    INT32     cxNew, nCount;
+    HBITMAP hbmNewImage, hbmNewMask;
+    HDC     hdcSrc, hdcDst;
+    INT     cxNew, nCount;
 
     if ((i < -1) || (i >= himl->cCurImage)) {
         ERR (imagelist, "index out of range! %d\n", i);
@@ -1695,15 +1695,15 @@ ImageList_Remove (HIMAGELIST himl, INT32 i)
         for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++)
              himl->nOvlIdx[nCount] = -1;
 
-        DeleteObject32 (himl->hbmImage);
+        DeleteObject (himl->hbmImage);
         himl->hbmImage =
-            CreateBitmap32 (himl->cMaxImage * himl->cx, himl->cy,
+            CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
                             1, himl->uBitsPixel, NULL);
 
         if (himl->hbmMask) {
-            DeleteObject32 (himl->hbmMask);
+            DeleteObject (himl->hbmMask);
             himl->hbmMask =
-                CreateBitmap32 (himl->cMaxImage * himl->cx, himl->cy,
+                CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
                                 1, 1, NULL);
         }
     }
@@ -1720,29 +1720,29 @@ ImageList_Remove (HIMAGELIST himl, INT32 i)
                  himl->cMaxImage, himl->cCurImage + himl->cGrow - 1);
         
         hbmNewImage =
-            CreateBitmap32 (cxNew, himl->cy, 1, himl->uBitsPixel, NULL);
+            CreateBitmap (cxNew, himl->cy, 1, himl->uBitsPixel, NULL);
 
         if (himl->hbmMask)
-            hbmNewMask = CreateBitmap32 (cxNew, himl->cy, 1, 1, NULL);
+            hbmNewMask = CreateBitmap (cxNew, himl->cy, 1, 1, NULL);
         else
             hbmNewMask = 0;  /* Just to keep compiler happy! */
 
-        hdcSrc = CreateCompatibleDC32 (0);
-        hdcDst = CreateCompatibleDC32 (0);
+        hdcSrc = CreateCompatibleDC (0);
+        hdcDst = CreateCompatibleDC (0);
 
         /* copy all images and masks prior to the "removed" image */
         if (i > 0) {
             TRACE (imagelist, "Pre image copy: Copy %d images\n", i);
        
-            SelectObject32 (hdcSrc, himl->hbmImage);
-            SelectObject32 (hdcDst, hbmNewImage);
-            BitBlt32 (hdcDst, 0, 0, i * himl->cx, himl->cy,
+            SelectObject (hdcSrc, himl->hbmImage);
+            SelectObject (hdcDst, hbmNewImage);
+            BitBlt (hdcDst, 0, 0, i * himl->cx, himl->cy,
                       hdcSrc, 0, 0, SRCCOPY);
 
             if (himl->hbmMask) {
-                SelectObject32 (hdcSrc, himl->hbmMask);
-                SelectObject32 (hdcDst, hbmNewMask);
-                BitBlt32 (hdcDst, 0, 0, i * himl->cx, himl->cy,
+                SelectObject (hdcSrc, himl->hbmMask);
+                SelectObject (hdcDst, hbmNewMask);
+                BitBlt (hdcDst, 0, 0, i * himl->cx, himl->cy,
                           hdcSrc, 0, 0, SRCCOPY);
             }
         }
@@ -1750,28 +1750,28 @@ ImageList_Remove (HIMAGELIST himl, INT32 i)
         /* copy all images and masks behind the removed image */
         if (i < himl->cCurImage - 1) {
             TRACE (imagelist, "Post image copy!\n");
-            SelectObject32 (hdcSrc, himl->hbmImage);
-            SelectObject32 (hdcDst, hbmNewImage);
-            BitBlt32 (hdcDst, i * himl->cx, 0, (himl->cCurImage - i - 1) * himl->cx,
+            SelectObject (hdcSrc, himl->hbmImage);
+            SelectObject (hdcDst, hbmNewImage);
+            BitBlt (hdcDst, i * himl->cx, 0, (himl->cCurImage - i - 1) * himl->cx,
                       himl->cy, hdcSrc, (i + 1) * himl->cx, 0, SRCCOPY);
 
             if (himl->hbmMask) {
-                SelectObject32 (hdcSrc, himl->hbmMask);
-                SelectObject32 (hdcDst, hbmNewMask);
-                BitBlt32 (hdcDst, i * himl->cx, 0,
+                SelectObject (hdcSrc, himl->hbmMask);
+                SelectObject (hdcDst, hbmNewMask);
+                BitBlt (hdcDst, i * himl->cx, 0,
                           (himl->cCurImage - i - 1) * himl->cx,
                           himl->cy, hdcSrc, (i + 1) * himl->cx, 0, SRCCOPY);
             }
         }
 
-        DeleteDC32 (hdcSrc);
-        DeleteDC32 (hdcDst);
+        DeleteDC (hdcSrc);
+        DeleteDC (hdcDst);
 
         /* delete old images and insert new ones */
-        DeleteObject32 (himl->hbmImage);
+        DeleteObject (himl->hbmImage);
         himl->hbmImage = hbmNewImage;
         if (himl->hbmMask) {
-            DeleteObject32 (himl->hbmMask);
+            DeleteObject (himl->hbmMask);
             himl->hbmMask = hbmNewMask;
         }
 
@@ -1799,12 +1799,12 @@ ImageList_Remove (HIMAGELIST himl, INT32 i)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-ImageList_Replace (HIMAGELIST himl, INT32 i, HBITMAP32 hbmImage,
-		   HBITMAP32 hbmMask)
+BOOL WINAPI
+ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage,
+		   HBITMAP hbmMask)
 {
-    HDC32 hdcImageList, hdcImage;
-    BITMAP32 bmp;
+    HDC hdcImageList, hdcImage;
+    BITMAP bmp;
 
     if (himl == NULL) {
         ERR (imagelist, "Invalid image list handle!\n");
@@ -1816,29 +1816,29 @@ ImageList_Replace (HIMAGELIST himl, INT32 i, HBITMAP32 hbmImage,
         return FALSE;
     }
 
-    hdcImageList = CreateCompatibleDC32 (0);
-    hdcImage = CreateCompatibleDC32 (0);
-    GetObject32A (hbmImage, sizeof(BITMAP32), (LPVOID)&bmp);
+    hdcImageList = CreateCompatibleDC (0);
+    hdcImage = CreateCompatibleDC (0);
+    GetObjectA (hbmImage, sizeof(BITMAP), (LPVOID)&bmp);
 
     /* Replace Image */
-    SelectObject32 (hdcImageList, himl->hbmImage);
-    SelectObject32 (hdcImage, hbmImage);
+    SelectObject (hdcImageList, himl->hbmImage);
+    SelectObject (hdcImage, hbmImage);
 
-    StretchBlt32 (hdcImageList, i * himl->cx, 0, himl->cx, himl->cy,
+    StretchBlt (hdcImageList, i * himl->cx, 0, himl->cx, himl->cy,
                   hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
 
     if (himl->hbmMask)
     {
         /* Replace Mask */
-        SelectObject32 (hdcImageList, himl->hbmMask);
-        SelectObject32 (hdcImage, hbmMask);
+        SelectObject (hdcImageList, himl->hbmMask);
+        SelectObject (hdcImage, hbmMask);
 
-        StretchBlt32 (hdcImageList, i * himl->cx, 0, himl->cx, himl->cy,
+        StretchBlt (hdcImageList, i * himl->cx, 0, himl->cx, himl->cy,
                       hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
     }
 
-    DeleteDC32 (hdcImage);
-    DeleteDC32 (hdcImageList);
+    DeleteDC (hdcImage);
+    DeleteDC (hdcImageList);
 
     return TRUE;
 }
@@ -1859,14 +1859,14 @@ ImageList_Replace (HIMAGELIST himl, INT32 i, HBITMAP32 hbmImage,
  *     Failure: -1
  */
 
-INT32 WINAPI
-ImageList_ReplaceIcon (HIMAGELIST himl, INT32 i, HICON32 hIcon)
+INT WINAPI
+ImageList_ReplaceIcon (HIMAGELIST himl, INT i, HICON hIcon)
 {
-    HDC32     hdcImageList, hdcImage;
-    INT32     nIndex;
-    HBITMAP32 hbmOldSrc, hbmOldDst;
-    ICONINFO32  ii;
-    BITMAP32  bmp;
+    HDC     hdcImageList, hdcImage;
+    INT     nIndex;
+    HBITMAP hbmOldSrc, hbmOldDst;
+    ICONINFO  ii;
+    BITMAP  bmp;
 
     TRACE (imagelist, "(0x%lx 0x%x 0x%x)\n", (DWORD)himl, i, hIcon);
 
@@ -1875,12 +1875,12 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT32 i, HICON32 hIcon)
     if ((i >= himl->cCurImage) || (i < -1))
 	return -1;
 
-    GetIconInfo32 (hIcon, &ii);
+    GetIconInfo (hIcon, &ii);
     if (ii.hbmMask == 0)
 	ERR (imagelist, "no mask!\n");
     if (ii.hbmColor == 0)
 	ERR (imagelist, "no color!\n");
-    GetObject32A (ii.hbmMask, sizeof(BITMAP32), (LPVOID)&bmp);
+    GetObjectA (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
 
     if (i == -1) {
         if (himl->cCurImage + 1 >= himl->cMaxImage)
@@ -1892,41 +1892,41 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT32 i, HICON32 hIcon)
     else
         nIndex = i;
 
-    hdcImageList = CreateCompatibleDC32 (0);
+    hdcImageList = CreateCompatibleDC (0);
     TRACE (imagelist, "hdcImageList=0x%x!\n", hdcImageList);
     if (hdcImageList == 0)
 	ERR (imagelist, "invalid hdcImageList!\n");
 
-    hdcImage = CreateCompatibleDC32 (0);
+    hdcImage = CreateCompatibleDC (0);
     TRACE (imagelist, "hdcImage=0x%x!\n", hdcImage);
     if (hdcImage == 0)
 	ERR (imagelist, "invalid hdcImage!\n");
 
-    hbmOldDst = SelectObject32 (hdcImageList, himl->hbmImage);
-    SetTextColor32( hdcImageList, RGB(0,0,0));
-    SetBkColor32( hdcImageList, RGB(255,255,255));
-    hbmOldSrc = SelectObject32 (hdcImage, ii.hbmColor);
-    StretchBlt32 (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
+    hbmOldDst = SelectObject (hdcImageList, himl->hbmImage);
+    SetTextColor( hdcImageList, RGB(0,0,0));
+    SetBkColor( hdcImageList, RGB(255,255,255));
+    hbmOldSrc = SelectObject (hdcImage, ii.hbmColor);
+    StretchBlt (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
                   hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
 
     if (himl->hbmMask) {
-        SelectObject32 (hdcImageList, himl->hbmMask);
-        SelectObject32 (hdcImage, ii.hbmMask);
-        StretchBlt32 (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
+        SelectObject (hdcImageList, himl->hbmMask);
+        SelectObject (hdcImage, ii.hbmMask);
+        StretchBlt (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
                       hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
     }
 
-    SelectObject32 (hdcImage, hbmOldSrc);
-    SelectObject32 (hdcImageList, hbmOldDst);
+    SelectObject (hdcImage, hbmOldSrc);
+    SelectObject (hdcImageList, hbmOldDst);
 
     if (hdcImageList)
-	DeleteDC32 (hdcImageList);
+	DeleteDC (hdcImageList);
     if (hdcImage)
-	DeleteDC32 (hdcImage);
+	DeleteDC (hdcImage);
     if (ii.hbmColor)
-	DeleteObject32 (ii.hbmColor);
+	DeleteObject (ii.hbmColor);
     if (ii.hbmMask)
-	DeleteObject32 (ii.hbmMask);
+	DeleteObject (ii.hbmMask);
 
     return nIndex;
 }
@@ -1979,9 +1979,9 @@ ImageList_SetBkColor (HIMAGELIST himl, COLORREF clrBk)
  *     semi-stub.
  */
 
-BOOL32 WINAPI
-ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT32 iDrag,
-			      INT32 dxHotspot, INT32 dyHotspot)
+BOOL WINAPI
+ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag,
+			      INT dxHotspot, INT dyHotspot)
 {
     HIMAGELIST himlTemp;
 
@@ -2025,8 +2025,8 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT32 iDrag,
  *     empty stub.
  */
 
-BOOL32 WINAPI
-ImageList_SetFilter (HIMAGELIST himl, INT32 i, DWORD dwFilter)
+BOOL WINAPI
+ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter)
 {
     FIXME (imagelist, "(%p 0x%x 0x%lx):empty stub!\n",
 	   himl, i, dwFilter);
@@ -2050,10 +2050,10 @@ ImageList_SetFilter (HIMAGELIST himl, INT32 i, DWORD dwFilter)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-ImageList_SetIconSize (HIMAGELIST himl, INT32 cx, INT32 cy)
+BOOL WINAPI
+ImageList_SetIconSize (HIMAGELIST himl, INT cx, INT cy)
 {
-    INT32 nCount;
+    INT nCount;
 
     if (!himl)
 	return FALSE;
@@ -2068,15 +2068,15 @@ ImageList_SetIconSize (HIMAGELIST himl, INT32 cx, INT32 cy)
     for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++)
         himl->nOvlIdx[nCount] = -1;
 
-    DeleteObject32 (himl->hbmImage);
+    DeleteObject (himl->hbmImage);
     himl->hbmImage =
-        CreateBitmap32 (himl->cMaxImage * himl->cx, himl->cy,
+        CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
                         1, himl->uBitsPixel, NULL);
 
     if (himl->hbmMask) {
-        DeleteObject32 (himl->hbmMask);
+        DeleteObject (himl->hbmMask);
         himl->hbmMask =
-            CreateBitmap32 (himl->cMaxImage * himl->cx, himl->cy,
+            CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
                             1, 1, NULL);
     }
 
@@ -2098,12 +2098,12 @@ ImageList_SetIconSize (HIMAGELIST himl, INT32 cx, INT32 cy)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-ImageList_SetImageCount (HIMAGELIST himl, INT32 iImageCount)
+BOOL WINAPI
+ImageList_SetImageCount (HIMAGELIST himl, INT iImageCount)
 {
-    HDC32     hdcImageList, hdcBitmap;
-    HBITMAP32 hbmNewBitmap;
-    INT32     nNewCount, nCopyCount;
+    HDC     hdcImageList, hdcBitmap;
+    HBITMAP hbmNewBitmap;
+    INT     nNewCount, nCopyCount;
 
     if (!himl)
 	return FALSE;
@@ -2115,27 +2115,27 @@ ImageList_SetImageCount (HIMAGELIST himl, INT32 iImageCount)
     nNewCount = iImageCount + himl->cGrow;
     nCopyCount = _MIN(himl->cCurImage, iImageCount);
 
-    hdcImageList = CreateCompatibleDC32 (0);
-    hdcBitmap = CreateCompatibleDC32 (0);
+    hdcImageList = CreateCompatibleDC (0);
+    hdcBitmap = CreateCompatibleDC (0);
 
-    hbmNewBitmap = CreateBitmap32 (nNewCount * himl->cx, himl->cy,
+    hbmNewBitmap = CreateBitmap (nNewCount * himl->cx, himl->cy,
                                    1, himl->uBitsPixel, NULL);
     if (hbmNewBitmap == 0)
     {
-        SelectObject32 (hdcImageList, himl->hbmImage);
-        SelectObject32 (hdcBitmap, hbmNewBitmap);
+        SelectObject (hdcImageList, himl->hbmImage);
+        SelectObject (hdcBitmap, hbmNewBitmap);
 
 	/* copy images */
-        BitBlt32 (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
+        BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                   hdcImageList, 0, 0, SRCCOPY);
 
 	/* delete 'empty' image space */
-	SetBkColor32 (hdcBitmap, RGB(255, 255, 255));
-	SetTextColor32 (hdcBitmap, RGB(0, 0, 0));
-	PatBlt32 (hdcBitmap,  nCopyCount * himl->cx, 0, 
+	SetBkColor (hdcBitmap, RGB(255, 255, 255));
+	SetTextColor (hdcBitmap, RGB(0, 0, 0));
+	PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0, 
 		  (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
 
-	DeleteObject32 (himl->hbmImage);
+	DeleteObject (himl->hbmImage);
 	himl->hbmImage = hbmNewBitmap;
     }
     else
@@ -2143,32 +2143,32 @@ ImageList_SetImageCount (HIMAGELIST himl, INT32 iImageCount)
 
     if (himl->hbmMask)
     {
-        hbmNewBitmap = CreateBitmap32 (nNewCount * himl->cx, himl->cy,
+        hbmNewBitmap = CreateBitmap (nNewCount * himl->cx, himl->cy,
                                        1, 1, NULL);
         if (hbmNewBitmap != 0)
         {
-            SelectObject32 (hdcImageList, himl->hbmMask);
-            SelectObject32 (hdcBitmap, hbmNewBitmap);
+            SelectObject (hdcImageList, himl->hbmMask);
+            SelectObject (hdcBitmap, hbmNewBitmap);
 
 	    /* copy images */
-            BitBlt32 (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
+            BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                       hdcImageList, 0, 0, SRCCOPY);
 
 	    /* delete 'empty' image space */
-	    SetBkColor32 (hdcBitmap, RGB(255, 255, 255));
-	    SetTextColor32 (hdcBitmap, RGB(0, 0, 0));
-            PatBlt32 (hdcBitmap,  nCopyCount * himl->cx, 0, 
+	    SetBkColor (hdcBitmap, RGB(255, 255, 255));
+	    SetTextColor (hdcBitmap, RGB(0, 0, 0));
+            PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0, 
 		      (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
 
-            DeleteObject32 (himl->hbmMask);
+            DeleteObject (himl->hbmMask);
             himl->hbmMask = hbmNewBitmap;
         }
         else
             ERR (imagelist, "Could not create new mask bitmap!\n");
     }
 
-    DeleteDC32 (hdcImageList);
-    DeleteDC32 (hdcBitmap);
+    DeleteDC (hdcImageList);
+    DeleteDC (hdcBitmap);
 
     /* Update max image count and current image count */
     himl->cMaxImage = nNewCount;
@@ -2194,8 +2194,8 @@ ImageList_SetImageCount (HIMAGELIST himl, INT32 iImageCount)
  *     Failure: FALSE
  */
 
-BOOL32 WINAPI
-ImageList_SetOverlayImage (HIMAGELIST himl, INT32 iImage, INT32 iOverlay)
+BOOL WINAPI
+ImageList_SetOverlayImage (HIMAGELIST himl, INT iImage, INT iOverlay)
 {
     if (!himl)
 	return FALSE;
@@ -2230,8 +2230,8 @@ ImageList_SetOverlayImage (HIMAGELIST himl, INT32 iImage, INT32 iOverlay)
  *     empty stub.
  */
 
-BOOL32 WINAPI
-ImageList_Write (HIMAGELIST himl, LPSTREAM32 pstm)
+BOOL WINAPI
+ImageList_Write (HIMAGELIST himl, LPSTREAM pstm)
 {
     if (!himl)
 	return FALSE;
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index 59bf86a5f67..812b9fb1abc 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -32,10 +32,10 @@
 #define IPADDRESS_GetInfoPtr(wndPtr) ((IPADDRESS_INFO *)wndPtr->wExtra[0])
 
 
-static BOOL32 
-IPADDRESS_SendNotify (WND *wndPtr, UINT32 command);
-static BOOL32 
-IPADDRESS_SendIPAddressNotify (WND *wndPtr, UINT32 field, BYTE newValue);
+static BOOL 
+IPADDRESS_SendNotify (WND *wndPtr, UINT command);
+static BOOL 
+IPADDRESS_SendIPAddressNotify (WND *wndPtr, UINT field, BYTE newValue);
 
 
 /* property name of tooltip window handle */
@@ -43,34 +43,34 @@ IPADDRESS_SendIPAddressNotify (WND *wndPtr, UINT32 field, BYTE newValue);
 
 
 static LRESULT CALLBACK
-IPADDRESS_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam);
+IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 
 
 
 static VOID
-IPADDRESS_Refresh (WND *wndPtr, HDC32 hdc)
+IPADDRESS_Refresh (WND *wndPtr, HDC hdc)
 {
-	RECT32 rcClient;
-	HBRUSH32 hbr;
-	COLORREF clr=GetSysColor32 (COLOR_3DDKSHADOW);
+	RECT rcClient;
+	HBRUSH hbr;
+	COLORREF clr=GetSysColor (COLOR_3DDKSHADOW);
     int i,x,fieldsize;
 
-    GetClientRect32 (wndPtr->hwndSelf, &rcClient);
-	hbr =  CreateSolidBrush32 (RGB(255,255,255));
-    DrawEdge32 (hdc, &rcClient, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
-	FillRect32 (hdc, &rcClient, hbr);
-    DeleteObject32 (hbr);
+    GetClientRect (wndPtr->hwndSelf, &rcClient);
+	hbr =  CreateSolidBrush (RGB(255,255,255));
+    DrawEdge (hdc, &rcClient, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
+	FillRect (hdc, &rcClient, hbr);
+    DeleteObject (hbr);
 
 	x=rcClient.left;
 	fieldsize=(rcClient.right-rcClient.left) /4;
 
 	for (i=0; i<3; i++) {		/* Should draw text "." here */
 		x+=fieldsize;
-		SetPixel32 (hdc, x,   13, clr);
-		SetPixel32 (hdc, x,   14, clr);
-		SetPixel32 (hdc, x+1, 13, clr);
-		SetPixel32 (hdc, x+1, 14, clr);
+		SetPixel (hdc, x,   13, clr);
+		SetPixel (hdc, x,   14, clr);
+		SetPixel (hdc, x+1, 13, clr);
+		SetPixel (hdc, x+1, 14, clr);
 
 	}
 
@@ -81,10 +81,10 @@ IPADDRESS_Refresh (WND *wndPtr, HDC32 hdc)
 
 
 static LRESULT
-IPADDRESS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     IPADDRESS_INFO *infoPtr;
-	RECT32 rcClient, edit;
+	RECT rcClient, edit;
 	int i,fieldsize;
 	LPIP_SUBCLASS_INFO lpipsi;
 	
@@ -97,7 +97,7 @@ IPADDRESS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     	return 0;
     }
 
-    GetClientRect32 (wndPtr->hwndSelf, &rcClient);
+    GetClientRect (wndPtr->hwndSelf, &rcClient);
 
 	fieldsize=(rcClient.right-rcClient.left) /4;
 
@@ -105,13 +105,13 @@ IPADDRESS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	edit.bottom=rcClient.bottom-2;
 
 	lpipsi=(LPIP_SUBCLASS_INFO)
-			GetProp32A ((HWND32)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
+			GetPropA ((HWND)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
 	if (lpipsi == NULL)  {
 		lpipsi= (LPIP_SUBCLASS_INFO) COMCTL32_Alloc (sizeof(IP_SUBCLASS_INFO));
 		lpipsi->wndPtr=wndPtr;
 		lpipsi->uRefCount++;
-		SetProp32A ((HWND32)wndPtr->hwndSelf, IP_SUBCLASS_PROP,
-					(HANDLE32)lpipsi);
+		SetPropA ((HWND)wndPtr->hwndSelf, IP_SUBCLASS_PROP,
+					(HANDLE)lpipsi);
 /*		infoPtr->lpipsi= lpipsi; */
 	} else 
 		WARN (ipaddress,"IP-create called twice\n");
@@ -121,15 +121,15 @@ IPADDRESS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		infoPtr->UpperLimit[i]=255;
 		edit.left=rcClient.left+i*fieldsize+3;
 		edit.right=rcClient.left+(i+1)*fieldsize-2;
-		lpipsi->hwndIP[i]= CreateWindow32A ("edit", NULL, 
+		lpipsi->hwndIP[i]= CreateWindowA ("edit", NULL, 
 				WS_CHILD | WS_VISIBLE | ES_LEFT,
 				edit.left, edit.top, edit.right-edit.left, edit.bottom-edit.top,
-				wndPtr->hwndSelf, (HMENU32) 1, wndPtr->hInstance, NULL);
-		lpipsi->wpOrigProc[i]= (WNDPROC32)
-					SetWindowLong32A (lpipsi->hwndIP[i],GWL_WNDPROC, (LONG)
+				wndPtr->hwndSelf, (HMENU) 1, wndPtr->hInstance, NULL);
+		lpipsi->wpOrigProc[i]= (WNDPROC)
+					SetWindowLongA (lpipsi->hwndIP[i],GWL_WNDPROC, (LONG)
 					IPADDRESS_SubclassProc);
-		SetProp32A ((HWND32)lpipsi->hwndIP[i], IP_SUBCLASS_PROP,
-					(HANDLE32)lpipsi);
+		SetPropA ((HWND)lpipsi->hwndIP[i], IP_SUBCLASS_PROP,
+					(HANDLE)lpipsi);
 	}
 
 	lpipsi->infoPtr= infoPtr;
@@ -139,15 +139,15 @@ IPADDRESS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-IPADDRESS_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 	int i;
     IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr);
 	LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetProp32A ((HWND32)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
+            GetPropA ((HWND)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
 
 	for (i=0; i<=3; i++) {
-		SetWindowLong32A ((HWND32)lpipsi->hwndIP[i], GWL_WNDPROC,
+		SetWindowLongA ((HWND)lpipsi->hwndIP[i], GWL_WNDPROC,
                   (LONG)lpipsi->wpOrigProc[i]);
 	}
 
@@ -157,54 +157,54 @@ IPADDRESS_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-IPADDRESS_KillFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_KillFocus (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    HDC32 hdc;
+    HDC hdc;
 
 	TRACE (ipaddress,"\n");
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     IPADDRESS_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
 	IPADDRESS_SendIPAddressNotify (wndPtr, 0, 0);  /* FIXME: should use -1 */
 	IPADDRESS_SendNotify (wndPtr, EN_KILLFOCUS);       
-    InvalidateRect32 (wndPtr->hwndSelf, NULL, TRUE);
+    InvalidateRect (wndPtr->hwndSelf, NULL, TRUE);
 
     return 0;
 }
 
 
 static LRESULT
-IPADDRESS_Paint (WND *wndPtr, WPARAM32 wParam)
+IPADDRESS_Paint (WND *wndPtr, WPARAM wParam)
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
+    HDC hdc;
+    PAINTSTRUCT ps;
 
-    hdc = wParam==0 ? BeginPaint32 (wndPtr->hwndSelf, &ps) : (HDC32)wParam;
+    hdc = wParam==0 ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam;
     IPADDRESS_Refresh (wndPtr, hdc);
     if(!wParam)
-	EndPaint32 (wndPtr->hwndSelf, &ps);
+	EndPaint (wndPtr->hwndSelf, &ps);
     return 0;
 }
 
 
 static LRESULT
-IPADDRESS_SetFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_SetFocus (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    HDC32 hdc;
+    HDC hdc;
 
 	TRACE (ipaddress,"\n");
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     IPADDRESS_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return 0;
 }
 
 
 static LRESULT
-IPADDRESS_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr); */
 	TRACE (ipaddress,"\n");
@@ -212,18 +212,18 @@ IPADDRESS_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 
-static BOOL32
-IPADDRESS_SendNotify (WND *wndPtr, UINT32 command)
+static BOOL
+IPADDRESS_SendNotify (WND *wndPtr, UINT command)
 
 {
     TRACE (ipaddress, "%x\n",command);
-    return (BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_COMMAND,
+    return (BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_COMMAND,
               MAKEWPARAM (wndPtr->wIDmenu,command), (LPARAM) wndPtr->hwndSelf);
 }
 
 
-static BOOL32
-IPADDRESS_SendIPAddressNotify (WND *wndPtr, UINT32 field, BYTE newValue)
+static BOOL
+IPADDRESS_SendIPAddressNotify (WND *wndPtr, UINT field, BYTE newValue)
 
 {
 	NMIPADDRESS nmip;
@@ -236,46 +236,46 @@ IPADDRESS_SendIPAddressNotify (WND *wndPtr, UINT32 field, BYTE newValue)
 	nmip.iField=field;
 	nmip.iValue=newValue;
 
-    return (BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                                   (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmip);
+    return (BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                                   (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmip);
 }
 
 
 
 
 static LRESULT
-IPADDRESS_ClearAddress (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_ClearAddress (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 	int i;
-	HDC32 hdc;
+	HDC hdc;
 	char buf[1];
 	LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetProp32A ((HWND32)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
+            GetPropA ((HWND)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
 
 	TRACE (ipaddress,"\n");
 
 	buf[0]=0;
 	for (i=0; i<=3; i++) 
-		SetWindowText32A (lpipsi->hwndIP[i],buf);
+		SetWindowTextA (lpipsi->hwndIP[i],buf);
 	
-  	hdc = GetDC32 (wndPtr->hwndSelf);
+  	hdc = GetDC (wndPtr->hwndSelf);
     IPADDRESS_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 	return 0;
 }
 
 static LRESULT
-IPADDRESS_IsBlank (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_IsBlank (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  int i;
  char buf[20];
  LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetProp32A ((HWND32)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
+            GetPropA ((HWND)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
 
  TRACE (ipaddress,"\n");
 
  for (i=0; i<=3; i++) {
-		GetWindowText32A (lpipsi->hwndIP[i],buf,5);
+		GetWindowTextA (lpipsi->hwndIP[i],buf,5);
 		if (buf[0]) return 0;
 	}
 
@@ -283,21 +283,21 @@ IPADDRESS_IsBlank (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-IPADDRESS_GetAddress (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_GetAddress (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  char field[20];
  int i,valid,fieldvalue;
  DWORD ip_addr;
  IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr);
  LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetProp32A ((HWND32)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
+            GetPropA ((HWND)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
 
  TRACE (ipaddress,"\n");
 
  valid=0;
  ip_addr=0;
  for (i=0; i<=3; i++) {
-		GetWindowText32A (lpipsi->hwndIP[i],field,4);
+		GetWindowTextA (lpipsi->hwndIP[i],field,4);
 		ip_addr*=256;
 		if (field[0]) {
 			field[3]=0;
@@ -317,15 +317,15 @@ IPADDRESS_GetAddress (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-IPADDRESS_SetRange (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_SetRange (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
     IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr);
-	INT32 index;
+	INT index;
 	
  	TRACE (ipaddress,"\n");
 
-	index=(INT32) wParam;
+	index=(INT) wParam;
 	if ((index<0) || (index>3)) return 0;
 
 	infoPtr->LowerLimit[index]=lParam & 0xff;
@@ -334,12 +334,12 @@ IPADDRESS_SetRange (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-IPADDRESS_SetAddress (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_SetAddress (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-	HDC32 hdc;
+	HDC hdc;
     IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr);
 	LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetProp32A ((HWND32)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
+            GetPropA ((HWND)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
 	int i,ip_address,value;
     char buf[20];
 
@@ -351,15 +351,15 @@ IPADDRESS_SetAddress (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		if ((value>=infoPtr->LowerLimit[i]) && (value<=infoPtr->UpperLimit[i])) 
 			{
 			 sprintf (buf,"%d",value);
-			 SetWindowText32A (lpipsi->hwndIP[i],buf);
+			 SetWindowTextA (lpipsi->hwndIP[i],buf);
 			 IPADDRESS_SendNotify (wndPtr, EN_CHANGE);
 		}
 		ip_address/=256;
 	}
 
-	hdc = GetDC32 (wndPtr->hwndSelf);		/* & send notifications */
+	hdc = GetDC (wndPtr->hwndSelf);		/* & send notifications */
     IPADDRESS_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
  return TRUE;
 }
@@ -368,29 +368,29 @@ IPADDRESS_SetAddress (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-IPADDRESS_SetFocusToField (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_SetFocusToField (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr); */
 	LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetProp32A ((HWND32)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
-	INT32 index;
+            GetPropA ((HWND)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
+	INT index;
 
-	index=(INT32) wParam;
+	index=(INT) wParam;
  	TRACE (ipaddress," %d\n", index);
 	if ((index<0) || (index>3)) return 0;
 	
-	SetFocus32 (lpipsi->hwndIP[index]);
+	SetFocus (lpipsi->hwndIP[index]);
 	
     return 1;
 }
 
 
 static LRESULT
-IPADDRESS_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_LButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACE (ipaddress, "\n");
 
-	SetFocus32 (wndPtr->hwndSelf);
+	SetFocus (wndPtr->hwndSelf);
 	IPADDRESS_SendNotify (wndPtr, EN_SETFOCUS);
 	IPADDRESS_SetFocusToField (wndPtr, 0, 0);
 
@@ -416,7 +416,7 @@ IPADDRESS_GotoNextField (LPIP_SUBCLASS_INFO lpipsi, int currentfield)
  IPADDRESS_INFO *infoPtr=lpipsi->infoPtr;
 
  TRACE (ipaddress,"\n");
- GetWindowText32A (lpipsi->hwndIP[currentfield],field,4);
+ GetWindowTextA (lpipsi->hwndIP[currentfield],field,4);
  if (field[0]) {
 	field[3]=0;	
 	newField=-1;
@@ -427,24 +427,24 @@ IPADDRESS_GotoNextField (LPIP_SUBCLASS_INFO lpipsi, int currentfield)
 		newField=infoPtr->UpperLimit[currentfield];
 	if (newField>=0) {
 		sprintf (field,"%d",newField);
-		SetWindowText32A (lpipsi->hwndIP[currentfield], field);
+		SetWindowTextA (lpipsi->hwndIP[currentfield], field);
 		return 1;
 	}
  }
 
  if (currentfield<3) 
-		SetFocus32 (lpipsi->hwndIP[currentfield+1]);
+		SetFocus (lpipsi->hwndIP[currentfield+1]);
  return 0;
 }
 
 
 LRESULT CALLBACK
-IPADDRESS_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
  int i,l,index;
  IPADDRESS_INFO *infoPtr;
  LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetProp32A ((HWND32)hwnd,IP_SUBCLASS_PROP); 
+            GetPropA ((HWND)hwnd,IP_SUBCLASS_PROP); 
 
  infoPtr = lpipsi->infoPtr;
  index=0;             /* FIXME */
@@ -456,14 +456,14 @@ IPADDRESS_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
 	case WM_KEYDOWN: {
 			char c=(char) wParam;
 			if (c==VK_TAB) {
- 				HWND32 pwnd;
+ 				HWND pwnd;
 				int shift;
-				shift = GetKeyState32(VK_SHIFT) & 0x8000;
+				shift = GetKeyState(VK_SHIFT) & 0x8000;
 				if (shift)
-					pwnd=GetNextDlgTabItem32 (GetParent32 (hwnd), 0, TRUE);
+					pwnd=GetNextDlgTabItem (GetParent (hwnd), 0, TRUE);
 				else
-					pwnd=GetNextDlgTabItem32 (GetParent32 (hwnd), 0, FALSE);
-				if (pwnd) SetFocus32 (pwnd);
+					pwnd=GetNextDlgTabItem (GetParent (hwnd), 0, FALSE);
+				if (pwnd) SetFocus (pwnd);
 				break;
 			}
 			
@@ -479,7 +479,7 @@ IPADDRESS_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
 			if (c==VK_RETURN) {
 			}
 			if (((c>='0') && (c<='9')) || (iscntrl(c))) {
-				l=GetWindowTextLength32A (lpipsi->hwndIP[index]);
+				l=GetWindowTextLengthA (lpipsi->hwndIP[index]);
 				if (l==3) 
 					if (IPADDRESS_GotoNextField (lpipsi,index)) {
 						wParam=0;
@@ -494,11 +494,11 @@ IPADDRESS_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
 		}
  }
 
- return CallWindowProc32A (lpipsi->wpOrigProc[index], hwnd, uMsg, wParam, lParam);
+ return CallWindowProcA (lpipsi->wpOrigProc[index], hwnd, uMsg, wParam, lParam);
 }
 
 LRESULT WINAPI
-IPADDRESS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -550,7 +550,7 @@ IPADDRESS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (ipaddress, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -559,26 +559,26 @@ IPADDRESS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 void
 IPADDRESS_Register (void)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (WC_IPADDRESS32A)) return;
+    if (GlobalFindAtomA (WC_IPADDRESSA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC32)IPADDRESS_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)IPADDRESS_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(IPADDRESS_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_3DFACE + 1);
-    wndClass.lpszClassName = WC_IPADDRESS32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
+    wndClass.lpszClassName = WC_IPADDRESSA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 VOID
 IPADDRESS_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (WC_IPADDRESS32A))
-    UnregisterClass32A (WC_IPADDRESS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (WC_IPADDRESSA))
+    UnregisterClassA (WC_IPADDRESSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index d10ab566616..157af47f982 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -21,10 +21,10 @@
 #include "winuser.h"
 
 /* prototypes */
-static INT32 LISTVIEW_GetItemCountPerColumn(HWND32 hwnd);
-static INT32 LISTVIEW_GetItemCountPerRow(HWND32 hwnd);
-static INT32 LISTVIEW_GetFirstVisibleItem(HWND32 hwnd);
-static VOID LISTVIEW_SetVisible(HWND32 hwnd, INT32 nItem);
+static INT LISTVIEW_GetItemCountPerColumn(HWND hwnd);
+static INT LISTVIEW_GetItemCountPerRow(HWND hwnd);
+static INT LISTVIEW_GetFirstVisibleItem(HWND hwnd);
+static VOID LISTVIEW_SetVisible(HWND hwnd, INT nItem);
 
 
 /***
@@ -38,15 +38,15 @@ static VOID LISTVIEW_SetVisible(HWND32 hwnd, INT32 nItem);
  * RETURN:
  * None
  */
-static VOID LISTVIEW_SetVisible(HWND32 hwnd, INT32 nItem)
+static VOID LISTVIEW_SetVisible(HWND hwnd, INT nItem)
 {
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nItemCountPerRow;
-  INT32 nItemCountPerColumn;
-  INT32 nLastItem;
-  INT32 nFirstItem;
-  INT32 nHScrollPos;
-  INT32 nVScrollPos;
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nItemCountPerRow;
+  INT nItemCountPerColumn;
+  INT nLastItem;
+  INT nFirstItem;
+  INT nHScrollPos;
+  INT nVScrollPos;
 
   /* retrieve the index of the first visible fully item */
   nFirstItem = LISTVIEW_GetFirstVisibleItem(hwnd);
@@ -72,7 +72,7 @@ static VOID LISTVIEW_SetVisible(HWND32 hwnd, INT32 nItem)
             nHScrollPos = (nItem - nLastItem) / nItemCountPerColumn;
           else
             nHScrollPos = (nItem - nLastItem) / nItemCountPerColumn + 1;
-          SendMessage32A(hwnd, LVM_SCROLL, (WPARAM32)nHScrollPos, (LPARAM)0);
+          SendMessageA(hwnd, LVM_SCROLL, (WPARAM)nHScrollPos, (LPARAM)0);
         }
         else if (nItem < nFirstItem)
         {
@@ -81,7 +81,7 @@ static VOID LISTVIEW_SetVisible(HWND32 hwnd, INT32 nItem)
             nHScrollPos = (nItem - nFirstItem) / nItemCountPerColumn;
           else
             nHScrollPos = (nItem - nFirstItem) / nItemCountPerColumn - 1;
-          SendMessage32A(hwnd, LVM_SCROLL, (WPARAM32)nHScrollPos, (LPARAM)0);
+          SendMessageA(hwnd, LVM_SCROLL, (WPARAM)nHScrollPos, (LPARAM)0);
         }
       }
     }
@@ -102,13 +102,13 @@ static VOID LISTVIEW_SetVisible(HWND32 hwnd, INT32 nItem)
         {
           /* calculate new scroll position based on item index */
           nVScrollPos = nItem - nLastItem;
-          SendMessage32A(hwnd, LVM_SCROLL, (WPARAM32)0, (LPARAM)nVScrollPos);
+          SendMessageA(hwnd, LVM_SCROLL, (WPARAM)0, (LPARAM)nVScrollPos);
         }
         else if (nItem < nFirstItem)
         {
           /* calculate new scroll position based on item index */
           nVScrollPos = nItem - nFirstItem;
-          SendMessage32A(hwnd, LVM_SCROLL, (WPARAM32)0, (LPARAM)nVScrollPos);
+          SendMessageA(hwnd, LVM_SCROLL, (WPARAM)0, (LPARAM)nVScrollPos);
         }
       }
     }
@@ -122,20 +122,20 @@ static VOID LISTVIEW_SetVisible(HWND32 hwnd, INT32 nItem)
         {
           /* calculate new scroll position based on item index */
           nVScrollPos = (nItem - nLastItem) / nItemCountPerRow + 1;
-          SendMessage32A(hwnd, LVM_SCROLL, (WPARAM32)0, (LPARAM)nVScrollPos);
+          SendMessageA(hwnd, LVM_SCROLL, (WPARAM)0, (LPARAM)nVScrollPos);
         }
         else if (nItem < nFirstItem)
         {
           /* calculate new scroll position based on item index */
           nHScrollPos = (nItem - nFirstItem) / nItemCountPerRow - 1;
-          SendMessage32A(hwnd, LVM_SCROLL, (WPARAM32)0, (LPARAM)nHScrollPos);
+          SendMessageA(hwnd, LVM_SCROLL, (WPARAM)0, (LPARAM)nHScrollPos);
         }
       }
     }
 
     /* refresh display */
-    InvalidateRect32(hwnd, NULL, FALSE);
-    UpdateWindow32(hwnd);
+    InvalidateRect(hwnd, NULL, FALSE);
+    UpdateWindow(hwnd);
 
 }
 }
@@ -150,16 +150,16 @@ static VOID LISTVIEW_SetVisible(HWND32 hwnd, INT32 nItem)
  * RETURN:
  * item index
  */
-static INT32 LISTVIEW_GetFirstVisibleItem(HWND32 hwnd)
+static INT LISTVIEW_GetFirstVisibleItem(HWND hwnd)
 {
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nItemCountPerRow;
-  INT32 nItemCountPerColumn;
-  INT32 nMinRange;
-  INT32 nMaxRange;
-  INT32 nHScrollPos;
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nItemCountPerRow;
+  INT nItemCountPerColumn;
+  INT nMinRange;
+  INT nMaxRange;
+  INT nHScrollPos;
 /*  INT32 nVScrollPos; */
-  INT32 nItem = 0;
+  INT nItem = 0;
 
   /* get number of items per column */
   nItemCountPerColumn = LISTVIEW_GetItemCountPerColumn(hwnd);
@@ -173,8 +173,8 @@ static INT32 LISTVIEW_GetFirstVisibleItem(HWND32 hwnd)
     {
       if (lStyle & WS_HSCROLL)
       {
-        GetScrollRange32(hwnd, SB_HORZ, &nMinRange, &nMaxRange);
-        nHScrollPos = GetScrollPos32(hwnd, SB_HORZ);
+        GetScrollRange(hwnd, SB_HORZ, &nMinRange, &nMaxRange);
+        nHScrollPos = GetScrollPos(hwnd, SB_HORZ);
         if (nMinRange < nHScrollPos)
         {
           nItem = ((nHScrollPos - nMinRange) * nItemCountPerColumn * 
@@ -210,11 +210,11 @@ static INT32 LISTVIEW_GetFirstVisibleItem(HWND32 hwnd)
  * RETURN:
  * Number of items per row.
  */
-static INT32 LISTVIEW_GetItemCountPerRow(HWND32 hwnd)
+static INT LISTVIEW_GetItemCountPerRow(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nItemCountPerRow = 0;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nItemCountPerRow = 0;
 
   if (infoPtr->nWidth > 0)
   {
@@ -255,11 +255,11 @@ static INT32 LISTVIEW_GetItemCountPerRow(HWND32 hwnd)
  * RETURN:
  * Number of items per column.
  */
-static INT32 LISTVIEW_GetItemCountPerColumn(HWND32 hwnd)
+static INT LISTVIEW_GetItemCountPerColumn(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nItemCountPerColumn = 0;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nItemCountPerColumn = 0;
   
   if (infoPtr->nHeight > 0)
   {
@@ -296,12 +296,12 @@ static INT32 LISTVIEW_GetItemCountPerColumn(HWND32 hwnd)
  * RETURN:
  * Number of columns.
  */
-static INT32 LISTVIEW_GetColumnCount(HWND32 hwnd)
+static INT LISTVIEW_GetColumnCount(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle  = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nColumnCount = 0;
-  INT32 nItemCountPerColumn;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle  = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nColumnCount = 0;
+  INT nItemCountPerColumn;
 
   nItemCountPerColumn = LISTVIEW_GetItemCountPerColumn(hwnd);
 
@@ -345,15 +345,15 @@ static INT32 LISTVIEW_GetColumnCount(HWND32 hwnd)
  * RETURN:
  * None
  */
-static VOID LISTVIEW_SetScroll(HWND32 hwnd)
+static VOID LISTVIEW_SetScroll(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nColumnCount;
-  INT32 nItemCountPerRow;
-  INT32 nItemCountPerColumn;
-  INT32 nMinRange, nMaxRange;
-  INT32 nHScrollPos;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nColumnCount;
+  INT nItemCountPerRow;
+  INT nItemCountPerColumn;
+  INT nMinRange, nMaxRange;
+  INT nHScrollPos;
 /*   INT32 nVScrollPos; */
 
   nItemCountPerColumn = LISTVIEW_GetItemCountPerColumn(hwnd);
@@ -373,32 +373,32 @@ static VOID LISTVIEW_SetScroll(HWND32 hwnd)
           if (!(lStyle & WS_HSCROLL))
           {
             /* display scrollbar */
-            ShowScrollBar32(hwnd, SB_HORZ, TRUE);
+            ShowScrollBar(hwnd, SB_HORZ, TRUE);
         
             /* set scrollbar range and position */
             nMaxRange = nColumnCount - nItemCountPerRow;
-            SetScrollRange32(hwnd, SB_HORZ, 0, nMaxRange, FALSE);
-            SetScrollPos32(hwnd, SB_HORZ, 0, TRUE);
+            SetScrollRange(hwnd, SB_HORZ, 0, nMaxRange, FALSE);
+            SetScrollPos(hwnd, SB_HORZ, 0, TRUE);
           }
           else
           {
-            nHScrollPos = GetScrollPos32(hwnd, SB_HORZ);
-            GetScrollRange32(hwnd, SB_HORZ, &nMinRange, &nMaxRange);
+            nHScrollPos = GetScrollPos(hwnd, SB_HORZ);
+            GetScrollRange(hwnd, SB_HORZ, &nMinRange, &nMaxRange);
             if (nMaxRange != nColumnCount - nItemCountPerRow)
             {
               nMaxRange = nColumnCount - nItemCountPerRow;
-              SetScrollRange32(hwnd, SB_HORZ, nMinRange, nMaxRange, FALSE);
+              SetScrollRange(hwnd, SB_HORZ, nMinRange, nMaxRange, FALSE);
 
               if (nHScrollPos > nMaxRange)
                 nHScrollPos = nMaxRange;
         
-              SetScrollPos32(hwnd, SB_HORZ, nHScrollPos, TRUE);
+              SetScrollPos(hwnd, SB_HORZ, nHScrollPos, TRUE);
             }
           }
           
           /* refresh the client area */
-          InvalidateRect32(hwnd,NULL, TRUE);
-          UpdateWindow32(hwnd);
+          InvalidateRect(hwnd,NULL, TRUE);
+          UpdateWindow(hwnd);
         }
         else
         {
@@ -406,11 +406,11 @@ static VOID LISTVIEW_SetScroll(HWND32 hwnd)
           if (lStyle & WS_HSCROLL)
           {
             /* hide scrollbar */
-            ShowScrollBar32(hwnd, SB_HORZ, FALSE);
+            ShowScrollBar(hwnd, SB_HORZ, FALSE);
 
             /* refresh the client area */
-            InvalidateRect32(hwnd,NULL, TRUE);
-            UpdateWindow32(hwnd);
+            InvalidateRect(hwnd,NULL, TRUE);
+            UpdateWindow(hwnd);
           }
         }
       }
@@ -418,8 +418,8 @@ static VOID LISTVIEW_SetScroll(HWND32 hwnd)
     else if (lStyle & LVS_REPORT) 
     {
       HDLAYOUT hl;
-      WINDOWPOS32 wp;
-      RECT32 rc;
+      WINDOWPOS wp;
+      RECT rc;
         
       rc.top = 0;
       rc.left = 0;
@@ -428,9 +428,9 @@ static VOID LISTVIEW_SetScroll(HWND32 hwnd)
 
       hl.prc = &rc;
       hl.pwpos = &wp;
-      SendMessage32A(infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl);
+      SendMessageA(infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl);
       
-      SetWindowPos32(infoPtr->hwndHeader, hwnd,
+      SetWindowPos(infoPtr->hwndHeader, hwnd,
                      wp.x, wp.y, wp.cx, wp.cy, wp.flags);
       
 /*       infoPtr->rcList.top += wp.cy; */
@@ -459,24 +459,24 @@ static VOID LISTVIEW_SetScroll(HWND32 hwnd)
  * RETURN:
  * None
  */
-static VOID LISTVIEW_SetItemStates(HWND32 hwnd, INT32 nFocusedItem, 
-                                   BOOL32 bVirtualKeys, BOOL32 bMouseInput)
+static VOID LISTVIEW_SetItemStates(HWND hwnd, INT nFocusedItem, 
+                                   BOOL bVirtualKeys, BOOL bMouseInput)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  WORD wShift = HIWORD(GetKeyState32(VK_SHIFT));
-  WORD wCtrl = HIWORD(GetKeyState32(VK_CONTROL));
-  INT32 i;
-  LVITEM32A lvItem;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  WORD wShift = HIWORD(GetKeyState(VK_SHIFT));
+  WORD wCtrl = HIWORD(GetKeyState(VK_CONTROL));
+  INT i;
+  LVITEMA lvItem;
 
   /* initialize memory */
-  ZeroMemory(&lvItem, sizeof(LVITEM32A));
+  ZeroMemory(&lvItem, sizeof(LVITEMA));
     
   if (wShift && (bVirtualKeys == TRUE))
   {
     /* reset the selected and focused states of all the items */
     lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
     lvItem.state = 0;
-    SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)-1, (LPARAM)&lvItem);
+    SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)-1, (LPARAM)&lvItem);
 
     if (infoPtr->nSelectionMark > nFocusedItem)
     {
@@ -485,7 +485,7 @@ static VOID LISTVIEW_SetItemStates(HWND32 hwnd, INT32 nFocusedItem,
         /* select items */
         lvItem.stateMask = LVIS_SELECTED;
         lvItem.state = LVIS_SELECTED;
-        SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)i, (LPARAM)&lvItem);
+        SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)i, (LPARAM)&lvItem);
       }
     }
     else
@@ -495,14 +495,14 @@ static VOID LISTVIEW_SetItemStates(HWND32 hwnd, INT32 nFocusedItem,
         /* select items */
         lvItem.stateMask = LVIS_SELECTED;
         lvItem.state = LVIS_SELECTED;
-        SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)i, (LPARAM)&lvItem);
+        SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)i, (LPARAM)&lvItem);
       }
     }
 
     /* select anf focus item */
     lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
     lvItem.state = LVIS_SELECTED | LVIS_FOCUSED;
-    SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)i, (LPARAM)&lvItem);
+    SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)i, (LPARAM)&lvItem);
   }
   else
   {
@@ -511,17 +511,17 @@ static VOID LISTVIEW_SetItemStates(HWND32 hwnd, INT32 nFocusedItem,
       /* make sure the focus is lost */
       lvItem.stateMask = LVIS_FOCUSED;
       lvItem.state = 0;
-      SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)-1, (LPARAM)&lvItem);
+      SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)-1, (LPARAM)&lvItem);
 
       if (bMouseInput == TRUE)
       {
-        if (SendMessage32A(hwnd, LVM_GETITEMSTATE, (WPARAM32)nFocusedItem, 
+        if (SendMessageA(hwnd, LVM_GETITEMSTATE, (WPARAM)nFocusedItem, 
                            (LPARAM)LVIS_SELECTED) & LVIS_SELECTED)
         {
           /* focus and unselect (toggle selection) */
           lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
           lvItem.state = LVIS_FOCUSED;
-          SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)nFocusedItem, 
+          SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)nFocusedItem, 
                          (LPARAM)&lvItem);
         }
         else
@@ -529,7 +529,7 @@ static VOID LISTVIEW_SetItemStates(HWND32 hwnd, INT32 nFocusedItem,
           /* select and focus */
           lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
           lvItem.state = LVIS_SELECTED | LVIS_FOCUSED;
-          SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)nFocusedItem, 
+          SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)nFocusedItem, 
                          (LPARAM)&lvItem);
         }
         
@@ -541,7 +541,7 @@ static VOID LISTVIEW_SetItemStates(HWND32 hwnd, INT32 nFocusedItem,
         /* focus */
         lvItem.stateMask = LVIS_FOCUSED;
         lvItem.state = LVIS_FOCUSED;
-        SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)nFocusedItem, 
+        SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)nFocusedItem, 
                        (LPARAM)&lvItem);
       }
     }
@@ -550,12 +550,12 @@ static VOID LISTVIEW_SetItemStates(HWND32 hwnd, INT32 nFocusedItem,
       /* clear selection and focus for all the items */
       lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
       lvItem.state = 0;
-      SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)-1, (LPARAM)&lvItem);
+      SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)-1, (LPARAM)&lvItem);
 
       /* set select and focus for this particular item */
       lvItem.stateMask = LVIS_FOCUSED | LVIS_SELECTED;
       lvItem.state = LVIS_FOCUSED | LVIS_SELECTED;
-      SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)nFocusedItem, 
+      SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)nFocusedItem, 
                      (LPARAM)&lvItem);
 
       /* set the new group selection start position */
@@ -575,26 +575,26 @@ static VOID LISTVIEW_SetItemStates(HWND32 hwnd, INT32 nFocusedItem,
  * RETURN:
  * None
  */
-static VOID LISTVIEW_RefreshList(HWND32 hwnd, HDC32 hdc)
+static VOID LISTVIEW_RefreshList(HWND hwnd, HDC hdc)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
     LISTVIEW_ITEM *lpItem;
-  HFONT32 hOldFont;
-  HPEN32 hPen, hOldPen;
-  INT32 nItemCountPerColumn;
-  INT32 nItemCountPerRow;
-  INT32 nSmallIconWidth;
-  SIZE32 labelSize;
-  INT32 nDrawPosX = 0;
-  INT32 nDrawPosY = 0;
-  BOOL32 bSelected;
-  RECT32 rcBoundingBox;
+  HFONT hOldFont;
+  HPEN hPen, hOldPen;
+  INT nItemCountPerColumn;
+  INT nItemCountPerRow;
+  INT nSmallIconWidth;
+  SIZE labelSize;
+  INT nDrawPosX = 0;
+  INT nDrawPosY = 0;
+  BOOL bSelected;
+  RECT rcBoundingBox;
   COLORREF clrHighlight;
   COLORREF clrHighlightText;
-  INT32 i;
-  INT32 nColumn = 0;
-  INT32 nRow;
-  INT32 j;
+  INT i;
+  INT nColumn = 0;
+  INT nRow;
+  INT j;
 
   /* get number of items per column */
   nItemCountPerColumn = LISTVIEW_GetItemCountPerColumn(hwnd);
@@ -605,19 +605,19 @@ static VOID LISTVIEW_RefreshList(HWND32 hwnd, HDC32 hdc)
   if ((nItemCountPerColumn > 0) && (nItemCountPerRow > 0))
   {
      /* select font */
-    hOldFont = SelectObject32(hdc, infoPtr->hFont);
+    hOldFont = SelectObject(hdc, infoPtr->hFont);
 
     /* inititialize system dependent information */
-    clrHighlight = GetSysColor32(COLOR_HIGHLIGHT);
-    clrHighlightText = GetSysColor32(COLOR_HIGHLIGHTTEXT);
-    nSmallIconWidth = GetSystemMetrics32(SM_CXSMICON);  
+    clrHighlight = GetSysColor(COLOR_HIGHLIGHT);
+    clrHighlightText = GetSysColor(COLOR_HIGHLIGHTTEXT);
+    nSmallIconWidth = GetSystemMetrics(SM_CXSMICON);  
 
     /* select transparent brush (for drawing the focus box) */
-    SelectObject32(hdc, GetStockObject32(NULL_BRUSH)); 
+    SelectObject(hdc, GetStockObject(NULL_BRUSH)); 
 
     /* select the doted pen (for drawing the focus box) */
-    hPen = CreatePen32(PS_DOT, 1, 0);
-    hOldPen = SelectObject32(hdc, hPen);
+    hPen = CreatePen(PS_DOT, 1, 0);
+    hOldPen = SelectObject(hdc, hPen);
 
     /* get starting index */
     i = LISTVIEW_GetFirstVisibleItem(hwnd);
@@ -644,22 +644,22 @@ static VOID LISTVIEW_RefreshList(HWND32 hwnd, HDC32 hdc)
           bSelected = TRUE;
         
           /* set item colors */ 
-          SetBkColor32(hdc, clrHighlight);
-          SetTextColor32(hdc, clrHighlightText);
+          SetBkColor(hdc, clrHighlight);
+          SetTextColor(hdc, clrHighlightText);
 
           /* set raster mode */
-          SetROP232(hdc, R2_XORPEN);
+          SetROP2(hdc, R2_XORPEN);
         }
         else
         {
           bSelected = FALSE;
           
           /* set item colors */
-          SetBkColor32(hdc, infoPtr->clrTextBk);
-          SetTextColor32(hdc, infoPtr->clrText);
+          SetBkColor(hdc, infoPtr->clrTextBk);
+          SetTextColor(hdc, infoPtr->clrText);
           
           /* set raster mode */
-          SetROP232(hdc, R2_COPYPEN);
+          SetROP2(hdc, R2_COPYPEN);
         }
 
         /* state images */
@@ -691,7 +691,7 @@ static VOID LISTVIEW_RefreshList(HWND32 hwnd, HDC32 hdc)
 
         /* get string size (in pixels) */
         GetTextExtentPoint32A(hdc, lpItem->pszText, 
-                              lstrlen32A(lpItem->pszText), &labelSize);
+                              lstrlenA(lpItem->pszText), &labelSize);
 
         /* define a bounding box */
         rcBoundingBox.left = nDrawPosX;
@@ -704,22 +704,22 @@ static VOID LISTVIEW_RefreshList(HWND32 hwnd, HDC32 hdc)
         rcBoundingBox.bottom = nDrawPosY + infoPtr->nItemHeight;
       
         /* draw text */  
-        ExtTextOut32A(hdc, nDrawPosX + 1, nDrawPosY+ 1, 
+        ExtTextOutA(hdc, nDrawPosX + 1, nDrawPosY+ 1, 
                       ETO_OPAQUE|ETO_CLIPPED, &rcBoundingBox, 
-                      lpItem->pszText, lstrlen32A(lpItem->pszText), NULL);
+                      lpItem->pszText, lstrlenA(lpItem->pszText), NULL);
       
         if (lpItem->state & LVIS_FOCUSED)
-          Rectangle32(hdc, rcBoundingBox.left, rcBoundingBox.top, 
+          Rectangle(hdc, rcBoundingBox.left, rcBoundingBox.top, 
                       rcBoundingBox.right, rcBoundingBox.bottom); 
       }
     }
 
     /* unselect objects */
-    SelectObject32(hdc, hOldFont);
-    SelectObject32(hdc, hOldPen);
+    SelectObject(hdc, hOldFont);
+    SelectObject(hdc, hOldPen);
 
     /* delete pen */
-    DeleteObject32(hPen);
+    DeleteObject(hPen);
   }
 }
 
@@ -734,7 +734,7 @@ static VOID LISTVIEW_RefreshList(HWND32 hwnd, HDC32 hdc)
  * RETURN:
  * None
  */
-static VOID LISTVIEW_RefreshReport(HWND32 hwnd, HDC32 hdc)
+static VOID LISTVIEW_RefreshReport(HWND hwnd, HDC hdc)
 {
   /* TO DO */
 }
@@ -750,7 +750,7 @@ static VOID LISTVIEW_RefreshReport(HWND32 hwnd, HDC32 hdc)
  * RETURN:
  * None
  */
-static VOID LISTVIEW_RefreshSmallIcon(HWND32 hwnd, HDC32 hdc)
+static VOID LISTVIEW_RefreshSmallIcon(HWND hwnd, HDC hdc)
 {
   /* TO DO */
 }
@@ -766,7 +766,7 @@ static VOID LISTVIEW_RefreshSmallIcon(HWND32 hwnd, HDC32 hdc)
  * RETURN:
  * None
  */
-static VOID LISTVIEW_RefreshIcon(HWND32 hwnd, HDC32 hdc)
+static VOID LISTVIEW_RefreshIcon(HWND hwnd, HDC hdc)
 {
   /* TO DO */
 }
@@ -782,9 +782,9 @@ static VOID LISTVIEW_RefreshIcon(HWND32 hwnd, HDC32 hdc)
  * RETURN:
  * None
  */
-static VOID LISTVIEW_Refresh(HWND32 hwnd, HDC32 hdc)
+static VOID LISTVIEW_Refresh(HWND hwnd, HDC hdc)
 {
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
   
   if (lStyle & LVS_LIST)
   {
@@ -818,13 +818,13 @@ static VOID LISTVIEW_Refresh(HWND32 hwnd, HDC32 hdc)
  * RETURN:
  * Returns a DWORD. The width in the low word and the height in high word.
  */
-static LRESULT LISTVIEW_ApproximateViewRect(HWND32 hwnd, INT32 nItemCount, 
+static LRESULT LISTVIEW_ApproximateViewRect(HWND hwnd, INT nItemCount, 
                                             WORD wWidth, WORD wHeight)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nItemCountPerColumn = 1;
-  INT32 nColumnCount = 0;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nItemCountPerColumn = 1;
+  INT nColumnCount = 0;
   DWORD dwViewRect = 0;
 
   if (nItemCount == -1)
@@ -891,11 +891,11 @@ static LRESULT LISTVIEW_ApproximateViewRect(HWND32 hwnd, INT32 nItemCount,
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_Arrange(HWND32 hwnd, INT32 nAlignCode)
+static LRESULT LISTVIEW_Arrange(HWND hwnd, INT nAlignCode)
 {
   /* LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0); */
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  BOOL32 bResult = FALSE;
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  BOOL bResult = FALSE;
 
   if (lStyle & LVS_ICON)
   {
@@ -931,15 +931,15 @@ static LRESULT LISTVIEW_Arrange(HWND32 hwnd, INT32 nAlignCode)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_DeleteAllItems(HWND32 hwnd)
+static LRESULT LISTVIEW_DeleteAllItems(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
   LISTVIEW_ITEM *lpItem;
   NMLISTVIEW nmlv;
-  BOOL32 bNotify;
-  INT32 i;
-  BOOL32 bResult = TRUE;
+  BOOL bNotify;
+  INT i;
+  BOOL bResult = TRUE;
 
   if (infoPtr->nItemCount > 0)
   {
@@ -949,8 +949,8 @@ static LRESULT LISTVIEW_DeleteAllItems(HWND32 hwnd)
     nmlv.hdr.idFrom = lCtrlId;
     nmlv.hdr.code     = LVN_DELETEALLITEMS;
     nmlv.iItem        = -1;
-    bNotify = !(BOOL32)SendMessage32A(GetParent32(hwnd), WM_NOTIFY, 
-                                      (WPARAM32)lCtrlId, (LPARAM)&nmlv);
+    bNotify = !(BOOL)SendMessageA(GetParent(hwnd), WM_NOTIFY, 
+                                      (WPARAM)lCtrlId, (LPARAM)&nmlv);
 
     nmlv.hdr.code     = LVN_DELETEITEM;
 
@@ -960,7 +960,7 @@ static LRESULT LISTVIEW_DeleteAllItems(HWND32 hwnd)
       {
         /* send LVN_DELETEITEM notification */
         nmlv.iItem = i;
-        SendMessage32A(GetParent32(hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+        SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                        (LPARAM)&nmlv);
 	}
 
@@ -970,7 +970,7 @@ static LRESULT LISTVIEW_DeleteAllItems(HWND32 hwnd)
       {
         /* free item string */
         if ((lpItem->pszText != NULL) && 
-            (lpItem->pszText != LPSTR_TEXTCALLBACK32A))
+            (lpItem->pszText != LPSTR_TEXTCALLBACKA))
 		COMCTL32_Free (lpItem->pszText);
 
         /* free item */
@@ -1003,7 +1003,7 @@ static LRESULT LISTVIEW_DeleteAllItems(HWND32 hwnd)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_DeleteColumn(HWND32 hwnd, INT32 nColumn)
+static LRESULT LISTVIEW_DeleteColumn(HWND hwnd, INT nColumn)
 {
 /*   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0); */
 
@@ -1030,13 +1030,13 @@ static LRESULT LISTVIEW_DeleteColumn(HWND32 hwnd, INT32 nColumn)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_DeleteItem(HWND32 hwnd, INT32 nItem)
+static LRESULT LISTVIEW_DeleteItem(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
     LISTVIEW_ITEM *lpItem;
     NMLISTVIEW nmlv;
-  BOOL32 bResult = FALSE;
+  BOOL bResult = FALSE;
 
   if ((nItem >= 0) && (nItem < infoPtr->nItemCount))
   {
@@ -1046,7 +1046,7 @@ static LRESULT LISTVIEW_DeleteItem(HWND32 hwnd, INT32 nItem)
     nmlv.hdr.idFrom = lCtrlId;
     nmlv.hdr.code     = LVN_DELETEITEM;
     nmlv.iItem        = nItem;
-    SendMessage32A(GetParent32(hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+    SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                    (LPARAM)&nmlv);
 
     /* remove item */
@@ -1055,7 +1055,7 @@ static LRESULT LISTVIEW_DeleteItem(HWND32 hwnd, INT32 nItem)
     {
       /* free item string */
       if ((lpItem->pszText != NULL) && 
-          (lpItem->pszText != LPSTR_TEXTCALLBACK32A))
+          (lpItem->pszText != LPSTR_TEXTCALLBACKA))
 	COMCTL32_Free (lpItem->pszText);
 
       /* free item */
@@ -1090,7 +1090,7 @@ static LRESULT LISTVIEW_DeleteItem(HWND32 hwnd, INT32 nItem)
  *   SUCCESS : index of item
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_FindItem(HWND32 hwnd, INT32 nStart, 
+static LRESULT LISTVIEW_FindItem(HWND hwnd, INT nStart, 
                                  LPLVFINDINFO lpFindInfo)
 {
 /*   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0); */
@@ -1168,9 +1168,9 @@ static LRESULT LISTVIEW_FindItem(HWND32 hwnd, INT32 nStart,
  * RETURN:
  * COLORREF associated with the background.
  */
-static LRESULT LISTVIEW_GetBkColor(HWND32 hwnd)
+static LRESULT LISTVIEW_GetBkColor(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 
     return infoPtr->clrBk;
 }
@@ -1207,16 +1207,16 @@ static LRESULT LISTVIEW_GetBkColor(HWND32 hwnd)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_GetColumn32A(HWND32 hwnd, INT32 nIndex, 
-                                     LPLVCOLUMN32A lpColumn)
+static LRESULT LISTVIEW_GetColumnA(HWND hwnd, INT nIndex, 
+                                     LPLVCOLUMNA lpColumn)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-    HDITEM32A hdi;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+    HDITEMA hdi;
 
   if (lpColumn == NULL)
 	return FALSE;
 
-    ZeroMemory (&hdi, sizeof(HDITEM32A));
+    ZeroMemory (&hdi, sizeof(HDITEMA));
 
   if (lpColumn->mask & LVCF_FMT)
 	hdi.mask |= HDI_FORMAT;
@@ -1233,8 +1233,8 @@ static LRESULT LISTVIEW_GetColumn32A(HWND32 hwnd, INT32 nIndex,
   if (lpColumn->mask & LVCF_ORDER)
         hdi.mask |= HDI_ORDER;
 
-    if (!SendMessage32A (infoPtr->hwndHeader, HDM_GETITEM32A,
-                       (WPARAM32)nIndex, (LPARAM)&hdi))
+    if (!SendMessageA (infoPtr->hwndHeader, HDM_GETITEMA,
+                       (WPARAM)nIndex, (LPARAM)&hdi))
 	return FALSE;
 
   if (lpColumn->mask & LVCF_FMT) 
@@ -1256,7 +1256,7 @@ static LRESULT LISTVIEW_GetColumn32A(HWND32 hwnd, INT32 nIndex,
     lpColumn->cx = hdi.cxy;
 
   if ((lpColumn->mask & LVCF_TEXT) && (lpColumn->pszText) && (hdi.pszText))
-    lstrcpyn32A (lpColumn->pszText, hdi.pszText, lpColumn->cchTextMax);
+    lstrcpynA (lpColumn->pszText, hdi.pszText, lpColumn->cchTextMax);
 
   if (lpColumn->mask & LVCF_IMAGE)
     lpColumn->iImage = hdi.iImage;
@@ -1282,12 +1282,12 @@ static LRESULT LISTVIEW_GetColumn32A(HWND32 hwnd, INT32 nIndex,
  *   SUCCESS : column width
  *   FAILURE : zero 
  */
-static LRESULT LISTVIEW_GetColumnWidth(HWND32 hwnd, INT32 nColumn)
+static LRESULT LISTVIEW_GetColumnWidth(HWND hwnd, INT nColumn)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-    HDITEM32A hdi;
-  INT32 nColumnWidth = 0;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+    HDITEMA hdi;
+  INT nColumnWidth = 0;
 
   if ((lStyle & LVS_LIST) || (lStyle & LVS_SMALLICON) || (lStyle & LVS_ICON))
   {
@@ -1300,8 +1300,8 @@ static LRESULT LISTVIEW_GetColumnWidth(HWND32 hwnd, INT32 nColumn)
     {
       /* get column width from header */
     hdi.mask = HDI_WIDTH;
-    if (SendMessage32A (infoPtr->hwndHeader, HDM_GETITEM32A,
-                         (WPARAM32)nColumn, (LPARAM)&hdi))
+    if (SendMessageA (infoPtr->hwndHeader, HDM_GETITEMA,
+                         (WPARAM)nColumn, (LPARAM)&hdi))
         nColumnWidth = hdi.cxy;
     }
   }
@@ -1321,13 +1321,13 @@ static LRESULT LISTVIEW_GetColumnWidth(HWND32 hwnd, INT32 nColumn)
  * RETURN:
  * Number of fully visible items.
  */
-static LRESULT LISTVIEW_GetCountPerPage(HWND32 hwnd)
+static LRESULT LISTVIEW_GetCountPerPage(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nItemCount = 0;
-  INT32 nItemCountPerRow = LISTVIEW_GetItemCountPerRow(hwnd);
-  INT32 nItemCountPerColumn = LISTVIEW_GetItemCountPerColumn(hwnd);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nItemCount = 0;
+  INT nItemCountPerRow = LISTVIEW_GetItemCountPerRow(hwnd);
+  INT nItemCountPerColumn = LISTVIEW_GetItemCountPerColumn(hwnd);
 
   if (lStyle & LVS_LIST)
   {
@@ -1361,9 +1361,9 @@ static LRESULT LISTVIEW_GetCountPerPage(HWND32 hwnd)
  * RETURN:
  * Header handle.
  */
-static LRESULT LISTVIEW_GetHeader(HWND32 hwnd)
+static LRESULT LISTVIEW_GetHeader(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 
     return infoPtr->hwndHeader;
 }
@@ -1384,9 +1384,9 @@ static LRESULT LISTVIEW_GetHeader(HWND32 hwnd)
  *   SUCCESS : image list handle
  *   FAILURE : NULL
  */
-static LRESULT LISTVIEW_GetImageList(HWND32 hwnd, INT32 nImageList)
+static LRESULT LISTVIEW_GetImageList(HWND hwnd, INT nImageList)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   HIMAGELIST himl = NULL;
 
   switch (nImageList) 
@@ -1417,11 +1417,11 @@ static LRESULT LISTVIEW_GetImageList(HWND32 hwnd, INT32 nImageList)
  *   SUCCESS : TRUE 
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_GetItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
+static LRESULT LISTVIEW_GetItemA(HWND hwnd, LPLVITEMA lpItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   LISTVIEW_ITEM *lpListItem;
-  BOOL32 bResult = FALSE;
+  BOOL bResult = FALSE;
 
   if (lpItem != NULL)
   {
@@ -1441,10 +1441,10 @@ static LRESULT LISTVIEW_GetItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
 
           if (lpItem->mask & LVIF_TEXT) 
           {
-            if (lpListItem->pszText == LPSTR_TEXTCALLBACK32A)
-	    lpItem->pszText = LPSTR_TEXTCALLBACK32A;
+            if (lpListItem->pszText == LPSTR_TEXTCALLBACKA)
+	    lpItem->pszText = LPSTR_TEXTCALLBACKA;
 	else
-              Str_GetPtr32A(lpListItem->pszText, lpItem->pszText, 
+              Str_GetPtrA(lpListItem->pszText, lpItem->pszText, 
 			   lpItem->cchTextMax);
     }
 
@@ -1481,9 +1481,9 @@ static LRESULT LISTVIEW_GetItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
  * RETURN:
  * Number of items.
  */
-static LRESULT LISTVIEW_GetItemCount(HWND32 hwnd)
+static LRESULT LISTVIEW_GetItemCount(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
 
     return infoPtr->nItemCount;
 }
@@ -1501,18 +1501,18 @@ static LRESULT LISTVIEW_GetItemCount(HWND32 hwnd)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_GetItemPosition(HWND32 hwnd, INT32 nItem, 
-                                        LPPOINT32 lpPt)
+static LRESULT LISTVIEW_GetItemPosition(HWND hwnd, INT nItem, 
+                                        LPPOINT lpPt)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nColumn;
-  INT32 nRow;
-  BOOL32 bResult = FALSE;
-  INT32 nItemCountPerColumn;
-  INT32 nItemCountPerRow;
-  INT32 nFirstItem;
-  INT32 nLastItem;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nColumn;
+  INT nRow;
+  BOOL bResult = FALSE;
+  INT nItemCountPerColumn;
+  INT nItemCountPerRow;
+  INT nFirstItem;
+  INT nLastItem;
 
   if ((nItem >= 0) && (nItem < infoPtr->nItemCount) && (lpPt != NULL))
   {
@@ -1576,16 +1576,16 @@ static LRESULT LISTVIEW_GetItemPosition(HWND32 hwnd, INT32 nItem,
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_GetItemRect(HWND32 hwnd, INT32 nItem, LPRECT32 lpRect)
+static LRESULT LISTVIEW_GetItemRect(HWND hwnd, INT nItem, LPRECT lpRect)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   LISTVIEW_ITEM *lpItem;
-  POINT32 pt;
-  INT32 nLabelWidth;
-  BOOL32 bResult = FALSE;
-  INT32 nSmallIconWidth;
+  POINT pt;
+  INT nLabelWidth;
+  BOOL bResult = FALSE;
+  INT nSmallIconWidth;
 
-  nSmallIconWidth = GetSystemMetrics32(SM_CXSMICON);
+  nSmallIconWidth = GetSystemMetrics(SM_CXSMICON);
 
   if ((nItem < 0) || (nItem >= infoPtr->nItemCount) || (lpRect == NULL))
     return FALSE;
@@ -1595,10 +1595,10 @@ static LRESULT LISTVIEW_GetItemRect(HWND32 hwnd, INT32 nItem, LPRECT32 lpRect)
   if (lpItem == NULL) 
     return FALSE;
 
-  if (!SendMessage32A(hwnd, LVM_GETITEMPOSITION, (WPARAM32)nItem, (LPARAM)&pt))
+  if (!SendMessageA(hwnd, LVM_GETITEMPOSITION, (WPARAM)nItem, (LPARAM)&pt))
     return FALSE;
 
-  nLabelWidth = SendMessage32A(hwnd, LVM_GETSTRINGWIDTH32A, (WPARAM32)0, 
+  nLabelWidth = SendMessageA(hwnd, LVM_GETSTRINGWIDTHA, (WPARAM)0, 
                                (LPARAM)lpItem->pszText);
   switch(lpRect->left) 
   { 
@@ -1642,12 +1642,12 @@ static LRESULT LISTVIEW_GetItemRect(HWND32 hwnd, INT32 nItem, LPRECT32 lpRect)
  * RETURN:
  * Horizontal + vertical spacing
  */
-static LRESULT LISTVIEW_GetItemSpacing(HWND32 hwnd, BOOL32 bSmall)
+static LRESULT LISTVIEW_GetItemSpacing(HWND hwnd, BOOL bSmall)
 {
-  INT32 nSmallIconHSpacing;
-  INT32 nSmallIconVSpacing;
-  INT32 nIconHSpacing;
-  INT32 nIconVSpacing;
+  INT nSmallIconHSpacing;
+  INT nSmallIconVSpacing;
+  INT nIconHSpacing;
+  INT nIconVSpacing;
   LONG lResult = 0;
 
   if (bSmall == TRUE)
@@ -1659,8 +1659,8 @@ static LRESULT LISTVIEW_GetItemSpacing(HWND32 hwnd, BOOL32 bSmall)
     }
     else
   {
-    nIconHSpacing = GetSystemMetrics32(SM_CXICONSPACING);
-    nIconVSpacing = GetSystemMetrics32(SM_CYICONSPACING);
+    nIconHSpacing = GetSystemMetrics(SM_CXICONSPACING);
+    nIconVSpacing = GetSystemMetrics(SM_CYICONSPACING);
     lResult = MAKELONG(nIconHSpacing, nIconVSpacing);
   }
   
@@ -1679,11 +1679,11 @@ static LRESULT LISTVIEW_GetItemSpacing(HWND32 hwnd, BOOL32 bSmall)
  * RETURN:
  * State specified by the mask.
  */
-static LRESULT LISTVIEW_GetItemState(HWND32 hwnd, INT32 nItem, UINT32 uMask)
+static LRESULT LISTVIEW_GetItemState(HWND hwnd, INT nItem, UINT uMask)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   LISTVIEW_ITEM *lpItem;
-  INT32 nState = 0;
+  INT nState = 0;
 
   if ((nItem >= 0) && (nItem < infoPtr->nItemCount))
   {
@@ -1707,10 +1707,10 @@ static LRESULT LISTVIEW_GetItemState(HWND32 hwnd, INT32 nItem, UINT32 uMask)
  * RETURN:
  * None
  */
-static VOID LISTVIEW_GetItemText32A(HWND32 hwnd, INT32 nItem, 
-                                    LPLVITEM32A lpItem)
+static VOID LISTVIEW_GetItemTextA(HWND hwnd, INT nItem, 
+                                    LPLVITEMA lpItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   LISTVIEW_ITEM *lpListItem;
 
   if ((nItem < 0) || (nItem >= infoPtr->nItemCount) || (lpItem == NULL))
@@ -1724,10 +1724,10 @@ static VOID LISTVIEW_GetItemText32A(HWND32 hwnd, INT32 nItem,
   if (lpListItem == NULL)
     return;
 
-  if (lpListItem->pszText == LPSTR_TEXTCALLBACK32A) 
-    lpItem->pszText = LPSTR_TEXTCALLBACK32A;
+  if (lpListItem->pszText == LPSTR_TEXTCALLBACKA) 
+    lpItem->pszText = LPSTR_TEXTCALLBACKA;
     else
-    Str_GetPtr32A(lpListItem->pszText, lpItem->pszText, lpItem->cchTextMax);
+    Str_GetPtrA(lpListItem->pszText, lpItem->pszText, lpItem->cchTextMax);
 }
 
 /***
@@ -1743,10 +1743,10 @@ static VOID LISTVIEW_GetItemText32A(HWND32 hwnd, INT32 nItem,
  *   SUCCESS : item index
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_GetNextItem (HWND32 hwnd, INT32 nItem, UINT32 uFlags)
+static LRESULT LISTVIEW_GetNextItem (HWND hwnd, INT nItem, UINT uFlags)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  INT32 nResult = -1;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  INT nResult = -1;
 
   /* start at begin */
   if (nItem == -1)
@@ -1774,10 +1774,10 @@ static LRESULT LISTVIEW_GetNextItem (HWND32 hwnd, INT32 nItem, UINT32 uFlags)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_GetOrigin(HWND32 hwnd, LPPOINT32 lpOrigin)
+static LRESULT LISTVIEW_GetOrigin(HWND hwnd, LPPOINT lpOrigin)
 {
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_ID);
-  BOOL32 bResult = FALSE;
+  LONG lStyle = GetWindowLongA(hwnd, GWL_ID);
+  BOOL bResult = FALSE;
 
   if (lStyle & LVS_SMALLICON) 
   {
@@ -1801,12 +1801,12 @@ static LRESULT LISTVIEW_GetOrigin(HWND32 hwnd, LPPOINT32 lpOrigin)
  * RETURN:
  * Number of items selected.
  */
-static LRESULT LISTVIEW_GetSelectedCount(HWND32 hwnd)
+static LRESULT LISTVIEW_GetSelectedCount(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   LISTVIEW_ITEM *lpItem;
-  INT32 nSelectedCount = 0;
-  INT32 i;
+  INT nSelectedCount = 0;
+  INT i;
 
   for (i = 0; i < infoPtr->nItemCount; i++)
   {
@@ -1831,12 +1831,12 @@ static LRESULT LISTVIEW_GetSelectedCount(HWND32 hwnd)
  * RETURN:
  * Index number or -1 if there is no selection mark.
  */
-static LRESULT LISTVIEW_GetSelectionMark(HWND32 hwnd)
+static LRESULT LISTVIEW_GetSelectionMark(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  INT32 nResult = -1;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  INT nResult = -1;
 
-  if (SendMessage32A(hwnd, LVM_GETSELECTEDCOUNT, (WPARAM32)0, (LPARAM)0) != 0)
+  if (SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, (WPARAM)0, (LPARAM)0) != 0)
     nResult = infoPtr->nSelectionMark;
 
   return nResult;
@@ -1853,22 +1853,22 @@ static LRESULT LISTVIEW_GetSelectionMark(HWND32 hwnd)
  *   SUCCESS : string width (in pixels)
  *   FAILURE : zero
  */
-static LRESULT LISTVIEW_GetStringWidth32A(HWND32 hwnd, LPCSTR lpsz)
+static LRESULT LISTVIEW_GetStringWidthA(HWND hwnd, LPCSTR lpsz)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-    HFONT32 hFont, hOldFont;
-    HDC32 hdc;
-  SIZE32 textSize;
-  INT32 nResult = 0;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+    HFONT hFont, hOldFont;
+    HDC hdc;
+  SIZE textSize;
+  INT nResult = 0;
 
   if (lpsz != NULL)
   {
-    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject32 (SYSTEM_FONT);
-    hdc = GetDC32(hwnd);
-    hOldFont = SelectObject32 (hdc, hFont);
-    GetTextExtentPoint32A(hdc, lpsz, lstrlen32A(lpsz), &textSize);
-    SelectObject32 (hdc, hOldFont);
-    ReleaseDC32(hwnd, hdc);
+    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
+    hdc = GetDC(hwnd);
+    hOldFont = SelectObject (hdc, hFont);
+    GetTextExtentPoint32A(hdc, lpsz, lstrlenA(lpsz), &textSize);
+    SelectObject (hdc, hOldFont);
+    ReleaseDC(hwnd, hdc);
     nResult = textSize.cx;
   }
 
@@ -1885,9 +1885,9 @@ static LRESULT LISTVIEW_GetStringWidth32A(HWND32 hwnd, LPCSTR lpsz)
  * RETURN:
  * COLORREF associated with the the background.
  */
-static LRESULT LISTVIEW_GetTextBkColor(HWND32 hwnd)
+static LRESULT LISTVIEW_GetTextBkColor(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
 
   return infoPtr->clrTextBk;
 }
@@ -1902,9 +1902,9 @@ static LRESULT LISTVIEW_GetTextBkColor(HWND32 hwnd)
  * RETURN:
  * COLORREF associated with the text.
  */
-static LRESULT LISTVIEW_GetTextColor(HWND32 hwnd)
+static LRESULT LISTVIEW_GetTextColor(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
 
   return infoPtr->clrText;
 }
@@ -1921,11 +1921,11 @@ static LRESULT LISTVIEW_GetTextColor(HWND32 hwnd)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_GetViewRect(HWND32 hwnd, LPRECT32 lpBoundingRect)
+static LRESULT LISTVIEW_GetViewRect(HWND hwnd, LPRECT lpBoundingRect)
 {
   /* LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0); */
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  BOOL32 bResult = FALSE;
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  BOOL bResult = FALSE;
 
   if (lpBoundingRect != NULL)
   {
@@ -1950,18 +1950,18 @@ static LRESULT LISTVIEW_GetViewRect(HWND32 hwnd, LPRECT32 lpBoundingRect)
  *   SUCCESS : item index
  *   FAILURE : -1
  */
-static LRESULT HitTestSmallIconView(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
+static LRESULT HitTestSmallIconView(HWND hwnd, LPLVHITTESTINFO lpHitTestInfo)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   LISTVIEW_ITEM *lpItem;
-  INT32 nColumn;
-  INT32 nRow;
-  INT32 nItem = 0;
-  INT32 nLabelWidth;
-  INT32 nOffset;
-  INT32 nPosX = 0;
-  INT32 nSmallIconWidth;
-  INT32 nItemCountPerRow;
+  INT nColumn;
+  INT nRow;
+  INT nItem = 0;
+  INT nLabelWidth;
+  INT nOffset;
+  INT nPosX = 0;
+  INT nSmallIconWidth;
+  INT nItemCountPerRow;
 
   /* get column */
   nColumn = lpHitTestInfo->pt.x / infoPtr->nColumnWidth;
@@ -1973,7 +1973,7 @@ static LRESULT HitTestSmallIconView(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
   nOffset = lpHitTestInfo->pt.x % infoPtr->nColumnWidth;
 
   /* get recommended width of a small icon */
-  nSmallIconWidth = GetSystemMetrics32(SM_CXSMICON);
+  nSmallIconWidth = GetSystemMetrics(SM_CXSMICON);
 
   /* calculate index */
   nItemCountPerRow = LISTVIEW_GetItemCountPerRow(hwnd);
@@ -2011,7 +2011,7 @@ static LRESULT HitTestSmallIconView(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
       }
 
       /* get width of label in pixels */
-      nLabelWidth = SendMessage32A(hwnd, LVM_GETSTRINGWIDTH32A, (WPARAM32)0, 
+      nLabelWidth = SendMessageA(hwnd, LVM_GETSTRINGWIDTHA, (WPARAM)0, 
                                    (LPARAM)lpItem->pszText); 
       nLabelWidth += nPosX;
 
@@ -2043,18 +2043,18 @@ static LRESULT HitTestSmallIconView(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
  *   SUCCESS : item index
  *   FAILURE : -1
  */
-static LRESULT HitTestListView(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
+static LRESULT HitTestListView(HWND hwnd, LPLVHITTESTINFO lpHitTestInfo)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   LISTVIEW_ITEM *lpItem;
-  INT32 nColumn;
-  INT32 nRow;
-  INT32 nItem = 0;
-  INT32 nLabelWidth;
-  INT32 nOffset;
-  INT32 nPosX = 0;
-  INT32 nSmallIconWidth;
-  INT32 nItemCountPerColumn;
+  INT nColumn;
+  INT nRow;
+  INT nItem = 0;
+  INT nLabelWidth;
+  INT nOffset;
+  INT nPosX = 0;
+  INT nSmallIconWidth;
+  INT nItemCountPerColumn;
 
   /* get column */
   nColumn = lpHitTestInfo->pt.x / infoPtr->nColumnWidth;
@@ -2066,7 +2066,7 @@ static LRESULT HitTestListView(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
   nOffset = lpHitTestInfo->pt.x % infoPtr->nColumnWidth;
 
   /* get recommended width of a small icon */
-  nSmallIconWidth = GetSystemMetrics32(SM_CXSMICON);
+  nSmallIconWidth = GetSystemMetrics(SM_CXSMICON);
 
   /* calculate index */
   nItemCountPerColumn = LISTVIEW_GetItemCountPerColumn(hwnd);
@@ -2105,7 +2105,7 @@ static LRESULT HitTestListView(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
       }
 
       /* get width of label in pixels */
-      nLabelWidth = SendMessage32A(hwnd, LVM_GETSTRINGWIDTH32A, (WPARAM32)0, 
+      nLabelWidth = SendMessageA(hwnd, LVM_GETSTRINGWIDTHA, (WPARAM)0, 
                                    (LPARAM)lpItem->pszText); 
       nLabelWidth += nPosX;
 
@@ -2137,9 +2137,9 @@ static LRESULT HitTestListView(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
  *   SUCCESS : item index
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_HitTest(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
+static LRESULT LISTVIEW_HitTest(HWND hwnd, LPLVHITTESTINFO lpHitTestInfo)
 {
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
 
   if (lStyle & LVS_LIST)
     return HitTestListView(hwnd, lpHitTestInfo);
@@ -2172,12 +2172,12 @@ static LRESULT LISTVIEW_HitTest(HWND32 hwnd, LPLVHITTESTINFO lpHitTestInfo)
  *   SUCCESS : new column index
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_InsertColumn32A(HWND32 hwnd, INT32 nIndex, 
-                                        LPLVCOLUMN32A lpColumn)
+static LRESULT LISTVIEW_InsertColumnA(HWND hwnd, INT nIndex, 
+                                        LPLVCOLUMNA lpColumn)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLong32A(hwnd, 0);
-    HDITEM32A hdi;
-    INT32 nResult;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+    HDITEMA hdi;
+    INT nResult;
 
   if ((lpColumn == NULL) || (infoPtr->nItemCount > 0))
 	return -1;
@@ -2185,7 +2185,7 @@ static LRESULT LISTVIEW_InsertColumn32A(HWND32 hwnd, INT32 nIndex,
   FIXME (listview, "(%d %p): semi stub!\n", nIndex, lpColumn);
 
   /* initialize memory */
-    ZeroMemory (&hdi, sizeof(HDITEM32A));
+    ZeroMemory (&hdi, sizeof(HDITEMA));
 
   if (lpColumn->mask & LVCF_FMT) 
   {
@@ -2228,8 +2228,8 @@ static LRESULT LISTVIEW_InsertColumn32A(HWND32 hwnd, INT32 nIndex,
     hdi.iOrder = lpColumn->iOrder;
     }
 
-    nResult = SendMessage32A (infoPtr->hwndHeader, HDM_INSERTITEM32A,
-                           (WPARAM32)nIndex, (LPARAM)&hdi);
+    nResult = SendMessageA (infoPtr->hwndHeader, HDM_INSERTITEMA,
+                           (WPARAM)nIndex, (LPARAM)&hdi);
     if (nResult == -1)
 	return -1;
 
@@ -2253,17 +2253,17 @@ static LRESULT LISTVIEW_InsertColumn32A(HWND32 hwnd, INT32 nIndex,
  *   SUCCESS : new item index
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_InsertItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
+static LRESULT LISTVIEW_InsertItemA(HWND hwnd, LPLVITEMA lpItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
     LISTVIEW_ITEM *lpListItem;
-  INT32 nItem;
+  INT nItem;
     NMLISTVIEW nmlv;
-  LVITEM32A lvItem;
-  INT32 nColumnWidth = 0;
-  INT32 nSmallIconWidth;
+  LVITEMA lvItem;
+  INT nColumnWidth = 0;
+  INT nSmallIconWidth;
 
   if (lpItem == NULL)
 	return -1;
@@ -2276,7 +2276,7 @@ static LRESULT LISTVIEW_InsertItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
   if (lpListItem == NULL)
 	return -1;
 
-  nSmallIconWidth = GetSystemMetrics32(SM_CXSMICON);
+  nSmallIconWidth = GetSystemMetrics(SM_CXSMICON);
 
   /* initialize listview control item */
   ZeroMemory(lpListItem, sizeof(LISTVIEW_ITEM));
@@ -2284,17 +2284,17 @@ static LRESULT LISTVIEW_InsertItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
   /* copy only valid data */
   if (lpItem->mask & LVIF_TEXT) 
   {
-	if (lpItem->pszText == LPSTR_TEXTCALLBACK32A)
+	if (lpItem->pszText == LPSTR_TEXTCALLBACKA)
     {
       if ((lStyle & LVS_SORTASCENDING) || (lStyle & LVS_SORTDESCENDING))
         return -1;
 
-      lpListItem->pszText = LPSTR_TEXTCALLBACK32A;
+      lpListItem->pszText = LPSTR_TEXTCALLBACKA;
     }
 	else
     {
-      nColumnWidth = SendMessage32A(hwnd, LVM_GETSTRINGWIDTH32A, 
-                                    (WPARAM32)0, (LPARAM)lpItem->pszText);
+      nColumnWidth = SendMessageA(hwnd, LVM_GETSTRINGWIDTHA, 
+                                    (WPARAM)0, (LPARAM)lpItem->pszText);
 
       /* add padding for separating columns */
       nColumnWidth += 10;
@@ -2303,7 +2303,7 @@ static LRESULT LISTVIEW_InsertItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
       if (nColumnWidth < 96)
         nColumnWidth = 96;
         
-      Str_SetPtr32A(&lpListItem->pszText, lpItem->pszText);
+      Str_SetPtrA(&lpListItem->pszText, lpItem->pszText);
     }
   }
 
@@ -2312,10 +2312,10 @@ static LRESULT LISTVIEW_InsertItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
     if (lpItem->stateMask & LVIS_FOCUSED)
     {
       /* clear LVIS_FOCUSED states */
-      ZeroMemory(&lvItem, sizeof(LVITEM32A));
+      ZeroMemory(&lvItem, sizeof(LVITEMA));
       lvItem.stateMask = LVIS_FOCUSED;
       lvItem.state = 0;
-      SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)-1, (LPARAM)&lvItem);
+      SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)-1, (LPARAM)&lvItem);
 
       /* set focused item index */
       infoPtr->nFocusedItem = lpItem->iItem;
@@ -2362,11 +2362,11 @@ static LRESULT LISTVIEW_InsertItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
   nmlv.hdr.idFrom = lCtrlId;
     nmlv.hdr.code     = LVN_INSERTITEM;
   nmlv.iItem = nItem;
-  SendMessage32A(GetParent32 (hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+  SendMessageA(GetParent (hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                  (LPARAM)&nmlv);
 
-  InvalidateRect32(hwnd, NULL, FALSE);
-  UpdateWindow32(hwnd);
+  InvalidateRect(hwnd, NULL, FALSE);
+  UpdateWindow(hwnd);
 
   return nItem;
 }
@@ -2386,9 +2386,9 @@ static LRESULT LISTVIEW_InsertItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_RedrawItems(HWND32 hwnd, INT32 nFirst, INT32 nLast)
+static LRESULT LISTVIEW_RedrawItems(HWND hwnd, INT nFirst, INT nLast)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0); 
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); 
 
   if (nFirst > nLast)
     return FALSE;
@@ -2417,29 +2417,29 @@ static LRESULT LISTVIEW_RedrawItems(HWND32 hwnd, INT32 nFirst, INT32 nLast)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_Scroll(HWND32 hwnd, INT32 nHScroll, INT32 nVScroll)
+static LRESULT LISTVIEW_Scroll(HWND hwnd, INT nHScroll, INT nVScroll)
 {
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  BOOL32 bResult = FALSE;
-  INT32 nHScrollPos;
-  INT32 nMinRange;
-  INT32 nMaxRange;
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  BOOL bResult = FALSE;
+  INT nHScrollPos;
+  INT nMinRange;
+  INT nMaxRange;
 
   if (lStyle & LVS_LIST)
   {
-    nHScrollPos = GetScrollPos32(hwnd, SB_HORZ);
-    GetScrollRange32(hwnd, SB_HORZ, &nMinRange, &nMaxRange);
+    nHScrollPos = GetScrollPos(hwnd, SB_HORZ);
+    GetScrollRange(hwnd, SB_HORZ, &nMinRange, &nMaxRange);
 
     if ((nMinRange <= nHScrollPos + nHScroll) && 
         (nHScrollPos + nHScroll <= nMaxRange))
     {
       bResult = TRUE;
       nHScrollPos += nHScroll;
-      SetScrollPos32(hwnd, SB_HORZ, nHScrollPos, TRUE);
+      SetScrollPos(hwnd, SB_HORZ, nHScrollPos, TRUE);
 
       /* refresh client area */
-      InvalidateRect32(hwnd, NULL, TRUE);
-      UpdateWindow32(hwnd);
+      InvalidateRect(hwnd, NULL, TRUE);
+      UpdateWindow(hwnd);
     }
   }  
   else if (lStyle & LVS_REPORT)
@@ -2470,12 +2470,12 @@ static LRESULT LISTVIEW_Scroll(HWND32 hwnd, INT32 nHScroll, INT32 nVScroll)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
 */
-static LRESULT LISTVIEW_SetBkColor(HWND32 hwnd, COLORREF clrBk)
+static LRESULT LISTVIEW_SetBkColor(HWND hwnd, COLORREF clrBk)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 
   infoPtr->clrBk = clrBk;
-  InvalidateRect32(hwnd, NULL, TRUE);
+  InvalidateRect(hwnd, NULL, TRUE);
 
   return TRUE;
 }
@@ -2493,17 +2493,17 @@ static LRESULT LISTVIEW_SetBkColor(HWND32 hwnd, COLORREF clrBk)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetColumn32A(HWND32 hwnd, INT32 nIndex, 
-                                     LPLVCOLUMN32A lpColumn)
+static LRESULT LISTVIEW_SetColumnA(HWND hwnd, INT nIndex, 
+                                     LPLVCOLUMNA lpColumn)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-    HDITEM32A hdi;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+    HDITEMA hdi;
 
   if (lpColumn == NULL)
 	return -1;
 
   /* initialize memory */
-    ZeroMemory (&hdi, sizeof(HDITEM32A));
+    ZeroMemory (&hdi, sizeof(HDITEMA));
 
   if (lpColumn->mask & LVCF_FMT) 
   {
@@ -2547,8 +2547,8 @@ static LRESULT LISTVIEW_SetColumn32A(HWND32 hwnd, INT32 nIndex,
     hdi.iOrder = lpColumn->iOrder;
     }
 
-    return (LRESULT)SendMessage32A (infoPtr->hwndHeader, HDM_SETITEM32A,
-                                  (WPARAM32)nIndex, (LPARAM)&hdi);
+    return (LRESULT)SendMessageA (infoPtr->hwndHeader, HDM_SETITEMA,
+                                  (WPARAM)nIndex, (LPARAM)&hdi);
 }
 
 /***
@@ -2564,9 +2564,9 @@ static LRESULT LISTVIEW_SetColumn32A(HWND32 hwnd, INT32 nIndex,
  *   SUCCESS : old image list
  *   FAILURE : NULL
 */
-static LRESULT LISTVIEW_SetImageList(HWND32 hwnd, INT32 nType, HIMAGELIST himl)
+static LRESULT LISTVIEW_SetImageList(HWND hwnd, INT nType, HIMAGELIST himl)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
     HIMAGELIST himlTemp = 0;
 
   switch (nType) 
@@ -2601,10 +2601,10 @@ static LRESULT LISTVIEW_SetImageList(HWND32 hwnd, INT32 nType, HIMAGELIST himl)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
+static LRESULT LISTVIEW_SetItemA(HWND hwnd, LPLVITEMA lpItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
   LISTVIEW_ITEM *lpListItem;
     NMLISTVIEW nmlv;
 
@@ -2622,7 +2622,7 @@ static LRESULT LISTVIEW_SetItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
     nmlv.iItem        = lpItem->iItem;
     nmlv.iSubItem     = lpItem->iSubItem;
     nmlv.uChanged     = lpItem->mask;
-  if (SendMessage32A(GetParent32(hwnd), WM_NOTIFY,  (WPARAM32)lCtrlId, 
+  if (SendMessageA(GetParent(hwnd), WM_NOTIFY,  (WPARAM)lCtrlId, 
                      (LPARAM)&nmlv) == FALSE) 
 	return FALSE;
 
@@ -2669,27 +2669,27 @@ static LRESULT LISTVIEW_SetItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
   
   if (lpItem->mask & LVIF_TEXT) 
   {
-    if (lpItem->pszText == LPSTR_TEXTCALLBACK32A) 
+    if (lpItem->pszText == LPSTR_TEXTCALLBACKA) 
     {
       if ((lpListItem->pszText != NULL) &&
-          (lpListItem->pszText != LPSTR_TEXTCALLBACK32A))
+          (lpListItem->pszText != LPSTR_TEXTCALLBACKA))
         COMCTL32_Free (lpListItem->pszText);
 
-      lpListItem->pszText = LPSTR_TEXTCALLBACK32A;
+      lpListItem->pszText = LPSTR_TEXTCALLBACKA;
     }
     else 
     {
-      if (lpListItem->pszText == LPSTR_TEXTCALLBACK32A)
+      if (lpListItem->pszText == LPSTR_TEXTCALLBACKA)
         lpListItem->pszText = NULL;
       
-      if (Str_SetPtr32A(&lpListItem->pszText, lpItem->pszText) == FALSE)
+      if (Str_SetPtrA(&lpListItem->pszText, lpItem->pszText) == FALSE)
         return FALSE;
     }
   }
 
     /* send LVN_ITEMCHANGED notification */
     nmlv.hdr.code = LVN_ITEMCHANGED;
-  SendMessage32A(GetParent32(hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+  SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                  (LPARAM)&nmlv);
 
     return TRUE;
@@ -2713,11 +2713,11 @@ static LRESULT LISTVIEW_SetItem32A(HWND32 hwnd, LPLVITEM32A lpItem)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetItemPosition(HWND32 hwnd, INT32 nItem, 
-                                        INT32 nPosX, INT32 nPosY)
+static LRESULT LISTVIEW_SetItemPosition(HWND hwnd, INT nItem, 
+                                        INT nPosX, INT nPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
 
   if ((nItem < 0) || (nItem >= infoPtr->nItemCount))
 	return FALSE;
@@ -2731,8 +2731,8 @@ static LRESULT LISTVIEW_SetItemPosition(HWND32 hwnd, INT32 nItem,
     /* refresh */
     if (lStyle & LVS_AUTOARRANGE)
     {
-      InvalidateRect32(hwnd, NULL, FALSE);
-      UpdateWindow32(hwnd);
+      InvalidateRect(hwnd, NULL, FALSE);
+      UpdateWindow(hwnd);
     }
 
     return TRUE;
@@ -2754,12 +2754,12 @@ static LRESULT LISTVIEW_SetItemPosition(HWND32 hwnd, INT32 nItem,
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
 */
-static LRESULT LISTVIEW_SetItemState(HWND32 hwnd, INT32 nItem, 
-                                     LPLVITEM32A lpItem)
+static LRESULT LISTVIEW_SetItemState(HWND hwnd, INT nItem, 
+                                     LPLVITEMA lpItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   LISTVIEW_ITEM *lpListItem;
-  INT32 i;
+  INT i;
 
   if (nItem == -1)
   {
@@ -2802,9 +2802,9 @@ static LRESULT LISTVIEW_SetItemState(HWND32 hwnd, INT32 nItem,
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
 */
-static LRESULT LISTVIEW_SetTextBkColor(HWND32 hwnd, COLORREF clrTextBk)
+static LRESULT LISTVIEW_SetTextBkColor(HWND hwnd, COLORREF clrTextBk)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 
   infoPtr->clrTextBk = clrTextBk;
 
@@ -2823,9 +2823,9 @@ static LRESULT LISTVIEW_SetTextBkColor(HWND32 hwnd, COLORREF clrTextBk)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetTextColor (HWND32 hwnd, COLORREF clrText)
+static LRESULT LISTVIEW_SetTextColor (HWND hwnd, COLORREF clrText)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 
   infoPtr->clrText = clrText;
 
@@ -2843,7 +2843,7 @@ static LRESULT LISTVIEW_SetTextColor (HWND32 hwnd, COLORREF clrText)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
 */
-static LRESULT LISTVIEW_SortItems(HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
+static LRESULT LISTVIEW_SortItems(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
 /*  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLong32A(hwnd, 0); */
 
@@ -2864,26 +2864,26 @@ static LRESULT LISTVIEW_SortItems(HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
 */
-static LRESULT LISTVIEW_Update(HWND32 hwnd, INT32 nItem)
+static LRESULT LISTVIEW_Update(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  RECT32 rcItemRect;
-  BOOL32 bResult = FALSE;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  RECT rcItemRect;
+  BOOL bResult = FALSE;
 
   if ((nItem >= 0) || (nItem < infoPtr->nItemCount))
   {
     /* get item bounding rectangle */
     rcItemRect.left = LVIR_BOUNDS;
-    SendMessage32A(hwnd, LVM_GETITEMRECT, (WPARAM32)nItem, 
+    SendMessageA(hwnd, LVM_GETITEMRECT, (WPARAM)nItem, 
                    (LPARAM)&rcItemRect);
 
-    InvalidateRect32(hwnd, &rcItemRect, FALSE);
+    InvalidateRect(hwnd, &rcItemRect, FALSE);
 
     /* rearrange with default alignment style */
     if ((lStyle & LVS_AUTOARRANGE) && 
         ((lStyle & LVS_ICON) || (lStyle & LVS_SMALLICON)))
-      SendMessage32A(hwnd, LVM_ARRANGE, (WPARAM32)LVA_DEFAULT, (LPARAM)0);
+      SendMessageA(hwnd, LVM_ARRANGE, (WPARAM)LVA_DEFAULT, (LPARAM)0);
   }
 
   return bResult;
@@ -2899,51 +2899,51 @@ static LRESULT LISTVIEW_Update(HWND32 hwnd, INT32 nItem)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_Create(HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
+static LRESULT LISTVIEW_Create(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE); 
-  LOGFONT32A logFont;
-  HFONT32 hOldFont;
-  HDC32 hdc;
-  TEXTMETRIC32A tm;
-  INT32 nSmallIconHeight;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE); 
+  LOGFONTA logFont;
+  HFONT hOldFont;
+  HDC hdc;
+  TEXTMETRICA tm;
+  INT nSmallIconHeight;
 
   /* initialize color information  */
-  infoPtr->clrBk = GetSysColor32(COLOR_WINDOW);
-  infoPtr->clrText = GetSysColor32(COLOR_WINDOWTEXT);
-  infoPtr->clrTextBk = GetSysColor32(COLOR_WINDOW); 
+  infoPtr->clrBk = GetSysColor(COLOR_WINDOW);
+  infoPtr->clrText = GetSysColor(COLOR_WINDOWTEXT);
+  infoPtr->clrTextBk = GetSysColor(COLOR_WINDOW); 
 
     /* get default font (icon title) */
-    SystemParametersInfo32A (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
-    infoPtr->hDefaultFont = CreateFontIndirect32A (&logFont);
+    SystemParametersInfoA (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
+    infoPtr->hDefaultFont = CreateFontIndirectA (&logFont);
     infoPtr->hFont = infoPtr->hDefaultFont;
 
   /* initialize column width */
   infoPtr->nColumnWidth = 96;
 
   /* get text height */
-  hdc = GetDC32(hwnd);
-  hOldFont = SelectObject32(hdc, infoPtr->hFont);
-  GetTextMetrics32A(hdc, &tm);
+  hdc = GetDC(hwnd);
+  hOldFont = SelectObject(hdc, infoPtr->hFont);
+  GetTextMetricsA(hdc, &tm);
 
   /* initialize item height with padding */
   if (!(lStyle & LVS_ICON)) 
   {
-    nSmallIconHeight = GetSystemMetrics32(SM_CYSMICON);
+    nSmallIconHeight = GetSystemMetrics(SM_CYSMICON);
     infoPtr->nItemHeight = max(tm.tmHeight, nSmallIconHeight) + 2;
   }
 
-  SelectObject32(hdc, hOldFont);
-  ReleaseDC32(hwnd, hdc);
+  SelectObject(hdc, hOldFont);
+  ReleaseDC(hwnd, hdc);
 
  /* create header */
-  infoPtr->hwndHeader =	CreateWindow32A(WC_HEADER32A, "", lStyle, 0, 0, 0, 0, 
-                                        hwnd, (HMENU32)0, 
-                                        GetWindowLong32A(hwnd, GWL_HINSTANCE),
+  infoPtr->hwndHeader =	CreateWindowA(WC_HEADERA, "", lStyle, 0, 0, 0, 0, 
+                                        hwnd, (HMENU)0, 
+                                        GetWindowLongA(hwnd, GWL_HINSTANCE),
                                         NULL);
     /* set header font */
-  SendMessage32A(infoPtr->hwndHeader, WM_SETFONT, (WPARAM32)infoPtr->hFont, 
+  SendMessageA(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, 
                  (LPARAM)TRUE);
 
   /* allocate memory */
@@ -2954,9 +2954,9 @@ static LRESULT LISTVIEW_Create(HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-LISTVIEW_Destroy (HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
+LISTVIEW_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLong32A(hwnd, 0);
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
 
     /* delete all items */
     LISTVIEW_DeleteAllItems(hwnd);
@@ -2966,12 +2966,12 @@ LISTVIEW_Destroy (HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
 
     /* destroy header */
     if (infoPtr->hwndHeader)
-	DestroyWindow32 (infoPtr->hwndHeader);
+	DestroyWindow (infoPtr->hwndHeader);
 
     /* destroy font */
-    infoPtr->hFont = (HFONT32)0;
+    infoPtr->hFont = (HFONT)0;
     if (infoPtr->hDefaultFont)
-	DeleteObject32 (infoPtr->hDefaultFont);
+	DeleteObject (infoPtr->hDefaultFont);
 
     infoPtr->nColumnWidth = 96;
 
@@ -2989,21 +2989,21 @@ LISTVIEW_Destroy (HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_EraseBackground(HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
+static LRESULT LISTVIEW_EraseBackground(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  BOOL32 bResult;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  BOOL bResult;
 
   if (infoPtr->clrBk == CLR_NONE) 
-    bResult = SendMessage32A(GetParent32(hwnd), WM_ERASEBKGND, wParam, lParam);
+    bResult = SendMessageA(GetParent(hwnd), WM_ERASEBKGND, wParam, lParam);
   else 
   {
-    HBRUSH32 hBrush = CreateSolidBrush32(infoPtr->clrBk);
-    RECT32   clientRect;
+    HBRUSH hBrush = CreateSolidBrush(infoPtr->clrBk);
+    RECT   clientRect;
 
-    GetClientRect32(hwnd, &clientRect);
-    FillRect32((HDC32)wParam, &clientRect, hBrush);
-    DeleteObject32(hBrush);
+    GetClientRect(hwnd, &clientRect);
+    FillRect((HDC)wParam, &clientRect, hBrush);
+    DeleteObject(hBrush);
     bResult = TRUE;
   }
 
@@ -3020,9 +3020,9 @@ static LRESULT LISTVIEW_EraseBackground(HWND32 hwnd, WPARAM32 wParam, LPARAM lPa
  * RETURN:
  * Font handle.
  */
-static LRESULT LISTVIEW_GetFont(HWND32 hwnd)
+static LRESULT LISTVIEW_GetFont(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 
   return infoPtr->hFont;
 }
@@ -3040,16 +3040,16 @@ static LRESULT LISTVIEW_GetFont(HWND32 hwnd)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_HScroll(HWND32 hwnd, INT32 nScrollCode, 
-                                INT32 nScrollPos, HWND32 hScrollWnd)
+static LRESULT LISTVIEW_HScroll(HWND hwnd, INT nScrollCode, 
+                                INT nScrollPos, HWND hScrollWnd)
 {
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nHScrollPos;
-  INT32 nMinRange;
-  INT32 nMaxRange;
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nHScrollPos;
+  INT nMinRange;
+  INT nMaxRange;
 
-  GetScrollRange32(hwnd, SB_HORZ, &nMinRange, &nMaxRange);
-  nHScrollPos = GetScrollPos32(hwnd, SB_HORZ);
+  GetScrollRange(hwnd, SB_HORZ, &nMinRange, &nMaxRange);
+  nHScrollPos = GetScrollPos(hwnd, SB_HORZ);
 
   if (lStyle & LVS_LIST)
   {
@@ -3076,11 +3076,11 @@ static LRESULT LISTVIEW_HScroll(HWND32 hwnd, INT32 nScrollCode,
     break;
     }
 
-    SetScrollPos32(hwnd, SB_HORZ, nHScrollPos, TRUE);
+    SetScrollPos(hwnd, SB_HORZ, nHScrollPos, TRUE);
 
     /* refresh client area */
-    InvalidateRect32(hwnd, NULL, TRUE);
-    UpdateWindow32(hwnd);
+    InvalidateRect(hwnd, NULL, TRUE);
+    UpdateWindow(hwnd);
   }
 
   return 0;
@@ -3098,16 +3098,16 @@ static LRESULT LISTVIEW_HScroll(HWND32 hwnd, INT32 nScrollCode,
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_KeyDown(HWND32 hwnd, INT32 nVirtualKey, LONG lKeyData)
+static LRESULT LISTVIEW_KeyDown(HWND hwnd, INT nVirtualKey, LONG lKeyData)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
-  HWND32 hwndParent = GetParent32(hwnd);
-  INT32 nItemCountPerColumn;
-  INT32 nItemCountPerRow;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
+  HWND hwndParent = GetParent(hwnd);
+  INT nItemCountPerColumn;
+  INT nItemCountPerRow;
   NMHDR nmh;
-  INT32 nColumn;
+  INT nColumn;
 /*   NMLVKEYDOWN nmKeyDown; */
 
   /* send LVN_KEYDOWN notification */
@@ -3126,11 +3126,11 @@ static LRESULT LISTVIEW_KeyDown(HWND32 hwnd, INT32 nVirtualKey, LONG lKeyData)
     {
       /* send NM_RETURN notification */
       nmh.code = NM_RETURN;
-      SendMessage32A(hwndParent, WM_NOTIFY, (WPARAM32)lCtrlId, (LPARAM)&nmh);
+      SendMessageA(hwndParent, WM_NOTIFY, (WPARAM)lCtrlId, (LPARAM)&nmh);
 
       /* send LVN_ITEMACTIVATE notification */
       nmh.code = LVN_ITEMACTIVATE;
-      SendMessage32A(hwndParent, WM_NOTIFY, (WPARAM32)lCtrlId, (LPARAM)&nmh);
+      SendMessageA(hwndParent, WM_NOTIFY, (WPARAM)lCtrlId, (LPARAM)&nmh);
     }
     break;
 
@@ -3187,8 +3187,8 @@ static LRESULT LISTVIEW_KeyDown(HWND32 hwnd, INT32 nVirtualKey, LONG lKeyData)
         LISTVIEW_SetItemStates(hwnd, infoPtr->nFocusedItem, TRUE, FALSE);
 
         /* refresh display */
-        InvalidateRect32(hwnd, NULL, FALSE);
-        UpdateWindow32(hwnd);
+        InvalidateRect(hwnd, NULL, FALSE);
+        UpdateWindow(hwnd);
       }
     }
     break;
@@ -3242,8 +3242,8 @@ static LRESULT LISTVIEW_KeyDown(HWND32 hwnd, INT32 nVirtualKey, LONG lKeyData)
         LISTVIEW_SetItemStates(hwnd, infoPtr->nFocusedItem, TRUE, FALSE);
 
         /* refresh display */
-        InvalidateRect32(hwnd, NULL, FALSE);
-        UpdateWindow32(hwnd);
+        InvalidateRect(hwnd, NULL, FALSE);
+        UpdateWindow(hwnd);
 }
 
     }
@@ -3293,16 +3293,16 @@ static LRESULT LISTVIEW_KeyDown(HWND32 hwnd, INT32 nVirtualKey, LONG lKeyData)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_KillFocus(HWND32 hwnd)
+static LRESULT LISTVIEW_KillFocus(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLong32A(hwnd, 0);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
     NMHDR nmh;
 
   nmh.hwndFrom = hwnd;
   nmh.idFrom = lCtrlId;
     nmh.code = NM_KILLFOCUS;
-  SendMessage32A(GetParent32(hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+  SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                  (LPARAM)&nmh);
 
   /* set window focus flag */
@@ -3324,22 +3324,22 @@ static LRESULT LISTVIEW_KillFocus(HWND32 hwnd)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_LButtonDblClk(HWND32 hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_LButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX, 
                                       WORD wPosY)
 {
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
   NMHDR nmh;
 
   /* send NM_DBLCLK notification */
   nmh.hwndFrom = hwnd;
   nmh.idFrom = lCtrlId;
   nmh.code = NM_DBLCLK;
-  SendMessage32A(GetParent32 (hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+  SendMessageA(GetParent (hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                  (LPARAM)&nmh);
 
   /* send LVN_ITEMACTIVATE notification */
   nmh.code = LVN_ITEMACTIVATE;
-  SendMessage32A(GetParent32 (hwnd), WM_NOTIFY, (WPARAM32)lCtrlId,
+  SendMessageA(GetParent (hwnd), WM_NOTIFY, (WPARAM)lCtrlId,
                  (LPARAM)&nmh);
 
   return 0;
@@ -3358,25 +3358,25 @@ static LRESULT LISTVIEW_LButtonDblClk(HWND32 hwnd, WORD wKey, WORD wPosX,
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_LButtonDown(HWND32 hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_LButtonDown(HWND hwnd, WORD wKey, WORD wPosX, 
                                     WORD wPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
   LVHITTESTINFO hitTestInfo;
-  LVITEM32A lvItem;
+  LVITEMA lvItem;
   NMHDR nmh;
-  INT32 nItem;
+  INT nItem;
 
   /* send NM_RELEASEDCAPTURE notification */ 
   nmh.hwndFrom = hwnd;
   nmh.idFrom = lCtrlId;
   nmh.code = NM_RELEASEDCAPTURE;
-  SendMessage32A(GetParent32(hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+  SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                  (LPARAM)&nmh);
 
   if (infoPtr->bFocus == FALSE)
-    SetFocus32(hwnd);
+    SetFocus(hwnd);
 
   /* set left button down flag */
   infoPtr->bLButtonDown = TRUE;
@@ -3386,7 +3386,7 @@ static LRESULT LISTVIEW_LButtonDown(HWND32 hwnd, WORD wKey, WORD wPosX,
   hitTestInfo.pt.y = wPosY;
   
   /* perform hit test */
-  nItem = SendMessage32A(hwnd, LVM_HITTEST, (WPARAM32)0, (LPARAM)&hitTestInfo);
+  nItem = SendMessageA(hwnd, LVM_HITTEST, (WPARAM)0, (LPARAM)&hitTestInfo);
     if ((nItem >= 0) && (nItem < infoPtr->nItemCount))
   {
     /* perform state changes (selection and focus) */
@@ -3402,21 +3402,21 @@ static LRESULT LISTVIEW_LButtonDown(HWND32 hwnd, WORD wKey, WORD wPosX,
     else
     {
       /* refresh display */
-      InvalidateRect32(hwnd, NULL, FALSE);
-      UpdateWindow32(hwnd);
+      InvalidateRect(hwnd, NULL, FALSE);
+      UpdateWindow(hwnd);
     }
   }
   else
   {
     /* clear selection(s) */
-    ZeroMemory(&lvItem, sizeof(LVITEM32A));
+    ZeroMemory(&lvItem, sizeof(LVITEMA));
     lvItem.stateMask = LVIS_SELECTED;
     lvItem.state = 0;
-    SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)-1, (LPARAM)&lvItem);
+    SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)-1, (LPARAM)&lvItem);
 
     /* repaint everything */
-    InvalidateRect32(hwnd, NULL, FALSE);
-    UpdateWindow32(hwnd);
+    InvalidateRect(hwnd, NULL, FALSE);
+    UpdateWindow(hwnd);
   }
 
   return 0;
@@ -3435,11 +3435,11 @@ static LRESULT LISTVIEW_LButtonDown(HWND32 hwnd, WORD wKey, WORD wPosX,
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_LButtonUp(HWND32 hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_LButtonUp(HWND hwnd, WORD wKey, WORD wPosX, 
                                   WORD wPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
   NMHDR nmh;
 
   if (infoPtr->bLButtonDown == TRUE) 
@@ -3448,7 +3448,7 @@ static LRESULT LISTVIEW_LButtonUp(HWND32 hwnd, WORD wKey, WORD wPosX,
     nmh.hwndFrom = hwnd;
     nmh.idFrom = lCtrlId;
     nmh.code = NM_CLICK;
-    SendMessage32A(GetParent32 (hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+    SendMessageA(GetParent (hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                      (LPARAM)&nmh);
   }
 
@@ -3470,26 +3470,26 @@ static LRESULT LISTVIEW_LButtonUp(HWND32 hwnd, WORD wKey, WORD wPosX,
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_NCCreate(HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
+static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
     LISTVIEW_INFO *infoPtr;
 
     /* allocate memory for info structure */
     infoPtr = (LISTVIEW_INFO *)COMCTL32_Alloc (sizeof(LISTVIEW_INFO));
-  SetWindowLong32A(hwnd, 0, (LONG)infoPtr);
+  SetWindowLongA(hwnd, 0, (LONG)infoPtr);
   if (infoPtr == NULL) 
   {
 	ERR (listview, "could not allocate info memory!\n");
 	return 0;
     }
 
-  if ((LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0) != infoPtr) 
+  if ((LISTVIEW_INFO *)GetWindowLongA(hwnd, 0) != infoPtr) 
   {
 	ERR (listview, "pointer assignment error!\n");
 	return 0;
     }
 
-  return DefWindowProc32A(hwnd, WM_NCCREATE, wParam, lParam);
+  return DefWindowProcA(hwnd, WM_NCCREATE, wParam, lParam);
 }
 
 /***
@@ -3502,9 +3502,9 @@ static LRESULT LISTVIEW_NCCreate(HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_NCDestroy(HWND32 hwnd)
+static LRESULT LISTVIEW_NCDestroy(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 
     /* free list view info data */
     COMCTL32_Free (infoPtr);
@@ -3524,9 +3524,9 @@ static LRESULT LISTVIEW_NCDestroy(HWND32 hwnd)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_Notify(HWND32 hwnd, INT32 nCtrlId, LPNMHDR lpnmh)
+static LRESULT LISTVIEW_Notify(HWND hwnd, INT nCtrlId, LPNMHDR lpnmh)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 
   if (lpnmh->hwndFrom == infoPtr->hwndHeader) 
   {
@@ -3553,15 +3553,15 @@ static LRESULT LISTVIEW_Notify(HWND32 hwnd, INT32 nCtrlId, LPNMHDR lpnmh)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_Paint(HWND32 hwnd, HDC32 hdc)
+static LRESULT LISTVIEW_Paint(HWND hwnd, HDC hdc)
 {
-    PAINTSTRUCT32 ps;
+    PAINTSTRUCT ps;
 
   if (hdc == 0)
   {
-    hdc = BeginPaint32(hwnd, &ps);
+    hdc = BeginPaint(hwnd, &ps);
     LISTVIEW_Refresh(hwnd, hdc);
-    EndPaint32(hwnd, &ps);
+    EndPaint(hwnd, &ps);
 }
   else
     LISTVIEW_Refresh(hwnd, hdc);
@@ -3582,22 +3582,22 @@ static LRESULT LISTVIEW_Paint(HWND32 hwnd, HDC32 hdc)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_RButtonDblClk(HWND32 hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_RButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX, 
                                       WORD wPosY)
 {
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
   NMHDR nmh;
 
   /* send NM_RELEASEDCAPTURE notification */ 
   nmh.hwndFrom = hwnd;
   nmh.idFrom = lCtrlId;
   nmh.code = NM_RELEASEDCAPTURE;
-  SendMessage32A(GetParent32(hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+  SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                  (LPARAM)&nmh);
 
   /* send NM_RDBLCLK notification */
   nmh.code = NM_RDBLCLK;
-  SendMessage32A(GetParent32(hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+  SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                  (LPARAM)&nmh);
 
     return 0;
@@ -3616,15 +3616,15 @@ static LRESULT LISTVIEW_RButtonDblClk(HWND32 hwnd, WORD wKey, WORD wPosX,
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_RButtonDown(HWND32 hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_RButtonDown(HWND hwnd, WORD wKey, WORD wPosX, 
                                     WORD wPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
   LVHITTESTINFO hitTestInfo;
   NMHDR nmh;
-  LVITEM32A lvItem;
-  INT32 nItem;
+  LVITEMA lvItem;
+  INT nItem;
 
   /* The syslistview32 control sends a NM_RELEASEDCAPTURE notification.
      I do not know why, but I decided to send it as well for compatibility 
@@ -3633,12 +3633,12 @@ static LRESULT LISTVIEW_RButtonDown(HWND32 hwnd, WORD wKey, WORD wPosX,
   nmh.hwndFrom = hwnd;
   nmh.idFrom = lCtrlId;
   nmh.code = NM_RELEASEDCAPTURE;
-  SendMessage32A(GetParent32(hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+  SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                  (LPARAM)&nmh);
  
   /* make sure listview control has focus */
   if (infoPtr->bFocus == FALSE)
-    SetFocus32(hwnd);
+    SetFocus(hwnd);
 
   /* set left button down flag */
   infoPtr->bRButtonDown = TRUE;
@@ -3648,7 +3648,7 @@ static LRESULT LISTVIEW_RButtonDown(HWND32 hwnd, WORD wKey, WORD wPosX,
   hitTestInfo.pt.y = wPosY;
 
   /* perform hit test */
-  nItem = SendMessage32A(hwnd, LVM_HITTEST, (WPARAM32)0, (LPARAM)&hitTestInfo);
+  nItem = SendMessageA(hwnd, LVM_HITTEST, (WPARAM)0, (LPARAM)&hitTestInfo);
   if ((nItem >= 0) && (nItem < infoPtr->nItemCount))
   {
     /* perform state changes (selection and focus) */
@@ -3658,15 +3658,15 @@ static LRESULT LISTVIEW_RButtonDown(HWND32 hwnd, WORD wKey, WORD wPosX,
   else
   {
     /* clear selection(s) */
-    ZeroMemory(&lvItem, sizeof(LVITEM32A));
+    ZeroMemory(&lvItem, sizeof(LVITEMA));
     lvItem.stateMask = LVIS_SELECTED;
     lvItem.state = 0;
-    SendMessage32A(hwnd, LVM_SETITEMSTATE, (WPARAM32)-1, (LPARAM)&lvItem);
+    SendMessageA(hwnd, LVM_SETITEMSTATE, (WPARAM)-1, (LPARAM)&lvItem);
   }
 
   /* repaint everything */
-  InvalidateRect32(hwnd, NULL, FALSE);
-  UpdateWindow32(hwnd);
+  InvalidateRect(hwnd, NULL, FALSE);
+  UpdateWindow(hwnd);
 
     return 0;
 }
@@ -3684,11 +3684,11 @@ static LRESULT LISTVIEW_RButtonDown(HWND32 hwnd, WORD wKey, WORD wPosX,
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_RButtonUp(HWND32 hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_RButtonUp(HWND hwnd, WORD wKey, WORD wPosX, 
                                   WORD wPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
     NMHDR nmh;
 
   if (infoPtr->bRButtonDown == TRUE) 
@@ -3698,7 +3698,7 @@ static LRESULT LISTVIEW_RButtonUp(HWND32 hwnd, WORD wKey, WORD wPosX,
     nmh.hwndFrom = hwnd;
     nmh.idFrom = lCtrlId;
     nmh.code = NM_RCLICK;
-    SendMessage32A(GetParent32 (hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+    SendMessageA(GetParent (hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                    (LPARAM)&nmh);
   }
 
@@ -3719,17 +3719,17 @@ static LRESULT LISTVIEW_RButtonUp(HWND32 hwnd, WORD wKey, WORD wPosX,
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_SetFocus(HWND32 hwnd, HWND32 hwndLoseFocus)
+static LRESULT LISTVIEW_SetFocus(HWND hwnd, HWND hwndLoseFocus)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lCtrlId = GetWindowLong32A(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
   NMHDR nmh;
     
   /* send NM_SETFOCUS notification */
   nmh.hwndFrom = hwnd;
   nmh.idFrom = lCtrlId;
   nmh.code = NM_SETFOCUS;
-  SendMessage32A(GetParent32(hwnd), WM_NOTIFY, (WPARAM32)lCtrlId, 
+  SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                  (LPARAM)&nmh);
 
   /* set window focus flag */
@@ -3750,10 +3750,10 @@ static LRESULT LISTVIEW_SetFocus(HWND32 hwnd, HWND32 hwndLoseFocus)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_SetFont(HWND32 hwnd, HFONT32 hFont, WORD fRedraw)
+static LRESULT LISTVIEW_SetFont(HWND hwnd, HFONT hFont, WORD fRedraw)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
 
   if (hFont == 0)
   {
@@ -3767,15 +3767,15 @@ static LRESULT LISTVIEW_SetFont(HWND32 hwnd, HFONT32 hFont, WORD fRedraw)
   if (lStyle & LVS_REPORT)
   {
     /* set font of header */
-    SendMessage32A(infoPtr->hwndHeader, WM_SETFONT, (WPARAM32)hFont, 
+    SendMessageA(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)hFont, 
                    MAKELPARAM(fRedraw, 0));
 }
 
   /* invalidate listview control client area */
-  InvalidateRect32(hwnd, NULL, FALSE);
+  InvalidateRect(hwnd, NULL, FALSE);
 
   if (fRedraw == TRUE)
-    UpdateWindow32(hwnd);
+    UpdateWindow(hwnd);
 
   return 0;
 }
@@ -3792,31 +3792,31 @@ static LRESULT LISTVIEW_SetFont(HWND32 hwnd, HFONT32 hFont, WORD fRedraw)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_Size(HWND32 hwnd, WORD wWidth, WORD wHeight)
+static LRESULT LISTVIEW_Size(HWND hwnd, WORD wWidth, WORD wHeight)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLong32A(hwnd, 0);
-  LONG lStyle = GetWindowLong32A(hwnd, GWL_STYLE);
-  INT32 nHScrollHeight;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  INT nHScrollHeight;
 
   if (lStyle & LVS_LIST)
   {
     if (!(lStyle & WS_HSCROLL))
     {
-      nHScrollHeight = GetSystemMetrics32(SM_CYHSCROLL);
+      nHScrollHeight = GetSystemMetrics(SM_CYHSCROLL);
       if (wHeight > nHScrollHeight)
         wHeight -= nHScrollHeight;
     }
 
-    infoPtr->nHeight = (INT32)wHeight;
-    infoPtr->nWidth = (INT32)wWidth;
+    infoPtr->nHeight = (INT)wHeight;
+    infoPtr->nWidth = (INT)wWidth;
   }
 
   /* set scrollbar(s) if needed */
   LISTVIEW_SetScroll(hwnd);
 
   /* refresh client area */
-  InvalidateRect32(hwnd, NULL, TRUE);
-  UpdateWindow32(hwnd);
+  InvalidateRect(hwnd, NULL, TRUE);
+  UpdateWindow(hwnd);
 
     return 0;
 }
@@ -3834,16 +3834,16 @@ static LRESULT LISTVIEW_Size(HWND32 hwnd, WORD wWidth, WORD wHeight)
  * RETURN:
  * 
  */
-LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
+LRESULT WINAPI LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
                                    LPARAM lParam)
 {
     switch (uMsg)
     {
   case LVM_APPROXIMATEVIEWRECT: 
-    return LISTVIEW_ApproximateViewRect(hwnd, (INT32)wParam, 
+    return LISTVIEW_ApproximateViewRect(hwnd, (INT)wParam, 
                                         LOWORD(lParam), HIWORD(lParam));
   case LVM_ARRANGE: 
-    return LISTVIEW_Arrange(hwnd, (INT32)wParam);
+    return LISTVIEW_Arrange(hwnd, (INT)wParam);
 
 /*	case LVM_CREATEDRAGIMAGE: */
 
@@ -3851,16 +3851,16 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
     return LISTVIEW_DeleteAllItems(hwnd);
 
 	case LVM_DELETECOLUMN:
-    return LISTVIEW_DeleteColumn(hwnd, (INT32)wParam);
+    return LISTVIEW_DeleteColumn(hwnd, (INT)wParam);
 
 	case LVM_DELETEITEM:
-    return LISTVIEW_DeleteItem(hwnd, (INT32)wParam);
+    return LISTVIEW_DeleteItem(hwnd, (INT)wParam);
 
 /*	case LVM_EDITLABEL: */
 /*	case LVM_ENSUREVISIBLE: */
 
-  case LVM_FINDITEM32A:
-    return LISTVIEW_FindItem(hwnd, (INT32)wParam, (LPLVFINDINFO)lParam);
+  case LVM_FINDITEMA:
+    return LISTVIEW_FindItem(hwnd, (INT)wParam, (LPLVFINDINFO)lParam);
 
 	case LVM_GETBKCOLOR:
     return LISTVIEW_GetBkColor(hwnd);
@@ -3868,14 +3868,14 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
 /*	case LVM_GETBKIMAGE: */
 /*	case LVM_GETCALLBACKMASK: */
 
-	case LVM_GETCOLUMN32A:
-    return LISTVIEW_GetColumn32A(hwnd, (INT32)wParam, (LPLVCOLUMN32A)lParam);
+	case LVM_GETCOLUMNA:
+    return LISTVIEW_GetColumnA(hwnd, (INT)wParam, (LPLVCOLUMNA)lParam);
 
 /*	case LVM_GETCOLUMN32W: */
 /*	case LVM_GETCOLUMNORDERARRAY: */
 
 	case LVM_GETCOLUMNWIDTH:
-    return LISTVIEW_GetColumnWidth(hwnd, (INT32)wParam);
+    return LISTVIEW_GetColumnWidth(hwnd, (INT)wParam);
 
   case LVM_GETCOUNTPERPAGE:
     return LISTVIEW_GetCountPerPage(hwnd);
@@ -3891,12 +3891,12 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
 /*	case LVM_GETHOVERTIME: */
 
 	case LVM_GETIMAGELIST:
-    return LISTVIEW_GetImageList(hwnd, (INT32)wParam);
+    return LISTVIEW_GetImageList(hwnd, (INT)wParam);
 
 /*	case LVM_GETISEARCHSTRING: */
 
-	case LVM_GETITEM32A:
-    return LISTVIEW_GetItem32A(hwnd, (LPLVITEM32A)lParam);
+	case LVM_GETITEMA:
+    return LISTVIEW_GetItemA(hwnd, (LPLVITEMA)lParam);
 
 /*	case LVM_GETITEM32W: */
 
@@ -3904,29 +3904,29 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
     return LISTVIEW_GetItemCount(hwnd);
 
 	case LVM_GETITEMPOSITION:
-    return LISTVIEW_GetItemPosition(hwnd, (INT32)wParam, (LPPOINT32)lParam);
+    return LISTVIEW_GetItemPosition(hwnd, (INT)wParam, (LPPOINT)lParam);
 
   case LVM_GETITEMRECT: 
-    return LISTVIEW_GetItemRect(hwnd, (INT32)wParam, (LPRECT32)lParam);
+    return LISTVIEW_GetItemRect(hwnd, (INT)wParam, (LPRECT)lParam);
 
   case LVM_GETITEMSPACING: 
-    return LISTVIEW_GetItemSpacing(hwnd, (BOOL32)wParam);
+    return LISTVIEW_GetItemSpacing(hwnd, (BOOL)wParam);
 
   case LVM_GETITEMSTATE: 
-    return LISTVIEW_GetItemState(hwnd, (INT32)wParam, (UINT32)lParam);
+    return LISTVIEW_GetItemState(hwnd, (INT)wParam, (UINT)lParam);
     
-	case LVM_GETITEMTEXT32A:
-    LISTVIEW_GetItemText32A(hwnd, (INT32)wParam, (LPLVITEM32A)lParam);
+	case LVM_GETITEMTEXTA:
+    LISTVIEW_GetItemTextA(hwnd, (INT)wParam, (LPLVITEMA)lParam);
     break;
 
 /*	case LVM_GETITEMTEXT32W: */
 
 	case LVM_GETNEXTITEM:
-    return LISTVIEW_GetNextItem(hwnd, (INT32)wParam, LOWORD(lParam));
+    return LISTVIEW_GetNextItem(hwnd, (INT)wParam, LOWORD(lParam));
 
 /*	case LVM_GETNUMBEROFWORKAREAS: */
   case LVM_GETORIGIN:
-    return LISTVIEW_GetOrigin(hwnd, (LPPOINT32)lParam);
+    return LISTVIEW_GetOrigin(hwnd, (LPPOINT)lParam);
 
 	case LVM_GETSELECTEDCOUNT:
     return LISTVIEW_GetSelectedCount(hwnd);
@@ -3934,8 +3934,8 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
   case LVM_GETSELECTIONMARK: 
     return LISTVIEW_GetSelectionMark(hwnd);
 
-	case LVM_GETSTRINGWIDTH32A:
-    return LISTVIEW_GetStringWidth32A (hwnd, (LPCSTR)lParam);
+	case LVM_GETSTRINGWIDTHA:
+    return LISTVIEW_GetStringWidthA (hwnd, (LPCSTR)lParam);
 
 /*	case LVM_GETSTRINGWIDTH32W: */
 /*	case LVM_GETSUBITEMRECT: */
@@ -3951,29 +3951,29 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
 /*	case LVM_GETUNICODEFORMAT: */
 
   case LVM_GETVIEWRECT:
-    return LISTVIEW_GetViewRect(hwnd, (LPRECT32)lParam);
+    return LISTVIEW_GetViewRect(hwnd, (LPRECT)lParam);
 
 /*	case LVM_GETWORKAREAS: */
 
 	case LVM_HITTEST:
     return LISTVIEW_HitTest(hwnd, (LPLVHITTESTINFO)lParam);
 
-	case LVM_INSERTCOLUMN32A:
-    return LISTVIEW_InsertColumn32A(hwnd, (INT32)wParam, 
-                                    (LPLVCOLUMN32A)lParam);
+	case LVM_INSERTCOLUMNA:
+    return LISTVIEW_InsertColumnA(hwnd, (INT)wParam, 
+                                    (LPLVCOLUMNA)lParam);
 
 /*	case LVM_INSERTCOLUMN32W: */
 
-	case LVM_INSERTITEM32A:
-    return LISTVIEW_InsertItem32A(hwnd, (LPLVITEM32A)lParam);
+	case LVM_INSERTITEMA:
+    return LISTVIEW_InsertItemA(hwnd, (LPLVITEMA)lParam);
 
 /*	case LVM_INSERTITEM32W: */
 
 	case LVM_REDRAWITEMS:
-    return LISTVIEW_RedrawItems(hwnd, (INT32)wParam, (INT32)lParam);
+    return LISTVIEW_RedrawItems(hwnd, (INT)wParam, (INT)lParam);
 
   case LVM_SCROLL: 
-    return LISTVIEW_Scroll(hwnd, (INT32)wParam, (INT32)lParam);
+    return LISTVIEW_Scroll(hwnd, (INT)wParam, (INT)lParam);
 
 	case LVM_SETBKCOLOR:
     return LISTVIEW_SetBkColor(hwnd, (COLORREF)lParam);
@@ -3981,8 +3981,8 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
 /*	case LVM_SETBKIMAGE: */
 /*	case LVM_SETCALLBACKMASK: */
 
-	case LVM_SETCOLUMN32A:
-    return LISTVIEW_SetColumn32A(hwnd, (INT32)wParam, (LPLVCOLUMN32A)lParam);
+	case LVM_SETCOLUMNA:
+    return LISTVIEW_SetColumnA(hwnd, (INT)wParam, (LPLVCOLUMNA)lParam);
 
 /*	case LVM_SETCOLUMN32W: */
 /*	case LVM_SETCOLUMNORDERARRAY: */
@@ -3994,23 +3994,23 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
 /*	case LVM_SETICONSPACING: */
 	
 	case LVM_SETIMAGELIST:
-    return LISTVIEW_SetImageList(hwnd, (INT32)wParam, (HIMAGELIST)lParam);
+    return LISTVIEW_SetImageList(hwnd, (INT)wParam, (HIMAGELIST)lParam);
 
-	case LVM_SETITEM32A:
-    return LISTVIEW_SetItem32A(hwnd, (LPLVITEM32A)lParam);
+	case LVM_SETITEMA:
+    return LISTVIEW_SetItemA(hwnd, (LPLVITEMA)lParam);
 
 /*	case LVM_SETITEM32W: */
 /*	case LVM_SETITEMCOUNT: */
 
-	case LVM_SETITEMPOSITION:
-    return LISTVIEW_SetItemPosition(hwnd, (INT32)wParam, 
-                                    (INT32)LOWORD(lParam), 
-                                    (INT32) HIWORD(lParam));
+	case LVM_SETITEMPOSITION16:
+    return LISTVIEW_SetItemPosition(hwnd, (INT)wParam, 
+                                    (INT)LOWORD(lParam), 
+                                    (INT) HIWORD(lParam));
 
 /*	case LVM_SETITEMPOSITION32: */
 
   case LVM_SETITEMSTATE: 
-    return LISTVIEW_SetItemState(hwnd, (INT32)wParam, (LPLVITEM32A)lParam);
+    return LISTVIEW_SetItemState(hwnd, (INT)wParam, (LPLVITEMA)lParam);
 
 /*	case LVM_SETITEMTEXT: */
 /*	case LVM_SETSELECTIONMARK: */
@@ -4031,7 +4031,7 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
 /*	case LVM_SUBITEMHITTEST: */
 
   case LVM_UPDATE: 
-    return LISTVIEW_Update(hwnd, (INT32)wParam);
+    return LISTVIEW_Update(hwnd, (INT)wParam);
 
 /*	case WM_CHAR: */
 /*	case WM_COMMAND: */
@@ -4052,11 +4052,11 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
     return LISTVIEW_GetFont(hwnd);
 
   case WM_HSCROLL:
-    return LISTVIEW_HScroll(hwnd, (INT32)LOWORD(wParam), 
-                            (INT32)HIWORD(wParam), (HWND32)lParam);
+    return LISTVIEW_HScroll(hwnd, (INT)LOWORD(wParam), 
+                            (INT)HIWORD(wParam), (HWND)lParam);
 
   case WM_KEYDOWN:
-    return LISTVIEW_KeyDown(hwnd, (INT32)wParam, (LONG)lParam);
+    return LISTVIEW_KeyDown(hwnd, (INT)wParam, (LONG)lParam);
 
 	case WM_KILLFOCUS:
     return LISTVIEW_KillFocus(hwnd);
@@ -4082,10 +4082,10 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
     return LISTVIEW_NCDestroy(hwnd);
 
 	case WM_NOTIFY:
-    return LISTVIEW_Notify(hwnd, (INT32)wParam, (LPNMHDR)lParam);
+    return LISTVIEW_Notify(hwnd, (INT)wParam, (LPNMHDR)lParam);
 
 	case WM_PAINT:
-    return LISTVIEW_Paint(hwnd, (HDC32)wParam); 
+    return LISTVIEW_Paint(hwnd, (HDC)wParam); 
 
 	case WM_RBUTTONDBLCLK:
     return LISTVIEW_RButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam), 
@@ -4100,10 +4100,10 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
                               HIWORD(lParam));
 
 	case WM_SETFOCUS:
-    return LISTVIEW_SetFocus(hwnd, (HWND32)wParam);
+    return LISTVIEW_SetFocus(hwnd, (HWND)wParam);
 
 	case WM_SETFONT:
-    return LISTVIEW_SetFont(hwnd, (HFONT32)wParam, (WORD)lParam);
+    return LISTVIEW_SetFont(hwnd, (HFONT)wParam, (WORD)lParam);
 
 /*	case WM_SETREDRAW: */
 
@@ -4121,7 +4121,7 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
 		     uMsg, wParam, lParam);
 
     /* call default window procedure */
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
 
     return 0;
@@ -4139,19 +4139,19 @@ LRESULT WINAPI LISTVIEW_WindowProc(HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
  */
 VOID LISTVIEW_Register(VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-  if (!GlobalFindAtom32A(WC_LISTVIEW32A)) 
+  if (!GlobalFindAtomA(WC_LISTVIEWA)) 
   {
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS;
-    wndClass.lpfnWndProc   = (WNDPROC32)LISTVIEW_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)LISTVIEW_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(LISTVIEW_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_WINDOW + 1);
-    wndClass.lpszClassName = WC_LISTVIEW32A;
-    RegisterClass32A (&wndClass);
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndClass.lpszClassName = WC_LISTVIEWA;
+    RegisterClassA (&wndClass);
 }
 }
 
@@ -4167,7 +4167,7 @@ VOID LISTVIEW_Register(VOID)
  */
 VOID LISTVIEW_Unregister(VOID)
 {
-    if (GlobalFindAtom32A (WC_LISTVIEW32A))
-	UnregisterClass32A (WC_LISTVIEW32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (WC_LISTVIEWA))
+	UnregisterClassA (WC_LISTVIEWA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 3ccc94656b3..c3a44556eed 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -28,7 +28,7 @@
 
 
 static LRESULT
-MONTHCAL_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+MONTHCAL_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     MONTHCAL_INFO *infoPtr;
 
@@ -55,7 +55,7 @@ MONTHCAL_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-MONTHCAL_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+MONTHCAL_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr(wndPtr);
 
@@ -74,7 +74,7 @@ MONTHCAL_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-MONTHCAL_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+MONTHCAL_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -92,7 +92,7 @@ MONTHCAL_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (monthcal, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -101,27 +101,27 @@ MONTHCAL_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 MONTHCAL_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (MONTHCAL_CLASS32A)) return;
+    if (GlobalFindAtomA (MONTHCAL_CLASSA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC32)MONTHCAL_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)MONTHCAL_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(MONTHCAL_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_WINDOW + 1);
-    wndClass.lpszClassName = MONTHCAL_CLASS32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndClass.lpszClassName = MONTHCAL_CLASSA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 MONTHCAL_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (MONTHCAL_CLASS32A))
-	UnregisterClass32A (MONTHCAL_CLASS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (MONTHCAL_CLASSA))
+	UnregisterClassA (MONTHCAL_CLASSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c
index 3877b44acb4..64d4afc52e8 100644
--- a/dlls/comctl32/nativefont.c
+++ b/dlls/comctl32/nativefont.c
@@ -25,7 +25,7 @@
 
 
 static LRESULT
-NATIVEFONT_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+NATIVEFONT_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     NATIVEFONT_INFO *infoPtr;
 
@@ -51,7 +51,7 @@ NATIVEFONT_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-NATIVEFONT_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+NATIVEFONT_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     NATIVEFONT_INFO *infoPtr = NATIVEFONT_GetInfoPtr(wndPtr);
 
@@ -67,7 +67,7 @@ NATIVEFONT_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-NATIVEFONT_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -83,7 +83,7 @@ NATIVEFONT_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	default:
 	    ERR (nativefont, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -92,27 +92,27 @@ NATIVEFONT_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 NATIVEFONT_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (WC_NATIVEFONTCTL32A)) return;
+    if (GlobalFindAtomA (WC_NATIVEFONTCTLA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC32)NATIVEFONT_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)NATIVEFONT_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(NATIVEFONT_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_WINDOW + 1);
-    wndClass.lpszClassName = WC_NATIVEFONTCTL32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndClass.lpszClassName = WC_NATIVEFONTCTLA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 NATIVEFONT_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (WC_NATIVEFONTCTL32A))
-	UnregisterClass32A (WC_NATIVEFONTCTL32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (WC_NATIVEFONTCTLA))
+	UnregisterClassA (WC_NATIVEFONTCTLA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index cae056c8ece..1946268917d 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -23,18 +23,18 @@
 
 
 static __inline__ LRESULT
-PAGER_ForwardMouse (WND *wndPtr, WPARAM32 wParam)
+PAGER_ForwardMouse (WND *wndPtr, WPARAM wParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
 
-    infoPtr->bForward = (BOOL32)wParam;
+    infoPtr->bForward = (BOOL)wParam;
 
     return 0;
 }
 
 
 static __inline__ LRESULT
-PAGER_GetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_GetBkColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
 
@@ -43,7 +43,7 @@ PAGER_GetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static __inline__ LRESULT
-PAGER_GetBorder (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_GetBorder (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
 
@@ -52,7 +52,7 @@ PAGER_GetBorder (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static __inline__ LRESULT
-PAGER_GetButtonSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_GetButtonSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
 
@@ -61,7 +61,7 @@ PAGER_GetButtonSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-PAGER_GetButtonState (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_GetButtonState (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr); */
 
@@ -75,7 +75,7 @@ PAGER_GetButtonState (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static __inline__ LRESULT
-PAGER_GetPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_GetPos (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
 
@@ -84,7 +84,7 @@ PAGER_GetPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-PAGER_RecalcSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_RecalcSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
     NMPGCALCSIZE nmpgcs;
@@ -96,8 +96,8 @@ PAGER_RecalcSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	nmpgcs.hdr.code = PGN_CALCSIZE;
 	nmpgcs.dwFlag =
 	     (wndPtr->dwStyle & PGS_HORZ) ? PGF_CALCWIDTH : PGF_CALCHEIGHT;
-	SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-			(WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmpgcs);
+	SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+			(WPARAM)wndPtr->wIDmenu, (LPARAM)&nmpgcs);
 
 	infoPtr->nChildSize =
 	     (wndPtr->dwStyle & PGS_HORZ) ? nmpgcs.iWidth : nmpgcs.iHeight;
@@ -113,7 +113,7 @@ PAGER_RecalcSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static __inline__ LRESULT
-PAGER_SetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_SetBkColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
     COLORREF clrTemp = infoPtr->clrBk;
@@ -127,12 +127,12 @@ PAGER_SetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static __inline__ LRESULT
-PAGER_SetBorder (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_SetBorder (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
-    INT32 nTemp = infoPtr->nBorder;
+    INT nTemp = infoPtr->nBorder;
 
-    infoPtr->nBorder = (INT32)lParam;
+    infoPtr->nBorder = (INT)lParam;
 
     /* FIXME: redraw */
 
@@ -141,12 +141,12 @@ PAGER_SetBorder (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static __inline__ LRESULT
-PAGER_SetButtonSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_SetButtonSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
-    INT32 nTemp = infoPtr->nButtonSize;
+    INT nTemp = infoPtr->nButtonSize;
 
-    infoPtr->nButtonSize = (INT32)lParam;
+    infoPtr->nButtonSize = (INT)lParam;
 
     FIXME (pager, "size=%d\n", infoPtr->nButtonSize);
 
@@ -157,18 +157,18 @@ PAGER_SetButtonSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static __inline__ LRESULT
-PAGER_SetChild (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_SetChild (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
 
-    infoPtr->hwndChild = IsWindow32 ((HWND32)lParam) ? (HWND32)lParam : 0;
+    infoPtr->hwndChild = IsWindow ((HWND)lParam) ? (HWND)lParam : 0;
 
     FIXME (pager, "hwnd=%x\n", infoPtr->hwndChild);
 
     /* FIXME: redraw */
     if (infoPtr->hwndChild) {
-	SetParent32 (infoPtr->hwndChild, wndPtr->hwndSelf);
-	SetWindowPos32 (infoPtr->hwndChild, HWND_TOP,
+	SetParent (infoPtr->hwndChild, wndPtr->hwndSelf);
+	SetWindowPos (infoPtr->hwndChild, HWND_TOP,
 			0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
     }
 
@@ -177,16 +177,16 @@ PAGER_SetChild (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static __inline__ LRESULT
-PAGER_SetPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_SetPos (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
 
-    infoPtr->nPos = (INT32)lParam;
+    infoPtr->nPos = (INT)lParam;
 
     FIXME (pager, "pos=%d\n", infoPtr->nPos);
 
     /* FIXME: redraw */
-    SetWindowPos32 (infoPtr->hwndChild, HWND_TOP,
+    SetWindowPos (infoPtr->hwndChild, HWND_TOP,
 		    0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
 
     return 0;
@@ -194,7 +194,7 @@ PAGER_SetPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-PAGER_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr;
 
@@ -213,8 +213,8 @@ PAGER_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     }
 
     /* set default settings */
-    infoPtr->hwndChild = (HWND32)NULL;
-    infoPtr->clrBk = GetSysColor32 (COLOR_BTNFACE);
+    infoPtr->hwndChild = (HWND)NULL;
+    infoPtr->clrBk = GetSysColor (COLOR_BTNFACE);
     infoPtr->nBorder = 0;
     infoPtr->nButtonSize = 0;
     infoPtr->nPos = 0;
@@ -225,7 +225,7 @@ PAGER_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-PAGER_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
 
@@ -240,15 +240,15 @@ PAGER_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-PAGER_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_EraseBackground (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
-    HBRUSH32 hBrush = CreateSolidBrush32 (infoPtr->clrBk);
-    RECT32 rect;
+    HBRUSH hBrush = CreateSolidBrush (infoPtr->clrBk);
+    RECT rect;
 
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
-    FillRect32 ((HDC32)wParam, &rect, hBrush);
-    DeleteObject32 (hBrush);
+    GetClientRect (wndPtr->hwndSelf, &rect);
+    FillRect ((HDC)wParam, &rect, hBrush);
+    DeleteObject (hBrush);
 
 /*    return TRUE; */
     return FALSE;
@@ -256,7 +256,7 @@ PAGER_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-PAGER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_MouseMove (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr); */
 
@@ -270,14 +270,14 @@ PAGER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-PAGER_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+PAGER_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
-    RECT32 rect;
+    RECT rect;
 
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
     if (infoPtr->hwndChild) {
-	SetWindowPos32 (infoPtr->hwndChild, HWND_TOP, rect.left, rect.top,
+	SetWindowPos (infoPtr->hwndChild, HWND_TOP, rect.left, rect.top,
 			rect.right - rect.left, rect.bottom - rect.top,
 			SWP_SHOWWINDOW);
 /*	MoveWindow32 (infoPtr->hwndChild, 1, 1, rect.right - 2, rect.bottom-2, TRUE); */
@@ -292,7 +292,7 @@ PAGER_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-PAGER_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -350,7 +350,7 @@ PAGER_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 
 	case WM_NOTIFY:
 	case WM_COMMAND:
-	    return SendMessage32A (wndPtr->parent->hwndSelf, uMsg, wParam, lParam);
+	    return SendMessageA (wndPtr->parent->hwndSelf, uMsg, wParam, lParam);
 
 /*	case WM_PAINT: */
 /*	    return PAGER_Paint (wndPtr, wParam); */
@@ -362,7 +362,7 @@ PAGER_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (pager, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -371,27 +371,27 @@ PAGER_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 PAGER_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (WC_PAGESCROLLER32A)) return;
+    if (GlobalFindAtomA (WC_PAGESCROLLERA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS;
-    wndClass.lpfnWndProc   = (WNDPROC32)PAGER_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)PAGER_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(PAGER_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
     wndClass.hbrBackground = 0;
-    wndClass.lpszClassName = WC_PAGESCROLLER32A;
+    wndClass.lpszClassName = WC_PAGESCROLLERA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 PAGER_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (WC_PAGESCROLLER32A))
-	UnregisterClass32A (WC_PAGESCROLLER32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (WC_PAGESCROLLERA))
+	UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index 7b17a70cbbb..5559d9620d4 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -29,33 +29,33 @@
  * Draws the progress bar.
  */
 static void
-PROGRESS_Draw (WND *wndPtr, HDC32 hdc)
+PROGRESS_Draw (WND *wndPtr, HDC hdc)
 {
   PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(wndPtr);
-  HBRUSH32 hbrBar, hbrBk;
+  HBRUSH hbrBar, hbrBk;
   int rightBar, rightMost, ledWidth;
-  RECT32 rect;
+  RECT rect;
 
   TRACE(progress, "refresh pos=%d min=%d, max=%d\n",
 	       infoPtr->CurVal, infoPtr->MinVal, infoPtr->MaxVal);
 
   /* get the required bar brush */
   if (infoPtr->ColorBar == CLR_DEFAULT)
-    hbrBar = GetSysColorBrush32(COLOR_HIGHLIGHT);
+    hbrBar = GetSysColorBrush(COLOR_HIGHLIGHT);
   else
-    hbrBar = CreateSolidBrush32 (infoPtr->ColorBar);
+    hbrBar = CreateSolidBrush (infoPtr->ColorBar);
 
   /* get the required background brush */
   if (infoPtr->ColorBk == CLR_DEFAULT)
-    hbrBk = GetSysColorBrush32 (COLOR_3DFACE);
+    hbrBk = GetSysColorBrush (COLOR_3DFACE);
   else
-    hbrBk = CreateSolidBrush32 (infoPtr->ColorBk);
+    hbrBk = CreateSolidBrush (infoPtr->ColorBk);
 
   /* get client rectangle */
-  GetClientRect32 (wndPtr->hwndSelf, &rect);
+  GetClientRect (wndPtr->hwndSelf, &rect);
 
   /* draw the background */
-  FillRect32(hdc, &rect, hbrBk);
+  FillRect(hdc, &rect, hbrBk);
 
   rect.left++; rect.right--; rect.top++; rect.bottom--;
 
@@ -63,19 +63,19 @@ PROGRESS_Draw (WND *wndPtr, HDC32 hdc)
   if (wndPtr->dwStyle & PBS_VERTICAL)
   {
     rightBar = rect.bottom - 
-      MulDiv32(infoPtr->CurVal-infoPtr->MinVal,
+      MulDiv(infoPtr->CurVal-infoPtr->MinVal,
 	       rect.bottom - rect.top,
 	       infoPtr->MaxVal-infoPtr->MinVal);
-    ledWidth = MulDiv32 ((rect.right - rect.left), 2, 3);
+    ledWidth = MulDiv ((rect.right - rect.left), 2, 3);
     rightMost = rect.top;
   }
   else
   {
     rightBar = rect.left + 
-      MulDiv32(infoPtr->CurVal-infoPtr->MinVal,
+      MulDiv(infoPtr->CurVal-infoPtr->MinVal,
 	       rect.right - rect.left,
 	       infoPtr->MaxVal-infoPtr->MinVal);
-    ledWidth = MulDiv32 ((rect.bottom - rect.top), 2, 3);
+    ledWidth = MulDiv ((rect.bottom - rect.top), 2, 3);
     rightMost = rect.right;
   }
 
@@ -86,7 +86,7 @@ PROGRESS_Draw (WND *wndPtr, HDC32 hdc)
       rect.top = rightBar;
     else
       rect.right = rightBar;
-    FillRect32(hdc, &rect, hbrBar);
+    FillRect(hdc, &rect, hbrBar);
   }
   else
   {
@@ -95,7 +95,7 @@ PROGRESS_Draw (WND *wndPtr, HDC32 hdc)
         rect.top = rect.bottom-ledWidth;
         if (rect.top < rightMost)
           rect.top = rightMost;
-        FillRect32(hdc, &rect, hbrBar);
+        FillRect(hdc, &rect, hbrBar);
         rect.bottom = rect.top-LED_GAP;
       }
     else
@@ -103,18 +103,18 @@ PROGRESS_Draw (WND *wndPtr, HDC32 hdc)
         rect.right = rect.left+ledWidth;
         if (rect.right > rightMost)
           rect.right = rightMost;
-        FillRect32(hdc, &rect, hbrBar);
+        FillRect(hdc, &rect, hbrBar);
         rect.left  = rect.right+LED_GAP;
       }
   }
 
   /* delete bar brush */
   if (infoPtr->ColorBar != CLR_DEFAULT)
-      DeleteObject32 (hbrBar);
+      DeleteObject (hbrBar);
 
   /* delete background brush */
   if (infoPtr->ColorBk != CLR_DEFAULT)
-      DeleteObject32 (hbrBk);
+      DeleteObject (hbrBk);
 }
 
 /***********************************************************************
@@ -124,11 +124,11 @@ PROGRESS_Draw (WND *wndPtr, HDC32 hdc)
 static void
 PROGRESS_Refresh (WND *wndPtr)
 {
-    HDC32 hdc;
+    HDC hdc;
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     PROGRESS_Draw (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 }
 
 /***********************************************************************
@@ -139,12 +139,12 @@ PROGRESS_Refresh (WND *wndPtr)
 static void
 PROGRESS_Paint (WND *wndPtr)
 {
-    PAINTSTRUCT32 ps;
-    HDC32 hdc;
+    PAINTSTRUCT ps;
+    HDC hdc;
 
-    hdc = BeginPaint32 (wndPtr->hwndSelf, &ps);
+    hdc = BeginPaint (wndPtr->hwndSelf, &ps);
     PROGRESS_Draw (wndPtr, hdc);
-    EndPaint32 (wndPtr->hwndSelf, &ps);
+    EndPaint (wndPtr->hwndSelf, &ps);
 }
 
 
@@ -167,13 +167,13 @@ static void PROGRESS_CoercePos(WND *wndPtr)
  *           PROGRESS_SetFont
  * Set new Font for progress bar
  */
-static HFONT32
-PROGRESS_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+static HFONT
+PROGRESS_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(wndPtr); 
-  HFONT32 hOldFont = infoPtr->hFont;
+  HFONT hOldFont = infoPtr->hFont;
 
-  infoPtr->hFont = (HFONT32)wParam;
+  infoPtr->hFont = (HFONT)wParam;
   if (LOWORD(lParam))
     PROGRESS_Refresh (wndPtr);
   return hOldFont;
@@ -183,12 +183,12 @@ PROGRESS_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /***********************************************************************
  *           ProgressWindowProc
  */
-LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message, 
-                                  WPARAM32 wParam, LPARAM lParam)
+LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, 
+                                  WPARAM wParam, LPARAM lParam)
 {
   WND *wndPtr = WIN_FindWndPtr(hwnd);
   PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(wndPtr); 
-  UINT32 temp;
+  UINT temp;
 
   switch(message)
     {
@@ -209,7 +209,7 @@ LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message,
       infoPtr->Step=10;
       infoPtr->ColorBar=CLR_DEFAULT;
       infoPtr->ColorBk=CLR_DEFAULT;
-      infoPtr->hFont=(HANDLE32)NULL;
+      infoPtr->hFont=(HANDLE)NULL;
       TRACE(progress, "Progress Ctrl creation, hwnd=%04x\n", hwnd);
       break;
     
@@ -256,9 +256,9 @@ LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message,
       }
       return temp;          
       
-    case PBM_SETRANGE:
+    case PBM_SETRANGE16:
       if (wParam)
-	UNKNOWN_PARAM(PBM_SETRANGE, wParam, lParam);
+	UNKNOWN_PARAM(PBM_SETRANGE16, wParam, lParam);
       temp = MAKELONG(infoPtr->MinVal, infoPtr->MaxVal);
       if(temp != lParam){
 	infoPtr->MinVal = LOWORD(lParam); 
@@ -288,12 +288,12 @@ LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message,
 	PROGRESS_Refresh (wndPtr);
       return temp;
 
-    case PBM_SETRANGE32:
+    case PBM_SETRANGE:
       temp = MAKELONG(infoPtr->MinVal, infoPtr->MaxVal);
-      if((infoPtr->MinVal != (INT32)wParam) ||
-         (infoPtr->MaxVal != (INT32)lParam)) {
-	infoPtr->MinVal = (INT32)wParam;
-	infoPtr->MaxVal = (INT32)lParam;
+      if((infoPtr->MinVal != (INT)wParam) ||
+         (infoPtr->MaxVal != (INT)lParam)) {
+	infoPtr->MinVal = (INT)wParam;
+	infoPtr->MaxVal = (INT)lParam;
 	if(infoPtr->MaxVal <= infoPtr->MinVal)
 	  infoPtr->MaxVal = infoPtr->MinVal+1;
 	PROGRESS_CoercePos(wndPtr);
@@ -331,7 +331,7 @@ LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message,
       if (message >= WM_USER) 
 	ERR(progress, "unknown msg %04x wp=%04x lp=%08lx\n", 
 		    message, wParam, lParam );
-      return DefWindowProc32A( hwnd, message, wParam, lParam ); 
+      return DefWindowProcA( hwnd, message, wParam, lParam ); 
     } 
 
     return 0;
@@ -347,19 +347,19 @@ LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message,
 VOID
 PROGRESS_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (PROGRESS_CLASS32A)) return;
+    if (GlobalFindAtomA (PROGRESS_CLASSA)) return;
 
-    ZeroMemory (&wndClass, sizeof( WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof( WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW;
-    wndClass.lpfnWndProc   = (WNDPROC32)ProgressWindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)ProgressWindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof (PROGRESS_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.lpszClassName = PROGRESS_CLASS32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.lpszClassName = PROGRESS_CLASSA;
 
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
@@ -372,7 +372,7 @@ PROGRESS_Register (VOID)
 VOID
 PROGRESS_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (PROGRESS_CLASS32A))
-	UnregisterClass32A (PROGRESS_CLASS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (PROGRESS_CLASSA))
+	UnregisterClassA (PROGRESS_CLASSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index ffe30f41f8c..45e6d2e1aa0 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -16,7 +16,7 @@
 
 
 LRESULT WINAPI
-PROPSHEET_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam);
+PROPSHEET_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 
 
@@ -27,20 +27,20 @@ PROPSHEET_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam);
 /*****************************************************************
  *            PropertySheet32A   (COMCTL32.84)(COMCTL32.83)
  */
-INT32 WINAPI PropertySheet32A(LPCPROPSHEETHEADER32A lppsh)
+INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh)
 {
-	HWND32 hwnd;
+	HWND hwnd;
 
     FIXME(propsheet, "(%p): stub\n", lppsh);
 
 	if (lppsh->dwFlags & PSH_MODELESS) {
-        hwnd = CreateDialogParam32A ( lppsh->hInstance, WC_PROPSHEET32A,
-                    lppsh->hwndParent, (DLGPROC32)PROPSHEET_WindowProc,
+        hwnd = CreateDialogParamA ( lppsh->hInstance, WC_PROPSHEETA,
+                    lppsh->hwndParent, (DLGPROC)PROPSHEET_WindowProc,
 		    (LPARAM) lppsh );
-		ShowWindow32 (hwnd, TRUE);
+		ShowWindow (hwnd, TRUE);
 	} else {
-		hwnd =  DialogBoxParam32A ( lppsh->hInstance, WC_PROPSHEET32A,
-                    lppsh->hwndParent, (DLGPROC32)PROPSHEET_WindowProc,
+		hwnd =  DialogBoxParamA ( lppsh->hInstance, WC_PROPSHEETA,
+                    lppsh->hwndParent, (DLGPROC)PROPSHEET_WindowProc,
 		    (LPARAM) lppsh );
 	}
     return hwnd;
@@ -49,7 +49,7 @@ INT32 WINAPI PropertySheet32A(LPCPROPSHEETHEADER32A lppsh)
 /*****************************************************************
  *            PropertySheet32W   (COMCTL32.85)
  */
-INT32 WINAPI PropertySheet32W(LPCPROPSHEETHEADER32W propertySheetHeader)
+INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW propertySheetHeader)
 {
     FIXME(propsheet, "(%p): stub\n", propertySheetHeader);
 
@@ -63,7 +63,7 @@ INT32 WINAPI PropertySheet32W(LPCPROPSHEETHEADER32W propertySheetHeader)
 /*****************************************************************
  *            CreatePropertySheetPage32A   (COMCTL32.19)(COMCTL32.18)
  */
-HPROPSHEETPAGE WINAPI CreatePropertySheetPage32A(LPCPROPSHEETPAGE32A lpPropSheetPage)
+HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(LPCPROPSHEETPAGEA lpPropSheetPage)
 {
     FIXME(propsheet, "(%p): stub\n", lpPropSheetPage);
 
@@ -73,7 +73,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPage32A(LPCPROPSHEETPAGE32A lpPropSheet
 /*****************************************************************
  *            CreatePropertySheetPage32W   (COMCTL32.20)
  */
-HPROPSHEETPAGE WINAPI CreatePropertySheetPage32W(LPCPROPSHEETPAGE32W lpPropSheetPage)
+HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage)
 {
     FIXME(propsheet, "(%p): stub\n", lpPropSheetPage);
 
@@ -83,7 +83,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPage32W(LPCPROPSHEETPAGE32W lpPropSheet
 /*****************************************************************
  *            DestroyPropertySheetPage32   (COMCTL32.24)
  */
-BOOL32 WINAPI DestroyPropertySheetPage32(HPROPSHEETPAGE hPropPage)
+BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage)
 {
     FIXME(propsheet, "(0x%08lx): stub\n", (DWORD)hPropPage);
     return FALSE;
@@ -92,7 +92,7 @@ BOOL32 WINAPI DestroyPropertySheetPage32(HPROPSHEETPAGE hPropPage)
 
 
 LRESULT WINAPI
-PROPSHEET_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+PROPSHEET_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     /* WND *wndPtr = WIN_FindWndPtr(hwnd); */
 
@@ -127,10 +127,10 @@ PROPSHEET_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
        case PSM_APPLY:
            FIXME (propsheet, "Unimplemented msg PSM_APPLY\n");
            return 0;
-       case PSM_SETTITLE32A:
+       case PSM_SETTITLEA:
            FIXME (propsheet, "Unimplemented msg PSM_SETTITLE32A\n");
            return 0;
-       case PSM_SETTITLE32W:
+       case PSM_SETTITLEW:
            FIXME (propsheet, "Unimplemented msg PSM_SETTITLE32W\n");
            return 0;
        case PSM_SETWIZBUTTONS:
@@ -142,10 +142,10 @@ PROPSHEET_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
        case PSM_SETCURSELID:
            FIXME (propsheet, "Unimplemented msg PSM_SETCURSELID\n");
            return 0;
-       case PSM_SETFINISHTEXT32A:
+       case PSM_SETFINISHTEXTA:
            FIXME (propsheet, "Unimplemented msg PSM_SETFINISHTEXT32A\n");
            return 0;
-       case PSM_SETFINISHTEXT32W:
+       case PSM_SETFINISHTEXTW:
            FIXME (propsheet, "Unimplemented msg PSM_SETFINISHTEXT32W\n");
            return 0;
        case PSM_GETTABCONTROL:
@@ -162,7 +162,7 @@ PROPSHEET_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
         if (uMsg >= WM_USER)
 	    ERR (propsheet, "unknown msg %04x wp=%08x lp=%08lx\n",
 		 uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
 }
 
@@ -170,26 +170,26 @@ PROPSHEET_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 PROPSHEET_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (WC_PROPSHEET32A)) return;
+    if (GlobalFindAtomA (WC_PROPSHEETA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS;
-    wndClass.lpfnWndProc   = (WNDPROC32)PROPSHEET_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)PROPSHEET_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(PROPSHEET_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
     wndClass.hbrBackground = 0;
-    wndClass.lpszClassName = WC_PROPSHEET32A;
+    wndClass.lpszClassName = WC_PROPSHEETA;
 
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 PROPSHEET_UnRegister (VOID)
 {
-    if (GlobalFindAtom32A (WC_PROPSHEET32A))
-        UnregisterClass32A (WC_PROPSHEET32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (WC_PROPSHEETA))
+        UnregisterClassA (WC_PROPSHEETA, (HINSTANCE)NULL);
 }
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 68b82b0f445..9ce1941af74 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -40,21 +40,21 @@
 
 
 static VOID
-REBAR_DrawBand (HDC32 hdc, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
+REBAR_DrawBand (HDC hdc, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
 {
 
-    DrawEdge32 (hdc, &lpBand->rcBand, BDR_RAISEDINNER, BF_MIDDLE);
+    DrawEdge (hdc, &lpBand->rcBand, BDR_RAISEDINNER, BF_MIDDLE);
 
     /* draw background */
 
     /* draw gripper */
     if (lpBand->fDraw & DRAW_GRIPPER)
-	DrawEdge32 (hdc, &lpBand->rcGripper, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
+	DrawEdge (hdc, &lpBand->rcGripper, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
 
     /* draw caption image */
     if (lpBand->fDraw & DRAW_IMAGE) {
 	/* FIXME: center image */
-	POINT32 pt;
+	POINT pt;
 
 	pt.y = (lpBand->rcCapImage.bottom + lpBand->rcCapImage.top - infoPtr->imageSize.cy)/2;
 	pt.x = (lpBand->rcCapImage.right + lpBand->rcCapImage.left - infoPtr->imageSize.cx)/2;
@@ -67,23 +67,23 @@ REBAR_DrawBand (HDC32 hdc, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
 
     /* draw caption text */
     if (lpBand->fDraw & DRAW_TEXT) {
-	HFONT32 hOldFont = SelectObject32 (hdc, infoPtr->hFont);
-	INT32 oldBkMode = SetBkMode32 (hdc, TRANSPARENT);
-	DrawText32W (hdc, lpBand->lpText, -1, &lpBand->rcCapText,
+	HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
+	INT oldBkMode = SetBkMode (hdc, TRANSPARENT);
+	DrawTextW (hdc, lpBand->lpText, -1, &lpBand->rcCapText,
 		     DT_CENTER | DT_VCENTER | DT_SINGLELINE);
 	if (oldBkMode != TRANSPARENT)
-	    SetBkMode32 (hdc, oldBkMode);
-	SelectObject32 (hdc, hOldFont);
+	    SetBkMode (hdc, oldBkMode);
+	SelectObject (hdc, hOldFont);
     }
 }
 
 
 static VOID
-REBAR_Refresh (WND *wndPtr, HDC32 hdc)
+REBAR_Refresh (WND *wndPtr, HDC hdc)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
     REBAR_BAND *lpBand;
-    UINT32 i;
+    UINT i;
 
     for (i = 0; i < infoPtr->uNumBands; i++) {
 	lpBand = &infoPtr->bands[i];
@@ -104,7 +104,7 @@ REBAR_CalcHorzBand (REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
     lpBand->fDraw = 0;
 
     /* set initial caption image rectangle */
-    SetRect32 (&lpBand->rcCapImage, 0, 0, 0, 0);
+    SetRect (&lpBand->rcCapImage, 0, 0, 0, 0);
 
     /* image is visible */
     if ((lpBand->iImage > -1) && (infoPtr->himl)) {
@@ -128,17 +128,17 @@ REBAR_CalcHorzBand (REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
 
     /* text is visible */
     if (lpBand->lpText) {
-	HDC32 hdc = GetDC32 (0);
-	HFONT32 hOldFont = SelectObject32 (hdc, infoPtr->hFont);
-	SIZE32 size;
+	HDC hdc = GetDC (0);
+	HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
+	SIZE size;
 
 	lpBand->fDraw |= DRAW_TEXT;
 	GetTextExtentPoint32W (hdc, lpBand->lpText,
-			       lstrlen32W (lpBand->lpText), &size);
+			       lstrlenW (lpBand->lpText), &size);
 	lpBand->rcCapText.right += size.cx;
 
-	SelectObject32 (hdc, hOldFont);
-	ReleaseDC32 (0, hdc);
+	SelectObject (hdc, hOldFont);
+	ReleaseDC (0, hdc);
     }
 
     /* set initial child window rectangle */
@@ -167,8 +167,8 @@ REBAR_CalcHorzBand (REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
 	lpBand->rcGripper.bottom = lpBand->rcBand.bottom - 3;
 
 	/* move caption rectangles */
-	OffsetRect32 (&lpBand->rcCapImage, GRIPPER_WIDTH, 0);
-	OffsetRect32 (&lpBand->rcCapText, GRIPPER_WIDTH, 0);
+	OffsetRect (&lpBand->rcCapImage, GRIPPER_WIDTH, 0);
+	OffsetRect (&lpBand->rcCapText, GRIPPER_WIDTH, 0);
 
 	/* adjust child rectangle */
 	lpBand->rcChild.left += GRIPPER_WIDTH;
@@ -184,7 +184,7 @@ REBAR_CalcVertBand (WND *wndPtr, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
     lpBand->fDraw = 0;
 
     /* set initial caption image rectangle */
-    SetRect32 (&lpBand->rcCapImage, 0, 0, 0, 0);
+    SetRect (&lpBand->rcCapImage, 0, 0, 0, 0);
 
     /* image is visible */
     if ((lpBand->iImage > -1) && (infoPtr->himl)) {
@@ -208,18 +208,18 @@ REBAR_CalcVertBand (WND *wndPtr, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
 
     /* text is visible */
     if (lpBand->lpText) {
-	HDC32 hdc = GetDC32 (0);
-	HFONT32 hOldFont = SelectObject32 (hdc, infoPtr->hFont);
-	SIZE32 size;
+	HDC hdc = GetDC (0);
+	HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
+	SIZE size;
 
 	lpBand->fDraw |= DRAW_TEXT;
 	GetTextExtentPoint32W (hdc, lpBand->lpText,
-			       lstrlen32W (lpBand->lpText), &size);
+			       lstrlenW (lpBand->lpText), &size);
 /*	lpBand->rcCapText.right += size.cx; */
 	lpBand->rcCapText.bottom += size.cy;
 
-	SelectObject32 (hdc, hOldFont);
-	ReleaseDC32 (0, hdc);
+	SelectObject (hdc, hOldFont);
+	ReleaseDC (0, hdc);
     }
 
     /* set initial child window rectangle */
@@ -254,8 +254,8 @@ REBAR_CalcVertBand (WND *wndPtr, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
 	    lpBand->rcGripper.bottom = lpBand->rcBand.bottom - 3;
 
 	    /* move caption rectangles */
-	    OffsetRect32 (&lpBand->rcCapImage, GRIPPER_WIDTH, 0);
-	    OffsetRect32 (&lpBand->rcCapText, GRIPPER_WIDTH, 0);
+	    OffsetRect (&lpBand->rcCapImage, GRIPPER_WIDTH, 0);
+	    OffsetRect (&lpBand->rcCapText, GRIPPER_WIDTH, 0);
  
 	    /* adjust child rectangle */
 	    lpBand->rcChild.left += GRIPPER_WIDTH;
@@ -267,8 +267,8 @@ REBAR_CalcVertBand (WND *wndPtr, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
 	    lpBand->rcGripper.bottom = lpBand->rcGripper.top + 3;
 
 	    /* move caption rectangles */
-	    OffsetRect32 (&lpBand->rcCapImage, 0, GRIPPER_WIDTH);
-	    OffsetRect32 (&lpBand->rcCapText, 0, GRIPPER_WIDTH);
+	    OffsetRect (&lpBand->rcCapImage, 0, GRIPPER_WIDTH);
+	    OffsetRect (&lpBand->rcCapText, 0, GRIPPER_WIDTH);
  
 	    /* adjust child rectangle */
 	    lpBand->rcChild.top += GRIPPER_WIDTH;
@@ -278,18 +278,18 @@ REBAR_CalcVertBand (WND *wndPtr, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
 
 
 static VOID
-REBAR_Layout (WND *wndPtr, LPRECT32 lpRect)
+REBAR_Layout (WND *wndPtr, LPRECT lpRect)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
     REBAR_BAND *lpBand;
-    RECT32 rcClient;
-    INT32 x, y, cx, cy;
-    UINT32 i;
+    RECT rcClient;
+    INT x, y, cx, cy;
+    UINT i;
 
     if (lpRect)
 	rcClient = *lpRect;
     else
-	GetClientRect32 (wndPtr->hwndSelf, &rcClient);
+	GetClientRect (wndPtr->hwndSelf, &rcClient);
 
     x = 0;
     y = 0;
@@ -365,7 +365,7 @@ static VOID
 REBAR_ForceResize (WND *wndPtr)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    RECT32 rc;
+    RECT rc;
 
     TRACE (rebar, " to [%d x %d]!\n",
 	   infoPtr->calcSize.cx, infoPtr->calcSize.cy);
@@ -378,10 +378,10 @@ REBAR_ForceResize (WND *wndPtr)
     rc.bottom = infoPtr->calcSize.cy;
 
     if (wndPtr->dwStyle & WS_BORDER) {
-	InflateRect32 (&rc, sysMetrics[SM_CXEDGE], sysMetrics[SM_CYEDGE]);
+	InflateRect (&rc, sysMetrics[SM_CXEDGE], sysMetrics[SM_CYEDGE]);
     }
 
-    SetWindowPos32 (wndPtr->hwndSelf, 0, 0, 0,
+    SetWindowPos (wndPtr->hwndSelf, 0, 0, 0,
 		    rc.right - rc.left, rc.bottom - rc.top,
 		    SWP_NOMOVE | SWP_NOZORDER | SWP_SHOWWINDOW);
 }
@@ -392,7 +392,7 @@ REBAR_MoveChildWindows (WND *wndPtr)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
     REBAR_BAND *lpBand;
-    UINT32 i;
+    UINT i;
 
     for (i = 0; i < infoPtr->uNumBands; i++) {
 	lpBand = &infoPtr->bands[i];
@@ -402,20 +402,20 @@ REBAR_MoveChildWindows (WND *wndPtr)
 	if (lpBand->hwndChild) {
 	    TRACE (rebar, "hwndChild = %x\n", lpBand->hwndChild);
 
-	    if (WIDGETS_IsControl32 (WIN_FindWndPtr(lpBand->hwndChild), BIC32_COMBO)) {
-		INT32 nEditHeight, yPos;
-		RECT32 rc;
+	    if (WIDGETS_IsControl (WIN_FindWndPtr(lpBand->hwndChild), BIC32_COMBO)) {
+		INT nEditHeight, yPos;
+		RECT rc;
 
 		/* special placement code for combo box */
 
 
 		/* get size of edit line */
-		GetWindowRect32 (lpBand->hwndChild, &rc);
+		GetWindowRect (lpBand->hwndChild, &rc);
 		nEditHeight = rc.bottom - rc.top;
 		yPos = (lpBand->rcChild.bottom + lpBand->rcChild.top - nEditHeight)/2;
 
 		/* center combo box inside child area */
-		SetWindowPos32 (lpBand->hwndChild, HWND_TOP,
+		SetWindowPos (lpBand->hwndChild, HWND_TOP,
 			    lpBand->rcChild.left, /*lpBand->rcChild.top*/ yPos,
 			    lpBand->rcChild.right - lpBand->rcChild.left,
 			    nEditHeight,
@@ -429,7 +429,7 @@ REBAR_MoveChildWindows (WND *wndPtr)
 	    }
 #endif
 	    else {
-		SetWindowPos32 (lpBand->hwndChild, HWND_TOP,
+		SetWindowPos (lpBand->hwndChild, HWND_TOP,
 			    lpBand->rcChild.left, lpBand->rcChild.top,
 			    lpBand->rcChild.right - lpBand->rcChild.left,
 			    lpBand->rcChild.bottom - lpBand->rcChild.top,
@@ -441,17 +441,17 @@ REBAR_MoveChildWindows (WND *wndPtr)
 
 
 static void
-REBAR_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pBand)
+REBAR_InternalHitTest (WND *wndPtr, LPPOINT lpPt, UINT *pFlags, INT *pBand)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr(wndPtr);
     REBAR_BAND *lpBand;
-    RECT32 rect;
-    INT32  iCount;
+    RECT rect;
+    INT  iCount;
 
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 
     *pFlags = RBHT_NOWHERE;
-    if (PtInRect32 (&rect, *lpPt))
+    if (PtInRect (&rect, *lpPt))
     {
 	if (infoPtr->uNumBands == 0) {
 	    *pFlags = RBHT_NOWHERE;
@@ -464,25 +464,25 @@ REBAR_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pBand
 	    /* somewhere inside */
 	    for (iCount = 0; iCount < infoPtr->uNumBands; iCount++) {
 		lpBand = &infoPtr->bands[iCount];
-		if (PtInRect32 (&lpBand->rcBand, *lpPt)) {
+		if (PtInRect (&lpBand->rcBand, *lpPt)) {
 		    if (pBand)
 			*pBand = iCount;
-		    if (PtInRect32 (&lpBand->rcGripper, *lpPt)) {
+		    if (PtInRect (&lpBand->rcGripper, *lpPt)) {
 			*pFlags = RBHT_GRABBER;
 			TRACE (rebar, "ON GRABBER %d\n", iCount);
 			return;
 		    }
-		    else if (PtInRect32 (&lpBand->rcCapImage, *lpPt)) {
+		    else if (PtInRect (&lpBand->rcCapImage, *lpPt)) {
 			*pFlags = RBHT_CAPTION;
 			TRACE (rebar, "ON CAPTION %d\n", iCount);
 			return;
 		    }
-		    else if (PtInRect32 (&lpBand->rcCapText, *lpPt)) {
+		    else if (PtInRect (&lpBand->rcCapText, *lpPt)) {
 			*pFlags = RBHT_CAPTION;
 			TRACE (rebar, "ON CAPTION %d\n", iCount);
 			return;
 		    }
-		    else if (PtInRect32 (&lpBand->rcChild, *lpPt)) {
+		    else if (PtInRect (&lpBand->rcChild, *lpPt)) {
 			*pFlags = RBHT_CLIENT;
 			TRACE (rebar, "ON CLIENT %d\n", iCount);
 			return;
@@ -521,10 +521,10 @@ REBAR_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pBand
 
 
 static LRESULT
-REBAR_DeleteBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_DeleteBand (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    UINT32 uBand = (UINT32)wParam;
+    UINT uBand = (UINT)wParam;
 
     if (uBand >= infoPtr->uNumBands)
 	return FALSE;
@@ -569,7 +569,7 @@ REBAR_DeleteBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_GetBandBorders (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_GetBandBorders (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
     /* LPRECT32 lpRect = (LPRECT32)lParam; */
@@ -577,10 +577,10 @@ REBAR_GetBandBorders (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     if (!lParam)
 	return 0;
-    if ((UINT32)wParam >= infoPtr->uNumBands)
+    if ((UINT)wParam >= infoPtr->uNumBands)
 	return 0;
 
-    lpBand = &infoPtr->bands[(UINT32)wParam];
+    lpBand = &infoPtr->bands[(UINT)wParam];
     if (wndPtr->dwStyle & RBS_BANDBORDERS) {
 
     }
@@ -604,23 +604,23 @@ REBAR_GetBandCount (WND *wndPtr)
 
 
 static LRESULT
-REBAR_GetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_GetBandInfoA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    LPREBARBANDINFO32A lprbbi = (LPREBARBANDINFO32A)lParam;
+    LPREBARBANDINFOA lprbbi = (LPREBARBANDINFOA)lParam;
     REBAR_BAND *lpBand;
 
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZE32A)
+    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
 	return FALSE;
-    if ((UINT32)wParam >= infoPtr->uNumBands)
+    if ((UINT)wParam >= infoPtr->uNumBands)
 	return FALSE;
 
-    TRACE (rebar, "index %u\n", (UINT32)wParam);
+    TRACE (rebar, "index %u\n", (UINT)wParam);
 
     /* copy band information */
-    lpBand = &infoPtr->bands[(UINT32)wParam];
+    lpBand = &infoPtr->bands[(UINT)wParam];
 
     if (lprbbi->fMask & RBBIM_STYLE)
 	lprbbi->fStyle = lpBand->fStyle;
@@ -659,7 +659,7 @@ REBAR_GetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lprbbi->wID = lpBand->wID;
 
     /* check for additional data */
-    if (lprbbi->cbSize >= sizeof (REBARBANDINFO32A)) {
+    if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
 	if (lprbbi->fMask & RBBIM_IDEALSIZE)
 	    lprbbi->cxIdeal = lpBand->cxIdeal;
 
@@ -675,23 +675,23 @@ REBAR_GetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_GetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_GetBandInfoW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    LPREBARBANDINFO32W lprbbi = (LPREBARBANDINFO32W)lParam;
+    LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam;
     REBAR_BAND *lpBand;
 
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZE32W)
+    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
 	return FALSE;
-    if ((UINT32)wParam >= infoPtr->uNumBands)
+    if ((UINT)wParam >= infoPtr->uNumBands)
 	return FALSE;
 
-    TRACE (rebar, "index %u\n", (UINT32)wParam);
+    TRACE (rebar, "index %u\n", (UINT)wParam);
 
     /* copy band information */
-    lpBand = &infoPtr->bands[(UINT32)wParam];
+    lpBand = &infoPtr->bands[(UINT)wParam];
 
     if (lprbbi->fMask & RBBIM_STYLE)
 	lprbbi->fStyle = lpBand->fStyle;
@@ -703,7 +703,7 @@ REBAR_GetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     if ((lprbbi->fMask & RBBIM_TEXT) && 
 	(lprbbi->lpText) && (lpBand->lpText)) {
-	    lstrcpyn32W (lprbbi->lpText, lpBand->lpText, lprbbi->cch);
+	    lstrcpynW (lprbbi->lpText, lpBand->lpText, lprbbi->cch);
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE)
@@ -730,7 +730,7 @@ REBAR_GetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lprbbi->wID = lpBand->wID;
 
     /* check for additional data */
-    if (lprbbi->cbSize >= sizeof (REBARBANDINFO32A)) {
+    if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
 	if (lprbbi->fMask & RBBIM_IDEALSIZE)
 	    lprbbi->cxIdeal = lpBand->cxIdeal;
 
@@ -746,10 +746,10 @@ REBAR_GetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_GetBarHeight (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_GetBarHeight (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    INT32 nHeight;
+    INT nHeight;
 
     REBAR_Layout (wndPtr, NULL);
     nHeight = infoPtr->calcSize.cy;
@@ -764,7 +764,7 @@ REBAR_GetBarHeight (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_GetBarInfo (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_GetBarInfo (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
     LPREBARINFO lpInfo = (LPREBARINFO)lParam;
@@ -802,7 +802,7 @@ REBAR_GetBkColor (WND *wndPtr)
 
 
 static LRESULT
-REBAR_GetPalette (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_GetPalette (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     FIXME (rebar, "empty stub!\n");
 
@@ -811,14 +811,14 @@ REBAR_GetPalette (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_GetRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_GetRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    INT32 iBand = (INT32)wParam;
-    LPRECT32 lprc = (LPRECT32)lParam;
+    INT iBand = (INT)wParam;
+    LPRECT lprc = (LPRECT)lParam;
     REBAR_BAND *lpBand;
 
-    if ((iBand < 0) && ((UINT32)iBand >= infoPtr->uNumBands))
+    if ((iBand < 0) && ((UINT)iBand >= infoPtr->uNumBands))
 	return FALSE;
     if (!lprc)
 	return FALSE;
@@ -826,7 +826,7 @@ REBAR_GetRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     TRACE (rebar, "band %d\n", iBand);
 
     lpBand = &infoPtr->bands[iBand];
-    CopyRect32 (lprc, &lpBand->rcBand);
+    CopyRect (lprc, &lpBand->rcBand);
 /*
     lprc->left   = lpBand->rcBand.left;
     lprc->top    = lpBand->rcBand.top;
@@ -850,7 +850,7 @@ REBAR_GetRowCount (WND *wndPtr)
 
 
 static LRESULT
-REBAR_GetRowHeight (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_GetRowHeight (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 /*    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr); */
 
@@ -888,7 +888,7 @@ REBAR_GetUnicodeFormat (WND *wndPtr)
 
 
 static LRESULT
-REBAR_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_HitTest (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     /* REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr); */
     LPRBHITTESTINFO lprbht = (LPRBHITTESTINFO)lParam; 
@@ -904,10 +904,10 @@ REBAR_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_IdToIndex (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_IdToIndex (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    UINT32 i;
+    UINT i;
 
     if (infoPtr == NULL)
 	return -1;
@@ -915,10 +915,10 @@ REBAR_IdToIndex (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (infoPtr->uNumBands < 1)
 	return -1;
 
-    TRACE (rebar, "id %u\n", (UINT32)wParam);
+    TRACE (rebar, "id %u\n", (UINT)wParam);
 
     for (i = 0; i < infoPtr->uNumBands; i++) {
-	if (infoPtr->bands[i].wID == (UINT32)wParam) {
+	if (infoPtr->bands[i].wID == (UINT)wParam) {
 	    TRACE (rebar, "band %u found!\n", i);
 	    return i;
 	}
@@ -930,18 +930,18 @@ REBAR_IdToIndex (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_InsertBand32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_InsertBandA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    LPREBARBANDINFO32A lprbbi = (LPREBARBANDINFO32A)lParam;
-    UINT32 uIndex = (UINT32)wParam;
+    LPREBARBANDINFOA lprbbi = (LPREBARBANDINFOA)lParam;
+    UINT uIndex = (UINT)wParam;
     REBAR_BAND *lpBand;
 
     if (infoPtr == NULL)
 	return FALSE;
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZE32A)
+    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
 	return FALSE;
 
     TRACE (rebar, "insert band at %u!\n", uIndex);
@@ -954,7 +954,7 @@ REBAR_InsertBand32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	REBAR_BAND *oldBands = infoPtr->bands;
 	infoPtr->bands =
 	    (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
-	if (((INT32)uIndex == -1) || (uIndex > infoPtr->uNumBands))
+	if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
 	    uIndex = infoPtr->uNumBands;
 
 	/* pre insert copy */
@@ -992,7 +992,7 @@ REBAR_InsertBand32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     }
 
     if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) {
-	INT32 len = lstrlen32A (lprbbi->lpText);
+	INT len = lstrlenA (lprbbi->lpText);
 	if (len > 0) {
 	    lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
 	    lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
@@ -1008,7 +1008,7 @@ REBAR_InsertBand32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	TRACE (rebar, "hwndChild = %x\n", lprbbi->hwndChild);
 	lpBand->hwndChild = lprbbi->hwndChild;
 	lpBand->hwndPrevParent =
-	    SetParent32 (lpBand->hwndChild, wndPtr->hwndSelf);
+	    SetParent (lpBand->hwndChild, wndPtr->hwndSelf);
     }
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
@@ -1038,7 +1038,7 @@ REBAR_InsertBand32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lpBand->wID = lprbbi->wID;
 
     /* check for additional data */
-    if (lprbbi->cbSize >= sizeof (REBARBANDINFO32A)) {
+    if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
 	if (lprbbi->fMask & RBBIM_IDEALSIZE)
 	    lpBand->cxIdeal = lprbbi->cxIdeal;
 
@@ -1059,18 +1059,18 @@ REBAR_InsertBand32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_InsertBand32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_InsertBandW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    LPREBARBANDINFO32W lprbbi = (LPREBARBANDINFO32W)lParam;
-    UINT32 uIndex = (UINT32)wParam;
+    LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam;
+    UINT uIndex = (UINT)wParam;
     REBAR_BAND *lpBand;
 
     if (infoPtr == NULL)
 	return FALSE;
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZE32W)
+    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
 	return FALSE;
 
     TRACE (rebar, "insert band at %u!\n", uIndex);
@@ -1083,7 +1083,7 @@ REBAR_InsertBand32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	REBAR_BAND *oldBands = infoPtr->bands;
 	infoPtr->bands =
 	    (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
-	if (((INT32)uIndex == -1) || (uIndex > infoPtr->uNumBands))
+	if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
 	    uIndex = infoPtr->uNumBands;
 
 	/* pre insert copy */
@@ -1121,10 +1121,10 @@ REBAR_InsertBand32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     }
 
     if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) {
-	INT32 len = lstrlen32W (lprbbi->lpText);
+	INT len = lstrlenW (lprbbi->lpText);
 	if (len > 0) {
 	    lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-	    lstrcpy32W (lpBand->lpText, lprbbi->lpText);
+	    lstrcpyW (lpBand->lpText, lprbbi->lpText);
 	}
     }
 
@@ -1137,7 +1137,7 @@ REBAR_InsertBand32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	TRACE (rebar, "hwndChild = %x\n", lprbbi->hwndChild);
 	lpBand->hwndChild = lprbbi->hwndChild;
 	lpBand->hwndPrevParent =
-	    SetParent32 (lpBand->hwndChild, wndPtr->hwndSelf);
+	    SetParent (lpBand->hwndChild, wndPtr->hwndSelf);
     }
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
@@ -1167,7 +1167,7 @@ REBAR_InsertBand32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lpBand->wID = lprbbi->wID;
 
     /* check for additional data */
-    if (lprbbi->cbSize >= sizeof (REBARBANDINFO32W)) {
+    if (lprbbi->cbSize >= sizeof (REBARBANDINFOW)) {
 	if (lprbbi->fMask & RBBIM_IDEALSIZE)
 	    lpBand->cxIdeal = lprbbi->cxIdeal;
 
@@ -1188,12 +1188,12 @@ REBAR_InsertBand32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_MaximizeBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_MaximizeBand (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 /*    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr); */
 
     FIXME (rebar, "(uBand = %u fIdeal = %s)\n",
-	   (UINT32)wParam, lParam ? "TRUE" : "FALSE");
+	   (UINT)wParam, lParam ? "TRUE" : "FALSE");
 
  
     return 0;
@@ -1201,11 +1201,11 @@ REBAR_MaximizeBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_MinimizeBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_MinimizeBand (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 /*    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr); */
 
-    FIXME (rebar, "(uBand = %u)\n", (UINT32)wParam);
+    FIXME (rebar, "(uBand = %u)\n", (UINT)wParam);
 
  
     return 0;
@@ -1213,12 +1213,12 @@ REBAR_MinimizeBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_MoveBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_MoveBand (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 /*    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr); */
 
     FIXME (rebar, "(iFrom = %u iTof = %u)\n",
-	   (UINT32)wParam, (UINT32)lParam);
+	   (UINT)wParam, (UINT)lParam);
 
  
     return FALSE;
@@ -1226,23 +1226,23 @@ REBAR_MoveBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_SetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_SetBandInfoA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    LPREBARBANDINFO32A lprbbi = (LPREBARBANDINFO32A)lParam;
+    LPREBARBANDINFOA lprbbi = (LPREBARBANDINFOA)lParam;
     REBAR_BAND *lpBand;
 
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZE32A)
+    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
 	return FALSE;
-    if ((UINT32)wParam >= infoPtr->uNumBands)
+    if ((UINT)wParam >= infoPtr->uNumBands)
 	return FALSE;
 
-    TRACE (rebar, "index %u\n", (UINT32)wParam);
+    TRACE (rebar, "index %u\n", (UINT)wParam);
 
     /* set band information */
-    lpBand = &infoPtr->bands[(UINT32)wParam];
+    lpBand = &infoPtr->bands[(UINT)wParam];
 
     if (lprbbi->fMask & RBBIM_STYLE)
 	lpBand->fStyle = lprbbi->fStyle;
@@ -1258,7 +1258,7 @@ REBAR_SetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	    lpBand->lpText = NULL;
 	}
 	if (lprbbi->lpText) {
-	    INT32 len = lstrlen32A (lprbbi->lpText);
+	    INT len = lstrlenA (lprbbi->lpText);
 	    lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
 	    lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
 	}
@@ -1271,7 +1271,7 @@ REBAR_SetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	if (lprbbi->hwndChild) {
 	    lpBand->hwndChild = lprbbi->hwndChild;
 	    lpBand->hwndPrevParent =
-		SetParent32 (lpBand->hwndChild, wndPtr->hwndSelf);
+		SetParent (lpBand->hwndChild, wndPtr->hwndSelf);
 	}
 	else {
 	    TRACE (rebar, "child: 0x%x  prev parent: 0x%x\n",
@@ -1299,7 +1299,7 @@ REBAR_SetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lpBand->wID = lprbbi->wID;
 
     /* check for additional data */
-    if (lprbbi->cbSize >= sizeof (REBARBANDINFO32A)) {
+    if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
 	if (lprbbi->fMask & RBBIM_IDEALSIZE)
 	    lpBand->cxIdeal = lprbbi->cxIdeal;
 
@@ -1319,23 +1319,23 @@ REBAR_SetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_SetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_SetBandInfoW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    LPREBARBANDINFO32W lprbbi = (LPREBARBANDINFO32W)lParam;
+    LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam;
     REBAR_BAND *lpBand;
 
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZE32W)
+    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
 	return FALSE;
-    if ((UINT32)wParam >= infoPtr->uNumBands)
+    if ((UINT)wParam >= infoPtr->uNumBands)
 	return FALSE;
 
-    TRACE (rebar, "index %u\n", (UINT32)wParam);
+    TRACE (rebar, "index %u\n", (UINT)wParam);
 
     /* set band information */
-    lpBand = &infoPtr->bands[(UINT32)wParam];
+    lpBand = &infoPtr->bands[(UINT)wParam];
 
     if (lprbbi->fMask & RBBIM_STYLE)
 	lpBand->fStyle = lprbbi->fStyle;
@@ -1351,9 +1351,9 @@ REBAR_SetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	    lpBand->lpText = NULL;
 	}
 	if (lprbbi->lpText) {
-	    INT32 len = lstrlen32W (lprbbi->lpText);
+	    INT len = lstrlenW (lprbbi->lpText);
 	    lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-	    lstrcpy32W (lpBand->lpText, lprbbi->lpText);
+	    lstrcpyW (lpBand->lpText, lprbbi->lpText);
 	}
     }
 
@@ -1364,7 +1364,7 @@ REBAR_SetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	if (lprbbi->hwndChild) {
 	    lpBand->hwndChild = lprbbi->hwndChild;
 	    lpBand->hwndPrevParent =
-		SetParent32 (lpBand->hwndChild, wndPtr->hwndSelf);
+		SetParent (lpBand->hwndChild, wndPtr->hwndSelf);
 	}
 	else {
 	    TRACE (rebar, "child: 0x%x  prev parent: 0x%x\n",
@@ -1392,7 +1392,7 @@ REBAR_SetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lpBand->wID = lprbbi->wID;
 
     /* check for additional data */
-    if (lprbbi->cbSize >= sizeof (REBARBANDINFO32W)) {
+    if (lprbbi->cbSize >= sizeof (REBARBANDINFOW)) {
 	if (lprbbi->fMask & RBBIM_IDEALSIZE)
 	    lpBand->cxIdeal = lprbbi->cxIdeal;
 
@@ -1412,7 +1412,7 @@ REBAR_SetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_SetBarInfo (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_SetBarInfo (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
     LPREBARINFO lpInfo = (LPREBARINFO)lParam;
@@ -1442,7 +1442,7 @@ REBAR_SetBarInfo (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_SetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_SetBkColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
     COLORREF clrTemp;
@@ -1461,19 +1461,19 @@ REBAR_SetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_SetParent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_SetParent (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    HWND32 hwndTemp = infoPtr->hwndNotify;
+    HWND hwndTemp = infoPtr->hwndNotify;
 
-    infoPtr->hwndNotify = (HWND32)wParam;
+    infoPtr->hwndNotify = (HWND)wParam;
 
     return (LRESULT)hwndTemp;
 }
 
 
 static LRESULT
-REBAR_SetTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_SetTextColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
     COLORREF clrTemp;
@@ -1491,37 +1491,37 @@ REBAR_SetTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-REBAR_SetUnicodeFormat (WND *wndPtr, WPARAM32 wParam)
+REBAR_SetUnicodeFormat (WND *wndPtr, WPARAM wParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    BOOL32 bTemp = infoPtr->bUnicode;
-    infoPtr->bUnicode = (BOOL32)wParam;
+    BOOL bTemp = infoPtr->bUnicode;
+    infoPtr->bUnicode = (BOOL)wParam;
     return bTemp;
 }
 
 
 static LRESULT
-REBAR_ShowBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_ShowBand (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
     REBAR_BAND *lpBand;
 
-    if (((INT32)wParam < 0) || ((INT32)wParam > infoPtr->uNumBands))
+    if (((INT)wParam < 0) || ((INT)wParam > infoPtr->uNumBands))
 	return FALSE;
 
-    lpBand = &infoPtr->bands[(INT32)wParam];
+    lpBand = &infoPtr->bands[(INT)wParam];
 
-    if ((BOOL32)lParam) {
-	TRACE (rebar, "show band %d\n", (INT32)wParam);
+    if ((BOOL)lParam) {
+	TRACE (rebar, "show band %d\n", (INT)wParam);
 	lpBand->fStyle = lpBand->fStyle & ~RBBS_HIDDEN;
-	if (IsWindow32 (lpBand->hwndChild))
-	    ShowWindow32 (lpBand->hwndChild, SW_SHOW);
+	if (IsWindow (lpBand->hwndChild))
+	    ShowWindow (lpBand->hwndChild, SW_SHOW);
     }
     else {
-	TRACE (rebar, "hide band %d\n", (INT32)wParam);
+	TRACE (rebar, "hide band %d\n", (INT)wParam);
 	lpBand->fStyle = lpBand->fStyle | RBBS_HIDDEN;
-	if (IsWindow32 (lpBand->hwndChild))
-	    ShowWindow32 (lpBand->hwndChild, SW_SHOW);
+	if (IsWindow (lpBand->hwndChild))
+	    ShowWindow (lpBand->hwndChild, SW_SHOW);
     }
 
     REBAR_Layout (wndPtr, NULL);
@@ -1533,10 +1533,10 @@ REBAR_ShowBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_SizeToRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_SizeToRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    LPRECT32 lpRect = (LPRECT32)lParam;
+    LPRECT lpRect = (LPRECT)lParam;
 
     if (lpRect == NULL)
 	return FALSE;
@@ -1546,7 +1546,7 @@ REBAR_SizeToRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	   lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
 
 #if 0
-    SetWindowPos32 (wndPtr->hwndSelf, 0, lpRect->left, lpRect->top,
+    SetWindowPos (wndPtr->hwndSelf, 0, lpRect->left, lpRect->top,
 		    lpRect->right - lpRect->left, lpRect->bottom - lpRect->top,
 		    SWP_NOZORDER);
 #endif
@@ -1561,7 +1561,7 @@ REBAR_SizeToRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr;
 
@@ -1584,10 +1584,10 @@ REBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->clrText = RGB(0, 0, 0);
 
     infoPtr->bAutoResize = FALSE;
-    infoPtr->hcurArrow = LoadCursor32A (0, IDC_ARROW32A);
-    infoPtr->hcurHorz  = LoadCursor32A (0, IDC_SIZEWE32A);
-    infoPtr->hcurVert  = LoadCursor32A (0, IDC_SIZENS32A);
-    infoPtr->hcurDrag  = LoadCursor32A (0, IDC_SIZE32A);
+    infoPtr->hcurArrow = LoadCursorA (0, IDC_ARROWA);
+    infoPtr->hcurHorz  = LoadCursorA (0, IDC_SIZEWEA);
+    infoPtr->hcurVert  = LoadCursorA (0, IDC_SIZENSA);
+    infoPtr->hcurDrag  = LoadCursorA (0, IDC_SIZEA);
 
     infoPtr->bUnicode = IsWindowUnicode (wndPtr->hwndSelf);
 
@@ -1595,8 +1595,8 @@ REBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	FIXME (rebar, "style RBS_AUTOSIZE set!\n");
 
 #if 0
-    SendMessage32A (wndPtr->parent->hwndSelf, WM_NOTIFYFORMAT,
-		    (WPARAM32)wndPtr->hwndSelf, NF_QUERY);
+    SendMessageA (wndPtr->parent->hwndSelf, WM_NOTIFYFORMAT,
+		    (WPARAM)wndPtr->hwndSelf, NF_QUERY);
 #endif
 
     TRACE (rebar, "created!\n");
@@ -1605,11 +1605,11 @@ REBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr(wndPtr);
     REBAR_BAND *lpBand;
-    INT32 i;
+    INT i;
 
 
     /* free rebar bands */
@@ -1624,7 +1624,7 @@ REBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		lpBand->lpText = NULL;
 	    }
 	    /* destroy child window */
-	    DestroyWindow32 (lpBand->hwndChild);
+	    DestroyWindow (lpBand->hwndChild);
 	}
 
 	/* free band array */
@@ -1635,10 +1635,10 @@ REBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 
-    DeleteObject32 (infoPtr->hcurArrow);
-    DeleteObject32 (infoPtr->hcurHorz);
-    DeleteObject32 (infoPtr->hcurVert);
-    DeleteObject32 (infoPtr->hcurDrag);
+    DeleteObject (infoPtr->hcurArrow);
+    DeleteObject (infoPtr->hcurHorz);
+    DeleteObject (infoPtr->hcurVert);
+    DeleteObject (infoPtr->hcurDrag);
 
 
 
@@ -1652,7 +1652,7 @@ REBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_GetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr(wndPtr);
 
@@ -1662,7 +1662,7 @@ REBAR_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 #if 0
 static LRESULT
-REBAR_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_MouseMove (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr(wndPtr);
 
@@ -1672,13 +1672,13 @@ REBAR_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-REBAR_NCCalcSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_NCCalcSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     if (wndPtr->dwStyle & WS_BORDER) {
-	((LPRECT32)lParam)->left   += sysMetrics[SM_CXEDGE];
-	((LPRECT32)lParam)->top    += sysMetrics[SM_CYEDGE];
-	((LPRECT32)lParam)->right  -= sysMetrics[SM_CXEDGE];
-	((LPRECT32)lParam)->bottom -= sysMetrics[SM_CYEDGE];
+	((LPRECT)lParam)->left   += sysMetrics[SM_CXEDGE];
+	((LPRECT)lParam)->top    += sysMetrics[SM_CYEDGE];
+	((LPRECT)lParam)->right  -= sysMetrics[SM_CXEDGE];
+	((LPRECT)lParam)->bottom -= sysMetrics[SM_CYEDGE];
     }
 
     return 0;
@@ -1686,90 +1686,90 @@ REBAR_NCCalcSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-REBAR_NCPaint (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_NCPaint (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    HWND32 hwnd = wndPtr->hwndSelf;
-    HDC32 hdc;
+    HWND hwnd = wndPtr->hwndSelf;
+    HDC hdc;
 
     if ( wndPtr->dwStyle & WS_MINIMIZE ||
 	!WIN_IsWindowDrawable( wndPtr, 0 )) return 0; /* Nothing to do */
 
-    DefWindowProc32A (hwnd, WM_NCPAINT, wParam, lParam);
+    DefWindowProcA (hwnd, WM_NCPAINT, wParam, lParam);
 
-    if (!(hdc = GetDCEx32( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ))) return 0;
+    if (!(hdc = GetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ))) return 0;
 
-    if (ExcludeVisRect( hdc, wndPtr->rectClient.left-wndPtr->rectWindow.left,
+    if (ExcludeVisRect16( hdc, wndPtr->rectClient.left-wndPtr->rectWindow.left,
 		        wndPtr->rectClient.top-wndPtr->rectWindow.top,
 		        wndPtr->rectClient.right-wndPtr->rectWindow.left,
 		        wndPtr->rectClient.bottom-wndPtr->rectWindow.top )
 	== NULLREGION){
-	ReleaseDC32( hwnd, hdc );
+	ReleaseDC( hwnd, hdc );
 	return 0;
     }
 
     if (!(wndPtr->flags & WIN_MANAGED) && (wndPtr->dwStyle & WS_BORDER))
-	DrawEdge32 (hdc, &wndPtr->rectWindow, EDGE_ETCHED, BF_RECT);
+	DrawEdge (hdc, &wndPtr->rectWindow, EDGE_ETCHED, BF_RECT);
 
-    ReleaseDC32( hwnd, hdc );
+    ReleaseDC( hwnd, hdc );
 
     return 0;
 }
 
 
 static LRESULT
-REBAR_Paint (WND *wndPtr, WPARAM32 wParam)
+REBAR_Paint (WND *wndPtr, WPARAM wParam)
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
+    HDC hdc;
+    PAINTSTRUCT ps;
 
-    hdc = wParam==0 ? BeginPaint32 (wndPtr->hwndSelf, &ps) : (HDC32)wParam;
+    hdc = wParam==0 ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam;
     REBAR_Refresh (wndPtr, hdc);
     if (!wParam)
-	EndPaint32 (wndPtr->hwndSelf, &ps);
+	EndPaint (wndPtr->hwndSelf, &ps);
     return 0;
 }
 
 
 static LRESULT
-REBAR_SetCursor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_SetCursor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr(wndPtr);
-    POINT32 pt;
-    UINT32  flags;
+    POINT pt;
+    UINT  flags;
 
     TRACE (rebar, "code=0x%X  id=0x%X\n", LOWORD(lParam), HIWORD(lParam));
 
-    GetCursorPos32 (&pt);
-    ScreenToClient32 (wndPtr->hwndSelf, &pt);
+    GetCursorPos (&pt);
+    ScreenToClient (wndPtr->hwndSelf, &pt);
 
     REBAR_InternalHitTest (wndPtr, &pt, &flags, NULL);
 
     if (flags == RBHT_GRABBER) {
 	if ((wndPtr->dwStyle & CCS_VERT) &&
 	    !(wndPtr->dwStyle & RBS_VERTICALGRIPPER))
-	    SetCursor32 (infoPtr->hcurVert);
+	    SetCursor (infoPtr->hcurVert);
 	else
-	    SetCursor32 (infoPtr->hcurHorz);
+	    SetCursor (infoPtr->hcurHorz);
     }
     else if (flags != RBHT_CLIENT)
-	SetCursor32 (infoPtr->hcurArrow);
+	SetCursor (infoPtr->hcurArrow);
 
     return 0;
 }
 
 
 static LRESULT
-REBAR_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr(wndPtr);
     
     /* TEXTMETRIC32A tm; */
-    HFONT32 hFont /*, hOldFont */;
+    HFONT hFont /*, hOldFont */;
     /* HDC32 hdc; */
 
-    infoPtr->hFont = (HFONT32)wParam;
+    infoPtr->hFont = (HFONT)wParam;
 
-    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject32 (SYSTEM_FONT);
+    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
 /*
     hdc = GetDC32 (0);
     hOldFont = SelectObject32 (hdc, hFont);
@@ -1791,10 +1791,10 @@ REBAR_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-REBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+REBAR_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr(wndPtr);
-    RECT32 rcParent;
+    RECT rcParent;
     /* INT32 x, y, cx, cy; */
 
     /* auto resize deadlock check */
@@ -1806,7 +1806,7 @@ REBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     TRACE (rebar, "sizing rebar!\n");
 
     /* get parent rectangle */
-    GetClientRect32 (GetParent32 (wndPtr->hwndSelf), &rcParent);
+    GetClientRect (GetParent (wndPtr->hwndSelf), &rcParent);
 /*
     REBAR_Layout (wndPtr, &rcParent);
 
@@ -1851,7 +1851,7 @@ REBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -1873,11 +1873,11 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 
 /*	case RB_GETBANDINFO32:  */ /* outdated, just for compatibility */
 
-	case RB_GETBANDINFO32A:
-	    return REBAR_GetBandInfo32A (wndPtr, wParam, lParam);
+	case RB_GETBANDINFOA:
+	    return REBAR_GetBandInfoA (wndPtr, wParam, lParam);
 
-	case RB_GETBANDINFO32W:
-	    return REBAR_GetBandInfo32W (wndPtr, wParam, lParam);
+	case RB_GETBANDINFOW:
+	    return REBAR_GetBandInfoW (wndPtr, wParam, lParam);
 
 	case RB_GETBARHEIGHT:
 	    return REBAR_GetBarHeight (wndPtr, wParam, lParam);
@@ -1918,11 +1918,11 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case RB_IDTOINDEX:
 	    return REBAR_IdToIndex (wndPtr, wParam, lParam);
 
-	case RB_INSERTBAND32A:
-	    return REBAR_InsertBand32A (wndPtr, wParam, lParam);
+	case RB_INSERTBANDA:
+	    return REBAR_InsertBandA (wndPtr, wParam, lParam);
 
-	case RB_INSERTBAND32W:
-	    return REBAR_InsertBand32W (wndPtr, wParam, lParam);
+	case RB_INSERTBANDW:
+	    return REBAR_InsertBandW (wndPtr, wParam, lParam);
 
 	case RB_MAXIMIZEBAND:
 	    return REBAR_MaximizeBand (wndPtr, wParam, lParam);
@@ -1933,11 +1933,11 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case RB_MOVEBAND:
 	    return REBAR_MoveBand (wndPtr, wParam, lParam);
 
-	case RB_SETBANDINFO32A:
-	    return REBAR_SetBandInfo32A (wndPtr, wParam, lParam);
+	case RB_SETBANDINFOA:
+	    return REBAR_SetBandInfoA (wndPtr, wParam, lParam);
 
-	case RB_SETBANDINFO32W:
-	    return REBAR_SetBandInfo32W (wndPtr, wParam, lParam);
+	case RB_SETBANDINFOW:
+	    return REBAR_SetBandInfoW (wndPtr, wParam, lParam);
 
 	case RB_SETBARINFO:
 	    return REBAR_SetBarInfo (wndPtr, wParam, lParam);
@@ -1968,7 +1968,7 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 
 
 	case WM_COMMAND:
-	    return SendMessage32A (wndPtr->parent->hwndSelf, uMsg, wParam, lParam);
+	    return SendMessageA (wndPtr->parent->hwndSelf, uMsg, wParam, lParam);
 
 	case WM_CREATE:
 	    return REBAR_Create (wndPtr, wParam, lParam);
@@ -1989,7 +1989,7 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    return REBAR_NCPaint (wndPtr, wParam, lParam);
 
 	case WM_NOTIFY:
-	    return SendMessage32A (wndPtr->parent->hwndSelf, uMsg, wParam, lParam);
+	    return SendMessageA (wndPtr->parent->hwndSelf, uMsg, wParam, lParam);
 
 	case WM_PAINT:
 	    return REBAR_Paint (wndPtr, wParam);
@@ -2011,7 +2011,7 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (rebar, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -2020,27 +2020,27 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 REBAR_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (REBARCLASSNAME32A)) return;
+    if (GlobalFindAtomA (REBARCLASSNAMEA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS;
-    wndClass.lpfnWndProc   = (WNDPROC32)REBAR_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)REBAR_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(REBAR_INFO *);
     wndClass.hCursor       = 0;
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_BTNFACE + 1);
-    wndClass.lpszClassName = REBARCLASSNAME32A;
+    wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+    wndClass.lpszClassName = REBARCLASSNAMEA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 REBAR_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (REBARCLASSNAME32A))
-	UnregisterClass32A (REBARCLASSNAME32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (REBARCLASSNAMEA))
+	UnregisterClassA (REBARCLASSNAMEA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index 30acd1c1cdf..915e3715a22 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -33,69 +33,69 @@
 
 
 static void
-STATUSBAR_DrawSizeGrip (HDC32 hdc, LPRECT32 lpRect)
+STATUSBAR_DrawSizeGrip (HDC hdc, LPRECT lpRect)
 {
-    HPEN32 hOldPen;
-    POINT32 pt;
-    INT32 i;
+    HPEN hOldPen;
+    POINT pt;
+    INT i;
 
     pt.x = lpRect->right - 1;
     pt.y = lpRect->bottom - 1;
 
-    hOldPen = SelectObject32 (hdc, GetSysColorPen32 (COLOR_3DFACE));
-    MoveToEx32 (hdc, pt.x - 12, pt.y, NULL);
-    LineTo32 (hdc, pt.x, pt.y);
-    LineTo32 (hdc, pt.x, pt.y - 12);
+    hOldPen = SelectObject (hdc, GetSysColorPen (COLOR_3DFACE));
+    MoveToEx (hdc, pt.x - 12, pt.y, NULL);
+    LineTo (hdc, pt.x, pt.y);
+    LineTo (hdc, pt.x, pt.y - 12);
 
     pt.x--;
     pt.y--;
 
-    SelectObject32 (hdc, GetSysColorPen32 (COLOR_3DSHADOW));
+    SelectObject (hdc, GetSysColorPen (COLOR_3DSHADOW));
     for (i = 1; i < 11; i += 4) {
-	MoveToEx32 (hdc, pt.x - i, pt.y, NULL);
-	LineTo32 (hdc, pt.x, pt.y - i);
+	MoveToEx (hdc, pt.x - i, pt.y, NULL);
+	LineTo (hdc, pt.x, pt.y - i);
 
-	MoveToEx32 (hdc, pt.x - i-1, pt.y, NULL);
-	LineTo32 (hdc, pt.x, pt.y - i-1);
+	MoveToEx (hdc, pt.x - i-1, pt.y, NULL);
+	LineTo (hdc, pt.x, pt.y - i-1);
     }
 
-    SelectObject32 (hdc, GetSysColorPen32 (COLOR_3DHIGHLIGHT));
+    SelectObject (hdc, GetSysColorPen (COLOR_3DHIGHLIGHT));
     for (i = 3; i < 13; i += 4) {
-	MoveToEx32 (hdc, pt.x - i, pt.y, NULL);
-	LineTo32 (hdc, pt.x, pt.y - i);
+	MoveToEx (hdc, pt.x - i, pt.y, NULL);
+	LineTo (hdc, pt.x, pt.y - i);
     }
 
-    SelectObject32 (hdc, hOldPen);
+    SelectObject (hdc, hOldPen);
 }
 
 
 static void 
-STATUSBAR_DrawPart (HDC32 hdc, STATUSWINDOWPART *part)
+STATUSBAR_DrawPart (HDC hdc, STATUSWINDOWPART *part)
 {
-    RECT32 r = part->bound;
-    UINT32 border = BDR_SUNKENOUTER;
+    RECT r = part->bound;
+    UINT border = BDR_SUNKENOUTER;
 
     if (part->style==SBT_POPOUT)
       border = BDR_RAISEDOUTER;
     else if (part->style==SBT_NOBORDERS)
       border = 0;
 
-    DrawEdge32(hdc, &r, border, BF_RECT|BF_ADJUST);
+    DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST);
 
     /* draw the icon */
     if (part->hIcon) {
-	INT32 cy = r.bottom - r.top;
+	INT cy = r.bottom - r.top;
 
 	r.left += 2;
-	DrawIconEx32 (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
+	DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
 	r.left += cy;
     }
 
     /* now draw text */
     if (part->text) {
-      int oldbkmode = SetBkMode32(hdc, TRANSPARENT);
+      int oldbkmode = SetBkMode(hdc, TRANSPARENT);
       LPWSTR p = (LPWSTR)part->text;
-      UINT32 align = DT_LEFT;
+      UINT align = DT_LEFT;
       if (*p == L'\t') {
 	p++;
 	align = DT_CENTER;
@@ -106,81 +106,81 @@ STATUSBAR_DrawPart (HDC32 hdc, STATUSWINDOWPART *part)
 	}
       }
       r.left += 3;
-      DrawText32W (hdc, p, lstrlen32W (p), &r, align|DT_VCENTER|DT_SINGLELINE);
+      DrawTextW (hdc, p, lstrlenW (p), &r, align|DT_VCENTER|DT_SINGLELINE);
       if (oldbkmode != TRANSPARENT)
-	SetBkMode32(hdc, oldbkmode);
+	SetBkMode(hdc, oldbkmode);
     }
 }
 
 
 static VOID
-STATUSBAR_RefreshPart (WND *wndPtr, STATUSWINDOWPART *part, HDC32 hdc)
+STATUSBAR_RefreshPart (WND *wndPtr, STATUSWINDOWPART *part, HDC hdc)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
-    HBRUSH32 hbrBk;
-    HFONT32  hOldFont;
+    HBRUSH hbrBk;
+    HFONT  hOldFont;
 
-    if (!IsWindowVisible32(wndPtr->hwndSelf))
+    if (!IsWindowVisible(wndPtr->hwndSelf))
         return;
 
     if (self->clrBk != CLR_DEFAULT)
-	hbrBk = CreateSolidBrush32 (self->clrBk);
+	hbrBk = CreateSolidBrush (self->clrBk);
     else
-	hbrBk = GetSysColorBrush32 (COLOR_3DFACE);
-    FillRect32(hdc, &part->bound, hbrBk);
+	hbrBk = GetSysColorBrush (COLOR_3DFACE);
+    FillRect(hdc, &part->bound, hbrBk);
 
-    hOldFont = SelectObject32 (hdc, self->hFont ? self->hFont : self->hDefaultFont);
+    hOldFont = SelectObject (hdc, self->hFont ? self->hFont : self->hDefaultFont);
 
     if (part->style == SBT_OWNERDRAW) {
-	DRAWITEMSTRUCT32 dis;
+	DRAWITEMSTRUCT dis;
 
 	dis.CtlID = wndPtr->wIDmenu;
 	dis.itemID = -1;
 	dis.hwndItem = wndPtr->hwndSelf;
 	dis.hDC = hdc;
 	dis.rcItem = part->bound;
-	dis.itemData = (INT32)part->text;
-	SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_DRAWITEM,
-			(WPARAM32)wndPtr->wIDmenu, (LPARAM)&dis);
+	dis.itemData = (INT)part->text;
+	SendMessageA (GetParent (wndPtr->hwndSelf), WM_DRAWITEM,
+			(WPARAM)wndPtr->wIDmenu, (LPARAM)&dis);
     }
     else
 	STATUSBAR_DrawPart (hdc, part);
 
-    SelectObject32 (hdc, hOldFont);
+    SelectObject (hdc, hOldFont);
 
     if (self->clrBk != CLR_DEFAULT)
-	DeleteObject32 (hbrBk);
+	DeleteObject (hbrBk);
 
     if (wndPtr->dwStyle & SBARS_SIZEGRIP) {
-	RECT32 rect;
+	RECT rect;
 
-	GetClientRect32 (wndPtr->hwndSelf, &rect);
+	GetClientRect (wndPtr->hwndSelf, &rect);
 	STATUSBAR_DrawSizeGrip (hdc, &rect);
     }
 }
 
 
-static BOOL32
-STATUSBAR_Refresh (WND *wndPtr, HDC32 hdc)
+static BOOL
+STATUSBAR_Refresh (WND *wndPtr, HDC hdc)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
     int      i;
-    RECT32   rect;
-    HBRUSH32 hbrBk;
-    HFONT32  hOldFont;
+    RECT   rect;
+    HBRUSH hbrBk;
+    HFONT  hOldFont;
 
-    if (!IsWindowVisible32(wndPtr->hwndSelf))
+    if (!IsWindowVisible(wndPtr->hwndSelf))
         return (TRUE);
 
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 
     if (self->clrBk != CLR_DEFAULT)
-	hbrBk = CreateSolidBrush32 (self->clrBk);
+	hbrBk = CreateSolidBrush (self->clrBk);
     else
-	hbrBk = GetSysColorBrush32 (COLOR_3DFACE);
-    FillRect32(hdc, &rect, hbrBk);
+	hbrBk = GetSysColorBrush (COLOR_3DFACE);
+    FillRect(hdc, &rect, hbrBk);
 
-    hOldFont = SelectObject32 (hdc, self->hFont ? self->hFont : self->hDefaultFont);
+    hOldFont = SelectObject (hdc, self->hFont ? self->hFont : self->hDefaultFont);
 
     if (self->simple) {
 	STATUSBAR_DrawPart (hdc, &self->part0);
@@ -188,26 +188,26 @@ STATUSBAR_Refresh (WND *wndPtr, HDC32 hdc)
     else {
 	for (i = 0; i < self->numParts; i++) {
 	    if (self->parts[i].style == SBT_OWNERDRAW) {
-		DRAWITEMSTRUCT32 dis;
+		DRAWITEMSTRUCT dis;
 
 		dis.CtlID = wndPtr->wIDmenu;
 		dis.itemID = -1;
 		dis.hwndItem = wndPtr->hwndSelf;
 		dis.hDC = hdc;
 		dis.rcItem = self->parts[i].bound;
-		dis.itemData = (INT32)self->parts[i].text;
-		SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_DRAWITEM,
-				(WPARAM32)wndPtr->wIDmenu, (LPARAM)&dis);
+		dis.itemData = (INT)self->parts[i].text;
+		SendMessageA (GetParent (wndPtr->hwndSelf), WM_DRAWITEM,
+				(WPARAM)wndPtr->wIDmenu, (LPARAM)&dis);
 	    }
 	    else
 		STATUSBAR_DrawPart (hdc, &self->parts[i]);
 	}
     }
 
-    SelectObject32 (hdc, hOldFont);
+    SelectObject (hdc, hOldFont);
 
     if (self->clrBk != CLR_DEFAULT)
-	DeleteObject32 (hbrBk);
+	DeleteObject (hbrBk);
 
     if (wndPtr->dwStyle & SBARS_SIZEGRIP)
 	STATUSBAR_DrawSizeGrip (hdc, &rect);
@@ -221,11 +221,11 @@ STATUSBAR_SetPartBounds (WND *wndPtr)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
     STATUSWINDOWPART *part;
-    RECT32 rect, *r;
+    RECT rect, *r;
     int	i;
 
     /* get our window size */
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 
     rect.top += VERT_BORDER;
 
@@ -248,13 +248,13 @@ STATUSBAR_SetPartBounds (WND *wndPtr)
 	    r->right = part->x;
 
 	if (self->hwndToolTip) {
-	    TTTOOLINFO32A ti;
+	    TTTOOLINFOA ti;
 
-	    ti.cbSize = sizeof(TTTOOLINFO32A);
+	    ti.cbSize = sizeof(TTTOOLINFOA);
 	    ti.hwnd = wndPtr->hwndSelf;
 	    ti.uId = i;
 	    ti.rect = *r;
-	    SendMessage32A (self->hwndToolTip, TTM_NEWTOOLRECT32A,
+	    SendMessageA (self->hwndToolTip, TTM_NEWTOOLRECTA,
 			    0, (LPARAM)&ti);
 	}
     }
@@ -262,10 +262,10 @@ STATUSBAR_SetPartBounds (WND *wndPtr)
 
 
 static VOID
-STATUSBAR_RelayEvent (HWND32 hwndTip, HWND32 hwndMsg, UINT32 uMsg,
-		      WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
+		      WPARAM wParam, LPARAM lParam)
 {
-    MSG32 msg;
+    MSG msg;
 
     msg.hwnd = hwndMsg;
     msg.message = uMsg;
@@ -275,14 +275,14 @@ STATUSBAR_RelayEvent (HWND32 hwndTip, HWND32 hwndMsg, UINT32 uMsg,
     msg.pt.x = LOWORD(GetMessagePos ());
     msg.pt.y = HIWORD(GetMessagePos ());
 
-    SendMessage32A (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg);
+    SendMessageA (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg);
 }
 
 
 __inline__ static LRESULT
 STATUSBAR_GetBorders (LPARAM lParam)
 {
-    LPINT32 out = (LPINT32) lParam;
+    LPINT out = (LPINT) lParam;
 
     out[0] = HORZ_BORDER; /* horizontal border width */
     out[1] = VERT_BORDER; /* vertical border width */
@@ -293,12 +293,12 @@ STATUSBAR_GetBorders (LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_GetIcon (WND *wndPtr, WPARAM32 wParam)
+STATUSBAR_GetIcon (WND *wndPtr, WPARAM wParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
-    INT32 nPart;
+    INT nPart;
 
-    nPart = (INT32)wParam & 0x00ff;
+    nPart = (INT)wParam & 0x00ff;
     if ((nPart < -1) || (nPart >= self->numParts)) return 0;
 
     if (nPart == -1)
@@ -309,15 +309,15 @@ STATUSBAR_GetIcon (WND *wndPtr, WPARAM32 wParam)
 
 
 static LRESULT
-STATUSBAR_GetParts (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_GetParts (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
-    LPINT32 parts;
-    INT32   num_parts;
+    LPINT parts;
+    INT   num_parts;
     int	    i;
 
-    num_parts = (INT32) wParam;
-    parts = (LPINT32) lParam;
+    num_parts = (INT) wParam;
+    parts = (LPINT) lParam;
     if (parts) {
 	return (self->numParts);
 	for (i = 0; i < num_parts; i++) {
@@ -329,14 +329,14 @@ STATUSBAR_GetParts (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_GetRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_GetRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
     int	part_num;
-    LPRECT32  rect;
+    LPRECT  rect;
 
-    part_num = ((INT32) wParam) & 0x00ff;
-    rect = (LPRECT32) lParam;
+    part_num = ((INT) wParam) & 0x00ff;
+    rect = (LPRECT) lParam;
     if (infoPtr->simple)
 	*rect = infoPtr->part0.bound;
     else
@@ -346,14 +346,14 @@ STATUSBAR_GetRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_GetText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_GetTextA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
     STATUSWINDOWPART *part;
-    INT32   nPart;
+    INT   nPart;
     LRESULT result;
 
-    nPart = ((INT32) wParam) & 0x00ff;
+    nPart = ((INT) wParam) & 0x00ff;
     if (self->simple)
 	part = &self->part0;
     else
@@ -362,7 +362,7 @@ STATUSBAR_GetText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (part->style == SBT_OWNERDRAW)
 	result = (LRESULT)part->text;
     else {
-	result = part->text ? lstrlen32W (part->text) : 0;
+	result = part->text ? lstrlenW (part->text) : 0;
 	result |= (part->style << 16);
 	if (lParam && LOWORD(result))
 	    lstrcpyWtoA ((LPSTR)lParam, part->text);
@@ -372,14 +372,14 @@ STATUSBAR_GetText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_GetText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_GetTextW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
     STATUSWINDOWPART *part;
-    INT32   nPart;
+    INT   nPart;
     LRESULT result;
 
-    nPart = ((INT32)wParam) & 0x00ff;
+    nPart = ((INT)wParam) & 0x00ff;
     if (self->simple)
 	part = &self->part0;
     else
@@ -388,24 +388,24 @@ STATUSBAR_GetText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (part->style == SBT_OWNERDRAW)
 	result = (LRESULT)part->text;
     else {
-	result = part->text ? lstrlen32W (part->text) : 0;
+	result = part->text ? lstrlenW (part->text) : 0;
 	result |= (part->style << 16);
 	if (lParam)
-	    lstrcpy32W ((LPWSTR)lParam, part->text);
+	    lstrcpyW ((LPWSTR)lParam, part->text);
     }
     return result;
 }
 
 
 static LRESULT
-STATUSBAR_GetTextLength (WND *wndPtr, WPARAM32 wParam)
+STATUSBAR_GetTextLength (WND *wndPtr, WPARAM wParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
     STATUSWINDOWPART *part;
-    INT32 part_num;
+    INT part_num;
     DWORD result;
 
-    part_num = ((INT32) wParam) & 0x00ff;
+    part_num = ((INT) wParam) & 0x00ff;
 
     if (infoPtr->simple)
 	part = &infoPtr->part0;
@@ -413,7 +413,7 @@ STATUSBAR_GetTextLength (WND *wndPtr, WPARAM32 wParam)
 	part = &infoPtr->parts[part_num];
 
     if (part->text)
-	result = lstrlen32W(part->text);
+	result = lstrlenW(part->text);
     else
 	result = 0;
 
@@ -423,19 +423,19 @@ STATUSBAR_GetTextLength (WND *wndPtr, WPARAM32 wParam)
 
 
 static LRESULT
-STATUSBAR_GetTipText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_GetTipTextA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
 
     if (infoPtr->hwndToolTip) {
-	TTTOOLINFO32A ti;
-	ti.cbSize = sizeof(TTTOOLINFO32A);
+	TTTOOLINFOA ti;
+	ti.cbSize = sizeof(TTTOOLINFOA);
 	ti.hwnd = wndPtr->hwndSelf;
 	ti.uId = LOWORD(wParam);
-	SendMessage32A (infoPtr->hwndToolTip, TTM_GETTEXT32A, 0, (LPARAM)&ti);
+	SendMessageA (infoPtr->hwndToolTip, TTM_GETTEXTA, 0, (LPARAM)&ti);
 
 	if (ti.lpszText)
-	    lstrcpyn32A ((LPSTR)lParam, ti.lpszText, HIWORD(wParam));
+	    lstrcpynA ((LPSTR)lParam, ti.lpszText, HIWORD(wParam));
     }
 
     return 0;
@@ -443,19 +443,19 @@ STATUSBAR_GetTipText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_GetTipText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_GetTipTextW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
 
     if (infoPtr->hwndToolTip) {
-	TTTOOLINFO32W ti;
-	ti.cbSize = sizeof(TTTOOLINFO32W);
+	TTTOOLINFOW ti;
+	ti.cbSize = sizeof(TTTOOLINFOW);
 	ti.hwnd = wndPtr->hwndSelf;
 	ti.uId = LOWORD(wParam);
-	SendMessage32W (infoPtr->hwndToolTip, TTM_GETTEXT32W, 0, (LPARAM)&ti);
+	SendMessageW (infoPtr->hwndToolTip, TTM_GETTEXTW, 0, (LPARAM)&ti);
 
 	if (ti.lpszText)
-	    lstrcpyn32W ((LPWSTR)lParam, ti.lpszText, HIWORD(wParam));
+	    lstrcpynW ((LPWSTR)lParam, ti.lpszText, HIWORD(wParam));
     }
 
     return 0;
@@ -479,65 +479,65 @@ STATUSBAR_IsSimple (WND *wndPtr)
 
 
 static LRESULT
-STATUSBAR_SetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_SetBkColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
     COLORREF oldBkColor;
-    HDC32    hdc;
+    HDC    hdc;
 
     oldBkColor = self->clrBk;
     self->clrBk = (COLORREF)lParam;
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     STATUSBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return oldBkColor;
 }
 
 
 static LRESULT
-STATUSBAR_SetIcon (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_SetIcon (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
-    INT32 nPart = (INT32)wParam & 0x00ff;
-    HDC32 hdc; 
+    INT nPart = (INT)wParam & 0x00ff;
+    HDC hdc; 
 
     if ((nPart < -1) || (nPart >= self->numParts))
 	return FALSE;
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     if (nPart == -1) {
-	self->part0.hIcon = (HICON32)lParam;
+	self->part0.hIcon = (HICON)lParam;
 	if (self->simple)
 	    STATUSBAR_RefreshPart (wndPtr, &self->part0, hdc);
     }
     else {
-	self->parts[nPart].hIcon = (HICON32)lParam;
+	self->parts[nPart].hIcon = (HICON)lParam;
 	if (!(self->simple))
 	    STATUSBAR_RefreshPart (wndPtr, &self->parts[nPart], hdc);
     }
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-STATUSBAR_SetMinHeight (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_SetMinHeight (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
 
-    if (IsWindowVisible32 (wndPtr->hwndSelf)) {
-	HWND32 parent = GetParent32 (wndPtr->hwndSelf);
-	INT32  width, x, y;
-	RECT32 parent_rect;
+    if (IsWindowVisible (wndPtr->hwndSelf)) {
+	HWND parent = GetParent (wndPtr->hwndSelf);
+	INT  width, x, y;
+	RECT parent_rect;
 
-	GetClientRect32 (parent, &parent_rect);
-	self->height = (INT32)wParam + VERT_BORDER;
+	GetClientRect (parent, &parent_rect);
+	self->height = (INT)wParam + VERT_BORDER;
 	width = parent_rect.right - parent_rect.left;
 	x = parent_rect.left;
 	y = parent_rect.bottom - self->height;
-	MoveWindow32 (wndPtr->hwndSelf, parent_rect.left,
+	MoveWindow (wndPtr->hwndSelf, parent_rect.left,
 		      parent_rect.bottom - self->height,
 		      width, self->height, TRUE);
 	STATUSBAR_SetPartBounds (wndPtr);
@@ -548,12 +548,12 @@ STATUSBAR_SetMinHeight (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_SetParts (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_SetParts (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
     STATUSWINDOWPART *tmp;
-    HDC32	hdc;
-    LPINT32 parts;
+    HDC	hdc;
+    LPINT parts;
     int	i;
     int	oldNumParts;
 
@@ -561,8 +561,8 @@ STATUSBAR_SetParts (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	self->simple = FALSE;
 
     oldNumParts = self->numParts;
-    self->numParts = (INT32) wParam;
-    parts = (LPINT32) lParam;
+    self->numParts = (INT) wParam;
+    parts = (LPINT) lParam;
     if (oldNumParts > self->numParts) {
 	for (i = self->numParts ; i < oldNumParts; i++) {
 	    if (self->parts[i].text && (self->parts[i].style != SBT_OWNERDRAW))
@@ -584,27 +584,27 @@ STATUSBAR_SetParts (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     }
 
     if (self->hwndToolTip) {
-	INT32 nTipCount =
-	    SendMessage32A (self->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
+	INT nTipCount =
+	    SendMessageA (self->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
 
 	if (nTipCount < self->numParts) {
 	    /* add tools */
-	    TTTOOLINFO32A ti;
-	    INT32 i;
+	    TTTOOLINFOA ti;
+	    INT i;
 
-	    ZeroMemory (&ti, sizeof(TTTOOLINFO32A));
-	    ti.cbSize = sizeof(TTTOOLINFO32A);
+	    ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+	    ti.cbSize = sizeof(TTTOOLINFOA);
 	    ti.hwnd = wndPtr->hwndSelf;
 	    for (i = nTipCount; i < self->numParts; i++) {
 		TRACE (statusbar, "add tool %d\n", i);
 		ti.uId = i;
-		SendMessage32A (self->hwndToolTip, TTM_ADDTOOL32A,
+		SendMessageA (self->hwndToolTip, TTM_ADDTOOLA,
 				0, (LPARAM)&ti);
 	    }
 	}
 	else if (nTipCount > self->numParts) {
 	    /* delete tools */
-	    INT32 i;
+	    INT i;
 
 	    for (i = nTipCount - 1; i >= self->numParts; i--) {
 
@@ -616,16 +616,16 @@ STATUSBAR_SetParts (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     STATUSBAR_SetPartBounds (wndPtr);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     STATUSBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-STATUSBAR_SetText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_SetTextA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
     STATUSWINDOWPART *part;
@@ -633,11 +633,11 @@ STATUSBAR_SetText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     int	style;
     LPSTR text;
     int	len;
-    HDC32 hdc;
+    HDC hdc;
 
     text = (LPSTR) lParam;
-    part_num = ((INT32) wParam) & 0x00ff;
-    style = ((INT32) wParam) & 0xff00;
+    part_num = ((INT) wParam) & 0x00ff;
+    style = ((INT) wParam) & 0xff00;
 
     if ((self->simple) || (self->parts==NULL) || (part_num==255))
 	part = &self->part0;
@@ -653,32 +653,32 @@ STATUSBAR_SetText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	if (part->text)
 	    COMCTL32_Free (part->text);
 	part->text = 0;
-	if (text && (len = lstrlen32A(text))) {
+	if (text && (len = lstrlenA(text))) {
 	    part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
 	    lstrcpyAtoW (part->text, text);
 	}
     }
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     STATUSBAR_RefreshPart (wndPtr, part, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-STATUSBAR_SetText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_SetTextW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (wndPtr);
     STATUSWINDOWPART *part;
-    INT32  part_num, style, len;
+    INT  part_num, style, len;
     LPWSTR text;
-    HDC32  hdc;
+    HDC  hdc;
 
     text = (LPWSTR) lParam;
-    part_num = ((INT32) wParam) & 0x00ff;
-    style = ((INT32) wParam) & 0xff00;
+    part_num = ((INT) wParam) & 0x00ff;
+    style = ((INT) wParam) & 0xff00;
 
     if ((self->simple) || (self->parts==NULL) || (part_num==255))
 	part = &self->part0;
@@ -694,34 +694,34 @@ STATUSBAR_SetText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	if (part->text)
 	    COMCTL32_Free (part->text);
 	part->text = 0;
-	if (text && (len = lstrlen32W(text))) {
+	if (text && (len = lstrlenW(text))) {
 	    part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-	    lstrcpy32W(part->text, text);
+	    lstrcpyW(part->text, text);
 	}
     }
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     STATUSBAR_RefreshPart (wndPtr, part, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-STATUSBAR_SetTipText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_SetTipTextA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
 
-    TRACE (statusbar, "part %d: \"%s\"\n", (INT32)wParam, (LPSTR)lParam);
+    TRACE (statusbar, "part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
     if (infoPtr->hwndToolTip) {
-	TTTOOLINFO32A ti;
-	ti.cbSize = sizeof(TTTOOLINFO32A);
+	TTTOOLINFOA ti;
+	ti.cbSize = sizeof(TTTOOLINFOA);
 	ti.hwnd = wndPtr->hwndSelf;
-	ti.uId = (INT32)wParam;
+	ti.uId = (INT)wParam;
 	ti.hinst = 0;
 	ti.lpszText = (LPSTR)lParam;
-	SendMessage32A (infoPtr->hwndToolTip, TTM_UPDATETIPTEXT32A,
+	SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA,
 			0, (LPARAM)&ti);
     }
 
@@ -730,19 +730,19 @@ STATUSBAR_SetTipText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_SetTipText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_SetTipTextW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
 
-    TRACE (statusbar, "part %d: \"%s\"\n", (INT32)wParam, (LPSTR)lParam);
+    TRACE (statusbar, "part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
     if (infoPtr->hwndToolTip) {
-	TTTOOLINFO32W ti;
-	ti.cbSize = sizeof(TTTOOLINFO32W);
+	TTTOOLINFOW ti;
+	ti.cbSize = sizeof(TTTOOLINFOW);
 	ti.hwnd = wndPtr->hwndSelf;
-	ti.uId = (INT32)wParam;
+	ti.uId = (INT)wParam;
 	ti.hinst = 0;
 	ti.lpszText = (LPWSTR)lParam;
-	SendMessage32W (infoPtr->hwndToolTip, TTM_UPDATETIPTEXT32W,
+	SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW,
 			0, (LPARAM)&ti);
     }
 
@@ -751,50 +751,50 @@ STATUSBAR_SetTipText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-STATUSBAR_SetUnicodeFormat (WND *wndPtr, WPARAM32 wParam)
+STATUSBAR_SetUnicodeFormat (WND *wndPtr, WPARAM wParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
-    BOOL32 bTemp = infoPtr->bUnicode;
+    BOOL bTemp = infoPtr->bUnicode;
 
-    TRACE (statusbar, "(0x%x)\n", (BOOL32)wParam);
-    infoPtr->bUnicode = (BOOL32)wParam;
+    TRACE (statusbar, "(0x%x)\n", (BOOL)wParam);
+    infoPtr->bUnicode = (BOOL)wParam;
 
     return bTemp;
 }
 
 
 static LRESULT
-STATUSBAR_Simple (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_Simple (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
-    HDC32  hdc;
+    HDC  hdc;
     NMHDR  nmhdr;
 
-    infoPtr->simple = (BOOL32)wParam;
+    infoPtr->simple = (BOOL)wParam;
 
     /* send notification */
     nmhdr.hwndFrom = wndPtr->hwndSelf;
     nmhdr.idFrom = wndPtr->wIDmenu;
     nmhdr.code = SBN_SIMPLEMODECHANGE;
-    SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
+    SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
 		    0, (LPARAM)&nmhdr);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     STATUSBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-STATUSBAR_WMCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_WMCreate (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    LPCREATESTRUCT32A lpCreate = (LPCREATESTRUCT32A)lParam;
-    NONCLIENTMETRICS32A nclm;
-    RECT32	rect;
+    LPCREATESTRUCTA lpCreate = (LPCREATESTRUCTA)lParam;
+    NONCLIENTMETRICSA nclm;
+    RECT	rect;
     int	        width, len;
-    HDC32	hdc;
+    HDC	hdc;
     STATUSWINDOWINFO *self;
 
     self = (STATUSWINDOWINFO*)COMCTL32_Alloc (sizeof(STATUSWINDOWINFO));
@@ -805,11 +805,11 @@ STATUSBAR_WMCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     self->simple = FALSE;
     self->clrBk = CLR_DEFAULT;
     self->hFont = 0;
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 
-    nclm.cbSize = sizeof(NONCLIENTMETRICS32A);
-    SystemParametersInfo32A (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
-    self->hDefaultFont = CreateFontIndirect32A (&nclm.lfStatusFont);
+    nclm.cbSize = sizeof(NONCLIENTMETRICSA);
+    SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
+    self->hDefaultFont = CreateFontIndirectA (&nclm.lfStatusFont);
 
     /* initialize simple case */
     self->part0.bound = rect;
@@ -828,34 +828,34 @@ STATUSBAR_WMCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     if (IsWindowUnicode (wndPtr->hwndSelf)) {
 	self->bUnicode = TRUE;
-	if ((len = lstrlen32W ((LPCWSTR)lpCreate->lpszName))) {
+	if ((len = lstrlenW ((LPCWSTR)lpCreate->lpszName))) {
 	    self->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-	    lstrcpy32W (self->parts[0].text, (LPCWSTR)lpCreate->lpszName);
+	    lstrcpyW (self->parts[0].text, (LPCWSTR)lpCreate->lpszName);
 	}
     }
     else {
-	if ((len = lstrlen32A ((LPCSTR)lpCreate->lpszName))) {
+	if ((len = lstrlenA ((LPCSTR)lpCreate->lpszName))) {
 	    self->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
 	    lstrcpyAtoW (self->parts[0].text, (LPCSTR)lpCreate->lpszName);
 	}
     }
 
-    if ((hdc = GetDC32 (0))) {
-	TEXTMETRIC32A tm;
-	HFONT32 hOldFont;
+    if ((hdc = GetDC (0))) {
+	TEXTMETRICA tm;
+	HFONT hOldFont;
 
-	hOldFont = SelectObject32 (hdc,self->hDefaultFont);
-	GetTextMetrics32A(hdc, &tm);
+	hOldFont = SelectObject (hdc,self->hDefaultFont);
+	GetTextMetricsA(hdc, &tm);
 	self->textHeight = tm.tmHeight;
-	SelectObject32 (hdc, hOldFont);
-	ReleaseDC32(0, hdc);
+	SelectObject (hdc, hOldFont);
+	ReleaseDC(0, hdc);
     }
 
     if (wndPtr->dwStyle & SBT_TOOLTIPS) {
 	self->hwndToolTip =
-	    CreateWindowEx32A (0, TOOLTIPS_CLASS32A, NULL, 0,
-			       CW_USEDEFAULT32, CW_USEDEFAULT32,
-			       CW_USEDEFAULT32, CW_USEDEFAULT32,
+	    CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+			       CW_USEDEFAULT, CW_USEDEFAULT,
+			       CW_USEDEFAULT, CW_USEDEFAULT,
 			       wndPtr->hwndSelf, 0,
 			       wndPtr->hInstance, NULL);
 
@@ -867,15 +867,15 @@ STATUSBAR_WMCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	    nmttc.hdr.code = NM_TOOLTIPSCREATED;
 	    nmttc.hwndToolTips = self->hwndToolTip;
 
-	    SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-			    (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmttc);
+	    SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+			    (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmttc);
 	}
     }
 
-    GetClientRect32 (GetParent32 (wndPtr->hwndSelf), &rect);
+    GetClientRect (GetParent (wndPtr->hwndSelf), &rect);
     width = rect.right - rect.left;
     self->height = self->textHeight + 4 + VERT_BORDER;
-    MoveWindow32 (wndPtr->hwndSelf, lpCreate->x, lpCreate->y-1,
+    MoveWindow (wndPtr->hwndSelf, lpCreate->x, lpCreate->y-1,
 		  width, self->height, FALSE);
     STATUSBAR_SetPartBounds (wndPtr);
 
@@ -899,11 +899,11 @@ STATUSBAR_WMDestroy (WND *wndPtr)
 
     /* delete default font */
     if (self->hDefaultFont)
-	DeleteObject32 (self->hDefaultFont);
+	DeleteObject (self->hDefaultFont);
 
     /* delete tool tip control */
     if (self->hwndToolTip)
-	DestroyWindow32 (self->hwndToolTip);
+	DestroyWindow (self->hwndToolTip);
 
     COMCTL32_Free (self);
 
@@ -920,17 +920,17 @@ STATUSBAR_WMGetFont (WND *wndPtr)
 
 
 static LRESULT
-STATUSBAR_WMGetText (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_WMGetText (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
-    INT32 len;
+    INT len;
 
     if (!(infoPtr->parts[0].text))
         return 0;
-    len = lstrlen32W (infoPtr->parts[0].text);
+    len = lstrlenW (infoPtr->parts[0].text);
     if (wParam > len) {
 	if (infoPtr->bUnicode)
-	    lstrcpy32W ((LPWSTR)lParam, infoPtr->parts[0].text);
+	    lstrcpyW ((LPWSTR)lParam, infoPtr->parts[0].text);
 	else
 	    lstrcpyWtoA ((LPSTR)lParam, infoPtr->parts[0].text);
 	return len;
@@ -941,7 +941,7 @@ STATUSBAR_WMGetText (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-STATUSBAR_WMMouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_WMMouseMove (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
 
@@ -953,72 +953,72 @@ STATUSBAR_WMMouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_WMNCHitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_WMNCHitTest (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     if (wndPtr->dwStyle & SBARS_SIZEGRIP) {
-	RECT32  rect;
-	POINT32 pt;
+	RECT  rect;
+	POINT pt;
 
-	GetClientRect32 (wndPtr->hwndSelf, &rect);
+	GetClientRect (wndPtr->hwndSelf, &rect);
 
-	pt.x = (INT32)LOWORD(lParam);
-	pt.y = (INT32)HIWORD(lParam);
-	ScreenToClient32 (wndPtr->hwndSelf, &pt);
+	pt.x = (INT)LOWORD(lParam);
+	pt.y = (INT)HIWORD(lParam);
+	ScreenToClient (wndPtr->hwndSelf, &pt);
 
 	rect.left = rect.right - 13;
 	rect.top += 2;
 
-	if (PtInRect32 (&rect, pt))
+	if (PtInRect (&rect, pt))
 	    return HTBOTTOMRIGHT;
     }
 
-    return DefWindowProc32A (wndPtr->hwndSelf, WM_NCHITTEST, wParam, lParam);
+    return DefWindowProcA (wndPtr->hwndSelf, WM_NCHITTEST, wParam, lParam);
 }
 
 
 static __inline__ LRESULT
-STATUSBAR_WMNCLButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_WMNCLButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    PostMessage32A (wndPtr->parent->hwndSelf, WM_NCLBUTTONDOWN,
+    PostMessageA (wndPtr->parent->hwndSelf, WM_NCLBUTTONDOWN,
 		    wParam, lParam);
     return 0;
 }
 
 
 static __inline__ LRESULT
-STATUSBAR_WMNCLButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_WMNCLButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    PostMessage32A (wndPtr->parent->hwndSelf, WM_NCLBUTTONUP,
+    PostMessageA (wndPtr->parent->hwndSelf, WM_NCLBUTTONUP,
 		    wParam, lParam);
     return 0;
 }
 
 
 static LRESULT
-STATUSBAR_WMPaint (WND *wndPtr, WPARAM32 wParam)
+STATUSBAR_WMPaint (WND *wndPtr, WPARAM wParam)
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
+    HDC hdc;
+    PAINTSTRUCT ps;
 
-    hdc = wParam==0 ? BeginPaint32 (wndPtr->hwndSelf, &ps) : (HDC32)wParam;
+    hdc = wParam==0 ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam;
     STATUSBAR_Refresh (wndPtr, hdc);
     if (!wParam)
-	EndPaint32 (wndPtr->hwndSelf, &ps);
+	EndPaint (wndPtr->hwndSelf, &ps);
 
     return 0;
 }
 
 
 static LRESULT
-STATUSBAR_WMSetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_WMSetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
 
-    infoPtr->hFont = (HFONT32)wParam;
+    infoPtr->hFont = (HFONT)wParam;
     if (LOWORD(lParam) == TRUE) {
-	HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+	HDC hdc = GetDC (wndPtr->hwndSelf);
         STATUSBAR_Refresh (wndPtr, hdc);
-        ReleaseDC32 (wndPtr->hwndSelf, hdc);
+        ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -1026,12 +1026,12 @@ STATUSBAR_WMSetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_WMSetText (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_WMSetText (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
     STATUSWINDOWPART *part;
     int len;
-    HDC32 hdc;
+    HDC hdc;
 
     if (infoPtr->numParts == 0)
 	return FALSE;
@@ -1042,36 +1042,36 @@ STATUSBAR_WMSetText (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
         COMCTL32_Free (part->text);
     part->text = 0;
     if (infoPtr->bUnicode) {
-	if (lParam && (len = lstrlen32W((LPCWSTR)lParam))) {
+	if (lParam && (len = lstrlenW((LPCWSTR)lParam))) {
 	    part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-	    lstrcpy32W (part->text, (LPCWSTR)lParam);
+	    lstrcpyW (part->text, (LPCWSTR)lParam);
 	}
     }
     else {
-	if (lParam && (len = lstrlen32A((LPCSTR)lParam))) {
+	if (lParam && (len = lstrlenA((LPCSTR)lParam))) {
 	    part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
 	    lstrcpyAtoW (part->text, (LPCSTR)lParam);
 	}
     }
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     STATUSBAR_RefreshPart (wndPtr, part, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-STATUSBAR_WMSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+STATUSBAR_WMSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (wndPtr);
-    INT32  width, x, y, flags;
-    RECT32 parent_rect;
-    HWND32 parent;
+    INT  width, x, y, flags;
+    RECT parent_rect;
+    HWND parent;
 
     /* Need to resize width to match parent */
-    flags = (INT32) wParam;
+    flags = (INT) wParam;
 
     /* FIXME for flags =
      * SIZE_MAXIMIZED, SIZE_MAXSHOW, SIZE_MINIMIZED, SIZE_RESTORED
@@ -1079,12 +1079,12 @@ STATUSBAR_WMSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     if (flags == SIZE_RESTORED) {
 	/* width and height don't apply */
-	parent = GetParent32 (wndPtr->hwndSelf);
-	GetClientRect32 (parent, &parent_rect);
+	parent = GetParent (wndPtr->hwndSelf);
+	GetClientRect (parent, &parent_rect);
 	width = parent_rect.right - parent_rect.left;
 	x = parent_rect.left;
 	y = parent_rect.bottom - infoPtr->height;
-	MoveWindow32 (wndPtr->hwndSelf, parent_rect.left, 
+	MoveWindow (wndPtr->hwndSelf, parent_rect.left, 
 		      parent_rect.bottom - infoPtr->height,
 		      width, infoPtr->height, TRUE);
 	STATUSBAR_SetPartBounds (wndPtr);
@@ -1094,14 +1094,14 @@ STATUSBAR_WMSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-STATUSBAR_SendNotify (WND *wndPtr, UINT32 code)
+STATUSBAR_SendNotify (WND *wndPtr, UINT code)
 {
     NMHDR  nmhdr;
 
     nmhdr.hwndFrom = wndPtr->hwndSelf;
     nmhdr.idFrom = wndPtr->wIDmenu;
     nmhdr.code = code;
-    SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
+    SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
 		    0, (LPARAM)&nmhdr);
     return 0;
 }
@@ -1109,7 +1109,7 @@ STATUSBAR_SendNotify (WND *wndPtr, UINT32 code)
 
 
 LRESULT WINAPI
-StatusWindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
+StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr (hwnd);
 
@@ -1126,21 +1126,21 @@ StatusWindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
 	case SB_GETRECT:
 	    return STATUSBAR_GetRect (wndPtr, wParam, lParam);
 
-	case SB_GETTEXT32A:
-	    return STATUSBAR_GetText32A (wndPtr, wParam, lParam);
+	case SB_GETTEXTA:
+	    return STATUSBAR_GetTextA (wndPtr, wParam, lParam);
 
-	case SB_GETTEXT32W:
-	    return STATUSBAR_GetText32W (wndPtr, wParam, lParam);
+	case SB_GETTEXTW:
+	    return STATUSBAR_GetTextW (wndPtr, wParam, lParam);
 
-	case SB_GETTEXTLENGTH32A:
-	case SB_GETTEXTLENGTH32W:
+	case SB_GETTEXTLENGTHA:
+	case SB_GETTEXTLENGTHW:
 	    return STATUSBAR_GetTextLength (wndPtr, wParam);
 
-	case SB_GETTIPTEXT32A:
-	    return STATUSBAR_GetTipText32A (wndPtr, wParam, lParam);
+	case SB_GETTIPTEXTA:
+	    return STATUSBAR_GetTipTextA (wndPtr, wParam, lParam);
 
-	case SB_GETTIPTEXT32W:
-	    return STATUSBAR_GetTipText32W (wndPtr, wParam, lParam);
+	case SB_GETTIPTEXTW:
+	    return STATUSBAR_GetTipTextW (wndPtr, wParam, lParam);
 
 	case SB_GETUNICODEFORMAT:
 	    return STATUSBAR_GetUnicodeFormat (wndPtr);
@@ -1160,17 +1160,17 @@ StatusWindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
 	case SB_SETPARTS:	
 	    return STATUSBAR_SetParts (wndPtr, wParam, lParam);
 
-	case SB_SETTEXT32A:
-	    return STATUSBAR_SetText32A (wndPtr, wParam, lParam);
+	case SB_SETTEXTA:
+	    return STATUSBAR_SetTextA (wndPtr, wParam, lParam);
 
-	case SB_SETTEXT32W:
-	    return STATUSBAR_SetText32W (wndPtr, wParam, lParam);
+	case SB_SETTEXTW:
+	    return STATUSBAR_SetTextW (wndPtr, wParam, lParam);
 
-	case SB_SETTIPTEXT32A:
-	    return STATUSBAR_SetTipText32A (wndPtr, wParam, lParam);
+	case SB_SETTIPTEXTA:
+	    return STATUSBAR_SetTipTextA (wndPtr, wParam, lParam);
 
-	case SB_SETTIPTEXT32W:
-	    return STATUSBAR_SetTipText32W (wndPtr, wParam, lParam);
+	case SB_SETTIPTEXTW:
+	    return STATUSBAR_SetTipTextW (wndPtr, wParam, lParam);
 
 	case SB_SETUNICODEFORMAT:
 	    return STATUSBAR_SetUnicodeFormat (wndPtr, wParam);
@@ -1234,7 +1234,7 @@ StatusWindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
 	    if (msg >= WM_USER)
 		ERR (statusbar, "unknown msg %04x wp=%04x lp=%08lx\n",
 		     msg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, msg, wParam, lParam);
+	    return DefWindowProcA (hwnd, msg, wParam, lParam);
     }
     return 0;
 }
@@ -1249,20 +1249,20 @@ StatusWindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
 VOID
 STATUS_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (STATUSCLASSNAME32A)) return;
+    if (GlobalFindAtomA (STATUSCLASSNAMEA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW;
-    wndClass.lpfnWndProc   = (WNDPROC32)StatusWindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)StatusWindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(STATUSWINDOWINFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_3DFACE + 1);
-    wndClass.lpszClassName = STATUSCLASSNAME32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
+    wndClass.lpszClassName = STATUSCLASSNAMEA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
@@ -1275,7 +1275,7 @@ STATUS_Register (VOID)
 VOID
 STATUS_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (STATUSCLASSNAME32A))
-	UnregisterClass32A (STATUSCLASSNAME32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (STATUSCLASSNAMEA))
+	UnregisterClassA (STATUSCLASSNAMEA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 0db78f69dae..ad9c889c9db 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -26,11 +26,11 @@
 
 
 
-static void TAB_Refresh (WND *wndPtr, HDC32 hdc);
+static void TAB_Refresh (WND *wndPtr, HDC hdc);
 
 
-static BOOL32
-TAB_SendSimpleNotify (WND *wndPtr, UINT32 code)
+static BOOL
+TAB_SendSimpleNotify (WND *wndPtr, UINT code)
 {
     NMHDR nmhdr;
 
@@ -38,16 +38,16 @@ TAB_SendSimpleNotify (WND *wndPtr, UINT32 code)
     nmhdr.idFrom = wndPtr->wIDmenu;
     nmhdr.code = code;
 
-    return (BOOL32) SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-				    (WPARAM32) nmhdr.idFrom, (LPARAM) &nmhdr);
+    return (BOOL) SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+				    (WPARAM) nmhdr.idFrom, (LPARAM) &nmhdr);
 }
 
 
 static VOID
-TAB_RelayEvent (HWND32 hwndTip, HWND32 hwndMsg, UINT32 uMsg,
-            WPARAM32 wParam, LPARAM lParam)
+TAB_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
+            WPARAM wParam, LPARAM lParam)
 {
-    MSG32 msg;
+    MSG msg;
 
     msg.hwnd = hwndMsg;
     msg.message = uMsg;
@@ -57,7 +57,7 @@ TAB_RelayEvent (HWND32 hwndTip, HWND32 hwndMsg, UINT32 uMsg,
     msg.pt.x = LOWORD(GetMessagePos ());
     msg.pt.y = HIWORD(GetMessagePos ());
 
-    SendMessage32A (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg);
+    SendMessageA (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg);
 }
 
 
@@ -79,7 +79,7 @@ TAB_GetCurFocus (WND *wndPtr)
 }
 
 static LRESULT
-TAB_GetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_GetToolTips (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 
@@ -89,11 +89,11 @@ TAB_GetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TAB_SetCurSel (WND *wndPtr,WPARAM32 wParam)
+TAB_SetCurSel (WND *wndPtr,WPARAM wParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
-	INT32 iItem=(INT32) wParam;
-	INT32 prevItem;
+	INT iItem=(INT) wParam;
+	INT prevItem;
  
 	prevItem=-1;
 	if ((iItem >= 0) && (iItem < infoPtr->uNumItem)) {
@@ -104,11 +104,11 @@ TAB_SetCurSel (WND *wndPtr,WPARAM32 wParam)
 }
 
 static LRESULT
-TAB_SetCurFocus (WND *wndPtr,WPARAM32 wParam)
+TAB_SetCurFocus (WND *wndPtr,WPARAM wParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
-	INT32 iItem=(INT32) wParam;
-	HDC32 hdc;
+	INT iItem=(INT) wParam;
+	HDC hdc;
  
 	if ((iItem < 0) || (iItem > infoPtr->uNumItem)) return 0;
 
@@ -120,9 +120,9 @@ TAB_SetCurFocus (WND *wndPtr,WPARAM32 wParam)
 	    	if (TAB_SendSimpleNotify(wndPtr, TCN_SELCHANGING)!=TRUE)  {
 				infoPtr->iSelected = iItem;
 				TAB_SendSimpleNotify(wndPtr, TCN_SELCHANGE);
-    			hdc = GetDC32 (wndPtr->hwndSelf);
+    			hdc = GetDC (wndPtr->hwndSelf);
     			TAB_Refresh (wndPtr, hdc);
-    			ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    			ReleaseDC (wndPtr->hwndSelf, hdc);
 			}
 		}
 	}
@@ -130,33 +130,33 @@ TAB_SetCurFocus (WND *wndPtr,WPARAM32 wParam)
 }
 
 static LRESULT
-TAB_SetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_SetToolTips (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 
     if (infoPtr == NULL) return 0;
-    infoPtr->hwndToolTip = (HWND32)wParam;
+    infoPtr->hwndToolTip = (HWND)wParam;
     return 0;
 }
 
 
-static HWND32 TAB_InternalHitTest (TAB_INFO *infoPtr, POINT32 pt, 
-									UINT32 *flags)
+static HWND TAB_InternalHitTest (TAB_INFO *infoPtr, POINT pt, 
+									UINT *flags)
 
 {
-  RECT32 rect;
+  RECT rect;
   int iCount; 
   
   for (iCount = 0; iCount < infoPtr->uNumItem; iCount++) {
 	    rect = infoPtr->items[iCount].rect;
-	    if (PtInRect32 (&rect, pt)) return iCount;
+	    if (PtInRect (&rect, pt)) return iCount;
 	}
   *flags=TCHT_NOWHERE;
   return -1;
 }
 
 static LRESULT
-TAB_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_HitTest (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 	LPTCHITTESTINFO lptest=(LPTCHITTESTINFO) lParam;
@@ -166,7 +166,7 @@ TAB_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TAB_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_LButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 
@@ -175,25 +175,25 @@ TAB_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
                 WM_LBUTTONDOWN, wParam, lParam);
 
 	if (wndPtr->dwStyle & TCS_FOCUSONBUTTONDOWN ) {
-		SetFocus32 (wndPtr->hwndSelf);
+		SetFocus (wndPtr->hwndSelf);
 	}
 	return 0;
 }
 
 static LRESULT
-TAB_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_LButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
-    POINT32 pt;
-    INT32 newItem,dummy;
-	HDC32 hdc;
+    POINT pt;
+    INT newItem,dummy;
+	HDC hdc;
 
 	if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, wndPtr->hwndSelf,
                 WM_LBUTTONDOWN, wParam, lParam);
 
-    pt.x = (INT32)LOWORD(lParam);
-    pt.y = (INT32)HIWORD(lParam);
+    pt.x = (INT)LOWORD(lParam);
+    pt.y = (INT)HIWORD(lParam);
 
 	newItem=TAB_InternalHitTest (infoPtr,pt,&dummy);
 	if (!newItem) return 0;
@@ -203,9 +203,9 @@ TAB_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	    if (TAB_SendSimpleNotify(wndPtr, TCN_SELCHANGING)!=TRUE)  {
 			infoPtr->iSelected = newItem;
 			TAB_SendSimpleNotify(wndPtr, TCN_SELCHANGE);
-    		hdc = GetDC32 (wndPtr->hwndSelf);
+    		hdc = GetDC (wndPtr->hwndSelf);
     		TAB_Refresh (wndPtr, hdc);
-    		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    		ReleaseDC (wndPtr->hwndSelf, hdc);
 		}
 	}
 	TAB_SendSimpleNotify(wndPtr, NM_CLICK);
@@ -214,14 +214,14 @@ TAB_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TAB_RButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_RButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 	TAB_SendSimpleNotify(wndPtr, NM_RCLICK);
 	return 0;
 }
 
 static LRESULT
-TAB_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_MouseMove (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 
@@ -232,7 +232,7 @@ TAB_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TAB_AdjustRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_AdjustRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 
 	if (wParam==TRUE) {
@@ -248,20 +248,20 @@ static void
 TAB_SetItemBounds (WND *wndPtr)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
-    RECT32 rect;
-    HFONT32 hFont, hOldFont;
-    INT32 i, left;
-    SIZE32 size;
-    HDC32 hdc;
+    RECT rect;
+    HFONT hFont, hOldFont;
+    INT i, left;
+    SIZE size;
+    HDC hdc;
 
     /* FIXME: Is this needed? */
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 	left += (size.cx + 11);
     
-    hdc = GetDC32(wndPtr->hwndSelf); 
+    hdc = GetDC(wndPtr->hwndSelf); 
     
-    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject32 (SYSTEM_FONT);
-    hOldFont = SelectObject32 (hdc, hFont);
+    hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
+    hOldFont = SelectObject (hdc, hFont);
 
     left = rect.left;
     
@@ -278,7 +278,7 @@ TAB_SetItemBounds (WND *wndPtr)
 
 	GetTextExtentPoint32A(hdc, 
 			     infoPtr->items[i].pszText, 
-			     lstrlen32A(infoPtr->items[i].pszText), &size);
+			     lstrlenA(infoPtr->items[i].pszText), &size);
 	infoPtr->items[i].rect.right = left + size.cx+2*5;
 	TRACE(tab, "TextSize: %i\n ", size.cx);
 	TRACE(tab, "Rect: T %i, L %i, B %i, R %i\n", 
@@ -289,61 +289,61 @@ TAB_SetItemBounds (WND *wndPtr)
 	left += (size.cx + 11);
     }
 
-    SelectObject32 (hdc, hOldFont);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    SelectObject (hdc, hOldFont);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 }
 				 
 static void
-TAB_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem)
+TAB_DrawItem (WND *wndPtr, HDC hdc, INT iItem)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
     TAB_ITEM *pti = &infoPtr->items[iItem];
-    RECT32 r;
-    INT32 oldBkMode,cx,cy;
-  HBRUSH32 hbr = CreateSolidBrush32 (COLOR_BACKGROUND);
+    RECT r;
+    INT oldBkMode,cx,cy;
+  HBRUSH hbr = CreateSolidBrush (COLOR_BACKGROUND);
    
-    HPEN32	hwPen  = GetSysColorPen32 (COLOR_3DHILIGHT);
-    HPEN32	hbPen  = GetSysColorPen32 (COLOR_BTNSHADOW);
-    HPEN32	hsdPen = GetSysColorPen32 (COLOR_BTNTEXT);
-    HPEN32	htmpPen = (HPEN32)NULL;
+    HPEN	hwPen  = GetSysColorPen (COLOR_3DHILIGHT);
+    HPEN	hbPen  = GetSysColorPen (COLOR_BTNSHADOW);
+    HPEN	hsdPen = GetSysColorPen (COLOR_BTNTEXT);
+    HPEN	htmpPen = (HPEN)NULL;
 
-    CopyRect32(&r, &pti->rect);
+    CopyRect(&r, &pti->rect);
 
 /* demo */
-    FillRect32(hdc, &r, hbr);
+    FillRect(hdc, &r, hbr);
 	
 	
 
 
     htmpPen = hwPen;
-    htmpPen = SelectObject32 (hdc, htmpPen);
+    htmpPen = SelectObject (hdc, htmpPen);
 	if (wndPtr->dwStyle & TCS_BOTTOM) {
-    	MoveToEx32 (hdc, r.left, r.top, NULL);
-    	LineTo32 (hdc, r.left, r.bottom - 2);
-    	LineTo32 (hdc, r.left +2, r.bottom);
-    	LineTo32 (hdc, r.right -1, r.bottom);
-    	htmpPen = SelectObject32 (hdc, hbPen); 
-    	MoveToEx32 (hdc, r.right-1, r.top, NULL);
-    	LineTo32 (hdc,r.right-1, r.bottom-1);
-    	hbPen = SelectObject32 (hdc, hsdPen);
-    	MoveToEx32 (hdc, r.right, r.top+1, NULL);
-    	LineTo32(hdc, r.right,r.bottom);
+    	MoveToEx (hdc, r.left, r.top, NULL);
+    	LineTo (hdc, r.left, r.bottom - 2);
+    	LineTo (hdc, r.left +2, r.bottom);
+    	LineTo (hdc, r.right -1, r.bottom);
+    	htmpPen = SelectObject (hdc, hbPen); 
+    	MoveToEx (hdc, r.right-1, r.top, NULL);
+    	LineTo (hdc,r.right-1, r.bottom-1);
+    	hbPen = SelectObject (hdc, hsdPen);
+    	MoveToEx (hdc, r.right, r.top+1, NULL);
+    	LineTo(hdc, r.right,r.bottom);
     } else {
-    	MoveToEx32 (hdc, r.left, r.bottom, NULL);
-    	LineTo32 (hdc, r.left, r.top + 2);
-    	LineTo32 (hdc, r.left +2, r.top);
-    	LineTo32 (hdc, r.right -1, r.top);
-    	htmpPen = SelectObject32 (hdc, hbPen); 
-    	MoveToEx32 (hdc, r.right-1, r.bottom, NULL);
-    	LineTo32 (hdc,r.right-1, r.top+1);
-    	hbPen = SelectObject32 (hdc, hsdPen);
-    	MoveToEx32 (hdc, r.right, r.bottom-1, NULL);
-    	LineTo32(hdc, r.right,r.top);
+    	MoveToEx (hdc, r.left, r.bottom, NULL);
+    	LineTo (hdc, r.left, r.top + 2);
+    	LineTo (hdc, r.left +2, r.top);
+    	LineTo (hdc, r.right -1, r.top);
+    	htmpPen = SelectObject (hdc, hbPen); 
+    	MoveToEx (hdc, r.right-1, r.bottom, NULL);
+    	LineTo (hdc,r.right-1, r.top+1);
+    	hbPen = SelectObject (hdc, hsdPen);
+    	MoveToEx (hdc, r.right, r.bottom-1, NULL);
+    	LineTo(hdc, r.right,r.top);
 	}
 
-   	hsdPen = SelectObject32(hdc,htmpPen); 
+   	hsdPen = SelectObject(hdc,htmpPen); 
 
-    oldBkMode = SetBkMode32(hdc, TRANSPARENT); 
+    oldBkMode = SetBkMode(hdc, TRANSPARENT); 
     r.left += 3;
     r.right -= 3;
 
@@ -353,98 +353,98 @@ TAB_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem)
 		ImageList_GetIconSize (infoPtr->himl, &cx, &cy);
 		r.left+=cx+3;
 		}
-    SetTextColor32 (hdc, COLOR_BTNTEXT);
-    DrawText32A(hdc, pti->pszText, lstrlen32A(pti->pszText),
+    SetTextColor (hdc, COLOR_BTNTEXT);
+    DrawTextA(hdc, pti->pszText, lstrlenA(pti->pszText),
 	&r, DT_LEFT|DT_SINGLELINE|DT_VCENTER);
     if (oldBkMode != TRANSPARENT)
-	SetBkMode32(hdc, oldBkMode);
+	SetBkMode(hdc, oldBkMode);
 }
 
 static void
-TAB_DrawBorder (WND *wndPtr, HDC32 hdc)
+TAB_DrawBorder (WND *wndPtr, HDC hdc)
 {
-    HPEN32 htmPen;
-    HPEN32 hwPen  = GetSysColorPen32 (COLOR_3DHILIGHT);
-    HPEN32 hbPen  = GetSysColorPen32 (COLOR_3DDKSHADOW);
-    HPEN32 hShade = GetSysColorPen32 (COLOR_BTNSHADOW);
+    HPEN htmPen;
+    HPEN hwPen  = GetSysColorPen (COLOR_3DHILIGHT);
+    HPEN hbPen  = GetSysColorPen (COLOR_3DDKSHADOW);
+    HPEN hShade = GetSysColorPen (COLOR_BTNSHADOW);
 
-    RECT32 rect;
+    RECT rect;
 
-    htmPen = SelectObject32 (hdc, hwPen);
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    htmPen = SelectObject (hdc, hwPen);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 
-    MoveToEx32 (hdc, rect.left, rect.bottom, NULL);
-    LineTo32 (hdc, rect.left, rect.top+20); 
+    MoveToEx (hdc, rect.left, rect.bottom, NULL);
+    LineTo (hdc, rect.left, rect.top+20); 
 
-    LineTo32 (hdc, rect.right, rect.top+20);
+    LineTo (hdc, rect.right, rect.top+20);
 
-    hwPen = SelectObject32 (hdc, htmPen);
-    LineTo32 (hdc, rect.right, rect.bottom );
-    LineTo32 (hdc, rect.left, rect.bottom);
-    hbPen = SelectObject32 (hdc, hShade );
-    MoveToEx32 (hdc, rect.right-1, rect.top+20, NULL);
-    LineTo32 (hdc, rect.right-1, rect.bottom-1);
-    LineTo32 (hdc, rect.left, rect.bottom-1);
-    hShade = SelectObject32(hdc, hShade);
+    hwPen = SelectObject (hdc, htmPen);
+    LineTo (hdc, rect.right, rect.bottom );
+    LineTo (hdc, rect.left, rect.bottom);
+    hbPen = SelectObject (hdc, hShade );
+    MoveToEx (hdc, rect.right-1, rect.top+20, NULL);
+    LineTo (hdc, rect.right-1, rect.bottom-1);
+    LineTo (hdc, rect.left, rect.bottom-1);
+    hShade = SelectObject(hdc, hShade);
 }
 
     
 static void
-TAB_Refresh (WND *wndPtr, HDC32 hdc)
+TAB_Refresh (WND *wndPtr, HDC hdc)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
-    HFONT32 hOldFont;
-    INT32 i;
+    HFONT hOldFont;
+    INT i;
 
 	if (!infoPtr->DoRedraw) return;
 
     TAB_DrawBorder (wndPtr, hdc);
 
-	hOldFont = SelectObject32 (hdc, infoPtr->hFont);
+	hOldFont = SelectObject (hdc, infoPtr->hFont);
     for (i = 0; i < infoPtr->uNumItem; i++) {
 	TAB_DrawItem (wndPtr, hdc, i);
     }
-	SelectObject32 (hdc, hOldFont);
+	SelectObject (hdc, hOldFont);
 }
 
 static LRESULT
-TAB_SetRedraw (WND *wndPtr, WPARAM32 wParam)
+TAB_SetRedraw (WND *wndPtr, WPARAM wParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 	
-	infoPtr->DoRedraw=(BOOL32) wParam;
+	infoPtr->DoRedraw=(BOOL) wParam;
 	return 0;
 }
 
 static LRESULT
-TAB_Paint (WND *wndPtr, WPARAM32 wParam)
+TAB_Paint (WND *wndPtr, WPARAM wParam)
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
+    HDC hdc;
+    PAINTSTRUCT ps;
     
-    hdc = wParam== 0 ? BeginPaint32 (wndPtr->hwndSelf, &ps) : (HDC32)wParam;
+    hdc = wParam== 0 ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam;
     TAB_Refresh (wndPtr, hdc);
     
     if(!wParam)
-	EndPaint32 (wndPtr->hwndSelf, &ps);
+	EndPaint (wndPtr->hwndSelf, &ps);
     return 0;
 }
 
 static LRESULT
-TAB_InsertItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_InsertItem (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
-    TCITEM32A *pti;
-    HDC32  hdc;
-    INT32 iItem, len;
-    RECT32 rect;
+    TCITEMA *pti;
+    HDC  hdc;
+    INT iItem, len;
+    RECT rect;
 
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
 	TRACE(tab, "Rect: %x T %i, L %i, B %i, R %i\n", wndPtr->hwndSelf,
 	      rect.top, rect.left, rect.bottom, rect.right);	
 
-    pti = (TCITEM32A *)lParam;
-    iItem = (INT32)wParam;
+    pti = (TCITEMA *)lParam;
+    iItem = (INT)wParam;
 
     if (iItem < 0) return -1;
     if (iItem > infoPtr->uNumItem)
@@ -478,9 +478,9 @@ TAB_InsertItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     infoPtr->items[iItem].mask = pti->mask;
     if (pti->mask & TCIF_TEXT) {
-	len = lstrlen32A (pti->pszText);
+	len = lstrlenA (pti->pszText);
 	infoPtr->items[iItem].pszText = COMCTL32_Alloc (len+1);
-	lstrcpy32A (infoPtr->items[iItem].pszText, pti->pszText);
+	lstrcpyA (infoPtr->items[iItem].pszText, pti->pszText);
 	infoPtr->items[iItem].cchTextMax = pti->cchTextMax;
     }
 
@@ -490,9 +490,9 @@ TAB_InsertItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (pti->mask & TCIF_PARAM)
 	infoPtr->items[iItem].lParam = pti->lParam;
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TAB_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     TRACE(tab, "[%04x]: added item %d '%s'\n",
 		wndPtr->hwndSelf, iItem, infoPtr->items[iItem].pszText);
@@ -502,15 +502,15 @@ TAB_InsertItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT 
-TAB_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_SetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
-  TCITEM32A *tabItem; 
+  TCITEMA *tabItem; 
   TAB_ITEM *wineItem; 
-  INT32    iItem,len;
+  INT    iItem,len;
 
-  iItem=(INT32) wParam;
-  tabItem=(LPTCITEM32A ) lParam;
+  iItem=(INT) wParam;
+  tabItem=(LPTCITEMA ) lParam;
   TRACE (tab,"%d %p\n",iItem, tabItem);
   if ((iItem<0) || (iItem>infoPtr->uNumItem)) return FALSE;
 
@@ -529,17 +529,17 @@ TAB_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		wineItem->dwState=tabItem->dwState;
 
   if (tabItem->mask & TCIF_TEXT) {
-	 len=lstrlen32A (tabItem->pszText);
+	 len=lstrlenA (tabItem->pszText);
 	 if (len>wineItem->cchTextMax) 
 		 wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
-	 lstrcpyn32A (wineItem->pszText, tabItem->pszText, len);
+	 lstrcpynA (wineItem->pszText, tabItem->pszText, len);
   }
 
 	return TRUE;
 }
 
 static LRESULT 
-TAB_GetItemCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_GetItemCount (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
    TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 
@@ -548,15 +548,15 @@ TAB_GetItemCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT 
-TAB_GetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_GetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
    TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
-   TCITEM32A *tabItem;
+   TCITEMA *tabItem;
    TAB_ITEM *wineItem;
-   INT32    iItem;
+   INT    iItem;
 
-  iItem=(INT32) wParam;
-  tabItem=(LPTCITEM32A) lParam;
+  iItem=(INT) wParam;
+  tabItem=(LPTCITEMA) lParam;
   TRACE (tab,"\n");
   if ((iItem<0) || (iItem>infoPtr->uNumItem)) return FALSE;
 
@@ -575,20 +575,20 @@ TAB_GetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		tabItem->dwState=wineItem->dwState;
 
   if (tabItem->mask & TCIF_TEXT) 
-	 lstrcpyn32A (tabItem->pszText, wineItem->pszText, tabItem->cchTextMax);
+	 lstrcpynA (tabItem->pszText, wineItem->pszText, tabItem->cchTextMax);
 
 	return TRUE;
 }
 
 static LRESULT 
-TAB_DeleteItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_DeleteItem (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 	FIXME (tab,"stub \n");
 	return TRUE;
 }
 
 static LRESULT 
-TAB_DeleteAllItems (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_DeleteAllItems (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
    TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 
@@ -600,7 +600,7 @@ TAB_DeleteAllItems (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TAB_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_GetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 
@@ -609,35 +609,35 @@ TAB_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TAB_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
  TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
- TEXTMETRIC32A tm;
- HFONT32 hFont, hOldFont;
- HDC32 hdc;
+ TEXTMETRICA tm;
+ HFONT hFont, hOldFont;
+ HDC hdc;
 
  TRACE (tab,"%x %lx\n",wParam, lParam);
 
- infoPtr->hFont = (HFONT32)wParam;
+ infoPtr->hFont = (HFONT)wParam;
 
- hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject32 (SYSTEM_FONT);
+ hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
 
- hdc = GetDC32 (0);
- hOldFont = SelectObject32 (hdc, hFont);
- GetTextMetrics32A (hdc, &tm);
+ hdc = GetDC (0);
+ hOldFont = SelectObject (hdc, hFont);
+ GetTextMetricsA (hdc, &tm);
  infoPtr->nHeight= tm.tmHeight + tm.tmExternalLeading;
- SelectObject32 (hdc, hOldFont);
+ SelectObject (hdc, hOldFont);
 
  if (lParam) TAB_Refresh (wndPtr,hdc);
- ReleaseDC32 (0, hdc);
+ ReleaseDC (0, hdc);
 
  return 0;
 }
 
 
 static LRESULT
-TAB_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_GetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
 
@@ -646,7 +646,7 @@ TAB_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TAB_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_SetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
     HIMAGELIST himlPrev;
@@ -659,40 +659,40 @@ TAB_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TAB_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
-  RECT32 parent_rect;
-  HWND32 parent;
-  HDC32 hdc;
-  UINT32 uPosFlags,cx,cy;
+  RECT parent_rect;
+  HWND parent;
+  HDC hdc;
+  UINT uPosFlags,cx,cy;
 
   uPosFlags=0;
   if (!wParam) {
-  	parent = GetParent32 (wndPtr->hwndSelf);
-  	GetClientRect32(parent, &parent_rect);
+  	parent = GetParent (wndPtr->hwndSelf);
+  	GetClientRect(parent, &parent_rect);
   	cx=LOWORD (lParam);
   	cy=HIWORD (lParam);
   	if (wndPtr->dwStyle & CCS_NORESIZE) 
         uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
 
-  	SetWindowPos32 (wndPtr->hwndSelf, 0, parent_rect.left, parent_rect.top,
+  	SetWindowPos (wndPtr->hwndSelf, 0, parent_rect.left, parent_rect.top,
             cx, cy, uPosFlags | SWP_NOZORDER);
 	} else {
     FIXME (tab,"WM_SIZE flag %x %lx not handled\n", wParam, lParam);
   } 
 
   TAB_SetItemBounds (wndPtr);
-  hdc = GetDC32 (wndPtr->hwndSelf);
+  hdc = GetDC (wndPtr->hwndSelf);
   TAB_Refresh (wndPtr, hdc);
-  ReleaseDC32 (wndPtr->hwndSelf, hdc);
+  ReleaseDC (wndPtr->hwndSelf, hdc);
 
   return 0;
 }
 
 
 static LRESULT 
-TAB_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr;
 
@@ -702,7 +702,7 @@ TAB_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->uNumItem = 0;
     infoPtr->hFont = 0;
     infoPtr->items = 0;
-    infoPtr->hcurArrow = LoadCursor32A (0, IDC_ARROW32A);
+    infoPtr->hcurArrow = LoadCursorA (0, IDC_ARROWA);
     infoPtr->iSelected = -1;  
 	infoPtr->hwndToolTip=0;
   
@@ -710,9 +710,9 @@ TAB_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (wndPtr->dwStyle & TCS_TOOLTIPS) {
     /* Create tooltip control */
     infoPtr->hwndToolTip =
-        CreateWindowEx32A (0, TOOLTIPS_CLASS32A, NULL, 0,
-                   CW_USEDEFAULT32, CW_USEDEFAULT32,
-                   CW_USEDEFAULT32, CW_USEDEFAULT32,
+        CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+                   CW_USEDEFAULT, CW_USEDEFAULT,
+                   CW_USEDEFAULT, CW_USEDEFAULT,
                    wndPtr->hwndSelf, 0, 0, 0);
 
     /* Send NM_TOOLTIPSCREATED notification */
@@ -724,8 +724,8 @@ TAB_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
         nmttc.hdr.code = NM_TOOLTIPSCREATED;
         nmttc.hwndToolTips = infoPtr->hwndToolTip;
 
-        SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmttc);
+        SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmttc);
     }
     }
 
@@ -734,10 +734,10 @@ TAB_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TAB_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TAB_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
-    INT32 iItem;
+    INT iItem;
 
     if (infoPtr->items) {
 	for (iItem = 0; iItem < infoPtr->uNumItem; iItem++) {
@@ -748,14 +748,14 @@ TAB_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     }
 
 	if (infoPtr->hwndToolTip) 
-		  DestroyWindow32 (infoPtr->hwndToolTip);
+		  DestroyWindow (infoPtr->hwndToolTip);
 
     COMCTL32_Free (infoPtr);
     return 0;
 }
 
 LRESULT WINAPI
-TAB_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -771,17 +771,17 @@ TAB_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TCM_GETITEMCOUNT:
 	    return TAB_GetItemCount (wndPtr, wParam, lParam);
 
-	case TCM_GETITEM32A:
-	   return TAB_GetItem32A (wndPtr, wParam, lParam);
+	case TCM_GETITEMA:
+	   return TAB_GetItemA (wndPtr, wParam, lParam);
 
-	case TCM_GETITEM32W:
+	case TCM_GETITEMW:
 	   FIXME (tab, "Unimplemented msg TCM_GETITEM32W\n");
 	   return 0;
 
-	case TCM_SETITEM32A:
-	   return TAB_SetItem32A (wndPtr, wParam, lParam);
+	case TCM_SETITEMA:
+	   return TAB_SetItemA (wndPtr, wParam, lParam);
 
-	case TCM_SETITEM32W:
+	case TCM_SETITEMW:
 	   FIXME (tab, "Unimplemented msg TCM_GETITEM32W\n");
 	   return 0;
 
@@ -804,10 +804,10 @@ TAB_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TCM_SETCURSEL:
 	   return TAB_SetCurSel (wndPtr, wParam);
 
-	case TCM_INSERTITEM32A:
+	case TCM_INSERTITEMA:
 	   return TAB_InsertItem (wndPtr, wParam, lParam);
 
-	case TCM_INSERTITEM32W:
+	case TCM_INSERTITEMW:
 	   FIXME (tab, "Unimplemented msg TCM_INSERTITEM32W\n");
 	   return 0;
 
@@ -894,7 +894,7 @@ TAB_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (tab, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -903,27 +903,27 @@ TAB_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 TAB_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (WC_TABCONTROL32A)) return;
+    if (GlobalFindAtomA (WC_TABCONTROLA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS;
-    wndClass.lpfnWndProc   = (WNDPROC32)TAB_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)TAB_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(TAB_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
     wndClass.hbrBackground = 0;
-    wndClass.lpszClassName = WC_TABCONTROL32A;
+    wndClass.lpszClassName = WC_TABCONTROLA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 TAB_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (WC_TABCONTROL32A))
-	UnregisterClass32A (WC_TABCONTROL32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (WC_TABCONTROLA))
+	UnregisterClassA (WC_TABCONTROLA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 2b272beb285..4db62ad56ac 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -47,132 +47,132 @@
 
 
 static void
-TOOLBAR_DrawFlatSeparator (LPRECT32 lpRect, HDC32 hdc)
+TOOLBAR_DrawFlatSeparator (LPRECT lpRect, HDC hdc)
 {
-    INT32 x = (lpRect->left + lpRect->right) / 2 - 1;
-    INT32 yBottom = lpRect->bottom - 3;
-    INT32 yTop = lpRect->top + 1;
+    INT x = (lpRect->left + lpRect->right) / 2 - 1;
+    INT yBottom = lpRect->bottom - 3;
+    INT yTop = lpRect->top + 1;
 
-    SelectObject32 ( hdc, GetSysColorPen32 (COLOR_3DSHADOW));
-    MoveToEx32 (hdc, x, yBottom, NULL);
-    LineTo32 (hdc, x, yTop);
+    SelectObject ( hdc, GetSysColorPen (COLOR_3DSHADOW));
+    MoveToEx (hdc, x, yBottom, NULL);
+    LineTo (hdc, x, yTop);
     x++;
-    SelectObject32 ( hdc, GetSysColorPen32 (COLOR_3DHILIGHT));
-    MoveToEx32 (hdc, x, yBottom, NULL);
-    LineTo32 (hdc, x, yTop);
+    SelectObject ( hdc, GetSysColorPen (COLOR_3DHILIGHT));
+    MoveToEx (hdc, x, yBottom, NULL);
+    LineTo (hdc, x, yTop);
 }
 
 
 static void
 TOOLBAR_DrawString (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-		    HDC32 hdc, INT32 nState)
+		    HDC hdc, INT nState)
 {
-    RECT32   rcText = btnPtr->rect;
-    HFONT32  hOldFont;
-    INT32    nOldBkMode;
+    RECT   rcText = btnPtr->rect;
+    HFONT  hOldFont;
+    INT    nOldBkMode;
     COLORREF clrOld;
 
     /* draw text */
     if ((btnPtr->iString > -1) && (btnPtr->iString < infoPtr->nNumStrings)) {
-	InflateRect32 (&rcText, -3, -3);
+	InflateRect (&rcText, -3, -3);
 	rcText.top += infoPtr->nBitmapHeight;
 	if (nState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
-	    OffsetRect32 (&rcText, 1, 1);
+	    OffsetRect (&rcText, 1, 1);
 
-	hOldFont = SelectObject32 (hdc, infoPtr->hFont);
-	nOldBkMode = SetBkMode32 (hdc, TRANSPARENT);
+	hOldFont = SelectObject (hdc, infoPtr->hFont);
+	nOldBkMode = SetBkMode (hdc, TRANSPARENT);
 	if (!(nState & TBSTATE_ENABLED)) {
-	    clrOld = SetTextColor32 (hdc, GetSysColor32 (COLOR_3DHILIGHT));
-	    OffsetRect32 (&rcText, 1, 1);
-	    DrawText32W (hdc, infoPtr->strings[btnPtr->iString], -1,
+	    clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DHILIGHT));
+	    OffsetRect (&rcText, 1, 1);
+	    DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
 			 &rcText, infoPtr->dwDTFlags);
-	    SetTextColor32 (hdc, GetSysColor32 (COLOR_3DSHADOW));
-	    OffsetRect32 (&rcText, -1, -1);
-	    DrawText32W (hdc, infoPtr->strings[btnPtr->iString], -1,
+	    SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
+	    OffsetRect (&rcText, -1, -1);
+	    DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
 			 &rcText, infoPtr->dwDTFlags);
 	}
 	else if (nState & TBSTATE_INDETERMINATE) {
-	    clrOld = SetTextColor32 (hdc, GetSysColor32 (COLOR_3DSHADOW));
-	    DrawText32W (hdc, infoPtr->strings[btnPtr->iString], -1,
+	    clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
+	    DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
 			 &rcText, infoPtr->dwDTFlags);
 	}
 	else {
-	    clrOld = SetTextColor32 (hdc, GetSysColor32 (COLOR_BTNTEXT));
-	    DrawText32W (hdc, infoPtr->strings[btnPtr->iString], -1,
+	    clrOld = SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT));
+	    DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
 			 &rcText, infoPtr->dwDTFlags);
 	}
 
-	SetTextColor32 (hdc, clrOld);
-	SelectObject32 (hdc, hOldFont);
+	SetTextColor (hdc, clrOld);
+	SelectObject (hdc, hOldFont);
 	if (nOldBkMode != TRANSPARENT)
-	    SetBkMode32 (hdc, nOldBkMode);
+	    SetBkMode (hdc, nOldBkMode);
     }
 }
 
 
 static void
-TOOLBAR_DrawPattern (HDC32 hdc, LPRECT32 lpRect)
+TOOLBAR_DrawPattern (HDC hdc, LPRECT lpRect)
 {
-    HBRUSH32 hbr = SelectObject32 (hdc, CACHE_GetPattern55AABrush ());
-    INT32 cx = lpRect->right - lpRect->left;
-    INT32 cy = lpRect->bottom - lpRect->top;
-    PatBlt32 (hdc, lpRect->left, lpRect->top, cx, cy, 0x00FA0089);
-    SelectObject32 (hdc, hbr);
+    HBRUSH hbr = SelectObject (hdc, CACHE_GetPattern55AABrush ());
+    INT cx = lpRect->right - lpRect->left;
+    INT cy = lpRect->bottom - lpRect->top;
+    PatBlt (hdc, lpRect->left, lpRect->top, cx, cy, 0x00FA0089);
+    SelectObject (hdc, hbr);
 }
 
 
 static void
 TOOLBAR_DrawMasked (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-		    HDC32 hdc, INT32 x, INT32 y)
+		    HDC hdc, INT x, INT y)
 {
     /* FIXME: this function is a hack since it uses image list
 	      internals directly */
 
-    HDC32 hdcImageList = CreateCompatibleDC32 (0);
-    HDC32 hdcMask = CreateCompatibleDC32 (0);
+    HDC hdcImageList = CreateCompatibleDC (0);
+    HDC hdcMask = CreateCompatibleDC (0);
     HIMAGELIST himl = infoPtr->himlStd;
-    HBITMAP32 hbmMask;
+    HBITMAP hbmMask;
 
     /* create new bitmap */
-    hbmMask = CreateBitmap32 (himl->cx, himl->cy, 1, 1, NULL);
-    SelectObject32 (hdcMask, hbmMask);
+    hbmMask = CreateBitmap (himl->cx, himl->cy, 1, 1, NULL);
+    SelectObject (hdcMask, hbmMask);
 
     /* copy the mask bitmap */
-    SelectObject32 (hdcImageList, himl->hbmMask);
-    SetBkColor32 (hdcImageList, RGB(255, 255, 255));
-    SetTextColor32 (hdcImageList, RGB(0, 0, 0));
-    BitBlt32 (hdcMask, 0, 0, himl->cx, himl->cy,
+    SelectObject (hdcImageList, himl->hbmMask);
+    SetBkColor (hdcImageList, RGB(255, 255, 255));
+    SetTextColor (hdcImageList, RGB(0, 0, 0));
+    BitBlt (hdcMask, 0, 0, himl->cx, himl->cy,
 	      hdcImageList, himl->cx * btnPtr->iBitmap, 0, SRCCOPY);
 
 #if 0
     /* add white mask from image */
-    SelectObject32 (hdcImageList, himl->hbmImage);
-    SetBkColor32 (hdcImageList, RGB(0, 0, 0));
-    BitBlt32 (hdcMask, 0, 0, himl->cx, himl->cy,
+    SelectObject (hdcImageList, himl->hbmImage);
+    SetBkColor (hdcImageList, RGB(0, 0, 0));
+    BitBlt (hdcMask, 0, 0, himl->cx, himl->cy,
 	      hdcImageList, himl->cx * btnPtr->iBitmap, 0, MERGEPAINT);
 #endif
 
     /* draw the new mask */
-    SelectObject32 (hdc, GetSysColorBrush32 (COLOR_3DHILIGHT));
-    BitBlt32 (hdc, x+1, y+1, himl->cx, himl->cy,
+    SelectObject (hdc, GetSysColorBrush (COLOR_3DHILIGHT));
+    BitBlt (hdc, x+1, y+1, himl->cx, himl->cy,
 	      hdcMask, 0, 0, 0xB8074A);
 
-    SelectObject32 (hdc, GetSysColorBrush32 (COLOR_3DSHADOW));
-    BitBlt32 (hdc, x, y, himl->cx, himl->cy,
+    SelectObject (hdc, GetSysColorBrush (COLOR_3DSHADOW));
+    BitBlt (hdc, x, y, himl->cx, himl->cy,
 	      hdcMask, 0, 0, 0xB8074A);
 
-    DeleteObject32 (hbmMask);
-    DeleteDC32 (hdcMask);
-    DeleteDC32 (hdcImageList);
+    DeleteObject (hbmMask);
+    DeleteDC (hdcMask);
+    DeleteDC (hdcImageList);
 }
 
 
 static void
-TOOLBAR_DrawButton (WND *wndPtr, TBUTTON_INFO *btnPtr, HDC32 hdc)
+TOOLBAR_DrawButton (WND *wndPtr, TBUTTON_INFO *btnPtr, HDC hdc)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    BOOL32 bFlat = (wndPtr->dwStyle & TBSTYLE_FLAT);
-    RECT32 rc;
+    BOOL bFlat = (wndPtr->dwStyle & TBSTYLE_FLAT);
+    RECT rc;
 
     if (btnPtr->fsState & TBSTATE_HIDDEN) return;
 
@@ -185,7 +185,7 @@ TOOLBAR_DrawButton (WND *wndPtr, TBUTTON_INFO *btnPtr, HDC32 hdc)
 
     /* disabled */
     if (!(btnPtr->fsState & TBSTATE_ENABLED)) {
-	DrawEdge32 (hdc, &rc, EDGE_RAISED,
+	DrawEdge (hdc, &rc, EDGE_RAISED,
 		    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
 
 	if (bFlat) {
@@ -204,7 +204,7 @@ TOOLBAR_DrawButton (WND *wndPtr, TBUTTON_INFO *btnPtr, HDC32 hdc)
 
     /* pressed TBSTYLE_BUTTON */
     if (btnPtr->fsState & TBSTATE_PRESSED) {
-	DrawEdge32 (hdc, &rc, EDGE_SUNKEN,
+	DrawEdge (hdc, &rc, EDGE_SUNKEN,
 		    BF_RECT | BF_MIDDLE | BF_ADJUST);
 	ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
 			rc.left+2, rc.top+2, ILD_NORMAL);
@@ -216,10 +216,10 @@ TOOLBAR_DrawButton (WND *wndPtr, TBUTTON_INFO *btnPtr, HDC32 hdc)
     if ((btnPtr->fsStyle & TBSTYLE_CHECK) &&
 	(btnPtr->fsState & TBSTATE_CHECKED)) {
 	if (bFlat)
-	    DrawEdge32 (hdc, &rc, BDR_SUNKENOUTER,
+	    DrawEdge (hdc, &rc, BDR_SUNKENOUTER,
 			BF_RECT | BF_MIDDLE | BF_ADJUST);
 	else
-	    DrawEdge32 (hdc, &rc, EDGE_SUNKEN,
+	    DrawEdge (hdc, &rc, EDGE_SUNKEN,
 			BF_RECT | BF_MIDDLE | BF_ADJUST);
 
 	TOOLBAR_DrawPattern (hdc, &rc);
@@ -235,7 +235,7 @@ TOOLBAR_DrawButton (WND *wndPtr, TBUTTON_INFO *btnPtr, HDC32 hdc)
 
     /* indeterminate */	
     if (btnPtr->fsState & TBSTATE_INDETERMINATE) {
-	DrawEdge32 (hdc, &rc, EDGE_RAISED,
+	DrawEdge (hdc, &rc, EDGE_RAISED,
 		    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
 
 	TOOLBAR_DrawPattern (hdc, &rc);
@@ -245,7 +245,7 @@ TOOLBAR_DrawButton (WND *wndPtr, TBUTTON_INFO *btnPtr, HDC32 hdc)
     }
 
     /* normal state */
-    DrawEdge32 (hdc, &rc, EDGE_RAISED,
+    DrawEdge (hdc, &rc, EDGE_RAISED,
 		BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
 
     if (bFlat)
@@ -260,11 +260,11 @@ TOOLBAR_DrawButton (WND *wndPtr, TBUTTON_INFO *btnPtr, HDC32 hdc)
 
 
 static void
-TOOLBAR_Refresh (WND *wndPtr, HDC32 hdc)
+TOOLBAR_Refresh (WND *wndPtr, HDC hdc)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    INT32 i;
+    INT i;
 
     /* draw buttons */
     btnPtr = infoPtr->buttons;
@@ -274,19 +274,19 @@ TOOLBAR_Refresh (WND *wndPtr, HDC32 hdc)
 
 
 static void
-TOOLBAR_CalcStrings (WND *wndPtr, LPSIZE32 lpSize)
+TOOLBAR_CalcStrings (WND *wndPtr, LPSIZE lpSize)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    INT32 i;
-    HDC32 hdc;
-    HFONT32 hOldFont;
-    SIZE32 sz;
+    INT i;
+    HDC hdc;
+    HFONT hOldFont;
+    SIZE sz;
 
     lpSize->cx = 0;
     lpSize->cy = 0;
-    hdc = GetDC32 (0);
-    hOldFont = SelectObject32 (hdc, infoPtr->hFont);
+    hdc = GetDC (0);
+    hOldFont = SelectObject (hdc, infoPtr->hFont);
 
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
@@ -294,7 +294,7 @@ TOOLBAR_CalcStrings (WND *wndPtr, LPSIZE32 lpSize)
 	    (btnPtr->iString > -1) &&
 	    (btnPtr->iString < infoPtr->nNumStrings)) {
 	    LPWSTR lpText = infoPtr->strings[btnPtr->iString];
-	    GetTextExtentPoint32W (hdc, lpText, lstrlen32W (lpText), &sz);
+	    GetTextExtentPoint32W (hdc, lpText, lstrlenW (lpText), &sz);
 	    if (sz.cx > lpSize->cx)
 		lpSize->cx = sz.cx;
 	    if (sz.cy > lpSize->cy)
@@ -302,8 +302,8 @@ TOOLBAR_CalcStrings (WND *wndPtr, LPSIZE32 lpSize)
 	}
     }
 
-    SelectObject32 (hdc, hOldFont);
-    ReleaseDC32 (0, hdc);
+    SelectObject (hdc, hOldFont);
+    ReleaseDC (0, hdc);
 
     TRACE (toolbar, "string size %d x %d!\n", lpSize->cx, lpSize->cy);
 }
@@ -314,13 +314,13 @@ TOOLBAR_CalcToolbar (WND *wndPtr)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr, *grpPtr;
-    INT32 i, j, nRows;
-    INT32 x, y, cx, cy;
-    BOOL32 bWrap;
-    SIZE32  sizeString;
+    INT i, j, nRows;
+    INT x, y, cx, cy;
+    BOOL bWrap;
+    SIZE  sizeString;
 /* --- new --- */
-    INT32  nGrpCount = 0;
-    INT32  grpX;
+    INT  nGrpCount = 0;
+    INT  grpX;
 /* --- end new --- */
 
     TOOLBAR_CalcStrings (wndPtr, &sizeString);
@@ -354,7 +354,7 @@ TOOLBAR_CalcToolbar (WND *wndPtr)
 	bWrap = FALSE;
 
 	if (btnPtr->fsState & TBSTATE_HIDDEN) {
-	    SetRectEmpty32 (&btnPtr->rect);
+	    SetRectEmpty (&btnPtr->rect);
 	    continue;
 	}
 
@@ -416,7 +416,7 @@ TOOLBAR_CalcToolbar (WND *wndPtr)
 	    bWrap = FALSE;
 	}
 
-	SetRect32 (&btnPtr->rect, x, y, x + cx, y + cy);
+	SetRect (&btnPtr->rect, x, y, x + cx, y + cy);
 
 	btnPtr->nRow = nRows;
 	x += cx;
@@ -467,14 +467,14 @@ TOOLBAR_CalcToolbar (WND *wndPtr)
 	    infoPtr->rcBound.bottom = y + cy;
 
 	if (infoPtr->hwndToolTip) {
-	    TTTOOLINFO32A ti;
+	    TTTOOLINFOA ti;
 
-	    ZeroMemory (&ti, sizeof(TTTOOLINFO32A));
-	    ti.cbSize = sizeof(TTTOOLINFO32A);
+	    ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+	    ti.cbSize = sizeof(TTTOOLINFOA);
 	    ti.hwnd = wndPtr->hwndSelf;
 	    ti.uId = btnPtr->idCommand;
 	    ti.rect = btnPtr->rect;
-	    SendMessage32A (infoPtr->hwndToolTip, TTM_NEWTOOLRECT32A,
+	    SendMessageA (infoPtr->hwndToolTip, TTM_NEWTOOLRECTA,
 			    0, (LPARAM)&ti);
 	}
 
@@ -494,12 +494,12 @@ TOOLBAR_CalcToolbar (WND *wndPtr)
 }
 
 
-static INT32
-TOOLBAR_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt)
+static INT
+TOOLBAR_InternalHitTest (WND *wndPtr, LPPOINT lpPt)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    INT32 i;
+    INT i;
     
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
@@ -507,13 +507,13 @@ TOOLBAR_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt)
 	    continue;
 
 	if (btnPtr->fsStyle & TBSTYLE_SEP) {
-	    if (PtInRect32 (&btnPtr->rect, *lpPt)) {
+	    if (PtInRect (&btnPtr->rect, *lpPt)) {
 		TRACE (toolbar, " ON SEPARATOR %d!\n", i);
 		return -i;
 	    }
 	}
 	else {
-	    if (PtInRect32 (&btnPtr->rect, *lpPt)) {
+	    if (PtInRect (&btnPtr->rect, *lpPt)) {
 		TRACE (toolbar, " ON BUTTON %d!\n", i);
 		return i;
 	    }
@@ -525,11 +525,11 @@ TOOLBAR_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt)
 }
 
 
-static INT32
-TOOLBAR_GetButtonIndex (TOOLBAR_INFO *infoPtr, INT32 idCommand)
+static INT
+TOOLBAR_GetButtonIndex (TOOLBAR_INFO *infoPtr, INT idCommand)
 {
     TBUTTON_INFO *btnPtr;
-    INT32 i;
+    INT i;
 
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
@@ -543,11 +543,11 @@ TOOLBAR_GetButtonIndex (TOOLBAR_INFO *infoPtr, INT32 idCommand)
 }
 
 
-static INT32
-TOOLBAR_GetCheckedGroupButtonIndex (TOOLBAR_INFO *infoPtr, INT32 nIndex)
+static INT
+TOOLBAR_GetCheckedGroupButtonIndex (TOOLBAR_INFO *infoPtr, INT nIndex)
 {
     TBUTTON_INFO *btnPtr;
-    INT32 nRunIndex;
+    INT nRunIndex;
 
     if ((nIndex < 0) || (nIndex > infoPtr->nNumButtons))
 	return -1;
@@ -590,10 +590,10 @@ TOOLBAR_GetCheckedGroupButtonIndex (TOOLBAR_INFO *infoPtr, INT32 nIndex)
 
 
 static VOID
-TOOLBAR_RelayEvent (HWND32 hwndTip, HWND32 hwndMsg, UINT32 uMsg,
-		    WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
+		    WPARAM wParam, LPARAM lParam)
 {
-    MSG32 msg;
+    MSG msg;
 
     msg.hwnd = hwndMsg;
     msg.message = uMsg;
@@ -603,18 +603,18 @@ TOOLBAR_RelayEvent (HWND32 hwndTip, HWND32 hwndMsg, UINT32 uMsg,
     msg.pt.x = LOWORD(GetMessagePos ());
     msg.pt.y = HIWORD(GetMessagePos ());
 
-    SendMessage32A (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg);
+    SendMessageA (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg);
 }
 
 
 static LRESULT
-TOOLBAR_AddBitmap (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_AddBitmap (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     LPTBADDBITMAP lpAddBmp = (LPTBADDBITMAP)lParam;
-    INT32 nIndex = 0;
+    INT nIndex = 0;
 
-    if ((!lpAddBmp) || ((INT32)wParam <= 0))
+    if ((!lpAddBmp) || ((INT)wParam <= 0))
 	return -1;
 
     TRACE (toolbar, "adding %d bitmaps!\n", wParam);
@@ -624,7 +624,7 @@ TOOLBAR_AddBitmap (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	TRACE (toolbar, "creating default image list!\n");
 	infoPtr->himlStd =
 	    ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
-			      ILC_COLOR | ILC_MASK, (INT32)wParam, 2);
+			      ILC_COLOR | ILC_MASK, (INT)wParam, 2);
     }
 
 #if 0
@@ -634,14 +634,14 @@ TOOLBAR_AddBitmap (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	infoPtr->himlDis =
 	    ImageList_Create (infoPtr->nBitmapWidth, 
 			      infoPtr->nBitmapHeight, ILC_COLOR | ILC_MASK,
-			      (INT32)wParam, 2);
+			      (INT)wParam, 2);
     }
 #endif
 
     /* Add bitmaps to the default image list */
-    if (lpAddBmp->hInst == (HINSTANCE32)0) {
+    if (lpAddBmp->hInst == (HINSTANCE)0) {
 	nIndex = 
-	    ImageList_AddMasked (infoPtr->himlStd, (HBITMAP32)lpAddBmp->nID,
+	    ImageList_AddMasked (infoPtr->himlStd, (HBITMAP)lpAddBmp->nID,
 				 CLR_DEFAULT);
     }
     else if (lpAddBmp->hInst == HINST_COMMCTRL) {
@@ -651,35 +651,35 @@ TOOLBAR_AddBitmap (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	/* Hack to "add" some reserved images within the image list 
 	   to get the right image indices */
 	nIndex = ImageList_GetImageCount (infoPtr->himlStd);
-	ImageList_SetImageCount (infoPtr->himlStd, nIndex + (INT32)wParam);
+	ImageList_SetImageCount (infoPtr->himlStd, nIndex + (INT)wParam);
     }
     else {
-	HBITMAP32 hBmp =
-	    LoadBitmap32A (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
+	HBITMAP hBmp =
+	    LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
 
 	nIndex = ImageList_AddMasked (infoPtr->himlStd, hBmp, CLR_DEFAULT);
 
-	DeleteObject32 (hBmp); 
+	DeleteObject (hBmp); 
     }
 
 
-    infoPtr->nNumBitmaps += (INT32)wParam;
+    infoPtr->nNumBitmaps += (INT)wParam;
 
     return nIndex;
 }
 
 
 static LRESULT
-TOOLBAR_AddButtons32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_AddButtonsA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     LPTBBUTTON lpTbb = (LPTBBUTTON)lParam;
-    INT32 nOldButtons, nNewButtons, nAddButtons, nCount;
-    HDC32 hdc;
+    INT nOldButtons, nNewButtons, nAddButtons, nCount;
+    HDC hdc;
 
     TRACE (toolbar, "adding %d buttons!\n", wParam);
 
-    nAddButtons = (UINT32)wParam;
+    nAddButtons = (UINT)wParam;
     nOldButtons = infoPtr->nNumButtons;
     nNewButtons = nOldButtons + nAddButtons;
 
@@ -709,25 +709,25 @@ TOOLBAR_AddButtons32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	btnPtr->iString   = lpTbb[nCount].iString;
 
 	if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
-	    TTTOOLINFO32A ti;
+	    TTTOOLINFOA ti;
 
-	    ZeroMemory (&ti, sizeof(TTTOOLINFO32A));
-	    ti.cbSize   = sizeof (TTTOOLINFO32A);
+	    ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+	    ti.cbSize   = sizeof (TTTOOLINFOA);
 	    ti.hwnd     = wndPtr->hwndSelf;
 	    ti.uId      = btnPtr->idCommand;
 	    ti.hinst    = 0;
-	    ti.lpszText = LPSTR_TEXTCALLBACK32A;
+	    ti.lpszText = LPSTR_TEXTCALLBACKA;
 
-	    SendMessage32A (infoPtr->hwndToolTip, TTM_ADDTOOL32A,
+	    SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
 			    0, (LPARAM)&ti);
 	}
     }
 
     TOOLBAR_CalcToolbar (wndPtr);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
@@ -737,17 +737,17 @@ TOOLBAR_AddButtons32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_AddString32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_AddStringA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
     if ((wParam) && (HIWORD(lParam) == 0)) {
 	char szString[256];
-	INT32 len;
+	INT len;
 	TRACE (toolbar, "adding string from resource!\n");
 
-	len = LoadString32A ((HINSTANCE32)wParam, (UINT32)lParam,
+	len = LoadStringA ((HINSTANCE)wParam, (UINT)lParam,
 			     szString, 256);
 
 	TRACE (toolbar, "len=%d \"%s\"\n", len, szString);
@@ -772,14 +772,14 @@ TOOLBAR_AddString32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     }
     else {
 	LPSTR p = (LPSTR)lParam;
-	INT32 len;
+	INT len;
 
 	if (p == NULL)
 	    return -1;
 	TRACE (toolbar, "adding string(s) from array!\n");
 	nIndex = infoPtr->nNumStrings;
 	while (*p) {
-	    len = lstrlen32A (p);
+	    len = lstrlenA (p);
 	    TRACE (toolbar, "len=%d \"%s\"\n", len, p);
 
 	    if (infoPtr->nNumStrings == 0) {
@@ -809,17 +809,17 @@ TOOLBAR_AddString32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_AddString32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_AddStringW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
     if ((wParam) && (HIWORD(lParam) == 0)) {
 	WCHAR szString[256];
-	INT32 len;
+	INT len;
 	TRACE (toolbar, "adding string from resource!\n");
 
-	len = LoadString32W ((HINSTANCE32)wParam, (UINT32)lParam,
+	len = LoadStringW ((HINSTANCE)wParam, (UINT)lParam,
 			     szString, 256);
 
 	TRACE (toolbar, "len=%d \"%s\"\n", len, debugstr_w(szString));
@@ -839,19 +839,19 @@ TOOLBAR_AddString32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 	infoPtr->strings[infoPtr->nNumStrings] =
 	    COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
-	lstrcpy32W (infoPtr->strings[infoPtr->nNumStrings], szString);
+	lstrcpyW (infoPtr->strings[infoPtr->nNumStrings], szString);
 	infoPtr->nNumStrings++;
     }
     else {
 	LPWSTR p = (LPWSTR)lParam;
-	INT32 len;
+	INT len;
 
 	if (p == NULL)
 	    return -1;
 	TRACE (toolbar, "adding string(s) from array!\n");
 	nIndex = infoPtr->nNumStrings;
 	while (*p) {
-	    len = lstrlen32W (p);
+	    len = lstrlenW (p);
 	    TRACE (toolbar, "len=%d \"%s\"\n", len, debugstr_w(p));
 
 	    if (infoPtr->nNumStrings == 0) {
@@ -869,7 +869,7 @@ TOOLBAR_AddString32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 	    infoPtr->strings[infoPtr->nNumStrings] =
 		COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
-	    lstrcpy32W (infoPtr->strings[infoPtr->nNumStrings], p);
+	    lstrcpyW (infoPtr->strings[infoPtr->nNumStrings], p);
 	    infoPtr->nNumStrings++;
 
 	    p += (len+1);
@@ -881,19 +881,19 @@ TOOLBAR_AddString32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_AutoSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_AutoSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    RECT32 parent_rect;
-    HWND32 parent;
+    RECT parent_rect;
+    HWND parent;
     /* INT32  x, y; */
-    INT32  cx, cy;
-    UINT32 uPosFlags = 0;
+    INT  cx, cy;
+    UINT uPosFlags = 0;
 
     TRACE (toolbar, "resize forced!\n");
 
-    parent = GetParent32 (wndPtr->hwndSelf);
-    GetClientRect32(parent, &parent_rect);
+    parent = GetParent (wndPtr->hwndSelf);
+    GetClientRect(parent, &parent_rect);
 
     if (wndPtr->dwStyle & CCS_NORESIZE) {
 	uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
@@ -914,7 +914,7 @@ TOOLBAR_AutoSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	cy += sysMetrics[SM_CYEDGE];
 
     infoPtr->bAutoSize = TRUE;
-    SetWindowPos32 (wndPtr->hwndSelf, HWND_TOP, parent_rect.left, parent_rect.top,
+    SetWindowPos (wndPtr->hwndSelf, HWND_TOP, parent_rect.left, parent_rect.top,
 		    cx, cy, uPosFlags);
 
     return 0;
@@ -922,7 +922,7 @@ TOOLBAR_AutoSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_ButtonCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_ButtonCount (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -931,7 +931,7 @@ TOOLBAR_ButtonCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_ButtonStructSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_ButtonStructSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -948,38 +948,38 @@ TOOLBAR_ButtonStructSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_ChangeBitmap (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_ChangeBitmap (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    HDC32 hdc;
-    INT32 nIndex;
+    HDC hdc;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     btnPtr->iBitmap = LOWORD(lParam);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-TOOLBAR_CheckButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_CheckButton (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    HDC32 hdc;
-    INT32 nIndex;
-    INT32 nOldIndex = -1;
+    HDC hdc;
+    INT nIndex;
+    INT nOldIndex = -1;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1002,11 +1002,11 @@ TOOLBAR_CheckButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	btnPtr->fsState |= TBSTATE_CHECKED;
     }
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     if (nOldIndex != -1)
 	TOOLBAR_DrawButton (wndPtr, &infoPtr->buttons[nOldIndex], hdc);
     TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     /* FIXME: Send a WM_NOTIFY?? */
 
@@ -1015,11 +1015,11 @@ TOOLBAR_CheckButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_CommandToIndex (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_CommandToIndex (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
-    return TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    return TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
 }
 
 
@@ -1033,24 +1033,24 @@ TOOLBAR_Customize (WND *wndPtr)
 
 
 static LRESULT
-TOOLBAR_DeleteButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_DeleteButton (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex = (INT32)wParam;
+    INT nIndex = (INT)wParam;
 
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
 	return FALSE;
 
     if ((infoPtr->hwndToolTip) && 
 	!(infoPtr->buttons[nIndex].fsStyle & TBSTYLE_SEP)) {
-	TTTOOLINFO32A ti;
+	TTTOOLINFOA ti;
 
-	ZeroMemory (&ti, sizeof(TTTOOLINFO32A));
-	ti.cbSize   = sizeof (TTTOOLINFO32A);
+	ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+	ti.cbSize   = sizeof (TTTOOLINFOA);
 	ti.hwnd     = wndPtr->hwndSelf;
 	ti.uId      = infoPtr->buttons[nIndex].idCommand;
 
-	SendMessage32A (infoPtr->hwndToolTip, TTM_DELTOOL32A, 0, (LPARAM)&ti);
+	SendMessageA (infoPtr->hwndToolTip, TTM_DELTOOLA, 0, (LPARAM)&ti);
     }
 
     if (infoPtr->nNumButtons == 1) {
@@ -1080,22 +1080,22 @@ TOOLBAR_DeleteButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     TOOLBAR_CalcToolbar (wndPtr);
 
-    InvalidateRect32 (wndPtr->hwndSelf, NULL, TRUE);
-    UpdateWindow32 (wndPtr->hwndSelf);
+    InvalidateRect (wndPtr->hwndSelf, NULL, TRUE);
+    UpdateWindow (wndPtr->hwndSelf);
 
     return TRUE;
 }
 
 
 static LRESULT
-TOOLBAR_EnableButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_EnableButton (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    HDC32 hdc;
-    INT32 nIndex;
+    HDC hdc;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1105,9 +1105,9 @@ TOOLBAR_EnableButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     else
 	btnPtr->fsState |= TBSTATE_ENABLED;
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
@@ -1117,12 +1117,12 @@ TOOLBAR_EnableButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetBitmap (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetBitmap (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return -1;
 
@@ -1131,18 +1131,18 @@ TOOLBAR_GetBitmap (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static __inline__ LRESULT
-TOOLBAR_GetBitmapFlags (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetBitmapFlags (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    return (GetDeviceCaps32 (0, LOGPIXELSX) >= 120) ? TBBF_LARGE : 0;
+    return (GetDeviceCaps (0, LOGPIXELSX) >= 120) ? TBBF_LARGE : 0;
 }
 
 
 static LRESULT
-TOOLBAR_GetButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetButton (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     LPTBBUTTON lpTbb = (LPTBBUTTON)lParam;
-    INT32 nIndex = (INT32)wParam;
+    INT nIndex = (INT)wParam;
     TBUTTON_INFO *btnPtr;
 
     if (infoPtr == NULL) return FALSE;
@@ -1164,18 +1164,18 @@ TOOLBAR_GetButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetButtonInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetButtonInfoA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    LPTBBUTTONINFO32A lpTbInfo = (LPTBBUTTONINFO32A)lParam;
+    LPTBBUTTONINFOA lpTbInfo = (LPTBBUTTONINFOA)lParam;
     TBUTTON_INFO *btnPtr;
-    INT32 nIndex;
+    INT nIndex;
 
     if (infoPtr == NULL) return -1;
     if (lpTbInfo == NULL) return -1;
-    if (lpTbInfo->cbSize < sizeof(LPTBBUTTONINFO32A)) return -1;
+    if (lpTbInfo->cbSize < sizeof(LPTBBUTTONINFOA)) return -1;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return -1;
 
@@ -1195,7 +1195,7 @@ TOOLBAR_GetButtonInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	lpTbInfo->fsStyle = btnPtr->fsStyle;
     if (lpTbInfo->dwMask & TBIF_TEXT) {
 	if ((btnPtr->iString >= 0) || (btnPtr->iString < infoPtr->nNumStrings))
-	    lstrcpyn32A (lpTbInfo->pszText, 
+	    lstrcpynA (lpTbInfo->pszText, 
 			 (LPSTR)infoPtr->strings[btnPtr->iString],
 			 lpTbInfo->cchText);
     }
@@ -1218,12 +1218,12 @@ TOOLBAR_GetButtonSize (WND *wndPtr)
 
 
 static LRESULT
-TOOLBAR_GetButtonText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetButtonTextA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex, nStringIndex;
+    INT nIndex, nStringIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return -1;
 
@@ -1236,9 +1236,9 @@ TOOLBAR_GetButtonText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     if (lParam == 0) return -1;
 
-    lstrcpy32A ((LPSTR)lParam, (LPSTR)infoPtr->strings[nStringIndex]);
+    lstrcpyA ((LPSTR)lParam, (LPSTR)infoPtr->strings[nStringIndex]);
 
-    return lstrlen32A ((LPSTR)infoPtr->strings[nStringIndex]);
+    return lstrlenA ((LPSTR)infoPtr->strings[nStringIndex]);
 }
 
 
@@ -1247,7 +1247,7 @@ TOOLBAR_GetButtonText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetDisabledImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetDisabledImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -1268,7 +1268,7 @@ TOOLBAR_GetExtendedStyle (WND *wndPtr)
 
 
 static LRESULT
-TOOLBAR_GetHotImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetHotImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -1283,7 +1283,7 @@ TOOLBAR_GetHotImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -1299,19 +1299,19 @@ TOOLBAR_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetItemRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetItemRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    LPRECT32     lpRect;
-    INT32        nIndex;
+    LPRECT     lpRect;
+    INT        nIndex;
 
     if (infoPtr == NULL) return FALSE;
-    nIndex = (INT32)wParam;
+    nIndex = (INT)wParam;
     btnPtr = &infoPtr->buttons[nIndex];
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
 	return FALSE;
-    lpRect = (LPRECT32)lParam;
+    lpRect = (LPRECT)lParam;
     if (lpRect == NULL) return FALSE;
     if (btnPtr->fsState & TBSTATE_HIDDEN) return FALSE;
     
@@ -1325,10 +1325,10 @@ TOOLBAR_GetItemRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetMaxSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetMaxSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    LPSIZE32 lpSize = (LPSIZE32)lParam;
+    LPSIZE lpSize = (LPSIZE)lParam;
 
     if (lpSize == NULL)
 	return FALSE;
@@ -1349,19 +1349,19 @@ TOOLBAR_GetMaxSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    LPRECT32     lpRect;
-    INT32        nIndex;
+    LPRECT     lpRect;
+    INT        nIndex;
 
     if (infoPtr == NULL) return FALSE;
-    nIndex = (INT32)wParam;
+    nIndex = (INT)wParam;
     btnPtr = &infoPtr->buttons[nIndex];
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
 	return FALSE;
-    lpRect = (LPRECT32)lParam;
+    lpRect = (LPRECT)lParam;
     if (lpRect == NULL) return FALSE;
     
     lpRect->left   = btnPtr->rect.left;
@@ -1374,7 +1374,7 @@ TOOLBAR_GetRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetRows (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetRows (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -1386,12 +1386,12 @@ TOOLBAR_GetRows (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetState (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetState (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1) return -1;
 
     return infoPtr->buttons[nIndex].fsState;
@@ -1399,12 +1399,12 @@ TOOLBAR_GetState (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetStyle (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1) return -1;
 
     return infoPtr->buttons[nIndex].fsStyle;
@@ -1412,7 +1412,7 @@ TOOLBAR_GetStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetTextRows (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetTextRows (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -1424,7 +1424,7 @@ TOOLBAR_GetTextRows (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetToolTips (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -1434,7 +1434,7 @@ TOOLBAR_GetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_GetUnicodeFormat (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_GetUnicodeFormat (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -1446,13 +1446,13 @@ TOOLBAR_GetUnicodeFormat (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_HideButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_HideButton (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1464,29 +1464,29 @@ TOOLBAR_HideButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     TOOLBAR_CalcToolbar (wndPtr);
 
-    InvalidateRect32 (wndPtr->hwndSelf, NULL, TRUE);
-    UpdateWindow32 (wndPtr->hwndSelf);
+    InvalidateRect (wndPtr->hwndSelf, NULL, TRUE);
+    UpdateWindow (wndPtr->hwndSelf);
 
     return TRUE;
 }
 
 
 __inline__ static LRESULT
-TOOLBAR_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_HitTest (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    return TOOLBAR_InternalHitTest (wndPtr, (LPPOINT32)lParam);
+    return TOOLBAR_InternalHitTest (wndPtr, (LPPOINT)lParam);
 }
 
 
 static LRESULT
-TOOLBAR_Indeterminate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_Indeterminate (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    HDC32 hdc;
-    INT32 nIndex;
+    HDC hdc;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1496,22 +1496,22 @@ TOOLBAR_Indeterminate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     else
 	btnPtr->fsState |= TBSTATE_INDETERMINATE;
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-TOOLBAR_InsertButton32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_InsertButtonA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     LPTBBUTTON lpTbb = (LPTBBUTTON)lParam;
-    INT32 nIndex = (INT32)wParam;
+    INT nIndex = (INT)wParam;
     TBUTTON_INFO *oldButtons;
-    HDC32 hdc;
+    HDC hdc;
 
     if (lpTbb == NULL) return FALSE;
     if (nIndex < 0) return FALSE;
@@ -1540,16 +1540,16 @@ TOOLBAR_InsertButton32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->buttons[nIndex].iString   = lpTbb->iString;
 
     if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & TBSTYLE_SEP)) {
-	TTTOOLINFO32A ti;
+	TTTOOLINFOA ti;
 
-	ZeroMemory (&ti, sizeof(TTTOOLINFO32A));
-	ti.cbSize   = sizeof (TTTOOLINFO32A);
+	ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+	ti.cbSize   = sizeof (TTTOOLINFOA);
 	ti.hwnd     = wndPtr->hwndSelf;
 	ti.uId      = lpTbb->idCommand;
 	ti.hinst    = 0;
-	ti.lpszText = LPSTR_TEXTCALLBACK32A;
+	ti.lpszText = LPSTR_TEXTCALLBACKA;
 
-	SendMessage32A (infoPtr->hwndToolTip, TTM_ADDTOOL32A,
+	SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
 			0, (LPARAM)&ti);
     }
 
@@ -1563,9 +1563,9 @@ TOOLBAR_InsertButton32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     TOOLBAR_CalcToolbar (wndPtr);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
@@ -1576,12 +1576,12 @@ TOOLBAR_InsertButton32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_IsButtonChecked (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_IsButtonChecked (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1590,12 +1590,12 @@ TOOLBAR_IsButtonChecked (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_IsButtonEnabled (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_IsButtonEnabled (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1604,12 +1604,12 @@ TOOLBAR_IsButtonEnabled (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_IsButtonHidden (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_IsButtonHidden (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1618,12 +1618,12 @@ TOOLBAR_IsButtonHidden (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_IsButtonHighlighted (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_IsButtonHighlighted (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1632,12 +1632,12 @@ TOOLBAR_IsButtonHighlighted (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_IsButtonIndeterminate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_IsButtonIndeterminate (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1646,12 +1646,12 @@ TOOLBAR_IsButtonIndeterminate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_IsButtonPressed (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_IsButtonPressed (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1666,14 +1666,14 @@ TOOLBAR_IsButtonPressed (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_PressButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_PressButton (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    HDC32 hdc;
-    INT32 nIndex;
+    HDC hdc;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1683,9 +1683,9 @@ TOOLBAR_PressButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     else
 	btnPtr->fsState |= TBSTATE_PRESSED;
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
@@ -1695,15 +1695,15 @@ TOOLBAR_PressButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SaveRestore32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SaveRestoreA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 #if 0
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    LPTBSAVEPARAMS32A lpSave = (LPTBSAVEPARAMS32A)lParam;
+    LPTBSAVEPARAMSA lpSave = (LPTBSAVEPARAMSA)lParam;
 
     if (lpSave == NULL) return 0;
 
-    if ((BOOL32)wParam) {
+    if ((BOOL)wParam) {
 	/* save toolbar information */
 	FIXME (toolbar, "save to \"%s\" \"%s\"\n",
 	       lpSave->pszSubKey, lpSave->pszValueName);
@@ -1729,34 +1729,34 @@ TOOLBAR_SaveRestore32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetBitmapSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetBitmapSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
     if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0))
 	return FALSE;
 
-    infoPtr->nBitmapWidth = (INT32)LOWORD(lParam);
-    infoPtr->nBitmapHeight = (INT32)HIWORD(lParam);
+    infoPtr->nBitmapWidth = (INT)LOWORD(lParam);
+    infoPtr->nBitmapHeight = (INT)HIWORD(lParam);
 
     return TRUE;
 }
 
 
 static LRESULT
-TOOLBAR_SetButtonInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetButtonInfoA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    LPTBBUTTONINFO32A lptbbi = (LPTBBUTTONINFO32A)lParam;
+    LPTBBUTTONINFOA lptbbi = (LPTBBUTTONINFOA)lParam;
     TBUTTON_INFO *btnPtr;
-    INT32 nIndex;
+    INT nIndex;
 
     if (lptbbi == NULL)
 	return FALSE;
-    if (lptbbi->cbSize < sizeof(LPTBBUTTONINFO32A))
+    if (lptbbi->cbSize < sizeof(LPTBBUTTONINFOA))
 	return FALSE;
     
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
@@ -1779,7 +1779,7 @@ TOOLBAR_SetButtonInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	    (btnPtr->iString < infoPtr->nNumStrings)) {
 #if 0
 	    CHAR **lpString = &infoPtr->strings[btnPtr->iString];
-	    INT32 len = lstrlen32A (lptbbi->pszText);
+	    INT len = lstrlenA (lptbbi->pszText);
 	    *lpString = COMCTL32_ReAlloc (lpString, sizeof(char)*(len+1));
 #endif
 
@@ -1796,45 +1796,45 @@ TOOLBAR_SetButtonInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetButtonSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetButtonSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
     if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0))
 	return FALSE;
 
-    infoPtr->nButtonWidth = (INT32)LOWORD(lParam);
-    infoPtr->nButtonHeight = (INT32)HIWORD(lParam);
+    infoPtr->nButtonWidth = (INT)LOWORD(lParam);
+    infoPtr->nButtonHeight = (INT)HIWORD(lParam);
 
     return TRUE;
 }
 
 
 static LRESULT
-TOOLBAR_SetButtonWidth (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetButtonWidth (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
     if (infoPtr == NULL)
 	return FALSE;
 
-    infoPtr->cxMin = (INT32)LOWORD(lParam);
-    infoPtr->cxMax = (INT32)HIWORD(lParam);
+    infoPtr->cxMin = (INT)LOWORD(lParam);
+    infoPtr->cxMax = (INT)HIWORD(lParam);
 
     return TRUE;
 }
 
 
 static LRESULT
-TOOLBAR_SetCmdId (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetCmdId (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    INT32 nIndex = (INT32)wParam;
+    INT nIndex = (INT)wParam;
 
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
 	return FALSE;
 
-    infoPtr->buttons[nIndex].idCommand = (INT32)lParam;
+    infoPtr->buttons[nIndex].idCommand = (INT)lParam;
 
     if (infoPtr->hwndToolTip) {
 
@@ -1850,7 +1850,7 @@ TOOLBAR_SetCmdId (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetDisabledImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetDisabledImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     HIMAGELIST himlTemp;
@@ -1868,7 +1868,7 @@ TOOLBAR_SetDisabledImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetDrawTextFlags (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetDrawTextFlags (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     DWORD dwTemp;
@@ -1882,7 +1882,7 @@ TOOLBAR_SetDrawTextFlags (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetExtendedStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetExtendedStyle (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     DWORD dwTemp;
@@ -1895,7 +1895,7 @@ TOOLBAR_SetExtendedStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetHotImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetHotImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     HIMAGELIST himlTemp;
@@ -1916,7 +1916,7 @@ TOOLBAR_SetHotImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     HIMAGELIST himlTemp;
@@ -1934,16 +1934,16 @@ TOOLBAR_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetIndent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetIndent (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    HDC32 hdc;
+    HDC hdc;
 
-    infoPtr->nIndent = (INT32)wParam;
+    infoPtr->nIndent = (INT)wParam;
     TOOLBAR_CalcToolbar (wndPtr);
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
@@ -1953,7 +1953,7 @@ TOOLBAR_SetIndent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetInsertMarkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetInsertMarkColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
@@ -1966,14 +1966,14 @@ TOOLBAR_SetInsertMarkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetMaxTextRows (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetMaxTextRows (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
     if (infoPtr == NULL)
 	return FALSE;
 
-    infoPtr->nMaxTextRows = (INT32)wParam;
+    infoPtr->nMaxTextRows = (INT)wParam;
 
     return TRUE;
 }
@@ -1983,25 +1983,25 @@ TOOLBAR_SetMaxTextRows (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_SetParent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetParent (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    HWND32 hwndOldNotify;
+    HWND hwndOldNotify;
 
     if (infoPtr == NULL) return 0;
     hwndOldNotify = infoPtr->hwndNotify;
-    infoPtr->hwndNotify = (HWND32)wParam;
+    infoPtr->hwndNotify = (HWND)wParam;
 
     return hwndOldNotify;
 }
 
 
 static LRESULT
-TOOLBAR_SetRows (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetRows (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    LPRECT32 lprc = (LPRECT32)lParam;
-    HDC32 hdc;
+    LPRECT lprc = (LPRECT)lParam;
+    HDC hdc;
 
     if (LOWORD(wParam) > 1) {
 
@@ -2021,55 +2021,55 @@ TOOLBAR_SetRows (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     }
 
     /* repaint toolbar */
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return 0;
 }
 
 
 static LRESULT
-TOOLBAR_SetState (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetState (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    HDC32 hdc;
-    INT32 nIndex;
+    HDC hdc;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     btnPtr->fsState = LOWORD(lParam);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
 
 
 static LRESULT
-TOOLBAR_SetStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetStyle (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    HDC32 hdc;
-    INT32 nIndex;
+    HDC hdc;
+    INT nIndex;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT32)wParam);
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
 	return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     btnPtr->fsStyle = LOWORD(lParam);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     if (infoPtr->hwndToolTip) {
 
@@ -2082,37 +2082,37 @@ TOOLBAR_SetStyle (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-TOOLBAR_SetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetToolTips (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
     if (infoPtr == NULL) return 0;
-    infoPtr->hwndToolTip = (HWND32)wParam;
+    infoPtr->hwndToolTip = (HWND)wParam;
     return 0;
 }
 
 
 static LRESULT
-TOOLBAR_SetUnicodeFormat (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_SetUnicodeFormat (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    BOOL32 bTemp;
+    BOOL bTemp;
 
     TRACE (toolbar, "%s hwnd=0x%04x stub!\n", 
-	   ((BOOL32)wParam) ? "TRUE" : "FALSE", wndPtr->hwndSelf);
+	   ((BOOL)wParam) ? "TRUE" : "FALSE", wndPtr->hwndSelf);
 
     bTemp = infoPtr->bUnicode;
-    infoPtr->bUnicode = (BOOL32)wParam;
+    infoPtr->bUnicode = (BOOL)wParam;
 
     return bTemp;
 }
 
 
 static LRESULT
-TOOLBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    LOGFONT32A logFont;
+    LOGFONTA logFont;
 
     /* initialize info structure */
     infoPtr->nButtonHeight = 22;
@@ -2131,20 +2131,20 @@ TOOLBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->nButtonDown = -1;
     infoPtr->nOldHit = -1;
 
-    infoPtr->hwndNotify = GetParent32 (wndPtr->hwndSelf);
+    infoPtr->hwndNotify = GetParent (wndPtr->hwndSelf);
     infoPtr->bTransparent = (wndPtr->dwStyle & TBSTYLE_FLAT);
     infoPtr->nHotItem = -1;
     infoPtr->dwDTFlags = DT_CENTER;
 
-    SystemParametersInfo32A (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
-    infoPtr->hFont = CreateFontIndirect32A (&logFont);
+    SystemParametersInfoA (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
+    infoPtr->hFont = CreateFontIndirectA (&logFont);
 
     if (wndPtr->dwStyle & TBSTYLE_TOOLTIPS) {
 	/* Create tooltip control */
 	infoPtr->hwndToolTip =
-	    CreateWindowEx32A (0, TOOLTIPS_CLASS32A, NULL, 0,
-			       CW_USEDEFAULT32, CW_USEDEFAULT32,
-			       CW_USEDEFAULT32, CW_USEDEFAULT32,
+	    CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+			       CW_USEDEFAULT, CW_USEDEFAULT,
+			       CW_USEDEFAULT, CW_USEDEFAULT,
 			       wndPtr->hwndSelf, 0, 0, 0);
 
 	/* Send NM_TOOLTIPSCREATED notification */
@@ -2156,8 +2156,8 @@ TOOLBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	    nmttc.hdr.code = NM_TOOLTIPSCREATED;
 	    nmttc.hwndToolTips = infoPtr->hwndToolTip;
 
-	    SendMessage32A (infoPtr->hwndNotify, WM_NOTIFY,
-			    (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmttc);
+	    SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
+			    (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmttc);
 	}
     }
 
@@ -2166,13 +2166,13 @@ TOOLBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
     /* delete tooltip control */
     if (infoPtr->hwndToolTip)
-	DestroyWindow32 (infoPtr->hwndToolTip);
+	DestroyWindow (infoPtr->hwndToolTip);
 
     /* delete button data */
     if (infoPtr->buttons)
@@ -2180,7 +2180,7 @@ TOOLBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     /* delete strings */
     if (infoPtr->strings) {
-	INT32 i;
+	INT i;
 	for (i = 0; i < infoPtr->nNumStrings; i++)
 	    if (infoPtr->strings[i])
 		COMCTL32_Free (infoPtr->strings[i]);
@@ -2202,7 +2202,7 @@ TOOLBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     /* delete default font */
     if (infoPtr->hFont)
-	DeleteObject32 (infoPtr->hFont);
+	DeleteObject (infoPtr->hFont);
 
     /* free toolbar info data */
     COMCTL32_Free (infoPtr);
@@ -2212,44 +2212,44 @@ TOOLBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_EraseBackground (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
 
     if (infoPtr->bTransparent)
-	return SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_ERASEBKGND,
+	return SendMessageA (GetParent (wndPtr->hwndSelf), WM_ERASEBKGND,
 			       wParam, lParam);
 
-    return DefWindowProc32A (wndPtr->hwndSelf, WM_ERASEBKGND, wParam, lParam);
+    return DefWindowProcA (wndPtr->hwndSelf, WM_ERASEBKGND, wParam, lParam);
 }
 
 
 static LRESULT
-TOOLBAR_LButtonDblClk (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_LButtonDblClk (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    POINT32 pt;
-    INT32   nHit;
-    HDC32   hdc;
+    POINT pt;
+    INT   nHit;
+    HDC   hdc;
 
-    pt.x = (INT32)LOWORD(lParam);
-    pt.y = (INT32)HIWORD(lParam);
+    pt.x = (INT)LOWORD(lParam);
+    pt.y = (INT)HIWORD(lParam);
     nHit = TOOLBAR_InternalHitTest (wndPtr, &pt);
 
     if (nHit >= 0) {
 	btnPtr = &infoPtr->buttons[nHit];
 	if (!(btnPtr->fsState & TBSTATE_ENABLED))
 	    return 0;
-	SetCapture32 (wndPtr->hwndSelf);
+	SetCapture (wndPtr->hwndSelf);
 	infoPtr->bCaptured = TRUE;
 	infoPtr->nButtonDown = nHit;
 
 	btnPtr->fsState |= TBSTATE_PRESSED;
 
-	hdc = GetDC32 (wndPtr->hwndSelf);
+	hdc = GetDC (wndPtr->hwndSelf);
 	TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-	ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	ReleaseDC (wndPtr->hwndSelf, hdc);
     }
     else if (wndPtr->dwStyle & CCS_ADJUSTABLE)
 	TOOLBAR_Customize (wndPtr);
@@ -2259,20 +2259,20 @@ TOOLBAR_LButtonDblClk (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_LButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    POINT32 pt;
-    INT32   nHit;
-    HDC32   hdc;
+    POINT pt;
+    INT   nHit;
+    HDC   hdc;
 
     if (infoPtr->hwndToolTip)
 	TOOLBAR_RelayEvent (infoPtr->hwndToolTip, wndPtr->hwndSelf,
 			    WM_LBUTTONDOWN, wParam, lParam);
 
-    pt.x = (INT32)LOWORD(lParam);
-    pt.y = (INT32)HIWORD(lParam);
+    pt.x = (INT)LOWORD(lParam);
+    pt.y = (INT)HIWORD(lParam);
     nHit = TOOLBAR_InternalHitTest (wndPtr, &pt);
 
     if (nHit >= 0) {
@@ -2280,16 +2280,16 @@ TOOLBAR_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	if (!(btnPtr->fsState & TBSTATE_ENABLED))
 	    return 0;
 
-	SetCapture32 (wndPtr->hwndSelf);
+	SetCapture (wndPtr->hwndSelf);
 	infoPtr->bCaptured = TRUE;
 	infoPtr->nButtonDown = nHit;
 	infoPtr->nOldHit = nHit;
 
 	btnPtr->fsState |= TBSTATE_PRESSED;
 
-	hdc = GetDC32 (wndPtr->hwndSelf);
+	hdc = GetDC (wndPtr->hwndSelf);
 	TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-	ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -2297,22 +2297,22 @@ TOOLBAR_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_LButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    POINT32 pt;
-    INT32   nHit;
-    INT32   nOldIndex = -1;
-    HDC32   hdc;
-    BOOL32  bSendMessage = TRUE;
+    POINT pt;
+    INT   nHit;
+    INT   nOldIndex = -1;
+    HDC   hdc;
+    BOOL  bSendMessage = TRUE;
 
     if (infoPtr->hwndToolTip)
 	TOOLBAR_RelayEvent (infoPtr->hwndToolTip, wndPtr->hwndSelf,
 			    WM_LBUTTONUP, wParam, lParam);
 
-    pt.x = (INT32)LOWORD(lParam);
-    pt.y = (INT32)HIWORD(lParam);
+    pt.x = (INT)LOWORD(lParam);
+    pt.y = (INT)HIWORD(lParam);
     nHit = TOOLBAR_InternalHitTest (wndPtr, &pt);
 
     if ((infoPtr->bCaptured) && (infoPtr->nButtonDown >= 0)) {
@@ -2344,14 +2344,14 @@ TOOLBAR_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	else
 	    bSendMessage = FALSE;
 
-	hdc = GetDC32 (wndPtr->hwndSelf);
+	hdc = GetDC (wndPtr->hwndSelf);
 	if (nOldIndex != -1)
 	    TOOLBAR_DrawButton (wndPtr, &infoPtr->buttons[nOldIndex], hdc);
 	TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-	ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	ReleaseDC (wndPtr->hwndSelf, hdc);
 
 	if (bSendMessage)
-	    SendMessage32A (infoPtr->hwndNotify, WM_COMMAND,
+	    SendMessageA (infoPtr->hwndNotify, WM_COMMAND,
 			    MAKEWPARAM(btnPtr->idCommand, 0),
 			    (LPARAM)wndPtr->hwndSelf);
 
@@ -2364,20 +2364,20 @@ TOOLBAR_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_MouseMove (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     TBUTTON_INFO *btnPtr;
-    POINT32 pt;
-    INT32   nHit;
-    HDC32   hdc;
+    POINT pt;
+    INT   nHit;
+    HDC   hdc;
 
     if (infoPtr->hwndToolTip)
 	TOOLBAR_RelayEvent (infoPtr->hwndToolTip, wndPtr->hwndSelf,
 			    WM_MOUSEMOVE, wParam, lParam);
 
-    pt.x = (INT32)LOWORD(lParam);
-    pt.y = (INT32)HIWORD(lParam);
+    pt.x = (INT)LOWORD(lParam);
+    pt.y = (INT)HIWORD(lParam);
     nHit = TOOLBAR_InternalHitTest (wndPtr, &pt);
 
     if (infoPtr->bCaptured) {
@@ -2385,15 +2385,15 @@ TOOLBAR_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	    btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
 	    if (infoPtr->nOldHit == infoPtr->nButtonDown) {
 		btnPtr->fsState &= ~TBSTATE_PRESSED;
-		hdc = GetDC32 (wndPtr->hwndSelf);
+		hdc = GetDC (wndPtr->hwndSelf);
 		TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
 	    }
 	    else if (nHit == infoPtr->nButtonDown) {
 		btnPtr->fsState |= TBSTATE_PRESSED;
-		hdc = GetDC32 (wndPtr->hwndSelf);
+		hdc = GetDC (wndPtr->hwndSelf);
 		TOOLBAR_DrawButton (wndPtr, btnPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
 	    }
 	}
 	infoPtr->nOldHit = nHit;
@@ -2404,10 +2404,10 @@ TOOLBAR_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-TOOLBAR_NCActivate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_NCActivate (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
 /*    if (wndPtr->dwStyle & CCS_NODIVIDER) */
-	return DefWindowProc32A (wndPtr->hwndSelf, WM_NCACTIVATE,
+	return DefWindowProcA (wndPtr->hwndSelf, WM_NCACTIVATE,
 				 wParam, lParam);
 /*    else */
 /*	return TOOLBAR_NCPaint (wndPtr, wParam, lParam); */
@@ -2415,17 +2415,17 @@ TOOLBAR_NCActivate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-TOOLBAR_NCCalcSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_NCCalcSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     if (!(wndPtr->dwStyle & CCS_NODIVIDER))
-	((LPRECT32)lParam)->top += sysMetrics[SM_CYEDGE];
+	((LPRECT)lParam)->top += sysMetrics[SM_CYEDGE];
 
-    return DefWindowProc32A (wndPtr->hwndSelf, WM_NCCALCSIZE, wParam, lParam);
+    return DefWindowProcA (wndPtr->hwndSelf, WM_NCCALCSIZE, wParam, lParam);
 }
 
 
 static LRESULT
-TOOLBAR_NCCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_NCCreate (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr;
 
@@ -2450,43 +2450,43 @@ TOOLBAR_NCCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (!wndPtr->hInstance)
 	wndPtr->hInstance = wndPtr->parent->hInstance;
 
-    return DefWindowProc32A (wndPtr->hwndSelf, WM_NCCREATE, wParam, lParam);
+    return DefWindowProcA (wndPtr->hwndSelf, WM_NCCREATE, wParam, lParam);
 }
 
 
 static LRESULT
-TOOLBAR_NCPaint (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_NCPaint (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    HWND32 hwnd = wndPtr->hwndSelf;
-    HDC32 hdc;
+    HWND hwnd = wndPtr->hwndSelf;
+    HDC hdc;
 
     if ( wndPtr->dwStyle & WS_MINIMIZE ||
 	!WIN_IsWindowDrawable( wndPtr, 0 )) return 0; /* Nothing to do */
 
-    DefWindowProc32A (hwnd, WM_NCPAINT, wParam, lParam);
+    DefWindowProcA (hwnd, WM_NCPAINT, wParam, lParam);
 
-    if (!(hdc = GetDCEx32( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ))) return 0;
+    if (!(hdc = GetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ))) return 0;
 
-    if (ExcludeVisRect( hdc, wndPtr->rectClient.left-wndPtr->rectWindow.left,
+    if (ExcludeVisRect16( hdc, wndPtr->rectClient.left-wndPtr->rectWindow.left,
 		        wndPtr->rectClient.top-wndPtr->rectWindow.top,
 		        wndPtr->rectClient.right-wndPtr->rectWindow.left,
 		        wndPtr->rectClient.bottom-wndPtr->rectWindow.top )
 	== NULLREGION){
-	ReleaseDC32( hwnd, hdc );
+	ReleaseDC( hwnd, hdc );
 	return 0;
     }
 
     if (!(wndPtr->flags & WIN_MANAGED) && !(wndPtr->dwStyle & CCS_NODIVIDER))
-	DrawEdge32 (hdc, &wndPtr->rectWindow, EDGE_ETCHED, BF_TOP);
+	DrawEdge (hdc, &wndPtr->rectWindow, EDGE_ETCHED, BF_TOP);
 
-    ReleaseDC32( hwnd, hdc );
+    ReleaseDC( hwnd, hdc );
 
     return 0;
 }
 
 
 __inline__ static LRESULT
-TOOLBAR_Notify (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_Notify (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     LPNMHDR lpnmh = (LPNMHDR)lParam;
@@ -2494,17 +2494,17 @@ TOOLBAR_Notify (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     TRACE (toolbar, "passing WM_NOTIFY!\n");
 
     if ((infoPtr->hwndToolTip) && (lpnmh->hwndFrom == infoPtr->hwndToolTip)) {
-	SendMessage32A (infoPtr->hwndNotify, WM_NOTIFY,	wParam, lParam);
+	SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,	wParam, lParam);
 
 #if 0
-	if (lpnmh->code == TTN_GETDISPINFO32A) {
-	    LPNMTTDISPINFO32A lpdi = (LPNMTTDISPINFO32A)lParam;
+	if (lpnmh->code == TTN_GETDISPINFOA) {
+	    LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
 
 	    FIXME (toolbar, "retrieving ASCII string\n");
 
 	}
-	else if (lpnmh->code == TTN_GETDISPINFO32W) {
-	    LPNMTTDISPINFO32W lpdi = (LPNMTTDISPINFO32W)lParam;
+	else if (lpnmh->code == TTN_GETDISPINFOW) {
+	    LPNMTTDISPINFOW lpdi = (LPNMTTDISPINFOW)lParam;
 
 	    FIXME (toolbar, "retrieving UNICODE string\n");
 
@@ -2517,29 +2517,29 @@ TOOLBAR_Notify (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_Paint (WND *wndPtr, WPARAM32 wParam)
+TOOLBAR_Paint (WND *wndPtr, WPARAM wParam)
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
+    HDC hdc;
+    PAINTSTRUCT ps;
 
-    hdc = wParam==0 ? BeginPaint32 (wndPtr->hwndSelf, &ps) : (HDC32)wParam;
+    hdc = wParam==0 ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam;
     TOOLBAR_Refresh (wndPtr, hdc);
     if (!wParam)
-	EndPaint32 (wndPtr->hwndSelf, &ps);
+	EndPaint (wndPtr->hwndSelf, &ps);
     return 0;
 }
 
 
 static LRESULT
-TOOLBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
-    RECT32 parent_rect;
-    HWND32 parent;
+    RECT parent_rect;
+    HWND parent;
     /* INT32  x, y; */
-    INT32  cx, cy;
-    INT32  flags;
-    UINT32 uPosFlags = 0;
+    INT  cx, cy;
+    INT  flags;
+    UINT uPosFlags = 0;
 
     /* Resize deadlock check */
     if (infoPtr->bAutoSize) {
@@ -2547,7 +2547,7 @@ TOOLBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	return 0;
     }
 
-    flags = (INT32) wParam;
+    flags = (INT) wParam;
 
     /* FIXME for flags =
      * SIZE_MAXIMIZED, SIZE_MAXSHOW, SIZE_MINIMIZED
@@ -2557,8 +2557,8 @@ TOOLBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
     if (flags == SIZE_RESTORED) {
 	/* width and height don't apply */
-	parent = GetParent32 (wndPtr->hwndSelf);
-	GetClientRect32(parent, &parent_rect);
+	parent = GetParent (wndPtr->hwndSelf);
+	GetClientRect(parent, &parent_rect);
 
 	if (wndPtr->dwStyle & CCS_NORESIZE) {
 	    uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
@@ -2587,7 +2587,7 @@ TOOLBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	if (!(wndPtr->dwStyle & CCS_NODIVIDER))
 	    cy += sysMetrics[SM_CYEDGE];
 
-	SetWindowPos32 (wndPtr->hwndSelf, 0, parent_rect.left, parent_rect.top,
+	SetWindowPos (wndPtr->hwndSelf, 0, parent_rect.left, parent_rect.top,
 			cx, cy, uPosFlags | SWP_NOZORDER);
     }
     return 0;
@@ -2595,15 +2595,15 @@ TOOLBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLBAR_StyleChanged (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLBAR_StyleChanged (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    HDC32 hdc;
+    HDC hdc;
 
     TOOLBAR_AutoSize (wndPtr, wParam, lParam);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return 0;
 }
@@ -2611,7 +2611,7 @@ TOOLBAR_StyleChanged (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -2620,16 +2620,16 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TB_ADDBITMAP:
 	    return TOOLBAR_AddBitmap (wndPtr, wParam, lParam);
 
-	case TB_ADDBUTTONS32A:
-	    return TOOLBAR_AddButtons32A (wndPtr, wParam, lParam);
+	case TB_ADDBUTTONSA:
+	    return TOOLBAR_AddButtonsA (wndPtr, wParam, lParam);
 
 /*	case TB_ADDBUTTONS32W: */
 
-	case TB_ADDSTRING32A:
-	    return TOOLBAR_AddString32A (wndPtr, wParam, lParam);
+	case TB_ADDSTRINGA:
+	    return TOOLBAR_AddStringA (wndPtr, wParam, lParam);
 
-	case TB_ADDSTRING32W:
-	    return TOOLBAR_AddString32W (wndPtr, wParam, lParam);
+	case TB_ADDSTRINGW:
+	    return TOOLBAR_AddStringW (wndPtr, wParam, lParam);
 
 	case TB_AUTOSIZE:
 	    return TOOLBAR_AutoSize (wndPtr, wParam, lParam);
@@ -2669,16 +2669,16 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TB_GETBUTTON:
 	    return TOOLBAR_GetButton (wndPtr, wParam, lParam);
 
-	case TB_GETBUTTONINFO32A:
-	    return TOOLBAR_GetButtonInfo32A (wndPtr, wParam, lParam);
+	case TB_GETBUTTONINFOA:
+	    return TOOLBAR_GetButtonInfoA (wndPtr, wParam, lParam);
 
 /*	case TB_GETBUTTONINFO32W:		*/ /* 4.71 */
 
 	case TB_GETBUTTONSIZE:
 	    return TOOLBAR_GetButtonSize (wndPtr);
 
-	case TB_GETBUTTONTEXT32A:
-	    return TOOLBAR_GetButtonText32A (wndPtr, wParam, lParam);
+	case TB_GETBUTTONTEXTA:
+	    return TOOLBAR_GetButtonTextA (wndPtr, wParam, lParam);
 
 /*	case TB_GETBUTTONTEXT32W: */
 /*	case TB_GETCOLORSCHEME:			*/ /* 4.71 */
@@ -2739,8 +2739,8 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TB_INDETERMINATE:
 	    return TOOLBAR_Indeterminate (wndPtr, wParam, lParam);
 
-	case TB_INSERTBUTTON32A:
-	    return TOOLBAR_InsertButton32A (wndPtr, wParam, lParam);
+	case TB_INSERTBUTTONA:
+	    return TOOLBAR_InsertButtonA (wndPtr, wParam, lParam);
 
 /*	case TB_INSERTBUTTON32W: */
 /*	case TB_INSERTMARKHITTEST:		*/ /* 4.71 */
@@ -2774,8 +2774,8 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 
 /*	case TB_REPLACEBITMAP: */
 
-	case TB_SAVERESTORE32A:
-	    return TOOLBAR_SaveRestore32A (wndPtr, wParam, lParam);
+	case TB_SAVERESTOREA:
+	    return TOOLBAR_SaveRestoreA (wndPtr, wParam, lParam);
 
 /*	case TB_SAVERESTORE32W: */
 /*	case TB_SETANCHORHIGHLIGHT:		*/ /* 4.71 */
@@ -2783,8 +2783,8 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TB_SETBITMAPSIZE:
 	    return TOOLBAR_SetBitmapSize (wndPtr, wParam, lParam);
 
-	case TB_SETBUTTONINFO32A:
-	    return TOOLBAR_SetButtonInfo32A (wndPtr, wParam, lParam);
+	case TB_SETBUTTONINFOA:
+	    return TOOLBAR_SetButtonInfoA (wndPtr, wParam, lParam);
 
 /*	case TB_SETBUTTONINFO32W:		*/ /* 4.71 */
 
@@ -2910,13 +2910,13 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case WM_DRAWITEM:
 	case WM_MEASUREITEM:
 	case WM_VKEYTOITEM:
-	    return SendMessage32A (GetParent32 (hwnd), uMsg, wParam, lParam);
+	    return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
 
 	default:
 	    if (uMsg >= WM_USER)
 		ERR (toolbar, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -2925,27 +2925,27 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 TOOLBAR_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (TOOLBARCLASSNAME32A)) return;
+    if (GlobalFindAtomA (TOOLBARCLASSNAMEA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS;
-    wndClass.lpfnWndProc   = (WNDPROC32)ToolbarWindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)ToolbarWindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(TOOLBAR_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_3DFACE + 1);
-    wndClass.lpszClassName = TOOLBARCLASSNAME32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
+    wndClass.lpszClassName = TOOLBARCLASSNAMEA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 TOOLBAR_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (TOOLBARCLASSNAME32A))
-	UnregisterClass32A (TOOLBARCLASSNAME32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (TOOLBARCLASSNAMEA))
+	UnregisterClassA (TOOLBARCLASSNAMEA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index ed1590b9ec4..433150b5249 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -34,29 +34,29 @@ extern LPSTR COMCTL32_aSubclass; /* global subclassing atom */
 
 
 LRESULT CALLBACK
-TOOLTIPS_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam);
+TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 
 static VOID
-TOOLTIPS_Refresh (WND *wndPtr, HDC32 hdc)
+TOOLTIPS_Refresh (WND *wndPtr, HDC hdc)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    RECT32 rc;
-    INT32 oldBkMode;
-    HFONT32 hOldFont;
-    HBRUSH32 hBrush;
-    UINT32 uFlags = DT_EXTERNALLEADING;
+    RECT rc;
+    INT oldBkMode;
+    HFONT hOldFont;
+    HBRUSH hBrush;
+    UINT uFlags = DT_EXTERNALLEADING;
 
     if (infoPtr->nMaxTipWidth > -1)
 	uFlags |= DT_WORDBREAK;
     if (wndPtr->dwStyle & TTS_NOPREFIX)
 	uFlags |= DT_NOPREFIX;
-    GetClientRect32 (wndPtr->hwndSelf, &rc);
+    GetClientRect (wndPtr->hwndSelf, &rc);
 
     /* fill the background */
-    hBrush = CreateSolidBrush32 (infoPtr->clrBk);
-    FillRect32 (hdc, &rc, hBrush);
-    DeleteObject32 (hBrush);
+    hBrush = CreateSolidBrush (infoPtr->clrBk);
+    FillRect (hdc, &rc, hBrush);
+    DeleteObject (hBrush);
 
     /* calculate text rectangle */
     rc.left   += (2 + infoPtr->rcMargin.left);
@@ -65,47 +65,47 @@ TOOLTIPS_Refresh (WND *wndPtr, HDC32 hdc)
     rc.bottom -= (2 + infoPtr->rcMargin.bottom);
 
     /* draw text */
-    oldBkMode = SetBkMode32 (hdc, TRANSPARENT);
-    SetTextColor32 (hdc, infoPtr->clrText);
-    hOldFont = SelectObject32 (hdc, infoPtr->hFont);
-    DrawText32W (hdc, infoPtr->szTipText, -1, &rc, uFlags);
-    SelectObject32 (hdc, hOldFont);
+    oldBkMode = SetBkMode (hdc, TRANSPARENT);
+    SetTextColor (hdc, infoPtr->clrText);
+    hOldFont = SelectObject (hdc, infoPtr->hFont);
+    DrawTextW (hdc, infoPtr->szTipText, -1, &rc, uFlags);
+    SelectObject (hdc, hOldFont);
     if (oldBkMode != TRANSPARENT)
-	SetBkMode32 (hdc, oldBkMode);
+	SetBkMode (hdc, oldBkMode);
 }
 
 
 static VOID
-TOOLTIPS_GetTipText (WND *wndPtr, TOOLTIPS_INFO *infoPtr, INT32 nTool)
+TOOLTIPS_GetTipText (WND *wndPtr, TOOLTIPS_INFO *infoPtr, INT nTool)
 {
     TTTOOL_INFO *toolPtr = &infoPtr->tools[nTool];
 
-    if ((toolPtr->hinst) && (HIWORD((UINT32)toolPtr->lpszText) == 0)) {
+    if ((toolPtr->hinst) && (HIWORD((UINT)toolPtr->lpszText) == 0)) {
 	/* load a resource */
 	TRACE (tooltips, "load res string %x %x\n",
 	       toolPtr->hinst, (int)toolPtr->lpszText);
-	LoadString32W (toolPtr->hinst, (UINT32)toolPtr->lpszText,
+	LoadStringW (toolPtr->hinst, (UINT)toolPtr->lpszText,
 		       infoPtr->szTipText, INFOTIPSIZE);
     }
     else if (toolPtr->lpszText) {
-	if (toolPtr->lpszText == LPSTR_TEXTCALLBACK32W) {
-	    NMTTDISPINFO32A ttnmdi;
+	if (toolPtr->lpszText == LPSTR_TEXTCALLBACKW) {
+	    NMTTDISPINFOA ttnmdi;
 
 	    /* fill NMHDR struct */
-	    ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFO32A));
+	    ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFOA));
 	    ttnmdi.hdr.hwndFrom = wndPtr->hwndSelf;
 	    ttnmdi.hdr.idFrom = toolPtr->uId;
-	    ttnmdi.hdr.code = TTN_GETDISPINFO32A;
+	    ttnmdi.hdr.code = TTN_GETDISPINFOA;
 	    ttnmdi.lpszText = (LPSTR)&ttnmdi.szText;
 	    ttnmdi.uFlags = toolPtr->uFlags;
 	    ttnmdi.lParam = toolPtr->lParam;
 
 	    TRACE (tooltips, "hdr.idFrom = %x\n", ttnmdi.hdr.idFrom);
-	    SendMessage32A (toolPtr->hwnd, WM_NOTIFY,
-			    (WPARAM32)toolPtr->uId, (LPARAM)&ttnmdi);
+	    SendMessageA (toolPtr->hwnd, WM_NOTIFY,
+			    (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi);
 
-	    if ((ttnmdi.hinst) && (HIWORD((UINT32)ttnmdi.szText) == 0)) {
-		LoadString32W (ttnmdi.hinst, (UINT32)ttnmdi.szText,
+	    if ((ttnmdi.hinst) && (HIWORD((UINT)ttnmdi.szText) == 0)) {
+		LoadStringW (ttnmdi.hinst, (UINT)ttnmdi.szText,
 			       infoPtr->szTipText, INFOTIPSIZE);
 		if (ttnmdi.uFlags & TTF_DI_SETITEM) {
 		    toolPtr->hinst = ttnmdi.hinst;
@@ -115,7 +115,7 @@ TOOLTIPS_GetTipText (WND *wndPtr, TOOLTIPS_INFO *infoPtr, INT32 nTool)
 	    else if (ttnmdi.szText[0]) {
 		lstrcpynAtoW (infoPtr->szTipText, ttnmdi.szText, 80);
 		if (ttnmdi.uFlags & TTF_DI_SETITEM) {
-		    INT32 len = lstrlen32A (ttnmdi.szText);
+		    INT len = lstrlenA (ttnmdi.szText);
 		    toolPtr->hinst = 0;
 		    toolPtr->lpszText =	COMCTL32_Alloc ((len+1)* sizeof(WCHAR));
 		    lstrcpyAtoW (toolPtr->lpszText, ttnmdi.szText);
@@ -125,10 +125,10 @@ TOOLTIPS_GetTipText (WND *wndPtr, TOOLTIPS_INFO *infoPtr, INT32 nTool)
 		/* no text available */
 		infoPtr->szTipText[0] = L'\0';
 	    }
-	    else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACK32A) {
+	    else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA) {
 		lstrcpynAtoW (infoPtr->szTipText, ttnmdi.lpszText, INFOTIPSIZE);
 		if (ttnmdi.uFlags & TTF_DI_SETITEM) {
-		    INT32 len = lstrlen32A (ttnmdi.lpszText);
+		    INT len = lstrlenA (ttnmdi.lpszText);
 		    toolPtr->hinst = 0;
 		    toolPtr->lpszText =	COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
 		    lstrcpyAtoW (toolPtr->lpszText, ttnmdi.lpszText);
@@ -141,7 +141,7 @@ TOOLTIPS_GetTipText (WND *wndPtr, TOOLTIPS_INFO *infoPtr, INT32 nTool)
 	}
 	else {
 	    /* the item is a usual (unicode) text */
-	    lstrcpyn32W (infoPtr->szTipText, toolPtr->lpszText, INFOTIPSIZE);
+	    lstrcpynW (infoPtr->szTipText, toolPtr->lpszText, INFOTIPSIZE);
 	}
     }
     else {
@@ -154,12 +154,12 @@ TOOLTIPS_GetTipText (WND *wndPtr, TOOLTIPS_INFO *infoPtr, INT32 nTool)
 
 
 static VOID
-TOOLTIPS_CalcTipSize (WND *wndPtr, TOOLTIPS_INFO *infoPtr, LPSIZE32 lpSize)
+TOOLTIPS_CalcTipSize (WND *wndPtr, TOOLTIPS_INFO *infoPtr, LPSIZE lpSize)
 {
-    HDC32 hdc;
-    HFONT32 hOldFont;
-    UINT32 uFlags = DT_EXTERNALLEADING | DT_CALCRECT;
-    RECT32 rc = {0, 0, 0, 0};
+    HDC hdc;
+    HFONT hOldFont;
+    UINT uFlags = DT_EXTERNALLEADING | DT_CALCRECT;
+    RECT rc = {0, 0, 0, 0};
 
     if (infoPtr->nMaxTipWidth > -1) {
 	rc.right = infoPtr->nMaxTipWidth;
@@ -169,11 +169,11 @@ TOOLTIPS_CalcTipSize (WND *wndPtr, TOOLTIPS_INFO *infoPtr, LPSIZE32 lpSize)
 	uFlags |= DT_NOPREFIX;
     TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
-    hOldFont = SelectObject32 (hdc, infoPtr->hFont);
-    DrawText32W (hdc, infoPtr->szTipText, -1, &rc, uFlags);
-    SelectObject32 (hdc, hOldFont);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    hdc = GetDC (wndPtr->hwndSelf);
+    hOldFont = SelectObject (hdc, infoPtr->hFont);
+    DrawTextW (hdc, infoPtr->szTipText, -1, &rc, uFlags);
+    SelectObject (hdc, hOldFont);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     lpSize->cx = rc.right - rc.left + 4 + 
 		 infoPtr->rcMargin.left + infoPtr->rcMargin.right;
@@ -186,9 +186,9 @@ static VOID
 TOOLTIPS_Show (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
 {
     TTTOOL_INFO *toolPtr;
-    RECT32 rect;
-    SIZE32 size;
-    HDC32  hdc;
+    RECT rect;
+    SIZE size;
+    HDC  hdc;
     NMHDR  hdr;
 
     if (infoPtr->nTool == -1) {
@@ -213,8 +213,8 @@ TOOLTIPS_Show (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
     hdr.hwndFrom = wndPtr->hwndSelf;
     hdr.idFrom = toolPtr->uId;
     hdr.code = TTN_SHOW;
-    SendMessage32A (toolPtr->hwnd, WM_NOTIFY,
-		    (WPARAM32)toolPtr->uId, (LPARAM)&hdr);
+    SendMessageA (toolPtr->hwnd, WM_NOTIFY,
+		    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
 
     TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
 
@@ -222,19 +222,19 @@ TOOLTIPS_Show (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
     TRACE (tooltips, "size %d - %d\n", size.cx, size.cy);
 
     if (toolPtr->uFlags & TTF_CENTERTIP) {
-	RECT32 rc;
+	RECT rc;
 
 	if (toolPtr->uFlags & TTF_IDISHWND)
-	    GetWindowRect32 ((HWND32)toolPtr->uId, &rc);
+	    GetWindowRect ((HWND)toolPtr->uId, &rc);
 	else {
 	    rc = toolPtr->rect;
-	    MapWindowPoints32 (toolPtr->hwnd, (HWND32)0, (LPPOINT32)&rc, 2);
+	    MapWindowPoints (toolPtr->hwnd, (HWND)0, (LPPOINT)&rc, 2);
 	}
 	rect.left = (rc.left + rc.right - size.cx) / 2;
 	rect.top  = rc.bottom + 2;
     }
     else {
-	GetCursorPos32 ((LPPOINT32)&rect);
+	GetCursorPos ((LPPOINT)&rect);
 	rect.top += 20;
     }
 
@@ -245,18 +245,18 @@ TOOLTIPS_Show (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
     rect.right = rect.left + size.cx;
     rect.bottom = rect.top + size.cy;
 
-    AdjustWindowRectEx32 (&rect, wndPtr->dwStyle, FALSE, wndPtr->dwExStyle);
+    AdjustWindowRectEx (&rect, wndPtr->dwStyle, FALSE, wndPtr->dwExStyle);
 
-    SetWindowPos32 (wndPtr->hwndSelf, HWND_TOP, rect.left, rect.top,
+    SetWindowPos (wndPtr->hwndSelf, HWND_TOP, rect.left, rect.top,
 		    rect.right - rect.left, rect.bottom - rect.top,
 		    SWP_SHOWWINDOW);
 
     /* repaint the tooltip */
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLTIPS_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
-    SetTimer32 (wndPtr->hwndSelf, ID_TIMERPOP, infoPtr->nAutoPopTime, 0);
+    SetTimer (wndPtr->hwndSelf, ID_TIMERPOP, infoPtr->nAutoPopTime, 0);
 }
 
 
@@ -271,17 +271,17 @@ TOOLTIPS_Hide (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
 
     toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
     TRACE (tooltips, "Hide tooltip %d!\n", infoPtr->nCurrentTool);
-    KillTimer32 (wndPtr->hwndSelf, ID_TIMERPOP);
+    KillTimer (wndPtr->hwndSelf, ID_TIMERPOP);
 
     hdr.hwndFrom = wndPtr->hwndSelf;
     hdr.idFrom = toolPtr->uId;
     hdr.code = TTN_POP;
-    SendMessage32A (toolPtr->hwnd, WM_NOTIFY,
-		    (WPARAM32)toolPtr->uId, (LPARAM)&hdr);
+    SendMessageA (toolPtr->hwnd, WM_NOTIFY,
+		    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
 
     infoPtr->nCurrentTool = -1;
 
-    SetWindowPos32 (wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0,
+    SetWindowPos (wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0,
 		    SWP_NOZORDER | SWP_HIDEWINDOW);
 }
 
@@ -290,9 +290,9 @@ static VOID
 TOOLTIPS_TrackShow (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
 {
     TTTOOL_INFO *toolPtr;
-    RECT32 rect;
-    SIZE32 size;
-    HDC32  hdc;
+    RECT rect;
+    SIZE size;
+    HDC  hdc;
     NMHDR hdr;
 
     if (infoPtr->nTrackTool == -1) {
@@ -315,8 +315,8 @@ TOOLTIPS_TrackShow (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
     hdr.hwndFrom = wndPtr->hwndSelf;
     hdr.idFrom = toolPtr->uId;
     hdr.code = TTN_SHOW;
-    SendMessage32A (toolPtr->hwnd, WM_NOTIFY,
-		    (WPARAM32)toolPtr->uId, (LPARAM)&hdr);
+    SendMessageA (toolPtr->hwnd, WM_NOTIFY,
+		    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
 
     TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
 
@@ -333,16 +333,16 @@ TOOLTIPS_TrackShow (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
 	}
     }
     else {
-	RECT32 rcTool;
+	RECT rcTool;
 
 	if (toolPtr->uFlags & TTF_IDISHWND)
-	    GetWindowRect32 ((HWND32)toolPtr->uId, &rcTool);
+	    GetWindowRect ((HWND)toolPtr->uId, &rcTool);
 	else {
 	    rcTool = toolPtr->rect;
-	    MapWindowPoints32 (toolPtr->hwnd, (HWND32)0, (LPPOINT32)&rcTool, 2);
+	    MapWindowPoints (toolPtr->hwnd, (HWND)0, (LPPOINT)&rcTool, 2);
 	}
 
-	GetCursorPos32 ((LPPOINT32)&rect);
+	GetCursorPos ((LPPOINT)&rect);
 	rect.top += 20;
 
 	if (toolPtr->uFlags & TTF_CENTERTIP) {
@@ -361,15 +361,15 @@ TOOLTIPS_TrackShow (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
     rect.right = rect.left + size.cx;
     rect.bottom = rect.top + size.cy;
 
-    AdjustWindowRectEx32 (&rect, wndPtr->dwStyle, FALSE, wndPtr->dwExStyle);
+    AdjustWindowRectEx (&rect, wndPtr->dwStyle, FALSE, wndPtr->dwExStyle);
 
-    SetWindowPos32 (wndPtr->hwndSelf, HWND_TOP, rect.left, rect.top,
+    SetWindowPos (wndPtr->hwndSelf, HWND_TOP, rect.left, rect.top,
 		    rect.right - rect.left, rect.bottom - rect.top,
 		    SWP_SHOWWINDOW);
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TOOLTIPS_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 }
 
 
@@ -388,19 +388,19 @@ TOOLTIPS_TrackHide (WND *wndPtr, TOOLTIPS_INFO *infoPtr)
     hdr.hwndFrom = wndPtr->hwndSelf;
     hdr.idFrom = toolPtr->uId;
     hdr.code = TTN_POP;
-    SendMessage32A (toolPtr->hwnd, WM_NOTIFY,
-		    (WPARAM32)toolPtr->uId, (LPARAM)&hdr);
+    SendMessageA (toolPtr->hwnd, WM_NOTIFY,
+		    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
 
-    SetWindowPos32 (wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0,
+    SetWindowPos (wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0,
 		    SWP_NOZORDER | SWP_HIDEWINDOW);
 }
 
 
-static INT32
-TOOLTIPS_GetToolFromInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFO32A lpToolInfo)
+static INT
+TOOLTIPS_GetToolFromInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo)
 {
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
 	toolPtr = &infoPtr->tools[nTool];
@@ -423,11 +423,11 @@ TOOLTIPS_GetToolFromInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFO32A lpToolInfo)
 }
 
 
-static INT32
-TOOLTIPS_GetToolFromInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFO32W lpToolInfo)
+static INT
+TOOLTIPS_GetToolFromInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo)
 {
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
 	toolPtr = &infoPtr->tools[nTool];
@@ -450,11 +450,11 @@ TOOLTIPS_GetToolFromInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFO32W lpToolInfo)
 }
 
 
-static INT32
-TOOLTIPS_GetToolFromPoint (TOOLTIPS_INFO *infoPtr, HWND32 hwnd, LPPOINT32 lpPt)
+static INT
+TOOLTIPS_GetToolFromPoint (TOOLTIPS_INFO *infoPtr, HWND hwnd, LPPOINT lpPt)
 {
     TTTOOL_INFO *toolPtr;
-    INT32  nTool;
+    INT  nTool;
 
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
 	toolPtr = &infoPtr->tools[nTool];
@@ -462,7 +462,7 @@ TOOLTIPS_GetToolFromPoint (TOOLTIPS_INFO *infoPtr, HWND32 hwnd, LPPOINT32 lpPt)
 	if (!(toolPtr->uFlags & TTF_IDISHWND)) {
 	    if (hwnd != toolPtr->hwnd)
 		continue;
-	    if (!PtInRect32 (&toolPtr->rect, *lpPt))
+	    if (!PtInRect (&toolPtr->rect, *lpPt))
 		continue;
 	    return nTool;
 	}
@@ -472,7 +472,7 @@ TOOLTIPS_GetToolFromPoint (TOOLTIPS_INFO *infoPtr, HWND32 hwnd, LPPOINT32 lpPt)
 	toolPtr = &infoPtr->tools[nTool];
 
 	if (toolPtr->uFlags & TTF_IDISHWND) {
-	    if ((HWND32)toolPtr->uId == hwnd)
+	    if ((HWND)toolPtr->uId == hwnd)
 		return nTool;
 	}
     }
@@ -481,48 +481,48 @@ TOOLTIPS_GetToolFromPoint (TOOLTIPS_INFO *infoPtr, HWND32 hwnd, LPPOINT32 lpPt)
 }
 
 
-static INT32
-TOOLTIPS_GetToolFromMessage (TOOLTIPS_INFO *infoPtr, HWND32 hwndTool)
+static INT
+TOOLTIPS_GetToolFromMessage (TOOLTIPS_INFO *infoPtr, HWND hwndTool)
 {
     DWORD   dwPos;
-    POINT32 pt;
+    POINT pt;
 
     dwPos = GetMessagePos ();
-    pt.x = (INT32)LOWORD(dwPos);
-    pt.y = (INT32)HIWORD(dwPos);
-    ScreenToClient32 (hwndTool, &pt);
+    pt.x = (INT)LOWORD(dwPos);
+    pt.y = (INT)HIWORD(dwPos);
+    ScreenToClient (hwndTool, &pt);
 
     return TOOLTIPS_GetToolFromPoint (infoPtr, hwndTool, &pt);
 }
 
 
-static BOOL32
-TOOLTIPS_IsWindowActive (HWND32 hwnd)
+static BOOL
+TOOLTIPS_IsWindowActive (HWND hwnd)
 {
-    HWND32 hwndActive = GetActiveWindow32 ();
+    HWND hwndActive = GetActiveWindow ();
     if (!hwndActive)
 	return FALSE;
     if (hwndActive == hwnd)
 	return TRUE;
-    return IsChild32 (hwndActive, hwnd);
+    return IsChild (hwndActive, hwnd);
 }
 
 
-static INT32
-TOOLTIPS_CheckTool (WND *wndPtr, BOOL32 bShowTest)
+static INT
+TOOLTIPS_CheckTool (WND *wndPtr, BOOL bShowTest)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    POINT32 pt;
-    HWND32 hwndTool;
-    INT32 nTool;
+    POINT pt;
+    HWND hwndTool;
+    INT nTool;
 
-    GetCursorPos32 (&pt);
+    GetCursorPos (&pt);
     hwndTool =
-	SendMessage32A (wndPtr->hwndSelf, TTM_WINDOWFROMPOINT, 0, (LPARAM)&pt);
+	SendMessageA (wndPtr->hwndSelf, TTM_WINDOWFROMPOINT, 0, (LPARAM)&pt);
     if (hwndTool == 0)
 	return -1;
 
-    ScreenToClient32 (hwndTool, &pt);
+    ScreenToClient (hwndTool, &pt);
     nTool = TOOLTIPS_GetToolFromPoint (infoPtr, hwndTool, &pt);
     if (nTool == -1)
 	return -1;
@@ -539,11 +539,11 @@ TOOLTIPS_CheckTool (WND *wndPtr, BOOL32 bShowTest)
 
 
 static LRESULT
-TOOLTIPS_Activate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_Activate (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
-    infoPtr->bActive = (BOOL32)wParam;
+    infoPtr->bActive = (BOOL)wParam;
 
     if (infoPtr->bActive)
 	TRACE (tooltips, "activate!\n");
@@ -556,15 +556,15 @@ TOOLTIPS_Activate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_AddTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_AddToolA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32A lpToolInfo = (LPTTTOOLINFO32A)lParam;
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
     TTTOOL_INFO *toolPtr;
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
 	return FALSE;
 
     TRACE (tooltips, "add tool (%x) %x %d%s!\n",
@@ -594,57 +594,57 @@ TOOLTIPS_AddTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     toolPtr->rect   = lpToolInfo->rect;
     toolPtr->hinst  = lpToolInfo->hinst;
 
-    if ((lpToolInfo->hinst) && (HIWORD((INT32)lpToolInfo->lpszText) == 0)) {
+    if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
 	TRACE (tooltips, "add string id %x!\n", (int)lpToolInfo->lpszText);
 	toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACK32A) {
+	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA) {
 	    TRACE (tooltips, "add CALLBACK!\n");
-	    toolPtr->lpszText = LPSTR_TEXTCALLBACK32W;
+	    toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
 	}
 	else {
-	    INT32 len = lstrlen32A (lpToolInfo->lpszText);
+	    INT len = lstrlenA (lpToolInfo->lpszText);
 	    TRACE (tooltips, "add text \"%s\"!\n", lpToolInfo->lpszText);
 	    toolPtr->lpszText =	COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
 	    lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
 	}
     }
 
-    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A))
+    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
 	toolPtr->lParam = lpToolInfo->lParam;
 
     /* install subclassing hook */
     if (toolPtr->uFlags & TTF_SUBCLASS) {
 	if (toolPtr->uFlags & TTF_IDISHWND) {
 	    LPTT_SUBCLASS_INFO lpttsi =
-		(LPTT_SUBCLASS_INFO)GetProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		(LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 	    if (lpttsi == NULL) {
 		lpttsi =
 		    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
 		lpttsi->wpOrigProc = 
-		    (WNDPROC32)SetWindowLong32A ((HWND32)toolPtr->uId,
+		    (WNDPROC)SetWindowLongA ((HWND)toolPtr->uId,
 		    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
 		lpttsi->hwndToolTip = wndPtr->hwndSelf;
 		lpttsi->uRefCount++;
-		SetProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass,
-			    (HANDLE32)lpttsi);
+		SetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass,
+			    (HANDLE)lpttsi);
 	    }
 	    else
 		WARN (tooltips, "A window tool must only be listed once!\n");
 	}
 	else {
 	    LPTT_SUBCLASS_INFO lpttsi =
-		(LPTT_SUBCLASS_INFO)GetProp32A (toolPtr->hwnd, COMCTL32_aSubclass);
+		(LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
 	    if (lpttsi == NULL) {
 		lpttsi =
 		    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
 		lpttsi->wpOrigProc = 
-		    (WNDPROC32)SetWindowLong32A (toolPtr->hwnd,
+		    (WNDPROC)SetWindowLongA (toolPtr->hwnd,
 		    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
 		lpttsi->hwndToolTip = wndPtr->hwndSelf;
 		lpttsi->uRefCount++;
-		SetProp32A (toolPtr->hwnd, COMCTL32_aSubclass, (HANDLE32)lpttsi);
+		SetPropA (toolPtr->hwnd, COMCTL32_aSubclass, (HANDLE)lpttsi);
 	    }
 	    else
 		lpttsi->uRefCount++;
@@ -657,15 +657,15 @@ TOOLTIPS_AddTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_AddTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_AddToolW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32W lpToolInfo = (LPTTTOOLINFO32W)lParam;
+    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
     TTTOOL_INFO *toolPtr;
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32W)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
 	return FALSE;
 
     TRACE (tooltips, "add tool (%x) %x %d%s!\n",
@@ -695,58 +695,58 @@ TOOLTIPS_AddTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     toolPtr->rect   = lpToolInfo->rect;
     toolPtr->hinst  = lpToolInfo->hinst;
 
-    if ((lpToolInfo->hinst) && (HIWORD((INT32)lpToolInfo->lpszText) == 0)) {
+    if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
 	TRACE (tooltips, "add string id %x!\n", (int)lpToolInfo->lpszText);
 	toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACK32W) {
+	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW) {
 	    TRACE (tooltips, "add CALLBACK!\n");
-	    toolPtr->lpszText = LPSTR_TEXTCALLBACK32W;
+	    toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
 	}
 	else {
-	    INT32 len = lstrlen32W (lpToolInfo->lpszText);
+	    INT len = lstrlenW (lpToolInfo->lpszText);
 	    TRACE (tooltips, "add text \"%s\"!\n",
 		   debugstr_w(lpToolInfo->lpszText));
 	    toolPtr->lpszText =	COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-	    lstrcpy32W (toolPtr->lpszText, lpToolInfo->lpszText);
+	    lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
 	}
     }
 
-    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W))
+    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
 	toolPtr->lParam = lpToolInfo->lParam;
 
     /* install subclassing hook */
     if (toolPtr->uFlags & TTF_SUBCLASS) {
 	if (toolPtr->uFlags & TTF_IDISHWND) {
 	    LPTT_SUBCLASS_INFO lpttsi =
-		(LPTT_SUBCLASS_INFO)GetProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		(LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 	    if (lpttsi == NULL) {
 		lpttsi =
 		    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
 		lpttsi->wpOrigProc = 
-		    (WNDPROC32)SetWindowLong32A ((HWND32)toolPtr->uId,
+		    (WNDPROC)SetWindowLongA ((HWND)toolPtr->uId,
 		    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
 		lpttsi->hwndToolTip = wndPtr->hwndSelf;
 		lpttsi->uRefCount++;
-		SetProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass,
-			    (HANDLE32)lpttsi);
+		SetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass,
+			    (HANDLE)lpttsi);
 	    }
 	    else
 		WARN (tooltips, "A window tool must only be listed once!\n");
 	}
 	else {
 	    LPTT_SUBCLASS_INFO lpttsi =
-		(LPTT_SUBCLASS_INFO)GetProp32A (toolPtr->hwnd, COMCTL32_aSubclass);
+		(LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
 	    if (lpttsi == NULL) {
 		lpttsi =
 		    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
 		lpttsi->wpOrigProc = 
-		    (WNDPROC32)SetWindowLong32A (toolPtr->hwnd,
+		    (WNDPROC)SetWindowLongA (toolPtr->hwnd,
 		    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
 		lpttsi->hwndToolTip = wndPtr->hwndSelf;
 		lpttsi->uRefCount++;
-		SetProp32A (toolPtr->hwnd, COMCTL32_aSubclass, (HANDLE32)lpttsi);
+		SetPropA (toolPtr->hwnd, COMCTL32_aSubclass, (HANDLE)lpttsi);
 	    }
 	    else
 		lpttsi->uRefCount++;
@@ -759,16 +759,16 @@ TOOLTIPS_AddTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_DelTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_DelToolA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32A lpToolInfo = (LPTTTOOLINFO32A)lParam;
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
 	return 0;
     if (infoPtr->uNumTools == 0)
 	return 0;
@@ -781,7 +781,7 @@ TOOLTIPS_DelTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     /* delete text string */
     toolPtr = &infoPtr->tools[nTool]; 
     if ((toolPtr->hinst) && (toolPtr->lpszText)) {
-	if (toolPtr->lpszText != LPSTR_TEXTCALLBACK32W)
+	if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
 	    COMCTL32_Free (toolPtr->lpszText);
     }
 
@@ -789,11 +789,11 @@ TOOLTIPS_DelTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (toolPtr->uFlags & TTF_SUBCLASS) {
 	if (toolPtr->uFlags & TTF_IDISHWND) {
 	    LPTT_SUBCLASS_INFO lpttsi =
-		(LPTT_SUBCLASS_INFO)GetProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		(LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 	    if (lpttsi) {
-		SetWindowLong32A ((HWND32)toolPtr->uId, GWL_WNDPROC,
+		SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
 				  (LONG)lpttsi->wpOrigProc);
-		RemoveProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 		COMCTL32_Free (&lpttsi);
 	    }
 	    else
@@ -801,12 +801,12 @@ TOOLTIPS_DelTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	}
 	else {
 	    LPTT_SUBCLASS_INFO lpttsi =
-		(LPTT_SUBCLASS_INFO)GetProp32A (toolPtr->hwnd, COMCTL32_aSubclass);
+		(LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
 	    if (lpttsi) {
 		if (lpttsi->uRefCount == 1) {
-		    SetWindowLong32A ((HWND32)toolPtr->uId, GWL_WNDPROC,
+		    SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
 				      (LONG)lpttsi->wpOrigProc);
-		    RemoveProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		    RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 		    COMCTL32_Free (&lpttsi);
 		}
 		else
@@ -845,16 +845,16 @@ TOOLTIPS_DelTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_DelTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_DelToolW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32W lpToolInfo = (LPTTTOOLINFO32W)lParam;
+    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32W)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
 	return 0;
     if (infoPtr->uNumTools == 0)
 	return 0;
@@ -867,7 +867,7 @@ TOOLTIPS_DelTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     /* delete text string */
     toolPtr = &infoPtr->tools[nTool]; 
     if ((toolPtr->hinst) && (toolPtr->lpszText)) {
-	if (toolPtr->lpszText != LPSTR_TEXTCALLBACK32W)
+	if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
 	    COMCTL32_Free (toolPtr->lpszText);
     }
 
@@ -875,11 +875,11 @@ TOOLTIPS_DelTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     if (toolPtr->uFlags & TTF_SUBCLASS) {
 	if (toolPtr->uFlags & TTF_IDISHWND) {
 	    LPTT_SUBCLASS_INFO lpttsi =
-		(LPTT_SUBCLASS_INFO)GetProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		(LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 	    if (lpttsi) {
-		SetWindowLong32A ((HWND32)toolPtr->uId, GWL_WNDPROC,
+		SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
 				  (LONG)lpttsi->wpOrigProc);
-		RemoveProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 		COMCTL32_Free (&lpttsi);
 	    }
 	    else
@@ -887,12 +887,12 @@ TOOLTIPS_DelTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	}
 	else {
 	    LPTT_SUBCLASS_INFO lpttsi =
-		(LPTT_SUBCLASS_INFO)GetProp32A (toolPtr->hwnd, COMCTL32_aSubclass);
+		(LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
 	    if (lpttsi) {
 		if (lpttsi->uRefCount == 1) {
-		    SetWindowLong32A ((HWND32)toolPtr->uId, GWL_WNDPROC,
+		    SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
 				      (LONG)lpttsi->wpOrigProc);
-		    RemoveProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		    RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 		    COMCTL32_Free (&lpttsi);
 		}
 		else
@@ -931,16 +931,16 @@ TOOLTIPS_DelTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_EnumTools32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_EnumToolsA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    UINT32 uIndex = (UINT32)wParam;
-    LPTTTOOLINFO32A lpToolInfo = (LPTTTOOLINFO32A)lParam;
+    UINT uIndex = (UINT)wParam;
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
     TTTOOL_INFO *toolPtr;
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
 	return FALSE;
     if (uIndex >= infoPtr->uNumTools)
 	return FALSE;
@@ -958,7 +958,7 @@ TOOLTIPS_EnumTools32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /*    lpToolInfo->lpszText = toolPtr->lpszText; */
     lpToolInfo->lpszText = NULL;  /* FIXME */
 
-    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A))
+    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
 	lpToolInfo->lParam = toolPtr->lParam;
 
     return TRUE;
@@ -966,16 +966,16 @@ TOOLTIPS_EnumTools32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_EnumTools32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_EnumToolsW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    UINT32 uIndex = (UINT32)wParam;
-    LPTTTOOLINFO32W lpToolInfo = (LPTTTOOLINFO32W)lParam;
+    UINT uIndex = (UINT)wParam;
+    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
     TTTOOL_INFO *toolPtr;
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32W)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
 	return FALSE;
     if (uIndex >= infoPtr->uNumTools)
 	return FALSE;
@@ -993,7 +993,7 @@ TOOLTIPS_EnumTools32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /*    lpToolInfo->lpszText = toolPtr->lpszText; */
     lpToolInfo->lpszText = NULL;  /* FIXME */
 
-    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W))
+    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
 	lpToolInfo->lParam = toolPtr->lParam;
 
     return TRUE;
@@ -1001,15 +1001,15 @@ TOOLTIPS_EnumTools32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_GetCurrentTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetCurrentToolA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32A lpToolInfo = (LPTTTOOLINFO32A)lParam;
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
     TTTOOL_INFO *toolPtr;
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
 	return FALSE;
 
     if (lpToolInfo) {
@@ -1023,7 +1023,7 @@ TOOLTIPS_GetCurrentTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /*	    lpToolInfo->lpszText = toolPtr->lpszText; */
 	    lpToolInfo->lpszText = NULL;  /* FIXME */
 
-	    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A))
+	    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
 		lpToolInfo->lParam = toolPtr->lParam;
 
 	    return TRUE;
@@ -1039,15 +1039,15 @@ TOOLTIPS_GetCurrentTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_GetCurrentTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetCurrentToolW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32W lpToolInfo = (LPTTTOOLINFO32W)lParam;
+    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
     TTTOOL_INFO *toolPtr;
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32W)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
 	return FALSE;
 
     if (lpToolInfo) {
@@ -1061,7 +1061,7 @@ TOOLTIPS_GetCurrentTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /*	    lpToolInfo->lpszText = toolPtr->lpszText; */
 	    lpToolInfo->lpszText = NULL;  /* FIXME */
 
-	    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W))
+	    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
 		lpToolInfo->lParam = toolPtr->lParam;
 
 	    return TRUE;
@@ -1077,7 +1077,7 @@ TOOLTIPS_GetCurrentTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_GetDelayTime (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetDelayTime (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
@@ -1100,10 +1100,10 @@ TOOLTIPS_GetDelayTime (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_GetMargin (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetMargin (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPRECT32 lpRect = (LPRECT32)lParam;
+    LPRECT lpRect = (LPRECT)lParam;
 
     lpRect->left   = infoPtr->rcMargin.left;
     lpRect->right  = infoPtr->rcMargin.right;
@@ -1115,7 +1115,7 @@ TOOLTIPS_GetMargin (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-TOOLTIPS_GetMaxTipWidth (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetMaxTipWidth (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
@@ -1124,15 +1124,15 @@ TOOLTIPS_GetMaxTipWidth (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_GetText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetTextA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32A lpToolInfo = (LPTTTOOLINFO32A)lParam;
-    INT32 nTool;
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
 	return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -1145,28 +1145,28 @@ TOOLTIPS_GetText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_GetText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetTextW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32W lpToolInfo = (LPTTTOOLINFO32W)lParam;
-    INT32 nTool;
+    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32W)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
 	return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
     if (nTool == -1) return 0;
 
-    lstrcpy32W (lpToolInfo->lpszText, infoPtr->tools[nTool].lpszText);
+    lstrcpyW (lpToolInfo->lpszText, infoPtr->tools[nTool].lpszText);
 
     return 0;
 }
 
 
 __inline__ static LRESULT
-TOOLTIPS_GetTipBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetTipBkColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
     return infoPtr->clrBk;
@@ -1174,7 +1174,7 @@ TOOLTIPS_GetTipBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-TOOLTIPS_GetTipTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetTipTextColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
     return infoPtr->clrText;
@@ -1182,7 +1182,7 @@ TOOLTIPS_GetTipTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-TOOLTIPS_GetToolCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetToolCount (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
     return infoPtr->uNumTools;
@@ -1190,16 +1190,16 @@ TOOLTIPS_GetToolCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_GetToolInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetToolInfoA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32A lpToolInfo = (LPTTTOOLINFO32A)lParam;
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
 	return FALSE;
     if (infoPtr->uNumTools == 0)
 	return FALSE;
@@ -1219,7 +1219,7 @@ TOOLTIPS_GetToolInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /*    lpToolInfo->lpszText = toolPtr->lpszText; */
     lpToolInfo->lpszText = NULL;  /* FIXME */
 
-    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A))
+    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
 	lpToolInfo->lParam = toolPtr->lParam;
 
     return TRUE;
@@ -1227,16 +1227,16 @@ TOOLTIPS_GetToolInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_GetToolInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetToolInfoW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32W lpToolInfo = (LPTTTOOLINFO32W)lParam;
+    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32W)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
 	return FALSE;
     if (infoPtr->uNumTools == 0)
 	return FALSE;
@@ -1256,7 +1256,7 @@ TOOLTIPS_GetToolInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /*    lpToolInfo->lpszText = toolPtr->lpszText; */
     lpToolInfo->lpszText = NULL;  /* FIXME */
 
-    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W))
+    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
 	lpToolInfo->lParam = toolPtr->lParam;
 
     return TRUE;
@@ -1264,12 +1264,12 @@ TOOLTIPS_GetToolInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_HitTest32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_HitTestA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTHITTESTINFO32A lptthit = (LPTTHITTESTINFO32A)lParam;
+    LPTTHITTESTINFOA lptthit = (LPTTHITTESTINFOA)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lptthit == 0)
 	return FALSE;
@@ -1281,7 +1281,7 @@ TOOLTIPS_HitTest32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     TRACE (tooltips, "tool %d!\n", nTool);
 
     /* copy tool data */
-    if (lptthit->ti.cbSize >= sizeof(TTTOOLINFO32A)) {
+    if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOA)) {
 	toolPtr = &infoPtr->tools[nTool];
 
 	lptthit->ti.uFlags   = toolPtr->uFlags;
@@ -1299,12 +1299,12 @@ TOOLTIPS_HitTest32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_HitTest32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_HitTestW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTHITTESTINFO32W lptthit = (LPTTHITTESTINFO32W)lParam;
+    LPTTHITTESTINFOW lptthit = (LPTTHITTESTINFOW)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lptthit == 0)
 	return FALSE;
@@ -1316,7 +1316,7 @@ TOOLTIPS_HitTest32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     TRACE (tooltips, "tool %d!\n", nTool);
 
     /* copy tool data */
-    if (lptthit->ti.cbSize >= sizeof(TTTOOLINFO32W)) {
+    if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOW)) {
 	toolPtr = &infoPtr->tools[nTool];
 
 	lptthit->ti.uFlags   = toolPtr->uFlags;
@@ -1334,15 +1334,15 @@ TOOLTIPS_HitTest32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_NewToolRect32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_NewToolRectA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32A lpti = (LPTTTOOLINFO32A)lParam;
-    INT32 nTool;
+    LPTTTOOLINFOA lpti = (LPTTTOOLINFOA)lParam;
+    INT nTool;
 
     if (lpti == NULL)
 	return 0;
-    if (lpti->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpti->cbSize < TTTOOLINFO_V1_SIZEA)
 	return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpti);
@@ -1355,15 +1355,15 @@ TOOLTIPS_NewToolRect32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_NewToolRect32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_NewToolRectW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32W lpti = (LPTTTOOLINFO32W)lParam;
-    INT32 nTool;
+    LPTTTOOLINFOW lpti = (LPTTTOOLINFOW)lParam;
+    INT nTool;
 
     if (lpti == NULL)
 	return 0;
-    if (lpti->cbSize < TTTOOLINFO_V1_SIZE32W)
+    if (lpti->cbSize < TTTOOLINFO_V1_SIZEW)
 	return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpti);
@@ -1376,7 +1376,7 @@ TOOLTIPS_NewToolRect32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-TOOLTIPS_Pop (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_Pop (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
@@ -1387,11 +1387,11 @@ TOOLTIPS_Pop (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_RelayEvent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_RelayEvent (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPMSG32 lpMsg = (LPMSG32)lParam;
-    POINT32 pt;
+    LPMSG lpMsg = (LPMSG)lParam;
+    POINT pt;
 
     if (lParam == 0) {
 	ERR (tooltips, "lpMsg == NULL!\n");
@@ -1406,7 +1406,7 @@ TOOLTIPS_RelayEvent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	case WM_RBUTTONDOWN:
 	case WM_RBUTTONUP:
 	    pt = lpMsg->pt;
-	    ScreenToClient32 (lpMsg->hwnd, &pt);
+	    ScreenToClient (lpMsg->hwnd, &pt);
 	    infoPtr->nOldTool = infoPtr->nTool;
 	    infoPtr->nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lpMsg->hwnd, &pt);
 	    TRACE (tooltips, "tool (%x) %d %d\n",
@@ -1416,7 +1416,7 @@ TOOLTIPS_RelayEvent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 	case WM_MOUSEMOVE:
 	    pt = lpMsg->pt;
-	    ScreenToClient32 (lpMsg->hwnd, &pt);
+	    ScreenToClient (lpMsg->hwnd, &pt);
 	    infoPtr->nOldTool = infoPtr->nTool;
 	    infoPtr->nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lpMsg->hwnd, &pt);
 	    TRACE (tooltips, "tool (%x) %d %d\n",
@@ -1425,19 +1425,19 @@ TOOLTIPS_RelayEvent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		   wndPtr->hwndSelf, pt.x, pt.y);
 	    if ((infoPtr->bActive) && (infoPtr->nTool != infoPtr->nOldTool)) {
 		if (infoPtr->nOldTool == -1) {
-		    SetTimer32 (wndPtr->hwndSelf, ID_TIMERSHOW,
+		    SetTimer (wndPtr->hwndSelf, ID_TIMERSHOW,
 				infoPtr->nInitialTime, 0);
 		    TRACE (tooltips, "timer 1 started!\n");
 		}
 		else {
 		    TOOLTIPS_Hide (wndPtr, infoPtr);
-		    SetTimer32 (wndPtr->hwndSelf, ID_TIMERSHOW,
+		    SetTimer (wndPtr->hwndSelf, ID_TIMERSHOW,
 				infoPtr->nReshowTime, 0);
 		    TRACE (tooltips, "timer 2 started!\n");
 		}
 	    }
 	    if (infoPtr->nCurrentTool != -1) {
-		SetTimer32 (wndPtr->hwndSelf, ID_TIMERLEAVE, 100, 0);
+		SetTimer (wndPtr->hwndSelf, ID_TIMERLEAVE, 100, 0);
 		TRACE (tooltips, "timer 3 started!\n");
 	    }
 	    break;
@@ -1448,10 +1448,10 @@ TOOLTIPS_RelayEvent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_SetDelayTime (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_SetDelayTime (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    INT32 nTime = (INT32)LOWORD(lParam);
+    INT nTime = (INT)LOWORD(lParam);
 
     switch (wParam) {
 	case TTDT_AUTOMATIC:
@@ -1487,10 +1487,10 @@ TOOLTIPS_SetDelayTime (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_SetMargin (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_SetMargin (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPRECT32 lpRect = (LPRECT32)lParam;
+    LPRECT lpRect = (LPRECT)lParam;
 
     infoPtr->rcMargin.left   = lpRect->left;
     infoPtr->rcMargin.right  = lpRect->right;
@@ -1502,19 +1502,19 @@ TOOLTIPS_SetMargin (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-TOOLTIPS_SetMaxTipWidth (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_SetMaxTipWidth (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    INT32 nTemp = infoPtr->nMaxTipWidth;
+    INT nTemp = infoPtr->nMaxTipWidth;
 
-    infoPtr->nMaxTipWidth = (INT32)lParam;
+    infoPtr->nMaxTipWidth = (INT)lParam;
 
     return nTemp;
 }
 
 
 __inline__ static LRESULT
-TOOLTIPS_SetTipBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_SetTipBkColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
@@ -1525,7 +1525,7 @@ TOOLTIPS_SetTipBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 __inline__ static LRESULT
-TOOLTIPS_SetTipTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_SetTipTextColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
@@ -1536,16 +1536,16 @@ TOOLTIPS_SetTipTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_SetToolInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_SetToolInfoA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32A lpToolInfo = (LPTTTOOLINFO32A)lParam;
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
 	return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -1562,27 +1562,27 @@ TOOLTIPS_SetToolInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     toolPtr->rect   = lpToolInfo->rect;
     toolPtr->hinst  = lpToolInfo->hinst;
 
-    if ((lpToolInfo->hinst) && (HIWORD((INT32)lpToolInfo->lpszText) == 0)) {
-	TRACE (tooltips, "set string id %x!\n", (INT32)lpToolInfo->lpszText);
+    if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
+	TRACE (tooltips, "set string id %x!\n", (INT)lpToolInfo->lpszText);
 	toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACK32A)
-	    toolPtr->lpszText = LPSTR_TEXTCALLBACK32W;
+	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA)
+	    toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
 	else {
 	    if (toolPtr->lpszText) {
 		COMCTL32_Free (toolPtr->lpszText);
 		toolPtr->lpszText = NULL;
 	    }
 	    if (lpToolInfo->lpszText) {
-		INT32 len = lstrlen32A (lpToolInfo->lpszText);
+		INT len = lstrlenA (lpToolInfo->lpszText);
 		toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
 		lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
 	    }
 	}
     }
 
-    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A))
+    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
 	toolPtr->lParam = lpToolInfo->lParam;
 
     return 0;
@@ -1590,16 +1590,16 @@ TOOLTIPS_SetToolInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_SetToolInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_SetToolInfoW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32W lpToolInfo = (LPTTTOOLINFO32W)lParam;
+    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32W)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
 	return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
@@ -1616,27 +1616,27 @@ TOOLTIPS_SetToolInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     toolPtr->rect   = lpToolInfo->rect;
     toolPtr->hinst  = lpToolInfo->hinst;
 
-    if ((lpToolInfo->hinst) && (HIWORD((INT32)lpToolInfo->lpszText) == 0)) {
-	TRACE (tooltips, "set string id %x!\n", (INT32)lpToolInfo->lpszText);
+    if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
+	TRACE (tooltips, "set string id %x!\n", (INT)lpToolInfo->lpszText);
 	toolPtr->lpszText = lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACK32W)
-	    toolPtr->lpszText = LPSTR_TEXTCALLBACK32W;
+	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW)
+	    toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
 	else {
 	    if (toolPtr->lpszText) {
 		COMCTL32_Free (toolPtr->lpszText);
 		toolPtr->lpszText = NULL;
 	    }
 	    if (lpToolInfo->lpszText) {
-		INT32 len = lstrlen32W (lpToolInfo->lpszText);
+		INT len = lstrlenW (lpToolInfo->lpszText);
 		toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-		lstrcpy32W (toolPtr->lpszText, lpToolInfo->lpszText);
+		lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
 	    }
 	}
     }
 
-    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W))
+    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
 	toolPtr->lParam = lpToolInfo->lParam;
 
     return 0;
@@ -1644,17 +1644,17 @@ TOOLTIPS_SetToolInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_TrackActivate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_TrackActivate (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32A lpToolInfo = (LPTTTOOLINFO32A)lParam;
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
 	return FALSE;
 
-    if ((BOOL32)wParam) {
+    if ((BOOL)wParam) {
 	/* activate */
 	infoPtr->nTrackTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
 	if (infoPtr->nTrackTool != -1) {
@@ -1678,12 +1678,12 @@ TOOLTIPS_TrackActivate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_TrackPosition (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_TrackPosition (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
-    infoPtr->xTrackPos = (INT32)LOWORD(lParam);
-    infoPtr->yTrackPos = (INT32)HIWORD(lParam);
+    infoPtr->xTrackPos = (INT)LOWORD(lParam);
+    infoPtr->yTrackPos = (INT)HIWORD(lParam);
 
     if (infoPtr->bTrackActive) {
 	TRACE (tooltips, "[%d %d]\n",
@@ -1697,28 +1697,28 @@ TOOLTIPS_TrackPosition (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_Update (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_Update (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
     if (infoPtr->nCurrentTool != -1)
-	UpdateWindow32 (wndPtr->hwndSelf);
+	UpdateWindow (wndPtr->hwndSelf);
 
     return 0;
 }
 
 
 static LRESULT
-TOOLTIPS_UpdateTipText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_UpdateTipTextA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32A lpToolInfo = (LPTTTOOLINFO32A)lParam;
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32A)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
 	return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -1731,19 +1731,19 @@ TOOLTIPS_UpdateTipText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     /* copy tool text */
     toolPtr->hinst  = lpToolInfo->hinst;
 
-    if ((lpToolInfo->hinst) && (HIWORD((INT32)lpToolInfo->lpszText) == 0)){
+    if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)){
 	toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACK32A)
-	    toolPtr->lpszText = LPSTR_TEXTCALLBACK32W;
+	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA)
+	    toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
 	else {
 	    if (toolPtr->lpszText) {
 		COMCTL32_Free (toolPtr->lpszText);
 		toolPtr->lpszText = NULL;
 	    }
 	    if (lpToolInfo->lpszText) {
-		INT32 len = lstrlen32A (lpToolInfo->lpszText);
+		INT len = lstrlenA (lpToolInfo->lpszText);
 		toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
 		lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
 	    }
@@ -1761,16 +1761,16 @@ TOOLTIPS_UpdateTipText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_UpdateTipText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_UpdateTipTextW (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    LPTTTOOLINFO32W lpToolInfo = (LPTTTOOLINFO32W)lParam;
+    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
     TTTOOL_INFO *toolPtr;
-    INT32 nTool;
+    INT nTool;
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZE32W)
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
 	return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
@@ -1784,21 +1784,21 @@ TOOLTIPS_UpdateTipText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     /* copy tool text */
     toolPtr->hinst  = lpToolInfo->hinst;
 
-    if ((lpToolInfo->hinst) && (HIWORD((INT32)lpToolInfo->lpszText) == 0)){
+    if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)){
 	toolPtr->lpszText = lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACK32W)
-	    toolPtr->lpszText = LPSTR_TEXTCALLBACK32W;
+	if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW)
+	    toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
 	else {
 	    if (toolPtr->lpszText) {
 		COMCTL32_Free (toolPtr->lpszText);
 		toolPtr->lpszText = NULL;
 	    }
 	    if (lpToolInfo->lpszText) {
-		INT32 len = lstrlen32W (lpToolInfo->lpszText);
+		INT len = lstrlenW (lpToolInfo->lpszText);
 		toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-		lstrcpy32W (toolPtr->lpszText, lpToolInfo->lpszText);
+		lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
 	    }
 	}
     }
@@ -1814,19 +1814,19 @@ TOOLTIPS_UpdateTipText32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_WindowFromPoint (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_WindowFromPoint (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    return WindowFromPoint32 (*((LPPOINT32)lParam));
+    return WindowFromPoint (*((LPPOINT)lParam));
 }
 
 
 
 static LRESULT
-TOOLTIPS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr;
-    NONCLIENTMETRICS32A nclm;
-    INT32 nResult;
+    NONCLIENTMETRICSA nclm;
+    INT nResult;
 
     /* allocate memory for info structure */
     infoPtr = (TOOLTIPS_INFO *)COMCTL32_Alloc (sizeof(TOOLTIPS_INFO));
@@ -1840,12 +1840,12 @@ TOOLTIPS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     /* initialize info structure */
     infoPtr->bActive = TRUE;
     infoPtr->bTrackActive = FALSE;
-    infoPtr->clrBk   = GetSysColor32 (COLOR_INFOBK);
-    infoPtr->clrText = GetSysColor32 (COLOR_INFOTEXT);
+    infoPtr->clrBk   = GetSysColor (COLOR_INFOBK);
+    infoPtr->clrText = GetSysColor (COLOR_INFOTEXT);
 
-    nclm.cbSize = sizeof(NONCLIENTMETRICS32A);
-    SystemParametersInfo32A (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
-    infoPtr->hFont = CreateFontIndirect32A (&nclm.lfStatusFont);
+    nclm.cbSize = sizeof(NONCLIENTMETRICSA);
+    SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
+    infoPtr->hFont = CreateFontIndirectA (&nclm.lfStatusFont);
 
     infoPtr->nMaxTipWidth = -1;
     infoPtr->nTool = -1;
@@ -1859,8 +1859,8 @@ TOOLTIPS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->nInitialTime   = 500;
 
     nResult =
-	(INT32) SendMessage32A (wndPtr->parent->hwndSelf, WM_NOTIFYFORMAT,
-				(WPARAM32)wndPtr->hwndSelf, (LPARAM)NF_QUERY);
+	(INT) SendMessageA (wndPtr->parent->hwndSelf, WM_NOTIFYFORMAT,
+				(WPARAM)wndPtr->hwndSelf, (LPARAM)NF_QUERY);
     if (nResult == NFR_ANSI)
 	FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: NFR_ANSI\n");
     else if (nResult == NFR_UNICODE)
@@ -1868,7 +1868,7 @@ TOOLTIPS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     else
 	FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: error!\n");
 
-    SetWindowPos32 (wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0,
+    SetWindowPos (wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0,
 		    SWP_NOZORDER | SWP_HIDEWINDOW);
 
     return 0;
@@ -1876,18 +1876,18 @@ TOOLTIPS_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
     TTTOOL_INFO *toolPtr;
-    INT32 i;
+    INT i;
 
     /* free tools */
     if (infoPtr->tools) {
 	for (i = 0; i < infoPtr->uNumTools; i++) {
 	    toolPtr = &infoPtr->tools[i];
 	    if ((toolPtr->hinst) && (toolPtr->lpszText)) {
-		if (toolPtr->lpszText != LPSTR_TEXTCALLBACK32W)
+		if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
 		    COMCTL32_Free (toolPtr->lpszText);
 	    }
 
@@ -1896,14 +1896,14 @@ TOOLTIPS_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		LPTT_SUBCLASS_INFO lpttsi;
 
 		if (toolPtr->uFlags & TTF_IDISHWND)
-		    lpttsi = (LPTT_SUBCLASS_INFO)GetProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		    lpttsi = (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 		else
-		    lpttsi = (LPTT_SUBCLASS_INFO)GetProp32A (toolPtr->hwnd, COMCTL32_aSubclass);
+		    lpttsi = (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
 
 		if (lpttsi) {
-		    SetWindowLong32A ((HWND32)toolPtr->uId, GWL_WNDPROC,
+		    SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
 				      (LONG)lpttsi->wpOrigProc);
-		    RemoveProp32A ((HWND32)toolPtr->uId, COMCTL32_aSubclass);
+		    RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
 		    COMCTL32_Free (&lpttsi);
 		}
 	    }
@@ -1912,7 +1912,7 @@ TOOLTIPS_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     }
 
     /* delete font */
-    DeleteObject32 (infoPtr->hFont);
+    DeleteObject (infoPtr->hFont);
 
     /* free tool tips info data */
     COMCTL32_Free (infoPtr);
@@ -1922,23 +1922,23 @@ TOOLTIPS_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_EraseBackground (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    RECT32 rect;
-    HBRUSH32 hBrush;
+    RECT rect;
+    HBRUSH hBrush;
 
-    hBrush = CreateSolidBrush32 (infoPtr->clrBk);
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
-    FillRect32 ((HDC32)wParam, &rect, hBrush);
-    DeleteObject32 (hBrush);
+    hBrush = CreateSolidBrush (infoPtr->clrBk);
+    GetClientRect (wndPtr->hwndSelf, &rect);
+    FillRect ((HDC)wParam, &rect, hBrush);
+    DeleteObject (hBrush);
 
     return FALSE;
 }
 
 
 static LRESULT
-TOOLTIPS_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_GetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
@@ -1947,7 +1947,7 @@ TOOLTIPS_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_MouseMessage (WND *wndPtr, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_MouseMessage (WND *wndPtr, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
@@ -1958,7 +1958,7 @@ TOOLTIPS_MouseMessage (WND *wndPtr, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_NCCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_NCCreate (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     wndPtr->dwStyle &= 0x0000FFFF;
     wndPtr->dwStyle |= (WS_POPUP | WS_BORDER | WS_CLIPSIBLINGS);
@@ -1968,10 +1968,10 @@ TOOLTIPS_NCCreate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_NCHitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_NCHitTest (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    INT32 nTool = (infoPtr->bTrackActive) ? infoPtr->nTrackTool : infoPtr->nTool;
+    INT nTool = (infoPtr->bTrackActive) ? infoPtr->nTrackTool : infoPtr->nTool;
 
     TRACE (tooltips, " nTool=%d\n", nTool);
 
@@ -1982,30 +1982,30 @@ TOOLTIPS_NCHitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	}
     }
 
-    return DefWindowProc32A (wndPtr->hwndSelf, WM_NCHITTEST, wParam, lParam);
+    return DefWindowProcA (wndPtr->hwndSelf, WM_NCHITTEST, wParam, lParam);
 }
 
 
 static LRESULT
-TOOLTIPS_Paint (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_Paint (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
+    HDC hdc;
+    PAINTSTRUCT ps;
 
-    hdc = (wParam == 0) ? BeginPaint32 (wndPtr->hwndSelf, &ps) : (HDC32)wParam;
+    hdc = (wParam == 0) ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam;
     TOOLTIPS_Refresh (wndPtr, hdc);
     if (!wParam)
-	EndPaint32 (wndPtr->hwndSelf, &ps);
+	EndPaint (wndPtr->hwndSelf, &ps);
     return 0;
 }
 
 
 static LRESULT
-TOOLTIPS_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
-    infoPtr->hFont = (HFONT32)wParam;
+    infoPtr->hFont = (HFONT)wParam;
 
     if ((LOWORD(lParam)) & (infoPtr->nCurrentTool != -1)) {
 	FIXME (tooltips, "full redraw needed!\n");
@@ -2016,7 +2016,7 @@ TOOLTIPS_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_Timer (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_Timer (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
 
@@ -2025,7 +2025,7 @@ TOOLTIPS_Timer (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     switch (wParam)
     {
 	case ID_TIMERSHOW:
-	    KillTimer32 (wndPtr->hwndSelf, ID_TIMERSHOW);
+	    KillTimer (wndPtr->hwndSelf, ID_TIMERSHOW);
 	    if (TOOLTIPS_CheckTool (wndPtr, TRUE) == infoPtr->nTool)
 		TOOLTIPS_Show (wndPtr, infoPtr);
 	    break;
@@ -2035,7 +2035,7 @@ TOOLTIPS_Timer (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	    break;
 
 	case ID_TIMERLEAVE:
-	    KillTimer32 (wndPtr->hwndSelf, ID_TIMERLEAVE);
+	    KillTimer (wndPtr->hwndSelf, ID_TIMERLEAVE);
 	    if (TOOLTIPS_CheckTool (wndPtr, FALSE) == -1) {
 		infoPtr->nTool = -1;
 		infoPtr->nOldTool = -1;
@@ -2048,31 +2048,31 @@ TOOLTIPS_Timer (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TOOLTIPS_WinIniChange (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_WinIniChange (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(wndPtr);
-    NONCLIENTMETRICS32A nclm;
+    NONCLIENTMETRICSA nclm;
 
-    infoPtr->clrBk   = GetSysColor32 (COLOR_INFOBK);
-    infoPtr->clrText = GetSysColor32 (COLOR_INFOTEXT);
+    infoPtr->clrBk   = GetSysColor (COLOR_INFOBK);
+    infoPtr->clrText = GetSysColor (COLOR_INFOTEXT);
 
-    DeleteObject32 (infoPtr->hFont);
-    nclm.cbSize = sizeof(NONCLIENTMETRICS32A);
-    SystemParametersInfo32A (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
-    infoPtr->hFont = CreateFontIndirect32A (&nclm.lfStatusFont);
+    DeleteObject (infoPtr->hFont);
+    nclm.cbSize = sizeof(NONCLIENTMETRICSA);
+    SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
+    infoPtr->hFont = CreateFontIndirectA (&nclm.lfStatusFont);
 
     return 0;
 }
 
 
 LRESULT CALLBACK
-TOOLTIPS_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     LPTT_SUBCLASS_INFO lpttsi =
-	(LPTT_SUBCLASS_INFO)GetProp32A (hwnd, COMCTL32_aSubclass);
+	(LPTT_SUBCLASS_INFO)GetPropA (hwnd, COMCTL32_aSubclass);
     WND *wndPtr;
     TOOLTIPS_INFO *infoPtr;
-    UINT32 nTool;
+    UINT nTool;
 
     switch (uMsg) {
 	case WM_LBUTTONDOWN:
@@ -2106,31 +2106,31 @@ TOOLTIPS_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 		if ((infoPtr->bActive) &&
 		    (infoPtr->nTool != infoPtr->nOldTool)) {
 		    if (infoPtr->nOldTool == -1) {
-			SetTimer32 (wndPtr->hwndSelf, ID_TIMERSHOW,
+			SetTimer (wndPtr->hwndSelf, ID_TIMERSHOW,
 				    infoPtr->nInitialTime, 0);
 			TRACE (tooltips, "timer 1 started!\n");
 		    }
 		    else {
 			TOOLTIPS_Hide (wndPtr, infoPtr);
-			SetTimer32 (wndPtr->hwndSelf, ID_TIMERSHOW,
+			SetTimer (wndPtr->hwndSelf, ID_TIMERSHOW,
 				infoPtr->nReshowTime, 0);
 			TRACE (tooltips, "timer 2 started!\n");
 		    }
 		}
 		if (infoPtr->nCurrentTool != -1) {
-		    SetTimer32 (wndPtr->hwndSelf, ID_TIMERLEAVE, 100, 0);
+		    SetTimer (wndPtr->hwndSelf, ID_TIMERLEAVE, 100, 0);
 		    TRACE (tooltips, "timer 3 started!\n");
 		}
 	    }
 	    break;
     }
 
-    return CallWindowProc32A (lpttsi->wpOrigProc, hwnd, uMsg, wParam, lParam);
+    return CallWindowProcA (lpttsi->wpOrigProc, hwnd, uMsg, wParam, lParam);
 }
 
 
 LRESULT CALLBACK
-TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -2139,29 +2139,29 @@ TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TTM_ACTIVATE:
 	    return TOOLTIPS_Activate (wndPtr, wParam, lParam);
 
-	case TTM_ADDTOOL32A:
-	    return TOOLTIPS_AddTool32A (wndPtr, wParam, lParam);
+	case TTM_ADDTOOLA:
+	    return TOOLTIPS_AddToolA (wndPtr, wParam, lParam);
 
-	case TTM_ADDTOOL32W:
-	    return TOOLTIPS_AddTool32W (wndPtr, wParam, lParam);
+	case TTM_ADDTOOLW:
+	    return TOOLTIPS_AddToolW (wndPtr, wParam, lParam);
 
-	case TTM_DELTOOL32A:
-	    return TOOLTIPS_DelTool32A (wndPtr, wParam, lParam);
+	case TTM_DELTOOLA:
+	    return TOOLTIPS_DelToolA (wndPtr, wParam, lParam);
 
-	case TTM_DELTOOL32W:
-	    return TOOLTIPS_DelTool32W (wndPtr, wParam, lParam);
+	case TTM_DELTOOLW:
+	    return TOOLTIPS_DelToolW (wndPtr, wParam, lParam);
 
-	case TTM_ENUMTOOLS32A:
-	    return TOOLTIPS_EnumTools32A (wndPtr, wParam, lParam);
+	case TTM_ENUMTOOLSA:
+	    return TOOLTIPS_EnumToolsA (wndPtr, wParam, lParam);
 
-	case TTM_ENUMTOOLS32W:
-	    return TOOLTIPS_EnumTools32W (wndPtr, wParam, lParam);
+	case TTM_ENUMTOOLSW:
+	    return TOOLTIPS_EnumToolsW (wndPtr, wParam, lParam);
 
-	case TTM_GETCURRENTTOOL32A:
-	    return TOOLTIPS_GetCurrentTool32A (wndPtr, wParam, lParam);
+	case TTM_GETCURRENTTOOLA:
+	    return TOOLTIPS_GetCurrentToolA (wndPtr, wParam, lParam);
 
-	case TTM_GETCURRENTTOOL32W:
-	    return TOOLTIPS_GetCurrentTool32W (wndPtr, wParam, lParam);
+	case TTM_GETCURRENTTOOLW:
+	    return TOOLTIPS_GetCurrentToolW (wndPtr, wParam, lParam);
 
 	case TTM_GETDELAYTIME:
 	    return TOOLTIPS_GetDelayTime (wndPtr, wParam, lParam);
@@ -2172,11 +2172,11 @@ TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TTM_GETMAXTIPWIDTH:
 	    return TOOLTIPS_GetMaxTipWidth (wndPtr, wParam, lParam);
 
-	case TTM_GETTEXT32A:
-	    return TOOLTIPS_GetText32A (wndPtr, wParam, lParam);
+	case TTM_GETTEXTA:
+	    return TOOLTIPS_GetTextA (wndPtr, wParam, lParam);
 
-	case TTM_GETTEXT32W:
-	    return TOOLTIPS_GetText32W (wndPtr, wParam, lParam);
+	case TTM_GETTEXTW:
+	    return TOOLTIPS_GetTextW (wndPtr, wParam, lParam);
 
 	case TTM_GETTIPBKCOLOR:
 	    return TOOLTIPS_GetTipBkColor (wndPtr, wParam, lParam);
@@ -2187,23 +2187,23 @@ TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TTM_GETTOOLCOUNT:
 	    return TOOLTIPS_GetToolCount (wndPtr, wParam, lParam);
 
-	case TTM_GETTOOLINFO32A:
-	    return TOOLTIPS_GetToolInfo32A (wndPtr, wParam, lParam);
+	case TTM_GETTOOLINFOA:
+	    return TOOLTIPS_GetToolInfoA (wndPtr, wParam, lParam);
 
-	case TTM_GETTOOLINFO32W:
-	    return TOOLTIPS_GetToolInfo32W (wndPtr, wParam, lParam);
+	case TTM_GETTOOLINFOW:
+	    return TOOLTIPS_GetToolInfoW (wndPtr, wParam, lParam);
 
-	case TTM_HITTEST32A:
-	    return TOOLTIPS_HitTest32A (wndPtr, wParam, lParam);
+	case TTM_HITTESTA:
+	    return TOOLTIPS_HitTestA (wndPtr, wParam, lParam);
 
-	case TTM_HITTEST32W:
-	    return TOOLTIPS_HitTest32W (wndPtr, wParam, lParam);
+	case TTM_HITTESTW:
+	    return TOOLTIPS_HitTestW (wndPtr, wParam, lParam);
 
-	case TTM_NEWTOOLRECT32A:
-	    return TOOLTIPS_NewToolRect32A (wndPtr, wParam, lParam);
+	case TTM_NEWTOOLRECTA:
+	    return TOOLTIPS_NewToolRectA (wndPtr, wParam, lParam);
 
-	case TTM_NEWTOOLRECT32W:
-	    return TOOLTIPS_NewToolRect32W (wndPtr, wParam, lParam);
+	case TTM_NEWTOOLRECTW:
+	    return TOOLTIPS_NewToolRectW (wndPtr, wParam, lParam);
 
 	case TTM_POP:
 	    return TOOLTIPS_Pop (wndPtr, wParam, lParam);
@@ -2226,11 +2226,11 @@ TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TTM_SETTIPTEXTCOLOR:
 	    return TOOLTIPS_SetTipTextColor (wndPtr, wParam, lParam);
 
-	case TTM_SETTOOLINFO32A:
-	    return TOOLTIPS_SetToolInfo32A (wndPtr, wParam, lParam);
+	case TTM_SETTOOLINFOA:
+	    return TOOLTIPS_SetToolInfoA (wndPtr, wParam, lParam);
 
-	case TTM_SETTOOLINFO32W:
-	    return TOOLTIPS_SetToolInfo32W (wndPtr, wParam, lParam);
+	case TTM_SETTOOLINFOW:
+	    return TOOLTIPS_SetToolInfoW (wndPtr, wParam, lParam);
 
 	case TTM_TRACKACTIVATE:
 	    return TOOLTIPS_TrackActivate (wndPtr, wParam, lParam);
@@ -2241,11 +2241,11 @@ TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	case TTM_UPDATE:
 	    return TOOLTIPS_Update (wndPtr, wParam, lParam);
 
-	case TTM_UPDATETIPTEXT32A:
-	    return TOOLTIPS_UpdateTipText32A (wndPtr, wParam, lParam);
+	case TTM_UPDATETIPTEXTA:
+	    return TOOLTIPS_UpdateTipTextA (wndPtr, wParam, lParam);
 
-	case TTM_UPDATETIPTEXT32W:
-	    return TOOLTIPS_UpdateTipText32W (wndPtr, wParam, lParam);
+	case TTM_UPDATETIPTEXTW:
+	    return TOOLTIPS_UpdateTipTextW (wndPtr, wParam, lParam);
 
 	case TTM_WINDOWFROMPOINT:
 	    return TOOLTIPS_WindowFromPoint (wndPtr, wParam, lParam);
@@ -2297,7 +2297,7 @@ TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 	    if (uMsg >= WM_USER)
 		ERR (tooltips, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -2306,27 +2306,27 @@ TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 TOOLTIPS_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (TOOLTIPS_CLASS32A)) return;
+    if (GlobalFindAtomA (TOOLTIPS_CLASSA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS;
-    wndClass.lpfnWndProc   = (WNDPROC32)TOOLTIPS_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)TOOLTIPS_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(TOOLTIPS_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
     wndClass.hbrBackground = 0;
-    wndClass.lpszClassName = TOOLTIPS_CLASS32A;
+    wndClass.lpszClassName = TOOLTIPS_CLASSA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 TOOLTIPS_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (TOOLTIPS_CLASS32A))
-	UnregisterClass32A (TOOLTIPS_CLASS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (TOOLTIPS_CLASSA))
+	UnregisterClassA (TOOLTIPS_CLASSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 575ba0492d2..17cb9b717b7 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -55,7 +55,7 @@
 #define TIC_SELECTIONMARKMIN 	0x100
 #define TIC_SELECTIONMARK		(TIC_SELECTIONMARKMAX | TIC_SELECTIONMARKMIN)
 
-static BOOL32 TRACKBAR_SendNotify (WND *wndPtr, UINT32 code);
+static BOOL TRACKBAR_SendNotify (WND *wndPtr, UINT code);
 
 void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr)
 
@@ -86,7 +86,7 @@ void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr)
 /* converts from physical (mouse) position to logical position 
    (in range of trackbar) */
 
-static inline INT32
+static inline INT
 TRACKBAR_ConvertPlaceToPosition (TRACKBAR_INFO *infoPtr, int place, 
 								int vertical) 
 {
@@ -110,10 +110,10 @@ TRACKBAR_ConvertPlaceToPosition (TRACKBAR_INFO *infoPtr, int place,
 static VOID
 TRACKBAR_CalcChannel (WND *wndPtr, TRACKBAR_INFO *infoPtr)
 {
-    INT32 cyChannel;
-	RECT32 lpRect,*channel = & infoPtr->rcChannel;
+    INT cyChannel;
+	RECT lpRect,*channel = & infoPtr->rcChannel;
 
-    GetClientRect32 (wndPtr->hwndSelf, &lpRect);
+    GetClientRect (wndPtr->hwndSelf, &lpRect);
 
     if (wndPtr->dwStyle & TBS_ENABLESELRANGE)
 		cyChannel = MAX(infoPtr->uThumbLen - 8, 4);
@@ -159,7 +159,7 @@ static VOID
 TRACKBAR_CalcThumb (WND *wndPtr, TRACKBAR_INFO *infoPtr)
 
 {
-	RECT32 *thumb;
+	RECT *thumb;
 	int range, width;
 	
 	thumb=&infoPtr->rcThumb;
@@ -185,7 +185,7 @@ TRACKBAR_CalcThumb (WND *wndPtr, TRACKBAR_INFO *infoPtr)
 static VOID
 TRACKBAR_CalcSelection (WND *wndPtr, TRACKBAR_INFO *infoPtr)
 {
-	RECT32 *selection;
+	RECT *selection;
 	int range, width;
 
 	selection= & infoPtr->rcSelection;
@@ -193,7 +193,7 @@ TRACKBAR_CalcSelection (WND *wndPtr, TRACKBAR_INFO *infoPtr)
 	width=infoPtr->rcChannel.right - infoPtr->rcChannel.left;
 
 	if (range <= 0) 
-		SetRectEmpty32 (selection);
+		SetRectEmpty (selection);
 	else 
 		if (wndPtr->dwStyle & TBS_VERT) {
 			selection->left   = infoPtr->rcChannel.left +
@@ -221,10 +221,10 @@ TRACKBAR_QueueRefresh (WND *wndPtr)
 
  TRACE (trackbar,"queued\n");
  if (infoPtr->flags & TB_REFRESH_TIMER_SET) {
-    KillTimer32 (wndPtr->hwndSelf, TB_REFRESH_TIMER);
+    KillTimer (wndPtr->hwndSelf, TB_REFRESH_TIMER);
  }
 
- SetTimer32 (wndPtr->hwndSelf, TB_REFRESH_TIMER, TB_REFRESH_DELAY, 0);
+ SetTimer (wndPtr->hwndSelf, TB_REFRESH_TIMER, TB_REFRESH_DELAY, 0);
  infoPtr->flags|=TB_REFRESH_TIMER_SET;
 }
 
@@ -237,11 +237,11 @@ TRACKBAR_QueueRefresh (WND *wndPtr)
 /* ticPos is in tic-units, not in pixels */
 
 static VOID
-TRACKBAR_DrawHorizTic (TRACKBAR_INFO *infoPtr, HDC32 hdc, LONG ticPos, 
+TRACKBAR_DrawHorizTic (TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, 
 		int flags, COLORREF clrTic)
 
 {
-  RECT32 rcChannel=infoPtr->rcChannel;
+  RECT rcChannel=infoPtr->rcChannel;
   int x,y,width,range,side;
 
   range=infoPtr->nRangeMax - infoPtr->nRangeMin;
@@ -261,16 +261,16 @@ TRACKBAR_DrawHorizTic (TRACKBAR_INFO *infoPtr, HDC32 hdc, LONG ticPos,
 	else 
 		x=rcChannel.left + (width*ticPos)/range + 1;
 
-   	SetPixel32 (hdc, x,y+6*side, clrTic);
-   	SetPixel32 (hdc, x,y+7*side, clrTic);
+   	SetPixel (hdc, x,y+6*side, clrTic);
+   	SetPixel (hdc, x,y+7*side, clrTic);
 	return;
   }
 
   if ((ticPos>infoPtr->nRangeMin) && (ticPos<infoPtr->nRangeMax)) {
    	x=rcChannel.left + (width*ticPos)/range;
-   	SetPixel32 (hdc, x,y+5*side, clrTic);
-   	SetPixel32 (hdc, x,y+6*side, clrTic);
-   	SetPixel32 (hdc, x,y+7*side, clrTic);
+   	SetPixel (hdc, x,y+5*side, clrTic);
+   	SetPixel (hdc, x,y+6*side, clrTic);
+   	SetPixel (hdc, x,y+7*side, clrTic);
 	}
 
   if (flags & TIC_EDGE) {
@@ -279,20 +279,20 @@ TRACKBAR_DrawHorizTic (TRACKBAR_INFO *infoPtr, HDC32 hdc, LONG ticPos,
 	else 
    		x=rcChannel.right;
 
-   	SetPixel32 (hdc, x,y+5*side, clrTic);
-   	SetPixel32 (hdc, x,y+6*side, clrTic);
-   	SetPixel32 (hdc, x,y+7*side, clrTic);
-	SetPixel32 (hdc, x,y+8*side, clrTic);
+   	SetPixel (hdc, x,y+5*side, clrTic);
+   	SetPixel (hdc, x,y+6*side, clrTic);
+   	SetPixel (hdc, x,y+7*side, clrTic);
+	SetPixel (hdc, x,y+8*side, clrTic);
   }
 
 }
 
 static VOID
-TRACKBAR_DrawVertTic (TRACKBAR_INFO *infoPtr, HDC32 hdc, LONG ticPos, 
+TRACKBAR_DrawVertTic (TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, 
 		int flags, COLORREF clrTic)
 
 {
-  RECT32 rcChannel=infoPtr->rcChannel;
+  RECT rcChannel=infoPtr->rcChannel;
   int x,y,width,range,side;
 
   range=infoPtr->nRangeMax - infoPtr->nRangeMin;
@@ -313,16 +313,16 @@ TRACKBAR_DrawVertTic (TRACKBAR_INFO *infoPtr, HDC32 hdc, LONG ticPos,
 	else 
 		y=rcChannel.top + (width*ticPos)/range + 1;
 
-   	SetPixel32 (hdc, x+6*side, y, clrTic);
-   	SetPixel32 (hdc, x+7*side, y, clrTic);
+   	SetPixel (hdc, x+6*side, y, clrTic);
+   	SetPixel (hdc, x+7*side, y, clrTic);
 	return;
   }
 
   if ((ticPos>infoPtr->nRangeMin) && (ticPos<infoPtr->nRangeMax)) {
    	y=rcChannel.top + (width*ticPos)/range;
-   	SetPixel32 (hdc, x+5*side, y, clrTic);
-   	SetPixel32 (hdc, x+6*side, y, clrTic);
-   	SetPixel32 (hdc, x+7*side, y, clrTic);
+   	SetPixel (hdc, x+5*side, y, clrTic);
+   	SetPixel (hdc, x+6*side, y, clrTic);
+   	SetPixel (hdc, x+7*side, y, clrTic);
 	}
 
   if (flags & TIC_EDGE) {
@@ -331,17 +331,17 @@ TRACKBAR_DrawVertTic (TRACKBAR_INFO *infoPtr, HDC32 hdc, LONG ticPos,
 	else 
    		y=rcChannel.bottom;
 
-   	SetPixel32 (hdc, x+5*side, y, clrTic);
-   	SetPixel32 (hdc, x+6*side, y, clrTic);
-   	SetPixel32 (hdc, x+7*side, y, clrTic);
-	SetPixel32 (hdc, x+8*side, y, clrTic);
+   	SetPixel (hdc, x+5*side, y, clrTic);
+   	SetPixel (hdc, x+6*side, y, clrTic);
+   	SetPixel (hdc, x+7*side, y, clrTic);
+	SetPixel (hdc, x+8*side, y, clrTic);
   }
 
 }
 
 
 static VOID
-TRACKBAR_DrawTics (TRACKBAR_INFO *infoPtr, HDC32 hdc, LONG ticPos, 
+TRACKBAR_DrawTics (TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, 
 		int flags, COLORREF clrTic)
 
 {
@@ -365,20 +365,20 @@ TRACKBAR_DrawTics (TRACKBAR_INFO *infoPtr, HDC32 hdc, LONG ticPos,
 
 
 static VOID
-TRACKBAR_Refresh (WND *wndPtr, HDC32 hdc)
+TRACKBAR_Refresh (WND *wndPtr, HDC hdc)
 {
 	TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-	RECT32 rcClient, rcChannel, rcSelection;
-	HBRUSH32 hBrush = CreateSolidBrush32 (infoPtr->clrBk);
+	RECT rcClient, rcChannel, rcSelection;
+	HBRUSH hBrush = CreateSolidBrush (infoPtr->clrBk);
 	int i;
 
-    GetClientRect32 (wndPtr->hwndSelf, &rcClient);
-	hBrush = CreateSolidBrush32 (infoPtr->clrBk);
-	FillRect32 (hdc, &rcClient, hBrush);
-    DeleteObject32 (hBrush);
+    GetClientRect (wndPtr->hwndSelf, &rcClient);
+	hBrush = CreateSolidBrush (infoPtr->clrBk);
+	FillRect (hdc, &rcClient, hBrush);
+    DeleteObject (hBrush);
 
     if (infoPtr->flags & TB_REFRESH_TIMER_SET) {
-        KillTimer32 (wndPtr->hwndSelf, TB_REFRESH_TIMER);
+        KillTimer (wndPtr->hwndSelf, TB_REFRESH_TIMER);
         infoPtr->flags &= ~TB_REFRESH_TIMER_SET;
     }
 
@@ -400,19 +400,19 @@ TRACKBAR_Refresh (WND *wndPtr, HDC32 hdc)
 
     rcChannel = infoPtr->rcChannel;
     rcSelection= infoPtr->rcSelection;
-    DrawEdge32 (hdc, &rcChannel, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
+    DrawEdge (hdc, &rcChannel, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
 
     if (wndPtr->dwStyle & TBS_ENABLESELRANGE) {		 /* fill the channel */
-		HBRUSH32 hbr = CreateSolidBrush32 (RGB(255,255,255));
-		FillRect32 (hdc, &rcChannel, hbr);
+		HBRUSH hbr = CreateSolidBrush (RGB(255,255,255));
+		FillRect (hdc, &rcChannel, hbr);
 		if (((wndPtr->dwStyle & TBS_VERT) && 
 		    (rcSelection.left!=rcSelection.right)) || 
 		    ((!(wndPtr->dwStyle & TBS_VERT)) && 	
 		    (rcSelection.left!=rcSelection.right))) {
-				hbr=CreateSolidBrush32 (COLOR_HIGHLIGHT); 
-				FillRect32 (hdc, &rcSelection, hbr);
+				hbr=CreateSolidBrush (COLOR_HIGHLIGHT); 
+				FillRect (hdc, &rcSelection, hbr);
 		}
-		DeleteObject32 (hbr);
+		DeleteObject (hbr);
     }
 
 
@@ -420,7 +420,7 @@ TRACKBAR_Refresh (WND *wndPtr, HDC32 hdc)
 
     if (!(wndPtr->dwStyle & TBS_NOTICKS)) {
 		int ticFlags=wndPtr->dwStyle & 0x0f;
-		COLORREF clrTic=GetSysColor32 (COLOR_3DDKSHADOW);
+		COLORREF clrTic=GetSysColor (COLOR_3DDKSHADOW);
 
         for (i=0; i<infoPtr->uNumTics; i++) 
 			TRACKBAR_DrawTics (infoPtr, hdc, infoPtr->tics[i], 
@@ -442,22 +442,22 @@ TRACKBAR_Refresh (WND *wndPtr, HDC32 hdc)
 
      if (!(wndPtr->dwStyle & TBS_NOTHUMB)) {
 		
-        HBRUSH32 hbr = CreateSolidBrush32 (COLOR_BACKGROUND);
-		RECT32 thumb = infoPtr->rcThumb;
+        HBRUSH hbr = CreateSolidBrush (COLOR_BACKGROUND);
+		RECT thumb = infoPtr->rcThumb;
 
-		SelectObject32 (hdc, hbr);
+		SelectObject (hdc, hbr);
 		
 		if (wndPtr->dwStyle & TBS_BOTH) {
-        	FillRect32 (hdc, &thumb, hbr);
-  			DrawEdge32 (hdc, &thumb, EDGE_RAISED, BF_TOPLEFT);
+        	FillRect (hdc, &thumb, hbr);
+  			DrawEdge (hdc, &thumb, EDGE_RAISED, BF_TOPLEFT);
 		} else {
 
-		POINT32 points[6];
+		POINT points[6];
 
  			/* first, fill the thumb */
 			/* FIXME: revamp. check for TBS_VERT */
 
-		SetPolyFillMode32 (hdc,WINDING);
+		SetPolyFillMode (hdc,WINDING);
 		points[0].x=thumb.left;
 		points[0].y=thumb.top;
 		points[1].x=thumb.right - 1;
@@ -470,13 +470,13 @@ TRACKBAR_Refresh (WND *wndPtr, HDC32 hdc)
 		points[4].y=thumb.bottom -2;
 		points[5].x=points[0].x;
 		points[5].y=points[0].y;
-		Polygon32 (hdc, points, 6);
+		Polygon (hdc, points, 6);
 
 		if (wndPtr->dwStyle & TBS_VERT) {
                     /*   draw edge  */
 		} else {
-			RECT32 triangle;	/* for correct shadows of thumb */
-			DrawEdge32 (hdc, &thumb, EDGE_RAISED, BF_TOPLEFT);
+			RECT triangle;	/* for correct shadows of thumb */
+			DrawEdge (hdc, &thumb, EDGE_RAISED, BF_TOPLEFT);
 
 			/* draw notch */
 
@@ -484,19 +484,19 @@ TRACKBAR_Refresh (WND *wndPtr, HDC32 hdc)
 			triangle.left  = points[3].x+5;
 			triangle.top   = thumb.bottom +5;
 			triangle.bottom= thumb.bottom +1;
-			DrawEdge32 (hdc, &triangle, EDGE_SUNKEN, 
+			DrawEdge (hdc, &triangle, EDGE_SUNKEN, 
 							BF_DIAGONAL | BF_TOP | BF_RIGHT);
 			triangle.left  = thumb.left+6;
 			triangle.right = points[3].x+6;
-			DrawEdge32 (hdc, &triangle, EDGE_RAISED, 
+			DrawEdge (hdc, &triangle, EDGE_RAISED, 
 							BF_DIAGONAL | BF_TOP | BF_LEFT);
 			}
 		}
-		DeleteObject32 (hbr);
+		DeleteObject (hbr);
      }
 
     if (infoPtr->bFocus)
-		DrawFocusRect32 (hdc, &rcClient);
+		DrawFocusRect (hdc, &rcClient);
 }
 
 
@@ -505,17 +505,17 @@ TRACKBAR_Refresh (WND *wndPtr, HDC32 hdc)
 static VOID
 TRACKBAR_AlignBuddies (WND *wndPtr, TRACKBAR_INFO *infoPtr)
 {
-    HWND32 hwndParent = GetParent32 (wndPtr->hwndSelf);
-    RECT32 rcSelf, rcBuddy;
-    INT32 x, y;
+    HWND hwndParent = GetParent (wndPtr->hwndSelf);
+    RECT rcSelf, rcBuddy;
+    INT x, y;
 
-    GetWindowRect32 (wndPtr->hwndSelf, &rcSelf);
-    MapWindowPoints32 (HWND_DESKTOP, hwndParent, (LPPOINT32)&rcSelf, 2);
+    GetWindowRect (wndPtr->hwndSelf, &rcSelf);
+    MapWindowPoints (HWND_DESKTOP, hwndParent, (LPPOINT)&rcSelf, 2);
 
     /* align buddy left or above */
     if (infoPtr->hwndBuddyLA) {
-	GetWindowRect32 (infoPtr->hwndBuddyLA, &rcBuddy);
-	MapWindowPoints32 (HWND_DESKTOP, hwndParent, (LPPOINT32)&rcBuddy, 2);
+	GetWindowRect (infoPtr->hwndBuddyLA, &rcBuddy);
+	MapWindowPoints (HWND_DESKTOP, hwndParent, (LPPOINT)&rcBuddy, 2);
 
 	if (wndPtr->dwStyle & TBS_VERT) {
 	    x = (infoPtr->rcChannel.right + infoPtr->rcChannel.left) / 2 -
@@ -528,15 +528,15 @@ TRACKBAR_AlignBuddies (WND *wndPtr, TRACKBAR_INFO *infoPtr)
 		(rcBuddy.bottom - rcBuddy.top) / 2 + rcSelf.top;
 	}
 
-	SetWindowPos32 (infoPtr->hwndBuddyLA, 0, x, y, 0, 0,
+	SetWindowPos (infoPtr->hwndBuddyLA, 0, x, y, 0, 0,
 			SWP_NOZORDER | SWP_NOSIZE);
     }
 
 
     /* align buddy right or below */
     if (infoPtr->hwndBuddyRB) {
-	GetWindowRect32 (infoPtr->hwndBuddyRB, &rcBuddy);
-	MapWindowPoints32 (HWND_DESKTOP, hwndParent, (LPPOINT32)&rcBuddy, 2);
+	GetWindowRect (infoPtr->hwndBuddyRB, &rcBuddy);
+	MapWindowPoints (HWND_DESKTOP, hwndParent, (LPPOINT)&rcBuddy, 2);
 
 	if (wndPtr->dwStyle & TBS_VERT) {
 	    x = (infoPtr->rcChannel.right + infoPtr->rcChannel.left) / 2 -
@@ -548,14 +548,14 @@ TRACKBAR_AlignBuddies (WND *wndPtr, TRACKBAR_INFO *infoPtr)
 	    y = (infoPtr->rcChannel.bottom + infoPtr->rcChannel.top) / 2 -
 		(rcBuddy.bottom - rcBuddy.top) / 2 + rcSelf.top;
 	}
-	SetWindowPos32 (infoPtr->hwndBuddyRB, 0, x, y, 0, 0,
+	SetWindowPos (infoPtr->hwndBuddyRB, 0, x, y, 0, 0,
 			SWP_NOZORDER | SWP_NOSIZE);
     }
 }
 
 
 static LRESULT
-TRACKBAR_ClearSel (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_ClearSel (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -563,10 +563,10 @@ TRACKBAR_ClearSel (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->nSelMax = 0;
 	infoPtr->flags |=TB_SELECTIONCHANGED;
 
-    if ((BOOL32)wParam) {
-		HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+    if ((BOOL)wParam) {
+		HDC hdc = GetDC (wndPtr->hwndSelf);
 		TRACKBAR_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -574,7 +574,7 @@ TRACKBAR_ClearSel (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_ClearTics (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_ClearTics (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -585,9 +585,9 @@ TRACKBAR_ClearTics (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     }
 
     if (wParam) {
-		HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+		HDC hdc = GetDC (wndPtr->hwndSelf);
 		TRACKBAR_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -595,7 +595,7 @@ TRACKBAR_ClearTics (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetBuddy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetBuddy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -608,10 +608,10 @@ TRACKBAR_GetBuddy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetChannelRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetChannelRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-    LPRECT32 lprc = (LPRECT32)lParam;
+    LPRECT lprc = (LPRECT)lParam;
 
     if (lprc == NULL)
 		return 0;
@@ -626,7 +626,7 @@ TRACKBAR_GetChannelRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetLineSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetLineSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -635,7 +635,7 @@ TRACKBAR_GetLineSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetNumTics (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetNumTics (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -647,7 +647,7 @@ TRACKBAR_GetNumTics (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetPageSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetPageSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -656,7 +656,7 @@ TRACKBAR_GetPageSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetPos (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -667,7 +667,7 @@ TRACKBAR_GetPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetRangeMax (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetRangeMax (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -676,7 +676,7 @@ TRACKBAR_GetRangeMax (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetRangeMin (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetRangeMin (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -685,7 +685,7 @@ TRACKBAR_GetRangeMin (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetSelEnd (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetSelEnd (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -694,7 +694,7 @@ TRACKBAR_GetSelEnd (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetSelStart (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetSelStart (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -703,7 +703,7 @@ TRACKBAR_GetSelStart (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetThumbLength (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetThumbLength (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -719,10 +719,10 @@ TRACKBAR_GetPTics (WND *wndPtr)
 }
 
 static LRESULT
-TRACKBAR_GetThumbRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetThumbRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-    LPRECT32 lprc = (LPRECT32)lParam;
+    LPRECT lprc = (LPRECT)lParam;
     
     if (lprc == NULL)
    		return 0; 
@@ -740,13 +740,13 @@ TRACKBAR_GetThumbRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetTic (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetTic (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
  TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
- INT32 iTic;
+ INT iTic;
 
- iTic=(INT32) wParam;
+ iTic=(INT) wParam;
  if ((iTic<0) || (iTic>infoPtr->uNumTics)) 
 	return -1;
 
@@ -756,14 +756,14 @@ TRACKBAR_GetTic (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_GetTicPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetTicPos (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
  TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
- INT32 iTic, range, width, pos;
+ INT iTic, range, width, pos;
  
 
- iTic=(INT32 ) wParam;
+ iTic=(INT ) wParam;
  if ((iTic<0) || (iTic>infoPtr->uNumTics)) 
 	return -1;
 
@@ -776,7 +776,7 @@ TRACKBAR_GetTicPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TRACKBAR_GetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_GetToolTips (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -790,22 +790,22 @@ TRACKBAR_GetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_SetBuddy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetBuddy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-    HWND32 hwndTemp;
+    HWND hwndTemp;
 
     if (wParam) {
 	/* buddy is left or above */
 	hwndTemp = infoPtr->hwndBuddyLA;
-	infoPtr->hwndBuddyLA = (HWND32)lParam;
+	infoPtr->hwndBuddyLA = (HWND)lParam;
 
 	FIXME (trackbar, "move buddy!\n");
     }
     else {
 		/* buddy is right or below */
 		hwndTemp = infoPtr->hwndBuddyRB;
-		infoPtr->hwndBuddyRB = (HWND32)lParam;
+		infoPtr->hwndBuddyRB = (HWND)lParam;
 
 		FIXME (trackbar, "move buddy!\n");
     }
@@ -817,35 +817,35 @@ TRACKBAR_SetBuddy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_SetLineSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetLineSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-    INT32 nTemp = infoPtr->nLineSize;
+    INT nTemp = infoPtr->nLineSize;
 
-    infoPtr->nLineSize = (INT32)lParam;
+    infoPtr->nLineSize = (INT)lParam;
 
     return nTemp;
 }
 
 
 static LRESULT
-TRACKBAR_SetPageSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetPageSize (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-    INT32 nTemp = infoPtr->nPageSize;
+    INT nTemp = infoPtr->nPageSize;
 
-    infoPtr->nPageSize = (INT32)lParam;
+    infoPtr->nPageSize = (INT)lParam;
 
     return nTemp;
 }
 
 
 static LRESULT
-TRACKBAR_SetPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetPos (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
-    infoPtr->nPos = (INT32)HIWORD(lParam);
+    infoPtr->nPos = (INT)HIWORD(lParam);
 
     if (infoPtr->nPos < infoPtr->nRangeMin)
 	infoPtr->nPos = infoPtr->nRangeMin;
@@ -855,9 +855,9 @@ TRACKBAR_SetPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	infoPtr->flags |=TB_THUMBPOSCHANGED;
 
     if (wParam) {
-		HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+		HDC hdc = GetDC (wndPtr->hwndSelf);
 		TRACKBAR_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -865,11 +865,11 @@ TRACKBAR_SetPos (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_SetRange (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetRange (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-    infoPtr->nRangeMin = (INT32)LOWORD(lParam);
-    infoPtr->nRangeMax = (INT32)HIWORD(lParam);
+    infoPtr->nRangeMin = (INT)LOWORD(lParam);
+    infoPtr->nRangeMax = (INT)HIWORD(lParam);
 
     if (infoPtr->nPos < infoPtr->nRangeMin) {
 		infoPtr->nPos = infoPtr->nRangeMin;
@@ -885,9 +885,9 @@ TRACKBAR_SetRange (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	TRACKBAR_RecalculateTics (infoPtr);
 
     if (wParam) {
-		HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+		HDC hdc = GetDC (wndPtr->hwndSelf);
 		TRACKBAR_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -895,11 +895,11 @@ TRACKBAR_SetRange (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_SetRangeMax (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetRangeMax (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
-    infoPtr->nRangeMax = (INT32)lParam;
+    infoPtr->nRangeMax = (INT)lParam;
     if (infoPtr->nPos > infoPtr->nRangeMax) {
 		infoPtr->nPos = infoPtr->nRangeMax;
 		infoPtr->flags |=TB_THUMBPOSCHANGED;
@@ -909,9 +909,9 @@ TRACKBAR_SetRangeMax (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	TRACKBAR_RecalculateTics (infoPtr);
 
     if (wParam) {
-		HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+		HDC hdc = GetDC (wndPtr->hwndSelf);
 		TRACKBAR_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -919,11 +919,11 @@ TRACKBAR_SetRangeMax (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_SetRangeMin (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetRangeMin (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
-    infoPtr->nRangeMin = (INT32)lParam;
+    infoPtr->nRangeMin = (INT)lParam;
     if (infoPtr->nPos < infoPtr->nRangeMin) {
 		infoPtr->nPos = infoPtr->nRangeMin;
 		infoPtr->flags |=TB_THUMBPOSCHANGED;
@@ -933,39 +933,39 @@ TRACKBAR_SetRangeMin (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	TRACKBAR_RecalculateTics (infoPtr);
 
     if (wParam) {
-		HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+		HDC hdc = GetDC (wndPtr->hwndSelf);
 		TRACKBAR_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
 }
 
 static LRESULT
-TRACKBAR_SetTicFreq (WND *wndPtr, WPARAM32 wParam)
+TRACKBAR_SetTicFreq (WND *wndPtr, WPARAM wParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-	HDC32 hdc;
+	HDC hdc;
 	
     if (wndPtr->dwStyle & TBS_AUTOTICKS) 
-           	infoPtr->uTicFreq=(UINT32) wParam; 
+           	infoPtr->uTicFreq=(UINT) wParam; 
 	
 	TRACKBAR_RecalculateTics (infoPtr);
 
-	hdc = GetDC32 (wndPtr->hwndSelf);
+	hdc = GetDC (wndPtr->hwndSelf);
     TRACKBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 	return 0;
 }   
 
 
 static LRESULT
-TRACKBAR_SetSel (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetSel (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
-    infoPtr->nSelMin = (INT32)LOWORD(lParam);
-    infoPtr->nSelMax = (INT32)HIWORD(lParam);
+    infoPtr->nSelMin = (INT)LOWORD(lParam);
+    infoPtr->nSelMax = (INT)HIWORD(lParam);
 	infoPtr->flags |=TB_SELECTIONCHANGED;
 
     if (!wndPtr->dwStyle & TBS_ENABLESELRANGE)
@@ -977,9 +977,9 @@ TRACKBAR_SetSel (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		infoPtr->nSelMax = infoPtr->nRangeMax;
 
     if (wParam) {
-		HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+		HDC hdc = GetDC (wndPtr->hwndSelf);
 		TRACKBAR_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -987,23 +987,23 @@ TRACKBAR_SetSel (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_SetSelEnd (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetSelEnd (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
     if (!wndPtr->dwStyle & TBS_ENABLESELRANGE)
 	return 0;
 
-    infoPtr->nSelMax = (INT32)lParam;
+    infoPtr->nSelMax = (INT)lParam;
 	infoPtr->flags  |=TB_SELECTIONCHANGED;
 	
     if (infoPtr->nSelMax > infoPtr->nRangeMax)
 		infoPtr->nSelMax = infoPtr->nRangeMax;
 
     if (wParam) {
-		HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+		HDC hdc = GetDC (wndPtr->hwndSelf);
 		TRACKBAR_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -1011,22 +1011,22 @@ TRACKBAR_SetSelEnd (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_SetSelStart (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetSelStart (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
     if (!wndPtr->dwStyle & TBS_ENABLESELRANGE)
 	return 0;
 
-    infoPtr->nSelMin = (INT32)lParam;
+    infoPtr->nSelMin = (INT)lParam;
 	infoPtr->flags  |=TB_SELECTIONCHANGED;
     if (infoPtr->nSelMin < infoPtr->nRangeMin)
 		infoPtr->nSelMin = infoPtr->nRangeMin;
 
     if (wParam) {
-		HDC32 hdc = GetDC32 (wndPtr->hwndSelf);
+		HDC hdc = GetDC (wndPtr->hwndSelf);
 		TRACKBAR_Refresh (wndPtr, hdc);
-		ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		ReleaseDC (wndPtr->hwndSelf, hdc);
     }
 
     return 0;
@@ -1034,29 +1034,29 @@ TRACKBAR_SetSelStart (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_SetThumbLength (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetThumbLength (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-	HDC32 hdc;
+	HDC hdc;
 
     if (wndPtr->dwStyle & TBS_FIXEDLENGTH)
-		infoPtr->uThumbLen = (UINT32)wParam;
+		infoPtr->uThumbLen = (UINT)wParam;
 
-	hdc = GetDC32 (wndPtr->hwndSelf);
+	hdc = GetDC (wndPtr->hwndSelf);
 	infoPtr->flags |=TB_THUMBSIZECHANGED;
 	TRACKBAR_Refresh (wndPtr, hdc);
-	ReleaseDC32 (wndPtr->hwndSelf, hdc);
+	ReleaseDC (wndPtr->hwndSelf, hdc);
 	
     return 0;
 }
 
 
 static LRESULT
-TRACKBAR_SetTic (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetTic (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-    INT32 nPos = (INT32)lParam;
-	HDC32 hdc;
+    INT nPos = (INT)lParam;
+	HDC hdc;
 
     if ((nPos < infoPtr->nRangeMin) || (nPos> infoPtr->nRangeMax))
 		return FALSE;
@@ -1066,9 +1066,9 @@ TRACKBAR_SetTic (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
                            (infoPtr->uNumTics)*sizeof (DWORD));
     infoPtr->tics[infoPtr->uNumTics-1]=nPos;
 
- 	hdc = GetDC32 (wndPtr->hwndSelf);
+ 	hdc = GetDC (wndPtr->hwndSelf);
     TRACKBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return TRUE;
 }
@@ -1077,23 +1077,23 @@ TRACKBAR_SetTic (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_SetTipSide (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetTipSide (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-    INT32 fTemp = infoPtr->fLocation;
+    INT fTemp = infoPtr->fLocation;
 
-    infoPtr->fLocation = (INT32)wParam;
+    infoPtr->fLocation = (INT)wParam;
 	
     return fTemp;
 }
 
 
 static LRESULT
-TRACKBAR_SetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetToolTips (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
-    infoPtr->hwndToolTip = (HWND32)wParam;
+    infoPtr->hwndToolTip = (HWND)wParam;
 
     return 0;
 }
@@ -1118,7 +1118,7 @@ TRACKBAR_InitializeThumb (WND *wndPtr)
 
 
 static LRESULT
-TRACKBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr;
 
@@ -1137,18 +1137,18 @@ TRACKBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->uNumTics  = 0;    /* start and end tic are not included in count*/
 	infoPtr->uTicFreq  = 1;
 	infoPtr->tics	   = NULL;
-	infoPtr->clrBk	   = GetSysColor32 (COLOR_BACKGROUND);
-	infoPtr->hwndNotify = GetParent32 (wndPtr->hwndSelf);
+	infoPtr->clrBk	   = GetSysColor (COLOR_BACKGROUND);
+	infoPtr->hwndNotify = GetParent (wndPtr->hwndSelf);
 
 	TRACKBAR_InitializeThumb (wndPtr);
 
 	 if (wndPtr->dwStyle & TBS_TOOLTIPS) { /* Create tooltip control */
-		TTTOOLINFO32A ti;
+		TTTOOLINFOA ti;
 
     	infoPtr->hwndToolTip =
-        	CreateWindowEx32A (0, TOOLTIPS_CLASS32A, NULL, 0,
-                   CW_USEDEFAULT32, CW_USEDEFAULT32,
-                   CW_USEDEFAULT32, CW_USEDEFAULT32,
+        	CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+                   CW_USEDEFAULT, CW_USEDEFAULT,
+                   CW_USEDEFAULT, CW_USEDEFAULT,
                    wndPtr->hwndSelf, 0, 0, 0);
 
     /* Send NM_TOOLTIPSCREATED notification */
@@ -1160,19 +1160,19 @@ TRACKBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
         	nmttc.hdr.code = NM_TOOLTIPSCREATED;
         	nmttc.hwndToolTips = infoPtr->hwndToolTip;
 
-        	SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmttc);
+        	SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmttc);
     	}
 
-		ZeroMemory (&ti, sizeof(TTTOOLINFO32A));
-	 	ti.cbSize   = sizeof(TTTOOLINFO32A);
+		ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+	 	ti.cbSize   = sizeof(TTTOOLINFOA);
      	ti.uFlags   = TTF_IDISHWND | TTF_TRACK;
      	ti.hwnd     = wndPtr->hwndSelf;
         ti.uId      = 0;
         ti.lpszText = "Test"; /* LPSTR_TEXTCALLBACK */
-        SetRectEmpty32 (&ti.rect);
+        SetRectEmpty (&ti.rect);
 
-        SendMessage32A (infoPtr->hwndToolTip, TTM_ADDTOOL32A, 0, (LPARAM)&ti);
+        SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA, 0, (LPARAM)&ti);
 
 	}
     return 0;
@@ -1180,16 +1180,16 @@ TRACKBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_Destroy (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
 	if (infoPtr->flags & TB_REFRESH_TIMER_SET) 
-        KillTimer32 (wndPtr->hwndSelf, TB_REFRESH_TIMER);
+        KillTimer (wndPtr->hwndSelf, TB_REFRESH_TIMER);
 
 	 /* delete tooltip control */
     if (infoPtr->hwndToolTip)
-    	DestroyWindow32 (infoPtr->hwndToolTip);
+    	DestroyWindow (infoPtr->hwndToolTip);
 
     COMCTL32_Free (infoPtr);
     return 0;
@@ -1197,7 +1197,7 @@ TRACKBAR_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TRACKBAR_KillFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_KillFocus (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -1206,25 +1206,25 @@ TRACKBAR_KillFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->bFocus = FALSE;
 	infoPtr->flags &= ~TB_DRAG_MODE;
     TRACKBAR_QueueRefresh (wndPtr);
-    InvalidateRect32 (wndPtr->hwndSelf, NULL, TRUE);
+    InvalidateRect (wndPtr->hwndSelf, NULL, TRUE);
 
     return 0;
 }
 
 
 static LRESULT
-TRACKBAR_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_LButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 	int clickPlace,prevPos,clickPos,vertical;
 	
-    SetFocus32 (wndPtr->hwndSelf);
+    SetFocus (wndPtr->hwndSelf);
 
 	vertical=wndPtr->dwStyle & TBS_VERT;
 	if (vertical)
-		clickPlace=(INT32)HIWORD(lParam);
+		clickPlace=(INT)HIWORD(lParam);
 	else
-		clickPlace=(INT32)LOWORD(lParam);
+		clickPlace=(INT)LOWORD(lParam);
 
 	if ((vertical && 
 	     (clickPlace>infoPtr->rcThumb.top) && 
@@ -1234,21 +1234,21 @@ TRACKBAR_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		(clickPlace<infoPtr->rcThumb.right))) {
 		infoPtr->flags |= TB_DRAG_MODE;
 	 	if (wndPtr->dwStyle & TBS_TOOLTIPS) {  /* enable tooltip */
-        	TTTOOLINFO32A ti;
-        	POINT32 pt;
+        	TTTOOLINFOA ti;
+        	POINT pt;
 
-        	GetCursorPos32 (&pt);
-        	SendMessage32A (infoPtr->hwndToolTip, TTM_TRACKPOSITION, 0,
+        	GetCursorPos (&pt);
+        	SendMessageA (infoPtr->hwndToolTip, TTM_TRACKPOSITION, 0,
                              (LPARAM)MAKELPARAM(pt.x, pt.y));
 
-        	ti.cbSize   = sizeof(TTTOOLINFO32A);
+        	ti.cbSize   = sizeof(TTTOOLINFOA);
         	ti.uId      = 0;
-        	ti.hwnd     = (UINT32)wndPtr->hwndSelf;
+        	ti.hwnd     = (UINT)wndPtr->hwndSelf;
 
         	infoPtr->flags |= TB_SHOW_TOOLTIP;
-        	SetCapture32 (wndPtr->hwndSelf);
-        	SendMessage32A (infoPtr->hwndToolTip, TTM_TRACKACTIVATE, 
-						(WPARAM32)TRUE, (LPARAM)&ti);
+        	SetCapture (wndPtr->hwndSelf);
+        	SendMessageA (infoPtr->hwndToolTip, TTM_TRACKACTIVATE, 
+						(WPARAM)TRUE, (LPARAM)&ti);
 	 	}
 		return 0;
 	}
@@ -1277,7 +1277,7 @@ TRACKBAR_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TRACKBAR_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_LButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -1287,23 +1287,23 @@ TRACKBAR_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	infoPtr->flags &= ~TB_DRAG_MODE;
 
     if (wndPtr->dwStyle & TBS_TOOLTIPS) {  /* disable tooltip */
-    	TTTOOLINFO32A ti;
+    	TTTOOLINFOA ti;
 
-        ti.cbSize   = sizeof(TTTOOLINFO32A);
+        ti.cbSize   = sizeof(TTTOOLINFOA);
         ti.uId      = 0;
-        ti.hwnd     = (UINT32)wndPtr->hwndSelf;
+        ti.hwnd     = (UINT)wndPtr->hwndSelf;
 
         infoPtr->flags &= ~TB_SHOW_TOOLTIP;
         ReleaseCapture ();
-        SendMessage32A (infoPtr->hwndToolTip, TTM_TRACKACTIVATE,
-                         (WPARAM32)FALSE, (LPARAM)&ti);
+        SendMessageA (infoPtr->hwndToolTip, TTM_TRACKACTIVATE,
+                         (WPARAM)FALSE, (LPARAM)&ti);
 	}
 
     return 0;
 }
 
 static LRESULT
-TRACKBAR_CaptureChanged (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_CaptureChanged (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 	
@@ -1319,38 +1319,38 @@ TRACKBAR_CaptureChanged (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TRACKBAR_Paint (WND *wndPtr, WPARAM32 wParam)
+TRACKBAR_Paint (WND *wndPtr, WPARAM wParam)
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
+    HDC hdc;
+    PAINTSTRUCT ps;
 
-    hdc = wParam==0 ? BeginPaint32 (wndPtr->hwndSelf, &ps) : (HDC32)wParam;
+    hdc = wParam==0 ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam;
     TRACKBAR_Refresh (wndPtr, hdc);
     if(!wParam)
-	EndPaint32 (wndPtr->hwndSelf, &ps);
+	EndPaint (wndPtr->hwndSelf, &ps);
     return 0;
 }
 
 
 static LRESULT
-TRACKBAR_SetFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_SetFocus (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-    HDC32 hdc;
+    HDC hdc;
 
 	TRACE (trackbar,"\n");
     infoPtr->bFocus = TRUE;
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TRACKBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return 0;
 }
 
 
 static LRESULT
-TRACKBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
 
@@ -1362,35 +1362,35 @@ TRACKBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 
-static BOOL32
-TRACKBAR_SendNotify (WND *wndPtr, UINT32 code)
+static BOOL
+TRACKBAR_SendNotify (WND *wndPtr, UINT code)
 
 {
     TRACE (trackbar, "%x\n",code);
 	if (wndPtr->dwStyle & TBS_VERT) 
-    	return (BOOL32) SendMessage32A (GetParent32 (wndPtr->hwndSelf), 
-						WM_VSCROLL, (WPARAM32)code, (LPARAM) wndPtr->hwndSelf);
+    	return (BOOL) SendMessageA (GetParent (wndPtr->hwndSelf), 
+						WM_VSCROLL, (WPARAM)code, (LPARAM) wndPtr->hwndSelf);
 
-   	return (BOOL32) SendMessage32A (GetParent32 (wndPtr->hwndSelf), 
-						WM_HSCROLL, (WPARAM32)code, (LPARAM) wndPtr->hwndSelf);
+   	return (BOOL) SendMessageA (GetParent (wndPtr->hwndSelf), 
+						WM_HSCROLL, (WPARAM)code, (LPARAM) wndPtr->hwndSelf);
 	return 0;
 }
 
 static LRESULT
-TRACKBAR_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_MouseMove (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-	INT32 clickPlace,vertical;
-	HDC32 hdc;
+	INT clickPlace,vertical;
+	HDC hdc;
 	char buf[80];
 			
     TRACE (trackbar, "%x\n",wParam);
 
 	vertical=wndPtr->dwStyle & TBS_VERT;
 	if (vertical)
-		clickPlace=(INT32)HIWORD(lParam);
+		clickPlace=(INT)HIWORD(lParam);
 	else
-		clickPlace=(INT32)LOWORD(lParam);
+		clickPlace=(INT)LOWORD(lParam);
 
 	if (!(infoPtr->flags & TB_DRAG_MODE)) return TRUE;
 
@@ -1399,41 +1399,41 @@ TRACKBAR_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	TRACKBAR_SendNotify (wndPtr, TB_THUMBTRACK | (infoPtr->nPos>>16));
 
     if (infoPtr->flags & TB_SHOW_TOOLTIP) {
-		POINT32 pt;
-    	TTTOOLINFO32A ti;
+		POINT pt;
+    	TTTOOLINFOA ti;
 	
-    	ti.cbSize = sizeof(TTTOOLINFO32A);
+    	ti.cbSize = sizeof(TTTOOLINFOA);
     	ti.hwnd = wndPtr->hwndSelf;
     	ti.uId = 0;
 		ti.hinst=0;
 		sprintf (buf,"%d",infoPtr->nPos);
     	ti.lpszText = (LPSTR) buf;
-		GetCursorPos32 (&pt);
+		GetCursorPos (&pt);
 		
 		if (vertical) {
-        	SendMessage32A (infoPtr->hwndToolTip, TTM_TRACKPOSITION, 
+        	SendMessageA (infoPtr->hwndToolTip, TTM_TRACKPOSITION, 
 							0, (LPARAM)MAKELPARAM(pt.x+5, pt.y+15));
 		} else {
-        	SendMessage32A (infoPtr->hwndToolTip, TTM_TRACKPOSITION, 
+        	SendMessageA (infoPtr->hwndToolTip, TTM_TRACKPOSITION, 
 							0, (LPARAM)MAKELPARAM(pt.x+15, pt.y+5));
 		}
-    	SendMessage32A (infoPtr->hwndToolTip, TTM_UPDATETIPTEXT32A,
+    	SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA,
             0, (LPARAM)&ti);
 	}
 
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     TRACKBAR_Refresh (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
  	return TRUE;
 }
 
 
 static LRESULT
-TRACKBAR_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_KeyDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
-	INT32 pos;
+	INT pos;
 
     TRACE (trackbar, "%x\n",wParam);
 
@@ -1490,7 +1490,7 @@ TRACKBAR_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TRACKBAR_KeyUp (WND *wndPtr, WPARAM32 wParam)
+TRACKBAR_KeyUp (WND *wndPtr, WPARAM wParam)
 {
 	switch (wParam) {
 		case VK_LEFT:
@@ -1507,24 +1507,24 @@ TRACKBAR_KeyUp (WND *wndPtr, WPARAM32 wParam)
 
 
 static LRESULT 
-TRACKBAR_HandleTimer ( WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_HandleTimer ( WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(wndPtr);
- HDC32 hdc;
+ HDC hdc;
 
  TRACE (trackbar,"timer\n");
 
  switch (wParam) {
 	case TB_REFRESH_TIMER: 
-		KillTimer32 (wndPtr->hwndSelf, TB_REFRESH_TIMER );
+		KillTimer (wndPtr->hwndSelf, TB_REFRESH_TIMER );
 		if (infoPtr->flags & TB_DRAGPOSVALID)  {
 			infoPtr->nPos=infoPtr->dragPos;
 			infoPtr->flags |= TB_THUMBPOSCHANGED;
 		}
 		infoPtr->flags &= ~ (TB_REFRESH_TIMER_SET | TB_DRAGPOSVALID);
-        hdc=GetDC32 (wndPtr->hwndSelf);
+        hdc=GetDC (wndPtr->hwndSelf);
         TRACKBAR_Refresh (wndPtr, hdc);
-        ReleaseDC32 (wndPtr->hwndSelf, hdc);
+        ReleaseDC (wndPtr->hwndSelf, hdc);
 		return 0;
 	}
  return 1;
@@ -1532,7 +1532,7 @@ TRACKBAR_HandleTimer ( WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
      WND *wndPtr = WIN_FindWndPtr(hwnd);
 
@@ -1699,7 +1699,7 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 		if (uMsg >= WM_USER)
 		ERR (trackbar, "unknown msg %04x wp=%08x lp=%08lx\n",
 		     uMsg, wParam, lParam);
-	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
 }
@@ -1708,27 +1708,27 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 TRACKBAR_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if (GlobalFindAtom32A (TRACKBAR_CLASS32A)) return;
+    if (GlobalFindAtomA (TRACKBAR_CLASSA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC32)TRACKBAR_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)TRACKBAR_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(TRACKBAR_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_3DFACE + 1);
-    wndClass.lpszClassName = TRACKBAR_CLASS32A;
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
+    wndClass.lpszClassName = TRACKBAR_CLASSA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 TRACKBAR_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (TRACKBAR_CLASS32A))
-	UnregisterClass32A (TRACKBAR_CLASS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (TRACKBAR_CLASSA))
+	UnregisterClassA (TRACKBAR_CLASSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 63d28337405..82d6c10fd97 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -56,30 +56,30 @@
 
 #define TREEVIEW_GetInfoPtr(wndPtr) ((TREEVIEW_INFO *)wndPtr->wExtra[0])
 
-static BOOL32
-TREEVIEW_SendSimpleNotify (WND *wndPtr, UINT32 code);
-static BOOL32
-TREEVIEW_SendTreeviewNotify (WND *wndPtr, UINT32 code, UINT32 action, 
+static BOOL
+TREEVIEW_SendSimpleNotify (WND *wndPtr, UINT code);
+static BOOL
+TREEVIEW_SendTreeviewNotify (WND *wndPtr, UINT code, UINT action, 
 			HTREEITEM oldItem, HTREEITEM newItem);
-static BOOL32
-TREEVIEW_SendTreeviewDnDNotify (WND *wndPtr, UINT32 code, HTREEITEM dragItem, 
-			POINT32 pt);
-static BOOL32
+static BOOL
+TREEVIEW_SendTreeviewDnDNotify (WND *wndPtr, UINT code, HTREEITEM dragItem, 
+			POINT pt);
+static BOOL
 TREEVIEW_SendDispInfoNotify (WND *wndPtr, TREEVIEW_ITEM *wineItem, 
-			UINT32 code, UINT32 what);
-static BOOL32
-TREEVIEW_SendCustomDrawNotify (WND *wndPtr, DWORD dwDrawStage, HDC32 hdc,
-			RECT32 rc);
-static BOOL32
-TREEVIEW_SendCustomDrawItemNotify (WND *wndPtr, HDC32 hdc,
-            TREEVIEW_ITEM *tvItem, UINT32 uItemDrawState);
+			UINT code, UINT what);
+static BOOL
+TREEVIEW_SendCustomDrawNotify (WND *wndPtr, DWORD dwDrawStage, HDC hdc,
+			RECT rc);
+static BOOL
+TREEVIEW_SendCustomDrawItemNotify (WND *wndPtr, HDC hdc,
+            TREEVIEW_ITEM *tvItem, UINT uItemDrawState);
 static LRESULT
-TREEVIEW_DoSelectItem (WND *wndPtr, INT32 action, HTREEITEM newSelect, INT32 cause);
+TREEVIEW_DoSelectItem (WND *wndPtr, INT action, HTREEITEM newSelect, INT cause);
 static void
 TREEVIEW_Refresh (WND *wndPtr);
 
 static LRESULT CALLBACK
-TREEVIEW_Edit_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, 
+TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, 
 							LPARAM lParam);
 
 
@@ -103,9 +103,9 @@ TREEVIEW_ValidItem (TREEVIEW_INFO *infoPtr,HTREEITEM  handle)
 {
  
  if ((!handle) || (handle>infoPtr->uMaxHandle)) return NULL;
- if (tv_test_bit ((INT32)handle, infoPtr->freeList)) return NULL;
+ if (tv_test_bit ((INT)handle, infoPtr->freeList)) return NULL;
 
- return & infoPtr->items[(INT32)handle];
+ return & infoPtr->items[(INT)handle];
 }
 
 
@@ -117,20 +117,20 @@ static TREEVIEW_ITEM *TREEVIEW_GetPrevListItem (TREEVIEW_INFO *infoPtr,
  TREEVIEW_ITEM *wineItem;
 
  if (tvItem->upsibling) {
-		wineItem=& infoPtr->items[(INT32)tvItem->upsibling];
+		wineItem=& infoPtr->items[(INT)tvItem->upsibling];
 		if ((wineItem->firstChild) && (wineItem->state & TVIS_EXPANDED)) {
-			wineItem=& infoPtr->items[(INT32)wineItem->firstChild];
+			wineItem=& infoPtr->items[(INT)wineItem->firstChild];
 			while (wineItem->sibling)
-				 wineItem= & infoPtr->items[(INT32)wineItem->sibling];
+				 wineItem= & infoPtr->items[(INT)wineItem->sibling];
 		}
 		return wineItem;
  }
 
  wineItem=tvItem;
  while (wineItem->parent) {
-	wineItem=& infoPtr->items[(INT32)wineItem->parent];
+	wineItem=& infoPtr->items[(INT)wineItem->parent];
 	if (wineItem->upsibling) 
-                return (& infoPtr->items[(INT32)wineItem->upsibling]);
+                return (& infoPtr->items[(INT)wineItem->upsibling]);
  } 
 
  return wineItem;
@@ -144,17 +144,17 @@ static TREEVIEW_ITEM *TREEVIEW_GetNextListItem (TREEVIEW_INFO *infoPtr,
  TREEVIEW_ITEM *wineItem;
 
   if ((tvItem->firstChild) && (tvItem->state & TVIS_EXPANDED)) 
-		return (& infoPtr->items[(INT32)tvItem->firstChild]);
+		return (& infoPtr->items[(INT)tvItem->firstChild]);
 
 
  if (tvItem->sibling) 
-		return (& infoPtr->items[(INT32)tvItem->sibling]);
+		return (& infoPtr->items[(INT)tvItem->sibling]);
 
  wineItem=tvItem;
  while (wineItem->parent) {
-	wineItem=& infoPtr->items [(INT32)wineItem->parent];
+	wineItem=& infoPtr->items [(INT)wineItem->parent];
 	if (wineItem->sibling) 
-                return (& infoPtr->items [(INT32)wineItem->sibling]);
+                return (& infoPtr->items [(INT)wineItem->sibling]);
  } 
 
  return NULL;  /* was wineItem */
@@ -168,7 +168,7 @@ static TREEVIEW_ITEM *TREEVIEW_GetLastListItem (TREEVIEW_INFO *infoPtr,
 
  wineItem=tvItem;
  while (wineItem->sibling) 
-	wineItem=& infoPtr->items [(INT32)wineItem->sibling];
+	wineItem=& infoPtr->items [(INT)wineItem->sibling];
 
  return wineItem;
 }
@@ -180,18 +180,18 @@ static void TREEVIEW_RemoveAllChildren (WND *wndPtr,
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  TREEVIEW_ITEM *killItem;
- INT32	kill;
+ INT	kill;
  
- kill=(INT32)parentItem->firstChild;
+ kill=(INT)parentItem->firstChild;
  while (kill) {
  	tv_set_bit ( kill, infoPtr->freeList);
  	killItem=& infoPtr->items[kill];
-	if (killItem->pszText!=LPSTR_TEXTCALLBACK32A) 
+	if (killItem->pszText!=LPSTR_TEXTCALLBACKA) 
 		COMCTL32_Free (killItem->pszText);
  	TREEVIEW_SendTreeviewNotify (wndPtr, TVN_DELETEITEM, 0, (HTREEITEM)kill, 0);
 	if (killItem->firstChild) 
 			TREEVIEW_RemoveAllChildren (wndPtr, killItem);
-	kill=(INT32)killItem->sibling;
+	kill=(INT)killItem->sibling;
  }
 
  if (parentItem->cChildren>0) {
@@ -209,13 +209,13 @@ TREEVIEW_RemoveItem (WND *wndPtr, TREEVIEW_ITEM *wineItem)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  TREEVIEW_ITEM *parentItem, *upsiblingItem, *siblingItem;
- INT32 iItem;
+ INT iItem;
 
- iItem=(INT32)wineItem->hItem;
+ iItem=(INT)wineItem->hItem;
  tv_set_bit(iItem,infoPtr->freeList);
  infoPtr->uNumItems--;
  parentItem=NULL;
- if (wineItem->pszText!=LPSTR_TEXTCALLBACK32A) 
+ if (wineItem->pszText!=LPSTR_TEXTCALLBACKA) 
 	COMCTL32_Free (wineItem->pszText);
 
  TREEVIEW_SendTreeviewNotify (wndPtr, TVN_DELETEITEM, 0, (HTREEITEM)iItem, 0);
@@ -224,7 +224,7 @@ TREEVIEW_RemoveItem (WND *wndPtr, TREEVIEW_ITEM *wineItem)
  	TREEVIEW_RemoveAllChildren (wndPtr,wineItem);
 
  if (wineItem->parent) {
-	parentItem=& infoPtr->items [(INT32)wineItem->parent];
+	parentItem=& infoPtr->items [(INT)wineItem->parent];
 	switch (parentItem->cChildren) {
 		case I_CHILDRENCALLBACK: 
 				FIXME (treeview,"we don't handle I_CHILDRENCALLBACK yet\n");
@@ -235,19 +235,19 @@ TREEVIEW_RemoveItem (WND *wndPtr, TREEVIEW_ITEM *wineItem)
 			return;
 		default:
 			parentItem->cChildren--;
-			if ((INT32)parentItem->firstChild==iItem) 
+			if ((INT)parentItem->firstChild==iItem) 
 				parentItem->firstChild=wineItem->sibling;
 		}
  }
 
- if (iItem==(INT32)infoPtr->TopRootItem) 
+ if (iItem==(INT)infoPtr->TopRootItem) 
 	infoPtr->TopRootItem=(HTREEITEM)wineItem->sibling;
  if (wineItem->upsibling) {
-	upsiblingItem=& infoPtr->items [(INT32)wineItem->upsibling];
+	upsiblingItem=& infoPtr->items [(INT)wineItem->upsibling];
 	upsiblingItem->sibling=wineItem->sibling;
  }
  if (wineItem->sibling) {
-	siblingItem=& infoPtr->items [(INT32)wineItem->sibling];
+	siblingItem=& infoPtr->items [(INT)wineItem->sibling];
 	siblingItem->upsibling=wineItem->upsibling;
  }
 }
@@ -265,10 +265,10 @@ static void TREEVIEW_RemoveTree (WND *wndPtr)
  TREEVIEW_ITEM *killItem;
  int i;
 
- for (i=1; i<=(INT32)infoPtr->uMaxHandle; i++) 
+ for (i=1; i<=(INT)infoPtr->uMaxHandle; i++) 
 	if (!tv_test_bit (i, infoPtr->freeList)) {
 		killItem=& infoPtr->items [i];	
-		if (killItem->pszText!=LPSTR_TEXTCALLBACK32A)
+		if (killItem->pszText!=LPSTR_TEXTCALLBACKA)
 			COMCTL32_Free (killItem->pszText);
 		TREEVIEW_SendTreeviewNotify 
 					(wndPtr, TVN_DELETEITEM, 0, killItem->hItem, 0);
@@ -290,29 +290,29 @@ static void TREEVIEW_RemoveTree (WND *wndPtr)
 
 
 static LRESULT
-TREEVIEW_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_GetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
 
   TRACE (treeview,"\n");
   if (infoPtr==NULL) return 0;
 
-  if ((INT32)wParam == TVSIL_NORMAL) 
+  if ((INT)wParam == TVSIL_NORMAL) 
 	return (LRESULT) infoPtr->himlNormal;
-  if ((INT32)wParam == TVSIL_STATE) 
+  if ((INT)wParam == TVSIL_STATE) 
 	return (LRESULT) infoPtr->himlState;
 
   return 0;
 }
 
 static LRESULT
-TREEVIEW_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_SetImageList (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
     HIMAGELIST himlTemp;
 
     TRACE (treeview,"\n");
-    switch ((INT32)wParam) {
+    switch ((INT)wParam) {
 	case TVSIL_NORMAL:
 	    himlTemp = infoPtr->himlNormal;
 	    infoPtr->himlNormal = (HIMAGELIST)lParam;
@@ -330,15 +330,15 @@ TREEVIEW_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_SetItemHeight (WND *wndPtr, WPARAM32 wParam)
+TREEVIEW_SetItemHeight (WND *wndPtr, WPARAM wParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  INT32 cx,cy,prevHeight=infoPtr->uItemHeight;
-  HDC32 hdc;
+  INT cx,cy,prevHeight=infoPtr->uItemHeight;
+  HDC hdc;
 
   TRACE (treeview,"\n");
   if (wParam==-1) {
-	hdc=GetDC32 (wndPtr->hwndSelf);
+	hdc=GetDC (wndPtr->hwndSelf);
 	infoPtr->uItemHeight=-1;
 	return prevHeight;
   }
@@ -349,7 +349,7 @@ TREEVIEW_SetItemHeight (WND *wndPtr, WPARAM32 wParam)
   infoPtr->uItemHeight=cy;
 
   if (!(wndPtr->dwStyle & TVS_NONEVENHEIGHT))
-	infoPtr->uItemHeight = (INT32) wParam & 0xfffffffe;
+	infoPtr->uItemHeight = (INT) wParam & 0xfffffffe;
   return prevHeight;
 }
 
@@ -363,7 +363,7 @@ TREEVIEW_GetItemHeight (WND *wndPtr)
 }
   
 static LRESULT
-TREEVIEW_SetTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_SetTextColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
   COLORREF prevColor=infoPtr->clrText;
@@ -383,7 +383,7 @@ TREEVIEW_GetBkColor (WND *wndPtr)
 }
 
 static LRESULT
-TREEVIEW_SetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_SetBkColor (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
   COLORREF prevColor=infoPtr->clrBk;
@@ -413,24 +413,24 @@ TREEVIEW_GetTextColor (WND *wndPtr)
            notification */
 
 static void
-TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem)
+TREEVIEW_DrawItem (WND *wndPtr, HDC hdc, TREEVIEW_ITEM *wineItem)
 
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  INT32  oldBkMode,center,xpos,cx,cy, cditem, drawmode;
+  INT  oldBkMode,center,xpos,cx,cy, cditem, drawmode;
   TREEVIEW_ITEM *parentItem;
   COLORREF oldBkColor;
-  HFONT32 hOldFont;
-  UINT32 uTextJustify = DT_LEFT;
-  HPEN32 hOldPen, hnewPen;
-  RECT32 r,upper;
+  HFONT hOldFont;
+  UINT uTextJustify = DT_LEFT;
+  HPEN hOldPen, hnewPen;
+  RECT r,upper;
 
   HIMAGELIST *himlp;
   
   if (wineItem->state & TVIS_BOLD) 
-  	hOldFont = SelectObject32 (hdc, infoPtr->hBoldFont);
+  	hOldFont = SelectObject (hdc, infoPtr->hBoldFont);
   else 
-  	hOldFont = SelectObject32 (hdc, infoPtr->hFont);
+  	hOldFont = SelectObject (hdc, infoPtr->hFont);
 
   cditem=0;
   if (infoPtr->cdmode & CDRF_NOTIFYITEMDRAW) {
@@ -443,8 +443,8 @@ TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem)
 	}
  
   
-  hnewPen = CreatePen32(PS_DOT, 0, GetSysColor32(COLOR_WINDOWTEXT) );
-  hOldPen = SelectObject32( hdc, hnewPen );
+  hnewPen = CreatePen(PS_DOT, 0, GetSysColor(COLOR_WINDOWTEXT) );
+  hOldPen = SelectObject( hdc, hnewPen );
  
   r=wineItem->rect;
   if (wineItem->parent) {
@@ -459,7 +459,7 @@ TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem)
   xpos=r.left+8;
 
   if (wndPtr->dwStyle & TVS_HASLINES) {
-	POINT32 points[3];
+	POINT points[3];
 	if ((wndPtr->dwStyle & TVS_LINESATROOT) && (wineItem->iLevel==0)) {
 		points[0].y=points[1].y=center;
 		points[2].y=upper.top;
@@ -467,7 +467,7 @@ TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem)
 		points[0].x=upper.left+12;
 		points[2].y+=5;
 
- 		Polyline32 (hdc,points,3);
+ 		Polyline (hdc,points,3);
 	}
 	else {
 		points[0].y=points[1].y=center;
@@ -475,21 +475,21 @@ TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem)
                 points[1].x=points[2].x=upper.left+13;
                 points[0].x=upper.left+25;
                 points[2].y+=5;
- 		Polyline32 (hdc,points,3);
+ 		Polyline (hdc,points,3);
 	}
  }
 
-  DeleteObject32(hnewPen);
-  SelectObject32(hdc, hOldPen);
+  DeleteObject(hnewPen);
+  SelectObject(hdc, hOldPen);
 
   if ((wndPtr->dwStyle & TVS_HASBUTTONS) && (wndPtr->dwStyle & TVS_HASLINES) && 
 		(wineItem->cChildren)) {
-		Rectangle32 (hdc, xpos-4, center-4, xpos+5, center+5);
-		MoveToEx32 (hdc, xpos-2, center, NULL);
-		LineTo32   (hdc, xpos+3, center);
+		Rectangle (hdc, xpos-4, center-4, xpos+5, center+5);
+		MoveToEx (hdc, xpos-2, center, NULL);
+		LineTo   (hdc, xpos+3, center);
 		if (!(wineItem->state & TVIS_EXPANDED)) {
-			MoveToEx32 (hdc, xpos,   center-2, NULL);
-			LineTo32   (hdc, xpos,   center+3);
+			MoveToEx (hdc, xpos,   center-2, NULL);
+			LineTo   (hdc, xpos,   center+3);
 	}
    }
 
@@ -524,41 +524,41 @@ TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem)
   if ((wineItem->mask & TVIF_TEXT) && (wineItem->pszText)) {
 
 	    if (wineItem->state & (TVIS_SELECTED | TVIS_DROPHILITED) ) {
-           	oldBkMode = SetBkMode32(hdc, OPAQUE);
-			oldBkColor= SetBkColor32 (hdc, GetSysColor32( COLOR_HIGHLIGHT));
-			SetTextColor32 (hdc, GetSysColor32(COLOR_HIGHLIGHTTEXT));
+           	oldBkMode = SetBkMode(hdc, OPAQUE);
+			oldBkColor= SetBkColor (hdc, GetSysColor( COLOR_HIGHLIGHT));
+			SetTextColor (hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
 	    } else {
-            	oldBkMode = SetBkMode32(hdc, TRANSPARENT);
+            	oldBkMode = SetBkMode(hdc, TRANSPARENT);
 	    }
         r.left += 3;
         r.right -= 3;
 		wineItem->text.left=r.left;
 		wineItem->text.right=r.right;
 		if (infoPtr->clrText==-1)
-           	SetTextColor32 (hdc, COLOR_BTNTEXT);
+           	SetTextColor (hdc, COLOR_BTNTEXT);
 		else 
-			SetTextColor32 (hdc, infoPtr->clrText);  /* FIXME: setback retval */
+			SetTextColor (hdc, infoPtr->clrText);  /* FIXME: setback retval */
 
-		if (wineItem->pszText== LPSTR_TEXTCALLBACK32A) {
+		if (wineItem->pszText== LPSTR_TEXTCALLBACKA) {
 			TRACE (treeview,"LPSTR_TEXTCALLBACK\n");
 			TREEVIEW_SendDispInfoNotify (wndPtr, wineItem, 
 											TVN_GETDISPINFO, TVIF_TEXT);
 		}
 
-       	DrawText32A (hdc, wineItem->pszText, lstrlen32A(wineItem->pszText), &r, 
+       	DrawTextA (hdc, wineItem->pszText, lstrlenA(wineItem->pszText), &r, 
 						uTextJustify|DT_VCENTER|DT_SINGLELINE);
 
         if (oldBkMode != TRANSPARENT)
-            SetBkMode32(hdc, oldBkMode);
+            SetBkMode(hdc, oldBkMode);
 	    if (wineItem->state & (TVIS_SELECTED | TVIS_DROPHILITED))
-			SetBkColor32 (hdc, oldBkColor);
+			SetBkColor (hdc, oldBkColor);
         }
 
   if (cditem & CDRF_NOTIFYPOSTPAINT)
 		TREEVIEW_SendCustomDrawItemNotify (wndPtr, hdc, wineItem, 
 											CDDS_ITEMPOSTPAINT);
 
-  SelectObject32 (hdc, hOldFont);
+  SelectObject (hdc, hOldFont);
 }
 
 
@@ -568,12 +568,12 @@ TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem)
 
 
 static LRESULT
-TREEVIEW_GetItemRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_GetItemRect (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
   TREEVIEW_ITEM *wineItem;
   HTREEITEM *iItem;
-  LPRECT32 lpRect;
+  LPRECT lpRect;
 
   TRACE (treeview,"\n");
   if (infoPtr==NULL) return FALSE;
@@ -585,13 +585,13 @@ TREEVIEW_GetItemRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
   wineItem = TREEVIEW_ValidItem (infoPtr, *iItem);
   if (!wineItem) return FALSE;
 
-  wineItem=& infoPtr->items[ (INT32)*iItem ];
+  wineItem=& infoPtr->items[ (INT)*iItem ];
   if (!wineItem->visible) return FALSE; 
 
-  lpRect = (LPRECT32)lParam;
+  lpRect = (LPRECT)lParam;
   if (lpRect == NULL) return FALSE;
 	
-  if ((INT32) wParam) {
+  if ((INT) wParam) {
   	lpRect->left	= wineItem->text.left;
 	lpRect->right	= wineItem->text.right;
 	lpRect->bottom	= wineItem->text.bottom;
@@ -611,7 +611,7 @@ TREEVIEW_GetItemRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_GetVisibleCount (WND *wndPtr,  WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_GetVisibleCount (WND *wndPtr,  WPARAM wParam, LPARAM lParam)
 
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
@@ -622,15 +622,15 @@ TREEVIEW_GetVisibleCount (WND *wndPtr,  WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_SetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
   TREEVIEW_ITEM *wineItem;
-  TVITEMEX32A *tvItem;
-  INT32 iItem,len;
+  TVITEMEXA *tvItem;
+  INT iItem,len;
 
-  tvItem=(LPTVITEMEX32A) lParam;
-  iItem=(INT32)tvItem->hItem;
+  tvItem=(LPTVITEMEXA) lParam;
+  iItem=(INT)tvItem->hItem;
   TRACE (treeview,"item %d,mask %x\n",iItem,tvItem->mask);
 
   wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)iItem);
@@ -662,17 +662,17 @@ TREEVIEW_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
   }
 
   if (tvItem->mask & TVIF_TEXT) {
-		if (tvItem->pszText!=LPSTR_TEXTCALLBACK32A) {
-        len=lstrlen32A (tvItem->pszText);
+		if (tvItem->pszText!=LPSTR_TEXTCALLBACKA) {
+        len=lstrlenA (tvItem->pszText);
         if (len>wineItem->cchTextMax) 
 			wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
-        lstrcpyn32A (wineItem->pszText, tvItem->pszText,len);
+        lstrcpynA (wineItem->pszText, tvItem->pszText,len);
 		} else {
 			if (wineItem->cchTextMax) {
 				COMCTL32_Free (wineItem->pszText);
 				wineItem->cchTextMax=0;
 			}
-		wineItem->pszText=LPSTR_TEXTCALLBACK32A;
+		wineItem->pszText=LPSTR_TEXTCALLBACKA;
 		}
    }
 
@@ -688,32 +688,32 @@ TREEVIEW_Refresh (WND *wndPtr)
 
 {
     TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-	TEXTMETRIC32A tm;
-	HBRUSH32 hbrBk;
-    RECT32 rect;
-	HDC32 hdc;
-    INT32 iItem, indent, x, y, cx, height, itemHeight;
-    INT32 viewtop,viewbottom,viewleft,viewright;
+	TEXTMETRICA tm;
+	HBRUSH hbrBk;
+    RECT rect;
+	HDC hdc;
+    INT iItem, indent, x, y, cx, height, itemHeight;
+    INT viewtop,viewbottom,viewleft,viewright;
     TREEVIEW_ITEM *wineItem, *prevItem;
 
     TRACE (treeview,"\n");
 
-	hdc=GetDC32 (wndPtr->hwndSelf);
+	hdc=GetDC (wndPtr->hwndSelf);
 
     if (infoPtr->Timer & TV_REFRESH_TIMER_SET) {
-		KillTimer32 (wndPtr->hwndSelf, TV_REFRESH_TIMER);
+		KillTimer (wndPtr->hwndSelf, TV_REFRESH_TIMER);
 		infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
     }
 
     
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
+    GetClientRect (wndPtr->hwndSelf, &rect);
     if ((rect.left-rect.right ==0) || (rect.top-rect.bottom==0)) return;
 
     infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify 
 						(wndPtr, CDDS_PREPAINT, hdc, rect);
 
 	if (infoPtr->cdmode==CDRF_SKIPDEFAULT) {
-		  ReleaseDC32 (wndPtr->hwndSelf, hdc);
+		  ReleaseDC (wndPtr->hwndSelf, hdc);
 		  return;
 	}
 
@@ -729,11 +729,11 @@ TREEVIEW_Refresh (WND *wndPtr)
 
     /* draw background */
     
-    hbrBk = GetSysColorBrush32 (COLOR_WINDOW);
-    FillRect32(hdc, &rect, hbrBk);
+    hbrBk = GetSysColorBrush (COLOR_WINDOW);
+    FillRect(hdc, &rect, hbrBk);
 
 
-    iItem=(INT32)infoPtr->TopRootItem;
+    iItem=(INT)infoPtr->TopRootItem;
     infoPtr->firstVisible=0;
     wineItem=NULL;
     indent=0;
@@ -749,7 +749,7 @@ TREEVIEW_Refresh (WND *wndPtr)
         if (infoPtr->uItemHeight>itemHeight)
 		    itemHeight=infoPtr->uItemHeight;
 
-	    GetTextMetrics32A (hdc, &tm);
+	    GetTextMetricsA (hdc, &tm);
  	    if ((tm.tmHeight + tm.tmExternalLeading) > itemHeight)
 		     itemHeight=tm.tmHeight + tm.tmExternalLeading;
 
@@ -797,20 +797,20 @@ TREEVIEW_Refresh (WND *wndPtr)
 		/* look up next item */
 	
 		if ((wineItem->firstChild) && (wineItem->state & TVIS_EXPANDED)) {
-			iItem=(INT32)wineItem->firstChild;
+			iItem=(INT)wineItem->firstChild;
 			indent++;
 			x+=infoPtr->uIndent;
 			if (x>infoPtr->uTotalWidth) 	
 				infoPtr->uTotalWidth=x;
 		}
 		else {
-			iItem=(INT32)wineItem->sibling;
+			iItem=(INT)wineItem->sibling;
 			while ((!iItem) && (indent>0)) {
 				indent--;
 				x-=infoPtr->uIndent;
 				prevItem=wineItem;
-				wineItem=&infoPtr->items[(INT32)wineItem->parent];
-				iItem=(INT32)wineItem->sibling;
+				wineItem=&infoPtr->items[(INT)wineItem->parent];
+				iItem=(INT)wineItem->sibling;
 			}
 		}
         y +=height;
@@ -822,15 +822,15 @@ TREEVIEW_Refresh (WND *wndPtr)
     infoPtr->uTotalHeight=y;
     if (y >= (viewbottom-viewtop)) {
  		if (!(infoPtr->uInternalStatus & TV_VSCROLL))
-			ShowScrollBar32 (wndPtr->hwndSelf, SB_VERT, TRUE);
+			ShowScrollBar (wndPtr->hwndSelf, SB_VERT, TRUE);
 		infoPtr->uInternalStatus |=TV_VSCROLL;
- 		SetScrollRange32 (wndPtr->hwndSelf, SB_VERT, 0, 
+ 		SetScrollRange (wndPtr->hwndSelf, SB_VERT, 0, 
 					y - infoPtr->uVisibleHeight, FALSE);
-		SetScrollPos32 (wndPtr->hwndSelf, SB_VERT, infoPtr->cy, TRUE);
+		SetScrollPos (wndPtr->hwndSelf, SB_VERT, infoPtr->cy, TRUE);
 	}
     else {
 		if (infoPtr->uInternalStatus & TV_VSCROLL) 
-			ShowScrollBar32 (wndPtr->hwndSelf, SB_VERT, FALSE);
+			ShowScrollBar (wndPtr->hwndSelf, SB_VERT, FALSE);
 		infoPtr->uInternalStatus &= ~TV_VSCROLL;
 	}
 
@@ -839,13 +839,13 @@ TREEVIEW_Refresh (WND *wndPtr)
     	infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify 
 								(wndPtr, CDDS_POSTPAINT, hdc, rect);
 
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
     TRACE (treeview,"done\n");
 }
 
 
 static LRESULT 
-TREEVIEW_HandleTimer ( WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_HandleTimer ( WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
 
@@ -854,12 +854,12 @@ TREEVIEW_HandleTimer ( WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
   switch (wParam) {
 	case TV_REFRESH_TIMER:
-		KillTimer32 (wndPtr->hwndSelf, TV_REFRESH_TIMER);
+		KillTimer (wndPtr->hwndSelf, TV_REFRESH_TIMER);
 		infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
-		SendMessage32A (wndPtr->hwndSelf, WM_PAINT, 0, 0);
+		SendMessageA (wndPtr->hwndSelf, WM_PAINT, 0, 0);
 		return 0;
 	case TV_EDIT_TIMER:
-		KillTimer32 (wndPtr->hwndSelf, TV_EDIT_TIMER);
+		KillTimer (wndPtr->hwndSelf, TV_EDIT_TIMER);
 		infoPtr->Timer &= ~TV_EDIT_TIMER_SET;
 		return 0;
 	default:
@@ -878,25 +878,25 @@ TREEVIEW_QueueRefresh (WND *wndPtr)
 
  TRACE (treeview,"\n");
  if (infoPtr->Timer & TV_REFRESH_TIMER_SET) {
-	KillTimer32 (wndPtr->hwndSelf, TV_REFRESH_TIMER);
+	KillTimer (wndPtr->hwndSelf, TV_REFRESH_TIMER);
  }
 
- SetTimer32 (wndPtr->hwndSelf, TV_REFRESH_TIMER, TV_REFRESH_DELAY, 0);
+ SetTimer (wndPtr->hwndSelf, TV_REFRESH_TIMER, TV_REFRESH_DELAY, 0);
  infoPtr->Timer|=TV_REFRESH_TIMER_SET;
 }
 
 
 
 static LRESULT
-TREEVIEW_GetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_GetItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  LPTVITEMEX32A    tvItem;
+  LPTVITEMEXA    tvItem;
   TREEVIEW_ITEM *wineItem;
-  INT32         iItem;
+  INT         iItem;
 
-  tvItem=(LPTVITEMEX32A) lParam;
-  iItem=(INT32)tvItem->hItem;
+  tvItem=(LPTVITEMEXA) lParam;
+  iItem=(INT)tvItem->hItem;
   TRACE (treeview,"item %d<%p>, txt %p, img %p, action %x\n", iItem,
 tvItem, tvItem->pszText, & tvItem->iImage, tvItem->mask);
 
@@ -935,12 +935,12 @@ tvItem, tvItem->pszText, & tvItem->iImage, tvItem->mask);
    }
 
    if (tvItem->mask & TVIF_TEXT) {
-	if (wineItem->pszText == LPSTR_TEXTCALLBACK32A) {
-	    tvItem->pszText = LPSTR_TEXTCALLBACK32A;  /* FIXME:send notification? */
+	if (wineItem->pszText == LPSTR_TEXTCALLBACKA) {
+	    tvItem->pszText = LPSTR_TEXTCALLBACKA;  /* FIXME:send notification? */
 		ERR (treeview," GetItem called with LPSTR_TEXTCALLBACK\n");
 	}
 	else if (wineItem->pszText) {
-	    lstrcpyn32A (tvItem->pszText, wineItem->pszText, tvItem->cchTextMax);
+	    lstrcpynA (tvItem->pszText, wineItem->pszText, tvItem->cchTextMax);
 	}
    }
 
@@ -952,30 +952,30 @@ tvItem, tvItem->pszText, & tvItem->iImage, tvItem->mask);
 /* FIXME: check implementation of TVGN_NEXT/TVGN_NEXTVISIBLE */
 
 static LRESULT
-TREEVIEW_GetNextItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_GetNextItem (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
   TREEVIEW_ITEM *wineItem, *returnItem;
-  INT32 iItem, retval, flag;
+  INT iItem, retval, flag;
 
 
   if (!infoPtr) return FALSE;
-  flag  = (INT32) wParam;
-  iItem = (INT32) lParam;
+  flag  = (INT) wParam;
+  iItem = (INT) lParam;
   retval=0;
   switch (flag) {
-	case TVGN_ROOT: retval=(INT32)infoPtr->TopRootItem;
+	case TVGN_ROOT: retval=(INT)infoPtr->TopRootItem;
 					break;
-	case TVGN_CARET:retval=(INT32)infoPtr->selectedItem;
+	case TVGN_CARET:retval=(INT)infoPtr->selectedItem;
 					break;
 	case TVGN_FIRSTVISIBLE: 
          			TREEVIEW_Refresh (wndPtr);       
 /* FIXME:we should only recalculate, not redraw */
-					retval=(INT32)infoPtr->firstVisible;
+					retval=(INT)infoPtr->firstVisible;
 					break;
 	case TVGN_DROPHILITE:
-					retval=(INT32)infoPtr->dropItem;
+					retval=(INT)infoPtr->dropItem;
 					break;
 	}
   if (retval) {
@@ -988,16 +988,16 @@ TREEVIEW_GetNextItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
   if (!wineItem) return FALSE;
 
   switch (flag)	{
-	case TVGN_NEXT: retval=(INT32)wineItem->sibling;
+	case TVGN_NEXT: retval=(INT)wineItem->sibling;
 					break;
 	case TVGN_PREVIOUS:	
-					retval=(INT32)wineItem->upsibling;
+					retval=(INT)wineItem->upsibling;
 					break;
 	case TVGN_PARENT:
-					retval=(INT32)wineItem->parent;
+					retval=(INT)wineItem->parent;
 					break;
 	case TVGN_CHILD:
-					retval=(INT32)wineItem->firstChild;
+					retval=(INT)wineItem->firstChild;
 					break;
 	case TVGN_LASTVISIBLE:  
 					returnItem=TREEVIEW_GetLastListItem (infoPtr,wineItem);
@@ -1014,8 +1014,8 @@ TREEVIEW_GetNextItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
   if (returnItem) {
 		  TRACE (treeview,"flags:%x, item %d;returns %d\n", flag, iItem,
-							(INT32)returnItem->hItem);
-		  return (INT32)returnItem->hItem;
+							(INT)returnItem->hItem);
+		  return (INT)returnItem->hItem;
   }
 
   TRACE (treeview,"flags:%x, item %d;returns %d\n", flag, iItem,retval);
@@ -1024,7 +1024,7 @@ TREEVIEW_GetNextItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_GetCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_GetCount (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
 
@@ -1041,38 +1041,38 @@ TREEVIEW_GetCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /* BTW: we waste handle 0; 0 is not an allowed handle. */
 
 static LRESULT
-TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_InsertItemA (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  TVINSERTSTRUCT32A  *ptdi;
-  TVITEMEX32A 	*tvItem;
+  TVINSERTSTRUCTA  *ptdi;
+  TVITEMEXA 	*tvItem;
   TREEVIEW_ITEM *wineItem, *parentItem, *prevsib, *sibItem;
-  INT32		iItem,listItems,i,len;
+  INT		iItem,listItems,i,len;
   
-  ptdi = (LPTVINSERTSTRUCT32A) lParam;
+  ptdi = (LPTVINSERTSTRUCTA) lParam;
 
 	/* check if memory is available */
 
   if (infoPtr->uNumPtrsAlloced==0) {
         infoPtr->items = COMCTL32_Alloc (TVITEM_ALLOC*sizeof (TREEVIEW_ITEM));
-        infoPtr->freeList= COMCTL32_Alloc ((1+(TVITEM_ALLOC>>5)) * sizeof (INT32));
+        infoPtr->freeList= COMCTL32_Alloc ((1+(TVITEM_ALLOC>>5)) * sizeof (INT));
         infoPtr->uNumPtrsAlloced=TVITEM_ALLOC;
 	infoPtr->TopRootItem=(HTREEITEM)1;
    }
 
   if (infoPtr->uNumItems == (infoPtr->uNumPtrsAlloced-1) ) {
    	TREEVIEW_ITEM *oldItems = infoPtr->items;
-	INT32 *oldfreeList = infoPtr->freeList;
+	INT *oldfreeList = infoPtr->freeList;
 
 	infoPtr->uNumPtrsAlloced*=2;
     infoPtr->items = COMCTL32_Alloc (infoPtr->uNumPtrsAlloced*sizeof (TREEVIEW_ITEM));
-    infoPtr->freeList= COMCTL32_Alloc ((1+(infoPtr->uNumPtrsAlloced>>5))*sizeof (INT32));
+    infoPtr->freeList= COMCTL32_Alloc ((1+(infoPtr->uNumPtrsAlloced>>5))*sizeof (INT));
 
     memcpy (&infoPtr->items[0], &oldItems[0],
                     infoPtr->uNumPtrsAlloced/2 * sizeof(TREEVIEW_ITEM));
     memcpy (&infoPtr->freeList[0], &oldfreeList[0],
-                    infoPtr->uNumPtrsAlloced>>6 * sizeof(INT32));
+                    infoPtr->uNumPtrsAlloced>>6 * sizeof(INT));
 
     COMCTL32_Free (oldItems);  
     COMCTL32_Free (oldfreeList);  
@@ -1081,9 +1081,9 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
   iItem=0;
   infoPtr->uNumItems++;
 
-  if ((INT32)infoPtr->uMaxHandle==(infoPtr->uNumItems-1))  { 
+  if ((INT)infoPtr->uMaxHandle==(infoPtr->uNumItems-1))  { 
   	iItem=infoPtr->uNumItems;
-  	infoPtr->uMaxHandle = (HTREEITEM)((INT32)infoPtr->uMaxHandle + 1);
+  	infoPtr->uMaxHandle = (HTREEITEM)((INT)infoPtr->uMaxHandle + 1);
   } else {					 /* check freelist */
 	for (i=0; i<infoPtr->uNumPtrsAlloced>>5; i++) {
 		if (infoPtr->freeList[i]) {
@@ -1106,15 +1106,15 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
   if ((ptdi->hParent==TVI_ROOT) || (ptdi->hParent==0)) {
 	parentItem=NULL;
 	wineItem->parent=0; 
-	sibItem=&infoPtr->items [(INT32)infoPtr->TopRootItem];
+	sibItem=&infoPtr->items [(INT)infoPtr->TopRootItem];
 	listItems=infoPtr->uNumItems;
   }
   else  {
-	parentItem= &infoPtr->items[(INT32)ptdi->hParent];
+	parentItem= &infoPtr->items[(INT)ptdi->hParent];
 	if (!parentItem->firstChild) 
 		parentItem->firstChild=(HTREEITEM)iItem;
 	wineItem->parent=ptdi->hParent;
-	sibItem=&infoPtr->items [(INT32)parentItem->firstChild];
+	sibItem=&infoPtr->items [(INT)parentItem->firstChild];
 	parentItem->cChildren++;
 	listItems=parentItem->cChildren;
   }
@@ -1126,7 +1126,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
   if (listItems>1) {
      prevsib=NULL;
-     switch ((INT32)ptdi->hInsertAfter) {
+     switch ((INT)ptdi->hInsertAfter) {
 		case TVI_FIRST: 
 			if (wineItem->parent) {
 				wineItem->sibling=parentItem->firstChild;
@@ -1141,7 +1141,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 			if (sibItem==wineItem) break;
 			while (sibItem->sibling) {
 				prevsib=sibItem;
-				sibItem=&infoPtr->items [(INT32)sibItem->sibling];
+				sibItem=&infoPtr->items [(INT)sibItem->sibling];
 			}
 			sibItem->sibling=(HTREEITEM)iItem;
 			wineItem->upsibling=sibItem->hItem;
@@ -1153,7 +1153,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 			while ((sibItem->sibling) && (sibItem->hItem!=ptdi->hInsertAfter))
 				{
 				prevsib=sibItem;
-                sibItem=&infoPtr->items [(INT32)sibItem->sibling];
+                sibItem=&infoPtr->items [(INT)sibItem->sibling];
               }
 			if (sibItem->hItem!=ptdi->hInsertAfter) {
 			 ERR (treeview, "tried to insert item after nonexisting handle.\n");
@@ -1161,7 +1161,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 			}
 			prevsib=sibItem;
 			if (sibItem->sibling) {
-            	sibItem=&infoPtr->items [(INT32)sibItem->sibling];
+            	sibItem=&infoPtr->items [(INT)sibItem->sibling];
 				sibItem->upsibling=(HTREEITEM)iItem;
 				wineItem->sibling=sibItem->hItem;
 			}
@@ -1175,7 +1175,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /* Fill in info structure */
 
    TRACE (treeview,"new item %d; parent %d, mask %x\n", iItem, 
-			(INT32)wineItem->parent,tvItem->mask);
+			(INT)wineItem->parent,tvItem->mask);
 
    wineItem->mask=tvItem->mask;
    wineItem->iIntegral=1; 
@@ -1208,16 +1208,16 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
    }
 
    if (tvItem->mask & TVIF_TEXT) {
-	if (tvItem->pszText!=LPSTR_TEXTCALLBACK32A) {
+	if (tvItem->pszText!=LPSTR_TEXTCALLBACKA) {
    		TRACE (treeview,"(%p,%s)\n", &tvItem->pszText, tvItem->pszText); 
-		len = lstrlen32A (tvItem->pszText)+1;
+		len = lstrlenA (tvItem->pszText)+1;
 		wineItem->pszText= COMCTL32_Alloc (len+1);
-		lstrcpy32A (wineItem->pszText, tvItem->pszText);
+		lstrcpyA (wineItem->pszText, tvItem->pszText);
 		wineItem->cchTextMax=len;
 	}
 	else {
 		TRACE (treeview,"LPSTR_TEXTCALLBACK\n");
-	    wineItem->pszText = LPSTR_TEXTCALLBACK32A;
+	    wineItem->pszText = LPSTR_TEXTCALLBACKA;
 	    wineItem->cchTextMax = 0;
 	}
    }
@@ -1232,19 +1232,19 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_DeleteItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_DeleteItem (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  INT32 iItem;
+  INT iItem;
   TREEVIEW_ITEM *wineItem;
 
   TRACE (treeview,"\n");
   if (!infoPtr) return FALSE;
 
-  if (lParam == (INT32)TVI_ROOT) {
+  if (lParam == (INT)TVI_ROOT) {
 	TREEVIEW_RemoveTree (wndPtr);
   } else {
-  	iItem= (INT32) lParam;
+  	iItem= (INT) lParam;
   	wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)iItem);
   	if (!wineItem) return FALSE;
     TRACE (treeview,"%s\n",wineItem->pszText);
@@ -1268,13 +1268,13 @@ TREEVIEW_GetIndent (WND *wndPtr)
 }
 
 static LRESULT
-TREEVIEW_SetIndent (WND *wndPtr, WPARAM32 wParam)
+TREEVIEW_SetIndent (WND *wndPtr, WPARAM wParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  INT32 newIndent;
+  INT newIndent;
    
   TRACE (treeview,"\n");
-  newIndent=(INT32) wParam;
+  newIndent=(INT) wParam;
   if (newIndent < MINIMUM_INDENT) newIndent=MINIMUM_INDENT;
   infoPtr->uIndent=newIndent;
   
@@ -1293,15 +1293,15 @@ TREEVIEW_GetToolTips (WND *wndPtr)
 
 
 static LRESULT
-TREEVIEW_SetToolTips (WND *wndPtr, WPARAM32 wParam)
+TREEVIEW_SetToolTips (WND *wndPtr, WPARAM wParam)
 
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
- HWND32 prevToolTip;
+ HWND prevToolTip;
 
  TRACE (treeview,"\n");
  prevToolTip=infoPtr->hwndToolTip;
- infoPtr->hwndToolTip= (HWND32) wParam;
+ infoPtr->hwndToolTip= (HWND) wParam;
 
  return prevToolTip;
 }
@@ -1317,21 +1317,21 @@ TREEVIEW_GetEditControl (WND *wndPtr)
 }
 
 LRESULT CALLBACK
-TREEVIEW_Edit_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, 
+TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, 
 							LPARAM lParam)
 {
   switch (uMsg) {
    case WM_ERASEBKGND: {
-           RECT32 rc;
-           HDC32  hdc = (HDC32) wParam;
-           GetClientRect32 (hwnd, &rc);
-           Rectangle32 (hdc, rc.left, rc.top, rc.right, rc.bottom);
+           RECT rc;
+           HDC  hdc = (HDC) wParam;
+           GetClientRect (hwnd, &rc);
+           Rectangle (hdc, rc.left, rc.top, rc.right, rc.bottom);
            return -1;
 		}
    case WM_GETDLGCODE:
             return DLGC_WANTARROWS | DLGC_WANTALLKEYS;
    default:
-			 return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+			 return DefWindowProcA (hwnd, uMsg, wParam, lParam);
   }
   return 0;
 }
@@ -1340,7 +1340,7 @@ TREEVIEW_Edit_SubclassProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam,
 /* should handle edit control messages here */
 
 static LRESULT
-TREEVIEW_Command (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_Command (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
   TRACE (treeview, "%x %ld\n",wParam, lParam);
@@ -1353,7 +1353,7 @@ TREEVIEW_Command (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 			 FIXME (treeview, "got EN_KILLFOCUS.\n");
 			 break;
 		default:
-			 return SendMessage32A (GetParent32 (wndPtr->hwndSelf), 
+			 return SendMessageA (GetParent (wndPtr->hwndSelf), 
 										WM_COMMAND, wParam, lParam);
 	}
  return 0;
@@ -1363,13 +1363,13 @@ TREEVIEW_Command (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_Size (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  RECT32 parent_rect;
-  UINT32  cx,cy;
-  HWND32 parent;
+  RECT parent_rect;
+  UINT  cx,cy;
+  HWND parent;
 
   if (infoPtr->bAutoSize) {
     infoPtr->bAutoSize = FALSE;
@@ -1378,11 +1378,11 @@ TREEVIEW_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     infoPtr->bAutoSize = TRUE;
 
     if (!wParam)  {
-    parent = GetParent32 (wndPtr->hwndSelf);
-    GetClientRect32(parent, &parent_rect);
+    parent = GetParent (wndPtr->hwndSelf);
+    GetClientRect(parent, &parent_rect);
     cx=LOWORD (lParam);
   	cy=HIWORD (lParam);
-	SetWindowPos32 (wndPtr->hwndSelf, 0, parent_rect.left, parent_rect.top, 
+	SetWindowPos (wndPtr->hwndSelf, 0, parent_rect.left, parent_rect.top, 
 			cx, cy, SWP_NOZORDER);
    } else {
 	FIXME (treeview,"WM_SIZE flag %x %lx not handled\n", wParam, lParam);
@@ -1395,7 +1395,7 @@ TREEVIEW_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_StyleChanged (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_StyleChanged (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   LPSTYLESTRUCT lpss=(LPSTYLESTRUCT) lParam;
 
@@ -1410,12 +1410,12 @@ TREEVIEW_StyleChanged (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TREEVIEW_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_Create (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TREEVIEW_INFO *infoPtr;
- 	LOGFONT32A logFont;
-    TEXTMETRIC32A tm;
-	HDC32 hdc;
+ 	LOGFONTA logFont;
+    TEXTMETRICA tm;
+	HDC hdc;
   
     TRACE (treeview,"wnd %x\n",wndPtr->hwndSelf);
       /* allocate memory for info structure */
@@ -1433,24 +1433,24 @@ TREEVIEW_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 		return 0;
     }
 
-	hdc=GetDC32 (wndPtr->hwndSelf);
+	hdc=GetDC (wndPtr->hwndSelf);
 
     /* set default settings */
     infoPtr->uInternalStatus=0;
     infoPtr->uNumItems=0;
-    infoPtr->clrBk = GetSysColor32 (COLOR_WINDOW);
-    infoPtr->clrText = GetSysColor32 (COLOR_BTNTEXT);
+    infoPtr->clrBk = GetSysColor (COLOR_WINDOW);
+    infoPtr->clrText = GetSysColor (COLOR_BTNTEXT);
     infoPtr->cy = 0;
     infoPtr->cx = 0;
     infoPtr->uIndent = 15;
     infoPtr->himlNormal = NULL;
     infoPtr->himlState = NULL;
 	infoPtr->uItemHeight = -1;
-    GetTextMetrics32A (hdc, &tm);
-    infoPtr->hFont = GetStockObject32 (DEFAULT_GUI_FONT);
-	GetObject32A (infoPtr->hFont, sizeof (LOGFONT32A), &logFont);
+    GetTextMetricsA (hdc, &tm);
+    infoPtr->hFont = GetStockObject (DEFAULT_GUI_FONT);
+	GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
 	logFont.lfWeight=FW_BOLD;
-    infoPtr->hBoldFont = CreateFontIndirect32A (&logFont);
+    infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
     
     infoPtr->items = NULL;
     infoPtr->selectedItem=0;
@@ -1464,12 +1464,12 @@ TREEVIEW_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 	infoPtr->hwndToolTip=0;
     if (!(wndPtr->dwStyle & TVS_NOTOOLTIPS)) {   /* Create tooltip control */
-		TTTOOLINFO32A ti;
+		TTTOOLINFOA ti;
 
 		infoPtr->hwndToolTip =  
-			CreateWindowEx32A (0, TOOLTIPS_CLASS32A, NULL, 0,
-                   CW_USEDEFAULT32, CW_USEDEFAULT32,
-                   CW_USEDEFAULT32, CW_USEDEFAULT32,
+			CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+                   CW_USEDEFAULT, CW_USEDEFAULT,
+                   CW_USEDEFAULT, CW_USEDEFAULT,
                    wndPtr->hwndSelf, 0, 0, 0);
 
         /* Send NM_TOOLTIPSCREATED notification */
@@ -1481,34 +1481,34 @@ TREEVIEW_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
             nmttc.hdr.code = NM_TOOLTIPSCREATED;
             nmttc.hwndToolTips = infoPtr->hwndToolTip;
 
-            SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmttc);
+            SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmttc);
         }
 
-		ZeroMemory (&ti, sizeof(TTTOOLINFO32A));
-        ti.cbSize   = sizeof(TTTOOLINFO32A);
+		ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+        ti.cbSize   = sizeof(TTTOOLINFOA);
         ti.uFlags   = TTF_IDISHWND | TTF_TRACK | TTF_TRANSPARENT ;
         ti.hwnd     = wndPtr->hwndSelf;
         ti.uId      = 0;
         ti.lpszText = "Test"; /* LPSTR_TEXTCALLBACK; */
-        SetRectEmpty32 (&ti.rect);
+        SetRectEmpty (&ti.rect);
 
-        SendMessage32A (infoPtr->hwndToolTip, TTM_ADDTOOL32A, 0, (LPARAM)&ti);
+        SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA, 0, (LPARAM)&ti);
     }
 
 
- 	infoPtr->hwndEdit = CreateWindowEx32A ( 0, "EDIT",NULL,
+ 	infoPtr->hwndEdit = CreateWindowExA ( 0, "EDIT",NULL,
                  WS_CHILD | WS_BORDER | ES_AUTOHSCROLL | ES_WANTRETURN,
                  0, 0, 0, 0,
                  wndPtr->hwndSelf, 0,0,0);
 				/* FIXME:   (HMENU)IDTVEDIT, pcs->hInstance, 0); */
 
-    SendMessage32A ( infoPtr->hwndEdit, WM_SETFONT, infoPtr->hFont, FALSE);
-	infoPtr->wpEditOrig= (WNDPROC32)
-                    SetWindowLong32A (infoPtr->hwndEdit,GWL_WNDPROC, 
+    SendMessageA ( infoPtr->hwndEdit, WM_SETFONT, infoPtr->hFont, FALSE);
+	infoPtr->wpEditOrig= (WNDPROC)
+                    SetWindowLongA (infoPtr->hwndEdit,GWL_WNDPROC, 
 					(LONG) TREEVIEW_Edit_SubclassProc);
 
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 
     return 0;
 }
@@ -1523,9 +1523,9 @@ TREEVIEW_Destroy (WND *wndPtr)
    TRACE (treeview,"\n");
    TREEVIEW_RemoveTree (wndPtr);
    if (infoPtr->Timer & TV_REFRESH_TIMER_SET) 
-        KillTimer32 (wndPtr->hwndSelf, TV_REFRESH_TIMER);
+        KillTimer (wndPtr->hwndSelf, TV_REFRESH_TIMER);
    if (infoPtr->hwndToolTip) 
-		DestroyWindow32 (infoPtr->hwndToolTip);
+		DestroyWindow (infoPtr->hwndToolTip);
 
    COMCTL32_Free (infoPtr);
    return 0;
@@ -1533,48 +1533,48 @@ TREEVIEW_Destroy (WND *wndPtr)
 
 
 static LRESULT
-TREEVIEW_Paint (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_Paint (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
+    HDC hdc;
+    PAINTSTRUCT ps;
 
     TRACE (treeview,"\n");
-    hdc = wParam==0 ? BeginPaint32 (wndPtr->hwndSelf, &ps) : (HDC32)wParam;
+    hdc = wParam==0 ? BeginPaint (wndPtr->hwndSelf, &ps) : (HDC)wParam;
     TREEVIEW_Refresh (wndPtr);
     if(!wParam)
-        EndPaint32 (wndPtr->hwndSelf, &ps);
+        EndPaint (wndPtr->hwndSelf, &ps);
     TRACE (treeview,"done\n");
       
-    return DefWindowProc32A (wndPtr->hwndSelf, WM_PAINT, wParam, lParam);
+    return DefWindowProcA (wndPtr->hwndSelf, WM_PAINT, wParam, lParam);
 }
 
 static LRESULT
-TREEVIEW_SetFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_SetFocus (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
    TREEVIEW_SendSimpleNotify (wndPtr, NM_SETFOCUS);
-   SendMessage32A (wndPtr->hwndSelf, WM_PAINT, 0, 0);
+   SendMessageA (wndPtr->hwndSelf, WM_PAINT, 0, 0);
    return 0;
 }
 
 static LRESULT
-TREEVIEW_KillFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_KillFocus (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
    TREEVIEW_SendSimpleNotify (wndPtr, NM_KILLFOCUS);
-   SendMessage32A (wndPtr->hwndSelf, WM_PAINT, 0, 0);
+   SendMessageA (wndPtr->hwndSelf, WM_PAINT, 0, 0);
    return 0;
 }
 
 static LRESULT
-TREEVIEW_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_EraseBackground (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
     TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-    HBRUSH32 hBrush = CreateSolidBrush32 (infoPtr->clrBk);
-    RECT32 rect;
+    HBRUSH hBrush = CreateSolidBrush (infoPtr->clrBk);
+    RECT rect;
 
     TRACE (treeview,"\n");
-    GetClientRect32 (wndPtr->hwndSelf, &rect);
-    FillRect32 ((HDC32)wParam, &rect, hBrush);
-    DeleteObject32 (hBrush);
+    GetClientRect (wndPtr->hwndSelf, &rect);
+    FillRect ((HDC)wParam, &rect, hBrush);
+    DeleteObject (hBrush);
     return TRUE;
 }
 
@@ -1589,8 +1589,8 @@ TREEVIEW_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 
-static BOOL32
-TREEVIEW_SendSimpleNotify (WND *wndPtr, UINT32 code)
+static BOOL
+TREEVIEW_SendSimpleNotify (WND *wndPtr, UINT code)
 {
     NMHDR nmhdr;
 
@@ -1599,29 +1599,29 @@ TREEVIEW_SendSimpleNotify (WND *wndPtr, UINT32 code)
     nmhdr.idFrom   = wndPtr->wIDmenu;
     nmhdr.code     = code;
 
-    return (BOOL32) SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                                   (WPARAM32)nmhdr.idFrom, (LPARAM)&nmhdr);
+    return (BOOL) SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                                   (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
 }
 
 
 
-static BOOL32
-TREEVIEW_SendTreeviewNotify (WND *wndPtr, UINT32 code, UINT32 action, 
+static BOOL
+TREEVIEW_SendTreeviewNotify (WND *wndPtr, UINT code, UINT action, 
 			HTREEITEM oldItem, HTREEITEM newItem)
 
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  NMTREEVIEW32A nmhdr;
+  NMTREEVIEWA nmhdr;
   TREEVIEW_ITEM  *wineItem;
 
   TRACE (treeview,"code:%x action:%x olditem:%x newitem:%x\n",
-		  code,action,(INT32)oldItem,(INT32)newItem);
+		  code,action,(INT)oldItem,(INT)newItem);
   nmhdr.hdr.hwndFrom = wndPtr->hwndSelf;
   nmhdr.hdr.idFrom = wndPtr->wIDmenu;
   nmhdr.hdr.code = code;
   nmhdr.action = action;
   if (oldItem) {
-  	wineItem=& infoPtr->items[(INT32)oldItem];
+  	wineItem=& infoPtr->items[(INT)oldItem];
   	nmhdr.itemOld.mask 		= wineItem->mask;
   	nmhdr.itemOld.hItem		= wineItem->hItem;
   	nmhdr.itemOld.state		= wineItem->state;
@@ -1636,7 +1636,7 @@ TREEVIEW_SendTreeviewNotify (WND *wndPtr, UINT32 code, UINT32 action,
   }
 
   if (newItem) {
-  	wineItem=& infoPtr->items[(INT32)newItem];
+  	wineItem=& infoPtr->items[(INT)newItem];
   	nmhdr.itemNew.mask 		= wineItem->mask;
   	nmhdr.itemNew.hItem		= wineItem->hItem;
   	nmhdr.itemNew.state		= wineItem->state;
@@ -1653,26 +1653,26 @@ TREEVIEW_SendTreeviewNotify (WND *wndPtr, UINT32 code, UINT32 action,
   nmhdr.ptDrag.x = 0;
   nmhdr.ptDrag.y = 0;
 
-  return (BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                                   (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmhdr);
+  return (BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                                   (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmhdr);
 
 }
 
-static BOOL32
-TREEVIEW_SendTreeviewDnDNotify (WND *wndPtr, UINT32 code, HTREEITEM dragItem, 
-								POINT32 pt)
+static BOOL
+TREEVIEW_SendTreeviewDnDNotify (WND *wndPtr, UINT code, HTREEITEM dragItem, 
+								POINT pt)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  NMTREEVIEW32A nmhdr;
+  NMTREEVIEWA nmhdr;
   TREEVIEW_ITEM  *wineItem;
 
-  TRACE (treeview,"code:%x dragitem:%x\n", code,(INT32)dragItem);
+  TRACE (treeview,"code:%x dragitem:%x\n", code,(INT)dragItem);
 
   nmhdr.hdr.hwndFrom = wndPtr->hwndSelf;
   nmhdr.hdr.idFrom = wndPtr->wIDmenu;
   nmhdr.hdr.code = code;
   nmhdr.action = 0;
-  wineItem=& infoPtr->items[(INT32)dragItem];
+  wineItem=& infoPtr->items[(INT)dragItem];
   nmhdr.itemNew.mask 	= wineItem->mask;
   nmhdr.itemNew.hItem	= wineItem->hItem;
   nmhdr.itemNew.state	= wineItem->state;
@@ -1681,22 +1681,22 @@ TREEVIEW_SendTreeviewDnDNotify (WND *wndPtr, UINT32 code, HTREEITEM dragItem,
   nmhdr.ptDrag.x = pt.x;
   nmhdr.ptDrag.y = pt.y;
 
-  return (BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                                   (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmhdr);
+  return (BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                                   (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmhdr);
 
 }
 
 
 
-static BOOL32
+static BOOL
 TREEVIEW_SendDispInfoNotify (WND *wndPtr, TREEVIEW_ITEM *wineItem, 
-								UINT32 code, UINT32 what)
+								UINT code, UINT what)
 {
-  NMTVDISPINFO32A tvdi;
-  BOOL32 retval;
+  NMTVDISPINFOA tvdi;
+  BOOL retval;
   char *buf;
 
-  TRACE (treeview,"item %d, action %x\n",(INT32)wineItem->hItem,what);
+  TRACE (treeview,"item %d, action %x\n",(INT)wineItem->hItem,what);
 
   tvdi.hdr.hwndFrom	= wndPtr->hwndSelf;
   tvdi.hdr.idFrom	= wndPtr->wIDmenu;
@@ -1707,8 +1707,8 @@ TREEVIEW_SendDispInfoNotify (WND *wndPtr, TREEVIEW_ITEM *wineItem,
   tvdi.item.lParam	= wineItem->lParam;
   tvdi.item.pszText = COMCTL32_Alloc (128*sizeof(char));
   buf = tvdi.item.pszText;
-  retval=(BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                                   (WPARAM32)wndPtr->wIDmenu, (LPARAM)&tvdi);
+  retval=(BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                                   (WPARAM)wndPtr->wIDmenu, (LPARAM)&tvdi);
   if (what & TVIF_TEXT) {
 		wineItem->pszText        = tvdi.item.pszText;
 		if (buf==tvdi.item.pszText) {
@@ -1731,9 +1731,9 @@ TREEVIEW_SendDispInfoNotify (WND *wndPtr, TREEVIEW_ITEM *wineItem,
 
 
 
-static BOOL32
-TREEVIEW_SendCustomDrawNotify (WND *wndPtr, DWORD dwDrawStage, HDC32 hdc,
-			RECT32 rc)
+static BOOL
+TREEVIEW_SendCustomDrawNotify (WND *wndPtr, DWORD dwDrawStage, HDC hdc,
+			RECT rc)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
   NMTVCUSTOMDRAW nmcdhdr;
@@ -1758,8 +1758,8 @@ TREEVIEW_SendCustomDrawNotify (WND *wndPtr, DWORD dwDrawStage, HDC32 hdc,
   nmcdhdr.clrTextBk= infoPtr->clrBk;
   nmcdhdr.iLevel   = 0;
 
-  return (BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                               (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmcdhdr);
+  return (BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                               (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmcdhdr);
 
 }
 
@@ -1767,15 +1767,15 @@ TREEVIEW_SendCustomDrawNotify (WND *wndPtr, DWORD dwDrawStage, HDC32 hdc,
 
 /* FIXME: need to find out when the flags in uItemState need to be set */
 
-static BOOL32
-TREEVIEW_SendCustomDrawItemNotify (WND *wndPtr, HDC32 hdc,
-  			TREEVIEW_ITEM *wineItem, UINT32 uItemDrawState)
+static BOOL
+TREEVIEW_SendCustomDrawItemNotify (WND *wndPtr, HDC hdc,
+  			TREEVIEW_ITEM *wineItem, UINT uItemDrawState)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  NMTVCUSTOMDRAW nmcdhdr;
  LPNMCUSTOMDRAW nmcd;
  DWORD dwDrawStage,dwItemSpec;
- UINT32 uItemState;
+ UINT uItemState;
  
  dwDrawStage=CDDS_ITEM | uItemDrawState;
  dwItemSpec=(DWORD)wineItem->hItem;
@@ -1805,8 +1805,8 @@ TREEVIEW_SendCustomDrawItemNotify (WND *wndPtr, HDC32 hdc,
  TRACE (treeview,"drawstage:%lx hdc:%x item:%lx, itemstate:%x\n",
 		  dwDrawStage, hdc, dwItemSpec, uItemState);
 
- return (BOOL32)SendMessage32A (GetParent32 (wndPtr->hwndSelf), WM_NOTIFY,
-                               (WPARAM32)wndPtr->wIDmenu, (LPARAM)&nmcdhdr);
+ return (BOOL)SendMessageA (GetParent (wndPtr->hwndSelf), WM_NOTIFY,
+                               (WPARAM)wndPtr->wIDmenu, (LPARAM)&nmcdhdr);
 }
 
 
@@ -1819,15 +1819,15 @@ TREEVIEW_SendCustomDrawItemNotify (WND *wndPtr, HDC32 hdc,
 
 
 static LRESULT
-TREEVIEW_Expand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_Expand (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  TREEVIEW_ITEM *wineItem, *parentItem;
- UINT32 flag;
- INT32 expand;
+ UINT flag;
+ INT expand;
  
- flag= (UINT32) wParam;
- expand= (INT32) lParam;
+ flag= (UINT) wParam;
+ expand= (INT) lParam;
  TRACE (treeview,"flags:%x item:%x\n", expand, wParam);
  wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)expand);
  if (!wineItem) return 0;
@@ -1891,17 +1891,17 @@ TREEVIEW_Expand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static TREEVIEW_ITEM *
-TREEVIEW_HitTest (WND *wndPtr, POINT32 pt)
+TREEVIEW_HitTestPoint (WND *wndPtr, POINT pt)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  TREEVIEW_ITEM *wineItem;
- RECT32 rect;
+ RECT rect;
 
- GetClientRect32 (wndPtr->hwndSelf, &rect);
+ GetClientRect (wndPtr->hwndSelf, &rect);
 
  if (!infoPtr->firstVisible) return NULL;
 
- wineItem=&infoPtr->items [(INT32)infoPtr->firstVisible];
+ wineItem=&infoPtr->items [(INT)infoPtr->firstVisible];
 
  while ((wineItem!=NULL) && (pt.y > wineItem->rect.bottom))
        wineItem=TREEVIEW_GetNextListItem (infoPtr,wineItem);
@@ -1916,14 +1916,14 @@ TREEVIEW_HitTest (WND *wndPtr, POINT32 pt)
 
 
 static LRESULT
-TREEVIEW_HitTest32 (WND *wndPtr, LPARAM lParam)
+TREEVIEW_HitTest (WND *wndPtr, LPARAM lParam)
 {
   LPTVHITTESTINFO lpht=(LPTVHITTESTINFO) lParam;
   TREEVIEW_ITEM *wineItem;
-  RECT32 rect;
-  UINT32 status,x,y;
+  RECT rect;
+  UINT status,x,y;
 
-  GetClientRect32 (wndPtr->hwndSelf, &rect);
+  GetClientRect (wndPtr->hwndSelf, &rect);
   status=0;
   x=lpht->pt.x;
   y=lpht->pt.y;
@@ -1936,7 +1936,7 @@ TREEVIEW_HitTest32 (WND *wndPtr, LPARAM lParam)
 	return 0;
   }
 
-  wineItem=TREEVIEW_HitTest (wndPtr, lpht->pt);
+  wineItem=TREEVIEW_HitTestPoint (wndPtr, lpht->pt);
   if (!wineItem) {	
 		lpht->flags=TVHT_NOWHERE;
 		return 0;
@@ -1959,23 +1959,23 @@ TREEVIEW_HitTest32 (WND *wndPtr, LPARAM lParam)
 
 
 LRESULT
-TREEVIEW_LButtonDoubleClick (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_LButtonDoubleClick (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_ITEM *wineItem;
-  POINT32 pt;
+  POINT pt;
 
   TRACE (treeview,"\n");
-  pt.x = (INT32)LOWORD(lParam);
-  pt.y = (INT32)HIWORD(lParam);
-  SetFocus32 (wndPtr->hwndSelf);
+  pt.x = (INT)LOWORD(lParam);
+  pt.y = (INT)HIWORD(lParam);
+  SetFocus (wndPtr->hwndSelf);
 
-  wineItem=TREEVIEW_HitTest (wndPtr, pt);
+  wineItem=TREEVIEW_HitTestPoint (wndPtr, pt);
   if (!wineItem) return 0;
-  TRACE (treeview,"item %d \n",(INT32)wineItem->hItem);
+  TRACE (treeview,"item %d \n",(INT)wineItem->hItem);
  
   if (TREEVIEW_SendSimpleNotify (wndPtr, NM_DBLCLK)!=TRUE) {     /* FIXME!*/
 	wineItem->state &= ~TVIS_EXPANDEDONCE;
-	TREEVIEW_Expand (wndPtr, (WPARAM32) TVE_TOGGLE, (LPARAM) wineItem->hItem);
+	TREEVIEW_Expand (wndPtr, (WPARAM) TVE_TOGGLE, (LPARAM) wineItem->hItem);
  }
  return TRUE;
 }
@@ -1983,20 +1983,20 @@ TREEVIEW_LButtonDoubleClick (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_LButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
-  INT32 iItem;
+  INT iItem;
   TVHITTESTINFO ht;
 
-  ht.pt.x = (INT32)LOWORD(lParam);
-  ht.pt.y = (INT32)HIWORD(lParam);
+  ht.pt.x = (INT)LOWORD(lParam);
+  ht.pt.y = (INT)HIWORD(lParam);
 
-  SetFocus32 (wndPtr->hwndSelf);
-  iItem=TREEVIEW_HitTest32 (wndPtr, (LPARAM) &ht);
+  SetFocus (wndPtr->hwndSelf);
+  iItem=TREEVIEW_HitTest (wndPtr, (LPARAM) &ht);
   TRACE (treeview,"item %d \n",iItem);
   if (ht.flags & TVHT_ONITEMBUTTON) {
-	TREEVIEW_Expand (wndPtr, (WPARAM32) TVE_TOGGLE, (LPARAM) iItem);
+	TREEVIEW_Expand (wndPtr, (WPARAM) TVE_TOGGLE, (LPARAM) iItem);
   }
 
   infoPtr->uInternalStatus|=TV_LDRAG;
@@ -2009,38 +2009,38 @@ TREEVIEW_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TREEVIEW_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_LButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  TREEVIEW_ITEM *editItem;
- INT32 ret;
- POINT32 pt;
+ INT ret;
+ POINT pt;
 
- pt.x = (INT32)LOWORD(lParam);
- pt.y = (INT32)HIWORD(lParam);
+ pt.x = (INT)LOWORD(lParam);
+ pt.y = (INT)HIWORD(lParam);
 
  TRACE (treeview,"\n");
  if (TREEVIEW_SendSimpleNotify (wndPtr, NM_CLICK)) return 0;
- editItem=TREEVIEW_HitTest (wndPtr, pt);    
+ editItem=TREEVIEW_HitTestPoint (wndPtr, pt);    
  if (!editItem) return 0;
 
  infoPtr->uInternalStatus &= ~(TV_LDRAG | TV_LDRAGGING);
 
  if (wndPtr->dwStyle & TVS_EDITLABELS) {
-		RECT32 *r;
+		RECT *r;
 		ret=TREEVIEW_SendDispInfoNotify (wndPtr, editItem, 
 											TVN_BEGINLABELEDIT, 0);
 		if (ret) return 0;
 		printf ("edit started..\n");
 		r=& editItem->rect;
 		infoPtr->editItem=editItem->hItem;
-		SetWindowPos32 ( infoPtr->hwndEdit, HWND_TOP, r->left, r->top,
+		SetWindowPos ( infoPtr->hwndEdit, HWND_TOP, r->left, r->top,
                            r->right - r->left + 5,
                            r->bottom - r->top + 2,
                            SWP_SHOWWINDOW );
-		SetFocus32 (infoPtr->hwndEdit);
-		SetWindowText32A ( infoPtr->hwndEdit, editItem->pszText );
-        SendMessage32A ( infoPtr->hwndEdit, EM_SETSEL32, 0, -1 );
+		SetFocus (infoPtr->hwndEdit);
+		SetWindowTextA ( infoPtr->hwndEdit, editItem->pszText );
+        SendMessageA ( infoPtr->hwndEdit, EM_SETSEL, 0, -1 );
 	}
 
 
@@ -2050,7 +2050,7 @@ TREEVIEW_LButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_RButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_RButtonDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
 
@@ -2060,7 +2060,7 @@ TREEVIEW_RButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TREEVIEW_RButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_RButtonUp (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
 
@@ -2072,15 +2072,15 @@ TREEVIEW_RButtonUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_MouseMove (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  TREEVIEW_ITEM *hotItem;
- POINT32 pt;
+ POINT pt;
 
- pt.x=(INT32) LOWORD (lParam);
- pt.y=(INT32) HIWORD (lParam);
- hotItem=TREEVIEW_HitTest (wndPtr, pt);
+ pt.x=(INT) LOWORD (lParam);
+ pt.y=(INT) HIWORD (lParam);
+ hotItem=TREEVIEW_HitTestPoint (wndPtr, pt);
  if (!hotItem) return 0;
  infoPtr->focusItem=hotItem->hItem;
 
@@ -2107,17 +2107,17 @@ TREEVIEW_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_CreateDragImage (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_CreateDragImage (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  TREEVIEW_ITEM *dragItem;
- INT32 cx,cy;
- HDC32    hdc,htopdc;
- HWND32 hwtop;
- HBITMAP32 hbmp,hOldbmp;
- SIZE32  size;
- RECT32  rc;
- HFONT32 hOldFont;
+ INT cx,cy;
+ HDC    hdc,htopdc;
+ HWND hwtop;
+ HBITMAP hbmp,hOldbmp;
+ SIZE  size;
+ RECT  rc;
+ HFONT hOldFont;
  char    *itemtxt;
  
  TRACE (treeview,"\n");
@@ -2127,15 +2127,15 @@ TREEVIEW_CreateDragImage (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
  if (!dragItem) return 0;
  itemtxt=dragItem->pszText;
 
- hwtop=GetDesktopWindow32 ();
- htopdc= GetDC32 (hwtop);
- hdc=CreateCompatibleDC32 (htopdc); 
+ hwtop=GetDesktopWindow ();
+ htopdc= GetDC (hwtop);
+ hdc=CreateCompatibleDC (htopdc); 
  
- hOldFont=SelectObject32 (hdc, infoPtr->hFont);
- GetTextExtentPoint32A (hdc, itemtxt, lstrlen32A (itemtxt), &size);
- TRACE (treeview,"%d %d %s %d\n",size.cx,size.cy,itemtxt,lstrlen32A(itemtxt));
- hbmp=CreateCompatibleBitmap32 (htopdc, size.cx, size.cy);
- hOldbmp=SelectObject32 (hdc, hbmp);
+ hOldFont=SelectObject (hdc, infoPtr->hFont);
+ GetTextExtentPoint32A (hdc, itemtxt, lstrlenA (itemtxt), &size);
+ TRACE (treeview,"%d %d %s %d\n",size.cx,size.cy,itemtxt,lstrlenA(itemtxt));
+ hbmp=CreateCompatibleBitmap (htopdc, size.cx, size.cy);
+ hOldbmp=SelectObject (hdc, hbmp);
 
  ImageList_GetIconSize (infoPtr->himlNormal, &cx, &cy);
  size.cx+=cx;
@@ -2151,16 +2151,16 @@ TREEVIEW_CreateDragImage (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 /* draw item text */
 
- SetRect32 (&rc, cx, 0, size.cx,size.cy);
- DrawText32A (hdc, itemtxt, lstrlen32A (itemtxt), &rc, DT_LEFT);
- SelectObject32 (hdc, hOldFont);
- SelectObject32 (hdc, hOldbmp);
+ SetRect (&rc, cx, 0, size.cx,size.cy);
+ DrawTextA (hdc, itemtxt, lstrlenA (itemtxt), &rc, DT_LEFT);
+ SelectObject (hdc, hOldFont);
+ SelectObject (hdc, hOldbmp);
 
  ImageList_Add (infoPtr->dragList, hbmp, 0);
 
- DeleteDC32 (hdc);
- DeleteObject32 (hbmp);
- ReleaseDC32 (hwtop, htopdc);
+ DeleteDC (hdc);
+ DeleteObject (hbmp);
+ ReleaseDC (hwtop, htopdc);
 
  return (LRESULT)infoPtr->dragList;
 }
@@ -2170,14 +2170,14 @@ TREEVIEW_CreateDragImage (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 /* FIXME: handle NM_KILLFocus enzo */
 
 static LRESULT
-TREEVIEW_DoSelectItem (WND *wndPtr, INT32 action, HTREEITEM newSelect, INT32 cause)
+TREEVIEW_DoSelectItem (WND *wndPtr, INT action, HTREEITEM newSelect, INT cause)
 
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  TREEVIEW_ITEM *prevItem,*wineItem, *parentItem;
- INT32 prevSelect;
+ INT prevSelect;
 
-  TRACE (treeview,"item %x, flag %x, cause %x\n", (INT32)newSelect, action, cause);
+  TRACE (treeview,"item %x, flag %x, cause %x\n", (INT)newSelect, action, cause);
   wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)newSelect);
 
   if (wineItem) {
@@ -2190,7 +2190,7 @@ TREEVIEW_DoSelectItem (WND *wndPtr, INT32 action, HTREEITEM newSelect, INT32 cau
 
   switch (action) {
 	case TVGN_CARET: 
-  		prevSelect=(INT32)infoPtr->selectedItem;
+  		prevSelect=(INT)infoPtr->selectedItem;
 		if ((HTREEITEM)prevSelect==newSelect) return FALSE;
   		prevItem= TREEVIEW_ValidItem (infoPtr, (HTREEITEM)prevSelect);
 		if (newSelect) 
@@ -2223,7 +2223,7 @@ TREEVIEW_DoSelectItem (WND *wndPtr, INT32 action, HTREEITEM newSelect, INT32 cau
 
 
 static LRESULT
-TREEVIEW_SelectItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_SelectItem (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
  return TREEVIEW_DoSelectItem (wndPtr, wParam, (HTREEITEM) lParam, TVC_UNKNOWN);
@@ -2233,7 +2233,7 @@ TREEVIEW_SelectItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
    
 static LRESULT
-TREEVIEW_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_GetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
@@ -2243,34 +2243,34 @@ TREEVIEW_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TREEVIEW_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_SetFont (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
- TEXTMETRIC32A tm;
- LOGFONT32A logFont;
- HFONT32 hFont, hOldFont;
- INT32 height;
- HDC32 hdc;
+ TEXTMETRICA tm;
+ LOGFONTA logFont;
+ HFONT hFont, hOldFont;
+ INT height;
+ HDC hdc;
 
  TRACE (treeview,"%x %lx\n",wParam, lParam);
  
- infoPtr->hFont = (HFONT32)wParam;
+ infoPtr->hFont = (HFONT)wParam;
 
- hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject32 (SYSTEM_FONT);
+ hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
 
- GetObject32A (infoPtr->hFont, sizeof (LOGFONT32A), &logFont);
+ GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
  logFont.lfWeight=FW_BOLD;
- infoPtr->hBoldFont = CreateFontIndirect32A (&logFont);
+ infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
 
- hdc = GetDC32 (0);
- hOldFont = SelectObject32 (hdc, hFont);
- GetTextMetrics32A (hdc, &tm);
+ hdc = GetDC (0);
+ hOldFont = SelectObject (hdc, hFont);
+ GetTextMetricsA (hdc, &tm);
  height= tm.tmHeight + tm.tmExternalLeading;
  if (height>infoPtr->uRealItemHeight) 
  	infoPtr->uRealItemHeight=height;
- SelectObject32 (hdc, hOldFont);
- ReleaseDC32 (0, hdc);
+ SelectObject (hdc, hOldFont);
+ ReleaseDC (0, hdc);
 
  if (lParam) 	
  	TREEVIEW_QueueRefresh (wndPtr);
@@ -2285,7 +2285,7 @@ TREEVIEW_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_KeyDown (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
  TREEVIEW_ITEM *prevItem,*newItem;
@@ -2293,7 +2293,7 @@ TREEVIEW_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
  TRACE (treeview,"%x %lx\n",wParam, lParam);
- prevSelect=(INT32)infoPtr->selectedItem;
+ prevSelect=(INT)infoPtr->selectedItem;
  if (!prevSelect) return FALSE;
 
  prevItem= TREEVIEW_ValidItem (infoPtr, (HTREEITEM)prevSelect);
@@ -2303,17 +2303,17 @@ TREEVIEW_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 	case VK_UP: 
 		newItem=TREEVIEW_GetPrevListItem (infoPtr, prevItem);
 		if (!newItem) 
-			newItem=& infoPtr->items[(INT32)infoPtr->TopRootItem];
+			newItem=& infoPtr->items[(INT)infoPtr->TopRootItem];
 		break;
 	case VK_DOWN: 
 		newItem=TREEVIEW_GetNextListItem (infoPtr, prevItem);
 		if (!newItem) newItem=prevItem;
 		break;
 	case VK_HOME:
-		newItem=& infoPtr->items[(INT32)infoPtr->TopRootItem];
+		newItem=& infoPtr->items[(INT)infoPtr->TopRootItem];
 		break;
 	case VK_END:
-		newItem=& infoPtr->items[(INT32)infoPtr->TopRootItem];
+		newItem=& infoPtr->items[(INT)infoPtr->TopRootItem];
 		newItem=TREEVIEW_GetLastListItem (infoPtr, newItem);
 		break;
 	case VK_PRIOR:
@@ -2340,7 +2340,7 @@ TREEVIEW_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 static LRESULT
-TREEVIEW_VScroll (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_VScroll (WND *wndPtr, WPARAM wParam, LPARAM lParam)
 
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
@@ -2385,7 +2385,7 @@ TREEVIEW_VScroll (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 }
 
 static LRESULT
-TREEVIEW_HScroll (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) 
+TREEVIEW_HScroll (WND *wndPtr, WPARAM wParam, LPARAM lParam) 
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(wndPtr);
   int maxWidth;
@@ -2433,16 +2433,16 @@ TREEVIEW_HScroll (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 
 
 LRESULT WINAPI
-TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
+TREEVIEW_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   WND *wndPtr = WIN_FindWndPtr(hwnd);
   
   
     switch (uMsg) {
-    	case TVM_INSERTITEM32A:
-          return TREEVIEW_InsertItem32A (wndPtr, wParam, lParam);
+    	case TVM_INSERTITEMA:
+          return TREEVIEW_InsertItemA (wndPtr, wParam, lParam);
 
-    	case TVM_INSERTITEM32W:
+    	case TVM_INSERTITEMW:
       		FIXME (treeview, "Unimplemented msg TVM_INSERTITEM32W\n");
       		return 0;
 
@@ -2476,25 +2476,25 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
     	case TVM_SELECTITEM:
       		return TREEVIEW_SelectItem (wndPtr, wParam, lParam);
 
-    	case TVM_GETITEM32A:
-      		return TREEVIEW_GetItem32A (wndPtr, wParam, lParam);
+    	case TVM_GETITEMA:
+      		return TREEVIEW_GetItemA (wndPtr, wParam, lParam);
 
-    	case TVM_GETITEM32W:
+    	case TVM_GETITEMW:
       		FIXME (treeview, "Unimplemented msg TVM_GETITEM32W\n");
       		return 0;
 
-    	case TVM_SETITEM32A:
-      		return TREEVIEW_SetItem32A (wndPtr, wParam, lParam);
+    	case TVM_SETITEMA:
+      		return TREEVIEW_SetItemA (wndPtr, wParam, lParam);
 
-    	case TVM_SETITEM32W:
+    	case TVM_SETITEMW:
       		FIXME (treeview, "Unimplemented msg TVM_SETITEMW\n");
       		return 0;
 
-    	case TVM_EDITLABEL32A:
+    	case TVM_EDITLABELA:
       		FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32A \n");
       		return 0;
 
-    	case TVM_EDITLABEL32W:
+    	case TVM_EDITLABELW:
       		FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32W \n");
       		return 0;
 
@@ -2505,7 +2505,7 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
       		return TREEVIEW_GetVisibleCount (wndPtr, wParam, lParam);
 
     	case TVM_HITTEST:
-      		return TREEVIEW_HitTest32 (wndPtr, lParam);
+      		return TREEVIEW_HitTest (wndPtr, lParam);
 
     	case TVM_CREATEDRAGIMAGE:
       		return TREEVIEW_CreateDragImage (wndPtr, wParam, lParam);
@@ -2526,11 +2526,11 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
       		FIXME (treeview, "Unimplemented msg TVM_ENDEDITLABELNOW\n");
       		return 0;
   
-    	case TVM_GETISEARCHSTRING32A:
+    	case TVM_GETISEARCHSTRINGA:
       		FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32A\n");
       		return 0;
   
-    	case TVM_GETISEARCHSTRING32W:
+    	case TVM_GETISEARCHSTRINGW:
       		FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32W\n");
       		return 0;
   
@@ -2657,13 +2657,13 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
   
 		case WM_DRAWITEM:
 			printf ("drawItem\n");
-			return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+			return DefWindowProcA (hwnd, uMsg, wParam, lParam);
   
 		default:
 	    	if (uMsg >= WM_USER)
 		FIXME (treeview, "Unknown msg %04x wp=%08x lp=%08lx\n",
   		     uMsg, wParam, lParam);
-  	    return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+  	    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
       }
     return 0;
 }
@@ -2672,29 +2672,29 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 VOID
 TREEVIEW_Register (VOID)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
     TRACE (treeview,"\n");
 
-    if (GlobalFindAtom32A (WC_TREEVIEW32A)) return;
+    if (GlobalFindAtomA (WC_TREEVIEWA)) return;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS;
-    wndClass.lpfnWndProc   = (WNDPROC32)TREEVIEW_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)TREEVIEW_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(TREEVIEW_INFO *);
-    wndClass.hCursor       = LoadCursor32A (0, IDC_ARROW32A);
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
     wndClass.hbrBackground = 0;
-    wndClass.lpszClassName = WC_TREEVIEW32A;
+    wndClass.lpszClassName = WC_TREEVIEWA;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 
 VOID
 TREEVIEW_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (WC_TREEVIEW32A))
-	UnregisterClass32A (WC_TREEVIEW32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (WC_TREEVIEWA))
+	UnregisterClassA (WC_TREEVIEWA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index 36816a2a6a0..bb836bf1943 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -72,7 +72,7 @@ static int accelIndex = -1;
  *           UPDOWN_InBounds
  * Tests if a given value 'val' is between the Min&Max limits
  */
-static BOOL32 UPDOWN_InBounds(WND *wndPtr, int val)
+static BOOL UPDOWN_InBounds(WND *wndPtr, int val)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr);
 
@@ -87,7 +87,7 @@ static BOOL32 UPDOWN_InBounds(WND *wndPtr, int val)
  * Tests if we can change the current value by delta. If so, it changes
  * it and returns TRUE. Else, it leaves it unchanged and returns FALSE.
  */
-static BOOL32 UPDOWN_OffsetVal(WND *wndPtr, int delta)
+static BOOL UPDOWN_OffsetVal(WND *wndPtr, int delta)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr);
 
@@ -114,11 +114,11 @@ static BOOL32 UPDOWN_OffsetVal(WND *wndPtr, int delta)
  *            FALSE get the "decrement" rect (down or left)
  *          
  */
-static void UPDOWN_GetArrowRect(WND *wndPtr, RECT32 *rect, BOOL32 incr)
+static void UPDOWN_GetArrowRect(WND *wndPtr, RECT *rect, BOOL incr)
 {
   int len; /* will hold the width or height */
 
-  GetClientRect32(wndPtr->hwndSelf, rect);
+  GetClientRect(wndPtr->hwndSelf, rect);
 
   if (wndPtr->dwStyle & UDS_HORZ) {
     len = rect->right - rect->left; /* compute the width */
@@ -142,10 +142,10 @@ static void UPDOWN_GetArrowRect(WND *wndPtr, RECT32 *rect, BOOL32 incr)
  * If it returns the up rect, it returns TRUE.
  * If it returns the down rect, it returns FALSE.
  */
-static int UPDOWN_GetArrowFromPoint(WND *wndPtr, RECT32 *rect, POINT32 pt)
+static int UPDOWN_GetArrowFromPoint(WND *wndPtr, RECT *rect, POINT pt)
 {
   UPDOWN_GetArrowRect(wndPtr, rect, TRUE);
-  if(PtInRect32(rect, pt))
+  if(PtInRect(rect, pt))
     return TRUE;
 
   UPDOWN_GetArrowRect(wndPtr, rect, FALSE);
@@ -161,7 +161,7 @@ static char UPDOWN_GetThousandSep()
 {
   char sep[2];
 
-  if(GetLocaleInfo32A(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, 
+  if(GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, 
 		      sep, sizeof(sep)) != 1)
     return ',';
 
@@ -176,24 +176,24 @@ static char UPDOWN_GetThousandSep()
  *   TRUE  - if it read the integer from the buddy successfully
  *   FALSE - if an error occured
  */
-static BOOL32 UPDOWN_GetBuddyInt(WND *wndPtr)
+static BOOL UPDOWN_GetBuddyInt(WND *wndPtr)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr);
   char txt[20], sep, *src, *dst;
   int newVal;
 
-  if (!IsWindow32(infoPtr->Buddy))
+  if (!IsWindow(infoPtr->Buddy))
     return FALSE;
 
   /*if the buddy is a list window, we must set curr index */
-  if(WIDGETS_IsControl32(WIN_FindWndPtr(infoPtr->Buddy), BIC32_LISTBOX)){
-    newVal = SendMessage32A(infoPtr->Buddy, LB_GETCARETINDEX32, 0, 0);
+  if(WIDGETS_IsControl(WIN_FindWndPtr(infoPtr->Buddy), BIC32_LISTBOX)){
+    newVal = SendMessageA(infoPtr->Buddy, LB_GETCARETINDEX, 0, 0);
     if(newVal < 0)
       return FALSE;
   }
   else{
     /* we have a regular window, so will get the text */
-    if (!GetWindowText32A(infoPtr->Buddy, txt, sizeof(txt)))
+    if (!GetWindowTextA(infoPtr->Buddy, txt, sizeof(txt)))
       return FALSE;
 
     sep = UPDOWN_GetThousandSep(); 
@@ -225,21 +225,21 @@ static BOOL32 UPDOWN_GetBuddyInt(WND *wndPtr)
  *   TRUE  - if it set the caption of the  buddy successfully
  *   FALSE - if an error occured
  */
-static BOOL32 UPDOWN_SetBuddyInt(WND *wndPtr)
+static BOOL UPDOWN_SetBuddyInt(WND *wndPtr)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr);
   char txt1[20], sep;
   int len;
 
-  if (!IsWindow32(infoPtr->Buddy)) 
+  if (!IsWindow(infoPtr->Buddy)) 
     return FALSE;
 
   TRACE(updown, "set new value(%d) to buddy.\n",
 	       infoPtr->CurVal);
 
   /*if the buddy is a list window, we must set curr index */
-  if(WIDGETS_IsControl32(WIN_FindWndPtr(infoPtr->Buddy), BIC32_LISTBOX)){
-    SendMessage32A(infoPtr->Buddy, LB_SETCURSEL32, infoPtr->CurVal, 0);
+  if(WIDGETS_IsControl(WIN_FindWndPtr(infoPtr->Buddy), BIC32_LISTBOX)){
+    SendMessageA(infoPtr->Buddy, LB_SETCURSEL, infoPtr->CurVal, 0);
   }
   else{ /* Regular window, so set caption to the number */
     len = sprintf(txt1, (infoPtr->Base==16) ? "%X" : "%d", infoPtr->CurVal);
@@ -250,7 +250,7 @@ static BOOL32 UPDOWN_SetBuddyInt(WND *wndPtr)
     if (!(wndPtr->dwStyle & UDS_NOTHOUSANDS) && (len > 3)) {
       char txt2[20], *src = txt1, *dst = txt2;
       if(len%3 > 0){
-	lstrcpyn32A (dst, src, len%3 + 1);      /* need to include the null */ 
+	lstrcpynA (dst, src, len%3 + 1);      /* need to include the null */ 
 	dst += len%3;
 	src += len%3;
       }
@@ -262,7 +262,7 @@ static BOOL32 UPDOWN_SetBuddyInt(WND *wndPtr)
       *dst = 0;           /* null terminate it */
       strcpy(txt1, txt2); /* move it to the proper place */
     }
-    SetWindowText32A(infoPtr->Buddy, txt1);
+    SetWindowTextA(infoPtr->Buddy, txt1);
   }
 
   return TRUE;
@@ -273,28 +273,28 @@ static BOOL32 UPDOWN_SetBuddyInt(WND *wndPtr)
  *
  * Draw the arrows. The background need not be erased.
  */
-static void UPDOWN_Draw (WND *wndPtr, HDC32 hdc)
+static void UPDOWN_Draw (WND *wndPtr, HDC hdc)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr);
-  BOOL32 prssed;
-  RECT32 rect;
+  BOOL prssed;
+  RECT rect;
   
   /* Draw the incr button */
   UPDOWN_GetArrowRect(wndPtr, &rect, TRUE);
   prssed = (infoPtr->Flags & FLAG_INCR) && (infoPtr->Flags & FLAG_MOUSEIN);
-  DrawFrameControl32(hdc, &rect, DFC_SCROLL, 
+  DrawFrameControl(hdc, &rect, DFC_SCROLL, 
 	(wndPtr->dwStyle & UDS_HORZ ? DFCS_SCROLLLEFT : DFCS_SCROLLUP) |
 	(prssed ? DFCS_PUSHED : 0) |
 	(wndPtr->dwStyle&WS_DISABLED ? DFCS_INACTIVE : 0) );
 
   /* Draw the space between the buttons */
   rect.top = rect.bottom; rect.bottom++;
-  DrawEdge32(hdc, &rect, 0, BF_MIDDLE);
+  DrawEdge(hdc, &rect, 0, BF_MIDDLE);
 		    
   /* Draw the decr button */
   UPDOWN_GetArrowRect(wndPtr, &rect, FALSE);
   prssed = (infoPtr->Flags & FLAG_DECR) && (infoPtr->Flags & FLAG_MOUSEIN);
-  DrawFrameControl32(hdc, &rect, DFC_SCROLL, 
+  DrawFrameControl(hdc, &rect, DFC_SCROLL, 
 	(wndPtr->dwStyle & UDS_HORZ ? DFCS_SCROLLRIGHT : DFCS_SCROLLDOWN) |
 	(prssed ? DFCS_PUSHED : 0) |
 	(wndPtr->dwStyle&WS_DISABLED ? DFCS_INACTIVE : 0) );
@@ -308,11 +308,11 @@ static void UPDOWN_Draw (WND *wndPtr, HDC32 hdc)
  */
 static void UPDOWN_Refresh (WND *wndPtr)
 {
-    HDC32 hdc;
+    HDC hdc;
   
-    hdc = GetDC32 (wndPtr->hwndSelf);
+    hdc = GetDC (wndPtr->hwndSelf);
     UPDOWN_Draw (wndPtr, hdc);
-    ReleaseDC32 (wndPtr->hwndSelf, hdc);
+    ReleaseDC (wndPtr->hwndSelf, hdc);
 }
 
 
@@ -324,12 +324,12 @@ static void UPDOWN_Refresh (WND *wndPtr)
  */
 static void UPDOWN_Paint (WND *wndPtr)
 {
-    PAINTSTRUCT32 ps;
-    HDC32 hdc;
+    PAINTSTRUCT ps;
+    HDC hdc;
   
-    hdc = BeginPaint32 (wndPtr->hwndSelf, &ps);
+    hdc = BeginPaint (wndPtr->hwndSelf, &ps);
     UPDOWN_Draw (wndPtr, hdc);
-    EndPaint32 (wndPtr->hwndSelf, &ps);
+    EndPaint (wndPtr->hwndSelf, &ps);
 }
 
 /***********************************************************************
@@ -342,14 +342,14 @@ static void UPDOWN_Paint (WND *wndPtr)
  * If window has the UDS_ALIGNLEFT or UDS_ALIGNRIGHT style
  * the size/pos of the buddy and the control are adjusted accordingly.
  */
-static BOOL32 UPDOWN_SetBuddy(WND *wndPtr, HWND32 hwndBud)
+static BOOL UPDOWN_SetBuddy(WND *wndPtr, HWND hwndBud)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr); 
-  RECT32 budRect; /* new coord for the buddy */
+  RECT budRect; /* new coord for the buddy */
   int x;          /* new x position and width for the up-down */
  	  
   /* Is is a valid bud? */
-  if(!IsWindow32(hwndBud))
+  if(!IsWindow(hwndBud))
     return FALSE;
 
   if(wndPtr->dwStyle & UDS_ARROWKEYS){
@@ -361,9 +361,9 @@ static BOOL32 UPDOWN_SetBuddy(WND *wndPtr, HWND32 hwndBud)
     return TRUE;
 
   /* Get the rect of the buddy relative to its parent */
-  GetWindowRect32(infoPtr->Buddy, &budRect);
-  MapWindowPoints32(HWND_DESKTOP, GetParent32(infoPtr->Buddy),
-		  (POINT32 *)(&budRect.left), 2);
+  GetWindowRect(infoPtr->Buddy, &budRect);
+  MapWindowPoints(HWND_DESKTOP, GetParent(infoPtr->Buddy),
+		  (POINT *)(&budRect.left), 2);
 
   /* now do the positioning */
   if(wndPtr->dwStyle & UDS_ALIGNRIGHT){
@@ -376,7 +376,7 @@ static BOOL32 UPDOWN_SetBuddy(WND *wndPtr, HWND32 hwndBud)
   }
 
   /* first adjust the buddy to accomodate the up/down */
-  SetWindowPos32(infoPtr->Buddy, 0, budRect.left, budRect.top,
+  SetWindowPos(infoPtr->Buddy, 0, budRect.left, budRect.top,
 	       budRect.right  - budRect.left, budRect.bottom - budRect.top, 
 	       SWP_NOACTIVATE|SWP_NOZORDER);
 
@@ -384,7 +384,7 @@ static BOOL32 UPDOWN_SetBuddy(WND *wndPtr, HWND32 hwndBud)
   /* Since the UDS_ALIGN* flags were used, */
   /* we will pick the position and size of the window. */
 
-  SetWindowPos32(wndPtr->hwndSelf,0,x,budRect.top-DEFAULT_ADDTOP,DEFAULT_WIDTH,
+  SetWindowPos(wndPtr->hwndSelf,0,x,budRect.top-DEFAULT_ADDTOP,DEFAULT_WIDTH,
 		 (budRect.bottom-budRect.top)+DEFAULT_ADDTOP+DEFAULT_ADDBOT,
 		 SWP_NOACTIVATE|SWP_NOZORDER);
 
@@ -400,7 +400,7 @@ static BOOL32 UPDOWN_SetBuddy(WND *wndPtr, HWND32 hwndBud)
  * It handles wraping and non-wraping correctly.
  * It is assumed that delta>0
  */
-static void UPDOWN_DoAction(WND *wndPtr, int delta, BOOL32 incr)
+static void UPDOWN_DoAction(WND *wndPtr, int delta, BOOL incr)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr); 
   int old_val = infoPtr->CurVal;
@@ -423,7 +423,7 @@ static void UPDOWN_DoAction(WND *wndPtr, int delta, BOOL32 incr)
   ni.hdr.hwndFrom = wndPtr->hwndSelf;
   ni.hdr.idFrom = wndPtr->wIDmenu;
   ni.hdr.code = UDN_DELTAPOS; 
-  if(SendMessage32A(wndPtr->parent->hwndSelf, 
+  if(SendMessageA(wndPtr->parent->hwndSelf, 
 		    WM_NOTIFY, wndPtr->wIDmenu, (LPARAM)&ni))
     return; /* we are not allowed to change */
   
@@ -432,7 +432,7 @@ static void UPDOWN_DoAction(WND *wndPtr, int delta, BOOL32 incr)
     return;
 
   /* Now take care about our buddy */
-  if(!IsWindow32(infoPtr->Buddy)) 
+  if(!IsWindow(infoPtr->Buddy)) 
     return; /* Nothing else to do */
 
 
@@ -443,7 +443,7 @@ static void UPDOWN_DoAction(WND *wndPtr, int delta, BOOL32 incr)
   /* FIXME: do we need to send the notification only if
             we do not have the UDS_SETBUDDYINT style set? */
 
-  SendMessage32A(GetParent32 (wndPtr->hwndSelf), 
+  SendMessageA(GetParent (wndPtr->hwndSelf), 
 		 wndPtr->dwStyle & UDS_HORZ ? WM_HSCROLL : WM_VSCROLL, 
 		 MAKELONG(incr ? SB_LINEUP : SB_LINEDOWN, infoPtr->CurVal),
 		 wndPtr->hwndSelf);
@@ -455,13 +455,13 @@ static void UPDOWN_DoAction(WND *wndPtr, int delta, BOOL32 incr)
  * Returns TRUE if it is enabled as well as its buddy (if any)
  *         FALSE otherwise
  */
-static BOOL32 UPDOWN_IsEnabled(WND *wndPtr)
+static BOOL UPDOWN_IsEnabled(WND *wndPtr)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr);
 
   if(wndPtr->dwStyle & WS_DISABLED)
     return FALSE;
-  return IsWindowEnabled32(infoPtr->Buddy);
+  return IsWindowEnabled(infoPtr->Buddy);
 }
 
 /***********************************************************************
@@ -472,7 +472,7 @@ static BOOL32 UPDOWN_IsEnabled(WND *wndPtr)
  * If the control was not in cancel mode, it returns FALSE. 
  * If the control was in cancel mode, it returns TRUE.
  */
-static BOOL32 UPDOWN_CancelMode(WND *wndPtr)
+static BOOL UPDOWN_CancelMode(WND *wndPtr)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr);
  
@@ -480,10 +480,10 @@ static BOOL32 UPDOWN_CancelMode(WND *wndPtr)
   if(!(infoPtr->Flags & FLAG_CLICKED))
     return FALSE;
 
-  KillTimer32(wndPtr->hwndSelf, TIMERID1); /* kill all possible timers */
-  KillTimer32(wndPtr->hwndSelf, TIMERID2);
+  KillTimer(wndPtr->hwndSelf, TIMERID1); /* kill all possible timers */
+  KillTimer(wndPtr->hwndSelf, TIMERID2);
   
-  if(GetCapture32() == wndPtr->hwndSelf)   /* let the mouse go         */
+  if(GetCapture() == wndPtr->hwndSelf)   /* let the mouse go         */
     ReleaseCapture();          /* if we still have it      */  
   
   infoPtr->Flags = 0;          /* get rid of any flags     */
@@ -499,10 +499,10 @@ static BOOL32 UPDOWN_CancelMode(WND *wndPtr)
  * 'pt' is the location of the mouse event in client or
  * windows coordinates. 
  */
-static void UPDOWN_HandleMouseEvent(WND *wndPtr, UINT32 msg, POINT32 pt)
+static void UPDOWN_HandleMouseEvent(WND *wndPtr, UINT msg, POINT pt)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(wndPtr);
-  RECT32 rect;
+  RECT rect;
   int temp;
 
   switch(msg)
@@ -513,8 +513,8 @@ static void UPDOWN_HandleMouseEvent(WND *wndPtr, UINT32 msg, POINT32 pt)
 	return;
 
       /* If the buddy is an edit, will set focus to it */
-      if(WIDGETS_IsControl32(WIN_FindWndPtr(infoPtr->Buddy), BIC32_EDIT))
-	SetFocus32(infoPtr->Buddy);
+      if(WIDGETS_IsControl(WIN_FindWndPtr(infoPtr->Buddy), BIC32_EDIT))
+	SetFocus(infoPtr->Buddy);
 
       /* Now see which one is the 'active' arrow */
       temp = UPDOWN_GetArrowFromPoint(wndPtr, &rect, pt);
@@ -541,10 +541,10 @@ static void UPDOWN_HandleMouseEvent(WND *wndPtr, UINT32 msg, POINT32 pt)
       UPDOWN_DoAction(wndPtr, 1, infoPtr->Flags & FLAG_INCR);
 
       /* now capture all mouse messages */
-      SetCapture32(wndPtr->hwndSelf);
+      SetCapture(wndPtr->hwndSelf);
 
       /* and startup the first timer */
-      SetTimer32(wndPtr->hwndSelf, TIMERID1, INITIAL_DELAY, 0); 
+      SetTimer(wndPtr->hwndSelf, TIMERID1, INITIAL_DELAY, 0); 
       break;
 
     case WM_MOUSEMOVE:
@@ -562,7 +562,7 @@ static void UPDOWN_HandleMouseEvent(WND *wndPtr, UINT32 msg, POINT32 pt)
 	UPDOWN_GetArrowRect(wndPtr, &rect, FALSE);
 
       /* Update the flags if we are in/out */
-      if(PtInRect32(&rect, pt))
+      if(PtInRect(&rect, pt))
 	infoPtr->Flags |=  FLAG_MOUSEIN;
       else{
 	infoPtr->Flags &= ~FLAG_MOUSEIN;
@@ -583,7 +583,7 @@ static void UPDOWN_HandleMouseEvent(WND *wndPtr, UINT32 msg, POINT32 pt)
 /***********************************************************************
  *           UpDownWndProc
  */
-LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
+LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
 				LPARAM lParam)
 {
   WND *wndPtr = WIN_FindWndPtr(hwnd);
@@ -610,7 +610,7 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 
       /* Do we pick the buddy win ourselves? */
       if(wndPtr->dwStyle & UDS_AUTOBUDDY)
-	UPDOWN_SetBuddy(wndPtr, GetWindow32(wndPtr->hwndSelf, GW_HWNDPREV));
+	UPDOWN_SetBuddy(wndPtr, GetWindow(wndPtr->hwndSelf, GW_HWNDPREV));
 	
       TRACE(updown, "UpDown Ctrl creation, hwnd=%04x\n", hwnd);
       break;
@@ -634,7 +634,7 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
     case WM_TIMER:
       /* if initial timer, kill it and start the repeat timer */
       if(wParam == TIMERID1){
-	KillTimer32(hwnd, TIMERID1);
+	KillTimer(hwnd, TIMERID1);
 	/* if no accel info given, used default timer */
 	if(infoPtr->AccelCount==0 || infoPtr->AccelVect==0){
 	  accelIndex = -1;
@@ -644,7 +644,7 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 	  accelIndex = 0; /* otherwise, use it */
 	  temp = infoPtr->AccelVect[accelIndex].nSec * 1000 + 1;
 	}
-	SetTimer32(hwnd, TIMERID2, temp, 0);
+	SetTimer(hwnd, TIMERID2, temp, 0);
       }
 
       /* now, if the mouse is above us, do the thing...*/
@@ -653,11 +653,11 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 	UPDOWN_DoAction(wndPtr, temp, infoPtr->Flags & FLAG_INCR);
 	
 	if(accelIndex!=-1 && accelIndex < infoPtr->AccelCount-1){
-	  KillTimer32(hwnd, TIMERID2);
+	  KillTimer(hwnd, TIMERID2);
 	  accelIndex++; /* move to the next accel info */
 	  temp = infoPtr->AccelVect[accelIndex].nSec * 1000 + 1;
 	  /* make sure we have at least 1ms intervals */
-	  SetTimer32(hwnd, TIMERID2, temp, 0);	    
+	  SetTimer(hwnd, TIMERID2, temp, 0);	    
 	}
       }
       break;
@@ -671,14 +671,14 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 	break;
       /*If we released the mouse and our buddy is an edit */
       /* we must select all text in it.                   */
-      if(WIDGETS_IsControl32(WIN_FindWndPtr(infoPtr->Buddy), BIC32_EDIT))
-	SendMessage32A(infoPtr->Buddy, EM_SETSEL32, 0, MAKELONG(0, -1));
+      if(WIDGETS_IsControl(WIN_FindWndPtr(infoPtr->Buddy), BIC32_EDIT))
+	SendMessageA(infoPtr->Buddy, EM_SETSEL, 0, MAKELONG(0, -1));
       break;
       
     case WM_LBUTTONDOWN:
     case WM_MOUSEMOVE:
       if(UPDOWN_IsEnabled(wndPtr)){
-	POINT32 pt;
+	POINT pt;
 	CONV_POINT16TO32( (POINT16 *)&lParam, &pt );
 	UPDOWN_HandleMouseEvent( wndPtr, message, pt );
       }
@@ -782,14 +782,14 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 	UPDOWN_SetBuddyInt(wndPtr);
       return wParam;            /* return prev value */
       
-    case UDM_GETRANGE:
+    case UDM_GETRANGE16:
       if (wParam || lParam)
-	UNKNOWN_PARAM(UDM_GETRANGE, wParam, lParam);
+	UNKNOWN_PARAM(UDM_GETRANGE16, wParam, lParam);
       return MAKELONG(infoPtr->MaxVal, infoPtr->MinVal);
 
-    case UDM_SETRANGE:
+    case UDM_SETRANGE16:
       if (wParam)
-	UNKNOWN_PARAM(UDM_SETRANGE, wParam, lParam); /* we must have:     */
+	UNKNOWN_PARAM(UDM_SETRANGE16, wParam, lParam); /* we must have:     */
       infoPtr->MaxVal = SLOWORD(lParam); /* UD_MINVAL <= Max <= UD_MAXVAL */
       infoPtr->MinVal = SHIWORD(lParam); /* UD_MINVAL <= Min <= UD_MAXVAL */
                                          /* |Max-Min| <= UD_MAXVAL        */
@@ -797,16 +797,16 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 		     infoPtr->MinVal, infoPtr->MaxVal, hwnd);
       break;                             
 
-    case UDM_GETRANGE32:
+    case UDM_GETRANGE:
       if (wParam)
-	*(LPINT32)wParam = infoPtr->MinVal;
+	*(LPINT)wParam = infoPtr->MinVal;
       if (lParam)
-	*(LPINT32)lParam = infoPtr->MaxVal;
+	*(LPINT)lParam = infoPtr->MaxVal;
       break;
 
-    case UDM_SETRANGE32:
-      infoPtr->MinVal = (INT32)wParam;
-      infoPtr->MaxVal = (INT32)lParam;
+    case UDM_SETRANGE:
+      infoPtr->MinVal = (INT)wParam;
+      infoPtr->MaxVal = (INT)lParam;
       if (infoPtr->MaxVal <= infoPtr->MinVal)
 	infoPtr->MaxVal = infoPtr->MinVal + 1;
       TRACE(updown, "UpDown Ctrl new range(%d to %d), hwnd=%04x\n", 
@@ -817,7 +817,7 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
       if (message >= WM_USER) 
 	ERR (updown, "unknown msg %04x wp=%04x lp=%08lx\n", 
 	     message, wParam, lParam);
-      return DefWindowProc32A (hwnd, message, wParam, lParam); 
+      return DefWindowProcA (hwnd, message, wParam, lParam); 
     } 
 
     return 0;
@@ -833,20 +833,20 @@ LRESULT WINAPI UpDownWindowProc(HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 VOID
 UPDOWN_Register(void)
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    if( GlobalFindAtom32A( UPDOWN_CLASS32A ) ) return;
+    if( GlobalFindAtomA( UPDOWN_CLASSA ) ) return;
 
-    ZeroMemory( &wndClass, sizeof( WNDCLASS32A ) );
+    ZeroMemory( &wndClass, sizeof( WNDCLASSA ) );
     wndClass.style         = CS_GLOBALCLASS | CS_VREDRAW;
-    wndClass.lpfnWndProc   = (WNDPROC32)UpDownWindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)UpDownWindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(UPDOWN_INFO*);
-    wndClass.hCursor       = LoadCursor32A( 0, IDC_ARROW32A );
-    wndClass.hbrBackground = (HBRUSH32)(COLOR_3DFACE + 1);
-    wndClass.lpszClassName = UPDOWN_CLASS32A;
+    wndClass.hCursor       = LoadCursorA( 0, IDC_ARROWA );
+    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
+    wndClass.lpszClassName = UPDOWN_CLASSA;
  
-    RegisterClass32A( &wndClass );
+    RegisterClassA( &wndClass );
 }
 
 
@@ -859,7 +859,7 @@ UPDOWN_Register(void)
 VOID
 UPDOWN_Unregister (VOID)
 {
-    if (GlobalFindAtom32A (UPDOWN_CLASS32A))
-	UnregisterClass32A (UPDOWN_CLASS32A, (HINSTANCE32)NULL);
+    if (GlobalFindAtomA (UPDOWN_CLASSA))
+	UnregisterClassA (UPDOWN_CLASSA, (HINSTANCE)NULL);
 }
 
diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c
index 1d6374797c3..30c44fa39ed 100644
--- a/dlls/imagehlp/access.c
+++ b/dlls/imagehlp/access.c
@@ -16,10 +16,10 @@
  *           Data
  */
 
-static PLOADED_IMAGE32 IMAGEHLP_pFirstLoadedImage32=NULL;
-static PLOADED_IMAGE32 IMAGEHLP_pLastLoadedImage32=NULL;
+static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL;
+static PLOADED_IMAGE IMAGEHLP_pLastLoadedImage=NULL;
 
-static LOADED_IMAGE32 IMAGEHLP_EmptyLoadedImage32 = {
+static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = {
   NULL,       /* ModuleName */
   0xffffffff, /* hFile */
   NULL,       /* MappedAddress */
@@ -30,16 +30,16 @@ static LOADED_IMAGE32 IMAGEHLP_EmptyLoadedImage32 = {
   1,          /* Characteristics */
   FALSE,      /* fSystemImage */
   FALSE,      /* fDOSImage */
-  { &IMAGEHLP_EmptyLoadedImage32.Links, &IMAGEHLP_EmptyLoadedImage32.Links }, /* Links */
+  { &IMAGEHLP_EmptyLoadedImage.Links, &IMAGEHLP_EmptyLoadedImage.Links }, /* Links */
   148,        /* SizeOfImage; */
 };
 
 /***********************************************************************
  *           EnumerateLoadedModules32 (IMAGEHLP.4)
  */
-BOOL32 WINAPI EnumerateLoadedModules32(
-  HANDLE32 hProcess,
-  PENUMLOADED_MODULES_CALLBACK32 EnumLoadedModulesCallback,
+BOOL WINAPI EnumerateLoadedModules(
+  HANDLE hProcess,
+  PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback,
   PVOID UserContext)
 {
   FIXME(imagehlp, "(0x%08x, %p, %p): stub\n",
@@ -52,7 +52,7 @@ BOOL32 WINAPI EnumerateLoadedModules32(
 /***********************************************************************
  *           GetTimestampForLoadedLibrary32 (IMAGEHLP.9)
  */
-DWORD WINAPI GetTimestampForLoadedLibrary32(HMODULE32 Module)
+DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE Module)
 {
   FIXME(imagehlp, "(0x%08x): stub\n", Module);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -62,9 +62,9 @@ DWORD WINAPI GetTimestampForLoadedLibrary32(HMODULE32 Module)
 /***********************************************************************
  *           GetImageConfigInformation32 (IMAGEHLP.7)
  */
-BOOL32 WINAPI GetImageConfigInformation32(
-  PLOADED_IMAGE32 LoadedImage,
-  PIMAGE_LOAD_CONFIG_DIRECTORY32 ImageConfigInformation)
+BOOL WINAPI GetImageConfigInformation(
+  PLOADED_IMAGE LoadedImage,
+  PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation)
 {
   FIXME(imagehlp, "(%p, %p): stub\n",
     LoadedImage, ImageConfigInformation
@@ -76,8 +76,8 @@ BOOL32 WINAPI GetImageConfigInformation32(
 /***********************************************************************
  *           GetImageUnusedHeaderBytes32 (IMAGEHLP.8)
  */
-DWORD WINAPI GetImageUnusedHeaderBytes32(
-  PLOADED_IMAGE32 LoadedImage,
+DWORD WINAPI GetImageUnusedHeaderBytes(
+  PLOADED_IMAGE LoadedImage,
   LPDWORD SizeUnusedHeaderBytes)
 {
   FIXME(imagehlp, "(%p, %p): stub\n",
@@ -90,7 +90,7 @@ DWORD WINAPI GetImageUnusedHeaderBytes32(
 /***********************************************************************
  *           ImageDirectoryEntryToData32 (IMAGEHLP.11)
  */
-PVOID WINAPI ImageDirectoryEntryToData32(
+PVOID WINAPI ImageDirectoryEntryToData(
   PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
 {
   FIXME(imagehlp, "(%p, %d, %d, %p): stub\n",
@@ -103,27 +103,27 @@ PVOID WINAPI ImageDirectoryEntryToData32(
 /***********************************************************************
  *           ImageLoad32 (IMAGEHLP.16)
  */
-PLOADED_IMAGE32 WINAPI ImageLoad32(LPSTR DllName, LPSTR DllPath)
+PLOADED_IMAGE WINAPI ImageLoad(LPSTR DllName, LPSTR DllPath)
 {
-  PLOADED_IMAGE32 pLoadedImage = 
-    HeapAlloc(IMAGEHLP_hHeap32, 0, sizeof(LOADED_IMAGE32));
+  PLOADED_IMAGE pLoadedImage = 
+    HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE));
   return pLoadedImage;
 }
 
 /***********************************************************************
  *           ImageNtHeader32 (IMAGEHLP.17)
  */
-PIMAGE_NT_HEADERS32 WINAPI ImageNtHeader32(PVOID Base)
+PIMAGE_NT_HEADERS WINAPI ImageNtHeader(PVOID Base)
 {
-  return (PIMAGE_NT_HEADERS32)
-    ((LPBYTE) Base + ((PIMAGE_DOS_HEADER32) Base)->e_lfanew);
+  return (PIMAGE_NT_HEADERS)
+    ((LPBYTE) Base + ((PIMAGE_DOS_HEADER) Base)->e_lfanew);
 }
 
 /***********************************************************************
  *           ImageRvaToSection32 (IMAGEHLP.19)
  */
-PIMAGE_SECTION_HEADER32 WINAPI ImageRvaToSection32(
-  PIMAGE_NT_HEADERS32 NtHeaders, PVOID Base, ULONG Rva)
+PIMAGE_SECTION_HEADER WINAPI ImageRvaToSection(
+  PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva)
 {
   FIXME(imagehlp, "(%p, %p, %ld): stub\n", NtHeaders, Base, Rva);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -133,9 +133,9 @@ PIMAGE_SECTION_HEADER32 WINAPI ImageRvaToSection32(
 /***********************************************************************
  *           ImageRvaToVa32 (IMAGEHLP.20)
  */
-PVOID WINAPI ImageRvaToVa32(
-  PIMAGE_NT_HEADERS32 NtHeaders, PVOID Base, ULONG Rva,
-  PIMAGE_SECTION_HEADER32 *LastRvaSection)
+PVOID WINAPI ImageRvaToVa(
+  PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva,
+  PIMAGE_SECTION_HEADER *LastRvaSection)
 {
   FIXME(imagehlp, "(%p, %p, %ld, %p): stub\n",
     NtHeaders, Base, Rva, LastRvaSection
@@ -147,10 +147,10 @@ PVOID WINAPI ImageRvaToVa32(
 /***********************************************************************
  *           ImageUnload32 (IMAGEHLP.21)
  */
-BOOL32 WINAPI ImageUnload32(PLOADED_IMAGE32 pLoadedImage)
+BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage)
 {
-  LIST_ENTRY32 *pCurrent, *pFind;
-  if(!IMAGEHLP_pFirstLoadedImage32 || !pLoadedImage)
+  LIST_ENTRY *pCurrent, *pFind;
+  if(!IMAGEHLP_pFirstLoadedImage || !pLoadedImage)
     {
       /* No image loaded or null pointer */
       SetLastError(ERROR_INVALID_PARAMETER);
@@ -158,7 +158,7 @@ BOOL32 WINAPI ImageUnload32(PLOADED_IMAGE32 pLoadedImage)
     }
 
   pFind=&pLoadedImage->Links;
-  pCurrent=&IMAGEHLP_pFirstLoadedImage32->Links;
+  pCurrent=&IMAGEHLP_pFirstLoadedImage->Links;
   while((pCurrent != pFind) && 
     (pCurrent != NULL)) 
       pCurrent = pCurrent->Flink;
@@ -172,14 +172,14 @@ BOOL32 WINAPI ImageUnload32(PLOADED_IMAGE32 pLoadedImage)
   if(pCurrent->Blink)
     pCurrent->Blink->Flink = pCurrent->Flink;
   else
-    IMAGEHLP_pFirstLoadedImage32 = pCurrent->Flink?CONTAINING_RECORD(
-      pCurrent->Flink, LOADED_IMAGE32, Links):NULL;
+    IMAGEHLP_pFirstLoadedImage = pCurrent->Flink?CONTAINING_RECORD(
+      pCurrent->Flink, LOADED_IMAGE, Links):NULL;
 
   if(pCurrent->Flink)
     pCurrent->Flink->Blink = pCurrent->Blink;
   else
-    IMAGEHLP_pLastLoadedImage32 = pCurrent->Blink?CONTAINING_RECORD(
-      pCurrent->Blink, LOADED_IMAGE32, Links):NULL;
+    IMAGEHLP_pLastLoadedImage = pCurrent->Blink?CONTAINING_RECORD(
+      pCurrent->Blink, LOADED_IMAGE, Links):NULL;
 
   return FALSE;
 }
@@ -187,29 +187,29 @@ BOOL32 WINAPI ImageUnload32(PLOADED_IMAGE32 pLoadedImage)
 /***********************************************************************
  *           MapAndLoad32 (IMAGEHLP.25)
  */
-BOOL32 WINAPI MapAndLoad32(
-  LPSTR pszImageName, LPSTR pszDllPath, PLOADED_IMAGE32 pLoadedImage,
-  BOOL32 bDotDll, BOOL32 bReadOnly)
+BOOL WINAPI MapAndLoad(
+  LPSTR pszImageName, LPSTR pszDllPath, PLOADED_IMAGE pLoadedImage,
+  BOOL bDotDll, BOOL bReadOnly)
 {
   CHAR szFileName[MAX_PATH];
-  HANDLE32 hFile = (HANDLE32) NULL;
-  HANDLE32 hFileMapping = (HANDLE32) NULL;
-  HMODULE32 hModule = (HMODULE32) NULL;
-  PIMAGE_NT_HEADERS32 pNtHeader = NULL;
+  HANDLE hFile = (HANDLE) NULL;
+  HANDLE hFileMapping = (HANDLE) NULL;
+  HMODULE hModule = (HMODULE) NULL;
+  PIMAGE_NT_HEADERS pNtHeader = NULL;
 
   /* PathCombine(&szFileName, pszDllPath, pszImageName); */
   /* PathRenameExtension(&szFileName, bDotDll?:"dll":"exe"); */
 
   /* FIXME: Check if the file already loaded (use IMAGEHLP_pFirstLoadedImage32) */
-  if(!(hFile = CreateFile32A(
+  if(!(hFile = CreateFileA(
     szFileName, GENERIC_READ, 1, /* FIXME: FILE_SHARE_READ not defined */
-    NULL, OPEN_EXISTING, 0, (HANDLE32) NULL)))
+    NULL, OPEN_EXISTING, 0, (HANDLE) NULL)))
     {
       SetLastError(ERROR_FILE_NOT_FOUND);
       goto Error;
     }
 
-  if(!(hFileMapping = CreateFileMapping32A(
+  if(!(hFileMapping = CreateFileMappingA(
     hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL)))
     {
       DWORD dwLastError = GetLastError();
@@ -218,9 +218,9 @@ BOOL32 WINAPI MapAndLoad32(
       goto Error;
     }
   CloseHandle(hFile);
-  hFile = (HANDLE32) NULL;
+  hFile = (HANDLE) NULL;
 
-  if(!(hModule = (HMODULE32) MapViewOfFile(
+  if(!(hModule = (HMODULE) MapViewOfFile(
     hFileMapping, FILE_MAP_READ, 0, 0, 0)))
     {
       DWORD dwLastError = GetLastError();
@@ -230,20 +230,20 @@ BOOL32 WINAPI MapAndLoad32(
     }
 
   CloseHandle(hFileMapping);
-  hFileMapping=(HANDLE32) NULL;
+  hFileMapping=(HANDLE) NULL;
 
-  pLoadedImage = (PLOADED_IMAGE32) HeapAlloc(
-    IMAGEHLP_hHeap32, 0, sizeof(LOADED_IMAGE32)
+  pLoadedImage = (PLOADED_IMAGE) HeapAlloc(
+    IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE)
   );
 
-  pNtHeader = ImageNtHeader32((PVOID) hModule);
+  pNtHeader = ImageNtHeader((PVOID) hModule);
 
   pLoadedImage->ModuleName =
-    HEAP_strdupA(IMAGEHLP_hHeap32, 0, pszDllPath); /* FIXME: Correct? */
+    HEAP_strdupA(IMAGEHLP_hHeap, 0, pszDllPath); /* FIXME: Correct? */
   pLoadedImage->hFile = hFile;
   pLoadedImage->MappedAddress = (PUCHAR) hModule;
   pLoadedImage->FileHeader = pNtHeader;
-  pLoadedImage->Sections = (PIMAGE_SECTION_HEADER32)
+  pLoadedImage->Sections = (PIMAGE_SECTION_HEADER)
     ((LPBYTE) &pNtHeader->OptionalHeader +
       pNtHeader->FileHeader.SizeOfOptionalHeader);
   pLoadedImage->NumberOfSections =
@@ -259,12 +259,12 @@ BOOL32 WINAPI MapAndLoad32(
 
   /* FIXME: Make thread safe */
   pLoadedImage->Links.Flink = NULL;
-  pLoadedImage->Links.Blink = &IMAGEHLP_pLastLoadedImage32->Links;
-  if(IMAGEHLP_pLastLoadedImage32)
-    IMAGEHLP_pLastLoadedImage32->Links.Flink = &pLoadedImage->Links;
-  IMAGEHLP_pLastLoadedImage32 = pLoadedImage;
-  if(!IMAGEHLP_pFirstLoadedImage32)
-    IMAGEHLP_pFirstLoadedImage32 = pLoadedImage;
+  pLoadedImage->Links.Blink = &IMAGEHLP_pLastLoadedImage->Links;
+  if(IMAGEHLP_pLastLoadedImage)
+    IMAGEHLP_pLastLoadedImage->Links.Flink = &pLoadedImage->Links;
+  IMAGEHLP_pLastLoadedImage = pLoadedImage;
+  if(!IMAGEHLP_pFirstLoadedImage)
+    IMAGEHLP_pFirstLoadedImage = pLoadedImage;
 
   return TRUE;
 
@@ -281,9 +281,9 @@ Error:
 /***********************************************************************
  *           SetImageConfigInformation32 (IMAGEHLP.34)
  */
-BOOL32 WINAPI SetImageConfigInformation32(
-  PLOADED_IMAGE32 LoadedImage,
-  PIMAGE_LOAD_CONFIG_DIRECTORY32 ImageConfigInformation)
+BOOL WINAPI SetImageConfigInformation(
+  PLOADED_IMAGE LoadedImage,
+  PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation)
 {
   FIXME(imagehlp, "(%p, %p): stub\n",
     LoadedImage, ImageConfigInformation
@@ -295,7 +295,7 @@ BOOL32 WINAPI SetImageConfigInformation32(
 /***********************************************************************
  *           UnMapAndLoad32 (IMAGEHLP.58)
  */
-BOOL32 WINAPI UnMapAndLoad32(PLOADED_IMAGE32 LoadedImage)
+BOOL WINAPI UnMapAndLoad(PLOADED_IMAGE LoadedImage)
 {
   FIXME(imagehlp, "(%p): stub\n", LoadedImage);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/imagehlp/debug.c b/dlls/imagehlp/debug.c
index c92b1bbd987..5e7a5edbecf 100644
--- a/dlls/imagehlp/debug.c
+++ b/dlls/imagehlp/debug.c
@@ -13,7 +13,7 @@
 /***********************************************************************
  *           FindDebugInfoFile32 (IMAGEHLP.5)
  */
-HANDLE32 WINAPI FindDebugInfoFile32(
+HANDLE WINAPI FindDebugInfoFile(
   LPSTR FileName, LPSTR SymbolPath, LPSTR DebugFilePath)
 {
   FIXME(imagehlp, "(%s, %s, %s): stub\n",
@@ -21,13 +21,13 @@ HANDLE32 WINAPI FindDebugInfoFile32(
     debugstr_a(DebugFilePath)
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return (HANDLE32) NULL;
+  return (HANDLE) NULL;
 }
 
 /***********************************************************************
  *           FindExecutableImage32 (IMAGEHLP.6)
  */
-HANDLE32 WINAPI FindExecutableImage32(
+HANDLE WINAPI FindExecutableImage(
   LPSTR FileName, LPSTR SymbolPath, LPSTR ImageFilePath)
 {
   FIXME(imagehlp, "(%s, %s, %s): stub\n",
@@ -35,14 +35,14 @@ HANDLE32 WINAPI FindExecutableImage32(
     debugstr_a(ImageFilePath)
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return (HANDLE32) NULL;
+  return (HANDLE) NULL;
 }
 
 /***********************************************************************
  *           MapDebugInformation32 (IMAGEHLP.26)
  */
-PIMAGE_DEBUG_INFORMATION32 WINAPI MapDebugInformation32(
-  HANDLE32 FileHandle, LPSTR FileName,
+PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(
+  HANDLE FileHandle, LPSTR FileName,
   LPSTR SymbolPath, DWORD ImageBase)
 {
   FIXME(imagehlp, "(0x%08x, %s, %s, 0x%08lx): stub\n",
@@ -55,13 +55,13 @@ PIMAGE_DEBUG_INFORMATION32 WINAPI MapDebugInformation32(
 /***********************************************************************
  *           StackWalk32 (IMAGEHLP.36)
  */
-BOOL32 WINAPI StackWalk32(
-  DWORD MachineType, HANDLE32 hProcess, HANDLE32 hThread,
-  PSTACKFRAME32 StackFrame, PVOID ContextRecord,
-  PREAD_PROCESS_MEMORY_ROUTINE32 ReadMemoryRoutine,
-  PFUNCTION_TABLE_ACCESS_ROUTINE32 FunctionTableAccessRoutine,
-  PGET_MODULE_BASE_ROUTINE32 GetModuleBaseRoutine,
-  PTRANSLATE_ADDRESS_ROUTINE32 TranslateAddress)
+BOOL WINAPI StackWalk(
+  DWORD MachineType, HANDLE hProcess, HANDLE hThread,
+  PSTACKFRAME StackFrame, PVOID ContextRecord,
+  PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine,
+  PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine,
+  PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,
+  PTRANSLATE_ADDRESS_ROUTINE TranslateAddress)
 {
   FIXME(imagehlp,
     "(%ld, 0x%08x, 0x%08x, %p, %p, %p, %p, %p, %p): stub\n",
@@ -76,7 +76,7 @@ BOOL32 WINAPI StackWalk32(
 /***********************************************************************
  *           UnDecorateSymbolName32 (IMAGEHLP.57)
  */
-DWORD WINAPI UnDecorateSymbolName32(
+DWORD WINAPI UnDecorateSymbolName(
   LPCSTR DecoratedName, LPSTR UnDecoratedName,
   DWORD UndecoratedLength, DWORD Flags)
 {
@@ -92,8 +92,8 @@ DWORD WINAPI UnDecorateSymbolName32(
  *           UnmapDebugInformation32 (IMAGEHLP.59)
  */
 
-BOOL32 WINAPI UnmapDebugInformation32(
-  PIMAGE_DEBUG_INFORMATION32 DebugInfo)
+BOOL WINAPI UnmapDebugInformation(
+  PIMAGE_DEBUG_INFORMATION DebugInfo)
 {
   FIXME(imagehlp, "(%p): stub\n", DebugInfo);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c
index cc769458b2f..2542e84859b 100644
--- a/dlls/imagehlp/imagehlp_main.c
+++ b/dlls/imagehlp/imagehlp_main.c
@@ -12,24 +12,24 @@
 
 /**********************************************************************/
 
-HANDLE32 IMAGEHLP_hHeap32 = (HANDLE32) NULL;
+HANDLE IMAGEHLP_hHeap = (HANDLE) NULL;
 
-static API_VERSION32 IMAGEHLP_ApiVersion = { 4, 0, 0, 5 };
+static API_VERSION IMAGEHLP_ApiVersion = { 4, 0, 0, 5 };
 
 /***********************************************************************
  *           IMAGEHLP_LibMain (IMAGEHLP.init)
  */
-BOOL32 WINAPI IMAGEHLP_LibMain(
-  HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI IMAGEHLP_LibMain(
+  HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
   switch(fdwReason)
     {
     case DLL_PROCESS_ATTACH:
-      IMAGEHLP_hHeap32 = HeapCreate(0, 0x10000, 0);
+      IMAGEHLP_hHeap = HeapCreate(0, 0x10000, 0);
       break;
     case DLL_PROCESS_DETACH:
-      HeapDestroy(IMAGEHLP_hHeap32);
-      IMAGEHLP_hHeap32 = (HANDLE32) NULL;
+      HeapDestroy(IMAGEHLP_hHeap);
+      IMAGEHLP_hHeap = (HANDLE) NULL;
       break;
     case DLL_THREAD_ATTACH:
       break;
@@ -44,7 +44,7 @@ BOOL32 WINAPI IMAGEHLP_LibMain(
 /***********************************************************************
  *           ImagehlpApiVersion32 (IMAGEHLP.22)
  */
-PAPI_VERSION32 WINAPI ImagehlpApiVersion32()
+PAPI_VERSION WINAPI ImagehlpApiVersion()
 {
   return &IMAGEHLP_ApiVersion;
 }
@@ -52,7 +52,7 @@ PAPI_VERSION32 WINAPI ImagehlpApiVersion32()
 /***********************************************************************
  *           ImagehlpApiVersionEx32 (IMAGEHLP.23)
  */
-PAPI_VERSION32 WINAPI ImagehlpApiVersionEx32(PAPI_VERSION32 AppVersion)
+PAPI_VERSION WINAPI ImagehlpApiVersionEx(PAPI_VERSION AppVersion)
 {
   if(!AppVersion)
     return NULL;
@@ -68,7 +68,7 @@ PAPI_VERSION32 WINAPI ImagehlpApiVersionEx32(PAPI_VERSION32 AppVersion)
 /***********************************************************************
  *           MakeSureDirectoryPathExists32 (IMAGEHLP.24)
  */
-BOOL32 WINAPI MakeSureDirectoryPathExists32(LPCSTR DirPath)
+BOOL WINAPI MakeSureDirectoryPathExists(LPCSTR DirPath)
 {
   FIXME(imagehlp, "(%s): stub\n", debugstr_a(DirPath));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -84,7 +84,7 @@ BOOL32 WINAPI MakeSureDirectoryPathExists32(LPCSTR DirPath)
 /***********************************************************************
  *           SearchTreeForFile32 (IMAGEHLP.33)
  */
-BOOL32 WINAPI SearchTreeForFile32(
+BOOL WINAPI SearchTreeForFile(
   LPSTR RootPath, LPSTR InputPathName, LPSTR OutputPathBuffer)
 {
   FIXME(imagehlp, "(%s, %s, %s): stub\n",
@@ -98,8 +98,8 @@ BOOL32 WINAPI SearchTreeForFile32(
 /***********************************************************************
  *           TouchFileTimes32 (IMAGEHLP.56)
  */
-BOOL32 WINAPI TouchFileTimes32(
-  HANDLE32 FileHandle, LPSYSTEMTIME lpSystemTime)
+BOOL WINAPI TouchFileTimes(
+  HANDLE FileHandle, LPSYSTEMTIME lpSystemTime)
 {
   FIXME(imagehlp, "(0x%08x, %p): stub\n",
     FileHandle, lpSystemTime
diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c
index c15308d3c81..ef5126f1de2 100644
--- a/dlls/imagehlp/integrity.c
+++ b/dlls/imagehlp/integrity.c
@@ -14,8 +14,8 @@
  *           ImageAddCertificate32 (IMAGEHLP.10)
  */
 
-BOOL32 WINAPI ImageAddCertificate32(
-  HANDLE32 FileHandle, PWIN_CERTIFICATE32 Certificate, PDWORD Index)
+BOOL WINAPI ImageAddCertificate(
+  HANDLE FileHandle, PWIN_CERTIFICATE Certificate, PDWORD Index)
 {
   FIXME(imagehlp, "(0x%08x, %p, %p): stub\n",
     FileHandle, Certificate, Index
@@ -27,8 +27,8 @@ BOOL32 WINAPI ImageAddCertificate32(
 /***********************************************************************
  *           ImageEnumerateCertificates32 (IMAGEHLP.12)
  */
-BOOL32 WINAPI ImageEnumerateCertificates32(
-  HANDLE32 FileHandle, WORD TypeFilter, PDWORD CertificateCount,
+BOOL WINAPI ImageEnumerateCertificates(
+  HANDLE FileHandle, WORD TypeFilter, PDWORD CertificateCount,
   PDWORD Indices, DWORD IndexCount)
 {
   FIXME(imagehlp, "(0x%08x, %hd, %p, %p, %ld): stub\n",
@@ -41,9 +41,9 @@ BOOL32 WINAPI ImageEnumerateCertificates32(
 /***********************************************************************
  *           ImageGetCertificateData32 (IMAGEHLP.13)
  */
-BOOL32 WINAPI ImageGetCertificateData32(
-  HANDLE32 FileHandle, DWORD CertificateIndex,
-  PWIN_CERTIFICATE32 Certificate, PDWORD RequiredLength)
+BOOL WINAPI ImageGetCertificateData(
+  HANDLE FileHandle, DWORD CertificateIndex,
+  PWIN_CERTIFICATE Certificate, PDWORD RequiredLength)
 {
   FIXME(imagehlp, "(0x%08x, %ld, %p, %p): stub\n",
     FileHandle, CertificateIndex, Certificate, RequiredLength
@@ -55,9 +55,9 @@ BOOL32 WINAPI ImageGetCertificateData32(
 /***********************************************************************
  *           ImageGetCertificateHeader32 (IMAGEHLP.14)
  */
-BOOL32 WINAPI ImageGetCertificateHeader32(
-  HANDLE32 FileHandle, DWORD CertificateIndex,
-  PWIN_CERTIFICATE32 Certificateheader)
+BOOL WINAPI ImageGetCertificateHeader(
+  HANDLE FileHandle, DWORD CertificateIndex,
+  PWIN_CERTIFICATE Certificateheader)
 {
   FIXME(imagehlp, "(0x%08x, %ld, %p): stub\n",
     FileHandle, CertificateIndex, Certificateheader
@@ -69,9 +69,9 @@ BOOL32 WINAPI ImageGetCertificateHeader32(
 /***********************************************************************
  *           ImageGetDigestStream32 (IMAGEHLP.15)
  */
-BOOL32 WINAPI ImageGetDigestStream32(
-  HANDLE32 FileHandle, DWORD DigestLevel,
-  DIGEST_FUNCTION32 DigestFunction, DIGEST_HANDLE32 DigestHandle)
+BOOL WINAPI ImageGetDigestStream(
+  HANDLE FileHandle, DWORD DigestLevel,
+  DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle)
 {
   FIXME(imagehlp, "(%0x08x, %ld, %p, %p): stub\n",
     FileHandle, DigestLevel, DigestFunction, DigestHandle
@@ -83,7 +83,7 @@ BOOL32 WINAPI ImageGetDigestStream32(
 /***********************************************************************
  *           ImageRemoveCertificate32 (IMAGEHLP.18)
  */
-BOOL32 WINAPI ImageRemoveCertificate32(HANDLE32 FileHandle, DWORD Index)
+BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index)
 {
   FIXME(imagehlp, "(0x%08x, %ld): stub\n", FileHandle, Index);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/imagehlp/internal.c b/dlls/imagehlp/internal.c
index 42a8495b338..4ac428dd93b 100644
--- a/dlls/imagehlp/internal.c
+++ b/dlls/imagehlp/internal.c
@@ -13,7 +13,7 @@
 /***********************************************************************
  *           InitializeListHead32
  */
-VOID InitializeListHead32(PLIST_ENTRY32 pListHead)
+VOID InitializeListHead(PLIST_ENTRY pListHead)
 {
   pListHead->Flink = pListHead;
   pListHead->Blink = pListHead;
@@ -22,7 +22,7 @@ VOID InitializeListHead32(PLIST_ENTRY32 pListHead)
 /***********************************************************************
  *           InsertHeadList32
  */
-VOID InsertHeadList32(PLIST_ENTRY32 pListHead, PLIST_ENTRY32 pEntry)
+VOID InsertHeadList(PLIST_ENTRY pListHead, PLIST_ENTRY pEntry)
 {
   pEntry->Blink = pListHead;
   pEntry->Flink = pListHead->Flink;
@@ -32,7 +32,7 @@ VOID InsertHeadList32(PLIST_ENTRY32 pListHead, PLIST_ENTRY32 pEntry)
 /***********************************************************************
  *           InsertTailList32
  */
-VOID InsertTailList32(PLIST_ENTRY32 pListHead, PLIST_ENTRY32 pEntry)
+VOID InsertTailList(PLIST_ENTRY pListHead, PLIST_ENTRY pEntry)
 {
   pEntry->Flink = pListHead;
   pEntry->Blink = pListHead->Blink;
@@ -42,7 +42,7 @@ VOID InsertTailList32(PLIST_ENTRY32 pListHead, PLIST_ENTRY32 pEntry)
 /***********************************************************************
  *           IsListEmpty32
  */
-BOOLEAN IsListEmpty32(PLIST_ENTRY32 pListHead)
+BOOLEAN IsListEmpty(PLIST_ENTRY pListHead)
 {
   return !pListHead;
 }
@@ -50,7 +50,7 @@ BOOLEAN IsListEmpty32(PLIST_ENTRY32 pListHead)
 /***********************************************************************
  *           PopEntryList32
  */
-PSINGLE_LIST_ENTRY32 PopEntryList32(PSINGLE_LIST_ENTRY32 pListHead)
+PSINGLE_LIST_ENTRY PopEntryList(PSINGLE_LIST_ENTRY pListHead)
 {
   pListHead->Next = NULL;
   return pListHead;
@@ -59,8 +59,8 @@ PSINGLE_LIST_ENTRY32 PopEntryList32(PSINGLE_LIST_ENTRY32 pListHead)
 /***********************************************************************
  *           PushEntryList32
  */
-VOID PushEntryList32(
-  PSINGLE_LIST_ENTRY32 pListHead, PSINGLE_LIST_ENTRY32 pEntry)
+VOID PushEntryList(
+  PSINGLE_LIST_ENTRY pListHead, PSINGLE_LIST_ENTRY pEntry)
 {
   pEntry->Next=pListHead;
 }
@@ -68,7 +68,7 @@ VOID PushEntryList32(
 /***********************************************************************
  *           RemoveEntryList32
  */
-VOID RemoveEntryList32(PLIST_ENTRY32 pEntry)
+VOID RemoveEntryList(PLIST_ENTRY pEntry)
 {
   pEntry->Flink->Blink = pEntry->Blink;
   pEntry->Blink->Flink = pEntry->Flink;
@@ -79,13 +79,13 @@ VOID RemoveEntryList32(PLIST_ENTRY32 pEntry)
 /***********************************************************************
  *           RemoveHeadList32
  */
-PLIST_ENTRY32 RemoveHeadList32(PLIST_ENTRY32 pListHead)
+PLIST_ENTRY RemoveHeadList(PLIST_ENTRY pListHead)
 {
-  PLIST_ENTRY32 p = pListHead->Flink;
+  PLIST_ENTRY p = pListHead->Flink;
   
   if(p != pListHead)
     {
-      RemoveEntryList32(pListHead); 
+      RemoveEntryList(pListHead); 
       return p;
     }
   else
@@ -99,9 +99,9 @@ PLIST_ENTRY32 RemoveHeadList32(PLIST_ENTRY32 pListHead)
 /***********************************************************************
  *           RemoveTailList32
  */
-PLIST_ENTRY32 RemoveTailList32(PLIST_ENTRY32 pListHead)
+PLIST_ENTRY RemoveTailList(PLIST_ENTRY pListHead)
 {
-  RemoveHeadList32(pListHead->Blink);
+  RemoveHeadList(pListHead->Blink);
   if(pListHead != pListHead->Blink)
     return pListHead;
   else
diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c
index ad8bbcfaf43..8c87d3915e7 100644
--- a/dlls/imagehlp/modify.c
+++ b/dlls/imagehlp/modify.c
@@ -13,18 +13,18 @@
 /***********************************************************************
  *           BindImage32 (IMAGEHLP.1)
  */
-BOOL32 WINAPI BindImage32(
+BOOL WINAPI BindImage(
   LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath)
 {
-  return BindImageEx32(0, ImageName, DllPath, SymbolPath, NULL);
+  return BindImageEx(0, ImageName, DllPath, SymbolPath, NULL);
 }
 
 /***********************************************************************
  *           BindImageEx32 (IMAGEHLP.2)
  */
-BOOL32 WINAPI BindImageEx32(
+BOOL WINAPI BindImageEx(
   DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath,
-  PIMAGEHLP_STATUS_ROUTINE32 StatusRoutine)
+  PIMAGEHLP_STATUS_ROUTINE StatusRoutine)
 {
   FIXME(imagehlp, "(%ld, %s, %s, %s, %p): stub\n", 
     Flags, debugstr_a(ImageName), debugstr_a(DllPath),
@@ -37,7 +37,7 @@ BOOL32 WINAPI BindImageEx32(
 /***********************************************************************
  *           CheckSumMappedFile32 (IMAGEHLP.3)
  */
-PIMAGE_NT_HEADERS32 WINAPI CheckSumMappedFile32(
+PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile(
   LPVOID BaseAddress, DWORD FileLength, 
   LPDWORD HeaderSum, LPDWORD CheckSum)
 {
@@ -51,7 +51,7 @@ PIMAGE_NT_HEADERS32 WINAPI CheckSumMappedFile32(
 /***********************************************************************
  *           MapFileAndCheckSum32A (IMAGEHLP.27)
  */
-DWORD WINAPI MapFileAndCheckSum32A(
+DWORD WINAPI MapFileAndCheckSumA(
   LPSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum)
 {
   FIXME(imagehlp, "(%s, %p, %p): stub\n",
@@ -64,7 +64,7 @@ DWORD WINAPI MapFileAndCheckSum32A(
 /***********************************************************************
  *           MapFileAndCheckSum32W (IMAGEHLP.28)
  */
-DWORD WINAPI MapFileAndCheckSum32W(
+DWORD WINAPI MapFileAndCheckSumW(
   LPWSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum)
 {
   FIXME(imagehlp, "(%s, %p, %p): stub\n",
@@ -77,9 +77,9 @@ DWORD WINAPI MapFileAndCheckSum32W(
 /***********************************************************************
  *           ReBaseImage32 (IMAGEHLP.30)
  */
-BOOL32 WINAPI ReBaseImage32(
-  LPSTR CurrentImageName, LPSTR SymbolPath, BOOL32 fReBase,
-  BOOL32 fRebaseSysfileOk, BOOL32 fGoingDown, ULONG CheckImageSize,
+BOOL WINAPI ReBaseImage(
+  LPSTR CurrentImageName, LPSTR SymbolPath, BOOL fReBase,
+  BOOL fRebaseSysfileOk, BOOL fGoingDown, ULONG CheckImageSize,
   ULONG *OldImageSize, ULONG *OldImageBase, ULONG *NewImageSize,
   ULONG *NewImageBase, ULONG TimeStamp)
 {
@@ -96,7 +96,7 @@ BOOL32 WINAPI ReBaseImage32(
 /***********************************************************************
  *           RemovePrivateCvSymbolic32 (IMAGEHLP.31)
  */
-BOOL32 WINAPI RemovePrivateCvSymbolic32(
+BOOL WINAPI RemovePrivateCvSymbolic(
   PCHAR DebugData, PCHAR *NewDebugData, ULONG *NewDebugSize)
 {
   FIXME(imagehlp, "(%p, %p, %p): stub\n",
@@ -109,7 +109,7 @@ BOOL32 WINAPI RemovePrivateCvSymbolic32(
 /***********************************************************************
  *           RemoveRelocations32 (IMAGEHLP.32)
  */
-VOID WINAPI RemoveRelocations32(PCHAR ImageName)
+VOID WINAPI RemoveRelocations(PCHAR ImageName)
 {
   FIXME(imagehlp, "(%p): stub\n", ImageName);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -118,7 +118,7 @@ VOID WINAPI RemoveRelocations32(PCHAR ImageName)
 /***********************************************************************
  *           SplitSymbols32 (IMAGEHLP.35)
  */
-BOOL32 WINAPI SplitSymbols32(
+BOOL WINAPI SplitSymbols(
   LPSTR ImageName, LPSTR SymbolsPath, 
   LPSTR SymbolFilePath, DWORD Flags)
 {
@@ -133,9 +133,9 @@ BOOL32 WINAPI SplitSymbols32(
 /***********************************************************************
  *           UpdateDebugInfoFile32 (IMAGEHLP.60)
  */
-BOOL32 WINAPI UpdateDebugInfoFile32(
+BOOL WINAPI UpdateDebugInfoFile(
   LPSTR ImageFileName, LPSTR SymbolPath,
-  LPSTR DebugFilePath, PIMAGE_NT_HEADERS32 NtHeaders)
+  LPSTR DebugFilePath, PIMAGE_NT_HEADERS NtHeaders)
 {
   FIXME(imagehlp, "(%s, %s, %s, %p): stub\n",
     debugstr_a(ImageFileName), debugstr_a(SymbolPath),
@@ -150,9 +150,9 @@ BOOL32 WINAPI UpdateDebugInfoFile32(
  * FIXME
  *   Function has no ordinal.
  */
-BOOL32 WINAPI UpdateDebugInfoFileEx32(
+BOOL WINAPI UpdateDebugInfoFileEx(
   LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath,
-  PIMAGE_NT_HEADERS32 NtHeaders, DWORD OldChecksum)
+  PIMAGE_NT_HEADERS NtHeaders, DWORD OldChecksum)
 {
   FIXME(imagehlp, "(%s, %s, %s, %p, %ld): stub\n",
     debugstr_a(ImageFileName), debugstr_a(SymbolPath),
diff --git a/dlls/imagehlp/symbol.c b/dlls/imagehlp/symbol.c
index b3191450f2d..80d79a715a8 100644
--- a/dlls/imagehlp/symbol.c
+++ b/dlls/imagehlp/symbol.c
@@ -13,7 +13,7 @@
 /***********************************************************************
  *           SymCleanup32 (IMAGEHLP.37)
  */
-BOOL32 WINAPI SymCleanup32(HANDLE32 hProcess)
+BOOL WINAPI SymCleanup(HANDLE hProcess)
 {
   FIXME(imagehlp, "(0x%08x): stub\n", hProcess);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -24,8 +24,8 @@ BOOL32 WINAPI SymCleanup32(HANDLE32 hProcess)
  *           SymEnumerateModules32 (IMAGEHLP.38)
  */
 
-BOOL32 WINAPI SymEnumerateModules32(
-  HANDLE32 hProcess, PSYM_ENUMMODULES_CALLBACK32 EnumModulesCallback,
+BOOL WINAPI SymEnumerateModules(
+  HANDLE hProcess, PSYM_ENUMMODULES_CALLBACK EnumModulesCallback,
   PVOID UserContext)
 {
   FIXME(imagehlp, "(0x%08x, %p, %p): stub\n",
@@ -38,9 +38,9 @@ BOOL32 WINAPI SymEnumerateModules32(
 /***********************************************************************
  *           SymEnumerateSymbols32 (IMAGEHLP.39)
  */
-BOOL32 WINAPI SymEnumerateSymbols32(
-  HANDLE32 hProcess, DWORD BaseOfDll,
-  PSYM_ENUMSYMBOLS_CALLBACK32 EnumSymbolsCallback, PVOID UserContext)
+BOOL WINAPI SymEnumerateSymbols(
+  HANDLE hProcess, DWORD BaseOfDll,
+  PSYM_ENUMSYMBOLS_CALLBACK EnumSymbolsCallback, PVOID UserContext)
 {
   FIXME(imagehlp, "(0x%08x, %p, %p): stub\n",
     hProcess, EnumSymbolsCallback, UserContext
@@ -52,7 +52,7 @@ BOOL32 WINAPI SymEnumerateSymbols32(
 /***********************************************************************
  *           SymFunctionTableAccess32 (IMAGEHLP.40)
  */
-PVOID WINAPI SymFunctionTableAccess32(HANDLE32 hProcess, DWORD AddrBase)
+PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase)
 {
   FIXME(imagehlp, "(0x%08x, 0x%08lx): stub\n", hProcess, AddrBase);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -62,7 +62,7 @@ PVOID WINAPI SymFunctionTableAccess32(HANDLE32 hProcess, DWORD AddrBase)
 /***********************************************************************
  *           SymGetModuleBase32 (IMAGEHLP.41)
  */
-DWORD WINAPI SymGetModuleBase32(HANDLE32 hProcess, DWORD dwAddr)
+DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr)
 {
   FIXME(imagehlp, "(0x%08x, 0x%08lx): stub\n", hProcess, dwAddr);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -72,9 +72,9 @@ DWORD WINAPI SymGetModuleBase32(HANDLE32 hProcess, DWORD dwAddr)
 /***********************************************************************
  *           SymGetModuleInfo32 (IMAGEHLP.42)
  */
-BOOL32 WINAPI SymGetModuleInfo32(
-  HANDLE32 hProcess, DWORD dwAddr,
-  PIMAGEHLP_MODULE32 ModuleInfo)
+BOOL WINAPI SymGetModuleInfo(
+  HANDLE hProcess, DWORD dwAddr,
+  PIMAGEHLP_MODULE ModuleInfo)
 {
   FIXME(imagehlp, "(0x%08x, 0x%08lx, %p): stub\n",
     hProcess, dwAddr, ModuleInfo
@@ -86,7 +86,7 @@ BOOL32 WINAPI SymGetModuleInfo32(
 /***********************************************************************
  *           SymGetOptions32 (IMAGEHLP.43)
  */
-DWORD WINAPI SymGetOptions32()
+DWORD WINAPI SymGetOptions()
 {
   FIXME(imagehlp, "(): stub\n");
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -96,8 +96,8 @@ DWORD WINAPI SymGetOptions32()
 /***********************************************************************
  *           SymGetSearchPath32 (IMAGEHLP.44)
  */
-BOOL32 WINAPI SymGetSearchPath32(
-  HANDLE32 hProcess, LPSTR szSearchPath, DWORD SearchPathLength)
+BOOL WINAPI SymGetSearchPath(
+  HANDLE hProcess, LPSTR szSearchPath, DWORD SearchPathLength)
 {
   FIXME(imagehlp, "(0x%08x, %s, %ld): stub\n",
     hProcess, debugstr_an(szSearchPath,SearchPathLength), SearchPathLength
@@ -109,9 +109,9 @@ BOOL32 WINAPI SymGetSearchPath32(
 /***********************************************************************
  *           SymGetSymFromAddr32 (IMAGEHLP.45)
  */
-BOOL32 WINAPI SymGetSymFromAddr32(
-  HANDLE32 hProcess, DWORD dwAddr, 
-  PDWORD pdwDisplacement, PIMAGEHLP_SYMBOL32 Symbol)
+BOOL WINAPI SymGetSymFromAddr(
+  HANDLE hProcess, DWORD dwAddr, 
+  PDWORD pdwDisplacement, PIMAGEHLP_SYMBOL Symbol)
 {
   FIXME(imagehlp, "(0x%08x, 0x%08lx, %p, %p): stub\n",
     hProcess, dwAddr, pdwDisplacement, Symbol
@@ -123,8 +123,8 @@ BOOL32 WINAPI SymGetSymFromAddr32(
 /***********************************************************************
  *           SymGetSymFromName32 (IMAGEHLP.46)
  */
-BOOL32 WINAPI SymGetSymFromName32(
-  HANDLE32 hProcess, LPSTR Name, PIMAGEHLP_SYMBOL32 Symbol)
+BOOL WINAPI SymGetSymFromName(
+  HANDLE hProcess, LPSTR Name, PIMAGEHLP_SYMBOL Symbol)
 {
   FIXME(imagehlp, "(0x%08x, %s, %p): stub\n", hProcess, Name, Symbol);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -134,8 +134,8 @@ BOOL32 WINAPI SymGetSymFromName32(
 /***********************************************************************
  *           SymGetSymNext32 (IMAGEHLP.47)
  */
-BOOL32 WINAPI SymGetSymNext32(
-  HANDLE32 hProcess, PIMAGEHLP_SYMBOL32 Symbol)
+BOOL WINAPI SymGetSymNext(
+  HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol)
 {
   FIXME(imagehlp, "(0x%08x, %p): stub\n", hProcess, Symbol);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -146,8 +146,8 @@ BOOL32 WINAPI SymGetSymNext32(
  *           SymGetSymPrev32 (IMAGEHLP.48)
  */
 
-BOOL32 WINAPI SymGetSymPrev32(
-  HANDLE32 hProcess, PIMAGEHLP_SYMBOL32 Symbol)
+BOOL WINAPI SymGetSymPrev(
+  HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol)
 {
   FIXME(imagehlp, "(0x%08x, %p): stub\n", hProcess, Symbol);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -157,8 +157,8 @@ BOOL32 WINAPI SymGetSymPrev32(
 /***********************************************************************
  *           SymInitialize32 (IMAGEHLP.49)
  */
-BOOL32 WINAPI SymInitialize32(
-  HANDLE32 hProcess, LPSTR UserSearchPath, BOOL32 fInvadeProcess)
+BOOL WINAPI SymInitialize(
+  HANDLE hProcess, LPSTR UserSearchPath, BOOL fInvadeProcess)
 {
   FIXME(imagehlp, "(0x%08x, %s, %d): stub\n",
     hProcess, debugstr_a(UserSearchPath), fInvadeProcess
@@ -171,8 +171,8 @@ BOOL32 WINAPI SymInitialize32(
  *           SymLoadModule32 (IMAGEHLP.50)
  */
 
-BOOL32 WINAPI SymLoadModule32(
-  HANDLE32 hProcess, HANDLE32 hFile, LPSTR ImageName, LPSTR ModuleName,
+BOOL WINAPI SymLoadModule(
+  HANDLE hProcess, HANDLE hFile, LPSTR ImageName, LPSTR ModuleName,
   DWORD BaseOfDll, DWORD SizeOfDll)
 {
   FIXME(imagehlp, "(0x%08x, 0x%08x, %s, %s, %ld, %ld): stub\n",
@@ -186,8 +186,8 @@ BOOL32 WINAPI SymLoadModule32(
 /***********************************************************************
  *           SymRegisterCallback32 (IMAGEHLP.51)
  */
-BOOL32 WINAPI SymRegisterCallback32(
-  HANDLE32 hProcess, PSYMBOL_REGISTERED_CALLBACK32 CallbackFunction,
+BOOL WINAPI SymRegisterCallback(
+  HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK CallbackFunction,
   PVOID UserContext)
 {
   FIXME(imagehlp, "(0x%08x, %p, %p): stub\n",
@@ -200,7 +200,7 @@ BOOL32 WINAPI SymRegisterCallback32(
 /***********************************************************************
  *           SymSetOptions32 (IMAGEHLP.52)
  */
-DWORD WINAPI SymSetOptions32(DWORD SymOptions)
+DWORD WINAPI SymSetOptions(DWORD SymOptions)
 {
   FIXME(imagehlp, "(%lx): stub\n", SymOptions);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -210,7 +210,7 @@ DWORD WINAPI SymSetOptions32(DWORD SymOptions)
 /***********************************************************************
  *           SymSetSearchPath32 (IMAGEHLP.53)
  */
-BOOL32 WINAPI SymSetSearchPath32(HANDLE32 hProcess, LPSTR szSearchPath)
+BOOL WINAPI SymSetSearchPath(HANDLE hProcess, LPSTR szSearchPath)
 {
   FIXME(imagehlp, "(0x%08x, %s): stub\n",
     hProcess, debugstr_a(szSearchPath)
@@ -222,8 +222,8 @@ BOOL32 WINAPI SymSetSearchPath32(HANDLE32 hProcess, LPSTR szSearchPath)
 /***********************************************************************
  *           SymUnDName32 (IMAGEHLP.54)
  */
-BOOL32 WINAPI SymUnDName32(
-  PIMAGEHLP_SYMBOL32 sym, LPSTR UnDecName, DWORD UnDecNameLength)
+BOOL WINAPI SymUnDName(
+  PIMAGEHLP_SYMBOL sym, LPSTR UnDecName, DWORD UnDecNameLength)
 {
   FIXME(imagehlp, "(%p, %s, %ld): stub\n",
     sym, UnDecName, UnDecNameLength
@@ -235,8 +235,8 @@ BOOL32 WINAPI SymUnDName32(
 /***********************************************************************
  *           SymUnloadModule32 (IMAGEHLP.55)
  */
-BOOL32 WINAPI SymUnloadModule32(
-  HANDLE32 hProcess, DWORD BaseOfDll)
+BOOL WINAPI SymUnloadModule(
+  HANDLE hProcess, DWORD BaseOfDll)
 {
   FIXME(imagehlp, "(0x%08x, 0x%08lx): stub\n", hProcess, BaseOfDll);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/msacm32/builtin.c b/dlls/msacm32/builtin.c
index 3ba3339e2f3..0981ef715eb 100644
--- a/dlls/msacm32/builtin.c
+++ b/dlls/msacm32/builtin.c
@@ -18,10 +18,10 @@
  *           MSACM_BuiltinDrivers
  */
 LONG WINAPI MSACM_DummyDriverProc(
-   DWORD dwDriverId, HDRVR32 hdrvr, UINT32 msg,
+   DWORD dwDriverId, HDRVR hdrvr, UINT msg,
    LONG lParam1, LONG lParam2); 
 
-WINE_ACMBUILTINDRIVER32 MSACM_BuiltinDrivers32[] = {
+WINE_ACMBUILTINDRIVER MSACM_BuiltinDrivers[] = {
   { "MSACM.dummy", &MSACM_DummyDriverProc },
   { NULL, NULL }
 };
@@ -30,7 +30,7 @@ WINE_ACMBUILTINDRIVER32 MSACM_BuiltinDrivers32[] = {
  *           MSACM_DummyDriverProc
  */
 LONG WINAPI MSACM_DummyDriverProc(
-   DWORD dwDriverId, HDRVR32 hdrvr, UINT32 msg,
+   DWORD dwDriverId, HDRVR hdrvr, UINT msg,
    LONG lParam1, LONG lParam2)
 {
   switch(msg)
@@ -68,7 +68,7 @@ LONG WINAPI MSACM_DummyDriverProc(
     default:
       /* FIXME: DefDriverProc not implemented  */
 #if 0
-      DefDriverProc32(dwDriverId, hdrvr, msg, lParam1, lParam2);
+      DefDriverProc(dwDriverId, hdrvr, msg, lParam1, lParam2);
 #endif
       break;
     }
diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c
index 2d7411a510b..99173147e40 100644
--- a/dlls/msacm32/driver.c
+++ b/dlls/msacm32/driver.c
@@ -19,11 +19,11 @@
 /***********************************************************************
  *           acmDriverAddA (MSACM32.2)
  */
-MMRESULT32 WINAPI acmDriverAdd32A(
-  PHACMDRIVERID32 phadid, HINSTANCE32 hinstModule,
+MMRESULT WINAPI acmDriverAddA(
+  PHACMDRIVERID phadid, HINSTANCE hinstModule,
   LPARAM lParam, DWORD dwPriority, DWORD fdwAdd)
 {
-  PWINE_ACMLOCALDRIVER32 pld;
+  PWINE_ACMLOCALDRIVER pld;
   if(!phadid)
     return MMSYSERR_INVALPARAM;
 
@@ -38,10 +38,10 @@ MMRESULT32 WINAPI acmDriverAdd32A(
      (fdwAdd & ACM_DRIVERADDF_NOTIFYHWND))
     return MMSYSERR_INVALFLAG;
 
-  pld = HeapAlloc(MSACM_hHeap32, 0, sizeof(WINE_ACMLOCALDRIVER32));
-  pld->pfnDriverProc = (DRIVERPROC32) 
-    GetProcAddress32(hinstModule, "DriverProc");
-  *phadid = (HACMDRIVERID32) MSACM_RegisterDriver32(NULL, NULL, pld);
+  pld = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVER));
+  pld->pfnDriverProc = (DRIVERPROC) 
+    GetProcAddress(hinstModule, "DriverProc");
+  *phadid = (HACMDRIVERID) MSACM_RegisterDriver(NULL, NULL, pld);
 
   /* FIXME: lParam, dwPriority and fdwAdd ignored */
 
@@ -53,8 +53,8 @@ MMRESULT32 WINAPI acmDriverAdd32A(
  * FIXME
  *   Not implemented
  */
-MMRESULT32 WINAPI acmDriverAdd32W(
-  PHACMDRIVERID32 phadid, HINSTANCE32 hinstModule,
+MMRESULT WINAPI acmDriverAddW(
+  PHACMDRIVERID phadid, HINSTANCE hinstModule,
   LPARAM lParam, DWORD dwPriority, DWORD fdwAdd)
 {
   FIXME(msacm, "(%p, 0x%08x, %ld, %ld, %ld): stub\n",
@@ -67,15 +67,15 @@ MMRESULT32 WINAPI acmDriverAdd32W(
 /***********************************************************************
  *           acmDriverClose (MSACM32.4)
  */
-MMRESULT32 WINAPI acmDriverClose32(
-  HACMDRIVER32 had, DWORD fdwClose)
+MMRESULT WINAPI acmDriverClose(
+  HACMDRIVER had, DWORD fdwClose)
 {
-  PWINE_ACMDRIVER32 p;
+  PWINE_ACMDRIVER p;
 
   if(fdwClose)
     return MMSYSERR_INVALFLAG;
 
-  p = MSACM_GetDriver32(had);
+  p = MSACM_GetDriver(had);
   if(!p)
     return MMSYSERR_INVALHANDLE;
 
@@ -84,10 +84,10 @@ MMRESULT32 WINAPI acmDriverClose32(
   /* FIXME: CloseDriver32 not implemented */
 #if 0
   if(p->hDrvr)
-    CloseDriver32(p->hDrvr, 0, 0);
+    CloseDriver(p->hDrvr, 0, 0);
 #endif
 
-  HeapFree(MSACM_hHeap32, 0, p);
+  HeapFree(MSACM_hHeap, 0, p);
 
   return MMSYSERR_NOERROR;
 }
@@ -95,14 +95,14 @@ MMRESULT32 WINAPI acmDriverClose32(
 /***********************************************************************
  *           acmDriverDetailsA (MSACM32.5)
  */
-MMRESULT32 WINAPI acmDriverDetails32A(
-  HACMDRIVERID32 hadid, PACMDRIVERDETAILS32A padd, DWORD fdwDetails)
+MMRESULT WINAPI acmDriverDetailsA(
+  HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, DWORD fdwDetails)
 {
-  PWINE_ACMDRIVERID32 p;
-  MMRESULT32 mmr;
-  BOOL32 bOpenTemporary;
+  PWINE_ACMDRIVERID p;
+  MMRESULT mmr;
+  BOOL bOpenTemporary;
 
-  p = MSACM_GetDriverID32(hadid);
+  p = MSACM_GetDriverID(hadid);
   if(!p)
     return MMSYSERR_INVALHANDLE;
   
@@ -112,7 +112,7 @@ MMRESULT32 WINAPI acmDriverDetails32A(
   bOpenTemporary = !p->pACMDriver;
   if(bOpenTemporary) {
     bOpenTemporary = TRUE;
-    acmDriverOpen32((PHACMDRIVER32) &p->pACMDriver, hadid, 0);
+    acmDriverOpen((PHACMDRIVER) &p->pACMDriver, hadid, 0);
   }
   
   /* FIXME
@@ -120,13 +120,13 @@ MMRESULT32 WINAPI acmDriverDetails32A(
    *   the UNICODE variant of PACMDRIVERDETAILS is used?
    *   It might check cbStruct or does it only accept ANSI.
    */
-  mmr = (MMRESULT32) acmDriverMessage32(
-    (HACMDRIVER32) p->pACMDriver, ACMDM_DRIVER_DETAILS, 
+  mmr = (MMRESULT) acmDriverMessage(
+    (HACMDRIVER) p->pACMDriver, ACMDM_DRIVER_DETAILS, 
     (LPARAM) padd,  0
   );
 
   if(bOpenTemporary) {
-    acmDriverClose32((HACMDRIVER32) p->pACMDriver, 0);
+    acmDriverClose((HACMDRIVER) p->pACMDriver, 0);
     p->pACMDriver = NULL;
   }
 
@@ -138,8 +138,8 @@ MMRESULT32 WINAPI acmDriverDetails32A(
  * FIXME
  *   Not implemented
  */
-MMRESULT32 WINAPI acmDriverDetails32W(
-  HACMDRIVERID32 hadid, PACMDRIVERDETAILS32W padd, DWORD fdwDetails)
+MMRESULT WINAPI acmDriverDetailsW(
+  HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, DWORD fdwDetails)
 {
   FIXME(msacm, "(0x%08x, %p, %ld): stub\n", hadid, padd, fdwDetails);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -149,10 +149,10 @@ MMRESULT32 WINAPI acmDriverDetails32W(
 /***********************************************************************
  *           acmDriverEnum (MSACM32.7)
  */
-MMRESULT32 WINAPI acmDriverEnum32(
-  ACMDRIVERENUMCB32 fnCallback, DWORD dwInstance, DWORD fdwEnum)
+MMRESULT WINAPI acmDriverEnum(
+  ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
-  PWINE_ACMDRIVERID32 p;
+  PWINE_ACMDRIVERID p;
 
   if(!fnCallback)
     {
@@ -164,10 +164,10 @@ MMRESULT32 WINAPI acmDriverEnum32(
       return MMSYSERR_INVALFLAG;
     }
 
-  p = MSACM_pFirstACMDriverID32;
+  p = MSACM_pFirstACMDriverID;
   while(p)
     {
-      (*fnCallback)((HACMDRIVERID32) p, dwInstance, ACMDRIVERDETAILS_SUPPORTF_CODEC);
+      (*fnCallback)((HACMDRIVERID) p, dwInstance, ACMDRIVERDETAILS_SUPPORTF_CODEC);
       p = p->pNextACMDriverID;
     }
 
@@ -177,12 +177,12 @@ MMRESULT32 WINAPI acmDriverEnum32(
 /***********************************************************************
  *           acmDriverID (MSACM32.8)
  */
-MMRESULT32 WINAPI acmDriverID32(
-  HACMOBJ32 hao, PHACMDRIVERID32 phadid, DWORD fdwDriverID)
+MMRESULT WINAPI acmDriverID(
+  HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID)
 {
-  PWINE_ACMOBJ32 pao;
+  PWINE_ACMOBJ pao;
 
-  pao = MSACM_GetObj32(hao);
+  pao = MSACM_GetObj(hao);
   if(!pao)
     return MMSYSERR_INVALHANDLE;
 
@@ -192,7 +192,7 @@ MMRESULT32 WINAPI acmDriverID32(
   if(fdwDriverID)
     return MMSYSERR_INVALFLAG;
 
-  *phadid = (HACMDRIVERID32) pao->pACMDriverID;
+  *phadid = (HACMDRIVERID) pao->pACMDriverID;
 
   return MMSYSERR_NOERROR;
 }
@@ -202,16 +202,16 @@ MMRESULT32 WINAPI acmDriverID32(
  * FIXME
  *   Not implemented
  */
-LRESULT WINAPI acmDriverMessage32(
-  HACMDRIVER32 had, UINT32 uMsg, LPARAM lParam1, LPARAM lParam2)
+LRESULT WINAPI acmDriverMessage(
+  HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
-  PWINE_ACMDRIVER32 pad = MSACM_GetDriver32(had);
+  PWINE_ACMDRIVER pad = MSACM_GetDriver(had);
   if(!pad)
     return MMSYSERR_INVALPARAM;
 
   /* FIXME: Check if uMsg legal */
 
-  if(!SendDriverMessage32(pad->hDrvr, uMsg, lParam1, lParam2))
+  if(!SendDriverMessage(pad->hDrvr, uMsg, lParam1, lParam2))
     return MMSYSERR_NOTSUPPORTED;
 
   return MMSYSERR_NOERROR;
@@ -221,15 +221,15 @@ LRESULT WINAPI acmDriverMessage32(
 /***********************************************************************
  *           acmDriverOpen (MSACM32.10)
  */
-MMRESULT32 WINAPI acmDriverOpen32(
-  PHACMDRIVER32 phad, HACMDRIVERID32 hadid, DWORD fdwOpen)
+MMRESULT WINAPI acmDriverOpen(
+  PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpen)
 {
-  PWINE_ACMDRIVERID32 padid;
+  PWINE_ACMDRIVERID padid;
 
   if(!phad)
     return MMSYSERR_INVALPARAM;
 
-  padid = MSACM_GetDriverID32(hadid); 
+  padid = MSACM_GetDriverID(hadid); 
   if(!padid)
     return MMSYSERR_INVALHANDLE;
 
@@ -244,16 +244,16 @@ MMRESULT32 WINAPI acmDriverOpen32(
     }
 
   padid->pACMDriver = HeapAlloc(
-    MSACM_hHeap32, 0, sizeof(WINE_ACMDRIVER32)
+    MSACM_hHeap, 0, sizeof(WINE_ACMDRIVER)
   );
   padid->pACMDriver->obj.pACMDriverID = padid;
   
   if(!padid->pACMLocalDriver)
       padid->pACMDriver->hDrvr =
-        OpenDriver32A(padid->pszDriverAlias, "drivers32", 0);
+        OpenDriverA(padid->pszDriverAlias, "drivers32", 0);
   else
     {
-      padid->pACMDriver->hDrvr = MSACM_OpenDriverProc32(
+      padid->pACMDriver->hDrvr = MSACM_OpenDriverProc(
 	padid->pACMLocalDriver->pfnDriverProc
       );
     }
@@ -262,7 +262,7 @@ MMRESULT32 WINAPI acmDriverOpen32(
     return MMSYSERR_ERROR;
  
   /* FIXME: Create a WINE_ACMDRIVER32 */
-  *phad = (HACMDRIVER32) NULL;
+  *phad = (HACMDRIVER) NULL;
 
   return MMSYSERR_ERROR;
 }
@@ -270,10 +270,10 @@ MMRESULT32 WINAPI acmDriverOpen32(
 /***********************************************************************
  *           acmDriverPriority (MSACM32.11)
  */
-MMRESULT32 WINAPI acmDriverPriority32(
-  HACMDRIVERID32 hadid, DWORD dwPriority, DWORD fdwPriority)
+MMRESULT WINAPI acmDriverPriority(
+  HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority)
 {
-  PWINE_ACMDRIVERID32 padid;
+  PWINE_ACMDRIVERID padid;
   CHAR szSubKey[17];
   CHAR szBuffer[256];
   LONG lBufferLength = sizeof(szBuffer);
@@ -281,7 +281,7 @@ MMRESULT32 WINAPI acmDriverPriority32(
   HKEY hPriorityKey;
   DWORD dwPriorityCounter;
 
-  padid = MSACM_GetDriverID32(hadid);
+  padid = MSACM_GetDriverID(hadid);
   if(!padid)
     return MMSYSERR_INVALHANDLE;
 
@@ -301,7 +301,7 @@ MMRESULT32 WINAPI acmDriverPriority32(
     (fdwPriority & ACM_DRIVERPRIORITYF_END))
     return MMSYSERR_INVALFLAG;
 
-  lError = RegOpenKey32A(HKEY_CURRENT_USER, 
+  lError = RegOpenKeyA(HKEY_CURRENT_USER, 
     "Software\\Microsoft\\Multimedia\\"
       "Audio Compression Manager\\Priority v4.00",
     &hPriorityKey
@@ -312,8 +312,8 @@ MMRESULT32 WINAPI acmDriverPriority32(
 
   for(dwPriorityCounter = 1; ; dwPriorityCounter++)
   {
-    wsnprintf32A(szSubKey, 17, "Priorty%ld", dwPriorityCounter);
-    lError = RegQueryValue32A(hPriorityKey, szSubKey, szBuffer, &lBufferLength);
+    wsnprintfA(szSubKey, 17, "Priorty%ld", dwPriorityCounter);
+    lError = RegQueryValueA(hPriorityKey, szSubKey, szBuffer, &lBufferLength);
     if(lError != ERROR_SUCCESS)
       break;
 
@@ -331,19 +331,19 @@ MMRESULT32 WINAPI acmDriverPriority32(
 /***********************************************************************
  *           acmDriverRemove (MSACM32.12)
  */
-MMRESULT32 WINAPI acmDriverRemove32(
-  HACMDRIVERID32 hadid, DWORD fdwRemove)
+MMRESULT WINAPI acmDriverRemove(
+  HACMDRIVERID hadid, DWORD fdwRemove)
 {
-  PWINE_ACMDRIVERID32 padid;
+  PWINE_ACMDRIVERID padid;
 
-  padid = MSACM_GetDriverID32(hadid);
+  padid = MSACM_GetDriverID(hadid);
   if(!padid)
     return MMSYSERR_INVALHANDLE;
 
   if(fdwRemove)
     return MMSYSERR_INVALFLAG;
 
-  MSACM_UnregisterDriver32(padid);
+  MSACM_UnregisterDriver(padid);
 
   return MMSYSERR_NOERROR;
 }
diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c
index 0c4f26763d0..74203435915 100644
--- a/dlls/msacm32/filter.c
+++ b/dlls/msacm32/filter.c
@@ -14,8 +14,8 @@
 /***********************************************************************
  *           acmFilterChooseA (MSACM32.13)
  */
-MMRESULT32 WINAPI acmFilterChoose32A(
-  PACMFILTERCHOOSE32A pafltrc)
+MMRESULT WINAPI acmFilterChooseA(
+  PACMFILTERCHOOSEA pafltrc)
 {
   FIXME(msacm, "(%p): stub\n", pafltrc);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -25,8 +25,8 @@ MMRESULT32 WINAPI acmFilterChoose32A(
 /***********************************************************************
  *           acmFilterChooseW (MSACM32.14)
  */
-MMRESULT32 WINAPI acmFilterChoose32W(
-  PACMFILTERCHOOSE32W pafltrc)
+MMRESULT WINAPI acmFilterChooseW(
+  PACMFILTERCHOOSEW pafltrc)
 {
   FIXME(msacm, "(%p): stub\n", pafltrc);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -36,8 +36,8 @@ MMRESULT32 WINAPI acmFilterChoose32W(
 /***********************************************************************
  *           acmFilterDetailsA (MSACM32.15)
  */
-MMRESULT32 WINAPI acmFilterDetails32A(
-  HACMDRIVER32 had, PACMFILTERDETAILS32A pafd, DWORD fdwDetails)
+MMRESULT WINAPI acmFilterDetailsA(
+  HACMDRIVER had, PACMFILTERDETAILSA pafd, DWORD fdwDetails)
 {
   if(fdwDetails & ~(ACM_FILTERDETAILSF_FILTER))
     return MMSYSERR_INVALFLAG;
@@ -47,7 +47,7 @@ MMRESULT32 WINAPI acmFilterDetails32A(
    *   the UNICODE variant of PACMFILTERDETAILS is used?
    *   It might check cbStruct or does it only accept ANSI.
    */
-  return (MMRESULT32) acmDriverMessage32(
+  return (MMRESULT) acmDriverMessage(
     had, ACMDM_FILTER_DETAILS,
     (LPARAM) pafd,  (LPARAM) fdwDetails
   );
@@ -56,8 +56,8 @@ MMRESULT32 WINAPI acmFilterDetails32A(
 /***********************************************************************
  *           acmFilterDetailsW (MSACM32.16)
  */
-MMRESULT32 WINAPI acmFilterDetails32W(
-  HACMDRIVER32 had, PACMFILTERDETAILS32W pafd, DWORD fdwDetails)
+MMRESULT WINAPI acmFilterDetailsW(
+  HACMDRIVER had, PACMFILTERDETAILSW pafd, DWORD fdwDetails)
 {
   FIXME(msacm, "(0x%08x, %p, %ld): stub\n", had, pafd, fdwDetails);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -67,9 +67,9 @@ MMRESULT32 WINAPI acmFilterDetails32W(
 /***********************************************************************
  *           acmFilterEnumA (MSACM32.17)
  */
-MMRESULT32 WINAPI acmFilterEnum32A(
-  HACMDRIVER32 had, PACMFILTERDETAILS32A pafd, 
-  ACMFILTERENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum)
+MMRESULT WINAPI acmFilterEnumA(
+  HACMDRIVER had, PACMFILTERDETAILSA pafd, 
+  ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
   FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, pafd, fnCallback, dwInstance, fdwEnum
@@ -81,9 +81,9 @@ MMRESULT32 WINAPI acmFilterEnum32A(
 /***********************************************************************
  *           acmFilterEnumW (MSACM32.18)
  */
-MMRESULT32 WINAPI acmFilterEnum32W(
-  HACMDRIVER32 had, PACMFILTERDETAILS32W pafd, 
-  ACMFILTERENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum)
+MMRESULT WINAPI acmFilterEnumW(
+  HACMDRIVER had, PACMFILTERDETAILSW pafd, 
+  ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
   FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, pafd, fnCallback, dwInstance, fdwEnum
@@ -95,8 +95,8 @@ MMRESULT32 WINAPI acmFilterEnum32W(
 /***********************************************************************
  *           acmFilterTagDetailsA (MSACM32.19)
  */
-MMRESULT32 WINAPI acmFilterTagDetails32A(
-  HACMDRIVER32 had, PACMFILTERTAGDETAILS32A paftd, DWORD fdwDetails)
+MMRESULT WINAPI acmFilterTagDetailsA(
+  HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, DWORD fdwDetails)
 {
   if(fdwDetails & 
      ~(ACM_FILTERTAGDETAILSF_FILTERTAG|
@@ -108,7 +108,7 @@ MMRESULT32 WINAPI acmFilterTagDetails32A(
    *   the UNICODE variant of PACMFILTERTAGDETAILS is used?
    *   It might check cbStruct or does it only accept ANSI.
    */
-  return (MMRESULT32) acmDriverMessage32(
+  return (MMRESULT) acmDriverMessage(
     had, ACMDM_FILTERTAG_DETAILS,
     (LPARAM) paftd,  (LPARAM) fdwDetails
   );
@@ -117,8 +117,8 @@ MMRESULT32 WINAPI acmFilterTagDetails32A(
 /***********************************************************************
  *           acmFilterTagDetailsW (MSACM32.20)
  */
-MMRESULT32 WINAPI acmFilterTagDetails32W(
-  HACMDRIVER32 had, PACMFILTERTAGDETAILS32W paftd, DWORD fdwDetails)
+MMRESULT WINAPI acmFilterTagDetailsW(
+  HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, DWORD fdwDetails)
 {
   FIXME(msacm, "(0x%08x, %p, %ld): stub\n", had, paftd, fdwDetails);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -128,9 +128,9 @@ MMRESULT32 WINAPI acmFilterTagDetails32W(
 /***********************************************************************
  *           acmFilterTagEnumA (MSACM32.21)
  */
-MMRESULT32 WINAPI acmFilterTagEnum32A(
-  HACMDRIVER32 had, PACMFILTERTAGDETAILS32A  paftd,
-  ACMFILTERTAGENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum)
+MMRESULT WINAPI acmFilterTagEnumA(
+  HACMDRIVER had, PACMFILTERTAGDETAILSA  paftd,
+  ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
   FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, paftd, fnCallback, dwInstance, fdwEnum
@@ -142,9 +142,9 @@ MMRESULT32 WINAPI acmFilterTagEnum32A(
 /***********************************************************************
  *           acmFilterTagEnumW (MSACM32.22)
  */
-MMRESULT32 WINAPI acmFilterTagEnum32W(
-  HACMDRIVER32 had, PACMFILTERTAGDETAILS32W paftd,
-  ACMFILTERTAGENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum)
+MMRESULT WINAPI acmFilterTagEnumW(
+  HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
+  ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
   FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, paftd, fnCallback, dwInstance, fdwEnum
diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c
index e780bd14c0c..74e0a1ab97e 100644
--- a/dlls/msacm32/format.c
+++ b/dlls/msacm32/format.c
@@ -15,8 +15,8 @@
 /***********************************************************************
  *           acmFormatChooseA (MSACM32.23)
  */
-MMRESULT32 WINAPI acmFormatChoose32A(
-  PACMFORMATCHOOSE32A pafmtc)
+MMRESULT WINAPI acmFormatChooseA(
+  PACMFORMATCHOOSEA pafmtc)
 {
   FIXME(msacm, "(%p): stub\n", pafmtc);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -26,8 +26,8 @@ MMRESULT32 WINAPI acmFormatChoose32A(
 /***********************************************************************
  *           acmFormatChooseW (MSACM32.24)
  */
-MMRESULT32 WINAPI acmFormatChoose32W(
-  PACMFORMATCHOOSE32W pafmtc)
+MMRESULT WINAPI acmFormatChooseW(
+  PACMFORMATCHOOSEW pafmtc)
 {
   FIXME(msacm, "(%p): stub\n", pafmtc);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -37,8 +37,8 @@ MMRESULT32 WINAPI acmFormatChoose32W(
 /***********************************************************************
  *           acmFormatDetailsA (MSACM32.25)
  */
-MMRESULT32 WINAPI acmFormatDetails32A(
-  HACMDRIVER32 had, PACMFORMATDETAILS32A pafd, DWORD fdwDetails)
+MMRESULT WINAPI acmFormatDetailsA(
+  HACMDRIVER had, PACMFORMATDETAILSA pafd, DWORD fdwDetails)
 {
   if(fdwDetails & ~(ACM_FORMATDETAILSF_FORMAT))
     return MMSYSERR_INVALFLAG;
@@ -48,7 +48,7 @@ MMRESULT32 WINAPI acmFormatDetails32A(
    *   the UNICODE variant of PACMFORMATDETAILS is used?
    *   It might check cbStruct or does it only accept ANSI.
    */
-  return (MMRESULT32) acmDriverMessage32(
+  return (MMRESULT) acmDriverMessage(
     had, ACMDM_FORMAT_DETAILS,
     (LPARAM) pafd,  (LPARAM) fdwDetails
   );
@@ -57,8 +57,8 @@ MMRESULT32 WINAPI acmFormatDetails32A(
 /***********************************************************************
  *           acmFormatDetailsW (MSACM32.26)
  */
-MMRESULT32 WINAPI acmFormatDetails32W(
-  HACMDRIVER32 had, PACMFORMATDETAILS32W pafd, DWORD fdwDetails)
+MMRESULT WINAPI acmFormatDetailsW(
+  HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails)
 {
   FIXME(msacm, "(0x%08x, %p, %ld): stub\n", had, pafd, fdwDetails);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -68,9 +68,9 @@ MMRESULT32 WINAPI acmFormatDetails32W(
 /***********************************************************************
  *           acmFormatEnumA (MSACM32.27)
  */
-MMRESULT32 WINAPI acmFormatEnum32A(
-  HACMDRIVER32 had, PACMFORMATDETAILS32A pafd,
-  ACMFORMATENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum)
+MMRESULT WINAPI acmFormatEnumA(
+  HACMDRIVER had, PACMFORMATDETAILSA pafd,
+  ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
   FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, pafd, fnCallback, dwInstance, fdwEnum
@@ -82,9 +82,9 @@ MMRESULT32 WINAPI acmFormatEnum32A(
 /***********************************************************************
  *           acmFormatEnumW (MSACM32.28)
  */
-MMRESULT32 WINAPI acmFormatEnum32W(
-  HACMDRIVER32 had, PACMFORMATDETAILS32W pafd,
-  ACMFORMATENUMCB32W fnCallback, DWORD dwInstance,  DWORD fdwEnum)
+MMRESULT WINAPI acmFormatEnumW(
+  HACMDRIVER had, PACMFORMATDETAILSW pafd,
+  ACMFORMATENUMCBW fnCallback, DWORD dwInstance,  DWORD fdwEnum)
 {
   FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, pafd, fnCallback, dwInstance, fdwEnum
@@ -96,8 +96,8 @@ MMRESULT32 WINAPI acmFormatEnum32W(
 /***********************************************************************
  *           acmFormatSuggest (MSACM32.29)
  */
-MMRESULT32 WINAPI acmFormatSuggest32(
-  HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
+MMRESULT WINAPI acmFormatSuggest(
+  HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
   DWORD cbwfxDst, DWORD fdwSuggest)
 {
   FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n",
@@ -110,8 +110,8 @@ MMRESULT32 WINAPI acmFormatSuggest32(
 /***********************************************************************
  *           acmFormatTagDetailsA (MSACM32.30)
  */
-MMRESULT32 WINAPI acmFormatTagDetails32A(
-  HACMDRIVER32 had, PACMFORMATTAGDETAILS32A paftd, DWORD fdwDetails)
+MMRESULT WINAPI acmFormatTagDetailsA(
+  HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, DWORD fdwDetails)
 {
   if(fdwDetails & 
      ~(ACM_FORMATTAGDETAILSF_FORMATTAG|ACM_FORMATTAGDETAILSF_LARGESTSIZE))
@@ -122,7 +122,7 @@ MMRESULT32 WINAPI acmFormatTagDetails32A(
    *   the UNICODE variant of PACMFORMATTAGDETAILS is used?
    *   It might check cbStruct or does it only accept ANSI.
    */
-  return (MMRESULT32) acmDriverMessage32(
+  return (MMRESULT) acmDriverMessage(
     had, ACMDM_FORMATTAG_DETAILS,
     (LPARAM) paftd,  (LPARAM) fdwDetails
   );
@@ -131,8 +131,8 @@ MMRESULT32 WINAPI acmFormatTagDetails32A(
 /***********************************************************************
  *           acmFormatTagDetailsW (MSACM32.31)
  */
-MMRESULT32 WINAPI acmFormatTagDetails32W(
-  HACMDRIVER32 had, PACMFORMATTAGDETAILS32W paftd, DWORD fdwDetails)
+MMRESULT WINAPI acmFormatTagDetailsW(
+  HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, DWORD fdwDetails)
 {
   FIXME(msacm, "(0x%08x, %p, %ld): stub\n", had, paftd, fdwDetails);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -142,9 +142,9 @@ MMRESULT32 WINAPI acmFormatTagDetails32W(
 /***********************************************************************
  *           acmFormatTagEnumA (MSACM32.32)
  */
-MMRESULT32 WINAPI acmFormatTagEnum32A(
-  HACMDRIVER32 had, PACMFORMATTAGDETAILS32A paftd,
-  ACMFORMATTAGENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum)
+MMRESULT WINAPI acmFormatTagEnumA(
+  HACMDRIVER had, PACMFORMATTAGDETAILSA paftd,
+  ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
   FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, paftd, fnCallback, dwInstance, fdwEnum
@@ -156,9 +156,9 @@ MMRESULT32 WINAPI acmFormatTagEnum32A(
 /***********************************************************************
  *           acmFormatTagEnumW (MSACM32.33)
  */
-MMRESULT32 WINAPI acmFormatTagEnum32W(
-  HACMDRIVER32 had, PACMFORMATTAGDETAILS32W paftd,
-  ACMFORMATTAGENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum)
+MMRESULT WINAPI acmFormatTagEnumW(
+  HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
+  ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
   FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, paftd, fnCallback, dwInstance, fdwEnum
diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c
index e06d9e1d088..b1485e4dd43 100644
--- a/dlls/msacm32/internal.c
+++ b/dlls/msacm32/internal.c
@@ -16,34 +16,34 @@
 
 /**********************************************************************/
 
-HANDLE32 MSACM_hHeap32 = (HANDLE32) NULL;
-PWINE_ACMDRIVERID32 MSACM_pFirstACMDriverID32 = NULL;
-PWINE_ACMDRIVERID32 MSACM_pLastACMDriverID32 = NULL;
+HANDLE MSACM_hHeap = (HANDLE) NULL;
+PWINE_ACMDRIVERID MSACM_pFirstACMDriverID = NULL;
+PWINE_ACMDRIVERID MSACM_pLastACMDriverID = NULL;
 
 /***********************************************************************
  *           MSACM_RegisterDriver32() 
  */
-PWINE_ACMDRIVERID32 MSACM_RegisterDriver32(
+PWINE_ACMDRIVERID MSACM_RegisterDriver(
   LPSTR pszDriverAlias, LPSTR pszFileName,
-  PWINE_ACMLOCALDRIVER32 pLocalDriver)
+  PWINE_ACMLOCALDRIVER pLocalDriver)
 {
-  PWINE_ACMDRIVERID32 padid;
-  padid = (PWINE_ACMDRIVERID32) HeapAlloc(
-    MSACM_hHeap32, 0, sizeof(WINE_ACMDRIVERID32)
+  PWINE_ACMDRIVERID padid;
+  padid = (PWINE_ACMDRIVERID) HeapAlloc(
+    MSACM_hHeap, 0, sizeof(WINE_ACMDRIVERID)
   );
   padid->pszDriverAlias = 
-    HEAP_strdupA(MSACM_hHeap32, 0, pszDriverAlias);
+    HEAP_strdupA(MSACM_hHeap, 0, pszDriverAlias);
   padid->pszFileName = 
-    HEAP_strdupA(MSACM_hHeap32, 0, pszFileName);
+    HEAP_strdupA(MSACM_hHeap, 0, pszFileName);
   padid->pACMLocalDriver = pLocalDriver; 
   padid->bEnabled = TRUE;
   padid->pACMDriver = NULL;
   padid->pNextACMDriverID = NULL;
   padid->pPreviousACMDriverID = 
-    MSACM_pLastACMDriverID32;
-  MSACM_pLastACMDriverID32 = padid;
-  if(!MSACM_pFirstACMDriverID32)
-    MSACM_pFirstACMDriverID32 = padid;
+    MSACM_pLastACMDriverID;
+  MSACM_pLastACMDriverID = padid;
+  if(!MSACM_pFirstACMDriverID)
+    MSACM_pFirstACMDriverID = padid;
 
   return padid;
 }
@@ -51,9 +51,9 @@ PWINE_ACMDRIVERID32 MSACM_RegisterDriver32(
 /***********************************************************************
  *           MSACM_RegisterAllDrivers32() 
  */
-void MSACM_RegisterAllDrivers32()
+void MSACM_RegisterAllDrivers()
 {
-  PWINE_ACMBUILTINDRIVER32 pbd;
+  PWINE_ACMBUILTINDRIVER pbd;
   LPSTR pszBuffer;
   DWORD dwBufferLength;
 
@@ -61,33 +61,33 @@ void MSACM_RegisterAllDrivers32()
    *  What if the user edits system.ini while the program is running?
    *  Does Windows handle that?
    */
-  if(!MSACM_pFirstACMDriverID32)
+  if(!MSACM_pFirstACMDriverID)
     return;
 
   /* FIXME: Do not work! How do I determine the section length? */
   dwBufferLength = 
-    GetPrivateProfileSection32A("drivers32", NULL, 0, "system.ini");
+    GetPrivateProfileSectionA("drivers32", NULL, 0, "system.ini");
 
   pszBuffer = (LPSTR) HeapAlloc(
-    MSACM_hHeap32, 0, dwBufferLength
+    MSACM_hHeap, 0, dwBufferLength
   );
-  if(GetPrivateProfileSection32A(
+  if(GetPrivateProfileSectionA(
     "drivers32", pszBuffer, dwBufferLength, "system.ini"))
     {
       char *s = pszBuffer;
       while(*s)
 	{
-	  if(!lstrncmpi32A("MSACM.", s, 6))
+	  if(!lstrncmpiA("MSACM.", s, 6))
 	    {
 	      char *s2 = s;
 	      while(*s2 != '\0' && *s2 != '=') s2++;
 	      if(*s2)
 		{
 		  *s2++='\0';
-		  MSACM_RegisterDriver32(s, s2, NULL);
+		  MSACM_RegisterDriver(s, s2, NULL);
 		}
 	    }  
-	  s += lstrlen32A(s) + 1; /* Either next char or \0 */
+	  s += lstrlenA(s) + 1; /* Either next char or \0 */
 	}
     }
 
@@ -96,34 +96,34 @@ void MSACM_RegisterAllDrivers32()
    *   when the external drivers was. 
    */
 
-  pbd = MSACM_BuiltinDrivers32;
+  pbd = MSACM_BuiltinDrivers;
   while(pbd->pszDriverAlias)
     {
-      PWINE_ACMLOCALDRIVER32 pld;
-      pld = HeapAlloc(MSACM_hHeap32, 0, sizeof(WINE_ACMLOCALDRIVER32));
+      PWINE_ACMLOCALDRIVER pld;
+      pld = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVER));
       pld->pfnDriverProc = pbd->pfnDriverProc;
-      MSACM_RegisterDriver32(pbd->pszDriverAlias, NULL, pld);
+      MSACM_RegisterDriver(pbd->pszDriverAlias, NULL, pld);
       pbd++;
     }
-   HeapFree(MSACM_hHeap32, 0, pszBuffer);
+   HeapFree(MSACM_hHeap, 0, pszBuffer);
 }
 
 /***********************************************************************
  *           MSACM_UnregisterDriver32()
  */
-PWINE_ACMDRIVERID32 MSACM_UnregisterDriver32(PWINE_ACMDRIVERID32 p)
+PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p)
 {
-  PWINE_ACMDRIVERID32 pNextACMDriverID;
+  PWINE_ACMDRIVERID pNextACMDriverID;
 
   if(p->pACMDriver)
-    acmDriverClose32((HACMDRIVER32) p->pACMDriver, 0);
+    acmDriverClose((HACMDRIVER) p->pACMDriver, 0);
 
   if(p->pszDriverAlias)
-    HeapFree(MSACM_hHeap32, 0, p->pszDriverAlias);
+    HeapFree(MSACM_hHeap, 0, p->pszDriverAlias);
   if(p->pszFileName)
-    HeapFree(MSACM_hHeap32, 0, p->pszFileName);
+    HeapFree(MSACM_hHeap, 0, p->pszFileName);
   if(p->pACMLocalDriver)
-    HeapFree(MSACM_hHeap32, 0, p->pACMLocalDriver);
+    HeapFree(MSACM_hHeap, 0, p->pACMLocalDriver);
 
   if(p->pPreviousACMDriverID)
     p->pPreviousACMDriverID->pNextACMDriverID = p->pNextACMDriverID;
@@ -132,7 +132,7 @@ PWINE_ACMDRIVERID32 MSACM_UnregisterDriver32(PWINE_ACMDRIVERID32 p)
 
   pNextACMDriverID = p->pNextACMDriverID;
 
-  HeapFree(MSACM_hHeap32, 0, p);
+  HeapFree(MSACM_hHeap, 0, p);
 
   return pNextACMDriverID;
 }
@@ -142,34 +142,34 @@ PWINE_ACMDRIVERID32 MSACM_UnregisterDriver32(PWINE_ACMDRIVERID32 p)
  * FIXME
  *   Where should this function be called?
  */
-void MSACM_UnregisterAllDrivers32()
+void MSACM_UnregisterAllDrivers()
 {
-  PWINE_ACMDRIVERID32 p = MSACM_pFirstACMDriverID32;
-  while(p) p = MSACM_UnregisterDriver32(p);
+  PWINE_ACMDRIVERID p = MSACM_pFirstACMDriverID;
+  while(p) p = MSACM_UnregisterDriver(p);
 }
 
 /***********************************************************************
  *           MSACM_GetDriverID32() 
  */
-PWINE_ACMDRIVERID32 MSACM_GetDriverID32(HACMDRIVERID32 hDriverID)
+PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID)
 {
-  return (PWINE_ACMDRIVERID32) hDriverID;
+  return (PWINE_ACMDRIVERID) hDriverID;
 }
 
 /***********************************************************************
  *           MSACM_GetDriver32()
  */
-PWINE_ACMDRIVER32 MSACM_GetDriver32(HACMDRIVER32 hDriver)
+PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver)
 {
-  return (PWINE_ACMDRIVER32) hDriver;
+  return (PWINE_ACMDRIVER) hDriver;
 }
 
 /***********************************************************************
  *           MSACM_GetObj32()
  */
-PWINE_ACMOBJ32 MSACM_GetObj32(HACMOBJ32 hObj)
+PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj)
 {
-  return (PWINE_ACMOBJ32) hObj;
+  return (PWINE_ACMOBJ) hObj;
 }
 
 /***********************************************************************
@@ -178,21 +178,21 @@ PWINE_ACMOBJ32 MSACM_GetObj32(HACMOBJ32 hObj)
  *  This function should be integrated with OpenDriver,
  *  renamed and moved there.
  */
-HDRVR32 MSACM_OpenDriverProc32(DRIVERPROC32 pfnDriverProc)
+HDRVR MSACM_OpenDriverProc(DRIVERPROC pfnDriverProc)
 {
 #if 0
-  LPDRIVERITEM32A pDrvr;
+  LPDRIVERITEMA pDrvr;
 
   /* FIXME: This is a very bad solution */
-  pDrvr = (LPDRIVERITEM32A) HeapAlloc(MSACM_hHeap32, HEAP_ZERO_MEMORY, sizeof(DRIVERITEM32A));
+  pDrvr = (LPDRIVERITEMA) HeapAlloc(MSACM_hHeap, HEAP_ZERO_MEMORY, sizeof(DRIVERITEMA));
   pDrvr->count = 1;
   pDrvr->driverproc = pfnDriverProc;
   
   /* FIXME: Send DRV_OPEN among others to DriverProc */
 
-  return (HDRVR32) pDrvr;
+  return (HDRVR) pDrvr;
 #else
-  return (HDRVR32) 0;
+  return (HDRVR) 0;
 #endif
 }
 
diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c
index 655c226de40..7d9a81848f6 100644
--- a/dlls/msacm32/msacm32_main.c
+++ b/dlls/msacm32/msacm32_main.c
@@ -14,31 +14,31 @@
 
 /**********************************************************************/
 
-static DWORD MSACM_dwProcessesAttached32 = 0;
+static DWORD MSACM_dwProcessesAttached = 0;
 
 /***********************************************************************
  *           MSACM_LibMain32 (MSACM32.init) 
  */
-BOOL32 WINAPI MSACM32_LibMain(
-  HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI MSACM32_LibMain(
+  HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
   switch(fdwReason)
     {
     case DLL_PROCESS_ATTACH:
-      if(MSACM_dwProcessesAttached32 == 0)
+      if(MSACM_dwProcessesAttached == 0)
 	{
-	  MSACM_hHeap32 = HeapCreate(0, 0x10000, 0);
-	  MSACM_RegisterAllDrivers32();
+	  MSACM_hHeap = HeapCreate(0, 0x10000, 0);
+	  MSACM_RegisterAllDrivers();
 	}
-      MSACM_dwProcessesAttached32++;
+      MSACM_dwProcessesAttached++;
       break;
     case DLL_PROCESS_DETACH:
-      MSACM_dwProcessesAttached32--;
-      if(MSACM_dwProcessesAttached32 == 0)
+      MSACM_dwProcessesAttached--;
+      if(MSACM_dwProcessesAttached == 0)
 	{
-	  MSACM_UnregisterAllDrivers32();
-	  HeapDestroy(MSACM_hHeap32);
-	  MSACM_hHeap32 = (HANDLE32) NULL;
+	  MSACM_UnregisterAllDrivers();
+	  HeapDestroy(MSACM_hHeap);
+	  MSACM_hHeap = (HANDLE) NULL;
 	}
       break;
     case DLL_THREAD_ATTACH:
@@ -60,7 +60,7 @@ BOOL32 WINAPI MSACM32_LibMain(
 /***********************************************************************
  *           acmGetVersion32 (MSACM32.34)
  */
-DWORD WINAPI acmGetVersion32()
+DWORD WINAPI acmGetVersion()
 {
   switch(VERSION_GetVersion()) 
     {
@@ -82,11 +82,11 @@ DWORD WINAPI acmGetVersion32()
 /***********************************************************************
  *           acmMetrics (MSACM32.36)
  */
-MMRESULT32 WINAPI acmMetrics32(
-  HACMOBJ32 hao, UINT32 uMetric, LPVOID  pMetric)
+MMRESULT WINAPI acmMetrics(
+  HACMOBJ hao, UINT uMetric, LPVOID  pMetric)
 {
-  PWINE_ACMOBJ32 pao = MSACM_GetObj32(hao);
-  BOOL32 bLocal = TRUE;
+  PWINE_ACMOBJ pao = MSACM_GetObj(hao);
+  BOOL bLocal = TRUE;
 
   FIXME(msacm, "(0x%08x, %d, %p): stub\n", hao, uMetric, pMetric);
 
diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c
index 21ca98b1249..760e3a89cff 100644
--- a/dlls/msacm32/stream.c
+++ b/dlls/msacm32/stream.c
@@ -15,8 +15,8 @@
 /***********************************************************************
  *           acmStreamClose (MSACM32.37)
  */
-MMRESULT32 WINAPI acmStreamClose32(
-  HACMSTREAM32 has, DWORD fdwClose)
+MMRESULT WINAPI acmStreamClose(
+  HACMSTREAM has, DWORD fdwClose)
 {
   FIXME(msacm, "(0x%08x, %ld): stub\n", has, fdwClose);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -26,8 +26,8 @@ MMRESULT32 WINAPI acmStreamClose32(
 /***********************************************************************
  *           acmStreamConvert (MSACM32.38)
  */
-MMRESULT32 WINAPI acmStreamConvert32(
-  HACMSTREAM32 has, PACMSTREAMHEADER32 pash, DWORD fdwConvert)
+MMRESULT WINAPI acmStreamConvert(
+  HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwConvert)
 {
   FIXME(msacm, "(0x%08x, %p, %ld): stub\n", has, pash, fdwConvert);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -37,8 +37,8 @@ MMRESULT32 WINAPI acmStreamConvert32(
 /***********************************************************************
  *           acmStreamMessage (MSACM32.39)
  */
-MMRESULT32 WINAPI acmStreamMessage32(
-  HACMSTREAM32 has, UINT32 uMsg, LPARAM lParam1, LPARAM lParam2)
+MMRESULT WINAPI acmStreamMessage(
+  HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
   FIXME(msacm, "(0x%08x, %u, %ld, %ld): stub\n",
     has, uMsg, lParam1, lParam2
@@ -50,8 +50,8 @@ MMRESULT32 WINAPI acmStreamMessage32(
 /***********************************************************************
  *           acmStreamOpen (MSACM32.40)
  */
-MMRESULT32 WINAPI acmStreamOpen32(
-  PHACMSTREAM32 phas, HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc,
+MMRESULT WINAPI acmStreamOpen(
+  PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc,
   PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback,
   DWORD dwInstance, DWORD fdwOpen)
 {
@@ -67,8 +67,8 @@ MMRESULT32 WINAPI acmStreamOpen32(
 /***********************************************************************
  *           acmStreamPrepareHeader (MSACM32.41)
  */
-MMRESULT32 WINAPI acmStreamPrepareHeader32(
-  HACMSTREAM32 has, PACMSTREAMHEADER32 pash, DWORD fdwPrepare)
+MMRESULT WINAPI acmStreamPrepareHeader(
+  HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare)
 {
   FIXME(msacm, "(0x%08x, %p, %ld): stub\n", has, pash, fdwPrepare);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -78,8 +78,8 @@ MMRESULT32 WINAPI acmStreamPrepareHeader32(
 /***********************************************************************
  *           acmStreamReset (MSACM32.42)
  */
-MMRESULT32 WINAPI acmStreamReset32(
-  HACMSTREAM32 has, DWORD fdwReset)
+MMRESULT WINAPI acmStreamReset(
+  HACMSTREAM has, DWORD fdwReset)
 {
   FIXME(msacm, "(0x%08x, %ld): stub\n", has, fdwReset);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -89,8 +89,8 @@ MMRESULT32 WINAPI acmStreamReset32(
 /***********************************************************************
  *           acmStreamSize (MSACM32.43)
  */
-MMRESULT32 WINAPI acmStreamSize32(
-  HACMSTREAM32 has, DWORD cbInput, 
+MMRESULT WINAPI acmStreamSize(
+  HACMSTREAM has, DWORD cbInput, 
   LPDWORD pdwOutputBytes, DWORD fdwSize)
 {
   FIXME(msacm, "(0x%08x, %ld, %p, %ld): stub\n",
@@ -103,8 +103,8 @@ MMRESULT32 WINAPI acmStreamSize32(
 /***********************************************************************
  *           acmStreamUnprepareHeader (MSACM32.44)
  */
-MMRESULT32 WINAPI acmStreamUnprepareHeader32(
-  HACMSTREAM32 has, PACMSTREAMHEADER32 pash, DWORD fdwUnprepare)
+MMRESULT WINAPI acmStreamUnprepareHeader(
+  HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare)
 {
   FIXME(msacm, "(0x%08x, %p, %ld): stub\n",
     has, pash, fdwUnprepare
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 005c2917873..10b3602a5c2 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -107,7 +107,7 @@ NTSTATUS WINAPI NtCreateTimer(
  *		NtSetTimer				[NTDLL.221]
  */
 NTSTATUS WINAPI NtSetTimer(
-	IN HANDLE32 TimerHandle,
+	IN HANDLE TimerHandle,
 	IN PLARGE_INTEGER DueTime,
 	IN PTIMERAPCROUTINE TimerApcRoutine,
 	IN PVOID TimerContext,
@@ -140,8 +140,8 @@ NTSTATUS WINAPI NtCreateEvent(
  *		NtDeviceIoControlFile			[NTDLL.94]
  */
 NTSTATUS WINAPI NtDeviceIoControlFile(
-	IN HANDLE32 DeviceHandle,
-	IN HANDLE32 Event OPTIONAL,
+	IN HANDLE DeviceHandle,
+	IN HANDLE Event OPTIONAL,
 	IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL,
 	IN PVOID UserApcContext OPTIONAL,
 	OUT PIO_STATUS_BLOCK IoStatusBlock,
@@ -192,7 +192,7 @@ NTSTATUS WINAPI NtOpenDirectoryObject(
  *  DataWritten		Caller supplied storage for the number of bytes written (or NULL)
  */
 NTSTATUS WINAPI NtQueryDirectoryObject(
-	IN HANDLE32 DirObjHandle,
+	IN HANDLE DirObjHandle,
 	OUT POBJDIR_INFORMATION DirObjInformation,
 	IN ULONG BufferLength,
 	IN BOOLEAN GetNextIndex,
@@ -239,7 +239,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
  * NtQueryObject [NTDLL.161]
  */
 NTSTATUS WINAPI NtQueryObject(
-	IN HANDLE32 ObjectHandle,
+	IN HANDLE ObjectHandle,
 	IN OBJECT_INFORMATION_CLASS ObjectInformationClass,
 	OUT PVOID ObjectInformation,
 	IN ULONG Length,
@@ -255,7 +255,7 @@ NTSTATUS WINAPI NtQueryObject(
  * NtSetInformationProcess [NTDLL.207]
  */
 NTSTATUS WINAPI NtSetInformationProcess(
-	IN HANDLE32 ProcessHandle,
+	IN HANDLE ProcessHandle,
 	IN PROCESSINFOCLASS ProcessInformationClass,
 	IN PVOID ProcessInformation,
 	IN ULONG ProcessInformationLength)
@@ -269,8 +269,8 @@ NTSTATUS WINAPI NtSetInformationProcess(
  * NtFsControlFile [NTDLL.108]
  */
 NTSTATUS WINAPI NtFsControlFile(
-	IN HANDLE32 DeviceHandle,
-	IN HANDLE32 Event OPTIONAL,
+	IN HANDLE DeviceHandle,
+	IN HANDLE Event OPTIONAL,
 	IN PIO_APC_ROUTINE ApcRoutine OPTIONAL,
 	IN PVOID ApcContext OPTIONAL,
 	OUT PIO_STATUS_BLOCK IoStatusBlock,
@@ -301,7 +301,7 @@ NTSTATUS WINAPI NtQueryTimerResolution(DWORD x1,DWORD x2,DWORD x3)
  *	Handle	handle to close
  */
 NTSTATUS WINAPI NtClose(
-	HANDLE32 Handle) 
+	HANDLE Handle) 
 {
 	FIXME(ntdll,"(0x%08x),stub!\n",Handle);
 	return 1;
@@ -311,7 +311,7 @@ NTSTATUS WINAPI NtClose(
 *
 */
 NTSTATUS WINAPI NtQueryInformationProcess(
-	IN HANDLE32 ProcessHandle,
+	IN HANDLE ProcessHandle,
 	IN PROCESSINFOCLASS ProcessInformationClass,
 	OUT PVOID ProcessInformation,
 	IN ULONG ProcessInformationLength,
@@ -326,7 +326,7 @@ NTSTATUS WINAPI NtQueryInformationProcess(
 *
 */
 NTSTATUS WINAPI NtQueryInformationThread(
-	IN HANDLE32 ThreadHandle,
+	IN HANDLE ThreadHandle,
 	IN THREADINFOCLASS ThreadInformationClass,
 	OUT PVOID ThreadInformation,
 	IN ULONG ThreadInformationLength,
@@ -366,9 +366,9 @@ NTSTATUS WINAPI NtCreatePagingFile(
  *  NtDuplicateObject		[NTDLL] 
  */
 NTSTATUS WINAPI NtDuplicateObject(
-	IN HANDLE32 SourceProcessHandle,
+	IN HANDLE SourceProcessHandle,
 	IN PHANDLE SourceHandle,
-	IN HANDLE32 TargetProcessHandle,
+	IN HANDLE TargetProcessHandle,
 	OUT PHANDLE TargetHandle,
 	IN ACCESS_MASK DesiredAccess,
 	IN BOOLEAN InheritHandle,
@@ -397,7 +397,7 @@ NTSTATUS WINAPI NtDuplicateToken(
  * FIXME: parameters unsafe
  */
 NTSTATUS WINAPI NtAdjustPrivilegesToken(
-	IN HANDLE32 TokenHandle,
+	IN HANDLE TokenHandle,
 	IN BOOLEAN DisableAllPrivileges,
 	IN PTOKEN_PRIVILEGES NewState,
 	IN DWORD BufferLength,
@@ -421,7 +421,7 @@ NTSTATUS WINAPI NtOpenProcessToken(DWORD x1,DWORD x2,DWORD x3) {
  *  NtSetInformationThread		[NTDLL] 
  */
 NTSTATUS WINAPI NtSetInformationThread(
-	HANDLE32 ThreadHandle,
+	HANDLE ThreadHandle,
 	THREADINFOCLASS ThreadInformationClass,
 	PVOID ThreadInformation,
 	ULONG ThreadInformationLength)
@@ -443,7 +443,7 @@ NTSTATUS WINAPI NtOpenThreadToken(DWORD x1,DWORD x2,DWORD x3,DWORD x4) {
  *  NtSetVolumeInformationFile		[NTDLL] 
  */
 NTSTATUS WINAPI NtSetVolumeInformationFile(
-	IN HANDLE32 FileHandle,
+	IN HANDLE FileHandle,
 	IN PVOID VolumeInformationClass,
 	PVOID VolumeInformation,
 	ULONG Length) 
@@ -466,7 +466,7 @@ NTSTATUS WINAPI NtCreatePort(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5)
  *  NtSetInformationFile		[NTDLL] 
  */
 NTSTATUS WINAPI NtSetInformationFile(
-	HANDLE32 FileHandle,
+	HANDLE FileHandle,
 	PIO_STATUS_BLOCK IoStatusBlock,
 	PVOID FileInformation,
 	ULONG Length,
@@ -481,7 +481,7 @@ NTSTATUS WINAPI NtSetInformationFile(
  *  NtSetEvent		[NTDLL] 
  */
 NTSTATUS WINAPI NtSetEvent(
-	IN HANDLE32 EventHandle,
+	IN HANDLE EventHandle,
 	PULONG NumberOfThreadsReleased)
 {
 	FIXME(ntdll,"(0x%08x,%p)\n",
@@ -494,7 +494,7 @@ NTSTATUS WINAPI NtSetEvent(
  *  NtQueryInformationFile		[NTDLL] 
  */
 NTSTATUS WINAPI NtQueryInformationFile(
-	HANDLE32 FileHandle,
+	HANDLE FileHandle,
 	PIO_STATUS_BLOCK IoStatusBlock,
 	PVOID FileInformation,
 	ULONG Length,
@@ -590,8 +590,8 @@ NTSTATUS WINAPI NtCreateDirectoryObject(
  *  Protect		Protection for the committed region of the view
  */
 NTSTATUS WINAPI NtMapViewOfSection(
-	HANDLE32 SectionHandle,
-	HANDLE32 ProcessHandle,
+	HANDLE SectionHandle,
+	HANDLE ProcessHandle,
 	PVOID* BaseAddress,
 	ULONG ZeroBits,
 	ULONG CommitSize,
@@ -630,8 +630,8 @@ NTSTATUS WINAPI NtCreateMailslotFile(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x
  *   PULONG 		Key 		OPTIONAL
  */
 NTSTATUS WINAPI NtReadFile (
-	HANDLE32 FileHandle,
-	HANDLE32 EventHandle,
+	HANDLE FileHandle,
+	HANDLE EventHandle,
 	PIO_APC_ROUTINE ApcRoutine,
 	PVOID ApcContext,
 	PIO_STATUS_BLOCK IoStatusBlock,
@@ -656,7 +656,7 @@ NTSTATUS WINAPI NtCreateSection(
 	IN PLARGE_INTEGER MaximumSize OPTIONAL,
 	IN ULONG SectionPageProtection OPTIONAL,
 	IN ULONG AllocationAttributes,
-	IN HANDLE32 FileHandle OPTIONAL)
+	IN HANDLE FileHandle OPTIONAL)
 {
 	FIXME(ntdll,"(%p,0x%08lx,%p(%s),%p,0x%08lx,0x%08lx,0x%08x) stub\n",
 	SectionHandle,DesiredAccess,ObjectAttributes,
@@ -669,7 +669,7 @@ NTSTATUS WINAPI NtCreateSection(
  *  NtResumeThread	[NTDLL] 
  */
 NTSTATUS WINAPI NtResumeThread(
-	IN HANDLE32 ThreadHandle,
+	IN HANDLE ThreadHandle,
 	IN PULONG SuspendCount) 
 {
 	FIXME(ntdll,"(0x%08x,%p),stub!\n",
@@ -713,7 +713,7 @@ NTSTATUS WINAPI NtRegisterThreadTerminatePort(DWORD x1) {
  *  NtTerminateThread	[NTDLL] 
  */
 NTSTATUS WINAPI NtTerminateThread(
-	IN HANDLE32 ThreadHandle,
+	IN HANDLE ThreadHandle,
 	IN NTSTATUS ExitStatus)
 {
 	if ( TerminateThread(ThreadHandle,ExitStatus) )
@@ -758,7 +758,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter(
  *  NtQuerySection	[NTDLL] 
  */
 NTSTATUS WINAPI NtQuerySection(
-	IN HANDLE32 SectionHandle,
+	IN HANDLE SectionHandle,
 	IN PVOID SectionInformationClass,
 	OUT PVOID SectionInformation,
 	IN ULONG Length,
@@ -796,7 +796,7 @@ NTSTATUS WINAPI NtCreateSemaphore(
  *  NtOpenSemaphore	[NTDLL] 
  */
 NTSTATUS WINAPI NtOpenSemaphore(
-	IN HANDLE32 SemaphoreHandle,
+	IN HANDLE SemaphoreHandle,
 	IN ACCESS_MASK DesiredAcces,
 	IN POBJECT_ATTRIBUTES ObjectAttributes)
 {
@@ -810,7 +810,7 @@ NTSTATUS WINAPI NtOpenSemaphore(
  *  NtQuerySemaphore	[NTDLL] 
  */
 NTSTATUS WINAPI NtQuerySemaphore(
-	HANDLE32 SemaphoreHandle,
+	HANDLE SemaphoreHandle,
 	PVOID SemaphoreInformationClass,
 	OUT PVOID SemaphoreInformation,
 	ULONG Length,
@@ -824,7 +824,7 @@ NTSTATUS WINAPI NtQuerySemaphore(
  *  NtQuerySemaphore	[NTDLL] 
  */
 NTSTATUS WINAPI NtReleaseSemaphore(
-	IN HANDLE32 SemaphoreHandle,
+	IN HANDLE SemaphoreHandle,
 	IN ULONG ReleaseCount,
 	IN PULONG PreviousCount)
 {
@@ -865,7 +865,7 @@ NTSTATUS WINAPI NtOpenSymbolicLinkObject(
  *  NtQuerySymbolicLinkObject	[NTDLL] 
  */
 NTSTATUS NtQuerySymbolicLinkObject(
-	IN HANDLE32 LinkHandle,
+	IN HANDLE LinkHandle,
 	IN OUT PUNICODE_STRING LinkTarget,
 	OUT PULONG ReturnedLength OPTIONAL)
 {
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 7e605115ca8..5d5be5db9e4 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -29,7 +29,7 @@ NTSTATUS WINAPI NtCreateKey(
  * NtDeleteKey [NTDLL]
  * ZwDeleteKey
  */
-NTSTATUS NtDeleteKey(HANDLE32 KeyHandle)
+NTSTATUS NtDeleteKey(HANDLE KeyHandle)
 {
 	FIXME(ntdll,"(0x%08x) stub!\n",
 	KeyHandle);
@@ -41,7 +41,7 @@ NTSTATUS NtDeleteKey(HANDLE32 KeyHandle)
  * ZwDeleteValueKey
  */
 NTSTATUS WINAPI NtDeleteValueKey(
-	IN HANDLE32 KeyHandle,
+	IN HANDLE KeyHandle,
 	IN PUNICODE_STRING ValueName)
 {
 	FIXME(ntdll,"(0x%08x,%p(%s)) stub!\n",
@@ -54,7 +54,7 @@ NTSTATUS WINAPI NtDeleteValueKey(
  * ZwEnumerateKey
  */
 NTSTATUS WINAPI NtEnumerateKey(
-	HANDLE32 KeyHandle,
+	HANDLE KeyHandle,
 	ULONG Index,
 	KEY_INFORMATION_CLASS KeyInformationClass,
 	PVOID KeyInformation,
@@ -71,7 +71,7 @@ NTSTATUS WINAPI NtEnumerateKey(
  *  ZwEnumerateValueKey
  */
 NTSTATUS WINAPI NtEnumerateValueKey(
-	HANDLE32 KeyHandle,
+	HANDLE KeyHandle,
 	ULONG Index,
 	KEY_VALUE_INFORMATION_CLASS KeyInformationClass,
 	PVOID KeyInformation,
@@ -87,7 +87,7 @@ NTSTATUS WINAPI NtEnumerateValueKey(
  *  NtFlushKey	[NTDLL] 
  *  ZwFlushKey
  */
-NTSTATUS NtFlushKey(HANDLE32 KeyHandle)
+NTSTATUS NtFlushKey(HANDLE KeyHandle)
 {
 	FIXME(ntdll,"(0x%08x) stub!\n",
 	KeyHandle);
@@ -113,8 +113,8 @@ NTSTATUS WINAPI NtLoadKey(
  *  ZwNotifyChangeKey
  */
 NTSTATUS WINAPI NtNotifyChangeKey(
-	IN HANDLE32 KeyHandle,
-	IN HANDLE32 Event,
+	IN HANDLE KeyHandle,
+	IN HANDLE Event,
 	IN PIO_APC_ROUTINE ApcRoutine OPTIONAL,
 	IN PVOID ApcContext OPTIONAL,
 	OUT PIO_STATUS_BLOCK IoStatusBlock,
@@ -153,7 +153,7 @@ NTSTATUS WINAPI NtOpenKey(
  * ZwQueryKey
  */
 NTSTATUS WINAPI NtQueryKey(
-	HANDLE32 KeyHandle,
+	HANDLE KeyHandle,
 	KEY_INFORMATION_CLASS KeyInformationClass,
 	PVOID KeyInformation,
 	ULONG Length,
@@ -170,7 +170,7 @@ NTSTATUS WINAPI NtQueryKey(
  */
 
 NTSTATUS WINAPI NtQueryMultipleValueKey(
-	HANDLE32 KeyHandle,
+	HANDLE KeyHandle,
 	PVALENTW ListOfValuesToQuery,
 	ULONG NumberOfItems,
 	PVOID MultipleValueInformation,
@@ -188,7 +188,7 @@ NTSTATUS WINAPI NtQueryMultipleValueKey(
  * ZwQueryValueKey
  */
 NTSTATUS WINAPI NtQueryValueKey(
-	HANDLE32 KeyHandle,
+	HANDLE KeyHandle,
 	PUNICODE_STRING ValueName,
 	KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass,
 	PVOID KeyValueInformation,
@@ -206,7 +206,7 @@ NTSTATUS WINAPI NtQueryValueKey(
  */
 NTSTATUS WINAPI NtReplaceKey(
 	IN POBJECT_ATTRIBUTES ObjectAttributes,
-	IN HANDLE32 Key,
+	IN HANDLE Key,
 	IN POBJECT_ATTRIBUTES ReplacedObjectAttributes)
 {
 	FIXME(ntdll,"(%p(%s),0x%08x,%p (%s)),stub!\n",
@@ -220,8 +220,8 @@ NTSTATUS WINAPI NtReplaceKey(
  * ZwRestoreKey
  */
 NTSTATUS WINAPI NtRestoreKey(
-	HANDLE32 KeyHandle,
-	HANDLE32 FileHandle,
+	HANDLE KeyHandle,
+	HANDLE FileHandle,
 	ULONG RestoreFlags)
 {
 	FIXME(ntdll,"(0x%08x,0x%08x,0x%08lx) stub\n",
@@ -234,8 +234,8 @@ NTSTATUS WINAPI NtRestoreKey(
  * ZwSaveKey
  */
 NTSTATUS WINAPI NtSaveKey(
-	IN HANDLE32 KeyHandle,
-	IN HANDLE32 FileHandle)
+	IN HANDLE KeyHandle,
+	IN HANDLE FileHandle)
 {
 	FIXME(ntdll,"(0x%08x,0x%08x) stub\n",
 	KeyHandle, FileHandle);
@@ -246,7 +246,7 @@ NTSTATUS WINAPI NtSaveKey(
  * ZwSetInformationKey
  */
 NTSTATUS WINAPI NtSetInformationKey(
-	IN HANDLE32 KeyHandle,
+	IN HANDLE KeyHandle,
 	IN const int KeyInformationClass,
 	IN PVOID KeyInformation,
 	IN ULONG KeyInformationLength)
@@ -260,7 +260,7 @@ NTSTATUS WINAPI NtSetInformationKey(
  * ZwSetValueKey
  */
 NTSTATUS WINAPI NtSetValueKey(
-	HANDLE32 KeyHandle,
+	HANDLE KeyHandle,
 	PUNICODE_STRING ValueName,
 	ULONG TitleIndex,
 	ULONG Type,
@@ -278,7 +278,7 @@ NTSTATUS WINAPI NtSetValueKey(
  * ZwUnloadKey
  */
 NTSTATUS WINAPI NtUnloadKey(
-	IN HANDLE32 KeyHandle)
+	IN HANDLE KeyHandle)
 {
 	FIXME(ntdll,"(0x%08x) stub\n",
 	KeyHandle);
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index b58e51ef972..2d673621c07 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -553,7 +553,7 @@ VOID WINAPI RtlInitAnsiString(PANSI_STRING target,LPCSTR source)
 	target->Buffer = (LPSTR)source;
 	if (!source)
 		return;
-	target->MaximumLength = lstrlen32A(target->Buffer);
+	target->MaximumLength = lstrlenA(target->Buffer);
 	target->Length = target->MaximumLength+1;
 }
 /**************************************************************************
@@ -565,7 +565,7 @@ VOID WINAPI RtlInitString(PSTRING target,LPCSTR source)
 	target->Buffer = (LPSTR)source;
 	if (!source)
 		return;
-	target->MaximumLength = lstrlen32A(target->Buffer);
+	target->MaximumLength = lstrlenA(target->Buffer);
 	target->Length = target->MaximumLength+1;
 }
 
@@ -578,7 +578,7 @@ VOID WINAPI RtlInitUnicodeString(PUNICODE_STRING target,LPCWSTR source)
 	target->Buffer = (LPWSTR)source;
 	if (!source)
 		return;
-	target->MaximumLength = lstrlen32W(target->Buffer)*2;
+	target->MaximumLength = lstrlenW(target->Buffer)*2;
 	target->Length = target->MaximumLength+2;
 }
 
@@ -658,7 +658,7 @@ DWORD WINAPI RtlEqualUnicodeString(PUNICODE_STRING s1,PUNICODE_STRING s2,DWORD x
 	return 0;
 	if (s1->Length != s2->Length)
 		return 1;
-	return !lstrncmp32W(s1->Buffer,s2->Buffer,s1->Length/2);
+	return !lstrncmpW(s1->Buffer,s2->Buffer,s1->Length/2);
 }
 
 /**************************************************************************
@@ -689,7 +689,7 @@ DWORD WINAPI RtlUpcaseUnicodeString(PUNICODE_STRING dest,PUNICODE_STRING src,BOO
 /**************************************************************************
  *                 RtlxOemStringToUnicodeSize		[NTDLL.549]
  */
-UINT32 WINAPI RtlxOemStringToUnicodeSize(PSTRING str)
+UINT WINAPI RtlxOemStringToUnicodeSize(PSTRING str)
 {
 	return str->Length*2+2;
 }
@@ -697,7 +697,7 @@ UINT32 WINAPI RtlxOemStringToUnicodeSize(PSTRING str)
 /**************************************************************************
  *                 RtlxAnsiStringToUnicodeSize		[NTDLL.548]
  */
-UINT32 WINAPI RtlxAnsiStringToUnicodeSize(PANSI_STRING str)
+UINT WINAPI RtlxAnsiStringToUnicodeSize(PANSI_STRING str)
 {
 	return str->Length*2+2;
 }
@@ -777,8 +777,8 @@ void WINAPI RtlInitializeResource(LPRTL_RWLOCK rwl)
 	rwl->hOwningThreadId = 0;
 	rwl->dwTimeoutBoost = 0; /* no info on this one, default value is 0 */
 	InitializeCriticalSection( &rwl->rtlCS );
-	rwl->hExclusiveReleaseSemaphore = CreateSemaphore32A( NULL, 0, 65535, NULL );
-	rwl->hSharedReleaseSemaphore = CreateSemaphore32A( NULL, 0, 65535, NULL );
+	rwl->hExclusiveReleaseSemaphore = CreateSemaphoreA( NULL, 0, 65535, NULL );
+	rwl->hSharedReleaseSemaphore = CreateSemaphoreA( NULL, 0, 65535, NULL );
     }
 }
 
@@ -833,7 +833,7 @@ wait:
 	     rwl->uExclusiveWaiters++;
 
 	     LeaveCriticalSection( &rwl->rtlCS );
-	     if( WaitForSingleObject( rwl->hExclusiveReleaseSemaphore, INFINITE32 ) == WAIT_FAILED )
+	     if( WaitForSingleObject( rwl->hExclusiveReleaseSemaphore, INFINITE ) == WAIT_FAILED )
 		 goto done;
 	     goto start; /* restart the acquisition to avoid deadlocks */
 	 }
@@ -873,7 +873,7 @@ start:
 	{
 	    rwl->uSharedWaiters++;
 	    LeaveCriticalSection( &rwl->rtlCS );
-	    if( (dwWait = WaitForSingleObject( rwl->hSharedReleaseSemaphore, INFINITE32 )) == WAIT_FAILED )
+	    if( (dwWait = WaitForSingleObject( rwl->hSharedReleaseSemaphore, INFINITE )) == WAIT_FAILED )
 		goto done;
 	    goto start;
 	}
@@ -920,7 +920,7 @@ wake_exclusive:
 	    else
 		if( rwl->uSharedWaiters )
 		{
-		    UINT32 n = rwl->uSharedWaiters;
+		    UINT n = rwl->uSharedWaiters;
 		    rwl->iNumberActive = rwl->uSharedWaiters; /* prevent new writers from joining until
 							       * all queued readers have done their thing */
 		    rwl->uSharedWaiters = 0;
@@ -957,7 +957,7 @@ void WINAPI RtlDumpResource(LPRTL_RWLOCK rwl)
 void __cdecl DbgPrint(LPCSTR fmt,LPVOID args) {
 	char buf[512];
 
-	wvsprintf32A(buf,fmt,&args);
+	wvsprintfA(buf,fmt,&args);
 	MSG("DbgPrint says: %s",buf);
 	/* hmm, raise exception? */
 }
@@ -1120,7 +1120,7 @@ DWORD WINAPI RtlTimeToElapsedTimeFields( DWORD x1, DWORD x2 )
 /******************************************************************************
  * RtlExtendedLargeIntegerDivide [NTDLL.359]
  */
-INT32 WINAPI RtlExtendedLargeIntegerDivide(
+INT WINAPI RtlExtendedLargeIntegerDivide(
 	LARGE_INTEGER dividend,
 	DWORD divisor,
 	LPDWORD rest
@@ -1144,7 +1144,7 @@ INT32 WINAPI RtlExtendedLargeIntegerDivide(
  */
 long long /*LARGE_INTEGER*/ 
 WINAPI RtlExtendedIntegerMultiply(
-	LARGE_INTEGER factor1,INT32 factor2
+	LARGE_INTEGER factor1,INT factor2
 ) {
 #if SIZEOF_LONG_LONG==8
 	return (*(long long*)&factor1)*factor2;
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index 07c2b3b59a0..e2c415217d9 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -15,7 +15,7 @@
 /***********************************************************************
  *           EmptyWorkingSet (PSAPI.1)
  */
-BOOL32 WINAPI EmptyWorkingSet32(HANDLE32 hProcess)
+BOOL WINAPI EmptyWorkingSet(HANDLE hProcess)
 {
   return SetProcessWorkingSetSize(hProcess, 0xFFFFFFFF, 0xFFFFFFFF);
 }
@@ -23,7 +23,7 @@ BOOL32 WINAPI EmptyWorkingSet32(HANDLE32 hProcess)
 /***********************************************************************
  *           EnumDeviceDrivers (PSAPI.2)
  */
-BOOL32 WINAPI EnumDeviceDrivers(
+BOOL WINAPI EnumDeviceDrivers(
   LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded)
 {
   FIXME(psapi, "(%p, %ld, %p): stub\n", lpImageBase, cb, lpcbNeeded);
@@ -38,7 +38,7 @@ BOOL32 WINAPI EnumDeviceDrivers(
 /***********************************************************************
  *           EnumProcesses (PSAPI.3)
  */
-BOOL32 WINAPI EnumProcesses(DWORD *lpidProcess, DWORD cb, DWORD *lpcbNeeded)
+BOOL WINAPI EnumProcesses(DWORD *lpidProcess, DWORD cb, DWORD *lpcbNeeded)
 {
   FIXME(psapi, "(%p, %ld, %p): stub\n", lpidProcess,cb, lpcbNeeded);
 
@@ -51,8 +51,8 @@ BOOL32 WINAPI EnumProcesses(DWORD *lpidProcess, DWORD cb, DWORD *lpcbNeeded)
 /***********************************************************************
  *           EnumProcessModules (PSAPI.4)
  */
-BOOL32 WINAPI EnumProcessModules(
-  HANDLE32 hProcess, HMODULE32 *lphModule, DWORD cb, LPDWORD lpcbNeeded)
+BOOL WINAPI EnumProcessModules(
+  HANDLE hProcess, HMODULE *lphModule, DWORD cb, LPDWORD lpcbNeeded)
 {
   FIXME(psapi, "(hProcess=0x%08x, %p, %ld, %p): stub\n",
     hProcess, lphModule, cb, lpcbNeeded
@@ -67,7 +67,7 @@ BOOL32 WINAPI EnumProcessModules(
 /***********************************************************************
  *          GetDeviceDriverBaseName32A (PSAPI.5)
  */
-DWORD WINAPI GetDeviceDriverBaseName32A(
+DWORD WINAPI GetDeviceDriverBaseNameA(
   LPVOID ImageBase, LPSTR lpBaseName, DWORD nSize)
 {
   FIXME(psapi, "(%p, %s, %ld): stub\n",
@@ -83,7 +83,7 @@ DWORD WINAPI GetDeviceDriverBaseName32A(
 /***********************************************************************
  *           GetDeviceDriverBaseName32W (PSAPI.6)
  */
-DWORD WINAPI GetDeviceDriverBaseName32W(
+DWORD WINAPI GetDeviceDriverBaseNameW(
   LPVOID ImageBase, LPWSTR lpBaseName, DWORD nSize)
 {
   FIXME(psapi, "(%p, %s, %ld): stub\n",
@@ -99,7 +99,7 @@ DWORD WINAPI GetDeviceDriverBaseName32W(
 /***********************************************************************
  *           GetDeviceDriverFileName32A (PSAPI.7)
  */
-DWORD WINAPI GetDeviceDriverFileName32A(
+DWORD WINAPI GetDeviceDriverFileNameA(
   LPVOID ImageBase, LPSTR lpFilename, DWORD nSize)
 {
   FIXME(psapi, "(%p, %s, %ld): stub\n",
@@ -115,7 +115,7 @@ DWORD WINAPI GetDeviceDriverFileName32A(
 /***********************************************************************
  *           GetDeviceDriverFileName32W (PSAPI.8)
  */
-DWORD WINAPI GetDeviceDriverFileName32W(
+DWORD WINAPI GetDeviceDriverFileNameW(
   LPVOID ImageBase, LPWSTR lpFilename, DWORD nSize)
 {
   FIXME(psapi, "(%p, %s, %ld): stub\n",
@@ -131,8 +131,8 @@ DWORD WINAPI GetDeviceDriverFileName32W(
 /***********************************************************************
  *           GetMappedFileName32A (PSAPI.9)
  */
-DWORD WINAPI GetMappedFileName32A(
-  HANDLE32 hProcess, LPVOID lpv, LPSTR lpFilename, DWORD nSize)
+DWORD WINAPI GetMappedFileNameA(
+  HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, DWORD nSize)
 {
   FIXME(psapi, "(hProcess=0x%08x, %p, %s, %ld): stub\n",
     hProcess, lpv, debugstr_a(lpFilename), nSize
@@ -147,8 +147,8 @@ DWORD WINAPI GetMappedFileName32A(
 /***********************************************************************
  *           GetMappedFileName32W (PSAPI.10)
  */
-DWORD WINAPI GetMappedFileName32W(
-  HANDLE32 hProcess, LPVOID lpv, LPWSTR lpFilename, DWORD nSize)
+DWORD WINAPI GetMappedFileNameW(
+  HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, DWORD nSize)
 {
   FIXME(psapi, "(hProcess=0x%08x, %p, %s, %ld): stub\n",
     hProcess, lpv, debugstr_w(lpFilename), nSize
@@ -163,8 +163,8 @@ DWORD WINAPI GetMappedFileName32W(
 /***********************************************************************
  *           GetModuleBaseName32A (PSAPI.11)
  */
-DWORD WINAPI GetModuleBaseName32A(
-  HANDLE32 hProcess, HMODULE32 hModule, LPSTR lpBaseName, DWORD nSize)
+DWORD WINAPI GetModuleBaseNameA(
+  HANDLE hProcess, HMODULE hModule, LPSTR lpBaseName, DWORD nSize)
 {
   FIXME(psapi, "(hProcess=0x%08x, hModule=0x%08x, %s, %ld): stub\n",
     hProcess, hModule, debugstr_a(lpBaseName), nSize
@@ -179,8 +179,8 @@ DWORD WINAPI GetModuleBaseName32A(
 /***********************************************************************
  *           GetModuleBaseName32W (PSAPI.12)
  */
-DWORD WINAPI GetModuleBaseName32W(
-  HANDLE32 hProcess, HMODULE32 hModule, LPWSTR lpBaseName, DWORD nSize)
+DWORD WINAPI GetModuleBaseNameW(
+  HANDLE hProcess, HMODULE hModule, LPWSTR lpBaseName, DWORD nSize)
 {
   FIXME(psapi, "(hProcess=0x%08x, hModule=0x%08x, %s, %ld): stub\n",
     hProcess, hModule, debugstr_w(lpBaseName), nSize);
@@ -194,8 +194,8 @@ DWORD WINAPI GetModuleBaseName32W(
 /***********************************************************************
  *           GetModuleFileNameEx32A (PSAPI.13)
  */
-DWORD WINAPI GetModuleFileNameEx32A(
-  HANDLE32 hProcess, HMODULE32 hModule, LPSTR lpFilename, DWORD nSize)
+DWORD WINAPI GetModuleFileNameExA(
+  HANDLE hProcess, HMODULE hModule, LPSTR lpFilename, DWORD nSize)
 {
   FIXME(psapi, "(hProcess=0x%08x,hModule=0x%08x, %s, %ld): stub\n",
     hProcess, hModule, debugstr_a(lpFilename), nSize
@@ -210,8 +210,8 @@ DWORD WINAPI GetModuleFileNameEx32A(
 /***********************************************************************
  *           GetModuleFileNameEx32W (PSAPI.14)
  */
-DWORD WINAPI GetModuleFileNameEx32W(
-  HANDLE32 hProcess, HMODULE32 hModule, LPWSTR lpFilename, DWORD nSize)
+DWORD WINAPI GetModuleFileNameExW(
+  HANDLE hProcess, HMODULE hModule, LPWSTR lpFilename, DWORD nSize)
 {
   FIXME(psapi, "(hProcess=0x%08x,hModule=0x%08x, %s, %ld): stub\n",
     hProcess, hModule, debugstr_w(lpFilename), nSize
@@ -226,8 +226,8 @@ DWORD WINAPI GetModuleFileNameEx32W(
 /***********************************************************************
  *           GetModuleInformation32 (PSAPI.15)
  */
-BOOL32 WINAPI GetModuleInformation32(
-  HANDLE32 hProcess, HMODULE32 hModule, LPMODULEINFO32 lpmodinfo, DWORD cb)
+BOOL WINAPI GetModuleInformation(
+  HANDLE hProcess, HMODULE hModule, LPMODULEINFO lpmodinfo, DWORD cb)
 {
   FIXME(psapi, "(hProcess=0x%08x, hModule=0x%08x, %p, %ld): stub\n",
     hProcess, hModule, lpmodinfo, cb
@@ -241,8 +241,8 @@ BOOL32 WINAPI GetModuleInformation32(
 /***********************************************************************
  *           GetProcessMemoryInfo32 (PSAPI.16)
  */
-BOOL32 WINAPI GetProcessMemoryInfo32(
-  HANDLE32 Process, PPROCESS_MEMORY_COUNTERS32 ppsmemCounters, DWORD cb)
+BOOL WINAPI GetProcessMemoryInfo(
+  HANDLE Process, PPROCESS_MEMORY_COUNTERS ppsmemCounters, DWORD cb)
 {
   FIXME(psapi, "(hProcess=0x%08x, %p, %ld): stub\n",
     Process, ppsmemCounters, cb
@@ -256,8 +256,8 @@ BOOL32 WINAPI GetProcessMemoryInfo32(
 /***********************************************************************
  *           GetWsChanges32 (PSAPI.17)
  */
-BOOL32 WINAPI GetWsChanges32(
-  HANDLE32 hProcess, PPSAPI_WS_WATCH_INFORMATION32 lpWatchInfo, DWORD cb)
+BOOL WINAPI GetWsChanges(
+  HANDLE hProcess, PPSAPI_WS_WATCH_INFORMATION lpWatchInfo, DWORD cb)
 {
   FIXME(psapi, "(hProcess=0x%08x, %p, %ld): stub\n",
     hProcess, lpWatchInfo, cb
@@ -271,7 +271,7 @@ BOOL32 WINAPI GetWsChanges32(
 /***********************************************************************
  *           InitializeProcessForWsWatch32 (PSAPI.18)
  */
-BOOL32 WINAPI InitializeProcessForWsWatch32(HANDLE32 hProcess)
+BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess)
 {
   FIXME(psapi, "(hProcess=0x%08x): stub\n", hProcess);
 
@@ -284,7 +284,7 @@ BOOL32 WINAPI InitializeProcessForWsWatch32(HANDLE32 hProcess)
  *     I haven't been able to find the ordinal for this function,
  *     This means it can't be called from outside the DLL.
  */
-BOOL32 WINAPI QueryWorkingSet32(HANDLE32 hProcess, LPVOID pv, DWORD cb)
+BOOL WINAPI QueryWorkingSet(HANDLE hProcess, LPVOID pv, DWORD cb)
 {
   FIXME(psapi, "(hProcess=0x%08x, %p, %ld)", hProcess, pv, cb);
 
diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c
index a798f2b8f3f..df89ef6ce34 100644
--- a/dlls/rasapi32/rasapi.c
+++ b/dlls/rasapi32/rasapi.c
@@ -11,7 +11,7 @@
 /**************************************************************************
  *                 RasEnumConnections32A			[RASAPI32.544]
  */
-DWORD WINAPI RasEnumConnections32A( LPRASCONN32A rca, LPDWORD x, LPDWORD y) {
+DWORD WINAPI RasEnumConnectionsA( LPRASCONNA rca, LPDWORD x, LPDWORD y) {
 	/* Remote Access Service stuff is done by underlying OS anyway */
 	FIXME(ras,"(%p,%p,%p),stub!\n",rca,x,y);
 	return 0;
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 69e6163bc15..b7a1f5cfb47 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -24,19 +24,19 @@
 
 #define		IDD_TREEVIEW 99
 
-static HWND32		hwndTreeView;
-static LPBROWSEINFO32A  lpBrowseInfo;
+static HWND		hwndTreeView;
+static LPBROWSEINFOA  lpBrowseInfo;
 static LPITEMIDLIST	pidlRet;
 
 static void FillTreeView(LPSHELLFOLDER lpsf, LPITEMIDLIST  lpifq, HTREEITEM hParent);
 
-static void InitializeTreeView(HWND32 hwndParent)
+static void InitializeTreeView(HWND hwndParent)
 {
 	HIMAGELIST	hImageList;
 	LPSHELLFOLDER	lpsf;
 	HRESULT	hr;
 
-	hwndTreeView = GetDlgItem32 (hwndParent, IDD_TREEVIEW);
+	hwndTreeView = GetDlgItem (hwndParent, IDD_TREEVIEW);
 	Shell_GetImageList(NULL, &hImageList);
 	
 	TRACE(shell,"dlg=%x tree=%x\n", hwndParent, hwndTreeView );
@@ -57,13 +57,13 @@ static void InitializeTreeView(HWND32 hwndParent)
 	}
 }
 
-static int GetIcon(LPITEMIDLIST lpi, UINT32 uFlags)
-{	SHFILEINFO32A    sfi;
-	SHGetFileInfo32A((LPCSTR)lpi,0,&sfi, sizeof(SHFILEINFO32A), uFlags);
+static int GetIcon(LPITEMIDLIST lpi, UINT uFlags)
+{	SHFILEINFOA    sfi;
+	SHGetFileInfoA((LPCSTR)lpi,0,&sfi, sizeof(SHFILEINFOA), uFlags);
 	return sfi.iIcon;
 }
 
-static void GetNormalAndSelectedIcons(LPITEMIDLIST lpifq,LPTVITEM32A lpTV_ITEM)
+static void GetNormalAndSelectedIcons(LPITEMIDLIST lpifq,LPTVITEMA lpTV_ITEM)
 {	TRACE (shell,"%p %p\n",lpifq, lpTV_ITEM);
 
 	lpTV_ITEM->iImage = GetIcon(lpifq, SHGFI_PIDL | SHGFI_SYSICONINDEX | SHGFI_SMALLICON);
@@ -79,9 +79,9 @@ typedef struct tagID
    LPITEMIDLIST  lpifq;
 } TV_ITEMDATA, *LPTV_ITEMDATA;
 
-static BOOL32 GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST lpi, DWORD dwFlags, LPSTR lpFriendlyName)
+static BOOL GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST lpi, DWORD dwFlags, LPSTR lpFriendlyName)
 {
-	BOOL32   bSuccess=TRUE;
+	BOOL   bSuccess=TRUE;
 	STRRET str;
 
 	TRACE(shell,"%p %p %lx %p\n", lpsf, lpi, dwFlags, lpFriendlyName);
@@ -97,8 +97,8 @@ static BOOL32 GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST lpi, DWORD dwFlags, LPSTR
 
 static void FillTreeView(LPSHELLFOLDER lpsf, LPITEMIDLIST  pidl, HTREEITEM hParent)
 {
-	TVITEM32A 			tvi;
-	TVINSERTSTRUCT32A 	tvins;
+	TVITEMA 			tvi;
+	TVINSERTSTRUCTA 	tvins;
 	HTREEITEM       hPrev = 0;
 	LPENUMIDLIST    lpe=0;
 	LPITEMIDLIST	pidlTemp=0;
@@ -106,12 +106,12 @@ static void FillTreeView(LPSHELLFOLDER lpsf, LPITEMIDLIST  pidl, HTREEITEM hPare
 	ULONG		ulFetched;
 	HRESULT		hr;
 	char		szBuff[256];
-	HWND32		hwnd=GetParent32(hwndTreeView);
+	HWND		hwnd=GetParent(hwndTreeView);
 
-	TRACE(shell, "%p %p %x\n",lpsf, pidl, (INT32)hParent);
+	TRACE(shell, "%p %p %x\n",lpsf, pidl, (INT)hParent);
 	
-	SetCapture32(GetParent32(hwndTreeView));
-	SetCursor32(LoadCursor32A(0, IDC_WAIT32A));
+	SetCapture(GetParent(hwndTreeView));
+	SetCursor(LoadCursorA(0, IDC_WAITA));
 
 	hr=lpsf->lpvtbl->fnEnumObjects(lpsf,hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS,&lpe);
 
@@ -148,7 +148,7 @@ static void FillTreeView(LPSHELLFOLDER lpsf, LPITEMIDLIST  pidl, HTREEITEM hPare
 	        tvins.hInsertAfter = hPrev;
 	        tvins.hParent      = hParent;
 
-	        hPrev = (HTREEITEM)TreeView_InsertItem32A (hwndTreeView, &tvins);
+	        hPrev = (HTREEITEM)TreeView_InsertItemA (hwndTreeView, &tvins);
 
 	      }
 	    }
@@ -159,15 +159,15 @@ static void FillTreeView(LPSHELLFOLDER lpsf, LPITEMIDLIST  pidl, HTREEITEM hPare
 
 Done:
 	ReleaseCapture();
-	SetCursor32(LoadCursor32A(0, IDC_ARROW32A));
+	SetCursor(LoadCursorA(0, IDC_ARROWA));
 
 	if (lpe)  lpe->lpvtbl->fnRelease(lpe);
 	if (pidlTemp )           SHFree(pidlTemp);
 }
 
-static LRESULT MsgNotify(HWND32 hWnd,  UINT32 CtlID, LPNMHDR lpnmh)
+static LRESULT MsgNotify(HWND hWnd,  UINT CtlID, LPNMHDR lpnmh)
 {	
-	NMTREEVIEW32A	*pnmtv   = (NMTREEVIEW32A *)lpnmh;
+	NMTREEVIEWA	*pnmtv   = (NMTREEVIEWA *)lpnmh;
 	LPTV_ITEMDATA	lptvid;  //Long pointer to TreeView item data
 	LPSHELLFOLDER	lpsf2=0;
 	
@@ -221,14 +221,14 @@ static LRESULT MsgNotify(HWND32 hWnd,  UINT32 CtlID, LPNMHDR lpnmh)
 /*************************************************************************
  *             BrsFolderDlgProc32  (not an exported API function)
  */
-BOOL32 WINAPI BrsFolderDlgProc32( HWND32 hWnd, UINT32 msg, WPARAM32 wParam,
+BOOL WINAPI BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
                                LPARAM lParam )
 {    TRACE(shell,"hwnd=%i msg=%i 0x%08x 0x%08lx\n", hWnd,  msg, wParam, lParam );
 
 	switch(msg)
 	{ case WM_INITDIALOG:
 	    pidlRet = NULL;
-	    lpBrowseInfo = (LPBROWSEINFO32A) lParam;
+	    lpBrowseInfo = (LPBROWSEINFOA) lParam;
 	    if (lpBrowseInfo->lpfn)
 	      FIXME(shell,"Callbacks not implemented\n");
 	    if (lpBrowseInfo->ulFlags)
@@ -242,7 +242,7 @@ BOOL32 WINAPI BrsFolderDlgProc32( HWND32 hWnd, UINT32 msg, WPARAM32 wParam,
 	    return 1;
 
 	  case WM_NOTIFY:
-	    MsgNotify( hWnd, (UINT32)wParam, (LPNMHDR)lParam);
+	    MsgNotify( hWnd, (UINT)wParam, (LPNMHDR)lParam);
 	    break;
 	    
 	  case WM_COMMAND:
@@ -250,11 +250,11 @@ BOOL32 WINAPI BrsFolderDlgProc32( HWND32 hWnd, UINT32 msg, WPARAM32 wParam,
 	    { case IDOK:
 		pdump ( pidlRet );
 		_ILGetPidlPath (pidlRet, lpBrowseInfo->pszDisplayName, MAX_PATH);
-	        EndDialog32(hWnd, (DWORD) ILClone(pidlRet));
+	        EndDialog(hWnd, (DWORD) ILClone(pidlRet));
 	        return TRUE;
 
 	      case IDCANCEL:
-	        EndDialog32(hWnd, 0);
+	        EndDialog(hWnd, 0);
 	        return TRUE;
 	    }
 	    break;
@@ -267,11 +267,11 @@ extern LPCVOID _Resource_Dlg_SHBRSFORFOLDER_MSGBOX_0_data ;
  * SHBrowseForFolderA [SHELL32.209]
  *
  */
-LPITEMIDLIST WINAPI SHBrowseForFolder32A (LPBROWSEINFO32A lpbi)
+LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
 {
 	TRACE(shell, "(%lx,%s) empty stub!\n", (DWORD)lpbi, lpbi->lpszTitle);
 
-	return (LPITEMIDLIST) DialogBoxIndirectParam32A( 0, 
+	return (LPITEMIDLIST) DialogBoxIndirectParamA( 0, 
 			&_Resource_Dlg_SHBRSFORFOLDER_MSGBOX_0_data, 0, 
-			BrsFolderDlgProc32, (INT32)lpbi );
+			BrsFolderDlgProc, (INT)lpbi );
 }
diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c
index b980b23b1e9..f76f64bba1b 100644
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -13,16 +13,16 @@
 #include "shlobj.h"
 #include "shell32_main.h"
 
-BOOL32 HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len)
+BOOL HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len)
 {	HKEY	hkey;
 
 	TRACE(shell, "%s %p\n",szExtension, szFileType );
 
-	if (RegOpenKeyEx32A(HKEY_CLASSES_ROOT,szExtension,0,0x02000000,&hkey))
+	if (RegOpenKeyExA(HKEY_CLASSES_ROOT,szExtension,0,0x02000000,&hkey))
 	{ return FALSE;
 	}
 
-	if (RegQueryValue32A(hkey,NULL,szFileType,&len))
+	if (RegQueryValueA(hkey,NULL,szFileType,&len))
 	{ RegCloseKey(hkey);
 	  return FALSE;
 	}	
@@ -33,7 +33,7 @@ BOOL32 HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len)
 
 	return TRUE;
 }
-BOOL32 HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD len )
+BOOL HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD len )
 {	HKEY	hkey;
 	char	sTemp[256];
 	
@@ -41,11 +41,11 @@ BOOL32 HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWOR
 
 	sprintf(sTemp, "%s\\shell\\%s\\command",szClass, szVerb);
 
-	if (RegOpenKeyEx32A(HKEY_CLASSES_ROOT,sTemp,0,0x02000000,&hkey))
+	if (RegOpenKeyExA(HKEY_CLASSES_ROOT,sTemp,0,0x02000000,&hkey))
 	{ return FALSE;
 	}
 
-	if (RegQueryValue32A(hkey,NULL,szDest,&len))
+	if (RegQueryValueA(hkey,NULL,szDest,&len))
 	{ RegCloseKey(hkey);
 	  return FALSE;
 	}	
@@ -61,7 +61,7 @@ BOOL32 HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWOR
 *
 * Gets the icon for a filetype
 */
-BOOL32 HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr)
+BOOL HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr)
 {	HKEY	hkey;
 	char	sTemp[256];
 	char	sNum[5];
@@ -70,22 +70,22 @@ BOOL32 HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr
 
 	sprintf(sTemp, "%s\\DefaultIcon",szClass);
 
-	if (RegOpenKeyEx32A(HKEY_CLASSES_ROOT,sTemp,0,0x02000000,&hkey))
+	if (RegOpenKeyExA(HKEY_CLASSES_ROOT,sTemp,0,0x02000000,&hkey))
 	{ return FALSE;
 	}
 
-	if (RegQueryValue32A(hkey,NULL,szDest,&len))
+	if (RegQueryValueA(hkey,NULL,szDest,&len))
 	{ RegCloseKey(hkey);
 	  return FALSE;
 	}	
 
 	RegCloseKey(hkey);
 
-	if (ParseField32A (szDest, 2, sNum, 5))
+	if (ParseFieldA (szDest, 2, sNum, 5))
 	{ *dwNr=atoi(sNum);
 	}
 	
-	ParseField32A (szDest, 1, szDest, len);
+	ParseFieldA (szDest, 1, szDest, len);
 	
 	TRACE(shell, "-- %s %li\n", szDest, *dwNr );
 
diff --git a/dlls/shell32/contmenu.c b/dlls/shell32/contmenu.c
index f737346c463..179746d8236 100644
--- a/dlls/shell32/contmenu.c
+++ b/dlls/shell32/contmenu.c
@@ -23,22 +23,22 @@ typedef struct
   DWORD     ref;
   LPSHELLFOLDER pSFParent;
   LPITEMIDLIST  *aPidls;
-  BOOL32    bAllValues;
+  BOOL    bAllValues;
 } IContextMenuImpl;
 
 static HRESULT WINAPI IContextMenu_fnQueryInterface(IContextMenu *,REFIID , LPVOID *);
 static ULONG WINAPI IContextMenu_fnAddRef(IContextMenu *);
 static ULONG WINAPI IContextMenu_fnRelease(IContextMenu *);
-static HRESULT WINAPI IContextMenu_fnQueryContextMenu(IContextMenu *, HMENU32 ,UINT32 ,UINT32 ,UINT32 ,UINT32);
-static HRESULT WINAPI IContextMenu_fnInvokeCommand(IContextMenu *, LPCMINVOKECOMMANDINFO32);
-static HRESULT WINAPI IContextMenu_fnGetCommandString(IContextMenu *, UINT32 ,UINT32 ,LPUINT32 ,LPSTR ,UINT32);
-static HRESULT WINAPI IContextMenu_fnHandleMenuMsg(IContextMenu *, UINT32, WPARAM32, LPARAM);
+static HRESULT WINAPI IContextMenu_fnQueryContextMenu(IContextMenu *, HMENU ,UINT ,UINT ,UINT ,UINT);
+static HRESULT WINAPI IContextMenu_fnInvokeCommand(IContextMenu *, LPCMINVOKECOMMANDINFO);
+static HRESULT WINAPI IContextMenu_fnGetCommandString(IContextMenu *, UINT ,UINT ,LPUINT ,LPSTR ,UINT);
+static HRESULT WINAPI IContextMenu_fnHandleMenuMsg(IContextMenu *, UINT, WPARAM, LPARAM);
 
 /* Private Methods */
-BOOL32 IContextMenu_AllocPidlTable(IContextMenuImpl*, DWORD);
+BOOL IContextMenu_AllocPidlTable(IContextMenuImpl*, DWORD);
 void IContextMenu_FreePidlTable(IContextMenuImpl*);
-BOOL32 IContextMenu_CanRenameItems(IContextMenuImpl*);
-BOOL32 IContextMenu_FillPidlTable(IContextMenuImpl*, LPCITEMIDLIST *, UINT32);
+BOOL IContextMenu_CanRenameItems(IContextMenuImpl*);
+BOOL IContextMenu_FillPidlTable(IContextMenuImpl*, LPCITEMIDLIST *, UINT);
 
 /**************************************************************************
 * IContextMenu VTable
@@ -124,9 +124,9 @@ static ULONG WINAPI IContextMenu_fnRelease(IContextMenu *iface)
 /**************************************************************************
 *   IContextMenu_Constructor()
 */
-IContextMenu *IContextMenu_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST *aPidls, UINT32 uItemCount)
+IContextMenu *IContextMenu_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST *aPidls, UINT uItemCount)
 {	IContextMenuImpl* cm;
-	UINT32  u;
+	UINT  u;
   FIXME(shell, "HELLO age\n")  ;
 	cm = (IContextMenuImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IContextMenuImpl));
 	cm->lpvtbl=&cmvt;
@@ -155,9 +155,9 @@ IContextMenu *IContextMenu_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST *a
 /**************************************************************************
 *  ICM_InsertItem()
 */ 
-void WINAPI _InsertMenuItem (HMENU32 hmenu, UINT32 indexMenu, BOOL32 fByPosition, 
-			UINT32 wID, UINT32 fType, LPSTR dwTypeData, UINT32 fState)
-{	MENUITEMINFO32A	mii;
+void WINAPI _InsertMenuItem (HMENU hmenu, UINT indexMenu, BOOL fByPosition, 
+			UINT wID, UINT fType, LPSTR dwTypeData, UINT fState)
+{	MENUITEMINFOA	mii;
 
 	ZeroMemory(&mii, sizeof(mii));
 	mii.cbSize = sizeof(mii);
@@ -171,16 +171,16 @@ void WINAPI _InsertMenuItem (HMENU32 hmenu, UINT32 indexMenu, BOOL32 fByPosition
 	}
 	mii.wID = wID;
 	mii.fType = fType;
-	InsertMenuItem32A( hmenu, indexMenu, fByPosition, &mii);
+	InsertMenuItemA( hmenu, indexMenu, fByPosition, &mii);
 }
 /**************************************************************************
 * IContextMenu_fnQueryContextMenu()
 */
 
-static HRESULT WINAPI IContextMenu_fnQueryContextMenu(IContextMenu *iface, HMENU32 hmenu, UINT32 indexMenu,
-							UINT32 idCmdFirst,UINT32 idCmdLast,UINT32 uFlags)
+static HRESULT WINAPI IContextMenu_fnQueryContextMenu(IContextMenu *iface, HMENU hmenu, UINT indexMenu,
+							UINT idCmdFirst,UINT idCmdLast,UINT uFlags)
 {	ICOM_THIS(IContextMenuImpl, iface);
-	BOOL32	fExplore ;
+	BOOL	fExplore ;
 
 	TRACE(shell,"(%p)->(hmenu=%x indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
 
@@ -217,20 +217,20 @@ static HRESULT WINAPI IContextMenu_fnQueryContextMenu(IContextMenu *iface, HMENU
 /**************************************************************************
 * IContextMenu_fnInvokeCommand()
 */
-static HRESULT WINAPI IContextMenu_fnInvokeCommand(IContextMenu *iface, LPCMINVOKECOMMANDINFO32 lpcmi)
+static HRESULT WINAPI IContextMenu_fnInvokeCommand(IContextMenu *iface, LPCMINVOKECOMMANDINFO lpcmi)
 {	ICOM_THIS(IContextMenuImpl, iface);
 	LPITEMIDLIST	pidlTemp,pidlFQ;
 	LPSHELLBROWSER	lpSB;
 	LPSHELLVIEW	lpSV;
-	HWND32	hWndSV;
-	SHELLEXECUTEINFO32A	sei;
+	HWND	hWndSV;
+	SHELLEXECUTEINFOA	sei;
 	int   i;
 
  	TRACE(shell,"(%p)->(invcom=%p verb=%p wnd=%x)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);    
 
 	if(HIWORD(lpcmi->lpVerb))
 	{ /* get the active IShellView */
-	  lpSB = (LPSHELLBROWSER)SendMessage32A(lpcmi->hwnd, CWM_GETISHELLBROWSER,0,0);
+	  lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER,0,0);
 	  IShellBrowser_QueryActiveShellView(lpSB, &lpSV);	/* does AddRef() on lpSV */
 	  lpSV->lpvtbl->fnGetWindow(lpSV, &hWndSV);
 	  
@@ -240,10 +240,10 @@ static HRESULT WINAPI IContextMenu_fnInvokeCommand(IContextMenu *iface, LPCMINVO
 	  { FIXME(shell,"%s not implemented\n",lpcmi->lpVerb);
 	  }
 	  else if (! strcmp(lpcmi->lpVerb,CMDSTR_VIEWLIST))
-	  { SendMessage32A(hWndSV, WM_COMMAND, MAKEWPARAM(FCIDM_SHVIEW_LISTVIEW,0),0 );
+	  { SendMessageA(hWndSV, WM_COMMAND, MAKEWPARAM(FCIDM_SHVIEW_LISTVIEW,0),0 );
 	  }
 	  else if (! strcmp(lpcmi->lpVerb,CMDSTR_VIEWDETAILS))
-	  { SendMessage32A(hWndSV, WM_COMMAND, MAKEWPARAM(FCIDM_SHVIEW_REPORTVIEW,0),0 );
+	  { SendMessageA(hWndSV, WM_COMMAND, MAKEWPARAM(FCIDM_SHVIEW_REPORTVIEW,0),0 );
 	  } 
 	  else
 	  { FIXME(shell,"please report: unknown verb %s\n",lpcmi->lpVerb);
@@ -284,12 +284,12 @@ static HRESULT WINAPI IContextMenu_fnInvokeCommand(IContextMenu *iface, LPCMINVO
 	    else
 	    { sei.lpVerb = "open";
 	    }
-	    ShellExecuteEx32A(&sei);
+	    ShellExecuteExA(&sei);
 	    SHFree(pidlFQ);
 	    break;
 		
 	  case IDM_RENAME:
-	    MessageBeep32(MB_OK);
+	    MessageBeep(MB_OK);
 	    /*handle rename for the view here*/
 	    break;	    
 	}
@@ -299,8 +299,8 @@ static HRESULT WINAPI IContextMenu_fnInvokeCommand(IContextMenu *iface, LPCMINVO
 /**************************************************************************
 *  IContextMenu_fnGetCommandString()
 */
-static HRESULT WINAPI IContextMenu_fnGetCommandString(IContextMenu *iface, UINT32 idCommand,
-		UINT32 uFlags,LPUINT32 lpReserved,LPSTR lpszName,UINT32 uMaxNameLen)
+static HRESULT WINAPI IContextMenu_fnGetCommandString(IContextMenu *iface, UINT idCommand,
+		UINT uFlags,LPUINT lpReserved,LPSTR lpszName,UINT uMaxNameLen)
 {	ICOM_THIS(IContextMenuImpl, iface);
 	HRESULT  hr = E_INVALIDARG;
 
@@ -345,7 +345,7 @@ static HRESULT WINAPI IContextMenu_fnGetCommandString(IContextMenu *iface, UINT3
 *  should be only in IContextMenu2 and IContextMenu3
 *  is nevertheless called from word95
 */
-static HRESULT WINAPI IContextMenu_fnHandleMenuMsg(IContextMenu *iface, UINT32 uMsg,WPARAM32 wParam,LPARAM lParam)
+static HRESULT WINAPI IContextMenu_fnHandleMenuMsg(IContextMenu *iface, UINT uMsg,WPARAM wParam,LPARAM lParam)
 {	ICOM_THIS(IContextMenuImpl, iface);
 	TRACE(shell,"(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
 	return E_NOTIMPL;
@@ -356,7 +356,7 @@ static HRESULT WINAPI IContextMenu_fnHandleMenuMsg(IContextMenu *iface, UINT32 u
 /**************************************************************************
 *  IContextMenu_AllocPidlTable()
 */
-BOOL32 IContextMenu_AllocPidlTable(IContextMenuImpl *This, DWORD dwEntries)
+BOOL IContextMenu_AllocPidlTable(IContextMenuImpl *This, DWORD dwEntries)
 {	TRACE(shell,"(%p)->(entrys=%lu)\n",This, dwEntries);
 
 	/*add one for NULL terminator */
@@ -391,8 +391,8 @@ void IContextMenu_FreePidlTable(IContextMenuImpl *This)
 /**************************************************************************
 * IContextMenu_FillPidlTable()
 */
-BOOL32 IContextMenu_FillPidlTable(IContextMenuImpl *This, LPCITEMIDLIST *aPidls, UINT32 uItemCount)
-{   UINT32  i;
+BOOL IContextMenu_FillPidlTable(IContextMenuImpl *This, LPCITEMIDLIST *aPidls, UINT uItemCount)
+{   UINT  i;
 	TRACE(shell,"(%p)->(apidl=%p count=%u)\n",This, aPidls, uItemCount);
 	if(This->aPidls)
 	{ for(i = 0; i < uItemCount; i++)
@@ -406,8 +406,8 @@ BOOL32 IContextMenu_FillPidlTable(IContextMenuImpl *This, LPCITEMIDLIST *aPidls,
 /**************************************************************************
 * IContextMenu_CanRenameItems()
 */
-BOOL32 IContextMenu_CanRenameItems(IContextMenuImpl *This)
-{	UINT32  i;
+BOOL IContextMenu_CanRenameItems(IContextMenuImpl *This)
+{	UINT  i;
 	DWORD dwAttributes;
 
 	TRACE(shell,"(%p)->()\n",This);
diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c
index b00da1405cd..fb9201e420d 100644
--- a/dlls/shell32/dataobject.c
+++ b/dlls/shell32/dataobject.c
@@ -17,9 +17,9 @@
 #include "winerror.h"
 #include "shell32_main.h"
 
-UINT32 cfShellIDList=0;
-UINT32 cfFileGroupDesc=0;
-UINT32 cfFileContents=0;
+UINT cfShellIDList=0;
+UINT cfFileGroupDesc=0;
+UINT cfFileContents=0;
 
 /***********************************************************************
 *   IEnumFORMATETC implementation
@@ -30,15 +30,15 @@ typedef struct
     ICOM_VTABLE(IEnumFORMATETC)* lpvtbl;
     DWORD                        ref;
     /* IEnumFORMATETC fields */
-    UINT32        posFmt;
-    UINT32        countFmt;
-    LPFORMATETC32 pFmt;
+    UINT        posFmt;
+    UINT        countFmt;
+    LPFORMATETC pFmt;
 } IEnumFORMATETCImpl;
 
 static HRESULT WINAPI IEnumFORMATETC_fnQueryInterface(LPENUMFORMATETC iface, REFIID riid, LPVOID* ppvObj);
 static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface);
 static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface);
-static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, FORMATETC32* rgelt, ULONG* pceltFethed);
+static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, FORMATETC* rgelt, ULONG* pceltFethed);
 static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt);
 static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface);
 static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum);
@@ -54,10 +54,10 @@ static struct ICOM_VTABLE(IEnumFORMATETC) efvt =
     IEnumFORMATETC_fnClone
 };
 
-LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT32 cfmt, const FORMATETC32 afmt[])
+LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[])
 {
 	IEnumFORMATETCImpl* ef;
-	DWORD size=cfmt * sizeof(FORMATETC32);
+	DWORD size=cfmt * sizeof(FORMATETC);
 	
 	ef=(IEnumFORMATETCImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IEnumFORMATETCImpl));
 	ef->ref=1;
@@ -124,10 +124,10 @@ static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface)
 	}
 	return This->ref;
 }
-static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, FORMATETC32 *rgelt, ULONG *pceltFethed)
+static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed)
 {
 	ICOM_THIS(IEnumFORMATETCImpl,iface);
-	UINT32 cfetch;
+	UINT cfetch;
 	HRESULT hres = S_FALSE;
 
 	TRACE (shell, "(%p)->()\n", This);
@@ -138,7 +138,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F
 	  { cfetch = celt;
 	    hres = S_OK;
 	  }
-	  memcpy(rgelt, &This->pFmt[This->posFmt], cfetch * sizeof(FORMATETC32));
+	  memcpy(rgelt, &This->pFmt[This->posFmt], cfetch * sizeof(FORMATETC));
 	  This->posFmt += cfetch;
 	}
 	else
@@ -195,13 +195,13 @@ typedef struct
 static HRESULT WINAPI IDataObject_fnQueryInterface(LPDATAOBJECT iface, REFIID riid, LPVOID* ppvObj);
 static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface);
 static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface);
-static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC32 pformatetcIn, STGMEDIUM32* pmedium);
-static HRESULT WINAPI IDataObject_fnGetDataHere(LPDATAOBJECT iface, LPFORMATETC32 pformatetc, STGMEDIUM32* pmedium);
-static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC32 pformatetc);
-static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC32 pformatectIn, LPFORMATETC32 pformatetcOut);
-static HRESULT WINAPI IDataObject_fnSetData(LPDATAOBJECT iface, LPFORMATETC32 pformatetc, STGMEDIUM32* pmedium, BOOL32 fRelease);
+static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC pformatetcIn, STGMEDIUM* pmedium);
+static HRESULT WINAPI IDataObject_fnGetDataHere(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM* pmedium);
+static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC pformatetc);
+static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut);
+static HRESULT WINAPI IDataObject_fnSetData(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM* pmedium, BOOL fRelease);
 static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirection, IEnumFORMATETC** ppenumFormatEtc);
-static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, LPFORMATETC32* pformatetc, DWORD advf, IAdviseSink* pAdvSink, DWORD* pdwConnection);
+static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, LPFORMATETC* pformatetc, DWORD advf, IAdviseSink* pAdvSink, DWORD* pdwConnection);
 static HRESULT WINAPI IDataObject_fnDUnadvise(LPDATAOBJECT iface, DWORD dwConnection);
 static HRESULT WINAPI IDataObject_fnEnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise);
 
@@ -224,7 +224,7 @@ static struct ICOM_VTABLE(IDataObject) dtovt =
 /**************************************************************************
 *  IDataObject_Constructor
 */
-LPDATAOBJECT IDataObject_Constructor(HWND32 hwndOwner, LPSHELLFOLDER psf, LPITEMIDLIST * apidl, UINT32 cidl)
+LPDATAOBJECT IDataObject_Constructor(HWND hwndOwner, LPSHELLFOLDER psf, LPITEMIDLIST * apidl, UINT cidl)
 {
 	IDataObjectImpl* dto;
 	if (!(dto = (IDataObjectImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDataObjectImpl))))
@@ -309,12 +309,12 @@ static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface)
 * NOTES
 *  get or register the "Shell IDList Array" clipformat
 */
-static BOOL32 DATAOBJECT_InitShellIDList(void)
+static BOOL DATAOBJECT_InitShellIDList(void)
 {	if (cfShellIDList)
         { return(TRUE);
         }
 
-        cfShellIDList = RegisterClipboardFormat32A(CFSTR_SHELLIDLIST);
+        cfShellIDList = RegisterClipboardFormatA(CFSTR_SHELLIDLIST);
         return(cfShellIDList != 0);
 }
 
@@ -354,17 +354,17 @@ static BOOL32 DATAOBJECT_InitFileContents(void)
 /**************************************************************************
 * interface implementation
 */
-static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC32 pformatetcIn, STGMEDIUM32 *pmedium)
+static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC pformatetcIn, STGMEDIUM *pmedium)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
 	char	temp[256];
-	UINT32	cItems;
+	UINT	cItems;
 	DWORD	size, size1, size2;
 	LPITEMIDLIST pidl;
 	LPCIDA pcida;
-	HGLOBAL32 hmem;
+	HGLOBAL hmem;
 	
-	GetClipboardFormatName32A (pformatetcIn->cfFormat, temp, 256);
+	GetClipboardFormatNameA (pformatetcIn->cfFormat, temp, 256);
 	WARN (shell, "(%p)->(%p %p format=%s)semi-stub\n", This, pformatetcIn, pmedium, temp);
 
 	if (!DATAOBJECT_InitShellIDList())	/* is the clipformat registred? */
@@ -387,11 +387,11 @@ static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC32 pf
 	    
 	    /*hack consider only the first item*/
 	    cItems = 2;
-	    size = sizeof(CIDA) + sizeof (UINT32)*(cItems-1);
+	    size = sizeof(CIDA) + sizeof (UINT)*(cItems-1);
 	    size1 = ILGetSize (This->pidl);
 	    size2 = ILGetSize (pidl);
-	    hmem = GlobalAlloc32(GMEM_FIXED, size+size1+size2);
-	    pcida = GlobalLock32 (hmem);
+	    hmem = GlobalAlloc(GMEM_FIXED, size+size1+size2);
+	    pcida = GlobalLock (hmem);
 	    if (!pcida)
 	    { return(E_OUTOFMEMORY);
 	    }
@@ -408,10 +408,10 @@ static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC32 pf
 	    memcpy ((LPBYTE)pcida+size+size1, pidl, size2);
 	    TRACE(shell,"-- after copy\n");
 
-	    GlobalUnlock32(hmem);
+	    GlobalUnlock(hmem);
 	    
 	    pmedium->tymed = TYMED_HGLOBAL;
-	    pmedium->u.hGlobal = (HGLOBAL32)pcida;
+	    pmedium->u.hGlobal = (HGLOBAL)pcida;
 	    pmedium->pUnkForRelease = NULL;
 	    TRACE(shell,"-- ready\n");
 	    return(NOERROR);
@@ -420,25 +420,25 @@ static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC32 pf
 	FIXME (shell, "-- clipformat not implemented\n");
 	return (E_INVALIDARG);
 }
-static HRESULT WINAPI IDataObject_fnGetDataHere(LPDATAOBJECT iface, LPFORMATETC32 pformatetc, STGMEDIUM32 *pmedium)
+static HRESULT WINAPI IDataObject_fnGetDataHere(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
 	FIXME (shell, "(%p)->()\n", This);
 	return E_NOTIMPL;
 }
-static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC32 pformatetc)
+static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC pformatetc)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
 	FIXME (shell, "(%p)->()\n", This);
 	return E_NOTIMPL;
 }
-static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC32 pformatectIn, LPFORMATETC32 pformatetcOut)
+static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
 	FIXME (shell, "(%p)->()\n", This);
 	return E_NOTIMPL;
 }
-static HRESULT WINAPI IDataObject_fnSetData(LPDATAOBJECT iface, LPFORMATETC32 pformatetc, STGMEDIUM32 *pmedium, BOOL32 fRelease)
+static HRESULT WINAPI IDataObject_fnSetData(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
 	FIXME (shell, "(%p)->()\n", This);
@@ -450,7 +450,7 @@ static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDi
 	FIXME (shell, "(%p)->()\n", This);
 	return E_NOTIMPL;
 }
-static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, LPFORMATETC32 *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection)
+static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, LPFORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
 	FIXME (shell, "(%p)->()\n", This);
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index a21bf654c6d..63e4def4c4d 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -22,9 +22,9 @@ static HRESULT WINAPI IEnumIDList_Next(LPENUMIDLIST,ULONG,LPITEMIDLIST*,ULONG*);
 static HRESULT WINAPI IEnumIDList_Skip(LPENUMIDLIST,ULONG);
 static HRESULT WINAPI IEnumIDList_Reset(LPENUMIDLIST);
 static HRESULT WINAPI IEnumIDList_Clone(LPENUMIDLIST,LPENUMIDLIST*);
-static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST,LPCSTR, DWORD);
-static BOOL32 WINAPI IEnumIDList_AddToEnumList(LPENUMIDLIST,LPITEMIDLIST);
-static BOOL32 WINAPI IEnumIDList_DeleteList(LPENUMIDLIST);
+static BOOL WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST,LPCSTR, DWORD);
+static BOOL WINAPI IEnumIDList_AddToEnumList(LPENUMIDLIST,LPITEMIDLIST);
+static BOOL WINAPI IEnumIDList_DeleteList(LPENUMIDLIST);
 
 /**************************************************************************
  *  IEnumIDList_VTable
@@ -206,11 +206,11 @@ static HRESULT WINAPI IEnumIDList_Clone(
  *  fixme: devices not handled
  *  fixme: add wildcards to path
  */
-static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPath, DWORD dwFlags)
+static BOOL WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPath, DWORD dwFlags)
 {	LPITEMIDLIST	pidl=NULL;
 	LPPIDLDATA 	pData=NULL;
-	WIN32_FIND_DATA32A stffile;	
-	HANDLE32 hFile;
+	WIN32_FIND_DATAA stffile;	
+	HANDLE hFile;
 	DWORD dwDrivemap;
 	CHAR  szDriveName[4];
 	CHAR  szPath[MAX_PATH];
@@ -219,7 +219,7 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa
 
 	if (lpszPath && lpszPath[0]!='\0')
 	{ strcpy(szPath, lpszPath);
-	  PathAddBackslash32A(szPath);
+	  PathAddBackslashA(szPath);
 	  strcat(szPath,"*.*");
 	}
 
@@ -254,8 +254,8 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa
 	  }
     	  else
 	  { TRACE (shell,"-- (%p)-> enumerate SHCONTF_FOLDERS of %s\n",this,debugstr_a(szPath));
-	    hFile = FindFirstFile32A(szPath,&stffile);
-	    if ( hFile != INVALID_HANDLE_VALUE32 )
+	    hFile = FindFirstFileA(szPath,&stffile);
+	    if ( hFile != INVALID_HANDLE_VALUE )
 	    { do
 	      { if ( (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && strcmp (stffile.cFileName, ".") && strcmp (stffile.cFileName, ".."))
 	        { pidl = _ILCreateFolder( stffile.cAlternateFileName, stffile.cFileName);
@@ -272,8 +272,8 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa
 	          { return FALSE;
 	          }   
 	        }
-	      } while( FindNextFile32A(hFile,&stffile));
-			FindClose32 (hFile);
+	      } while( FindNextFileA(hFile,&stffile));
+			FindClose (hFile);
 	    }
 	  }   
 	}   
@@ -281,8 +281,8 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa
 	if(dwFlags & SHCONTF_NONFOLDERS)
 	{ if(lpszPath)
 	  { TRACE (shell,"-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n",this,debugstr_a(szPath));
-	    hFile = FindFirstFile32A(szPath,&stffile);
-	    if ( hFile != INVALID_HANDLE_VALUE32 )
+	    hFile = FindFirstFileA(szPath,&stffile);
+	    if ( hFile != INVALID_HANDLE_VALUE )
 	    { do
 	      { if (! (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
 	        { pidl = _ILCreateValue( stffile.cAlternateFileName, stffile.cFileName);
@@ -299,8 +299,8 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa
 	          { return FALSE;
 	          }   
 	        }
-	      } while( FindNextFile32A(hFile,&stffile));
-	      FindClose32 (hFile);
+	      } while( FindNextFileA(hFile,&stffile));
+	      FindClose (hFile);
 	    } 
 	  }
 	} 
@@ -310,7 +310,7 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa
 /**************************************************************************
  *  EnumIDList_AddToEnumList()
  */
-static BOOL32 WINAPI IEnumIDList_AddToEnumList(LPENUMIDLIST this,LPITEMIDLIST pidl)
+static BOOL WINAPI IEnumIDList_AddToEnumList(LPENUMIDLIST this,LPITEMIDLIST pidl)
 { LPENUMLIST  pNew;
 
   TRACE(shell,"(%p)->(pidl=%p)\n",this,pidl);
@@ -341,7 +341,7 @@ static BOOL32 WINAPI IEnumIDList_AddToEnumList(LPENUMIDLIST this,LPITEMIDLIST pi
 /**************************************************************************
 *   EnumIDList_DeleteList()
 */
-static BOOL32 WINAPI IEnumIDList_DeleteList(LPENUMIDLIST this)
+static BOOL WINAPI IEnumIDList_DeleteList(LPENUMIDLIST this)
 { LPENUMLIST  pDelete;
 
   TRACE(shell,"(%p)->()\n",this);
diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index efab1d38942..4b0e4df454e 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -23,8 +23,8 @@ static HRESULT WINAPI IExtractIcon_QueryInterface(LPEXTRACTICON, REFIID, LPVOID
 static ULONG WINAPI IExtractIcon_AddRef(LPEXTRACTICON);
 static ULONG WINAPI IExtractIcon_AddRef(LPEXTRACTICON);
 static ULONG WINAPI IExtractIcon_Release(LPEXTRACTICON);
-static HRESULT WINAPI IExtractIcon_GetIconLocation(LPEXTRACTICON, UINT32, LPSTR, UINT32, int *, UINT32 *);
-static HRESULT WINAPI IExtractIcon_Extract(LPEXTRACTICON, LPCSTR, UINT32, HICON32 *, HICON32 *, UINT32);
+static HRESULT WINAPI IExtractIcon_GetIconLocation(LPEXTRACTICON, UINT, LPSTR, UINT, int *, UINT *);
+static HRESULT WINAPI IExtractIcon_Extract(LPEXTRACTICON, LPCSTR, UINT, HICON *, HICON *, UINT);
 
 
 /***********************************************************************
@@ -109,7 +109,7 @@ static ULONG WINAPI IExtractIcon_Release(LPEXTRACTICON this)
 /**************************************************************************
 *  IExtractIcon_GetIconLocation
 */
-static HRESULT WINAPI IExtractIcon_GetIconLocation(LPEXTRACTICON this, UINT32 uFlags, LPSTR szIconFile, UINT32 cchMax, int * piIndex, UINT32 * pwFlags)
+static HRESULT WINAPI IExtractIcon_GetIconLocation(LPEXTRACTICON this, UINT uFlags, LPSTR szIconFile, UINT cchMax, int * piIndex, UINT * pwFlags)
 {	WARN (shell,"(%p) (flags=%u file=%s max=%u %p %p) semi-stub\n", this, uFlags, szIconFile, cchMax, piIndex, pwFlags);
 
 	*piIndex = (int) SHMapPIDLToSystemImageListIndex(0, this->pidl,0);
@@ -122,7 +122,7 @@ static HRESULT WINAPI IExtractIcon_GetIconLocation(LPEXTRACTICON this, UINT32 uF
 /**************************************************************************
 *  IExtractIcon_Extract
 */
-static HRESULT WINAPI IExtractIcon_Extract(LPEXTRACTICON this, LPCSTR pszFile, UINT32 nIconIndex, HICON32 *phiconLarge, HICON32 *phiconSmall, UINT32 nIconSize)
+static HRESULT WINAPI IExtractIcon_Extract(LPEXTRACTICON this, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize)
 { FIXME (shell,"(%p) (file=%s index=%u %p %p size=%u) semi-stub\n", this, pszFile, nIconIndex, phiconLarge, phiconSmall, nIconSize);
   *phiconLarge = pImageList_GetIcon(ShellBigIconList, nIconIndex, ILD_TRANSPARENT);
   *phiconSmall = pImageList_GetIcon(ShellSmallIconList, nIconIndex, ILD_TRANSPARENT);
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index 8032b5c5a98..fb30ac4661d 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -46,7 +46,7 @@ typedef struct
 /*************************************************************************
  *				SHELL_GetResourceTable
  */
-static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
+static DWORD SHELL_GetResourceTable(HFILE hFile,LPBYTE *retptr)
 {	IMAGE_DOS_HEADER	mz_header;
 	char			magic[4];
 	int			size;
@@ -54,8 +54,8 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 	TRACE(shell,"\n");  
 
 	*retptr = NULL;
-	_llseek32( hFile, 0, SEEK_SET );
-	if ((_lread32(hFile,&mz_header,sizeof(mz_header)) != sizeof(mz_header)) || (mz_header.e_magic != IMAGE_DOS_SIGNATURE))
+	_llseek( hFile, 0, SEEK_SET );
+	if ((_lread(hFile,&mz_header,sizeof(mz_header)) != sizeof(mz_header)) || (mz_header.e_magic != IMAGE_DOS_SIGNATURE))
 	{ if (mz_header.e_cblp == 1)	/* .ICO file ? */
 	  { *retptr = (LPBYTE)-1;	/* ICONHEADER.idType, must be 1 */
   	    return 1;
@@ -63,12 +63,12 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 	  else
 	    return 0; /* failed */
 	}
-	_llseek32( hFile, mz_header.e_lfanew, SEEK_SET );
+	_llseek( hFile, mz_header.e_lfanew, SEEK_SET );
 
-	if (_lread32( hFile, magic, sizeof(magic) ) != sizeof(magic))
+	if (_lread( hFile, magic, sizeof(magic) ) != sizeof(magic))
 	  return 0;
 
-	_llseek32( hFile, mz_header.e_lfanew, SEEK_SET);
+	_llseek( hFile, mz_header.e_lfanew, SEEK_SET);
 
 	if (*(DWORD*)magic  == IMAGE_NT_SIGNATURE)
 	  return IMAGE_NT_SIGNATURE;
@@ -77,7 +77,7 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 	{ IMAGE_OS2_HEADER	ne_header;
 	  LPBYTE		pTypeInfo = (LPBYTE)-1;
 
-	  if (_lread32(hFile,&ne_header,sizeof(ne_header))!=sizeof(ne_header))
+	  if (_lread(hFile,&ne_header,sizeof(ne_header))!=sizeof(ne_header))
 	    return 0;
 
 	  if (ne_header.ne_magic != IMAGE_OS2_SIGNATURE)
@@ -88,8 +88,8 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 	  if( size > sizeof(NE_TYPEINFO) )
 	  { pTypeInfo = (BYTE*)HeapAlloc( GetProcessHeap(), 0, size);
 	    if( pTypeInfo ) 
-	    { _llseek32(hFile, mz_header.e_lfanew+ne_header.resource_tab_offset, SEEK_SET);
-	      if( _lread32( hFile, (char*)pTypeInfo, size) != size )
+	    { _llseek(hFile, mz_header.e_lfanew+ne_header.resource_tab_offset, SEEK_SET);
+	      if( _lread( hFile, (char*)pTypeInfo, size) != size )
 	      { HeapFree( GetProcessHeap(), 0, pTypeInfo); 
 		pTypeInfo = NULL;
 	      }
@@ -103,15 +103,15 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 /*************************************************************************
  *			SHELL_LoadResource
  */
-static HGLOBAL16 SHELL_LoadResource(HINSTANCE32 hInst, HFILE32 hFile, NE_NAMEINFO* pNInfo, WORD sizeShift)
+static HGLOBAL16 SHELL_LoadResource(HINSTANCE hInst, HFILE hFile, NE_NAMEINFO* pNInfo, WORD sizeShift)
 {	BYTE*  ptr;
-	HGLOBAL16 handle = DirectResAlloc( hInst, 0x10, (DWORD)pNInfo->length << sizeShift);
+	HGLOBAL16 handle = DirectResAlloc16( hInst, 0x10, (DWORD)pNInfo->length << sizeShift);
 
 	TRACE(shell,"\n");
 
 	if( (ptr = (BYTE*)GlobalLock16( handle )) )
-	{ _llseek32( hFile, (DWORD)pNInfo->offset << sizeShift, SEEK_SET);
-	  _lread32( hFile, (char*)ptr, pNInfo->length << sizeShift);
+	{ _llseek( hFile, (DWORD)pNInfo->offset << sizeShift, SEEK_SET);
+	  _lread( hFile, (char*)ptr, pNInfo->length << sizeShift);
 	  return handle;
 	}
 	return 0;
@@ -120,13 +120,13 @@ static HGLOBAL16 SHELL_LoadResource(HINSTANCE32 hInst, HFILE32 hFile, NE_NAMEINF
 /*************************************************************************
  *                      ICO_LoadIcon
  */
-static HGLOBAL16 ICO_LoadIcon(HINSTANCE32 hInst, HFILE32 hFile, LPicoICONDIRENTRY lpiIDE)
+static HGLOBAL16 ICO_LoadIcon(HINSTANCE hInst, HFILE hFile, LPicoICONDIRENTRY lpiIDE)
 {	BYTE*  ptr;
-	HGLOBAL16 handle = DirectResAlloc( hInst, 0x10, lpiIDE->dwBytesInRes);
+	HGLOBAL16 handle = DirectResAlloc16( hInst, 0x10, lpiIDE->dwBytesInRes);
 	TRACE(shell,"\n");
 	if( (ptr = (BYTE*)GlobalLock16( handle )) )
-	{ _llseek32( hFile, lpiIDE->dwImageOffset, SEEK_SET);
-	  _lread32( hFile, (char*)ptr, lpiIDE->dwBytesInRes);
+	{ _llseek( hFile, lpiIDE->dwImageOffset, SEEK_SET);
+	  _lread( hFile, (char*)ptr, lpiIDE->dwBytesInRes);
 	  return handle;
 	}
 	return 0;
@@ -137,14 +137,14 @@ static HGLOBAL16 ICO_LoadIcon(HINSTANCE32 hInst, HFILE32 hFile, LPicoICONDIRENTR
  *
  *  Read .ico file and build phony ICONDIR struct for GetIconID
  */
-static HGLOBAL16 ICO_GetIconDirectory(HINSTANCE32 hInst, HFILE32 hFile, LPicoICONDIR* lplpiID ) 
+static HGLOBAL16 ICO_GetIconDirectory(HINSTANCE hInst, HFILE hFile, LPicoICONDIR* lplpiID ) 
 {	WORD    id[3];  /* idReserved, idType, idCount */
 	LPicoICONDIR	lpiID;
 	int		i;
  
 	TRACE(shell,"\n"); 
-	_llseek32( hFile, 0, SEEK_SET );
-	if( _lread32(hFile,(char*)id,sizeof(id)) != sizeof(id) ) 
+	_llseek( hFile, 0, SEEK_SET );
+	if( _lread(hFile,(char*)id,sizeof(id)) != sizeof(id) ) 
 	  return 0;
 
 	/* check .ICO header 
@@ -159,8 +159,8 @@ static HGLOBAL16 ICO_GetIconDirectory(HINSTANCE32 hInst, HFILE32 hFile, LPicoICO
 
 	lpiID = (LPicoICONDIR)HeapAlloc( GetProcessHeap(), 0, i);
 
-	if( _lread32(hFile,(char*)lpiID->idEntries,i) == i )
-	{ HGLOBAL16 handle = DirectResAlloc( hInst, 0x10,id[2]*sizeof(ICONDIRENTRY) + sizeof(id) );
+	if( _lread(hFile,(char*)lpiID->idEntries,i) == i )
+	{ HGLOBAL16 handle = DirectResAlloc16( hInst, 0x10,id[2]*sizeof(ICONDIRENTRY) + sizeof(id) );
 	  if( handle ) 
 	  { CURSORICONDIR*     lpID = (CURSORICONDIR*)GlobalLock16( handle );
 	    lpID->idReserved = lpiID->idReserved = id[0];
@@ -191,19 +191,19 @@ static HGLOBAL16 ICO_GetIconDirectory(HINSTANCE32 hInst, HFILE32 hFile, LPicoICO
 #define ICO_INVALID_FILE	1
 #define ICO_NO_ICONS		0
 
-HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32 * RetPtr, UINT32 nIconIndex, UINT32 n, UINT32 cxDesired, UINT32 cyDesired )
-{	HGLOBAL32	hRet = ICO_NO_ICONS;
+HGLOBAL WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON * RetPtr, UINT nIconIndex, UINT n, UINT cxDesired, UINT cyDesired )
+{	HGLOBAL	hRet = ICO_NO_ICONS;
 	LPBYTE		pData;
 	OFSTRUCT	ofs;
 	DWORD		sig;
-	HFILE32		hFile = OpenFile32( lpszExeFileName, &ofs, OF_READ );
+	HFILE		hFile = OpenFile( lpszExeFileName, &ofs, OF_READ );
 	UINT16		iconDirCount = 0,iconCount = 0;
 	LPBYTE		peimage;
-	HANDLE32	fmapping;
+	HANDLE	fmapping;
 	
 	TRACE(shell,"(file %s,start %d,extract %d\n", lpszExeFileName, nIconIndex, n);
 
-	if( hFile == HFILE_ERROR32 || !n )
+	if( hFile == HFILE_ERROR || !n )
 	  return ICO_INVALID_FILE;
 
 	sig = SHELL_GetResourceTable(hFile,&pData);
@@ -250,7 +250,7 @@ HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32 * RetPtr, UIN
 
 	        if( lpiID == NULL )
 	          hIcon = SHELL_LoadResource( 0, hFile, pIconDir + i, *(WORD*)pData );
-	        RetPtr[i-nIconIndex] = GetIconID( hIcon, 3 );
+	        RetPtr[i-nIconIndex] = GetIconID16( hIcon, 3 );
 	        GlobalFree16(hIcon); 
               }
 
@@ -267,7 +267,7 @@ HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32 * RetPtr, UIN
 	          }
 	        }
 	        if( hIcon )
-	        { RetPtr[icon-nIconIndex] = LoadIconHandler( hIcon, TRUE ); 
+	        { RetPtr[icon-nIconIndex] = LoadIconHandler16( hIcon, TRUE ); 
 	        }
 	        else
 	        { RetPtr[icon-nIconIndex] = 0;
@@ -293,7 +293,7 @@ HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32 * RetPtr, UIN
 	  PIMAGE_RESOURCE_DIRECTORY_ENTRY	xresent;
 	  int			i,j;
 		  
-	  if ( !(fmapping = CreateFileMapping32A(hFile,NULL,PAGE_READONLY|SEC_COMMIT,0,0,NULL))) 
+	  if ( !(fmapping = CreateFileMappingA(hFile,NULL,PAGE_READONLY|SEC_COMMIT,0,0,NULL))) 
 	  { WARN(shell,"failed to create filemap.\n");	/* FIXME, INVALID_HANDLE_VALUE? */
 	    hRet = ICO_INVALID_FILE;
 	    goto end_2;		/* failure */
@@ -325,7 +325,7 @@ HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32 * RetPtr, UIN
 	    goto end_4;		/* failure */
 	  }
   /* search the group icon dir*/
-	  if (!(icongroupresdir = GetResDirEntryW(rootresdir,RT_GROUP_ICON32W, (DWORD)rootresdir,FALSE))) 
+	  if (!(icongroupresdir = GetResDirEntryW(rootresdir,RT_GROUP_ICONW, (DWORD)rootresdir,FALSE))) 
 	  { WARN(shell,"No Icongroupresourcedirectory!\n");
 	    goto end_4;		/* failure */
 	  }
@@ -375,10 +375,10 @@ HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32 * RetPtr, UIN
 	    { WARN(shell,"no matching real address for icongroup!\n");
 	      goto end_4;	/* failure */
 	    }
-	    RetPtr[i] = (HICON32)pLookupIconIdFromDirectoryEx32(igdata, TRUE, cxDesired, cyDesired, LR_DEFAULTCOLOR);
+	    RetPtr[i] = (HICON)pLookupIconIdFromDirectoryEx(igdata, TRUE, cxDesired, cyDesired, LR_DEFAULTCOLOR);
 	  }
 
-	  if (!(iconresdir=GetResDirEntryW(rootresdir,RT_ICON32W,(DWORD)rootresdir,FALSE))) 
+	  if (!(iconresdir=GetResDirEntryW(rootresdir,RT_ICONW,(DWORD)rootresdir,FALSE))) 
 	  { WARN(shell,"No Iconresourcedirectory!\n");
 	    goto end_4;		/* failure */
 	  }
@@ -403,7 +403,7 @@ HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32 * RetPtr, UIN
 	      RetPtr[i]=0;
 	      continue;
 	    }
-	    RetPtr[i] = (HICON32) pCreateIconFromResourceEx32(idata,idataent->Size,TRUE,0x00030000, cxDesired, cyDesired, LR_DEFAULTCOLOR);
+	    RetPtr[i] = (HICON) pCreateIconFromResourceEx(idata,idataent->Size,TRUE,0x00030000, cxDesired, cyDesired, LR_DEFAULTCOLOR);
 	  }
 	  hRet = RetPtr[0];	/* return first icon */
 	  goto end_3;		/* sucess */
@@ -415,7 +415,7 @@ HGLOBAL32 WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON32 * RetPtr, UIN
 end_4:	hRet = 0;	/* failure */
 end_3:	UnmapViewOfFile(peimage);	/* success */
 end_2:	CloseHandle(fmapping);
-end_1:	_lclose32( hFile);
+end_1:	_lclose( hFile);
 	return hRet;
 }
 
@@ -437,7 +437,7 @@ typedef struct
 * NOTES
 *  Callback for DPA_Search
 */
-INT32 CALLBACK SIC_CompareEntrys( LPVOID p1, LPVOID p2, LPARAM lparam)
+INT CALLBACK SIC_CompareEntrys( LPVOID p1, LPVOID p2, LPARAM lparam)
 {	TRACE(shell,"%p %p\n", p1, p2);
 
 	if (((LPSIC_ENTRY)p1)->dwSourceIndex != ((LPSIC_ENTRY)p2)->dwSourceIndex) /* first the faster one*/
@@ -453,9 +453,9 @@ INT32 CALLBACK SIC_CompareEntrys( LPVOID p1, LPVOID p2, LPARAM lparam)
 * NOTES
 *  appends a icon pair to the end of the cache
 */
-static INT32 SIC_IconAppend (LPCSTR sSourceFile, INT32 dwSourceIndex, HICON32 hSmallIcon, HICON32 hBigIcon)
+static INT SIC_IconAppend (LPCSTR sSourceFile, INT dwSourceIndex, HICON hSmallIcon, HICON hBigIcon)
 {	LPSIC_ENTRY lpsice;
-	INT32 index, index1;
+	INT index, index1;
 	
 	TRACE(shell,"%s %i %x %x\n", sSourceFile, dwSourceIndex, hSmallIcon ,hBigIcon);
 
@@ -486,9 +486,9 @@ static INT32 SIC_IconAppend (LPCSTR sSourceFile, INT32 dwSourceIndex, HICON32 hS
 * NOTES
 *  gets small/big icon by number from a file
 */
-static INT32 SIC_LoadIcon (LPCSTR sSourceFile, INT32 dwSourceIndex)
-{	HICON32	hiconLarge=0;
-	HICON32	hiconSmall=0;
+static INT SIC_LoadIcon (LPCSTR sSourceFile, INT dwSourceIndex)
+{	HICON	hiconLarge=0;
+	HICON	hiconSmall=0;
 
 	ICO_ExtractIconEx(sSourceFile, &hiconLarge, dwSourceIndex, 1, 32, 32  );
 	ICO_ExtractIconEx(sSourceFile, &hiconSmall, dwSourceIndex, 1, 16, 16  );
@@ -506,9 +506,9 @@ static INT32 SIC_LoadIcon (LPCSTR sSourceFile, INT32 dwSourceIndex)
 *  look in the cache for a proper icon. if not available the icon is taken
 *  from the file and cached
 */
-INT32 SIC_GetIconIndex (LPCSTR sSourceFile, INT32 dwSourceIndex )
+INT SIC_GetIconIndex (LPCSTR sSourceFile, INT dwSourceIndex )
 {	SIC_ENTRY sice;
-	INT32 index = INVALID_INDEX;
+	INT index = INVALID_INDEX;
 		
 	TRACE(shell,"%s %i\n", sSourceFile, dwSourceIndex);
 
@@ -531,8 +531,8 @@ INT32 SIC_GetIconIndex (LPCSTR sSourceFile, INT32 dwSourceIndex )
 * NOTES
 *  retrives the specified icon from the iconcache. if not found try's to load the icon
 */
-static HICON32 SIC_GetIcon (LPCSTR sSourceFile, INT32 dwSourceIndex, BOOL32 bSmallIcon )
-{	INT32 index;
+static HICON SIC_GetIcon (LPCSTR sSourceFile, INT dwSourceIndex, BOOL bSmallIcon )
+{	INT index;
 
 	TRACE(shell,"%s %i\n", sSourceFile, dwSourceIndex);
 
@@ -552,11 +552,11 @@ static HICON32 SIC_GetIcon (LPCSTR sSourceFile, INT32 dwSourceIndex, BOOL32 bSma
 *  hack to load the resources from the shell32.dll under a different dll name 
 *  will be removed when the resource-compiler is ready
 */
-BOOL32 SIC_Initialize(void)
+BOOL SIC_Initialize(void)
 {	CHAR   		szShellPath[MAX_PATH];
-	HGLOBAL32	hSmRet, hLgRet;
-	HICON32		*pSmRet, *pLgRet;
-	UINT32		index;
+	HGLOBAL	hSmRet, hLgRet;
+	HICON		*pSmRet, *pLgRet;
+	UINT		index;
  
 	TRACE(shell,"\n");
 
@@ -569,17 +569,17 @@ BOOL32 SIC_Initialize(void)
 	{ return(FALSE);
 	}
 
-	GetSystemDirectory32A(szShellPath,MAX_PATH);
-	PathAddBackslash32A(szShellPath);
+	GetSystemDirectoryA(szShellPath,MAX_PATH);
+	PathAddBackslashA(szShellPath);
 	strcat(szShellPath,"shell32.dll");
 
-	hSmRet = GlobalAlloc32( GMEM_FIXED | GMEM_ZEROINIT, sizeof(HICON32)*40);
-	hLgRet = GlobalAlloc32( GMEM_FIXED | GMEM_ZEROINIT, sizeof(HICON32)*40);
+	hSmRet = GlobalAlloc( GMEM_FIXED | GMEM_ZEROINIT, sizeof(HICON)*40);
+	hLgRet = GlobalAlloc( GMEM_FIXED | GMEM_ZEROINIT, sizeof(HICON)*40);
 
-	pSmRet = (HICON32*)GlobalLock32(hSmRet);
-	pLgRet = (HICON32*)GlobalLock32(hLgRet);
+	pSmRet = (HICON*)GlobalLock(hSmRet);
+	pLgRet = (HICON*)GlobalLock(hLgRet);
 
-	ExtractIconEx32A ( szShellPath, 0, pLgRet, pSmRet, 40 );
+	ExtractIconExA ( szShellPath, 0, pLgRet, pSmRet, 40 );
 
 	ShellSmallIconList = pImageList_Create(16,16,ILC_COLORDDB | ILC_MASK,0,0x20);
 	ShellBigIconList = pImageList_Create(32,32,ILC_COLORDDB | ILC_MASK,0,0x20);
@@ -594,11 +594,11 @@ BOOL32 SIC_Initialize(void)
 	  SIC_IconAppend (szShellPath, index, pSmRet[index], pLgRet[index]);
 	}
 		
-	GlobalUnlock32(hLgRet);
-	GlobalFree32(hLgRet);
+	GlobalUnlock(hLgRet);
+	GlobalFree(hLgRet);
 
-	GlobalUnlock32(hSmRet);
-	GlobalFree32(hSmRet);
+	GlobalUnlock(hSmRet);
+	GlobalFree(hSmRet);
 
 	TRACE(shell,"hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList);
 
@@ -682,13 +682,13 @@ DWORD WINAPI SHMapPIDLToSystemImageListIndex(LPSHELLFOLDER sh,LPITEMIDLIST pidl,
  * Shell_GetCachedImageIndex [SHELL32.72]
  *
  */
-INT32 WINAPI Shell_GetCachedImageIndex32A(LPCSTR szPath, INT32 nIndex, DWORD z) 
+INT WINAPI Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, DWORD z) 
 {	WARN(shell,"(%s,%08x,%08lx) semi-stub.\n",debugstr_a(szPath),nIndex,z);
 	return SIC_GetIconIndex(szPath, nIndex);
 }
 
-INT32 WINAPI Shell_GetCachedImageIndex32W(LPCWSTR szPath, INT32 nIndex, DWORD z) 
-{	INT32 ret;
+INT WINAPI Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, DWORD z) 
+{	INT ret;
 	LPSTR sTemp = HEAP_strdupWtoA (GetProcessHeap(),0,szPath);   
 	
 	WARN(shell,"(%s,%08x,%08lx) semi-stub.\n",debugstr_w(szPath),nIndex,z);
@@ -698,19 +698,19 @@ INT32 WINAPI Shell_GetCachedImageIndex32W(LPCWSTR szPath, INT32 nIndex, DWORD z)
  	return ret;
 }
 
-INT32 WINAPI Shell_GetCachedImageIndex32AW(LPCVOID szPath, INT32 nIndex, DWORD z)
+INT WINAPI Shell_GetCachedImageIndexAW(LPCVOID szPath, INT nIndex, DWORD z)
 {	if( VERSION_OsIsUnicode())
-	  return Shell_GetCachedImageIndex32W(szPath, nIndex, z);
-	return Shell_GetCachedImageIndex32A(szPath, nIndex, z);
+	  return Shell_GetCachedImageIndexW(szPath, nIndex, z);
+	return Shell_GetCachedImageIndexA(szPath, nIndex, z);
 }
 
 /*************************************************************************
 *	ExtracticonEx32		[shell32.189]
 */
-HICON32 WINAPI ExtractIconEx32AW ( LPCVOID lpszFile, INT32 nIconIndex, HICON32 * phiconLarge, HICON32 * phiconSmall, UINT32 nIcons )
+HICON WINAPI ExtractIconExAW ( LPCVOID lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons )
 {	if (VERSION_OsIsUnicode())
-	  return ExtractIconEx32W ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
-	return ExtractIconEx32A ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
+	  return ExtractIconExW ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
+	return ExtractIconExA ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
 }
 /*************************************************************************
 *	ExtracticonEx32A	[shell32.190]
@@ -719,8 +719,8 @@ HICON32 WINAPI ExtractIconEx32AW ( LPCVOID lpszFile, INT32 nIconIndex, HICON32 *
 *  1 file is not valid
 *  HICON32 handle of a icon (phiconLarge/Small == NULL)
 */
-HICON32 WINAPI ExtractIconEx32A ( LPCSTR lpszFile, INT32 nIconIndex, HICON32 * phiconLarge, HICON32 * phiconSmall, UINT32 nIcons )
-{	HICON32 ret=0;
+HICON WINAPI ExtractIconExA ( LPCSTR lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons )
+{	HICON ret=0;
 	
 	TRACE(shell,"file=%s idx=%i %p %p num=%i\n", lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons );
 
@@ -751,14 +751,14 @@ HICON32 WINAPI ExtractIconEx32A ( LPCSTR lpszFile, INT32 nIconIndex, HICON32 * p
 /*************************************************************************
 *	ExtracticonEx32W	[shell32.191]
 */
-HICON32 WINAPI ExtractIconEx32W ( LPCWSTR lpszFile, INT32 nIconIndex, HICON32 * phiconLarge, HICON32 * phiconSmall, UINT32 nIcons )
+HICON WINAPI ExtractIconExW ( LPCWSTR lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons )
 {	LPSTR sFile;
 	DWORD ret;
 	
 	TRACE(shell,"file=%s idx=%i %p %p num=%i\n", debugstr_w(lpszFile), nIconIndex, phiconLarge, phiconSmall, nIcons );
 
 	sFile = HEAP_strdupWtoA (GetProcessHeap(),0,lpszFile);
-	ret = ExtractIconEx32A ( sFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
+	ret = ExtractIconExA ( sFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
 	HeapFree(GetProcessHeap(),0,sFile);
 	return ret;
 }
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 5c053efb9d9..440b4a9d144 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -54,9 +54,9 @@ void pdump (LPCITEMIDLIST pidl)
 /*************************************************************************
  * ILGetDisplayName			[SHELL32.15]
  */
-BOOL32 WINAPI ILGetDisplayName(LPCITEMIDLIST pidl,LPSTR path)
+BOOL WINAPI ILGetDisplayName(LPCITEMIDLIST pidl,LPSTR path)
 {	FIXME(shell,"pidl=%p %p semi-stub\n",pidl,path);
-	return SHGetPathFromIDList32A(pidl, path);
+	return SHGetPathFromIDListA(pidl, path);
 }
 /*************************************************************************
  * ILFindLastID [SHELL32.16]
@@ -79,7 +79,7 @@ LPITEMIDLIST WINAPI ILFindLastID(LPITEMIDLIST pidl)
  * NOTES
  *  Removes the last item 
  */
-BOOL32 WINAPI ILRemoveLastID(LPCITEMIDLIST pidl)
+BOOL WINAPI ILRemoveLastID(LPCITEMIDLIST pidl)
 {	TRACE(shell,"pidl=%p\n",pidl);
 	if (!pidl || !pidl->mkid.cb)
 	  return 0;
@@ -148,7 +148,7 @@ LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST pidl)
  * NOTES
  *     exported by ordinal
  */
-LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND32 hwndOwner,DWORD nFolder,DWORD x3)
+LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwndOwner,DWORD nFolder,DWORD x3)
 {	LPITEMIDLIST ppidl;
 	WARN(shell,"(hwnd=0x%x,csidl=0x%lx,0x%lx):semi-stub.\n",
 					 hwndOwner,nFolder,x3);
@@ -184,7 +184,7 @@ LPITEMIDLIST WINAPI ILGlobalClone(LPCITEMIDLIST pidl)
  * ILIsEqual [SHELL32.21]
  *
  */
-BOOL32 WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
+BOOL WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
 {	LPPIDLDATA ppidldata;
 	CHAR * szData1;
 	CHAR * szData2;
@@ -416,7 +416,7 @@ LPITEMIDLIST WINAPI ILGetNext(LPITEMIDLIST pidl)
  *  otherwise adds the item to the end. (???)
  *  Destroys the passed in idlist! (???)
  */
-LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIST pidl,LPCITEMIDLIST item,BOOL32 bEnd)
+LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIST pidl,LPCITEMIDLIST item,BOOL bEnd)
 {	LPITEMIDLIST idlRet;
 	WARN(pidl,"(pidl=%p,pidl=%p,%08u)semi-stub\n",pidl,item,bEnd);
 	pdump (pidl);
@@ -477,11 +477,11 @@ LPITEMIDLIST WINAPI ILCreateFromPath(LPVOID path)
 	
 	if ( !VERSION_OsIsUnicode())
 	{ TRACE(pidl,"(path=%s)\n",(LPSTR)path);
-	  LocalToWideChar32(lpszDisplayName, path, MAX_PATH);
+	  LocalToWideChar(lpszDisplayName, path, MAX_PATH);
   	}
 	else
 	{ TRACE(pidl,"(path=L%s)\n",debugstr_w(path));
-	  lstrcpy32W(lpszDisplayName, path);
+	  lstrcpyW(lpszDisplayName, path);
 	}
 
 	if (SHGetDesktopFolder(&shellfolder)==S_OK)
@@ -494,7 +494,7 @@ LPITEMIDLIST WINAPI ILCreateFromPath(LPVOID path)
  *  SHSimpleIDListFromPath [SHELL32.162]
  *
  */
-LPITEMIDLIST WINAPI SHSimpleIDListFromPath32AW (LPVOID lpszPath)
+LPITEMIDLIST WINAPI SHSimpleIDListFromPathAW (LPVOID lpszPath)
 {	LPCSTR	lpszElement;
 	char	lpszTemp[MAX_PATH];
 
@@ -503,15 +503,15 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPath32AW (LPVOID lpszPath)
 
 	if ( VERSION_OsIsUnicode())
 	{ TRACE(pidl,"(path=L%s)\n",debugstr_w((LPWSTR)lpszPath));
-	  WideCharToLocal32(lpszTemp, lpszPath, MAX_PATH);
+	  WideCharToLocal(lpszTemp, lpszPath, MAX_PATH);
   	}
 	else
 	{ TRACE(pidl,"(path=%s)\n",(LPSTR)lpszPath);
 	  strcpy(lpszTemp, lpszPath);
 	}
 		
-	lpszElement = PathFindFilename32A(lpszTemp);
-	if( GetFileAttributes32A(lpszTemp) & FILE_ATTRIBUTE_DIRECTORY )
+	lpszElement = PathFindFilenameA(lpszTemp);
+	if( GetFileAttributesA(lpszTemp) & FILE_ATTRIBUTE_DIRECTORY )
 	{ return _ILCreateFolder(NULL, lpszElement);	/*FIXME: fill shortname */
 	}
 	return _ILCreateValue(NULL, lpszElement);	/*FIXME: fill shortname */
@@ -520,7 +520,7 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPath32AW (LPVOID lpszPath)
  * SHGetDataFromIDListA [SHELL32.247]
  *
  */
-HRESULT WINAPI SHGetDataFromIDList32A(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len)
+HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len)
 {	FIXME(shell,"sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len);
 	switch (nFormat)
 	{ case SHGDFIL_FINDDATA:
@@ -536,9 +536,9 @@ HRESULT WINAPI SHGetDataFromIDList32A(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int
  * SHGetDataFromIDListW [SHELL32.247]
  *
  */
-HRESULT WINAPI SHGetDataFromIDList32W(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len)
+HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len)
 {	FIXME(shell,"sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len);
-	return SHGetDataFromIDList32A( psf, pidl, nFormat, dest, len);
+	return SHGetDataFromIDListA( psf, pidl, nFormat, dest, len);
 }
 
 /**************************************************************************
@@ -662,30 +662,30 @@ DWORD WINAPI _ILGetItemText(LPCITEMIDLIST pidl, LPSTR lpszText, UINT16 uSize)
  *  _ILIsFolder()
  *  _ILIsValue()
  */
-BOOL32 WINAPI _ILIsDesktop(LPCITEMIDLIST pidl)
+BOOL WINAPI _ILIsDesktop(LPCITEMIDLIST pidl)
 {	TRACE(pidl,"(%p)\n",pidl);
 	return ( !pidl || (pidl && pidl->mkid.cb == 0x00) );
 }
 
-BOOL32 WINAPI _ILIsMyComputer(LPCITEMIDLIST pidl)
+BOOL WINAPI _ILIsMyComputer(LPCITEMIDLIST pidl)
 {	LPPIDLDATA lpPData = _ILGetDataPointer(pidl);
 	TRACE(pidl,"(%p)\n",pidl);
 	return (pidl && lpPData && PT_MYCOMP == lpPData->type);
 }
 
-BOOL32 WINAPI _ILIsDrive(LPCITEMIDLIST pidl)
+BOOL WINAPI _ILIsDrive(LPCITEMIDLIST pidl)
 {	LPPIDLDATA lpPData = _ILGetDataPointer(pidl);
 	TRACE(pidl,"(%p)\n",pidl);
 	return (pidl && lpPData && PT_DRIVE == lpPData->type);
 }
 
-BOOL32 WINAPI _ILIsFolder(LPCITEMIDLIST pidl)
+BOOL WINAPI _ILIsFolder(LPCITEMIDLIST pidl)
 {	LPPIDLDATA lpPData = _ILGetDataPointer(pidl);
 	TRACE(pidl,"(%p)\n",pidl);
 	return (pidl && lpPData && PT_FOLDER == lpPData->type);
 }
 
-BOOL32 WINAPI _ILIsValue(LPCITEMIDLIST pidl)
+BOOL WINAPI _ILIsValue(LPCITEMIDLIST pidl)
 {	LPPIDLDATA lpPData = _ILGetDataPointer(pidl);
 	TRACE(pidl,"(%p)\n",pidl);
 	return (pidl && lpPData && PT_VALUE == lpPData->type);
@@ -904,7 +904,7 @@ LPITEMIDLIST WINAPI _ILCreate(PIDLTYPE type, LPVOID pIn, UINT16 uInSize)
  * RETURNS
  *  length of data (raw)
  */
-DWORD WINAPI _ILGetData(PIDLTYPE type, LPCITEMIDLIST pidl, LPVOID pOut, UINT32 uOutSize)
+DWORD WINAPI _ILGetData(PIDLTYPE type, LPCITEMIDLIST pidl, LPVOID pOut, UINT uOutSize)
 {	LPPIDLDATA  pData;
 	DWORD       dwReturn=0; 
 	LPSTR	    pszSrc;
@@ -1001,7 +1001,7 @@ LPSTR WINAPI _ILGetSTextPointer(PIDLTYPE type, LPPIDLDATA pidldata)
 	}
 	return NULL;
 }
-BOOL32 WINAPI _ILGetFileDate (LPCITEMIDLIST pidl, LPSTR pOut, UINT32 uOutSize)
+BOOL WINAPI _ILGetFileDate (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize)
 {	LPPIDLDATA pdata =_ILGetDataPointer(pidl);
 	FILETIME ft;
 	SYSTEMTIME time;
@@ -1020,9 +1020,9 @@ BOOL32 WINAPI _ILGetFileDate (LPCITEMIDLIST pidl, LPSTR pOut, UINT32 uOutSize)
 	    return FALSE;
 	}
 	FileTimeToSystemTime (&ft, &time);
-	return GetDateFormat32A(LOCALE_USER_DEFAULT,DATE_SHORTDATE,&time, NULL,  pOut, uOutSize);
+	return GetDateFormatA(LOCALE_USER_DEFAULT,DATE_SHORTDATE,&time, NULL,  pOut, uOutSize);
 }
-BOOL32 WINAPI _ILGetFileSize (LPCITEMIDLIST pidl, LPSTR pOut, UINT32 uOutSize)
+BOOL WINAPI _ILGetFileSize (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize)
 {	LPPIDLDATA pdata =_ILGetDataPointer(pidl);
 	char stemp[20]; /* for filesize */
 	
@@ -1036,12 +1036,12 @@ BOOL32 WINAPI _ILGetFileSize (LPCITEMIDLIST pidl, LPSTR pOut, UINT32 uOutSize)
 	  default:
 	    return FALSE;
 	}
-	StrFormatByteSize32A(pdata->u.file.dwFileSize, stemp, 20);
+	StrFormatByteSizeA(pdata->u.file.dwFileSize, stemp, 20);
 	strncpy( pOut, stemp, 20);
 	return TRUE;
 }
 
-BOOL32 WINAPI _ILGetExtension (LPCITEMIDLIST pidl, LPSTR pOut, UINT32 uOutSize)
+BOOL WINAPI _ILGetExtension (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize)
 {	char pTemp[MAX_PATH];
 	int i;
 
@@ -1066,12 +1066,12 @@ BOOL32 WINAPI _ILGetExtension (LPCITEMIDLIST pidl, LPSTR pOut, UINT32 uOutSize)
  *  IDLList "Item ID List List"
  * 
  */
-static UINT32 WINAPI IDLList_GetState(LPIDLLIST this);
-static LPITEMIDLIST WINAPI IDLList_GetElement(LPIDLLIST this, UINT32 nIndex);
-static UINT32 WINAPI IDLList_GetCount(LPIDLLIST this);
-static BOOL32 WINAPI IDLList_StoreItem(LPIDLLIST this, LPITEMIDLIST pidl);
-static BOOL32 WINAPI IDLList_AddItems(LPIDLLIST this, LPITEMIDLIST *apidl, UINT32 cidl);
-static BOOL32 WINAPI IDLList_InitList(LPIDLLIST this);
+static UINT WINAPI IDLList_GetState(LPIDLLIST this);
+static LPITEMIDLIST WINAPI IDLList_GetElement(LPIDLLIST this, UINT nIndex);
+static UINT WINAPI IDLList_GetCount(LPIDLLIST this);
+static BOOL WINAPI IDLList_StoreItem(LPIDLLIST this, LPITEMIDLIST pidl);
+static BOOL WINAPI IDLList_AddItems(LPIDLLIST this, LPITEMIDLIST *apidl, UINT cidl);
+static BOOL WINAPI IDLList_InitList(LPIDLLIST this);
 static void WINAPI IDLList_CleanList(LPIDLLIST this);
 
 static IDLList_VTable idllvt = 
@@ -1084,7 +1084,7 @@ static IDLList_VTable idllvt =
 	IDLList_CleanList
 };
 
-LPIDLLIST IDLList_Constructor (UINT32 uStep)
+LPIDLLIST IDLList_Constructor (UINT uStep)
 {	LPIDLLIST lpidll;
 	if (!(lpidll = (LPIDLLIST)HeapAlloc(GetProcessHeap(),0,sizeof(IDLList))))
 	  return NULL;
@@ -1101,7 +1101,7 @@ void IDLList_Destructor(LPIDLLIST this)
 	IDLList_CleanList(this);
 }
  
-static UINT32 WINAPI IDLList_GetState(LPIDLLIST this)
+static UINT WINAPI IDLList_GetState(LPIDLLIST this)
 {	TRACE (shell,"(%p)->(uStep=%u dpa=%p)\n",this, this->uStep, this->dpa);
 
 	if (this->uStep == 0)
@@ -1111,15 +1111,15 @@ static UINT32 WINAPI IDLList_GetState(LPIDLLIST this)
         }
         return(State_UnInit);
 }
-static LPITEMIDLIST WINAPI IDLList_GetElement(LPIDLLIST this, UINT32 nIndex)
+static LPITEMIDLIST WINAPI IDLList_GetElement(LPIDLLIST this, UINT nIndex)
 {	TRACE (shell,"(%p)->(index=%u)\n",this, nIndex);
 	return((LPITEMIDLIST)pDPA_GetPtr(this->dpa, nIndex));
 }
-static UINT32 WINAPI IDLList_GetCount(LPIDLLIST this)
+static UINT WINAPI IDLList_GetCount(LPIDLLIST this)
 {	TRACE (shell,"(%p)\n",this);
 	return(IDLList_GetState(this)==State_Init ? DPA_GetPtrCount(this->dpa) : 0);
 }
-static BOOL32 WINAPI IDLList_StoreItem(LPIDLLIST this, LPITEMIDLIST pidl)
+static BOOL WINAPI IDLList_StoreItem(LPIDLLIST this, LPITEMIDLIST pidl)
 {	TRACE (shell,"(%p)->(pidl=%p)\n",this, pidl);
 	if (pidl)
         { if (IDLList_InitList(this) && pDPA_InsertPtr(this->dpa, 0x7fff, (LPSTR)pidl)>=0)
@@ -1129,8 +1129,8 @@ static BOOL32 WINAPI IDLList_StoreItem(LPIDLLIST this, LPITEMIDLIST pidl)
         IDLList_CleanList(this);
         return(FALSE);
 }
-static BOOL32 WINAPI IDLList_AddItems(LPIDLLIST this, LPITEMIDLIST *apidl, UINT32 cidl)
-{	INT32 i;
+static BOOL WINAPI IDLList_AddItems(LPIDLLIST this, LPITEMIDLIST *apidl, UINT cidl)
+{	INT i;
 	TRACE (shell,"(%p)->(apidl=%p cidl=%u)\n",this, apidl, cidl);
 
 	for (i=0; i<cidl; ++i)
@@ -1139,7 +1139,7 @@ static BOOL32 WINAPI IDLList_AddItems(LPIDLLIST this, LPITEMIDLIST *apidl, UINT3
         }
         return(TRUE);
 }
-static BOOL32 WINAPI IDLList_InitList(LPIDLLIST this)
+static BOOL WINAPI IDLList_InitList(LPIDLLIST this)
 {	TRACE (shell,"(%p)\n",this);
 	switch (IDLList_GetState(this))
         { case State_Init:
@@ -1156,7 +1156,7 @@ static BOOL32 WINAPI IDLList_InitList(LPIDLLIST this)
         }
 }
 static void WINAPI IDLList_CleanList(LPIDLLIST this)
-{	INT32 i;
+{	INT i;
 	TRACE (shell,"(%p)\n",this);
 
 	if (this->uStep != 0)
diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h
index 870fba0af5b..8b462d42493 100644
--- a/dlls/shell32/pidl.h
+++ b/dlls/shell32/pidl.h
@@ -82,19 +82,19 @@ DWORD WINAPI _ILGetPidlPath(LPCITEMIDLIST,LPSTR,DWORD);
 /*
  * getting special values from simple pidls
  */
-BOOL32 WINAPI _ILGetFileDate (LPCITEMIDLIST pidl, LPSTR pOut, UINT32 uOutSize);
-BOOL32 WINAPI _ILGetFileSize (LPCITEMIDLIST pidl, LPSTR pOut, UINT32 uOutSize);
-BOOL32 WINAPI _ILGetExtension (LPCITEMIDLIST pidl, LPSTR pOut, UINT32 uOutSize);
+BOOL WINAPI _ILGetFileDate (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
+BOOL WINAPI _ILGetFileSize (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
+BOOL WINAPI _ILGetExtension (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
 
 
 /*
  * testing simple pidls
  */
-BOOL32 WINAPI _ILIsDesktop(LPCITEMIDLIST);
-BOOL32 WINAPI _ILIsMyComputer(LPCITEMIDLIST);
-BOOL32 WINAPI _ILIsDrive(LPCITEMIDLIST);
-BOOL32 WINAPI _ILIsFolder(LPCITEMIDLIST);
-BOOL32 WINAPI _ILIsValue(LPCITEMIDLIST);
+BOOL WINAPI _ILIsDesktop(LPCITEMIDLIST);
+BOOL WINAPI _ILIsMyComputer(LPCITEMIDLIST);
+BOOL WINAPI _ILIsDrive(LPCITEMIDLIST);
+BOOL WINAPI _ILIsFolder(LPCITEMIDLIST);
+BOOL WINAPI _ILIsValue(LPCITEMIDLIST);
 
 /*
  * simple pidls from strings
@@ -110,7 +110,7 @@ LPITEMIDLIST WINAPI _ILCreateValue(LPCSTR, LPCSTR);
  *
  * data is binary / sizes are bytes
  */
-DWORD WINAPI _ILGetData(PIDLTYPE,LPCITEMIDLIST,LPVOID,UINT32);
+DWORD WINAPI _ILGetData(PIDLTYPE,LPCITEMIDLIST,LPVOID,UINT);
 LPITEMIDLIST WINAPI _ILCreate(PIDLTYPE,LPVOID,UINT16);
 
 /*
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index d64a4fc3a51..f0b3c605d41 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -82,7 +82,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPWSTR cmdline,LPDWORD numargs)
  * http://premium.microsoft.com/msdn/library/techart/msdn193.htm
  */
 
-void WINAPI Control_RunDLL( HWND32 hwnd, LPCVOID code, LPCSTR cmd, DWORD arg4 )
+void WINAPI Control_RunDLL( HWND hwnd, LPCVOID code, LPCSTR cmd, DWORD arg4 )
 {
     FIXME(shell, "(0x%08x, %p, %s, 0x%08lx): stub\n", hwnd, code,
           debugstr_a(cmd), arg4);
@@ -95,9 +95,9 @@ void WINAPI Control_RunDLL( HWND32 hwnd, LPCVOID code, LPCSTR cmd, DWORD arg4 )
  *   
  */
 
-DWORD WINAPI SHGetFileInfo32A(LPCSTR path,DWORD dwFileAttributes,
-                              SHFILEINFO32A *psfi, UINT32 sizeofpsfi,
-                              UINT32 flags )
+DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes,
+                              SHFILEINFOA *psfi, UINT sizeofpsfi,
+                              UINT flags )
 {	CHAR		szTemp[MAX_PATH];
 	LPPIDLDATA 	pData;
 	LPITEMIDLIST	pPidlTemp = NULL;
@@ -109,7 +109,7 @@ DWORD WINAPI SHGetFileInfo32A(LPCSTR path,DWORD dwFileAttributes,
 	/* translate the pidl to a path*/
 	if (flags & SHGFI_PIDL)
 	{ pPidlTemp = (LPCITEMIDLIST)path;
-	  SHGetPathFromIDList32A (pPidlTemp, szTemp);
+	  SHGetPathFromIDListA (pPidlTemp, szTemp);
 	  TRACE(shell,"pidl=%p is %s\n", path, szTemp);
 	}
 	else
@@ -227,9 +227,9 @@ DWORD WINAPI SHGetFileInfo32A(LPCSTR path,DWORD dwFileAttributes,
  *   
  */
 
-DWORD WINAPI SHGetFileInfo32W(LPCWSTR path,DWORD dwFileAttributes,
-                              SHFILEINFO32W *psfi, UINT32 sizeofpsfi,
-                              UINT32 flags )
+DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
+                              SHFILEINFOW *psfi, UINT sizeofpsfi,
+                              UINT flags )
 {	FIXME(shell,"(%s,0x%lx,%p,0x%x,0x%x)\n",
 	      debugstr_w(path),dwFileAttributes,psfi,sizeofpsfi,flags);
 	return 0;
@@ -238,9 +238,9 @@ DWORD WINAPI SHGetFileInfo32W(LPCWSTR path,DWORD dwFileAttributes,
 /*************************************************************************
  *             ExtractIcon32A   (SHELL32.133)
  */
-HICON32 WINAPI ExtractIcon32A( HINSTANCE32 hInstance, LPCSTR lpszExeFileName,
-	UINT32 nIconIndex )
-{   HGLOBAL16 handle = InternalExtractIcon(hInstance,lpszExeFileName,nIconIndex, 1);
+HICON WINAPI ExtractIconA( HINSTANCE hInstance, LPCSTR lpszExeFileName,
+	UINT nIconIndex )
+{   HGLOBAL16 handle = InternalExtractIcon16(hInstance,lpszExeFileName,nIconIndex, 1);
     TRACE(shell,"\n");
     if( handle )
     {
@@ -256,14 +256,14 @@ HICON32 WINAPI ExtractIcon32A( HINSTANCE32 hInstance, LPCSTR lpszExeFileName,
 /*************************************************************************
  *             ExtractIcon32W   (SHELL32.180)
  */
-HICON32 WINAPI ExtractIcon32W( HINSTANCE32 hInstance, LPCWSTR lpszExeFileName,
-	UINT32 nIconIndex )
+HICON WINAPI ExtractIconW( HINSTANCE hInstance, LPCWSTR lpszExeFileName,
+	UINT nIconIndex )
 { LPSTR  exefn;
-  HICON32  ret;
+  HICON  ret;
   TRACE(shell,"\n");
 
   exefn = HEAP_strdupWtoA(GetProcessHeap(),0,lpszExeFileName);
-  ret = ExtractIcon32A(hInstance,exefn,nIconIndex);
+  ret = ExtractIconA(hInstance,exefn,nIconIndex);
 
 	HeapFree(GetProcessHeap(),0,exefn);
 	return ret;
@@ -272,9 +272,9 @@ HICON32 WINAPI ExtractIcon32W( HINSTANCE32 hInstance, LPCWSTR lpszExeFileName,
 /*************************************************************************
  *             FindExecutable32A   (SHELL32.184)
  */
-HINSTANCE32 WINAPI FindExecutable32A( LPCSTR lpFile, LPCSTR lpDirectory,
+HINSTANCE WINAPI FindExecutableA( LPCSTR lpFile, LPCSTR lpDirectory,
                                       LPSTR lpResult )
-{ HINSTANCE32 retval=31;    /* default - 'No association was found' */
+{ HINSTANCE retval=31;    /* default - 'No association was found' */
     char old_dir[1024];
 
   TRACE(shell, "File %s, Dir %s\n", 
@@ -290,22 +290,22 @@ HINSTANCE32 WINAPI FindExecutable32A( LPCSTR lpFile, LPCSTR lpDirectory,
     }
 
     if (lpDirectory)
-  { GetCurrentDirectory32A( sizeof(old_dir), old_dir );
-        SetCurrentDirectory32A( lpDirectory );
+  { GetCurrentDirectoryA( sizeof(old_dir), old_dir );
+        SetCurrentDirectoryA( lpDirectory );
     }
 
     retval = SHELL_FindExecutable( lpFile, "open", lpResult );
 
   TRACE(shell, "returning %s\n", lpResult);
   if (lpDirectory)
-    SetCurrentDirectory32A( old_dir );
+    SetCurrentDirectoryA( old_dir );
     return retval;
 }
 
 /*************************************************************************
  *             FindExecutable32W   (SHELL32.219)
  */
-HINSTANCE32 WINAPI FindExecutable32W(LPCWSTR lpFile, LPCWSTR lpDirectory,
+HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory,
                                      LPWSTR lpResult)
 {
   FIXME(shell, "(%p,%p,%p): stub\n", lpFile, lpDirectory, lpResult);
@@ -315,7 +315,7 @@ HINSTANCE32 WINAPI FindExecutable32W(LPCWSTR lpFile, LPCWSTR lpDirectory,
 typedef struct
 { LPCSTR  szApp;
     LPCSTR  szOtherStuff;
-    HICON32 hIcon;
+    HICON hIcon;
 } ABOUT_INFO;
 
 #define		IDC_STATIC_TEXT		100
@@ -325,13 +325,13 @@ typedef struct
 #define		DROP_FIELD_TOP		(-15)
 #define		DROP_FIELD_HEIGHT	15
 
-extern HICON32 hIconTitleFont;
+extern HICON hIconTitleFont;
 
-static BOOL32 __get_dropline( HWND32 hWnd, LPRECT32 lprect )
-{ HWND32 hWndCtl = GetDlgItem32(hWnd, IDC_WINE_TEXT);
+static BOOL __get_dropline( HWND hWnd, LPRECT lprect )
+{ HWND hWndCtl = GetDlgItem(hWnd, IDC_WINE_TEXT);
     if( hWndCtl )
-  { GetWindowRect32( hWndCtl, lprect );
-	MapWindowPoints32( 0, hWnd, (LPPOINT32)lprect, 2 );
+  { GetWindowRect( hWndCtl, lprect );
+	MapWindowPoints( 0, hWnd, (LPPOINT)lprect, 2 );
 	lprect->bottom = (lprect->top += DROP_FIELD_TOP);
 	return TRUE;
     }
@@ -341,7 +341,7 @@ static BOOL32 __get_dropline( HWND32 hWnd, LPRECT32 lprect )
 /*************************************************************************
  *				SHAppBarMessage32	[SHELL32.207]
  */
-UINT32 WINAPI SHAppBarMessage32(DWORD msg, PAPPBARDATA data)
+UINT WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data)
 { FIXME(shell,"(0x%08lx,%p): stub\n", msg, data);
 #if 0
   switch (msg)
@@ -408,9 +408,9 @@ DWORD WINAPI SHGetDesktopFolder(LPSHELLFOLDER *shellfolder)
 /*************************************************************************
  *			 SHGetPathFromIDList		[SHELL32.221][NT 4.0: SHELL32.219]
  */
-BOOL32 WINAPI SHGetPathFromIDList32(LPCITEMIDLIST pidl,LPSTR pszPath)     
+BOOL WINAPI SHGetPathFromIDListAW(LPCITEMIDLIST pidl,LPSTR pszPath)     
 { TRACE(shell,"(pidl=%p,%p)\n",pidl,pszPath);
-  return SHGetPathFromIDList32A(pidl,pszPath);
+  return SHGetPathFromIDListA(pidl,pszPath);
 }
 
 /*************************************************************************
@@ -430,7 +430,7 @@ BOOL32 WINAPI SHGetPathFromIDList32(LPCITEMIDLIST pidl,LPSTR pszPath)
  *   - look for "User Shell Folder" first
  *
  */
-HRESULT WINAPI SHGetSpecialFolderLocation(HWND32 hwndOwner, INT32 nFolder, LPITEMIDLIST * ppidl)
+HRESULT WINAPI SHGetSpecialFolderLocation(HWND hwndOwner, INT nFolder, LPITEMIDLIST * ppidl)
 { LPSHELLFOLDER shellfolder;
   DWORD pchEaten,tpathlen=MAX_PATH,type,dwdisp,res;
   CHAR pszTemp[256],buffer[256],tpath[MAX_PATH],npath[MAX_PATH];
@@ -448,7 +448,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation(HWND32 hwndOwner, INT32 nFolder, LPITE
 
 	strcpy(buffer,"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\");
 
-	res=RegCreateKeyEx32A(HKEY_CURRENT_USER,buffer,0,NULL,REG_OPTION_NON_VOLATILE,KEY_WRITE,NULL,&key,&dwdisp);
+	res=RegCreateKeyExA(HKEY_CURRENT_USER,buffer,0,NULL,REG_OPTION_NON_VOLATILE,KEY_WRITE,NULL,&key,&dwdisp);
 	if (res)
 	{ ERR(shell,"Could not create key %s %08lx \n",buffer,res);
 	  return E_OUTOFMEMORY;
@@ -541,9 +541,9 @@ HRESULT WINAPI SHGetSpecialFolderLocation(HWND32 hwndOwner, INT32 nFolder, LPITE
 	{ case FT_DIR:
 	    /* Directory: get the value from the registry, if its not there 
 			create it and the directory*/
-	    if (RegQueryValueEx32A(key,buffer,NULL,&type,(LPBYTE)tpath,&tpathlen))
-  	    { GetWindowsDirectory32A(npath,MAX_PATH);
-	      PathAddBackslash32A(npath);
+	    if (RegQueryValueExA(key,buffer,NULL,&type,(LPBYTE)tpath,&tpathlen))
+  	    { GetWindowsDirectoryA(npath,MAX_PATH);
+	      PathAddBackslashA(npath);
 	      switch (nFolder)
 	      { case CSIDL_DESKTOPDIRECTORY:
 	        case CSIDL_COMMON_DESKTOPDIRECTORY:
@@ -573,7 +573,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation(HWND32 hwndOwner, INT32 nFolder, LPITE
 	        case CSIDL_COMMON_PROGRAMS:
       		case CSIDL_PROGRAMS:
          	  strcat (npath,"Start Menu");			
-         	  CreateDirectory32A(npath,NULL);
+         	  CreateDirectoryA(npath,NULL);
          	  strcat (npath,"\\Programs");			
          	  break;
       		case CSIDL_RECENT:
@@ -589,7 +589,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation(HWND32 hwndOwner, INT32 nFolder, LPITE
 	        case CSIDL_COMMON_STARTUP:  
       		case CSIDL_STARTUP:
          	  strcat (npath,"Start Menu");			
-         	  CreateDirectory32A(npath,NULL);
+         	  CreateDirectoryA(npath,NULL);
          	  strcat (npath,"\\Startup");			
          	  break;
       		case CSIDL_TEMPLATES:
@@ -599,13 +599,13 @@ HRESULT WINAPI SHGetSpecialFolderLocation(HWND32 hwndOwner, INT32 nFolder, LPITE
          	  RegCloseKey(key);
         	  return E_OUTOFMEMORY;
 	      }
-	      if (RegSetValueEx32A(key,buffer,0,REG_SZ,(LPBYTE)npath,sizeof(npath)+1))
+	      if (RegSetValueExA(key,buffer,0,REG_SZ,(LPBYTE)npath,sizeof(npath)+1))
 	      { ERR(shell,"could not create value %s\n",buffer);
 	        RegCloseKey(key);
 	        return E_OUTOFMEMORY;
 	      }
 	      TRACE(shell,"value %s=%s created\n",buffer,npath);
-	      CreateDirectory32A(npath,NULL);
+	      CreateDirectoryA(npath,NULL);
 	      strcpy(tpath,npath);
 	    }
 	    break;
@@ -624,7 +624,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation(HWND32 hwndOwner, INT32 nFolder, LPITE
 	RegCloseKey(key);
 
 	TRACE(shell,"Value=%s\n",tpath);
-	LocalToWideChar32(lpszDisplayName, tpath, 256);
+	LocalToWideChar(lpszDisplayName, tpath, 256);
   
 	if (SHGetDesktopFolder(&shellfolder)==S_OK)
 	{ shellfolder->lpvtbl->fnParseDisplayName(shellfolder,hwndOwner, NULL,lpszDisplayName,&pchEaten,ppidl,NULL);
@@ -658,9 +658,9 @@ DWORD WINAPI SHLoadInProc (DWORD dwArg1)
 /*************************************************************************
  *             ShellExecute32A   (SHELL32.245)
  */
-HINSTANCE32 WINAPI ShellExecute32A( HWND32 hWnd, LPCSTR lpOperation,
+HINSTANCE WINAPI ShellExecuteA( HWND hWnd, LPCSTR lpOperation,
                                     LPCSTR lpFile, LPCSTR lpParameters,
-                                    LPCSTR lpDirectory, INT32 iShowCmd )
+                                    LPCSTR lpDirectory, INT iShowCmd )
 {   TRACE(shell,"\n");
     return ShellExecute16( hWnd, lpOperation, lpFile, lpParameters,
                            lpDirectory, iShowCmd );
@@ -672,14 +672,14 @@ HINSTANCE32 WINAPI ShellExecute32A( HWND32 hWnd, LPCSTR lpOperation,
  * WINSHELLAPI HINSTANCE APIENTRY ShellExecuteW(HWND hwnd, LPCWSTR lpOperation, 
  * LPCWSTR lpFile, LPCWSTR lpParameters, LPCWSTR lpDirectory, INT nShowCmd);   
  */
-HINSTANCE32 WINAPI 
-ShellExecute32W(
-       HWND32 hwnd, 
+HINSTANCE WINAPI 
+ShellExecuteW(
+       HWND hwnd, 
        LPCWSTR lpOperation, 
        LPCWSTR lpFile, 
        LPCWSTR lpParameters, 
        LPCWSTR lpDirectory, 
-       INT32 nShowCmd) {
+       INT nShowCmd) {
 
        FIXME(shell,": stub\n");
        return 0;
@@ -688,9 +688,9 @@ ShellExecute32W(
 /*************************************************************************
  *             AboutDlgProc32  (not an exported API function)
  */
-BOOL32 WINAPI AboutDlgProc32( HWND32 hWnd, UINT32 msg, WPARAM32 wParam,
+BOOL WINAPI AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
                               LPARAM lParam )
-{   HWND32 hWndCtl;
+{   HWND hWndCtl;
     char Template[512], AppTitle[512];
 
     TRACE(shell,"\n");
@@ -700,55 +700,55 @@ BOOL32 WINAPI AboutDlgProc32( HWND32 hWnd, UINT32 msg, WPARAM32 wParam,
       { ABOUT_INFO *info = (ABOUT_INFO *)lParam;
             if (info)
         { const char* const *pstr = SHELL_People;
-                SendDlgItemMessage32A(hWnd, stc1, STM_SETICON32,info->hIcon, 0);
-                GetWindowText32A( hWnd, Template, sizeof(Template) );
+                SendDlgItemMessageA(hWnd, stc1, STM_SETICON,info->hIcon, 0);
+                GetWindowTextA( hWnd, Template, sizeof(Template) );
                 sprintf( AppTitle, Template, info->szApp );
-                SetWindowText32A( hWnd, AppTitle );
-                SetWindowText32A( GetDlgItem32(hWnd, IDC_STATIC_TEXT),
+                SetWindowTextA( hWnd, AppTitle );
+                SetWindowTextA( GetDlgItem(hWnd, IDC_STATIC_TEXT),
                                   info->szOtherStuff );
-                hWndCtl = GetDlgItem32(hWnd, IDC_LISTBOX);
-                SendMessage32A( hWndCtl, WM_SETREDRAW, 0, 0 );
-                SendMessage32A( hWndCtl, WM_SETFONT, hIconTitleFont, 0 );
+                hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX);
+                SendMessageA( hWndCtl, WM_SETREDRAW, 0, 0 );
+                SendMessageA( hWndCtl, WM_SETFONT, hIconTitleFont, 0 );
                 while (*pstr)
-          { SendMessage32A( hWndCtl, LB_ADDSTRING32, (WPARAM32)-1, (LPARAM)*pstr );
+          { SendMessageA( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)*pstr );
                     pstr++;
                 }
-                SendMessage32A( hWndCtl, WM_SETREDRAW, 1, 0 );
+                SendMessageA( hWndCtl, WM_SETREDRAW, 1, 0 );
             }
         }
         return 1;
 
     case WM_PAINT:
-      { RECT32 rect;
-	    PAINTSTRUCT32 ps;
-	    HDC32 hDC = BeginPaint32( hWnd, &ps );
+      { RECT rect;
+	    PAINTSTRUCT ps;
+	    HDC hDC = BeginPaint( hWnd, &ps );
 
 	    if( __get_dropline( hWnd, &rect ) ) {
-	        SelectObject32( hDC, GetStockObject32( BLACK_PEN ) );
-	        MoveToEx32( hDC, rect.left, rect.top, NULL );
-		LineTo32( hDC, rect.right, rect.bottom );
+	        SelectObject( hDC, GetStockObject( BLACK_PEN ) );
+	        MoveToEx( hDC, rect.left, rect.top, NULL );
+		LineTo( hDC, rect.right, rect.bottom );
 	    }
-	    EndPaint32( hWnd, &ps );
+	    EndPaint( hWnd, &ps );
 	}
 	break;
 
     case WM_LBTRACKPOINT:
-	hWndCtl = GetDlgItem32(hWnd, IDC_LISTBOX);
+	hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX);
 	if( (INT16)GetKeyState16( VK_CONTROL ) < 0 )
-      { if( DragDetect32( hWndCtl, *((LPPOINT32)&lParam) ) )
-        { INT32 idx = SendMessage32A( hWndCtl, LB_GETCURSEL32, 0, 0 );
+      { if( DragDetect( hWndCtl, *((LPPOINT)&lParam) ) )
+        { INT idx = SendMessageA( hWndCtl, LB_GETCURSEL, 0, 0 );
 		if( idx != -1 )
-          { INT32 length = SendMessage32A( hWndCtl, LB_GETTEXTLEN32, (WPARAM32)idx, 0 );
+          { INT length = SendMessageA( hWndCtl, LB_GETTEXTLEN, (WPARAM)idx, 0 );
 		    HGLOBAL16 hMemObj = GlobalAlloc16( GMEM_MOVEABLE, length + 1 );
 		    char* pstr = (char*)GlobalLock16( hMemObj );
 
 		    if( pstr )
             { HCURSOR16 hCursor = LoadCursor16( 0, MAKEINTRESOURCE16(OCR_DRAGOBJECT) );
-			SendMessage32A( hWndCtl, LB_GETTEXT32, (WPARAM32)idx, (LPARAM)pstr );
-			SendMessage32A( hWndCtl, LB_DELETESTRING32, (WPARAM32)idx, 0 );
-			UpdateWindow32( hWndCtl );
+			SendMessageA( hWndCtl, LB_GETTEXT, (WPARAM)idx, (LPARAM)pstr );
+			SendMessageA( hWndCtl, LB_DELETESTRING, (WPARAM)idx, 0 );
+			UpdateWindow( hWndCtl );
 			if( !DragObject16((HWND16)hWnd, (HWND16)hWnd, DRAGOBJ_DATA, 0, (WORD)hMemObj, hCursor) )
-			    SendMessage32A( hWndCtl, LB_ADDSTRING32, (WPARAM32)-1, (LPARAM)pstr );
+			    SendMessageA( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)pstr );
 		    }
             if( hMemObj )
               GlobalFree16( hMemObj );
@@ -761,14 +761,14 @@ BOOL32 WINAPI AboutDlgProc32( HWND32 hWnd, UINT32 msg, WPARAM32 wParam,
 	if( wParam == 0 )
       { LPDRAGINFO lpDragInfo = (LPDRAGINFO)PTR_SEG_TO_LIN((SEGPTR)lParam);
 	    if( lpDragInfo && lpDragInfo->wFlags == DRAGOBJ_DATA )
-        { RECT32 rect;
+        { RECT rect;
 		if( __get_dropline( hWnd, &rect ) )
-          { POINT32 pt;
+          { POINT pt;
 	    pt.x=lpDragInfo->pt.x;
 	    pt.x=lpDragInfo->pt.y;
 		    rect.bottom += DROP_FIELD_HEIGHT;
-		    if( PtInRect32( &rect, pt ) )
-            { SetWindowLong32A( hWnd, DWL_MSGRESULT, 1 );
+		    if( PtInRect( &rect, pt ) )
+            { SetWindowLongA( hWnd, DWL_MSGRESULT, 1 );
 			return TRUE;
 		    }
 		}
@@ -784,21 +784,21 @@ BOOL32 WINAPI AboutDlgProc32( HWND32 hWnd, UINT32 msg, WPARAM32 wParam,
 		if( pstr )
           { static char __appendix_str[] = " with";
 
-		    hWndCtl = GetDlgItem32( hWnd, IDC_WINE_TEXT );
-		    SendMessage32A( hWndCtl, WM_GETTEXT, 512, (LPARAM)Template );
-		    if( !lstrncmp32A( Template, "WINE", 4 ) )
-			SetWindowText32A( GetDlgItem32(hWnd, IDC_STATIC_TEXT), Template );
+		    hWndCtl = GetDlgItem( hWnd, IDC_WINE_TEXT );
+		    SendMessageA( hWndCtl, WM_GETTEXT, 512, (LPARAM)Template );
+		    if( !lstrncmpA( Template, "WINE", 4 ) )
+			SetWindowTextA( GetDlgItem(hWnd, IDC_STATIC_TEXT), Template );
 		    else
           { char* pch = Template + strlen(Template) - strlen(__appendix_str);
 			*pch = '\0';
-			SendMessage32A( GetDlgItem32(hWnd, IDC_LISTBOX), LB_ADDSTRING32, 
-					(WPARAM32)-1, (LPARAM)Template );
+			SendMessageA( GetDlgItem(hWnd, IDC_LISTBOX), LB_ADDSTRING, 
+					(WPARAM)-1, (LPARAM)Template );
 		    }
 
-		    lstrcpy32A( Template, pstr );
-		    lstrcat32A( Template, __appendix_str );
-		    SetWindowText32A( hWndCtl, Template );
-		    SetWindowLong32A( hWnd, DWL_MSGRESULT, 1 );
+		    lstrcpyA( Template, pstr );
+		    lstrcatA( Template, __appendix_str );
+		    SetWindowTextA( hWndCtl, Template );
+		    SetWindowLongA( hWnd, DWL_MSGRESULT, 1 );
 		    return TRUE;
 		}
 	    }
@@ -807,7 +807,7 @@ BOOL32 WINAPI AboutDlgProc32( HWND32 hWnd, UINT32 msg, WPARAM32 wParam,
 
     case WM_COMMAND:
         if (wParam == IDOK)
-    {  EndDialog32(hWnd, TRUE);
+    {  EndDialog(hWnd, TRUE);
             return TRUE;
         }
         break;
@@ -819,26 +819,26 @@ BOOL32 WINAPI AboutDlgProc32( HWND32 hWnd, UINT32 msg, WPARAM32 wParam,
 /*************************************************************************
  *             ShellAbout32A   (SHELL32.243)
  */
-BOOL32 WINAPI ShellAbout32A( HWND32 hWnd, LPCSTR szApp, LPCSTR szOtherStuff,
-                             HICON32 hIcon )
+BOOL WINAPI ShellAboutA( HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff,
+                             HICON hIcon )
 {   ABOUT_INFO info;
     TRACE(shell,"\n");
     info.szApp        = szApp;
     info.szOtherStuff = szOtherStuff;
     info.hIcon        = hIcon;
     if (!hIcon) info.hIcon = LoadIcon16( 0, MAKEINTRESOURCE16(OIC_WINEICON) );
-    return DialogBoxIndirectParam32A( WIN_GetWindowInstance( hWnd ),
+    return DialogBoxIndirectParamA( WIN_GetWindowInstance( hWnd ),
                          SYSRES_GetResPtr( SYSRES_DIALOG_SHELL_ABOUT_MSGBOX ),
-                                      hWnd, AboutDlgProc32, (LPARAM)&info );
+                                      hWnd, AboutDlgProc, (LPARAM)&info );
 }
 
 
 /*************************************************************************
  *             ShellAbout32W   (SHELL32.244)
  */
-BOOL32 WINAPI ShellAbout32W( HWND32 hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
-                             HICON32 hIcon )
-{   BOOL32 ret;
+BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
+                             HICON hIcon )
+{   BOOL ret;
     ABOUT_INFO info;
 
     TRACE(shell,"\n");
@@ -847,9 +847,9 @@ BOOL32 WINAPI ShellAbout32W( HWND32 hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
     info.szOtherStuff = HEAP_strdupWtoA( GetProcessHeap(), 0, szOtherStuff );
     info.hIcon        = hIcon;
     if (!hIcon) info.hIcon = LoadIcon16( 0, MAKEINTRESOURCE16(OIC_WINEICON) );
-    ret = DialogBoxIndirectParam32A( WIN_GetWindowInstance( hWnd ),
+    ret = DialogBoxIndirectParamA( WIN_GetWindowInstance( hWnd ),
                          SYSRES_GetResPtr( SYSRES_DIALOG_SHELL_ABOUT_MSGBOX ),
-                                      hWnd, AboutDlgProc32, (LPARAM)&info );
+                                      hWnd, AboutDlgProc, (LPARAM)&info );
     HeapFree( GetProcessHeap(), 0, (LPSTR)info.szApp );
     HeapFree( GetProcessHeap(), 0, (LPSTR)info.szOtherStuff );
     return ret;
@@ -861,7 +861,7 @@ BOOL32 WINAPI ShellAbout32W( HWND32 hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
  *	This function is supposed to deal with the systray.
  *	Any ideas on how this is to be implimented?
  */
-BOOL32 WINAPI Shell_NotifyIcon(	DWORD dwMessage, PNOTIFYICONDATA pnid )
+BOOL WINAPI Shell_NotifyIcon(	DWORD dwMessage, PNOTIFYICONDATA pnid )
 {   TRACE(shell,"\n");
     return FALSE;
 }
@@ -872,7 +872,7 @@ BOOL32 WINAPI Shell_NotifyIcon(	DWORD dwMessage, PNOTIFYICONDATA pnid )
  *	This function is supposed to deal with the systray.
  *	Any ideas on how this is to be implimented?
  */
-BOOL32 WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATA pnid )
+BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATA pnid )
 {   TRACE(shell,"\n");
     return FALSE;
 }
@@ -900,7 +900,7 @@ void WINAPI FreeIconList( DWORD dw )
  * FIXME
  *  fnGetDisplayNameOf can return different types of OLEString
  */
-DWORD WINAPI SHGetPathFromIDList32A (LPCITEMIDLIST pidl,LPSTR pszPath)
+DWORD WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath)
 {	STRRET lpName;
 	LPSHELLFOLDER shellfolder;
 	CHAR  buffer[MAX_PATH],tpath[MAX_PATH];
@@ -912,17 +912,17 @@ DWORD WINAPI SHGetPathFromIDList32A (LPCITEMIDLIST pidl,LPSTR pszPath)
   if (!pidl)
   {  strcpy(buffer,"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\");
 
-     if (RegCreateKeyEx32A(HKEY_CURRENT_USER,buffer,0,NULL,REG_OPTION_NON_VOLATILE,KEY_WRITE,NULL,&key,&dwdisp))
+     if (RegCreateKeyExA(HKEY_CURRENT_USER,buffer,0,NULL,REG_OPTION_NON_VOLATILE,KEY_WRITE,NULL,&key,&dwdisp))
      { return E_OUTOFMEMORY;
      }
      type=REG_SZ;    
      strcpy (buffer,"Desktop");					/*registry name*/
-     if ( RegQueryValueEx32A(key,buffer,NULL,&type,(LPBYTE)tpath,&tpathlen))
-     { GetWindowsDirectory32A(tpath,MAX_PATH);
-       PathAddBackslash32A(tpath);
+     if ( RegQueryValueExA(key,buffer,NULL,&type,(LPBYTE)tpath,&tpathlen))
+     { GetWindowsDirectoryA(tpath,MAX_PATH);
+       PathAddBackslashA(tpath);
        strcat (tpath,"Desktop");				/*folder name*/
-       RegSetValueEx32A(key,buffer,0,REG_SZ,(LPBYTE)tpath,tpathlen);
-       CreateDirectory32A(tpath,NULL);
+       RegSetValueExA(key,buffer,0,REG_SZ,(LPBYTE)tpath,tpathlen);
+       CreateDirectoryA(tpath,NULL);
      }
      RegCloseKey(key);
      strcpy(pszPath,tpath);
@@ -942,12 +942,12 @@ DWORD WINAPI SHGetPathFromIDList32A (LPCITEMIDLIST pidl,LPSTR pszPath)
 /*************************************************************************
  * SHGetPathFromIDList32W [SHELL32.262]
  */
-DWORD WINAPI SHGetPathFromIDList32W (LPCITEMIDLIST pidl,LPWSTR pszPath)
+DWORD WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath)
 {	char sTemp[MAX_PATH];
 
 	TRACE (shell,"(pidl=%p)\n", pidl);
 
-	SHGetPathFromIDList32A (pidl, sTemp);
+	SHGetPathFromIDListA (pidl, sTemp);
 	lstrcpyAtoW(pszPath, sTemp);
 
 	TRACE(shell,"-- (%s)\n",debugstr_w(pszPath));
@@ -960,39 +960,39 @@ DWORD WINAPI SHGetPathFromIDList32W (LPCITEMIDLIST pidl,LPWSTR pszPath)
  *
  */
 void	(WINAPI* pDLLInitComctl)(LPVOID);
-INT32	(WINAPI* pImageList_AddIcon) (HIMAGELIST himl, HICON32 hIcon);
-INT32	(WINAPI* pImageList_ReplaceIcon) (HIMAGELIST, INT32, HICON32);
-HIMAGELIST (WINAPI * pImageList_Create) (INT32,INT32,UINT32,INT32,INT32);
-HICON32	(WINAPI * pImageList_GetIcon) (HIMAGELIST, INT32, UINT32);
-INT32	(WINAPI* pImageList_GetImageCount)(HIMAGELIST);
-
-LPVOID	(WINAPI* pCOMCTL32_Alloc) (INT32);  
-BOOL32	(WINAPI* pCOMCTL32_Free) (LPVOID);  
-
-HDPA	(WINAPI* pDPA_Create) (INT32);  
-INT32	(WINAPI* pDPA_InsertPtr) (const HDPA, INT32, LPVOID); 
-BOOL32	(WINAPI* pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
-LPVOID	(WINAPI* pDPA_GetPtr) (const HDPA, INT32);   
-BOOL32	(WINAPI* pDPA_Destroy) (const HDPA); 
-INT32	(WINAPI *pDPA_Search) (const HDPA, LPVOID, INT32, PFNDPACOMPARE, LPARAM, UINT32);
+INT	(WINAPI* pImageList_AddIcon) (HIMAGELIST himl, HICON hIcon);
+INT	(WINAPI* pImageList_ReplaceIcon) (HIMAGELIST, INT, HICON);
+HIMAGELIST (WINAPI * pImageList_Create) (INT,INT,UINT,INT,INT);
+HICON	(WINAPI * pImageList_GetIcon) (HIMAGELIST, INT, UINT);
+INT	(WINAPI* pImageList_GetImageCount)(HIMAGELIST);
+
+LPVOID	(WINAPI* pCOMCTL32_Alloc) (INT);  
+BOOL	(WINAPI* pCOMCTL32_Free) (LPVOID);  
+
+HDPA	(WINAPI* pDPA_Create) (INT);  
+INT	(WINAPI* pDPA_InsertPtr) (const HDPA, INT, LPVOID); 
+BOOL	(WINAPI* pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
+LPVOID	(WINAPI* pDPA_GetPtr) (const HDPA, INT);   
+BOOL	(WINAPI* pDPA_Destroy) (const HDPA); 
+INT	(WINAPI *pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
 
 /* user32 */
-HICON32 (WINAPI *pLookupIconIdFromDirectoryEx32)(LPBYTE dir, BOOL32 bIcon, INT32 width, INT32 height, UINT32 cFlag);
-HICON32 (WINAPI *pCreateIconFromResourceEx32)(LPBYTE bits,UINT32 cbSize, BOOL32 bIcon, DWORD dwVersion, INT32 width, INT32 height,UINT32 cFlag);
+HICON (WINAPI *pLookupIconIdFromDirectoryEx)(LPBYTE dir, BOOL bIcon, INT width, INT height, UINT cFlag);
+HICON (WINAPI *pCreateIconFromResourceEx)(LPBYTE bits,UINT cbSize, BOOL bIcon, DWORD dwVersion, INT width, INT height,UINT cFlag);
 
-static BOOL32		bShell32IsInitialized = 0;
-static HINSTANCE32	hComctl32;
-static INT32		shell32_RefCount = 0;
+static BOOL		bShell32IsInitialized = 0;
+static HINSTANCE	hComctl32;
+static INT		shell32_RefCount = 0;
 
-INT32		shell32_ObjCount = 0;
-HINSTANCE32	shell32_hInstance; 
+INT		shell32_ObjCount = 0;
+HINSTANCE	shell32_hInstance; 
 /*************************************************************************
  * SHELL32 LibMain
  *
  */
 
-BOOL32 WINAPI Shell32LibMain(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
-{	HMODULE32 hUser32;
+BOOL WINAPI Shell32LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
+{	HMODULE hUser32;
 
 	TRACE(shell,"0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
 
@@ -1001,31 +1001,31 @@ BOOL32 WINAPI Shell32LibMain(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID fImpL
 	switch (fdwReason)
 	{ case DLL_PROCESS_ATTACH:
 	    if (!bShell32IsInitialized)
-	    { hComctl32 = LoadLibrary32A("COMCTL32.DLL");	
-	      hUser32 = GetModuleHandle32A("USER32");
+	    { hComctl32 = LoadLibraryA("COMCTL32.DLL");	
+	      hUser32 = GetModuleHandleA("USER32");
 	      if (hComctl32 && hUser32)
-	      { pDLLInitComctl=(void*)GetProcAddress32(hComctl32,"InitCommonControlsEx");
+	      { pDLLInitComctl=(void*)GetProcAddress(hComctl32,"InitCommonControlsEx");
 	        if (pDLLInitComctl)
 	        { pDLLInitComctl(NULL);
 	        }
-	        pImageList_Create=(void*)GetProcAddress32(hComctl32,"ImageList_Create");
-	        pImageList_AddIcon=(void*)GetProcAddress32(hComctl32,"ImageList_AddIcon");
-	        pImageList_ReplaceIcon=(void*)GetProcAddress32(hComctl32,"ImageList_ReplaceIcon");
-	        pImageList_GetIcon=(void*)GetProcAddress32(hComctl32,"ImageList_GetIcon");
-	        pImageList_GetImageCount=(void*)GetProcAddress32(hComctl32,"ImageList_GetImageCount");
+	        pImageList_Create=(void*)GetProcAddress(hComctl32,"ImageList_Create");
+	        pImageList_AddIcon=(void*)GetProcAddress(hComctl32,"ImageList_AddIcon");
+	        pImageList_ReplaceIcon=(void*)GetProcAddress(hComctl32,"ImageList_ReplaceIcon");
+	        pImageList_GetIcon=(void*)GetProcAddress(hComctl32,"ImageList_GetIcon");
+	        pImageList_GetImageCount=(void*)GetProcAddress(hComctl32,"ImageList_GetImageCount");
 
 	        /* imports by ordinal, pray that it works*/
-	        pCOMCTL32_Alloc=(void*)GetProcAddress32(hComctl32, (LPCSTR)71L);
-	        pCOMCTL32_Free=(void*)GetProcAddress32(hComctl32, (LPCSTR)73L);
-	        pDPA_Create=(void*)GetProcAddress32(hComctl32, (LPCSTR)328L);
-	        pDPA_Destroy=(void*)GetProcAddress32(hComctl32, (LPCSTR)329L);
-	        pDPA_GetPtr=(void*)GetProcAddress32(hComctl32, (LPCSTR)332L);
-	        pDPA_InsertPtr=(void*)GetProcAddress32(hComctl32, (LPCSTR)334L);
-	        pDPA_Sort=(void*)GetProcAddress32(hComctl32, (LPCSTR)338L);
-	        pDPA_Search=(void*)GetProcAddress32(hComctl32, (LPCSTR)339L);
+	        pCOMCTL32_Alloc=(void*)GetProcAddress(hComctl32, (LPCSTR)71L);
+	        pCOMCTL32_Free=(void*)GetProcAddress(hComctl32, (LPCSTR)73L);
+	        pDPA_Create=(void*)GetProcAddress(hComctl32, (LPCSTR)328L);
+	        pDPA_Destroy=(void*)GetProcAddress(hComctl32, (LPCSTR)329L);
+	        pDPA_GetPtr=(void*)GetProcAddress(hComctl32, (LPCSTR)332L);
+	        pDPA_InsertPtr=(void*)GetProcAddress(hComctl32, (LPCSTR)334L);
+	        pDPA_Sort=(void*)GetProcAddress(hComctl32, (LPCSTR)338L);
+	        pDPA_Search=(void*)GetProcAddress(hComctl32, (LPCSTR)339L);
 	        /* user32 */
-	        pLookupIconIdFromDirectoryEx32=(void*)GetProcAddress32(hUser32,"LookupIconIdFromDirectoryEx");
-	        pCreateIconFromResourceEx32=(void*)GetProcAddress32(hUser32,"CreateIconFromResourceEx");
+	        pLookupIconIdFromDirectoryEx=(void*)GetProcAddress(hUser32,"LookupIconIdFromDirectoryEx");
+	        pCreateIconFromResourceEx=(void*)GetProcAddress(hUser32,"CreateIconFromResourceEx");
 	      }
 	      else
 	      { ERR(shell,"P A N I C SHELL32 loading failed\n");
@@ -1048,7 +1048,7 @@ BOOL32 WINAPI Shell32LibMain(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID fImpL
 	  case DLL_PROCESS_DETACH:
 	    shell32_RefCount--;
 	    if ( !shell32_RefCount )
-	    { FreeLibrary32(hComctl32);
+	    { FreeLibrary(hComctl32);
 	      bShell32IsInitialized = FALSE;
 
 	      if (pdesktopfolder) 
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index 196a0fd8bec..7afe0d397fb 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -8,8 +8,8 @@
 /*******************************************
 *  global SHELL32.DLL variables
 */
-extern HINSTANCE32 shell32_hInstance;
-extern INT32	  shell32_ObjCount;
+extern HINSTANCE shell32_hInstance;
+extern INT	  shell32_ObjCount;
 extern HIMAGELIST ShellSmallIconList;
 extern HIMAGELIST ShellBigIconList;
 
@@ -17,24 +17,24 @@ extern HIMAGELIST ShellBigIconList;
 * pointer to functions dynamically loaded
 */
 extern void	(WINAPI* pDLLInitComctl)(LPVOID);
-extern INT32	(WINAPI* pImageList_AddIcon) (HIMAGELIST himl, HICON32 hIcon);
-extern INT32	(WINAPI* pImageList_ReplaceIcon) (HIMAGELIST, INT32, HICON32);
-extern HIMAGELIST (WINAPI* pImageList_Create) (INT32,INT32,UINT32,INT32,INT32);
-extern HICON32	(WINAPI* pImageList_GetIcon) (HIMAGELIST, INT32, UINT32);
-extern INT32	(WINAPI* pImageList_GetImageCount)(HIMAGELIST);
+extern INT	(WINAPI* pImageList_AddIcon) (HIMAGELIST himl, HICON hIcon);
+extern INT	(WINAPI* pImageList_ReplaceIcon) (HIMAGELIST, INT, HICON);
+extern HIMAGELIST (WINAPI* pImageList_Create) (INT,INT,UINT,INT,INT);
+extern HICON	(WINAPI* pImageList_GetIcon) (HIMAGELIST, INT, UINT);
+extern INT	(WINAPI* pImageList_GetImageCount)(HIMAGELIST);
 
-extern LPVOID	(WINAPI* pCOMCTL32_Alloc) (INT32);  
-extern BOOL32	(WINAPI* pCOMCTL32_Free) (LPVOID);  
+extern LPVOID	(WINAPI* pCOMCTL32_Alloc) (INT);  
+extern BOOL	(WINAPI* pCOMCTL32_Free) (LPVOID);  
 
-extern HDPA	(WINAPI* pDPA_Create) (INT32);  
-extern INT32	(WINAPI* pDPA_InsertPtr) (const HDPA, INT32, LPVOID); 
-extern BOOL32	(WINAPI* pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
-extern LPVOID	(WINAPI* pDPA_GetPtr) (const HDPA, INT32);   
-extern BOOL32	(WINAPI* pDPA_Destroy) (const HDPA); 
-extern INT32	(WINAPI* pDPA_Search) (const HDPA, LPVOID, INT32, PFNDPACOMPARE, LPARAM, UINT32);
+extern HDPA	(WINAPI* pDPA_Create) (INT);  
+extern INT	(WINAPI* pDPA_InsertPtr) (const HDPA, INT, LPVOID); 
+extern BOOL	(WINAPI* pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
+extern LPVOID	(WINAPI* pDPA_GetPtr) (const HDPA, INT);   
+extern BOOL	(WINAPI* pDPA_Destroy) (const HDPA); 
+extern INT	(WINAPI* pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
 
-extern HICON32 (WINAPI *pLookupIconIdFromDirectoryEx32)(LPBYTE dir, BOOL32 bIcon, INT32 width, INT32 height, UINT32 cFlag);
-extern HICON32 (WINAPI *pCreateIconFromResourceEx32)(LPBYTE bits,UINT32 cbSize, BOOL32 bIcon, DWORD dwVersion, INT32 width, INT32 height,UINT32 cFlag);
+extern HICON (WINAPI *pLookupIconIdFromDirectoryEx)(LPBYTE dir, BOOL bIcon, INT width, INT height, UINT cFlag);
+extern HICON (WINAPI *pCreateIconFromResourceEx)(LPBYTE bits,UINT cbSize, BOOL bIcon, DWORD dwVersion, INT width, INT height,UINT cFlag);
 
 /* undocumented WINAPI functions not globaly exported */
 LPITEMIDLIST WINAPI ILClone (LPCITEMIDLIST pidl);
@@ -49,33 +49,33 @@ HRESULT WINAPI StrRetToStrN (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST
 
 /* Iconcache */
 #define INVALID_INDEX -1
-BOOL32 SIC_Initialize(void);
+BOOL SIC_Initialize(void);
 /*INT32 SIC_GetIconIndex (LPCSTR sSourceFile, INT32 dwSourceIndex );*/
 
 /* Classes Root */
-BOOL32 HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len);
-BOOL32 HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD len );
-BOOL32 HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr);
+BOOL HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len);
+BOOL HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD len );
+BOOL HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr);
 
-DWORD 		WINAPI ParseField32A(LPCSTR src,DWORD field,LPSTR dst,DWORD len);
+DWORD 		WINAPI ParseFieldA(LPCSTR src,DWORD field,LPSTR dst,DWORD len);
 
-HGLOBAL32	WINAPI SHAllocShared(LPVOID psrc, DWORD size, DWORD procID);
-LPVOID		WINAPI SHLockShared(HANDLE32 hmem, DWORD procID);
-BOOL32		WINAPI SHUnlockShared(HANDLE32 pmem);
-HANDLE32	WINAPI SHFreeShared(HANDLE32 hmem, DWORD procID);
+HGLOBAL	WINAPI SHAllocShared(LPVOID psrc, DWORD size, DWORD procID);
+LPVOID		WINAPI SHLockShared(HANDLE hmem, DWORD procID);
+BOOL		WINAPI SHUnlockShared(HANDLE pmem);
+HANDLE	WINAPI SHFreeShared(HANDLE hmem, DWORD procID);
 
 /****************************************************************************
  * Class constructors
  */
 #ifdef __WINE__
-extern LPDATAOBJECT	IDataObject_Constructor(HWND32 hwndOwner, LPSHELLFOLDER psf, LPITEMIDLIST * apidl, UINT32 cidl);
-extern LPENUMFORMATETC	IEnumFORMATETC_Constructor(UINT32, const FORMATETC32 []);
+extern LPDATAOBJECT	IDataObject_Constructor(HWND hwndOwner, LPSHELLFOLDER psf, LPITEMIDLIST * apidl, UINT cidl);
+extern LPENUMFORMATETC	IEnumFORMATETC_Constructor(UINT, const FORMATETC []);
 
 extern LPCLASSFACTORY IShellLink_CF_Constructor(void);
 extern LPCLASSFACTORY IShellLinkW_CF_Constructor(void);
 
 extern LPCLASSFACTORY	IClassFactory_Constructor(void);
-extern LPCONTEXTMENU	IContextMenu_Constructor(LPSHELLFOLDER, LPCITEMIDLIST *, UINT32);
+extern LPCONTEXTMENU	IContextMenu_Constructor(LPSHELLFOLDER, LPCITEMIDLIST *, UINT);
 extern LPSHELLFOLDER	IShellFolder_Constructor(LPSHELLFOLDER,LPITEMIDLIST);
 extern LPSHELLVIEW	IShellView_Constructor(LPSHELLFOLDER, LPCITEMIDLIST);
 extern LPSHELLLINK	IShellLink_Constructor(void);
diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index b8a0fedc79f..fbefdaaef1b 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -160,14 +160,14 @@ static HRESULT WINAPI IPersistFile_fnIsDirty(const IPersistFile* iface)
 	FIXME(shell,"(%p)\n",This);
 	return NOERROR;
 }
-static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR32 pszFileName, DWORD dwMode)
+static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode)
 {
 	ICOM_THIS(IPersistFileImpl,iface);
 
 	OFSTRUCT	ofs;
 	LPSTR	sFile = HEAP_strdupWtoA ( GetProcessHeap(), 0, pszFileName);
-	HFILE32	hFile = OpenFile32( sFile, &ofs, OF_READ );
-	HANDLE32	hMapping;
+	HFILE	hFile = OpenFile( sFile, &ofs, OF_READ );
+	HANDLE	hMapping;
 	PLINK_HEADER	pImage;
 	HRESULT		hRet = E_FAIL;
 	CHAR		sTemp[512];
@@ -176,7 +176,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR32 pszFi
 
 	HeapFree(GetProcessHeap(),0,sFile);
 
-	if ( !(hMapping = CreateFileMapping32A(hFile,NULL,PAGE_READONLY|SEC_COMMIT,0,0,NULL))) 
+	if ( !(hMapping = CreateFileMappingA(hFile,NULL,PAGE_READONLY|SEC_COMMIT,0,0,NULL))) 
 	{ WARN(shell,"failed to create filemap.\n");
 	  goto end_1;
 	}
@@ -194,15 +194,15 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR32 pszFi
 	{ /* for debugging */
 	  SYSTEMTIME time;
 	  FileTimeToSystemTime (&pImage->Time1, &time);
-	  GetDateFormat32A(LOCALE_USER_DEFAULT,DATE_SHORTDATE,&time, NULL,  sTemp, 256);
+	  GetDateFormatA(LOCALE_USER_DEFAULT,DATE_SHORTDATE,&time, NULL,  sTemp, 256);
 	  TRACE(shell, "-- time1: %s\n", sTemp);
 
 	  FileTimeToSystemTime (&pImage->Time2, &time);
-	  GetDateFormat32A(LOCALE_USER_DEFAULT,DATE_SHORTDATE,&time, NULL,  sTemp, 256);
+	  GetDateFormatA(LOCALE_USER_DEFAULT,DATE_SHORTDATE,&time, NULL,  sTemp, 256);
 	  TRACE(shell, "-- time2: %s\n", sTemp);
 
 	  FileTimeToSystemTime (&pImage->Time3, &time);
-	  GetDateFormat32A(LOCALE_USER_DEFAULT,DATE_SHORTDATE,&time, NULL,  sTemp, 256);
+	  GetDateFormatA(LOCALE_USER_DEFAULT,DATE_SHORTDATE,&time, NULL,  sTemp, 256);
 	  TRACE(shell, "-- time3: %s\n", sTemp);
 	  pdump (&pImage->Pidl);
 	}
@@ -215,24 +215,24 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR32 pszFi
 	hRet = NOERROR;
 end_3:	UnmapViewOfFile(pImage);
 end_2:	CloseHandle(hMapping);
-end_1:	_lclose32( hFile);
+end_1:	_lclose( hFile);
 
 	return hRet;
 }
 
-static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR32 pszFileName, BOOL32 fRemember)
+static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember)
 {
 	ICOM_THIS(IPersistFileImpl,iface);
 	FIXME(shell,"(%p)->(%s)\n",This,debugstr_w(pszFileName));
        	return NOERROR;
 }
-static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR32 pszFileName)
+static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR pszFileName)
 {
 	ICOM_THIS(IPersistFileImpl,iface);
 	FIXME(shell,"(%p)->(%s)\n",This,debugstr_w(pszFileName));
         return NOERROR;
 }
-static HRESULT WINAPI IPersistFile_fnGetCurFile(const IPersistFile* iface, LPOLESTR32 *ppszFileName)
+static HRESULT WINAPI IPersistFile_fnGetCurFile(const IPersistFile* iface, LPOLESTR *ppszFileName)
 {
 	ICOM_CTHIS(IPersistFileImpl,iface);
 	FIXME(shell,"(%p)\n",This);
@@ -376,7 +376,7 @@ static HRESULT WINAPI IShellLink_CF_CreateInstance(
 /******************************************************************************
  * IShellLink_CF_LockServer
  */
-static HRESULT WINAPI IShellLink_CF_LockServer(IClassFactory* iface, BOOL32 fLock)
+static HRESULT WINAPI IShellLink_CF_LockServer(IClassFactory* iface, BOOL fLock)
 {
 	ICOM_THIS(IClassFactoryImpl,iface);
 	TRACE(shell,"%p->(0x%x), not implemented\n",This, fLock);
@@ -484,7 +484,7 @@ static ULONG WINAPI IShellLink_fnRelease(IShellLink * iface)
 	return This->ref;
 }
 
-static HRESULT WINAPI IShellLink_fnGetPath(IShellLink * iface, LPSTR pszFile,INT32 cchMaxPath, WIN32_FIND_DATA32A *pfd, DWORD fFlags)
+static HRESULT WINAPI IShellLink_fnGetPath(IShellLink * iface, LPSTR pszFile,INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags)
 {
 	ICOM_THIS(IShellLinkImpl, iface);
 	
@@ -513,7 +513,7 @@ static HRESULT WINAPI IShellLink_fnSetIDList(IShellLink * iface, LPCITEMIDLIST p
 	This->lppf->pPidl = ILClone (pidl);
 	return NOERROR;
 }
-static HRESULT WINAPI IShellLink_fnGetDescription(IShellLink * iface, LPSTR pszName,INT32 cchMaxName)
+static HRESULT WINAPI IShellLink_fnGetDescription(IShellLink * iface, LPSTR pszName,INT cchMaxName)
 {
 	ICOM_THIS(IShellLinkImpl, iface);
 	
@@ -528,7 +528,7 @@ static HRESULT WINAPI IShellLink_fnSetDescription(IShellLink * iface, LPCSTR psz
 	FIXME(shell,"(%p)->(desc=%s)\n",This, pszName);
 	return NOERROR;
 }
-static HRESULT WINAPI IShellLink_fnGetWorkingDirectory(IShellLink * iface, LPSTR pszDir,INT32 cchMaxPath)
+static HRESULT WINAPI IShellLink_fnGetWorkingDirectory(IShellLink * iface, LPSTR pszDir,INT cchMaxPath)
 {
 	ICOM_THIS(IShellLinkImpl, iface);
 	
@@ -543,7 +543,7 @@ static HRESULT WINAPI IShellLink_fnSetWorkingDirectory(IShellLink * iface, LPCST
 	FIXME(shell,"(%p)->(dir=%s)\n",This, pszDir);
 	return NOERROR;
 }
-static HRESULT WINAPI IShellLink_fnGetArguments(IShellLink * iface, LPSTR pszArgs,INT32 cchMaxPath)
+static HRESULT WINAPI IShellLink_fnGetArguments(IShellLink * iface, LPSTR pszArgs,INT cchMaxPath)
 {
 	ICOM_THIS(IShellLinkImpl, iface);
 	
@@ -573,7 +573,7 @@ static HRESULT WINAPI IShellLink_fnSetHotkey(IShellLink * iface, WORD wHotkey)
 	FIXME(shell,"(%p)->(hotkey=%x)\n",This, wHotkey);
 	return NOERROR;
 }
-static HRESULT WINAPI IShellLink_fnGetShowCmd(IShellLink * iface, INT32 *piShowCmd)
+static HRESULT WINAPI IShellLink_fnGetShowCmd(IShellLink * iface, INT *piShowCmd)
 {
 	ICOM_THIS(IShellLinkImpl, iface);
 	
@@ -581,14 +581,14 @@ static HRESULT WINAPI IShellLink_fnGetShowCmd(IShellLink * iface, INT32 *piShowC
 	*piShowCmd=0;
 	return NOERROR;
 }
-static HRESULT WINAPI IShellLink_fnSetShowCmd(IShellLink * iface, INT32 iShowCmd)
+static HRESULT WINAPI IShellLink_fnSetShowCmd(IShellLink * iface, INT iShowCmd)
 {
 	ICOM_THIS(IShellLinkImpl, iface);
 	
 	FIXME(shell,"(%p)->(showcmd=%x)\n",This, iShowCmd);
 	return NOERROR;
 }
-static HRESULT WINAPI IShellLink_fnGetIconLocation(IShellLink * iface, LPSTR pszIconPath,INT32 cchIconPath,INT32 *piIcon)
+static HRESULT WINAPI IShellLink_fnGetIconLocation(IShellLink * iface, LPSTR pszIconPath,INT cchIconPath,INT *piIcon)
 {
 	ICOM_THIS(IShellLinkImpl, iface);
 	
@@ -597,7 +597,7 @@ static HRESULT WINAPI IShellLink_fnGetIconLocation(IShellLink * iface, LPSTR psz
 	*piIcon=1;
 	return NOERROR;
 }
-static HRESULT WINAPI IShellLink_fnSetIconLocation(IShellLink * iface, LPCSTR pszIconPath,INT32 iIcon)
+static HRESULT WINAPI IShellLink_fnSetIconLocation(IShellLink * iface, LPCSTR pszIconPath,INT iIcon)
 {
 	ICOM_THIS(IShellLinkImpl, iface);
 	
@@ -611,7 +611,7 @@ static HRESULT WINAPI IShellLink_fnSetRelativePath(IShellLink * iface, LPCSTR ps
 	FIXME(shell,"(%p)->(path=%s %lx)\n",This, pszPathRel, dwReserved);
 	return NOERROR;
 }
-static HRESULT WINAPI IShellLink_fnResolve(IShellLink * iface, HWND32 hwnd, DWORD fFlags)
+static HRESULT WINAPI IShellLink_fnResolve(IShellLink * iface, HWND hwnd, DWORD fFlags)
 {
 	ICOM_THIS(IShellLinkImpl, iface);
 	
@@ -772,7 +772,7 @@ static HRESULT WINAPI IShellLinkW_CF_CreateInstance(
  * IShellLinkW_CF_LockServer
  */
 
-static HRESULT WINAPI IShellLinkW_CF_LockServer(LPCLASSFACTORY iface, BOOL32 fLock)
+static HRESULT WINAPI IShellLinkW_CF_LockServer(LPCLASSFACTORY iface, BOOL fLock)
 {
 	ICOM_THIS(IClassFactoryImpl,iface);
 	TRACE(shell,"%p->(0x%x), not implemented\n",This, fLock);
@@ -886,7 +886,7 @@ static ULONG WINAPI IShellLinkW_fnRelease(IShellLinkW * iface)
 	return This->ref;
 }
 
-static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile,INT32 cchMaxPath, WIN32_FIND_DATA32A *pfd, DWORD fFlags)
+static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile,INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags)
 {
 	ICOM_THIS(IShellLinkWImpl, iface);
 	
@@ -912,7 +912,7 @@ static HRESULT WINAPI IShellLinkW_fnSetIDList(IShellLinkW * iface, LPCITEMIDLIST
 	return NOERROR;
 }
 
-static HRESULT WINAPI IShellLinkW_fnGetDescription(IShellLinkW * iface, LPWSTR pszName,INT32 cchMaxName)
+static HRESULT WINAPI IShellLinkW_fnGetDescription(IShellLinkW * iface, LPWSTR pszName,INT cchMaxName)
 {
 	ICOM_THIS(IShellLinkWImpl, iface);
 	
@@ -929,7 +929,7 @@ static HRESULT WINAPI IShellLinkW_fnSetDescription(IShellLinkW * iface, LPCWSTR
 	return NOERROR;
 }
 
-static HRESULT WINAPI IShellLinkW_fnGetWorkingDirectory(IShellLinkW * iface, LPWSTR pszDir,INT32 cchMaxPath)
+static HRESULT WINAPI IShellLinkW_fnGetWorkingDirectory(IShellLinkW * iface, LPWSTR pszDir,INT cchMaxPath)
 {
 	ICOM_THIS(IShellLinkWImpl, iface);
 	
@@ -946,7 +946,7 @@ static HRESULT WINAPI IShellLinkW_fnSetWorkingDirectory(IShellLinkW * iface, LPC
 	return NOERROR;
 }
 
-static HRESULT WINAPI IShellLinkW_fnGetArguments(IShellLinkW * iface, LPWSTR pszArgs,INT32 cchMaxPath)
+static HRESULT WINAPI IShellLinkW_fnGetArguments(IShellLinkW * iface, LPWSTR pszArgs,INT cchMaxPath)
 {
 	ICOM_THIS(IShellLinkWImpl, iface);
 	
@@ -980,7 +980,7 @@ static HRESULT WINAPI IShellLinkW_fnSetHotkey(IShellLinkW * iface, WORD wHotkey)
 	return NOERROR;
 }
 
-static HRESULT WINAPI IShellLinkW_fnGetShowCmd(IShellLinkW * iface, INT32 *piShowCmd)
+static HRESULT WINAPI IShellLinkW_fnGetShowCmd(IShellLinkW * iface, INT *piShowCmd)
 {
 	ICOM_THIS(IShellLinkWImpl, iface);
 	
@@ -989,7 +989,7 @@ static HRESULT WINAPI IShellLinkW_fnGetShowCmd(IShellLinkW * iface, INT32 *piSho
 	return NOERROR;
 }
 
-static HRESULT WINAPI IShellLinkW_fnSetShowCmd(IShellLinkW * iface, INT32 iShowCmd)
+static HRESULT WINAPI IShellLinkW_fnSetShowCmd(IShellLinkW * iface, INT iShowCmd)
 {
 	ICOM_THIS(IShellLinkWImpl, iface);
 	
@@ -997,7 +997,7 @@ static HRESULT WINAPI IShellLinkW_fnSetShowCmd(IShellLinkW * iface, INT32 iShowC
 	return NOERROR;
 }
 
-static HRESULT WINAPI IShellLinkW_fnGetIconLocation(IShellLinkW * iface, LPWSTR pszIconPath,INT32 cchIconPath,INT32 *piIcon)
+static HRESULT WINAPI IShellLinkW_fnGetIconLocation(IShellLinkW * iface, LPWSTR pszIconPath,INT cchIconPath,INT *piIcon)
 {
 	ICOM_THIS(IShellLinkWImpl, iface);
 	
@@ -1007,7 +1007,7 @@ static HRESULT WINAPI IShellLinkW_fnGetIconLocation(IShellLinkW * iface, LPWSTR
 	return NOERROR;
 }
 
-static HRESULT WINAPI IShellLinkW_fnSetIconLocation(IShellLinkW * iface, LPCWSTR pszIconPath,INT32 iIcon)
+static HRESULT WINAPI IShellLinkW_fnSetIconLocation(IShellLinkW * iface, LPCWSTR pszIconPath,INT iIcon)
 {
 	ICOM_THIS(IShellLinkWImpl, iface);
 	
@@ -1023,7 +1023,7 @@ static HRESULT WINAPI IShellLinkW_fnSetRelativePath(IShellLinkW * iface, LPCWSTR
 	return NOERROR;
 }
 
-static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND32 hwnd, DWORD fFlags)
+static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWORD fFlags)
 {
 	ICOM_THIS(IShellLinkWImpl, iface);
 	
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 345f06c9b31..f34435d3a36 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -24,31 +24,31 @@
  */
 typedef DWORD (* WINAPI GetClassPtr)(REFCLSID,REFIID,LPVOID);
 
-static GetClassPtr SH_find_moduleproc(LPSTR dllname,HMODULE32 *xhmod,LPSTR name)
-{	HMODULE32 hmod;
-	FARPROC32 dllunload,nameproc;
+static GetClassPtr SH_find_moduleproc(LPSTR dllname,HMODULE *xhmod,LPSTR name)
+{	HMODULE hmod;
+	FARPROC dllunload,nameproc;
 
 	TRACE(shell,"dll=%s, hmodule=%p, name=%s\n",dllname, xhmod, name);
 	if (xhmod)
 	{ *xhmod = 0;
 	}
-	if (!strcasecmp(PathFindFilename32A(dllname),"shell32.dll"))
+	if (!strcasecmp(PathFindFilenameA(dllname),"shell32.dll"))
 	{ return (GetClassPtr)SHELL32_DllGetClassObject;
 	}
 
-	hmod = LoadLibraryEx32A(dllname,0,LOAD_WITH_ALTERED_SEARCH_PATH);
+	hmod = LoadLibraryExA(dllname,0,LOAD_WITH_ALTERED_SEARCH_PATH);
 	if (!hmod)
 	{ return NULL;
 	}
-	dllunload = GetProcAddress32(hmod,"DllCanUnloadNow");
+	dllunload = GetProcAddress(hmod,"DllCanUnloadNow");
 	if (!dllunload)
 	{ if (xhmod)
 	  { *xhmod = hmod;
 	  }
 	}
-	nameproc = GetProcAddress32(hmod,name);
+	nameproc = GetProcAddress(hmod,name);
 	if (!nameproc)
-	{ FreeLibrary32(hmod);
+	{ FreeLibrary(hmod);
 	  return NULL;
 	}
 	/* register unloadable dll with unloadproc ... */
@@ -111,12 +111,12 @@ LRESULT WINAPI SHCoCreateInstance(LPSTR aclsid,CLSID *clsid,LPUNKNOWN unknownout
 
 	sprintf(buffer,"CLSID\\%s\\InProcServer32",xclsid);
 
-	if (RegOpenKeyEx32A(HKEY_CLASSES_ROOT,buffer,0,0x02000000,&inprockey))
+	if (RegOpenKeyExA(HKEY_CLASSES_ROOT,buffer,0,0x02000000,&inprockey))
 	{ return SH_get_instance(clsid,"shell32.dll",unknownouter,refiid,inst);
 	}
 	pathlen=sizeof(path);
 
-	if (RegQueryValue32A(inprockey,NULL,path,&pathlen))
+	if (RegQueryValueA(inprockey,NULL,path,&pathlen))
 	{ RegCloseKey(inprockey);
 	  return SH_get_instance(clsid,"shell32.dll",unknownouter,refiid,inst);
 	}
@@ -124,7 +124,7 @@ LRESULT WINAPI SHCoCreateInstance(LPSTR aclsid,CLSID *clsid,LPUNKNOWN unknownout
 	TRACE(shell, "Server dll is %s\n",path);
 	tmodellen=sizeof(tmodel);
 	type=REG_SZ;
-	if (RegQueryValueEx32A(inprockey,"ThreadingModel",NULL,&type,tmodel,&tmodellen))
+	if (RegQueryValueExA(inprockey,"ThreadingModel",NULL,&type,tmodel,&tmodellen))
 	{ RegCloseKey(inprockey);
 	  return SH_get_instance(clsid,"shell32.dll",unknownouter,refiid,inst);
 	}
@@ -203,9 +203,9 @@ DWORD WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid,REFIID iid,LPVOID *ppv)
  * What we are currently doing is not very wrong, since we always use the same
  * heap (ProcessHeap).
  */
-DWORD WINAPI SHGetMalloc(LPMALLOC32 *lpmal) 
+DWORD WINAPI SHGetMalloc(LPMALLOC *lpmal) 
 {	TRACE(shell,"(%p)\n", lpmal);
-	return CoGetMalloc32(0,lpmal);
+	return CoGetMalloc(0,lpmal);
 }
 
 /**************************************************************************
@@ -345,7 +345,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(
 /******************************************************************************
  * IClassFactory_LockServer
  */
-static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface, BOOL32 fLock)
+static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface, BOOL fLock)
 {
 	ICOM_THIS(IClassFactoryImpl,iface);
 	TRACE(shell,"%p->(0x%x), not implemented\n",This, fLock);
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 5bff5120b95..230a38bdfe1 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -24,7 +24,7 @@
  */
 DWORD WINAPI
 SHChangeNotifyRegister(
-    HWND32 hwnd,
+    HWND hwnd,
     LONG events1,
     LONG events2,
     DWORD msg,
@@ -49,7 +49,7 @@ SHChangeNotifyDeregister(LONG x1)
  *   (usually just one I think).
  */
 DWORD WINAPI NTSHChangeNotifyRegister(
-    HWND32 hwnd,
+    HWND hwnd,
     LONG events1,
     LONG events2,
     DWORD msg,
@@ -71,7 +71,7 @@ DWORD WINAPI NTSHChangeNotifyDeregister(LONG x1)
  * ParseField [SHELL32.58]
  *
  */
-DWORD WINAPI ParseField32A(LPCSTR src, DWORD field, LPSTR dst, DWORD len) 
+DWORD WINAPI ParseFieldA(LPCSTR src, DWORD field, LPSTR dst, DWORD len) 
 {	WARN(shell,"('%s',0x%08lx,%p,%ld) semi-stub.\n",src,field,dst,len);
 
 	if (!src || !src[0] || !dst || !len)
@@ -107,12 +107,12 @@ DWORD WINAPI PickIconDlg(DWORD x,DWORD y,DWORD z,DWORD a)
  * GetFileNameFromBrowse [SHELL32.63]
  * 
  */
-DWORD WINAPI GetFileNameFromBrowse(HWND32 howner, LPSTR targetbuf, DWORD len, DWORD x, LPCSTR suffix, LPCSTR y, LPCSTR cmd) 
+DWORD WINAPI GetFileNameFromBrowse(HWND howner, LPSTR targetbuf, DWORD len, DWORD x, LPCSTR suffix, LPCSTR y, LPCSTR cmd) 
 {	FIXME(shell,"(%04x,%p,%ld,%08lx,%s,%s,%s):stub.\n",
 	    howner,targetbuf,len,x,suffix,y,cmd);
     /* puts up a Open Dialog and requests input into targetbuf */
     /* OFN_HIDEREADONLY|OFN_NOCHANGEDIR|OFN_FILEMUSTEXIST|OFN_unknown */
-    lstrcpy32A(targetbuf,"x:\\dummy.exe");
+    lstrcpyA(targetbuf,"x:\\dummy.exe");
     return 1;
 }
 
@@ -140,7 +140,7 @@ DWORD WINAPI SHGetSettings(DWORD x,DWORD y,DWORD z)
  *    shell view to re-sort the item list. lParam identifies the column
  *    that was clicked.
  */
-int WINAPI SHShellFolderView_Message(HWND32 hwndCabinet,UINT32 uMsg,LPARAM lParam)
+int WINAPI SHShellFolderView_Message(HWND hwndCabinet,UINT uMsg,LPARAM lParam)
 { FIXME(shell,"%04x %08ux %08lx stub\n",hwndCabinet,uMsg,lParam);
   return 0;
 }
@@ -153,8 +153,8 @@ int WINAPI SHShellFolderView_Message(HWND32 hwndCabinet,UINT32 uMsg,LPARAM lPara
  * FIXME
  *  wrong implemented OleStr is NOT wide string !!!! (jsch)
  */
-BOOL32 WINAPI
-OleStrToStrN (LPSTR lpMulti, INT32 nMulti, LPCWSTR lpWide, INT32 nWide) {
+BOOL WINAPI
+OleStrToStrN (LPSTR lpMulti, INT nMulti, LPCWSTR lpWide, INT nWide) {
     return WideCharToMultiByte (0, 0, lpWide, nWide,
         lpMulti, nMulti, NULL, NULL);
 }
@@ -167,8 +167,8 @@ OleStrToStrN (LPSTR lpMulti, INT32 nMulti, LPCWSTR lpWide, INT32 nWide) {
  * FIXME
  *  wrong implemented OleStr is NOT wide string !!!! (jsch)
 */
-BOOL32 WINAPI
-StrToOleStrN (LPWSTR lpWide, INT32 nWide, LPCSTR lpMulti, INT32 nMulti) {
+BOOL WINAPI
+StrToOleStrN (LPWSTR lpWide, INT nWide, LPCSTR lpMulti, INT nMulti) {
     return MultiByteToWideChar (0, 0, lpMulti, nMulti, lpWide, nWide);
 }
 
@@ -182,7 +182,7 @@ StrToOleStrN (LPWSTR lpWide, INT32 nWide, LPCSTR lpMulti, INT32 nMulti) {
  * NOTES
  *     exported by ordinal
  */
-void WINAPI RegisterShellHook32(HWND32 hwnd, DWORD y) {
+void WINAPI RegisterShellHook(HWND hwnd, DWORD y) {
     FIXME(shell,"(0x%08x,0x%08lx):stub.\n",hwnd,y);
 }
 /*************************************************************************
@@ -196,8 +196,8 @@ void WINAPI RegisterShellHook32(HWND32 hwnd, DWORD y) {
  * NOTES
  *     exported by ordinal
  */
-INT32 __cdecl
-ShellMessageBoxW(HMODULE32 hmod,HWND32 hwnd,DWORD idText,DWORD idTitle,DWORD uType,LPCVOID arglist) 
+INT __cdecl
+ShellMessageBoxW(HMODULE hmod,HWND hwnd,DWORD idText,DWORD idTitle,DWORD uType,LPCVOID arglist) 
 {	WCHAR	szText[100],szTitle[100],szTemp[256];
 	LPWSTR   pszText = &szText[0], pszTitle = &szTitle[0];
 	LPVOID	args = &arglist;
@@ -205,24 +205,24 @@ ShellMessageBoxW(HMODULE32 hmod,HWND32 hwnd,DWORD idText,DWORD idTitle,DWORD uTy
 	TRACE(shell,"(%08lx,%08lx,%08lx,%08lx,%08lx,%p)\n",(DWORD)hmod,(DWORD)hwnd,idText,idTitle,uType,arglist);
 
 	if (!HIWORD (idTitle))
-	  LoadString32W(hmod,idTitle,pszTitle,100);
+	  LoadStringW(hmod,idTitle,pszTitle,100);
 	else
 	  pszTitle = (LPWSTR)idTitle;
 
 	if (! HIWORD (idText))
-	  LoadString32W(hmod,idText,pszText,100);
+	  LoadStringW(hmod,idText,pszText,100);
 	else
 	  pszText = (LPWSTR)idText;
 
-	FormatMessage32W(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY ,szText,0,0,szTemp,256,args);
-	return MessageBox32W(hwnd,szTemp,szTitle,uType);
+	FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY ,szText,0,0,szTemp,256,args);
+	return MessageBoxW(hwnd,szTemp,szTitle,uType);
 }
 
 /*************************************************************************
  * ShellMessageBoxA [SHELL32.183]
  */
-INT32 __cdecl
-ShellMessageBoxA(HMODULE32 hmod,HWND32 hwnd,DWORD idText,DWORD idTitle,DWORD uType,LPCVOID arglist) 
+INT __cdecl
+ShellMessageBoxA(HMODULE hmod,HWND hwnd,DWORD idText,DWORD idTitle,DWORD uType,LPCVOID arglist) 
 {	char	szText[100],szTitle[100],szTemp[256];
 	LPSTR   pszText = &szText[0], pszTitle = &szTitle[0];
 	LPVOID	args = &arglist;
@@ -230,17 +230,17 @@ ShellMessageBoxA(HMODULE32 hmod,HWND32 hwnd,DWORD idText,DWORD idTitle,DWORD uTy
 	TRACE(shell,"(%08lx,%08lx,%08lx,%08lx,%08lx,%p)\n", (DWORD)hmod,(DWORD)hwnd,idText,idTitle,uType,arglist);
 
 	if (!HIWORD (idTitle))
-	  LoadString32A(hmod,idTitle,pszTitle,100);
+	  LoadStringA(hmod,idTitle,pszTitle,100);
 	else
 	  pszTitle = (LPSTR)idTitle;
 
 	if (! HIWORD (idText))
-	  LoadString32A(hmod,idText,pszText,100);
+	  LoadStringA(hmod,idText,pszText,100);
 	else
 	  pszText = (LPSTR)idText;
 
-	FormatMessage32A(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY ,pszText,0,0,szTemp,256,args);
-	return MessageBox32A(hwnd,szTemp,pszTitle,uType);
+	FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY ,pszText,0,0,szTemp,256,args);
+	return MessageBoxA(hwnd,szTemp,pszTitle,uType);
 }
 
 /*************************************************************************
@@ -276,7 +276,7 @@ DWORD WINAPI SHRestricted (DWORD pol) {
 	HKEY	xhkey;
 
 	FIXME(shell,"(%08lx):stub.\n",pol);
-	if (RegOpenKey32A(HKEY_CURRENT_USER,"Software\\Microsoft\\Windows\\CurrentVersion\\Policies",&xhkey))
+	if (RegOpenKeyA(HKEY_CURRENT_USER,"Software\\Microsoft\\Windows\\CurrentVersion\\Policies",&xhkey))
 		return 0;
 	/* FIXME: do nothing for now, just return 0 (== "allowed") */
 	RegCloseKey(xhkey);
@@ -292,7 +292,7 @@ DWORD WINAPI SHRestricted (DWORD pol) {
  */
 DWORD WINAPI SHCreateDirectory(LPSECURITY_ATTRIBUTES sec,LPCSTR path) {
 	TRACE(shell,"(%p,%s):stub.\n",sec,path);
-	if (CreateDirectory32A(path,sec))
+	if (CreateDirectoryA(path,sec))
 		return TRUE;
 	/* SHChangeNotify(8,1,path,0); */
 	return FALSE;
@@ -352,7 +352,7 @@ DWORD WINAPI OpenRegStream(DWORD x1,DWORD x2,DWORD x3,DWORD x4) {
  * NOTES
  *     exported by ordinal
  */
-DWORD WINAPI SHRegisterDragDrop(HWND32 hwnd,DWORD x2) {
+DWORD WINAPI SHRegisterDragDrop(HWND hwnd,DWORD x2) {
     FIXME (shell, "(0x%08x,0x%08lx):stub.\n", hwnd, x2);
     return 0;
 }
@@ -375,8 +375,8 @@ DWORD WINAPI SHRevokeDragDrop(DWORD x) {
  *     Original name: RunFileDlg (exported by ordinal)
  */
 DWORD WINAPI
-RunFileDlg (HWND32 hwndOwner, DWORD dwParam1, DWORD dwParam2,
-	    LPSTR lpszTitle, LPSTR lpszPrompt, UINT32 uFlags)
+RunFileDlg (HWND hwndOwner, DWORD dwParam1, DWORD dwParam2,
+	    LPSTR lpszTitle, LPSTR lpszPrompt, UINT uFlags)
 {
     FIXME (shell,"(0x%08x 0x%lx 0x%lx \"%s\" \"%s\" 0x%x):stub.\n",
 	   hwndOwner, dwParam1, dwParam2, lpszTitle, lpszPrompt, uFlags);
@@ -390,7 +390,7 @@ RunFileDlg (HWND32 hwndOwner, DWORD dwParam1, DWORD dwParam2,
  *     exported by ordinal
  */
 DWORD WINAPI
-ExitWindowsDialog (HWND32 hwndOwner)
+ExitWindowsDialog (HWND hwndOwner)
 {
     FIXME (shell,"(0x%08x):stub.\n", hwndOwner);
     return 0;
@@ -449,7 +449,7 @@ SignalFileOpen (DWORD dwParam1)
  * NOTES
  *     exported by name
  */
-DWORD WINAPI SHAddToRecentDocs32 (UINT32 uFlags,LPCVOID pv)   
+DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)   
 { if (SHARD_PIDL==uFlags)
   { FIXME (shell,"(0x%08x,pidl=%p):stub.\n", uFlags,pv);
 	}
@@ -462,7 +462,7 @@ DWORD WINAPI SHAddToRecentDocs32 (UINT32 uFlags,LPCVOID pv)
  * SHFileOperation32 [SHELL32.242]
  *
  */
-DWORD WINAPI SHFileOperation32(DWORD x)
+DWORD WINAPI SHFileOperationAW(DWORD x)
 {	FIXME(shell,"0x%08lx stub\n",x);
 	return 0;
 
@@ -474,7 +474,7 @@ DWORD WINAPI SHFileOperation32(DWORD x)
  * NOTES
  *     exported by name
  */
-DWORD WINAPI SHFileOperation32A (LPSHFILEOPSTRUCT32A lpFileOp)   
+DWORD WINAPI SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp)   
 { FIXME (shell,"(%p):stub.\n", lpFileOp);
   return 1;
 }
@@ -484,7 +484,7 @@ DWORD WINAPI SHFileOperation32A (LPSHFILEOPSTRUCT32A lpFileOp)
  * NOTES
  *     exported by name
  */
-DWORD WINAPI SHFileOperation32W (LPSHFILEOPSTRUCT32W lpFileOp)   
+DWORD WINAPI SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp)   
 { FIXME (shell,"(%p):stub.\n", lpFileOp);
   return 1;
 }
@@ -495,9 +495,9 @@ DWORD WINAPI SHFileOperation32W (LPSHFILEOPSTRUCT32W lpFileOp)
  * NOTES
  *     exported by name
  */
-DWORD WINAPI SHChangeNotify32 (
-    INT32   wEventId,  /* [IN] flags that specifies the event*/
-    UINT32  uFlags,   /* [IN] the meaning of dwItem[1|2]*/
+DWORD WINAPI SHChangeNotify (
+    INT   wEventId,  /* [IN] flags that specifies the event*/
+    UINT  uFlags,   /* [IN] the meaning of dwItem[1|2]*/
 		LPCVOID dwItem1,
 		LPCVOID dwItem2)
 { FIXME (shell,"(0x%08x,0x%08ux,%p,%p):stub.\n", wEventId,uFlags,dwItem1,dwItem2);
@@ -509,7 +509,7 @@ DWORD WINAPI SHChangeNotify32 (
  * NOTES
  *  see IShellFolder::CreateViewObject
  */
-HRESULT WINAPI SHCreateShellFolderViewEx32(
+HRESULT WINAPI SHCreateShellFolderViewEx(
   LPSHELLVIEWDATA psvcbi, /*[in ] shelltemplate struct*/
   LPVOID* ppv)            /*[out] IShellView pointer*/
 { FIXME (shell,"(%p,%p):stub.\n", psvcbi,ppv);
@@ -527,7 +527,7 @@ HRESULT WINAPI SHCreateShellFolderViewEx32(
  *  w			[in] no pointer
  *  x			[in] no pointer
  */
-HRESULT WINAPI SHFind_InitMenuPopup (HMENU32 hMenu, HWND32 hWndParent, DWORD w, DWORD x)
+HRESULT WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x)
 {	FIXME(shell,"hmenu=0x%08x hwnd=0x%08x 0x%08lx 0x%08lx stub\n",
 		hMenu,hWndParent,w,x);
 	return 0;
@@ -561,7 +561,7 @@ HRESULT WINAPI FileMenu_Create (DWORD u, DWORD v, DWORD w, DWORD x, DWORD z)
  *  hWndParent		[in]
  *  z	could be rect (trace) or TPMPARAMS (TrackPopupMenuEx)
  */
-HRESULT WINAPI FileMenu_TrackPopupMenuEx (DWORD t, DWORD uFlags, DWORD posX, DWORD posY, HWND32 hWndParent, DWORD z)
+HRESULT WINAPI FileMenu_TrackPopupMenuEx (DWORD t, DWORD uFlags, DWORD posX, DWORD posY, HWND hWndParent, DWORD z)
 {	FIXME(shell,"0x%lx flags=0x%lx posx=0x%lx posy=0x%lx hwndp=0x%x 0x%lx stub\n",
 		t,uFlags,posX,posY, hWndParent,z);
 	return 0;
@@ -586,20 +586,20 @@ HRESULT WINAPI SHRunControlPanel (DWORD x, DWORD z)
  * ShellExecuteEx [SHELL32.291]
  *
  */
-BOOL32 WINAPI ShellExecuteEx32 (LPVOID sei)
+BOOL WINAPI ShellExecuteExAW (LPVOID sei)
 {	if (VERSION_OsIsUnicode())
-	  return ShellExecuteEx32W (sei);
-	return ShellExecuteEx32A (sei);
+	  return ShellExecuteExW (sei);
+	return ShellExecuteExA (sei);
 }
 /*************************************************************************
  * ShellExecuteEx32A [SHELL32.292]
  *
  */
-BOOL32 WINAPI ShellExecuteEx32A (LPSHELLEXECUTEINFO32A sei)
+BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei)
 { 	CHAR szApplicationName[MAX_PATH],szCommandline[MAX_PATH],szPidl[20];
 	LPSTR pos;
 	int gap, len;
-	STARTUPINFO32A  startupinfo;
+	STARTUPINFOA  startupinfo;
 	PROCESS_INFORMATION processinformation;
 			
   	WARN(shell,"mask=0x%08lx hwnd=0x%04x verb=%s file=%s parm=%s dir=%s show=0x%08x class=%s incomplete\n",
@@ -627,7 +627,7 @@ BOOL32 WINAPI ShellExecuteEx32A (LPSHELLEXECUTEINFO32A sei)
 
 	/* process the IDList */
 	if ( (sei->fMask & SEE_MASK_INVOKEIDLIST) == SEE_MASK_INVOKEIDLIST) /*0x0c*/
-	{ SHGetPathFromIDList32A (sei->lpIDList,szApplicationName);
+	{ SHGetPathFromIDListA (sei->lpIDList,szApplicationName);
 	  TRACE(shell,"-- idlist=%p (%s)\n", sei->lpIDList, szApplicationName);
 	}
 	else
@@ -635,7 +635,7 @@ BOOL32 WINAPI ShellExecuteEx32A (LPSHELLEXECUTEINFO32A sei)
 	  { /* %I is the adress of a global item ID*/
 	    pos = strstr(szCommandline, "%I");
 	    if (pos)
-	    { HGLOBAL32 hmem = SHAllocShared ( sei->lpIDList, ILGetSize(sei->lpIDList), 0);
+	    { HGLOBAL hmem = SHAllocShared ( sei->lpIDList, ILGetSize(sei->lpIDList), 0);
 	      sprintf(szPidl,":%li",(DWORD)SHLockShared(hmem,0) );
 	      SHUnlockShared(hmem);
 	    
@@ -657,10 +657,10 @@ BOOL32 WINAPI ShellExecuteEx32A (LPSHELLEXECUTEINFO32A sei)
 
 	TRACE(shell,"execute: %s %s\n",szApplicationName, szCommandline);
 
-	ZeroMemory(&startupinfo,sizeof(STARTUPINFO32A));
-	startupinfo.cb = sizeof(STARTUPINFO32A);
+	ZeroMemory(&startupinfo,sizeof(STARTUPINFOA));
+	startupinfo.cb = sizeof(STARTUPINFOA);
 
-	return CreateProcess32A(szApplicationName[0] ? szApplicationName:NULL,
+	return CreateProcessA(szApplicationName[0] ? szApplicationName:NULL,
 			 szCommandline[0] ? szCommandline : NULL,
 			 NULL, NULL, FALSE, 0, 
 			 NULL, NULL, &startupinfo, &processinformation);
@@ -671,13 +671,13 @@ BOOL32 WINAPI ShellExecuteEx32A (LPSHELLEXECUTEINFO32A sei)
  * ShellExecuteEx32W [SHELL32.293]
  *
  */
-BOOL32 WINAPI ShellExecuteEx32W (LPSHELLEXECUTEINFO32W sei)
-{	SHELLEXECUTEINFO32A seiA;
+BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei)
+{	SHELLEXECUTEINFOA seiA;
 	DWORD ret;
 
 	TRACE (shell,"%p\n", sei);
 
-	memcpy(&seiA, sei, sizeof(SHELLEXECUTEINFO32A));
+	memcpy(&seiA, sei, sizeof(SHELLEXECUTEINFOA));
 	
         if (sei->lpVerb)
 	  seiA.lpVerb = HEAP_strdupWtoA( GetProcessHeap(), 0, sei->lpVerb);
@@ -696,7 +696,7 @@ BOOL32 WINAPI ShellExecuteEx32W (LPSHELLEXECUTEINFO32W sei)
 	else
 	  seiA.lpClass = NULL;
 	  	  
-	ret = ShellExecuteEx32A(&seiA);
+	ret = ShellExecuteExA(&seiA);
 
         if (seiA.lpVerb)	HeapFree( GetProcessHeap(), 0, (LPSTR) seiA.lpVerb );
 	if (seiA.lpFile)	HeapFree( GetProcessHeap(), 0, (LPSTR) seiA.lpFile );
@@ -770,7 +770,7 @@ HRESULT WINAPI FileMenu_Destroy (DWORD u)
  * SHRegCloseKey32 [NT4.0:SHELL32.505]
  *
  */
-HRESULT WINAPI SHRegCloseKey32 (HKEY hkey)
+HRESULT WINAPI SHRegCloseKey (HKEY hkey)
 {	TRACE(shell,"0x%04x\n",hkey);
 	return RegCloseKey( hkey );
 }
@@ -778,25 +778,25 @@ HRESULT WINAPI SHRegCloseKey32 (HKEY hkey)
  * SHRegOpenKey32A [SHELL32.506]
  *
  */
-HRESULT WINAPI SHRegOpenKey32A(HKEY hKey, LPSTR lpSubKey, LPHKEY phkResult)
+HRESULT WINAPI SHRegOpenKeyA(HKEY hKey, LPSTR lpSubKey, LPHKEY phkResult)
 {	FIXME(shell,"(0x%08x, %s, %p)\n", hKey, debugstr_a(lpSubKey),
 	      phkResult);
-	return RegOpenKey32A(hKey, lpSubKey, phkResult);
+	return RegOpenKeyA(hKey, lpSubKey, phkResult);
 }
 
 /*************************************************************************
  * SHRegOpenKey32W [NT4.0:SHELL32.507]
  *
  */
-HRESULT WINAPI SHRegOpenKey32W (HKEY hkey, LPCWSTR lpszSubKey, LPHKEY retkey)
+HRESULT WINAPI SHRegOpenKeyW (HKEY hkey, LPCWSTR lpszSubKey, LPHKEY retkey)
 {	WARN(shell,"0x%04x %s %p\n",hkey,debugstr_w(lpszSubKey),retkey);
-	return RegOpenKey32W( hkey, lpszSubKey, retkey );
+	return RegOpenKeyW( hkey, lpszSubKey, retkey );
 }
 /*************************************************************************
  * SHRegQueryValueExA [SHELL32.509]
  *
  */
-HRESULT WINAPI SHRegQueryValueEx32A(DWORD u, LPSTR v, DWORD w, DWORD x,
+HRESULT WINAPI SHRegQueryValueExA(DWORD u, LPSTR v, DWORD w, DWORD x,
 				  DWORD y, DWORD z)
 {	FIXME(shell,"0x%04lx %s 0x%04lx 0x%04lx 0x%04lx  0x%04lx stub\n",
 		u,debugstr_a(v),w,x,y,z);
@@ -806,11 +806,11 @@ HRESULT WINAPI SHRegQueryValueEx32A(DWORD u, LPSTR v, DWORD w, DWORD x,
  * SHRegQueryValue32W [NT4.0:SHELL32.510]
  *
  */
-HRESULT WINAPI SHRegQueryValue32W (HKEY hkey, LPWSTR lpszSubKey,
+HRESULT WINAPI SHRegQueryValueW (HKEY hkey, LPWSTR lpszSubKey,
 				 LPWSTR lpszData, LPDWORD lpcbData )
 {	WARN(shell,"0x%04x %s %p %p semi-stub\n",
 		hkey, debugstr_w(lpszSubKey), lpszData, lpcbData);
-	return RegQueryValue32W( hkey, lpszSubKey, lpszData, lpcbData );
+	return RegQueryValueW( hkey, lpszSubKey, lpszData, lpcbData );
 }
 
 /*************************************************************************
@@ -820,12 +820,12 @@ HRESULT WINAPI SHRegQueryValue32W (HKEY hkey, LPWSTR lpszSubKey,
  *  if the datatype REG_EXPAND_SZ then expand the string and change
  *  *pdwType to REG_SZ. 
  */
-HRESULT WINAPI SHRegQueryValueEx32W (HKEY hkey, LPWSTR pszValue, LPDWORD pdwReserved,
+HRESULT WINAPI SHRegQueryValueExW (HKEY hkey, LPWSTR pszValue, LPDWORD pdwReserved,
 		 LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData)
 {	DWORD ret;
 	WARN(shell,"0x%04x %s %p %p %p %p semi-stub\n",
 		hkey, debugstr_w(pszValue), pdwReserved, pdwType, pvData, pcbData);
-	ret = RegQueryValueEx32W ( hkey, pszValue, pdwReserved, pdwType, pvData, pcbData);
+	ret = RegQueryValueExW ( hkey, pszValue, pdwReserved, pdwType, pvData, pcbData);
 	return ret;
 }
 
@@ -849,7 +849,7 @@ HRESULT WINAPI WriteCabinetState(DWORD u)
  * FileIconInit [SHELL32.660]
  *
  */
-BOOL32 WINAPI FileIconInit(BOOL32 bFullInit)
+BOOL WINAPI FileIconInit(BOOL bFullInit)
 {	FIXME(shell,"(%s)\n", bFullInit ? "true" : "false");
 	return 0;
 }
@@ -925,7 +925,7 @@ LPWSTR WINAPI StrChrW (LPWSTR str, WCHAR x )
  *	StrCmpNIW		[NT 4.0:SHELL32.*]
  *
  */
-INT32 WINAPI StrCmpNIW ( LPWSTR wstr1, LPWSTR wstr2, INT32 len)
+INT WINAPI StrCmpNIW ( LPWSTR wstr1, LPWSTR wstr2, INT len)
 {	FIXME( shell,"%s %s %i stub\n", debugstr_w(wstr1),debugstr_w(wstr2),len);
 	return 0;
 }
@@ -942,22 +942,22 @@ INT32 WINAPI StrCmpNIW ( LPWSTR wstr1, LPWSTR wstr2, INT32 len)
  *  WM_USER+2 could be the undocumented CWM_SETPATH
  *  the allocated memory contains a pidl
  */
-HGLOBAL32 WINAPI SHAllocShared(LPVOID psrc, DWORD size, DWORD procID)
-{	HGLOBAL32 hmem;
+HGLOBAL WINAPI SHAllocShared(LPVOID psrc, DWORD size, DWORD procID)
+{	HGLOBAL hmem;
 	LPVOID pmem;
 	
 	TRACE(shell,"ptr=%p size=0x%04lx procID=0x%04lx\n",psrc,size,procID);
-	hmem = GlobalAlloc32(GMEM_FIXED, size);
+	hmem = GlobalAlloc(GMEM_FIXED, size);
 	if (!hmem)
 	  return 0;
 	
-	pmem =  GlobalLock32 (hmem);
+	pmem =  GlobalLock (hmem);
 
 	if (! pmem)
 	  return 0;
 	  
 	memcpy (pmem, psrc, size);
-	GlobalUnlock32(hmem); 
+	GlobalUnlock(hmem); 
 	return hmem;
 }
 /*************************************************************************
@@ -969,9 +969,9 @@ HGLOBAL32 WINAPI SHAllocShared(LPVOID psrc, DWORD size, DWORD procID)
  *  the receiver of (WM_USER+2) trys to lock the HANDLE (?) 
  *  the returnvalue seems to be a memoryadress
  */
-LPVOID WINAPI SHLockShared(HANDLE32 hmem, DWORD procID)
+LPVOID WINAPI SHLockShared(HANDLE hmem, DWORD procID)
 {	TRACE(shell,"handle=0x%04x procID=0x%04lx\n",hmem,procID);
-	return GlobalLock32(hmem);
+	return GlobalLock(hmem);
 }
 /*************************************************************************
  * SHUnlockShared [SHELL32.522]
@@ -979,9 +979,9 @@ LPVOID WINAPI SHLockShared(HANDLE32 hmem, DWORD procID)
  * NOTES
  *  parameter1 is return value from SHLockShared
  */
-BOOL32 WINAPI SHUnlockShared(HANDLE32 pmem)
+BOOL WINAPI SHUnlockShared(HANDLE pmem)
 {	TRACE(shell,"handle=0x%04x\n",pmem);
-	return GlobalUnlock32(pmem); 
+	return GlobalUnlock(pmem); 
 }
 /*************************************************************************
  * SHFreeShared [SHELL32.523]
@@ -990,16 +990,16 @@ BOOL32 WINAPI SHUnlockShared(HANDLE32 pmem)
  *  parameter1 is return value from SHAllocShared
  *  parameter2 is return value from GetCurrentProcessId
  */
-HANDLE32 WINAPI SHFreeShared(HANDLE32 hmem, DWORD procID)
+HANDLE WINAPI SHFreeShared(HANDLE hmem, DWORD procID)
 {	TRACE(shell,"handle=0x%04x 0x%04lx\n",hmem,procID);
-	return GlobalFree32(hmem);
+	return GlobalFree(hmem);
 }
 
 /*************************************************************************
  * SetAppStartingCursor32 [SHELL32.99]
  *
  */
-HRESULT WINAPI SetAppStartingCursor32(HWND32 u, DWORD v)
+HRESULT WINAPI SetAppStartingCursor(HWND u, DWORD v)
 {	FIXME(shell,"hwnd=0x%04x 0x%04lx stub\n",u,v );
 	return 0;
 }
@@ -1007,7 +1007,7 @@ HRESULT WINAPI SetAppStartingCursor32(HWND32 u, DWORD v)
  * SHLoadOLE32 [SHELL32.151]
  *
  */
-HRESULT WINAPI SHLoadOLE32(DWORD u)
+HRESULT WINAPI SHLoadOLE(DWORD u)
 {	FIXME(shell,"0x%04lx stub\n",u);
 	return S_OK;
 }
@@ -1015,14 +1015,14 @@ HRESULT WINAPI SHLoadOLE32(DWORD u)
  * Shell_MergeMenus32 [SHELL32.67]
  *
  */
-BOOL32 _SHIsMenuSeparator(HMENU32 hm, int i)
+BOOL _SHIsMenuSeparator(HMENU hm, int i)
 {
-	MENUITEMINFO32A mii;
+	MENUITEMINFOA mii;
 
-	mii.cbSize = sizeof(MENUITEMINFO32A);
+	mii.cbSize = sizeof(MENUITEMINFOA);
 	mii.fMask = MIIM_TYPE;
 	mii.cch = 0;    /* WARNING: We MUST initialize it to 0*/
-	if (!GetMenuItemInfo32A(hm, i, TRUE, &mii))
+	if (!GetMenuItemInfoA(hm, i, TRUE, &mii))
 	{ return(FALSE);
 	}
 
@@ -1034,13 +1034,13 @@ BOOL32 _SHIsMenuSeparator(HMENU32 hm, int i)
 }
 #define MM_ADDSEPARATOR         0x00000001L
 #define MM_SUBMENUSHAVEIDS      0x00000002L
-HRESULT WINAPI Shell_MergeMenus32 (HMENU32 hmDst, HMENU32 hmSrc, UINT32 uInsert, UINT32 uIDAdjust, UINT32 uIDAdjustMax, ULONG uFlags)
+HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags)
 {	int		nItem;
-	HMENU32		hmSubMenu;
-	BOOL32		bAlreadySeparated;
-	MENUITEMINFO32A miiSrc;
+	HMENU		hmSubMenu;
+	BOOL		bAlreadySeparated;
+	MENUITEMINFOA miiSrc;
 	char		szName[256];
-	UINT32		uTemp, uIDMax = uIDAdjust;
+	UINT		uTemp, uIDMax = uIDAdjust;
 
 	FIXME(shell,"hmenu1=0x%04x hmenu2=0x%04x 0x%04x 0x%04x 0x%04x  0x%04lx stub\n",
 		 hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags);
@@ -1049,9 +1049,9 @@ HRESULT WINAPI Shell_MergeMenus32 (HMENU32 hmDst, HMENU32 hmSrc, UINT32 uInsert,
 	{ return uIDMax;
 	}
 
-	nItem = GetMenuItemCount32(hmDst);
-	if (uInsert >= (UINT32)nItem)
-	{ uInsert = (UINT32)nItem;
+	nItem = GetMenuItemCount(hmDst);
+	if (uInsert >= (UINT)nItem)
+	{ uInsert = (UINT)nItem;
 	  bAlreadySeparated = TRUE;
 	}
 	else
@@ -1059,14 +1059,14 @@ HRESULT WINAPI Shell_MergeMenus32 (HMENU32 hmDst, HMENU32 hmSrc, UINT32 uInsert,
 	}
 	if ((uFlags & MM_ADDSEPARATOR) && !bAlreadySeparated)
 	{ /* Add a separator between the menus */
-	  InsertMenu32A(hmDst, uInsert, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+	  InsertMenuA(hmDst, uInsert, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
 	  bAlreadySeparated = TRUE;
         }
 
 
         /* Go through the menu items and clone them*/
-        for (nItem = GetMenuItemCount32(hmSrc) - 1; nItem >= 0; nItem--)
-        { miiSrc.cbSize = sizeof(MENUITEMINFO32A);
+        for (nItem = GetMenuItemCount(hmSrc) - 1; nItem >= 0; nItem--)
+        { miiSrc.cbSize = sizeof(MENUITEMINFOA);
 	  miiSrc.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_TYPE | MIIM_DATA;
 	  /* We need to reset this every time through the loop in case
 	  menus DON'T have IDs*/
@@ -1075,7 +1075,7 @@ HRESULT WINAPI Shell_MergeMenus32 (HMENU32 hmDst, HMENU32 hmSrc, UINT32 uInsert,
 	  miiSrc.dwItemData = 0;
 	  miiSrc.cch = sizeof(szName);
 
-	  if (!GetMenuItemInfo32A(hmSrc, nItem, TRUE, &miiSrc))
+	  if (!GetMenuItemInfoA(hmSrc, nItem, TRUE, &miiSrc))
 	  { continue;
 	  }
 	  if (miiSrc.fType & MFT_SEPARATOR)
@@ -1101,11 +1101,11 @@ HRESULT WINAPI Shell_MergeMenus32 (HMENU32 hmDst, HMENU32 hmSrc, UINT32 uInsert,
 	      miiSrc.fMask &= ~MIIM_ID;
 	    }
 	    hmSubMenu = miiSrc.hSubMenu;
-	    miiSrc.hSubMenu = CreatePopupMenu32();
+	    miiSrc.hSubMenu = CreatePopupMenu();
 	    if (!miiSrc.hSubMenu)
 	    { return(uIDMax);
 	    }
-	    uTemp = Shell_MergeMenus32(miiSrc.hSubMenu, hmSubMenu, 0, uIDAdjust, uIDAdjustMax, uFlags&MM_SUBMENUSHAVEIDS);
+	    uTemp = Shell_MergeMenus(miiSrc.hSubMenu, hmSubMenu, 0, uIDAdjust, uIDAdjustMax, uFlags&MM_SUBMENUSHAVEIDS);
 	    if (uIDMax <= uTemp)
 	    { uIDMax = uTemp;
 	    }
@@ -1122,7 +1122,7 @@ HRESULT WINAPI Shell_MergeMenus32 (HMENU32 hmDst, HMENU32 hmSrc, UINT32 uInsert,
 	    }
 	    bAlreadySeparated = FALSE;
 	  }
-	  if (!InsertMenuItem32A(hmDst, uInsert, TRUE, &miiSrc))
+	  if (!InsertMenuItemA(hmDst, uInsert, TRUE, &miiSrc))
 	  { return(uIDMax);
 	  }
 	}
@@ -1131,19 +1131,19 @@ HRESULT WINAPI Shell_MergeMenus32 (HMENU32 hmDst, HMENU32 hmSrc, UINT32 uInsert,
         inserted menu items*/
         if (uInsert == 0)
         { if (bAlreadySeparated)
-	  { DeleteMenu32(hmDst, uInsert, MF_BYPOSITION);
+	  { DeleteMenu(hmDst, uInsert, MF_BYPOSITION);
 	  }
 	}
 	else
 	{ if (_SHIsMenuSeparator(hmDst, uInsert-1))
 	  { if (bAlreadySeparated)
-	    { DeleteMenu32(hmDst, uInsert, MF_BYPOSITION);
+	    { DeleteMenu(hmDst, uInsert, MF_BYPOSITION);
 	    }
 	  }
 	  else
 	  { if ((uFlags & MM_ADDSEPARATOR) && !bAlreadySeparated)
 	    { /* Add a separator between the menus*/
-	      InsertMenu32A(hmDst, uInsert, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+	      InsertMenuA(hmDst, uInsert, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
 	    }
 	  }
 	}
@@ -1154,7 +1154,7 @@ HRESULT WINAPI Shell_MergeMenus32 (HMENU32 hmDst, HMENU32 hmSrc, UINT32 uInsert,
  * DriveType32 [SHELL32.64]
  *
  */
-HRESULT WINAPI DriveType32(DWORD u)
+HRESULT WINAPI DriveType(DWORD u)
 {	FIXME(shell,"0x%04lx stub\n",u);
 	return 0;
 }
@@ -1207,7 +1207,7 @@ LPWSTR WINAPI StrRChrW(LPWSTR lpStart, LPWSTR lpEnd, DWORD wMatch)
 /*************************************************************************
 *	StrFormatByteSize	[SHLWAPI]
 */
-LPSTR WINAPI StrFormatByteSize32A ( DWORD dw, LPSTR pszBuf, UINT32 cchBuf )
+LPSTR WINAPI StrFormatByteSizeA ( DWORD dw, LPSTR pszBuf, UINT cchBuf )
 {	char buf[64];
 	TRACE(shell,"%lx %p %i\n", dw, pszBuf, cchBuf);
 	if ( dw<1024L )
@@ -1225,7 +1225,7 @@ LPSTR WINAPI StrFormatByteSize32A ( DWORD dw, LPSTR pszBuf, UINT32 cchBuf )
 	strncpy (pszBuf, buf, cchBuf);
 	return pszBuf;	
 }
-LPWSTR WINAPI StrFormatByteSize32W ( DWORD dw, LPWSTR pszBuf, UINT32 cchBuf )
+LPWSTR WINAPI StrFormatByteSizeW ( DWORD dw, LPWSTR pszBuf, UINT cchBuf )
 {	char buf[64];
 	TRACE(shell,"%lx %p %i\n", dw, pszBuf, cchBuf);
 	if ( dw<1024L )
@@ -1255,7 +1255,7 @@ HRESULT WINAPI SHWaitForFileToOpen(DWORD u, DWORD v, DWORD w)
  * Control_FillCache_RunDLL [SHELL32.8]
  *
  */
-HRESULT WINAPI Control_FillCache_RunDLL(HWND32 hWnd, HANDLE32 hModule, DWORD w, DWORD x)
+HRESULT WINAPI Control_FillCache_RunDLL(HWND hWnd, HANDLE hModule, DWORD w, DWORD x)
 {	FIXME(shell,"0x%04x 0x%04x 0x%04lx 0x%04lx stub\n",hWnd, hModule,w,x);
 	return 0;
 }
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 8503657b27b..aebb7575198 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -16,7 +16,7 @@
 /*************************************************************************
  * PathIsRoot [SHELL32.29]
  */
-BOOL32 WINAPI PathIsRoot32A(LPCSTR x)
+BOOL WINAPI PathIsRootA(LPCSTR x)
 {	TRACE(shell,"%s\n",x);
 	if (*(x+1)==':' && *(x+2)=='\\')		/* "X:\" */
 	  return 1;
@@ -34,7 +34,7 @@ BOOL32 WINAPI PathIsRoot32A(LPCSTR x)
 	}
 	return 0;
 }
-BOOL32 WINAPI PathIsRoot32W(LPCWSTR x) 
+BOOL WINAPI PathIsRootW(LPCWSTR x) 
 {	TRACE(shell,"%s\n",debugstr_w(x));
 	if (*(x+1)==':' && *(x+2)=='\\')		/* "X:\" */
 	  return 1;
@@ -52,16 +52,16 @@ BOOL32 WINAPI PathIsRoot32W(LPCWSTR x)
 	}
 	return 0;
 }
-BOOL32 WINAPI PathIsRoot32AW(LPCVOID x) 
+BOOL WINAPI PathIsRootAW(LPCVOID x) 
 {	if (VERSION_OsIsUnicode())
-	  return PathIsRoot32W(x);
-	return PathIsRoot32A(x);
+	  return PathIsRootW(x);
+	return PathIsRootA(x);
 
 }
 /*************************************************************************
  * PathBuildRoot [SHELL32.30]
  */
-LPSTR WINAPI PathBuildRoot32A(LPSTR root,BYTE drive) {
+LPSTR WINAPI PathBuildRootA(LPSTR root,BYTE drive) {
   TRACE(shell,"%p %i\n",root, drive);
 	strcpy(root,"A:\\");
 	root[0]+=drive;
@@ -74,7 +74,7 @@ LPSTR WINAPI PathBuildRoot32A(LPSTR root,BYTE drive) {
  * NOTES
  *     returns pointer to last . in last pathcomponent or at \0.
  */
-LPCSTR WINAPI PathFindExtension32A(LPCSTR path) 
+LPCSTR WINAPI PathFindExtensionA(LPCSTR path) 
 {	LPCSTR   lastpoint = NULL;
 	TRACE(shell,"%p %s\n",path,path);
 	while (*path) 
@@ -86,7 +86,7 @@ LPCSTR WINAPI PathFindExtension32A(LPCSTR path)
 	}
 	return lastpoint?lastpoint:path;
 }
-LPCWSTR WINAPI PathFindExtension32W(LPCWSTR path) 
+LPCWSTR WINAPI PathFindExtensionW(LPCWSTR path) 
 {	LPCWSTR   lastpoint = NULL;
 	TRACE(shell,"%p L%s\n",path,debugstr_w(path));
 	while (*path)
@@ -98,10 +98,10 @@ LPCWSTR WINAPI PathFindExtension32W(LPCWSTR path)
 	}
 	return lastpoint?lastpoint:path;
 }
-LPCVOID WINAPI PathFindExtension32AW(LPCVOID path) 
+LPCVOID WINAPI PathFindExtensionAW(LPCVOID path) 
 {	if (VERSION_OsIsUnicode())
-	  return PathFindExtension32W(path);
-	return PathFindExtension32A(path);
+	  return PathFindExtensionW(path);
+	return PathFindExtensionA(path);
 
 }
 
@@ -111,7 +111,7 @@ LPCVOID WINAPI PathFindExtension32AW(LPCVOID path)
  * NOTES
  *     append \ if there is none
  */
-LPSTR WINAPI PathAddBackslash32A(LPSTR path)
+LPSTR WINAPI PathAddBackslashA(LPSTR path)
 {	int len;
 	TRACE(shell,"%p->%s\n",path,path);
 
@@ -123,11 +123,11 @@ LPSTR WINAPI PathAddBackslash32A(LPSTR path)
 	}
 	return path+len;
 }
-LPWSTR WINAPI PathAddBackslash32W(LPWSTR path)
+LPWSTR WINAPI PathAddBackslashW(LPWSTR path)
 {	int len;
 	TRACE(shell,"%p->%s\n",path,debugstr_w(path));
 
-	len = lstrlen32W(path);
+	len = lstrlenW(path);
 	if (len && path[len-1]!=(WCHAR)'\\') 
 	{ path[len]  = (WCHAR)'\\';
 	  path[len+1]= 0x00;
@@ -135,10 +135,10 @@ LPWSTR WINAPI PathAddBackslash32W(LPWSTR path)
 	}
 	return path+len;
 }
-LPVOID WINAPI PathAddBackslash32AW(LPVOID path)
+LPVOID WINAPI PathAddBackslashAW(LPVOID path)
 {	if(VERSION_OsIsUnicode())
-	  return PathAddBackslash32W(path);
-	return PathAddBackslash32A(path);
+	  return PathAddBackslashW(path);
+	return PathAddBackslashA(path);
 }
 
 /*************************************************************************
@@ -147,7 +147,7 @@ LPVOID WINAPI PathAddBackslash32AW(LPVOID path)
  * NOTES
  *     remove spaces from beginning and end of passed string
  */
-LPSTR WINAPI PathRemoveBlanks32A(LPSTR str)
+LPSTR WINAPI PathRemoveBlanksA(LPSTR str)
 {	LPSTR x = str;
 	TRACE(shell,"%s\n",str);
 	while (*x==' ') x++;
@@ -162,25 +162,25 @@ LPSTR WINAPI PathRemoveBlanks32A(LPSTR str)
 	  *x='\0';
 	return x;
 }
-LPWSTR WINAPI PathRemoveBlanks32W(LPWSTR str)
+LPWSTR WINAPI PathRemoveBlanksW(LPWSTR str)
 {	LPWSTR x = str;
 	TRACE(shell,"%s\n",debugstr_w(str));
 	while (*x==' ') x++;
 	if (x!=str)
-	  lstrcpy32W(str,x);
+	  lstrcpyW(str,x);
 	if (!*str)
 	  return str;
-	x=str+lstrlen32W(str)-1;
+	x=str+lstrlenW(str)-1;
 	while (*x==' ')
 	  x--;
 	if (*x==' ')
 	  *x='\0';
 	return x;
 }
-LPVOID WINAPI PathRemoveBlanks32AW(LPVOID str)
+LPVOID WINAPI PathRemoveBlanksAW(LPVOID str)
 {	if(VERSION_OsIsUnicode())
-	  return PathRemoveBlanks32W(str);
-	return PathRemoveBlanks32A(str);
+	  return PathRemoveBlanksW(str);
+	return PathRemoveBlanksA(str);
 }
 
 
@@ -191,7 +191,7 @@ LPVOID WINAPI PathRemoveBlanks32AW(LPVOID str)
  * NOTES
  *     basename(char *fn);
  */
-LPCSTR WINAPI PathFindFilename32A(LPCSTR aptr)
+LPCSTR WINAPI PathFindFilenameA(LPCSTR aptr)
 {	LPCSTR aslash;
 	aslash = aptr;
 
@@ -204,7 +204,7 @@ LPCSTR WINAPI PathFindFilename32A(LPCSTR aptr)
 	return aslash;
 
 }
-LPCWSTR WINAPI PathFindFilename32W(LPCWSTR wptr)
+LPCWSTR WINAPI PathFindFilenameW(LPCWSTR wptr)
 {	LPCWSTR wslash;
 	wslash = wptr;
 
@@ -216,11 +216,11 @@ LPCWSTR WINAPI PathFindFilename32W(LPCWSTR wptr)
 	}
 	return wslash;	
 }
-LPCVOID WINAPI PathFindFilename32AW(LPCVOID fn)
+LPCVOID WINAPI PathFindFilenameAW(LPCVOID fn)
 {
 	if(VERSION_OsIsUnicode())
-	  return PathFindFilename32W(fn);
-	return PathFindFilename32A(fn);
+	  return PathFindFilenameW(fn);
+	return PathFindFilenameA(fn);
 }
 
 /*************************************************************************
@@ -233,7 +233,7 @@ LPCVOID WINAPI PathFindFilename32AW(LPCVOID fn)
  *     "\" -> "\"
  *     "a:\foo"	-> "a:\"
  */
-DWORD WINAPI PathRemoveFileSpec32A(LPSTR fn) {
+DWORD WINAPI PathRemoveFileSpecA(LPSTR fn) {
 	LPSTR	x,cutplace;
   TRACE(shell,"%s\n",fn);
 	if (!fn[0])
@@ -274,10 +274,10 @@ DWORD WINAPI PathRemoveFileSpec32A(LPSTR fn) {
  *     concat_paths(char*target,const char*add);
  *     concats "target\\add" and writes them to target
  */
-LPSTR WINAPI PathAppend32A(LPSTR x1,LPSTR x2) {
+LPSTR WINAPI PathAppendA(LPSTR x1,LPSTR x2) {
   TRACE(shell,"%s %s\n",x1,x2);
   while (x2[0]=='\\') x2++;
-  return PathCombine32A(x1,x1,x2);
+  return PathCombineA(x1,x1,x2);
 }
 
 /*************************************************************************
@@ -287,7 +287,7 @@ LPSTR WINAPI PathAppend32A(LPSTR x1,LPSTR x2) {
  *  if lpszFile='.' skip it
  *  szDest can be equal to lpszFile. Thats why we use sTemp
  */
-LPSTR WINAPI PathCombine32A(LPSTR szDest, LPCSTR lpszDir, LPCSTR lpszFile) 
+LPSTR WINAPI PathCombineA(LPSTR szDest, LPCSTR lpszDir, LPCSTR lpszFile) 
 {	char sTemp[MAX_PATH];
 	TRACE(shell,"%p %p->%s %p->%s\n",szDest, lpszDir, lpszDir, lpszFile, lpszFile);
 	
@@ -298,44 +298,44 @@ LPSTR WINAPI PathCombine32A(LPSTR szDest, LPCSTR lpszDir, LPCSTR lpszFile)
 	}
 
 	/*  if lpszFile is a complete path don't care about lpszDir */
-	if (PathIsRoot32A(lpszFile))
+	if (PathIsRootA(lpszFile))
 	{ strcpy(szDest,lpszFile);
 	}
 	else
 	{ strcpy(sTemp,lpszDir);
-	  PathAddBackslash32A(sTemp);
+	  PathAddBackslashA(sTemp);
 	  strcat(sTemp,lpszFile);
 	  strcpy(szDest,sTemp);
 	}
 	return szDest;
 }
-LPWSTR WINAPI PathCombine32W(LPWSTR szDest, LPCWSTR lpszDir, LPCWSTR lpszFile) 
+LPWSTR WINAPI PathCombineW(LPWSTR szDest, LPCWSTR lpszDir, LPCWSTR lpszFile) 
 {	WCHAR sTemp[MAX_PATH];
 	TRACE(shell,"%p %p->%s %p->%s\n",szDest, lpszDir, debugstr_w(lpszDir),
 			 lpszFile, debugstr_w(lpszFile));
 	
 	
 	if (!lpszFile || !lpszFile[0] || (lpszFile[0]==(WCHAR)'.' && !lpszFile[1]) ) 
-	{ lstrcpy32W(szDest,lpszDir);
+	{ lstrcpyW(szDest,lpszDir);
 	  return szDest;
 	}
 
 	/*  if lpszFile is a complete path don't care about lpszDir */
-	if (PathIsRoot32W(lpszFile))
-	{ lstrcpy32W(szDest,lpszFile);
+	if (PathIsRootW(lpszFile))
+	{ lstrcpyW(szDest,lpszFile);
 	}
 	else
-	{ lstrcpy32W(sTemp,lpszDir);
-	  PathAddBackslash32W(sTemp);
-	  lstrcat32W(sTemp,lpszFile);
-	  lstrcpy32W(szDest,sTemp);
+	{ lstrcpyW(sTemp,lpszDir);
+	  PathAddBackslashW(sTemp);
+	  lstrcatW(sTemp,lpszFile);
+	  lstrcpyW(szDest,sTemp);
 	}
 	return szDest;
 }
-LPVOID WINAPI PathCombine32AW(LPVOID szDest, LPCVOID lpszDir, LPCVOID lpszFile) 
+LPVOID WINAPI PathCombineAW(LPVOID szDest, LPCVOID lpszDir, LPCVOID lpszFile) 
 {	if (VERSION_OsIsUnicode())
-	  return PathCombine32W( szDest, lpszDir, lpszFile );
-	return PathCombine32A( szDest, lpszDir, lpszFile );
+	  return PathCombineW( szDest, lpszDir, lpszFile );
+	return PathCombineA( szDest, lpszDir, lpszFile );
 }
 
 /*************************************************************************
@@ -344,64 +344,64 @@ LPVOID WINAPI PathCombine32AW(LPVOID szDest, LPCVOID lpszDir, LPCVOID lpszFile)
  * NOTES
  *     PathIsUNC(char*path);
  */
-BOOL32 WINAPI PathIsUNC32A(LPCSTR path) 
+BOOL WINAPI PathIsUNCA(LPCSTR path) 
 {	TRACE(shell,"%s\n",path);
 
 	if ((path[0]=='\\') && (path[1]=='\\'))
 	  return TRUE;
 	return FALSE;
 }
-BOOL32 WINAPI PathIsUNC32W(LPCWSTR path) 
+BOOL WINAPI PathIsUNCW(LPCWSTR path) 
 {	TRACE(shell,"%s\n",debugstr_w(path));
 
 	if ((path[0]=='\\') && (path[1]=='\\'))
 	  return TRUE;
 	return FALSE;
 }
-BOOL32 WINAPI PathIsUNC32AW (LPCVOID path)
+BOOL WINAPI PathIsUNCAW (LPCVOID path)
 {	if (VERSION_OsIsUnicode())
-	  return PathIsUNC32W( path );
-	return PathIsUNC32A( path );  
+	  return PathIsUNCW( path );
+	return PathIsUNCA( path );  
 }
 /*************************************************************************
  *  PathIsRelativ [SHELL32.40]
  * 
  */
-BOOL32 WINAPI PathIsRelative32A (LPCSTR path)
+BOOL WINAPI PathIsRelativeA (LPCSTR path)
 {	TRACE(shell,"path=%s\n",path);
 
 	if (path && (path[0]!='\\' && path[1]==':'))
 	  return TRUE;
 	return FALSE;    
 }
-BOOL32 WINAPI PathIsRelative32W (LPCWSTR path)
+BOOL WINAPI PathIsRelativeW (LPCWSTR path)
 {	TRACE(shell,"path=%s\n",debugstr_w(path));
 
 	if (path && (path[0]!='\\' && path[1]==':'))
 	  return TRUE;
 	return FALSE;    
 }
-BOOL32 WINAPI PathIsRelative32AW (LPCVOID path)
+BOOL WINAPI PathIsRelativeAW (LPCVOID path)
 {	if (VERSION_OsIsUnicode())
-	  return PathIsRelative32W( path );
-	return PathIsRelative32A( path );  
+	  return PathIsRelativeW( path );
+	return PathIsRelativeA( path );  
 }
 /*************************************************************************
  *  PathIsExe [SHELL32.43]
  * 
  */
-BOOL32 WINAPI PathIsExe32A (LPCSTR path)
+BOOL WINAPI PathIsExeA (LPCSTR path)
 {	FIXME(shell,"path=%s\n",path);
 	return FALSE;
 }
-BOOL32 WINAPI PathIsExe32W (LPCWSTR path)
+BOOL WINAPI PathIsExeW (LPCWSTR path)
 {	FIXME(shell,"path=%s\n",debugstr_w(path));
 	return FALSE;
 }
-BOOL32 WINAPI PathIsExe32AW (LPCVOID path)
+BOOL WINAPI PathIsExeAW (LPCVOID path)
 {	if (VERSION_OsIsUnicode())
-	  return PathIsExe32W (path);
-	return PathIsExe32A(path);
+	  return PathIsExeW (path);
+	return PathIsExeA(path);
 }
 
 /*************************************************************************
@@ -410,9 +410,9 @@ BOOL32 WINAPI PathIsExe32AW (LPCVOID path)
  * NOTES
  *     file_exists(char *fn);
  */
-BOOL32 WINAPI PathFileExists32A(LPSTR fn) {
+BOOL WINAPI PathFileExistsA(LPSTR fn) {
   TRACE(shell,"%s\n",fn);
-   if (GetFileAttributes32A(fn)==-1)
+   if (GetFileAttributesA(fn)==-1)
     	return FALSE;
     else
     	return TRUE;
@@ -424,7 +424,7 @@ BOOL32 WINAPI PathFileExists32A(LPSTR fn) {
  *     used from COMDLG32
  */
 
-BOOL32 WINAPI PathMatchSpec32A(LPCSTR name, LPCSTR mask) 
+BOOL WINAPI PathMatchSpecA(LPCSTR name, LPCSTR mask) 
 {	LPCSTR _name;
 
 	TRACE(shell,"%s %s stub\n",name,mask);
@@ -455,14 +455,14 @@ BOOL32 WINAPI PathMatchSpec32A(LPCSTR name, LPCSTR mask)
 	}
 	return (!*_name && (!*mask || *mask==';'));
 }
-BOOL32 WINAPI PathMatchSpec32W(LPCWSTR name, LPCWSTR mask) 
+BOOL WINAPI PathMatchSpecW(LPCWSTR name, LPCWSTR mask) 
 {	WCHAR stemp[4];
 	LPCWSTR _name;
 	
 	TRACE(shell,"%s %s stub\n",debugstr_w(name),debugstr_w(mask));
 
 	lstrcpyAtoW(stemp,"*.*");	
-	if (!lstrcmp32W( mask, stemp )) return 1;
+	if (!lstrcmpW( mask, stemp )) return 1;
 
 	_name = name;
 	while (*_name && *mask)
@@ -490,10 +490,10 @@ BOOL32 WINAPI PathMatchSpec32W(LPCWSTR name, LPCWSTR mask)
 	}
 	return (!*_name && (!*mask || *mask==';'));
 }
-BOOL32 WINAPI PathMatchSpec32AW(LPVOID name, LPVOID mask) 
+BOOL WINAPI PathMatchSpecAW(LPVOID name, LPVOID mask) 
 {	if (VERSION_OsIsUnicode())
-	  return PathMatchSpec32W( name, mask );
-	return PathMatchSpec32A( name, mask );
+	  return PathMatchSpecW( name, mask );
+	return PathMatchSpecA( name, mask );
 }
 /*************************************************************************
  * PathSetDlgItemPath32AW [SHELL32.48]
@@ -501,36 +501,36 @@ BOOL32 WINAPI PathMatchSpec32AW(LPVOID name, LPVOID mask)
  *  use PathCompactPath to make sure, the path fits into the control
  */
 
-BOOL32 WINAPI PathSetDlgItemPath32A(HWND32 hDlg, int id, LPCSTR pszPath) 
+BOOL WINAPI PathSetDlgItemPathA(HWND hDlg, int id, LPCSTR pszPath) 
 {	TRACE(shell,"%x %x %s\n",hDlg, id, pszPath);
-	return SetDlgItemText32A(hDlg, id, pszPath);
+	return SetDlgItemTextA(hDlg, id, pszPath);
 }
-BOOL32 WINAPI PathSetDlgItemPath32W(HWND32 hDlg, int id, LPCWSTR pszPath) 
+BOOL WINAPI PathSetDlgItemPathW(HWND hDlg, int id, LPCWSTR pszPath) 
 {	TRACE(shell,"%x %x %s\n",hDlg, id, debugstr_w(pszPath));
-	return SetDlgItemText32W(hDlg, id, pszPath);
+	return SetDlgItemTextW(hDlg, id, pszPath);
 }
-BOOL32 WINAPI PathSetDlgItemPath32AW(HWND32 hDlg, int id, LPCVOID pszPath) 
+BOOL WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath) 
 {	if (VERSION_OsIsUnicode())
-	  return PathSetDlgItemPath32W(hDlg, id, pszPath);
-	return PathSetDlgItemPath32A(hDlg, id, pszPath);
+	  return PathSetDlgItemPathW(hDlg, id, pszPath);
+	return PathSetDlgItemPathA(hDlg, id, pszPath);
 }
 
 /*************************************************************************
  * PathQualify32AW [SHELL32.49]
  */
 
-BOOL32 WINAPI PathQualify32A(LPCSTR pszPath) 
+BOOL WINAPI PathQualifyA(LPCSTR pszPath) 
 {	TRACE(shell,"%s\n",pszPath);
 	return 0;
 }
-BOOL32 WINAPI PathQualify32W(LPCWSTR pszPath) 
+BOOL WINAPI PathQualifyW(LPCWSTR pszPath) 
 {	TRACE(shell,"%s\n",debugstr_w(pszPath));
 	return 0;
 }
-BOOL32 WINAPI PathQualify32AW(LPCVOID pszPath) 
+BOOL WINAPI PathQualifyAW(LPCVOID pszPath) 
 {	if (VERSION_OsIsUnicode())
-	  return PathQualify32W(pszPath);
-	return PathQualify32A(pszPath);
+	  return PathQualifyW(pszPath);
+	return PathQualifyA(pszPath);
 }
 
 /*************************************************************************
@@ -548,8 +548,8 @@ DWORD WINAPI PathResolve(LPCSTR s,DWORD x2,DWORD x3) {
  *     look for next arg in string. handle "quoted" strings
  *     returns pointer to argument *AFTER* the space. Or to the \0.
  */
-LPCSTR WINAPI PathGetArgs32A(LPCSTR cmdline) 
-{	BOOL32	qflag = FALSE;
+LPCSTR WINAPI PathGetArgsA(LPCSTR cmdline) 
+{	BOOL	qflag = FALSE;
 
 	TRACE(shell,"%s\n",cmdline);
 
@@ -563,8 +563,8 @@ LPCSTR WINAPI PathGetArgs32A(LPCSTR cmdline)
 	return cmdline;
 
 }
-LPCWSTR WINAPI PathGetArgs32W(LPCWSTR cmdline) 
-{	BOOL32	qflag = FALSE;
+LPCWSTR WINAPI PathGetArgsW(LPCWSTR cmdline) 
+{	BOOL	qflag = FALSE;
 
 	TRACE(shell,"%sL\n",debugstr_w(cmdline));
 
@@ -577,10 +577,10 @@ LPCWSTR WINAPI PathGetArgs32W(LPCWSTR cmdline)
 	}
 	return cmdline;
 }
-LPCVOID WINAPI PathGetArgs32AW(LPVOID cmdline) 
+LPCVOID WINAPI PathGetArgsAW(LPVOID cmdline) 
 {	if (VERSION_OsIsUnicode())
-	  return PathGetArgs32W(cmdline);
-	return PathGetArgs32A(cmdline);
+	  return PathGetArgsW(cmdline);
+	return PathGetArgsA(cmdline);
 }
 /*************************************************************************
  * PathQuoteSpaces [SHELL32.55]
@@ -588,19 +588,19 @@ LPCVOID WINAPI PathGetArgs32AW(LPVOID cmdline)
  * NOTES
  *     basename(char *fn);
  */
-LPSTR WINAPI PathQuoteSpaces32A(LPCSTR aptr)
+LPSTR WINAPI PathQuoteSpacesA(LPCSTR aptr)
 {	FIXME(shell,"%s\n",aptr);
 	return 0;
 
 }
-LPWSTR WINAPI PathQuoteSpaces32W(LPCWSTR wptr)
+LPWSTR WINAPI PathQuoteSpacesW(LPCWSTR wptr)
 {	FIXME(shell,"L%s\n",debugstr_w(wptr));
 	return 0;	
 }
-LPVOID WINAPI PathQuoteSpaces32AW (LPCVOID fn)
+LPVOID WINAPI PathQuoteSpacesAW (LPCVOID fn)
 {	if(VERSION_OsIsUnicode())
-	  return PathQuoteSpaces32W(fn);
-	return PathQuoteSpaces32A(fn);
+	  return PathQuoteSpacesW(fn);
+	return PathQuoteSpacesA(fn);
 }
 
 
@@ -610,19 +610,19 @@ LPVOID WINAPI PathQuoteSpaces32AW (LPCVOID fn)
  * NOTES
  *     unquote string (remove ")
  */
-VOID WINAPI PathUnquoteSpaces32A(LPSTR str) 
-{	DWORD      len = lstrlen32A(str);
+VOID WINAPI PathUnquoteSpacesA(LPSTR str) 
+{	DWORD      len = lstrlenA(str);
 	TRACE(shell,"%s\n",str);
 	if (*str!='"')
 	  return;
 	if (str[len-1]!='"')
 	  return;
 	str[len-1]='\0';
-	lstrcpy32A(str,str+1);
+	lstrcpyA(str,str+1);
 	return;
 }
-VOID WINAPI PathUnquoteSpaces32W(LPWSTR str) 
-{	DWORD len = lstrlen32W(str);
+VOID WINAPI PathUnquoteSpacesW(LPWSTR str) 
+{	DWORD len = lstrlenW(str);
 
 	TRACE(shell,"%s\n",debugstr_w(str));
 
@@ -631,13 +631,13 @@ VOID WINAPI PathUnquoteSpaces32W(LPWSTR str)
 	if (str[len-1]!='"')
 	  return;
 	str[len-1]='\0';
-	lstrcpy32W(str,str+1);
+	lstrcpyW(str,str+1);
 	return;
 }
-VOID WINAPI PathUnquoteSpaces32AW(LPVOID str) 
+VOID WINAPI PathUnquoteSpacesAW(LPVOID str) 
 {	if(VERSION_OsIsUnicode())
-	  PathUnquoteSpaces32W(str);
-	PathUnquoteSpaces32A(str);
+	  PathUnquoteSpacesW(str);
+	PathUnquoteSpacesA(str);
 }
 
 
@@ -645,7 +645,7 @@ VOID WINAPI PathUnquoteSpaces32AW(LPVOID str)
  * PathGetDriveNumber32 [SHELL32.57]
  *
  */
-HRESULT WINAPI PathGetDriveNumber32(LPSTR u)
+HRESULT WINAPI PathGetDriveNumber(LPSTR u)
 {	FIXME(shell,"%s stub\n",debugstr_a(u));
 	return 0;
 }
@@ -656,7 +656,7 @@ HRESULT WINAPI PathGetDriveNumber32(LPSTR u)
  * NOTES
  *     exported by ordinal
  */
-BOOL32 WINAPI PathYetAnotherMakeUniqueName32A(LPDWORD x,LPDWORD y) {
+BOOL WINAPI PathYetAnotherMakeUniqueNameA(LPDWORD x,LPDWORD y) {
     FIXME(shell,"(%p,%p):stub.\n",x,y);
     return TRUE;
 }
@@ -667,28 +667,28 @@ BOOL32 WINAPI PathYetAnotherMakeUniqueName32A(LPDWORD x,LPDWORD y) {
  * NOTES
  *     exported by ordinal Name
  */
-BOOL32 WINAPI IsLFNDrive32A(LPCSTR path) {
+BOOL WINAPI IsLFNDriveA(LPCSTR path) {
     DWORD	fnlen;
 
-    if (!GetVolumeInformation32A(path,NULL,0,NULL,&fnlen,NULL,NULL,0))
+    if (!GetVolumeInformationA(path,NULL,0,NULL,&fnlen,NULL,NULL,0))
 	return FALSE;
     return fnlen>12;
 }
 /*************************************************************************
  * PathFindOnPath [SHELL32.145]
  */
-BOOL32 WINAPI PathFindOnPath32A(LPSTR sFile, LPCSTR sOtherDirs)
+BOOL WINAPI PathFindOnPathA(LPSTR sFile, LPCSTR sOtherDirs)
 {	FIXME(shell,"%s %s\n",sFile, sOtherDirs);
 	return FALSE;
 }
-BOOL32 WINAPI PathFindOnPath32W(LPWSTR sFile, LPCWSTR sOtherDirs)
+BOOL WINAPI PathFindOnPathW(LPWSTR sFile, LPCWSTR sOtherDirs)
 {	FIXME(shell,"%s %s\n",debugstr_w(sFile), debugstr_w(sOtherDirs));
 	return FALSE;
 }
-BOOL32 WINAPI PathFindOnPath32AW(LPVOID sFile, LPCVOID sOtherDirs)
+BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs)
 {	if (VERSION_OsIsUnicode())
-	  return PathFindOnPath32W(sFile, sOtherDirs);
-	return PathFindOnPath32A(sFile, sOtherDirs);
+	  return PathFindOnPathW(sFile, sOtherDirs);
+	return PathFindOnPathA(sFile, sOtherDirs);
 }
 
 /*************************************************************************
@@ -697,27 +697,27 @@ BOOL32 WINAPI PathFindOnPath32AW(LPVOID sFile, LPCVOID sOtherDirs)
  * NOTES
  *     exported by ordinal
  */
-LPCSTR WINAPI PathGetExtension32A(LPCSTR path,DWORD y,DWORD z)
+LPCSTR WINAPI PathGetExtensionA(LPCSTR path,DWORD y,DWORD z)
 {	TRACE(shell,"(%s,%08lx,%08lx)\n",path,y,z);
-	path = PathFindExtension32A(path);
+	path = PathFindExtensionA(path);
 	return *path?(path+1):path;
 }
-LPCWSTR WINAPI PathGetExtension32W(LPCWSTR path,DWORD y,DWORD z)
+LPCWSTR WINAPI PathGetExtensionW(LPCWSTR path,DWORD y,DWORD z)
 {	TRACE(shell,"(L%s,%08lx,%08lx)\n",debugstr_w(path),y,z);
-	path = PathFindExtension32W(path);
+	path = PathFindExtensionW(path);
 	return *path?(path+1):path;
 }
-LPCVOID WINAPI PathGetExtension32AW(LPCVOID path,DWORD y,DWORD z) 
+LPCVOID WINAPI PathGetExtensionAW(LPCVOID path,DWORD y,DWORD z) 
 {	if (VERSION_OsIsUnicode())
-	  return PathGetExtension32W(path,y,z);
-	return PathGetExtension32A(path,y,z);
+	  return PathGetExtensionW(path,y,z);
+	return PathGetExtensionA(path,y,z);
 }
 
 /*************************************************************************
  * SheGetDirW [SHELL32.281]
  *
  */
-HRESULT WINAPI SheGetDir32W(LPWSTR u, LPWSTR v)
+HRESULT WINAPI SheGetDirW(LPWSTR u, LPWSTR v)
 {	FIXME(shell,"%s %s stub\n",debugstr_w(u),debugstr_w(v) );
 	return 0;
 }
@@ -726,7 +726,7 @@ HRESULT WINAPI SheGetDir32W(LPWSTR u, LPWSTR v)
  * SheChangeDirW [SHELL32.274]
  *
  */
-HRESULT WINAPI SheChangeDir32W(LPWSTR u)
+HRESULT WINAPI SheChangeDirW(LPWSTR u)
 {	FIXME(shell,"(%s),stub\n",debugstr_w(u));
 	return 0;
 }
@@ -745,28 +745,28 @@ HRESULT WINAPI PathProcessCommand (DWORD u, DWORD v, DWORD w, DWORD x)
  * converts csidl to path
  * 
  */
-BOOL32 WINAPI SHGetSpecialFolderPath32A (DWORD x1,LPSTR szPath,DWORD csidl,DWORD x4) 
+BOOL WINAPI SHGetSpecialFolderPathA (DWORD x1,LPSTR szPath,DWORD csidl,DWORD x4) 
 {	LPITEMIDLIST pidl;
 
 	WARN(shell,"(0x%04lx,%p,csidl=%lu,0x%04lx) semi-stub\n", x1,szPath,csidl,x4);
 
 	SHGetSpecialFolderLocation(0, csidl, &pidl);
-	SHGetPathFromIDList32A (pidl, szPath);
+	SHGetPathFromIDListA (pidl, szPath);
 	SHFree (pidl);
 	return TRUE;
 }
-BOOL32 WINAPI SHGetSpecialFolderPath32W (DWORD x1,LPWSTR szPath, DWORD csidl,DWORD x4) 
+BOOL WINAPI SHGetSpecialFolderPathW (DWORD x1,LPWSTR szPath, DWORD csidl,DWORD x4) 
 {	LPITEMIDLIST pidl;
 
 	WARN(shell,"(0x%04lx,%p,csidl=%lu,0x%04lx) semi-stub\n", x1,szPath,csidl,x4);
 
 	SHGetSpecialFolderLocation(0, csidl, &pidl);
-	SHGetPathFromIDList32W (pidl, szPath);
+	SHGetPathFromIDListW (pidl, szPath);
 	SHFree (pidl);
 	return TRUE;
 }
-BOOL32 WINAPI SHGetSpecialFolderPath32 (DWORD x1,LPVOID szPath,DWORD csidl,DWORD x4) 
+BOOL WINAPI SHGetSpecialFolderPath (DWORD x1,LPVOID szPath,DWORD csidl,DWORD x4) 
 {	if (VERSION_OsIsUnicode())
-	  return SHGetSpecialFolderPath32W ( x1, szPath, csidl, x4);
-	return SHGetSpecialFolderPath32A ( x1, szPath, csidl, x4);
+	  return SHGetSpecialFolderPathW ( x1, szPath, csidl, x4);
+	return SHGetSpecialFolderPathA ( x1, szPath, csidl, x4);
 }
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 7b7b47293ea..fd9d6bd60ed 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -26,17 +26,17 @@ static HRESULT WINAPI IShellFolder_QueryInterface(LPSHELLFOLDER,REFIID,LPVOID*);
 static ULONG WINAPI IShellFolder_AddRef(LPSHELLFOLDER);
 static ULONG WINAPI IShellFolder_Release(LPSHELLFOLDER);
 static HRESULT WINAPI IShellFolder_Initialize(LPSHELLFOLDER,LPCITEMIDLIST);
-static HRESULT WINAPI IShellFolder_ParseDisplayName(LPSHELLFOLDER,HWND32,LPBC,LPOLESTR32,DWORD*,LPITEMIDLIST*,DWORD*);
-static HRESULT WINAPI IShellFolder_EnumObjects(LPSHELLFOLDER,HWND32,DWORD,LPENUMIDLIST*);
+static HRESULT WINAPI IShellFolder_ParseDisplayName(LPSHELLFOLDER,HWND,LPBC,LPOLESTR,DWORD*,LPITEMIDLIST*,DWORD*);
+static HRESULT WINAPI IShellFolder_EnumObjects(LPSHELLFOLDER,HWND,DWORD,LPENUMIDLIST*);
 static HRESULT WINAPI IShellFolder_BindToObject(LPSHELLFOLDER,LPCITEMIDLIST,LPBC,REFIID,LPVOID*);
 static HRESULT WINAPI IShellFolder_BindToStorage(LPSHELLFOLDER,LPCITEMIDLIST,LPBC,REFIID,LPVOID*);
 static HRESULT WINAPI IShellFolder_CompareIDs(LPSHELLFOLDER,LPARAM,LPCITEMIDLIST,LPCITEMIDLIST);
-static HRESULT WINAPI IShellFolder_CreateViewObject(LPSHELLFOLDER,HWND32,REFIID,LPVOID*);
-static HRESULT WINAPI IShellFolder_GetAttributesOf(LPSHELLFOLDER,UINT32,LPCITEMIDLIST*,DWORD*);
-static HRESULT WINAPI IShellFolder_GetUIObjectOf(LPSHELLFOLDER,HWND32,UINT32,LPCITEMIDLIST*,REFIID,UINT32*,LPVOID*);
+static HRESULT WINAPI IShellFolder_CreateViewObject(LPSHELLFOLDER,HWND,REFIID,LPVOID*);
+static HRESULT WINAPI IShellFolder_GetAttributesOf(LPSHELLFOLDER,UINT,LPCITEMIDLIST*,DWORD*);
+static HRESULT WINAPI IShellFolder_GetUIObjectOf(LPSHELLFOLDER,HWND,UINT,LPCITEMIDLIST*,REFIID,UINT*,LPVOID*);
 static HRESULT WINAPI IShellFolder_GetDisplayNameOf(LPSHELLFOLDER,LPCITEMIDLIST,DWORD,LPSTRRET);
-static HRESULT WINAPI IShellFolder_SetNameOf(LPSHELLFOLDER,HWND32,LPCITEMIDLIST,LPCOLESTR32,DWORD,LPITEMIDLIST*);
-static BOOL32 WINAPI IShellFolder_GetFolderPath(LPSHELLFOLDER,LPSTR,DWORD);
+static HRESULT WINAPI IShellFolder_SetNameOf(LPSHELLFOLDER,HWND,LPCITEMIDLIST,LPCOLESTR,DWORD,LPITEMIDLIST*);
+static BOOL WINAPI IShellFolder_GetFolderPath(LPSHELLFOLDER,LPSTR,DWORD);
 
 /***************************************************************************
  * IDropTarget interface definition for the ShellFolder
@@ -216,7 +216,7 @@ LPSTR GetNextElement(LPSTR pszNext,LPSTR pszOut,DWORD dwOut)
 	{ pszTail++;
 	}
 	dwCopy=((LPBYTE)pszTail-(LPBYTE)pszNext)/sizeof(CHAR)+1;
-	lstrcpyn32A(pszOut, pszNext, (dwOut<dwCopy)? dwOut : dwCopy);
+	lstrcpynA(pszOut, pszNext, (dwOut<dwCopy)? dwOut : dwCopy);
 
 	if(*pszTail)
 	{  pszTail++;
@@ -277,7 +277,7 @@ LPSHELLFOLDER IShellFolder_Constructor(LPSHELLFOLDER pParent,LPITEMIDLIST pidl)
 	    *(sf->sMyPath)=0x00;
 	    if(pParent->sMyPath)			/* if the parent has a path, get it*/
 	    {  strcpy(sf->sMyPath, pParent->sMyPath);
-	       PathAddBackslash32A (sf->sMyPath);
+	       PathAddBackslashA (sf->sMyPath);
 	    }
 	    sf->pMyPidl = ILCombine(pParent->pMyPidl, pidl);
 	    len = strlen(sf->sMyPath);
@@ -374,9 +374,9 @@ static ULONG WINAPI IShellFolder_Release(LPSHELLFOLDER this)
 */
 static HRESULT WINAPI IShellFolder_ParseDisplayName(
 	LPSHELLFOLDER this,
-	HWND32 hwndOwner,
+	HWND hwndOwner,
 	LPBC pbcReserved,
-	LPOLESTR32 lpszDisplayName,
+	LPOLESTR lpszDisplayName,
 	DWORD *pchEaten,
 	LPITEMIDLIST *ppidl,
 	DWORD *pdwAttributes)
@@ -384,14 +384,14 @@ static HRESULT WINAPI IShellFolder_ParseDisplayName(
 	LPITEMIDLIST   pidlFull=NULL, pidlTemp = NULL, pidlOld = NULL;
 	LPSTR          pszNext=NULL;
 	CHAR           szTemp[MAX_PATH],szElement[MAX_PATH];
-	BOOL32         bIsFile;
+	BOOL         bIsFile;
        
 	TRACE(shell,"(%p)->(HWND=0x%08x,%p,%p=%s,%p,pidl=%p,%p)\n",
 		this,hwndOwner,pbcReserved,lpszDisplayName,
 		debugstr_w(lpszDisplayName),pchEaten,ppidl,pdwAttributes);
 
 	{ hr = E_FAIL;
-	  WideCharToLocal32(szTemp, lpszDisplayName, lstrlen32W(lpszDisplayName) + 1);
+	  WideCharToLocal(szTemp, lpszDisplayName, lstrlenW(lpszDisplayName) + 1);
 	  if(szTemp[0])
 	  { if (strcmp(szTemp,"Desktop")==0)
 	    { pidlFull = _ILCreateDesktop();
@@ -400,11 +400,11 @@ static HRESULT WINAPI IShellFolder_ParseDisplayName(
 	    { pidlFull = _ILCreateMyComputer();
 	    }
 	    else
-	    { if (!PathIsRoot32A(szTemp))
+	    { if (!PathIsRootA(szTemp))
 	      { if (this->sMyPath && strlen (this->sMyPath))
 	        { if (strcmp(this->sMyPath,"My Computer"))
 	          { strcpy (szElement,this->sMyPath);
-	            PathAddBackslash32A (szElement);
+	            PathAddBackslashA (szElement);
 		    strcat (szElement, szTemp);
 		    strcpy (szTemp, szElement);
 	          }
@@ -412,7 +412,7 @@ static HRESULT WINAPI IShellFolder_ParseDisplayName(
 	      }
 	      
 	      /* check if the lpszDisplayName is Folder or File*/
-	      bIsFile = ! (GetFileAttributes32A(szTemp) & FILE_ATTRIBUTE_DIRECTORY);
+	      bIsFile = ! (GetFileAttributesA(szTemp) & FILE_ATTRIBUTE_DIRECTORY);
 	      pszNext = GetNextElement(szTemp, szElement, MAX_PATH);
 
 	      pidlFull = _ILCreateMyComputer();
@@ -451,7 +451,7 @@ static HRESULT WINAPI IShellFolder_ParseDisplayName(
 */
 static HRESULT WINAPI IShellFolder_EnumObjects(
 	LPSHELLFOLDER this,
-	HWND32 hwndOwner,
+	HWND hwndOwner,
 	DWORD dwFlags,
 	LPENUMIDLIST* ppEnumIDList)
 {	TRACE(shell,"(%p)->(HWND=0x%08x flags=0x%08lx pplist=%p)\n",this,hwndOwner,dwFlags,ppEnumIDList);
@@ -608,7 +608,7 @@ static HRESULT WINAPI  IShellFolder_CompareIDs(LPSHELLFOLDER this,
 *  the same as SHCreateShellFolderViewEx ???
 */
 static HRESULT WINAPI IShellFolder_CreateViewObject( LPSHELLFOLDER this,
-		 HWND32 hwndOwner, REFIID riid, LPVOID *ppvOut)
+		 HWND hwndOwner, REFIID riid, LPVOID *ppvOut)
 {	LPSHELLVIEW pShellView;
 	char    xriid[50];
 	HRESULT       hr;
@@ -644,7 +644,7 @@ static HRESULT WINAPI IShellFolder_CreateViewObject( LPSHELLFOLDER this,
 *  passes ONE element in the array and writing to further elements will
 *  cause the shell to fail later.
 */
-static HRESULT WINAPI IShellFolder_GetAttributesOf(LPSHELLFOLDER this,UINT32 cidl,LPCITEMIDLIST *apidl,DWORD *rgfInOut)
+static HRESULT WINAPI IShellFolder_GetAttributesOf(LPSHELLFOLDER this,UINT cidl,LPCITEMIDLIST *apidl,DWORD *rgfInOut)
 { LPCITEMIDLIST * pidltemp;
   DWORD i;
 
@@ -709,11 +709,11 @@ static HRESULT WINAPI IShellFolder_GetAttributesOf(LPSHELLFOLDER this,UINT32 cid
 */
 static HRESULT WINAPI IShellFolder_GetUIObjectOf( 
   LPSHELLFOLDER this,
-  HWND32        hwndOwner,
-  UINT32        cidl,
+  HWND        hwndOwner,
+  UINT        cidl,
   LPCITEMIDLIST * apidl, 
   REFIID        riid, 
-  UINT32        *  prgfInOut,
+  UINT        *  prgfInOut,
   LPVOID        * ppvOut)
 {	
 	char		xclsid[50];
@@ -791,7 +791,7 @@ static HRESULT WINAPI IShellFolder_GetDisplayNameOf( LPSHELLFOLDER this, LPCITEM
 	CHAR	szDrive[MAX_PATH];
 	DWORD	dwVolumeSerialNumber,dwMaximumComponetLength,dwFileSystemFlags;
 	LPITEMIDLIST	pidlTemp=NULL;
-	BOOL32	bSimplePidl=FALSE;
+	BOOL	bSimplePidl=FALSE;
 		
 	TRACE(shell,"(%p)->(pidl=%p,0x%08lx,%p)\n",this,pidl,dwFlags,lpName);
 	pdump(pidl);
@@ -821,14 +821,14 @@ static HRESULT WINAPI IShellFolder_GetDisplayNameOf( LPSHELLFOLDER this, LPCITEM
 	  { _ILGetDrive( pidl, szTemp, MAX_PATH);
 
 	    if ( dwFlags==SHGDN_NORMAL || dwFlags==SHGDN_INFOLDER)	/* like "A1-dos (C:)" */
-	    { GetVolumeInformation32A(szTemp,szDrive,MAX_PATH,&dwVolumeSerialNumber,&dwMaximumComponetLength,&dwFileSystemFlags,NULL,0);
+	    { GetVolumeInformationA(szTemp,szDrive,MAX_PATH,&dwVolumeSerialNumber,&dwMaximumComponetLength,&dwFileSystemFlags,NULL,0);
 	      szTemp[2]=0x00;						/* overwrite '\' */
 	      strcat (szDrive," (");
 	      strcat (szDrive,szTemp);
 	      strcat (szDrive,")"); 
 	    }
 	    else							/* like "C:\" */
-	    {  PathAddBackslash32A (szTemp);
+	    {  PathAddBackslashA (szTemp);
 	       strcpy(szDrive,szTemp);
 	    }
 	  }
@@ -855,7 +855,7 @@ static HRESULT WINAPI IShellFolder_GetDisplayNameOf( LPSHELLFOLDER this, LPCITEM
 	        if (this->sMyPath && strlen (this->sMyPath))
 	        { if (strcmp(this->sMyPath,"My Computer"))
 	          { strcpy (szText,this->sMyPath);
-	            PathAddBackslash32A (szText);
+	            PathAddBackslashA (szText);
 	          }
 	        }
 	        pidlTemp = ILFindLastID(pidl);
@@ -904,9 +904,9 @@ static HRESULT WINAPI IShellFolder_GetDisplayNameOf( LPSHELLFOLDER this, LPCITEM
 */
 static HRESULT WINAPI IShellFolder_SetNameOf(
   	LPSHELLFOLDER this,
-		HWND32 hwndOwner, 
+		HWND hwndOwner, 
     LPCITEMIDLIST pidl, /*simple pidl*/
-    LPCOLESTR32 lpName, 
+    LPCOLESTR lpName, 
     DWORD dw, 
     LPITEMIDLIST *pPidlOut)
 {  FIXME(shell,"(%p)->(%u,pidl=%p,%s,%lu,%p),stub!\n",
@@ -917,7 +917,7 @@ static HRESULT WINAPI IShellFolder_SetNameOf(
 *  IShellFolder_GetFolderPath
 *  FIXME: drive not included
 */
-static BOOL32 WINAPI IShellFolder_GetFolderPath(LPSHELLFOLDER this, LPSTR lpszOut, DWORD dwOutSize)
+static BOOL WINAPI IShellFolder_GetFolderPath(LPSHELLFOLDER this, LPSTR lpszOut, DWORD dwOutSize)
 {	DWORD	dwSize;
 
 	TRACE(shell,"(%p)->(%p %lu)\n",this, lpszOut, dwOutSize);
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index bd9dc6e6127..7c503237663 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -32,22 +32,22 @@ static HRESULT WINAPI IShellView_QueryInterface(LPSHELLVIEW,REFIID, LPVOID *);
 static ULONG WINAPI IShellView_AddRef(LPSHELLVIEW) ;
 static ULONG WINAPI IShellView_Release(LPSHELLVIEW);
     /* IOleWindow methods */
-static HRESULT WINAPI IShellView_GetWindow(LPSHELLVIEW,HWND32 * lphwnd);
-static HRESULT WINAPI IShellView_ContextSensitiveHelp(LPSHELLVIEW,BOOL32 fEnterMode);
+static HRESULT WINAPI IShellView_GetWindow(LPSHELLVIEW,HWND * lphwnd);
+static HRESULT WINAPI IShellView_ContextSensitiveHelp(LPSHELLVIEW,BOOL fEnterMode);
     /* IShellView methods */
-static HRESULT WINAPI IShellView_TranslateAccelerator(LPSHELLVIEW,LPMSG32 lpmsg);
-static HRESULT WINAPI IShellView_EnableModeless(LPSHELLVIEW,BOOL32 fEnable);
-static HRESULT WINAPI IShellView_UIActivate(LPSHELLVIEW,UINT32 uState);
+static HRESULT WINAPI IShellView_TranslateAccelerator(LPSHELLVIEW,LPMSG lpmsg);
+static HRESULT WINAPI IShellView_EnableModeless(LPSHELLVIEW,BOOL fEnable);
+static HRESULT WINAPI IShellView_UIActivate(LPSHELLVIEW,UINT uState);
 static HRESULT WINAPI IShellView_Refresh(LPSHELLVIEW);
-static HRESULT WINAPI IShellView_CreateViewWindow(LPSHELLVIEW, IShellView *lpPrevView,LPCFOLDERSETTINGS lpfs, IShellBrowser * psb,RECT32 * prcView, HWND32  *phWnd);
+static HRESULT WINAPI IShellView_CreateViewWindow(LPSHELLVIEW, IShellView *lpPrevView,LPCFOLDERSETTINGS lpfs, IShellBrowser * psb,RECT * prcView, HWND  *phWnd);
 static HRESULT WINAPI IShellView_DestroyViewWindow(LPSHELLVIEW);
 static HRESULT WINAPI IShellView_GetCurrentInfo(LPSHELLVIEW, LPFOLDERSETTINGS lpfs);
 static HRESULT WINAPI IShellView_AddPropertySheetPages(LPSHELLVIEW, DWORD dwReserved,LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam);
 static HRESULT WINAPI IShellView_SaveViewState(LPSHELLVIEW);
-static HRESULT WINAPI IShellView_SelectItem(LPSHELLVIEW, LPCITEMIDLIST pidlItem, UINT32 uFlags);
-static HRESULT WINAPI IShellView_GetItemObject(LPSHELLVIEW, UINT32 uItem, REFIID riid,LPVOID *ppv);
+static HRESULT WINAPI IShellView_SelectItem(LPSHELLVIEW, LPCITEMIDLIST pidlItem, UINT uFlags);
+static HRESULT WINAPI IShellView_GetItemObject(LPSHELLVIEW, UINT uItem, REFIID riid,LPVOID *ppv);
 
-static BOOL32 ShellView_CanDoIDockingWindow(LPSHELLVIEW);
+static BOOL ShellView_CanDoIDockingWindow(LPSHELLVIEW);
 
 static struct IShellView_VTable svvt = 
 { IShellView_QueryInterface,
@@ -81,12 +81,12 @@ static struct IShellView_VTable svvt =
 #define TOOLBAR_ID   (L"SHELLDLL_DefView")
 /*windowsx.h */
 #define GET_WM_COMMAND_ID(wp, lp)               LOWORD(wp)
-#define GET_WM_COMMAND_HWND(wp, lp)             (HWND32)(lp)
+#define GET_WM_COMMAND_HWND(wp, lp)             (HWND)(lp)
 #define GET_WM_COMMAND_CMD(wp, lp)              HIWORD(wp)
 /* winuser.h */
 #define WM_SETTINGCHANGE                WM_WININICHANGE
-extern void WINAPI _InsertMenuItem (HMENU32 hmenu, UINT32 indexMenu, BOOL32 fByPosition, 
-			UINT32 wID, UINT32 fType, LPSTR dwTypeData, UINT32 fState);
+extern void WINAPI _InsertMenuItem (HMENU hmenu, UINT indexMenu, BOOL fByPosition, 
+			UINT wID, UINT fType, LPSTR dwTypeData, UINT fState);
 
 typedef struct
 {  int   idCommand;
@@ -105,8 +105,8 @@ MYTOOLINFO g_Tools[] =
 { {IDM_VIEW_FILES, 0, IDS_TB_VIEW_FILES, IDS_MI_VIEW_FILES, 0, TBSTATE_ENABLED, TBSTYLE_BUTTON},
   {-1, 0, 0, 0, 0, 0, 0}   
 };
-BOOL32 g_bViewKeys;
-BOOL32 g_bShowIDW;
+BOOL g_bViewKeys;
+BOOL g_bShowIDW;
 
 typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
 
@@ -136,7 +136,7 @@ LPSHELLVIEW IShellView_Constructor( LPSHELLFOLDER pFolder, LPCITEMIDLIST pidl)
 *  helperfunctions for communication with ICommDlgBrowser
 *
 */
-static BOOL32 IsInCommDlg(LPSHELLVIEW this)
+static BOOL IsInCommDlg(LPSHELLVIEW this)
 {	return(this->pCommDlgBrowser != NULL);
 }
 static HRESULT IncludeObject(LPSHELLVIEW this, LPCITEMIDLIST pidl)
@@ -153,7 +153,7 @@ static HRESULT OnDefaultCommand(LPSHELLVIEW this)
 	}
 	return S_FALSE;
 }
-static HRESULT OnStateChange(LPSHELLVIEW this, UINT32 uFlags)
+static HRESULT OnStateChange(LPSHELLVIEW this, UINT uFlags)
 {	if (IsInCommDlg(this))
 	{ TRACE(shell,"ICommDlgBrowser::OnStateChange flags=%x\n", uFlags);
 	  return (this->pCommDlgBrowser->lpvtbl->fnOnStateChange(this->pCommDlgBrowser, this, uFlags));
@@ -165,8 +165,8 @@ static void SetStyle(LPSHELLVIEW this, DWORD dwAdd, DWORD dwRemove)
 
 	TRACE(shell,"(%p)\n", this);
 
-	tmpstyle = GetWindowLong32A(this->hWndList, GWL_STYLE);
-	SetWindowLong32A(this->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove));
+	tmpstyle = GetWindowLongA(this->hWndList, GWL_STYLE);
+	SetWindowLongA(this->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove));
 }
 
 static void CheckToolbar(LPSHELLVIEW this)
@@ -243,7 +243,7 @@ static void MergeToolBar(LPSHELLVIEW this)
 *
 */
 
-BOOL32 ShellView_CreateList (LPSHELLVIEW this)
+BOOL ShellView_CreateList (LPSHELLVIEW this)
 {	DWORD dwStyle;
 
 	TRACE(shell,"%p\n",this);
@@ -261,13 +261,13 @@ BOOL32 ShellView_CreateList (LPSHELLVIEW this)
 	/*if (this->FolderSettings.fFlags && FWF_DESKTOP); used from explorer*/
 	if (this->FolderSettings.fFlags && FWF_SINGLESEL)	dwStyle |= LVS_SINGLESEL;
 
-	this->hWndList=CreateWindowEx32A( WS_EX_CLIENTEDGE,
-					  WC_LISTVIEW32A,
+	this->hWndList=CreateWindowExA( WS_EX_CLIENTEDGE,
+					  WC_LISTVIEWA,
 					  NULL,
 					  dwStyle,
 					  0,0,0,0,
   					  this->hWnd,
-					  (HMENU32)ID_LISTVIEW,
+					  (HMENU)ID_LISTVIEW,
 					  shell32_hInstance,
 					  NULL);
 
@@ -288,8 +288,8 @@ int  nColumn2=80;
 int  nColumn3=170;
 int  nColumn4=60;
 
-BOOL32 ShellView_InitList(LPSHELLVIEW this)
-{	LVCOLUMN32A lvColumn;
+BOOL ShellView_InitList(LPSHELLVIEW this)
+{	LVCOLUMNA lvColumn;
 	CHAR        szString[50];
 
 	TRACE(shell,"%p\n",this);
@@ -304,19 +304,19 @@ BOOL32 ShellView_InitList(LPSHELLVIEW this)
 	lvColumn.cx = nColumn1;
 	strcpy(szString,"File");
 	/*LoadString32A(shell32_hInstance, IDS_COLUMN1, szString, sizeof(szString));*/
-	ListView_InsertColumn32A(this->hWndList, 0, &lvColumn);
+	ListView_InsertColumnA(this->hWndList, 0, &lvColumn);
 
 	lvColumn.cx = nColumn2;
 	strcpy(szString,"Size");
-	ListView_InsertColumn32A(this->hWndList, 1, &lvColumn);
+	ListView_InsertColumnA(this->hWndList, 1, &lvColumn);
 
 	lvColumn.cx = nColumn3;
 	strcpy(szString,"Type");
-	ListView_InsertColumn32A(this->hWndList, 2, &lvColumn);
+	ListView_InsertColumnA(this->hWndList, 2, &lvColumn);
 
 	lvColumn.cx = nColumn4;
 	strcpy(szString,"Modified");
-	ListView_InsertColumn32A(this->hWndList, 3, &lvColumn);
+	ListView_InsertColumnA(this->hWndList, 3, &lvColumn);
 
 	ListView_SetImageList(this->hWndList, ShellSmallIconList, LVSIL_SMALL);
 	ListView_SetImageList(this->hWndList, ShellBigIconList, LVSIL_NORMAL);
@@ -329,7 +329,7 @@ BOOL32 ShellView_InitList(LPSHELLVIEW this)
 * NOTES
 *  internal, CALLBACK for DSA_Sort
 */   
-INT32 CALLBACK ShellView_CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData)
+INT CALLBACK ShellView_CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData)
 {	int ret;
 	TRACE(shell,"pidl1=%p pidl2=%p lpsf=%p\n", lParam1, lParam2, (LPVOID) lpData);
 
@@ -352,8 +352,8 @@ static HRESULT ShellView_FillList(LPSHELLVIEW this)
 {	LPENUMIDLIST	pEnumIDList;
 	LPITEMIDLIST	pidl;
 	DWORD		dwFetched;
-	UINT32		i;
-	LVITEM32A	lvItem;
+	UINT		i;
+	LVITEMA	lvItem;
 	HRESULT		hRes;
 	HDPA		hdpa;
 
@@ -384,7 +384,7 @@ static HRESULT ShellView_FillList(LPSHELLVIEW this)
 	pDPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)this->pSFParent);
 
 	/*turn the listview's redrawing off*/
- 	SendMessage32A(this->hWndList, WM_SETREDRAW, FALSE, 0); 
+ 	SendMessageA(this->hWndList, WM_SETREDRAW, FALSE, 0); 
 
         for (i=0; i < DPA_GetPtrCount(hdpa); ++i) 	/* DPA_GetPtrCount is a macro*/
         { pidl = (LPITEMIDLIST)DPA_GetPtr(hdpa, i);
@@ -393,18 +393,18 @@ static HRESULT ShellView_FillList(LPSHELLVIEW this)
 	    lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;		/*set the mask*/
 	    lvItem.iItem = ListView_GetItemCount(this->hWndList);	/*add the item to the end of the list*/
 	    lvItem.lParam = (LPARAM) pidl;				/*set the item's data*/
-	    lvItem.pszText = LPSTR_TEXTCALLBACK32A;			/*get text on a callback basis*/
+	    lvItem.pszText = LPSTR_TEXTCALLBACKA;			/*get text on a callback basis*/
 	    lvItem.iImage = I_IMAGECALLBACK;				/*get the image on a callback basis*/
-	    ListView_InsertItem32A(this->hWndList, &lvItem);
+	    ListView_InsertItemA(this->hWndList, &lvItem);
 	  }
 	  else
 	    SHFree(pidl);	/* the listview has the COPY*/
         }
 
 	/*turn the listview's redrawing back on and force it to draw*/
-	SendMessage32A(this->hWndList, WM_SETREDRAW, TRUE, 0);
-	InvalidateRect32(this->hWndList, NULL, TRUE);
-	UpdateWindow32(this->hWndList);
+	SendMessageA(this->hWndList, WM_SETREDRAW, TRUE, 0);
+	InvalidateRect(this->hWndList, NULL, TRUE);
+	UpdateWindow(this->hWndList);
 
 	pEnumIDList->lpvtbl->fnRelease(pEnumIDList); /* destroy the list*/
 	pDPA_Destroy(hdpa);
@@ -437,7 +437,7 @@ LRESULT ShellView_OnSize(LPSHELLVIEW this, WORD wWidth, WORD wHeight)
 
 	/*resize the ListView to fit our window*/
 	if(this->hWndList)
-	{ MoveWindow32(this->hWndList, 0, 0, wWidth, wHeight, TRUE);
+	{ MoveWindow(this->hWndList, 0, 0, wWidth, wHeight, TRUE);
 	}
 
 	return S_OK;
@@ -445,15 +445,15 @@ LRESULT ShellView_OnSize(LPSHELLVIEW this, WORD wWidth, WORD wHeight)
 /**************************************************************************
 * ShellView_BuildFileMenu()
 */   
-HMENU32 ShellView_BuildFileMenu(LPSHELLVIEW this)
+HMENU ShellView_BuildFileMenu(LPSHELLVIEW this)
 {	CHAR	szText[MAX_PATH];
-	MENUITEMINFO32A	mii;
+	MENUITEMINFOA	mii;
 	int	nTools,i;
-	HMENU32	hSubMenu;
+	HMENU	hSubMenu;
 
 	TRACE(shell,"(%p) semi-stub\n",this);
 
-	hSubMenu = CreatePopupMenu32();
+	hSubMenu = CreatePopupMenu();
 	if(hSubMenu)
 	{ /*get the number of items in our global array*/
 	  for(nTools = 0; g_Tools[nTools].idCommand != -1; nTools++){}
@@ -476,7 +476,7 @@ HMENU32 ShellView_BuildFileMenu(LPSHELLVIEW this)
 	    { mii.fType = MFT_SEPARATOR;
 	    }
 	    /* tack this item onto the end of the menu */
-	    InsertMenuItem32A(hSubMenu, (UINT32)-1, TRUE, &mii);
+	    InsertMenuItemA(hSubMenu, (UINT)-1, TRUE, &mii);
 	  }
 	}
 	TRACE(shell,"-- return (menu=0x%x)\n",hSubMenu);
@@ -485,7 +485,7 @@ HMENU32 ShellView_BuildFileMenu(LPSHELLVIEW this)
 /**************************************************************************
 * ShellView_MergeFileMenu()
 */   
-void ShellView_MergeFileMenu(LPSHELLVIEW this, HMENU32 hSubMenu)
+void ShellView_MergeFileMenu(LPSHELLVIEW this, HMENU hSubMenu)
 {	TRACE(shell,"(%p)->(submenu=0x%08x) stub\n",this,hSubMenu);
 
 	if(hSubMenu)
@@ -501,8 +501,8 @@ void ShellView_MergeFileMenu(LPSHELLVIEW this, HMENU32 hSubMenu)
 * ShellView_MergeViewMenu()
 */   
 
-void ShellView_MergeViewMenu(LPSHELLVIEW this, HMENU32 hSubMenu)
-{	MENUITEMINFO32A	mii;
+void ShellView_MergeViewMenu(LPSHELLVIEW this, HMENU hSubMenu)
+{	MENUITEMINFOA	mii;
 
 	TRACE(shell,"(%p)->(submenu=0x%08x)\n",this,hSubMenu);
 
@@ -515,24 +515,24 @@ void ShellView_MergeViewMenu(LPSHELLVIEW this, HMENU32 hSubMenu)
 	  mii.fMask = MIIM_SUBMENU | MIIM_TYPE | MIIM_DATA;;
           mii.fType = MFT_STRING;
  	  mii.dwTypeData = "View";
-	  mii.hSubMenu = LoadMenuIndirect32A(&_Resource_Men_MENU_001_0_data);
-	  InsertMenuItem32A(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii);
+	  mii.hSubMenu = LoadMenuIndirectA(&_Resource_Men_MENU_001_0_data);
+	  InsertMenuItemA(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii);
 	}
 }
 /**************************************************************************
 * ShellView_UpdateMenu()
 */
-LRESULT ShellView_UpdateMenu(LPSHELLVIEW this, HMENU32 hMenu)
+LRESULT ShellView_UpdateMenu(LPSHELLVIEW this, HMENU hMenu)
 {	TRACE(shell,"(%p)->(menu=0x%08x)\n",this,hMenu);
-	CheckMenuItem32(hMenu, IDM_VIEW_FILES, MF_BYCOMMAND | (g_bViewKeys ? MF_CHECKED: MF_UNCHECKED));
+	CheckMenuItem(hMenu, IDM_VIEW_FILES, MF_BYCOMMAND | (g_bViewKeys ? MF_CHECKED: MF_UNCHECKED));
 
 	if(ShellView_CanDoIDockingWindow(this))
-	{ EnableMenuItem32(hMenu, IDM_VIEW_IDW, MF_BYCOMMAND | MF_ENABLED);
-	  CheckMenuItem32(hMenu, IDM_VIEW_IDW, MF_BYCOMMAND | (g_bShowIDW ? MF_CHECKED: MF_UNCHECKED));
+	{ EnableMenuItem(hMenu, IDM_VIEW_IDW, MF_BYCOMMAND | MF_ENABLED);
+	  CheckMenuItem(hMenu, IDM_VIEW_IDW, MF_BYCOMMAND | (g_bShowIDW ? MF_CHECKED: MF_UNCHECKED));
 	}
 	else
-	{ EnableMenuItem32(hMenu, IDM_VIEW_IDW, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
-	  CheckMenuItem32(hMenu, IDM_VIEW_IDW, MF_BYCOMMAND | MF_UNCHECKED);
+	{ EnableMenuItem(hMenu, IDM_VIEW_IDW, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+	  CheckMenuItem(hMenu, IDM_VIEW_IDW, MF_BYCOMMAND | MF_UNCHECKED);
 	}
 	return S_OK;
 }
@@ -549,7 +549,7 @@ void ShellView_OnDeactivate(LPSHELLVIEW this)
   { if(this->hMenu)
     { IShellBrowser_SetMenuSB(this->pShellBrowser,0, 0, 0);
       IShellBrowser_RemoveMenusSB(this->pShellBrowser,this->hMenu);
-      DestroyMenu32(this->hMenu);
+      DestroyMenu(this->hMenu);
       this->hMenu = 0;
       }
 
@@ -560,9 +560,9 @@ void ShellView_OnDeactivate(LPSHELLVIEW this)
 /**************************************************************************
 * ShellView_OnActivate()
 */   
-LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT32 uState)
-{	OLEMENUGROUPWIDTHS32   omw = { {0, 0, 0, 0, 0, 0} };
-	MENUITEMINFO32A         mii;
+LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT uState)
+{	OLEMENUGROUPWIDTHS   omw = { {0, 0, 0, 0, 0, 0} };
+	MENUITEMINFOA         mii;
 	CHAR                szText[MAX_PATH];
 
 	TRACE(shell,"%p uState=%x\n",this,uState);    
@@ -577,7 +577,7 @@ LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT32 uState)
 	/*only do this if we are active */
 	if(uState != SVUIA_DEACTIVATE)
 	{ /*merge the menus */
-	  this->hMenu = CreateMenu32();
+	  this->hMenu = CreateMenu();
    
 	  if(this->hMenu)
 	  { IShellBrowser_InsertMenusSB(this->pShellBrowser, this->hMenu, &omw);
@@ -595,7 +595,7 @@ LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT32 uState)
 
 	    /*insert our menu into the menu bar*/
 	    if(mii.hSubMenu)
-	    { InsertMenuItem32A(this->hMenu, FCIDM_MENU_HELP, FALSE, &mii);
+	    { InsertMenuItemA(this->hMenu, FCIDM_MENU_HELP, FALSE, &mii);
 	    }
 
 	    /*get the view menu so we can merge with it*/
@@ -603,7 +603,7 @@ LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT32 uState)
 	    mii.cbSize = sizeof(mii);
 	    mii.fMask = MIIM_SUBMENU;
       
-	    if(GetMenuItemInfo32A(this->hMenu, FCIDM_MENU_VIEW, FALSE, &mii))
+	    if(GetMenuItemInfoA(this->hMenu, FCIDM_MENU_VIEW, FALSE, &mii))
 	    { ShellView_MergeViewMenu(this, mii.hSubMenu);
 	    }
 
@@ -614,7 +614,7 @@ LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT32 uState)
 	      mii.cbSize = sizeof(mii);
 	      mii.fMask = MIIM_SUBMENU;
       
-	      if(GetMenuItemInfo32A(this->hMenu, FCIDM_MENU_FILE, FALSE, &mii))
+	      if(GetMenuItemInfoA(this->hMenu, FCIDM_MENU_FILE, FALSE, &mii))
 	      { ShellView_MergeFileMenu(this, mii.hSubMenu);
 	      }
 	    }
@@ -656,8 +656,8 @@ LRESULT ShellView_OnKillFocus(LPSHELLVIEW this)
 /**************************************************************************
 * ShellView_AddRemoveDockingWindow()
 */   
-BOOL32 ShellView_AddRemoveDockingWindow(LPSHELLVIEW this, BOOL32 bAdd)
-{	BOOL32	bReturn = FALSE;
+BOOL ShellView_AddRemoveDockingWindow(LPSHELLVIEW this, BOOL bAdd)
+{	BOOL	bReturn = FALSE;
 	HRESULT	hr;
 	LPSERVICEPROVIDER	pSP;
 	LPDOCKINGWINDOWFRAME	pFrame;
@@ -716,8 +716,8 @@ BOOL32 ShellView_AddRemoveDockingWindow(LPSHELLVIEW this, BOOL32 bAdd)
 /**************************************************************************
 * ShellView_CanDoIDockingWindow()
 */   
-BOOL32 ShellView_CanDoIDockingWindow(LPSHELLVIEW this)
-{	BOOL32 bReturn = FALSE;
+BOOL ShellView_CanDoIDockingWindow(LPSHELLVIEW this)
+{	BOOL bReturn = FALSE;
 	HRESULT hr;
 	LPSERVICEPROVIDER pSP;
 	LPDOCKINGWINDOWFRAME pFrame;
@@ -792,7 +792,7 @@ LRESULT ShellView_OnSettingChange(LPSHELLVIEW this, LPCSTR lpszSection)
 /**************************************************************************
 * ShellView_OnCommand()
 */   
-LRESULT ShellView_OnCommand(LPSHELLVIEW this,DWORD dwCmdID, DWORD dwCmd, HWND32 hwndCmd)
+LRESULT ShellView_OnCommand(LPSHELLVIEW this,DWORD dwCmdID, DWORD dwCmd, HWND hwndCmd)
 {	TRACE(shell,"(%p)->(0x%08lx 0x%08lx 0x%08x) stub\n",this, dwCmdID, dwCmd, hwndCmd);
 	switch(dwCmdID)
 	{ case IDM_VIEW_FILES:
@@ -806,7 +806,7 @@ LRESULT ShellView_OnCommand(LPSHELLVIEW this,DWORD dwCmdID, DWORD dwCmd, HWND32
 	    break;
    
 	  case IDM_MYFILEITEM:
-	    MessageBeep32(MB_OK);
+	    MessageBeep(MB_OK);
 	    break;
 
 	  case FCIDM_SHVIEW_SMALLICON:
@@ -841,9 +841,9 @@ LRESULT ShellView_OnCommand(LPSHELLVIEW this,DWORD dwCmdID, DWORD dwCmd, HWND32
 * RETURNS
 *  number of selected items
 */   
-UINT32 ShellView_GetSelections(LPSHELLVIEW this)
-{	LVITEM32A	lvItem;
-	UINT32	i;
+UINT ShellView_GetSelections(LPSHELLVIEW this)
+{	LVITEMA	lvItem;
+	UINT	i;
 
 
 	if (this->aSelectedItems)
@@ -864,7 +864,7 @@ UINT32 ShellView_GetSelections(LPSHELLVIEW this)
 
 	  i = 0;
    
-	  while(ListView_GetItem32A(this->hWndList, &lvItem) && (i < this->uSelected))
+	  while(ListView_GetItemA(this->hWndList, &lvItem) && (i < this->uSelected))
 	  { if(lvItem.state & LVIS_SELECTED)
 	    { this->aSelectedItems[i] = (LPITEMIDLIST)lvItem.lParam;
 	      i++;
@@ -879,16 +879,16 @@ UINT32 ShellView_GetSelections(LPSHELLVIEW this)
 /**************************************************************************
 *   ShellView_DoContextMenu()
 */   
-void ShellView_DoContextMenu(LPSHELLVIEW this, WORD x, WORD y, BOOL32 fDefault)
-{	UINT32	uCommand;
+void ShellView_DoContextMenu(LPSHELLVIEW this, WORD x, WORD y, BOOL fDefault)
+{	UINT	uCommand;
 	DWORD	wFlags;
-	HMENU32 hMenu;
-	BOOL32  fExplore = FALSE;
-	HWND32  hwndTree = 0;
-	INT32          	nMenuIndex;
-	MENUITEMINFO32A	mii;
+	HMENU hMenu;
+	BOOL  fExplore = FALSE;
+	HWND  hwndTree = 0;
+	INT          	nMenuIndex;
+	MENUITEMINFOA	mii;
 	LPCONTEXTMENU	pContextMenu = NULL;
-	CMINVOKECOMMANDINFO32  cmi;
+	CMINVOKECOMMANDINFO  cmi;
 	
 	TRACE(shell,"(%p)->(0x%08x 0x%08x 0x%08x) stub\n",this, x, y, fDefault);
 
@@ -900,7 +900,7 @@ void ShellView_DoContextMenu(LPSHELLVIEW this, WORD x, WORD y, BOOL32 fDefault)
    
 	  if(pContextMenu)
 	  { TRACE(shell,"-- pContextMenu\n");
-	    hMenu = CreatePopupMenu32();
+	    hMenu = CreatePopupMenu();
 
 	    if( hMenu )
 	    { /* See if we are in Explore or Open mode. If the browser's tree
@@ -922,7 +922,7 @@ void ShellView_DoContextMenu(LPSHELLVIEW this, WORD x, WORD y, BOOL32 fDefault)
 	          mii.cbSize = sizeof(mii);
 	          mii.fMask = MIIM_STATE | MIIM_ID;
 
-	          while(GetMenuItemInfo32A(hMenu, nMenuIndex, TRUE, &mii))	/*find the default item in the menu*/
+	          while(GetMenuItemInfoA(hMenu, nMenuIndex, TRUE, &mii))	/*find the default item in the menu*/
 	          { if(mii.fState & MFS_DEFAULT)
 	            { uCommand = mii.wID;
 	              break;
@@ -932,7 +932,7 @@ void ShellView_DoContextMenu(LPSHELLVIEW this, WORD x, WORD y, BOOL32 fDefault)
 	        }
 	        else
 	        { TRACE(shell,"-- track popup\n");
-	          uCommand = TrackPopupMenu32( hMenu,TPM_LEFTALIGN | TPM_RETURNCMD,x,y,0,this->hWnd,NULL);
+	          uCommand = TrackPopupMenu( hMenu,TPM_LEFTALIGN | TPM_RETURNCMD,x,y,0,this->hWnd,NULL);
 	        }		
          
 	        if(uCommand > 0)
@@ -946,11 +946,11 @@ void ShellView_DoContextMenu(LPSHELLVIEW this, WORD x, WORD y, BOOL32 fDefault)
 		      ZeroMemory(&cmi, sizeof(cmi));
 	              cmi.cbSize = sizeof(cmi);
 	              cmi.hwnd = this->hWndParent;
-	              cmi.lpVerb = (LPCSTR)MAKEINTRESOURCE32A(uCommand - MENU_OFFSET);
+	              cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand - MENU_OFFSET);
 		      pContextMenu->lpvtbl->fnInvokeCommand(pContextMenu, &cmi);
 		  }
 	        }
-	        DestroyMenu32(hMenu);
+	        DestroyMenu(hMenu);
 	      }
 	    }
 	    if (pContextMenu)
@@ -958,10 +958,10 @@ void ShellView_DoContextMenu(LPSHELLVIEW this, WORD x, WORD y, BOOL32 fDefault)
 	  }
 	}
 	else	/* background context menu */
-	{ hMenu = LoadMenuIndirect32A(&_Resource_Men_MENU_002_0_data);
-	  uCommand = TrackPopupMenu32( GetSubMenu32(hMenu,0),TPM_LEFTALIGN | TPM_RETURNCMD,x,y,0,this->hWnd,NULL);
+	{ hMenu = LoadMenuIndirectA(&_Resource_Men_MENU_002_0_data);
+	  uCommand = TrackPopupMenu( GetSubMenu(hMenu,0),TPM_LEFTALIGN | TPM_RETURNCMD,x,y,0,this->hWnd,NULL);
 	  ShellView_OnCommand(this, uCommand, 0,0);
-	  DestroyMenu32(hMenu);
+	  DestroyMenu(hMenu);
 	}
 }
 
@@ -969,13 +969,13 @@ void ShellView_DoContextMenu(LPSHELLVIEW this, WORD x, WORD y, BOOL32 fDefault)
 * ShellView_OnNotify()
 */
    
-LRESULT ShellView_OnNotify(LPSHELLVIEW this, UINT32 CtlID, LPNMHDR lpnmh)
+LRESULT ShellView_OnNotify(LPSHELLVIEW this, UINT CtlID, LPNMHDR lpnmh)
 {	NM_LISTVIEW *lpnmlv = (NM_LISTVIEW*)lpnmh;
-	NMLVDISPINFO32A *lpdi = (NMLVDISPINFO32A *)lpnmh;
+	NMLVDISPINFOA *lpdi = (NMLVDISPINFOA *)lpnmh;
 	LPITEMIDLIST pidl;
 	DWORD dwCursor; 
 	STRRET   str;  
-	UINT32  uFlags;
+	UINT  uFlags;
 	IExtractIcon *pei;
 
 	TRACE(shell,"%p CtlID=%u lpnmh->code=%x\n",this,CtlID,lpnmh->code);
@@ -991,7 +991,7 @@ LRESULT ShellView_OnNotify(LPSHELLVIEW this, UINT32 CtlID, LPNMHDR lpnmh)
 	    ShellView_OnDeactivate(this);
 	    break;
 
-	  case HDN_ENDTRACK32A:
+	  case HDN_ENDTRACKA:
 	    TRACE(shell,"-- HDN_ENDTRACK32A %p\n",this);
 	    /*nColumn1 = ListView_GetColumnWidth(this->hWndList, 0);
 	    nColumn2 = ListView_GetColumnWidth(this->hWndList, 1);*/
@@ -1014,7 +1014,7 @@ LRESULT ShellView_OnNotify(LPSHELLVIEW this, UINT32 CtlID, LPNMHDR lpnmh)
 	    ShellView_DoContextMenu(this, LOWORD(dwCursor), HIWORD(dwCursor), FALSE);
 	    break;
 
-	  case LVN_GETDISPINFO32A:
+	  case LVN_GETDISPINFOA:
 	    TRACE(shell,"-- LVN_GETDISPINFO32A %p\n",this);
 	    pidl = (LPITEMIDLIST)lpdi->item.lParam;
 
@@ -1065,7 +1065,7 @@ LRESULT ShellView_OnNotify(LPSHELLVIEW this, UINT32 CtlID, LPNMHDR lpnmh)
 	    { if(lpdi->item.mask & LVIF_TEXT)	   /*is the text being requested?*/
 	      { if(SUCCEEDED(this->pSFParent->lpvtbl->fnGetDisplayNameOf(this->pSFParent,pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &str)))
 	        { if(STRRET_WSTR == str.uType)
-	          { WideCharToLocal32(lpdi->item.pszText, str.u.pOleStr, lpdi->item.cchTextMax);
+	          { WideCharToLocal(lpdi->item.pszText, str.u.pOleStr, lpdi->item.cchTextMax);
 	            SHFree(str.u.pOleStr);
 	          }
 	          else if(STRRET_CSTRA == str.uType)
@@ -1106,9 +1106,9 @@ LRESULT ShellView_OnNotify(LPSHELLVIEW this, UINT32 CtlID, LPNMHDR lpnmh)
 *  ShellView_WndProc
 */
 
-LRESULT CALLBACK ShellView_WndProc(HWND32 hWnd, UINT32 uMessage, WPARAM32 wParam, LPARAM lParam)
-{ LPSHELLVIEW pThis = (LPSHELLVIEW)GetWindowLong32A(hWnd, GWL_USERDATA);
-  LPCREATESTRUCT32A lpcs;
+LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam)
+{ LPSHELLVIEW pThis = (LPSHELLVIEW)GetWindowLongA(hWnd, GWL_USERDATA);
+  LPCREATESTRUCTA lpcs;
   DWORD dwCursor;
   
   TRACE(shell,"(hwnd=%x msg=%x wparm=%x lparm=%lx)\n",hWnd, uMessage, wParam, lParam);
@@ -1116,9 +1116,9 @@ LRESULT CALLBACK ShellView_WndProc(HWND32 hWnd, UINT32 uMessage, WPARAM32 wParam
   switch (uMessage)
   { case WM_NCCREATE:
       { TRACE(shell,"-- WM_NCCREATE\n");
-        lpcs = (LPCREATESTRUCT32A)lParam;
+        lpcs = (LPCREATESTRUCTA)lParam;
         pThis = (LPSHELLVIEW)(lpcs->lpCreateParams);
-        SetWindowLong32A(hWnd, GWL_USERDATA, (LONG)pThis);
+        SetWindowLongA(hWnd, GWL_USERDATA, (LONG)pThis);
         pThis->hWnd = hWnd;        /*set the window handle*/
       }
       break;
@@ -1141,7 +1141,7 @@ LRESULT CALLBACK ShellView_WndProc(HWND32 hWnd, UINT32 uMessage, WPARAM32 wParam
 
    case WM_SHOWWINDOW:
       TRACE(shell,"-- WM_SHOWWINDOW\n");
-      UpdateWindow32(pThis->hWndList);
+      UpdateWindow(pThis->hWndList);
       break;
 
    case WM_ACTIVATE:
@@ -1156,11 +1156,11 @@ LRESULT CALLBACK ShellView_WndProc(HWND32 hWnd, UINT32 uMessage, WPARAM32 wParam
    
    case WM_INITMENUPOPUP:
       TRACE(shell,"-- WM_INITMENUPOPUP\n");
-      return ShellView_UpdateMenu(pThis, (HMENU32)wParam);
+      return ShellView_UpdateMenu(pThis, (HMENU)wParam);
    
    case WM_NOTIFY:
       TRACE(shell,"-- WM_NOTIFY\n");
-      return ShellView_OnNotify(pThis,(UINT32)wParam, (LPNMHDR)lParam);
+      return ShellView_OnNotify(pThis,(UINT)wParam, (LPNMHDR)lParam);
 
    case WM_SETTINGCHANGE:
       TRACE(shell,"-- WM_SETTINGCHANGE\n");
@@ -1179,7 +1179,7 @@ LRESULT CALLBACK ShellView_WndProc(HWND32 hWnd, UINT32 uMessage, WPARAM32 wParam
       TRACE(shell,"-- message %s unhandled\n", SPY_GetMsgName(uMessage));
       break;
   }
-  return DefWindowProc32A (hWnd, uMessage, wParam, lParam);
+  return DefWindowProcA (hWnd, uMessage, wParam, lParam);
 }
 /**************************************************************************
 *
@@ -1248,13 +1248,13 @@ static ULONG WINAPI IShellView_Release(LPSHELLVIEW this)
 /**************************************************************************
 *  ShellView_GetWindow
 */
-static HRESULT WINAPI IShellView_GetWindow(LPSHELLVIEW this,HWND32 * phWnd)
+static HRESULT WINAPI IShellView_GetWindow(LPSHELLVIEW this,HWND * phWnd)
 {	TRACE(shell,"(%p)\n",this);
 	*phWnd = this->hWnd;
 
 	return S_OK;
 }
-static HRESULT WINAPI IShellView_ContextSensitiveHelp(LPSHELLVIEW this,BOOL32 fEnterMode)
+static HRESULT WINAPI IShellView_ContextSensitiveHelp(LPSHELLVIEW this,BOOL fEnterMode)
 { FIXME(shell,"(%p) stub\n",this);
   return E_NOTIMPL;
 }
@@ -1264,7 +1264,7 @@ static HRESULT WINAPI IShellView_ContextSensitiveHelp(LPSHELLVIEW this,BOOL32 fE
 * FIXME:
 *  use the accel functions
 */
-static HRESULT WINAPI IShellView_TranslateAccelerator(LPSHELLVIEW this,LPMSG32 lpmsg)
+static HRESULT WINAPI IShellView_TranslateAccelerator(LPSHELLVIEW this,LPMSG lpmsg)
 {	FIXME(shell,"(%p)->(%p: hwnd=%x msg=%x lp=%lx wp=%x) stub\n",this,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam);
 
 	
@@ -1273,11 +1273,11 @@ static HRESULT WINAPI IShellView_TranslateAccelerator(LPSHELLVIEW this,LPMSG32 l
 	}
 	return S_FALSE;
 }
-static HRESULT WINAPI IShellView_EnableModeless(LPSHELLVIEW this,BOOL32 fEnable)
+static HRESULT WINAPI IShellView_EnableModeless(LPSHELLVIEW this,BOOL fEnable)
 { FIXME(shell,"(%p) stub\n",this);
   return E_NOTIMPL;
 }
-static HRESULT WINAPI IShellView_UIActivate(LPSHELLVIEW this,UINT32 uState)
+static HRESULT WINAPI IShellView_UIActivate(LPSHELLVIEW this,UINT uState)
 {	CHAR	szName[MAX_PATH];
 	LRESULT	lResult;
 	int	nPartArray[1] = {-1};
@@ -1310,7 +1310,7 @@ static HRESULT WINAPI IShellView_UIActivate(LPSHELLVIEW this,UINT32 uState)
 	  						(LPARAM)nPartArray, &lResult);
 
 	  /* set the text for the parts */
-	  IShellBrowser_SendControlMsg(this->pShellBrowser, FCW_STATUS, SB_SETTEXT32A,
+	  IShellBrowser_SendControlMsg(this->pShellBrowser, FCW_STATUS, SB_SETTEXTA,
 							0, (LPARAM)szName, &lResult);
 
 	  /*add the docking window if necessary */
@@ -1329,8 +1329,8 @@ static HRESULT WINAPI IShellView_Refresh(LPSHELLVIEW this)
 	return S_OK;
 }
 static HRESULT WINAPI IShellView_CreateViewWindow(LPSHELLVIEW this, IShellView *lpPrevView,
-                     LPCFOLDERSETTINGS lpfs, IShellBrowser * psb, RECT32 * prcView, HWND32  *phWnd)
-{	WNDCLASS32A wc;
+                     LPCFOLDERSETTINGS lpfs, IShellBrowser * psb, RECT * prcView, HWND  *phWnd)
+{	WNDCLASSA wc;
 /*	LRESULT dwResult;*/
 	*phWnd = 0;
 
@@ -1354,24 +1354,24 @@ static HRESULT WINAPI IShellView_CreateViewWindow(LPSHELLVIEW this, IShellView *
 	}
 	   
 	/*if our window class has not been registered, then do so*/
-	if(!GetClassInfo32A(shell32_hInstance, SV_CLASS_NAME, &wc))
+	if(!GetClassInfoA(shell32_hInstance, SV_CLASS_NAME, &wc))
 	{ ZeroMemory(&wc, sizeof(wc));
 	  wc.style          = CS_HREDRAW | CS_VREDRAW;
-	  wc.lpfnWndProc    = (WNDPROC32) ShellView_WndProc;
+	  wc.lpfnWndProc    = (WNDPROC) ShellView_WndProc;
 	  wc.cbClsExtra     = 0;
 	  wc.cbWndExtra     = 0;
 	  wc.hInstance      = shell32_hInstance;
 	  wc.hIcon          = 0;
-	  wc.hCursor        = LoadCursor32A (0, IDC_ARROW32A);
-	  wc.hbrBackground  = (HBRUSH32) (COLOR_WINDOW + 1);
+	  wc.hCursor        = LoadCursorA (0, IDC_ARROWA);
+	  wc.hbrBackground  = (HBRUSH) (COLOR_WINDOW + 1);
 	  wc.lpszMenuName   = NULL;
 	  wc.lpszClassName  = SV_CLASS_NAME;
    
-	  if(!RegisterClass32A(&wc))
+	  if(!RegisterClassA(&wc))
 	    return E_FAIL;
 	}
 
-	*phWnd = CreateWindowEx32A(0, SV_CLASS_NAME, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS,
+	*phWnd = CreateWindowExA(0, SV_CLASS_NAME, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS,
                            prcView->left, prcView->top, prcView->right - prcView->left, prcView->bottom - prcView->top,
                            this->hWndParent, 0, shell32_hInstance, (LPVOID)this);
                            
@@ -1389,9 +1389,9 @@ static HRESULT WINAPI IShellView_DestroyViewWindow(LPSHELLVIEW this)
 	/*Make absolutely sure all our UI is cleaned up.*/
 	IShellView_UIActivate(this, SVUIA_DEACTIVATE);
 	if(this->hMenu)
-   	{ DestroyMenu32(this->hMenu);
+   	{ DestroyMenu(this->hMenu);
 	}
-	DestroyWindow32(this->hWnd);
+	DestroyWindow(this->hWnd);
 	IShellBrowser_Release(this->pShellBrowser);
 	return S_OK;
 }
@@ -1414,11 +1414,11 @@ static HRESULT WINAPI IShellView_SaveViewState(LPSHELLVIEW this)
 { FIXME(shell,"(%p) stub\n",this);
   return S_OK;
 }
-static HRESULT WINAPI IShellView_SelectItem(LPSHELLVIEW this, LPCITEMIDLIST pidlItem, UINT32 uFlags)
+static HRESULT WINAPI IShellView_SelectItem(LPSHELLVIEW this, LPCITEMIDLIST pidlItem, UINT uFlags)
 { FIXME(shell,"(%p)->(pidl=%p, 0x%08x) stub\n",this, pidlItem, uFlags);
   return E_NOTIMPL;
 }
-static HRESULT WINAPI IShellView_GetItemObject(LPSHELLVIEW this, UINT32 uItem, REFIID riid, LPVOID *ppvOut)
+static HRESULT WINAPI IShellView_GetItemObject(LPSHELLVIEW this, UINT uItem, REFIID riid, LPVOID *ppvOut)
 { 	LPUNKNOWN	pObj = NULL; 
 	char    xriid[50];
 	
diff --git a/dlls/ver/ver16.c b/dlls/ver/ver16.c
index f2a05d4e153..25d7689ea5b 100644
--- a/dlls/ver/ver16.c
+++ b/dlls/ver/ver16.c
@@ -23,7 +23,7 @@ DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName,
     LPCSTR lpszResId = HIWORD( spszResId )? PTR_SEG_TO_LIN( spszResId )
                                           : (LPCSTR)spszResId;
 
-    return GetFileResourceSize32( lpszFileName, 
+    return GetFileResourceSize( lpszFileName, 
                                   lpszResType, lpszResId, lpdwFileOffset );
 }
 
@@ -40,7 +40,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName,
     LPCSTR lpszResId = HIWORD( spszResId )? PTR_SEG_TO_LIN( spszResId )
                                           : (LPCSTR)spszResId;
 
-    return GetFileResource32( lpszFileName, lpszResType, lpszResId,
+    return GetFileResource( lpszFileName, lpszResType, lpszResId,
                               dwFileOffset, dwResLen, lpvData );
 }
 
@@ -50,7 +50,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName,
 DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle )
 {
     TRACE( ver, "(%s, %p)\n", debugstr_a(lpszFileName), lpdwHandle );
-    return GetFileVersionInfoSize32A( lpszFileName, lpdwHandle );
+    return GetFileVersionInfoSizeA( lpszFileName, lpdwHandle );
 }
 
 /*************************************************************************
@@ -62,7 +62,7 @@ DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle,
     TRACE( ver, "(%s, %08lx, %ld, %p)\n", 
                 debugstr_a(lpszFileName), handle, cbBuf, lpvData );
 
-    return GetFileVersionInfo32A( lpszFileName, handle, cbBuf, lpvData );
+    return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData );
 }
 
 /*************************************************************************
@@ -73,8 +73,8 @@ DWORD WINAPI VerFindFile16( UINT16 flags, LPCSTR lpszFilename,
                             LPSTR lpszCurDir, UINT16 *lpuCurDirLen,
                             LPSTR lpszDestDir, UINT16 *lpuDestDirLen )
 {
-    UINT32 curDirLen, destDirLen;
-    DWORD retv = VerFindFile32A( flags, lpszFilename, lpszWinDir, lpszAppDir,
+    UINT curDirLen, destDirLen;
+    DWORD retv = VerFindFileA( flags, lpszFilename, lpszWinDir, lpszAppDir,
                                  lpszCurDir, &curDirLen, lpszDestDir, &destDirLen );
 
     *lpuCurDirLen = (UINT16)curDirLen;
@@ -90,8 +90,8 @@ DWORD WINAPI VerInstallFile16( UINT16 flags,
                                LPCSTR lpszSrcDir, LPCSTR lpszDestDir, LPCSTR lpszCurDir,
                                LPSTR lpszTmpFile, UINT16 *lpwTmpFileLen )
 {
-    UINT32 filelen;
-    DWORD retv = VerInstallFile32A( flags, lpszSrcFilename, lpszDestFilename, 
+    UINT filelen;
+    DWORD retv = VerInstallFileA( flags, lpszSrcFilename, lpszDestFilename, 
                                     lpszSrcDir, lpszDestDir, lpszCurDir, 
                                     lpszTmpFile, &filelen);
 
@@ -104,7 +104,7 @@ DWORD WINAPI VerInstallFile16( UINT16 flags,
  */
 DWORD WINAPI VerLanguageName16( UINT16 uLang, LPSTR lpszLang, UINT16 cbLang )
 {
-    return VerLanguageName32A( uLang, lpszLang, cbLang );
+    return VerLanguageNameA( uLang, lpszLang, cbLang );
 }
 
 /*************************************************************************
@@ -115,13 +115,13 @@ DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock,
 {
     LPVOID lpvBlock = PTR_SEG_TO_LIN( spvBlock );
     LPVOID buffer = lpvBlock;
-    UINT32 buflen;
+    UINT buflen;
     DWORD retv;
 
     TRACE( ver, "(%p, %s, %p, %p)\n", 
                 lpvBlock, debugstr_a(lpszSubBlock), lpspBuffer, lpcb );
 
-    retv = VerQueryValue32A( lpvBlock, lpszSubBlock, &buffer, &buflen );
+    retv = VerQueryValueA( lpvBlock, lpszSubBlock, &buffer, &buflen );
     if ( !retv ) return FALSE;
 
     if ( OFFSETOF( spvBlock ) + (buffer - lpvBlock) >= 0x10000 )
diff --git a/dlls/version/info.c b/dlls/version/info.c
index b9c8f8c75ad..f28c0c93121 100644
--- a/dlls/version/info.c
+++ b/dlls/version/info.c
@@ -174,9 +174,9 @@ typedef struct
     ( ((VS_VERSION_INFO_STRUCT16 *)ver)->szKey[0] >= ' ' )
 
 #define VersionInfo16_Value( ver )  \
-    (LPBYTE)( ((DWORD)((ver)->szKey) + (lstrlen32A((ver)->szKey)+1) + 3) & ~3 )
+    (LPBYTE)( ((DWORD)((ver)->szKey) + (lstrlenA((ver)->szKey)+1) + 3) & ~3 )
 #define VersionInfo32_Value( ver )  \
-    (LPBYTE)( ((DWORD)((ver)->szKey) + 2*(lstrlen32W((ver)->szKey)+1) + 3) & ~3 )
+    (LPBYTE)( ((DWORD)((ver)->szKey) + 2*(lstrlenW((ver)->szKey)+1) + 3) & ~3 )
 
 #define VersionInfo16_Children( ver )  \
     (VS_VERSION_INFO_STRUCT16 *)( VersionInfo16_Value( ver ) + \
@@ -223,7 +223,7 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
     }
     else if ( bText )
     {
-        info16->wValueLength = lstrlen32W( (LPCWSTR)lpValue ) + 1;
+        info16->wValueLength = lstrlenW( (LPCWSTR)lpValue ) + 1;
         lstrcpyWtoA( VersionInfo16_Value( info16 ), (LPCWSTR)lpValue );
 
         TRACE( ver, "Copied value from %p to %p: %s\n", lpValue, 
@@ -262,7 +262,7 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
 /***********************************************************************
  *           GetFileVersionInfoSize32A         [VERSION.2]
  */
-DWORD WINAPI GetFileVersionInfoSize32A( LPCSTR filename, LPDWORD handle )
+DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
 {
     VS_FIXEDFILEINFO *vffi;
     DWORD len, ret, offset;
@@ -270,15 +270,15 @@ DWORD WINAPI GetFileVersionInfoSize32A( LPCSTR filename, LPDWORD handle )
 
     TRACE( ver, "(%s,%p)\n", debugstr_a(filename), handle );
 
-    len = GetFileResourceSize32( filename,
-                                 MAKEINTRESOURCE32A(VS_FILE_INFO),
-                                 MAKEINTRESOURCE32A(VS_VERSION_INFO),
+    len = GetFileResourceSize( filename,
+                                 MAKEINTRESOURCEA(VS_FILE_INFO),
+                                 MAKEINTRESOURCEA(VS_VERSION_INFO),
                                  &offset );
     if (!len) return 0;
 
-    ret = GetFileResource32( filename,
-                             MAKEINTRESOURCE32A(VS_FILE_INFO),
-                             MAKEINTRESOURCE32A(VS_VERSION_INFO),
+    ret = GetFileResource( filename,
+                             MAKEINTRESOURCEA(VS_FILE_INFO),
+                             MAKEINTRESOURCEA(VS_VERSION_INFO),
                              offset, sizeof( buf ), buf );
     if (!ret) return 0;
 
@@ -308,10 +308,10 @@ DWORD WINAPI GetFileVersionInfoSize32A( LPCSTR filename, LPDWORD handle )
 /***********************************************************************
  *           GetFileVersionInfoSize32W         [VERSION.3]
  */
-DWORD WINAPI GetFileVersionInfoSize32W( LPCWSTR filename, LPDWORD handle )
+DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
 {
     LPSTR fn = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    DWORD ret = GetFileVersionInfoSize32A( fn, handle );
+    DWORD ret = GetFileVersionInfoSizeA( fn, handle );
     HeapFree( GetProcessHeap(), 0, fn );
     return ret;
 }
@@ -319,14 +319,14 @@ DWORD WINAPI GetFileVersionInfoSize32W( LPCWSTR filename, LPDWORD handle )
 /***********************************************************************
  *           GetFileVersionInfo32A             [VERSION.1]
  */
-DWORD WINAPI GetFileVersionInfo32A( LPCSTR filename, DWORD handle,
+DWORD WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle,
                                     DWORD datasize, LPVOID data )
 {
     TRACE( ver, "(%s,%ld,size=%ld,data=%p)\n",
                 debugstr_a(filename), handle, datasize, data );
 
-    if ( !GetFileResource32( filename, MAKEINTRESOURCE32A(VS_FILE_INFO),
-                                       MAKEINTRESOURCE32A(VS_VERSION_INFO),
+    if ( !GetFileResource( filename, MAKEINTRESOURCEA(VS_FILE_INFO),
+                                       MAKEINTRESOURCEA(VS_VERSION_INFO),
                                        handle, datasize, data ) )
         return FALSE;
 
@@ -345,7 +345,7 @@ DWORD WINAPI GetFileVersionInfo32A( LPCSTR filename, DWORD handle,
 /***********************************************************************
  *           GetFileVersionInfo32W             [VERSION.4]
  */
-DWORD WINAPI GetFileVersionInfo32W( LPCWSTR filename, DWORD handle,
+DWORD WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle,
                                     DWORD datasize, LPVOID data )
 {
     LPSTR fn = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
@@ -354,8 +354,8 @@ DWORD WINAPI GetFileVersionInfo32W( LPCWSTR filename, DWORD handle,
     TRACE( ver, "(%s,%ld,size=%ld,data=%p)\n",
                 debugstr_a(fn), handle, datasize, data );
 
-    if ( !GetFileResource32( fn, MAKEINTRESOURCE32A(VS_FILE_INFO),
-                                 MAKEINTRESOURCE32A(VS_VERSION_INFO),
+    if ( !GetFileResource( fn, MAKEINTRESOURCEA(VS_FILE_INFO),
+                                 MAKEINTRESOURCEA(VS_VERSION_INFO),
                                  handle, datasize, data ) )
         retv = FALSE;
 
@@ -376,13 +376,13 @@ DWORD WINAPI GetFileVersionInfo32W( LPCWSTR filename, DWORD handle,
  *           VersionInfo16_FindChild             [internal]
  */
 VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( VS_VERSION_INFO_STRUCT16 *info, 
-                                            LPCSTR szKey, UINT32 cbKey )
+                                            LPCSTR szKey, UINT cbKey )
 {
     VS_VERSION_INFO_STRUCT16 *child = VersionInfo16_Children( info );
 
     while ( (DWORD)child < (DWORD)info + info->wLength )
     {
-        if ( !lstrncmpi32A( child->szKey, szKey, cbKey ) )
+        if ( !lstrncmpiA( child->szKey, szKey, cbKey ) )
             return child;
 
 	if (!(child->wLength)) return NULL;
@@ -396,13 +396,13 @@ VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( VS_VERSION_INFO_STRUCT16 *inf
  *           VersionInfo32_FindChild             [internal]
  */
 VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( VS_VERSION_INFO_STRUCT32 *info, 
-                                            LPCWSTR szKey, UINT32 cbKey )
+                                            LPCWSTR szKey, UINT cbKey )
 {
     VS_VERSION_INFO_STRUCT32 *child = VersionInfo32_Children( info );
 
     while ( (DWORD)child < (DWORD)info + info->wLength )
     {
-        if ( !lstrncmpi32W( child->szKey, szKey, cbKey ) )
+        if ( !lstrncmpiW( child->szKey, szKey, cbKey ) )
             return child;
 
         child = VersionInfo32_Next( child );
@@ -414,8 +414,8 @@ VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( VS_VERSION_INFO_STRUCT32 *inf
 /***********************************************************************
  *           VerQueryValue32A              [VERSION.12]
  */
-DWORD WINAPI VerQueryValue32A( LPVOID pBlock, LPCSTR lpSubBlock,
-                               LPVOID *lplpBuffer, UINT32 *puLen )
+DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
+                               LPVOID *lplpBuffer, UINT *puLen )
 {
     VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock;
     if ( !VersionInfoIs16( info ) )
@@ -460,8 +460,8 @@ DWORD WINAPI VerQueryValue32A( LPVOID pBlock, LPCSTR lpSubBlock,
 /***********************************************************************
  *           VerQueryValue32W              [VERSION.13]
  */
-DWORD WINAPI VerQueryValue32W( LPVOID pBlock, LPCWSTR lpSubBlock,
-                               LPVOID *lplpBuffer, UINT32 *puLen )
+DWORD WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock,
+                               LPVOID *lplpBuffer, UINT *puLen )
 {
     VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock;
     if ( VersionInfoIs16( info ) )
@@ -503,12 +503,12 @@ DWORD WINAPI VerQueryValue32W( LPVOID pBlock, LPCWSTR lpSubBlock,
     return TRUE;
 }
 
-extern LPCSTR WINE_GetLanguageName( UINT32 langid );
+extern LPCSTR WINE_GetLanguageName( UINT langid );
 
 /***********************************************************************
  *           VerLanguageName32A              [VERSION.9]
  */
-DWORD WINAPI VerLanguageName32A( UINT32 wLang, LPSTR szLang, UINT32 nSize )
+DWORD WINAPI VerLanguageNameA( UINT wLang, LPSTR szLang, UINT nSize )
 {
     char    buffer[80];
     LPCSTR  name;
@@ -525,7 +525,7 @@ DWORD WINAPI VerLanguageName32A( UINT32 wLang, LPSTR szLang, UINT32 nSize )
              "\\System\\CurrentControlSet\\control\\Nls\\Locale\\%08x",
              wLang );
 
-    result = RegQueryValue32A( HKEY_LOCAL_MACHINE, buffer, szLang, (LPDWORD)&nSize );
+    result = RegQueryValueA( HKEY_LOCAL_MACHINE, buffer, szLang, (LPDWORD)&nSize );
     if ( result == ERROR_SUCCESS || result == ERROR_MORE_DATA ) 
         return nSize;
 
@@ -535,14 +535,14 @@ DWORD WINAPI VerLanguageName32A( UINT32 wLang, LPSTR szLang, UINT32 nSize )
      */
 
     name = WINE_GetLanguageName( wLang );
-    lstrcpyn32A( szLang, name, nSize );
-    return lstrlen32A( name );
+    lstrcpynA( szLang, name, nSize );
+    return lstrlenA( name );
 }
 
 /***********************************************************************
  *           VerLanguageName32W              [VERSION.10]
  */
-DWORD WINAPI VerLanguageName32W( UINT32 wLang, LPWSTR szLang, UINT32 nSize )
+DWORD WINAPI VerLanguageNameW( UINT wLang, LPWSTR szLang, UINT nSize )
 {
     char    buffer[80];
     LPWSTR  keyname;
@@ -561,7 +561,7 @@ DWORD WINAPI VerLanguageName32W( UINT32 wLang, LPWSTR szLang, UINT32 nSize )
              wLang );
 
     keyname = HEAP_strdupAtoW( GetProcessHeap(), 0, buffer );
-    result = RegQueryValue32W( HKEY_LOCAL_MACHINE, keyname, szLang, (LPDWORD)&nSize );
+    result = RegQueryValueW( HKEY_LOCAL_MACHINE, keyname, szLang, (LPDWORD)&nSize );
     HeapFree( GetProcessHeap(), 0, keyname );
 
     if ( result == ERROR_SUCCESS || result == ERROR_MORE_DATA ) 
@@ -574,7 +574,7 @@ DWORD WINAPI VerLanguageName32W( UINT32 wLang, LPWSTR szLang, UINT32 nSize )
 
     name = WINE_GetLanguageName( wLang );
     lstrcpynAtoW( szLang, name, nSize );
-    return lstrlen32A( name );
+    return lstrlenA( name );
 }
 
 
diff --git a/dlls/version/install.c b/dlls/version/install.c
index 40c8d5f4dae..ab836fc7b09 100644
--- a/dlls/version/install.c
+++ b/dlls/version/install.c
@@ -95,7 +95,7 @@ static int  testFileExistence(
     /* Create the full pathname */
     strcat(filename, file);
 
-    if(OpenFile32(filename, &fileinfo, OF_EXIST) == HFILE_ERROR32)
+    if(OpenFile(filename, &fileinfo, OF_EXIST) == HFILE_ERROR)
 	retval = 0;
     else
 	retval = 1;
@@ -145,8 +145,8 @@ static int  testFileExclusiveExistence(
     /* Create the full pathname */
     strcat(filename, file);
 
-    if(OpenFile32(filename, &fileinfo, OF_EXIST | OF_SHARE_EXCLUSIVE) ==
-       HFILE_ERROR32)
+    if(OpenFile(filename, &fileinfo, OF_EXIST | OF_SHARE_EXCLUSIVE) ==
+       HFILE_ERROR)
 	retval = 0;
     else
 	retval = 1;
@@ -168,15 +168,15 @@ static int  testFileExclusiveExistence(
  ****************************************************************************/
 
 /* VerFindFile32A						[VERSION.5] */
-DWORD WINAPI VerFindFile32A(
-    UINT32 flags,
+DWORD WINAPI VerFindFileA(
+    UINT flags,
     LPCSTR lpszFilename,
     LPCSTR lpszWinDir,
     LPCSTR lpszAppDir,
     LPSTR lpszCurDir,
-    UINT32 *lpuCurDirLen,
+    UINT *lpuCurDirLen,
     LPSTR lpszDestDir,
-    UINT32 *lpuDestDirLen )
+    UINT *lpuDestDirLen )
 {
     DWORD  retval;
     char  curDir[256];
@@ -217,7 +217,7 @@ DWORD WINAPI VerFindFile32A(
     strcpy(destDir, "");
 
     if(flags & VFFF_ISSHAREDFILE) {
-	GetSystemDirectory32A(destDir, 256);
+	GetSystemDirectoryA(destDir, 256);
 
 	/* Were we given a filename?  If so, try to find the file. */
 	if(lpszFilename) {
@@ -240,7 +240,7 @@ DWORD WINAPI VerFindFile32A(
     else if(!(flags & VFFF_ISSHAREDFILE)) { /* not a shared file */
 	if(lpszAppDir) {
 	    char  systemDir[256];
-	    GetSystemDirectory32A(systemDir, 256);
+	    GetSystemDirectoryA(systemDir, 256);
 
 	    strcpy(destDir, lpszAppDir);
 
@@ -316,11 +316,11 @@ DWORD WINAPI VerFindFile32A(
 }
 
 /* VerFindFile32W						[VERSION.6] */
-DWORD WINAPI VerFindFile32W(
-	UINT32 flags,LPCWSTR filename,LPCWSTR windir,LPCWSTR appdir,
-	LPWSTR curdir,UINT32 *pcurdirlen,LPWSTR destdir,UINT32 *pdestdirlen )
+DWORD WINAPI VerFindFileW(
+	UINT flags,LPCWSTR filename,LPCWSTR windir,LPCWSTR appdir,
+	LPWSTR curdir,UINT *pcurdirlen,LPWSTR destdir,UINT *pdestdirlen )
 {
-    UINT32 curdirlen, destdirlen;
+    UINT curdirlen, destdirlen;
     LPSTR wfn,wwd,wad,wdd,wcd;
     DWORD ret;
 
@@ -329,7 +329,7 @@ DWORD WINAPI VerFindFile32W(
     wad = HEAP_strdupWtoA( GetProcessHeap(), 0, appdir );
     wcd = HeapAlloc( GetProcessHeap(), 0, *pcurdirlen );
     wdd = HeapAlloc( GetProcessHeap(), 0, *pdestdirlen );
-    ret = VerFindFile32A(flags,wfn,wwd,wad,wcd,&curdirlen,wdd,&destdirlen);
+    ret = VerFindFileA(flags,wfn,wwd,wad,wcd,&curdirlen,wdd,&destdirlen);
     lstrcpynAtoW(curdir,wcd,*pcurdirlen);
     lstrcpynAtoW(destdir,wdd,*pdestdirlen);
     *pcurdirlen = strlen(wcd);
@@ -351,7 +351,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) {
     alloclen = 1000;
     buf= xmalloc(alloclen);
     while (1) {
-    	ret = GetFileVersionInfo32A(fn,0,alloclen,buf);
+    	ret = GetFileVersionInfoA(fn,0,alloclen,buf);
 	if (!ret) {
 	    free(buf);
 	    return 0;
@@ -387,13 +387,13 @@ _error2vif(DWORD error) {
 /******************************************************************************
  * VerInstallFile32A [VERSION.7]
  */
-DWORD WINAPI VerInstallFile32A(
-	UINT32 flags,LPCSTR srcfilename,LPCSTR destfilename,LPCSTR srcdir,
- 	LPCSTR destdir,LPCSTR curdir,LPSTR tmpfile,UINT32 *tmpfilelen )
+DWORD WINAPI VerInstallFileA(
+	UINT flags,LPCSTR srcfilename,LPCSTR destfilename,LPCSTR srcdir,
+ 	LPCSTR destdir,LPCSTR curdir,LPSTR tmpfile,UINT *tmpfilelen )
 {
     LPCSTR pdest;
     char	destfn[260],tmpfn[260],srcfn[260];
-    HFILE32	hfsrc,hfdst;
+    HFILE	hfsrc,hfdst;
     DWORD	attr,ret,xret,tmplast;
     LPBYTE	buf1,buf2;
     OFSTRUCT	ofs;
@@ -406,15 +406,15 @@ DWORD WINAPI VerInstallFile32A(
     if (!destdir || !*destdir) pdest = srcdir;
     else pdest = destdir;
     sprintf(destfn,"%s\\%s",pdest,destfilename);
-    hfsrc=LZOpenFile32A(srcfn,&ofs,OF_READ);
-    if (hfsrc==HFILE_ERROR32)
+    hfsrc=LZOpenFileA(srcfn,&ofs,OF_READ);
+    if (hfsrc==HFILE_ERROR)
     	return VIF_CANNOTREADSRC;
     sprintf(tmpfn,"%s\\%s",pdest,destfilename);
     tmplast=strlen(pdest)+1;
-    attr = GetFileAttributes32A(tmpfn);
+    attr = GetFileAttributesA(tmpfn);
     if (attr!=-1) {
 	if (attr & FILE_ATTRIBUTE_READONLY) {
-	    LZClose32(hfsrc);
+	    LZClose(hfsrc);
 	    return VIF_WRITEPROT;
 	}
 	/* FIXME: check if file currently in use and return VIF_FILEINUSE */
@@ -424,7 +424,7 @@ DWORD WINAPI VerInstallFile32A(
     	if (tmpfile[0]) {
 	    sprintf(tmpfn,"%s\\%s",pdest,tmpfile);
 	    tmplast = strlen(pdest)+1;
-	    attr = GetFileAttributes32A(tmpfn);
+	    attr = GetFileAttributesA(tmpfn);
 	    /* if it exists, it has been copied by the call before.
 	     * we jump over the copy part... 
 	     */
@@ -433,19 +433,19 @@ DWORD WINAPI VerInstallFile32A(
     if (attr == -1) {
     	char	*s;
 
-	GetTempFileName32A(pdest,"ver",0,tmpfn); /* should not fail ... */
+	GetTempFileNameA(pdest,"ver",0,tmpfn); /* should not fail ... */
 	s=strrchr(tmpfn,'\\');
 	if (s)
 	    tmplast = s-tmpfn;
 	else
 	    tmplast = 0;
-	hfdst = OpenFile32(tmpfn,&ofs,OF_CREATE);
-	if (hfdst == HFILE_ERROR32) {
-	    LZClose32(hfsrc);
+	hfdst = OpenFile(tmpfn,&ofs,OF_CREATE);
+	if (hfdst == HFILE_ERROR) {
+	    LZClose(hfsrc);
 	    return VIF_CANNOTCREATE; /* | translated dos error */
 	}
-	ret = LZCopy32(hfsrc,hfdst);
-	_lclose32(hfdst);
+	ret = LZCopy(hfsrc,hfdst);
+	_lclose(hfdst);
 	if (((long) ret) < 0) {
 	    /* translate LZ errors into VIF_xxx */
 	    switch (ret) {
@@ -468,7 +468,7 @@ DWORD WINAPI VerInstallFile32A(
 		break;
 	    }
 	    if (ret) {
-		LZClose32(hfsrc);
+		LZClose(hfsrc);
 		return ret;
 	    }
 	}
@@ -481,7 +481,7 @@ DWORD WINAPI VerInstallFile32A(
 	    buf2 = _fetch_versioninfo(tmpfn,&tmpvffi);
 	    if (buf2) {
 	    	char	*tbuf1,*tbuf2;
-		UINT32	len1,len2;
+		UINT	len1,len2;
 
 		len1=len2=40;
 
@@ -497,8 +497,8 @@ DWORD WINAPI VerInstallFile32A(
 		    (destvffi->dwFileSubtype!=tmpvffi->dwFileSubtype)
 		)
 		    xret |= VIF_MISMATCH|VIF_DIFFTYPE;
-		if (VerQueryValue32A(buf1,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf1,&len1) &&
-		    VerQueryValue32A(buf2,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf2,&len2)
+		if (VerQueryValueA(buf1,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf1,&len1) &&
+		    VerQueryValueA(buf2,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf2,&len2)
 		) {
 		    /* irgendwas mit tbuf1 und tbuf2 machen 
 		     * generiert DIFFLANG|MISMATCH
@@ -513,48 +513,48 @@ DWORD WINAPI VerInstallFile32A(
     if (xret) {
 	if (*tmpfilelen<strlen(tmpfn+tmplast)) {
 	    xret|=VIF_BUFFTOOSMALL;
-	    DeleteFile32A(tmpfn);
+	    DeleteFileA(tmpfn);
 	} else {
 	    strcpy(tmpfile,tmpfn+tmplast);
 	    *tmpfilelen = strlen(tmpfn+tmplast)+1;
 	    xret|=VIF_TEMPFILE;
 	}
     } else {
-    	if (-1!=GetFileAttributes32A(destfn))
-	    if (!DeleteFile32A(destfn)) {
+    	if (-1!=GetFileAttributesA(destfn))
+	    if (!DeleteFileA(destfn)) {
 		xret|=_error2vif(GetLastError())|VIF_CANNOTDELETE;
-		DeleteFile32A(tmpfn);
-		LZClose32(hfsrc);
+		DeleteFileA(tmpfn);
+		LZClose(hfsrc);
 		return xret;
 	    }
 	if ((!(flags & VIFF_DONTDELETEOLD))	&& 
 	    curdir				&& 
 	    *curdir				&&
-	    lstrcmpi32A(curdir,pdest)
+	    lstrcmpiA(curdir,pdest)
 	) {
 	    char curfn[260];
 
 	    sprintf(curfn,"%s\\%s",curdir,destfilename);
-	    if (-1!=GetFileAttributes32A(curfn)) {
+	    if (-1!=GetFileAttributesA(curfn)) {
 		/* FIXME: check if in use ... if it is, VIF_CANNOTDELETECUR */
-		if (!DeleteFile32A(curfn))
+		if (!DeleteFileA(curfn))
 	    	    xret|=_error2vif(GetLastError())|VIF_CANNOTDELETECUR;
 	    }
 	}
-	if (!MoveFile32A(tmpfn,destfn)) {
+	if (!MoveFileA(tmpfn,destfn)) {
 	    xret|=_error2vif(GetLastError())|VIF_CANNOTRENAME;
-	    DeleteFile32A(tmpfn);
+	    DeleteFileA(tmpfn);
 	}
     }
-    LZClose32(hfsrc);
+    LZClose(hfsrc);
     return xret;
 }
 
 
 /* VerInstallFile32W				[VERSION.8] */
-DWORD WINAPI VerInstallFile32W(
-	UINT32 flags,LPCWSTR srcfilename,LPCWSTR destfilename,LPCWSTR srcdir,
-	LPCWSTR destdir,LPCWSTR curdir,LPWSTR tmpfile,UINT32 *tmpfilelen )
+DWORD WINAPI VerInstallFileW(
+	UINT flags,LPCWSTR srcfilename,LPCWSTR destfilename,LPCWSTR srcdir,
+	LPCWSTR destdir,LPCWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen )
 {
     LPSTR wsrcf,wsrcd,wdestf,wdestd,wtmpf,wcurd;
     DWORD ret;
@@ -565,7 +565,7 @@ DWORD WINAPI VerInstallFile32W(
     wdestd = HEAP_strdupWtoA( GetProcessHeap(), 0, destdir );
     wtmpf  = HEAP_strdupWtoA( GetProcessHeap(), 0, tmpfile );
     wcurd  = HEAP_strdupWtoA( GetProcessHeap(), 0, curdir );
-    ret = VerInstallFile32A(flags,wsrcf,wdestf,wsrcd,wdestd,wcurd,wtmpf,tmpfilelen);
+    ret = VerInstallFileA(flags,wsrcf,wdestf,wsrcd,wdestd,wcurd,wtmpf,tmpfilelen);
     if (!ret)
     	lstrcpynAtoW(tmpfile,wtmpf,*tmpfilelen);
     HeapFree( GetProcessHeap(), 0, wsrcf );
diff --git a/dlls/version/resource.c b/dlls/version/resource.c
index 2a48b97d54c..13cfb90ff13 100644
--- a/dlls/version/resource.c
+++ b/dlls/version/resource.c
@@ -23,22 +23,22 @@
 /***********************************************************************
  *           read_xx_header         [internal]
  */
-static int read_xx_header( HFILE32 lzfd )
+static int read_xx_header( HFILE lzfd )
 {
     IMAGE_DOS_HEADER mzh;
     char magic[3];
 
-    LZSeek32( lzfd, 0, SEEK_SET );
-    if ( sizeof(mzh) != LZRead32( lzfd, &mzh, sizeof(mzh) ) )
+    LZSeek( lzfd, 0, SEEK_SET );
+    if ( sizeof(mzh) != LZRead( lzfd, &mzh, sizeof(mzh) ) )
         return 0;
     if ( mzh.e_magic != IMAGE_DOS_SIGNATURE )
         return 0;
 
-    LZSeek32( lzfd, mzh.e_lfanew, SEEK_SET );
-    if ( 2 != LZRead32( lzfd, magic, 2 ) )
+    LZSeek( lzfd, mzh.e_lfanew, SEEK_SET );
+    if ( 2 != LZRead( lzfd, magic, 2 ) )
         return 0;
 
-    LZSeek32( lzfd, mzh.e_lfanew, SEEK_SET );
+    LZSeek( lzfd, mzh.e_lfanew, SEEK_SET );
 
     if ( magic[0] == 'N' && magic[1] == 'E' )
         return IMAGE_OS2_SIGNATURE;
@@ -53,7 +53,7 @@ static int read_xx_header( HFILE32 lzfd )
 /***********************************************************************
  *           load_ne_resource         [internal]
  */
-static BOOL32 find_ne_resource( HFILE32 lzfd, LPCSTR typeid, LPCSTR resid,
+static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
                                 DWORD *resLen, DWORD *resOff )
 {
     IMAGE_OS2_HEADER nehd;
@@ -64,8 +64,8 @@ static BOOL32 find_ne_resource( HFILE32 lzfd, LPCSTR typeid, LPCSTR resid,
     DWORD resTabSize;
 
     /* Read in NE header */ 
-    nehdoffset = LZSeek32( lzfd, 0, SEEK_CUR );
-    if ( sizeof(nehd) != LZRead32( lzfd, &nehd, sizeof(nehd) ) ) return 0;
+    nehdoffset = LZSeek( lzfd, 0, SEEK_CUR );
+    if ( sizeof(nehd) != LZRead( lzfd, &nehd, sizeof(nehd) ) ) return 0;
 
     resTabSize = nehd.rname_tab_offset - nehd.resource_tab_offset; 
     if ( !resTabSize )
@@ -78,8 +78,8 @@ static BOOL32 find_ne_resource( HFILE32 lzfd, LPCSTR typeid, LPCSTR resid,
     resTab = HeapAlloc( GetProcessHeap(), 0, resTabSize );
     if ( !resTab ) return FALSE;
 
-    LZSeek32( lzfd, nehd.resource_tab_offset + nehdoffset, SEEK_SET );
-    if ( resTabSize != LZRead32( lzfd, resTab, resTabSize ) )
+    LZSeek( lzfd, nehd.resource_tab_offset + nehdoffset, SEEK_SET );
+    if ( resTabSize != LZRead( lzfd, resTab, resTabSize ) )
     {
         HeapFree( GetProcessHeap(), 0, resTab );
         return FALSE;
@@ -113,7 +113,7 @@ static BOOL32 find_ne_resource( HFILE32 lzfd, LPCSTR typeid, LPCSTR resid,
 /***********************************************************************
  *           load_pe_resource         [internal]
  */
-static BOOL32 find_pe_resource( HFILE32 lzfd, LPCSTR typeid, LPCSTR resid,
+static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
                                 DWORD *resLen, DWORD *resOff )
 {
     IMAGE_NT_HEADERS pehd;
@@ -129,8 +129,8 @@ static BOOL32 find_pe_resource( HFILE32 lzfd, LPCSTR typeid, LPCSTR resid,
 
 
     /* Read in PE header */
-    pehdoffset = LZSeek32( lzfd, 0, SEEK_CUR );
-    if ( sizeof(pehd) != LZRead32( lzfd, &pehd, sizeof(pehd) ) ) return 0;
+    pehdoffset = LZSeek( lzfd, 0, SEEK_CUR );
+    if ( sizeof(pehd) != LZRead( lzfd, &pehd, sizeof(pehd) ) ) return 0;
 
     resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_FILE_RESOURCE_DIRECTORY;
     if ( !resDataDir->Size )
@@ -145,13 +145,13 @@ static BOOL32 find_pe_resource( HFILE32 lzfd, LPCSTR typeid, LPCSTR resid,
                           nSections * sizeof(IMAGE_SECTION_HEADER) );
     if ( !sections ) return FALSE;
 
-    LZSeek32( lzfd, pehdoffset +
+    LZSeek( lzfd, pehdoffset +
                     sizeof(DWORD) + /* Signature */
                     sizeof(IMAGE_FILE_HEADER) +
                     pehd.FileHeader.SizeOfOptionalHeader, SEEK_SET );
 
     if ( nSections * sizeof(IMAGE_SECTION_HEADER) !=
-         LZRead32( lzfd, sections, nSections * sizeof(IMAGE_SECTION_HEADER) ) )
+         LZRead( lzfd, sections, nSections * sizeof(IMAGE_SECTION_HEADER) ) )
     {
         HeapFree( GetProcessHeap(), 0, sections );
         return FALSE;
@@ -180,8 +180,8 @@ static BOOL32 find_pe_resource( HFILE32 lzfd, LPCSTR typeid, LPCSTR resid,
         return FALSE;
     }
 
-    LZSeek32( lzfd, sections[i].PointerToRawData, SEEK_SET );
-    if ( resSectionSize != LZRead32( lzfd, resSection, resSectionSize ) )
+    LZSeek( lzfd, sections[i].PointerToRawData, SEEK_SET );
+    if ( resSectionSize != LZRead( lzfd, resSection, resSectionSize ) )
     {
         HeapFree( GetProcessHeap(), 0, resSection );
         HeapFree( GetProcessHeap(), 0, sections );
@@ -247,12 +247,12 @@ static BOOL32 find_pe_resource( HFILE32 lzfd, LPCSTR typeid, LPCSTR resid,
 /***********************************************************************
  *           GetFileResourceSize32         [internal]
  */
-DWORD WINAPI GetFileResourceSize32( LPCSTR lpszFileName,
+DWORD WINAPI GetFileResourceSize( LPCSTR lpszFileName,
                                     LPCSTR lpszResType, LPCSTR lpszResId,
                                     LPDWORD lpdwFileOffset )
 {
-    BOOL32 retv = FALSE;
-    HFILE32 lzfd;
+    BOOL retv = FALSE;
+    HFILE lzfd;
     OFSTRUCT ofs;
     DWORD reslen;
 
@@ -260,7 +260,7 @@ DWORD WINAPI GetFileResourceSize32( LPCSTR lpszFileName,
                 debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId, 
                 lpszResId );
 
-    lzfd = LZOpenFile32A( lpszFileName, &ofs, OF_READ );
+    lzfd = LZOpenFileA( lpszFileName, &ofs, OF_READ );
     if ( !lzfd ) return 0;
 
     switch ( read_xx_header( lzfd ) )
@@ -276,20 +276,20 @@ DWORD WINAPI GetFileResourceSize32( LPCSTR lpszFileName,
         break;
     }
 
-    LZClose32( lzfd );
+    LZClose( lzfd );
     return retv? reslen : 0;
 }
 
 /***********************************************************************
  *           GetFileResource32         [internal]
  */
-DWORD WINAPI GetFileResource32( LPCSTR lpszFileName,
+DWORD WINAPI GetFileResource( LPCSTR lpszFileName,
                                 LPCSTR lpszResType, LPCSTR lpszResId,
                                 DWORD dwFileOffset,
                                 DWORD dwResLen, LPVOID lpvData )
 {
-    BOOL32 retv = FALSE;
-    HFILE32 lzfd;
+    BOOL retv = FALSE;
+    HFILE lzfd;
     OFSTRUCT ofs;
     DWORD reslen = dwResLen;
 
@@ -297,7 +297,7 @@ DWORD WINAPI GetFileResource32( LPCSTR lpszFileName,
 		debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId, 
                 dwFileOffset, dwResLen, lpvData );
 
-    lzfd = LZOpenFile32A( lpszFileName, &ofs, OF_READ );
+    lzfd = LZOpenFileA( lpszFileName, &ofs, OF_READ );
     if ( lzfd == 0 ) return 0;
 
     if ( !dwFileOffset )
@@ -317,14 +317,14 @@ DWORD WINAPI GetFileResource32( LPCSTR lpszFileName,
 
         if ( !retv ) 
         {
-            LZClose32( lzfd );
+            LZClose( lzfd );
             return 0;
         }
     }
 
-    LZSeek32( lzfd, dwFileOffset, SEEK_SET );
-    reslen = LZRead32( lzfd, lpvData, min( reslen, dwResLen ) );
-    LZClose32( lzfd );
+    LZSeek( lzfd, dwFileOffset, SEEK_SET );
+    reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) );
+    LZClose( lzfd );
 
     return reslen;
 }
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index bbdbc0099e8..e5052af81fd 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -95,7 +95,7 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *prb, UINT16 mode)
       case ASPI_DOS:
 	/* translate real mode address */
 	if (prb->SRB_BufPointer)
-	    lpBuf = (BYTE *)DOSMEM_MapRealToLinear((UINT32)prb->SRB_BufPointer);
+	    lpBuf = (BYTE *)DOSMEM_MapRealToLinear((UINT)prb->SRB_BufPointer);
 	break;
       case ASPI_WIN16:
 	lpBuf = PTR_SEG_TO_LIN(prb->SRB_BufPointer);
@@ -177,7 +177,7 @@ ASPI_DebugPrintResult(SRB_ExecSCSICmd16 *prb, UINT16 mode)
       case ASPI_DOS:
 	/* translate real mode address */
 	if (prb->SRB_BufPointer)
-	    lpBuf = (BYTE *)DOSMEM_MapRealToLinear((UINT32)prb->SRB_BufPointer);
+	    lpBuf = (BYTE *)DOSMEM_MapRealToLinear((UINT)prb->SRB_BufPointer);
 	break;
       case ASPI_WIN16:
 	lpBuf = PTR_SEG_TO_LIN(prb->SRB_BufPointer);
@@ -235,7 +235,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode)
       case ASPI_DOS:
 	/* translate real mode address */
 	if (ptrPRB)
-	    lpBuf = (BYTE *)DOSMEM_MapRealToLinear((UINT32)lpPRB->SRB_BufPointer);
+	    lpBuf = (BYTE *)DOSMEM_MapRealToLinear((UINT)lpPRB->SRB_BufPointer);
 	break;
       case ASPI_WIN16:
 	lpBuf = PTR_SEG_TO_LIN(lpPRB->SRB_BufPointer);
diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c
index e57272e4fde..754a117eafd 100644
--- a/dlls/wnaspi32/winaspi32.c
+++ b/dlls/wnaspi32/winaspi32.c
@@ -24,7 +24,7 @@
 
 #ifdef linux
 static int
-ASPI_OpenDevice32(SRB_ExecSCSICmd32 *prb)
+ASPI_OpenDevice(SRB_ExecSCSICmd *prb)
 {
     int	fd;
     char	idstr[20];
@@ -80,7 +80,7 @@ ASPI_OpenDevice32(SRB_ExecSCSICmd32 *prb)
 
 
 static void
-ASPI_DebugPrintCmd32(SRB_ExecSCSICmd32 *prb)
+ASPI_DebugPrintCmd(SRB_ExecSCSICmd *prb)
 {
   BYTE	cmd;
   int	i;
@@ -137,7 +137,7 @@ ASPI_DebugPrintCmd32(SRB_ExecSCSICmd32 *prb)
 }
 
 static void
-ASPI_PrintSenseArea32(SRB_ExecSCSICmd32 *prb)
+ASPI_PrintSenseArea(SRB_ExecSCSICmd *prb)
 {
   int	i;
   BYTE *cdb;
@@ -152,7 +152,7 @@ ASPI_PrintSenseArea32(SRB_ExecSCSICmd32 *prb)
 }
 
 static void
-ASPI_DebugPrintResult32(SRB_ExecSCSICmd32 *prb)
+ASPI_DebugPrintResult(SRB_ExecSCSICmd *prb)
 {
 
   switch (prb->CDBByte[0]) {
@@ -160,13 +160,13 @@ ASPI_DebugPrintResult32(SRB_ExecSCSICmd32 *prb)
     TRACE(aspi, "Vendor: '%s'\n", prb->SRB_BufPointer + INQUIRY_VENDOR);
     break;
   case CMD_TEST_UNIT_READY:
-    ASPI_PrintSenseArea32(prb);
+    ASPI_PrintSenseArea(prb);
     break;
   }
 }
 
 static WORD
-ASPI_ExecScsiCmd32(SRB_ExecSCSICmd32 *lpPRB)
+ASPI_ExecScsiCmd(SRB_ExecSCSICmd *lpPRB)
 {
   struct sg_header *sg_hd, *sg_reply_hdr;
   int	status;
@@ -174,9 +174,9 @@ ASPI_ExecScsiCmd32(SRB_ExecSCSICmd32 *lpPRB)
   int	error_code = 0;
   int	fd;
 
-  ASPI_DebugPrintCmd32(lpPRB);
+  ASPI_DebugPrintCmd(lpPRB);
 
-  fd = ASPI_OpenDevice32(lpPRB);
+  fd = ASPI_OpenDevice(lpPRB);
   if (fd == -1) {
       ERR(aspi, "Failed: could not open device. Device permissions !?\n");
       lpPRB->SRB_Status = SS_ERR;
@@ -282,13 +282,13 @@ ASPI_ExecScsiCmd32(SRB_ExecSCSICmd32 *lpPRB)
     }
     else
     if (lpPRB->SRB_Flags & SRB_EVENT_NOTIFY) {
-      TRACE(aspi, "Setting event %04x\n", (HANDLE32)lpPRB->SRB_PostProc);
-      SetEvent((HANDLE32)lpPRB->SRB_PostProc); /* FIXME: correct ? */
+      TRACE(aspi, "Setting event %04x\n", (HANDLE)lpPRB->SRB_PostProc);
+      SetEvent((HANDLE)lpPRB->SRB_PostProc); /* FIXME: correct ? */
     }
   }
   free(sg_reply_hdr);
   free(sg_hd);
-  ASPI_DebugPrintResult32(lpPRB);
+  ASPI_DebugPrintResult(lpPRB);
   return SS_COMP;
   
 error_exit:
@@ -322,7 +322,7 @@ error_exit:
  *    HIBYTE of LOWORD: status (SS_COMP or SS_FAILED_INIT)
  *    LOBYTE of LOWORD: # of host adapters.  
  */
-DWORD WINAPI GetASPI32SupportInfo32()
+DWORD WINAPI GetASPI32SupportInfo()
 {
     return ((SS_COMP << 8) | 1); /* FIXME: get # of host adapters installed */
 }
@@ -331,7 +331,7 @@ DWORD WINAPI GetASPI32SupportInfo32()
 /***********************************************************************
  *             SendASPI32Command32 (WNASPI32.1)
  */
-DWORD __cdecl SendASPI32Command32(LPSRB32 lpSRB)
+DWORD __cdecl SendASPI32Command(LPSRB lpSRB)
 {
 #ifdef linux
   switch (lpSRB->common.SRB_Cmd) {
@@ -349,7 +349,7 @@ DWORD __cdecl SendASPI32Command32(LPSRB32 lpSRB)
     FIXME(aspi, "Not implemented SC_GET_DEV_TYPE\n");
     break;
   case SC_EXEC_SCSI_CMD:
-    return ASPI_ExecScsiCmd32(&lpSRB->cmd);
+    return ASPI_ExecScsiCmd(&lpSRB->cmd);
     break;
   case SC_RESET_DEV:
     FIXME(aspi, "Not implemented SC_RESET_DEV\n");
@@ -368,7 +368,7 @@ DWORD __cdecl SendASPI32Command32(LPSRB32 lpSRB)
  *             GetASPI32DLLVersion32   (WNASPI32.3)
  */
 
-DWORD WINAPI GetASPI32DLLVersion32()
+DWORD WINAPI GetASPI32DLLVersion()
 {
 #ifdef linux
         return (DWORD)1;
diff --git a/files/async.c b/files/async.c
index c22da8e409f..9a6d7baeb96 100644
--- a/files/async.c
+++ b/files/async.c
@@ -95,7 +95,7 @@ HANDLER_DEF(ASYNC_sigio) {
  *
  * Makes the passed filedescriptor async (or not) depending on flag.
  */
-static BOOL32 ASYNC_MakeFDAsync(int unixfd,int async) {
+static BOOL ASYNC_MakeFDAsync(int unixfd,int async) {
     int	flags;
 
 #if !defined(FASYNC) && defined(FIOASYNC)
diff --git a/files/change.c b/files/change.c
index 2aa1a1e34de..d5fce064920 100644
--- a/files/change.c
+++ b/files/change.c
@@ -27,8 +27,8 @@ typedef struct
 /****************************************************************************
  *		FindFirstChangeNotification32A (KERNEL32.248)
  */
-HANDLE32 WINAPI FindFirstChangeNotification32A( LPCSTR lpPathName,
-                                                BOOL32 bWatchSubtree,
+HANDLE WINAPI FindFirstChangeNotificationA( LPCSTR lpPathName,
+                                                BOOL bWatchSubtree,
                                                 DWORD dwNotifyFilter ) 
 {
     CHANGE_OBJECT *change;
@@ -39,13 +39,13 @@ HANDLE32 WINAPI FindFirstChangeNotification32A( LPCSTR lpPathName,
     req.filter  = dwNotifyFilter;
     CLIENT_SendRequest( REQ_CREATE_CHANGE_NOTIFICATION, -1, 1, &req, sizeof(req) );
     CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL );
-    if (reply.handle == -1) return INVALID_HANDLE_VALUE32;
+    if (reply.handle == -1) return INVALID_HANDLE_VALUE;
 
     change = HeapAlloc( SystemHeap, 0, sizeof(CHANGE_OBJECT) );
     if (!change)
     {
         CLIENT_CloseHandle( reply.handle );
-        return INVALID_HANDLE_VALUE32;
+        return INVALID_HANDLE_VALUE;
     }
     change->header.type = K32OBJ_CHANGE;
     change->header.refcount = 1;
@@ -57,12 +57,12 @@ HANDLE32 WINAPI FindFirstChangeNotification32A( LPCSTR lpPathName,
 /****************************************************************************
  *		FindFirstChangeNotification32W (KERNEL32.249)
  */
-HANDLE32 WINAPI FindFirstChangeNotification32W( LPCWSTR lpPathName,
-                                                BOOL32 bWatchSubtree,
+HANDLE WINAPI FindFirstChangeNotificationW( LPCWSTR lpPathName,
+                                                BOOL bWatchSubtree,
                                                 DWORD dwNotifyFilter) 
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, lpPathName );
-    HANDLE32 ret = FindFirstChangeNotification32A( nameA, bWatchSubtree, 
+    HANDLE ret = FindFirstChangeNotificationA( nameA, bWatchSubtree, 
                                                           dwNotifyFilter );
     if (nameA) HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
@@ -71,7 +71,7 @@ HANDLE32 WINAPI FindFirstChangeNotification32W( LPCWSTR lpPathName,
 /****************************************************************************
  *		FindNextChangeNotification (KERNEL32.252)
  */
-BOOL32 WINAPI FindNextChangeNotification( HANDLE32 handle ) 
+BOOL WINAPI FindNextChangeNotification( HANDLE handle ) 
 {
     if (HANDLE_GetServerHandle( PROCESS_Current(), handle,
                                 K32OBJ_FILE, 0 ) == -1)
@@ -83,7 +83,7 @@ BOOL32 WINAPI FindNextChangeNotification( HANDLE32 handle )
 /****************************************************************************
  *		FindCloseChangeNotification (KERNEL32.247)
  */
-BOOL32 WINAPI FindCloseChangeNotification( HANDLE32 handle) 
+BOOL WINAPI FindCloseChangeNotification( HANDLE handle) 
 {
     return CloseHandle( handle );
 }
diff --git a/files/directory.c b/files/directory.c
index 62e91e6c4d8..d0e75f44de0 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -110,11 +110,11 @@ int DIR_Init(void)
 
     /* Set the environment variables */
 
-    SetEnvironmentVariable32A( "PATH", path );
-    SetEnvironmentVariable32A( "COMSPEC", "c:\\command.com" );
-    SetEnvironmentVariable32A( "TEMP", tmp_dir.short_name );
-    SetEnvironmentVariable32A( "windir", DIR_Windows.short_name );
-    SetEnvironmentVariable32A( "winsysdir", DIR_System.short_name );
+    SetEnvironmentVariableA( "PATH", path );
+    SetEnvironmentVariableA( "COMSPEC", "c:\\command.com" );
+    SetEnvironmentVariableA( "TEMP", tmp_dir.short_name );
+    SetEnvironmentVariableA( "windir", DIR_Windows.short_name );
+    SetEnvironmentVariableA( "winsysdir", DIR_System.short_name );
 
     TRACE(dosfs, "WindowsDir = %s (%s)\n",
           DIR_Windows.short_name, DIR_Windows.long_name );
@@ -133,12 +133,12 @@ int DIR_Init(void)
 /***********************************************************************
  *           GetTempPath32A   (KERNEL32.292)
  */
-UINT32 WINAPI GetTempPath32A( UINT32 count, LPSTR path )
+UINT WINAPI GetTempPathA( UINT count, LPSTR path )
 {
-    UINT32 ret;
-    if (!(ret = GetEnvironmentVariable32A( "TMP", path, count )))
-        if (!(ret = GetEnvironmentVariable32A( "TEMP", path, count )))
-            if (!(ret = GetCurrentDirectory32A( count, path )))
+    UINT ret;
+    if (!(ret = GetEnvironmentVariableA( "TMP", path, count )))
+        if (!(ret = GetEnvironmentVariableA( "TEMP", path, count )))
+            if (!(ret = GetCurrentDirectoryA( count, path )))
                 return 0;
     if (count && (ret < count - 1) && (path[ret-1] != '\\'))
     {
@@ -152,14 +152,14 @@ UINT32 WINAPI GetTempPath32A( UINT32 count, LPSTR path )
 /***********************************************************************
  *           GetTempPath32W   (KERNEL32.293)
  */
-UINT32 WINAPI GetTempPath32W( UINT32 count, LPWSTR path )
+UINT WINAPI GetTempPathW( UINT count, LPWSTR path )
 {
     static const WCHAR tmp[]  = { 'T', 'M', 'P', 0 };
     static const WCHAR temp[] = { 'T', 'E', 'M', 'P', 0 };
-    UINT32 ret;
-    if (!(ret = GetEnvironmentVariable32W( tmp, path, count )))
-        if (!(ret = GetEnvironmentVariable32W( temp, path, count )))
-            if (!(ret = GetCurrentDirectory32W( count, path )))
+    UINT ret;
+    if (!(ret = GetEnvironmentVariableW( tmp, path, count )))
+        if (!(ret = GetEnvironmentVariableW( temp, path, count )))
+            if (!(ret = GetCurrentDirectoryW( count, path )))
                 return 0;
     if (count && (ret < count - 1) && (path[ret-1] != '\\'))
     {
@@ -173,9 +173,9 @@ UINT32 WINAPI GetTempPath32W( UINT32 count, LPWSTR path )
 /***********************************************************************
  *           DIR_GetWindowsUnixDir
  */
-UINT32 DIR_GetWindowsUnixDir( LPSTR path, UINT32 count )
+UINT DIR_GetWindowsUnixDir( LPSTR path, UINT count )
 {
-    if (path) lstrcpyn32A( path, DIR_Windows.long_name, count );
+    if (path) lstrcpynA( path, DIR_Windows.long_name, count );
     return strlen( DIR_Windows.long_name );
 }
 
@@ -183,9 +183,9 @@ UINT32 DIR_GetWindowsUnixDir( LPSTR path, UINT32 count )
 /***********************************************************************
  *           DIR_GetSystemUnixDir
  */
-UINT32 DIR_GetSystemUnixDir( LPSTR path, UINT32 count )
+UINT DIR_GetSystemUnixDir( LPSTR path, UINT count )
 {
-    if (path) lstrcpyn32A( path, DIR_System.long_name, count );
+    if (path) lstrcpynA( path, DIR_System.long_name, count );
     return strlen( DIR_System.long_name );
 }
 
@@ -197,20 +197,20 @@ BYTE WINAPI GetTempDrive( BYTE ignored )
 {
     char *buffer;
     BYTE ret;
-    UINT32 len = GetTempPath32A( 0, NULL );
+    UINT len = GetTempPathA( 0, NULL );
 
     if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len + 1 )) )
       return DRIVE_GetCurrentDrive() + 'A';
 
     /* FIXME: apparently Windows does something with the ignored byte */
-    if (!GetTempPath32A( len, buffer )) buffer[0] = 'C';
+    if (!GetTempPathA( len, buffer )) buffer[0] = 'C';
     ret = buffer[0];
     HeapFree( GetProcessHeap(), 0, buffer );
     return toupper(ret);
 }
 
 
-UINT32 WINAPI WIN16_GetTempDrive( BYTE ignored )
+UINT WINAPI WIN16_GetTempDrive( BYTE ignored )
 {
     /* A closer look at krnl386.exe shows what the SDK doesn't mention:
      *
@@ -229,16 +229,16 @@ UINT32 WINAPI WIN16_GetTempDrive( BYTE ignored )
  */
 UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count )
 {
-    return (UINT16)GetWindowsDirectory32A( path, count );
+    return (UINT16)GetWindowsDirectoryA( path, count );
 }
 
 
 /***********************************************************************
  *           GetWindowsDirectory32A   (KERNEL32.311)
  */
-UINT32 WINAPI GetWindowsDirectory32A( LPSTR path, UINT32 count )
+UINT WINAPI GetWindowsDirectoryA( LPSTR path, UINT count )
 {
-    if (path) lstrcpyn32A( path, DIR_Windows.short_name, count );
+    if (path) lstrcpynA( path, DIR_Windows.short_name, count );
     return strlen( DIR_Windows.short_name );
 }
 
@@ -246,7 +246,7 @@ UINT32 WINAPI GetWindowsDirectory32A( LPSTR path, UINT32 count )
 /***********************************************************************
  *           GetWindowsDirectory32W   (KERNEL32.312)
  */
-UINT32 WINAPI GetWindowsDirectory32W( LPWSTR path, UINT32 count )
+UINT WINAPI GetWindowsDirectoryW( LPWSTR path, UINT count )
 {
     if (path) lstrcpynAtoW( path, DIR_Windows.short_name, count );
     return strlen( DIR_Windows.short_name );
@@ -258,16 +258,16 @@ UINT32 WINAPI GetWindowsDirectory32W( LPWSTR path, UINT32 count )
  */
 UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count )
 {
-    return (UINT16)GetSystemDirectory32A( path, count );
+    return (UINT16)GetSystemDirectoryA( path, count );
 }
 
 
 /***********************************************************************
  *           GetSystemDirectory32A   (KERNEL32.282)
  */
-UINT32 WINAPI GetSystemDirectory32A( LPSTR path, UINT32 count )
+UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count )
 {
-    if (path) lstrcpyn32A( path, DIR_System.short_name, count );
+    if (path) lstrcpynA( path, DIR_System.short_name, count );
     return strlen( DIR_System.short_name );
 }
 
@@ -275,7 +275,7 @@ UINT32 WINAPI GetSystemDirectory32A( LPSTR path, UINT32 count )
 /***********************************************************************
  *           GetSystemDirectory32W   (KERNEL32.283)
  */
-UINT32 WINAPI GetSystemDirectory32W( LPWSTR path, UINT32 count )
+UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count )
 {
     if (path) lstrcpynAtoW( path, DIR_System.short_name, count );
     return strlen( DIR_System.short_name );
@@ -288,14 +288,14 @@ UINT32 WINAPI GetSystemDirectory32W( LPWSTR path, UINT32 count )
 BOOL16 WINAPI CreateDirectory16( LPCSTR path, LPVOID dummy )
 {
     TRACE(file,"(%s,%p)\n", path, dummy );
-    return (BOOL16)CreateDirectory32A( path, NULL );
+    return (BOOL16)CreateDirectoryA( path, NULL );
 }
 
 
 /***********************************************************************
  *           CreateDirectory32A   (KERNEL32.39)
  */
-BOOL32 WINAPI CreateDirectory32A( LPCSTR path,
+BOOL WINAPI CreateDirectoryA( LPCSTR path,
                                   LPSECURITY_ATTRIBUTES lpsecattribs )
 {
     DOS_FULL_NAME full_name;
@@ -321,11 +321,11 @@ BOOL32 WINAPI CreateDirectory32A( LPCSTR path,
 /***********************************************************************
  *           CreateDirectory32W   (KERNEL32.42)
  */
-BOOL32 WINAPI CreateDirectory32W( LPCWSTR path,
+BOOL WINAPI CreateDirectoryW( LPCWSTR path,
                                   LPSECURITY_ATTRIBUTES lpsecattribs )
 {
     LPSTR xpath = HEAP_strdupWtoA( GetProcessHeap(), 0, path );
-    BOOL32 ret = CreateDirectory32A( xpath, lpsecattribs );
+    BOOL ret = CreateDirectoryA( xpath, lpsecattribs );
     HeapFree( GetProcessHeap(), 0, xpath );
     return ret;
 }
@@ -334,20 +334,20 @@ BOOL32 WINAPI CreateDirectory32W( LPCWSTR path,
 /***********************************************************************
  *           CreateDirectoryEx32A   (KERNEL32.40)
  */
-BOOL32 WINAPI CreateDirectoryEx32A( LPCSTR template, LPCSTR path,
+BOOL WINAPI CreateDirectoryExA( LPCSTR template, LPCSTR path,
                                     LPSECURITY_ATTRIBUTES lpsecattribs)
 {
-    return CreateDirectory32A(path,lpsecattribs);
+    return CreateDirectoryA(path,lpsecattribs);
 }
 
 
 /***********************************************************************
  *           CreateDirectoryEx32W   (KERNEL32.41)
  */
-BOOL32 WINAPI CreateDirectoryEx32W( LPCWSTR template, LPCWSTR path,
+BOOL WINAPI CreateDirectoryExW( LPCWSTR template, LPCWSTR path,
                                     LPSECURITY_ATTRIBUTES lpsecattribs)
 {
-    return CreateDirectory32W(path,lpsecattribs);
+    return CreateDirectoryW(path,lpsecattribs);
 }
 
 
@@ -356,14 +356,14 @@ BOOL32 WINAPI CreateDirectoryEx32W( LPCWSTR template, LPCWSTR path,
  */
 BOOL16 WINAPI RemoveDirectory16( LPCSTR path )
 {
-    return (BOOL16)RemoveDirectory32A( path );
+    return (BOOL16)RemoveDirectoryA( path );
 }
 
 
 /***********************************************************************
  *           RemoveDirectory32A   (KERNEL32.437)
  */
-BOOL32 WINAPI RemoveDirectory32A( LPCSTR path )
+BOOL WINAPI RemoveDirectoryA( LPCSTR path )
 {
     DOS_FULL_NAME full_name;
 
@@ -388,10 +388,10 @@ BOOL32 WINAPI RemoveDirectory32A( LPCSTR path )
 /***********************************************************************
  *           RemoveDirectory32W   (KERNEL32.438)
  */
-BOOL32 WINAPI RemoveDirectory32W( LPCWSTR path )
+BOOL WINAPI RemoveDirectoryW( LPCWSTR path )
 {
     LPSTR xpath = HEAP_strdupWtoA( GetProcessHeap(), 0, path );
-    BOOL32 ret = RemoveDirectory32A( xpath );
+    BOOL ret = RemoveDirectoryA( xpath );
     HeapFree( GetProcessHeap(), 0, xpath );
     return ret;
 }
@@ -402,7 +402,7 @@ BOOL32 WINAPI RemoveDirectory32W( LPCWSTR path )
  *
  * Helper function for DIR_SearchPath.
  */
-static BOOL32 DIR_TryPath( const DOS_FULL_NAME *dir, LPCSTR name,
+static BOOL DIR_TryPath( const DOS_FULL_NAME *dir, LPCSTR name,
                            DOS_FULL_NAME *full_name )
 {
     LPSTR p_l = full_name->long_name + strlen(dir->long_name) + 1;
@@ -431,16 +431,16 @@ static BOOL32 DIR_TryPath( const DOS_FULL_NAME *dir, LPCSTR name,
  *
  * Helper function for DIR_SearchPath.
  */
-static BOOL32 DIR_TryEnvironmentPath( LPCSTR name, DOS_FULL_NAME *full_name )
+static BOOL DIR_TryEnvironmentPath( LPCSTR name, DOS_FULL_NAME *full_name )
 {
     LPSTR path, next, buffer;
-    BOOL32 ret = FALSE;
-    INT32 len = strlen(name);
-    DWORD size = GetEnvironmentVariable32A( "PATH", NULL, 0 );
+    BOOL ret = FALSE;
+    INT len = strlen(name);
+    DWORD size = GetEnvironmentVariableA( "PATH", NULL, 0 );
 
     if (!size) return FALSE;
     if (!(path = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE;
-    if (!GetEnvironmentVariable32A( "PATH", path, size )) goto done;
+    if (!GetEnvironmentVariableA( "PATH", path, size )) goto done;
     next = path;
     while (!ret && next)
     {
@@ -469,9 +469,9 @@ done:
  *
  * Helper function for DIR_SearchPath.
  */
-static BOOL32 DIR_TryModulePath( LPCSTR name, DOS_FULL_NAME *full_name )
+static BOOL DIR_TryModulePath( LPCSTR name, DOS_FULL_NAME *full_name )
 {
-    PDB32	*pdb = PROCESS_Current();
+    PDB	*pdb = PROCESS_Current();
 
     /* FIXME: for now, GetModuleFileName32A can't return more */
     /* than OFS_MAXPATHNAME. This may change with Win32. */
@@ -484,7 +484,7 @@ static BOOL32 DIR_TryModulePath( LPCSTR name, DOS_FULL_NAME *full_name )
 	if (!GetModuleFileName16( GetCurrentTask(), buffer, sizeof(buffer) ))
 		buffer[0]='\0';
     } else {
-	if (!GetModuleFileName32A( 0, buffer, sizeof(buffer) ))
+	if (!GetModuleFileNameA( 0, buffer, sizeof(buffer) ))
 		buffer[0]='\0';
     }
     if (!(p = strrchr( buffer, '\\' ))) return FALSE;
@@ -503,12 +503,12 @@ static BOOL32 DIR_TryModulePath( LPCSTR name, DOS_FULL_NAME *full_name )
  * FIXME: should return long path names.
  */
 DWORD DIR_SearchPath( LPCSTR path, LPCSTR name, LPCSTR ext,
-                      DOS_FULL_NAME *full_name, BOOL32 win32 )
+                      DOS_FULL_NAME *full_name, BOOL win32 )
 {
     DWORD len;
     LPCSTR p;
     LPSTR tmp = NULL;
-    BOOL32 ret = TRUE;
+    BOOL ret = TRUE;
 
     /* First check the supplied parameters */
 
@@ -612,20 +612,20 @@ done:
  * NOTES
  *    Should call SetLastError(but currently doesn't).
  */
-DWORD WINAPI SearchPath32A( LPCSTR path, LPCSTR name, LPCSTR ext, DWORD buflen,
+DWORD WINAPI SearchPathA( LPCSTR path, LPCSTR name, LPCSTR ext, DWORD buflen,
                             LPSTR buffer, LPSTR *lastpart )
 {
     LPSTR p, res;
     DOS_FULL_NAME full_name;
 
     if (!DIR_SearchPath( path, name, ext, &full_name, TRUE )) return 0;
-    lstrcpyn32A( buffer, full_name.short_name, buflen );
+    lstrcpynA( buffer, full_name.short_name, buflen );
     res = full_name.long_name +
               strlen(DRIVE_GetRoot( full_name.short_name[0] - 'A' ));
     while (*res == '/') res++;
     if (buflen)
     {
-        if (buflen > 3) lstrcpyn32A( buffer + 3, res, buflen - 3 );
+        if (buflen > 3) lstrcpynA( buffer + 3, res, buflen - 3 );
         for (p = buffer; *p; p++) if (*p == '/') *p = '\\';
         if (lastpart) *lastpart = strrchr( buffer, '\\' ) + 1;
     }
@@ -637,7 +637,7 @@ DWORD WINAPI SearchPath32A( LPCSTR path, LPCSTR name, LPCSTR ext, DWORD buflen,
 /***********************************************************************
  *           SearchPath32W   (KERNEL32.448)
  */
-DWORD WINAPI SearchPath32W( LPCWSTR path, LPCWSTR name, LPCWSTR ext,
+DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext,
                             DWORD buflen, LPWSTR buffer, LPWSTR *lastpart )
 {
     LPWSTR p;
diff --git a/files/dos_fs.c b/files/dos_fs.c
index baf55666c1a..2fa8ebcf82e 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -152,7 +152,7 @@ static int DOSFS_ValidDOSName( const char *name, int ignore_case )
  * Return FALSE if the name is not a valid DOS name.
  * 'buffer' must be at least 12 characters long.
  */
-BOOL32 DOSFS_ToDosFCBFormat( LPCSTR name, LPSTR buffer )
+BOOL DOSFS_ToDosFCBFormat( LPCSTR name, LPSTR buffer )
 {
     static const char invalid_chars[] = INVALID_DOS_CHARS;
     const char *p = name;
@@ -371,7 +371,7 @@ static void DOSFS_CloseDir( DOS_DIR *dir )
 /***********************************************************************
  *           DOSFS_ReadDir
  */
-static BOOL32 DOSFS_ReadDir( DOS_DIR *dir, LPCSTR *long_name,
+static BOOL DOSFS_ReadDir( DOS_DIR *dir, LPCSTR *long_name,
                              LPCSTR *short_name )
 {
     struct dirent *dirent;
@@ -407,8 +407,8 @@ static BOOL32 DOSFS_ReadDir( DOS_DIR *dir, LPCSTR *long_name,
  * File name can be terminated by '\0', '\\' or '/'.
  * 'buffer' must be at least 13 characters long.
  */
-static void DOSFS_Hash( LPCSTR name, LPSTR buffer, BOOL32 dir_format,
-                        BOOL32 ignore_case )
+static void DOSFS_Hash( LPCSTR name, LPSTR buffer, BOOL dir_format,
+                        BOOL ignore_case )
 {
     static const char invalid_chars[] = INVALID_DOS_CHARS "~.";
     static const char hash_chars[32] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ012345";
@@ -505,13 +505,13 @@ static void DOSFS_Hash( LPCSTR name, LPSTR buffer, BOOL32 dir_format,
  * turns out to be larger than that, the function returns FALSE.
  * 'short_buf' must be at least 13 characters long.
  */
-BOOL32 DOSFS_FindUnixName( LPCSTR path, LPCSTR name, LPSTR long_buf,
-                           INT32 long_len, LPSTR short_buf, BOOL32 ignore_case)
+BOOL DOSFS_FindUnixName( LPCSTR path, LPCSTR name, LPSTR long_buf,
+                           INT long_len, LPSTR short_buf, BOOL ignore_case)
 {
     DOS_DIR *dir;
     LPCSTR long_name, short_name;
     char dos_name[12], tmp_buf[13];
-    BOOL32 ret;
+    BOOL ret;
 
     const char *p = strchr( name, '/' );
     int len = p ? (int)(p - name) : strlen(name);
@@ -536,11 +536,11 @@ BOOL32 DOSFS_FindUnixName( LPCSTR path, LPCSTR name, LPSTR long_buf,
         {
             if (!ignore_case)
             {
-                if (!lstrncmp32A( long_name, name, len )) break;
+                if (!lstrncmpA( long_name, name, len )) break;
             }
             else
             {
-                if (!lstrncmpi32A( long_name, name, len )) break;
+                if (!lstrncmpiA( long_name, name, len )) break;
             }
         }
         if (dos_name[0])
@@ -591,7 +591,7 @@ const DOS_DEVICE *DOSFS_GetDevice( const char *name )
     for (i = 0; i < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0]); i++)
     {
         const char *dev = DOSFS_Devices[i].name;
-        if (!lstrncmpi32A( dev, name, strlen(dev) ))
+        if (!lstrncmpiA( dev, name, strlen(dev) ))
         {
             p = name + strlen( dev );
             if (!*p || (*p == '.')) return &DOSFS_Devices[i];
@@ -604,7 +604,7 @@ const DOS_DEVICE *DOSFS_GetDevice( const char *name )
 /***********************************************************************
  *           DOSFS_GetDeviceByHandle
  */
-const DOS_DEVICE *DOSFS_GetDeviceByHandle( HFILE32 hFile )
+const DOS_DEVICE *DOSFS_GetDeviceByHandle( HFILE hFile )
 {
     struct get_file_info_request req;
     struct get_file_info_reply reply;
@@ -629,19 +629,19 @@ const DOS_DEVICE *DOSFS_GetDeviceByHandle( HFILE32 hFile )
  *
  * Open a DOS device. This might not map 1:1 into the UNIX device concept.
  */
-HFILE32 DOSFS_OpenDevice( const char *name, DWORD access )
+HFILE DOSFS_OpenDevice( const char *name, DWORD access )
 {
     int i;
     const char *p;
 
-    if (!name) return (HFILE32)NULL; /* if FILE_DupUnixHandle was used */
+    if (!name) return (HFILE)NULL; /* if FILE_DupUnixHandle was used */
     if (name[0] && (name[1] == ':')) name += 2;
     if ((p = strrchr( name, '/' ))) name = p + 1;
     if ((p = strrchr( name, '\\' ))) name = p + 1;
     for (i = 0; i < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0]); i++)
     {
         const char *dev = DOSFS_Devices[i].name;
-        if (!lstrncmpi32A( dev, name, strlen(dev) ))
+        if (!lstrncmpiA( dev, name, strlen(dev) ))
         {
             p = name + strlen( dev );
             if (!*p || (*p == '.')) {
@@ -651,8 +651,8 @@ HFILE32 DOSFS_OpenDevice( const char *name, DWORD access )
                                             FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
                                             OPEN_EXISTING, 0, -1 );
 		if (!strcmp(DOSFS_Devices[i].name,"CON")) {
-			HFILE32 to_dup;
-			HFILE32 handle;
+			HFILE to_dup;
+			HFILE handle;
 			switch (access & (GENERIC_READ|GENERIC_WRITE)) {
 			case GENERIC_READ:
 				to_dup = GetStdHandle( STD_INPUT_HANDLE );
@@ -662,12 +662,12 @@ HFILE32 DOSFS_OpenDevice( const char *name, DWORD access )
 				break;
 			default:
 				FIXME(dosfs,"can't open CON read/write\n");
-				return HFILE_ERROR32;
+				return HFILE_ERROR;
 				break;
 			}
 			if (!DuplicateHandle( GetCurrentProcess(), to_dup, GetCurrentProcess(),
 					      &handle, 0, FALSE, DUPLICATE_SAME_ACCESS ))
-			    handle = HFILE_ERROR32;
+			    handle = HFILE_ERROR;
 			return handle;
 		}
 		if (!strcmp(DOSFS_Devices[i].name,"SCSIMGR$") ||
@@ -676,11 +676,11 @@ HFILE32 DOSFS_OpenDevice( const char *name, DWORD access )
                     return FILE_CreateDevice( i, access, NULL );
 		}
 		FIXME(dosfs,"device open %s not supported (yet)\n",DOSFS_Devices[i].name);
-    		return HFILE_ERROR32;
+    		return HFILE_ERROR;
 	    }
         }
     }
-    return HFILE_ERROR32;
+    return HFILE_ERROR;
 }
 
 
@@ -729,10 +729,10 @@ static int DOSFS_GetPathDrive( const char **name )
  * The buffers pointed to by 'long_buf' and 'short_buf' must be
  * at least MAX_PATHNAME_LEN long.
  */
-BOOL32 DOSFS_GetFullName( LPCSTR name, BOOL32 check_last, DOS_FULL_NAME *full )
+BOOL DOSFS_GetFullName( LPCSTR name, BOOL check_last, DOS_FULL_NAME *full )
 {
-    BOOL32 found;
-    UINT32 flags;
+    BOOL found;
+    UINT flags;
     char *p_l, *p_s, *root;
 
     TRACE(dosfs, "%s (last=%d)\n",
@@ -741,7 +741,7 @@ BOOL32 DOSFS_GetFullName( LPCSTR name, BOOL32 check_last, DOS_FULL_NAME *full )
     if ((full->drive = DOSFS_GetPathDrive( &name )) == -1) return FALSE;
     flags = DRIVE_GetFlags( full->drive );
 
-    lstrcpyn32A( full->long_name, DRIVE_GetRoot( full->drive ),
+    lstrcpynA( full->long_name, DRIVE_GetRoot( full->drive ),
                  sizeof(full->long_name) );
     if (full->long_name[1]) root = full->long_name + strlen(full->long_name);
     else root = full->long_name;  /* root directory */
@@ -755,10 +755,10 @@ BOOL32 DOSFS_GetFullName( LPCSTR name, BOOL32 check_last, DOS_FULL_NAME *full )
     }
     else  /* Relative path */
     {
-        lstrcpyn32A( root + 1, DRIVE_GetUnixCwd( full->drive ),
+        lstrcpynA( root + 1, DRIVE_GetUnixCwd( full->drive ),
                      sizeof(full->long_name) - (root - full->long_name) - 1 );
         if (root[1]) *root = '/';
-        lstrcpyn32A( full->short_name + 3, DRIVE_GetDosCwd( full->drive ),
+        lstrcpynA( full->short_name + 3, DRIVE_GetDosCwd( full->drive ),
                      sizeof(full->short_name) - 3 );
     }
 
@@ -862,7 +862,7 @@ BOOL32 DOSFS_GetFullName( LPCSTR name, BOOL32 check_last, DOS_FULL_NAME *full )
  *  longpath=NULL: LastError=ERROR_INVALID_PARAMETER, ret=0
  *  *longpath="" or invalid: LastError=ERROR_BAD_PATHNAME, ret=0
  */
-DWORD WINAPI GetShortPathName32A( LPCSTR longpath, LPSTR shortpath,
+DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath,
                                   DWORD shortlen )
 {
     DOS_FULL_NAME full_name;
@@ -885,7 +885,7 @@ DWORD WINAPI GetShortPathName32A( LPCSTR longpath, LPSTR shortpath,
         SetLastError(ERROR_BAD_PATHNAME);
         return 0;
     }
-    lstrcpyn32A( shortpath, full_name.short_name, shortlen );
+    lstrcpynA( shortpath, full_name.short_name, shortlen );
     return strlen( full_name.short_name );
 }
 
@@ -893,7 +893,7 @@ DWORD WINAPI GetShortPathName32A( LPCSTR longpath, LPSTR shortpath,
 /***********************************************************************
  *           GetShortPathName32W   (KERNEL32.272)
  */
-DWORD WINAPI GetShortPathName32W( LPCWSTR longpath, LPWSTR shortpath,
+DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath,
                                   DWORD shortlen )
 {
     DOS_FULL_NAME full_name;
@@ -929,7 +929,7 @@ DWORD WINAPI GetShortPathName32W( LPCWSTR longpath, LPWSTR shortpath,
 /***********************************************************************
  *           GetLongPathName32A   (KERNEL32.xxx)
  */
-DWORD WINAPI GetLongPathName32A( LPCSTR shortpath, LPSTR longpath,
+DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath,
                                   DWORD longlen )
 {
     DOS_FULL_NAME full_name;
@@ -938,7 +938,7 @@ DWORD WINAPI GetLongPathName32A( LPCSTR shortpath, LPSTR longpath,
     DWORD shortpathlen;
     
     if (!DOSFS_GetFullName( shortpath, TRUE, &full_name )) return 0;
-    lstrcpyn32A( longpath, full_name.short_name, longlen );
+    lstrcpynA( longpath, full_name.short_name, longlen );
     /* Do some hackery to get the long filename.
      * FIXME: Would be better if it returned the
      * long version of the directories too
@@ -948,7 +948,7 @@ DWORD WINAPI GetLongPathName32A( LPCSTR shortpath, LPSTR longpath,
       if ((p = strrchr( longpath, '\\' )) != NULL) {
 	p++;
 	longlen -= (p-longpath);
-	lstrcpyn32A( p, longfilename , longlen);
+	lstrcpynA( p, longfilename , longlen);
       }
     }
     shortpathlen =
@@ -960,7 +960,7 @@ DWORD WINAPI GetLongPathName32A( LPCSTR shortpath, LPSTR longpath,
 /***********************************************************************
  *           GetLongPathName32W   (KERNEL32.269)
  */
-DWORD WINAPI GetLongPathName32W( LPCWSTR shortpath, LPWSTR longpath,
+DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath,
                                   DWORD longlen )
 {
     DOS_FULL_NAME full_name;
@@ -984,7 +984,7 @@ DWORD WINAPI GetLongPathName32W( LPCWSTR shortpath, LPWSTR longpath,
  * Implementation of GetFullPathName32A/W.
  */
 static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
-                                      BOOL32 unicode )
+                                      BOOL unicode )
 {
     char buffer[MAX_PATHNAME_LEN];
     int drive;
@@ -1013,7 +1013,7 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
     else  /* Relative path or empty path */
     {
         *p++ = '\\';
-        lstrcpyn32A( p, DRIVE_GetDosCwd(drive), sizeof(buffer) - 4 );
+        lstrcpynA( p, DRIVE_GetDosCwd(drive), sizeof(buffer) - 4 );
         if ( *p )
         {
             p += strlen(p);
@@ -1059,12 +1059,12 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
     *p = '\0';
 
     if (!(DRIVE_GetFlags(drive) & DRIVE_CASE_PRESERVING))
-        CharUpper32A( buffer );
+        CharUpperA( buffer );
        
     if (unicode)
         lstrcpynAtoW( (LPWSTR)result, buffer, len );
     else
-        lstrcpyn32A( result, buffer, len );
+        lstrcpynA( result, buffer, len );
 
     TRACE(dosfs, "returning '%s'\n", buffer );
 
@@ -1085,7 +1085,7 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
  * NOTES
  *   if the path closed with '\', *lastpart is 0 
  */
-DWORD WINAPI GetFullPathName32A( LPCSTR name, DWORD len, LPSTR buffer,
+DWORD WINAPI GetFullPathNameA( LPCSTR name, DWORD len, LPSTR buffer,
                                  LPSTR *lastpart )
 {
     DWORD ret = DOSFS_DoGetFullPathName( name, len, buffer, FALSE );
@@ -1107,7 +1107,7 @@ DWORD WINAPI GetFullPathName32A( LPCSTR name, DWORD len, LPSTR buffer,
 /***********************************************************************
  *           GetFullPathName32W   (KERNEL32.273)
  */
-DWORD WINAPI GetFullPathName32W( LPCWSTR name, DWORD len, LPWSTR buffer,
+DWORD WINAPI GetFullPathNameW( LPCWSTR name, DWORD len, LPWSTR buffer,
                                  LPWSTR *lastpart )
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
@@ -1115,7 +1115,7 @@ DWORD WINAPI GetFullPathName32W( LPCWSTR name, DWORD len, LPWSTR buffer,
     HeapFree( GetProcessHeap(), 0, nameA );
     if (ret && lastpart)
     {
-        LPWSTR p = buffer + lstrlen32W(buffer);
+        LPWSTR p = buffer + lstrlenW(buffer);
         if (*p != (WCHAR)'\\')
         {
             while ((p > buffer + 2) && (*p != (WCHAR)'\\')) p--;
@@ -1129,10 +1129,10 @@ DWORD WINAPI GetFullPathName32W( LPCWSTR name, DWORD len, LPWSTR buffer,
 /***********************************************************************
  *           DOSFS_FindNextEx
  */
-static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATA32A *entry )
+static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATAA *entry )
 {
     BYTE attr = info->attr | FA_UNUSED | FA_ARCHIVE | FA_RDONLY;
-    UINT32 flags = DRIVE_GetFlags( info->drive );
+    UINT flags = DRIVE_GetFlags( info->drive );
     char *p, buffer[MAX_PATHNAME_LEN];
     const char *drive_path;
     int drive_root;
@@ -1161,7 +1161,7 @@ static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATA32A *entry )
     while ((*drive_path == '/') || (*drive_path == '\\')) drive_path++;
     drive_root = !*drive_path;
 
-    lstrcpyn32A( buffer, info->path, sizeof(buffer) - 1 );
+    lstrcpynA( buffer, info->path, sizeof(buffer) - 1 );
     strcat( buffer, "/" );
     p = buffer + strlen(buffer);
 
@@ -1197,7 +1197,7 @@ static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATA32A *entry )
 
         /* Check the file attributes */
 
-        lstrcpyn32A( p, long_name, sizeof(buffer) - (int)(p - buffer) );
+        lstrcpynA( p, long_name, sizeof(buffer) - (int)(p - buffer) );
         if (!FILE_Stat( buffer, &fileinfo ))
         {
             WARN(dosfs, "can't stat %s\n", buffer);
@@ -1220,8 +1220,8 @@ static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATA32A *entry )
             DOSFS_Hash( long_name, entry->cAlternateFileName, FALSE,
                         !(flags & DRIVE_CASE_SENSITIVE) );
 
-        lstrcpyn32A( entry->cFileName, long_name, sizeof(entry->cFileName) );
-        if (!(flags & DRIVE_CASE_PRESERVING)) CharLower32A( entry->cFileName );
+        lstrcpynA( entry->cFileName, long_name, sizeof(entry->cFileName) );
+        if (!(flags & DRIVE_CASE_PRESERVING)) CharLowerA( entry->cFileName );
         TRACE(dosfs, "returning %s (%s) %02lx %ld\n",
                        entry->cFileName, entry->cAlternateFileName,
                        entry->dwFileAttributes, entry->nFileSizeLow );
@@ -1245,7 +1245,7 @@ static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATA32A *entry )
  */
 int DOSFS_FindNext( const char *path, const char *short_mask,
                     const char *long_mask, int drive, BYTE attr,
-                    int skip, WIN32_FIND_DATA32A *entry )
+                    int skip, WIN32_FIND_DATAA *entry )
 {
     static FIND_FIRST_INFO info = { NULL };
     LPCSTR short_name, long_name;
@@ -1298,7 +1298,7 @@ int DOSFS_FindNext( const char *path, const char *short_mask,
 /*************************************************************************
  *           FindFirstFile16   (KERNEL.413)
  */
-HANDLE16 WINAPI FindFirstFile16( LPCSTR path, WIN32_FIND_DATA32A *data )
+HANDLE16 WINAPI FindFirstFile16( LPCSTR path, WIN32_FIND_DATAA *data )
 {
     DOS_FULL_NAME full_name;
     HGLOBAL16 handle;
@@ -1336,10 +1336,10 @@ HANDLE16 WINAPI FindFirstFile16( LPCSTR path, WIN32_FIND_DATA32A *data )
 /*************************************************************************
  *           FindFirstFile32A   (KERNEL32.123)
  */
-HANDLE32 WINAPI FindFirstFile32A( LPCSTR path, WIN32_FIND_DATA32A *data )
+HANDLE WINAPI FindFirstFileA( LPCSTR path, WIN32_FIND_DATAA *data )
 {
-    HANDLE32 handle = FindFirstFile16( path, data );
-    if (handle == INVALID_HANDLE_VALUE16) return INVALID_HANDLE_VALUE32;
+    HANDLE handle = FindFirstFile16( path, data );
+    if (handle == INVALID_HANDLE_VALUE16) return INVALID_HANDLE_VALUE;
     return handle;
 }
 
@@ -1347,13 +1347,13 @@ HANDLE32 WINAPI FindFirstFile32A( LPCSTR path, WIN32_FIND_DATA32A *data )
 /*************************************************************************
  *           FindFirstFile32W   (KERNEL32.124)
  */
-HANDLE32 WINAPI FindFirstFile32W( LPCWSTR path, WIN32_FIND_DATA32W *data )
+HANDLE WINAPI FindFirstFileW( LPCWSTR path, WIN32_FIND_DATAW *data )
 {
-    WIN32_FIND_DATA32A dataA;
+    WIN32_FIND_DATAA dataA;
     LPSTR pathA = HEAP_strdupWtoA( GetProcessHeap(), 0, path );
-    HANDLE32 handle = FindFirstFile32A( pathA, &dataA );
+    HANDLE handle = FindFirstFileA( pathA, &dataA );
     HeapFree( GetProcessHeap(), 0, pathA );
-    if (handle != INVALID_HANDLE_VALUE32)
+    if (handle != INVALID_HANDLE_VALUE)
     {
         data->dwFileAttributes = dataA.dwFileAttributes;
         data->ftCreationTime   = dataA.ftCreationTime;
@@ -1371,7 +1371,7 @@ HANDLE32 WINAPI FindFirstFile32W( LPCWSTR path, WIN32_FIND_DATA32W *data )
 /*************************************************************************
  *           FindNextFile16   (KERNEL.414)
  */
-BOOL16 WINAPI FindNextFile16( HANDLE16 handle, WIN32_FIND_DATA32A *data )
+BOOL16 WINAPI FindNextFile16( HANDLE16 handle, WIN32_FIND_DATAA *data )
 {
     FIND_FIRST_INFO *info;
 
@@ -1401,7 +1401,7 @@ BOOL16 WINAPI FindNextFile16( HANDLE16 handle, WIN32_FIND_DATA32A *data )
 /*************************************************************************
  *           FindNextFile32A   (KERNEL32.126)
  */
-BOOL32 WINAPI FindNextFile32A( HANDLE32 handle, WIN32_FIND_DATA32A *data )
+BOOL WINAPI FindNextFileA( HANDLE handle, WIN32_FIND_DATAA *data )
 {
     return FindNextFile16( handle, data );
 }
@@ -1410,10 +1410,10 @@ BOOL32 WINAPI FindNextFile32A( HANDLE32 handle, WIN32_FIND_DATA32A *data )
 /*************************************************************************
  *           FindNextFile32W   (KERNEL32.127)
  */
-BOOL32 WINAPI FindNextFile32W( HANDLE32 handle, WIN32_FIND_DATA32W *data )
+BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data )
 {
-    WIN32_FIND_DATA32A dataA;
-    if (!FindNextFile32A( handle, &dataA )) return FALSE;
+    WIN32_FIND_DATAA dataA;
+    if (!FindNextFileA( handle, &dataA )) return FALSE;
     data->dwFileAttributes = dataA.dwFileAttributes;
     data->ftCreationTime   = dataA.ftCreationTime;
     data->ftLastAccessTime = dataA.ftLastAccessTime;
@@ -1450,7 +1450,7 @@ BOOL16 WINAPI FindClose16( HANDLE16 handle )
 /*************************************************************************
  *           FindClose32   (KERNEL32.119)
  */
-BOOL32 WINAPI FindClose32( HANDLE32 handle )
+BOOL WINAPI FindClose( HANDLE handle )
 {
     return FindClose16( (HANDLE16)handle );
 }
@@ -1533,14 +1533,14 @@ void DOSFS_UnixTimeToFileTime( time_t unix_time, FILETIME *filetime,
     t *= 10000000;
     t += 116444736000000000LL;
     t += remainder;
-    filetime->dwLowDateTime  = (UINT32)t;
-    filetime->dwHighDateTime = (UINT32)(t >> 32);
+    filetime->dwLowDateTime  = (UINT)t;
+    filetime->dwHighDateTime = (UINT)(t >> 32);
 
 #else  /* ISO version */
 
-    UINT32 a0;			/* 16 bit, low    bits */
-    UINT32 a1;			/* 16 bit, medium bits */
-    UINT32 a2;			/* 32 bit, high   bits */
+    UINT a0;			/* 16 bit, low    bits */
+    UINT a1;			/* 16 bit, medium bits */
+    UINT a2;			/* 32 bit, high   bits */
 
     /* Copy the unix time to a2/a1/a0 */
     a0 =  unix_time & 0xffff;
@@ -1593,7 +1593,7 @@ time_t DOSFS_FileTimeToUnixTime( const FILETIME *filetime, DWORD *remainder )
 
     long long int t = filetime->dwHighDateTime;
     t <<= 32;
-    t += (UINT32)filetime->dwLowDateTime;
+    t += (UINT)filetime->dwLowDateTime;
     t -= 116444736000000000LL;
     if (t < 0)
     {
@@ -1608,17 +1608,17 @@ time_t DOSFS_FileTimeToUnixTime( const FILETIME *filetime, DWORD *remainder )
 
 #else  /* ISO version */
 
-    UINT32 a0;			/* 16 bit, low    bits */
-    UINT32 a1;			/* 16 bit, medium bits */
-    UINT32 a2;			/* 32 bit, high   bits */
-    UINT32 r;			/* remainder of division */
+    UINT a0;			/* 16 bit, low    bits */
+    UINT a1;			/* 16 bit, medium bits */
+    UINT a2;			/* 32 bit, high   bits */
+    UINT r;			/* remainder of division */
     unsigned int carry;		/* carry bit for subtraction */
     int negative;		/* whether a represents a negative value */
 
     /* Copy the time values to a2/a1/a0 */
-    a2 =  (UINT32)filetime->dwHighDateTime;
-    a1 = ((UINT32)filetime->dwLowDateTime ) >> 16;
-    a0 = ((UINT32)filetime->dwLowDateTime ) & 0xffff;
+    a2 =  (UINT)filetime->dwHighDateTime;
+    a1 = ((UINT)filetime->dwLowDateTime ) >> 16;
+    a0 = ((UINT)filetime->dwLowDateTime ) & 0xffff;
 
     /* Subtract the time difference */
     if (a0 >= 32768           ) a0 -=             32768        , carry = 0;
@@ -1630,7 +1630,7 @@ time_t DOSFS_FileTimeToUnixTime( const FILETIME *filetime, DWORD *remainder )
     a2 -= 27111902 + carry;
     
     /* If a is negative, replace a by (-1-a) */
-    negative = (a2 >= ((UINT32)1) << 31);
+    negative = (a2 >= ((UINT)1) << 31);
     if (negative)
     {
 	/* Set a to -a - 1 (a is a2/a1/a0) */
@@ -1678,7 +1678,7 @@ time_t DOSFS_FileTimeToUnixTime( const FILETIME *filetime, DWORD *remainder )
 /***********************************************************************
  *           DosDateTimeToFileTime   (KERNEL32.76)
  */
-BOOL32 WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, LPFILETIME ft)
+BOOL WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, LPFILETIME ft)
 {
     struct tm newtm;
 
@@ -1696,7 +1696,7 @@ BOOL32 WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, LPFILETIME ft)
 /***********************************************************************
  *           FileTimeToDosDateTime   (KERNEL32.111)
  */
-BOOL32 WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate,
+BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate,
                                      LPWORD fattime )
 {
     time_t unixtime = DOSFS_FileTimeToUnixTime( ft, NULL );
@@ -1713,7 +1713,7 @@ BOOL32 WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate,
 /***********************************************************************
  *           LocalFileTimeToFileTime   (KERNEL32.373)
  */
-BOOL32 WINAPI LocalFileTimeToFileTime( const FILETIME *localft,
+BOOL WINAPI LocalFileTimeToFileTime( const FILETIME *localft,
                                        LPFILETIME utcft )
 {
     struct tm *xtm;
@@ -1730,7 +1730,7 @@ BOOL32 WINAPI LocalFileTimeToFileTime( const FILETIME *localft,
 /***********************************************************************
  *           FileTimeToLocalFileTime   (KERNEL32.112)
  */
-BOOL32 WINAPI FileTimeToLocalFileTime( const FILETIME *utcft,
+BOOL WINAPI FileTimeToLocalFileTime( const FILETIME *utcft,
                                        LPFILETIME localft )
 {
     DWORD remainder;
@@ -1760,7 +1760,7 @@ BOOL32 WINAPI FileTimeToLocalFileTime( const FILETIME *utcft,
 /***********************************************************************
  *           FileTimeToSystemTime   (KERNEL32.113)
  */
-BOOL32 WINAPI FileTimeToSystemTime( const FILETIME *ft, LPSYSTEMTIME syst )
+BOOL WINAPI FileTimeToSystemTime( const FILETIME *ft, LPSYSTEMTIME syst )
 {
     struct tm *xtm;
     DWORD remainder;
@@ -1782,7 +1782,7 @@ BOOL32 WINAPI FileTimeToSystemTime( const FILETIME *ft, LPSYSTEMTIME syst )
  *
  * returns array of strings terminated by \0, terminated by \0
  */
-DWORD WINAPI QueryDosDevice32A(LPCSTR devname,LPSTR target,DWORD bufsize)
+DWORD WINAPI QueryDosDeviceA(LPCSTR devname,LPSTR target,DWORD bufsize)
 {
     LPSTR s;
     char  buffer[200];
@@ -1790,17 +1790,17 @@ DWORD WINAPI QueryDosDevice32A(LPCSTR devname,LPSTR target,DWORD bufsize)
     TRACE(dosfs,"(%s,...)\n",devname?devname:"<null>");
     if (!devname) {
 	/* return known MSDOS devices */
-	lstrcpy32A(buffer,"CON COM1 COM2 LPT1 NUL ");
+	lstrcpyA(buffer,"CON COM1 COM2 LPT1 NUL ");
 	while ((s=strchr(buffer,' ')))
 		*s='\0';
 
-	lstrcpyn32A(target,buffer,bufsize);
+	lstrcpynA(target,buffer,bufsize);
 	return strlen(buffer);
     }
-    lstrcpy32A(buffer,"\\DEV\\");
-    lstrcat32A(buffer,devname);
+    lstrcpyA(buffer,"\\DEV\\");
+    lstrcatA(buffer,devname);
     if ((s=strchr(buffer,':'))) *s='\0';
-    lstrcpyn32A(target,buffer,bufsize);
+    lstrcpynA(target,buffer,bufsize);
     return strlen(buffer);
 }
 
@@ -1810,11 +1810,11 @@ DWORD WINAPI QueryDosDevice32A(LPCSTR devname,LPSTR target,DWORD bufsize)
  *
  * returns array of strings terminated by \0, terminated by \0
  */
-DWORD WINAPI QueryDosDevice32W(LPCWSTR devname,LPWSTR target,DWORD bufsize)
+DWORD WINAPI QueryDosDeviceW(LPCWSTR devname,LPWSTR target,DWORD bufsize)
 {
     LPSTR devnameA = devname?HEAP_strdupWtoA(GetProcessHeap(),0,devname):NULL;
     LPSTR targetA = (LPSTR)HEAP_xalloc(GetProcessHeap(),0,bufsize);
-    DWORD ret = QueryDosDevice32A(devnameA,targetA,bufsize);
+    DWORD ret = QueryDosDeviceA(devnameA,targetA,bufsize);
 
     lstrcpynAtoW(target,targetA,bufsize);
     if (devnameA) HeapFree(GetProcessHeap(),0,devnameA);
@@ -1826,7 +1826,7 @@ DWORD WINAPI QueryDosDevice32W(LPCWSTR devname,LPWSTR target,DWORD bufsize)
 /***********************************************************************
  *           SystemTimeToFileTime   (KERNEL32.526)
  */
-BOOL32 WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
+BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
 {
 #ifdef HAVE_TIMEGM
     struct tm xtm;
@@ -1859,7 +1859,7 @@ BOOL32 WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
     return TRUE; 
 }
 
-BOOL32 WINAPI DefineDosDevice32A(DWORD flags,LPCSTR devname,LPCSTR targetpath) {
+BOOL WINAPI DefineDosDeviceA(DWORD flags,LPCSTR devname,LPCSTR targetpath) {
 	FIXME(dosfs,"(0x%08lx,%s,%s),stub!\n",flags,devname,targetpath);
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
diff --git a/files/drive.c b/files/drive.c
index f8290500a86..78806f47e16 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -53,7 +53,7 @@ typedef struct
     char      label[12]; /* drive label */
     DWORD     serial;    /* drive serial number */
     DRIVETYPE type;      /* drive type */
-    UINT32    flags;     /* drive flags */
+    UINT    flags;     /* drive flags */
     dev_t     dev;       /* unix device number */
     ino_t     ino;       /* unix inode number */
 } DOSDRIVE;
@@ -73,7 +73,7 @@ static const char * const DRIVE_Types[] =
 typedef struct
 {
     const char *name;
-    UINT32      flags;
+    UINT      flags;
 } FS_DESCR;
 
 static const FS_DESCR DRIVE_Filesystems[] =
@@ -115,7 +115,7 @@ static DRIVETYPE DRIVE_GetDriveType( const char *name )
 /***********************************************************************
  *           DRIVE_GetFSFlags
  */
-static UINT32 DRIVE_GetFSFlags( const char *name, const char *value )
+static UINT DRIVE_GetFSFlags( const char *name, const char *value )
 {
     const FS_DESCR *descr;
 
@@ -435,7 +435,7 @@ DRIVETYPE DRIVE_GetType( int drive )
 /***********************************************************************
  *           DRIVE_GetFlags
  */
-UINT32 DRIVE_GetFlags( int drive )
+UINT DRIVE_GetFlags( int drive )
 {
     if ((drive < 0) || (drive >= MAX_DOS_DRIVES)) return 0;
     return DOSDrives[drive].flags;
@@ -456,7 +456,7 @@ int DRIVE_Chdir( int drive, const char *path )
     strcpy( buffer, "A:" );
     buffer[0] += drive;
     TRACE(dosfs, "(%c:,%s)\n", buffer[0], path );
-    lstrcpyn32A( buffer + 2, path, sizeof(buffer) - 2 );
+    lstrcpynA( buffer + 2, path, sizeof(buffer) - 2 );
 
     if (!DOSFS_GetFullName( buffer, TRUE, &full_name )) return 0;
     if (!FILE_Stat( full_name.long_name, &info )) return 0;
@@ -480,7 +480,7 @@ int DRIVE_Chdir( int drive, const char *path )
     if (pTask && (pTask->curdrive & 0x80) && 
         ((pTask->curdrive & ~0x80) == drive))
     {
-        lstrcpyn32A( pTask->curdir, full_name.short_name + 2,
+        lstrcpynA( pTask->curdir, full_name.short_name + 2,
                      sizeof(pTask->curdir) );
         DRIVE_LastTask = GetCurrentTask();
     }
@@ -585,7 +585,7 @@ int DRIVE_OpenDevice( int drive, int flags )
  *
  * Read raw sectors from a device
  */
-int DRIVE_RawRead(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL32 fake_success)
+int DRIVE_RawRead(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL fake_success)
 {
     int fd;
 
@@ -616,7 +616,7 @@ int DRIVE_RawRead(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL32
  *
  * Write raw sectors to a device
  */
-int DRIVE_RawWrite(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL32 fake_success)
+int DRIVE_RawWrite(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL fake_success)
 {
 	int fd;
 
@@ -690,7 +690,7 @@ BOOL16 WINAPI GetDiskFreeSpace16( LPCSTR root, LPDWORD cluster_sectors,
                                   LPDWORD sector_bytes, LPDWORD free_clusters,
                                   LPDWORD total_clusters )
 {
-    return GetDiskFreeSpace32A( root, cluster_sectors, sector_bytes,
+    return GetDiskFreeSpaceA( root, cluster_sectors, sector_bytes,
                                 free_clusters, total_clusters );
 }
 
@@ -722,7 +722,7 @@ BOOL16 WINAPI GetDiskFreeSpace16( LPCSTR root, LPDWORD cluster_sectors,
  * "E:\\TEST"  "C:"   TRUE  (when CurrDir of "C:" set to "\\")
  * "E:\\TEST"  "C:"   FALSE (when CurrDir of "C:" set to "\\TEST")
  */
-BOOL32 WINAPI GetDiskFreeSpace32A( LPCSTR root, LPDWORD cluster_sectors,
+BOOL WINAPI GetDiskFreeSpaceA( LPCSTR root, LPDWORD cluster_sectors,
                                    LPDWORD sector_bytes, LPDWORD free_clusters,
                                    LPDWORD total_clusters )
 {
@@ -790,15 +790,15 @@ BOOL32 WINAPI GetDiskFreeSpace32A( LPCSTR root, LPDWORD cluster_sectors,
 /***********************************************************************
  *           GetDiskFreeSpace32W   (KERNEL32.207)
  */
-BOOL32 WINAPI GetDiskFreeSpace32W( LPCWSTR root, LPDWORD cluster_sectors,
+BOOL WINAPI GetDiskFreeSpaceW( LPCWSTR root, LPDWORD cluster_sectors,
                                    LPDWORD sector_bytes, LPDWORD free_clusters,
                                    LPDWORD total_clusters )
 {
     LPSTR xroot;
-    BOOL32 ret;
+    BOOL ret;
 
     xroot = HEAP_strdupWtoA( GetProcessHeap(), 0, root);
-    ret = GetDiskFreeSpace32A( xroot,cluster_sectors, sector_bytes,
+    ret = GetDiskFreeSpaceA( xroot,cluster_sectors, sector_bytes,
                                free_clusters, total_clusters );
     HeapFree( GetProcessHeap(), 0, xroot );
     return ret;
@@ -808,7 +808,7 @@ BOOL32 WINAPI GetDiskFreeSpace32W( LPCWSTR root, LPDWORD cluster_sectors,
 /***********************************************************************
  *           GetDiskFreeSpaceEx32A   (KERNEL32.871)
  */
-BOOL32 WINAPI GetDiskFreeSpaceEx32A( LPCSTR root,
+BOOL WINAPI GetDiskFreeSpaceExA( LPCSTR root,
 				     PULARGE_INTEGER avail,
 				     PULARGE_INTEGER total,
 				     PULARGE_INTEGER totalfree)
@@ -842,15 +842,15 @@ BOOL32 WINAPI GetDiskFreeSpaceEx32A( LPCSTR root,
 /***********************************************************************
  *           GetDiskFreeSpaceEx32W   (KERNEL32.873)
  */
-BOOL32 WINAPI GetDiskFreeSpaceEx32W( LPCWSTR root, PULARGE_INTEGER avail,
+BOOL WINAPI GetDiskFreeSpaceExW( LPCWSTR root, PULARGE_INTEGER avail,
 				     PULARGE_INTEGER total,
 				     PULARGE_INTEGER  totalfree)
 {
     LPSTR xroot;
-    BOOL32 ret;
+    BOOL ret;
 
     xroot = HEAP_strdupWtoA( GetProcessHeap(), 0, root);
-    ret = GetDiskFreeSpaceEx32A( xroot, avail, total, totalfree);
+    ret = GetDiskFreeSpaceExA( xroot, avail, total, totalfree);
     HeapFree( GetProcessHeap(), 0, xroot );
     return ret;
 }
@@ -911,7 +911,7 @@ UINT16 WINAPI GetDriveType16(
  *
  *  DRIVE_RAMDISK is unsupported.
  */
-UINT32 WINAPI GetDriveType32A(LPCSTR root /* String describing drive */)
+UINT WINAPI GetDriveTypeA(LPCSTR root /* String describing drive */)
 {
     int drive;
     TRACE(dosfs, "(%s)\n", debugstr_a(root));
@@ -941,10 +941,10 @@ UINT32 WINAPI GetDriveType32A(LPCSTR root /* String describing drive */)
 /***********************************************************************
  *           GetDriveType32W   (KERNEL32.209)
  */
-UINT32 WINAPI GetDriveType32W( LPCWSTR root )
+UINT WINAPI GetDriveTypeW( LPCWSTR root )
 {
     LPSTR xpath = HEAP_strdupWtoA( GetProcessHeap(), 0, root );
-    UINT32 ret = GetDriveType32A( xpath );
+    UINT ret = GetDriveTypeA( xpath );
     HeapFree( GetProcessHeap(), 0, xpath );
     return ret;
 }
@@ -955,7 +955,7 @@ UINT32 WINAPI GetDriveType32W( LPCWSTR root )
  */
 UINT16 WINAPI GetCurrentDirectory16( UINT16 buflen, LPSTR buf )
 {
-    return (UINT16)GetCurrentDirectory32A( buflen, buf );
+    return (UINT16)GetCurrentDirectoryA( buflen, buf );
 }
 
 
@@ -967,17 +967,17 @@ UINT16 WINAPI GetCurrentDirectory16( UINT16 buflen, LPSTR buf )
  * Despite the API description, return required length including the 
  * terminating null when buffer too small. This is the real behaviour.
  */
-UINT32 WINAPI GetCurrentDirectory32A( UINT32 buflen, LPSTR buf )
+UINT WINAPI GetCurrentDirectoryA( UINT buflen, LPSTR buf )
 {
-    UINT32 ret;
+    UINT ret;
     const char *s = DRIVE_GetDosCwd( DRIVE_GetCurrentDrive() );
 
     assert(s);
     ret = strlen(s) + 3; /* length of WHOLE current directory */
     if (ret >= buflen) return ret + 1;
-    lstrcpyn32A( buf, "A:\\", MIN( 4, buflen ) );
+    lstrcpynA( buf, "A:\\", MIN( 4, buflen ) );
     if (buflen) buf[0] += DRIVE_GetCurrentDrive();
-    if (buflen > 3) lstrcpyn32A( buf + 3, s, buflen - 3 );
+    if (buflen > 3) lstrcpynA( buf + 3, s, buflen - 3 );
     return ret;
 }
 
@@ -985,10 +985,10 @@ UINT32 WINAPI GetCurrentDirectory32A( UINT32 buflen, LPSTR buf )
 /***********************************************************************
  *           GetCurrentDirectory32W   (KERNEL32.197)
  */
-UINT32 WINAPI GetCurrentDirectory32W( UINT32 buflen, LPWSTR buf )
+UINT WINAPI GetCurrentDirectoryW( UINT buflen, LPWSTR buf )
 {
     LPSTR xpath = HeapAlloc( GetProcessHeap(), 0, buflen+1 );
-    UINT32 ret = GetCurrentDirectory32A( buflen, xpath );
+    UINT ret = GetCurrentDirectoryA( buflen, xpath );
     lstrcpyAtoW( buf, xpath );
     HeapFree( GetProcessHeap(), 0, xpath );
     return ret;
@@ -1000,14 +1000,14 @@ UINT32 WINAPI GetCurrentDirectory32W( UINT32 buflen, LPWSTR buf )
  */
 BOOL16 WINAPI SetCurrentDirectory16( LPCSTR dir )
 {
-    return SetCurrentDirectory32A( dir );
+    return SetCurrentDirectoryA( dir );
 }
 
 
 /***********************************************************************
  *           SetCurrentDirectory32A   (KERNEL32.479)
  */
-BOOL32 WINAPI SetCurrentDirectory32A( LPCSTR dir )
+BOOL WINAPI SetCurrentDirectoryA( LPCSTR dir )
 {
     int olddrive, drive = DRIVE_GetCurrentDrive();
 
@@ -1038,10 +1038,10 @@ BOOL32 WINAPI SetCurrentDirectory32A( LPCSTR dir )
 /***********************************************************************
  *           SetCurrentDirectory32W   (KERNEL32.480)
  */
-BOOL32 WINAPI SetCurrentDirectory32W( LPCWSTR dirW )
+BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dirW )
 {
     LPSTR dir = HEAP_strdupWtoA( GetProcessHeap(), 0, dirW );
-    BOOL32 res = SetCurrentDirectory32A( dir );
+    BOOL res = SetCurrentDirectoryA( dir );
     HeapFree( GetProcessHeap(), 0, dir );
     return res;
 }
@@ -1050,7 +1050,7 @@ BOOL32 WINAPI SetCurrentDirectory32W( LPCWSTR dirW )
 /***********************************************************************
  *           GetLogicalDriveStrings32A   (KERNEL32.231)
  */
-UINT32 WINAPI GetLogicalDriveStrings32A( UINT32 len, LPSTR buffer )
+UINT WINAPI GetLogicalDriveStringsA( UINT len, LPSTR buffer )
 {
     int drive, count;
 
@@ -1076,7 +1076,7 @@ UINT32 WINAPI GetLogicalDriveStrings32A( UINT32 len, LPSTR buffer )
 /***********************************************************************
  *           GetLogicalDriveStrings32W   (KERNEL32.232)
  */
-UINT32 WINAPI GetLogicalDriveStrings32W( UINT32 len, LPWSTR buffer )
+UINT WINAPI GetLogicalDriveStringsW( UINT len, LPWSTR buffer )
 {
     int drive, count;
 
@@ -1116,7 +1116,7 @@ DWORD WINAPI GetLogicalDrives(void)
 /***********************************************************************
  *           GetVolumeInformation32A   (KERNEL32.309)
  */
-BOOL32 WINAPI GetVolumeInformation32A( LPCSTR root, LPSTR label,
+BOOL WINAPI GetVolumeInformationA( LPCSTR root, LPSTR label,
                                        DWORD label_len, DWORD *serial,
                                        DWORD *filename_len, DWORD *flags,
                                        LPSTR fsname, DWORD fsname_len )
@@ -1139,7 +1139,7 @@ BOOL32 WINAPI GetVolumeInformation32A( LPCSTR root, LPSTR label,
     if (!DRIVE_IsValid( drive )) return FALSE;
     if (label)
     {
-       lstrcpyn32A( label, DRIVE_GetLabel(drive), label_len );
+       lstrcpynA( label, DRIVE_GetLabel(drive), label_len );
        for (cp = label; *cp; cp++);
        while (cp != label && *(cp-1) == ' ') cp--;
        *cp = '\0';
@@ -1166,9 +1166,9 @@ BOOL32 WINAPI GetVolumeInformation32A( LPCSTR root, LPSTR label,
     if (fsname) {
     	/* Diablo checks that return code ... */
     	if (DRIVE_GetType(drive)==TYPE_CDROM)
-	    lstrcpyn32A( fsname, "CDFS", fsname_len );
+	    lstrcpynA( fsname, "CDFS", fsname_len );
 	else
-	    lstrcpyn32A( fsname, "FAT", fsname_len );
+	    lstrcpynA( fsname, "FAT", fsname_len );
     }
     return TRUE;
 }
@@ -1177,7 +1177,7 @@ BOOL32 WINAPI GetVolumeInformation32A( LPCSTR root, LPSTR label,
 /***********************************************************************
  *           GetVolumeInformation32W   (KERNEL32.310)
  */
-BOOL32 WINAPI GetVolumeInformation32W( LPCWSTR root, LPWSTR label,
+BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label,
                                        DWORD label_len, DWORD *serial,
                                        DWORD *filename_len, DWORD *flags,
                                        LPWSTR fsname, DWORD fsname_len )
@@ -1185,7 +1185,7 @@ BOOL32 WINAPI GetVolumeInformation32W( LPCWSTR root, LPWSTR label,
     LPSTR xroot    = HEAP_strdupWtoA( GetProcessHeap(), 0, root );
     LPSTR xvolname = label ? HeapAlloc(GetProcessHeap(),0,label_len) : NULL;
     LPSTR xfsname  = fsname ? HeapAlloc(GetProcessHeap(),0,fsname_len) : NULL;
-    BOOL32 ret = GetVolumeInformation32A( xroot, xvolname, label_len, serial,
+    BOOL ret = GetVolumeInformationA( xroot, xvolname, label_len, serial,
                                           filename_len, flags, xfsname,
                                           fsname_len );
     if (ret)
@@ -1199,7 +1199,7 @@ BOOL32 WINAPI GetVolumeInformation32W( LPCWSTR root, LPWSTR label,
     return ret;
 }
 
-BOOL32 WINAPI SetVolumeLabel32A(LPCSTR rootpath,LPCSTR volname) {
+BOOL WINAPI SetVolumeLabelA(LPCSTR rootpath,LPCSTR volname) {
 	FIXME(dosfs,"(%s,%s),stub!\n",rootpath,volname);
 	return TRUE;
 }
diff --git a/files/file.c b/files/file.c
index c596564d10f..8e18adb9afd 100644
--- a/files/file.c
+++ b/files/file.c
@@ -66,7 +66,7 @@ typedef struct
  *
  * Convert OF_* mode into flags for CreateFile.
  */
-static void FILE_ConvertOFMode( INT32 mode, DWORD *access, DWORD *sharing )
+static void FILE_ConvertOFMode( INT mode, DWORD *access, DWORD *sharing )
 {
     switch(mode & 0x03)
     {
@@ -141,7 +141,7 @@ Legend: Y = open succeeds, N = open fails with error code 05h
 	For all	other cases we barf,set the DOS_ERROR and return TRUE
 
  */
-static BOOL32 FILE_ShareDeny( int mode, int oldmode)
+static BOOL FILE_ShareDeny( int mode, int oldmode)
 {
   int oldsharemode = oldmode & 0x70;
   int sharemode    =    mode & 0x70;
@@ -307,7 +307,7 @@ void FILE_SetDosError(void)
  *
  * Duplicate a Unix handle into a task handle.
  */
-HFILE32 FILE_DupUnixHandle( int fd, DWORD access )
+HFILE FILE_DupUnixHandle( int fd, DWORD access )
 {
     FILE_OBJECT *file;
     int unix_handle;
@@ -317,7 +317,7 @@ HFILE32 FILE_DupUnixHandle( int fd, DWORD access )
     if ((unix_handle = dup(fd)) == -1)
     {
         FILE_SetDosError();
-        return INVALID_HANDLE_VALUE32;
+        return INVALID_HANDLE_VALUE;
     }
     req.access  = access;
     req.inherit = 1;
@@ -328,13 +328,13 @@ HFILE32 FILE_DupUnixHandle( int fd, DWORD access )
     CLIENT_SendRequest( REQ_CREATE_FILE, unix_handle, 1,
                         &req, sizeof(req) );
     CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL );
-    if (reply.handle == -1) return INVALID_HANDLE_VALUE32;
+    if (reply.handle == -1) return INVALID_HANDLE_VALUE;
 
     if (!(file = HeapAlloc( SystemHeap, 0, sizeof(FILE_OBJECT) )))
     {
         CLIENT_CloseHandle( reply.handle );
         SetLastError( ERROR_TOO_MANY_OPEN_FILES );
-        return (HFILE32)NULL;
+        return (HFILE)NULL;
     }
     file->header.type = K32OBJ_FILE;
     file->header.refcount = 0;
@@ -348,9 +348,9 @@ HFILE32 FILE_DupUnixHandle( int fd, DWORD access )
  *
  * Implementation of CreateFile. Takes a Unix path name.
  */
-HFILE32 FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
+HFILE FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
                          LPSECURITY_ATTRIBUTES sa, DWORD creation,
-                         DWORD attributes, HANDLE32 template )
+                         DWORD attributes, HANDLE template )
 {
     FILE_OBJECT *file;
     struct create_file_request req;
@@ -382,7 +382,7 @@ HFILE32 FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
 	    CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL );
 	}
     }
-    if (reply.handle == -1) return INVALID_HANDLE_VALUE32;
+    if (reply.handle == -1) return INVALID_HANDLE_VALUE;
 
     /* Now build the FILE_OBJECT */
 
@@ -390,7 +390,7 @@ HFILE32 FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
     {
         SetLastError( ERROR_OUTOFMEMORY );
         CLIENT_CloseHandle( reply.handle );
-        return (HFILE32)INVALID_HANDLE_VALUE32;
+        return (HFILE)INVALID_HANDLE_VALUE;
     }
     file->header.type = K32OBJ_FILE;
     file->header.refcount = 0;
@@ -404,7 +404,7 @@ HFILE32 FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
  *
  * Same as FILE_CreateFile but for a device
  */
-HFILE32 FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa )
+HFILE FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa )
 {
     FILE_OBJECT *file;
     struct create_device_request req;
@@ -415,7 +415,7 @@ HFILE32 FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa
     req.id      = client_id;
     CLIENT_SendRequest( REQ_CREATE_DEVICE, -1, 1, &req, sizeof(req) );
     CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL );
-    if (reply.handle == -1) return INVALID_HANDLE_VALUE32;
+    if (reply.handle == -1) return INVALID_HANDLE_VALUE;
 
     /* Now build the FILE_OBJECT */
 
@@ -423,7 +423,7 @@ HFILE32 FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa
     {
         SetLastError( ERROR_OUTOFMEMORY );
         CLIENT_CloseHandle( reply.handle );
-        return (HFILE32)INVALID_HANDLE_VALUE32;
+        return (HFILE)INVALID_HANDLE_VALUE;
     }
     file->header.type = K32OBJ_FILE;
     file->header.refcount = 0;
@@ -460,16 +460,16 @@ HFILE32 FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa
  * Doesn't support character devices, pipes, template files, or a
  * lot of the 'attributes' flags yet.
  */
-HFILE32 WINAPI CreateFile32A( LPCSTR filename, DWORD access, DWORD sharing,
+HFILE WINAPI CreateFileA( LPCSTR filename, DWORD access, DWORD sharing,
                               LPSECURITY_ATTRIBUTES sa, DWORD creation,
-                              DWORD attributes, HANDLE32 template )
+                              DWORD attributes, HANDLE template )
 {
     DOS_FULL_NAME full_name;
 
     if (!filename)
     {
         SetLastError( ERROR_INVALID_PARAMETER );
-        return HFILE_ERROR32;
+        return HFILE_ERROR;
     }
 
     /* If the name starts with '\\?\', ignore the first 4 chars. */
@@ -480,7 +480,7 @@ HFILE32 WINAPI CreateFile32A( LPCSTR filename, DWORD access, DWORD sharing,
 	{
             FIXME( file, "UNC name (%s) not supported.\n", filename );
             SetLastError( ERROR_PATH_NOT_FOUND );
-            return HFILE_ERROR32;
+            return HFILE_ERROR;
 	}
     }
 
@@ -492,32 +492,32 @@ HFILE32 WINAPI CreateFile32A( LPCSTR filename, DWORD access, DWORD sharing,
     {
         FIXME( file, "UNC name (%s) not supported.\n", filename );
         SetLastError( ERROR_PATH_NOT_FOUND );
-        return HFILE_ERROR32;
+        return HFILE_ERROR;
     }
 
     /* Open a console for CONIN$ or CONOUT$ */
-    if (!lstrcmpi32A(filename, "CONIN$")) return CONSOLE_OpenHandle( FALSE, access, sa );
-    if (!lstrcmpi32A(filename, "CONOUT$")) return CONSOLE_OpenHandle( TRUE, access, sa );
+    if (!lstrcmpiA(filename, "CONIN$")) return CONSOLE_OpenHandle( FALSE, access, sa );
+    if (!lstrcmpiA(filename, "CONOUT$")) return CONSOLE_OpenHandle( TRUE, access, sa );
 
     if (DOSFS_GetDevice( filename ))
     {
-    	HFILE32	ret;
+    	HFILE	ret;
 
         TRACE(file, "opening device '%s'\n", filename );
 
-	if (HFILE_ERROR32!=(ret=DOSFS_OpenDevice( filename, access )))
+	if (HFILE_ERROR!=(ret=DOSFS_OpenDevice( filename, access )))
 		return ret;
 
 	/* Do not silence this please. It is a critical error. -MM */
         ERR(file, "Couldn't open device '%s'!\n",filename);
         SetLastError( ERROR_FILE_NOT_FOUND );
-        return HFILE_ERROR32;
+        return HFILE_ERROR;
     }
 
     /* check for filename, don't check for last entry if creating */
     if (!DOSFS_GetFullName( filename,
                (creation == OPEN_EXISTING) || (creation == TRUNCATE_EXISTING), &full_name ))
-        return HFILE_ERROR32;
+        return HFILE_ERROR;
 
     return FILE_CreateFile( full_name.long_name, access, sharing,
                             sa, creation, attributes, template );
@@ -528,12 +528,12 @@ HFILE32 WINAPI CreateFile32A( LPCSTR filename, DWORD access, DWORD sharing,
 /*************************************************************************
  *              CreateFile32W              (KERNEL32.48)
  */
-HFILE32 WINAPI CreateFile32W( LPCWSTR filename, DWORD access, DWORD sharing,
+HFILE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing,
                               LPSECURITY_ATTRIBUTES sa, DWORD creation,
-                              DWORD attributes, HANDLE32 template)
+                              DWORD attributes, HANDLE template)
 {
     LPSTR afn = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    HFILE32 res = CreateFile32A( afn, access, sharing, sa, creation, attributes, template );
+    HFILE res = CreateFileA( afn, access, sharing, sa, creation, attributes, template );
     HeapFree( GetProcessHeap(), 0, afn );
     return res;
 }
@@ -571,7 +571,7 @@ static void FILE_FillInfo( struct stat *st, BY_HANDLE_FILE_INFORMATION *info )
  *
  * Stat a Unix path name. Return TRUE if OK.
  */
-BOOL32 FILE_Stat( LPCSTR unixName, BY_HANDLE_FILE_INFORMATION *info )
+BOOL FILE_Stat( LPCSTR unixName, BY_HANDLE_FILE_INFORMATION *info )
 {
     struct stat st;
 
@@ -590,7 +590,7 @@ BOOL32 FILE_Stat( LPCSTR unixName, BY_HANDLE_FILE_INFORMATION *info )
 /***********************************************************************
  *             GetFileInformationByHandle   (KERNEL32.219)
  */
-DWORD WINAPI GetFileInformationByHandle( HFILE32 hFile,
+DWORD WINAPI GetFileInformationByHandle( HFILE hFile,
                                          BY_HANDLE_FILE_INFORMATION *info )
 {
     struct get_file_info_request req;
@@ -622,14 +622,14 @@ DWORD WINAPI GetFileInformationByHandle( HFILE32 hFile,
  */
 DWORD WINAPI GetFileAttributes16( LPCSTR name )
 {
-    return GetFileAttributes32A( name );
+    return GetFileAttributesA( name );
 }
 
 
 /**************************************************************************
  *           GetFileAttributes32A   (KERNEL32.217)
  */
-DWORD WINAPI GetFileAttributes32A( LPCSTR name )
+DWORD WINAPI GetFileAttributesA( LPCSTR name )
 {
     DOS_FULL_NAME full_name;
     BY_HANDLE_FILE_INFORMATION info;
@@ -645,10 +645,10 @@ DWORD WINAPI GetFileAttributes32A( LPCSTR name )
 /**************************************************************************
  *           GetFileAttributes32W   (KERNEL32.218)
  */
-DWORD WINAPI GetFileAttributes32W( LPCWSTR name )
+DWORD WINAPI GetFileAttributesW( LPCWSTR name )
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    DWORD res = GetFileAttributes32A( nameA );
+    DWORD res = GetFileAttributesA( nameA );
     HeapFree( GetProcessHeap(), 0, nameA );
     return res;
 }
@@ -657,7 +657,7 @@ DWORD WINAPI GetFileAttributes32W( LPCWSTR name )
 /***********************************************************************
  *           GetFileSize   (KERNEL32.220)
  */
-DWORD WINAPI GetFileSize( HFILE32 hFile, LPDWORD filesizehigh )
+DWORD WINAPI GetFileSize( HFILE hFile, LPDWORD filesizehigh )
 {
     BY_HANDLE_FILE_INFORMATION info;
     if (!GetFileInformationByHandle( hFile, &info )) return 0;
@@ -669,7 +669,7 @@ DWORD WINAPI GetFileSize( HFILE32 hFile, LPDWORD filesizehigh )
 /***********************************************************************
  *           GetFileTime   (KERNEL32.221)
  */
-BOOL32 WINAPI GetFileTime( HFILE32 hFile, FILETIME *lpCreationTime,
+BOOL WINAPI GetFileTime( HFILE hFile, FILETIME *lpCreationTime,
                            FILETIME *lpLastAccessTime,
                            FILETIME *lpLastWriteTime )
 {
@@ -684,7 +684,7 @@ BOOL32 WINAPI GetFileTime( HFILE32 hFile, FILETIME *lpCreationTime,
 /***********************************************************************
  *           CompareFileTime   (KERNEL32.28)
  */
-INT32 WINAPI CompareFileTime( LPFILETIME x, LPFILETIME y )
+INT WINAPI CompareFileTime( LPFILETIME x, LPFILETIME y )
 {
         if (!x || !y) return -1;
 
@@ -721,22 +721,22 @@ UINT16 WINAPI GetTempFileName16( BYTE drive, LPCSTR prefix, UINT16 unique,
     if (drive & TF_FORCEDRIVE)
         sprintf(temppath,"%c:", drive & ~TF_FORCEDRIVE );
     else
-        GetTempPath32A( 132, temppath );
-    return (UINT16)GetTempFileName32A( temppath, prefix, unique, buffer );
+        GetTempPathA( 132, temppath );
+    return (UINT16)GetTempFileNameA( temppath, prefix, unique, buffer );
 }
 
 
 /***********************************************************************
  *           GetTempFileName32A   (KERNEL32.290)
  */
-UINT32 WINAPI GetTempFileName32A( LPCSTR path, LPCSTR prefix, UINT32 unique,
+UINT WINAPI GetTempFileNameA( LPCSTR path, LPCSTR prefix, UINT unique,
                                   LPSTR buffer)
 {
-    static UINT32 unique_temp;
+    static UINT unique_temp;
     DOS_FULL_NAME full_name;
     int i;
     LPSTR p;
-    UINT32 num;
+    UINT num;
 
     if ( !path || !prefix || !buffer ) return 0;
 
@@ -760,9 +760,9 @@ UINT32 WINAPI GetTempFileName32A( LPCSTR path, LPCSTR prefix, UINT32 unique,
     {
         do
         {
-            HFILE32 handle = CreateFile32A( buffer, GENERIC_WRITE, 0, NULL,
+            HFILE handle = CreateFileA( buffer, GENERIC_WRITE, 0, NULL,
                                             CREATE_NEW, FILE_ATTRIBUTE_NORMAL, -1 );
-            if (handle != INVALID_HANDLE_VALUE32)
+            if (handle != INVALID_HANDLE_VALUE)
             {  /* We created it */
                 TRACE(file, "created %s\n",
 			      buffer);
@@ -794,17 +794,17 @@ UINT32 WINAPI GetTempFileName32A( LPCSTR path, LPCSTR prefix, UINT32 unique,
 /***********************************************************************
  *           GetTempFileName32W   (KERNEL32.291)
  */
-UINT32 WINAPI GetTempFileName32W( LPCWSTR path, LPCWSTR prefix, UINT32 unique,
+UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique,
                                   LPWSTR buffer )
 {
     LPSTR   patha,prefixa;
     char    buffera[144];
-    UINT32  ret;
+    UINT  ret;
 
     if (!path) return 0;
     patha   = HEAP_strdupWtoA( GetProcessHeap(), 0, path );
     prefixa = HEAP_strdupWtoA( GetProcessHeap(), 0, prefix );
-    ret     = GetTempFileName32A( patha, prefixa, unique, buffera );
+    ret     = GetTempFileNameA( patha, prefixa, unique, buffera );
     lstrcpyAtoW( buffer, buffera );
     HeapFree( GetProcessHeap(), 0, patha );
     HeapFree( GetProcessHeap(), 0, prefixa );
@@ -817,17 +817,17 @@ UINT32 WINAPI GetTempFileName32W( LPCWSTR path, LPCWSTR prefix, UINT32 unique,
  *
  * Implementation of OpenFile16() and OpenFile32().
  */
-static HFILE32 FILE_DoOpenFile( LPCSTR name, OFSTRUCT *ofs, UINT32 mode,
-                                BOOL32 win32 )
+static HFILE FILE_DoOpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode,
+                                BOOL win32 )
 {
-    HFILE32 hFileRet;
+    HFILE hFileRet;
     FILETIME filetime;
     WORD filedatetime[2];
     DOS_FULL_NAME full_name;
     DWORD access, sharing;
     char *p;
 
-    if (!ofs) return HFILE_ERROR32;
+    if (!ofs) return HFILE_ERROR;
 
     ofs->cBytes = sizeof(OFSTRUCT);
     ofs->nErrCode = 0;
@@ -835,7 +835,7 @@ static HFILE32 FILE_DoOpenFile( LPCSTR name, OFSTRUCT *ofs, UINT32 mode,
 
     if (!name) {
 	ERR(file, "called with `name' set to NULL ! Please debug.\n");
-	return HFILE_ERROR32;
+	return HFILE_ERROR;
     }
 
     TRACE(file, "%s %04x\n", name, mode );
@@ -843,7 +843,7 @@ static HFILE32 FILE_DoOpenFile( LPCSTR name, OFSTRUCT *ofs, UINT32 mode,
     /* the watcom 10.6 IDE relies on a valid path returned in ofs->szPathName
        Are there any cases where getting the path here is wrong? 
        Uwe Bonnes 1997 Apr 2 */
-    if (!GetFullPathName32A( name, sizeof(ofs->szPathName),
+    if (!GetFullPathNameA( name, sizeof(ofs->szPathName),
 			     ofs->szPathName, NULL )) goto error;
     FILE_ConvertOFMode( mode, &access, &sharing );
 
@@ -863,9 +863,9 @@ static HFILE32 FILE_DoOpenFile( LPCSTR name, OFSTRUCT *ofs, UINT32 mode,
 
     if (mode & OF_CREATE)
     {
-        if ((hFileRet = CreateFile32A( name, GENERIC_READ | GENERIC_WRITE,
+        if ((hFileRet = CreateFileA( name, GENERIC_READ | GENERIC_WRITE,
                                        sharing, NULL, CREATE_ALWAYS,
-                                       FILE_ATTRIBUTE_NORMAL, -1 ))== INVALID_HANDLE_VALUE32)
+                                       FILE_ATTRIBUTE_NORMAL, -1 ))== INVALID_HANDLE_VALUE)
             goto error;
         goto success;
     }
@@ -890,7 +890,7 @@ static HFILE32 FILE_DoOpenFile( LPCSTR name, OFSTRUCT *ofs, UINT32 mode,
 found:
     TRACE(file, "found %s = %s\n",
                   full_name.long_name, full_name.short_name );
-    lstrcpyn32A( ofs->szPathName, full_name.short_name,
+    lstrcpynA( ofs->szPathName, full_name.short_name,
                  sizeof(ofs->szPathName) );
 
     if (mode & OF_SHARE_EXCLUSIVE)
@@ -911,7 +911,7 @@ found:
 	if (GetModuleHandle16(last+1))
 	  {
 	    TRACE(file,"Denying shared open for %s\n",full_name.long_name);
-	    return HFILE_ERROR32;
+	    return HFILE_ERROR;
 	  }
       }
 
@@ -924,7 +924,7 @@ found:
 
     hFileRet = FILE_CreateFile( full_name.long_name, access, sharing,
                                 NULL, OPEN_EXISTING, 0, -1 );
-    if (hFileRet == HFILE_ERROR32) goto not_found;
+    if (hFileRet == HFILE_ERROR) goto not_found;
 
     GetFileTime( hFileRet, NULL, NULL, &filetime );
     FileTimeToDosDateTime( &filetime, &filedatetime[0], &filedatetime[1] );
@@ -966,7 +966,7 @@ error:  /* We get here if there was an error opening the file */
     ofs->nErrCode = GetLastError();
     WARN(file, "(%s): return = HFILE_ERROR error= %d\n", 
 		  name,ofs->nErrCode );
-    return HFILE_ERROR32;
+    return HFILE_ERROR;
 }
 
 
@@ -982,7 +982,7 @@ HFILE16 WINAPI OpenFile16( LPCSTR name, OFSTRUCT *ofs, UINT16 mode )
 /***********************************************************************
  *           OpenFile32   (KERNEL32.396)
  */
-HFILE32 WINAPI OpenFile32( LPCSTR name, OFSTRUCT *ofs, UINT32 mode )
+HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode )
 {
     return FILE_DoOpenFile( name, ofs, mode, TRUE );
 }
@@ -994,8 +994,8 @@ HFILE32 WINAPI OpenFile32( LPCSTR name, OFSTRUCT *ofs, UINT32 mode )
  * Allocates the default DOS handles for a process. Called either by
  * AllocDosHandle below or by the DOSVM stuff.
  */
-BOOL32 FILE_InitProcessDosHandles( void ) {
-	HANDLE32 *ptr;
+BOOL FILE_InitProcessDosHandles( void ) {
+	HANDLE *ptr;
 
         if (!(ptr = HeapAlloc( SystemHeap, HEAP_ZERO_MEMORY,
                                sizeof(*ptr) * DOS_TABLE_SIZE )))
@@ -1015,12 +1015,12 @@ BOOL32 FILE_InitProcessDosHandles( void ) {
  * Allocate a DOS handle for a Win32 handle. The Win32 handle is no
  * longer valid after this function (even on failure).
  */
-HFILE16 FILE_AllocDosHandle( HANDLE32 handle )
+HFILE16 FILE_AllocDosHandle( HANDLE handle )
 {
     int i;
-    HANDLE32 *ptr = PROCESS_Current()->dos_handles;
+    HANDLE *ptr = PROCESS_Current()->dos_handles;
 
-    if (!handle || (handle == INVALID_HANDLE_VALUE32))
+    if (!handle || (handle == INVALID_HANDLE_VALUE))
         return INVALID_HANDLE_VALUE16;
 
     if (!ptr) {
@@ -1048,13 +1048,13 @@ error:
  *
  * Return the Win32 handle for a DOS handle.
  */
-HANDLE32 FILE_GetHandle32( HFILE16 hfile )
+HANDLE FILE_GetHandle( HFILE16 hfile )
 {
-    HANDLE32 *table = PROCESS_Current()->dos_handles;
+    HANDLE *table = PROCESS_Current()->dos_handles;
     if ((hfile >= DOS_TABLE_SIZE) || !table || !table[hfile])
     {
         SetLastError( ERROR_INVALID_HANDLE );
-        return INVALID_HANDLE_VALUE32;
+        return INVALID_HANDLE_VALUE;
     }
     return table[hfile];
 }
@@ -1067,8 +1067,8 @@ HANDLE32 FILE_GetHandle32( HFILE16 hfile )
  */
 HFILE16 FILE_Dup2( HFILE16 hFile1, HFILE16 hFile2 )
 {
-    HANDLE32 *table = PROCESS_Current()->dos_handles;
-    HANDLE32 new_handle;
+    HANDLE *table = PROCESS_Current()->dos_handles;
+    HANDLE new_handle;
 
     if ((hFile1 >= DOS_TABLE_SIZE) || (hFile2 >= DOS_TABLE_SIZE) ||
         !table || !table[hFile1])
@@ -1097,7 +1097,7 @@ HFILE16 FILE_Dup2( HFILE16 hFile1, HFILE16 hFile2 )
  */
 HFILE16 WINAPI _lclose16( HFILE16 hFile )
 {
-    HANDLE32 *table = PROCESS_Current()->dos_handles;
+    HANDLE *table = PROCESS_Current()->dos_handles;
 
     if (hFile < 5)
     {
@@ -1120,17 +1120,17 @@ HFILE16 WINAPI _lclose16( HFILE16 hFile )
 /***********************************************************************
  *           _lclose32   (KERNEL32.592)
  */
-HFILE32 WINAPI _lclose32( HFILE32 hFile )
+HFILE WINAPI _lclose( HFILE hFile )
 {
     TRACE(file, "handle %d\n", hFile );
-    return CloseHandle( hFile ) ? 0 : HFILE_ERROR32;
+    return CloseHandle( hFile ) ? 0 : HFILE_ERROR;
 }
 
 
 /***********************************************************************
  *              ReadFile                (KERNEL32.428)
  */
-BOOL32 WINAPI ReadFile( HANDLE32 hFile, LPVOID buffer, DWORD bytesToRead,
+BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead,
                         LPDWORD bytesRead, LPOVERLAPPED overlapped )
 {
     struct get_read_fd_request req;
@@ -1164,7 +1164,7 @@ BOOL32 WINAPI ReadFile( HANDLE32 hFile, LPVOID buffer, DWORD bytesToRead,
 /***********************************************************************
  *             WriteFile               (KERNEL32.578)
  */
-BOOL32 WINAPI WriteFile( HANDLE32 hFile, LPCVOID buffer, DWORD bytesToWrite,
+BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite,
                          LPDWORD bytesWritten, LPOVERLAPPED overlapped )
 {
     struct get_write_fd_request req;
@@ -1206,9 +1206,9 @@ LONG WINAPI WIN16_hread( HFILE16 hFile, SEGPTR buffer, LONG count )
                   hFile, (DWORD)buffer, count );
 
     /* Some programs pass a count larger than the allocated buffer */
-    maxlen = GetSelectorLimit( SELECTOROF(buffer) ) - OFFSETOF(buffer) + 1;
+    maxlen = GetSelectorLimit16( SELECTOROF(buffer) ) - OFFSETOF(buffer) + 1;
     if (count > maxlen) count = maxlen;
-    return _lread32(FILE_GetHandle32(hFile), PTR_SEG_TO_LIN(buffer), count );
+    return _lread(FILE_GetHandle(hFile), PTR_SEG_TO_LIN(buffer), count );
 }
 
 
@@ -1224,7 +1224,7 @@ UINT16 WINAPI WIN16_lread( HFILE16 hFile, SEGPTR buffer, UINT16 count )
 /***********************************************************************
  *           _lread32   (KERNEL32.596)
  */
-UINT32 WINAPI _lread32( HFILE32 handle, LPVOID buffer, UINT32 count )
+UINT WINAPI _lread( HFILE handle, LPVOID buffer, UINT count )
 {
     DWORD result;
     if (!ReadFile( handle, buffer, count, &result, NULL )) return -1;
@@ -1237,7 +1237,7 @@ UINT32 WINAPI _lread32( HFILE32 handle, LPVOID buffer, UINT32 count )
  */
 UINT16 WINAPI _lread16( HFILE16 hFile, LPVOID buffer, UINT16 count )
 {
-    return (UINT16)_lread32(FILE_GetHandle32(hFile), buffer, (LONG)count );
+    return (UINT16)_lread(FILE_GetHandle(hFile), buffer, (LONG)count );
 }
 
 
@@ -1247,17 +1247,17 @@ UINT16 WINAPI _lread16( HFILE16 hFile, LPVOID buffer, UINT16 count )
 HFILE16 WINAPI _lcreat16( LPCSTR path, INT16 attr )
 {
     TRACE(file, "%s %02x\n", path, attr );
-    return FILE_AllocDosHandle( _lcreat32( path, attr ) );
+    return FILE_AllocDosHandle( _lcreat( path, attr ) );
 }
 
 
 /***********************************************************************
  *           _lcreat32   (KERNEL32.593)
  */
-HFILE32 WINAPI _lcreat32( LPCSTR path, INT32 attr )
+HFILE WINAPI _lcreat( LPCSTR path, INT attr )
 {
     TRACE(file, "%s %02x\n", path, attr );
-    return CreateFile32A( path, GENERIC_READ | GENERIC_WRITE,
+    return CreateFileA( path, GENERIC_READ | GENERIC_WRITE,
                           FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                           CREATE_ALWAYS, attr, -1 );
 }
@@ -1266,10 +1266,10 @@ HFILE32 WINAPI _lcreat32( LPCSTR path, INT32 attr )
 /***********************************************************************
  *           _lcreat16_uniq   (Not a Windows API)
  */
-HFILE16 _lcreat16_uniq( LPCSTR path, INT32 attr )
+HFILE16 _lcreat16_uniq( LPCSTR path, INT attr )
 {
     TRACE(file, "%s %02x\n", path, attr );
-    return FILE_AllocDosHandle( CreateFile32A( path, GENERIC_READ | GENERIC_WRITE,
+    return FILE_AllocDosHandle( CreateFileA( path, GENERIC_READ | GENERIC_WRITE,
                                                FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                                                CREATE_NEW, attr, -1 ));
 }
@@ -1278,7 +1278,7 @@ HFILE16 _lcreat16_uniq( LPCSTR path, INT32 attr )
 /***********************************************************************
  *           SetFilePointer   (KERNEL32.492)
  */
-DWORD WINAPI SetFilePointer( HFILE32 hFile, LONG distance, LONG *highword,
+DWORD WINAPI SetFilePointer( HFILE hFile, LONG distance, LONG *highword,
                              DWORD method )
 {
     struct set_file_pointer_request req;
@@ -1318,14 +1318,14 @@ DWORD WINAPI SetFilePointer( HFILE32 hFile, LONG distance, LONG *highword,
  */
 LONG WINAPI _llseek16( HFILE16 hFile, LONG lOffset, INT16 nOrigin )
 {
-    return SetFilePointer( FILE_GetHandle32(hFile), lOffset, NULL, nOrigin );
+    return SetFilePointer( FILE_GetHandle(hFile), lOffset, NULL, nOrigin );
 }
 
 
 /***********************************************************************
  *           _llseek32   (KERNEL32.594)
  */
-LONG WINAPI _llseek32( HFILE32 hFile, LONG lOffset, INT32 nOrigin )
+LONG WINAPI _llseek( HFILE hFile, LONG lOffset, INT nOrigin )
 {
     return SetFilePointer( hFile, lOffset, NULL, nOrigin );
 }
@@ -1336,20 +1336,20 @@ LONG WINAPI _llseek32( HFILE32 hFile, LONG lOffset, INT32 nOrigin )
  */
 HFILE16 WINAPI _lopen16( LPCSTR path, INT16 mode )
 {
-    return FILE_AllocDosHandle( _lopen32( path, mode ) );
+    return FILE_AllocDosHandle( _lopen( path, mode ) );
 }
 
 
 /***********************************************************************
  *           _lopen32   (KERNEL32.595)
  */
-HFILE32 WINAPI _lopen32( LPCSTR path, INT32 mode )
+HFILE WINAPI _lopen( LPCSTR path, INT mode )
 {
     DWORD access, sharing;
 
     TRACE(file, "('%s',%04x)\n", path, mode );
     FILE_ConvertOFMode( mode, &access, &sharing );
-    return CreateFile32A( path, access, sharing, NULL, OPEN_EXISTING, 0, -1 );
+    return CreateFileA( path, access, sharing, NULL, OPEN_EXISTING, 0, -1 );
 }
 
 
@@ -1358,15 +1358,15 @@ HFILE32 WINAPI _lopen32( LPCSTR path, INT32 mode )
  */
 UINT16 WINAPI _lwrite16( HFILE16 hFile, LPCSTR buffer, UINT16 count )
 {
-    return (UINT16)_hwrite32( FILE_GetHandle32(hFile), buffer, (LONG)count );
+    return (UINT16)_hwrite( FILE_GetHandle(hFile), buffer, (LONG)count );
 }
 
 /***********************************************************************
  *           _lwrite32   (KERNEL32.761)
  */
-UINT32 WINAPI _lwrite32( HFILE32 hFile, LPCSTR buffer, UINT32 count )
+UINT WINAPI _lwrite( HFILE hFile, LPCSTR buffer, UINT count )
 {
-    return (UINT32)_hwrite32( hFile, buffer, (LONG)count );
+    return (UINT)_hwrite( hFile, buffer, (LONG)count );
 }
 
 
@@ -1375,16 +1375,16 @@ UINT32 WINAPI _lwrite32( HFILE32 hFile, LPCSTR buffer, UINT32 count )
  */
 LONG WINAPI _hread16( HFILE16 hFile, LPVOID buffer, LONG count)
 {
-    return _lread32( FILE_GetHandle32(hFile), buffer, count );
+    return _lread( FILE_GetHandle(hFile), buffer, count );
 }
 
 
 /***********************************************************************
  *           _hread32   (KERNEL32.590)
  */
-LONG WINAPI _hread32( HFILE32 hFile, LPVOID buffer, LONG count)
+LONG WINAPI _hread( HFILE hFile, LPVOID buffer, LONG count)
 {
-    return _lread32( hFile, buffer, count );
+    return _lread( hFile, buffer, count );
 }
 
 
@@ -1393,7 +1393,7 @@ LONG WINAPI _hread32( HFILE32 hFile, LPVOID buffer, LONG count)
  */
 LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count )
 {
-    return _hwrite32( FILE_GetHandle32(hFile), buffer, count );
+    return _hwrite( FILE_GetHandle(hFile), buffer, count );
 }
 
 
@@ -1407,7 +1407,7 @@ LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count )
  *		o works with console handles
  *		
  */
-LONG WINAPI _hwrite32( HFILE32 handle, LPCSTR buffer, LONG count )
+LONG WINAPI _hwrite( HFILE handle, LPCSTR buffer, LONG count )
 {
     DWORD result;
 
@@ -1416,11 +1416,11 @@ LONG WINAPI _hwrite32( HFILE32 handle, LPCSTR buffer, LONG count )
     if (!count)
     {
         /* Expand or truncate at current position */
-        if (!SetEndOfFile( handle )) return HFILE_ERROR32;
+        if (!SetEndOfFile( handle )) return HFILE_ERROR;
         return 0;
     }
     if (!WriteFile( handle, buffer, count, &result, NULL ))
-        return HFILE_ERROR32;
+        return HFILE_ERROR;
     return result;
 }
 
@@ -1430,8 +1430,8 @@ LONG WINAPI _hwrite32( HFILE32 handle, LPCSTR buffer, LONG count )
  */
 UINT16 WINAPI SetHandleCount16( UINT16 count )
 {
-    HGLOBAL16 hPDB = GetCurrentPDB();
-    PDB *pdb = (PDB *)GlobalLock16( hPDB );
+    HGLOBAL16 hPDB = GetCurrentPDB16();
+    PDB16 *pdb = (PDB16 *)GlobalLock16( hPDB );
     BYTE *files = PTR_SEG_TO_LIN( pdb->fileHandlesPtr );
 
     TRACE(file, "(%d)\n", count );
@@ -1446,7 +1446,7 @@ UINT16 WINAPI SetHandleCount16( UINT16 count )
             memcpy( pdb->fileHandles, files, 20 );
             GlobalFree16( pdb->hFileHandles );
             pdb->fileHandlesPtr = (SEGPTR)MAKELONG( 0x18,
-                                                   GlobalHandleToSel( hPDB ) );
+                                                   GlobalHandleToSel16( hPDB ) );
             pdb->hFileHandles = 0;
             pdb->nbFiles = 20;
         }
@@ -1480,7 +1480,7 @@ UINT16 WINAPI SetHandleCount16( UINT16 count )
 /*************************************************************************
  *           SetHandleCount32   (KERNEL32.494)
  */
-UINT32 WINAPI SetHandleCount32( UINT32 count )
+UINT WINAPI SetHandleCount( UINT count )
 {
     return MIN( 256, count );
 }
@@ -1489,7 +1489,7 @@ UINT32 WINAPI SetHandleCount32( UINT32 count )
 /***********************************************************************
  *           FlushFileBuffers   (KERNEL32.133)
  */
-BOOL32 WINAPI FlushFileBuffers( HFILE32 hFile )
+BOOL WINAPI FlushFileBuffers( HFILE hFile )
 {
     struct flush_file_request req;
 
@@ -1504,7 +1504,7 @@ BOOL32 WINAPI FlushFileBuffers( HFILE32 hFile )
 /**************************************************************************
  *           SetEndOfFile   (KERNEL32.483)
  */
-BOOL32 WINAPI SetEndOfFile( HFILE32 hFile )
+BOOL WINAPI SetEndOfFile( HFILE hFile )
 {
     struct truncate_file_request req;
 
@@ -1521,14 +1521,14 @@ BOOL32 WINAPI SetEndOfFile( HFILE32 hFile )
  */
 BOOL16 WINAPI DeleteFile16( LPCSTR path )
 {
-    return DeleteFile32A( path );
+    return DeleteFileA( path );
 }
 
 
 /***********************************************************************
  *           DeleteFile32A   (KERNEL32.71)
  */
-BOOL32 WINAPI DeleteFile32A( LPCSTR path )
+BOOL WINAPI DeleteFileA( LPCSTR path )
 {
     DOS_FULL_NAME full_name;
 
@@ -1559,10 +1559,10 @@ BOOL32 WINAPI DeleteFile32A( LPCSTR path )
 /***********************************************************************
  *           DeleteFile32W   (KERNEL32.72)
  */
-BOOL32 WINAPI DeleteFile32W( LPCWSTR path )
+BOOL WINAPI DeleteFileW( LPCWSTR path )
 {
     LPSTR xpath = HEAP_strdupWtoA( GetProcessHeap(), 0, path );
-    BOOL32 ret = DeleteFile32A( xpath );
+    BOOL ret = DeleteFileA( xpath );
     HeapFree( GetProcessHeap(), 0, xpath );
     return ret;
 }
@@ -1662,7 +1662,7 @@ int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low )
 /***********************************************************************
  *           GetFileType   (KERNEL32.222)
  */
-DWORD WINAPI GetFileType( HFILE32 hFile )
+DWORD WINAPI GetFileType( HFILE hFile )
 {
     struct get_file_info_request req;
     struct get_file_info_reply reply;
@@ -1680,7 +1680,7 @@ DWORD WINAPI GetFileType( HFILE32 hFile )
 /**************************************************************************
  *           MoveFileEx32A   (KERNEL32.???)
  */
-BOOL32 WINAPI MoveFileEx32A( LPCSTR fn1, LPCSTR fn2, DWORD flag )
+BOOL WINAPI MoveFileExA( LPCSTR fn1, LPCSTR fn2, DWORD flag )
 {
     DOS_FULL_NAME full_name1, full_name2;
     int mode=0; /* mode == 1: use copy */
@@ -1750,18 +1750,18 @@ BOOL32 WINAPI MoveFileEx32A( LPCSTR fn1, LPCSTR fn2, DWORD flag )
 	}
       else return TRUE;
     else /* copy File */
-      return CopyFile32A(fn1, fn2, (!(flag & MOVEFILE_REPLACE_EXISTING))); 
+      return CopyFileA(fn1, fn2, (!(flag & MOVEFILE_REPLACE_EXISTING))); 
     
 }
 
 /**************************************************************************
  *           MoveFileEx32W   (KERNEL32.???)
  */
-BOOL32 WINAPI MoveFileEx32W( LPCWSTR fn1, LPCWSTR fn2, DWORD flag )
+BOOL WINAPI MoveFileExW( LPCWSTR fn1, LPCWSTR fn2, DWORD flag )
 {
     LPSTR afn1 = HEAP_strdupWtoA( GetProcessHeap(), 0, fn1 );
     LPSTR afn2 = HEAP_strdupWtoA( GetProcessHeap(), 0, fn2 );
-    BOOL32 res = MoveFileEx32A( afn1, afn2, flag );
+    BOOL res = MoveFileExA( afn1, afn2, flag );
     HeapFree( GetProcessHeap(), 0, afn1 );
     HeapFree( GetProcessHeap(), 0, afn2 );
     return res;
@@ -1773,7 +1773,7 @@ BOOL32 WINAPI MoveFileEx32W( LPCWSTR fn1, LPCWSTR fn2, DWORD flag )
  *
  *  Move file or directory
  */
-BOOL32 WINAPI MoveFile32A( LPCSTR fn1, LPCSTR fn2 )
+BOOL WINAPI MoveFileA( LPCSTR fn1, LPCSTR fn2 )
 {
     DOS_FULL_NAME full_name1, full_name2;
     struct stat fstat;
@@ -1808,7 +1808,7 @@ BOOL32 WINAPI MoveFile32A( LPCSTR fn1, LPCSTR fn2 )
 	return FALSE;
       }
       else
-	return CopyFile32A(fn1, fn2, TRUE); /*fail, if exist */ 
+	return CopyFileA(fn1, fn2, TRUE); /*fail, if exist */ 
     }
 }
 
@@ -1816,11 +1816,11 @@ BOOL32 WINAPI MoveFile32A( LPCSTR fn1, LPCSTR fn2 )
 /**************************************************************************
  *           MoveFile32W   (KERNEL32.390)
  */
-BOOL32 WINAPI MoveFile32W( LPCWSTR fn1, LPCWSTR fn2 )
+BOOL WINAPI MoveFileW( LPCWSTR fn1, LPCWSTR fn2 )
 {
     LPSTR afn1 = HEAP_strdupWtoA( GetProcessHeap(), 0, fn1 );
     LPSTR afn2 = HEAP_strdupWtoA( GetProcessHeap(), 0, fn2 );
-    BOOL32 res = MoveFile32A( afn1, afn2 );
+    BOOL res = MoveFileA( afn1, afn2 );
     HeapFree( GetProcessHeap(), 0, afn1 );
     HeapFree( GetProcessHeap(), 0, afn2 );
     return res;
@@ -1830,35 +1830,35 @@ BOOL32 WINAPI MoveFile32W( LPCWSTR fn1, LPCWSTR fn2 )
 /**************************************************************************
  *           CopyFile32A   (KERNEL32.36)
  */
-BOOL32 WINAPI CopyFile32A( LPCSTR source, LPCSTR dest, BOOL32 fail_if_exists )
+BOOL WINAPI CopyFileA( LPCSTR source, LPCSTR dest, BOOL fail_if_exists )
 {
-    HFILE32 h1, h2;
+    HFILE h1, h2;
     BY_HANDLE_FILE_INFORMATION info;
-    UINT32 count;
-    BOOL32 ret = FALSE;
+    UINT count;
+    BOOL ret = FALSE;
     int mode;
     char buffer[2048];
 
-    if ((h1 = _lopen32( source, OF_READ )) == HFILE_ERROR32) return FALSE;
+    if ((h1 = _lopen( source, OF_READ )) == HFILE_ERROR) return FALSE;
     if (!GetFileInformationByHandle( h1, &info ))
     {
         CloseHandle( h1 );
         return FALSE;
     }
     mode = (info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666;
-    if ((h2 = CreateFile32A( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+    if ((h2 = CreateFileA( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                              fail_if_exists ? CREATE_NEW : CREATE_ALWAYS,
-                             info.dwFileAttributes, h1 )) == HFILE_ERROR32)
+                             info.dwFileAttributes, h1 )) == HFILE_ERROR)
     {
         CloseHandle( h1 );
         return FALSE;
     }
-    while ((count = _lread32( h1, buffer, sizeof(buffer) )) > 0)
+    while ((count = _lread( h1, buffer, sizeof(buffer) )) > 0)
     {
         char *p = buffer;
         while (count > 0)
         {
-            INT32 res = _lwrite32( h2, p, count );
+            INT res = _lwrite( h2, p, count );
             if (res <= 0) goto done;
             p += res;
             count -= res;
@@ -1875,11 +1875,11 @@ done:
 /**************************************************************************
  *           CopyFile32W   (KERNEL32.37)
  */
-BOOL32 WINAPI CopyFile32W( LPCWSTR source, LPCWSTR dest, BOOL32 fail_if_exists)
+BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists)
 {
     LPSTR sourceA = HEAP_strdupWtoA( GetProcessHeap(), 0, source );
     LPSTR destA   = HEAP_strdupWtoA( GetProcessHeap(), 0, dest );
-    BOOL32 ret = CopyFile32A( sourceA, destA, fail_if_exists );
+    BOOL ret = CopyFileA( sourceA, destA, fail_if_exists );
     HeapFree( GetProcessHeap(), 0, sourceA );
     HeapFree( GetProcessHeap(), 0, destA );
     return ret;
@@ -1893,14 +1893,14 @@ BOOL32 WINAPI CopyFile32W( LPCWSTR source, LPCWSTR dest, BOOL32 fail_if_exists)
  * the "ex" version of the method and calls the CopyFile method.
  * It will have to be fixed eventually.
  */
-BOOL32 WINAPI CopyFileEx32A(LPCSTR             sourceFilename,
+BOOL WINAPI CopyFileExA(LPCSTR             sourceFilename,
                            LPCSTR             destFilename,
                            LPPROGRESS_ROUTINE progressRoutine,
                            LPVOID             appData,
-                           LPBOOL32           cancelFlagPointer,
+                           LPBOOL           cancelFlagPointer,
                            DWORD              copyFlags)
 {
-  BOOL32 failIfExists = FALSE;
+  BOOL failIfExists = FALSE;
 
   /*
    * Interpret the only flag that CopyFile can interpret.
@@ -1910,23 +1910,23 @@ BOOL32 WINAPI CopyFileEx32A(LPCSTR             sourceFilename,
     failIfExists = TRUE;
   }
 
-  return CopyFile32A(sourceFilename, destFilename, failIfExists);
+  return CopyFileA(sourceFilename, destFilename, failIfExists);
 }
 
 /**************************************************************************
  *           CopyFileEx32W   (KERNEL32.859)
  */
-BOOL32 WINAPI CopyFileEx32W(LPCWSTR            sourceFilename,
+BOOL WINAPI CopyFileExW(LPCWSTR            sourceFilename,
                            LPCWSTR            destFilename,
                            LPPROGRESS_ROUTINE progressRoutine,
                            LPVOID             appData,
-                           LPBOOL32           cancelFlagPointer,
+                           LPBOOL           cancelFlagPointer,
                            DWORD              copyFlags)
 {
     LPSTR sourceA = HEAP_strdupWtoA( GetProcessHeap(), 0, sourceFilename );
     LPSTR destA   = HEAP_strdupWtoA( GetProcessHeap(), 0, destFilename );
 
-    BOOL32 ret = CopyFileEx32A(sourceA,
+    BOOL ret = CopyFileExA(sourceA,
                               destA,
                               progressRoutine,
                               appData,
@@ -1943,7 +1943,7 @@ BOOL32 WINAPI CopyFileEx32W(LPCWSTR            sourceFilename,
 /***********************************************************************
  *              SetFileTime   (KERNEL32.650)
  */
-BOOL32 WINAPI SetFileTime( HFILE32 hFile,
+BOOL WINAPI SetFileTime( HFILE hFile,
                            const FILETIME *lpCreationTime,
                            const FILETIME *lpLastAccessTime,
                            const FILETIME *lpLastWriteTime )
@@ -1970,7 +1970,7 @@ BOOL32 WINAPI SetFileTime( HFILE32 hFile,
 /**************************************************************************
  *           LockFile   (KERNEL32.511)
  */
-BOOL32 WINAPI LockFile( HFILE32 hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
+BOOL WINAPI LockFile( HFILE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
                         DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh )
 {
     struct lock_file_request req;
@@ -1990,7 +1990,7 @@ BOOL32 WINAPI LockFile( HFILE32 hFile, DWORD dwFileOffsetLow, DWORD dwFileOffset
 /**************************************************************************
  *           UnlockFile   (KERNEL32.703)
  */
-BOOL32 WINAPI UnlockFile( HFILE32 hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
+BOOL WINAPI UnlockFile( HFILE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
                           DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh )
 {
     struct unlock_file_request req;
@@ -2031,7 +2031,7 @@ static void DOS_RemoveFileLocks(FILE_OBJECT *file);
  * how critical that is at this point (FIXME).
  */
 
-static BOOL32 DOS_AddLock(FILE_OBJECT *file, struct flock *f)
+static BOOL DOS_AddLock(FILE_OBJECT *file, struct flock *f)
 {
   DOS_FILE_LOCK *curr;
   DWORD		processId;
@@ -2084,7 +2084,7 @@ static void DOS_RemoveFileLocks(FILE_OBJECT *file)
   }
 }
 
-static BOOL32 DOS_RemoveLock(FILE_OBJECT *file, struct flock *f)
+static BOOL DOS_RemoveLock(FILE_OBJECT *file, struct flock *f)
 {
   DWORD		processId;
   DOS_FILE_LOCK **curr;
@@ -2112,8 +2112,8 @@ static BOOL32 DOS_RemoveLock(FILE_OBJECT *file, struct flock *f)
 /**************************************************************************
  *           LockFile   (KERNEL32.511)
  */
-BOOL32 WINAPI LockFile(
-	HFILE32 hFile,DWORD dwFileOffsetLow,DWORD dwFileOffsetHigh,
+BOOL WINAPI LockFile(
+	HFILE hFile,DWORD dwFileOffsetLow,DWORD dwFileOffsetHigh,
 	DWORD nNumberOfBytesToLockLow,DWORD nNumberOfBytesToLockHigh )
 {
   struct flock f;
@@ -2163,8 +2163,8 @@ BOOL32 WINAPI LockFile(
 /**************************************************************************
  *           UnlockFile   (KERNEL32.703)
  */
-BOOL32 WINAPI UnlockFile(
-	HFILE32 hFile,DWORD dwFileOffsetLow,DWORD dwFileOffsetHigh,
+BOOL WINAPI UnlockFile(
+	HFILE hFile,DWORD dwFileOffsetLow,DWORD dwFileOffsetHigh,
 	DWORD nNumberOfBytesToUnlockLow,DWORD nNumberOfBytesToUnlockHigh )
 {
   FILE_OBJECT *file;
@@ -2203,7 +2203,7 @@ BOOL32 WINAPI UnlockFile(
 /**************************************************************************
  * GetFileAttributesEx32A [KERNEL32.874]
  */
-BOOL32 WINAPI GetFileAttributesEx32A(
+BOOL WINAPI GetFileAttributesExA(
 	LPCSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId,
 	LPVOID lpFileInformation)
 {
@@ -2238,13 +2238,13 @@ BOOL32 WINAPI GetFileAttributesEx32A(
 /**************************************************************************
  * GetFileAttributesEx32W [KERNEL32.875]
  */
-BOOL32 WINAPI GetFileAttributesEx32W(
+BOOL WINAPI GetFileAttributesExW(
 	LPCWSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId,
 	LPVOID lpFileInformation)
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, lpFileName );
-    BOOL32 res = 
-	GetFileAttributesEx32A( nameA, fInfoLevelId, lpFileInformation);
+    BOOL res = 
+	GetFileAttributesExA( nameA, fInfoLevelId, lpFileInformation);
     HeapFree( GetProcessHeap(), 0, nameA );
     return res;
 }
diff --git a/files/profile.c b/files/profile.c
index 05c67f3590f..fb67b711f3c 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -36,7 +36,7 @@ typedef struct tagPROFILESECTION
 
 typedef struct
 {
-    BOOL32           changed;
+    BOOL           changed;
     PROFILESECTION  *section;
     char            *dos_name;
     char            *unix_name;
@@ -89,7 +89,7 @@ static void PROFILE_CopyEntry( char *buffer, const char *value, int len,
 
     if (!handle_env)
     {
-        lstrcpyn32A( buffer, value, len );
+        lstrcpynA( buffer, value, len );
         if (quote && (len >= strlen(value))) buffer[strlen(buffer)-1] = '\0';
         return;
     }
@@ -102,10 +102,10 @@ static void PROFILE_CopyEntry( char *buffer, const char *value, int len,
             const char *env_p;
             const char *p2 = strchr( p, '}' );
             if (!p2) continue;  /* ignore it */
-            lstrcpyn32A(env_val, p + 2, MIN( sizeof(env_val), (int)(p2-p)-1 ));
+            lstrcpynA(env_val, p + 2, MIN( sizeof(env_val), (int)(p2-p)-1 ));
             if ((env_p = getenv( env_val )) != NULL)
             {
-                lstrcpyn32A( buffer, env_p, len );
+                lstrcpynA( buffer, env_p, len );
                 buffer += strlen( buffer );
                 len -= strlen( buffer );
             }
@@ -258,7 +258,7 @@ static PROFILESECTION *PROFILE_Load( FILE *file )
  *
  * Delete a section from a profile tree.
  */
-static BOOL32 PROFILE_DeleteSection( PROFILESECTION **section, LPCSTR name )
+static BOOL PROFILE_DeleteSection( PROFILESECTION **section, LPCSTR name )
 {
     while (*section)
     {
@@ -281,7 +281,7 @@ static BOOL32 PROFILE_DeleteSection( PROFILESECTION **section, LPCSTR name )
  *
  * Delete a key from a profile tree.
  */
-static BOOL32 PROFILE_DeleteKey( PROFILESECTION **section,
+static BOOL PROFILE_DeleteKey( PROFILESECTION **section,
                                  LPCSTR section_name, LPCSTR key_name )
 {
     while (*section)
@@ -354,7 +354,7 @@ static PROFILEKEY *PROFILE_Find( PROFILESECTION **section,
  *
  * Flush the current profile to disk if changed.
  */
-static BOOL32 PROFILE_FlushFile(void)
+static BOOL PROFILE_FlushFile(void)
 {
     char *p, buffer[MAX_PATHNAME_LEN];
     const char *unix_name;
@@ -378,7 +378,7 @@ static BOOL32 PROFILE_FlushFile(void)
             strcat( buffer, "/.wine/" );
             p = buffer + strlen(buffer);
             strcpy( p, strrchr( CurProfile->dos_name, '\\' ) + 1 );
-            CharLower32A( p );
+            CharLowerA( p );
             file = fopen( buffer, "w" );
             unix_name = buffer;
         }
@@ -405,7 +405,7 @@ static BOOL32 PROFILE_FlushFile(void)
  *
  * Open a profile file, checking the cached file first.
  */
-static BOOL32 PROFILE_Open( LPCSTR filename )
+static BOOL PROFILE_Open( LPCSTR filename )
 {
     DOS_FULL_NAME full_name;
     char buffer[MAX_PATHNAME_LEN];
@@ -438,7 +438,7 @@ static BOOL32 PROFILE_Open( LPCSTR filename )
     }
     else
     {
-        GetWindowsDirectory32A( buffer, sizeof(buffer) );
+        GetWindowsDirectoryA( buffer, sizeof(buffer) );
         strcat( buffer, "\\" );
         strcat( buffer, filename );
         if (!DOSFS_GetFullName( buffer, FALSE, &full_name )) return FALSE;
@@ -507,7 +507,7 @@ static BOOL32 PROFILE_Open( LPCSTR filename )
         strcat( buffer, "/.wine/" );
         p = buffer + strlen(buffer);
         strcpy( p, strrchr( newdos_name, '\\' ) + 1 );
-        CharLower32A( p );
+        CharLowerA( p );
         if ((file = fopen( buffer, "r" )))
         {
             TRACE(profile, "(%s): found it in %s\n",
@@ -547,16 +547,16 @@ static BOOL32 PROFILE_Open( LPCSTR filename )
  * Returns all keys of a section.
  * If return_values is TRUE, also include the corresponding values.
  */
-static INT32 PROFILE_GetSection( PROFILESECTION *section, LPCSTR section_name,
-                                 LPSTR buffer, UINT32 len, BOOL32 handle_env,
-				 BOOL32 return_values )
+static INT PROFILE_GetSection( PROFILESECTION *section, LPCSTR section_name,
+                                 LPSTR buffer, UINT len, BOOL handle_env,
+				 BOOL return_values )
 {
     PROFILEKEY *key;
     while (section)
     {
         if (section->name && !strcasecmp( section->name, section_name ))
         {
-            UINT32 oldlen = len;
+            UINT oldlen = len;
             for (key = section->key; key; key = key->next)
             {
                 if (len <= 2) break;
@@ -598,8 +598,8 @@ static INT32 PROFILE_GetSection( PROFILESECTION *section, LPCSTR section_name,
  *
  * Get a profile string.
  */
-static INT32 PROFILE_GetString( LPCSTR section, LPCSTR key_name,
-                                LPCSTR def_val, LPSTR buffer, UINT32 len )
+static INT PROFILE_GetString( LPCSTR section, LPCSTR key_name,
+                                LPCSTR def_val, LPSTR buffer, UINT len )
 {
     PROFILEKEY *key = NULL;
 
@@ -623,7 +623,7 @@ static INT32 PROFILE_GetString( LPCSTR section, LPCSTR key_name,
  *
  * Set a profile string.
  */
-static BOOL32 PROFILE_SetString( LPCSTR section_name, LPCSTR key_name,
+static BOOL PROFILE_SetString( LPCSTR section_name, LPCSTR key_name,
                                  LPCSTR value )
 {
     if (!key_name)  /* Delete a whole section */
@@ -849,7 +849,7 @@ int PROFILE_LoadWineIni(void)
       }
     if ((p = getenv( "HOME" )) != NULL)
     {
-        lstrcpyn32A(buffer, p, MAX_PATHNAME_LEN - sizeof(PROFILE_WineIniName));
+        lstrcpynA(buffer, p, MAX_PATHNAME_LEN - sizeof(PROFILE_WineIniName));
         strcat( buffer, PROFILE_WineIniName );
         if ((f = fopen( buffer, "r" )) != NULL)
         {
@@ -936,18 +936,18 @@ UINT16 WINAPI GetProfileInt16( LPCSTR section, LPCSTR entry, INT16 def_val )
 /***********************************************************************
  *           GetProfileInt32A   (KERNEL32.264)
  */
-UINT32 WINAPI GetProfileInt32A( LPCSTR section, LPCSTR entry, INT32 def_val )
+UINT WINAPI GetProfileIntA( LPCSTR section, LPCSTR entry, INT def_val )
 {
-    return GetPrivateProfileInt32A( section, entry, def_val, "win.ini" );
+    return GetPrivateProfileIntA( section, entry, def_val, "win.ini" );
 }
 
 /***********************************************************************
  *           GetProfileInt32W   (KERNEL32.264)
  */
-UINT32 WINAPI GetProfileInt32W( LPCWSTR section, LPCWSTR entry, INT32 def_val )
+UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val )
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini" );
-    return GetPrivateProfileInt32W( section, entry, def_val, wininiW );
+    return GetPrivateProfileIntW( section, entry, def_val, wininiW );
 }
 
 /***********************************************************************
@@ -963,40 +963,40 @@ INT16 WINAPI GetProfileString16( LPCSTR section, LPCSTR entry, LPCSTR def_val,
 /***********************************************************************
  *           GetProfileString32A   (KERNEL32.268)
  */
-INT32 WINAPI GetProfileString32A( LPCSTR section, LPCSTR entry, LPCSTR def_val,
-                                  LPSTR buffer, UINT32 len )
+INT WINAPI GetProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR def_val,
+                                  LPSTR buffer, UINT len )
 {
-    return GetPrivateProfileString32A( section, entry, def_val,
+    return GetPrivateProfileStringA( section, entry, def_val,
                                        buffer, len, "win.ini" );
 }
 
 /***********************************************************************
  *           GetProfileString32W   (KERNEL32.269)
  */
-INT32 WINAPI GetProfileString32W( LPCWSTR section, LPCWSTR entry,
-                                  LPCWSTR def_val, LPWSTR buffer, UINT32 len )
+INT WINAPI GetProfileStringW( LPCWSTR section, LPCWSTR entry,
+                                  LPCWSTR def_val, LPWSTR buffer, UINT len )
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini" );
-    return GetPrivateProfileString32W( section, entry, def_val,
+    return GetPrivateProfileStringW( section, entry, def_val,
                                        buffer, len, wininiW );
 }
 
 /***********************************************************************
  *           GetProfileSection32A   (KERNEL32.268)
  */
-INT32 WINAPI GetProfileSection32A( LPCSTR section, LPSTR buffer, DWORD len )
+INT WINAPI GetProfileSectionA( LPCSTR section, LPSTR buffer, DWORD len )
 {
-    return GetPrivateProfileSection32A( section, buffer, len, "win.ini" );
+    return GetPrivateProfileSectionA( section, buffer, len, "win.ini" );
 }
 
 
 /***********************************************************************
  *           GetProfileSection32W   (KERNEL32)
  */
-INT32 WINAPI GetProfileSection32W( LPCWSTR section, LPWSTR buffer, DWORD len )
+INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len )
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini" );
-    return GetPrivateProfileSection32W( section, buffer, len, wininiW );
+    return GetPrivateProfileSectionW( section, buffer, len, wininiW );
 }
 
 
@@ -1015,20 +1015,20 @@ BOOL16 WINAPI WriteProfileString16( LPCSTR section, LPCSTR entry,
 /***********************************************************************
  *           WriteProfileString32A   (KERNEL32.587)
  */
-BOOL32 WINAPI WriteProfileString32A( LPCSTR section, LPCSTR entry,
+BOOL WINAPI WriteProfileStringA( LPCSTR section, LPCSTR entry,
                                      LPCSTR string )
 {
-    return WritePrivateProfileString32A( section, entry, string, "win.ini" );
+    return WritePrivateProfileStringA( section, entry, string, "win.ini" );
 }
 
 /***********************************************************************
  *           WriteProfileString32W   (KERNEL32.588)
  */
-BOOL32 WINAPI WriteProfileString32W( LPCWSTR section, LPCWSTR entry,
+BOOL WINAPI WriteProfileStringW( LPCWSTR section, LPCWSTR entry,
                                      LPCWSTR string )
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini" );
-    return WritePrivateProfileString32W( section, entry, string, wininiW );
+    return WritePrivateProfileStringW( section, entry, string, wininiW );
 }
 
 
@@ -1038,7 +1038,7 @@ BOOL32 WINAPI WriteProfileString32W( LPCWSTR section, LPCWSTR entry,
 UINT16 WINAPI GetPrivateProfileInt16( LPCSTR section, LPCSTR entry,
                                       INT16 def_val, LPCSTR filename )
 {
-    long result=(long)GetPrivateProfileInt32A(section,entry,def_val,filename);
+    long result=(long)GetPrivateProfileIntA(section,entry,def_val,filename);
 
     if (result > 65535) return 65535;
     if (result >= 0) return (UINT16)result;
@@ -1049,31 +1049,31 @@ UINT16 WINAPI GetPrivateProfileInt16( LPCSTR section, LPCSTR entry,
 /***********************************************************************
  *           GetPrivateProfileInt32A   (KERNEL32.251)
  */
-UINT32 WINAPI GetPrivateProfileInt32A( LPCSTR section, LPCSTR entry,
-                                       INT32 def_val, LPCSTR filename )
+UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry,
+                                       INT def_val, LPCSTR filename )
 {
     char buffer[20];
     char *p;
     long result;
 
-    GetPrivateProfileString32A( section, entry, "",
+    GetPrivateProfileStringA( section, entry, "",
                                 buffer, sizeof(buffer), filename );
-    if (!buffer[0]) return (UINT32)def_val;
+    if (!buffer[0]) return (UINT)def_val;
     result = strtol( buffer, &p, 0 );
     if (p == buffer) return 0;  /* No digits at all */
-    return (UINT32)result;
+    return (UINT)result;
 }
 
 /***********************************************************************
  *           GetPrivateProfileInt32W   (KERNEL32.252)
  */
-UINT32 WINAPI GetPrivateProfileInt32W( LPCWSTR section, LPCWSTR entry,
-                                       INT32 def_val, LPCWSTR filename )
+UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry,
+                                       INT def_val, LPCWSTR filename )
 {
     LPSTR sectionA  = HEAP_strdupWtoA( GetProcessHeap(), 0, section );
     LPSTR entryA    = HEAP_strdupWtoA( GetProcessHeap(), 0, entry );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    UINT32 res = GetPrivateProfileInt32A(sectionA, entryA, def_val, filenameA);
+    UINT res = GetPrivateProfileIntA(sectionA, entryA, def_val, filenameA);
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, filenameA );
     HeapFree( GetProcessHeap(), 0, entryA );
@@ -1087,37 +1087,37 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry,
                                         LPCSTR def_val, LPSTR buffer,
                                         UINT16 len, LPCSTR filename )
 {
-    return GetPrivateProfileString32A(section,entry,def_val,buffer,len,filename);
+    return GetPrivateProfileStringA(section,entry,def_val,buffer,len,filename);
 }
 
 /***********************************************************************
  *           GetPrivateProfileString32A   (KERNEL32.255)
  */
-INT32 WINAPI GetPrivateProfileString32A( LPCSTR section, LPCSTR entry,
+INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry,
                                          LPCSTR def_val, LPSTR buffer,
-                                         UINT32 len, LPCSTR filename )
+                                         UINT len, LPCSTR filename )
 {
     if (!filename) 
 	filename = "win.ini";
     if (PROFILE_Open( filename ))
         return PROFILE_GetString( section, entry, def_val, buffer, len );
-    lstrcpyn32A( buffer, def_val, len );
+    lstrcpynA( buffer, def_val, len );
     return strlen( buffer );
 }
 
 /***********************************************************************
  *           GetPrivateProfileString32W   (KERNEL32.256)
  */
-INT32 WINAPI GetPrivateProfileString32W( LPCWSTR section, LPCWSTR entry,
+INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
                                          LPCWSTR def_val, LPWSTR buffer,
-                                         UINT32 len, LPCWSTR filename )
+                                         UINT len, LPCWSTR filename )
 {
     LPSTR sectionA  = HEAP_strdupWtoA( GetProcessHeap(), 0, section );
     LPSTR entryA    = HEAP_strdupWtoA( GetProcessHeap(), 0, entry );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
     LPSTR def_valA  = HEAP_strdupWtoA( GetProcessHeap(), 0, def_val );
     LPSTR bufferA   = HeapAlloc( GetProcessHeap(), 0, len );
-    INT32 ret = GetPrivateProfileString32A( sectionA, entryA, def_valA,
+    INT ret = GetPrivateProfileStringA( sectionA, entryA, def_valA,
                                             bufferA, len, filenameA );
     lstrcpynAtoW( buffer, bufferA, len );
     HeapFree( GetProcessHeap(), 0, sectionA );
@@ -1131,7 +1131,7 @@ INT32 WINAPI GetPrivateProfileString32W( LPCWSTR section, LPCWSTR entry,
 /***********************************************************************
  *           GetPrivateProfileSection32A   (KERNEL32.255)
  */
-INT32 WINAPI GetPrivateProfileSection32A( LPCSTR section, LPSTR buffer,
+INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer,
                                           DWORD len, LPCSTR filename )
 {
     if (PROFILE_Open( filename ))
@@ -1145,14 +1145,14 @@ INT32 WINAPI GetPrivateProfileSection32A( LPCSTR section, LPSTR buffer,
  *           GetPrivateProfileSection32W   (KERNEL32.256)
  */
 
-INT32 WINAPI GetPrivateProfileSection32W (LPCWSTR section, LPWSTR buffer,
+INT WINAPI GetPrivateProfileSectionW (LPCWSTR section, LPWSTR buffer,
                                           DWORD len, LPCWSTR filename )
 
 {
     LPSTR sectionA  = HEAP_strdupWtoA( GetProcessHeap(), 0, section );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
     LPSTR bufferA   = HeapAlloc( GetProcessHeap(), 0, len );
-    INT32 ret = GetPrivateProfileSection32A( sectionA, bufferA, len, 
+    INT ret = GetPrivateProfileSectionA( sectionA, bufferA, len, 
 						filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, filenameA );
@@ -1166,13 +1166,13 @@ INT32 WINAPI GetPrivateProfileSection32W (LPCWSTR section, LPWSTR buffer,
 BOOL16 WINAPI WritePrivateProfileString16( LPCSTR section, LPCSTR entry,
                                            LPCSTR string, LPCSTR filename )
 {
-    return WritePrivateProfileString32A(section,entry,string,filename);
+    return WritePrivateProfileStringA(section,entry,string,filename);
 }
 
 /***********************************************************************
  *           WritePrivateProfileString32A   (KERNEL32.582)
  */
-BOOL32 WINAPI WritePrivateProfileString32A( LPCSTR section, LPCSTR entry,
+BOOL WINAPI WritePrivateProfileStringA( LPCSTR section, LPCSTR entry,
                                             LPCSTR string, LPCSTR filename )
 {
     if (!PROFILE_Open( filename )) return FALSE;
@@ -1183,14 +1183,14 @@ BOOL32 WINAPI WritePrivateProfileString32A( LPCSTR section, LPCSTR entry,
 /***********************************************************************
  *           WritePrivateProfileString32W   (KERNEL32.583)
  */
-BOOL32 WINAPI WritePrivateProfileString32W( LPCWSTR section, LPCWSTR entry,
+BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
                                             LPCWSTR string, LPCWSTR filename )
 {
     LPSTR sectionA  = HEAP_strdupWtoA( GetProcessHeap(), 0, section );
     LPSTR entryA    = HEAP_strdupWtoA( GetProcessHeap(), 0, entry );
     LPSTR stringA   = HEAP_strdupWtoA( GetProcessHeap(), 0, string );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    BOOL32 res = WritePrivateProfileString32A( sectionA, entryA,
+    BOOL res = WritePrivateProfileStringA( sectionA, entryA,
                                                stringA, filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, entryA );
@@ -1202,7 +1202,7 @@ BOOL32 WINAPI WritePrivateProfileString32W( LPCWSTR section, LPCWSTR entry,
 /***********************************************************************
  *           WritePrivateProfileSection32A   (KERNEL32)
  */
-BOOL32 WINAPI WritePrivateProfileSection32A( LPCSTR section, 
+BOOL WINAPI WritePrivateProfileSectionA( LPCSTR section, 
                                             LPCSTR string, LPCSTR filename )
 {
     char *p =(char*)string;
@@ -1223,14 +1223,14 @@ BOOL32 WINAPI WritePrivateProfileSection32A( LPCSTR section,
 /***********************************************************************
  *           WritePrivateProfileSection32W   (KERNEL32)
  */
-BOOL32 WINAPI WritePrivateProfileSection32W( LPCWSTR section,
+BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section,
                                             LPCWSTR string, LPCWSTR filename)
 
 {
     LPSTR sectionA  = HEAP_strdupWtoA( GetProcessHeap(), 0, section );
     LPSTR stringA   = HEAP_strdupWtoA( GetProcessHeap(), 0, string );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    BOOL32 res = WritePrivateProfileSection32A( sectionA, stringA, filenameA );
+    BOOL res = WritePrivateProfileSectionA( sectionA, stringA, filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, stringA );
     HeapFree( GetProcessHeap(), 0, filenameA );
@@ -1241,20 +1241,20 @@ BOOL32 WINAPI WritePrivateProfileSection32W( LPCWSTR section,
 /***********************************************************************
  *           WriteProfileSection32A   (KERNEL32.747)
  */
-BOOL32 WINAPI WriteProfileSection32A( LPCSTR section, LPCSTR keys_n_values)
+BOOL WINAPI WriteProfileSectionA( LPCSTR section, LPCSTR keys_n_values)
                                      
 {
-    return WritePrivateProfileSection32A( section, keys_n_values, "win.ini");
+    return WritePrivateProfileSectionA( section, keys_n_values, "win.ini");
 }
 
 /***********************************************************************
  *           WriteProfileSection32W   (KERNEL32.748)
  */
-BOOL32 WINAPI WriteProfileSection32W( LPCWSTR section, LPCWSTR keys_n_values)
+BOOL WINAPI WriteProfileSectionW( LPCWSTR section, LPCWSTR keys_n_values)
 {
    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini");
    
-   return (WritePrivateProfileSection32W (section,keys_n_values, wininiW));
+   return (WritePrivateProfileSectionW (section,keys_n_values, wininiW));
 }
 
 /***********************************************************************
@@ -1303,7 +1303,7 @@ WORD WINAPI GetProfileSectionNames16( LPSTR buffer, WORD size)
 /***********************************************************************
  *           GetPrivateProfileSectionNames32A  (KERNEL32.365)
  */
-DWORD WINAPI GetPrivateProfileSectionNames32A( LPSTR buffer, DWORD size,
+DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size,
 					 LPCSTR filename)
 
 {
@@ -1314,14 +1314,14 @@ DWORD WINAPI GetPrivateProfileSectionNames32A( LPSTR buffer, DWORD size,
 /***********************************************************************
  *           GetPrivateProfileSectionNames32W  (KERNEL32.366)
  */
-DWORD WINAPI GetPrivateProfileSectionNames32W( LPWSTR buffer, DWORD size,
+DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size,
                                          LPCWSTR filename)
 
 {
    LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
    LPSTR bufferA   = HeapAlloc( GetProcessHeap(), 0, size);
 
-   INT32 ret = GetPrivateProfileSectionNames16 (bufferA, size, filenameA);
+   INT ret = GetPrivateProfileSectionNames16 (bufferA, size, filenameA);
    lstrcpynAtoW( buffer, bufferA, size);   
    HeapFree( GetProcessHeap(), 0, bufferA);
    HeapFree( GetProcessHeap(), 0, filenameA );
@@ -1333,15 +1333,15 @@ DWORD WINAPI GetPrivateProfileSectionNames32W( LPWSTR buffer, DWORD size,
 /***********************************************************************
  *           GetPrivateProfileStruct32A (KERNEL32.370)
  */
-BOOL32 WINAPI GetPrivateProfileStruct32A (LPCSTR section, LPCSTR key, 
-	LPVOID buf, UINT32 len, LPCSTR filename)
+BOOL WINAPI GetPrivateProfileStructA (LPCSTR section, LPCSTR key, 
+	LPVOID buf, UINT len, LPCSTR filename)
 {
     PROFILEKEY *k;
 
     if (PROFILE_Open( filename )) {
         k=PROFILE_Find ( &CurProfile->section, section, key, FALSE);
 	if (!k) return FALSE;
-    	lstrcpyn32A( buf, k->value, strlen(k->value));
+    	lstrcpynA( buf, k->value, strlen(k->value));
         return TRUE;
     }
   return FALSE;
@@ -1350,15 +1350,15 @@ BOOL32 WINAPI GetPrivateProfileStruct32A (LPCSTR section, LPCSTR key,
 /***********************************************************************
  *           GetPrivateProfileStruct32W (KERNEL32.543)
  */
-BOOL32 WINAPI GetPrivateProfileStruct32W (LPCWSTR section, LPCWSTR key,
-        LPVOID buffer, UINT32 len, LPCWSTR filename)
+BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key,
+        LPVOID buffer, UINT len, LPCWSTR filename)
 {
     LPSTR sectionA  = HEAP_strdupWtoA( GetProcessHeap(), 0, section );
     LPSTR keyA      = HEAP_strdupWtoA( GetProcessHeap(), 0, key);
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
     LPSTR bufferA   = HeapAlloc( GetProcessHeap(), 0, len );
 
-    INT32 ret = GetPrivateProfileStruct32A( sectionA, keyA, bufferA,
+    INT ret = GetPrivateProfileStructA( sectionA, keyA, bufferA,
                                             len, filenameA );
     lstrcpynAtoW( buffer, bufferA, len );
     HeapFree( GetProcessHeap(), 0, bufferA);
@@ -1375,8 +1375,8 @@ BOOL32 WINAPI GetPrivateProfileStruct32W (LPCWSTR section, LPCWSTR key,
 /***********************************************************************
  *           WritePrivateProfileStruct32A (KERNEL32.744)
  */
-BOOL32 WINAPI WritePrivateProfileStruct32A (LPCSTR section, LPCSTR key, 
-	LPVOID buf, UINT32 bufsize, LPCSTR filename)
+BOOL WINAPI WritePrivateProfileStructA (LPCSTR section, LPCSTR key, 
+	LPVOID buf, UINT bufsize, LPCSTR filename)
 {
     if ((!section) && (!key) && (!buf)) {	/* flush the cache */
         PROFILE_FlushFile();
@@ -1390,13 +1390,13 @@ BOOL32 WINAPI WritePrivateProfileStruct32A (LPCSTR section, LPCSTR key,
 /***********************************************************************
  *           WritePrivateProfileStruct32W (KERNEL32.544)
  */
-BOOL32 WINAPI WritePrivateProfileStruct32W (LPCWSTR section, LPCWSTR key,
-        LPVOID buf, UINT32 bufsize, LPCWSTR filename)
+BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key,
+        LPVOID buf, UINT bufsize, LPCWSTR filename)
 {
     LPSTR sectionA  = HEAP_strdupWtoA( GetProcessHeap(), 0, section );
     LPSTR keyA      = HEAP_strdupWtoA( GetProcessHeap(), 0, key);
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    INT32 ret = WritePrivateProfileStruct32A( sectionA, keyA, buf, bufsize,
+    INT ret = WritePrivateProfileStructA( sectionA, keyA, buf, bufsize,
                                              filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, keyA );
@@ -1409,7 +1409,7 @@ BOOL32 WINAPI WritePrivateProfileStruct32W (LPCWSTR section, LPCWSTR key,
 /***********************************************************************
  *           WriteOutProfiles   (KERNEL.315)
  */
-void WINAPI WriteOutProfiles(void)
+void WINAPI WriteOutProfiles16(void)
 {
     PROFILE_FlushFile();
 }
diff --git a/graphics/bitblt.c b/graphics/bitblt.c
index 4576d0b74a6..a775bddee92 100644
--- a/graphics/bitblt.c
+++ b/graphics/bitblt.c
@@ -26,8 +26,8 @@ BOOL16 WINAPI PatBlt16( HDC16 hdc, INT16 left, INT16 top,
 /***********************************************************************
  *           PatBlt32    (GDI32.260)
  */
-BOOL32 WINAPI PatBlt32( HDC32 hdc, INT32 left, INT32 top,
-                        INT32 width, INT32 height, DWORD rop)
+BOOL WINAPI PatBlt( HDC hdc, INT left, INT top,
+                        INT width, INT height, DWORD rop)
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc || !dc->funcs->pPatBlt) return FALSE;
@@ -62,8 +62,8 @@ BOOL16 WINAPI BitBlt16( HDC16 hdcDst, INT16 xDst, INT16 yDst, INT16 width,
 /***********************************************************************
  *           BitBlt32    (GDI32.10)
  */
-BOOL32 WINAPI BitBlt32( HDC32 hdcDst, INT32 xDst, INT32 yDst, INT32 width,
-                        INT32 height, HDC32 hdcSrc, INT32 xSrc, INT32 ySrc,
+BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width,
+                        INT height, HDC hdcSrc, INT xSrc, INT ySrc,
                         DWORD rop )
 {
     DC *dcDst, *dcSrc;
@@ -107,10 +107,10 @@ BOOL16 WINAPI StretchBlt16( HDC16 hdcDst, INT16 xDst, INT16 yDst,
 /***********************************************************************
  *           StretchBlt32    (GDI32.350)
  */
-BOOL32 WINAPI StretchBlt32( HDC32 hdcDst, INT32 xDst, INT32 yDst,
-                            INT32 widthDst, INT32 heightDst,
-                            HDC32 hdcSrc, INT32 xSrc, INT32 ySrc,
-                            INT32 widthSrc, INT32 heightSrc, DWORD rop )
+BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst,
+                            INT widthDst, INT heightDst,
+                            HDC hdcSrc, INT xSrc, INT ySrc,
+                            INT widthSrc, INT heightSrc, DWORD rop )
 {
     DC *dcDst, *dcSrc;
 
@@ -131,28 +131,28 @@ BOOL32 WINAPI StretchBlt32( HDC32 hdcDst, INT32 xDst, INT32 yDst,
 /***********************************************************************
  *           FastWindowFrame    (GDI.400)
  */
-BOOL16 WINAPI FastWindowFrame( HDC16 hdc, const RECT16 *rect,
+BOOL16 WINAPI FastWindowFrame16( HDC16 hdc, const RECT16 *rect,
                                INT16 width, INT16 height, DWORD rop )
 {
-    HBRUSH32 hbrush = SelectObject32( hdc, GetStockObject32( GRAY_BRUSH ) );
-    PatBlt32( hdc, rect->left, rect->top,
+    HBRUSH hbrush = SelectObject( hdc, GetStockObject( GRAY_BRUSH ) );
+    PatBlt( hdc, rect->left, rect->top,
               rect->right - rect->left - width, height, rop );
-    PatBlt32( hdc, rect->left, rect->top + height, width,
+    PatBlt( hdc, rect->left, rect->top + height, width,
               rect->bottom - rect->top - height, rop );
-    PatBlt32( hdc, rect->left + width, rect->bottom,
+    PatBlt( hdc, rect->left + width, rect->bottom,
               rect->right - rect->left - width, -height, rop );
-    PatBlt32( hdc, rect->right, rect->top, -width, 
+    PatBlt( hdc, rect->right, rect->top, -width, 
               rect->bottom - rect->top - height, rop );
-    SelectObject32( hdc, hbrush );
+    SelectObject( hdc, hbrush );
     return TRUE;
 }
 /***********************************************************************
  *           MaskBlt32 [GDI32.252]
  */
-BOOL32 WINAPI MaskBlt32(HDC32 hdcDest, INT32 nXDest, INT32 nYDest,
-                        INT32 nWidth, INT32 nHeight, HDC32 hdcSource,
-			INT32 nXSrc, INT32 nYSrc, HBITMAP32 hbmMask,
-			INT32 xMask, INT32 yMask, DWORD dwRop)
+BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest,
+                        INT nWidth, INT nHeight, HDC hdcSource,
+			INT nXSrc, INT nYSrc, HBITMAP hbmMask,
+			INT xMask, INT yMask, DWORD dwRop)
 {
     FIXME(bitmap, "(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%ld): stub\n",
              hdcDest,nXDest,nYDest,nWidth,nHeight,hdcSource,nXSrc,nYSrc,
@@ -164,9 +164,9 @@ BOOL32 WINAPI MaskBlt32(HDC32 hdcDest, INT32 nXDest, INT32 nYDest,
  *      PlgBlt [GDI.267]
  *
  */
-BOOL32 WINAPI PlgBlt32( HDC32 hdcDest, const POINT32 *lpPoint,
-                        HDC32 hdcSrc, INT32 nXDest, INT32 nYDest, INT32 nWidth,
-                        INT32 nHeight, HBITMAP32 hbmMask, INT32 xMask, INT32 yMask)
+BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint,
+                        HDC hdcSrc, INT nXDest, INT nYDest, INT nWidth,
+                        INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask)
 {
         FIXME(gdi, "PlgBlt, stub\n");
         return 1;
diff --git a/graphics/cache.c b/graphics/cache.c
index 7cf4c929ab2..ea603904a0c 100644
--- a/graphics/cache.c
+++ b/graphics/cache.c
@@ -15,17 +15,17 @@ static const WORD wPattern55AA[] =
     0x5555, 0xaaaa, 0x5555, 0xaaaa
 };
 
-static HBRUSH32  hPattern55AABrush = 0;
-static HBITMAP32 hPattern55AABitmap = 0;
+static HBRUSH  hPattern55AABrush = 0;
+static HBITMAP hPattern55AABitmap = 0;
 
 
 /*********************************************************************
  *	CACHE_GetPattern55AABrush
  */
-HBRUSH32 CACHE_GetPattern55AABrush(void)
+HBRUSH CACHE_GetPattern55AABrush(void)
 {
     if (!hPattern55AABrush)
-        hPattern55AABrush = CreatePatternBrush32(CACHE_GetPattern55AABitmap());
+        hPattern55AABrush = CreatePatternBrush(CACHE_GetPattern55AABitmap());
     return hPattern55AABrush;
 }
 
@@ -33,9 +33,9 @@ HBRUSH32 CACHE_GetPattern55AABrush(void)
 /*********************************************************************
  *	CACHE_GetPattern55AABitmap
  */
-HBITMAP32 CACHE_GetPattern55AABitmap(void)
+HBITMAP CACHE_GetPattern55AABitmap(void)
 {
     if (!hPattern55AABitmap)
-        hPattern55AABitmap = CreateBitmap32( 8, 8, 1, 1, wPattern55AA );
+        hPattern55AABitmap = CreateBitmap( 8, 8, 1, 1, wPattern55AA );
     return hPattern55AABitmap;
 }
diff --git a/graphics/d3dviewport.c b/graphics/d3dviewport.c
index 49c34ec2dbe..5582e4fd90d 100644
--- a/graphics/d3dviewport.c
+++ b/graphics/d3dviewport.c
@@ -192,7 +192,7 @@ static HRESULT WINAPI IDirect3DViewport2_SetBackground(LPDIRECT3DVIEWPORT2 this,
 
 static HRESULT WINAPI IDirect3DViewport2_GetBackground(LPDIRECT3DVIEWPORT2 this,
 						       LPD3DMATERIALHANDLE lphMat,
-						       LPBOOL32 lpValid)
+						       LPBOOL lpValid)
 {
   FIXME(ddraw, "(%p)->(%p,%p): stub\n", this, lphMat, lpValid);
   
@@ -209,7 +209,7 @@ static HRESULT WINAPI IDirect3DViewport2_SetBackgroundDepth(LPDIRECT3DVIEWPORT2
 
 static HRESULT WINAPI IDirect3DViewport2_GetBackgroundDepth(LPDIRECT3DVIEWPORT2 this,
 							    LPDIRECTDRAWSURFACE* lplpDDSurface,
-							    LPBOOL32 lpValid)
+							    LPBOOL lpValid)
 {
   FIXME(ddraw, "(%p)->(%p,%p): stub\n", this, lplpDDSurface, lpValid);
   
diff --git a/graphics/ddraw.c b/graphics/ddraw.c
index 1fb88782fae..4dc32c79064 100644
--- a/graphics/ddraw.c
+++ b/graphics/ddraw.c
@@ -34,7 +34,7 @@
 /* X is retarted and insists on declaring INT32, INT16 etc in Xmd.h,
    this is a crude hack to get around it */
 #define XMD_H
-#include "wintypes.h"
+typedef int INT32;
 #include "ts_xf86vmode.h"
 #endif /* defined(HAVE_LIBXXF86VM) */
 
@@ -106,7 +106,7 @@ static XF86VidModeModeInfo *orig_mode = NULL;
 static int XShmErrorFlag = 0;
 #endif
 
-BOOL32
+BOOL
 DDRAW_DGA_Available(void)
 {
 #ifdef HAVE_LIBXXF86DGA
@@ -128,7 +128,7 @@ DDRAW_DGA_Available(void)
 }
 
 HRESULT WINAPI
-DirectDrawEnumerate32A(LPDDENUMCALLBACK32A ddenumproc,LPVOID data) {
+DirectDrawEnumerateA(LPDDENUMCALLBACKA ddenumproc,LPVOID data) {
 	if (DDRAW_DGA_Available()) {
 	  TRACE(ddraw, "Enumerating DGA interface\n");
 		ddenumproc(&DGA_DirectDraw_GUID,"WINE with XFree86 DGA","display",data);
@@ -420,7 +420,7 @@ static int _getpixelformat(LPDIRECTDRAW2 ddraw,LPDDPIXELFORMAT pf) {
  * using different DirectDrawSurfaceX version), just added flags and functions)
  */
 static HRESULT WINAPI IDirectDrawSurface4_Lock(
-    LPDIRECTDRAWSURFACE4 this,LPRECT32 lprect,LPDDSURFACEDESC lpddsd,DWORD flags, HANDLE32 hnd
+    LPDIRECTDRAWSURFACE4 this,LPRECT lprect,LPDDSURFACEDESC lpddsd,DWORD flags, HANDLE hnd
 ) {
         TRACE(ddraw, "(%p)->Lock(%p,%p,%08lx,%08lx)\n",
 		this,lprect,lpddsd,flags,(DWORD)hnd);
@@ -688,9 +688,9 @@ static HRESULT WINAPI DGA_IDirectDrawSurface4_SetPalette(
 }
 
 static HRESULT WINAPI IDirectDrawSurface4_Blt(
-	LPDIRECTDRAWSURFACE4 this,LPRECT32 rdst,LPDIRECTDRAWSURFACE4 src,LPRECT32 rsrc,DWORD dwFlags,LPDDBLTFX lpbltfx
+	LPDIRECTDRAWSURFACE4 this,LPRECT rdst,LPDIRECTDRAWSURFACE4 src,LPRECT rsrc,DWORD dwFlags,LPDDBLTFX lpbltfx
 ) {
-	RECT32	xdst,xsrc;
+	RECT	xdst,xsrc;
 	DDSURFACEDESC	ddesc,sdesc;
 	int	i,j;
 
@@ -915,7 +915,7 @@ static HRESULT WINAPI IDirectDrawSurface4_Blt(
 }
 
 static HRESULT WINAPI IDirectDrawSurface4_BltFast(
-	LPDIRECTDRAWSURFACE4 this,DWORD dstx,DWORD dsty,LPDIRECTDRAWSURFACE4 src,LPRECT32 rsrc,DWORD trans
+	LPDIRECTDRAWSURFACE4 this,DWORD dstx,DWORD dsty,LPDIRECTDRAWSURFACE4 src,LPRECT rsrc,DWORD trans
 ) {
 	int		i,bpp,w,h;
 	DDSURFACEDESC	ddesc,sdesc;
@@ -1157,18 +1157,18 @@ static HRESULT WINAPI IDirectDrawSurface4_AddAttachedSurface(
 	return DD_OK;
 }
 
-static HRESULT WINAPI IDirectDrawSurface4_GetDC(LPDIRECTDRAWSURFACE4 this,HDC32* lphdc) {
+static HRESULT WINAPI IDirectDrawSurface4_GetDC(LPDIRECTDRAWSURFACE4 this,HDC* lphdc) {
 	FIXME(ddraw,"(%p)->GetDC(%p)\n",this,lphdc);
-	*lphdc = BeginPaint32(this->s.ddraw->d.window,&this->s.ddraw->d.ps);
+	*lphdc = BeginPaint(this->s.ddraw->d.window,&this->s.ddraw->d.ps);
 	return DD_OK;
 }
 
-static HRESULT WINAPI IDirectDrawSurface4_ReleaseDC(LPDIRECTDRAWSURFACE4 this,HDC32 hdc) {
+static HRESULT WINAPI IDirectDrawSurface4_ReleaseDC(LPDIRECTDRAWSURFACE4 this,HDC hdc) {
   	DDSURFACEDESC	desc;
 	DWORD x, y;
 	
 	FIXME(ddraw,"(%p)->(0x%08lx),stub!\n",this,(long)hdc);
-	EndPaint32(this->s.ddraw->d.window,&this->s.ddraw->d.ps);
+	EndPaint(this->s.ddraw->d.window,&this->s.ddraw->d.ps);
 
 	/* Well, as what the application did paint in this DC is NOT saved in the surface,
 	   I fill it with 'dummy' values to have something on the screen */
@@ -1299,7 +1299,7 @@ static HRESULT WINAPI IDirectDrawSurface4_SetColorKey(
 
 static HRESULT WINAPI IDirectDrawSurface4_AddOverlayDirtyRect(
         LPDIRECTDRAWSURFACE4 this, 
-        LPRECT32 lpRect )
+        LPRECT lpRect )
 {
   FIXME(ddraw,"(%p)->(%p),stub!\n",this,lpRect); 
 
@@ -1405,9 +1405,9 @@ static HRESULT WINAPI IDirectDrawSurface4_SetOverlayPosition(
 
 static HRESULT WINAPI IDirectDrawSurface4_UpdateOverlay(
         LPDIRECTDRAWSURFACE4 this,
-        LPRECT32 lpSrcRect,
+        LPRECT lpSrcRect,
         LPDIRECTDRAWSURFACE4 lpDDDestSurface,
-        LPRECT32 lpDestRect,
+        LPRECT lpDestRect,
         DWORD dwFlags,
         LPDDOVERLAYFX lpDDOverlayFx )
 {
@@ -1631,7 +1631,7 @@ HRESULT WINAPI DirectDrawCreateClipper( DWORD dwFlags,
  *			IDirectDrawClipper
  */
 static HRESULT WINAPI IDirectDrawClipper_SetHwnd(
-	LPDIRECTDRAWCLIPPER this,DWORD x,HWND32 hwnd
+	LPDIRECTDRAWCLIPPER this,DWORD x,HWND hwnd
 ) {
 	FIXME(ddraw,"(%p)->SetHwnd(0x%08lx,0x%08lx),stub!\n",this,x,(DWORD)hwnd);
 	return DD_OK;
@@ -1648,7 +1648,7 @@ static ULONG WINAPI IDirectDrawClipper_Release(LPDIRECTDRAWCLIPPER this) {
 }
 
 static HRESULT WINAPI IDirectDrawClipper_GetClipList(
-	LPDIRECTDRAWCLIPPER this,LPRECT32 rects,LPRGNDATA lprgn,LPDWORD hmm
+	LPDIRECTDRAWCLIPPER this,LPRECT rects,LPRGNDATA lprgn,LPDWORD hmm
 ) {
 	FIXME(ddraw,"(%p,%p,%p,%p),stub!\n",this,rects,lprgn,hmm);
 	if (hmm) *hmm=0;
@@ -1679,7 +1679,7 @@ static ULONG WINAPI IDirectDrawClipper_AddRef( LPDIRECTDRAWCLIPPER this )
 
 static HRESULT WINAPI IDirectDrawClipper_GetHWnd(
          LPDIRECTDRAWCLIPPER this,
-         HWND32* HWndPtr )
+         HWND* HWndPtr )
 {
    FIXME(ddraw,"(%p)->(%p),stub!\n",this,HWndPtr);
    return DD_OK;
@@ -1696,7 +1696,7 @@ static HRESULT WINAPI IDirectDrawClipper_Initialize(
 
 static HRESULT WINAPI IDirectDrawClipper_IsClipListChanged(
          LPDIRECTDRAWCLIPPER this,
-         BOOL32* lpbChanged )
+         BOOL* lpbChanged )
 {
    FIXME(ddraw,"(%p)->(%p),stub!\n",this,lpbChanged);
    return DD_OK;
@@ -2169,7 +2169,7 @@ static struct IDirect3D2_VTable d3d2vt = {
 /* Used in conjunction with cbWndExtra for storage of the this ptr for the window.
  * Please adjust allocation in Xlib_DirectDrawCreate if you store more data here.
  */
-static INT32 ddrawXlibThisOffset = 0;
+static INT ddrawXlibThisOffset = 0;
 
 static HRESULT common_off_screen_CreateSurface(LPDIRECTDRAW2 this,
 					       LPDDSURFACEDESC lpddsd,
@@ -2581,7 +2581,7 @@ static HRESULT WINAPI IDirectDraw2_DuplicateSurface(
  * even when the approbiate bitmasks are not specified.
  */
 static HRESULT WINAPI IDirectDraw2_SetCooperativeLevel(
-	LPDIRECTDRAW2 this,HWND32 hwnd,DWORD cooplevel
+	LPDIRECTDRAW2 this,HWND hwnd,DWORD cooplevel
 ) {
 	int	i;
 	const struct {
@@ -2621,18 +2621,18 @@ static HRESULT WINAPI IDirectDraw2_SetCooperativeLevel(
  * one (for mouse and keyboard input) and drawing in the Xlib implementation.
  */
 static void _common_IDirectDraw_SetDisplayMode(LPDIRECTDRAW this) {
-	RECT32	rect;
+	RECT	rect;
 
 	/* Do not destroy the application supplied cooperative window */
 	if (this->d.window && this->d.window != this->d.mainWindow) {
-		DestroyWindow32(this->d.window);
+		DestroyWindow(this->d.window);
 		this->d.window = 0;
 	}
 	/* Sanity check cooperative window before assigning it to drawing. */
-	if (	IsWindow32(this->d.mainWindow) &&
-		IsWindowVisible32(this->d.mainWindow)
+	if (	IsWindow(this->d.mainWindow) &&
+		IsWindowVisible(this->d.mainWindow)
 	) {
-		GetWindowRect32(this->d.mainWindow,&rect);
+		GetWindowRect(this->d.mainWindow,&rect);
 		if (((rect.right-rect.left) >= this->d.width)	&&
 		    ((rect.bottom-rect.top) >= this->d.height)
 		)
@@ -2640,7 +2640,7 @@ static void _common_IDirectDraw_SetDisplayMode(LPDIRECTDRAW this) {
 	}
 	/* ... failed, create new one. */
 	if (!this->d.window) {
-	    this->d.window = CreateWindowEx32A(
+	    this->d.window = CreateWindowExA(
 		    0,
 		    "WINE_DirectDraw",
 		    "WINE_DirectDraw",
@@ -2654,11 +2654,11 @@ static void _common_IDirectDraw_SetDisplayMode(LPDIRECTDRAW this) {
 		    NULL
 	    );
 	    /*Store THIS with the window. We'll use it in the window procedure*/
-	    SetWindowLong32A(this->d.window,ddrawXlibThisOffset,(LONG)this);
-	    ShowWindow32(this->d.window,TRUE);
-	    UpdateWindow32(this->d.window);
+	    SetWindowLongA(this->d.window,ddrawXlibThisOffset,(LONG)this);
+	    ShowWindow(this->d.window,TRUE);
+	    UpdateWindow(this->d.window);
 	}
-	SetFocus32(this->d.window);
+	SetFocus(this->d.window);
 }
 
 static HRESULT WINAPI DGA_IDirectDraw_SetDisplayMode(
@@ -2787,7 +2787,7 @@ static HRESULT WINAPI Xlib_IDirectDraw_SetDisplayMode(
 
 	  if (i==depcount) {
 		sprintf(buf,"SetDisplayMode(w=%ld,h=%ld,d=%ld), unsupported depth!",width,height,depth);
-		MessageBox32A(0,buf,"WINE DirectDraw",MB_OK|MB_ICONSTOP);
+		MessageBoxA(0,buf,"WINE DirectDraw",MB_OK|MB_ICONSTOP);
 	    TSXFree(depths);
 		return DDERR_UNSUPPORTEDMODE;
 	  } else {
@@ -3020,7 +3020,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2_RestoreDisplayMode(LPDIRECTDRAW2 this) {
 }
 
 static HRESULT WINAPI IDirectDraw2_WaitForVerticalBlank(
-	LPDIRECTDRAW2 this,DWORD x,HANDLE32 h
+	LPDIRECTDRAW2 this,DWORD x,HANDLE h
 ) {
 	TRACE(ddraw,"(%p)->(0x%08lx,0x%08x)\n",this,x,h);
 	return DD_OK;
@@ -3039,7 +3039,7 @@ static ULONG WINAPI DGA_IDirectDraw2_Release(LPDIRECTDRAW2 this) {
 	if (!--(this->ref)) {
 		TSXF86DGADirectVideo(display,DefaultScreen(display),0);
 		if (this->d.window && (this->d.mainWindow != this->d.window))
-			DestroyWindow32(this->d.window);
+			DestroyWindow(this->d.window);
 #ifdef HAVE_LIBXXF86VM
 		if (orig_mode) {
 			TSXF86VidModeSwitchToMode(
@@ -3068,7 +3068,7 @@ static ULONG WINAPI Xlib_IDirectDraw2_Release(LPDIRECTDRAW2 this) {
 
 	if (!--(this->ref)) {
 		if (this->d.window && (this->d.mainWindow != this->d.window))
-			DestroyWindow32(this->d.window);
+			DestroyWindow(this->d.window);
 		HeapFree(GetProcessHeap(),0,this);
 		return 0;
 	}
@@ -3225,7 +3225,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2_QueryInterface(
 }
 
 static HRESULT WINAPI IDirectDraw2_GetVerticalBlankStatus(
-	LPDIRECTDRAW2 this,BOOL32 *status
+	LPDIRECTDRAW2 this,BOOL *status
 ) {
         TRACE(ddraw,"(%p)->(%p)\n",this,status);
 	*status = TRUE;
@@ -3570,7 +3570,7 @@ static struct IDirectDraw2_VTable xlib_dd2vt = {
  */
 
 static HRESULT WINAPI IDirectDraw4_GetSurfaceFromDC(LPDIRECTDRAW4 this,
-						    HDC32 hdc,
+						    HDC hdc,
 						    LPDIRECTDRAWSURFACE *lpDDS) {
   FIXME(ddraw, "(%p)->(%08ld,%p)\n", this, (DWORD) hdc, lpDDS);
 
@@ -3672,7 +3672,7 @@ static struct IDirectDraw4_VTable xlib_dd4vt = {
  * 				DirectDrawCreate
  */
 
-LRESULT WINAPI Xlib_DDWndProc(HWND32 hwnd,UINT32 msg,WPARAM32 wParam,LPARAM lParam)
+LRESULT WINAPI Xlib_DDWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
 {
    LRESULT ret;
    LPDIRECTDRAW ddraw = NULL;
@@ -3681,7 +3681,7 @@ LRESULT WINAPI Xlib_DDWndProc(HWND32 hwnd,UINT32 msg,WPARAM32 wParam,LPARAM lPar
    /* FIXME(ddraw,"(0x%04x,%s,0x%08lx,0x%08lx),stub!\n",(int)hwnd,SPY_GetMsgName(msg),(long)wParam,(long)lParam); */
 
    SetLastError( ERROR_SUCCESS );
-   ddraw  = (LPDIRECTDRAW)GetWindowLong32A( hwnd, ddrawXlibThisOffset );
+   ddraw  = (LPDIRECTDRAW)GetWindowLongA( hwnd, ddrawXlibThisOffset );
    if( (!ddraw)  &&
        ( ( lastError = GetLastError() ) != ERROR_SUCCESS )
      ) 
@@ -3707,25 +3707,25 @@ LRESULT WINAPI Xlib_DDWndProc(HWND32 hwnd,UINT32 msg,WPARAM32 wParam,LPARAM lPar
 	   instead of those of the window provided by the application.
 	   And with this patch, mouse clicks work with Monkey Island III
 	     - Lionel */
-	ret = DefWindowProc32A( ddraw->d.mainWindow, msg, wParam, lParam );
+	ret = DefWindowProcA( ddraw->d.mainWindow, msg, wParam, lParam );
 
         if( !ret )
         {
           /* We didn't handle the message - give it to the application */
 	  if (ddraw && ddraw->d.mainWindow && WIN_FindWndPtr(ddraw->d.mainWindow)) {
-          	ret = CallWindowProc32A( WIN_FindWndPtr( ddraw->d.mainWindow )->winproc,
+          	ret = CallWindowProcA( WIN_FindWndPtr( ddraw->d.mainWindow )->winproc,
                	                   ddraw->d.mainWindow, msg, wParam, lParam );
 	  }
         }
         
       } else {
-        ret = DefWindowProc32A(hwnd, msg, wParam, lParam );
+        ret = DefWindowProcA(hwnd, msg, wParam, lParam );
       } 
 
     }
     else
     {
-	ret = DefWindowProc32A(hwnd,msg,wParam,lParam);
+	ret = DefWindowProcA(hwnd,msg,wParam,lParam);
     }
 
     return ret;
@@ -3743,7 +3743,7 @@ HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter)
 	
 	if (fd  == -1) {
 	  MSG("Must be able to access /dev/mem to use XF86DGA!\n");
-	  MessageBox32A(0,"Using the XF86DGA extension requires access to /dev/mem.","WINE DirectDraw",MB_OK|MB_ICONSTOP);
+	  MessageBoxA(0,"Using the XF86DGA extension requires access to /dev/mem.","WINE DirectDraw",MB_OK|MB_ICONSTOP);
 	  return E_UNEXPECTED;
 	}
 	if (!DDRAW_DGA_Available()) {
@@ -3790,7 +3790,7 @@ HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter)
 #endif /* defined(HAVE_LIBXXF86DGA) */
 }
 
-BOOL32
+BOOL
 DDRAW_XSHM_Available(void)
    {
 #ifdef HAVE_LIBXXSHM
@@ -3835,7 +3835,7 @@ HRESULT WINAPI Xlib_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter)
 
 HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter ) {
 	char	xclsid[50];
-	WNDCLASS32A	wc;
+	WNDCLASSA	wc;
         WND*            pParentWindow; 
 	HRESULT ret;
 
@@ -3869,11 +3869,11 @@ HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN
         wc.hInstance    = 0; 
 
 	wc.hIcon	= 0;
-	wc.hCursor	= (HCURSOR32)IDC_ARROW32A;
+	wc.hCursor	= (HCURSOR)IDC_ARROWA;
 	wc.hbrBackground= NULL_BRUSH;
 	wc.lpszMenuName	= 0;
 	wc.lpszClassName= "WINE_DirectDraw";
-	RegisterClass32A(&wc);
+	RegisterClassA(&wc);
 
 	if (!memcmp(lpGUID, &DGA_DirectDraw_GUID, sizeof(GUID)))
 		ret = DGA_DirectDrawCreate(lplpDD, pUnkOuter);
@@ -3883,7 +3883,7 @@ HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN
 	  goto err;
 
 
-	(*lplpDD)->d.winclass = RegisterClass32A(&wc);
+	(*lplpDD)->d.winclass = RegisterClassA(&wc);
 	return ret;
 
       err:
diff --git a/graphics/dispdib.c b/graphics/dispdib.c
index f1ed6296464..f3820732b02 100644
--- a/graphics/dispdib.c
+++ b/graphics/dispdib.c
@@ -29,9 +29,9 @@ static WORD DISPDIB_Begin(WORD wFlags)
     }
     /* more or less dummy calls to Death/Resurrection, for completeness */
     /* FIXME: what arguments should they get? */
-    Death(0);
+    Death16(0);
     if (VGA_SetMode(Xres,Yres,Depth)) {
-         Resurrection(0,0,0,0,0,0,0);
+         Resurrection16(0,0,0,0,0,0,0);
          return DISPLAYDIB_NOTSUPPORTED;
     }
     return DISPLAYDIB_NOERROR;
@@ -39,7 +39,7 @@ static WORD DISPDIB_Begin(WORD wFlags)
 
 static void DISPDIB_End(void)
 {
-    Resurrection(0,0,0,0,0,0,0); /* FIXME: arguments */
+    Resurrection16(0,0,0,0,0,0,0); /* FIXME: arguments */
     VGA_Exit();
 }
 
diff --git a/graphics/driver.c b/graphics/driver.c
index 08df15efe16..aeddb9603fa 100644
--- a/graphics/driver.c
+++ b/graphics/driver.c
@@ -22,7 +22,7 @@ static GRAPHICS_DRIVER *genericDriver = NULL;
 /**********************************************************************
  *	     DRIVER_RegisterDriver
  */
-BOOL32 DRIVER_RegisterDriver( LPCSTR name, const DC_FUNCTIONS *funcs )
+BOOL DRIVER_RegisterDriver( LPCSTR name, const DC_FUNCTIONS *funcs )
 {
     GRAPHICS_DRIVER *driver = HeapAlloc( SystemHeap, 0, sizeof(*driver) );
     if (!driver) return FALSE;
@@ -66,7 +66,7 @@ const DC_FUNCTIONS *DRIVER_FindDriver( LPCSTR name )
 /**********************************************************************
  *	     DRIVER_UnregisterDriver
  */
-BOOL32 DRIVER_UnregisterDriver( LPCSTR name )
+BOOL DRIVER_UnregisterDriver( LPCSTR name )
 {
     if (name)
     {
diff --git a/graphics/env.c b/graphics/env.c
index 8f1e4b93406..d788f7ea6cf 100644
--- a/graphics/env.c
+++ b/graphics/env.c
@@ -38,9 +38,9 @@ static ATOM GDI_GetNullPortAtom(void)
     {
         char NullPort[256];
         
-        GetProfileString32A( "windows", "nullport", "none",
+        GetProfileStringA( "windows", "nullport", "none",
                              NullPort, sizeof(NullPort) );
-        NullPortAtom = AddAtom32A( NullPort );
+        NullPortAtom = AddAtomA( NullPort );
     }
     return NullPortAtom;
 }
@@ -48,7 +48,7 @@ static ATOM GDI_GetNullPortAtom(void)
 static ATOM PortNameToAtom(LPCSTR lpPortName, BOOL16 add)
 {
     char *p;
-    BOOL32 needfree = FALSE;
+    BOOL needfree = FALSE;
     ATOM ret;
 
     if (lpPortName[strlen(lpPortName) - 1] == ':') {
@@ -60,9 +60,9 @@ static ATOM PortNameToAtom(LPCSTR lpPortName, BOOL16 add)
         p = (char *)lpPortName;
 
     if (add)
-        ret = AddAtom32A(p);
+        ret = AddAtomA(p);
     else
-        ret =  FindAtom32A(p);
+        ret =  FindAtomA(p);
 
     if(needfree) HeapFree(GetProcessHeap(), 0, p);
 
@@ -73,7 +73,7 @@ static ATOM PortNameToAtom(LPCSTR lpPortName, BOOL16 add)
 /***********************************************************************
  *           GetEnvironment   (GDI.134)
  */
-INT16 WINAPI GetEnvironment(LPCSTR lpPortName, LPDEVMODE16 lpdev, UINT16 nMaxSize)
+INT16 WINAPI GetEnvironment16(LPCSTR lpPortName, LPDEVMODE16 lpdev, UINT16 nMaxSize)
 {
     ATOM atom;
     LPCSTR p;
@@ -85,7 +85,7 @@ INT16 WINAPI GetEnvironment(LPCSTR lpPortName, LPDEVMODE16 lpdev, UINT16 nMaxSiz
     if (!(atom = PortNameToAtom(lpPortName, FALSE)))
 	return 0;
     if (atom == GDI_GetNullPortAtom())
-	if (!(atom = FindAtom32A((LPCSTR)lpdev)))
+	if (!(atom = FindAtomA((LPCSTR)lpdev)))
 	    return 0;
     if (!(env = SearchEnvTable(atom)))
 	return 0;
@@ -102,7 +102,7 @@ INT16 WINAPI GetEnvironment(LPCSTR lpPortName, LPDEVMODE16 lpdev, UINT16 nMaxSiz
 /***********************************************************************
  *          SetEnvironment   (GDI.132)
  */
-INT16 WINAPI SetEnvironment(LPCSTR lpPortName, LPDEVMODE16 lpdev, UINT16 nCount)
+INT16 WINAPI SetEnvironment16(LPCSTR lpPortName, LPDEVMODE16 lpdev, UINT16 nCount)
 {
     ATOM atom; 
     BOOL16 nullport = FALSE;
@@ -115,7 +115,7 @@ INT16 WINAPI SetEnvironment(LPCSTR lpPortName, LPDEVMODE16 lpdev, UINT16 nCount)
     if ((atom = PortNameToAtom(lpPortName, FALSE))) {
 	if (atom == GDI_GetNullPortAtom()) {
 	    nullport = TRUE;
-	    atom = FindAtom32A((LPCSTR)lpdev);
+	    atom = FindAtomA((LPCSTR)lpdev);
 	}
 	env = SearchEnvTable(atom);
         GlobalFree16(env->handle);
diff --git a/graphics/escape.c b/graphics/escape.c
index d6986a83549..9dc13966e64 100644
--- a/graphics/escape.c
+++ b/graphics/escape.c
@@ -21,12 +21,12 @@ INT16 WINAPI Escape16( HDC16 hdc, INT16 nEscape, INT16 cbInput,
     return dc->funcs->pEscape( dc, nEscape, cbInput, lpszInData, lpvOutData );
 }
 
-INT32 WINAPI Escape32( HDC32 hdc, INT32 nEscape, INT32 cbInput,
+INT WINAPI Escape( HDC hdc, INT nEscape, INT cbInput,
                        LPCSTR lpszInData, LPVOID lpvOutData )
 {
     DC		*dc = DC_GetDCPtr( hdc );
     SEGPTR	segin,segout;
-    INT32	ret;
+    INT	ret;
 
     if (!dc || !dc->funcs->pEscape) return 0;
     segin	= (SEGPTR)lpszInData;
@@ -35,7 +35,7 @@ INT32 WINAPI Escape32( HDC32 hdc, INT32 nEscape, INT32 cbInput,
     	/* Escape(hdc,QUERYESCSUPPORT,LPINT32,NULL) */
     case QUERYESCSUPPORT: {
     	LPINT16 x = (LPINT16)SEGPTR_NEW(INT16);
-	*x = *(INT32*)lpszInData;
+	*x = *(INT*)lpszInData;
 	segin = SEGPTR_GET(x);
 	break;
     }
@@ -64,7 +64,7 @@ INT32 WINAPI Escape32( HDC32 hdc, INT32 nEscape, INT32 cbInput,
         LPINT16 enab = SEGPTR_NEW(INT16);
         segout = SEGPTR_GET(SEGPTR_NEW(INT16));
         segin = SEGPTR_GET(enab);
-        *enab = *(INT32*)lpszInData;
+        *enab = *(INT*)lpszInData;
         break;
     }
 
@@ -103,27 +103,27 @@ INT32 WINAPI Escape32( HDC32 hdc, INT32 nEscape, INT32 cbInput,
     case GETPRINTINGOFFSET:
     case GETPHYSPAGESIZE: {
     	LPPOINT16 x = (LPPOINT16)PTR_SEG_TO_LIN(segout);
-	CONV_POINT16TO32(x,(LPPOINT32)lpvOutData);
+	CONV_POINT16TO32(x,(LPPOINT)lpvOutData);
 	SEGPTR_FREE(x);
 	break;
     }
     case GETTECHNOLOGY: {
         LPSTR x=PTR_SEG_TO_LIN(segout);
-        lstrcpy32A(lpvOutData,x);
+        lstrcpyA(lpvOutData,x);
         SEGPTR_FREE(x);
 	break;
     }
     case ENABLEPAIRKERNING: {
         LPINT16 enab = (LPINT16)PTR_SEG_TO_LIN(segout);
 
-        *(LPINT32)lpvOutData = *enab;
+        *(LPINT)lpvOutData = *enab;
         SEGPTR_FREE(enab);
         SEGPTR_FREE(PTR_SEG_TO_LIN(segin));
 	break;
     }
     case GETFACENAME: {
         LPSTR x = (LPSTR)PTR_SEG_TO_LIN(segout);
-        lstrcpy32A(lpvOutData,x);
+        lstrcpyA(lpvOutData,x);
         SEGPTR_FREE(x);
         break;
     }
@@ -153,8 +153,8 @@ INT32 WINAPI Escape32( HDC32 hdc, INT32 nEscape, INT32 cbInput,
  *    Not implemented: 0
  *    Failure: <0
  */
-INT32 WINAPI ExtEscape( HDC32 hdc, INT32 nEscape, INT32 cbInput, 
-                        LPCSTR lpszInData, INT32 cbOutput, LPSTR lpszOutData )
+INT WINAPI ExtEscape( HDC hdc, INT nEscape, INT cbInput, 
+                        LPCSTR lpszInData, INT cbOutput, LPSTR lpszOutData )
 {
     FIXME(driver,"(0x%04x,0x%x,%d,%s,%d,%p):stub\n",
           hdc,nEscape,cbInput,debugstr_a(lpszInData),cbOutput,lpszOutData);
@@ -166,7 +166,7 @@ INT32 WINAPI ExtEscape( HDC32 hdc, INT32 nEscape, INT32 cbInput,
  *
  *
  */
-INT32 WINAPI DrawEscape(HDC32 hdc, INT32 nEscape, INT32 cbInput, LPCSTR lpszInData)
+INT WINAPI DrawEscape(HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData)
 {
     FIXME(gdi, "DrawEscape, stub\n");
     return 0;
diff --git a/graphics/fontengine.c b/graphics/fontengine.c
index f9016de925b..0d8a07f57e2 100644
--- a/graphics/fontengine.c
+++ b/graphics/fontengine.c
@@ -17,7 +17,7 @@
  *    EngineEnumerateFont [GDI.300] 
  */
 WORD WINAPI 
-EngineEnumerateFont(LPSTR fontname, FARPROC16 proc, DWORD data )
+EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data )
 {
     FIXME(font,"(%s,%p,%lx),stub\n",fontname,proc,data);
     return 0;
@@ -26,7 +26,7 @@ EngineEnumerateFont(LPSTR fontname, FARPROC16 proc, DWORD data )
 /* **************************************************************** 
  *   EngineDeleteFont [GDI.301] 
  */
-WORD WINAPI EngineDeleteFont(LPFONTINFO16 lpFontInfo)
+WORD WINAPI EngineDeleteFont16(LPFONTINFO16 lpFontInfo)
 {
     WORD handle;
 
@@ -52,7 +52,7 @@ WORD WINAPI EngineDeleteFont(LPFONTINFO16 lpFontInfo)
 /* ****************************************************************
  *       EngineRealizeFont [GDI.302] 
  */
-WORD WINAPI EngineRealizeFont(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform, LPFONTINFO16 lpfontInfo)
+WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform, LPFONTINFO16 lpfontInfo)
 {
     FIXME(font,"(%p,%p,%p),stub\n",lplogFont,lptextxform,lpfontInfo);
     
@@ -62,7 +62,7 @@ WORD WINAPI EngineRealizeFont(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform,
 /* ****************************************************************
  *        EngineGetCharWidth [GDI.303] 
  */
-WORD WINAPI EngineGetCharWidth(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE lastChar, LPINT16 buffer)
+WORD WINAPI EngineGetCharWidth16(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE lastChar, LPINT16 buffer)
 {
     int i;
 
diff --git a/graphics/mapping.c b/graphics/mapping.c
index f9a1f834323..ee9a090b001 100644
--- a/graphics/mapping.c
+++ b/graphics/mapping.c
@@ -53,7 +53,7 @@ BOOL16 WINAPI DPtoLP16( HDC16 hdc, LPPOINT16 points, INT16 count )
 /***********************************************************************
  *           DPtoLP32    (GDI32.65)
  */
-BOOL32 WINAPI DPtoLP32( HDC32 hdc, LPPOINT32 points, INT32 count )
+BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return FALSE;
@@ -89,7 +89,7 @@ BOOL16 WINAPI LPtoDP16( HDC16 hdc, LPPOINT16 points, INT16 count )
 /***********************************************************************
  *           LPtoDP32    (GDI32.247)
  */
-BOOL32 WINAPI LPtoDP32( HDC32 hdc, LPPOINT32 points, INT32 count )
+BOOL WINAPI LPtoDP( HDC hdc, LPPOINT points, INT count )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return FALSE;
@@ -108,16 +108,16 @@ BOOL32 WINAPI LPtoDP32( HDC32 hdc, LPPOINT32 points, INT32 count )
  */
 INT16 WINAPI SetMapMode16( HDC16 hdc, INT16 mode )
 {
-    return SetMapMode32( hdc, mode );
+    return SetMapMode( hdc, mode );
 }
 
 
 /***********************************************************************
  *           SetMapMode32    (GDI32.321)
  */
-INT32 WINAPI SetMapMode32( HDC32 hdc, INT32 mode )
+INT WINAPI SetMapMode( HDC hdc, INT mode )
 {
-    INT32 prevMode;
+    INT prevMode;
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return 0;
     if (dc->funcs->pSetMapMode) return dc->funcs->pSetMapMode( dc, mode );
@@ -197,10 +197,10 @@ INT32 WINAPI SetMapMode32( HDC32 hdc, INT32 mode )
 /***********************************************************************
  *           SetViewportExt    (GDI.14)
  */
-DWORD WINAPI SetViewportExt( HDC16 hdc, INT16 x, INT16 y )
+DWORD WINAPI SetViewportExt16( HDC16 hdc, INT16 x, INT16 y )
 {
-    SIZE32 size;
-    if (!SetViewportExtEx32( hdc, x, y, &size )) return 0;
+    SIZE size;
+    if (!SetViewportExtEx( hdc, x, y, &size )) return 0;
     return MAKELONG( size.cx, size.cy );
 }
 
@@ -210,8 +210,8 @@ DWORD WINAPI SetViewportExt( HDC16 hdc, INT16 x, INT16 y )
  */
 BOOL16 WINAPI SetViewportExtEx16( HDC16 hdc, INT16 x, INT16 y, LPSIZE16 size )
 {
-    SIZE32 size32;
-    BOOL16 ret = SetViewportExtEx32( hdc, x, y, &size32 );
+    SIZE size32;
+    BOOL16 ret = SetViewportExtEx( hdc, x, y, &size32 );
     if (size) CONV_SIZE32TO16( &size32, size );
     return ret;
 }
@@ -220,7 +220,7 @@ BOOL16 WINAPI SetViewportExtEx16( HDC16 hdc, INT16 x, INT16 y, LPSIZE16 size )
 /***********************************************************************
  *           SetViewportExtEx32    (GDI32.340)
  */
-BOOL32 WINAPI SetViewportExtEx32( HDC32 hdc, INT32 x, INT32 y, LPSIZE32 size )
+BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size )
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
@@ -245,10 +245,10 @@ BOOL32 WINAPI SetViewportExtEx32( HDC32 hdc, INT32 x, INT32 y, LPSIZE32 size )
 /***********************************************************************
  *           SetViewportOrg    (GDI.13)
  */
-DWORD WINAPI SetViewportOrg( HDC16 hdc, INT16 x, INT16 y )
+DWORD WINAPI SetViewportOrg16( HDC16 hdc, INT16 x, INT16 y )
 {
-    POINT32 pt;
-    if (!SetViewportOrgEx32( hdc, x, y, &pt )) return 0;
+    POINT pt;
+    if (!SetViewportOrgEx( hdc, x, y, &pt )) return 0;
     return MAKELONG( pt.x, pt.y );
 }
 
@@ -258,8 +258,8 @@ DWORD WINAPI SetViewportOrg( HDC16 hdc, INT16 x, INT16 y )
  */
 BOOL16 WINAPI SetViewportOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 {
-    POINT32 pt32;
-    BOOL16 ret = SetViewportOrgEx32( hdc, x, y, &pt32 );
+    POINT pt32;
+    BOOL16 ret = SetViewportOrgEx( hdc, x, y, &pt32 );
     if (pt) CONV_POINT32TO16( &pt32, pt );
     return ret;
 }
@@ -268,7 +268,7 @@ BOOL16 WINAPI SetViewportOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 /***********************************************************************
  *           SetViewportOrgEx32    (GDI32.341)
  */
-BOOL32 WINAPI SetViewportOrgEx32( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 pt )
+BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt )
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
@@ -289,10 +289,10 @@ BOOL32 WINAPI SetViewportOrgEx32( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 pt )
 /***********************************************************************
  *           SetWindowExt    (GDI.12)
  */
-DWORD WINAPI SetWindowExt( HDC16 hdc, INT16 x, INT16 y )
+DWORD WINAPI SetWindowExt16( HDC16 hdc, INT16 x, INT16 y )
 {
-    SIZE32 size;
-    if (!SetWindowExtEx32( hdc, x, y, &size )) return 0;
+    SIZE size;
+    if (!SetWindowExtEx( hdc, x, y, &size )) return 0;
     return MAKELONG( size.cx, size.cy );
 }
 
@@ -302,8 +302,8 @@ DWORD WINAPI SetWindowExt( HDC16 hdc, INT16 x, INT16 y )
  */
 BOOL16 WINAPI SetWindowExtEx16( HDC16 hdc, INT16 x, INT16 y, LPSIZE16 size )
 {
-    SIZE32 size32;
-    BOOL16 ret = SetWindowExtEx32( hdc, x, y, &size32 );
+    SIZE size32;
+    BOOL16 ret = SetWindowExtEx( hdc, x, y, &size32 );
     if (size) CONV_SIZE32TO16( &size32, size );
     return ret;
 }
@@ -312,7 +312,7 @@ BOOL16 WINAPI SetWindowExtEx16( HDC16 hdc, INT16 x, INT16 y, LPSIZE16 size )
 /***********************************************************************
  *           SetWindowExtEx32    (GDI32.344)
  */
-BOOL32 WINAPI SetWindowExtEx32( HDC32 hdc, INT32 x, INT32 y, LPSIZE32 size )
+BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, LPSIZE size )
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
@@ -336,10 +336,10 @@ BOOL32 WINAPI SetWindowExtEx32( HDC32 hdc, INT32 x, INT32 y, LPSIZE32 size )
 /***********************************************************************
  *           SetWindowOrg    (GDI.11)
  */
-DWORD WINAPI SetWindowOrg( HDC16 hdc, INT16 x, INT16 y )
+DWORD WINAPI SetWindowOrg16( HDC16 hdc, INT16 x, INT16 y )
 {
-    POINT32 pt;
-    if (!SetWindowOrgEx32( hdc, x, y, &pt )) return 0;
+    POINT pt;
+    if (!SetWindowOrgEx( hdc, x, y, &pt )) return 0;
     return MAKELONG( pt.x, pt.y );
 }
 
@@ -349,8 +349,8 @@ DWORD WINAPI SetWindowOrg( HDC16 hdc, INT16 x, INT16 y )
  */
 BOOL16 WINAPI SetWindowOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 {
-    POINT32 pt32;
-    BOOL16 ret = SetWindowOrgEx32( hdc, x, y, &pt32 );
+    POINT pt32;
+    BOOL16 ret = SetWindowOrgEx( hdc, x, y, &pt32 );
     if (pt) CONV_POINT32TO16( &pt32, pt );
     return ret;
 }
@@ -359,7 +359,7 @@ BOOL16 WINAPI SetWindowOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 /***********************************************************************
  *           SetWindowOrgEx32    (GDI32.345)
  */
-BOOL32 WINAPI SetWindowOrgEx32( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 pt )
+BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt )
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
@@ -379,10 +379,10 @@ BOOL32 WINAPI SetWindowOrgEx32( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 pt )
 /***********************************************************************
  *           OffsetViewportOrg    (GDI.17)
  */
-DWORD WINAPI OffsetViewportOrg( HDC16 hdc, INT16 x, INT16 y )
+DWORD WINAPI OffsetViewportOrg16( HDC16 hdc, INT16 x, INT16 y )
 {
-    POINT32 pt;
-    if (!OffsetViewportOrgEx32( hdc, x, y, &pt )) return 0;
+    POINT pt;
+    if (!OffsetViewportOrgEx( hdc, x, y, &pt )) return 0;
     return MAKELONG( pt.x, pt.y );
 }
 
@@ -392,8 +392,8 @@ DWORD WINAPI OffsetViewportOrg( HDC16 hdc, INT16 x, INT16 y )
  */
 BOOL16 WINAPI OffsetViewportOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt)
 {
-    POINT32 pt32;
-    BOOL16 ret = OffsetViewportOrgEx32( hdc, x, y, &pt32 );
+    POINT pt32;
+    BOOL16 ret = OffsetViewportOrgEx( hdc, x, y, &pt32 );
     if (pt) CONV_POINT32TO16( &pt32, pt );
     return ret;
 }
@@ -402,7 +402,7 @@ BOOL16 WINAPI OffsetViewportOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt)
 /***********************************************************************
  *           OffsetViewportOrgEx32    (GDI32.257)
  */
-BOOL32 WINAPI OffsetViewportOrgEx32( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 pt)
+BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt)
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
@@ -423,10 +423,10 @@ BOOL32 WINAPI OffsetViewportOrgEx32( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 pt)
 /***********************************************************************
  *           OffsetWindowOrg    (GDI.15)
  */
-DWORD WINAPI OffsetWindowOrg( HDC16 hdc, INT16 x, INT16 y )
+DWORD WINAPI OffsetWindowOrg16( HDC16 hdc, INT16 x, INT16 y )
 {
-    POINT32 pt;
-    if (!OffsetWindowOrgEx32( hdc, x, y, &pt )) return 0;
+    POINT pt;
+    if (!OffsetWindowOrgEx( hdc, x, y, &pt )) return 0;
     return MAKELONG( pt.x, pt.y );
 }
 
@@ -436,8 +436,8 @@ DWORD WINAPI OffsetWindowOrg( HDC16 hdc, INT16 x, INT16 y )
  */
 BOOL16 WINAPI OffsetWindowOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 {
-    POINT32 pt32;
-    BOOL16 ret = OffsetWindowOrgEx32( hdc, x, y, &pt32 );
+    POINT pt32;
+    BOOL16 ret = OffsetWindowOrgEx( hdc, x, y, &pt32 );
     if (pt) CONV_POINT32TO16( &pt32, pt );
     return ret;
 }
@@ -446,7 +446,7 @@ BOOL16 WINAPI OffsetWindowOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 /***********************************************************************
  *           OffsetWindowOrgEx32    (GDI32.258)
  */
-BOOL32 WINAPI OffsetWindowOrgEx32( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 pt )
+BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt )
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
@@ -467,11 +467,11 @@ BOOL32 WINAPI OffsetWindowOrgEx32( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 pt )
 /***********************************************************************
  *           ScaleViewportExt    (GDI.18)
  */
-DWORD WINAPI ScaleViewportExt( HDC16 hdc, INT16 xNum, INT16 xDenom,
+DWORD WINAPI ScaleViewportExt16( HDC16 hdc, INT16 xNum, INT16 xDenom,
                                INT16 yNum, INT16 yDenom )
 {
-    SIZE32 size;
-    if (!ScaleViewportExtEx32( hdc, xNum, xDenom, yNum, yDenom, &size ))
+    SIZE size;
+    if (!ScaleViewportExtEx( hdc, xNum, xDenom, yNum, yDenom, &size ))
         return FALSE;
     return MAKELONG( size.cx,  size.cy );
 }
@@ -483,8 +483,8 @@ DWORD WINAPI ScaleViewportExt( HDC16 hdc, INT16 xNum, INT16 xDenom,
 BOOL16 WINAPI ScaleViewportExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom,
                                     INT16 yNum, INT16 yDenom, LPSIZE16 size )
 {
-    SIZE32 size32;
-    BOOL16 ret = ScaleViewportExtEx32( hdc, xNum, xDenom, yNum, yDenom,
+    SIZE size32;
+    BOOL16 ret = ScaleViewportExtEx( hdc, xNum, xDenom, yNum, yDenom,
                                        &size32 );
     if (size) CONV_SIZE32TO16( &size32, size );
     return ret;
@@ -494,8 +494,8 @@ BOOL16 WINAPI ScaleViewportExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom,
 /***********************************************************************
  *           ScaleViewportExtEx32    (GDI32.293)
  */
-BOOL32 WINAPI ScaleViewportExtEx32( HDC32 hdc, INT32 xNum, INT32 xDenom,
-                                    INT32 yNum, INT32 yDenom, LPSIZE32 size )
+BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom,
+                                    INT yNum, INT yDenom, LPSIZE size )
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
@@ -522,11 +522,11 @@ BOOL32 WINAPI ScaleViewportExtEx32( HDC32 hdc, INT32 xNum, INT32 xDenom,
 /***********************************************************************
  *           ScaleWindowExt    (GDI.16)
  */
-DWORD WINAPI ScaleWindowExt( HDC16 hdc, INT16 xNum, INT16 xDenom,
+DWORD WINAPI ScaleWindowExt16( HDC16 hdc, INT16 xNum, INT16 xDenom,
                              INT16 yNum, INT16 yDenom )
 {
-    SIZE32 size;
-    if (!ScaleWindowExtEx32( hdc, xNum, xDenom, yNum, yDenom, &size ))
+    SIZE size;
+    if (!ScaleWindowExtEx( hdc, xNum, xDenom, yNum, yDenom, &size ))
         return FALSE;
     return MAKELONG( size.cx,  size.cy );
 }
@@ -538,8 +538,8 @@ DWORD WINAPI ScaleWindowExt( HDC16 hdc, INT16 xNum, INT16 xDenom,
 BOOL16 WINAPI ScaleWindowExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom,
                                   INT16 yNum, INT16 yDenom, LPSIZE16 size )
 {
-    SIZE32 size32;
-    BOOL16 ret = ScaleWindowExtEx32( hdc, xNum, xDenom, yNum, yDenom,
+    SIZE size32;
+    BOOL16 ret = ScaleWindowExtEx( hdc, xNum, xDenom, yNum, yDenom,
                                      &size32 );
     if (size) CONV_SIZE32TO16( &size32, size );
     return ret;
@@ -549,8 +549,8 @@ BOOL16 WINAPI ScaleWindowExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom,
 /***********************************************************************
  *           ScaleWindowExtEx32    (GDI32.294)
  */
-BOOL32 WINAPI ScaleWindowExtEx32( HDC32 hdc, INT32 xNum, INT32 xDenom,
-                                  INT32 yNum, INT32 yDenom, LPSIZE32 size )
+BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom,
+                                  INT yNum, INT yDenom, LPSIZE size )
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
diff --git a/graphics/metafiledrv/bitblt.c b/graphics/metafiledrv/bitblt.c
index 34c6ad68d4a..f77b2282043 100644
--- a/graphics/metafiledrv/bitblt.c
+++ b/graphics/metafiledrv/bitblt.c
@@ -11,8 +11,8 @@
 /***********************************************************************
  *           MFDRV_PatBlt
  */
-BOOL32 MFDRV_PatBlt( DC *dc, INT32 left, INT32 top,
-                     INT32 width, INT32 height, DWORD rop )
+BOOL MFDRV_PatBlt( DC *dc, INT left, INT top,
+                     INT width, INT height, DWORD rop )
 {
     MF_MetaParam6( dc, META_PATBLT, left, top, width, height,
                    HIWORD(rop), LOWORD(rop) );
@@ -23,9 +23,9 @@ BOOL32 MFDRV_PatBlt( DC *dc, INT32 left, INT32 top,
 /***********************************************************************
  *           MFDRV_BitBlt
  */
-BOOL32 MFDRV_BitBlt( DC *dcDst, INT32 xDst, INT32 yDst,
-                      INT32 width, INT32 height, DC *dcSrc,
-                      INT32 xSrc, INT32 ySrc, DWORD rop )
+BOOL MFDRV_BitBlt( DC *dcDst, INT xDst, INT yDst,
+                      INT width, INT height, DC *dcSrc,
+                      INT xSrc, INT ySrc, DWORD rop )
 {
     return MF_BitBlt( dcDst, xDst, yDst, width, height,
                       dcSrc, xSrc, ySrc, rop );
@@ -35,10 +35,10 @@ BOOL32 MFDRV_BitBlt( DC *dcDst, INT32 xDst, INT32 yDst,
 /***********************************************************************
  *           MFDRV_StretchBlt
  */
-BOOL32 MFDRV_StretchBlt( DC *dcDst, INT32 xDst, INT32 yDst,
-                          INT32 widthDst, INT32 heightDst,
-                          DC *dcSrc, INT32 xSrc, INT32 ySrc,
-                          INT32 widthSrc, INT32 heightSrc, DWORD rop )
+BOOL MFDRV_StretchBlt( DC *dcDst, INT xDst, INT yDst,
+                          INT widthDst, INT heightDst,
+                          DC *dcSrc, INT xSrc, INT ySrc,
+                          INT widthSrc, INT heightSrc, DWORD rop )
 {
     return MF_StretchBlt( dcDst, xDst, yDst, widthDst, heightDst,
                           dcSrc, xSrc, ySrc, widthSrc, heightSrc, rop );
diff --git a/graphics/metafiledrv/graphics.c b/graphics/metafiledrv/graphics.c
index 4ad49fb5d3b..8bc0a221c24 100644
--- a/graphics/metafiledrv/graphics.c
+++ b/graphics/metafiledrv/graphics.c
@@ -16,8 +16,8 @@
 /**********************************************************************
  *	     MFDRV_MoveToEx
  */
-BOOL32
-MFDRV_MoveToEx(DC *dc,INT32 x,INT32 y,LPPOINT32 pt)
+BOOL
+MFDRV_MoveToEx(DC *dc,INT x,INT y,LPPOINT pt)
 {
     if (!MF_MetaParam2(dc,META_MOVETO,x,y))
     	return FALSE;
@@ -35,8 +35,8 @@ MFDRV_MoveToEx(DC *dc,INT32 x,INT32 y,LPPOINT32 pt)
 /***********************************************************************
  *           MFDRV_LineTo
  */
-BOOL32
-MFDRV_LineTo( DC *dc, INT32 x, INT32 y )
+BOOL
+MFDRV_LineTo( DC *dc, INT x, INT y )
 {
      return MF_MetaParam2(dc, META_LINETO, x, y);
 }
@@ -45,9 +45,9 @@ MFDRV_LineTo( DC *dc, INT32 x, INT32 y )
 /***********************************************************************
  *           MFDRV_Arc
  */
-BOOL32 
-MFDRV_Arc( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
-           INT32 xstart, INT32 ystart, INT32 xend, INT32 yend )
+BOOL 
+MFDRV_Arc( DC *dc, INT left, INT top, INT right, INT bottom,
+           INT xstart, INT ystart, INT xend, INT yend )
 {
      return MF_MetaParam8(dc, META_ARC, left, top, right, bottom,
 			  xstart, ystart, xend, yend);
@@ -57,9 +57,9 @@ MFDRV_Arc( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
 /***********************************************************************
  *           MFDRV_Pie
  */
-BOOL32
-MFDRV_Pie( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
-           INT32 xstart, INT32 ystart, INT32 xend, INT32 yend )
+BOOL
+MFDRV_Pie( DC *dc, INT left, INT top, INT right, INT bottom,
+           INT xstart, INT ystart, INT xend, INT yend )
 {
     return MF_MetaParam8(dc, META_PIE, left, top, right, bottom,
 			 xstart, ystart, xend, yend);
@@ -69,9 +69,9 @@ MFDRV_Pie( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
 /***********************************************************************
  *           MFDRV_Chord
  */
-BOOL32
-MFDRV_Chord( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
-             INT32 xstart, INT32 ystart, INT32 xend, INT32 yend )
+BOOL
+MFDRV_Chord( DC *dc, INT left, INT top, INT right, INT bottom,
+             INT xstart, INT ystart, INT xend, INT yend )
 {
     return MF_MetaParam8(dc, META_CHORD, left, top, right, bottom,
 			 xstart, ystart, xend, yend);
@@ -80,8 +80,8 @@ MFDRV_Chord( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
 /***********************************************************************
  *           MFDRV_Ellipse
  */
-BOOL32
-MFDRV_Ellipse( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom )
+BOOL
+MFDRV_Ellipse( DC *dc, INT left, INT top, INT right, INT bottom )
 {
     return MF_MetaParam4(dc, META_ELLIPSE, left, top, right, bottom);
 }
@@ -89,8 +89,8 @@ MFDRV_Ellipse( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom )
 /***********************************************************************
  *           MFDRV_Rectangle
  */
-BOOL32
-MFDRV_Rectangle(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
+BOOL
+MFDRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom)
 {
     return MF_MetaParam4(dc, META_RECTANGLE, left, top, right, bottom);
 }
@@ -98,9 +98,9 @@ MFDRV_Rectangle(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
 /***********************************************************************
  *           MFDRV_RoundRect
  */
-BOOL32 
-MFDRV_RoundRect( DC *dc, INT32 left, INT32 top, INT32 right,
-                 INT32 bottom, INT32 ell_width, INT32 ell_height )
+BOOL 
+MFDRV_RoundRect( DC *dc, INT left, INT top, INT right,
+                 INT bottom, INT ell_width, INT ell_height )
 {
     return MF_MetaParam6(dc, META_ROUNDRECT, left, top, right, bottom,
 			 ell_width, ell_height);
@@ -110,7 +110,7 @@ MFDRV_RoundRect( DC *dc, INT32 left, INT32 top, INT32 right,
  *           MFDRV_SetPixel
  */
 COLORREF
-MFDRV_SetPixel( DC *dc, INT32 x, INT32 y, COLORREF color )
+MFDRV_SetPixel( DC *dc, INT x, INT y, COLORREF color )
 {
     return MF_MetaParam4(dc, META_SETPIXEL, x, y,HIWORD(color),LOWORD(color)); 
 }
@@ -119,8 +119,8 @@ MFDRV_SetPixel( DC *dc, INT32 x, INT32 y, COLORREF color )
 /**********************************************************************
  *          MFDRV_Polyline
  */
-BOOL32
-MFDRV_Polyline( DC *dc, const POINT32* pt, INT32 count )
+BOOL
+MFDRV_Polyline( DC *dc, const POINT* pt, INT count )
 {
     register int i;
     LPPOINT16	pt16;
@@ -138,8 +138,8 @@ MFDRV_Polyline( DC *dc, const POINT32* pt, INT32 count )
 /**********************************************************************
  *          MFDRV_Polygon
  */
-BOOL32
-MFDRV_Polygon( DC *dc, const POINT32* pt, INT32 count )
+BOOL
+MFDRV_Polygon( DC *dc, const POINT* pt, INT count )
 {
     register int i;
     LPPOINT16	pt16;
@@ -157,13 +157,13 @@ MFDRV_Polygon( DC *dc, const POINT32* pt, INT32 count )
 /**********************************************************************
  *          PolyPolygon
  */
-BOOL32 
-MFDRV_PolyPolygon( DC *dc, const POINT32* pt, const INT32* counts, UINT32 polygons)
+BOOL 
+MFDRV_PolyPolygon( DC *dc, const POINT* pt, const INT* counts, UINT polygons)
 {
     int		i,j;
     LPPOINT16	pt16;
-    const POINT32* curpt=pt;
-    BOOL32	ret;
+    const POINT* curpt=pt;
+    BOOL	ret;
 
     for (i=0;i<polygons;i++) {
     	pt16=(LPPOINT16)xmalloc(sizeof(POINT16)*counts[i]);
@@ -181,8 +181,8 @@ MFDRV_PolyPolygon( DC *dc, const POINT32* pt, const INT32* counts, UINT32 polygo
 /**********************************************************************
  *          MFDRV_ExtFloodFill
  */
-BOOL32 
-MFDRV_ExtFloodFill( DC *dc, INT32 x, INT32 y, COLORREF color, UINT32 fillType )
+BOOL 
+MFDRV_ExtFloodFill( DC *dc, INT x, INT y, COLORREF color, UINT fillType )
 {
     return MF_MetaParam4(dc,META_FLOODFILL,x,y,HIWORD(color),LOWORD(color)); 
 }
@@ -191,8 +191,8 @@ MFDRV_ExtFloodFill( DC *dc, INT32 x, INT32 y, COLORREF color, UINT32 fillType )
 /**********************************************************************
  *          MFDRV_PaintRgn
  */
-BOOL32
-MFDRV_PaintRgn( DC *dc, HRGN32 hrgn )
+BOOL
+MFDRV_PaintRgn( DC *dc, HRGN hrgn )
 {
     INT16 index;
     index = MF_CreateRegion( dc, hrgn );
diff --git a/graphics/metafiledrv/init.c b/graphics/metafiledrv/init.c
index 149607f3823..197d5d5bf77 100644
--- a/graphics/metafiledrv/init.c
+++ b/graphics/metafiledrv/init.c
@@ -130,7 +130,7 @@ static DC *MFDRV_AllocMetaFile(void)
 /**********************************************************************
 *	     MFDRV_DeleteDC
  */
-static BOOL32 MFDRV_DeleteDC( DC *dc )
+static BOOL MFDRV_DeleteDC( DC *dc )
 {
     METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
     
@@ -157,7 +157,7 @@ HDC16 WINAPI CreateMetaFile16(
 {
     DC *dc;
     METAFILEDRV_PDEVICE *physDev;
-    HFILE32 hFile;
+    HFILE hFile;
 
     TRACE(metafile, "'%s'\n", filename );
 
@@ -167,13 +167,13 @@ HDC16 WINAPI CreateMetaFile16(
     if (filename)  /* disk based metafile */
     {
         physDev->mh->mtType = METAFILE_DISK;
-        if ((hFile = _lcreat32( filename, 0 )) == HFILE_ERROR32)
+        if ((hFile = _lcreat( filename, 0 )) == HFILE_ERROR)
         {
             MFDRV_DeleteDC( dc );
             return 0;
         }
-        if (_lwrite32( hFile, (LPSTR)physDev->mh,
-                       sizeof(*physDev->mh)) == HFILE_ERROR32)
+        if (_lwrite( hFile, (LPSTR)physDev->mh,
+                       sizeof(*physDev->mh)) == HFILE_ERROR)
 	{
             MFDRV_DeleteDC( dc );
             return 0;
@@ -191,7 +191,7 @@ HDC16 WINAPI CreateMetaFile16(
 /**********************************************************************
  *	     CreateMetaFile32A   (GDI32.51)
  */
-HDC32 WINAPI CreateMetaFile32A( 
+HDC WINAPI CreateMetaFileA( 
 			      LPCSTR filename /* Filename of disk metafile */
 )
 {
@@ -201,24 +201,24 @@ HDC32 WINAPI CreateMetaFile32A(
 /**********************************************************************
  *          CreateMetaFile32W   (GDI32.52)
  */
-HDC32 WINAPI CreateMetaFile32W(LPCWSTR filename)
+HDC WINAPI CreateMetaFileW(LPCWSTR filename)
 {
     LPSTR filenameA;
-    HDC32 hReturnDC;
+    HDC hReturnDC;
 
     filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
 
-    hReturnDC = CreateMetaFile32A(filenameA);
+    hReturnDC = CreateMetaFileA(filenameA);
 
     HeapFree( GetProcessHeap(), 0, filenameA );
 
     return hReturnDC;
 }
 
-static DC *METAFILE_CloseMetaFile( HDC32 hdc ) 
+static DC *METAFILE_CloseMetaFile( HDC hdc ) 
 {
     DC *dc;
-    HFILE32 hFile;
+    HFILE hFile;
     METAFILEDRV_PDEVICE *physDev;
     
     TRACE(metafile, "(%04x)\n", hdc );
@@ -240,18 +240,18 @@ static DC *METAFILE_CloseMetaFile( HDC32 hdc )
     {
         hFile = physDev->mh->mtNoParameters;
 	physDev->mh->mtNoParameters = 0;
-        if (_llseek32(hFile, 0L, 0) == HFILE_ERROR32)
+        if (_llseek(hFile, 0L, 0) == HFILE_ERROR)
         {
             MFDRV_DeleteDC( dc );
             return 0;
         }
-        if (_lwrite32( hFile, (LPSTR)physDev->mh,
-                       sizeof(*physDev->mh)) == HFILE_ERROR32)
+        if (_lwrite( hFile, (LPSTR)physDev->mh,
+                       sizeof(*physDev->mh)) == HFILE_ERROR)
         {
             MFDRV_DeleteDC( dc );
             return 0;
         }
-        _lclose32(hFile);
+        _lclose(hFile);
     }
 
     return dc;
@@ -274,7 +274,7 @@ HMETAFILE16 WINAPI CloseMetaFile16(
 
     hmf = GLOBAL_CreateBlock( GMEM_MOVEABLE, physDev->mh,
                               physDev->mh->mtSize * sizeof(WORD),
-                              GetCurrentPDB(), FALSE, FALSE, FALSE, NULL );
+                              GetCurrentPDB16(), FALSE, FALSE, FALSE, NULL );
     physDev->mh = NULL;  /* So it won't be deleted */
     MFDRV_DeleteDC( dc );
     return hmf;
@@ -289,8 +289,8 @@ HMETAFILE16 WINAPI CloseMetaFile16(
  * RETURNS
  *  Handle of newly created metafile on success, NULL on failure.
  */
-HMETAFILE32 WINAPI CloseMetaFile32( 
-				   HDC32 hdc /* Metafile DC to close */
+HMETAFILE WINAPI CloseMetaFile( 
+				   HDC hdc /* Metafile DC to close */
 )
 {
   return CloseMetaFile16(hdc);
@@ -314,8 +314,8 @@ BOOL16 WINAPI DeleteMetaFile16(
  *  Delete a memory-based metafile.
  */
 
-BOOL32 WINAPI DeleteMetaFile32(
-	      HMETAFILE32 hmf
+BOOL WINAPI DeleteMetaFile(
+	      HMETAFILE hmf
 ) {
   return !GlobalFree16( hmf );
 }
@@ -332,17 +332,17 @@ BOOL32 WINAPI DeleteMetaFile32(
 /**********************************************************************
  *          CreateEnhMetaFile32A   (GDI32.41)
 */
-HDC32 WINAPI CreateEnhMetaFile32A( 
-    HDC32 hdc, /* optional reference DC */
+HDC WINAPI CreateEnhMetaFileA( 
+    HDC hdc, /* optional reference DC */
     LPCSTR filename, /* optional filename for disk metafiles */
-    const RECT32 *rect, /* optional bounding rectangle */
+    const RECT *rect, /* optional bounding rectangle */
     LPCSTR description /* optional description */ 
     )
 {
 #if 0
     DC *dc;
     METAFILEDRV_PDEVICE *physDev;
-    HFILE32 hFile;
+    HFILE hFile;
 
     if (!(dc = MFDRV_AllocMetaFile())) return 0;
     physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
@@ -350,13 +350,13 @@ HDC32 WINAPI CreateEnhMetaFile32A(
     if (filename)  /* disk based metafile */
     {
         physDev->mh->mtType = METAFILE_DISK;
-        if ((hFile = _lcreat32( filename, 0 )) == HFILE_ERROR32)
+        if ((hFile = _lcreat( filename, 0 )) == HFILE_ERROR)
         {
             MFDRV_DeleteDC( dc );
             return 0;
         }
-        if (_lwrite32( hFile, (LPSTR)physDev->mh,
-                       sizeof(*physDev->mh)) == HFILE_ERROR32)
+        if (_lwrite( hFile, (LPSTR)physDev->mh,
+                       sizeof(*physDev->mh)) == HFILE_ERROR)
 	{
             MFDRV_DeleteDC( dc );
             return 0;
@@ -380,21 +380,21 @@ HDC32 WINAPI CreateEnhMetaFile32A(
 /**********************************************************************
  *          CreateEnhMetaFile32W   (GDI32.42)
  */
-HDC32 WINAPI CreateEnhMetaFile32W(
-    HDC32         hdc,        /* optional reference DC */
+HDC WINAPI CreateEnhMetaFileW(
+    HDC         hdc,        /* optional reference DC */
     LPCWSTR       filename,   /* optional filename for disk metafiles */
-    const RECT32* rect,       /* optional bounding rectangle */
+    const RECT* rect,       /* optional bounding rectangle */
     LPCWSTR       description /* optional description */ 
     )
 {
     LPSTR filenameA;
     LPSTR descriptionA;
-    HDC32 hReturnDC;
+    HDC hReturnDC;
 
     filenameA    = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
     descriptionA = HEAP_strdupWtoA( GetProcessHeap(), 0, description );
 
-    hReturnDC = CreateEnhMetaFile32A(hdc,
+    hReturnDC = CreateEnhMetaFileA(hdc,
                                     filenameA,
                                     rect,
                                     descriptionA);
@@ -405,7 +405,7 @@ HDC32 WINAPI CreateEnhMetaFile32W(
     return hReturnDC;
 }
 
-HENHMETAFILE32 WINAPI CloseEnhMetaFile( HDC32 hdc /* metafile DC */ )
+HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc /* metafile DC */ )
 {
   /* write EMR_EOF(0x0, 0x10, 0x14) */
   return 0;
diff --git a/graphics/metafiledrv/mapping.c b/graphics/metafiledrv/mapping.c
index 4e396d1ebdb..d49b5029fca 100644
--- a/graphics/metafiledrv/mapping.c
+++ b/graphics/metafiledrv/mapping.c
@@ -12,9 +12,9 @@
 /***********************************************************************
  *           MFDRV_SetMapMode
  */
-INT32 MFDRV_SetMapMode( DC *dc, INT32 mode )
+INT MFDRV_SetMapMode( DC *dc, INT mode )
 {
-    INT32 prevMode = dc->w.MapMode;
+    INT prevMode = dc->w.MapMode;
     MF_MetaParam1( dc, META_SETMAPMODE, mode );
     return prevMode;
 }
@@ -23,7 +23,7 @@ INT32 MFDRV_SetMapMode( DC *dc, INT32 mode )
 /***********************************************************************
  *           MFDRV_SetViewportExt
  */
-BOOL32 MFDRV_SetViewportExt( DC *dc, INT32 x, INT32 y )
+BOOL MFDRV_SetViewportExt( DC *dc, INT x, INT y )
 {
     MF_MetaParam2( dc, META_SETVIEWPORTEXT, x, y );
     return TRUE;
@@ -33,7 +33,7 @@ BOOL32 MFDRV_SetViewportExt( DC *dc, INT32 x, INT32 y )
 /***********************************************************************
  *           MFDRV_SetViewportOrg
  */
-BOOL32 MFDRV_SetViewportOrg( DC *dc, INT32 x, INT32 y )
+BOOL MFDRV_SetViewportOrg( DC *dc, INT x, INT y )
 {
     MF_MetaParam2( dc, META_SETVIEWPORTORG, x, y );
     return TRUE;
@@ -43,7 +43,7 @@ BOOL32 MFDRV_SetViewportOrg( DC *dc, INT32 x, INT32 y )
 /***********************************************************************
  *           MFDRV_SetWindowExt
  */
-BOOL32 MFDRV_SetWindowExt( DC *dc, INT32 x, INT32 y )
+BOOL MFDRV_SetWindowExt( DC *dc, INT x, INT y )
 {
     MF_MetaParam2( dc, META_SETWINDOWEXT, x, y );
     return TRUE;
@@ -53,7 +53,7 @@ BOOL32 MFDRV_SetWindowExt( DC *dc, INT32 x, INT32 y )
 /***********************************************************************
  *           MFDRV_SetWindowOrg
  */
-BOOL32 MFDRV_SetWindowOrg( DC *dc, INT32 x, INT32 y )
+BOOL MFDRV_SetWindowOrg( DC *dc, INT x, INT y )
 {
     MF_MetaParam2( dc, META_SETWINDOWORG, x, y );
     return TRUE;
@@ -63,7 +63,7 @@ BOOL32 MFDRV_SetWindowOrg( DC *dc, INT32 x, INT32 y )
 /***********************************************************************
  *           MFDRV_OffsetViewportOrg
  */
-BOOL32 MFDRV_OffsetViewportOrg( DC *dc, INT32 x, INT32 y )
+BOOL MFDRV_OffsetViewportOrg( DC *dc, INT x, INT y )
 {
     MF_MetaParam2( dc, META_OFFSETVIEWPORTORG, x, y );
     return TRUE;
@@ -73,7 +73,7 @@ BOOL32 MFDRV_OffsetViewportOrg( DC *dc, INT32 x, INT32 y )
 /***********************************************************************
  *           MFDRV_OffsetWindowOrg
  */
-BOOL32 MFDRV_OffsetWindowOrg( DC *dc, INT32 x, INT32 y )
+BOOL MFDRV_OffsetWindowOrg( DC *dc, INT x, INT y )
 {
     MF_MetaParam2( dc, META_OFFSETWINDOWORG, x, y );
     return TRUE;
@@ -83,8 +83,8 @@ BOOL32 MFDRV_OffsetWindowOrg( DC *dc, INT32 x, INT32 y )
 /***********************************************************************
  *           MFDRV_ScaleViewportExt
  */
-BOOL32 MFDRV_ScaleViewportExt( DC *dc, INT32 xNum, INT32 xDenom,
-                               INT32 yNum, INT32 yDenom )
+BOOL MFDRV_ScaleViewportExt( DC *dc, INT xNum, INT xDenom,
+                               INT yNum, INT yDenom )
 {
     MF_MetaParam4( dc, META_SCALEVIEWPORTEXT, xNum, xDenom, yNum, yDenom );
     return TRUE;
@@ -94,8 +94,8 @@ BOOL32 MFDRV_ScaleViewportExt( DC *dc, INT32 xNum, INT32 xDenom,
 /***********************************************************************
  *           MFDRV_ScaleWindowExt
  */
-BOOL32 MFDRV_ScaleWindowExt( DC *dc, INT32 xNum, INT32 xDenom,
-                             INT32 yNum, INT32 yDenom )
+BOOL MFDRV_ScaleWindowExt( DC *dc, INT xNum, INT xDenom,
+                             INT yNum, INT yDenom )
 {
     MF_MetaParam4( dc, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom );
     return TRUE;
diff --git a/graphics/metafiledrv/objects.c b/graphics/metafiledrv/objects.c
index 6488df84ff7..3e52734f4f0 100644
--- a/graphics/metafiledrv/objects.c
+++ b/graphics/metafiledrv/objects.c
@@ -28,7 +28,7 @@ static HBITMAP16 MFDRV_BITMAP_SelectObject( DC * dc, HBITMAP16 hbitmap,
 /***********************************************************************
  *           MFDRV_BRUSH_SelectObject
  */
-static HBRUSH32 MFDRV_BRUSH_SelectObject( DC * dc, HBRUSH32 hbrush,
+static HBRUSH MFDRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush,
                                           BRUSHOBJ * brush )
 {
     LOGBRUSH16 logbrush = { brush->logbrush.lbStyle,
@@ -65,9 +65,9 @@ static HFONT16 MFDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
 /***********************************************************************
  *           MFDRV_PEN_SelectObject
  */
-static HPEN32 MFDRV_PEN_SelectObject( DC * dc, HPEN32 hpen, PENOBJ * pen )
+static HPEN MFDRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
 {
-    HPEN32 prevHandle = dc->w.hPen;
+    HPEN prevHandle = dc->w.hPen;
     LOGPEN16 logpen = { pen->logpen.lopnStyle,
                         { pen->logpen.lopnWidth.x, pen->logpen.lopnWidth.y },
                         pen->logpen.lopnColor };
@@ -79,10 +79,10 @@ static HPEN32 MFDRV_PEN_SelectObject( DC * dc, HPEN32 hpen, PENOBJ * pen )
 /***********************************************************************
  *           MFDRV_SelectObject
  */
-HGDIOBJ32 MFDRV_SelectObject( DC *dc, HGDIOBJ32 handle )
+HGDIOBJ MFDRV_SelectObject( DC *dc, HGDIOBJ handle )
 {
     GDIOBJHDR * ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE );
-    HGDIOBJ32 ret = 0;
+    HGDIOBJ ret = 0;
 
     if (!ptr) return 0;
     TRACE(gdi, "hdc=%04x %04x\n", dc->hSelf, handle );
diff --git a/graphics/metafiledrv/text.c b/graphics/metafiledrv/text.c
index 1a8617a2f69..be5c1a14036 100644
--- a/graphics/metafiledrv/text.c
+++ b/graphics/metafiledrv/text.c
@@ -20,14 +20,14 @@
 /***********************************************************************
  *           MFDRV_ExtTextOut
  */
-BOOL32
-MFDRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
-                  const RECT32 *lprect, LPCSTR str, UINT32 count,
-                  const INT32 *lpDx )
+BOOL
+MFDRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
+                  const RECT *lprect, LPCSTR str, UINT count,
+                  const INT *lpDx )
 {
     RECT16	rect16;
     LPINT16	lpdx16 = lpDx?(LPINT16)xmalloc(sizeof(INT16)*count):NULL;
-    BOOL32	ret;
+    BOOL	ret;
     int		i;
 
     if (lprect)	CONV_RECT32TO16(lprect,&rect16);
diff --git a/graphics/painting.c b/graphics/painting.c
index bc7e60576d9..b62dd848c61 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -27,14 +27,14 @@
  */
 BOOL16 WINAPI LineTo16( HDC16 hdc, INT16 x, INT16 y )
 {
-    return LineTo32( hdc, x, y );
+    return LineTo( hdc, x, y );
 }
 
 
 /***********************************************************************
  *           LineTo32    (GDI32.249)
  */
-BOOL32 WINAPI LineTo32( HDC32 hdc, INT32 x, INT32 y )
+BOOL WINAPI LineTo( HDC hdc, INT x, INT y )
 {
     DC * dc = DC_GetDCPtr( hdc );
 
@@ -50,7 +50,7 @@ BOOL32 WINAPI LineTo32( HDC32 hdc, INT32 x, INT32 y )
 /***********************************************************************
  *           MoveTo    (GDI.20)
  */
-DWORD WINAPI MoveTo( HDC16 hdc, INT16 x, INT16 y )
+DWORD WINAPI MoveTo16( HDC16 hdc, INT16 x, INT16 y )
 {
     POINT16	pt;
 
@@ -65,9 +65,9 @@ DWORD WINAPI MoveTo( HDC16 hdc, INT16 x, INT16 y )
  */
 BOOL16 WINAPI MoveToEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 {
-    POINT32 pt32;
+    POINT pt32;
 
-    if (!MoveToEx32( (HDC32)hdc, (INT32)x, (INT32)y, &pt32 )) return FALSE;
+    if (!MoveToEx( (HDC)hdc, (INT)x, (INT)y, &pt32 )) return FALSE;
     if (pt) CONV_POINT32TO16( &pt32, pt );
     return TRUE;
 
@@ -77,7 +77,7 @@ BOOL16 WINAPI MoveToEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 /***********************************************************************
  *           MoveToEx32    (GDI32.254)
  */
-BOOL32 WINAPI MoveToEx32( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 pt )
+BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt )
 {
     DC * dc = DC_GetDCPtr( hdc );
   
@@ -97,18 +97,18 @@ BOOL16 WINAPI Arc16( HDC16 hdc, INT16 left, INT16 top, INT16 right,
                      INT16 bottom, INT16 xstart, INT16 ystart,
                      INT16 xend, INT16 yend )
 {
-    return Arc32( (HDC32)hdc, (INT32)left, (INT32)top, (INT32)right,
-   		  (INT32)bottom, (INT32)xstart, (INT32)ystart, (INT32)xend,
-		  (INT32)yend );
+    return Arc( (HDC)hdc, (INT)left, (INT)top, (INT)right,
+   		  (INT)bottom, (INT)xstart, (INT)ystart, (INT)xend,
+		  (INT)yend );
 }
 
 
 /***********************************************************************
  *           Arc32    (GDI32.7)
  */
-BOOL32 WINAPI Arc32( HDC32 hdc, INT32 left, INT32 top, INT32 right,
-                     INT32 bottom, INT32 xstart, INT32 ystart,
-                     INT32 xend, INT32 yend )
+BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right,
+                     INT bottom, INT xstart, INT ystart,
+                     INT xend, INT yend )
 {
     DC * dc = DC_GetDCPtr( hdc );
   
@@ -124,24 +124,24 @@ BOOL32 WINAPI Arc32( HDC32 hdc, INT32 left, INT32 top, INT32 right,
 /***********************************************************************
  *           ArcTo    (GDI32.8)
  */
-BOOL32 WINAPI ArcTo( HDC32 hdc, 
-                     INT32 left,   INT32 top, 
-                     INT32 right,  INT32 bottom,
-                     INT32 xstart, INT32 ystart,
-                     INT32 xend,   INT32 yend )
+BOOL WINAPI ArcTo( HDC hdc, 
+                     INT left,   INT top, 
+                     INT right,  INT bottom,
+                     INT xstart, INT ystart,
+                     INT xend,   INT yend )
 {
-    BOOL32 result;
+    BOOL result;
 
     /*
      * According to the documentation, a line is drawn from the current
      * position to the starting point of the arc.
      */
-    LineTo32(hdc, xstart, ystart);
+    LineTo(hdc, xstart, ystart);
 
     /*
      * Then the arc is drawn.
      */
-    result = Arc32(hdc, 
+    result = Arc(hdc, 
                   left, top,
                   right, bottom,
                   xstart, ystart,
@@ -153,7 +153,7 @@ BOOL32 WINAPI ArcTo( HDC32 hdc,
      */
     if (result)
     {
-        MoveToEx32(hdc, xend, yend, NULL);
+        MoveToEx(hdc, xend, yend, NULL);
     }
 
     return result;
@@ -166,18 +166,18 @@ BOOL16 WINAPI Pie16( HDC16 hdc, INT16 left, INT16 top,
                      INT16 right, INT16 bottom, INT16 xstart, INT16 ystart,
                      INT16 xend, INT16 yend )
 {
-    return Pie32( (HDC32)hdc, (INT32)left, (INT32)top, (INT32)right,
-   		  (INT32)bottom, (INT32)xstart, (INT32)ystart, (INT32)xend,
-		  (INT32)yend );
+    return Pie( (HDC)hdc, (INT)left, (INT)top, (INT)right,
+   		  (INT)bottom, (INT)xstart, (INT)ystart, (INT)xend,
+		  (INT)yend );
 }
 
 
 /***********************************************************************
  *           Pie32   (GDI32.262)
  */
-BOOL32 WINAPI Pie32( HDC32 hdc, INT32 left, INT32 top,
-                     INT32 right, INT32 bottom, INT32 xstart, INT32 ystart,
-                     INT32 xend, INT32 yend )
+BOOL WINAPI Pie( HDC hdc, INT left, INT top,
+                     INT right, INT bottom, INT xstart, INT ystart,
+                     INT xend, INT yend )
 {
     DC * dc = DC_GetDCPtr( hdc );
   
@@ -193,16 +193,16 @@ BOOL16 WINAPI Chord16( HDC16 hdc, INT16 left, INT16 top,
                        INT16 right, INT16 bottom, INT16 xstart, INT16 ystart,
                        INT16 xend, INT16 yend )
 {
-    return Chord32( hdc, left, top, right, bottom, xstart, ystart, xend, yend );
+    return Chord( hdc, left, top, right, bottom, xstart, ystart, xend, yend );
 }
 
 
 /***********************************************************************
  *           Chord32    (GDI32.14)
  */
-BOOL32 WINAPI Chord32( HDC32 hdc, INT32 left, INT32 top,
-                       INT32 right, INT32 bottom, INT32 xstart, INT32 ystart,
-                       INT32 xend, INT32 yend )
+BOOL WINAPI Chord( HDC hdc, INT left, INT top,
+                       INT right, INT bottom, INT xstart, INT ystart,
+                       INT xend, INT yend )
 {
     DC * dc = DC_GetDCPtr( hdc );
   
@@ -217,15 +217,15 @@ BOOL32 WINAPI Chord32( HDC32 hdc, INT32 left, INT32 top,
 BOOL16 WINAPI Ellipse16( HDC16 hdc, INT16 left, INT16 top,
                          INT16 right, INT16 bottom )
 {
-    return Ellipse32( hdc, left, top, right, bottom );
+    return Ellipse( hdc, left, top, right, bottom );
 }
 
 
 /***********************************************************************
  *           Ellipse32    (GDI32.75)
  */
-BOOL32 WINAPI Ellipse32( HDC32 hdc, INT32 left, INT32 top,
-                         INT32 right, INT32 bottom )
+BOOL WINAPI Ellipse( HDC hdc, INT left, INT top,
+                         INT right, INT bottom )
 {
     DC * dc = DC_GetDCPtr( hdc );
   
@@ -240,15 +240,15 @@ BOOL32 WINAPI Ellipse32( HDC32 hdc, INT32 left, INT32 top,
 BOOL16 WINAPI Rectangle16( HDC16 hdc, INT16 left, INT16 top,
                            INT16 right, INT16 bottom )
 {
-    return Rectangle32( hdc, left, top, right, bottom );
+    return Rectangle( hdc, left, top, right, bottom );
 }
 
 
 /***********************************************************************
  *           Rectangle32    (GDI32.283)
  */
-BOOL32 WINAPI Rectangle32( HDC32 hdc, INT32 left, INT32 top,
-                           INT32 right, INT32 bottom )
+BOOL WINAPI Rectangle( HDC hdc, INT left, INT top,
+                           INT right, INT bottom )
 {
     DC * dc = DC_GetDCPtr( hdc );
   
@@ -267,19 +267,19 @@ BOOL32 WINAPI Rectangle32( HDC32 hdc, INT32 left, INT32 top,
 BOOL16 WINAPI RoundRect16( HDC16 hdc, INT16 left, INT16 top, INT16 right,
                            INT16 bottom, INT16 ell_width, INT16 ell_height )
 {
-    return RoundRect32( hdc, left, top, right, bottom, ell_width, ell_height );
+    return RoundRect( hdc, left, top, right, bottom, ell_width, ell_height );
 }
 
 
 /***********************************************************************
  *           RoundRect32    (GDI32.291)
  */
-BOOL32 WINAPI RoundRect32( HDC32 hdc, INT32 left, INT32 top, INT32 right,
-                           INT32 bottom, INT32 ell_width, INT32 ell_height )
+BOOL WINAPI RoundRect( HDC hdc, INT left, INT top, INT right,
+                           INT bottom, INT ell_width, INT ell_height )
 {
   
     if(ell_width == 0 || ell_height == 0) /* Just an optimization */
-        return Rectangle32(hdc, left, top, right, bottom);
+        return Rectangle(hdc, left, top, right, bottom);
 
     else {
         DC * dc = DC_GetDCPtr( hdc );
@@ -302,7 +302,7 @@ INT16 WINAPI FillRect16( HDC16 hdc, const RECT16 *rect, HBRUSH16 hbrush )
      */
 
     if (!(prevBrush = SelectObject16( hdc, hbrush ))) return 0;
-    PatBlt32( hdc, rect->left, rect->top,
+    PatBlt( hdc, rect->left, rect->top,
               rect->right - rect->left, rect->bottom - rect->top, PATCOPY );
     SelectObject16( hdc, prevBrush );
     return 1;
@@ -312,14 +312,14 @@ INT16 WINAPI FillRect16( HDC16 hdc, const RECT16 *rect, HBRUSH16 hbrush )
 /***********************************************************************
  *           FillRect32    (USER32.197)
  */
-INT32 WINAPI FillRect32( HDC32 hdc, const RECT32 *rect, HBRUSH32 hbrush )
+INT WINAPI FillRect( HDC hdc, const RECT *rect, HBRUSH hbrush )
 {
-    HBRUSH32 prevBrush;
+    HBRUSH prevBrush;
 
-    if (!(prevBrush = SelectObject32( hdc, hbrush ))) return 0;
-    PatBlt32( hdc, rect->left, rect->top,
+    if (!(prevBrush = SelectObject( hdc, hbrush ))) return 0;
+    PatBlt( hdc, rect->left, rect->top,
               rect->right - rect->left, rect->bottom - rect->top, PATCOPY );
-    SelectObject32( hdc, prevBrush );
+    SelectObject( hdc, prevBrush );
     return 1;
 }
 
@@ -329,7 +329,7 @@ INT32 WINAPI FillRect32( HDC32 hdc, const RECT32 *rect, HBRUSH32 hbrush )
  */
 void WINAPI InvertRect16( HDC16 hdc, const RECT16 *rect )
 {
-    PatBlt32( hdc, rect->left, rect->top,
+    PatBlt( hdc, rect->left, rect->top,
               rect->right - rect->left, rect->bottom - rect->top, DSTINVERT );
 }
 
@@ -337,9 +337,9 @@ void WINAPI InvertRect16( HDC16 hdc, const RECT16 *rect )
 /***********************************************************************
  *           InvertRect32    (USER32.330)
  */
-BOOL32 WINAPI InvertRect32( HDC32 hdc, const RECT32 *rect )
+BOOL WINAPI InvertRect( HDC hdc, const RECT *rect )
 {
-    return PatBlt32( hdc, rect->left, rect->top,
+    return PatBlt( hdc, rect->left, rect->top,
 		     rect->right - rect->left, rect->bottom - rect->top, 
 		     DSTINVERT );
 }
@@ -364,13 +364,13 @@ INT16 WINAPI FrameRect16( HDC16 hdc, const RECT16 *rect, HBRUSH16 hbrush )
     if ( (right <= left) || (bottom <= top) ) return 0;
     if (!(prevBrush = SelectObject16( hdc, hbrush ))) return 0;
     
-    PatBlt32( hdc, rect->left, rect->top, 1,
+    PatBlt( hdc, rect->left, rect->top, 1,
 	      rect->bottom - rect->top, PATCOPY );
-    PatBlt32( hdc, rect->right - 1, rect->top, 1,
+    PatBlt( hdc, rect->right - 1, rect->top, 1,
 	      rect->bottom - rect->top, PATCOPY );
-    PatBlt32( hdc, rect->left, rect->top,
+    PatBlt( hdc, rect->left, rect->top,
 	      rect->right - rect->left, 1, PATCOPY );
-    PatBlt32( hdc, rect->left, rect->bottom - 1,
+    PatBlt( hdc, rect->left, rect->bottom - 1,
 	      rect->right - rect->left, 1, PATCOPY );
 
     SelectObject16( hdc, prevBrush );
@@ -381,7 +381,7 @@ INT16 WINAPI FrameRect16( HDC16 hdc, const RECT16 *rect, HBRUSH16 hbrush )
 /***********************************************************************
  *           FrameRect32    (USER32.203)
  */
-INT32 WINAPI FrameRect32( HDC32 hdc, const RECT32 *rect, HBRUSH32 hbrush )
+INT WINAPI FrameRect( HDC hdc, const RECT *rect, HBRUSH hbrush )
 {
     RECT16 rect16;
     CONV_RECT32TO16( rect, &rect16 );
@@ -394,14 +394,14 @@ INT32 WINAPI FrameRect32( HDC32 hdc, const RECT32 *rect, HBRUSH32 hbrush )
  */
 COLORREF WINAPI SetPixel16( HDC16 hdc, INT16 x, INT16 y, COLORREF color )
 {
-    return SetPixel32( hdc, x, y, color );
+    return SetPixel( hdc, x, y, color );
 }
 
 
 /***********************************************************************
  *           SetPixel32    (GDI32.327)
  */
-COLORREF WINAPI SetPixel32( HDC32 hdc, INT32 x, INT32 y, COLORREF color )
+COLORREF WINAPI SetPixel( HDC hdc, INT x, INT y, COLORREF color )
 {
     DC * dc = DC_GetDCPtr( hdc );
   
@@ -412,7 +412,7 @@ COLORREF WINAPI SetPixel32( HDC32 hdc, INT32 x, INT32 y, COLORREF color )
 /***********************************************************************
  *           SetPixelV32    (GDI32.329)
  */
-BOOL32 WINAPI SetPixelV32( HDC32 hdc, INT32 x, INT32 y, COLORREF color )
+BOOL WINAPI SetPixelV( HDC hdc, INT x, INT y, COLORREF color )
 {
     DC * dc = DC_GetDCPtr( hdc );
   
@@ -426,14 +426,14 @@ BOOL32 WINAPI SetPixelV32( HDC32 hdc, INT32 x, INT32 y, COLORREF color )
  */
 COLORREF WINAPI GetPixel16( HDC16 hdc, INT16 x, INT16 y )
 {
-    return GetPixel32( hdc, x, y );
+    return GetPixel( hdc, x, y );
 }
 
 
 /***********************************************************************
  *           GetPixel32    (GDI32.211)
  */
-COLORREF WINAPI GetPixel32( HDC32 hdc, INT32 x, INT32 y )
+COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y )
 {
     DC * dc = DC_GetDCPtr( hdc );
 
@@ -443,7 +443,7 @@ COLORREF WINAPI GetPixel32( HDC32 hdc, INT32 x, INT32 y )
 #endif
 
     /* FIXME: should this be in the graphics driver? */
-    if (!PtVisible32( hdc, x, y )) return 0;
+    if (!PtVisible( hdc, x, y )) return 0;
     if (!dc || !dc->funcs->pGetPixel) return 0;
     return dc->funcs->pGetPixel(dc,x,y);
 }
@@ -461,7 +461,7 @@ COLORREF WINAPI GetPixel32( HDC32 hdc, INT32 x, INT32 y )
  *    Success: Pixel format index closest to given format
  *    Failure: 0
  */
-INT32 WINAPI ChoosePixelFormat( HDC32 hdc, const PIXELFORMATDESCRIPTOR* ppfd )
+INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd )
 {
     FIXME(gdi, "(%d,%p): stub\n",hdc,ppfd);
     return 1;
@@ -479,7 +479,7 @@ INT32 WINAPI ChoosePixelFormat( HDC32 hdc, const PIXELFORMATDESCRIPTOR* ppfd )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI SetPixelFormat( HDC32 hdc, int iPixelFormat, 
+BOOL WINAPI SetPixelFormat( HDC hdc, int iPixelFormat, 
                               const PIXELFORMATDESCRIPTOR* ppfd)
 {
     FIXME(gdi, "(%d,%d,%p): stub\n",hdc,iPixelFormat,ppfd);
@@ -498,7 +498,7 @@ BOOL32 WINAPI SetPixelFormat( HDC32 hdc, int iPixelFormat,
  *    Success: Currently selected pixel format
  *    Failure: 0
  */
-int WINAPI GetPixelFormat( HDC32 hdc )
+int WINAPI GetPixelFormat( HDC hdc )
 {
     FIXME(gdi, "(%d): stub\n",hdc);
     return 1;
@@ -519,7 +519,7 @@ int WINAPI GetPixelFormat( HDC32 hdc )
  *    Success: Maximum pixel format index of the device context
  *    Failure: 0
  */
-int WINAPI DescribePixelFormat( HDC32 hdc, int iPixelFormat, UINT32 nBytes,
+int WINAPI DescribePixelFormat( HDC hdc, int iPixelFormat, UINT nBytes,
                                 LPPIXELFORMATDESCRIPTOR ppfd )
 {
     FIXME(gdi, "(%d,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd);
@@ -538,7 +538,7 @@ int WINAPI DescribePixelFormat( HDC32 hdc, int iPixelFormat, UINT32 nBytes,
  *
  * RETURNS STD
  */
-BOOL32 WINAPI SwapBuffers( HDC32 hdc )
+BOOL WINAPI SwapBuffers( HDC hdc )
 {
     FIXME(gdi, "(%d): stub\n",hdc);
     return TRUE;
@@ -550,14 +550,14 @@ BOOL32 WINAPI SwapBuffers( HDC32 hdc )
  */
 BOOL16 WINAPI PaintRgn16( HDC16 hdc, HRGN16 hrgn )
 {
-    return PaintRgn32( hdc, hrgn );
+    return PaintRgn( hdc, hrgn );
 }
 
 
 /***********************************************************************
  *           PaintRgn32    (GDI32.259)
  */
-BOOL32 WINAPI PaintRgn32( HDC32 hdc, HRGN32 hrgn )
+BOOL WINAPI PaintRgn( HDC hdc, HRGN hrgn )
 {
     DC * dc = DC_GetDCPtr( hdc );
 
@@ -571,20 +571,20 @@ BOOL32 WINAPI PaintRgn32( HDC32 hdc, HRGN32 hrgn )
  */
 BOOL16 WINAPI FillRgn16( HDC16 hdc, HRGN16 hrgn, HBRUSH16 hbrush )
 {
-    return FillRgn32( hdc, hrgn, hbrush );
+    return FillRgn( hdc, hrgn, hbrush );
 }
 
     
 /***********************************************************************
  *           FillRgn32    (GDI32.101)
  */
-BOOL32 WINAPI FillRgn32( HDC32 hdc, HRGN32 hrgn, HBRUSH32 hbrush )
+BOOL WINAPI FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush )
 {
-    BOOL32 retval;
-    HBRUSH32 prevBrush = SelectObject32( hdc, hbrush );
+    BOOL retval;
+    HBRUSH prevBrush = SelectObject( hdc, hbrush );
     if (!prevBrush) return FALSE;
-    retval = PaintRgn32( hdc, hrgn );
-    SelectObject32( hdc, prevBrush );
+    retval = PaintRgn( hdc, hrgn );
+    SelectObject( hdc, prevBrush );
     return retval;
 }
 
@@ -595,20 +595,20 @@ BOOL32 WINAPI FillRgn32( HDC32 hdc, HRGN32 hrgn, HBRUSH32 hbrush )
 BOOL16 WINAPI FrameRgn16( HDC16 hdc, HRGN16 hrgn, HBRUSH16 hbrush,
                           INT16 nWidth, INT16 nHeight )
 {
-    return FrameRgn32( hdc, hrgn, hbrush, nWidth, nHeight );
+    return FrameRgn( hdc, hrgn, hbrush, nWidth, nHeight );
 }
 
 
 /***********************************************************************
  *           FrameRgn32     (GDI32.105)
  */
-BOOL32 WINAPI FrameRgn32( HDC32 hdc, HRGN32 hrgn, HBRUSH32 hbrush,
-                          INT32 nWidth, INT32 nHeight )
+BOOL WINAPI FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush,
+                          INT nWidth, INT nHeight )
 {
-    HRGN32 tmp = CreateRectRgn32( 0, 0, 0, 0 );
+    HRGN tmp = CreateRectRgn( 0, 0, 0, 0 );
     if(!REGION_FrameRgn( tmp, hrgn, nWidth, nHeight )) return FALSE;
-    FillRgn32( hdc, tmp, hbrush );
-    DeleteObject32( tmp );
+    FillRgn( hdc, tmp, hbrush );
+    DeleteObject( tmp );
     return TRUE;
 }
 
@@ -618,20 +618,20 @@ BOOL32 WINAPI FrameRgn32( HDC32 hdc, HRGN32 hrgn, HBRUSH32 hbrush,
  */
 BOOL16 WINAPI InvertRgn16( HDC16 hdc, HRGN16 hrgn )
 {
-    return InvertRgn32( hdc, hrgn );
+    return InvertRgn( hdc, hrgn );
 }
 
 
 /***********************************************************************
  *           InvertRgn32    (GDI32.246)
  */
-BOOL32 WINAPI InvertRgn32( HDC32 hdc, HRGN32 hrgn )
+BOOL WINAPI InvertRgn( HDC hdc, HRGN hrgn )
 {
-    HBRUSH32 prevBrush = SelectObject32( hdc, GetStockObject32(BLACK_BRUSH) );
-    INT32 prevROP = SetROP232( hdc, R2_NOT );
-    BOOL32 retval = PaintRgn32( hdc, hrgn );
-    SelectObject32( hdc, prevBrush );
-    SetROP232( hdc, prevROP );
+    HBRUSH prevBrush = SelectObject( hdc, GetStockObject(BLACK_BRUSH) );
+    INT prevROP = SetROP2( hdc, R2_NOT );
+    BOOL retval = PaintRgn( hdc, hrgn );
+    SelectObject( hdc, prevBrush );
+    SetROP2( hdc, prevROP );
     return retval;
 }
 
@@ -641,9 +641,9 @@ BOOL32 WINAPI InvertRgn32( HDC32 hdc, HRGN32 hrgn )
  */
 void WINAPI DrawFocusRect16( HDC16 hdc, const RECT16* rc )
 {
-    RECT32 rect32;
+    RECT rect32;
     CONV_RECT16TO32( rc, &rect32 );
-    DrawFocusRect32( hdc, &rect32 );
+    DrawFocusRect( hdc, &rect32 );
 }
 
 
@@ -652,11 +652,11 @@ void WINAPI DrawFocusRect16( HDC16 hdc, const RECT16* rc )
  *
  * FIXME: PatBlt(PATINVERT) with background brush.
  */
-BOOL32 WINAPI DrawFocusRect32( HDC32 hdc, const RECT32* rc )
+BOOL WINAPI DrawFocusRect( HDC hdc, const RECT* rc )
 {
-    HPEN32 hOldPen, hnewPen;
-    INT32 oldDrawMode, oldBkMode;
-    INT32 left, top, right, bottom;
+    HPEN hOldPen, hnewPen;
+    INT oldDrawMode, oldBkMode;
+    INT left, top, right, bottom;
     X11DRV_PDEVICE *physDev;
 
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
@@ -678,10 +678,10 @@ BOOL32 WINAPI DrawFocusRect32( HDC32 hdc, const RECT32* rc )
        return FALSE;
     }
 
-    hnewPen = CreatePen32(PS_DOT, 1, GetSysColor32(COLOR_WINDOWTEXT) );
-    hOldPen = SelectObject32( hdc, hnewPen );
-    oldDrawMode = SetROP232(hdc, R2_XORPEN);
-    oldBkMode = SetBkMode32(hdc, TRANSPARENT);
+    hnewPen = CreatePen(PS_DOT, 1, GetSysColor(COLOR_WINDOWTEXT) );
+    hOldPen = SelectObject( hdc, hnewPen );
+    oldDrawMode = SetROP2(hdc, R2_XORPEN);
+    oldBkMode = SetBkMode(hdc, TRANSPARENT);
 
     /* Hack: make sure the XORPEN operation has an effect */
     physDev->pen.pixel = (1 << MONITOR_GetDepth(&MONITOR_PrimaryMonitor)) - 1;
@@ -691,10 +691,10 @@ BOOL32 WINAPI DrawFocusRect32( HDC32 hdc, const RECT32* rc )
 		        dc->w.DCOrgX + left, dc->w.DCOrgY + top,
 		        right-left-1, bottom-top-1 );
 
-    SetBkMode32(hdc, oldBkMode);
-    SetROP232(hdc, oldDrawMode);
-    SelectObject32(hdc, hOldPen);
-    DeleteObject32(hnewPen);
+    SetBkMode(hdc, oldBkMode);
+    SetROP2(hdc, oldDrawMode);
+    SelectObject(hdc, hOldPen);
+    DeleteObject(hnewPen);
     return TRUE;
 }
 
@@ -706,12 +706,12 @@ BOOL16 WINAPI Polyline16( HDC16 hdc, const POINT16* pt, INT16 count )
 {
     register int i;
     BOOL16 ret;
-    LPPOINT32 pt32 = (LPPOINT32)HeapAlloc( GetProcessHeap(), 0,
-                                           count*sizeof(POINT32) );
+    LPPOINT pt32 = (LPPOINT)HeapAlloc( GetProcessHeap(), 0,
+                                           count*sizeof(POINT) );
 
     if (!pt32) return FALSE;
     for (i=count;i--;) CONV_POINT16TO32(&(pt[i]),&(pt32[i]));
-    ret = Polyline32(hdc,pt32,count);
+    ret = Polyline(hdc,pt32,count);
     HeapFree( GetProcessHeap(), 0, pt32 );
     return ret;
 }
@@ -720,7 +720,7 @@ BOOL16 WINAPI Polyline16( HDC16 hdc, const POINT16* pt, INT16 count )
 /**********************************************************************
  *          Polyline32   (GDI32.276)
  */
-BOOL32 WINAPI Polyline32( HDC32 hdc, const POINT32* pt, INT32 count )
+BOOL WINAPI Polyline( HDC hdc, const POINT* pt, INT count )
 {
     DC * dc = DC_GetDCPtr( hdc );
 
@@ -731,23 +731,23 @@ BOOL32 WINAPI Polyline32( HDC32 hdc, const POINT32* pt, INT32 count )
 /**********************************************************************
  *          PolylineTo32   (GDI32.277)
  */
-BOOL32 WINAPI PolylineTo32( HDC32 hdc, const POINT32* pt, DWORD cCount )
+BOOL WINAPI PolylineTo( HDC hdc, const POINT* pt, DWORD cCount )
 {
-    POINT32 *pts = HeapAlloc( GetProcessHeap(), 0,
-			      sizeof(POINT32) * (cCount + 1) );
+    POINT *pts = HeapAlloc( GetProcessHeap(), 0,
+			      sizeof(POINT) * (cCount + 1) );
     if(!pts) return FALSE;
 
     /* Get the current point */
-    MoveToEx32( hdc, 0, 0, pts);
+    MoveToEx( hdc, 0, 0, pts);
 
     /* Add in the other points */
-    memcpy( pts + 1, pt, sizeof(POINT32) * cCount );
+    memcpy( pts + 1, pt, sizeof(POINT) * cCount );
 
     /* Draw the lines */
-    Polyline32( hdc, pts, cCount + 1 );
+    Polyline( hdc, pts, cCount + 1 );
 
     /* Move to last point */
-    MoveToEx32( hdc, (pts + cCount)->x, (pts + cCount)->y, NULL );
+    MoveToEx( hdc, (pts + cCount)->x, (pts + cCount)->y, NULL );
 
     HeapFree( GetProcessHeap(), 0, pts );
     return TRUE;
@@ -759,13 +759,13 @@ BOOL32 WINAPI PolylineTo32( HDC32 hdc, const POINT32* pt, DWORD cCount )
 BOOL16 WINAPI Polygon16( HDC16 hdc, const POINT16* pt, INT16 count )
 {
     register int i;
-    BOOL32 ret;
-    LPPOINT32 pt32 = (LPPOINT32)HeapAlloc( GetProcessHeap(), 0,
-                                           count*sizeof(POINT32) );
+    BOOL ret;
+    LPPOINT pt32 = (LPPOINT)HeapAlloc( GetProcessHeap(), 0,
+                                           count*sizeof(POINT) );
 
     if (!pt32) return FALSE;
     for (i=count;i--;) CONV_POINT16TO32(&(pt[i]),&(pt32[i]));
-    ret = Polygon32(hdc,pt32,count);
+    ret = Polygon(hdc,pt32,count);
     HeapFree( GetProcessHeap(), 0, pt32 );
     return ret;
 }
@@ -774,7 +774,7 @@ BOOL16 WINAPI Polygon16( HDC16 hdc, const POINT16* pt, INT16 count )
 /**********************************************************************
  *          Polygon32  (GDI32.275)
  */
-BOOL32 WINAPI Polygon32( HDC32 hdc, const POINT32* pt, INT32 count )
+BOOL WINAPI Polygon( HDC hdc, const POINT* pt, INT count )
 {
     DC * dc = DC_GetDCPtr( hdc );
 
@@ -790,21 +790,21 @@ BOOL16 WINAPI PolyPolygon16( HDC16 hdc, const POINT16* pt, const INT16* counts,
                              UINT16 polygons )
 {
     int		i,nrpts;
-    LPPOINT32	pt32;
-    LPINT32	counts32;
+    LPPOINT	pt32;
+    LPINT	counts32;
     BOOL16	ret;
 
     nrpts=0;
     for (i=polygons;i--;)
     	nrpts+=counts[i];
-    pt32 = (LPPOINT32)HEAP_xalloc( GetProcessHeap(), 0, sizeof(POINT32)*nrpts);
+    pt32 = (LPPOINT)HEAP_xalloc( GetProcessHeap(), 0, sizeof(POINT)*nrpts);
     for (i=nrpts;i--;)
     	CONV_POINT16TO32(&(pt[i]),&(pt32[i]));
-    counts32 = (LPINT32)HEAP_xalloc( GetProcessHeap(), 0,
-                                     polygons*sizeof(INT32) );
+    counts32 = (LPINT)HEAP_xalloc( GetProcessHeap(), 0,
+                                     polygons*sizeof(INT) );
     for (i=polygons;i--;) counts32[i]=counts[i];
    
-    ret = PolyPolygon32(hdc,pt32,counts32,polygons);
+    ret = PolyPolygon(hdc,pt32,counts32,polygons);
     HeapFree( GetProcessHeap(), 0, counts32 );
     HeapFree( GetProcessHeap(), 0, pt32 );
     return ret;
@@ -813,8 +813,8 @@ BOOL16 WINAPI PolyPolygon16( HDC16 hdc, const POINT16* pt, const INT16* counts,
 /**********************************************************************
  *          PolyPolygon32  (GDI.450)
  */
-BOOL32 WINAPI PolyPolygon32( HDC32 hdc, const POINT32* pt, const INT32* counts,
-                             UINT32 polygons )
+BOOL WINAPI PolyPolygon( HDC hdc, const POINT* pt, const INT* counts,
+                             UINT polygons )
 {
     DC * dc = DC_GetDCPtr( hdc );
 
@@ -825,7 +825,7 @@ BOOL32 WINAPI PolyPolygon32( HDC32 hdc, const POINT32* pt, const INT32* counts,
 /**********************************************************************
  *          PolyPolyline  (GDI32.272)
  */
-BOOL32 WINAPI PolyPolyline( HDC32 hdc, const POINT32* pt, const DWORD* counts,
+BOOL WINAPI PolyPolyline( HDC hdc, const POINT* pt, const DWORD* counts,
                             DWORD polylines )
 {
     DC * dc = DC_GetDCPtr( hdc );
@@ -840,15 +840,15 @@ BOOL32 WINAPI PolyPolyline( HDC32 hdc, const POINT32* pt, const DWORD* counts,
 BOOL16 WINAPI ExtFloodFill16( HDC16 hdc, INT16 x, INT16 y, COLORREF color,
                               UINT16 fillType )
 {
-    return ExtFloodFill32( hdc, x, y, color, fillType );
+    return ExtFloodFill( hdc, x, y, color, fillType );
 }
 
 
 /**********************************************************************
  *          ExtFloodFill32   (GDI32.96)
  */
-BOOL32 WINAPI ExtFloodFill32( HDC32 hdc, INT32 x, INT32 y, COLORREF color,
-                              UINT32 fillType )
+BOOL WINAPI ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color,
+                              UINT fillType )
 {
     DC *dc = DC_GetDCPtr( hdc );
 
@@ -862,16 +862,16 @@ BOOL32 WINAPI ExtFloodFill32( HDC32 hdc, INT32 x, INT32 y, COLORREF color,
  */
 BOOL16 WINAPI FloodFill16( HDC16 hdc, INT16 x, INT16 y, COLORREF color )
 {
-    return ExtFloodFill32( hdc, x, y, color, FLOODFILLBORDER );
+    return ExtFloodFill( hdc, x, y, color, FLOODFILLBORDER );
 }
 
 
 /**********************************************************************
  *          FloodFill32   (GDI32.104)
  */
-BOOL32 WINAPI FloodFill32( HDC32 hdc, INT32 x, INT32 y, COLORREF color )
+BOOL WINAPI FloodFill( HDC hdc, INT x, INT y, COLORREF color )
 {
-    return ExtFloodFill32( hdc, x, y, color, FLOODFILLBORDER );
+    return ExtFloodFill( hdc, x, y, color, FLOODFILLBORDER );
 }
 
 
@@ -882,28 +882,28 @@ BOOL16 WINAPI DrawAnimatedRects16( HWND16 hwnd, INT16 idAni,
                                    const RECT16* lprcFrom,
                                    const RECT16* lprcTo )
 {
-    RECT32 rcFrom32, rcTo32;
+    RECT rcFrom32, rcTo32;
 
-    rcFrom32.left	= (INT32)lprcFrom->left;
-    rcFrom32.top	= (INT32)lprcFrom->top;
-    rcFrom32.right	= (INT32)lprcFrom->right;
-    rcFrom32.bottom	= (INT32)lprcFrom->bottom;
+    rcFrom32.left	= (INT)lprcFrom->left;
+    rcFrom32.top	= (INT)lprcFrom->top;
+    rcFrom32.right	= (INT)lprcFrom->right;
+    rcFrom32.bottom	= (INT)lprcFrom->bottom;
 
-    rcTo32.left		= (INT32)lprcTo->left;
-    rcTo32.top		= (INT32)lprcTo->top;
-    rcTo32.right	= (INT32)lprcTo->right;
-    rcTo32.bottom	= (INT32)lprcTo->bottom;
+    rcTo32.left		= (INT)lprcTo->left;
+    rcTo32.top		= (INT)lprcTo->top;
+    rcTo32.right	= (INT)lprcTo->right;
+    rcTo32.bottom	= (INT)lprcTo->bottom;
 
-    return DrawAnimatedRects32((HWND32)hwnd, (INT32)idAni, &rcFrom32, &rcTo32);
+    return DrawAnimatedRects((HWND)hwnd, (INT)idAni, &rcFrom32, &rcTo32);
 }
 
 
 /**********************************************************************
  *          DrawAnimatedRects32  (USER32.153)
  */
-BOOL32 WINAPI DrawAnimatedRects32( HWND32 hwnd, int idAni,
-                                   const RECT32* lprcFrom,
-                                   const RECT32* lprcTo )
+BOOL WINAPI DrawAnimatedRects( HWND hwnd, int idAni,
+                                   const RECT* lprcFrom,
+                                   const RECT* lprcTo )
 {
     FIXME(gdi,"(0x%x,%d,%p,%p): stub\n",hwnd,idAni,lprcFrom,lprcTo);
     return TRUE;
@@ -915,43 +915,43 @@ BOOL32 WINAPI DrawAnimatedRects32( HWND32 hwnd, int idAni,
  *
  * Jams in the requested type in the dc
  */
-static BOOL32 PAINTING_DrawStateJam(HDC32 hdc, UINT32 opcode,
-                                    DRAWSTATEPROC32 func, LPARAM lp, WPARAM32 wp, 
-                                    LPRECT32 rc, UINT32 dtflags,
-                                    BOOL32 unicode, BOOL32 _32bit)
+static BOOL PAINTING_DrawStateJam(HDC hdc, UINT opcode,
+                                    DRAWSTATEPROC func, LPARAM lp, WPARAM wp, 
+                                    LPRECT rc, UINT dtflags,
+                                    BOOL unicode, BOOL _32bit)
 {
-    HDC32 memdc;
-    HBITMAP32 hbmsave;
-    BOOL32 retval;
-    INT32 cx = rc->right - rc->left;
-    INT32 cy = rc->bottom - rc->top;
+    HDC memdc;
+    HBITMAP hbmsave;
+    BOOL retval;
+    INT cx = rc->right - rc->left;
+    INT cy = rc->bottom - rc->top;
     
     switch(opcode)
     {
     case DST_TEXT:
     case DST_PREFIXTEXT:
         if(unicode)
-            return DrawText32W(hdc, (LPWSTR)lp, (INT32)wp, rc, dtflags);
+            return DrawTextW(hdc, (LPWSTR)lp, (INT)wp, rc, dtflags);
         else if(_32bit)
-            return DrawText32A(hdc, (LPSTR)lp, (INT32)wp, rc, dtflags);
+            return DrawTextA(hdc, (LPSTR)lp, (INT)wp, rc, dtflags);
         else
-            return DrawText32A(hdc, (LPSTR)PTR_SEG_TO_LIN(lp), (INT32)wp, rc, dtflags);
+            return DrawTextA(hdc, (LPSTR)PTR_SEG_TO_LIN(lp), (INT)wp, rc, dtflags);
 
     case DST_ICON:
-        return DrawIcon32(hdc, rc->left, rc->top, (HICON32)lp);
+        return DrawIcon(hdc, rc->left, rc->top, (HICON)lp);
 
     case DST_BITMAP:
-        memdc = CreateCompatibleDC32(hdc);
+        memdc = CreateCompatibleDC(hdc);
         if(!memdc) return FALSE;
-        hbmsave = (HBITMAP32)SelectObject32(memdc, (HBITMAP32)lp);
+        hbmsave = (HBITMAP)SelectObject(memdc, (HBITMAP)lp);
         if(!hbmsave) 
         {
-            DeleteDC32(memdc);
+            DeleteDC(memdc);
             return FALSE;
         }
-        retval = BitBlt32(hdc, rc->left, rc->top, cx, cy, memdc, 0, 0, SRCCOPY);
-        SelectObject32(memdc, hbmsave);
-        DeleteDC32(memdc);
+        retval = BitBlt(hdc, rc->left, rc->top, cx, cy, memdc, 0, 0, SRCCOPY);
+        SelectObject(memdc, hbmsave);
+        DeleteDC(memdc);
         return retval;
             
     case DST_COMPLEX:
@@ -959,7 +959,7 @@ static BOOL32 PAINTING_DrawStateJam(HDC32 hdc, UINT32 opcode,
             if(_32bit)
                 return func(hdc, lp, wp, cx, cy);
             else
-                return (BOOL32)((DRAWSTATEPROC16)func)((HDC16)hdc, (LPARAM)lp, (WPARAM16)wp, (INT16)cx, (INT16)cy);
+                return (BOOL)((DRAWSTATEPROC16)func)((HDC16)hdc, (LPARAM)lp, (WPARAM16)wp, (INT16)cx, (INT16)cy);
         else
             return FALSE;
     }
@@ -969,36 +969,36 @@ static BOOL32 PAINTING_DrawStateJam(HDC32 hdc, UINT32 opcode,
 /**********************************************************************
  *      PAINTING_DrawState32()
  */
-static BOOL32 PAINTING_DrawState32(HDC32 hdc, HBRUSH32 hbr, 
-                                   DRAWSTATEPROC32 func, LPARAM lp, WPARAM32 wp,
-                                   INT32 x, INT32 y, INT32 cx, INT32 cy, 
-                                   UINT32 flags, BOOL32 unicode, BOOL32 _32bit)
-{
-    HBITMAP32 hbm, hbmsave;
-    HFONT32 hfsave;
-    HBRUSH32 hbsave;
-    HDC32 memdc;
-    RECT32 rc;
-    UINT32 dtflags = DT_NOCLIP;
+static BOOL PAINTING_DrawState(HDC hdc, HBRUSH hbr, 
+                                   DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
+                                   INT x, INT y, INT cx, INT cy, 
+                                   UINT flags, BOOL unicode, BOOL _32bit)
+{
+    HBITMAP hbm, hbmsave;
+    HFONT hfsave;
+    HBRUSH hbsave;
+    HDC memdc;
+    RECT rc;
+    UINT dtflags = DT_NOCLIP;
     COLORREF fg, bg;
-    UINT32 opcode = flags & 0xf;
-    INT32 len = wp;
-    BOOL32 retval, tmp;
+    UINT opcode = flags & 0xf;
+    INT len = wp;
+    BOOL retval, tmp;
 
     if((opcode == DST_TEXT || opcode == DST_PREFIXTEXT) && !len)    /* The string is '\0' terminated */
     {
         if(unicode)
-            len = lstrlen32W((LPWSTR)lp);
+            len = lstrlenW((LPWSTR)lp);
         else if(_32bit)
-            len = lstrlen32A((LPSTR)lp);
+            len = lstrlenA((LPSTR)lp);
         else
-            len = lstrlen32A((LPSTR)PTR_SEG_TO_LIN(lp));
+            len = lstrlenA((LPSTR)PTR_SEG_TO_LIN(lp));
     }
 
     /* Find out what size the image has if not given by caller */
     if(!cx || !cy)
     {
-        SIZE32 s;
+        SIZE s;
         CURSORICONINFO *ici;
         BITMAPOBJ *bmp;
 
@@ -1056,62 +1056,62 @@ static BOOL32 PAINTING_DrawState32(HDC32 hdc, HBRUSH32 hbr,
 
     /* For all other states we need to convert the image to B/W in a local bitmap */
     /* before it is displayed */
-    fg = SetTextColor32(hdc, RGB(0, 0, 0));
-    bg = SetBkColor32(hdc, RGB(255, 255, 255));
-    hbm = (HBITMAP32)NULL; hbmsave = (HBITMAP32)NULL;
-    memdc = (HDC32)NULL; hbsave = (HBRUSH32)NULL;
+    fg = SetTextColor(hdc, RGB(0, 0, 0));
+    bg = SetBkColor(hdc, RGB(255, 255, 255));
+    hbm = (HBITMAP)NULL; hbmsave = (HBITMAP)NULL;
+    memdc = (HDC)NULL; hbsave = (HBRUSH)NULL;
     retval = FALSE; /* assume failure */
     
     /* From here on we must use "goto cleanup" when something goes wrong */
-    hbm     = CreateBitmap32(cx, cy, 1, 1, NULL);
+    hbm     = CreateBitmap(cx, cy, 1, 1, NULL);
     if(!hbm) goto cleanup;
-    memdc   = CreateCompatibleDC32(hdc);
+    memdc   = CreateCompatibleDC(hdc);
     if(!memdc) goto cleanup;
-    hbmsave = (HBITMAP32)SelectObject32(memdc, hbm);
+    hbmsave = (HBITMAP)SelectObject(memdc, hbm);
     if(!hbmsave) goto cleanup;
     rc.left = rc.top = 0;
     rc.right = cx;
     rc.bottom = cy;
-    if(!FillRect32(memdc, &rc, (HBRUSH32)GetStockObject32(WHITE_BRUSH))) goto cleanup;
-    SetBkColor32(memdc, RGB(255, 255, 255));
-    SetTextColor32(memdc, RGB(0, 0, 0));
-    hfsave  = (HFONT32)SelectObject32(memdc, GetCurrentObject(hdc, OBJ_FONT));
+    if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH))) goto cleanup;
+    SetBkColor(memdc, RGB(255, 255, 255));
+    SetTextColor(memdc, RGB(0, 0, 0));
+    hfsave  = (HFONT)SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT));
     if(!hfsave && (opcode == DST_TEXT || opcode == DST_PREFIXTEXT)) goto cleanup;
     tmp = PAINTING_DrawStateJam(memdc, opcode, func, lp, len, &rc, dtflags, unicode, _32bit);
-    if(hfsave) SelectObject32(memdc, hfsave);
+    if(hfsave) SelectObject(memdc, hfsave);
     if(!tmp) goto cleanup;
     
     /* These states cause the image to be dithered */
     if(flags & (DSS_UNION|DSS_DISABLED))
     {
-        hbsave = (HBRUSH32)SelectObject32(memdc, CACHE_GetPattern55AABrush());
+        hbsave = (HBRUSH)SelectObject(memdc, CACHE_GetPattern55AABrush());
         if(!hbsave) goto cleanup;
-        tmp = PatBlt32(memdc, 0, 0, cx, cy, 0x00FA0089);
-        if(hbsave) SelectObject32(memdc, hbsave);
+        tmp = PatBlt(memdc, 0, 0, cx, cy, 0x00FA0089);
+        if(hbsave) SelectObject(memdc, hbsave);
         if(!tmp) goto cleanup;
     }
 
-    hbsave = (HBRUSH32)SelectObject32(hdc, hbr ? hbr : GetStockObject32(WHITE_BRUSH));
+    hbsave = (HBRUSH)SelectObject(hdc, hbr ? hbr : GetStockObject(WHITE_BRUSH));
     if(!hbsave) goto cleanup;
     
-    if(!BitBlt32(hdc, x, y, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup;
+    if(!BitBlt(hdc, x, y, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup;
     
     /* DSS_DEFAULT makes the image boldface */
     if(flags & DSS_DEFAULT)
     {
-        if(!BitBlt32(hdc, x+1, y, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup;
+        if(!BitBlt(hdc, x+1, y, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup;
     }
 
     retval = TRUE; /* We succeeded */
     
 cleanup:    
-    SetTextColor32(hdc, fg);
-    SetBkColor32(hdc, bg);
+    SetTextColor(hdc, fg);
+    SetBkColor(hdc, bg);
 
-    if(hbsave)  SelectObject32(hdc, hbsave);
-    if(hbmsave) SelectObject32(memdc, hbmsave);
-    if(hbm)     DeleteObject32(hbm);
-    if(memdc)   DeleteDC32(memdc);
+    if(hbsave)  SelectObject(hdc, hbsave);
+    if(hbmsave) SelectObject(memdc, hbmsave);
+    if(hbm)     DeleteObject(hbm);
+    if(memdc)   DeleteDC(memdc);
 
     return retval;
 }
@@ -1119,21 +1119,21 @@ cleanup:
 /**********************************************************************
  *      DrawState32A()   (USER32.162)
  */
-BOOL32 WINAPI DrawState32A(HDC32 hdc, HBRUSH32 hbr,
-                   DRAWSTATEPROC32 func, LPARAM ldata, WPARAM32 wdata,
-                   INT32 x, INT32 y, INT32 cx, INT32 cy, UINT32 flags)
+BOOL WINAPI DrawStateA(HDC hdc, HBRUSH hbr,
+                   DRAWSTATEPROC func, LPARAM ldata, WPARAM wdata,
+                   INT x, INT y, INT cx, INT cy, UINT flags)
 {
-    return PAINTING_DrawState32(hdc, hbr, func, ldata, wdata, x, y, cx, cy, flags, FALSE, TRUE);
+    return PAINTING_DrawState(hdc, hbr, func, ldata, wdata, x, y, cx, cy, flags, FALSE, TRUE);
 }
 
 /**********************************************************************
  *      DrawState32W()   (USER32.163)
  */
-BOOL32 WINAPI DrawState32W(HDC32 hdc, HBRUSH32 hbr,
-                   DRAWSTATEPROC32 func, LPARAM ldata, WPARAM32 wdata,
-                   INT32 x, INT32 y, INT32 cx, INT32 cy, UINT32 flags)
+BOOL WINAPI DrawStateW(HDC hdc, HBRUSH hbr,
+                   DRAWSTATEPROC func, LPARAM ldata, WPARAM wdata,
+                   INT x, INT y, INT cx, INT cy, UINT flags)
 {
-    return PAINTING_DrawState32(hdc, hbr, func, ldata, wdata, x, y, cx, cy, flags, TRUE, TRUE);
+    return PAINTING_DrawState(hdc, hbr, func, ldata, wdata, x, y, cx, cy, flags, TRUE, TRUE);
 }
 
 /**********************************************************************
@@ -1143,7 +1143,7 @@ BOOL16 WINAPI DrawState16(HDC16 hdc, HBRUSH16 hbr,
                    DRAWSTATEPROC16 func, LPARAM ldata, WPARAM16 wdata,
                    INT16 x, INT16 y, INT16 cx, INT16 cy, UINT16 flags)
 {
-    return PAINTING_DrawState32(hdc, hbr, (DRAWSTATEPROC32)func, ldata, wdata, x, y, cx, cy, flags, FALSE, FALSE);
+    return PAINTING_DrawState(hdc, hbr, (DRAWSTATEPROC)func, ldata, wdata, x, y, cx, cy, flags, FALSE, FALSE);
 }
 
 
@@ -1154,11 +1154,11 @@ BOOL16 WINAPI PolyBezier16( HDC16 hDc, const POINT16* lppt, INT16 cPoints )
 {
     int i;
     BOOL16 ret;
-    LPPOINT32 pt32 = (LPPOINT32)HeapAlloc( GetProcessHeap(), 0,
-                                           cPoints*sizeof(POINT32) );
+    LPPOINT pt32 = (LPPOINT)HeapAlloc( GetProcessHeap(), 0,
+                                           cPoints*sizeof(POINT) );
     if(!pt32) return FALSE;
     for (i=cPoints;i--;) CONV_POINT16TO32(&(lppt[i]),&(pt32[i]));
-    ret= PolyBezier32(hDc, pt32, cPoints);
+    ret= PolyBezier(hDc, pt32, cPoints);
     HeapFree( GetProcessHeap(), 0, pt32 );
     return ret;
 }
@@ -1170,11 +1170,11 @@ BOOL16 WINAPI PolyBezierTo16( HDC16 hDc, const POINT16* lppt, INT16 cPoints )
 {
     int i;
     BOOL16 ret;
-    LPPOINT32 pt32 = (LPPOINT32)HeapAlloc( GetProcessHeap(), 0,
-                                           cPoints*sizeof(POINT32) );
+    LPPOINT pt32 = (LPPOINT)HeapAlloc( GetProcessHeap(), 0,
+                                           cPoints*sizeof(POINT) );
     if(!pt32) return FALSE;
     for (i=cPoints;i--;) CONV_POINT16TO32(&(lppt[i]),&(pt32[i]));
-    ret= PolyBezierTo32(hDc, pt32, cPoints);
+    ret= PolyBezierTo(hDc, pt32, cPoints);
     HeapFree( GetProcessHeap(), 0, pt32 );
     return ret;
 }
@@ -1190,7 +1190,7 @@ BOOL16 WINAPI PolyBezierTo16( HDC16 hDc, const POINT16* lppt, INT16 cPoints )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI PolyBezier32( HDC32 hdc, const POINT32* lppt, DWORD cPoints )
+BOOL WINAPI PolyBezier( HDC hdc, const POINT* lppt, DWORD cPoints )
 {
     DC * dc = DC_GetDCPtr( hdc );
     if(!dc) return FALSE;
@@ -1213,11 +1213,11 @@ BOOL32 WINAPI PolyBezier32( HDC32 hdc, const POINT32* lppt, DWORD cPoints )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI PolyBezierTo32( HDC32 hdc, const POINT32* lppt, DWORD cPoints )
+BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints )
 {
     DC * dc = DC_GetDCPtr( hdc );
-    POINT32 pt;
-    BOOL32 ret;
+    POINT pt;
+    BOOL ret;
     if(!dc) return FALSE;
     pt.x=dc->w.CursPosX;
     pt.y=dc->w.CursPosY;
@@ -1236,7 +1236,7 @@ BOOL32 WINAPI PolyBezierTo32( HDC32 hdc, const POINT32* lppt, DWORD cPoints )
  *      AngleArc (GDI32.5)
  *
  */
-BOOL32 WINAPI AngleArc(HDC32 hdc, INT32 x, INT32 y, DWORD dwRadius,
+BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius,
                        FLOAT eStartAngle, FLOAT eSweepAngle)
 {
         FIXME(gdi,"AngleArc, stub\n");
@@ -1247,7 +1247,7 @@ BOOL32 WINAPI AngleArc(HDC32 hdc, INT32 x, INT32 y, DWORD dwRadius,
  *      PolyDraw (GDI32.270)
  *
  */
-BOOL32 WINAPI PolyDraw(HDC32 hdc, const POINT32 *lppt, const BYTE *lpbTypes,
+BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes,
                        DWORD cCount)
 {
         FIXME(gdi,"PolyDraw, stub\n");
diff --git a/graphics/path.c b/graphics/path.c
index 290ddcdcbf5..6e174fc35de 100644
--- a/graphics/path.c
+++ b/graphics/path.c
@@ -61,17 +61,17 @@
 #define GROW_FACTOR_DENOM    1  /* Denominator of grow factor             */
 
 
-static BOOL32 PATH_PathToRegion(const GdiPath *pPath, INT32 nPolyFillMode,
-   HRGN32 *pHrgn);
+static BOOL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode,
+   HRGN *pHrgn);
 static void   PATH_EmptyPath(GdiPath *pPath);
-static BOOL32 PATH_AddEntry(GdiPath *pPath, const POINT32 *pPoint,
+static BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint,
    BYTE flags);
-static BOOL32 PATH_ReserveEntries(GdiPath *pPath, INT32 numEntries);
-static BOOL32 PATH_GetPathFromHDC(HDC32 hdc, GdiPath **ppPath);
-static BOOL32 PATH_DoArcPart(GdiPath *pPath, FLOAT_POINT corners[],
-   double angleStart, double angleEnd, BOOL32 addMoveTo);
+static BOOL PATH_ReserveEntries(GdiPath *pPath, INT numEntries);
+static BOOL PATH_GetPathFromHDC(HDC hdc, GdiPath **ppPath);
+static BOOL PATH_DoArcPart(GdiPath *pPath, FLOAT_POINT corners[],
+   double angleStart, double angleEnd, BOOL addMoveTo);
 static void PATH_ScaleNormalizedPoint(FLOAT_POINT corners[], double x,
-   double y, POINT32 *pPoint);
+   double y, POINT *pPoint);
 static void PATH_NormalizePoint(FLOAT_POINT corners[], const FLOAT_POINT
    *pPoint, double *pX, double *pY);
 
@@ -81,14 +81,14 @@ static void PATH_NormalizePoint(FLOAT_POINT corners[], const FLOAT_POINT
  */
 BOOL16 WINAPI BeginPath16(HDC16 hdc)
 {
-   return (BOOL16)BeginPath32((HDC32)hdc);
+   return (BOOL16)BeginPath((HDC)hdc);
 }
 
 
 /***********************************************************************
  *           BeginPath32    (GDI32.9)
  */
-BOOL32 WINAPI BeginPath32(HDC32 hdc)
+BOOL WINAPI BeginPath(HDC hdc)
 {
    GdiPath *pPath;
    
@@ -119,14 +119,14 @@ BOOL32 WINAPI BeginPath32(HDC32 hdc)
  */
 BOOL16 WINAPI EndPath16(HDC16 hdc)
 {
-   return (BOOL16)EndPath32((HDC32)hdc);
+   return (BOOL16)EndPath((HDC)hdc);
 }
 
 
 /***********************************************************************
  *           EndPath32    (GDI32.78)
  */
-BOOL32 WINAPI EndPath32(HDC32 hdc)
+BOOL WINAPI EndPath(HDC hdc)
 {
    GdiPath *pPath;
    
@@ -156,7 +156,7 @@ BOOL32 WINAPI EndPath32(HDC32 hdc)
  */
 BOOL16 WINAPI AbortPath16(HDC16 hdc)
 {
-   return (BOOL16)AbortPath32((HDC32)hdc);
+   return (BOOL16)AbortPath((HDC)hdc);
 }
 
 
@@ -172,7 +172,7 @@ BOOL16 WINAPI AbortPath16(HDC16 hdc)
  *
  * RETURNS STD
  */
-BOOL32 WINAPI AbortPath32( HDC32 hdc )
+BOOL WINAPI AbortPath( HDC hdc )
 {
    GdiPath *pPath;
    
@@ -195,7 +195,7 @@ BOOL32 WINAPI AbortPath32( HDC32 hdc )
  */
 BOOL16 WINAPI CloseFigure16(HDC16 hdc)
 {
-   return (BOOL16)CloseFigure32((HDC32)hdc);
+   return (BOOL16)CloseFigure((HDC)hdc);
 }
 
 
@@ -204,7 +204,7 @@ BOOL16 WINAPI CloseFigure16(HDC16 hdc)
  *
  * FIXME: Check that SetLastError is being called correctly 
  */
-BOOL32 WINAPI CloseFigure32(HDC32 hdc)
+BOOL WINAPI CloseFigure(HDC hdc)
 {
    GdiPath *pPath;
    
@@ -250,8 +250,8 @@ INT16 WINAPI GetPath16(HDC16 hdc, LPPOINT16 pPoints, LPBYTE pTypes,
 /***********************************************************************
  *           GetPath32    (GDI32.210)
  */
-INT32 WINAPI GetPath32(HDC32 hdc, LPPOINT32 pPoints, LPBYTE pTypes,
-   INT32 nSize)
+INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes,
+   INT nSize)
 {
    GdiPath *pPath;
    
@@ -278,11 +278,11 @@ INT32 WINAPI GetPath32(HDC32 hdc, LPPOINT32 pPoints, LPBYTE pTypes,
    }
    else
    {
-      memcpy(pPoints, pPath->pPoints, sizeof(POINT32)*pPath->numEntriesUsed);
+      memcpy(pPoints, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed);
       memcpy(pTypes, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed);
 
       /* Convert the points to logical coordinates */
-      if(!DPtoLP32(hdc, pPoints, pPath->numEntriesUsed))
+      if(!DPtoLP(hdc, pPoints, pPath->numEntriesUsed))
       {
 	 /* FIXME: Is this the correct value? */
          SetLastError(ERROR_CAN_NOT_COMPLETE);
@@ -303,10 +303,10 @@ INT32 WINAPI GetPath32(HDC32 hdc, LPPOINT32 pPoints, LPBYTE pTypes,
  * The documentation does not state this explicitly, but a test under Windows
  * shows that the region which is returned should be in device coordinates.
  */
-HRGN32 WINAPI PathToRegion32(HDC32 hdc)
+HRGN WINAPI PathToRegion(HDC hdc)
 {
    GdiPath *pPath;
-   HRGN32  hrgnRval;
+   HRGN  hrgnRval;
 
    /* Get pointer to path */
    if(!PATH_GetPathFromHDC(hdc, &pPath))
@@ -323,7 +323,7 @@ HRGN32 WINAPI PathToRegion32(HDC32 hdc)
    }
    
    /* FIXME: Should we empty the path even if conversion failed? */
-   if(PATH_PathToRegion(pPath, GetPolyFillMode32(hdc), &hrgnRval))
+   if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgnRval))
       PATH_EmptyPath(pPath);
    else
       hrgnRval=0;
@@ -338,14 +338,14 @@ HRGN32 WINAPI PathToRegion32(HDC32 hdc)
  * FIXME
  *    Check that SetLastError is being called correctly 
  */
-BOOL32 WINAPI FillPath32(HDC32 hdc)
+BOOL WINAPI FillPath(HDC hdc)
 {
    GdiPath *pPath;
-   INT32   mapMode, graphicsMode;
-   SIZE32  ptViewportExt, ptWindowExt;
-   POINT32 ptViewportOrg, ptWindowOrg;
+   INT   mapMode, graphicsMode;
+   SIZE  ptViewportExt, ptWindowExt;
+   POINT ptViewportOrg, ptWindowOrg;
    XFORM   xform;
-   HRGN32  hrgn;
+   HRGN  hrgn;
    
    /* Get pointer to path */
    if(!PATH_GetPathFromHDC(hdc, &pPath))
@@ -362,7 +362,7 @@ BOOL32 WINAPI FillPath32(HDC32 hdc)
    }
    
    /* Construct a region from the path and fill it */
-   if(PATH_PathToRegion(pPath, GetPolyFillMode32(hdc), &hrgn))
+   if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgn))
    {
       /* Since PaintRgn interprets the region as being in logical coordinates
        * but the points we store for the path are already in device
@@ -373,11 +373,11 @@ BOOL32 WINAPI FillPath32(HDC32 hdc)
        */
        
       /* Save the information about the old mapping mode */
-      mapMode=GetMapMode32(hdc);
-      GetViewportExtEx32(hdc, &ptViewportExt);
-      GetViewportOrgEx32(hdc, &ptViewportOrg);
-      GetWindowExtEx32(hdc, &ptWindowExt);
-      GetWindowOrgEx32(hdc, &ptWindowOrg);
+      mapMode=GetMapMode(hdc);
+      GetViewportExtEx(hdc, &ptViewportExt);
+      GetViewportOrgEx(hdc, &ptViewportOrg);
+      GetWindowExtEx(hdc, &ptWindowExt);
+      GetWindowOrgEx(hdc, &ptWindowOrg);
       
       /* Save world transform
        * NB: The Windows documentation on world transforms would lead one to
@@ -388,17 +388,17 @@ BOOL32 WINAPI FillPath32(HDC32 hdc)
       GetWorldTransform(hdc, &xform);
       
       /* Set MM_TEXT */
-      SetMapMode32(hdc, MM_TEXT);
+      SetMapMode(hdc, MM_TEXT);
       
       /* Paint the region */
-      PaintRgn32(hdc, hrgn);
+      PaintRgn(hdc, hrgn);
 
       /* Restore the old mapping mode */
-      SetMapMode32(hdc, mapMode);
-      SetViewportExtEx32(hdc, ptViewportExt.cx, ptViewportExt.cy, NULL);
-      SetViewportOrgEx32(hdc, ptViewportOrg.x, ptViewportOrg.y, NULL);
-      SetWindowExtEx32(hdc, ptWindowExt.cx, ptWindowExt.cy, NULL);
-      SetWindowOrgEx32(hdc, ptWindowOrg.x, ptWindowOrg.y, NULL);
+      SetMapMode(hdc, mapMode);
+      SetViewportExtEx(hdc, ptViewportExt.cx, ptViewportExt.cy, NULL);
+      SetViewportOrgEx(hdc, ptViewportOrg.x, ptViewportOrg.y, NULL);
+      SetWindowExtEx(hdc, ptWindowExt.cx, ptWindowExt.cy, NULL);
+      SetWindowOrgEx(hdc, ptWindowOrg.x, ptWindowOrg.y, NULL);
 
       /* Go to GM_ADVANCED temporarily to restore the world transform */
       graphicsMode=GetGraphicsMode(hdc);
@@ -424,11 +424,11 @@ BOOL32 WINAPI FillPath32(HDC32 hdc)
  * FIXME 
  *  Check that SetLastError is being called correctly 
  */
-BOOL32 WINAPI SelectClipPath32(HDC32 hdc, INT32 iMode)
+BOOL WINAPI SelectClipPath(HDC hdc, INT iMode)
 {
    GdiPath *pPath;
-   HRGN32  hrgnPath;
-   BOOL32  success;
+   HRGN  hrgnPath;
+   BOOL  success;
    
    /* Get pointer to path */
    if(!PATH_GetPathFromHDC(hdc, &pPath))
@@ -445,10 +445,10 @@ BOOL32 WINAPI SelectClipPath32(HDC32 hdc, INT32 iMode)
    }
    
    /* Construct a region from the path */
-   if(PATH_PathToRegion(pPath, GetPolyFillMode32(hdc), &hrgnPath))
+   if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgnPath))
    {
       success = ExtSelectClipRgn( hdc, hrgnPath, iMode ) != ERROR;
-      DeleteObject32(hrgnPath);
+      DeleteObject(hrgnPath);
 
       /* Empty the path */
       if(success)
@@ -503,7 +503,7 @@ void PATH_DestroyGdiPath(GdiPath *pPath)
  * not a copy constructor).
  * Returns TRUE if successful, else FALSE.
  */
-BOOL32 PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc)
+BOOL PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc)
 {
    assert(pPathDest!=NULL && pPathSrc!=NULL);
 
@@ -513,9 +513,9 @@ BOOL32 PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc)
 
    /* Perform the copy operation */
    memcpy(pPathDest->pPoints, pPathSrc->pPoints,
-      sizeof(POINT32)*pPathSrc->numEntriesUsed);
+      sizeof(POINT)*pPathSrc->numEntriesUsed);
    memcpy(pPathDest->pFlags, pPathSrc->pFlags,
-      sizeof(INT32)*pPathSrc->numEntriesUsed);
+      sizeof(INT)*pPathSrc->numEntriesUsed);
    pPathDest->state=pPathSrc->state;
    pPathDest->numEntriesUsed=pPathSrc->numEntriesUsed;
    pPathDest->newStroke=pPathSrc->newStroke;
@@ -529,7 +529,7 @@ BOOL32 PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc)
  * open path. This starts a new stroke. Returns TRUE if successful, else
  * FALSE.
  */
-BOOL32 PATH_MoveTo(HDC32 hdc)
+BOOL PATH_MoveTo(HDC hdc)
 {
    GdiPath *pPath;
    
@@ -555,10 +555,10 @@ BOOL32 PATH_MoveTo(HDC32 hdc)
  * a PT_MOVETO entry, if this is the first LineTo in a stroke).
  * Returns TRUE if successful, else FALSE.
  */
-BOOL32 PATH_LineTo(HDC32 hdc, INT32 x, INT32 y)
+BOOL PATH_LineTo(HDC hdc, INT x, INT y)
 {
    GdiPath *pPath;
-   POINT32 point, pointCurPos;
+   POINT point, pointCurPos;
    
    /* Get pointer to path */
    if(!PATH_GetPathFromHDC(hdc, &pPath))
@@ -571,15 +571,15 @@ BOOL32 PATH_LineTo(HDC32 hdc, INT32 x, INT32 y)
    /* Convert point to device coordinates */
    point.x=x;
    point.y=y;
-   if(!LPtoDP32(hdc, &point, 1))
+   if(!LPtoDP(hdc, &point, 1))
       return FALSE;
    
    /* Add a PT_MOVETO if necessary */
    if(pPath->newStroke)
    {
       pPath->newStroke=FALSE;
-      if(!GetCurrentPositionEx32(hdc, &pointCurPos) ||
-         !LPtoDP32(hdc, &pointCurPos, 1))
+      if(!GetCurrentPositionEx(hdc, &pointCurPos) ||
+         !LPtoDP(hdc, &pointCurPos, 1))
          return FALSE;
       if(!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO))
          return FALSE;
@@ -594,11 +594,11 @@ BOOL32 PATH_LineTo(HDC32 hdc, INT32 x, INT32 y)
  * Should be called when a call to Rectangle is performed on a DC that has
  * an open path. Returns TRUE if successful, else FALSE.
  */
-BOOL32 PATH_Rectangle(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2)
+BOOL PATH_Rectangle(HDC hdc, INT x1, INT y1, INT x2, INT y2)
 {
    GdiPath *pPath;
-   POINT32 corners[2], pointTemp;
-   INT32   temp;
+   POINT corners[2], pointTemp;
+   INT   temp;
 
    /* Get pointer to path */
    if(!PATH_GetPathFromHDC(hdc, &pPath))
@@ -613,7 +613,7 @@ BOOL32 PATH_Rectangle(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2)
    corners[0].y=y1;
    corners[1].x=x2;
    corners[1].y=y2;
-   if(!LPtoDP32(hdc, corners, 2))
+   if(!LPtoDP(hdc, corners, 2))
       return FALSE;
    
    /* Make sure first corner is top left and second corner is bottom right */
@@ -638,7 +638,7 @@ BOOL32 PATH_Rectangle(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2)
    }
 
    /* Close any previous figure */
-   if(!CloseFigure32(hdc))
+   if(!CloseFigure(hdc))
    {
       /* The CloseFigure call shouldn't have failed */
       assert(FALSE);
@@ -660,7 +660,7 @@ BOOL32 PATH_Rectangle(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2)
       return FALSE;
 
    /* Close the rectangle figure */
-   if(!CloseFigure32(hdc))
+   if(!CloseFigure(hdc))
    {
       /* The CloseFigure call shouldn't have failed */
       assert(FALSE);
@@ -676,7 +676,7 @@ BOOL32 PATH_Rectangle(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2)
  * an open path. This adds four Bezier splines representing the ellipse
  * to the path. Returns TRUE if successful, else FALSE.
  */
-BOOL32 PATH_Ellipse(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2)
+BOOL PATH_Ellipse(HDC hdc, INT x1, INT y1, INT x2, INT y2)
 {
    /* TODO: This should probably be revised to call PATH_AngleArc */
    /* (once it exists) */
@@ -689,8 +689,8 @@ BOOL32 PATH_Ellipse(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2)
  * an open path. This adds up to five Bezier splines representing the arc
  * to the path. Returns TRUE if successful, else FALSE.
  */
-BOOL32 PATH_Arc(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2,
-   INT32 xStart, INT32 yStart, INT32 xEnd, INT32 yEnd)
+BOOL PATH_Arc(HDC hdc, INT x1, INT y1, INT x2, INT y2,
+   INT xStart, INT yStart, INT xEnd, INT yEnd)
 {
    GdiPath     *pPath;
    DC          *pDC;
@@ -698,8 +698,8 @@ BOOL32 PATH_Arc(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2,
                /* Initialize angleEndQuadrant to silence gcc's warning */
    double      x, y;
    FLOAT_POINT corners[2], pointStart, pointEnd;
-   BOOL32      start, end;
-   INT32       temp;
+   BOOL      start, end;
+   INT       temp;
 
    /* FIXME: This function should check for all possible error returns */
    /* FIXME: Do we have to respect newStroke? */
@@ -759,7 +759,7 @@ BOOL32 PATH_Arc(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2,
    angleEnd=atan2(y, x);
 
    /* Make sure the end angle is "on the right side" of the start angle */
-   if(GetArcDirection32(hdc)==AD_CLOCKWISE)
+   if(GetArcDirection(hdc)==AD_CLOCKWISE)
    {
       if(angleEnd<=angleStart)
       {
@@ -793,7 +793,7 @@ BOOL32 PATH_Arc(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2,
       if(start)
       {
          angleStartQuadrant=angleStart;
-	 if(GetArcDirection32(hdc)==AD_CLOCKWISE)
+	 if(GetArcDirection(hdc)==AD_CLOCKWISE)
 	    angleEndQuadrant=(floor(angleStart/M_PI_2)+1.0)*M_PI_2;
 	 else
 	    angleEndQuadrant=(ceil(angleStart/M_PI_2)-1.0)*M_PI_2;
@@ -801,16 +801,16 @@ BOOL32 PATH_Arc(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2,
       else
       {
 	 angleStartQuadrant=angleEndQuadrant;
-	 if(GetArcDirection32(hdc)==AD_CLOCKWISE)
+	 if(GetArcDirection(hdc)==AD_CLOCKWISE)
 	    angleEndQuadrant+=M_PI_2;
 	 else
 	    angleEndQuadrant-=M_PI_2;
       }
 
       /* Have we reached the last part of the arc? */
-      if((GetArcDirection32(hdc)==AD_CLOCKWISE &&
+      if((GetArcDirection(hdc)==AD_CLOCKWISE &&
          angleEnd<angleEndQuadrant) ||
-	 (GetArcDirection32(hdc)==AD_COUNTERCLOCKWISE &&
+	 (GetArcDirection(hdc)==AD_COUNTERCLOCKWISE &&
 	 angleEnd>angleEndQuadrant))
       {
 	 /* Adjust the end angle for this quadrant */
@@ -839,12 +839,12 @@ BOOL32 PATH_Arc(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2,
  * error occurs, SetLastError is called with the appropriate value and
  * FALSE is returned.
  */
-static BOOL32 PATH_PathToRegion(const GdiPath *pPath, INT32 nPolyFillMode,
-   HRGN32 *pHrgn)
+static BOOL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode,
+   HRGN *pHrgn)
 {
    int    numStrokes, iStroke, i;
-   INT32  *pNumPointsInStroke;
-   HRGN32 hrgn;
+   INT  *pNumPointsInStroke;
+   HRGN hrgn;
 
    assert(pPath!=NULL);
    assert(pHrgn!=NULL);
@@ -881,9 +881,9 @@ static BOOL32 PATH_PathToRegion(const GdiPath *pPath, INT32 nPolyFillMode,
    }
 
    /* Create a region from the strokes */
-   hrgn=CreatePolyPolygonRgn32(pPath->pPoints, pNumPointsInStroke,
+   hrgn=CreatePolyPolygonRgn(pPath->pPoints, pNumPointsInStroke,
       numStrokes, nPolyFillMode);
-   if(hrgn==(HRGN32)0)
+   if(hrgn==(HRGN)0)
    {
       SetLastError(ERROR_NOT_ENOUGH_MEMORY);
       return FALSE;
@@ -915,7 +915,7 @@ static void PATH_EmptyPath(GdiPath *pPath)
  * or PT_BEZIERTO, optionally ORed with PT_CLOSEFIGURE. Returns TRUE if
  * successful, FALSE otherwise (e.g. if not enough memory was available).
  */
-BOOL32 PATH_AddEntry(GdiPath *pPath, const POINT32 *pPoint, BYTE flags)
+BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags)
 {
    assert(pPath!=NULL);
    
@@ -951,10 +951,10 @@ BOOL32 PATH_AddEntry(GdiPath *pPath, const POINT32 *pPoint, BYTE flags)
  * been allocated; allocates larger arrays and copies the existing entries
  * to those arrays, if necessary. Returns TRUE if successful, else FALSE.
  */
-static BOOL32 PATH_ReserveEntries(GdiPath *pPath, INT32 numEntries)
+static BOOL PATH_ReserveEntries(GdiPath *pPath, INT numEntries)
 {
-   INT32   numEntriesToAllocate;
-   POINT32 *pPointsNew;
+   INT   numEntriesToAllocate;
+   POINT *pPointsNew;
    BYTE    *pFlagsNew;
    
    assert(pPath!=NULL);
@@ -977,7 +977,7 @@ static BOOL32 PATH_ReserveEntries(GdiPath *pPath, INT32 numEntries)
          numEntriesToAllocate=NUM_ENTRIES_INITIAL;
 
       /* Allocate new arrays */
-      pPointsNew=(POINT32 *)malloc(numEntriesToAllocate * sizeof(POINT32));
+      pPointsNew=(POINT *)malloc(numEntriesToAllocate * sizeof(POINT));
       if(!pPointsNew)
          return FALSE;
       pFlagsNew=(BYTE *)malloc(numEntriesToAllocate * sizeof(BYTE));
@@ -993,7 +993,7 @@ static BOOL32 PATH_ReserveEntries(GdiPath *pPath, INT32 numEntries)
          assert(pPath->pFlags);
 
 	 memcpy(pPointsNew, pPath->pPoints,
-	     sizeof(POINT32)*pPath->numEntriesUsed);
+	     sizeof(POINT)*pPath->numEntriesUsed);
 	 memcpy(pFlagsNew, pPath->pFlags,
 	     sizeof(BYTE)*pPath->numEntriesUsed);
 
@@ -1013,7 +1013,7 @@ static BOOL32 PATH_ReserveEntries(GdiPath *pPath, INT32 numEntries)
  * Retrieves a pointer to the GdiPath structure contained in an HDC and
  * places it in *ppPath. TRUE is returned if successful, FALSE otherwise.
  */
-static BOOL32 PATH_GetPathFromHDC(HDC32 hdc, GdiPath **ppPath)
+static BOOL PATH_GetPathFromHDC(HDC hdc, GdiPath **ppPath)
 {
    DC *pDC;
 
@@ -1036,12 +1036,12 @@ static BOOL32 PATH_GetPathFromHDC(HDC32 hdc, GdiPath **ppPath)
  * point is added to the path; otherwise, it is assumed that the current
  * position is equal to the first control point.
  */
-static BOOL32 PATH_DoArcPart(GdiPath *pPath, FLOAT_POINT corners[],
-   double angleStart, double angleEnd, BOOL32 addMoveTo)
+static BOOL PATH_DoArcPart(GdiPath *pPath, FLOAT_POINT corners[],
+   double angleStart, double angleEnd, BOOL addMoveTo)
 {
    double  halfAngle, a;
    double  xNorm[4], yNorm[4];
-   POINT32 point;
+   POINT point;
    int     i;
 
    assert(fabs(angleEnd-angleStart)<=M_PI_2);
@@ -1096,7 +1096,7 @@ static BOOL32 PATH_DoArcPart(GdiPath *pPath, FLOAT_POINT corners[],
  * (1.0, 1.0) correspond to corners[1].
  */
 static void PATH_ScaleNormalizedPoint(FLOAT_POINT corners[], double x,
-   double y, POINT32 *pPoint)
+   double y, POINT *pPoint)
 {
    pPoint->x=GDI_ROUND( (double)corners[0].x +
       (double)(corners[1].x-corners[0].x)*0.5*(x+1.0) );
@@ -1124,7 +1124,7 @@ static void PATH_NormalizePoint(FLOAT_POINT corners[],
  *
  *
  */
-BOOL32 WINAPI FlattenPath32(HDC32 hdc)
+BOOL WINAPI FlattenPath(HDC hdc)
 {
         FIXME(gdi, "FlattenPath, stub\n");
         return 0;
@@ -1135,7 +1135,7 @@ BOOL32 WINAPI FlattenPath32(HDC32 hdc)
  *
  *
  */
-BOOL32 WINAPI StrokeAndFillPath32(HDC32 hdc)
+BOOL WINAPI StrokeAndFillPath(HDC hdc)
 {
         FIXME(gdi, "StrokeAndFillPath, stub\n");
         return 0;
@@ -1146,7 +1146,7 @@ BOOL32 WINAPI StrokeAndFillPath32(HDC32 hdc)
  *
  *
  */
-BOOL32 WINAPI StrokePath32(HDC32 hdc)
+BOOL WINAPI StrokePath(HDC hdc)
 {
         FIXME(gdi, "StrokePath, stub\n");
         return 0;
@@ -1157,7 +1157,7 @@ BOOL32 WINAPI StrokePath32(HDC32 hdc)
  *
  *
  */
-BOOL32 WINAPI WidenPath32(HDC32 hdc)
+BOOL WINAPI WidenPath(HDC hdc)
 {
         FIXME(gdi, "WidenPath, stub\n");
         return 0;
diff --git a/graphics/psdrv/afm.c b/graphics/psdrv/afm.c
index a11cd100b09..62024e50696 100644
--- a/graphics/psdrv/afm.c
+++ b/graphics/psdrv/afm.c
@@ -431,7 +431,7 @@ static void PSDRV_DumpFontList(void)
  * Only exported function in this file. Parses all afm files listed in
  * [afmfiles] of wine.conf .
  */
-BOOL32 PSDRV_GetFontMetrics(void)
+BOOL PSDRV_GetFontMetrics(void)
 {
     PROFILE_EnumerateWineIniSection( "afmfiles", PSDRV_afmfilesCallback, NULL);
     PSDRV_DumpFontList();
diff --git a/graphics/psdrv/bitmap.c b/graphics/psdrv/bitmap.c
index 2b8f340f3bc..6cf8e1f9301 100644
--- a/graphics/psdrv/bitmap.c
+++ b/graphics/psdrv/bitmap.c
@@ -14,10 +14,10 @@
  *
  *	PSDRV_StretchDIBits
  */
-INT32 PSDRV_StretchDIBits( DC *dc, INT32 xDst, INT32 yDst, INT32 widthDst,
-			   INT32 heightDst, INT32 xSrc, INT32 ySrc,
-			   INT32 widthSrc, INT32 heightSrc, const void *bits,
-			   const BITMAPINFO *info, UINT32 wUsage, DWORD dwRop )
+INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
+			   INT heightDst, INT xSrc, INT ySrc,
+			   INT widthSrc, INT heightSrc, const void *bits,
+			   const BITMAPINFO *info, UINT wUsage, DWORD dwRop )
 {
     TRACE(psdrv, "(%d,%d %dx%d) -> (%d,%d %dx%d) on %08x. %d colour bits\n",
 	  xSrc, ySrc, widthSrc, heightSrc, xDst, yDst, widthDst, heightDst,
diff --git a/graphics/psdrv/brush.c b/graphics/psdrv/brush.c
index 1b3cd85a963..58c1647bfe9 100644
--- a/graphics/psdrv/brush.c
+++ b/graphics/psdrv/brush.c
@@ -13,9 +13,9 @@
 /***********************************************************************
  *           PSDRV_BRUSH_SelectObject
  */
-HBRUSH32 PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH32 hbrush, BRUSHOBJ * brush )
+HBRUSH PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
 {
-    HBRUSH32 prevbrush = dc->w.hBrush;
+    HBRUSH prevbrush = dc->w.hBrush;
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
 
     TRACE(psdrv, "hbrush = %08x\n", hbrush);
@@ -55,7 +55,7 @@ HBRUSH32 PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH32 hbrush, BRUSHOBJ * brush )
  *	PSDRV_SetBrush
  *
  */
-static BOOL32 PSDRV_SetBrush(DC *dc)
+static BOOL PSDRV_SetBrush(DC *dc)
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     BRUSHOBJ *brush = (BRUSHOBJ *)GDI_GetObjPtr( dc->w.hBrush, BRUSH_MAGIC );
@@ -89,7 +89,7 @@ static BOOL32 PSDRV_SetBrush(DC *dc)
  *	PSDRV_Fill
  *
  */
-static BOOL32 PSDRV_Fill(DC *dc, BOOL32 EO)
+static BOOL PSDRV_Fill(DC *dc, BOOL EO)
 {
     if(!EO)
         return PSDRV_WriteFill(dc);
@@ -103,7 +103,7 @@ static BOOL32 PSDRV_Fill(DC *dc, BOOL32 EO)
  *	PSDRV_Clip
  *
  */
-static BOOL32 PSDRV_Clip(DC *dc, BOOL32 EO)
+static BOOL PSDRV_Clip(DC *dc, BOOL EO)
 {
     if(!EO)
         return PSDRV_WriteClip(dc);
@@ -116,7 +116,7 @@ static BOOL32 PSDRV_Clip(DC *dc, BOOL32 EO)
  *	PSDRV_Brush
  *
  */
-BOOL32 PSDRV_Brush(DC *dc, BOOL32 EO)
+BOOL PSDRV_Brush(DC *dc, BOOL EO)
 {
     BRUSHOBJ *brush = (BRUSHOBJ *)GDI_GetObjPtr( dc->w.hBrush, BRUSH_MAGIC );
 
diff --git a/graphics/psdrv/color.c b/graphics/psdrv/color.c
index 7ceaa99f343..79b7e58f04b 100644
--- a/graphics/psdrv/color.c
+++ b/graphics/psdrv/color.c
@@ -13,7 +13,7 @@
  *
  * Return TRUE if col1 == col2
  */ 
-BOOL32 PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2)
+BOOL PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2)
 {
     if(col1->type != col2->type)
         return FALSE;
@@ -41,7 +41,7 @@ BOOL32 PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2)
  *
  * Copies col2 into col1. Return FALSE on error.
  */ 
-BOOL32 PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2)
+BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2)
 {
 
     switch(col2->type) {
diff --git a/graphics/psdrv/driver.c b/graphics/psdrv/driver.c
index 2b3b70357b8..bb8a7e7d97a 100644
--- a/graphics/psdrv/driver.c
+++ b/graphics/psdrv/driver.c
@@ -84,23 +84,23 @@ void PSDRV_MergeDevmodes(PSDRV_DEVMODE16 *dm1, PSDRV_DEVMODE16 *dm2,
  *
  *
  */
-LRESULT WINAPI PSDRV_NewPrinterDlgProc32(HWND32 hWnd, UINT32 wMsg,
-					    WPARAM32 wParam, LPARAM lParam)
+LRESULT WINAPI PSDRV_NewPrinterDlgProc(HWND hWnd, UINT wMsg,
+					    WPARAM wParam, LPARAM lParam)
 {
   switch (wMsg) {
   case WM_INITDIALOG:
     TRACE(psdrv,"WM_INITDIALOG lParam=%08lX\n", lParam);
-    ShowWindow32(hWnd, SW_SHOWNORMAL);
+    ShowWindow(hWnd, SW_SHOWNORMAL);
     return TRUE;
  
   case WM_COMMAND:
     switch (LOWORD(wParam)) {
     case IDOK:
-      EndDialog32(hWnd, TRUE);
+      EndDialog(hWnd, TRUE);
       return TRUE;
   
     case IDCANCEL:
-      EndDialog32(hWnd, FALSE);
+      EndDialog(hWnd, FALSE);
       return TRUE;
     
     default:
@@ -112,31 +112,31 @@ LRESULT WINAPI PSDRV_NewPrinterDlgProc32(HWND32 hWnd, UINT32 wMsg,
   }
 }
 
-LRESULT WINAPI PSDRV_AdvancedSetupDlgProc32(HWND32 hWnd, UINT32 wMsg,
-					    WPARAM32 wParam, LPARAM lParam)
+LRESULT WINAPI PSDRV_AdvancedSetupDlgProc(HWND hWnd, UINT wMsg,
+					    WPARAM wParam, LPARAM lParam)
 {
   switch (wMsg) {
   case WM_INITDIALOG:
     TRACE(psdrv,"WM_INITDIALOG lParam=%08lX\n", lParam);
-    SendDlgItemMessage32A(hWnd, 99, CB_ADDSTRING32, 0, 
+    SendDlgItemMessageA(hWnd, 99, CB_ADDSTRING, 0, 
 			  (LPARAM)"Default Tray");
-    ShowWindow32(hWnd, SW_SHOWNORMAL);
+    ShowWindow(hWnd, SW_SHOWNORMAL);
     return TRUE;
 
   case WM_COMMAND:
     switch (LOWORD(wParam)) {
     case IDOK:
-      EndDialog32(hWnd, TRUE);
+      EndDialog(hWnd, TRUE);
       return TRUE;
 
     case IDCANCEL:
-      EndDialog32(hWnd, FALSE);
+      EndDialog(hWnd, FALSE);
       return TRUE;
 
     case 200:
-      DialogBoxIndirectParam32A( WIN_GetWindowInstance( hWnd ),
+      DialogBoxIndirectParamA( WIN_GetWindowInstance( hWnd ),
 			  SYSRES_GetResPtr( SYSRES_DIALOG_PSDRV_NEWPRINTER ),
-			  hWnd, PSDRV_NewPrinterDlgProc32, (LPARAM) NULL );
+			  hWnd, PSDRV_NewPrinterDlgProc, (LPARAM) NULL );
       return TRUE;
 
     default:
@@ -164,9 +164,9 @@ WORD WINAPI PSDRV_AdvancedSetupDialog16(HWND16 hwnd, HANDLE16 hDriver,
 
 
 #if 0
-  return DialogBoxIndirectParam32A( WIN_GetWindowInstance( hwnd ),
+  return DialogBoxIndirectParamA( WIN_GetWindowInstance( hwnd ),
 	SYSRES_GetResPtr( SYSRES_DIALOG_PSDRV_ADVANCEDSETUP ),
-	hwnd, PSDRV_AdvancedSetupDlgProc32, (LPARAM) NULL );
+	hwnd, PSDRV_AdvancedSetupDlgProc, (LPARAM) NULL );
 #endif
 
 
diff --git a/graphics/psdrv/escape.c b/graphics/psdrv/escape.c
index e2423ff0474..1807192dad1 100644
--- a/graphics/psdrv/escape.c
+++ b/graphics/psdrv/escape.c
@@ -9,7 +9,7 @@
 #include "winspool.h"
 
 
-INT32 PSDRV_Escape( DC *dc, INT32 nEscape, INT32 cbInput, 
+INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput, 
                               SEGPTR lpInData, SEGPTR lpOutData )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
@@ -51,7 +51,7 @@ INT32 PSDRV_Escape( DC *dc, INT32 nEscape, INT32 cbInput,
 	    return 0;
 	}
 
-	physDev->job.hJob = OpenJob(physDev->job.output,
+	physDev->job.hJob = OpenJob16(physDev->job.output,
 				    PTR_SEG_TO_LIN(lpInData), dc->hSelf);
 	if(!physDev->job.hJob) {
 	    WARN(psdrv, "OpenJob failed\n");
@@ -121,7 +121,7 @@ INT32 PSDRV_Escape( DC *dc, INT32 nEscape, INT32 cbInput,
 	if(!PSDRV_WriteFooter( dc ))
 	    return 0;
 
-        if( CloseJob( physDev->job.hJob ) == SP_ERROR ) {
+        if( CloseJob16( physDev->job.hJob ) == SP_ERROR ) {
 	    WARN(psdrv, "CloseJob error\n");
 	    return 0;
 	}
diff --git a/graphics/psdrv/font.c b/graphics/psdrv/font.c
index dc471c0643b..61830f76cc6 100644
--- a/graphics/psdrv/font.c
+++ b/graphics/psdrv/font.c
@@ -20,7 +20,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
     HFONT16 prevfont = dc->w.hFont;
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     LOGFONT16 *lf = &(font->logfont);
-    BOOL32 bd = FALSE, it = FALSE;
+    BOOL bd = FALSE, it = FALSE;
     AFMLISTENTRY *afmle;
     AFM *afm;
     FONTFAMILY *family;
@@ -143,7 +143,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
 /***********************************************************************
  *           PSDRV_GetTextMetrics
  */
-BOOL32 PSDRV_GetTextMetrics(DC *dc, TEXTMETRIC32A *metrics)
+BOOL PSDRV_GetTextMetrics(DC *dc, TEXTMETRICA *metrics)
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
 
@@ -155,11 +155,11 @@ BOOL32 PSDRV_GetTextMetrics(DC *dc, TEXTMETRIC32A *metrics)
 /***********************************************************************
  *           PSDRV_GetTextExtentPoint
  */
-BOOL32 PSDRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT32 count,
-                                  LPSIZE32 size )
+BOOL PSDRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
+                                  LPSIZE size )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
-    INT32 i;
+    INT i;
     float width;
 
     size->cy = YDSTOLS(dc, physDev->font.tm.tmHeight);
@@ -180,11 +180,11 @@ BOOL32 PSDRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT32 count,
 /***********************************************************************
  *           PSDRV_GetCharWidth
  */
-BOOL32 PSDRV_GetCharWidth( DC *dc, UINT32 firstChar, UINT32 lastChar,
-			   LPINT32 buffer )
+BOOL PSDRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
+			   LPINT buffer )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
-    UINT32 i;
+    UINT i;
 
     TRACE(psdrv, "first = %d last = %d\n", firstChar, lastChar);
 
@@ -198,10 +198,10 @@ BOOL32 PSDRV_GetCharWidth( DC *dc, UINT32 firstChar, UINT32 lastChar,
 /***********************************************************************
  *           PSDRV_SetFont
  */
-BOOL32 PSDRV_SetFont( DC *dc )
+BOOL PSDRV_SetFont( DC *dc )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
-    BOOL32 ReEncode = FALSE;
+    BOOL ReEncode = FALSE;
 
     PSDRV_WriteSetColor(dc, &physDev->font.color);
     if(physDev->font.set) return TRUE;
@@ -220,7 +220,7 @@ BOOL32 PSDRV_SetFont( DC *dc )
 /***********************************************************************
  *           PSDRV_GetFontMetric
  */
-static UINT32 PSDRV_GetFontMetric(DC *dc, AFM *pafm, NEWTEXTMETRIC16 *pTM, 
+static UINT PSDRV_GetFontMetric(DC *dc, AFM *pafm, NEWTEXTMETRIC16 *pTM, 
               ENUMLOGFONTEX16 *pLF, INT16 size)
 
 {
@@ -253,7 +253,7 @@ static UINT32 PSDRV_GetFontMetric(DC *dc, AFM *pafm, NEWTEXTMETRIC16 *pTM,
     pTM->tmDigitizedAspectX = dc->w.devCaps->logPixelsY;
     pTM->tmDigitizedAspectY = dc->w.devCaps->logPixelsX;
 
-    *(INT32*)&pTM->tmFirstChar = 32;
+    *(INT*)&pTM->tmFirstChar = 32;
 
     /* return font type */
 
@@ -264,12 +264,12 @@ static UINT32 PSDRV_GetFontMetric(DC *dc, AFM *pafm, NEWTEXTMETRIC16 *pTM,
 /***********************************************************************
  *           PSDRV_EnumDeviceFonts
  */
-BOOL32 PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
+BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
 				        DEVICEFONTENUMPROC proc, LPARAM lp )
 {
     ENUMLOGFONTEX16	lf;
     NEWTEXTMETRIC16	tm;
-    BOOL32	  	b, bRet = 0;
+    BOOL	  	b, bRet = 0;
     AFMLISTENTRY	*afmle;
     FONTFAMILY		*family;
     PSDRV_PDEVICE	*physDev = (PSDRV_PDEVICE *)dc->physDev;
diff --git a/graphics/psdrv/graphics.c b/graphics/psdrv/graphics.c
index 836362934d9..97d3bc7ad28 100644
--- a/graphics/psdrv/graphics.c
+++ b/graphics/psdrv/graphics.c
@@ -16,7 +16,7 @@
 /**********************************************************************
  *	     PSDRV_MoveToEx
  */
-BOOL32 PSDRV_MoveToEx(DC *dc, INT32 x, INT32 y, LPPOINT32 pt)
+BOOL PSDRV_MoveToEx(DC *dc, INT x, INT y, LPPOINT pt)
 {
     TRACE(psdrv, "%d %d\n", x, y);
     if (pt)
@@ -34,7 +34,7 @@ BOOL32 PSDRV_MoveToEx(DC *dc, INT32 x, INT32 y, LPPOINT32 pt)
 /***********************************************************************
  *           PSDRV_LineTo
  */
-BOOL32 PSDRV_LineTo(DC *dc, INT32 x, INT32 y)
+BOOL PSDRV_LineTo(DC *dc, INT x, INT y)
 {
     TRACE(psdrv, "%d %d\n", x, y);
 
@@ -53,11 +53,11 @@ BOOL32 PSDRV_LineTo(DC *dc, INT32 x, INT32 y)
 /***********************************************************************
  *           PSDRV_Rectangle
  */
-BOOL32 PSDRV_Rectangle( DC *dc, INT32 left, INT32 top, INT32 right,
-		       INT32 bottom )
+BOOL PSDRV_Rectangle( DC *dc, INT left, INT top, INT right,
+		       INT bottom )
 {
-    INT32 width = XLSTODS(dc, right - left);
-    INT32 height = YLSTODS(dc, bottom - top);
+    INT width = XLSTODS(dc, right - left);
+    INT height = YLSTODS(dc, bottom - top);
 
 
     TRACE(psdrv, "%d %d - %d %d\n", left, top, right, bottom);
@@ -75,8 +75,8 @@ BOOL32 PSDRV_Rectangle( DC *dc, INT32 left, INT32 top, INT32 right,
 /***********************************************************************
  *           PSDRV_RoundRect
  */
-BOOL32 PSDRV_RoundRect( DC *dc, INT32 left, INT32 top, INT32 right,
-			INT32 bottom, INT32 ell_width, INT32 ell_height )
+BOOL PSDRV_RoundRect( DC *dc, INT left, INT top, INT right,
+			INT bottom, INT ell_width, INT ell_height )
 {
     left = XLPTODP( dc, left );
     right = XLPTODP( dc, right );
@@ -85,8 +85,8 @@ BOOL32 PSDRV_RoundRect( DC *dc, INT32 left, INT32 top, INT32 right,
     ell_width = XLSTODS( dc, ell_width );
     ell_height = YLSTODS( dc, ell_height );
 
-    if( left > right ) { INT32 tmp = left; left = right; right = tmp; }
-    if( top > bottom ) { INT32 tmp = top; top = bottom; bottom = tmp; }
+    if( left > right ) { INT tmp = left; left = right; right = tmp; }
+    if( top > bottom ) { INT tmp = top; top = bottom; bottom = tmp; }
 
     if(ell_width > right - left) ell_width = right - left;
     if(ell_height > bottom - top) ell_height = bottom - top;
@@ -116,13 +116,13 @@ BOOL32 PSDRV_RoundRect( DC *dc, INT32 left, INT32 top, INT32 right,
  *
  * Does the work of Arc, Chord and Pie. lines is 0, 1 or 2 respectively.
  */
-static BOOL32 PSDRV_DrawArc( DC *dc, INT32 left, INT32 top, 
-			     INT32 right, INT32 bottom,
-			     INT32 xstart, INT32 ystart,
-			     INT32 xend, INT32 yend,
+static BOOL PSDRV_DrawArc( DC *dc, INT left, INT top, 
+			     INT right, INT bottom,
+			     INT xstart, INT ystart,
+			     INT xend, INT yend,
 			     int lines )
 {
-    INT32 x, y, h, w;
+    INT x, y, h, w;
     double start_angle, end_angle, ratio;
 
     x = XLPTODP(dc, (left + right)/2);
@@ -160,8 +160,8 @@ static BOOL32 PSDRV_DrawArc( DC *dc, INT32 left, INT32 top,
 /***********************************************************************
  *           PSDRV_Arc
  */
-BOOL32 PSDRV_Arc( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
-		  INT32 xstart, INT32 ystart, INT32 xend, INT32 yend )
+BOOL PSDRV_Arc( DC *dc, INT left, INT top, INT right, INT bottom,
+		  INT xstart, INT ystart, INT xend, INT yend )
 {
     return PSDRV_DrawArc( dc, left, top, right, bottom, xstart, ystart,
 			 xend, yend, 0 );
@@ -170,8 +170,8 @@ BOOL32 PSDRV_Arc( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
 /***********************************************************************
  *           PSDRV_Chord
  */
-BOOL32 PSDRV_Chord( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
-		  INT32 xstart, INT32 ystart, INT32 xend, INT32 yend )
+BOOL PSDRV_Chord( DC *dc, INT left, INT top, INT right, INT bottom,
+		  INT xstart, INT ystart, INT xend, INT yend )
 {
     return PSDRV_DrawArc( dc, left, top, right, bottom, xstart, ystart,
 			 xend, yend, 1 );
@@ -181,8 +181,8 @@ BOOL32 PSDRV_Chord( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
 /***********************************************************************
  *           PSDRV_Pie
  */
-BOOL32 PSDRV_Pie( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
-		  INT32 xstart, INT32 ystart, INT32 xend, INT32 yend )
+BOOL PSDRV_Pie( DC *dc, INT left, INT top, INT right, INT bottom,
+		  INT xstart, INT ystart, INT xend, INT yend )
 {
     return PSDRV_DrawArc( dc, left, top, right, bottom, xstart, ystart,
 			 xend, yend, 2 );
@@ -192,9 +192,9 @@ BOOL32 PSDRV_Pie( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
 /***********************************************************************
  *           PSDRV_Ellipse
  */
-BOOL32 PSDRV_Ellipse( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
+BOOL PSDRV_Ellipse( DC *dc, INT left, INT top, INT right, INT bottom)
 {
-    INT32 x, y, w, h;
+    INT x, y, w, h;
 
     TRACE(psdrv, "%d %d - %d %d\n", left, top, right, bottom);
 
@@ -216,11 +216,11 @@ BOOL32 PSDRV_Ellipse( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
 /***********************************************************************
  *           PSDRV_PolyPolyline
  */
-BOOL32 PSDRV_PolyPolyline( DC *dc, const POINT32* pts, const DWORD* counts,
+BOOL PSDRV_PolyPolyline( DC *dc, const POINT* pts, const DWORD* counts,
 			   DWORD polylines )
 {
     DWORD polyline, line;
-    const POINT32* pt;
+    const POINT* pt;
     TRACE(psdrv, "\n");
 
     pt = pts;
@@ -241,7 +241,7 @@ BOOL32 PSDRV_PolyPolyline( DC *dc, const POINT32* pts, const DWORD* counts,
 /***********************************************************************
  *           PSDRV_Polyline
  */
-BOOL32 PSDRV_Polyline( DC *dc, const POINT32* pt, INT32 count )
+BOOL PSDRV_Polyline( DC *dc, const POINT* pt, INT count )
 {
     return PSDRV_PolyPolyline( dc, pt, (LPDWORD) &count, 1 );
 }
@@ -250,11 +250,11 @@ BOOL32 PSDRV_Polyline( DC *dc, const POINT32* pt, INT32 count )
 /***********************************************************************
  *           PSDRV_PolyPolygon
  */
-BOOL32 PSDRV_PolyPolygon( DC *dc, const POINT32* pts, const INT32* counts,
-			  UINT32 polygons )
+BOOL PSDRV_PolyPolygon( DC *dc, const POINT* pts, const INT* counts,
+			  UINT polygons )
 {
     DWORD polygon, line;
-    const POINT32* pt;
+    const POINT* pt;
     TRACE(psdrv, "\n");
 
     pt = pts;
@@ -281,7 +281,7 @@ BOOL32 PSDRV_PolyPolygon( DC *dc, const POINT32* pts, const INT32* counts,
 /***********************************************************************
  *           PSDRV_Polygon
  */
-BOOL32 PSDRV_Polygon( DC *dc, const POINT32* pt, INT32 count )
+BOOL PSDRV_Polygon( DC *dc, const POINT* pt, INT count )
 {
      return PSDRV_PolyPolygon( dc, pt, &count, 1 );
 }
@@ -290,7 +290,7 @@ BOOL32 PSDRV_Polygon( DC *dc, const POINT32* pt, INT32 count )
 /***********************************************************************
  *           PSDRV_SetPixel
  */
-COLORREF PSDRV_SetPixel( DC *dc, INT32 x, INT32 y, COLORREF color )
+COLORREF PSDRV_SetPixel( DC *dc, INT x, INT y, COLORREF color )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     PSCOLOR pscolor;
diff --git a/graphics/psdrv/init.c b/graphics/psdrv/init.c
index 957709b2e4d..aa4cac755a7 100644
--- a/graphics/psdrv/init.c
+++ b/graphics/psdrv/init.c
@@ -14,9 +14,9 @@
 #include "winspool.h"
 #include "winerror.h"
 
-static BOOL32 PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
+static BOOL PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
                                LPCSTR output, const DEVMODE16* initData );
-static BOOL32 PSDRV_DeleteDC( DC *dc );
+static BOOL PSDRV_DeleteDC( DC *dc );
 
 static const DC_FUNCTIONS PSDRV_Funcs =
 {
@@ -170,10 +170,10 @@ static PSDRV_DEVMODE16 DefaultDevmode =
   }
 };
 
-HANDLE32 PSDRV_Heap = 0;
+HANDLE PSDRV_Heap = 0;
 
-static HANDLE32 PSDRV_DefaultFont = 0;
-static LOGFONT32A DefaultLogFont = {
+static HANDLE PSDRV_DefaultFont = 0;
+static LOGFONTA DefaultLogFont = {
     100, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0,
     DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, ""
 };
@@ -184,19 +184,19 @@ static LOGFONT32A DefaultLogFont = {
  * Initializes font metrics and registers driver. Called from GDI_Init()
  *
  */
-BOOL32 PSDRV_Init(void)
+BOOL PSDRV_Init(void)
 {
     TRACE(psdrv, "\n");
     PSDRV_Heap = HeapCreate(0, 0x10000, 0);
     PSDRV_GetFontMetrics();
-    PSDRV_DefaultFont = CreateFontIndirect32A(&DefaultLogFont);
+    PSDRV_DefaultFont = CreateFontIndirectA(&DefaultLogFont);
     return DRIVER_RegisterDriver( "WINEPS", &PSDRV_Funcs );
 }
 
 /**********************************************************************
  *	     PSDRV_CreateDC
  */
-static BOOL32 PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
+static BOOL PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
                                LPCSTR output, const DEVMODE16* initData )
 {
     PSDRV_PDEVICE *physDev;
@@ -268,7 +268,7 @@ static BOOL32 PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
 
     dc->w.devCaps = devCaps;
 
-    dc->w.hVisRgn = CreateRectRgn32(0, 0, dc->w.devCaps->horzRes,
+    dc->w.hVisRgn = CreateRectRgn(0, 0, dc->w.devCaps->horzRes,
     			    dc->w.devCaps->vertRes);
     
     dc->w.hFont = PSDRV_DefaultFont;
@@ -281,7 +281,7 @@ static BOOL32 PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
 /**********************************************************************
  *	     PSDRV_DeleteDC
  */
-static BOOL32 PSDRV_DeleteDC( DC *dc )
+static BOOL PSDRV_DeleteDC( DC *dc )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     
@@ -319,19 +319,19 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name)
 
     pi = *last = HeapAlloc( PSDRV_Heap, 0, sizeof(*pi) );
     pi->FriendlyName = HEAP_strdupA( PSDRV_Heap, 0, name );
-    res = DrvGetPrinterData((LPSTR)name, (LPSTR)INT_PD_DEFAULT_DEVMODE, &type,
+    res = DrvGetPrinterData16((LPSTR)name, (LPSTR)INT_PD_DEFAULT_DEVMODE, &type,
 			    NULL, 0, &needed );
 
     if(res == ERROR_INVALID_PRINTER_NAME) {
         pi->Devmode = HeapAlloc( PSDRV_Heap, 0, sizeof(DefaultDevmode) );
 	memcpy(pi->Devmode, &DefaultDevmode, sizeof(DefaultDevmode) );
-	DrvSetPrinterData((LPSTR)name, (LPSTR)INT_PD_DEFAULT_DEVMODE,
+	DrvSetPrinterData16((LPSTR)name, (LPSTR)INT_PD_DEFAULT_DEVMODE,
 		 REG_BINARY, (LPBYTE)&DefaultDevmode, sizeof(DefaultDevmode) );
 
 	/* need to do something here AddPrinter?? */
     } else {
         pi->Devmode = HeapAlloc( PSDRV_Heap, 0, needed );
-	DrvGetPrinterData((LPSTR)name, (LPSTR)INT_PD_DEFAULT_DEVMODE, &type,
+	DrvGetPrinterData16((LPSTR)name, (LPSTR)INT_PD_DEFAULT_DEVMODE, &type,
 			  (LPBYTE)pi->Devmode, needed, &needed);
     }
 
diff --git a/graphics/psdrv/objects.c b/graphics/psdrv/objects.c
index 1c85773ac76..143caaefa2d 100644
--- a/graphics/psdrv/objects.c
+++ b/graphics/psdrv/objects.c
@@ -26,10 +26,10 @@ static HBITMAP16 PSDRV_BITMAP_SelectObject( DC * dc, HBITMAP16 hbitmap,
 /***********************************************************************
  *           PSDRV_SelectObject
  */
-HGDIOBJ32 PSDRV_SelectObject( DC *dc, HGDIOBJ32 handle )
+HGDIOBJ PSDRV_SelectObject( DC *dc, HGDIOBJ handle )
 {
     GDIOBJHDR * ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE );
-    HGDIOBJ32 ret = 0;
+    HGDIOBJ ret = 0;
 
     if (!ptr) return 0;
     TRACE(psdrv, "hdc=%04x %04x\n", dc->hSelf, handle );
diff --git a/graphics/psdrv/pen.c b/graphics/psdrv/pen.c
index e0186459297..c10ac335517 100644
--- a/graphics/psdrv/pen.c
+++ b/graphics/psdrv/pen.c
@@ -18,9 +18,9 @@ static char PEN_alternate[]  = "1";
 /***********************************************************************
  *           PSDRV_PEN_SelectObject
  */
-extern HPEN32 PSDRV_PEN_SelectObject( DC * dc, HPEN32 hpen, PENOBJ * pen )
+extern HPEN PSDRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
 {
-    HPEN32 prevpen = dc->w.hPen;
+    HPEN prevpen = dc->w.hPen;
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
 
     TRACE(psdrv, "hpen = %08x colour = %08lx\n", hpen, pen->logpen.lopnColor);
@@ -72,7 +72,7 @@ extern HPEN32 PSDRV_PEN_SelectObject( DC * dc, HPEN32 hpen, PENOBJ * pen )
  *	PSDRV_SetPen
  *
  */
-BOOL32 PSDRV_SetPen(DC *dc)
+BOOL PSDRV_SetPen(DC *dc)
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
 
diff --git a/graphics/psdrv/ppd.c b/graphics/psdrv/ppd.c
index fbc32d27df1..84ce9e5bf37 100644
--- a/graphics/psdrv/ppd.c
+++ b/graphics/psdrv/ppd.c
@@ -64,7 +64,7 @@ static struct {
 static char *PSDRV_PPDDecodeHex(char *str)
 {
     char *buf, *in, *out;
-    BOOL32 inhex = FALSE;
+    BOOL inhex = FALSE;
 
     buf = HeapAlloc(PSDRV_Heap, 0, strlen(str) + 1);
     if(!buf)
@@ -112,7 +112,7 @@ static char *PSDRV_PPDDecodeHex(char *str)
  *		PSDRV_PPDGetTransValue
  *
  */
-static BOOL32 PSDRV_PPDGetTransValue(char *start, PPDTuple *tuple)
+static BOOL PSDRV_PPDGetTransValue(char *start, PPDTuple *tuple)
 {
     char *buf, *end;
 
@@ -135,7 +135,7 @@ static BOOL32 PSDRV_PPDGetTransValue(char *start, PPDTuple *tuple)
  * Passed string that should be surrounded by `"'s, return string alloced
  * from process heap.
  */
-static BOOL32 PSDRV_PPDGetInvocationValue(FILE *fp, char *pos, PPDTuple *tuple)
+static BOOL PSDRV_PPDGetInvocationValue(FILE *fp, char *pos, PPDTuple *tuple)
 {
     char *start, *end, *buf;
     char line[257];
@@ -177,7 +177,7 @@ static BOOL32 PSDRV_PPDGetInvocationValue(FILE *fp, char *pos, PPDTuple *tuple)
  * Passed string that should be surrounded by `"'s. Expand <xx> as hex
  * return string alloced from process heap.
  */
-static BOOL32 PSDRV_PPDGetQuotedValue(FILE *fp, char *pos, PPDTuple *tuple)
+static BOOL PSDRV_PPDGetQuotedValue(FILE *fp, char *pos, PPDTuple *tuple)
 {
     char *buf;
 
@@ -196,7 +196,7 @@ static BOOL32 PSDRV_PPDGetQuotedValue(FILE *fp, char *pos, PPDTuple *tuple)
  *
  * Just strip leading white space.
  */
-static BOOL32 PSDRV_PPDGetStringValue(char *str, PPDTuple *tuple)
+static BOOL PSDRV_PPDGetStringValue(char *str, PPDTuple *tuple)
 {
     char *start = str, *end;
 
@@ -220,7 +220,7 @@ static BOOL32 PSDRV_PPDGetStringValue(char *str, PPDTuple *tuple)
  *
  * Not implemented yet.
  */
-static BOOL32 PSDRV_PPDGetSymbolValue(char *pos, PPDTuple *tuple)
+static BOOL PSDRV_PPDGetSymbolValue(char *pos, PPDTuple *tuple)
 {
     FIXME(psdrv, "Stub\n");
     return FALSE;
@@ -234,10 +234,10 @@ static BOOL32 PSDRV_PPDGetSymbolValue(char *pos, PPDTuple *tuple)
  * Gets the next Keyword Option Value tuple from the file. Allocs space off
  * the process heap which should be free()ed by the caller if not needed.
  */
-static BOOL32 PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple)
+static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple)
 {
     char line[257], *opt = NULL, *cp, *trans;
-    BOOL32 gotoption = TRUE;
+    BOOL gotoption = TRUE;
 
     memset(tuple, 0, sizeof(*tuple));
 
diff --git a/graphics/psdrv/ps.c b/graphics/psdrv/ps.c
index 3b73498d6f4..b8d9ba27c92 100644
--- a/graphics/psdrv/ps.c
+++ b/graphics/psdrv/ps.c
@@ -236,11 +236,11 @@ int PSDRV_WriteSpool(DC *dc, LPSTR lpData, WORD cch)
 	    return FALSE;
 	physDev->job.NeedPageHeader = FALSE;
     }
-    return WriteSpool( physDev->job.hJob, lpData, cch );
+    return WriteSpool16( physDev->job.hJob, lpData, cch );
 }
 
 
-INT32 PSDRV_WriteFeature(HANDLE16 hJob, char *feature, char *value,
+INT PSDRV_WriteFeature(HANDLE16 hJob, char *feature, char *value,
 			 char *invocation)
 {
 
@@ -249,11 +249,11 @@ INT32 PSDRV_WriteFeature(HANDLE16 hJob, char *feature, char *value,
 
 
     sprintf(buf, psbeginfeature, feature, value);
-    WriteSpool( hJob, buf, strlen(buf) );
+    WriteSpool16( hJob, buf, strlen(buf) );
 
-    WriteSpool( hJob, invocation, strlen(invocation) );
+    WriteSpool16( hJob, invocation, strlen(invocation) );
 
-    WriteSpool( hJob, psendfeature, strlen(psendfeature) );
+    WriteSpool16( hJob, psendfeature, strlen(psendfeature) );
     
     HeapFree( PSDRV_Heap, 0, buf );
     return 1;
@@ -261,7 +261,7 @@ INT32 PSDRV_WriteFeature(HANDLE16 hJob, char *feature, char *value,
 
 
 
-INT32 PSDRV_WriteHeader( DC *dc, char *title, int len )
+INT PSDRV_WriteHeader( DC *dc, char *title, int len )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     char *buf, *titlebuf, *orient, vectbuf[256];
@@ -300,7 +300,7 @@ INT32 PSDRV_WriteHeader( DC *dc, char *title, int len )
 
     sprintf(buf, psheader, title, 0, 0, urx, ury, orient);		
 
-    if( WriteSpool( physDev->job.hJob, buf, strlen(buf) ) != 
+    if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != 
 	                                             strlen(buf) ) {
         WARN(psdrv, "WriteSpool error\n");
 	HeapFree( PSDRV_Heap, 0, titlebuf );
@@ -310,8 +310,8 @@ INT32 PSDRV_WriteHeader( DC *dc, char *title, int len )
     HeapFree( PSDRV_Heap, 0, titlebuf );
     HeapFree( PSDRV_Heap, 0, buf );
 
-    WriteSpool( physDev->job.hJob, psbeginprolog, strlen(psbeginprolog) );
-    WriteSpool( physDev->job.hJob, psvectorstart, strlen(psvectorstart) );
+    WriteSpool16( physDev->job.hJob, psbeginprolog, strlen(psbeginprolog) );
+    WriteSpool16( physDev->job.hJob, psvectorstart, strlen(psvectorstart) );
     
     for(i = 0; i < 256; i += 8) {
         vectbuf[0] = '\0';
@@ -325,15 +325,15 @@ INT32 PSDRV_WriteHeader( DC *dc, char *title, int len )
 	    }
 	}
 	strcat(vectbuf, "\n");
-	WriteSpool( physDev->job.hJob, vectbuf, strlen(vectbuf) );
+	WriteSpool16( physDev->job.hJob, vectbuf, strlen(vectbuf) );
     }
 
-    WriteSpool( physDev->job.hJob, psvectorend, strlen(psvectorend) );
-    WriteSpool( physDev->job.hJob, psprolog, strlen(psprolog) );
-    WriteSpool( physDev->job.hJob, psendprolog, strlen(psendprolog) );
+    WriteSpool16( physDev->job.hJob, psvectorend, strlen(psvectorend) );
+    WriteSpool16( physDev->job.hJob, psprolog, strlen(psprolog) );
+    WriteSpool16( physDev->job.hJob, psendprolog, strlen(psendprolog) );
 
 
-    WriteSpool( physDev->job.hJob, psbeginsetup, strlen(psbeginsetup) );
+    WriteSpool16( physDev->job.hJob, psbeginsetup, strlen(psbeginsetup) );
 
     for(slot = physDev->pi->ppd->InputSlots; slot; slot = slot->next) {
         if(slot->WinBin == physDev->Devmode->dmPublic.dmDefaultSource) {
@@ -355,14 +355,14 @@ INT32 PSDRV_WriteHeader( DC *dc, char *title, int len )
 	}
     }
 
-    WriteSpool( physDev->job.hJob, psendsetup, strlen(psendsetup) );
+    WriteSpool16( physDev->job.hJob, psendsetup, strlen(psendsetup) );
 
 
     return 1;
 }
 
 
-INT32 PSDRV_WriteFooter( DC *dc )
+INT PSDRV_WriteFooter( DC *dc )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     char *buf;
@@ -375,7 +375,7 @@ INT32 PSDRV_WriteFooter( DC *dc )
 
     sprintf(buf, psfooter, physDev->job.PageNo);
 
-    if( WriteSpool( physDev->job.hJob, buf, strlen(buf) ) != 
+    if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != 
 	                                             strlen(buf) ) {
         WARN(psdrv, "WriteSpool error\n");
 	HeapFree( PSDRV_Heap, 0, buf );
@@ -387,11 +387,11 @@ INT32 PSDRV_WriteFooter( DC *dc )
 
 
 
-INT32 PSDRV_WriteEndPage( DC *dc )
+INT PSDRV_WriteEndPage( DC *dc )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
 
-    if( WriteSpool( physDev->job.hJob, psendpage, sizeof(psendpage)-1 ) != 
+    if( WriteSpool16( physDev->job.hJob, psendpage, sizeof(psendpage)-1 ) != 
 	                                             sizeof(psendpage)-1 ) {
         WARN(psdrv, "WriteSpool error\n");
 	return 0;
@@ -402,7 +402,7 @@ INT32 PSDRV_WriteEndPage( DC *dc )
 
 
 
-INT32 PSDRV_WriteNewPage( DC *dc )
+INT PSDRV_WriteNewPage( DC *dc )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     char *buf;
@@ -436,7 +436,7 @@ INT32 PSDRV_WriteNewPage( DC *dc )
 	    dc->w.devCaps->logPixelsX, dc->w.devCaps->logPixelsY,
 	    xtrans, ytrans, rotation);
 
-    if( WriteSpool( physDev->job.hJob, buf, strlen(buf) ) != 
+    if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != 
 	                                             strlen(buf) ) {
         WARN(psdrv, "WriteSpool error\n");
 	HeapFree( PSDRV_Heap, 0, buf );
@@ -447,7 +447,7 @@ INT32 PSDRV_WriteNewPage( DC *dc )
 }
 
 
-BOOL32 PSDRV_WriteMoveTo(DC *dc, INT32 x, INT32 y)
+BOOL PSDRV_WriteMoveTo(DC *dc, INT x, INT y)
 {
     char buf[100];
 
@@ -455,7 +455,7 @@ BOOL32 PSDRV_WriteMoveTo(DC *dc, INT32 x, INT32 y)
     return PSDRV_WriteSpool(dc, buf, strlen(buf));
 }
 
-BOOL32 PSDRV_WriteLineTo(DC *dc, INT32 x, INT32 y)
+BOOL PSDRV_WriteLineTo(DC *dc, INT x, INT y)
 {
     char buf[100];
 
@@ -464,15 +464,15 @@ BOOL32 PSDRV_WriteLineTo(DC *dc, INT32 x, INT32 y)
 }
 
 
-BOOL32 PSDRV_WriteStroke(DC *dc)
+BOOL PSDRV_WriteStroke(DC *dc)
 {
     return PSDRV_WriteSpool(dc, psstroke, sizeof(psstroke)-1);
 }
 
 
 
-BOOL32 PSDRV_WriteRectangle(DC *dc, INT32 x, INT32 y, INT32 width, 
-			INT32 height)
+BOOL PSDRV_WriteRectangle(DC *dc, INT x, INT y, INT width, 
+			INT height)
 {
     char buf[100];
 
@@ -480,7 +480,7 @@ BOOL32 PSDRV_WriteRectangle(DC *dc, INT32 x, INT32 y, INT32 width,
     return PSDRV_WriteSpool(dc, buf, strlen(buf));
 }
 
-BOOL32 PSDRV_WriteArc(DC *dc, INT32 x, INT32 y, INT32 w, INT32 h, double ang1,
+BOOL PSDRV_WriteArc(DC *dc, INT x, INT y, INT w, INT h, double ang1,
 		      double ang2)
 {
     char buf[256];
@@ -493,7 +493,7 @@ BOOL32 PSDRV_WriteArc(DC *dc, INT32 x, INT32 y, INT32 w, INT32 h, double ang1,
 
 static char encodingext[] = "-ANSI";
 
-BOOL32 PSDRV_WriteSetFont(DC *dc, BOOL32 UseANSI)
+BOOL PSDRV_WriteSetFont(DC *dc, BOOL UseANSI)
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     char *buf, *newbuf;
@@ -529,7 +529,7 @@ BOOL32 PSDRV_WriteSetFont(DC *dc, BOOL32 UseANSI)
     return TRUE;
 }    
 
-BOOL32 PSDRV_WriteSetColor(DC *dc, PSCOLOR *color)
+BOOL PSDRV_WriteSetColor(DC *dc, PSCOLOR *color)
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     char buf[256];
@@ -556,7 +556,7 @@ BOOL32 PSDRV_WriteSetColor(DC *dc, PSCOLOR *color)
     return FALSE;
 }
 
-BOOL32 PSDRV_WriteSetPen(DC *dc)
+BOOL PSDRV_WriteSetPen(DC *dc)
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     char buf[256];
@@ -572,7 +572,7 @@ BOOL32 PSDRV_WriteSetPen(DC *dc)
     return TRUE;
 }
 
-BOOL32 PSDRV_WriteReencodeFont(DC *dc)
+BOOL PSDRV_WriteReencodeFont(DC *dc)
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     char *buf, *newbuf;
@@ -605,10 +605,10 @@ BOOL32 PSDRV_WriteReencodeFont(DC *dc)
     return TRUE;
 }    
 
-BOOL32 PSDRV_WriteShow(DC *dc, char *str, INT32 count)
+BOOL PSDRV_WriteShow(DC *dc, char *str, INT count)
 {
     char *buf, *buf1;
-    INT32 buflen = count + 10, i, done;
+    INT buflen = count + 10, i, done;
 
     buf = (char *)HeapAlloc( PSDRV_Heap, 0, buflen );
     
@@ -642,47 +642,47 @@ BOOL32 PSDRV_WriteShow(DC *dc, char *str, INT32 count)
     return TRUE;
 }    
 
-BOOL32 PSDRV_WriteFill(DC *dc)
+BOOL PSDRV_WriteFill(DC *dc)
 {
     return PSDRV_WriteSpool(dc, psfill, sizeof(psfill)-1);
 }
 
-BOOL32 PSDRV_WriteEOFill(DC *dc)
+BOOL PSDRV_WriteEOFill(DC *dc)
 {
     return PSDRV_WriteSpool(dc, pseofill, sizeof(pseofill)-1);
 }
 
-BOOL32 PSDRV_WriteGSave(DC *dc)
+BOOL PSDRV_WriteGSave(DC *dc)
 {
     return PSDRV_WriteSpool(dc, psgsave, sizeof(psgsave)-1);
 }
 
-BOOL32 PSDRV_WriteGRestore(DC *dc)
+BOOL PSDRV_WriteGRestore(DC *dc)
 {
     return PSDRV_WriteSpool(dc, psgrestore, sizeof(psgrestore)-1);
 }
 
-BOOL32 PSDRV_WriteClosePath(DC *dc)
+BOOL PSDRV_WriteClosePath(DC *dc)
 {
     return PSDRV_WriteSpool(dc, psclosepath, sizeof(psclosepath)-1);
 }
 
-BOOL32 PSDRV_WriteClip(DC *dc)
+BOOL PSDRV_WriteClip(DC *dc)
 {
     return PSDRV_WriteSpool(dc, psclip, sizeof(psclip)-1);
 }
 
-BOOL32 PSDRV_WriteEOClip(DC *dc)
+BOOL PSDRV_WriteEOClip(DC *dc)
 {
     return PSDRV_WriteSpool(dc, pseoclip, sizeof(pseoclip)-1);
 }
 
-BOOL32 PSDRV_WriteHatch(DC *dc)
+BOOL PSDRV_WriteHatch(DC *dc)
 {
     return PSDRV_WriteSpool(dc, pshatch, sizeof(pshatch)-1);
 }
 
-BOOL32 PSDRV_WriteRotate(DC *dc, float ang)
+BOOL PSDRV_WriteRotate(DC *dc, float ang)
 {
     char buf[256];
 
diff --git a/graphics/psdrv/text.c b/graphics/psdrv/text.c
index bffe95633de..79410adab05 100644
--- a/graphics/psdrv/text.c
+++ b/graphics/psdrv/text.c
@@ -12,13 +12,13 @@
 /***********************************************************************
  *           PSDRV_ExtTextOut
  */
-BOOL32 PSDRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
-                   const RECT32 *lprect, LPCSTR str, UINT32 count,
-                   const INT32 *lpDx )
+BOOL PSDRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
+                   const RECT *lprect, LPCSTR str, UINT count,
+                   const INT *lpDx )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     char *strbuf;
-    SIZE32 sz;
+    SIZE sz;
 
     TRACE(psdrv, "(x=%d, y=%d, flags=0x%08x, str='%.*s', count=%d)\n", x, y,
 	  flags, (int)count, str, count);
diff --git a/graphics/ttydrv/init.c b/graphics/ttydrv/init.c
index e2a8a8840af..5f4dcf47d12 100644
--- a/graphics/ttydrv/init.c
+++ b/graphics/ttydrv/init.c
@@ -108,7 +108,7 @@ static DeviceCaps TTYDRV_GDI_DevCaps = {
 /**********************************************************************
  *	     TTYDRV_GDI_Initialize
  */
-BOOL32 TTYDRV_GDI_Initialize(void)
+BOOL TTYDRV_GDI_Initialize(void)
 {
 
   TTYDRV_GDI_DevCaps.version = 0x300;
@@ -139,7 +139,7 @@ void TTDRV_GDI_Finalize()
 /**********************************************************************
  *	     TTYDRV_GDI_CreateDC
  */
-BOOL32 TTYDRV_GDI_CreateDC(DC *dc, LPCSTR driver, LPCSTR device,
+BOOL TTYDRV_GDI_CreateDC(DC *dc, LPCSTR driver, LPCSTR device,
 			   LPCSTR output, const DEVMODE16 *initData)
 {
   FIXME(ttydrv, "(%p, %s, %s, %s, %p): semistub\n",
@@ -164,7 +164,7 @@ BOOL32 TTYDRV_GDI_CreateDC(DC *dc, LPCSTR driver, LPCSTR device,
 /**********************************************************************
  *	     TTYDRV_GDI_DeleteDC
  */
-BOOL32 TTYDRV_GDI_DeleteDC(DC *dc)
+BOOL TTYDRV_GDI_DeleteDC(DC *dc)
 {
   FIXME(ttydrv, "(%p): semistub\n", dc);
 
@@ -177,7 +177,7 @@ BOOL32 TTYDRV_GDI_DeleteDC(DC *dc)
 /**********************************************************************
  *           TTYDRV_GDI_Escape
  */
-INT32 TTYDRV_GDI_Escape(DC *dc, INT32 nEscape, INT32 cbInput,
+INT TTYDRV_GDI_Escape(DC *dc, INT nEscape, INT cbInput,
 			SEGPTR lpInData, SEGPTR lpOutData)
 {
     return 0;
diff --git a/graphics/win16drv/brush.c b/graphics/win16drv/brush.c
index a437d210cc8..b6650d5cf94 100644
--- a/graphics/win16drv/brush.c
+++ b/graphics/win16drv/brush.c
@@ -10,7 +10,7 @@
 #include "heap.h"
 #include "debug.h"
 
-HBRUSH32 WIN16DRV_BRUSH_SelectObject( DC * dc, HBRUSH32 hbrush,
+HBRUSH WIN16DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush,
                                       BRUSHOBJ * brush )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
diff --git a/graphics/win16drv/font.c b/graphics/win16drv/font.c
index 22ad850f1d1..089847231b8 100644
--- a/graphics/win16drv/font.c
+++ b/graphics/win16drv/font.c
@@ -17,8 +17,8 @@
 /***********************************************************************
  *           WIN16DRV_GetTextExtentPoint
  */
-BOOL32 WIN16DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT32 count,
-                                    LPSIZE32 size )
+BOOL WIN16DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
+                                    LPSIZE size )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
     DWORD dwRet;
@@ -42,7 +42,7 @@ BOOL32 WIN16DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT32 count,
 /***********************************************************************
  *           WIN16DRV_GetTextMetrics
  */
-BOOL32 WIN16DRV_GetTextMetrics( DC *dc, TEXTMETRIC32A *metrics )
+BOOL WIN16DRV_GetTextMetrics( DC *dc, TEXTMETRICA *metrics )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
 
@@ -63,10 +63,10 @@ BOOL32 WIN16DRV_GetTextMetrics( DC *dc, TEXTMETRIC32A *metrics )
     return TRUE;
 }
 
-HFONT32 WIN16DRV_FONT_SelectObject( DC * dc, HFONT32 hfont, FONTOBJ * font)
+HFONT WIN16DRV_FONT_SelectObject( DC * dc, HFONT hfont, FONTOBJ * font)
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
-    HPEN32 prevHandle = dc->w.hFont;
+    HPEN prevHandle = dc->w.hFont;
     int	nSize;
 
     dc->w.hFont = hfont;
@@ -143,8 +143,8 @@ HFONT32 WIN16DRV_FONT_SelectObject( DC * dc, HFONT32 hfont, FONTOBJ * font)
 /***********************************************************************
  *           GetCharWidth32A    (GDI32.155)
  */
-BOOL32 WIN16DRV_GetCharWidth( DC *dc, UINT32 firstChar, UINT32 lastChar,
-			    LPINT32 buffer )
+BOOL WIN16DRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
+			    LPINT buffer )
 {
     int i;
     WORD wRet;
@@ -172,7 +172,7 @@ BOOL32 WIN16DRV_GetCharWidth( DC *dc, UINT32 firstChar, UINT32 lastChar,
  *           WIN16DRV_EnumDeviceFonts
  */
 
-BOOL32	WIN16DRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
+BOOL	WIN16DRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
 				        DEVICEFONTENUMPROC proc, LPARAM lp )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
diff --git a/graphics/win16drv/graphics.c b/graphics/win16drv/graphics.c
index 721ca1b823e..4546dceffb1 100644
--- a/graphics/win16drv/graphics.c
+++ b/graphics/win16drv/graphics.c
@@ -12,8 +12,8 @@
 /**********************************************************************
  *	     WIN16DRV_MoveToEx
  */
-BOOL32
-WIN16DRV_MoveToEx(DC *dc,INT32 x,INT32 y,LPPOINT32 pt) 
+BOOL
+WIN16DRV_MoveToEx(DC *dc,INT x,INT y,LPPOINT pt) 
 {
     if (pt)
     {
@@ -28,10 +28,10 @@ WIN16DRV_MoveToEx(DC *dc,INT32 x,INT32 y,LPPOINT32 pt)
 /***********************************************************************
  *           WIN16DRV_LineTo
  */
-BOOL32
-WIN16DRV_LineTo( DC *dc, INT32 x, INT32 y )
+BOOL
+WIN16DRV_LineTo( DC *dc, INT x, INT y )
 {
-    BOOL32 bRet ;
+    BOOL bRet ;
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
     POINT16 points[2];
     points[0].x = dc->w.DCOrgX + XLPTODP( dc, dc->w.CursPosX );
@@ -53,11 +53,11 @@ WIN16DRV_LineTo( DC *dc, INT32 x, INT32 y )
 /***********************************************************************
  *           WIN16DRV_Rectangle
  */
-BOOL32
-WIN16DRV_Rectangle(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
+BOOL
+WIN16DRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom)
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
-    BOOL32 bRet = 0;
+    BOOL bRet = 0;
     POINT16 points[2];
 
     TRACE(win16drv, "In WIN16DRV_Rectangle, x %d y %d DCOrgX %d y %d\n",
@@ -83,11 +83,11 @@ WIN16DRV_Rectangle(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
 /***********************************************************************
  *           WIN16DRV_Polygon
  */
-BOOL32
-WIN16DRV_Polygon(DC *dc, const POINT32* pt, INT32 count )
+BOOL
+WIN16DRV_Polygon(DC *dc, const POINT* pt, INT count )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
-    BOOL32 bRet = 0;
+    BOOL bRet = 0;
     LPPOINT16 points;
     int i;
 
@@ -116,11 +116,11 @@ WIN16DRV_Polygon(DC *dc, const POINT32* pt, INT32 count )
 /***********************************************************************
  *           WIN16DRV_Polyline
  */
-BOOL32
-WIN16DRV_Polyline(DC *dc, const POINT32* pt, INT32 count )
+BOOL
+WIN16DRV_Polyline(DC *dc, const POINT* pt, INT count )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
-    BOOL32 bRet = 0;
+    BOOL bRet = 0;
     LPPOINT16 points;
     int i;
 
@@ -146,11 +146,11 @@ WIN16DRV_Polyline(DC *dc, const POINT32* pt, INT32 count )
 /***********************************************************************
  *           WIN16DRV_Ellipse
  */
-BOOL32
-WIN16DRV_Ellipse(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
+BOOL
+WIN16DRV_Ellipse(DC *dc, INT left, INT top, INT right, INT bottom)
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
-    BOOL32 bRet = 0;
+    BOOL bRet = 0;
     POINT16 points[2];
     TRACE(win16drv, "In WIN16DRV_Ellipse, x %d y %d DCOrgX %d y %d\n",
            left, top, dc->w.DCOrgX, dc->w.DCOrgY);
diff --git a/graphics/win16drv/init.c b/graphics/win16drv/init.c
index e2f04e3f884..d8ae969be6d 100644
--- a/graphics/win16drv/init.c
+++ b/graphics/win16drv/init.c
@@ -35,9 +35,9 @@ SEGPTR		win16drv_SegPtr_DrawMode;
 LPDRAWMODE 	win16drv_DrawModeP;
 
 
-static BOOL32 WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
+static BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
                                  LPCSTR output, const DEVMODE16* initData );
-static INT32 WIN16DRV_Escape( DC *dc, INT32 nEscape, INT32 cbInput, 
+static INT WIN16DRV_Escape( DC *dc, INT nEscape, INT cbInput, 
                               SEGPTR lpInData, SEGPTR lpOutData );
 
 static const DC_FUNCTIONS WIN16DRV_Funcs =
@@ -117,7 +117,7 @@ static const DC_FUNCTIONS WIN16DRV_Funcs =
 /**********************************************************************
  *	     WIN16DRV_Init
  */
-BOOL32 WIN16DRV_Init(void)
+BOOL WIN16DRV_Init(void)
 {
     return DRIVER_RegisterDriver( NULL /* generic driver */, &WIN16DRV_Funcs );
         
@@ -158,7 +158,7 @@ void InitDrawMode(LPDRAWMODE lpDrawMode)
     lpDrawMode->LTextColor	= 0x00000000;     
 }
 
-BOOL32 WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
+BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
                           const DEVMODE16* initData )
 {
     LOADED_PRINTER_DRIVER *pLPD;
@@ -170,7 +170,7 @@ BOOL32 WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
     char printerEnabled[20];
     PROFILE_GetWineIniString( "wine", "printer", "off",
                              printerEnabled, sizeof(printerEnabled) );
-    if (lstrcmpi32A(printerEnabled,"on"))
+    if (lstrcmpiA(printerEnabled,"on"))
     {
         MSG("Printing disabled in wine.conf or .winerc file\n");
         MSG("Use \"printer=on\" in the \"[wine]\" section to enable it.\n");
@@ -203,7 +203,7 @@ BOOL32 WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
 
     /* Add this to the DC */
     dc->w.devCaps = printerDevCaps;
-    dc->w.hVisRgn = CreateRectRgn32(0, 0, dc->w.devCaps->horzRes, dc->w.devCaps->vertRes);
+    dc->w.hVisRgn = CreateRectRgn(0, 0, dc->w.devCaps->horzRes, dc->w.devCaps->vertRes);
     dc->w.bitsPerPixel = dc->w.devCaps->bitsPixel;
     
     TRACE(win16drv, "Got devcaps width %d height %d bits %d planes %d\n",
@@ -247,12 +247,12 @@ BOOL32 WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
     return TRUE;
 }
 
-BOOL32 WIN16DRV_PatBlt( struct tagDC *dc, INT32 left, INT32 top,
-			INT32 width, INT32 height, DWORD rop )
+BOOL WIN16DRV_PatBlt( struct tagDC *dc, INT left, INT top,
+			INT width, INT height, DWORD rop )
 {
   
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
-    BOOL32 bRet = 0;
+    BOOL bRet = 0;
 
     bRet = PRTDRV_StretchBlt( physDev->segptrPDEVICE, left, top, width, height, (SEGPTR)NULL, 0, 0, width, height,
                        PATCOPY, physDev->BrushInfo, win16drv_SegPtr_DrawMode, NULL);
@@ -262,7 +262,7 @@ BOOL32 WIN16DRV_PatBlt( struct tagDC *dc, INT32 left, INT32 top,
 /* 
  * Escape (GDI.38)
  */
-static INT32 WIN16DRV_Escape( DC *dc, INT32 nEscape, INT32 cbInput, 
+static INT WIN16DRV_Escape( DC *dc, INT nEscape, INT cbInput, 
                               SEGPTR lpInData, SEGPTR lpOutData )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
@@ -328,7 +328,7 @@ static INT32 WIN16DRV_Escape( DC *dc, INT32 nEscape, INT32 cbInput,
 				  lpInData, lpOutData);
             if (nRet != -1)
             {
-              HDC32 *tmpHdc = SEGPTR_NEW(HDC32);
+              HDC *tmpHdc = SEGPTR_NEW(HDC);
 
 #define SETPRINTERDC SETABORTPROC
 
diff --git a/graphics/win16drv/objects.c b/graphics/win16drv/objects.c
index 44426aa4de9..564da70dbb6 100644
--- a/graphics/win16drv/objects.c
+++ b/graphics/win16drv/objects.c
@@ -13,22 +13,22 @@
 #include "debug.h"
 
 
-extern HBITMAP32 WIN16DRV_BITMAP_SelectObject( DC * dc, HBITMAP32 hbitmap,
+extern HBITMAP WIN16DRV_BITMAP_SelectObject( DC * dc, HBITMAP hbitmap,
                                              BITMAPOBJ * bmp );
-extern HBRUSH32 WIN16DRV_BRUSH_SelectObject( DC * dc, HBRUSH32 hbrush,
+extern HBRUSH WIN16DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush,
                                            BRUSHOBJ * brush );
-extern HFONT32 WIN16DRV_FONT_SelectObject( DC * dc, HFONT32 hfont,
+extern HFONT WIN16DRV_FONT_SelectObject( DC * dc, HFONT hfont,
                                          FONTOBJ * font );
-extern HPEN32 WIN16DRV_PEN_SelectObject( DC * dc, HPEN32 hpen, PENOBJ * pen );
+extern HPEN WIN16DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen );
 
 
 /***********************************************************************
  *           WIN16DRV_SelectObject
  */
-HGDIOBJ32 WIN16DRV_SelectObject( DC *dc, HGDIOBJ32 handle )
+HGDIOBJ WIN16DRV_SelectObject( DC *dc, HGDIOBJ handle )
 {
     GDIOBJHDR *ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE );
-    HGDIOBJ32 ret = 0;
+    HGDIOBJ ret = 0;
 
     if (!ptr) return 0;
     TRACE(gdi, "hdc=%04x %04x\n", dc->hSelf, handle );
diff --git a/graphics/win16drv/pen.c b/graphics/win16drv/pen.c
index 0dca2f16551..e222a03f174 100644
--- a/graphics/win16drv/pen.c
+++ b/graphics/win16drv/pen.c
@@ -12,10 +12,10 @@
 /***********************************************************************
  *           PEN_SelectObject
  */
-HPEN32 WIN16DRV_PEN_SelectObject( DC * dc, HPEN32 hpen, PENOBJ * pen )
+HPEN WIN16DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
-    HPEN32 prevHandle = dc->w.hPen;
+    HPEN prevHandle = dc->w.hPen;
     int		 nSize;
     LOGPEN16 	 lPen16;
     dc->w.hPen = hpen;
diff --git a/graphics/win16drv/prtdrv.c b/graphics/win16drv/prtdrv.c
index 20eb7495d36..15315e3d9af 100644
--- a/graphics/win16drv/prtdrv.c
+++ b/graphics/win16drv/prtdrv.c
@@ -80,7 +80,7 @@ static LOADED_PRINTER_DRIVER *FindPrinterDriverFromName(const char *pszDriver)
 	{
 	    TRACE(win16drv, "Comparing %s,%s\n",ptmpLPD->szDriver,pszDriver);
 	    /* Found driver store info, exit loop */
-	    if (lstrcmpi32A(ptmpLPD->szDriver, pszDriver) == 0)
+	    if (lstrcmpiA(ptmpLPD->szDriver, pszDriver) == 0)
 	      pLPD = ptmpLPD;
 	}
     }
@@ -112,7 +112,7 @@ LOADED_PRINTER_DRIVER *LoadPrinterDriver(const char *pszDriver)
     HINSTANCE16	hInst;	
     LOADED_PRINTER_DRIVER *pLPD = NULL;
     int		nDriverSlot = 0;
-    BOOL32	bSlotFound = FALSE;
+    BOOL	bSlotFound = FALSE;
 
     /* First look to see if driver is loaded */
     pLPD = FindPrinterDriverFromName(pszDriver);
@@ -356,7 +356,7 @@ WORD PRTDRV_Output(LPPDEVICE 	 lpDestDev,
                    LPLOGPEN16 	 lpPen,
                    LPLOGBRUSH16	 lpBrush,
                    SEGPTR	 lpDrawMode,
-                   HRGN32 	 hClipRgn)
+                   HRGN 	 hClipRgn)
 {
     WORD wRet = 0;
     LOADED_PRINTER_DRIVER *pLPD = NULL;
@@ -391,14 +391,14 @@ WORD PRTDRV_Output(LPPDEVICE 	 lpDestDev,
 	    DWORD size;
 	    RGNDATA *clip;
 
-	    size = GetRegionData32( hClipRgn, 0, NULL );
+	    size = GetRegionData( hClipRgn, 0, NULL );
 	    clip = HeapAlloc( SystemHeap, 0, size );
 	    if(!clip) 
 	    {
 	        WARN(win16drv, "Can't alloc clip array in PRTDRV_Output\n");
 		return FALSE;
 	    }
-	    GetRegionData32( hClipRgn, size, clip );
+	    GetRegionData( hClipRgn, size, clip );
 	    if( clip->rdh.nCount == 0 )
 	    {
 		wRet = Callbacks->CallDrvOutputProc(pLPD->fn[FUNC_OUTPUT], 
@@ -407,11 +407,11 @@ WORD PRTDRV_Output(LPPDEVICE 	 lpDestDev,
 	    }
 	    else
 	    {
-	        RECT32 *pRect;
+	        RECT *pRect;
 	        lP8 = SEGPTR_NEW(RECT16);
 	    
-		for(pRect = (RECT32 *)clip->Buffer; 
-		    pRect < (RECT32 *)clip->Buffer + clip->rdh.nCount; pRect++)
+		for(pRect = (RECT *)clip->Buffer; 
+		    pRect < (RECT *)clip->Buffer + clip->rdh.nCount; pRect++)
 	        {
 		    CONV_RECT32TO16( pRect, lP8 );
 
@@ -661,16 +661,16 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg,
     return dwRet;
 }
 
-int WINAPI dmEnumDFonts(LPPDEVICE lpDestDev, LPSTR lpFaceName, FARPROC16 lpCallbackFunc, LPVOID lpClientData)
+int WINAPI dmEnumDFonts16(LPPDEVICE lpDestDev, LPSTR lpFaceName, FARPROC16 lpCallbackFunc, LPVOID lpClientData)
 {
         /* Windows 3.1 just returns 1 */
         return 1;
 }
 
-int WINAPI dmRealizeObject(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, LPSTR lpOutObj, SEGPTR lpTextXForm)
+int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, LPSTR lpOutObj, SEGPTR lpTextXForm)
 {
     FIXME(win16drv, "(lpDestDev=%08x,wStyle=%04x,lpInObj=%08x,lpOutObj=%08x,lpTextXForm=%08x): stub\n",
-        (UINT32)lpDestDev, wStyle, (UINT32)lpInObj, (UINT32)lpOutObj, (UINT32)lpTextXForm);
+        (UINT)lpDestDev, wStyle, (UINT)lpInObj, (UINT)lpOutObj, (UINT)lpTextXForm);
     if (wStyle < 0) { /* Free extra memory of given object's structure */
 	switch ( -wStyle ) {
             case DRVOBJ_PEN:    {
@@ -747,7 +747,7 @@ int WINAPI dmRealizeObject(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, LPS
 }
 
 
-WORD PRTDRV_GetCharWidth(LPPDEVICE lpDestDev, LPINT32 lpBuffer, 
+WORD PRTDRV_GetCharWidth(LPPDEVICE lpDestDev, LPINT lpBuffer, 
 		      WORD wFirstChar, WORD wLastChar, LPFONTINFO16 lpFontInfo,
 		      SEGPTR lpDrawMode, SEGPTR lpTextXForm )
 {
@@ -782,7 +782,7 @@ WORD PRTDRV_GetCharWidth(LPPDEVICE lpDestDev, LPINT32 lpBuffer,
                                                  wP4, lP5, lP6, lP7 );
 
 	for(i = 0; i <= wLastChar - wFirstChar; i++)
-	    lpBuffer[i] = (INT32) lP2[i];
+	    lpBuffer[i] = (INT) lP2[i];
 
 	SEGPTR_FREE(lP2);
     }
diff --git a/graphics/win16drv/text.c b/graphics/win16drv/text.c
index 815b1957b3a..76ea034cdd9 100644
--- a/graphics/win16drv/text.c
+++ b/graphics/win16drv/text.c
@@ -14,12 +14,12 @@
 /***********************************************************************
  *           WIN16DRV_ExtTextOut
  */
-BOOL32 WIN16DRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
-                           const RECT32 *lprect, LPCSTR str, UINT32 count,
-                           const INT32 *lpDx )
+BOOL WIN16DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
+                           const RECT *lprect, LPCSTR str, UINT count,
+                           const INT *lpDx )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
-    BOOL32 bRet = 1;
+    BOOL bRet = 1;
     RECT16	 clipRect;
     RECT16 	 opaqueRect;
     RECT16 	*lpOpaqueRect = NULL; 
diff --git a/graphics/x11drv/bitblt.c b/graphics/x11drv/bitblt.c
index dea59dd9544..4b1be45a564 100644
--- a/graphics/x11drv/bitblt.c
+++ b/graphics/x11drv/bitblt.c
@@ -41,7 +41,7 @@
 #define MAX_OP_LEN  6  /* Longest opcode + 1 for the terminating 0 */
 
 #define SWAP_INT32(i1,i2) \
-    do { INT32 __t = *(i1); *(i1) = *(i2); *(i2) = __t; } while(0)
+    do { INT __t = *(i1); *(i1) = *(i2); *(i2) = __t; } while(0)
 
 static const unsigned char BITBLT_Opcodes[256][MAX_OP_LEN] =
 {
@@ -527,10 +527,10 @@ main()
  * Stretch a row of pixels. Helper function for BITBLT_StretchImage.
  */
 static void BITBLT_StretchRow( int *rowSrc, int *rowDst,
-                               INT32 startDst, INT32 widthDst,
-                               INT32 xinc, INT32 xoff, WORD mode )
+                               INT startDst, INT widthDst,
+                               INT xinc, INT xoff, WORD mode )
 {
-    register INT32 xsrc = xinc * startDst + xoff;
+    register INT xsrc = xinc * startDst + xoff;
     rowDst += startDst;
     switch(mode)
     {
@@ -556,10 +556,10 @@ static void BITBLT_StretchRow( int *rowSrc, int *rowDst,
  * Shrink a row of pixels. Helper function for BITBLT_StretchImage.
  */
 static void BITBLT_ShrinkRow( int *rowSrc, int *rowDst,
-                              INT32 startSrc, INT32 widthSrc,
-                              INT32 xinc, INT32 xoff, WORD mode )
+                              INT startSrc, INT widthSrc,
+                              INT xinc, INT xoff, WORD mode )
 {
-    register INT32 xdst = xinc * startSrc + xoff;
+    register INT xdst = xinc * startSrc + xoff;
     rowSrc += startSrc;
     switch(mode)
     {
@@ -584,11 +584,11 @@ static void BITBLT_ShrinkRow( int *rowSrc, int *rowDst,
  *
  * Retrieve a row from an image. Helper function for BITBLT_StretchImage.
  */
-static void BITBLT_GetRow( XImage *image, int *pdata, INT32 row,
-                           INT32 start, INT32 width, INT32 depthDst,
-                           int fg, int bg, BOOL32 swap)
+static void BITBLT_GetRow( XImage *image, int *pdata, INT row,
+                           INT start, INT width, INT depthDst,
+                           int fg, int bg, BOOL swap)
 {
-    register INT32 i;
+    register INT i;
 
     assert( (row >= 0) && (row < image->height) );
     assert( (start >= 0) && (width <= image->width) );
@@ -639,16 +639,16 @@ static void BITBLT_GetRow( XImage *image, int *pdata, INT32 row,
  * FIXME: does not work for full 32-bit coordinates.
  */
 static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage,
-                                 INT32 widthSrc, INT32 heightSrc,
-                                 INT32 widthDst, INT32 heightDst,
-                                 RECT32 *visRectSrc, RECT32 *visRectDst,
+                                 INT widthSrc, INT heightSrc,
+                                 INT widthDst, INT heightDst,
+                                 RECT *visRectSrc, RECT *visRectDst,
                                  int foreground, int background, WORD mode )
 {
     int *rowSrc, *rowDst, *pixel;
     char *pdata;
-    INT32 xinc, xoff, yinc, ysrc, ydst;
-    register INT32 x, y;
-    BOOL32 hstretch, vstretch, hswap, vswap;
+    INT xinc, xoff, yinc, ysrc, ydst;
+    register INT x, y;
+    BOOL hstretch, vstretch, hswap, vswap;
 
     hswap = ((int)widthSrc * widthDst) < 0;
     vswap = ((int)heightSrc * heightDst) < 0;
@@ -814,25 +814,25 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage,
  */
 static void BITBLT_GetSrcAreaStretch( DC *dcSrc, DC *dcDst,
                                       Pixmap pixmap, GC gc,
-                                      INT32 xSrc, INT32 ySrc,
-                                      INT32 widthSrc, INT32 heightSrc,
-                                      INT32 xDst, INT32 yDst,
-                                      INT32 widthDst, INT32 heightDst,
-                                      RECT32 *visRectSrc, RECT32 *visRectDst )
+                                      INT xSrc, INT ySrc,
+                                      INT widthSrc, INT heightSrc,
+                                      INT xDst, INT yDst,
+                                      INT widthDst, INT heightDst,
+                                      RECT *visRectSrc, RECT *visRectDst )
 {
     XImage *imageSrc, *imageDst;
     X11DRV_PDEVICE *physDevSrc = (X11DRV_PDEVICE *)dcSrc->physDev;
     X11DRV_PDEVICE *physDevDst = (X11DRV_PDEVICE *)dcDst->physDev;
 
-    RECT32 rectSrc = *visRectSrc;
-    RECT32 rectDst = *visRectDst;
+    RECT rectSrc = *visRectSrc;
+    RECT rectDst = *visRectDst;
 
     if (widthSrc < 0) xSrc += widthSrc;
     if (widthDst < 0) xDst += widthDst;
     if (heightSrc < 0) ySrc += heightSrc;
     if (heightDst < 0) yDst += heightDst;
-    OffsetRect32( &rectSrc, -xSrc, -ySrc );
-    OffsetRect32( &rectDst, -xDst, -yDst );
+    OffsetRect( &rectSrc, -xSrc, -ySrc );
+    OffsetRect( &rectDst, -xDst, -yDst );
 
     /* FIXME: avoid BadMatch errors */
     imageSrc = XGetImage( display, physDevSrc->drawable,
@@ -862,12 +862,12 @@ static void BITBLT_GetSrcAreaStretch( DC *dcSrc, DC *dcDst,
  * pixels to Windows colors.
  */
 static void BITBLT_GetSrcArea( DC *dcSrc, DC *dcDst, Pixmap pixmap, GC gc,
-                               INT32 xSrc, INT32 ySrc, RECT32 *visRectSrc )
+                               INT xSrc, INT ySrc, RECT *visRectSrc )
 {
     XImage *imageSrc, *imageDst;
-    register INT32 x, y;
-    INT32 width  = visRectSrc->right - visRectSrc->left;
-    INT32 height = visRectSrc->bottom - visRectSrc->top;
+    register INT x, y;
+    INT width  = visRectSrc->right - visRectSrc->left;
+    INT height = visRectSrc->bottom - visRectSrc->top;
     X11DRV_PDEVICE *physDevSrc = (X11DRV_PDEVICE *)dcSrc->physDev;
     X11DRV_PDEVICE *physDevDst = (X11DRV_PDEVICE *)dcDst->physDev;
 
@@ -949,10 +949,10 @@ static void BITBLT_GetSrcArea( DC *dcSrc, DC *dcDst, Pixmap pixmap, GC gc,
  * Retrieve an area from the destination DC, mapping all the
  * pixels to Windows colors.
  */
-static void BITBLT_GetDstArea(DC *dc, Pixmap pixmap, GC gc, RECT32 *visRectDst)
+static void BITBLT_GetDstArea(DC *dc, Pixmap pixmap, GC gc, RECT *visRectDst)
 {
-    INT32 width  = visRectDst->right - visRectDst->left;
-    INT32 height = visRectDst->bottom - visRectDst->top;
+    INT width  = visRectDst->right - visRectDst->left;
+    INT height = visRectDst->bottom - visRectDst->top;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
     if (!COLOR_PixelToPalette || (dc->w.bitsPerPixel == 1) ||
@@ -963,7 +963,7 @@ static void BITBLT_GetDstArea(DC *dc, Pixmap pixmap, GC gc, RECT32 *visRectDst)
     }
     else
     {
-        register INT32 x, y;
+        register INT x, y;
         XImage *image;
 
         if (dc->w.flags & DC_MEMORY)
@@ -994,10 +994,10 @@ static void BITBLT_GetDstArea(DC *dc, Pixmap pixmap, GC gc, RECT32 *visRectDst)
  * Put an area back into the destination DC, mapping the pixel
  * colors to X pixels.
  */
-static void BITBLT_PutDstArea(DC *dc, Pixmap pixmap, GC gc, RECT32 *visRectDst)
+static void BITBLT_PutDstArea(DC *dc, Pixmap pixmap, GC gc, RECT *visRectDst)
 {
-    INT32 width  = visRectDst->right - visRectDst->left;
-    INT32 height = visRectDst->bottom - visRectDst->top;
+    INT width  = visRectDst->right - visRectDst->left;
+    INT height = visRectDst->bottom - visRectDst->top;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
     /* !COLOR_PaletteToPixel is _NOT_ enough */
@@ -1010,7 +1010,7 @@ static void BITBLT_PutDstArea(DC *dc, Pixmap pixmap, GC gc, RECT32 *visRectDst)
     }
     else
     {
-        register INT32 x, y;
+        register INT x, y;
         XImage *image = XGetImage( display, pixmap, 0, 0, width, height,
                                    AllPlanes, ZPixmap );
         for (y = 0; y < height; y++)
@@ -1032,41 +1032,41 @@ static void BITBLT_PutDstArea(DC *dc, Pixmap pixmap, GC gc, RECT32 *visRectDst)
  * Get the source and destination visible rectangles for StretchBlt().
  * Return FALSE if one of the rectangles is empty.
  */
-static BOOL32 BITBLT_GetVisRectangles( DC *dcDst, INT32 xDst, INT32 yDst,
-                                       INT32 widthDst, INT32 heightDst,
-                                       DC *dcSrc, INT32 xSrc, INT32 ySrc,
-                                       INT32 widthSrc, INT32 heightSrc,
-                                       RECT32 *visRectSrc, RECT32 *visRectDst )
+static BOOL BITBLT_GetVisRectangles( DC *dcDst, INT xDst, INT yDst,
+                                       INT widthDst, INT heightDst,
+                                       DC *dcSrc, INT xSrc, INT ySrc,
+                                       INT widthSrc, INT heightSrc,
+                                       RECT *visRectSrc, RECT *visRectDst )
 {
-    RECT32 rect, clipRect;
+    RECT rect, clipRect;
 
       /* Get the destination visible rectangle */
 
-    SetRect32( &rect, xDst, yDst, xDst + widthDst, yDst + heightDst );
+    SetRect( &rect, xDst, yDst, xDst + widthDst, yDst + heightDst );
     if (widthDst < 0) SWAP_INT32( &rect.left, &rect.right );
     if (heightDst < 0) SWAP_INT32( &rect.top, &rect.bottom );
-    GetRgnBox32( dcDst->w.hGCClipRgn, &clipRect );
-    if (!IntersectRect32( visRectDst, &rect, &clipRect )) return FALSE;
+    GetRgnBox( dcDst->w.hGCClipRgn, &clipRect );
+    if (!IntersectRect( visRectDst, &rect, &clipRect )) return FALSE;
 
       /* Get the source visible rectangle */
 
     if (!dcSrc) return TRUE;
-    SetRect32( &rect, xSrc, ySrc, xSrc + widthSrc, ySrc + heightSrc );
+    SetRect( &rect, xSrc, ySrc, xSrc + widthSrc, ySrc + heightSrc );
     if (widthSrc < 0) SWAP_INT32( &rect.left, &rect.right );
     if (heightSrc < 0) SWAP_INT32( &rect.top, &rect.bottom );
     /* Apparently the clipping and visible regions are only for output, 
        so just check against totalExtent here to avoid BadMatch errors */
-    if (!IntersectRect32( visRectSrc, &rect, &dcSrc->w.totalExtent )) 
+    if (!IntersectRect( visRectSrc, &rect, &dcSrc->w.totalExtent )) 
         return FALSE;
 
       /* Intersect the rectangles */
 
     if ((widthSrc == widthDst) && (heightSrc == heightDst)) /* no stretching */
     {
-        OffsetRect32( visRectSrc, xDst - xSrc, yDst - ySrc );
-        if (!IntersectRect32( &rect, visRectSrc, visRectDst )) return FALSE;
+        OffsetRect( visRectSrc, xDst - xSrc, yDst - ySrc );
+        if (!IntersectRect( &rect, visRectSrc, visRectDst )) return FALSE;
         *visRectSrc = *visRectDst = rect;
-        OffsetRect32( visRectSrc, xSrc - xDst, ySrc - yDst );
+        OffsetRect( visRectSrc, xSrc - xDst, ySrc - yDst );
     }
     else  /* stretching */
     {
@@ -1077,8 +1077,8 @@ static BOOL32 BITBLT_GetVisRectangles( DC *dcDst, INT32 xDst, INT32 yDst,
         rect.bottom = yDst + ((visRectSrc->bottom - ySrc)*heightDst)/heightSrc;
         if (rect.left > rect.right) SWAP_INT32( &rect.left, &rect.right );
         if (rect.top > rect.bottom) SWAP_INT32( &rect.top, &rect.bottom );
-        InflateRect32( &rect, 1, 1 );  /* Avoid rounding errors */
-        if (!IntersectRect32( visRectDst, &rect, visRectDst )) return FALSE;
+        InflateRect( &rect, 1, 1 );  /* Avoid rounding errors */
+        if (!IntersectRect( visRectDst, &rect, visRectDst )) return FALSE;
 
         /* Map destination rectangle back to source coordinates */
         rect = *visRectDst;
@@ -1088,8 +1088,8 @@ static BOOL32 BITBLT_GetVisRectangles( DC *dcDst, INT32 xDst, INT32 yDst,
         rect.bottom = ySrc + ((visRectDst->bottom - yDst)*heightSrc)/heightDst;
         if (rect.left > rect.right) SWAP_INT32( &rect.left, &rect.right );
         if (rect.top > rect.bottom) SWAP_INT32( &rect.top, &rect.bottom );
-        InflateRect32( &rect, 1, 1 );  /* Avoid rounding errors */
-        if (!IntersectRect32( visRectSrc, &rect, visRectSrc )) return FALSE;
+        InflateRect( &rect, 1, 1 );  /* Avoid rounding errors */
+        if (!IntersectRect( visRectSrc, &rect, visRectSrc )) return FALSE;
     }
     return TRUE;
 }
@@ -1100,15 +1100,15 @@ static BOOL32 BITBLT_GetVisRectangles( DC *dcDst, INT32 xDst, INT32 yDst,
  *
  * Implementation of PatBlt(), BitBlt() and StretchBlt().
  */
-static BOOL32 BITBLT_InternalStretchBlt( DC *dcDst, INT32 xDst, INT32 yDst,
-                                         INT32 widthDst, INT32 heightDst,
-                                         DC *dcSrc, INT32 xSrc, INT32 ySrc,
-                                         INT32 widthSrc, INT32 heightSrc,
+static BOOL BITBLT_InternalStretchBlt( DC *dcDst, INT xDst, INT yDst,
+                                         INT widthDst, INT heightDst,
+                                         DC *dcSrc, INT xSrc, INT ySrc,
+                                         INT widthSrc, INT heightSrc,
                                          DWORD rop )
 {
-    BOOL32 usePat, useSrc, useDst, destUsed, fStretch, fNullBrush;
-    RECT32 visRectDst, visRectSrc;
-    INT32 width, height;
+    BOOL usePat, useSrc, useDst, destUsed, fStretch, fNullBrush;
+    RECT visRectDst, visRectSrc;
+    INT width, height;
     const BYTE *opcode;
     Pixmap pixmaps[3] = { 0, 0, 0 };  /* pixmaps for DST, SRC, TMP */
     GC tmpGC = 0;
@@ -1359,15 +1359,15 @@ static BOOL32 BITBLT_InternalStretchBlt( DC *dcDst, INT32 xDst, INT32 yDst,
 struct StretchBlt_params
 {
     DC   *dcDst;
-    INT32 xDst;
-    INT32 yDst;
-    INT32 widthDst;
-    INT32 heightDst;
+    INT xDst;
+    INT yDst;
+    INT widthDst;
+    INT heightDst;
     DC   *dcSrc;
-    INT32 xSrc;
-    INT32 ySrc;
-    INT32 widthSrc;
-    INT32 heightSrc;
+    INT xSrc;
+    INT ySrc;
+    INT widthSrc;
+    INT heightSrc;
     DWORD rop;
 };
 
@@ -1388,15 +1388,15 @@ static int BITBLT_DoStretchBlt( const struct StretchBlt_params *p )
 /***********************************************************************
  *           X11DRV_PatBlt
  */
-BOOL32 X11DRV_PatBlt( DC *dc, INT32 left, INT32 top,
-                      INT32 width, INT32 height, DWORD rop )
+BOOL X11DRV_PatBlt( DC *dc, INT left, INT top,
+                      INT width, INT height, DWORD rop )
 {
     struct StretchBlt_params params = { dc, left, top, width, height,
                                         NULL, 0, 0, 0, 0, rop };
-    BOOL32 result;
+    BOOL result;
     DIB_UpdateDIBSection( dc, FALSE );
     EnterCriticalSection( &X11DRV_CritSection );
-    result = (BOOL32)CALL_LARGE_STACK( BITBLT_DoStretchBlt, &params );
+    result = (BOOL)CALL_LARGE_STACK( BITBLT_DoStretchBlt, &params );
     LeaveCriticalSection( &X11DRV_CritSection );
     DIB_UpdateDIBSection( dc, TRUE );
     return result;
@@ -1406,17 +1406,17 @@ BOOL32 X11DRV_PatBlt( DC *dc, INT32 left, INT32 top,
 /***********************************************************************
  *           X11DRV_BitBlt
  */
-BOOL32 X11DRV_BitBlt( DC *dcDst, INT32 xDst, INT32 yDst,
-                      INT32 width, INT32 height, DC *dcSrc,
-                      INT32 xSrc, INT32 ySrc, DWORD rop )
+BOOL X11DRV_BitBlt( DC *dcDst, INT xDst, INT yDst,
+                      INT width, INT height, DC *dcSrc,
+                      INT xSrc, INT ySrc, DWORD rop )
 {
     struct StretchBlt_params params = { dcDst, xDst, yDst, width, height,
                                         dcSrc, xSrc, ySrc, width, height, rop};
-    BOOL32 result;
+    BOOL result;
     DIB_UpdateDIBSection( dcDst, FALSE );
     DIB_UpdateDIBSection( dcSrc, FALSE );
     EnterCriticalSection( &X11DRV_CritSection );
-    result = (BOOL32)CALL_LARGE_STACK( BITBLT_DoStretchBlt, &params );
+    result = (BOOL)CALL_LARGE_STACK( BITBLT_DoStretchBlt, &params );
     LeaveCriticalSection( &X11DRV_CritSection );
     DIB_UpdateDIBSection( dcDst, TRUE );
     return result;
@@ -1426,19 +1426,19 @@ BOOL32 X11DRV_BitBlt( DC *dcDst, INT32 xDst, INT32 yDst,
 /***********************************************************************
  *           X11DRV_StretchBlt
  */
-BOOL32 X11DRV_StretchBlt( DC *dcDst, INT32 xDst, INT32 yDst,
-                          INT32 widthDst, INT32 heightDst,
-                          DC *dcSrc, INT32 xSrc, INT32 ySrc,
-                          INT32 widthSrc, INT32 heightSrc, DWORD rop )
+BOOL X11DRV_StretchBlt( DC *dcDst, INT xDst, INT yDst,
+                          INT widthDst, INT heightDst,
+                          DC *dcSrc, INT xSrc, INT ySrc,
+                          INT widthSrc, INT heightSrc, DWORD rop )
 {
     struct StretchBlt_params params = { dcDst, xDst, yDst, widthDst, heightDst,
                                         dcSrc, xSrc, ySrc, widthSrc, heightSrc,
                                         rop };
-    BOOL32 result;
+    BOOL result;
     DIB_UpdateDIBSection( dcDst, FALSE );
     DIB_UpdateDIBSection( dcSrc, FALSE );
     EnterCriticalSection( &X11DRV_CritSection );
-    result = (BOOL32)CALL_LARGE_STACK( BITBLT_DoStretchBlt, &params );
+    result = (BOOL)CALL_LARGE_STACK( BITBLT_DoStretchBlt, &params );
     LeaveCriticalSection( &X11DRV_CritSection );
     DIB_UpdateDIBSection( dcDst, TRUE );
     return result;
diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c
index 077c7ab2f53..de17e60dcb9 100644
--- a/graphics/x11drv/bitmap.c
+++ b/graphics/x11drv/bitmap.c
@@ -32,7 +32,7 @@ GC BITMAP_monoGC = 0, BITMAP_colorGC = 0;
 /***********************************************************************
  *           X11DRV_BITMAP_Init
  */
-BOOL32 X11DRV_BITMAP_Init(void)
+BOOL X11DRV_BITMAP_Init(void)
 {
     Pixmap tmpPixmap;
     
@@ -66,11 +66,11 @@ BOOL32 X11DRV_BITMAP_Init(void)
 /***********************************************************************
  *           X11DRV_BITMAP_SelectObject
  */
-HBITMAP32 X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP32 hbitmap,
+HBITMAP X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP hbitmap,
                                       BITMAPOBJ * bmp )
 {
-    HRGN32 hrgn;
-    HBITMAP32 prevHandle = dc->w.hBitmap;
+    HRGN hrgn;
+    HBITMAP prevHandle = dc->w.hBitmap;
     X11DRV_PHYSBITMAP *pbitmap;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
@@ -94,11 +94,11 @@ HBITMAP32 X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP32 hbitmap,
     dc->w.totalExtent.bottom = bmp->bitmap.bmHeight;
 
     if (dc->w.hVisRgn)
-       SetRectRgn32( dc->w.hVisRgn, 0, 0,
+       SetRectRgn( dc->w.hVisRgn, 0, 0,
                      bmp->bitmap.bmWidth, bmp->bitmap.bmHeight );
     else
     { 
-       hrgn = CreateRectRgn32(0, 0, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight);
+       hrgn = CreateRectRgn(0, 0, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight);
        if (!hrgn) return 0;
        dc->w.hVisRgn    = hrgn;
     }
@@ -130,8 +130,8 @@ struct XPutImage_descr
 {
     BITMAPOBJ *bmp;
     XImage    *image;
-    INT32      width;
-    INT32      height;
+    INT      width;
+    INT      height;
 };
 
 static int XPutImage_wrapper( const struct XPutImage_descr *descr )
@@ -181,7 +181,7 @@ X11DRV_PHYSBITMAP *X11DRV_AllocBitmap( BITMAPOBJ *bmp )
  *
  */
 
-BOOL32 X11DRV_CreateBitmap( HBITMAP32 hbitmap )
+BOOL X11DRV_CreateBitmap( HBITMAP hbitmap )
 {
     X11DRV_PHYSBITMAP *pbitmap;
     BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
@@ -487,7 +487,7 @@ static LONG X11DRV_SetBitmapBits(BITMAPOBJ *bmp, void *bits, LONG count)
 /***********************************************************************
  *           X11DRV_BitmapBits
  */
-LONG X11DRV_BitmapBits(HBITMAP32 hbitmap, void *bits, LONG count, WORD flags)
+LONG X11DRV_BitmapBits(HBITMAP hbitmap, void *bits, LONG count, WORD flags)
 {
     BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
     LONG ret;
@@ -512,7 +512,7 @@ LONG X11DRV_BitmapBits(HBITMAP32 hbitmap, void *bits, LONG count, WORD flags)
 /***********************************************************************
  *           X11DRV_BITMAP_DeleteObject
  */
-BOOL32 X11DRV_BITMAP_DeleteObject( HBITMAP32 hbitmap, BITMAPOBJ * bmp )
+BOOL X11DRV_BITMAP_DeleteObject( HBITMAP hbitmap, BITMAPOBJ * bmp )
 {
     X11DRV_PHYSBITMAP *pbitmap = bmp->DDBitmap->physBitmap;
 
diff --git a/graphics/x11drv/brush.c b/graphics/x11drv/brush.c
index 04c9cc2f470..cbc54e0bea7 100644
--- a/graphics/x11drv/brush.c
+++ b/graphics/x11drv/brush.c
@@ -99,7 +99,7 @@ static XImage *ditherImage = NULL;
  *
  * Create the X image used for dithering.
  */
-BOOL32 X11DRV_BRUSH_Init(void)
+BOOL X11DRV_BRUSH_Init(void)
 {
     XCREATEIMAGE( ditherImage, MATRIX_SIZE, MATRIX_SIZE, MONITOR_GetDepth(&MONITOR_PrimaryMonitor) );
     return (ditherImage != NULL);
@@ -172,7 +172,7 @@ static void BRUSH_SelectSolidBrush( DC *dc, COLORREF color )
 /***********************************************************************
  *           BRUSH_SelectPatternBrush
  */
-static BOOL32 BRUSH_SelectPatternBrush( DC * dc, HBITMAP32 hbitmap )
+static BOOL BRUSH_SelectPatternBrush( DC * dc, HBITMAP hbitmap )
 {
     X11DRV_PHYSBITMAP *pbitmap;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
@@ -226,7 +226,7 @@ static BOOL32 BRUSH_SelectPatternBrush( DC * dc, HBITMAP32 hbitmap )
 /***********************************************************************
  *           BRUSH_SelectObject
  */
-HBRUSH32 X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH32 hbrush, BRUSHOBJ * brush )
+HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
 {
     HBITMAP16 hBitmap;
     BITMAPINFO * bmpInfo;
@@ -274,7 +274,7 @@ HBRUSH32 X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH32 hbrush, BRUSHOBJ * brush )
 	if ((bmpInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)brush->logbrush.lbHatch )))
 	{
 	    int size = DIB_BitmapInfoSize( bmpInfo, brush->logbrush.lbColor );
-	    hBitmap = CreateDIBitmap32( dc->hSelf, &bmpInfo->bmiHeader,
+	    hBitmap = CreateDIBitmap( dc->hSelf, &bmpInfo->bmiHeader,
                                         CBM_INIT, ((char *)bmpInfo) + size,
                                         bmpInfo,
                                         (WORD)brush->logbrush.lbColor );
diff --git a/graphics/x11drv/clipping.c b/graphics/x11drv/clipping.c
index 36c5b72e712..0827a35939b 100644
--- a/graphics/x11drv/clipping.c
+++ b/graphics/x11drv/clipping.c
@@ -40,8 +40,8 @@ void X11DRV_SetDeviceClipping( DC * dc )
     if (obj->rgn->numRects > 0)
     {
         XRectangle *pXr;
-        RECT32 *pRect = obj->rgn->rects;
-        RECT32 *pEndRect = obj->rgn->rects + obj->rgn->numRects;
+        RECT *pRect = obj->rgn->rects;
+        RECT *pEndRect = obj->rgn->rects + obj->rgn->numRects;
 
         pXrect = HeapAlloc( GetProcessHeap(), 0, 
 			    sizeof(*pXrect) * obj->rgn->numRects );
diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c
index bcd715b1aa6..c639f5652f2 100644
--- a/graphics/x11drv/dib.c
+++ b/graphics/x11drv/dib.c
@@ -26,7 +26,7 @@ static int ximageDepthTable[] = { 0, 0, 0,  0,  0,  0,  0 };
 /***********************************************************************
  *           X11DRV_DIB_Init
  */
-BOOL32 X11DRV_DIB_Init(void)
+BOOL X11DRV_DIB_Init(void)
 {
     int		i;
     XImage*	testimage;
@@ -73,7 +73,7 @@ int *X11DRV_DIB_BuildColorMap( DC *dc, WORD coloruse, WORD depth,
                                const BITMAPINFO *info, int *nColors )
 {
     int i, colors;
-    BOOL32 isInfo;
+    BOOL isInfo;
     WORD *colorPtr;
     int *colorMapping;
 
@@ -1125,14 +1125,14 @@ int X11DRV_DIB_GetImageBits( const DIB_SETIMAGEBITS_DESCR *descr )
  *		X11DRV_SetDIBitsToDevice
  *
  */
-INT32 X11DRV_SetDIBitsToDevice( DC *dc, INT32 xDest, INT32 yDest, DWORD cx,
-				DWORD cy, INT32 xSrc, INT32 ySrc,
-				UINT32 startscan, UINT32 lines, LPCVOID bits,
-				const BITMAPINFO *info, UINT32 coloruse )
+INT X11DRV_SetDIBitsToDevice( DC *dc, INT xDest, INT yDest, DWORD cx,
+				DWORD cy, INT xSrc, INT ySrc,
+				UINT startscan, UINT lines, LPCVOID bits,
+				const BITMAPINFO *info, UINT coloruse )
 {
     DIB_SETIMAGEBITS_DESCR descr;
     DWORD width, oldcy = cy;
-    INT32 result;
+    INT result;
     int height, tmpheight;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
diff --git a/graphics/x11drv/graphics.c b/graphics/x11drv/graphics.c
index 1a2388661ea..8db928988ba 100644
--- a/graphics/x11drv/graphics.c
+++ b/graphics/x11drv/graphics.c
@@ -74,7 +74,7 @@ const int X11DRV_XROPfunction[16] =
  * If fMapColors is TRUE, X pixels are mapped to Windows colors.
  * Return FALSE if brush is BS_NULL, TRUE otherwise.
  */
-BOOL32 X11DRV_SetupGCForPatBlt( DC * dc, GC gc, BOOL32 fMapColors )
+BOOL X11DRV_SetupGCForPatBlt( DC * dc, GC gc, BOOL fMapColors )
 {
     XGCValues val;
     unsigned long mask;
@@ -172,7 +172,7 @@ BOOL32 X11DRV_SetupGCForPatBlt( DC * dc, GC gc, BOOL32 fMapColors )
  * Setup physDev->gc for drawing operations using current brush.
  * Return FALSE if brush is BS_NULL, TRUE otherwise.
  */
-BOOL32 X11DRV_SetupGCForBrush( DC * dc )
+BOOL X11DRV_SetupGCForBrush( DC * dc )
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
     return X11DRV_SetupGCForPatBlt( dc, physDev->gc, FALSE );
@@ -185,7 +185,7 @@ BOOL32 X11DRV_SetupGCForBrush( DC * dc )
  * Setup physDev->gc for drawing operations using current pen.
  * Return FALSE if pen is PS_NULL, TRUE otherwise.
  */
-BOOL32 X11DRV_SetupGCForPen( DC * dc )
+BOOL X11DRV_SetupGCForPen( DC * dc )
 {
     XGCValues val;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
@@ -269,7 +269,7 @@ BOOL32 X11DRV_SetupGCForPen( DC * dc )
  * Setup physDev->gc for text drawing operations.
  * Return FALSE if the font is null, TRUE otherwise.
  */
-BOOL32 X11DRV_SetupGCForText( DC * dc )
+BOOL X11DRV_SetupGCForText( DC * dc )
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
     XFontStruct* xfs = XFONT_GetFontStruct( physDev->font );
@@ -299,8 +299,8 @@ BOOL32 X11DRV_SetupGCForText( DC * dc )
 /**********************************************************************
  *	     X11DRV_MoveToEx
  */
-BOOL32
-X11DRV_MoveToEx(DC *dc,INT32 x,INT32 y,LPPOINT32 pt) {
+BOOL
+X11DRV_MoveToEx(DC *dc,INT x,INT y,LPPOINT pt) {
     if (pt)
     {
 	pt->x = dc->w.CursPosX;
@@ -314,8 +314,8 @@ X11DRV_MoveToEx(DC *dc,INT32 x,INT32 y,LPPOINT32 pt) {
 /***********************************************************************
  *           X11DRV_LineTo
  */
-BOOL32
-X11DRV_LineTo( DC *dc, INT32 x, INT32 y )
+BOOL
+X11DRV_LineTo( DC *dc, INT x, INT y )
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
@@ -339,13 +339,13 @@ X11DRV_LineTo( DC *dc, INT32 x, INT32 y )
  * 'lines' is the number of lines to draw: 0 for Arc, 1 for Chord, 2 for Pie.
  *
  */
-static BOOL32
-X11DRV_DrawArc( DC *dc, INT32 left, INT32 top, INT32 right,
-                INT32 bottom, INT32 xstart, INT32 ystart,
-                INT32 xend, INT32 yend, INT32 lines )
+static BOOL
+X11DRV_DrawArc( DC *dc, INT left, INT top, INT right,
+                INT bottom, INT xstart, INT ystart,
+                INT xend, INT yend, INT lines )
 {
-    INT32 xcenter, ycenter, istart_angle, idiff_angle;
-    INT32 width, oldwidth, oldendcap;
+    INT xcenter, ycenter, istart_angle, idiff_angle;
+    INT width, oldwidth, oldendcap;
     double start_angle, end_angle;
     XPoint points[4];
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
@@ -359,8 +359,8 @@ X11DRV_DrawArc( DC *dc, INT32 left, INT32 top, INT32 right,
     xend   = XLPTODP( dc, xend );
     yend   = YLPTODP( dc, yend );
 
-    if (right < left) { INT32 tmp = right; right = left; left = tmp; }
-    if (bottom < top) { INT32 tmp = bottom; bottom = top; top = tmp; }
+    if (right < left) { INT tmp = right; right = left; left = tmp; }
+    if (bottom < top) { INT tmp = bottom; bottom = top; top = tmp; }
     if ((left == right) || (top == bottom)
             ||(lines && ((right-left==1)||(bottom-top==1)))) return TRUE;
 
@@ -399,8 +399,8 @@ X11DRV_DrawArc( DC *dc, INT32 left, INT32 top, INT32 right,
     else
       if ((end_angle == PI)&&( start_angle <0))
 	end_angle = - PI;
-    istart_angle = (INT32)(start_angle * 180 * 64 / PI + 0.5);
-    idiff_angle  = (INT32)((end_angle - start_angle) * 180 * 64 / PI + 0.5);
+    istart_angle = (INT)(start_angle * 180 * 64 / PI + 0.5);
+    idiff_angle  = (INT)((end_angle - start_angle) * 180 * 64 / PI + 0.5);
     if (idiff_angle <= 0) idiff_angle += 360 * 64;
 
       /* Fill arc with brush if Chord() or Pie() */
@@ -442,7 +442,7 @@ X11DRV_DrawArc( DC *dc, INT32 left, INT32 top, INT32 right,
              * from these (compile switch or whatever)
              */
             if (lines == 2) {
-                INT32 dx1,dy1;
+                INT dx1,dy1;
                 points[3] = points[1];
 	points[1].x = dc->w.DCOrgX + xcenter;
 	points[1].y = dc->w.DCOrgY + ycenter;
@@ -485,9 +485,9 @@ X11DRV_DrawArc( DC *dc, INT32 left, INT32 top, INT32 right,
 /***********************************************************************
  *           X11DRV_Arc
  */
-BOOL32
-X11DRV_Arc( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
-            INT32 xstart, INT32 ystart, INT32 xend, INT32 yend )
+BOOL
+X11DRV_Arc( DC *dc, INT left, INT top, INT right, INT bottom,
+            INT xstart, INT ystart, INT xend, INT yend )
 {
     return X11DRV_DrawArc( dc, left, top, right, bottom,
 			   xstart, ystart, xend, yend, 0 );
@@ -497,9 +497,9 @@ X11DRV_Arc( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
 /***********************************************************************
  *           X11DRV_Pie
  */
-BOOL32
-X11DRV_Pie( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
-            INT32 xstart, INT32 ystart, INT32 xend, INT32 yend )
+BOOL
+X11DRV_Pie( DC *dc, INT left, INT top, INT right, INT bottom,
+            INT xstart, INT ystart, INT xend, INT yend )
 {
     return X11DRV_DrawArc( dc, left, top, right, bottom,
 			   xstart, ystart, xend, yend, 2 );
@@ -508,9 +508,9 @@ X11DRV_Pie( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
 /***********************************************************************
  *           X11DRV_Chord
  */
-BOOL32
-X11DRV_Chord( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
-              INT32 xstart, INT32 ystart, INT32 xend, INT32 yend )
+BOOL
+X11DRV_Chord( DC *dc, INT left, INT top, INT right, INT bottom,
+              INT xstart, INT ystart, INT xend, INT yend )
 {
     return X11DRV_DrawArc( dc, left, top, right, bottom,
 		  	   xstart, ystart, xend, yend, 1 );
@@ -520,10 +520,10 @@ X11DRV_Chord( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom,
 /***********************************************************************
  *           X11DRV_Ellipse
  */
-BOOL32
-X11DRV_Ellipse( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom )
+BOOL
+X11DRV_Ellipse( DC *dc, INT left, INT top, INT right, INT bottom )
 {
-    INT32 width, oldwidth;
+    INT width, oldwidth;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
     left   = XLPTODP( dc, left );
@@ -532,8 +532,8 @@ X11DRV_Ellipse( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom )
     bottom = YLPTODP( dc, bottom );
     if ((left == right) || (top == bottom)) return TRUE;
 
-    if (right < left) { INT32 tmp = right; right = left; left = tmp; }
-    if (bottom < top) { INT32 tmp = bottom; bottom = top; top = tmp; }
+    if (right < left) { INT tmp = right; right = left; left = tmp; }
+    if (bottom < top) { INT tmp = bottom; bottom = top; top = tmp; }
     
     oldwidth = width = physDev->pen.width;
     if (!width) width = 1;
@@ -567,10 +567,10 @@ X11DRV_Ellipse( DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom )
 /***********************************************************************
  *           X11DRV_Rectangle
  */
-BOOL32
-X11DRV_Rectangle(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
+BOOL
+X11DRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom)
 {
-    INT32 width, oldwidth, oldjoinstyle;
+    INT width, oldwidth, oldjoinstyle;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
     TRACE(graphics, "(%d %d %d %d)\n", 
@@ -583,8 +583,8 @@ X11DRV_Rectangle(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
 
     if ((left == right) || (top == bottom)) return TRUE;
 
-    if (right < left) { INT32 tmp = right; right = left; left = tmp; }
-    if (bottom < top) { INT32 tmp = bottom; bottom = top; top = tmp; }
+    if (right < left) { INT tmp = right; right = left; left = tmp; }
+    if (bottom < top) { INT tmp = bottom; bottom = top; top = tmp; }
 
     oldwidth = width = physDev->pen.width;
     if (!width) width = 1;
@@ -626,11 +626,11 @@ X11DRV_Rectangle(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom)
 /***********************************************************************
  *           X11DRV_RoundRect
  */
-BOOL32
-X11DRV_RoundRect( DC *dc, INT32 left, INT32 top, INT32 right,
-                  INT32 bottom, INT32 ell_width, INT32 ell_height )
+BOOL
+X11DRV_RoundRect( DC *dc, INT left, INT top, INT right,
+                  INT bottom, INT ell_width, INT ell_height )
 {
-    INT32 width, oldwidth, oldendcap;
+    INT width, oldwidth, oldendcap;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
     TRACE(graphics, "(%d %d %d %d  %d %d\n", 
@@ -651,8 +651,8 @@ X11DRV_RoundRect( DC *dc, INT32 left, INT32 top, INT32 right,
 
     /* Fix the coordinates */
 
-    if (right < left) { INT32 tmp = right; right = left; left = tmp; }
-    if (bottom < top) { INT32 tmp = bottom; bottom = top; top = tmp; }
+    if (right < left) { INT tmp = right; right = left; left = tmp; }
+    if (bottom < top) { INT tmp = bottom; bottom = top; top = tmp; }
 
     oldwidth = width = physDev->pen.width;
     oldendcap = physDev->pen.endcap;
@@ -820,7 +820,7 @@ X11DRV_RoundRect( DC *dc, INT32 left, INT32 top, INT32 right,
  *           X11DRV_SetPixel
  */
 COLORREF
-X11DRV_SetPixel( DC *dc, INT32 x, INT32 y, COLORREF color )
+X11DRV_SetPixel( DC *dc, INT x, INT y, COLORREF color )
 {
     Pixel pixel;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
@@ -843,7 +843,7 @@ X11DRV_SetPixel( DC *dc, INT32 x, INT32 y, COLORREF color )
  *           X11DRV_GetPixel
  */
 COLORREF
-X11DRV_GetPixel( DC *dc, INT32 x, INT32 y )
+X11DRV_GetPixel( DC *dc, INT x, INT y )
 {
     static Pixmap pixmap = 0;
     XImage * image;
@@ -879,35 +879,35 @@ X11DRV_GetPixel( DC *dc, INT32 x, INT32 y )
 /***********************************************************************
  *           X11DRV_PaintRgn
  */
-BOOL32
-X11DRV_PaintRgn( DC *dc, HRGN32 hrgn )
+BOOL
+X11DRV_PaintRgn( DC *dc, HRGN hrgn )
 {
-    RECT32 box;
-    HRGN32 tmpVisRgn, prevVisRgn;
-    HDC32  hdc = dc->hSelf; /* FIXME: should not mix dc/hdc this way */
+    RECT box;
+    HRGN tmpVisRgn, prevVisRgn;
+    HDC  hdc = dc->hSelf; /* FIXME: should not mix dc/hdc this way */
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
-    if (!(tmpVisRgn = CreateRectRgn32( 0, 0, 0, 0 ))) return FALSE;
+    if (!(tmpVisRgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE;
 
       /* Transform region into device co-ords */
     if (  !REGION_LPTODP( hdc, tmpVisRgn, hrgn )
-        || OffsetRgn32( tmpVisRgn, dc->w.DCOrgX, dc->w.DCOrgY ) == ERROR) {
-        DeleteObject32( tmpVisRgn );
+        || OffsetRgn( tmpVisRgn, dc->w.DCOrgX, dc->w.DCOrgY ) == ERROR) {
+        DeleteObject( tmpVisRgn );
 	return FALSE;
     }
 
       /* Modify visible region */
-    if (!(prevVisRgn = SaveVisRgn( hdc ))) {
-        DeleteObject32( tmpVisRgn );
+    if (!(prevVisRgn = SaveVisRgn16( hdc ))) {
+        DeleteObject( tmpVisRgn );
 	return FALSE;
     }
-    CombineRgn32( tmpVisRgn, prevVisRgn, tmpVisRgn, RGN_AND );
-    SelectVisRgn( hdc, tmpVisRgn );
-    DeleteObject32( tmpVisRgn );
+    CombineRgn( tmpVisRgn, prevVisRgn, tmpVisRgn, RGN_AND );
+    SelectVisRgn16( hdc, tmpVisRgn );
+    DeleteObject( tmpVisRgn );
 
       /* Fill the region */
 
-    GetRgnBox32( dc->w.hGCClipRgn, &box );
+    GetRgnBox( dc->w.hGCClipRgn, &box );
     if (X11DRV_SetupGCForBrush( dc ))
 	TSXFillRectangle( display, physDev->drawable, physDev->gc,
 		          box.left, box.top,
@@ -915,17 +915,17 @@ X11DRV_PaintRgn( DC *dc, HRGN32 hrgn )
 
       /* Restore the visible region */
 
-    RestoreVisRgn( hdc );
+    RestoreVisRgn16( hdc );
     return TRUE;
 }
 
 /**********************************************************************
  *          X11DRV_Polyline
  */
-BOOL32
-X11DRV_Polyline( DC *dc, const POINT32* pt, INT32 count )
+BOOL
+X11DRV_Polyline( DC *dc, const POINT* pt, INT count )
 {
-    INT32 oldwidth;
+    INT oldwidth;
     register int i;
     XPoint *points;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
@@ -952,8 +952,8 @@ X11DRV_Polyline( DC *dc, const POINT32* pt, INT32 count )
 /**********************************************************************
  *          X11DRV_Polygon
  */
-BOOL32
-X11DRV_Polygon( DC *dc, const POINT32* pt, INT32 count )
+BOOL
+X11DRV_Polygon( DC *dc, const POINT* pt, INT count )
 {
     register int i;
     XPoint *points;
@@ -983,18 +983,18 @@ X11DRV_Polygon( DC *dc, const POINT32* pt, INT32 count )
 /**********************************************************************
  *          X11DRV_PolyPolygon
  */
-BOOL32 
-X11DRV_PolyPolygon( DC *dc, const POINT32* pt, const INT32* counts, UINT32 polygons)
+BOOL 
+X11DRV_PolyPolygon( DC *dc, const POINT* pt, const INT* counts, UINT polygons)
 {
-    HRGN32 hrgn;
+    HRGN hrgn;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
     /* FIXME: The points should be converted to device coords before */
     /* creating the region. */
 
-    hrgn = CreatePolyPolygonRgn32( pt, counts, polygons, dc->w.polyFillMode );
+    hrgn = CreatePolyPolygonRgn( pt, counts, polygons, dc->w.polyFillMode );
     X11DRV_PaintRgn( dc, hrgn );
-    DeleteObject32( hrgn );
+    DeleteObject( hrgn );
 
       /* Draw the outline of the polygons */
 
@@ -1027,8 +1027,8 @@ X11DRV_PolyPolygon( DC *dc, const POINT32* pt, const INT32* counts, UINT32 polyg
 /**********************************************************************
  *          X11DRV_PolyPolyline
  */
-BOOL32 
-X11DRV_PolyPolyline( DC *dc, const POINT32* pt, const DWORD* counts, DWORD polylines )
+BOOL 
+X11DRV_PolyPolyline( DC *dc, const POINT* pt, const DWORD* counts, DWORD polylines )
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
     if (X11DRV_SetupGCForPen ( dc ))
@@ -1138,20 +1138,20 @@ static void X11DRV_InternalFloodFill(XImage *image, DC *dc,
 struct FloodFill_params
 {
     DC      *dc;
-    INT32    x;
-    INT32    y;
+    INT    x;
+    INT    y;
     COLORREF color;
-    UINT32   fillType;
+    UINT   fillType;
 };
 
-static BOOL32 X11DRV_DoFloodFill( const struct FloodFill_params *params )
+static BOOL X11DRV_DoFloodFill( const struct FloodFill_params *params )
 {
     XImage *image;
-    RECT32 rect;
+    RECT rect;
     DC *dc = params->dc;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
-    if (GetRgnBox32( dc->w.hGCClipRgn, &rect ) == ERROR) return FALSE;
+    if (GetRgnBox( dc->w.hGCClipRgn, &rect ) == ERROR) return FALSE;
 
     if (!(image = XGetImage( display, physDev->drawable,
                              rect.left,
@@ -1181,17 +1181,17 @@ static BOOL32 X11DRV_DoFloodFill( const struct FloodFill_params *params )
 /**********************************************************************
  *          X11DRV_ExtFloodFill
  */
-BOOL32
-X11DRV_ExtFloodFill( DC *dc, INT32 x, INT32 y, COLORREF color,
-                     UINT32 fillType )
+BOOL
+X11DRV_ExtFloodFill( DC *dc, INT x, INT y, COLORREF color,
+                     UINT fillType )
 {
-    BOOL32 result;
+    BOOL result;
     struct FloodFill_params params = { dc, x, y, color, fillType };
 
     TRACE(graphics, "X11DRV_ExtFloodFill %d,%d %06lx %d\n",
                       x, y, color, fillType );
 
-    if (!PtVisible32( dc->hSelf, x, y )) return FALSE;
+    if (!PtVisible( dc->hSelf, x, y )) return FALSE;
     EnterCriticalSection( &X11DRV_CritSection );
     result = CALL_LARGE_STACK( X11DRV_DoFloodFill, &params );
     LeaveCriticalSection( &X11DRV_CritSection );
@@ -1249,9 +1249,9 @@ X11DRV_ExtFloodFill( DC *dc, INT32 x, INT32 y, COLORREF color,
 *       level is the recursion depth
 *       returns true if the recusion can be terminated
 */
-static BOOL32 BezierCheck( int level, POINT32 *Points)
+static BOOL BezierCheck( int level, POINT *Points)
 { 
-    INT32 dx, dy;
+    INT dx, dy;
     dx=Points[3].x-Points[0].x;
     dy=Points[3].y-Points[0].y;
     if(ABS(dy)<=ABS(dx)){/* shallow line */
@@ -1316,7 +1316,7 @@ static BOOL32 BezierCheck( int level, POINT32 *Points)
  *   *pIx       nr points calculated sofar
  *   
  */
-static void X11DRV_Bezier(int level, DC * dc, POINT32 *Points, 
+static void X11DRV_Bezier(int level, DC * dc, POINT *Points, 
                           XPoint* xpoints, unsigned int* pIx)
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
@@ -1336,7 +1336,7 @@ static void X11DRV_Bezier(int level, DC * dc, POINT32 *Points,
         xpoints[*pIx].y= dc->w.DCOrgY + BEZIERSHIFTDOWN(Points[3].y);
         (*pIx) ++;
     } else {
-        POINT32 Points2[4]; /* for the second recursive call */
+        POINT Points2[4]; /* for the second recursive call */
         Points2[3]=Points[3];
         BEZIERMIDDLE(Points2[2], Points[2], Points[3]);
         BEZIERMIDDLE(Points2[0], Points[1], Points[2]);
@@ -1364,10 +1364,10 @@ static void X11DRV_Bezier(int level, DC * dc, POINT32 *Points,
  *      [i] count, number of points in BezierPoints, must be a 
  *          multiple of 3.
  */
-BOOL32
-X11DRV_PolyBezier(DC *dc, POINT32 start, const POINT32* BezierPoints, DWORD count)
+BOOL
+X11DRV_PolyBezier(DC *dc, POINT start, const POINT* BezierPoints, DWORD count)
 {
-    POINT32 Points[4]; 
+    POINT Points[4]; 
     int i;
     unsigned int ix=0;
     XPoint* xpoints;
diff --git a/graphics/x11drv/init.c b/graphics/x11drv/init.c
index 019ffacf8a2..032a846e6b2 100644
--- a/graphics/x11drv/init.c
+++ b/graphics/x11drv/init.c
@@ -20,11 +20,11 @@
 #include "ldt.h"
 #include "monitor.h"
 
-static BOOL32 X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
+static BOOL X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
                                LPCSTR output, const DEVMODE16* initData );
-static BOOL32 X11DRV_DeleteDC( DC *dc );
+static BOOL X11DRV_DeleteDC( DC *dc );
 
-static INT32 X11DRV_Escape( DC *dc, INT32 nEscape, INT32 cbInput,
+static INT X11DRV_Escape( DC *dc, INT nEscape, INT cbInput,
                             SEGPTR lpInData, SEGPTR lpOutData );
 
 static const DC_FUNCTIONS X11DRV_Funcs =
@@ -122,7 +122,7 @@ static DeviceCaps X11DRV_DevCaps = {
 /**********************************************************************
  *	     X11DRV_Init
  */
-BOOL32 X11DRV_Init(void)
+BOOL X11DRV_Init(void)
 {
     /* FIXME: colormap management should be merged with the X11DRV */
 
@@ -178,7 +178,7 @@ BOOL32 X11DRV_Init(void)
 /**********************************************************************
  *	     X11DRV_CreateDC
  */
-static BOOL32 X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
+static BOOL X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
                                LPCSTR output, const DEVMODE16* initData )
 {
     X11DRV_PDEVICE *physDev;
@@ -206,7 +206,7 @@ static BOOL32 X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
         dc->w.totalExtent.top    = 0;
         dc->w.totalExtent.right  = bmp->bitmap.bmWidth;
         dc->w.totalExtent.bottom = bmp->bitmap.bmHeight;
-        dc->w.hVisRgn            = CreateRectRgnIndirect32( &dc->w.totalExtent );
+        dc->w.hVisRgn            = CreateRectRgnIndirect( &dc->w.totalExtent );
 
 	GDI_HEAP_UNLOCK( dc->w.hBitmap );
     }
@@ -220,7 +220,7 @@ static BOOL32 X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
         dc->w.totalExtent.top    = 0;
         dc->w.totalExtent.right  = MONITOR_GetWidth(&MONITOR_PrimaryMonitor);
         dc->w.totalExtent.bottom = MONITOR_GetHeight(&MONITOR_PrimaryMonitor);
-        dc->w.hVisRgn            = CreateRectRgnIndirect32( &dc->w.totalExtent );
+        dc->w.hVisRgn            = CreateRectRgnIndirect( &dc->w.totalExtent );
     }
 
     if (!dc->w.hVisRgn)
@@ -239,7 +239,7 @@ static BOOL32 X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
 /**********************************************************************
  *	     X11DRV_DeleteDC
  */
-static BOOL32 X11DRV_DeleteDC( DC *dc )
+static BOOL X11DRV_DeleteDC( DC *dc )
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
     TSXFreeGC( display, physDev->gc );
@@ -251,7 +251,7 @@ static BOOL32 X11DRV_DeleteDC( DC *dc )
 /**********************************************************************
  *           X11DRV_Escape
  */
-static INT32 X11DRV_Escape( DC *dc, INT32 nEscape, INT32 cbInput,
+static INT X11DRV_Escape( DC *dc, INT nEscape, INT cbInput,
                             SEGPTR lpInData, SEGPTR lpOutData )
 {
     switch( nEscape )
diff --git a/graphics/x11drv/objects.c b/graphics/x11drv/objects.c
index c4f90c95b05..627557fc41a 100644
--- a/graphics/x11drv/objects.c
+++ b/graphics/x11drv/objects.c
@@ -18,23 +18,23 @@
 #include "debug.h"
 
 
-extern HBITMAP32 X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP32 hbitmap,
+extern HBITMAP X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP hbitmap,
                                              BITMAPOBJ * bmp );
-extern HBRUSH32 X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH32 hbrush,
+extern HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush,
                                            BRUSHOBJ * brush );
-extern HFONT32 X11DRV_FONT_SelectObject( DC * dc, HFONT32 hfont,
+extern HFONT X11DRV_FONT_SelectObject( DC * dc, HFONT hfont,
                                          FONTOBJ * font );
-extern HPEN32 X11DRV_PEN_SelectObject( DC * dc, HPEN32 hpen, PENOBJ * pen );
+extern HPEN X11DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen );
 
-extern BOOL32 X11DRV_BITMAP_DeleteObject( HBITMAP32 hbitmap, BITMAPOBJ *bmp );
+extern BOOL X11DRV_BITMAP_DeleteObject( HBITMAP hbitmap, BITMAPOBJ *bmp );
 
 /***********************************************************************
  *           X11DRV_SelectObject
  */
-HGDIOBJ32 X11DRV_SelectObject( DC *dc, HGDIOBJ32 handle )
+HGDIOBJ X11DRV_SelectObject( DC *dc, HGDIOBJ handle )
 {
     GDIOBJHDR *ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE );
-    HGDIOBJ32 ret = 0;
+    HGDIOBJ ret = 0;
 
     if (!ptr) return 0;
     TRACE(gdi, "hdc=%04x %04x\n", dc->hSelf, handle );
@@ -65,10 +65,10 @@ HGDIOBJ32 X11DRV_SelectObject( DC *dc, HGDIOBJ32 handle )
 /***********************************************************************
  *           X11DRV_DeleteObject
  */
-BOOL32 X11DRV_DeleteObject( HGDIOBJ32 handle )
+BOOL X11DRV_DeleteObject( HGDIOBJ handle )
 {
     GDIOBJHDR *ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE );
-    BOOL32 ret = 0;
+    BOOL ret = 0;
 
     if (!ptr) return FALSE;
      
diff --git a/graphics/x11drv/oembitmap.c b/graphics/x11drv/oembitmap.c
index 67255b7c590..57cd6b30f69 100644
--- a/graphics/x11drv/oembitmap.c
+++ b/graphics/x11drv/oembitmap.c
@@ -92,7 +92,7 @@ typedef unsigned long Pixel;
 static struct
 {
     char** data;   /* Pointer to bitmap data */
-    BOOL32 color;  /* Is it a color bitmap?  */
+    BOOL color;  /* Is it a color bitmap?  */
 } OBM_Pixmaps_Data[OBM_LAST-OBM_FIRST+1] = {
     { obm_closed_95,TRUE},      /* OBM_CLOSED */
     { obm_radiocheck, FALSE },	/* OBM_RADIOCHECK */
@@ -299,20 +299,20 @@ static XpmColorSymbol OBM_BlackAndWhite[2] =
 typedef struct
 {
     char     **data;      /* In: bitmap data */
-    BOOL32     color;     /* In: color or monochrome */
-    BOOL32     need_mask; /* In: do we need a mask? */
+    BOOL     color;     /* In: color or monochrome */
+    BOOL     need_mask; /* In: do we need a mask? */
     HBITMAP16  bitmap;    /* Out: resulting bitmap */
     HBITMAP16  mask;      /* Out: resulting mask (if needed) */
-    POINT32    hotspot;   /* Out: bitmap hotspot */
+    POINT    hotspot;   /* Out: bitmap hotspot */
 } OBM_BITMAP_DESCR;
 
 
 /***********************************************************************
  *           OBM_InitColorSymbols
  */
-static BOOL32 OBM_InitColorSymbols()
+static BOOL OBM_InitColorSymbols()
 {
-    static BOOL32 initialized = FALSE;
+    static BOOL initialized = FALSE;
     int i;
 
     if (initialized) return TRUE;  /* Already initialised */
@@ -322,7 +322,7 @@ static BOOL32 OBM_InitColorSymbols()
     {
         if (OBM_Colors[i].pixel & 0xff000000)  /* PALETTEINDEX */
             OBM_Colors[i].pixel = COLOR_ToPhysical( NULL,
-                                    GetSysColor32(OBM_Colors[i].pixel & 0xff));
+                                    GetSysColor(OBM_Colors[i].pixel & 0xff));
         else  /* RGB*/
             OBM_Colors[i].pixel = COLOR_ToPhysical( NULL, OBM_Colors[i].pixel);
     }
@@ -376,7 +376,7 @@ static HBITMAP16 OBM_MakeBitmap( WORD width, WORD height,
  *
  * The Xlib critical section must be entered before calling this function.
  */
-static BOOL32 OBM_CreateBitmaps( OBM_BITMAP_DESCR *descr )
+static BOOL OBM_CreateBitmaps( OBM_BITMAP_DESCR *descr )
 {
 #ifdef HAVE_LIBXXPM
     Pixmap pixmap, pixmask;
@@ -457,7 +457,7 @@ static HBITMAP16 OBM_LoadBitmap( WORD id )
 /***********************************************************************
  *           OBM_LoadCursorIcon
  */
-static HGLOBAL16 OBM_LoadCursorIcon( WORD id, BOOL32 fCursor )
+static HGLOBAL16 OBM_LoadCursorIcon( WORD id, BOOL fCursor )
 {
     OBM_BITMAP_DESCR descr;
     HGLOBAL16 handle;
@@ -512,8 +512,8 @@ static HGLOBAL16 OBM_LoadCursorIcon( WORD id, BOOL32 fCursor )
     if (!(handle = GlobalAlloc16( GMEM_MOVEABLE,
                                   sizeof(CURSORICONINFO) + sizeXor + sizeAnd)))
     {
-        DeleteObject32( descr.bitmap );
-        DeleteObject32( descr.mask );
+        DeleteObject( descr.bitmap );
+        DeleteObject( descr.mask );
         return 0;
     }
 
@@ -552,12 +552,12 @@ static HGLOBAL16 OBM_LoadCursorIcon( WORD id, BOOL32 fCursor )
         }
     }
 
-    if (descr.mask) GetBitmapBits32( descr.mask, sizeAnd, (char *)(pInfo + 1));
+    if (descr.mask) GetBitmapBits( descr.mask, sizeAnd, (char *)(pInfo + 1));
     else memset( (char *)(pInfo + 1), 0xff, sizeAnd );
-    GetBitmapBits32( descr.bitmap, sizeXor, (char *)(pInfo + 1) + sizeAnd );
+    GetBitmapBits( descr.bitmap, sizeXor, (char *)(pInfo + 1) + sizeAnd );
 
-    DeleteObject32( descr.bitmap );
-    DeleteObject32( descr.mask );
+    DeleteObject( descr.bitmap );
+    DeleteObject( descr.mask );
 
     if (fCursor) OBM_Cursors[id] = handle;
     return handle;
@@ -567,7 +567,7 @@ static HGLOBAL16 OBM_LoadCursorIcon( WORD id, BOOL32 fCursor )
  *           X11DRV_LoadOEMResource
  *
  */
-HANDLE32 X11DRV_LoadOEMResource(WORD resid, WORD type)
+HANDLE X11DRV_LoadOEMResource(WORD resid, WORD type)
 {
     switch(type) {
     case OEM_BITMAP:
@@ -591,7 +591,7 @@ HANDLE32 X11DRV_LoadOEMResource(WORD resid, WORD type)
  *
  * Initializes the OBM_Pixmaps_Data and OBM_Icons_Data struct
  */
-BOOL32 X11DRV_OBM_Init(void)
+BOOL X11DRV_OBM_Init(void)
 {
     if (TWEAK_WineLook == WIN31_LOOK) {
 	OBM_Pixmaps_Data[OBM_ZOOMD - OBM_FIRST].data = obm_zoomd;
diff --git a/graphics/x11drv/pen.c b/graphics/x11drv/pen.c
index 52ff94b6cf7..f951bf82344 100644
--- a/graphics/x11drv/pen.c
+++ b/graphics/x11drv/pen.c
@@ -22,9 +22,9 @@ static const char PEN_alternate[]  = { 1,1 };      /* FIXME */
 /***********************************************************************
  *           PEN_SelectObject
  */
-HPEN32 X11DRV_PEN_SelectObject( DC * dc, HPEN32 hpen, PENOBJ * pen )
+HPEN X11DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
 {
-    HPEN32 prevHandle = dc->w.hPen;
+    HPEN prevHandle = dc->w.hPen;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
     dc->w.hPen = hpen;
diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c
index 0122c9751be..7c3f7dba307 100644
--- a/graphics/x11drv/text.c
+++ b/graphics/x11drv/text.c
@@ -26,18 +26,18 @@
 /***********************************************************************
  *           X11DRV_ExtTextOut
  */
-BOOL32
-X11DRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
-                   const RECT32 *lprect, LPCSTR str, UINT32 count,
-                   const INT32 *lpDx )
+BOOL
+X11DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
+                   const RECT *lprect, LPCSTR str, UINT count,
+                   const INT *lpDx )
 {
     int 	        i;
     fontObject*		pfo;
-    INT32	 	width, ascent, descent, xwidth, ywidth;
+    INT	 	width, ascent, descent, xwidth, ywidth;
     XFontStruct*	font;
-    RECT32 		rect;
+    RECT 		rect;
     char		dfBreakChar, lfUnderline, lfStrikeOut;
-    BOOL32		rotated = FALSE;
+    BOOL		rotated = FALSE;
     X11DRV_PDEVICE      *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
     if (!X11DRV_SetupGCForText( dc )) return TRUE;
@@ -75,7 +75,7 @@ X11DRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
     {
         if (!lprect)  /* not always */
         {
-            SIZE32 sz;
+            SIZE sz;
             if (flags & ETO_CLIPPED)  /* Can't clip with no rectangle */
 	      return FALSE;
 	    if (!X11DRV_GetTextExtentPoint( dc, str, count, &sz ))
@@ -123,7 +123,7 @@ X11DRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
     }
     else
     {
-        SIZE32 sz;
+        SIZE sz;
         if (!X11DRV_GetTextExtentPoint( dc, str, count, &sz ))
 	    return FALSE;
 	width = XLSTODS(dc, sz.cx);
@@ -179,7 +179,7 @@ X11DRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
 
     if (flags & ETO_CLIPPED)
     {
-        SaveVisRgn( dc->hSelf );
+        SaveVisRgn16( dc->hSelf );
         CLIPPING_IntersectVisRect( dc, rect.left, rect.top, rect.right,
                                    rect.bottom, FALSE );
     }
@@ -345,7 +345,7 @@ X11DRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
     }
 
     if (flags & ETO_CLIPPED) 
-        RestoreVisRgn( dc->hSelf );
+        RestoreVisRgn16( dc->hSelf );
 
     return TRUE;
 }
diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c
index c73ec05c551..5c4de2fd297 100644
--- a/graphics/x11drv/xfont.c
+++ b/graphics/x11drv/xfont.c
@@ -170,11 +170,11 @@ static fontObject*      fontCache = NULL;		/* array */
 static int		fontCacheSize = FONTCACHE;
 static int		fontLF = -1, fontMRU = -1;	/* last free, most recently used */
 
-#define __PFONT(pFont)     ( fontCache + ((UINT32)(pFont) & 0x0000FFFF) )
-#define CHECK_PFONT(pFont) ( (((UINT32)(pFont) & 0xFFFF0000) == X_PFONT_MAGIC) &&\
-			     (((UINT32)(pFont) & 0x0000FFFF) < fontCacheSize) )
+#define __PFONT(pFont)     ( fontCache + ((UINT)(pFont) & 0x0000FFFF) )
+#define CHECK_PFONT(pFont) ( (((UINT)(pFont) & 0xFFFF0000) == X_PFONT_MAGIC) &&\
+			     (((UINT)(pFont) & 0x0000FFFF) < fontCacheSize) )
 
-static INT32 XFONT_IsSubset(fontInfo*, fontInfo*);
+static INT XFONT_IsSubset(fontInfo*, fontInfo*);
 static void  XFONT_CheckFIList(fontResource*, fontInfo*, int subset_action);
 static void  XFONT_GrowFreeList(int start, int end);
 static void XFONT_RemoveFontResource(fontResource** ppfr);
@@ -479,8 +479,8 @@ done:
  *       should be bulletproof enough to allow us to avoid hacks like
  *	 if( uRelax == 200 ) even despite LFD being so braindead.
  */
-static BOOL32  LFD_ComposeLFD( fontObject* fo, 
-			       INT32 height, LPSTR lpLFD, UINT32 uRelax )
+static BOOL  LFD_ComposeLFD( fontObject* fo, 
+			       INT height, LPSTR lpLFD, UINT uRelax )
 {
    fontEncodingTemplate* boba;
    int		i, h, w, ch, point = 0;
@@ -489,7 +489,7 @@ static BOOL32  LFD_ComposeLFD( fontObject* fo,
    char         h_string[64], point_string[64];
 
    *(lpLFD+MAX_LFD_LENGTH-1)=0;
-   lstrcpy32A( lpLFD, fo->fr->resource );
+   lstrcpyA( lpLFD, fo->fr->resource );
 
 /* add weight */
    switch( fo->fi->df.dfWeight )
@@ -593,7 +593,7 @@ static BOOL32  LFD_ComposeLFD( fontObject* fo,
 	case 255: /* no suffix */
    }
 
-   lpch = lpLFD + lstrlen32A(lpLFD);
+   lpch = lpLFD + lstrlenA(lpLFD);
    ch = (fo->fi->fi_flags & FI_SCALABLE) ? '0' : LFDSeparator[0];
 
    switch( uRelax )
@@ -656,13 +656,13 @@ static BOOL32  LFD_ComposeLFD( fontObject* fo,
  * font info		- http://www.microsoft.com/kb/articles/q65/1/23.htm
  * Windows font metrics	- http://www.microsoft.com/kb/articles/q32/6/67.htm
  */
-static BOOL32 XFONT_GetLeading( LPIFONTINFO16 pFI, XFontStruct* x_fs, INT32*
-       pIL, INT32* pEL, XFONTTRANS *XFT )
+static BOOL XFONT_GetLeading( LPIFONTINFO16 pFI, XFontStruct* x_fs, INT*
+       pIL, INT* pEL, XFONTTRANS *XFT )
 {
     unsigned long height;
     unsigned min = (unsigned char)pFI->dfFirstChar;
     unsigned max = (unsigned char)pFI->dfLastChar;
-    BOOL32 bHaveCapHeight = (pFI->dfCharSet == ANSI_CHARSET && 'X' >= min && 'X' <= max );
+    BOOL bHaveCapHeight = (pFI->dfCharSet == ANSI_CHARSET && 'X' >= min && 'X' <= max );
 
     if( pEL ) *pEL = 0;
 
@@ -670,7 +670,7 @@ static BOOL32 XFONT_GetLeading( LPIFONTINFO16 pFI, XFontStruct* x_fs, INT32*
         Atom RAW_CAP_HEIGHT = TSXInternAtom(display, "RAW_CAP_HEIGHT", TRUE);
 	if(TSXGetFontProperty(x_fs, RAW_CAP_HEIGHT, &height))
 	    *pIL = XFT->ascent - 
-                            (INT32)(XFT->pixelsize / 1000.0 * height);
+                            (INT)(XFT->pixelsize / 1000.0 * height);
 	else
 	    *pIL = 0;
 	return bHaveCapHeight && x_fs->per_char;
@@ -698,7 +698,7 @@ static BOOL32 XFONT_GetLeading( LPIFONTINFO16 pFI, XFontStruct* x_fs, INT32*
     return (bHaveCapHeight && x_fs->per_char);
 }
 
-static INT32 XFONT_GetAvgCharWidth( LPIFONTINFO16 pFI, XFontStruct* x_fs,
+static INT XFONT_GetAvgCharWidth( LPIFONTINFO16 pFI, XFontStruct* x_fs,
 				    XFONTTRANS *XFT)
 {
     unsigned min = (unsigned char)pFI->dfFirstChar;
@@ -723,7 +723,7 @@ static INT32 XFONT_GetAvgCharWidth( LPIFONTINFO16 pFI, XFontStruct* x_fs,
     return x_fs->min_bounds.width;
 }
 
-static INT32 XFONT_GetMaxCharWidth(fontObject *pfo)
+static INT XFONT_GetMaxCharWidth(fontObject *pfo)
 {
     unsigned min = (unsigned char)pfo->fs->min_char_or_byte2;
     unsigned max = (unsigned char)pfo->fs->max_char_or_byte2;
@@ -755,7 +755,7 @@ static INT32 XFONT_GetMaxCharWidth(fontObject *pfo)
 static void XFONT_SetFontMetric(fontInfo* fi, fontResource* fr, XFontStruct* xfs)
 {
     unsigned	 min, max;
-    INT32	 el, il;
+    INT	 el, il;
 
     fi->df.dfFirstChar = (BYTE)(min = xfs->min_char_or_byte2);
     fi->df.dfLastChar = (BYTE)(max = xfs->max_char_or_byte2);
@@ -775,7 +775,7 @@ static void XFONT_SetFontMetric(fontInfo* fi, fontResource* fr, XFontStruct* xfs
     fi->df.dfInternalLeading = (INT16)il;
     fi->df.dfExternalLeading = (INT16)el;
 
-    fi->df.dfPoints = (INT16)(((INT32)(fi->df.dfPixHeight - 
+    fi->df.dfPoints = (INT16)(((INT)(fi->df.dfPixHeight - 
 	       fi->df.dfInternalLeading) * 72 + (fi->df.dfVertRes >> 1)) / fi->df.dfVertRes);
 
     if( xfs->min_bounds.width != xfs->max_bounds.width )
@@ -798,7 +798,7 @@ static void XFONT_SetFontMetric(fontInfo* fi, fontResource* fr, XFontStruct* xfs
  *
  * GetTextMetrics() back end.
  */
-static void XFONT_GetTextMetric( fontObject* pfo, LPTEXTMETRIC32A pTM )
+static void XFONT_GetTextMetric( fontObject* pfo, LPTEXTMETRICA pTM )
 {
     LPIFONTINFO16 pdf = &pfo->fi->df;
 
@@ -837,7 +837,7 @@ static void XFONT_GetTextMetric( fontObject* pfo, LPTEXTMETRIC32A pTM )
 	pTM->tmWeight += 100;
     } 
 
-    *(INT32*)&pTM->tmFirstChar = *(INT32*)&pdf->dfFirstChar;
+    *(INT*)&pTM->tmFirstChar = *(INT*)&pdf->dfFirstChar;
 
     pTM->tmCharSet = pdf->dfCharSet;
     pTM->tmPitchAndFamily = pdf->dfPitchAndFamily;
@@ -851,7 +851,7 @@ static void XFONT_GetTextMetric( fontObject* pfo, LPTEXTMETRIC32A pTM )
  *
  * Retrieve font metric info (enumeration).
  */
-static UINT32 XFONT_GetFontMetric( fontInfo* pfi, LPENUMLOGFONTEX16 pLF,
+static UINT XFONT_GetFontMetric( fontInfo* pfi, LPENUMLOGFONTEX16 pLF,
                                                   LPNEWTEXTMETRIC16 pTM )
 {
     memset( pLF, 0, sizeof(*pLF) );
@@ -871,7 +871,7 @@ static UINT32 XFONT_GetFontMetric( fontInfo* pfi, LPENUMLOGFONTEX16 pLF,
     pTM->tmPitchAndFamily = pfi->df.dfPitchAndFamily;
     plf->lfPitchAndFamily = (pfi->df.dfPitchAndFamily & 0xF1) + 1;
 
-    lstrcpyn32A( plf->lfFaceName, pfi->df.dfFace, LF_FACESIZE );
+    lstrcpynA( plf->lfFaceName, pfi->df.dfFace, LF_FACESIZE );
 #undef plf
 
     pTM->tmAscent = pfi->df.dfAscent;
@@ -881,7 +881,7 @@ static UINT32 XFONT_GetFontMetric( fontInfo* pfi, LPENUMLOGFONTEX16 pLF,
     pTM->tmDigitizedAspectX = pfi->df.dfHorizRes;
     pTM->tmDigitizedAspectY = pfi->df.dfVertRes;
 
-    *(INT32*)&pTM->tmFirstChar = *(INT32*)&pfi->df.dfFirstChar;
+    *(INT*)&pTM->tmFirstChar = *(INT*)&pfi->df.dfFirstChar;
 
     /* return font type */
 
@@ -934,7 +934,7 @@ static BYTE XFONT_FixupFlags( LPCSTR lfFaceName )
  *
  * INIT ONLY
  */
-static BOOL32 XFONT_CheckResourceName( LPSTR resource, LPCSTR name, INT32 n )
+static BOOL XFONT_CheckResourceName( LPSTR resource, LPCSTR name, INT n )
 {
     resource = LFD_Advance( resource, 2 );
     if( resource )
@@ -1048,16 +1048,16 @@ static fontAlias* XFONT_CreateAlias( LPCSTR lpTypeFace, LPCSTR lpAlias )
 	else break;
     }
 
-    j = lstrlen32A(lpTypeFace) + 1;
+    j = lstrlenA(lpTypeFace) + 1;
     pfa->next = HeapAlloc( SystemHeap, 0, sizeof(fontAlias) +
-					  j + lstrlen32A(lpAlias) + 1 );
+					  j + lstrlenA(lpAlias) + 1 );
     if((pfa = pfa->next))
     {
 	pfa->next = NULL;
 	pfa->faTypeFace = (LPSTR)(pfa + 1);
-	lstrcpy32A( pfa->faTypeFace, lpTypeFace );
+	lstrcpyA( pfa->faTypeFace, lpTypeFace );
         pfa->faAlias = pfa->faTypeFace + j;
-        lstrcpy32A( pfa->faAlias, lpAlias );
+        lstrcpyA( pfa->faAlias, lpAlias );
 
         TRACE(font, "\tadded alias '%s' for %s\n", lpAlias, lpTypeFace );
 
@@ -1086,7 +1086,7 @@ static void XFONT_LoadAliases( char** buffer, int *buf_size )
     char* lpResource, *lpAlias;
     char  subsection[32];
     int	  i = 0, j = 0;
-    BOOL32 bHaveAlias = TRUE, bSubst = FALSE;
+    BOOL bHaveAlias = TRUE, bSubst = FALSE;
 
     if( *buf_size < 128 )
     {
@@ -1107,7 +1107,7 @@ static void XFONT_LoadAliases( char** buffer, int *buf_size )
 	{
 	    /* then WINE.CONF */
 
-	    wsprintf32A( subsection, "%s%i", INIAliasSection, i++ );
+	    wsprintfA( subsection, "%s%i", INIAliasSection, i++ );
 
 	    if( (bHaveAlias = PROFILE_GetWineIniString( INIFontSection, 
 					subsection, "", *buffer, 128 )) )
@@ -1166,7 +1166,7 @@ static void XFONT_LoadAliases( char** buffer, int *buf_size )
                         TRACE(font, "\tsubstituted '%s' with %s\n",
 						frMatch->lfFaceName, lpAlias );
 
-			lstrcpyn32A( frMatch->lfFaceName, lpAlias, LF_FACESIZE );
+			lstrcpynA( frMatch->lfFaceName, lpAlias, LF_FACESIZE );
 			frMatch->fr_flags |= FR_NAMESET;
 		    }
 		    else
@@ -1209,7 +1209,7 @@ static void XFONT_LoadPenalties( char** buffer, int *buf_size )
     }
     do
     {
-	wsprintf32A( subsection, "%s%i", INIIgnoreSection, i++ );
+	wsprintfA( subsection, "%s%i", INIIgnoreSection, i++ );
 
 	if( PROFILE_GetWineIniString( INIFontSection,
 				subsection, "", *buffer, 255 ) )
@@ -1268,7 +1268,7 @@ static char* XFONT_UserMetricsCache( char* buffer, int* buf_size )
  *
  * INIT ONLY
  */
-static BOOL32 XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x_count )
+static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x_count )
 {
     if( fd >= 0 )
     {
@@ -1311,7 +1311,7 @@ static BOOL32 XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int
 
 			   pfi->df.dfFace = pfr->lfFaceName;
 			   pfi->df.dfHorizRes = pfi->df.dfVertRes = res;
-			   pfi->df.dfPoints = (INT16)(((INT32)(pfi->df.dfPixHeight -
+			   pfi->df.dfPoints = (INT16)(((INT)(pfi->df.dfPixHeight -
 				pfi->df.dfInternalLeading) * 72 + (res >> 1)) / res );
 			   pfi->next = pfi + 1;
 
@@ -1363,7 +1363,7 @@ fail:
  *
  * INIT ONLY
  */
-static BOOL32 XFONT_WriteCachedMetrics( int fd, unsigned x_checksum, int x_count, int n_ff )
+static BOOL XFONT_WriteCachedMetrics( int fd, unsigned x_checksum, int x_count, int n_ff )
 {
     fontResource* pfr;
     fontInfo* pfi;
@@ -1643,7 +1643,7 @@ static int XFONT_BuildDefaultAliases( char** buffer, int* buf_size )
  *
  * Initialize font resource list and allocate font cache.
  */
-BOOL32 X11DRV_FONT_Init( DeviceCaps* pDevCaps )
+BOOL X11DRV_FONT_Init( DeviceCaps* pDevCaps )
 {
   XFontStruct*	x_fs;
   fontResource* fr, *pfr;
@@ -1729,7 +1729,7 @@ BOOL32 X11DRV_FONT_Init( DeviceCaps* pDevCaps )
 	   fr = (fontResource*) HeapAlloc(SystemHeap, 0, sizeof(fontResource)); 
 	   memset(fr, 0, sizeof(fontResource));
 	   fr->resource = (char*) HeapAlloc(SystemHeap, 0, j + 1 );
-	   lstrcpyn32A( fr->resource, typeface, j + 1 );
+	   lstrcpynA( fr->resource, typeface, j + 1 );
 
 	   TRACE(font,"    family: %s\n", fr->resource );
 
@@ -1861,9 +1861,9 @@ void XFONT_RemoveFontResource( fontResource** ppfr )
  *
  * Compare two fonts (only parameters set by the XFONT_InitFontInfo()).
  */
-static INT32 XFONT_IsSubset(fontInfo* match, fontInfo* fi)
+static INT XFONT_IsSubset(fontInfo* match, fontInfo* fi)
 {
-  INT32           m;
+  INT           m;
 
   /* 0 - keep both, 1 - keep match, -1 - keep fi */
 
@@ -1901,14 +1901,14 @@ static INT32 XFONT_IsSubset(fontInfo* match, fontInfo* fi)
  * NOTE: you can experiment with different penalty weights to see what happens.
  * http://premium.microsoft.com/msdn/library/techart/f365/f36b/f37b/d38b/sa8bf.htm
  */
-static UINT32 XFONT_Match( fontMatch* pfm )
+static UINT XFONT_Match( fontMatch* pfm )
 {
    fontInfo*    pfi = pfm->pfi;         /* device font to match */
    LPLOGFONT16  plf = pfm->plf;         /* wanted logical font */
-   UINT32       penalty = 0;
-   BOOL32       bR6 = pfm->flags & FO_MATCH_XYINDEP;    /* from TextCaps */
-   BOOL32       bScale = pfi->fi_flags & FI_SCALABLE;
-   INT32        d, h;
+   UINT       penalty = 0;
+   BOOL       bR6 = pfm->flags & FO_MATCH_XYINDEP;    /* from TextCaps */
+   BOOL       bScale = pfi->fi_flags & FI_SCALABLE;
+   INT        d, h;
 
    TRACE(font,"\t[ %-2ipt h=%-3i w=%-3i %s%s]\n", pfi->df.dfPoints,
 		 pfi->df.dfPixHeight, pfi->df.dfAvgWidth,
@@ -2017,10 +2017,10 @@ static UINT32 XFONT_Match( fontMatch* pfm )
  *
  * Scan a particular font resource for the best match.
  */
-static UINT32 XFONT_MatchFIList( fontMatch* pfm )
+static UINT XFONT_MatchFIList( fontMatch* pfm )
 {
-  BOOL32        skipRaster = (pfm->flags & FO_MATCH_NORASTER);
-  UINT32        current_score, score = (UINT32)(-1);
+  BOOL        skipRaster = (pfm->flags & FO_MATCH_NORASTER);
+  UINT        current_score, score = (UINT)(-1);
   UINT16        origflags = pfm->flags; /* Preserve FO_MATCH_XYINDEP */
   fontMatch     fm = *pfm;
 
@@ -2105,7 +2105,7 @@ static fontResource* XFONT_FindFIList( fontResource* pfr, const char* pTypeFace
  *
  * Scan font resource tree.
  */
-static BOOL32 XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm )
+static BOOL XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm )
 {
     fontResource**	ppfr;
     fontMatch           fm = *pfm;
@@ -2140,7 +2140,7 @@ static BOOL32 XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm )
 
     if( !pfm->pfi )      /* match all available fonts */
     {
-        UINT32          current_score, score = (UINT32)(-1);
+        UINT          current_score, score = (UINT)(-1);
 
         fm.flags |= FO_MATCH_PAF;
         for( ppfr = &fontList; *ppfr && score; ppfr = &(*ppfr)->next )
@@ -2295,7 +2295,7 @@ static fontObject* XFONT_GetCacheEntry()
 
 static int XFONT_ReleaseCacheEntry(fontObject* pfo)
 {
-    UINT32	u = (UINT32)(pfo - fontCache);
+    UINT	u = (UINT)(pfo - fontCache);
 
     if( u < fontCacheSize ) return (--fontCache[u].count);
     return -1;
@@ -2304,7 +2304,7 @@ static int XFONT_ReleaseCacheEntry(fontObject* pfo)
 /**********************************************************************
  *	XFONT_SetX11Trans
  */
-static BOOL32 XFONT_SetX11Trans( fontObject *pfo )
+static BOOL XFONT_SetX11Trans( fontObject *pfo )
 {
   char *fontName;
   Atom nameAtom;
@@ -2352,7 +2352,7 @@ static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf )
     if( !pfo )
     {
 	fontMatch	fm = { NULL, NULL, 0, 0, plf};
-	INT32		i, index;
+	INT		i, index;
 
 	if( XTextCaps & TC_SF_X_YINDEP ) fm.flags = FO_MATCH_XYINDEP;
 
@@ -2364,7 +2364,7 @@ static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf )
 	    
 	    if( lpLFD ) /* initialize entry and load font */
 	    {
-		UINT32	uRelaxLevel = 0;
+		UINT	uRelaxLevel = 0;
 
 		TRACE(font,"(%u) '%s' h=%i weight=%i %s\n",
 			     plf->lfCharSet, plf->lfFaceName, plf->lfHeight, 
@@ -2446,7 +2446,7 @@ static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf )
 
 	if( !pfo ) /* couldn't get a new entry, get one of the cached fonts */
 	{
-	    UINT32		current_score, score = (UINT32)(-1);
+	    UINT		current_score, score = (UINT)(-1);
 
 	    i = index = fontMRU; 
 	    fm.flags |= FO_MATCH_PAF;
@@ -2514,9 +2514,9 @@ LPIFONTINFO16 XFONT_GetFontInfo( X_PHYSFONT pFont )
 /***********************************************************************
  *           X11DRV_FONT_SelectObject
  */
-HFONT32 X11DRV_FONT_SelectObject( DC* dc, HFONT32 hfont, FONTOBJ* font )
+HFONT X11DRV_FONT_SelectObject( DC* dc, HFONT hfont, FONTOBJ* font )
 {
-    HFONT32 hPrevFont = 0;
+    HFONT hPrevFont = 0;
     LOGFONT16 lf;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
@@ -2544,13 +2544,13 @@ HFONT32 X11DRV_FONT_SelectObject( DC* dc, HFONT32 hfont, FONTOBJ* font )
  *
  *           X11DRV_EnumDeviceFonts
  */
-BOOL32	X11DRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
+BOOL	X11DRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
 				        DEVICEFONTENUMPROC proc, LPARAM lp )
 {
     ENUMLOGFONTEX16	lf;
     NEWTEXTMETRIC16	tm;
     fontResource* 	pfr = fontList;
-    BOOL32	  	b, bRet = 0;
+    BOOL	  	b, bRet = 0;
 
     if( plf->lfFaceName[0] )
     {
@@ -2590,8 +2590,8 @@ BOOL32	X11DRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf,
 /***********************************************************************
  *           X11DRV_GetTextExtentPoint
  */
-BOOL32 X11DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT32 count,
-                                  LPSIZE32 size )
+BOOL X11DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
+                                  LPSIZE size )
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
     fontObject* pfo = XFONT_GetFontObject( physDev->font );
@@ -2607,7 +2607,7 @@ BOOL32 X11DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT32 count,
 			   dc->wndExtY / dc->vportExtY);
 	} else {
 
-	    INT32 i;
+	    INT i;
 	    float x = 0.0, y = 0.0;
 	    for(i = 0; i < count; i++) {
 	        x += pfo->fs->per_char ? 
@@ -2631,7 +2631,7 @@ BOOL32 X11DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT32 count,
 /***********************************************************************
  *           X11DRV_GetTextMetrics
  */
-BOOL32 X11DRV_GetTextMetrics(DC *dc, TEXTMETRIC32A *metrics)
+BOOL X11DRV_GetTextMetrics(DC *dc, TEXTMETRICA *metrics)
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
@@ -2649,8 +2649,8 @@ BOOL32 X11DRV_GetTextMetrics(DC *dc, TEXTMETRIC32A *metrics)
 /***********************************************************************
  *           X11DRV_GetCharWidth
  */
-BOOL32 X11DRV_GetCharWidth( DC *dc, UINT32 firstChar, UINT32 lastChar,
-                            LPINT32 buffer )
+BOOL X11DRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
+                            LPINT buffer )
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
     fontObject* pfo = XFONT_GetFontObject( physDev->font );
@@ -2716,14 +2716,14 @@ BOOL32 X11DRV_GetCharWidth( DC *dc, UINT32 firstChar, UINT32 lastChar,
  */
 INT16 WINAPI AddFontResource16( LPCSTR filename )
 {
-    return AddFontResource32A( filename );
+    return AddFontResourceA( filename );
 }
 
 
 /***********************************************************************
  *           AddFontResource32A    (GDI32.2)
  */
-INT32 WINAPI AddFontResource32A( LPCSTR str )
+INT WINAPI AddFontResourceA( LPCSTR str )
 {
     FIXME(font, "(%s): stub\n", debugres_a(str));
     return 1;
@@ -2733,7 +2733,7 @@ INT32 WINAPI AddFontResource32A( LPCSTR str )
 /***********************************************************************
  *           AddFontResource32W    (GDI32.4)
  */
-INT32 WINAPI AddFontResource32W( LPCWSTR str )
+INT WINAPI AddFontResourceW( LPCWSTR str )
 {
     FIXME(font, "(%s): stub\n", debugres_w(str) );
     return 1;
@@ -2752,7 +2752,7 @@ BOOL16 WINAPI RemoveFontResource16( SEGPTR str )
 /***********************************************************************
  *           RemoveFontResource32A    (GDI32.284)
  */
-BOOL32 WINAPI RemoveFontResource32A( LPCSTR str )
+BOOL WINAPI RemoveFontResourceA( LPCSTR str )
 {
 /*  This is how it should look like */
 /*
@@ -2784,7 +2784,7 @@ BOOL32 WINAPI RemoveFontResource32A( LPCSTR str )
 /***********************************************************************
  *           RemoveFontResource32W    (GDI32.286)
  */
-BOOL32 WINAPI RemoveFontResource32W( LPCWSTR str )
+BOOL WINAPI RemoveFontResourceW( LPCWSTR str )
 {
     FIXME(font, "(%s): stub\n", debugres_w(str) );
     return TRUE;
diff --git a/if1632/builtin.c b/if1632/builtin.c
index a817cc89c23..2004114a9fb 100644
--- a/if1632/builtin.c
+++ b/if1632/builtin.c
@@ -160,7 +160,7 @@ static HMODULE16 BUILTIN_DoLoadModule16( const WIN16_DESCRIPTOR *descr )
                                             descr->module_size, 0,
                                             FALSE, FALSE, FALSE, NULL );
     if (!hModule) return 0;
-    FarSetOwner( hModule, hModule );
+    FarSetOwner16( hModule, hModule );
 
     TRACE(module, "Built-in %s: hmodule=%04x\n",
                     descr->name, hModule );
@@ -187,7 +187,7 @@ static HMODULE16 BUILTIN_DoLoadModule16( const WIN16_DESCRIPTOR *descr )
     if (pSegTable->minsize) memcpy( GlobalLock16( pSegTable->hSeg ),
                                     descr->data_start, pSegTable->minsize);
     if (pModule->heap_size)
-        LocalInit( GlobalHandleToSel(pSegTable->hSeg),
+        LocalInit16( GlobalHandleToSel16(pSegTable->hSeg),
 		pSegTable->minsize, minsize );
 
     NE_RegisterModule( pModule );
@@ -200,7 +200,7 @@ static HMODULE16 BUILTIN_DoLoadModule16( const WIN16_DESCRIPTOR *descr )
  *
  * Load all built-in modules marked as 'always used'.
  */
-BOOL32 BUILTIN_Init(void)
+BOOL BUILTIN_Init(void)
 {
     BUILTIN16_DLL *dll;
     WORD vector;
@@ -237,7 +237,7 @@ BOOL32 BUILTIN_Init(void)
  * Load a built-in module. If the 'force' parameter is FALSE, we only
  * load the module if it has not been disabled via the -dll option.
  */
-HMODULE16 BUILTIN_LoadModule( LPCSTR name, BOOL32 force )
+HMODULE16 BUILTIN_LoadModule( LPCSTR name, BOOL force )
 {
     BUILTIN16_DLL *table;
     char dllname[16], *p;
@@ -245,11 +245,11 @@ HMODULE16 BUILTIN_LoadModule( LPCSTR name, BOOL32 force )
     /* Fix the name in case we have a full path and extension */
 
     if ((p = strrchr( name, '\\' ))) name = p + 1;
-    lstrcpyn32A( dllname, name, sizeof(dllname) );
+    lstrcpynA( dllname, name, sizeof(dllname) );
     if ((p = strrchr( dllname, '.' ))) *p = '\0';
 
     for (table = BuiltinDLLs; table->descr; table++)
-        if (!lstrcmpi32A( table->descr->name, dllname )) break;
+        if (!lstrcmpiA( table->descr->name, dllname )) break;
     if (!table->descr) return 0;
     if ((table->flags & DLL_FLAG_NOT_USED) && !force) return 0;
 
@@ -270,7 +270,7 @@ LPCSTR BUILTIN_GetEntryPoint16( WORD cs, WORD ip, WORD *pOrd )
     register BYTE *p;
     NE_MODULE *pModule;
 
-    if (!(pModule = NE_GetPtr( FarGetOwner( GlobalHandle16(cs) ))))
+    if (!(pModule = NE_GetPtr( FarGetOwner16( GlobalHandle16(cs) ))))
         return NULL;
 
     /* Search for the ordinal */
@@ -351,7 +351,7 @@ void BUILTIN_DefaultIntHandler( CONTEXT *context )
  *
  * Set runtime DLL usage flags
  */
-BOOL32 BUILTIN_ParseDLLOptions( const char *str )
+BOOL BUILTIN_ParseDLLOptions( const char *str )
 {
     BUILTIN16_DLL *dll;
     const char *p;
@@ -367,7 +367,7 @@ BOOL32 BUILTIN_ParseDLLOptions( const char *str )
         if (p == str) return FALSE;
         for (dll = BuiltinDLLs; dll->descr; dll++)
         {
-            if (!lstrncmpi32A( str, dll->descr->name, (int)(p - str) ))
+            if (!lstrncmpiA( str, dll->descr->name, (int)(p - str) ))
             {
 	        if (dll->descr->name[(int)(p-str)])  /* only partial match */
 			continue;
diff --git a/if1632/commdlg.spec b/if1632/commdlg.spec
index 7e0a3ba0f0b..24f9d7d1c21 100644
--- a/if1632/commdlg.spec
+++ b/if1632/commdlg.spec
@@ -4,9 +4,9 @@ type	win16
 1   pascal16 GetOpenFileName(segptr) GetOpenFileName16
 2   pascal16 GetSaveFileName(segptr) GetSaveFileName16
 5   pascal16 ChooseColor(ptr) ChooseColor16
-6   pascal   FileOpenDlgProc(word word word long) FileOpenDlgProc
-7   pascal   FileSaveDlgProc(word word word long) FileSaveDlgProc
-8   pascal   ColorDlgProc(word word word long) ColorDlgProc
+6   pascal   FileOpenDlgProc(word word word long) FileOpenDlgProc16
+7   pascal   FileSaveDlgProc(word word word long) FileSaveDlgProc16
+8   pascal   ColorDlgProc(word word word long) ColorDlgProc16
 #9   pascal  LOADALTERBITMAP exported, shared data
 11  pascal16 FindText(segptr) FindText16
 12  pascal16 ReplaceText(segptr) ReplaceText16
@@ -17,8 +17,8 @@ type	win16
 18  pascal16 FontStyleEnumProc(ptr ptr word long)   FontStyleEnumProc16
 19  pascal16 FontFamilyEnumProc(ptr ptr word long)  FontFamilyEnumProc16
 20  pascal16 PrintDlg(segptr) PrintDlg16
-21  pascal   PrintDlgProc(word word word long) PrintDlgProc
-22  pascal   PrintSetupDlgProc(word word word long) PrintSetupDlgProc
+21  pascal   PrintDlgProc(word word word long) PrintDlgProc16
+22  pascal   PrintSetupDlgProc(word word word long) PrintSetupDlgProc16
 #23  pascal  EDITINTEGERONLY exported, shared data
 #25  pascal  WANTARROWS exported, shared data
 26  pascal   CommDlgExtendedError() CommDlgExtendedError
diff --git a/if1632/compobj.spec b/if1632/compobj.spec
index f14196f8878..9e775dafb0f 100644
--- a/if1632/compobj.spec
+++ b/if1632/compobj.spec
@@ -93,8 +93,8 @@ type	win16
 91 stub LRPCREVOKEMONITOR
 92 stub LRPCGETTHREADWINDOW
 93 stub TIMERCALLBACKPROC
-94 pascal LookupETask(ptr ptr) LookupETask
-95 pascal16 SetETask(word ptr) SetETask
+94 pascal LookupETask(ptr ptr) LookupETask16
+95 pascal16 SetETask(word ptr) SetETask16
 96 stub LRPCFREEMONITORDATA
 97 stub REMLOOKUPSHUNK
 98 stub SHRGETSIZE
diff --git a/if1632/ddeml.spec b/if1632/ddeml.spec
index 39e8691221e..6a89e419f0b 100644
--- a/if1632/ddeml.spec
+++ b/if1632/ddeml.spec
@@ -9,13 +9,13 @@ type	win16
 7 pascal   DdeConnect(long long long ptr) DdeConnect16
 8 pascal16 DdeDisconnect(long) DdeDisconnect16
 9 stub DdeQueryConvInfo #(word long ptr) DdeQueryConvInfo
-10 pascal DdeSetUserHandle(word long long) DdeSetUserHandle
+10 pascal DdeSetUserHandle(word long long) DdeSetUserHandle16
 11 pascal   DdeClientTransaction(ptr long long long s_word s_word long ptr)
             DdeClientTransaction16
-12 pascal DdeAbandonTransaction(long word long) DdeAbandonTransaction
+12 pascal DdeAbandonTransaction(long word long) DdeAbandonTransaction16
 13 pascal DdePostAdvise(long word word) DdePostAdvise16
 14 pascal DdeCreateDataHandle(long ptr long long word word word) DdeCreateDataHandle16
-15 pascal DdeAddData(word ptr long long) DdeAddData
+15 pascal DdeAddData(word ptr long long) DdeAddData16
 16 pascal DdeGetData(word ptr long long) DdeGetData16
 17 pascal DdeAccessData(word ptr) DdeAccessData16
 18 pascal DdeUnaccessData(word) DdeUnaccessData16
diff --git a/if1632/display.spec b/if1632/display.spec
index 0f22317ed4e..855340340b0 100644
--- a/if1632/display.spec
+++ b/if1632/display.spec
@@ -29,7 +29,7 @@ type	win16
 102 pascal16 SetCursor(ptr) DISPLAY_SetCursor
 103 pascal16 MoveCursor(word word) DISPLAY_MoveCursor
 140 pascal16 CheckCursor() DISPLAY_CheckCursor
-500 pascal16 UserRepaintDisable(word) UserRepaintDisable
+500 pascal16 UserRepaintDisable(word) UserRepaintDisable16
 600 stub InkReady
 601 stub GetLPDevice
 
diff --git a/if1632/gdi.spec b/if1632/gdi.spec
index 5343380f32e..7f9b1224a7d 100644
--- a/if1632/gdi.spec
+++ b/if1632/gdi.spec
@@ -13,16 +13,16 @@ file	gdi.exe
 8   pascal16 SetTextCharacterExtra(word s_word) SetTextCharacterExtra16
 9   pascal   SetTextColor(word long) SetTextColor16
 10  pascal16 SetTextJustification(word s_word s_word) SetTextJustification16
-11  pascal SetWindowOrg(word s_word s_word) SetWindowOrg
-12  pascal SetWindowExt(word s_word s_word) SetWindowExt
-13  pascal SetViewportOrg(word s_word s_word) SetViewportOrg
-14  pascal SetViewportExt(word s_word s_word) SetViewportExt
-15  pascal OffsetWindowOrg(word s_word s_word) OffsetWindowOrg
-16  pascal ScaleWindowExt(word s_word s_word s_word s_word) ScaleWindowExt
-17  pascal OffsetViewportOrg(word s_word s_word) OffsetViewportOrg
-18  pascal ScaleViewportExt(word s_word s_word s_word s_word) ScaleViewportExt
+11  pascal SetWindowOrg(word s_word s_word) SetWindowOrg16
+12  pascal SetWindowExt(word s_word s_word) SetWindowExt16
+13  pascal SetViewportOrg(word s_word s_word) SetViewportOrg16
+14  pascal SetViewportExt(word s_word s_word) SetViewportExt16
+15  pascal OffsetWindowOrg(word s_word s_word) OffsetWindowOrg16
+16  pascal ScaleWindowExt(word s_word s_word s_word s_word) ScaleWindowExt16
+17  pascal OffsetViewportOrg(word s_word s_word) OffsetViewportOrg16
+18  pascal ScaleViewportExt(word s_word s_word s_word s_word) ScaleViewportExt16
 19  pascal16 LineTo(word s_word s_word) LineTo16
-20  pascal   MoveTo(word s_word s_word) MoveTo
+20  pascal   MoveTo(word s_word s_word) MoveTo16
 21  pascal16 ExcludeClipRect(word s_word s_word s_word s_word) ExcludeClipRect16
 22  pascal16 IntersectClipRect(word s_word s_word s_word s_word) IntersectClipRect16
 23  pascal16 Arc(word s_word s_word s_word s_word s_word s_word s_word s_word)
@@ -80,13 +80,13 @@ file	gdi.exe
 70  pascal16 EnumFonts(word str segptr long) THUNK_EnumFonts16
 71  pascal16 EnumObjects(word word segptr long) THUNK_EnumObjects16
 72  pascal16 EqualRgn(word word) EqualRgn16
-73  pascal16 ExcludeVisRect(word s_word s_word s_word s_word) ExcludeVisRect
+73  pascal16 ExcludeVisRect(word s_word s_word s_word s_word) ExcludeVisRect16
 74  pascal GetBitmapBits(word long ptr) GetBitmapBits16
 75  pascal   GetBkColor(word) GetBkColor16
 76  pascal16 GetBkMode(word) GetBkMode16
 77  pascal16 GetClipBox(word ptr) GetClipBox16
-78  pascal   GetCurrentPosition(word) GetCurrentPosition
-79  pascal   GetDCOrg(word) GetDCOrg
+78  pascal   GetCurrentPosition(word) GetCurrentPosition16
+79  pascal   GetDCOrg(word) GetDCOrg16
 80  pascal16 GetDeviceCaps(word s_word) GetDeviceCaps16
 81  pascal16 GetMapMode(word) GetMapMode16
 82  pascal16 GetObject(word s_word ptr) GetObject16
@@ -98,79 +98,79 @@ file	gdi.exe
 88  pascal16 GetStretchBltMode(word) GetStretchBltMode16
 89  pascal16 GetTextCharacterExtra(word) GetTextCharacterExtra16
 90  pascal   GetTextColor(word) GetTextColor16
-91  pascal   GetTextExtent(word ptr s_word) GetTextExtent
+91  pascal   GetTextExtent(word ptr s_word) GetTextExtent16
 92  pascal16 GetTextFace(word s_word ptr) GetTextFace16
 93  pascal16 GetTextMetrics(word ptr) GetTextMetrics16
-94  pascal   GetViewportExt(word) GetViewportExt
-95  pascal   GetViewportOrg(word) GetViewportOrg
-96  pascal   GetWindowExt(word) GetWindowExt
-97  pascal   GetWindowOrg(word) GetWindowOrg
+94  pascal   GetViewportExt(word) GetViewportExt16
+95  pascal   GetViewportOrg(word) GetViewportOrg16
+96  pascal   GetWindowExt(word) GetWindowExt16
+97  pascal   GetWindowOrg(word) GetWindowOrg16
 98  pascal16 IntersectVisRect(word s_word s_word s_word s_word)
-             IntersectVisRect
+             IntersectVisRect16
 99  pascal16 LPtoDP(word ptr s_word) LPtoDP16
 100 pascal16 LineDDA(s_word s_word s_word s_word segptr long) THUNK_LineDDA16
 101 pascal16 OffsetRgn(word s_word s_word) OffsetRgn16
-102 pascal16 OffsetVisRgn(word s_word s_word) OffsetVisRgn
+102 pascal16 OffsetVisRgn(word s_word s_word) OffsetVisRgn16
 103 pascal16 PtVisible(word s_word s_word) PtVisible16
 104 pascal16 RectVisibleOld(word ptr) RectVisible16
-105 pascal16 SelectVisRgn(word word) SelectVisRgn
+105 pascal16 SelectVisRgn(word word) SelectVisRgn16
 106 pascal SetBitmapBits(word long ptr) SetBitmapBits16
-117 pascal SetDCOrg(word s_word s_word) SetDCOrg
+117 pascal SetDCOrg(word s_word s_word) SetDCOrg16
 119 pascal16 AddFontResource(str) AddFontResource16
-121 pascal16 Death(word) Death
-122 pascal16 Resurrection(word word word word word word word) Resurrection
+121 pascal16 Death(word) Death16
+122 pascal16 Resurrection(word word word word word word word) Resurrection16
 123 pascal16 PlayMetaFile(word word) PlayMetaFile16
 124 pascal16 GetMetaFile(str) GetMetaFile16
 125 pascal16 CreateMetaFile(str) CreateMetaFile16
 126 pascal16 CloseMetaFile(word) CloseMetaFile16
 127 pascal16 DeleteMetaFile(word) DeleteMetaFile16
 128 pascal16 MulDiv(s_word s_word s_word) MulDiv16
-129 pascal16 SaveVisRgn(word) SaveVisRgn
-130 pascal16 RestoreVisRgn(word) RestoreVisRgn
-131 pascal16 InquireVisRgn(word) InquireVisRgn
-132 pascal16 SetEnvironment(str str word) SetEnvironment
-133 pascal16 GetEnvironment(str str word) GetEnvironment
+129 pascal16 SaveVisRgn(word) SaveVisRgn16
+130 pascal16 RestoreVisRgn(word) RestoreVisRgn16
+131 pascal16 InquireVisRgn(word) InquireVisRgn16
+132 pascal16 SetEnvironment(str str word) SetEnvironment16
+133 pascal16 GetEnvironment(str str word) GetEnvironment16
 134 pascal16 GetRgnBox(word ptr) GetRgnBox16
 #135 pascal ScanLr
 136 pascal16 RemoveFontResource(segptr) RemoveFontResource16
-148 pascal SetBrushOrg(word s_word s_word) SetBrushOrg
-149 pascal GetBrushOrg(word) GetBrushOrg
+148 pascal SetBrushOrg(word s_word s_word) SetBrushOrg16
+149 pascal GetBrushOrg(word) GetBrushOrg16
 150 pascal16 UnrealizeObject(word) UnrealizeObject16
 151 pascal16 CopyMetaFile(word str) CopyMetaFile16
 153 pascal16 CreateIC(str str str ptr) CreateIC16
 154 pascal   GetNearestColor(word long) GetNearestColor16
-155 pascal16 QueryAbort(word word) QueryAbort
+155 pascal16 QueryAbort(word word) QueryAbort16
 156 pascal16 CreateDiscardableBitmap(word word word) CreateDiscardableBitmap16
 158 pascal16 EnumCallback(ptr ptr word long) WineEnumDFontCallback
-159 pascal16 GetMetaFileBits(word) GetMetaFileBits
-160 pascal16 SetMetaFileBits(word) SetMetaFileBits
+159 pascal16 GetMetaFileBits(word) GetMetaFileBits16
+160 pascal16 SetMetaFileBits(word) SetMetaFileBits16
 161 pascal16 PtInRegion(word s_word s_word) PtInRegion16
-162 pascal   GetBitmapDimension(word) GetBitmapDimension
-163 pascal   SetBitmapDimension(word s_word s_word) SetBitmapDimension
+162 pascal   GetBitmapDimension(word) GetBitmapDimension16
+163 pascal   SetBitmapDimension(word s_word s_word) SetBitmapDimension16
 169 stub IsDCDirty
 170 stub SetDCStatus
 172 pascal16 SetRectRgn(word s_word s_word s_word s_word) SetRectRgn16
 173 pascal16 GetClipRgn(word) GetClipRgn16
 175 pascal16 EnumMetaFile(word word segptr long) THUNK_EnumMetaFile16
 176 pascal16 PlayMetaFileRecord(word ptr ptr word) PlayMetaFileRecord16
-179 pascal16 GetDCState(word) GetDCState
-180 pascal16 SetDCState(word word) SetDCState
+179 pascal16 GetDCState(word) GetDCState16
+180 pascal16 SetDCState(word word) SetDCState16
 181 pascal16 RectInRegionOld(word ptr) RectInRegion16
 188 stub GetTextExtentEx
 190 pascal16 SetDCHook(word segptr long) THUNK_SetDCHook
 191 pascal   GetDCHook(word ptr) THUNK_GetDCHook
-192 pascal16 SetHookFlags(word word) SetHookFlags
+192 pascal16 SetHookFlags(word word) SetHookFlags16
 193 pascal16 SetBoundsRect(word ptr word) SetBoundsRect16
 194 pascal16 GetBoundsRect(word ptr word) GetBoundsRect16
 195 stub SelectBitmap
-196 pascal16 SetMetaFileBitsBetter(word) SetMetaFileBitsBetter
+196 pascal16 SetMetaFileBitsBetter(word) SetMetaFileBitsBetter16
 201 stub DMBITBLT
 202 stub DMCOLORINFO
-206 pascal16 dmEnumDFonts(ptr str ptr ptr) dmEnumDFonts
+206 pascal16 dmEnumDFonts(ptr str ptr ptr) dmEnumDFonts16
 207 stub DMENUMOBJ
 208 stub DMOUTPUT
 209 stub DMPIXEL
-210 pascal16 dmRealizeObject(ptr word ptr ptr segptr) dmRealizeObject
+210 pascal16 dmRealizeObject(ptr word ptr ptr segptr) dmRealizeObject16
 211 stub DMSTRBLT
 212 stub DMSCANLR
 213 stub BRUTE
@@ -181,22 +181,22 @@ file	gdi.exe
 218 stub DMSTRETCHDIBITS
 219 stub DMSETDIBTODEV
 220 stub DMTRANSPOSE
-230 pascal16 CreatePQ(word) CreatePQ
-231 pascal16 MinPQ(word) MinPQ
-232 pascal16 ExtractPQ(word) ExtractPQ
-233 pascal16 InsertPQ(word word word) InsertPQ
-234 pascal16 SizePQ(word word) SizePQ
-235 pascal16 DeletePQ(word) DeletePQ
-240 pascal16 OpenJob(ptr ptr word) OpenJob
-241 pascal16 WriteSpool(word ptr word) WriteSpool
-242 pascal16 WriteDialog(word ptr word) WriteDialog
-243 pascal16 CloseJob(word) CloseJob
-244 pascal16 DeleteJob(word word) DeleteJob
-245 pascal GetSpoolJob(word ptr) GetSpoolJob
-246 pascal16 StartSpoolPage(word) StartSpoolPage
-247 pascal16 EndSpoolPage(word) EndSpoolPage
+230 pascal16 CreatePQ(word) CreatePQ16
+231 pascal16 MinPQ(word) MinPQ16
+232 pascal16 ExtractPQ(word) ExtractPQ16
+233 pascal16 InsertPQ(word word word) InsertPQ16
+234 pascal16 SizePQ(word word) SizePQ16
+235 pascal16 DeletePQ(word) DeletePQ16
+240 pascal16 OpenJob(ptr ptr word) OpenJob16
+241 pascal16 WriteSpool(word ptr word) WriteSpool16
+242 pascal16 WriteDialog(word ptr word) WriteDialog16
+243 pascal16 CloseJob(word) CloseJob16
+244 pascal16 DeleteJob(word word) DeleteJob16
+245 pascal GetSpoolJob(word ptr) GetSpoolJob16
+246 pascal16 StartSpoolPage(word) StartSpoolPage16
+247 pascal16 EndSpoolPage(word) EndSpoolPage16
 248 stub QueryJob
-250 pascal16 Copy(ptr ptr word) Copy
+250 pascal16 Copy(ptr ptr word) Copy16
 253 stub DeleteSpoolPage
 254 stub SpoolFile
 267 stub StartDocPrintEra
@@ -207,13 +207,13 @@ file	gdi.exe
 272 stub EndDocPrinter
 274 stub ClosePrinter
 280 stub GetRealDriverInfo
-281 pascal DrvSetPrinterData(ptr ptr long ptr long) DrvSetPrinterData
-282 pascal DrvGetPrinterData(ptr ptr ptr ptr long ptr) DrvGetPrinterData
+281 pascal DrvSetPrinterData(ptr ptr long ptr long) DrvSetPrinterData16
+282 pascal DrvGetPrinterData(ptr ptr ptr ptr long ptr) DrvGetPrinterData16
 299 stub ENGINEGETCHARWIDTHEX
-300 pascal EngineEnumerateFont(ptr segptr long) EngineEnumerateFont
-301 pascal16 EngineDeleteFont(ptr) EngineDeleteFont
-302 pascal EngineRealizeFont(ptr ptr ptr) EngineRealizeFont
-303 pascal16 EngineGetCharWidth(ptr word word ptr) EngineGetCharWidth
+300 pascal EngineEnumerateFont(ptr segptr long) EngineEnumerateFont16
+301 pascal16 EngineDeleteFont(ptr) EngineDeleteFont16
+302 pascal EngineRealizeFont(ptr ptr ptr) EngineRealizeFont16
+303 pascal16 EngineGetCharWidth(ptr word word ptr) EngineGetCharWidth16
 304 stub ENGINESETFONTCONTEXT
 305 stub ENGINEGETGLYPHBMP
 306 stub ENGINEMAKEFONTDIR
@@ -242,11 +242,11 @@ file	gdi.exe
 354 stub ShrinkGDIHeap
 355 stub FTrapping0
 360 pascal16 CreatePalette(ptr) CreatePalette16
-361 pascal16 GDISelectPalette(word word word) GDISelectPalette
-362 pascal16 GDIRealizePalette(word) GDIRealizePalette
+361 pascal16 GDISelectPalette(word word word) GDISelectPalette16
+362 pascal16 GDIRealizePalette(word) GDIRealizePalette16
 363 pascal16 GetPaletteEntries(word word word ptr) GetPaletteEntries16
 364 pascal16 SetPaletteEntries(word word word ptr) SetPaletteEntries16
-365 pascal16 RealizeDefaultPalette(word) RealizeDefaultPalette
+365 pascal16 RealizeDefaultPalette(word) RealizeDefaultPalette16
 366 pascal16 UpdateColors(word) UpdateColors16
 367 pascal16 AnimatePalette(word word word ptr) AnimatePalette16
 368 pascal16 ResizePalette(word word) ResizePalette16
@@ -262,16 +262,16 @@ file	gdi.exe
 380 pascal16 EndPage(word) EndPage16
 381 pascal16 SetAbortProc(word segptr) SetAbortProc16
 382 pascal16 AbortDoc() stub_GDI_382
-400 pascal16 FastWindowFrame(word ptr s_word s_word long) FastWindowFrame
+400 pascal16 FastWindowFrame(word ptr s_word s_word long) FastWindowFrame16
 401 stub GDIMOVEBITMAP
 403 stub GDIINIT2
 404 stub GetTTGlyphIndexMap
 405 stub FINALGDIINIT
 407 pascal16 CreateUserBitmap(word word word word ptr) CreateUserBitmap16
 409 pascal16 CreateUserDiscardableBitmap(word word word) CreateUserDiscardableBitmap16
-410 pascal16 IsValidMetaFile (word) IsValidMetaFile
-411 pascal16 GetCurLogFont(word) GetCurLogFont
-412 pascal16 IsDCCurrentPalette(word) IsDCCurrentPalette
+410 pascal16 IsValidMetaFile (word) IsValidMetaFile16
+411 pascal16 GetCurLogFont(word) GetCurLogFont16
+412 pascal16 IsDCCurrentPalette(word) IsDCCurrentPalette16
 439 pascal16 StretchDIBits (word s_word s_word s_word s_word s_word s_word
                             s_word s_word ptr ptr word long) StretchDIBits16
 440 pascal16 SetDIBits(word word word word ptr ptr word) SetDIBits16
@@ -285,11 +285,11 @@ file	gdi.exe
 449 stub DEVICECOLORMATCH
 450 pascal16 PolyPolygon(word ptr ptr word) PolyPolygon16
 451 pascal16 CreatePolyPolygonRgn(ptr ptr word word) CreatePolyPolygonRgn16
-452 pascal   GdiSeeGdiDo(word word word word) GdiSeeGdiDo
+452 pascal   GdiSeeGdiDo(word word word word) GdiSeeGdiDo16
 460 stub GDITASKTERMINATION
 461 pascal16 SetObjectOwner(word word) SetObjectOwner16
-462 pascal16 IsGDIObject(word) IsGDIObject
-463 pascal16 MakeObjectPrivate(word word) MakeObjectPrivate
+462 pascal16 IsGDIObject(word) IsGDIObject16
+463 pascal16 MakeObjectPrivate(word word) MakeObjectPrivate16
 464 stub FIXUPBOGUSPUBLISHERMETAFILE
 465 pascal16 RectVisible(word ptr) RectVisible16
 466 pascal16 RectInRegion(word ptr) RectInRegion16
@@ -378,7 +378,7 @@ file	gdi.exe
 606 pascal16 SetMagicColors(word long word) SetMagicColors16
 607 pascal GetRegionData(word long ptr) GetRegionData16
 608 stub ExtCreateRegion
-609 pascal16 GdiFreeResources(long) GdiFreeResources
+609 pascal16 GdiFreeResources(long) GdiFreeResources16
 610 stub GDISignalProc32
 611 stub GetRandomRgn
 612 pascal16 GetTextCharset(word) GetTextCharset16
diff --git a/if1632/kernel.spec b/if1632/kernel.spec
index 0c04936221a..d06f4029854 100644
--- a/if1632/kernel.spec
+++ b/if1632/kernel.spec
@@ -8,7 +8,7 @@ file	krnl386.exe
 1   stub FatalExit
 2   stub ExitKernel
 3   pascal GetVersion() GetVersion16
-4   pascal16 LocalInit(word word word) LocalInit
+4   pascal16 LocalInit(word word word) LocalInit16
 5   register LocalAlloc(word word) WIN16_LocalAlloc
 6   pascal16 LocalReAlloc(word word word) LocalReAlloc16
 7   pascal16 LocalFree(word) LocalFree16
@@ -18,7 +18,7 @@ file	krnl386.exe
 11  pascal16 LocalHandle(word) LocalHandle16
 12  pascal16 LocalFlags(word) LocalFlags16
 13  pascal16 LocalCompact(word) LocalCompact16
-14  pascal LocalNotify(long) LocalNotify
+14  pascal LocalNotify(long) LocalNotify16
 15  pascal16 GlobalAlloc(word long) GlobalAlloc16
 16  pascal16 GlobalReAlloc(word long word) GlobalReAlloc16
 17  pascal16 GlobalFree(word) GlobalFree16
@@ -30,33 +30,33 @@ file	krnl386.exe
 23  pascal16 LockSegment(word) LockSegment16
 24  pascal16 UnlockSegment(word) UnlockSegment16
 25  pascal GlobalCompact(long) GlobalCompact16
-26  pascal16 GlobalFreeAll(word) GlobalFreeAll
-27  pascal16 GetModuleName(word ptr word) GetModuleName
+26  pascal16 GlobalFreeAll(word) GlobalFreeAll16
+27  pascal16 GetModuleName(word ptr word) GetModuleName16
 28  stub GlobalMasterHandle
 29  pascal16 Yield() Yield16
-30  pascal16 WaitEvent(word) WaitEvent
-31  pascal16 PostEvent(word) PostEvent
-32  pascal16 SetPriority(word s_word) SetPriority
-33  pascal16 LockCurrentTask(word) LockCurrentTask
-34  pascal16 SetTaskQueue(word word) SetTaskQueue
-35  pascal16 GetTaskQueue(word) GetTaskQueue
+30  pascal16 WaitEvent(word) WaitEvent16
+31  pascal16 PostEvent(word) PostEvent16
+32  pascal16 SetPriority(word s_word) SetPriority16
+33  pascal16 LockCurrentTask(word) LockCurrentTask16
+34  pascal16 SetTaskQueue(word word) SetTaskQueue16
+35  pascal16 GetTaskQueue(word) GetTaskQueue16
 36  pascal   GetCurrentTask() WIN16_GetCurrentTask
-37  pascal GetCurrentPDB() GetCurrentPDB
+37  pascal GetCurrentPDB() GetCurrentPDB16
 38  pascal   SetTaskSignalProc(word segptr) THUNK_SetTaskSignalProc
 41  return EnableDos 0 0
 42  return DisableDos 0 0
 45  pascal16 LoadModule(str ptr) LoadModule16
 46  pascal16 FreeModule(word) FreeModule16
 47  pascal   GetModuleHandle(segstr) WIN16_GetModuleHandle
-48  pascal16 GetModuleUsage(word) GetModuleUsage
+48  pascal16 GetModuleUsage(word) GetModuleUsage16
 49  pascal16 GetModuleFileName(word ptr s_word) GetModuleFileName16
 50  pascal GetProcAddress(word segstr) GetProcAddress16
 51  pascal MakeProcInstance(segptr word) MakeProcInstance16
 52  pascal16 FreeProcInstance(segptr) FreeProcInstance16
 53  stub CallProcInstance
-54  pascal16 GetInstanceData(word word word) GetInstanceData
-55  register Catch(segptr) Catch 
-56  register Throw(segptr word) Throw
+54  pascal16 GetInstanceData(word word word) GetInstanceData16
+55  register Catch(segptr) Catch16 
+56  register Throw(segptr word) Throw16
 57  pascal16 GetProfileInt(str str s_word) GetProfileInt16
 58  pascal16 GetProfileString(str str str ptr word) GetProfileString16
 59  pascal16 WriteProfileString(str str str) WriteProfileString16
@@ -66,14 +66,14 @@ file	krnl386.exe
 63  pascal16 FreeResource(word) FreeResource16
 64  pascal16 AccessResource(word word) AccessResource16
 65  pascal SizeofResource(word word) SizeofResource16
-66  pascal16 AllocResource(word word long) AllocResource
-67  pascal SetResourceHandler(word segstr segptr) SetResourceHandler
+66  pascal16 AllocResource(word word long) AllocResource16
+67  pascal SetResourceHandler(word segstr segptr) SetResourceHandler16
 68  pascal16 InitAtomTable(word) InitAtomTable16
 69  pascal16 FindAtom(segstr) FindAtom16
 70  pascal16 AddAtom(segstr) AddAtom16
 71  pascal16 DeleteAtom(word) DeleteAtom16
 72  pascal16 GetAtomName(word ptr word) GetAtomName16
-73  pascal16 GetAtomHandle(word) GetAtomHandle
+73  pascal16 GetAtomHandle(word) GetAtomHandle16
 74  pascal16 OpenFile(str ptr word) OpenFile16
 75  stub OpenPathName
 76  stub DeletePathName
@@ -92,9 +92,9 @@ file	krnl386.exe
 88  pascal   lstrcpy(segptr str) lstrcpy16
 89  pascal   lstrcat(segstr str) lstrcat16
 90  pascal16 lstrlen(str) lstrlen16
-91  register InitTask() InitTask
+91  register InitTask() InitTask16
 92  pascal   GetTempDrive(word) WIN16_GetTempDrive
-93  pascal16 GetCodeHandle(segptr) GetCodeHandle
+93  pascal16 GetCodeHandle(segptr) GetCodeHandle16
 94  pascal16 DefineHandleTable(word) DefineHandleTable16
 95  pascal16 LoadLibrary(str) LoadLibrary16
 96  pascal16 FreeLibrary(word) FreeLibrary16
@@ -104,26 +104,26 @@ file	krnl386.exe
 100 return ValidateCodeSegments 0 0
 101 stub NoHookDosCall
 102 register DOS3Call() DOS3Call
-103 register NetBIOSCall() NetBIOSCall
-104 pascal16 GetCodeInfo(segptr ptr) GetCodeInfo
-105 pascal16 GetExeVersion() GetExeVersion
+103 register NetBIOSCall() NetBIOSCall16
+104 pascal16 GetCodeInfo(segptr ptr) GetCodeInfo16
+105 pascal16 GetExeVersion() GetExeVersion16
 106 pascal SetSwapAreaSize(word) SetSwapAreaSize16
 107 pascal16 SetErrorMode(word) SetErrorMode16
-108 pascal16 SwitchStackTo(word word word) SwitchStackTo
-109 register SwitchStackBack() SwitchStackBack
-110 pascal   PatchCodeHandle(word) PatchCodeHandle
+108 pascal16 SwitchStackTo(word word word) SwitchStackTo16
+109 register SwitchStackBack() SwitchStackBack16
+110 pascal   PatchCodeHandle(word) PatchCodeHandle16
 111 pascal   GlobalWire(word) GlobalWire16
 112 pascal16 GlobalUnWire(word) GlobalUnWire16
 113 equate __AHSHIFT 3
 114 equate __AHINCR 8
 115 pascal16 OutputDebugString(str) OutputDebugString16
 116 stub InitLib
-117 pascal16 OldYield() OldYield
-118 register GetTaskQueueDS() GetTaskQueueDS
-119 register GetTaskQueueES() GetTaskQueueES
+117 pascal16 OldYield() OldYield16
+118 register GetTaskQueueDS() GetTaskQueueDS16
+119 register GetTaskQueueES() GetTaskQueueES16
 120 stub UndefDynLink
 121 pascal16 LocalShrink(word word) LocalShrink16
-122 pascal16 IsTaskLocked() IsTaskLocked
+122 pascal16 IsTaskLocked() IsTaskLocked16
 123 return KbdRst 0 0
 124 return EnableKernel 0 0
 125 return DisableKernel 0 0
@@ -133,17 +133,17 @@ file	krnl386.exe
              GetPrivateProfileString16
 129 pascal16 WritePrivateProfileString(str str str str)
              WritePrivateProfileString16
-130 pascal FileCDR(ptr) FileCDR
-131 pascal GetDOSEnvironment() GetDOSEnvironment
-132 pascal GetWinFlags() GetWinFlags
+130 pascal FileCDR(ptr) FileCDR16
+131 pascal GetDOSEnvironment() GetDOSEnvironment16
+132 pascal GetWinFlags() GetWinFlags16
 133 register GetExePtr(word) WIN16_GetExePtr
 134 pascal16 GetWindowsDirectory(ptr word) GetWindowsDirectory16
 135 pascal16 GetSystemDirectory(ptr word) GetSystemDirectory16
 136 pascal16 GetDriveType(word) GetDriveType16
 137 pascal16 FatalAppExit(word str) FatalAppExit16
-138 pascal GetHeapSpaces(word) GetHeapSpaces
+138 pascal GetHeapSpaces(word) GetHeapSpaces16
 139 stub DoSignal
-140 pascal16 SetSigHandler(segptr ptr ptr word word) SetSigHandler
+140 pascal16 SetSigHandler(segptr ptr ptr word word) SetSigHandler16
 141 stub InitTask1
 142 pascal16 GetProfileSectionNames(ptr word) GetProfileSectionNames16
 143 pascal16 GetPrivateProfileSectionNames(ptr word str) GetPrivateProfileSectionNames16
@@ -153,74 +153,74 @@ file	krnl386.exe
 147 pascal16 SetLastError(long) SetLastError
 148 pascal   GetLastError() GetLastError
 149 pascal16 GetVersionEx(ptr) GetVersionEx16
-150 pascal16 DirectedYield(word) DirectedYield
+150 pascal16 DirectedYield(word) DirectedYield16
 151 stub WinOldApCall
-152 pascal16 GetNumTasks() GetNumTasks
-154 pascal16 GlobalNotify(segptr) GlobalNotify
-155 pascal16 GetTaskDS() GetTaskDS
+152 pascal16 GetNumTasks() GetNumTasks16
+154 pascal16 GlobalNotify(segptr) GlobalNotify16
+155 pascal16 GetTaskDS() GetTaskDS16
 156 return LimitEMSPages 4 0
 157 return GetCurPID 4 0
 158 return IsWinOldApTask 2 0
-159 pascal GlobalHandleNoRIP(word) GlobalHandleNoRIP
+159 pascal GlobalHandleNoRIP(word) GlobalHandleNoRIP16
 160 stub EMSCopy
-161 pascal16 LocalCountFree() LocalCountFree
-162 pascal16 LocalHeapSize() LocalHeapSize
-163 pascal16 GlobalLRUOldest(word) GlobalLRUOldest
-164 pascal16 GlobalLRUNewest(word) GlobalLRUNewest
+161 pascal16 LocalCountFree() LocalCountFree16
+162 pascal16 LocalHeapSize() LocalHeapSize16
+163 pascal16 GlobalLRUOldest(word) GlobalLRUOldest16
+164 pascal16 GlobalLRUNewest(word) GlobalLRUNewest16
 165 return A20Proc 2 0
 166 pascal16 WinExec(str word) WinExec16
-167 pascal16 GetExpWinVer(word) GetExpWinVer
-168 pascal16 DirectResAlloc(word word word) DirectResAlloc
+167 pascal16 GetExpWinVer(word) GetExpWinVer16
+168 pascal16 DirectResAlloc(word word word) DirectResAlloc16
 169 pascal GetFreeSpace(word) GetFreeSpace16
-170 pascal16 AllocCStoDSAlias(word) AllocCStoDSAlias
-171 pascal16 AllocDStoCSAlias(word) AllocDStoCSAlias
-172 pascal16 AllocAlias(word) AllocCStoDSAlias
+170 pascal16 AllocCStoDSAlias(word) AllocCStoDSAlias16
+171 pascal16 AllocDStoCSAlias(word) AllocDStoCSAlias16
+172 pascal16 AllocAlias(word) AllocCStoDSAlias16
 173 equate __ROMBIOS 0
 174 equate __A000H 0
-175 pascal16 AllocSelector(word) AllocSelector
-176 pascal16 FreeSelector(word) FreeSelector
-177 pascal16 PrestoChangoSelector(word word) PrestoChangoSelector
+175 pascal16 AllocSelector(word) AllocSelector16
+176 pascal16 FreeSelector(word) FreeSelector16
+177 pascal16 PrestoChangoSelector(word word) PrestoChangoSelector16
 178 equate __WINFLAGS 0x413
 179 equate __D000H 0
-180 pascal16 LongPtrAdd(long long) LongPtrAdd
+180 pascal16 LongPtrAdd(long long) LongPtrAdd16
 181 equate __B000H 0
 182 equate __B800H 0
 183 equate __0000H 0
-184 pascal GlobalDOSAlloc(long) GlobalDOSAlloc
-185 pascal16 GlobalDOSFree(word) GlobalDOSFree
+184 pascal GlobalDOSAlloc(long) GlobalDOSAlloc16
+185 pascal16 GlobalDOSFree(word) GlobalDOSFree16
 186 pascal GetSelectorBase(word) WIN16_GetSelectorBase
 187 pascal16 SetSelectorBase(word long) WIN16_SetSelectorBase
-188 pascal GetSelectorLimit(word) GetSelectorLimit
-189 pascal16 SetSelectorLimit(word long) SetSelectorLimit
+188 pascal GetSelectorLimit(word) GetSelectorLimit16
+189 pascal16 SetSelectorLimit(word long) SetSelectorLimit16
 190 equate __E000H 0
-191 pascal16 GlobalPageLock(word) GlobalPageLock
-192 pascal16 GlobalPageUnlock(word) GlobalPageUnlock
+191 pascal16 GlobalPageLock(word) GlobalPageLock16
+192 pascal16 GlobalPageUnlock(word) GlobalPageUnlock16
 193 equate __0040H 0
 194 equate __F000H 0
 195 equate __C000H 0
-196 pascal16 SelectorAccessRights(word word word) SelectorAccessRights
+196 pascal16 SelectorAccessRights(word word word) SelectorAccessRights16
 197 pascal16 GlobalFix(word) GlobalFix16
 198 pascal16 GlobalUnfix(word) GlobalUnfix16
 199 pascal16 SetHandleCount(word) SetHandleCount16
 200 return ValidateFreeSpaces 0 0
 201 stub ReplaceInst
 202 stub RegisterPtrace
-203 register DebugBreak() DebugBreak
+203 register DebugBreak() DebugBreak16
 204 stub SwapRecording
 205 stub CVWBreak
-206 pascal16 AllocSelectorArray(word) AllocSelectorArray
+206 pascal16 AllocSelectorArray(word) AllocSelectorArray16
 207 pascal16 IsDBCSLeadByte(word) IsDBCSLeadByte16
 
 
 # 208-237 are Win95 extensions; a few of those are also present in WinNT
 
-208 pascal K208(word long long long) Local32Init
-209 pascal K209(long long word long) Local32Alloc
-210 pascal K210(long long word long long) Local32ReAlloc
-211 pascal K211(long long word) Local32Free
-213 pascal K213(long long word word) Local32Translate
-214 pascal K214(long long word) Local32Size
-215 pascal K215(long word) Local32ValidHandle  # Win95 only -- CONFLICT!
+208 pascal K208(word long long long) Local32Init16
+209 pascal K209(long long word long) Local32Alloc16
+210 pascal K210(long long word long long) Local32ReAlloc16
+211 pascal K211(long long word) Local32Free16
+213 pascal K213(long long word word) Local32Translate16
+214 pascal K214(long long word) Local32Size16
+215 pascal K215(long word) Local32ValidHandle16  # Win95 only -- CONFLICT!
 #215 stub WOWShouldWeSayWin95                  # WinNT only -- CONFLICT!
 216 pascal RegEnumKey(long long ptr long) RegEnumKey16                    # Both 95/NT
 217 pascal RegOpenKey(long str ptr) RegOpenKey16                          # Both 95/NT
@@ -235,8 +235,8 @@ file	krnl386.exe
 226 pascal RegSetValueEx(long str long long ptr long) RegSetValueEx16
 227 pascal RegFlushKey(long) RegFlushKey
 228 pascal16 K228(word) GetExePtr
-229 pascal16 K229(long) Local32GetSegment
-230 pascal GlobalSmartPageLock(word) GlobalPageLock #?
+229 pascal16 K229(long) Local32GetSegment16
+230 pascal GlobalSmartPageLock(word) GlobalPageLock16 #?
 231 stub GlobalSmartPageUnlock
 232 stub RegLoadKey
 233 stub RegUnloadKey
@@ -256,17 +256,17 @@ file	krnl386.exe
 
 # 310-356 are again shared between all versions
 
-310 pascal16 LocalHandleDelta(word) LocalHandleDelta
-311 pascal GetSetKernelDOSProc(ptr) GetSetKernelDOSProc
+310 pascal16 LocalHandleDelta(word) LocalHandleDelta16
+311 pascal GetSetKernelDOSProc(ptr) GetSetKernelDOSProc16
 314 stub DebugDefineSegment
-315 pascal16 WriteOutProfiles() WriteOutProfiles
-316 pascal GetFreeMemInfo() GetFreeMemInfo
+315 pascal16 WriteOutProfiles() WriteOutProfiles16
+316 pascal GetFreeMemInfo() GetFreeMemInfo16
 318 stub FatalExitHook
 319 stub FlushCachedFileHandle
-320 pascal16 IsTask(word) IsTask
+320 pascal16 IsTask(word) IsTask16
 323 return IsRomModule 2 0
-324 pascal16 LogError(word ptr) LogError
-325 pascal16 LogParamError(word ptr ptr) LogParamError
+324 pascal16 LogError(word ptr) LogError16
+325 pascal16 LogParamError(word ptr ptr) LogParamError16
 326 return IsRomFile 2 0
 327 register K327() HandleParamError
 328 stub _DebugOutput
@@ -276,25 +276,25 @@ file	krnl386.exe
 335 pascal16 IsBadWritePtr(segptr word) IsBadWritePtr16
 336 pascal16 IsBadCodePtr(segptr) IsBadCodePtr16
 337 pascal16 IsBadStringPtr(segptr word) IsBadStringPtr16
-338 pascal16 HasGPHandler(segptr) HasGPHandler
-339 pascal16 DiagQuery() DiagQuery
-340 pascal16 DiagOutput(str) DiagOutput
-341 pascal ToolHelpHook(ptr) ToolHelpHook
+338 pascal16 HasGPHandler(segptr) HasGPHandler16
+339 pascal16 DiagQuery() DiagQuery16
+340 pascal16 DiagOutput(str) DiagOutput16
+341 pascal ToolHelpHook(ptr) ToolHelpHook16
 342 word __GP(0 0 0 0)
 343 stub RegisterWinOldApHook
 344 stub GetWinOldApHooks
-345 pascal16 IsSharedSelector(word) IsSharedSelector
+345 pascal16 IsSharedSelector(word) IsSharedSelector16
 346 pascal16 IsBadHugeReadPtr(segptr long) IsBadHugeReadPtr16
 347 pascal16 IsBadHugeWritePtr(segptr long) IsBadHugeWritePtr16
-348 pascal16 hmemcpy(ptr ptr long) hmemcpy
+348 pascal16 hmemcpy(ptr ptr long) hmemcpy16
 349 pascal   _hread(word segptr long) WIN16_hread
 350 pascal   _hwrite(word ptr long) _hwrite16
 351 stub BUNNY_351
 352 pascal   lstrcatn(segstr str word) lstrcatn16
 353 pascal   lstrcpyn(segptr str word) lstrcpyn16
 354 pascal   GetAppCompatFlags(word) GetAppCompatFlags16
-355 pascal16 GetWinDebugInfo(ptr word) GetWinDebugInfo
-356 pascal16 SetWinDebugInfo(ptr) SetWinDebugInfo
+355 pascal16 GetWinDebugInfo(ptr word) GetWinDebugInfo16
+356 pascal16 SetWinDebugInfo(ptr) SetWinDebugInfo16
 
 
 # 357-365 are present in Win95 only
@@ -307,13 +307,13 @@ file	krnl386.exe
 360 pascal16 OpenFileEx(str ptr word) OpenFile16
 361 return PIGLET_361 0 0
 362 stub ThunkTerminateProcess
-365 register GlobalChangeLockCount(word word) GlobalChangeLockCount
+365 register GlobalChangeLockCount(word word) GlobalChangeLockCount16
 
 
 # 403-404 are common to all versions
 
-403 pascal16 FarSetOwner(word word) FarSetOwner
-404 pascal16 FarGetOwner(word) FarGetOwner
+403 pascal16 FarSetOwner(word word) FarSetOwner16
+404 pascal16 FarGetOwner(word) FarGetOwner16
 
 
 # 406-494 are present only in Win95
@@ -336,9 +336,9 @@ file	krnl386.exe
 421 pascal16 SetFileAttributes(ptr long) SetFileAttributes16
 422 pascal16 GetDiskFreeSpace(ptr ptr ptr ptr ptr) GetDiskFreeSpace16 
 423 stub LogApiThk
-431 pascal16 IsPeFormat(str word) IsPeFormat
+431 pascal16 IsPeFormat(str word) IsPeFormat16
 432 stub FileTimeToLocalFileTime
-434 pascal16 UnicodeToAnsi(ptr ptr word) UnicodeToAnsi
+434 pascal16 UnicodeToAnsi(ptr ptr word) UnicodeToAnsi16
 435 stub GetTaskFlags
 436 stub _ConfirmSysLevel
 437 stub _CheckNotSysLevel
@@ -348,16 +348,16 @@ file	krnl386.exe
 441 pascal CreateThread16(ptr long segptr segptr long ptr) THUNK_CreateThread16
 442 pascal VWin32_EventCreate() VWin32_EventCreate
 443 pascal VWin32_EventDestroy(long) VWin32_EventDestroy
-444 pascal16 Local32Info(ptr word) Local32Info
-445 pascal16 Local32First(ptr word) Local32First
-446 pascal16 Local32Next(ptr) Local32Next
+444 pascal16 Local32Info(ptr word) Local32Info16
+445 pascal16 Local32First(ptr word) Local32First16
+446 pascal16 Local32Next(ptr) Local32Next16
 447 return KERNEL_447 0 0
 448 stub KERNEL_448
 449 pascal GetpWin16Lock() GetpWin16Lock16
 450 pascal VWin32_EventWait(long) VWin32_EventWait
 451 pascal VWin32_EventSet(long) VWin32_EventSet
-452 pascal LoadLibrary32(str) LoadLibrary32A
-453 pascal GetProcAddress32(long str) WIN16_GetProcAddress32
+452 pascal LoadLibrary32(str) LoadLibraryA
+453 pascal GetProcAddress32(long str) GetProcAddress32_16
 454 equate __FLATCS 0   # initialized by BUILTIN_Init()
 455 equate __FLATDS 0   # initialized by BUILTIN_Init()
 456 pascal DefResourceHandler(word word word) NE_DefResourceHandler
@@ -367,8 +367,8 @@ file	krnl386.exe
 460 pascal WaitForSingleObject(long long) WIN16_WaitForSingleObject
 461 pascal WaitForMultipleObjects(long ptr long long) WIN16_WaitForMultipleObjects
 462 pascal GetCurrentThreadId() GetCurrentThreadId
-463 pascal SetThreadQueue(long word) SetThreadQueue
-464 pascal GetThreadQueue(long) GetThreadQueue
+463 pascal SetThreadQueue(long word) SetThreadQueue16
+464 pascal GetThreadQueue(long) GetThreadQueue16
 465 stub NukeProcess
 466 stub ExitProcess
 467 stub WOACreateConsole
@@ -379,20 +379,20 @@ file	krnl386.exe
 472 register MapHInstLS() WIN16_MapHInstLS
 473 register MapHInstSL() WIN16_MapHInstSL
 474 pascal CloseW32Handle(long) CloseHandle
-475 register GetTEBSelectorFS() GetTEBSelectorFS
+475 register GetTEBSelectorFS() GetTEBSelectorFS16
 476 pascal ConvertToGlobalHandle(long) ConvertToGlobalHandle
 477 stub WOAFullScreen
 478 stub WOATerminateProcess
 479 pascal KERNEL_479(long) VWin32_EventSet  # ???
 480 pascal16 _EnterWin16Lock() SYSLEVEL_EnterWin16Lock
 481 pascal16 _LeaveWin16Lock() SYSLEVEL_LeaveWin16Lock
-482 pascal LoadSystemLibrary32(str) LoadLibrary32A   # FIXME!
+482 pascal LoadSystemLibrary32(str) LoadLibraryA   # FIXME!
 483 stub MapProcessHandle
 484 pascal SetProcessDWORD(long s_word long) SetProcessDword
 485 pascal GetProcessDWORD(long s_word) GetProcessDword
-486 pascal FreeLibrary32(long) FreeLibrary32
-487 pascal GetModuleFileName32(long str word) GetModuleFileName32A
-488 pascal GetModuleHandle32(str) GetModuleHandle32A
+486 pascal FreeLibrary32(long) FreeLibrary
+487 pascal GetModuleFileName32(long str word) GetModuleFileNameA
+488 pascal GetModuleHandle32(str) GetModuleHandleA
 489 stub KERNEL_489  # VWin32_BoostWithDecay
 490 pascal16 KERNEL_490(word) KERNEL_490
 491 pascal RegisterServiceProcess(long long) RegisterServiceProcess
@@ -418,11 +418,11 @@ file	krnl386.exe
 511 stub WOWKILLREMOTETASK
 512 stub WOWQUERYDEBUG
 513 pascal   LoadLibraryEx32W(ptr long long) LoadLibraryEx32W16 # Both NT/95
-514 pascal16 FreeLibrary32W(long) FreeLibrary32                 # Both NT/95
-515 pascal   GetProcAddress32W(long str) GetProcAddress32       # Both NT/95
+514 pascal16 FreeLibrary32W(long) FreeLibrary                 # Both NT/95
+515 pascal   GetProcAddress32W(long str) GetProcAddress       # Both NT/95
 516 pascal   GetVDMPointer32W(segptr word) GetVDMPointer32W     # Both NT/95
-517 pascal   CallProc32W() WIN16_CallProc32W                    # Both NT/95
-518 pascal   CallProcEx32W() WIN16_CallProcEx32W                # Both NT/95
+517 pascal   CallProc32W() CallProc32W_16                    # Both NT/95
+518 pascal   CallProcEx32W() CallProcEx32W_16                # Both NT/95
 519 stub EXITKERNELTHUNK
 # the __MOD_ variables are WORD datareferences, the current values are invented.
 520 equate __MOD_KERNEL 4200
@@ -457,44 +457,44 @@ file	krnl386.exe
 #541 stub KERNEL_541
 542 stub KERNEL_542
 543 stub KERNEL_543
-560 pascal SetThunkletCallbackGlue(long segptr) SetThunkletCallbackGlue
-561 pascal AllocLSThunkletCallback(segptr long) AllocLSThunkletCallback
-562 pascal AllocSLThunkletCallback(long long) AllocSLThunkletCallback
+560 pascal SetThunkletCallbackGlue(long segptr) SetThunkletCallbackGlue16
+561 pascal AllocLSThunkletCallback(segptr long) AllocLSThunkletCallback16
+562 pascal AllocSLThunkletCallback(long long) AllocSLThunkletCallback16
 563 pascal FindLSThunkletCallback(segptr long) FindLSThunkletCallback
 564 pascal FindSLThunkletCallback(long long) FindSLThunkletCallback
 566 stub KERNEL_566  # (thunklet) FIXME!!!
-567 pascal AllocLSThunkletCallbackEx(segptr long word) AllocLSThunkletCallbackEx
-568 pascal AllocSLThunkletCallbackEx(long long word) AllocSLThunkletCallbackEx
+567 pascal AllocLSThunkletCallbackEx(segptr long word) AllocLSThunkletCallbackEx16
+568 pascal AllocSLThunkletCallbackEx(long long word) AllocSLThunkletCallbackEx16
 
 
 # 600-653 are Win95 only
 
 600 stub AllocCodeAlias
 601 stub FreeCodeAlias
-602 register GetDummyModuleHandleDS() GetDummyModuleHandleDS
+602 register GetDummyModuleHandleDS() GetDummyModuleHandleDS16
 603 stub KERNEL_603  # OutputDebugString (?)
 604 register CBClientGlueSL() CBClientGlueSL
-605 pascal AllocSLThunkletCallback(long long) AllocSLThunkletCallback
-606 pascal AllocLSThunkletCallback(segptr long) AllocLSThunkletCallback
-607 pascal AllocLSThunkletSysthunk(segptr long long) AllocLSThunkletSysthunk
-608 pascal AllocSLThunkletSysthunk(long segptr long) AllocSLThunkletSysthunk
+605 pascal AllocSLThunkletCallback(long long) AllocSLThunkletCallback16
+606 pascal AllocLSThunkletCallback(segptr long) AllocLSThunkletCallback16
+607 pascal AllocLSThunkletSysthunk(segptr long long) AllocLSThunkletSysthunk16
+608 pascal AllocSLThunkletSysthunk(long segptr long) AllocSLThunkletSysthunk16
 609 pascal FindLSThunkletCallback(segptr long) FindLSThunkletCallback
 610 pascal FindSLThunkletCallback(long long) FindSLThunkletCallback
 611 return FreeThunklet 8 0
-612 pascal16 IsSLThunklet(ptr) IsSLThunklet
+612 pascal16 IsSLThunklet(ptr) IsSLThunklet16
 613 stub HugeMapLS
 614 stub HugeUnMapLS
 615 pascal16 ConvertDialog32To16(long long long) ConvertDialog32To16
 616 pascal16 ConvertMenu32To16(long long long) ConvertMenu32To16
-617 pascal16 GetMenu32Size(ptr) GetMenu32Size
-618 pascal16 GetDialog32Size(ptr) GetDialog32Size
-619 pascal16 RegisterCBClient(word ptr long) RegisterCBClient
+617 pascal16 GetMenu32Size(ptr) GetMenu32Size16
+618 pascal16 GetDialog32Size(ptr) GetDialog32Size16
+619 pascal16 RegisterCBClient(word ptr long) RegisterCBClient16
 620 register CBClientThunkSL() CBClientThunkSL
 621 register CBClientThunkSLEx() CBClientThunkSLEx
-622 pascal16 UnRegisterCBClient(word ptr long) UnRegisterCBClient
-623 pascal16 InitCBClient(long) InitCBClient
-624 pascal SetFastQueue(long long) SetFastQueue
-625 pascal GetFastQueue() GetFastQueue
+622 pascal16 UnRegisterCBClient(word ptr long) UnRegisterCBClient16
+623 pascal16 InitCBClient(long) InitCBClient16
+624 pascal SetFastQueue(long long) SetFastQueue16
+625 pascal GetFastQueue() GetFastQueue16
 626 stub SmashEnvironment
 627 stub IsBadFlatReadWritePtr
 630 register C16ThkSL() C16ThkSL
@@ -506,7 +506,7 @@ file	krnl386.exe
 
 # 700-704 are Win95 only
 
-700 pascal SSInit() SSInit
+700 pascal SSInit() SSInit16
 701 stub SSOnBigStack
 702 stub SSCall
 703 stub CallProc32WFix
diff --git a/if1632/keyboard.spec b/if1632/keyboard.spec
index 0b9a2b36a5f..0f9116f42bc 100644
--- a/if1632/keyboard.spec
+++ b/if1632/keyboard.spec
@@ -8,7 +8,7 @@ type	win16
 5   pascal16 AnsiToOem(str ptr) AnsiToOem16
 6   pascal16 OemToAnsi(str ptr) OemToAnsi16
 7   return   SetSpeed 2 65535
-100	pascal	ScreenSwitchEnable(word) ScreenSwitchEnable
+100	pascal	ScreenSwitchEnable(word) ScreenSwitchEnable16
 #126	pascal	GetTableSeg
 #127	pascal	NewTable
 128 pascal   OemKeyScan(word) OemKeyScan
diff --git a/if1632/mmsystem.spec b/if1632/mmsystem.spec
index 7dc84f55d0b..db72fe4bc6d 100644
--- a/if1632/mmsystem.spec
+++ b/if1632/mmsystem.spec
@@ -5,10 +5,10 @@ type	win16
 2      pascal  SNDPLAYSOUND(ptr word) sndPlaySound
 3      stub    PLAYSOUND
 5      pascal  mmsystemGetVersion() mmsystemGetVersion16
-6      pascal  DriverProc(long word word long long) DriverProc
+6      pascal  DriverProc(long word word long long) DriverProc16
 8      stub    WMMMIDIRUNONCE
 30     pascal16 OutputDebugStr(str) OutputDebugString16
-31     pascal  DriverCallback(long word word word long long long) DriverCallback
+31     pascal  DriverCallback(long word word word long long long) DriverCallback16
 32     stub    STACKENTER
 33     stub    STACKLEAVE
 34     stub    MMDRVINSTALL
diff --git a/if1632/ole2.spec b/if1632/ole2.spec
index 77894ddfb37..253ff143acf 100644
--- a/if1632/ole2.spec
+++ b/if1632/ole2.spec
@@ -74,7 +74,7 @@ type	win16
 71 stub OLECONVERTOLESTREAMTOISTORAGE
 74 stub READFMTUSERTYPESTG
 75 stub WRITEFMTUSERTYPESTG
-76 pascal16 OleFlushClipboard() OleFlushClipboard
+76 pascal16 OleFlushClipboard() OleFlushClipboard16
 77 stub OLEISCURRENTCLIPBOARD
 78 stub OLETRANSLATEACCELERATOR
 79 stub OLEDOAUTOCONVERT
diff --git a/if1632/ole2disp.spec b/if1632/ole2disp.spec
index dce0c29d6d8..99d34cf1e52 100644
--- a/if1632/ole2disp.spec
+++ b/if1632/ole2disp.spec
@@ -31,11 +31,11 @@ type	win16
 28 stub DISPGETPARAM
 29 stub DISPGETIDSOFNAMES
 30 stub DISPINVOKE
-31 pascal CreateDispTypeInfo(ptr long ptr) CreateDispTypeInfo
+31 pascal CreateDispTypeInfo(ptr long ptr) CreateDispTypeInfo16
 32 stub CREATESTDDISPATCH
 33 stub _IID_IDISPATCH
 34 stub _IID_IENUMVARIANT
-35 pascal RegisterActiveObject(ptr ptr long ptr) RegisterActiveObject
+35 pascal RegisterActiveObject(ptr ptr long ptr) RegisterActiveObject16
 36 stub REVOKEACTIVEOBJECT
 37 stub GETACTIVEOBJECT
 38 stub SAFEARRAYALLOCDESCRIPTOR
diff --git a/if1632/olesvr.spec b/if1632/olesvr.spec
index 074c538dc73..b9083a3a429 100644
--- a/if1632/olesvr.spec
+++ b/if1632/olesvr.spec
@@ -3,7 +3,7 @@ type	win16
 
 #1 WEP
 2  pascal OleRegisterServer(str ptr ptr word word) OleRegisterServer16
-3  pascal OleRevokeServer(long) OleRevokeServer
+3  pascal OleRevokeServer(long) OleRevokeServer16
 4  pascal OleBlockServer(long) OleBlockServer16
 5  pascal OleUnblockServer(long ptr) OleUnblockServer16
 6  pascal OleRegisterServerDoc(long str ptr ptr) OleRegisterServerDoc16
diff --git a/if1632/relay.c b/if1632/relay.c
index b072f9d4882..afe9d2cd97c 100644
--- a/if1632/relay.c
+++ b/if1632/relay.c
@@ -21,7 +21,7 @@
 /***********************************************************************
  *           RELAY_Init
  */
-BOOL32 RELAY_Init(void)
+BOOL RELAY_Init(void)
 {
     WORD codesel;
 
@@ -316,7 +316,7 @@ void RELAY_DebugCallTo16Ret( int ret_val )
  * Real prototype is:
  *   INT16 WINAPI Catch( LPCATCHBUF lpbuf );
  */
-void WINAPI Catch( CONTEXT *context )
+void WINAPI Catch16( CONTEXT *context )
 {
     VA_LIST16 valist;
     SEGPTR buf;
@@ -363,7 +363,7 @@ void WINAPI Catch( CONTEXT *context )
  * Real prototype is:
  *   INT16 WINAPI Throw( LPCATCHBUF lpbuf, INT16 retval );
  */
-void WINAPI Throw( CONTEXT *context )
+void WINAPI Throw16( CONTEXT *context )
 {
     VA_LIST16 valist;
     SEGPTR buf;
@@ -425,7 +425,7 @@ void WINAPI Throw( CONTEXT *context )
 static DWORD RELAY_CallProc32W(int Ex)
 {
 	DWORD nrofargs, argconvmask;
-	FARPROC32 proc32;
+	FARPROC proc32;
 	DWORD *args, ret;
         VA_LIST16 valist;
 	int i;
@@ -435,7 +435,7 @@ static DWORD RELAY_CallProc32W(int Ex)
         VA_START16( valist );
         nrofargs    = VA_ARG16( valist, DWORD );
         argconvmask = VA_ARG16( valist, DWORD );
-        proc32      = VA_ARG16( valist, FARPROC32 );
+        proc32      = VA_ARG16( valist, FARPROC );
 	dsprintf(relay, "CallProc32W(%ld,%ld,%p, Ex%d args[",nrofargs,argconvmask,proc32,Ex);
 	args = (DWORD*)HEAP_xalloc( GetProcessHeap(), 0,
                                     sizeof(DWORD)*nrofargs );
@@ -507,7 +507,7 @@ static DWORD RELAY_CallProc32W(int Ex)
 /**********************************************************************
  *	     CallProc32W    (KERNEL.517)
  */
-DWORD WINAPI WIN16_CallProc32W()
+DWORD WINAPI CallProc32W_16()
 {
         return RELAY_CallProc32W(0);
 }
@@ -518,7 +518,7 @@ DWORD WINAPI WIN16_CallProc32W()
 *
 *      C - style linkage to CallProc32W - caller pops stack.
 */
-DWORD WINAPI WIN16_CallProcEx32W()
+DWORD WINAPI CallProcEx32W_16()
 {
 	return RELAY_CallProc32W(TRUE);
 }
diff --git a/if1632/shell.spec b/if1632/shell.spec
index 50e8eeff9dd..bd84c6ff7a9 100644
--- a/if1632/shell.spec
+++ b/if1632/shell.spec
@@ -18,9 +18,9 @@ type	win16
  33 pascal16 AboutDlgProc(word word word long) AboutDlgProc16
  34 pascal16 ExtractIcon(word str s_word) ExtractIcon16
  36 pascal16 ExtractAssociatedIcon(word ptr ptr) ExtractAssociatedIcon16
- 37 pascal   DoEnvironmentSubst(ptr word) DoEnvironmentSubst
- 38 pascal   FindEnvironmentString(ptr) FindEnvironmentString
- 39 pascal16 InternalExtractIcon(word ptr s_word word) InternalExtractIcon
+ 37 pascal   DoEnvironmentSubst(ptr word) DoEnvironmentSubst16
+ 38 pascal   FindEnvironmentString(ptr) FindEnvironmentString16
+ 39 pascal16 InternalExtractIcon(word ptr s_word word) InternalExtractIcon16
  40 pascal16 ExtractIconEx(str word ptr ptr word) ExtractIconEx16
 # 98 stub SHL3216_THUNKDATA16
 # 99 stub SHL1632_THUNKDATA16
@@ -29,8 +29,8 @@ type	win16
 #101   8  010e  FINDEXEDLGPROC exported, shared data
 #101 DLLENTRYPOINT #win95 SHELL.DLL
 
-102 pascal16 RegisterShellHook(word word) RegisterShellHook
-103 pascal   ShellHookProc(word word long) ShellHookProc
+102 pascal16 RegisterShellHook(word word) RegisterShellHook16
+103 pascal   ShellHookProc(word word long) ShellHookProc16
 
 157 stub RESTARTDIALOG
 #  166 PICKICONDLG
diff --git a/if1632/snoop.c b/if1632/snoop.c
index 69915aab744..9c687c177a5 100644
--- a/if1632/snoop.c
+++ b/if1632/snoop.c
@@ -124,7 +124,7 @@ SNOOP16_RegisterDLL(NE_MODULE *pModule,LPCSTR name) {
 	(*dll)->name	= HEAP_strdupA(SystemHeap,0,name);
 	if ((s=strrchr((*dll)->name,'.')))
 		*s='\0';
-	(*dll)->funhandle = GlobalHandleToSel(GLOBAL_Alloc(GMEM_ZEROINIT,65535,0,TRUE,FALSE,FALSE));
+	(*dll)->funhandle = GlobalHandleToSel16(GLOBAL_Alloc(GMEM_ZEROINIT,65535,0,TRUE,FALSE,FALSE));
 	(*dll)->funs = GlobalLock16((*dll)->funhandle);
 	if (!(*dll)->funs) {
 		HeapFree(SystemHeap,0,*dll);
@@ -238,7 +238,7 @@ void WINAPI SNOOP16_Entry(CONTEXT *context) {
 		rets = &((*rets)->next);
 	}
 	if (!*rets) {
-		HANDLE16	hand = GlobalHandleToSel(GLOBAL_Alloc(GMEM_ZEROINIT,65535,0,TRUE,FALSE,FALSE));
+		HANDLE16	hand = GlobalHandleToSel16(GLOBAL_Alloc(GMEM_ZEROINIT,65535,0,TRUE,FALSE,FALSE));
 		*rets = GlobalLock16(hand);
 		memset(*rets,0,65535);
 		(*rets)->rethandle = hand;
diff --git a/if1632/sound.spec b/if1632/sound.spec
index 8a8e0bf68be..28b5324286d 100644
--- a/if1632/sound.spec
+++ b/if1632/sound.spec
@@ -2,7 +2,7 @@ name	sound
 type	win16
 
 1  pascal16 OpenSound() OpenSound16
-2  pascal16 CloseSound() CloseSound
+2  pascal16 CloseSound() CloseSound16
 3  pascal16 SetVoiceQueueSize(word word) SetVoiceQueueSize16
 4  pascal16 SetVoiceNote(word word word word) SetVoiceNote16
 5  pascal16 SetVoiceAccent(word word word word word) SetVoiceAccent16
@@ -17,4 +17,4 @@ type	win16
 14 pascal   GetThresholdEvent() GetThresholdEvent16
 15 pascal16 GetThresholdStatus() GetThresholdStatus16
 16 pascal16 SetVoiceThreshold(word word) SetVoiceThreshold16
-17 pascal16 DoBeep() DoBeep
+17 pascal16 DoBeep() DoBeep16
diff --git a/if1632/system.spec b/if1632/system.spec
index c2702c2143a..5090302eb79 100644
--- a/if1632/system.spec
+++ b/if1632/system.spec
@@ -1,11 +1,11 @@
 name	system
 type	win16
 
-1 pascal   InquireSystem(word word) InquireSystem
+1 pascal   InquireSystem(word word) InquireSystem16
 2 pascal16 CreateSystemTimer(word segptr) WIN16_CreateSystemTimer
 3 pascal16 KillSystemTimer(word) SYSTEM_KillSystemTimer
-4 pascal16 EnableSystemTimers() EnableSystemTimers
-5 pascal16 DisableSystemTimers() DisableSystemTimers
+4 pascal16 EnableSystemTimers() EnableSystemTimers16
+5 pascal16 DisableSystemTimers() DisableSystemTimers16
 6 pascal   GetSystemMSecCount() GetTickCount
 7 return Get80x87SaveSize 0 94
 8 stub Save80x87State
diff --git a/if1632/thunk.c b/if1632/thunk.c
index ff1fbe9bd94..d275ab0944b 100644
--- a/if1632/thunk.c
+++ b/if1632/thunk.c
@@ -30,8 +30,8 @@
 /* by the build program to generate the file if1632/callto16.S */
 
 /* ### start build ### */
-extern LONG CALLBACK CallTo16_sreg_(const CONTEXT *context, INT32 offset);
-extern LONG CALLBACK CallTo16_lreg_(const CONTEXT *context, INT32 offset);
+extern LONG CALLBACK CallTo16_sreg_(const CONTEXT *context, INT offset);
+extern LONG CALLBACK CallTo16_lreg_(const CONTEXT *context, INT offset);
 extern WORD CALLBACK CallTo16_word_     (FARPROC16);
 extern LONG CALLBACK CallTo16_long_     (FARPROC16);
 extern WORD CALLBACK CallTo16_word_w    (FARPROC16,WORD);
@@ -116,7 +116,7 @@ typedef struct tagTHUNK
 {
     BYTE             popl_eax;           /* 0x58  popl  %eax (return address)*/
     BYTE             pushl_func;         /* 0x68  pushl $proc */
-    FARPROC32        proc WINE_PACKED;
+    FARPROC        proc WINE_PACKED;
     BYTE             pushl_eax;          /* 0x50  pushl %eax */
     BYTE             jmp;                /* 0xe9  jmp   relay (relative jump)*/
     RELAY            relay WINE_PACKED;
@@ -126,7 +126,7 @@ typedef struct tagTHUNK
 #pragma pack(4)
 
 #define DECL_THUNK(name,proc,relay) \
-    THUNK name = { 0x58, 0x68, (FARPROC32)(proc), 0x50, 0xe9, \
+    THUNK name = { 0x58, 0x68, (FARPROC)(proc), 0x50, 0xe9, \
                    (RELAY)((char *)(relay) - (char *)(&(name).next)), NULL }
 
 
@@ -135,14 +135,14 @@ static THUNK *firstThunk = NULL;
 static LRESULT WINAPI THUNK_CallWndProc16( WNDPROC16 proc, HWND16 hwnd,
                                            UINT16 msg, WPARAM16 wParam,
                                            LPARAM lParam );
-static BOOL32 WINAPI THUNK_CallTaskReschedule(void);
-static BOOL32 WINAPI THUNK_WOWCallback16Ex( FARPROC16,DWORD,DWORD,
+static BOOL WINAPI THUNK_CallTaskReschedule(void);
+static BOOL WINAPI THUNK_WOWCallback16Ex( FARPROC16,DWORD,DWORD,
                                             LPVOID,LPDWORD );
 
 /* TASK_Reschedule() 16-bit entry point */
 static FARPROC16 TASK_RescheduleProc;
 
-static BOOL32 THUNK_ThunkletInit( void );
+static BOOL THUNK_ThunkletInit( void );
 
 extern void CallFrom16_p_long_wwwll(void);
 
@@ -182,7 +182,7 @@ static const CALLBACKS_TABLE CALLBACK_EmulatorTable =
 /***********************************************************************
  *           THUNK_Init
  */
-BOOL32 THUNK_Init(void)
+BOOL THUNK_Init(void)
 {
     /* Set the window proc calling functions */
     Callbacks = &CALLBACK_EmulatorTable;
@@ -195,7 +195,7 @@ BOOL32 THUNK_Init(void)
 /***********************************************************************
  *           THUNK_Alloc
  */
-static THUNK *THUNK_Alloc( FARPROC32 func, RELAY relay )
+static THUNK *THUNK_Alloc( FARPROC func, RELAY relay )
 {
     THUNK *thunk = HeapAlloc( GetProcessHeap(), 0, sizeof(*thunk) );
     if (thunk)
@@ -216,7 +216,7 @@ static THUNK *THUNK_Alloc( FARPROC32 func, RELAY relay )
 /***********************************************************************
  *           THUNK_Find
  */
-static THUNK *THUNK_Find( FARPROC32 func )
+static THUNK *THUNK_Find( FARPROC func )
 {
     THUNK *thunk = firstThunk;
     while (thunk && (thunk->proc != func)) thunk = thunk->next;
@@ -313,7 +313,7 @@ static LRESULT WINAPI THUNK_CallWndProc16( WNDPROC16 proc, HWND16 hwnd,
 /***********************************************************************
  *           THUNK_CallTaskReschedule
  */
-static BOOL32 WINAPI THUNK_CallTaskReschedule(void)
+static BOOL WINAPI THUNK_CallTaskReschedule(void)
 {
     return CallTo16_word_(TASK_RescheduleProc);
 }
@@ -450,7 +450,7 @@ BOOL16 WINAPI THUNK_GrayString16( HDC16 hdc, HBRUSH16 hbr,
  */
 FARPROC16 WINAPI THUNK_SetWindowsHook16( INT16 id, HOOKPROC16 proc )
 {
-    HINSTANCE16 hInst = FarGetOwner( HIWORD(proc) );
+    HINSTANCE16 hInst = FarGetOwner16( HIWORD(proc) );
     HTASK16 hTask = (id == WH_MSGFILTER) ? GetCurrentTask() : 0;
     THUNK *thunk = THUNK_Alloc( (FARPROC16)proc, (RELAY)CallTo16_long_wwl );
     if (!thunk) return 0;
@@ -514,11 +514,11 @@ BOOL16 WINAPI THUNK_SetDCHook( HDC16 hdc, FARPROC16 proc, DWORD dwHookData )
         thunk = THUNK_Alloc( proc, (RELAY)CallTo16_word_wwll );
         if (!thunk) return FALSE;
     }
-    else thunk = (THUNK *)DCHook;
+    else thunk = (THUNK *)DCHook16;
 
     /* Free the previous thunk */
     GetDCHook( hdc, (FARPROC16 *)&oldThunk );
-    if (oldThunk && (oldThunk != (THUNK *)DCHook)) THUNK_Free( oldThunk );
+    if (oldThunk && (oldThunk != (THUNK *)DCHook16)) THUNK_Free( oldThunk );
 
     return SetDCHook( hdc, (FARPROC16)thunk, dwHookData );
 }
@@ -533,7 +533,7 @@ DWORD WINAPI THUNK_GetDCHook( HDC16 hdc, FARPROC16 *phookProc )
     DWORD ret = GetDCHook( hdc, (FARPROC16 *)&thunk );
     if (thunk)
     {
-        if (thunk == (THUNK *)DCHook)
+        if (thunk == (THUNK *)DCHook16)
         {
             if (!defDCHookProc)  /* Get DCHook Win16 entry point */
                 defDCHookProc = NE_GetEntryPoint(GetModuleHandle16("USER"),362);
@@ -588,12 +588,12 @@ static DWORD CALLBACK THUNK_StartThread16( LPVOID threadArgs )
 
     return CallTo16_long_l( start, param );
 }
-HANDLE32 WINAPI THUNK_CreateThread16( SECURITY_ATTRIBUTES *sa, DWORD stack,
+HANDLE WINAPI THUNK_CreateThread16( SECURITY_ATTRIBUTES *sa, DWORD stack,
                                       FARPROC16 start, SEGPTR param,
                                       DWORD flags, LPDWORD id )
 {
     DWORD *threadArgs = HeapAlloc( GetProcessHeap(), 0, 2*sizeof(DWORD) );
-    if (!threadArgs) return INVALID_HANDLE_VALUE32;
+    if (!threadArgs) return INVALID_HANDLE_VALUE;
     threadArgs[0] = (DWORD)start;
     threadArgs[1] = (DWORD)param;
 
@@ -607,7 +607,7 @@ HANDLE32 WINAPI THUNK_CreateThread16( SECURITY_ATTRIBUTES *sa, DWORD stack,
  * RETURNS
  * 	TRUE if the call was done
  */
-static BOOL32 WINAPI THUNK_WOWCallback16Ex(
+static BOOL WINAPI THUNK_WOWCallback16Ex(
 	FARPROC16 proc,		/* [in] 16bit function to call */
 	DWORD dwFlags,		/* [in] flags (WCB_*) */
 	DWORD cbArgs,		/* [in] number of arguments */
@@ -744,7 +744,7 @@ VOID WINAPI THUNK_MOUSE_Enable( FARPROC16 proc )
 /***********************************************************************
  *           GetMouseEventProc   (USER.337)
  */
-FARPROC16 WINAPI GetMouseEventProc(void)
+FARPROC16 WINAPI GetMouseEventProc16(void)
 {
     HMODULE16 hmodule = GetModuleHandle16("USER");
     return NE_GetEntryPoint( hmodule, NE_GetOrdinal( hmodule, "mouse_event" ));
@@ -859,26 +859,26 @@ WORD WINAPI WIN16_CreateSystemTimer( WORD rate, FARPROC16 proc )
  */
 void THUNK_InitCallout(void)
 {
-    HMODULE32 hModule = GetModuleHandle32A( "USER32" );
+    HMODULE hModule = GetModuleHandleA( "USER32" );
     if ( hModule )
     {
 #define GETADDR( var, name )  \
-        *(FARPROC32 *)&Callout.##var = GetProcAddress32( hModule, name )
-
-        GETADDR( PeekMessage32A, "PeekMessageA" );
-        GETADDR( PeekMessage32W, "PeekMessageW" );
-        GETADDR( GetMessage32A, "GetMessageA" );
-        GETADDR( GetMessage32W, "GetMessageW" );
-        GETADDR( SendMessage32A, "SendMessageA" );
-        GETADDR( SendMessage32W, "SendMessageW" );
-        GETADDR( PostMessage32A, "PostMessageA" );
-        GETADDR( PostMessage32W, "PostMessageW" );
-        GETADDR( PostThreadMessage32A, "PostThreadMessageA" );
-        GETADDR( PostThreadMessage32W, "PostThreadMessageW" );
-        GETADDR( TranslateMessage32, "TranslateMessage" );
-        GETADDR( DispatchMessage32W, "DispatchMessageW" );
-        GETADDR( DispatchMessage32A, "DispatchMessageA" );
-        GETADDR( RedrawWindow32, "RedrawWindow" );
+        *(FARPROC *)&Callout.##var = GetProcAddress( hModule, name )
+
+        GETADDR( PeekMessageA, "PeekMessageA" );
+        GETADDR( PeekMessageW, "PeekMessageW" );
+        GETADDR( GetMessageA, "GetMessageA" );
+        GETADDR( GetMessageW, "GetMessageW" );
+        GETADDR( SendMessageA, "SendMessageA" );
+        GETADDR( SendMessageW, "SendMessageW" );
+        GETADDR( PostMessageA, "PostMessageA" );
+        GETADDR( PostMessageW, "PostMessageW" );
+        GETADDR( PostThreadMessageA, "PostThreadMessageA" );
+        GETADDR( PostThreadMessageW, "PostThreadMessageW" );
+        GETADDR( TranslateMessage, "TranslateMessage" );
+        GETADDR( DispatchMessageW, "DispatchMessageW" );
+        GETADDR( DispatchMessageA, "DispatchMessageA" );
+        GETADDR( RedrawWindow, "RedrawWindow" );
 
 #undef GETADDR
     }
@@ -887,7 +887,7 @@ void THUNK_InitCallout(void)
     if ( hModule )
     {
 #define GETADDR( var, name, thk )  \
-        *(FARPROC32 *)&Callout.##var = (FARPROC32) \
+        *(FARPROC *)&Callout.##var = (FARPROC) \
               THUNK_Alloc( WIN32_GetProcAddress16( hModule, name ), \
                            (RELAY)CallTo16_##thk )
 
@@ -899,8 +899,8 @@ void THUNK_InitCallout(void)
         GETADDR( TranslateMessage16, "TranslateMessage", word_l );
         GETADDR( DispatchMessage16, "DispatchMessage", long_l );
         GETADDR( RedrawWindow16, "RedrawWindow", word_wlww );
-        GETADDR( InitThreadInput, "InitThreadInput", word_ww );
-        GETADDR( UserYield, "UserYield", word_ );
+        GETADDR( InitThreadInput16, "InitThreadInput", word_ww );
+        GETADDR( UserYield16, "UserYield", word_ );
 
 #undef GETADDR
     }
@@ -914,7 +914,7 @@ void THUNK_InitCallout(void)
  *              ThunkConnect16          (KERNEL.651)
  * Connects a 32bit and a 16bit thunkbuffer.
  */
-UINT32 WINAPI ThunkConnect16(
+UINT WINAPI ThunkConnect16(
         LPSTR module16,              /* [in] name of win16 dll */
         LPSTR module32,              /* [in] name of win32 dll */
         HINSTANCE16 hInst16,         /* [in] hInst of win16 dll */
@@ -923,16 +923,16 @@ UINT32 WINAPI ThunkConnect16(
         LPSTR thunkfun32,            /* [in] win32 thunkfunction */
         WORD cs                      /* [in] CS of win16 dll */
 ) {
-    BOOL32 directionSL;
+    BOOL directionSL;
 
-    if (!lstrncmp32A(TD->magic, "SL01", 4))
+    if (!lstrncmpA(TD->magic, "SL01", 4))
     {
         directionSL = TRUE;
 
         TRACE(thunk, "SL01 thunk %s (%lx) -> %s (%s), Reason: %ld\n",
                      module16, (DWORD)TD, module32, thunkfun32, dwReason);
     }
-    else if (!lstrncmp32A(TD->magic, "LS01", 4))
+    else if (!lstrncmpA(TD->magic, "LS01", 4))
     {
         directionSL = FALSE;
 
@@ -965,8 +965,8 @@ UINT32 WINAPI ThunkConnect16(
                     SL->apiDB    = PTR_SEG_TO_LIN(SL16->apiDatabase);
                     SL->targetDB = NULL;
 
-                    lstrcpyn32A(SL->pszDll16, module16, 255);
-                    lstrcpyn32A(SL->pszDll32, module32, 255);
+                    lstrcpynA(SL->pszDll16, module16, 255);
+                    lstrcpynA(SL->pszDll32, module32, 255);
 
                     /* We should create a SEGPTR to the ThunkDataSL,
                        but since the contents are not in the original format,
@@ -979,7 +979,7 @@ UINT32 WINAPI ThunkConnect16(
                 if (SL->flags2 & 0x80000000)
                 {
                     TRACE(thunk, "Preloading 32-bit library\n");
-                    LoadLibrary32A(module32);
+                    LoadLibraryA(module32);
                 }
             }
             else
@@ -1110,7 +1110,7 @@ void WINAPI C16ThkSL01(CONTEXT *context)
         if (!tdb)
         {
             TRACE(thunk, "Loading 32-bit library %s\n", td->pszDll32);
-            LoadLibrary32A(td->pszDll32);
+            LoadLibraryA(td->pszDll32);
 
             for (tdb = td->targetDB; tdb; tdb = tdb->next)
                 if (tdb->process == PROCESS_Current())
@@ -1181,19 +1181,19 @@ typedef struct _THUNKLET
 #define THUNKLET_TYPE_LS  1
 #define THUNKLET_TYPE_SL  2
 
-static HANDLE32  ThunkletHeap = 0;
+static HANDLE  ThunkletHeap = 0;
 static THUNKLET *ThunkletAnchor = NULL;
 
-static FARPROC32 ThunkletSysthunkGlueLS = 0;
+static FARPROC ThunkletSysthunkGlueLS = 0;
 static SEGPTR    ThunkletSysthunkGlueSL = 0;
 
-static FARPROC32 ThunkletCallbackGlueLS = 0;
+static FARPROC ThunkletCallbackGlueLS = 0;
 static SEGPTR    ThunkletCallbackGlueSL = 0;
 
 /***********************************************************************
  *     THUNK_ThunkletInit
  */
-static BOOL32 THUNK_ThunkletInit( void )
+static BOOL THUNK_ThunkletInit( void )
 {
     LPBYTE thunk;
 
@@ -1203,7 +1203,7 @@ static BOOL32 THUNK_ThunkletInit( void )
     thunk = HeapAlloc( ThunkletHeap, 0, 5 );
     if (!thunk) return FALSE;
     
-    ThunkletSysthunkGlueLS = (FARPROC32)thunk;
+    ThunkletSysthunkGlueLS = (FARPROC)thunk;
     *thunk++ = 0x58;                             /* popl eax */
     *thunk++ = 0xC3;                             /* ret      */
 
@@ -1217,7 +1217,7 @@ static BOOL32 THUNK_ThunkletInit( void )
 /***********************************************************************
  *     SetThunkletCallbackGlue             (KERNEL.560)
  */
-void WINAPI SetThunkletCallbackGlue( FARPROC32 glueLS, SEGPTR glueSL )
+void WINAPI SetThunkletCallbackGlue16( FARPROC glueLS, SEGPTR glueSL )
 {
     ThunkletCallbackGlueLS = glueLS;
     ThunkletCallbackGlueSL = glueSL;
@@ -1245,8 +1245,8 @@ THUNKLET *THUNK_FindThunklet( DWORD target, DWORD relay,
 /***********************************************************************
  *     THUNK_AllocLSThunklet
  */
-FARPROC32 THUNK_AllocLSThunklet( SEGPTR target, DWORD relay, 
-                                 FARPROC32 glue, HTASK16 owner ) 
+FARPROC THUNK_AllocLSThunklet( SEGPTR target, DWORD relay, 
+                                 FARPROC glue, HTASK16 owner ) 
 {
     THUNKLET *thunk = THUNK_FindThunklet( (DWORD)target, relay, (DWORD)glue,
                                           THUNKLET_TYPE_LS );
@@ -1272,13 +1272,13 @@ FARPROC32 THUNK_AllocLSThunklet( SEGPTR target, DWORD relay,
         ThunkletAnchor = thunk;
     }
 
-    return (FARPROC32)thunk;
+    return (FARPROC)thunk;
 }
 
 /***********************************************************************
  *     THUNK_AllocSLThunklet
  */
-SEGPTR THUNK_AllocSLThunklet( FARPROC32 target, DWORD relay,
+SEGPTR THUNK_AllocSLThunklet( FARPROC target, DWORD relay,
                               SEGPTR glue, HTASK16 owner )
 {
     THUNKLET *thunk = THUNK_FindThunklet( (DWORD)target, relay, (DWORD)glue,
@@ -1321,7 +1321,7 @@ BOOL16 WINAPI IsLSThunklet( THUNKLET *thunk )
 /**********************************************************************
  *     IsSLThunklet                        (KERNEL.612)
  */
-BOOL16 WINAPI IsSLThunklet( THUNKLET *thunk )
+BOOL16 WINAPI IsSLThunklet16( THUNKLET *thunk )
 {
     return    thunk->prefix_target == 0x66 && thunk->pushl_target == 0x68
            && thunk->prefix_relay  == 0x66 && thunk->pushl_relay  == 0x68
@@ -1333,8 +1333,8 @@ BOOL16 WINAPI IsSLThunklet( THUNKLET *thunk )
 /***********************************************************************
  *     AllocLSThunkletSysthunk             (KERNEL.607)
  */
-FARPROC32 WINAPI AllocLSThunkletSysthunk( SEGPTR target, 
-                                          FARPROC32 relay, DWORD dummy )
+FARPROC WINAPI AllocLSThunkletSysthunk16( SEGPTR target, 
+                                          FARPROC relay, DWORD dummy )
 {
     return THUNK_AllocLSThunklet( (SEGPTR)relay, (DWORD)target, 
                                   ThunkletSysthunkGlueLS, GetCurrentTask() );
@@ -1343,10 +1343,10 @@ FARPROC32 WINAPI AllocLSThunkletSysthunk( SEGPTR target,
 /***********************************************************************
  *     AllocSLThunkletSysthunk             (KERNEL.608)
  */
-SEGPTR WINAPI AllocSLThunkletSysthunk( FARPROC32 target, 
+SEGPTR WINAPI AllocSLThunkletSysthunk16( FARPROC target, 
                                        SEGPTR relay, DWORD dummy )
 {
-    return THUNK_AllocSLThunklet( (FARPROC32)relay, (DWORD)target, 
+    return THUNK_AllocSLThunklet( (FARPROC)relay, (DWORD)target, 
                                   ThunkletSysthunkGlueSL, GetCurrentTask() );
 }
 
@@ -1354,13 +1354,13 @@ SEGPTR WINAPI AllocSLThunkletSysthunk( FARPROC32 target,
 /***********************************************************************
  *     AllocLSThunkletCallbackEx           (KERNEL.567)
  */
-FARPROC32 WINAPI AllocLSThunkletCallbackEx( SEGPTR target, 
+FARPROC WINAPI AllocLSThunkletCallbackEx16( SEGPTR target, 
                                             DWORD relay, HTASK16 task )
 {
     THUNKLET *thunk = (THUNKLET *)PTR_SEG_TO_LIN( target );
-    if (   IsSLThunklet( thunk ) && thunk->relay == relay 
+    if (   IsSLThunklet16( thunk ) && thunk->relay == relay 
         && thunk->glue == (DWORD)ThunkletCallbackGlueSL )
-        return (FARPROC32)thunk->target;
+        return (FARPROC)thunk->target;
 
     return THUNK_AllocLSThunklet( target, relay, 
                                   ThunkletCallbackGlueLS, task );
@@ -1369,7 +1369,7 @@ FARPROC32 WINAPI AllocLSThunkletCallbackEx( SEGPTR target,
 /***********************************************************************
  *     AllocSLThunkletCallbackEx           (KERNEL.568)
  */
-SEGPTR WINAPI AllocSLThunkletCallbackEx( FARPROC32 target, 
+SEGPTR WINAPI AllocSLThunkletCallbackEx16( FARPROC target, 
                                          DWORD relay, HTASK16 task )
 {
     THUNKLET *thunk = (THUNKLET *)target;
@@ -1384,39 +1384,39 @@ SEGPTR WINAPI AllocSLThunkletCallbackEx( FARPROC32 target,
 /***********************************************************************
  *     AllocLSThunkletCallback             (KERNEL.561) (KERNEL.606)
  */
-FARPROC32 WINAPI AllocLSThunkletCallback( SEGPTR target, DWORD relay )
+FARPROC WINAPI AllocLSThunkletCallback16( SEGPTR target, DWORD relay )
 {
-    return AllocLSThunkletCallbackEx( target, relay, GetCurrentTask() );
+    return AllocLSThunkletCallbackEx16( target, relay, GetCurrentTask() );
 }
 
 /***********************************************************************
  *     AllocSLThunkletCallback             (KERNEL.562) (KERNEL.605)
  */
-SEGPTR WINAPI AllocSLThunkletCallback( FARPROC32 target, DWORD relay )
+SEGPTR WINAPI AllocSLThunkletCallback16( FARPROC target, DWORD relay )
 {
-    return AllocSLThunkletCallbackEx( target, relay, GetCurrentTask() );
+    return AllocSLThunkletCallbackEx16( target, relay, GetCurrentTask() );
 }
 
 /***********************************************************************
  *     FindLSThunkletCallback              (KERNEL.563) (KERNEL.609)
  */
-FARPROC32 WINAPI FindLSThunkletCallback( SEGPTR target, DWORD relay )
+FARPROC WINAPI FindLSThunkletCallback( SEGPTR target, DWORD relay )
 {
     THUNKLET *thunk = (THUNKLET *)PTR_SEG_TO_LIN( target );
-    if (   thunk && IsSLThunklet( thunk ) && thunk->relay == relay 
+    if (   thunk && IsSLThunklet16( thunk ) && thunk->relay == relay 
         && thunk->glue == (DWORD)ThunkletCallbackGlueSL )
-        return (FARPROC32)thunk->target;
+        return (FARPROC)thunk->target;
 
     thunk = THUNK_FindThunklet( (DWORD)target, relay, 
                                 (DWORD)ThunkletCallbackGlueLS, 
                                 THUNKLET_TYPE_LS );
-    return (FARPROC32)thunk;
+    return (FARPROC)thunk;
 }
 
 /***********************************************************************
  *     FindSLThunkletCallback              (KERNEL.564) (KERNEL.610)
  */
-SEGPTR WINAPI FindSLThunkletCallback( FARPROC32 target, DWORD relay )
+SEGPTR WINAPI FindSLThunkletCallback( FARPROC target, DWORD relay )
 {
     THUNKLET *thunk = (THUNKLET *)target;
     if (   thunk && IsLSThunklet( thunk ) && thunk->relay == relay 
@@ -1439,13 +1439,13 @@ SEGPTR WINAPI FindSLThunkletCallback( FARPROC32 target, DWORD relay )
 #define N_CBC_TOTAL    (N_CBC_FIXED + N_CBC_VARIABLE)
 
 static SEGPTR    *CBClientRelay16[ N_CBC_TOTAL ];
-static FARPROC32 *CBClientRelay32[ N_CBC_TOTAL ];
+static FARPROC *CBClientRelay32[ N_CBC_TOTAL ];
 
 /***********************************************************************
  *     RegisterCBClient                    (KERNEL.619)
  */
-INT16 WINAPI RegisterCBClient( INT16 wCBCId, 
-                               SEGPTR *relay16, FARPROC32 *relay32 )
+INT16 WINAPI RegisterCBClient16( INT16 wCBCId, 
+                               SEGPTR *relay16, FARPROC *relay32 )
 {
     /* Search for free Callback ID */
     if ( wCBCId == -1 )
@@ -1468,8 +1468,8 @@ INT16 WINAPI RegisterCBClient( INT16 wCBCId,
 /***********************************************************************
  *     UnRegisterCBClient                  (KERNEL.622)
  */
-INT16 WINAPI UnRegisterCBClient( INT16 wCBCId, 
-                                 SEGPTR *relay16, FARPROC32 *relay32 )
+INT16 WINAPI UnRegisterCBClient16( INT16 wCBCId, 
+                                 SEGPTR *relay16, FARPROC *relay32 )
 {
     if (    wCBCId >= N_CBC_FIXED && wCBCId < N_CBC_TOTAL 
          && CBClientRelay16[ wCBCId ] == relay16 
@@ -1488,12 +1488,12 @@ INT16 WINAPI UnRegisterCBClient( INT16 wCBCId,
 /***********************************************************************
  *     InitCBClient                        (KERNEL.623)
  */
-void WINAPI InitCBClient( FARPROC32 glueLS )
+void WINAPI InitCBClient16( FARPROC glueLS )
 {
     HMODULE16 kernel = GetModuleHandle16( "KERNEL" );
     SEGPTR glueSL = (SEGPTR)WIN32_GetProcAddress16( kernel, (LPCSTR)604 );
 
-    SetThunkletCallbackGlue( glueLS, glueSL );
+    SetThunkletCallbackGlue16( glueLS, glueSL );
 }
 
 /***********************************************************************
@@ -1527,10 +1527,10 @@ void WINAPI CBClientGlueSL( CONTEXT *context )
 void WINAPI CBClientThunkSL( CONTEXT *context )
 {
     /* Call 32-bit relay code */
-    extern DWORD WINAPI CALL32_CBClient( FARPROC32 proc, LPWORD args );
+    extern DWORD WINAPI CALL32_CBClient( FARPROC proc, LPWORD args );
 
     LPWORD args = PTR_SEG_OFF_TO_LIN( SS_reg( context ), BP_reg( context ) );
-    FARPROC32 proc = CBClientRelay32[ args[2] ][ args[1] ];
+    FARPROC proc = CBClientRelay32[ args[2] ][ args[1] ];
 
     EAX_reg(context) = CALL32_CBClient( proc, args );
 }
@@ -1541,12 +1541,12 @@ void WINAPI CBClientThunkSL( CONTEXT *context )
 void WINAPI CBClientThunkSLEx( CONTEXT *context )
 {
     /* Call 32-bit relay code */
-    extern DWORD WINAPI CALL32_CBClientEx( FARPROC32 proc, 
-                                           LPWORD args, INT32 *nArgs );
+    extern DWORD WINAPI CALL32_CBClientEx( FARPROC proc, 
+                                           LPWORD args, INT *nArgs );
 
     LPWORD args = PTR_SEG_OFF_TO_LIN( SS_reg( context ), BP_reg( context ) );
-    FARPROC32 proc = CBClientRelay32[ args[2] ][ args[1] ];
-    INT32 nArgs;
+    FARPROC proc = CBClientRelay32[ args[2] ][ args[1] ];
+    INT nArgs;
     LPWORD stackLin;
 
     EAX_reg(context) = CALL32_CBClientEx( proc, args, &nArgs );
diff --git a/if1632/toolhelp.spec b/if1632/toolhelp.spec
index dbbcbecbec2..e82ea400145 100644
--- a/if1632/toolhelp.spec
+++ b/if1632/toolhelp.spec
@@ -1,40 +1,40 @@
 name	toolhelp
 type	win16
 
-50 pascal16 GlobalHandleToSel(word) GlobalHandleToSel
-51 pascal16 GlobalFirst(ptr word) GlobalFirst
-52 pascal16 GlobalNext(ptr word) GlobalNext
-53 pascal16 GlobalInfo(ptr) GlobalInfo
-54 pascal16 GlobalEntryHandle(ptr word) GlobalEntryHandle
-55 pascal16 GlobalEntryModule(ptr word word) GlobalEntryModule
-56 pascal16 LocalInfo(ptr word) LocalInfo
-57 pascal16 LocalFirst(ptr word) LocalFirst
-58 pascal16 LocalNext(ptr) LocalNext
-59 pascal16 ModuleFirst(ptr) ModuleFirst
-60 pascal16 ModuleNext(ptr) ModuleNext
-61 pascal16 ModuleFindName(ptr ptr) ModuleFindName
-62 pascal16 ModuleFindHandle(ptr word) ModuleFindHandle
-63 pascal16 TaskFirst(ptr) TaskFirst
-64 pascal16 TaskNext(ptr) TaskNext
-65 pascal16 TaskFindHandle(ptr word) TaskFindHandle
-66 pascal16 StackTraceFirst(ptr word) StackTraceFirst
-67 pascal16 StackTraceCSIPFirst(ptr word word word word) StackTraceCSIPFirst
-68 pascal16 StackTraceNext(ptr) StackTraceNext
-69 pascal16 ClassFirst(ptr) ClassFirst
-70 pascal16 ClassNext(ptr) ClassNext
-71 pascal16 SystemHeapInfo(ptr) SystemHeapInfo
-72 pascal16 MemManInfo(ptr) MemManInfo
-73 pascal16 NotifyRegister(word segptr word) NotifyRegister
-74 pascal16 NotifyUnregister(word) NotifyUnregister
+50 pascal16 GlobalHandleToSel(word) GlobalHandleToSel16
+51 pascal16 GlobalFirst(ptr word) GlobalFirst16
+52 pascal16 GlobalNext(ptr word) GlobalNext16
+53 pascal16 GlobalInfo(ptr) GlobalInfo16
+54 pascal16 GlobalEntryHandle(ptr word) GlobalEntryHandle16
+55 pascal16 GlobalEntryModule(ptr word word) GlobalEntryModule16
+56 pascal16 LocalInfo(ptr word) LocalInfo16
+57 pascal16 LocalFirst(ptr word) LocalFirst16
+58 pascal16 LocalNext(ptr) LocalNext16
+59 pascal16 ModuleFirst(ptr) ModuleFirst16
+60 pascal16 ModuleNext(ptr) ModuleNext16
+61 pascal16 ModuleFindName(ptr ptr) ModuleFindName16
+62 pascal16 ModuleFindHandle(ptr word) ModuleFindHandle16
+63 pascal16 TaskFirst(ptr) TaskFirst16
+64 pascal16 TaskNext(ptr) TaskNext16
+65 pascal16 TaskFindHandle(ptr word) TaskFindHandle16
+66 pascal16 StackTraceFirst(ptr word) StackTraceFirst16
+67 pascal16 StackTraceCSIPFirst(ptr word word word word) StackTraceCSIPFirst16
+68 pascal16 StackTraceNext(ptr) StackTraceNext16
+69 pascal16 ClassFirst(ptr) ClassFirst16
+70 pascal16 ClassNext(ptr) ClassNext16
+71 pascal16 SystemHeapInfo(ptr) SystemHeapInfo16
+72 pascal16 MemManInfo(ptr) MemManInfo16
+73 pascal16 NotifyRegister(word segptr word) NotifyRegister16
+74 pascal16 NotifyUnregister(word) NotifyUnregister16
 75 return INTERRUPTREGISTER 6 1
 76 return INTERRUPTUNREGISTER 2 1
 77 stub TERMINATEAPP
-78 pascal   MemoryRead(word long ptr long) MemoryRead
-79 pascal   MemoryWrite(word long ptr long) MemoryWrite
-80 pascal16 TimerCount(ptr) TimerCount
+78 pascal   MemoryRead(word long ptr long) MemoryRead16
+79 pascal   MemoryWrite(word long ptr long) MemoryWrite16
+80 pascal16 TimerCount(ptr) TimerCount16
 81 stub TASKSETCSIP
 82 stub TASKGETCSIP
 83 stub TASKSWITCH
-84 pascal16 Local32Info(ptr word) Local32Info
-85 pascal16 Local32First(ptr word) Local32First
-86 pascal16 Local32Next(ptr) Local32Next
+84 pascal16 Local32Info(ptr word) Local32Info16
+85 pascal16 Local32First(ptr word) Local32First16
+86 pascal16 Local32Next(ptr) Local32Next16
diff --git a/if1632/typelib.spec b/if1632/typelib.spec
index 441c7715458..7784023b69a 100644
--- a/if1632/typelib.spec
+++ b/if1632/typelib.spec
@@ -12,4 +12,4 @@ type win16
 10 stub REGISTERTYPELIB              
 11 stub LOADREGTYPELIB               
 14 pascal QueryPathOfRegTypeLib(ptr word word word ptr) QueryPathOfRegTypeLib16
-15 pascal OABuildVersion() OABuildVersion               
+15 pascal OABuildVersion() OABuildVersion16               
diff --git a/if1632/user.spec b/if1632/user.spec
index f4abf04eafe..886f5eaa4ef 100644
--- a/if1632/user.spec
+++ b/if1632/user.spec
@@ -7,14 +7,14 @@ file	user.exe
 2   stub OldExitWindows
 3   stub EnableOEMLayer
 4   stub DisableOEMLayer
-5   pascal16 InitApp(word) InitApp
+5   pascal16 InitApp(word) InitApp16
 6   pascal16 PostQuitMessage(word) PostQuitMessage16
 7   pascal16 ExitWindows(long word) ExitWindows16
 10  pascal16 SetTimer(word word word segptr) SetTimer16
 11  pascal16 SetSystemTimer(word word word segptr) SetSystemTimer16
 12  pascal16 KillTimer(word word) KillTimer16
 13  pascal   GetTickCount() GetTickCount
-14  pascal   GetTimerResolution() GetTimerResolution
+14  pascal   GetTimerResolution() GetTimerResolution16
 15  pascal   GetCurrentTime() GetCurrentTime16
 16  pascal16 ClipCursor(ptr) ClipCursor16
 17  pascal16 GetCursorPos(ptr) GetCursorPos16
@@ -100,7 +100,7 @@ file	user.exe
 96  pascal16 CheckRadioButton(word word word word) CheckRadioButton16
 97  pascal16 CheckDlgButton(word word word) CheckDlgButton16
 98  pascal16 IsDlgButtonChecked(word word) IsDlgButtonChecked16
-99  pascal16 DlgDirSelect(word ptr word) DlgDirSelect
+99  pascal16 DlgDirSelect(word ptr word) DlgDirSelect16
 100 pascal16 DlgDirList(word ptr word word word) DlgDirList16
 101 pascal   SendDlgItemMessage(word word word word long) SendDlgItemMessage16
 102 pascal16 AdjustWindowRect(ptr long word) AdjustWindowRect16
@@ -195,31 +195,31 @@ file	user.exe
 191 pascal16 ChildWindowFromPoint(word long) ChildWindowFromPoint16
 192 pascal16 InSendMessage() InSendMessage16
 193 pascal16 IsClipboardFormatAvailable(word) IsClipboardFormatAvailable16
-194 pascal16 DlgDirSelectComboBox(word ptr word) DlgDirSelectComboBox
+194 pascal16 DlgDirSelectComboBox(word ptr word) DlgDirSelectComboBox16
 195 pascal16 DlgDirListComboBox(word ptr word word word) DlgDirListComboBox16
 196 pascal   TabbedTextOut(word s_word s_word ptr s_word s_word ptr s_word)
              TabbedTextOut16
 197 pascal   GetTabbedTextExtent(word ptr word word ptr) GetTabbedTextExtent16
-198 pascal16 CascadeChildWindows(word word) CascadeChildWindows
-199 pascal16 TileChildWindows(word word) TileChildWindows
-200 pascal16 OpenComm(str word word) OpenComm
+198 pascal16 CascadeChildWindows(word word) CascadeChildWindows16
+199 pascal16 TileChildWindows(word word) TileChildWindows16
+200 pascal16 OpenComm(str word word) OpenComm16
 201 pascal16 SetCommState(ptr) SetCommState16
 202 pascal16 GetCommState(word ptr) GetCommState16
-203 pascal16 GetCommError(word ptr) GetCommError
-204 pascal16 ReadComm(word ptr word) ReadComm
-205 pascal16 WriteComm(word ptr word) WriteComm
+203 pascal16 GetCommError(word ptr) GetCommError16
+204 pascal16 ReadComm(word ptr word) ReadComm16
+205 pascal16 WriteComm(word ptr word) WriteComm16
 206 pascal16 TransmitCommChar(word word) TransmitCommChar16
-207 pascal16 CloseComm(word) CloseComm
-208 pascal   SetCommEventMask(word word) SetCommEventMask
-209 pascal16 GetCommEventMask(word word) GetCommEventMask
+207 pascal16 CloseComm(word) CloseComm16
+208 pascal   SetCommEventMask(word word) SetCommEventMask16
+209 pascal16 GetCommEventMask(word word) GetCommEventMask16
 210 pascal16 SetCommBreak(word) SetCommBreak16
 211 pascal16 ClearCommBreak(word) ClearCommBreak16
-212 pascal16 UngetCommChar(word word) UngetCommChar
+212 pascal16 UngetCommChar(word word) UngetCommChar16
 213 pascal16 BuildCommDCB(ptr ptr) BuildCommDCB16
 214 pascal   EscapeCommFunction(word word) EscapeCommFunction16
-215 pascal16 FlushComm(word word) FlushComm
-216 pascal   UserSeeUserDo(word word word word) UserSeeUserDo
-217 pascal16 LookupMenuHandle(word s_word) LookupMenuHandle
+215 pascal16 FlushComm(word word) FlushComm16
+216 pascal   UserSeeUserDo(word word word word) UserSeeUserDo16
+217 pascal16 LookupMenuHandle(word s_word) LookupMenuHandle16
 218 pascal16 DialogBoxIndirect(word word word segptr) DialogBoxIndirect16
 219 pascal16 CreateDialogIndirect(word ptr word segptr) CreateDialogIndirect16
 220 pascal16 LoadMenuIndirect(ptr) LoadMenuIndirect16
@@ -249,7 +249,7 @@ file	user.exe
              CreateDialogIndirectParam16
 243 pascal   GetDialogBaseUnits() GetDialogBaseUnits
 244 pascal16 EqualRect(ptr ptr) EqualRect16
-245 pascal16 EnableCommNotification(s_word word s_word s_word) EnableCommNotification
+245 pascal16 EnableCommNotification(s_word word s_word s_word) EnableCommNotification16
 246 pascal16 ExitWindowsExec(str str) ExitWindowsExec16
 247 pascal16 GetCursor() GetCursor16
 248 pascal16 GetOpenClipboardWindow() GetOpenClipboardWindow16
@@ -260,8 +260,8 @@ file	user.exe
 253 pascal   CloseDriver(word long long) CloseDriver16
 254 pascal16 GetDriverModuleHandle(word) GetDriverModuleHandle16
 255 pascal   DefDriverProc(long word word long long) DefDriverProc16
-256 pascal16 GetDriverInfo(word ptr) GetDriverInfo
-257 pascal16 GetNextDriver(word long) GetNextDriver
+256 pascal16 GetDriverInfo(word ptr) GetDriverInfo16
+257 pascal16 GetNextDriver(word long) GetNextDriver16
 258 pascal16 MapWindowPoints(word word ptr word) MapWindowPoints16
 259 pascal16 BeginDeferWindowPos(s_word) BeginDeferWindowPos16
 260 pascal16 DeferWindowPos(word word word s_word s_word s_word s_word word)
@@ -283,13 +283,13 @@ file	user.exe
 275 stub RepaintScreen
 276 stub LockMyTask
 277 pascal16 GetDlgCtrlID(word) GetDlgCtrlID16
-278 pascal16 GetDesktopHwnd() GetDesktopHwnd
+278 pascal16 GetDesktopHwnd() GetDesktopHwnd16
 279 pascal16 OldSetDeskPattern() SetDeskPattern
 280 pascal16 SetSystemMenu(word word) SetSystemMenu16
 281 pascal16 GetSysColorBrush(word) GetSysColorBrush16
 282 pascal16 SelectPalette(word word word) SelectPalette16
 283 pascal16 RealizePalette(word) RealizePalette16
-284 pascal16 GetFreeSystemResources(word) GetFreeSystemResources
+284 pascal16 GetFreeSystemResources(word) GetFreeSystemResources16
 285 pascal16 SetDeskWallPaper(ptr) SetDeskWallPaper16
 286 pascal16 GetDesktopWindow() GetDesktopWindow16
 287 pascal16 GetLastActivePopup(word) GetLastActivePopup16
@@ -316,32 +316,32 @@ file	user.exe
 #318 GetWC2
 319 pascal16 ScrollWindowEx(word s_word s_word ptr ptr word ptr word) ScrollWindowEx16
 320 stub SysErrorBox
-321 pascal   SetEventHook(segptr) SetEventHook
+321 pascal   SetEventHook(segptr) SetEventHook16
 322 stub WinOldAppHackOMatic
 323 stub GetMessage2
-324 pascal16 FillWindow(word word word word) FillWindow
-325 pascal16 PaintRect(word word word word ptr) PaintRect
-326 pascal16 GetControlBrush(word word word) GetControlBrush
+324 pascal16 FillWindow(word word word word) FillWindow16
+325 pascal16 PaintRect(word word word word ptr) PaintRect16
+326 pascal16 GetControlBrush(word word word) GetControlBrush16
 #327 KillTimer2
 #328 SetTimer2
 #330 SetGetKbdState
-331 pascal16 EnableHardwareInput(word) EnableHardwareInput
-332 pascal16 UserYield() UserYield
-333 pascal16 IsUserIdle() IsUserIdle
+331 pascal16 EnableHardwareInput(word) EnableHardwareInput16
+332 pascal16 UserYield() UserYield16
+333 pascal16 IsUserIdle() IsUserIdle16
 334 pascal   GetQueueStatus(word) GetQueueStatus16
 335 pascal16 GetInputState() GetInputState16
-336 pascal16 LoadCursorIconHandler(word word word) LoadCursorIconHandler
-337 pascal   GetMouseEventProc() GetMouseEventProc
+336 pascal16 LoadCursorIconHandler(word word word) LoadCursorIconHandler16
+337 pascal   GetMouseEventProc() GetMouseEventProc16
 #340 WinFarFrame
 #341 _FFFE_FARFRAME
 343 stub GetFilePortName
 #354 TabTheTextOutForWimps
 #355 BroadcastMessage
-356 pascal16 LoadDIBCursorHandler(word word word) LoadDIBCursorHandler
-357 pascal16 LoadDIBIconHandler(word word word) LoadDIBIconHandler
+356 pascal16 LoadDIBCursorHandler(word word word) LoadDIBCursorHandler16
+357 pascal16 LoadDIBIconHandler(word word word) LoadDIBIconHandler16
 358 pascal16 IsMenu(word) IsMenu16
 359 pascal16 GetDCEx(word word long) GetDCEx16
-362 pascal16 DCHook(word word long long) DCHook
+362 pascal16 DCHook(word word long long) DCHook16
 364 pascal16 LookupIconIdFromDirectoryEx(ptr word word word word) LookupIconIdFromDirectoryEx16
 368 pascal16 CopyIcon(word word) CopyIcon16
 369 pascal16 CopyCursor(word word) CopyCursor16
@@ -374,8 +374,8 @@ file	user.exe
 406 pascal16 CreateCursor(word word word word word ptr ptr) CreateCursor16
 407 pascal16 CreateIcon(word word word word word ptr ptr) CreateIcon16
 408 pascal16 CreateCursorIconIndirect(word ptr ptr ptr)
-	     CreateCursorIconIndirect
-409 pascal16 InitThreadInput(word word) InitThreadInput
+	     CreateCursorIconIndirect16
+409 pascal16 InitThreadInput(word word) InitThreadInput16
 410 pascal16 InsertMenu(word word word word segptr) InsertMenu16
 411 pascal16 AppendMenu(word word word segptr) AppendMenu16
 412 pascal16 RemoveMenu(word word word) RemoveMenu16
@@ -413,14 +413,14 @@ file	user.exe
 452 pascal16 CreateWindowEx(long str str long s_word s_word s_word s_word
                             word word word segptr) CreateWindowEx16
 454 pascal16 AdjustWindowRectEx(ptr long word long) AdjustWindowRectEx16
-455 pascal16 GetIconID(word long) GetIconID
-456 pascal16 LoadIconHandler(word word) LoadIconHandler
+455 pascal16 GetIconID(word long) GetIconID16
+456 pascal16 LoadIconHandler(word word) LoadIconHandler16
 457 pascal16 DestroyIcon(word) DestroyIcon16
 458 pascal16 DestroyCursor(word) DestroyCursor16
-459 pascal   DumpIcon(segptr ptr ptr ptr) DumpIcon
+459 pascal   DumpIcon(segptr ptr ptr ptr) DumpIcon16
 460 pascal16 GetInternalWindowPos(word ptr ptr) GetInternalWindowPos16
 461 pascal16 SetInternalWindowPos(word word ptr ptr) SetInternalWindowPos16
-462 pascal16 CalcChildScroll(word word) CalcChildScroll
+462 pascal16 CalcChildScroll(word word) CalcChildScroll16
 463 pascal16 ScrollChildren(word word word long) ScrollChildren16
 464 pascal   DragObject(word word word word word word) DragObject16
 465 pascal16 DragDetect(word long) DragDetect16
@@ -444,40 +444,40 @@ file	user.exe
 490 pascal16 USER_490() stub_USER_490
 492 pascal16 USER_492() stub_USER_492
 496 pascal16 USER_496() stub_USER_496
-499 pascal16 WNetErrorText(word ptr word) WNetErrorText
+499 pascal16 WNetErrorText(word ptr word) WNetErrorText16
 500 stub FARCALLNETDRIVER 			# Undocumented Windows
-501 pascal16 WNetOpenJob(ptr ptr word ptr)  WNetOpenJob
-502 pascal16 WNetCloseJob(word ptr ptr) WNetCloseJob
-503 pascal16 WNetAbortJob(ptr word) WNetAbortJob
-504 pascal16 WNetHoldJob(ptr word) WNetHoldJob
-505 pascal16 WNetReleaseJob(ptr word) WNetReleaseJob
-506 pascal16 WNetCancelJob(ptr word) WNetCancelJob
-507 pascal16 WNetSetJobCopies(ptr word word) WNetSetJobCopies
-508 pascal16 WNetWatchQueue(word ptr ptr word) WNetWatchQueue
-509 pascal16 WNetUnwatchQueue(word ptr ptr word) WNetUnwatchQueue
-510 pascal16 WNetLockQueueData(ptr ptr ptr) WNetLockQueueData
-511 pascal16 WNetUnlockQueueData(ptr) WNetUnlockQueueData
+501 pascal16 WNetOpenJob(ptr ptr word ptr)  WNetOpenJob16
+502 pascal16 WNetCloseJob(word ptr ptr) WNetCloseJob16
+503 pascal16 WNetAbortJob(ptr word) WNetAbortJob16
+504 pascal16 WNetHoldJob(ptr word) WNetHoldJob16
+505 pascal16 WNetReleaseJob(ptr word) WNetReleaseJob16
+506 pascal16 WNetCancelJob(ptr word) WNetCancelJob16
+507 pascal16 WNetSetJobCopies(ptr word word) WNetSetJobCopies16
+508 pascal16 WNetWatchQueue(word ptr ptr word) WNetWatchQueue16
+509 pascal16 WNetUnwatchQueue(word ptr ptr word) WNetUnwatchQueue16
+510 pascal16 WNetLockQueueData(ptr ptr ptr) WNetLockQueueData16
+511 pascal16 WNetUnlockQueueData(ptr) WNetUnlockQueueData16
 512 pascal16 WNetGetConnection(ptr ptr ptr) WNetGetConnection16
-513 pascal16 WNetGetCaps(word) WNetGetCaps
-514 pascal16 WNetDeviceMode(word) WNetDeviceMode
-515 pascal16 WNetBrowseDialog(word word ptr) WNetBrowseDialog
-516 pascal16 WNetGetUser(ptr ptr ptr) WNetGetUser
+513 pascal16 WNetGetCaps(word) WNetGetCaps16
+514 pascal16 WNetDeviceMode(word) WNetDeviceMode16
+515 pascal16 WNetBrowseDialog(word word ptr) WNetBrowseDialog16
+516 pascal16 WNetGetUser(ptr ptr ptr) WNetGetUser16
 517 pascal16 WNetAddConnection(str str str) WNetAddConnection16
-518 pascal16 WNetCancelConnection(str word) WNetCancelConnection
-519 pascal16 WNetGetError(ptr) WNetGetError
-520 pascal16 WNetGetErrorText(word ptr ptr) WNetGetErrorText
+518 pascal16 WNetCancelConnection(str word) WNetCancelConnection16
+519 pascal16 WNetGetError(ptr) WNetGetError16
+520 pascal16 WNetGetErrorText(word ptr ptr) WNetGetErrorText16
 521 stub WNetEnable
 522 stub WNetDisable
-523 pascal16 WNetRestoreConnection(word ptr) WNetRestoreConnection
-524 pascal16 WNetWriteJob(word ptr ptr) WNetWriteJob
+523 pascal16 WNetRestoreConnection(word ptr) WNetRestoreConnection16
+524 pascal16 WNetWriteJob(word ptr ptr) WNetWriteJob16
 525 pascal16 WnetConnectDialog(word word) WNetConnectDialog
-526 pascal16 WNetDisconnectDialog(word word) WNetDisconnectDialog
-527 pascal16 WNetConnectionDialog(word word) WNetConnectionDialog
-528 pascal16 WNetViewQueueDialog(word ptr) WNetViewQueueDialog
-529 pascal16 WNetPropertyDialog(word word ptr word) WNetPropertyDialog
+526 pascal16 WNetDisconnectDialog(word word) WNetDisconnectDialog16
+527 pascal16 WNetConnectionDialog(word word) WNetConnectionDialog16
+528 pascal16 WNetViewQueueDialog(word ptr) WNetViewQueueDialog16
+529 pascal16 WNetPropertyDialog(word word ptr word) WNetPropertyDialog16
 530 pascal16 WNetGetDirectoryType(ptr ptr) WNetGetDirectoryType16
-531 pascal16 WNetDirectoryNotify(word ptr word) WNetDirectoryNotify
-532 pascal16 WNetGetPropertyText(word word str str word word) WNetGetPropertyText
+531 pascal16 WNetDirectoryNotify(word ptr word) WNetDirectoryNotify16
+532 pascal16 WNetGetPropertyText(word word str str word word) WNetGetPropertyText16
 533 stub WNetInitialize
 534 stub WNetLogon
 600 pascal16 GetShellWindow() GetShellWindow16
@@ -516,12 +516,12 @@ file	user.exe
 802 stub OPENFILENAME_CALLBACK16
 803 stub PRINTDLG_CALLBACK16
 804 stub CHOOSECOLOR_CALLBACK16
-819 pascal16 PeekMessage32(ptr word word word word word) WIN16_PeekMessage32
-820 pascal GetMessage32(segptr word word word word) WIN16_GetMessage32
-821 pascal16 TranslateMessage32(ptr word) WIN16_TranslateMessage32 
+819 pascal16 PeekMessage32(ptr word word word word word) PeekMessage32_16
+820 pascal GetMessage32(segptr word word word word) GetMessage32_16
+821 pascal16 TranslateMessage32(ptr word) TranslateMessage32_16 
 #821 stub IsDialogMessage32		# FIXME: two ordinal 821???
-822 pascal DispatchMessage32(ptr word) WIN16_DispatchMessage32
-823 pascal16 CallMsgFilter32(segptr word word) WIN16_CallMsgFilter32
+822 pascal DispatchMessage32(ptr word) DispatchMessage32_16
+823 pascal16 CallMsgFilter32(segptr word word) CallMsgFilter32_16
 825 stub PostMessage32
 826 stub PostThreadMessage32
 827 pascal16 MessageBoxIndirect(ptr) MessageBoxIndirect16
diff --git a/if1632/w32sys.spec b/if1632/w32sys.spec
index 98dd63d00d1..e9bee3e367e 100644
--- a/if1632/w32sys.spec
+++ b/if1632/w32sys.spec
@@ -2,14 +2,14 @@ name	w32sys
 type	win16
 
 #1 WEP
-2 pascal16 IsPeFormat(str word) IsPeFormat
+2 pascal16 IsPeFormat(str word) IsPeFormat16
 3 stub EXECPE
 4 stub GETPEEXEINFO
 5 return GETW32SYSVERSION 0 0x100
 6 stub LOADPERESOURCE
-7 pascal16 GetPEResourceTable(word) GetPEResourceTable
+7 pascal16 GetPEResourceTable(word) GetPEResourceTable16
 8 stub EXECPEEX
 9 stub ITSME
 10 stub W32SERROR
 11 stub EXP1
-12 pascal16 GetWin32sInfo(ptr) GetWin32sInfo
+12 pascal16 GetWin32sInfo(ptr) GetWin32sInfo16
diff --git a/if1632/win32s16.spec b/if1632/win32s16.spec
index 468b56e4205..fd4c46fdee1 100644
--- a/if1632/win32s16.spec
+++ b/if1632/win32s16.spec
@@ -2,7 +2,7 @@ name	win32s16
 type	win16
 
 1 stub WEP
-2 pascal16 BootTask() BootTask
+2 pascal16 BootTask() BootTask16
 3 stub CREATEPROCESS
 4 stub WAITFORDEBUGEVENT
 5 pascal CONTINUEDEBUGEVENT(long long long) ContinueDebugEvent
@@ -43,13 +43,13 @@ type	win16
 40 stub RMEMCPY
 41 stub INITRESLOADER
 42 stub FREESELECTOROFFSET
-43 pascal StackLinearToSegmented(word word) StackLinearToSegmented
+43 pascal StackLinearToSegmented(word word) StackLinearToSegmented16
 44 stub GETMODULEFILENAME32S
 45 stub FAPILOG16
 46 stub ALLOCCALLBACK
 47 stub LINEARTOHUGESELECTOROFFSET
-48 pascal UTSelectorOffsetToLinear(ptr) UTSelectorOffsetToLinear
-49 pascal UTLinearToSelectorOffset(ptr) UTLinearToSelectorOffset
+48 pascal UTSelectorOffsetToLinear(ptr) UTSelectorOffsetToLinear16
+49 pascal UTLinearToSelectorOffset(ptr) UTLinearToSelectorOffset16
 50 stub SELFOREIGNTIB
 51 stub MYGLOBALREALLOC
 52 stub CREATEPEHEADER
diff --git a/if1632/windebug.spec b/if1632/windebug.spec
index 437068fa6a7..ecb14ba13b6 100644
--- a/if1632/windebug.spec
+++ b/if1632/windebug.spec
@@ -3,4 +3,4 @@ type	win16
 
   1 stub     WINDEBUG
   2 stub     WEP
-  3 register WinNotify() WinNotify
+  3 register WinNotify() WinNotify16
diff --git a/if1632/wprocs.spec b/if1632/wprocs.spec
index e4a7464df73..1ccca024794 100644
--- a/if1632/wprocs.spec
+++ b/if1632/wprocs.spec
@@ -1,20 +1,20 @@
 name	wprocs
 type	win16
 
-14 pascal FileOpenDlgProc(word word word long) FileOpenDlgProc
-15 pascal FileSaveDlgProc(word word word long) FileSaveDlgProc
-16 pascal ColorDlgProc(word word word long) ColorDlgProc
+14 pascal FileOpenDlgProc(word word word long) FileOpenDlgProc16
+15 pascal FileSaveDlgProc(word word word long) FileSaveDlgProc16
+16 pascal ColorDlgProc(word word word long) ColorDlgProc16
 17 pascal FindTextDlgProc(word word word long) FindTextDlgProc16
 18 pascal ReplaceTextDlgProc(word word word long) ReplaceTextDlgProc16
-19 pascal PrintSetupDlgProc(word word word long) PrintSetupDlgProc
-20 pascal PrintDlgProc(word word word long) PrintDlgProc
+19 pascal PrintSetupDlgProc(word word word long) PrintSetupDlgProc16
+20 pascal PrintDlgProc(word word word long) PrintDlgProc16
 24 pascal16 TASK_Reschedule() TASK_Reschedule
 27 pascal EntryAddrProc(word word) NE_GetEntryPoint
 28 pascal MyAlloc(word word word) NE_AllocateSegment
 29 pascal DefResourceHandler(word word word) NE_DefResourceHandler
 30 pascal FormatCharDlgProc(word word word long) FormatCharDlgProc16
-31 pascal LoadDIBIconHandler(word word word) LoadDIBIconHandler
-32 pascal LoadDIBCursorHandler(word word word) LoadDIBCursorHandler
+31 pascal LoadDIBIconHandler(word word word) LoadDIBIconHandler16
+32 pascal LoadDIBCursorHandler(word word word) LoadDIBCursorHandler16
  
 # Interrupt vectors 0-255 are ordinals 100-355
 # The 'word' parameter are the flags pushed on the stack by the interrupt
@@ -111,7 +111,7 @@ type	win16
 189 register INT_Int59Handler(word) BUILTIN_DefaultIntHandler
 190 register INT_Int5aHandler(word) BUILTIN_DefaultIntHandler
 191 register INT_Int5bHandler(word) BUILTIN_DefaultIntHandler
-192 register INT_Int5cHandler(word) NetBIOSCall
+192 register INT_Int5cHandler(word) NetBIOSCall16
 193 register INT_Int5dHandler(word) BUILTIN_DefaultIntHandler
 194 register INT_Int5eHandler(word) BUILTIN_DefaultIntHandler
 195 register INT_Int5fHandler(word) BUILTIN_DefaultIntHandler
diff --git a/include/animate.h b/include/animate.h
index e988dd8fec5..cfde3f22f52 100644
--- a/include/animate.h
+++ b/include/animate.h
@@ -11,7 +11,7 @@
 typedef struct tagANIMATE_INFO
 {
     LPVOID  lpAvi;   /* pointer to avi data */
-    HFILE32 hFile;   /* handle to avi file */
+    HFILE hFile;   /* handle to avi file */
 } ANIMATE_INFO;
 
 
diff --git a/include/bitmap.h b/include/bitmap.h
index 7336e826418..35b58ea43eb 100644
--- a/include/bitmap.h
+++ b/include/bitmap.h
@@ -48,8 +48,8 @@ typedef struct {
 typedef struct tagBITMAPOBJ
 {
     GDIOBJHDR   header;
-    BITMAP32    bitmap;
-    SIZE32      size;   /* For SetBitmapDimension() */
+    BITMAP    bitmap;
+    SIZE      size;   /* For SetBitmapDimension() */
 
     DDBITMAP	*DDBitmap;
 
@@ -60,23 +60,23 @@ typedef struct tagBITMAPOBJ
 
   /* objects/bitmap.c */
 extern INT16   BITMAP_GetObject16( BITMAPOBJ * bmp, INT16 count, LPVOID buffer );
-extern INT32   BITMAP_GetObject32( BITMAPOBJ * bmp, INT32 count, LPVOID buffer );
-extern BOOL32  BITMAP_DeleteObject( HBITMAP16 hbitmap, BITMAPOBJ * bitmap );
-extern INT32   BITMAP_GetPadding( INT32 width, INT32 depth );
-extern INT32   BITMAP_GetWidthBytes( INT32 width, INT32 depth );
-extern HBITMAP32 BITMAP_LoadBitmap32W(HINSTANCE32 instance,LPCWSTR name,
-  UINT32 loadflags);
-extern HBITMAP32 BITMAP_CopyBitmap( HBITMAP32 hbitmap );
+extern INT   BITMAP_GetObject( BITMAPOBJ * bmp, INT count, LPVOID buffer );
+extern BOOL  BITMAP_DeleteObject( HBITMAP16 hbitmap, BITMAPOBJ * bitmap );
+extern INT   BITMAP_GetPadding( INT width, INT depth );
+extern INT   BITMAP_GetWidthBytes( INT width, INT depth );
+extern HBITMAP BITMAP_LoadBitmapW(HINSTANCE instance,LPCWSTR name,
+  UINT loadflags);
+extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap );
 
   /* objects/dib.c */
 extern int DIB_GetDIBWidthBytes( int width, int depth );
 extern int DIB_BitmapInfoSize( BITMAPINFO * info, WORD coloruse );
 extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, DWORD *width,
                               int *height, WORD *bpp, WORD *compr );
-extern void DIB_UpdateDIBSection( DC *dc, BOOL32 toDIB );
+extern void DIB_UpdateDIBSection( DC *dc, BOOL toDIB );
 extern void DIB_DeleteDIBSection( BITMAPOBJ *bmp );
 extern void DIB_SelectDIBSection( DC *dc, BITMAPOBJ *bmp );
-extern void DIB_FixColorsToLoadflags(BITMAPINFO * bmi, UINT32 loadflags,
+extern void DIB_FixColorsToLoadflags(BITMAPINFO * bmi, UINT loadflags,
   BYTE pix);
 
 #endif  /* __WINE_BITMAP_H */
diff --git a/include/brush.h b/include/brush.h
index 8c136d9275a..5ca8b58dc4f 100644
--- a/include/brush.h
+++ b/include/brush.h
@@ -13,13 +13,13 @@
 typedef struct
 {
     GDIOBJHDR   header;
-    LOGBRUSH32  logbrush;
+    LOGBRUSH  logbrush;
 } BRUSHOBJ;
 
 #define NB_HATCH_STYLES  6
 
 extern INT16 BRUSH_GetObject16( BRUSHOBJ * brush, INT16 count, LPSTR buffer );
-extern INT32 BRUSH_GetObject32( BRUSHOBJ * brush, INT32 count, LPSTR buffer );
-extern BOOL32 BRUSH_DeleteObject( HBRUSH16 hbrush, BRUSHOBJ * brush );
+extern INT BRUSH_GetObject( BRUSHOBJ * brush, INT count, LPSTR buffer );
+extern BOOL BRUSH_DeleteObject( HBRUSH16 hbrush, BRUSHOBJ * brush );
 
 #endif  /* __WINE_BRUSH_H */
diff --git a/include/button.h b/include/button.h
index 377f1b2160e..42d29f72b53 100644
--- a/include/button.h
+++ b/include/button.h
@@ -28,7 +28,7 @@ typedef struct
 
 #define BUTTON_STATE(hwnd)     ((WIN_FindWndPtr(hwnd))->wExtra[0])
 
-extern LRESULT WINAPI ButtonWndProc( HWND32 hWnd, UINT32 uMsg,
-                                     WPARAM32 wParam, LPARAM lParam );
+extern LRESULT WINAPI ButtonWndProc( HWND hWnd, UINT uMsg,
+                                     WPARAM wParam, LPARAM lParam );
 
 #endif  /* __WINE_BUTTON_H */
diff --git a/include/cache.h b/include/cache.h
index aa10b037cc0..32d52dd2fff 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -11,7 +11,7 @@
 
 #include "wintypes.h"
 
-HBRUSH32  CACHE_GetPattern55AABrush(void);
-HBITMAP32 CACHE_GetPattern55AABitmap(void);
+HBRUSH  CACHE_GetPattern55AABrush(void);
+HBITMAP CACHE_GetPattern55AABitmap(void);
 
 #endif /* __WINE_CACHE_H */
diff --git a/include/callback.h b/include/callback.h
index fe0728cb3d7..64e925cf5b3 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -20,9 +20,9 @@ extern int (*IF1632_CallLargeStack)( int (*func)(void), void *arg );
 
 typedef struct
 {
-    LONG (CALLBACK *CallRegisterShortProc)( CONTEXT *, INT32 );
-    LONG (CALLBACK *CallRegisterLongProc)( CONTEXT *, INT32 );
-    BOOL32 (CALLBACK *CallTaskRescheduleProc)(void);
+    LONG (CALLBACK *CallRegisterShortProc)( CONTEXT *, INT );
+    LONG (CALLBACK *CallRegisterLongProc)( CONTEXT *, INT );
+    BOOL (CALLBACK *CallTaskRescheduleProc)(void);
     VOID (CALLBACK *CallFrom16WndProc)(void);
     LRESULT (CALLBACK *CallWndProc)( WNDPROC16, HWND16, UINT16,
                                      WPARAM16, LPARAM );
@@ -40,7 +40,7 @@ typedef struct
     WORD (CALLBACK *CallLocalNotifyFunc)( FARPROC16, WORD, HLOCAL16, WORD );
     HGLOBAL16 (CALLBACK *CallResourceHandlerProc)( FARPROC16, HGLOBAL16, HMODULE16, HRSRC16 );
     DWORD (CALLBACK *CallWOWCallbackProc)( FARPROC16, DWORD );
-    BOOL32 (CALLBACK *CallWOWCallback16Ex)( FARPROC16, DWORD, DWORD, LPVOID, 
+    BOOL (CALLBACK *CallWOWCallback16Ex)( FARPROC16, DWORD, DWORD, LPVOID, 
                                             LPDWORD );
     LRESULT (CALLBACK *CallASPIPostProc)( FARPROC16, SEGPTR );
     /* Following are the graphics driver callbacks */
@@ -75,54 +75,54 @@ typedef struct
 {
     BOOL16 WINAPI (*PeekMessage16)( LPMSG16 msg, HWND16 hwnd, 
                                     UINT16 first, UINT16 last, UINT16 flags );
-    BOOL32 WINAPI (*PeekMessage32A)( LPMSG32 lpmsg, HWND32 hwnd,
-                                     UINT32 min, UINT32 max, UINT32 wRemoveMsg );
-    BOOL32 WINAPI (*PeekMessage32W)( LPMSG32 lpmsg, HWND32 hwnd, 
-                                     UINT32 min, UINT32 max, UINT32 wRemoveMsg );
+    BOOL WINAPI (*PeekMessageA)( LPMSG lpmsg, HWND hwnd,
+                                     UINT min, UINT max, UINT wRemoveMsg );
+    BOOL WINAPI (*PeekMessageW)( LPMSG lpmsg, HWND hwnd, 
+                                     UINT min, UINT max, UINT wRemoveMsg );
 
     BOOL16 WINAPI (*GetMessage16)( SEGPTR msg, HWND16 hwnd, 
                                    UINT16 first, UINT16 last );
-    BOOL32 WINAPI (*GetMessage32A)( MSG32* lpmsg, HWND32 hwnd, 
-                                    UINT32 min, UINT32 max );
-    BOOL32 WINAPI (*GetMessage32W)( MSG32* lpmsg, HWND32 hwnd, 
-                                    UINT32 min, UINT32 max );
+    BOOL WINAPI (*GetMessageA)( MSG* lpmsg, HWND hwnd, 
+                                    UINT min, UINT max );
+    BOOL WINAPI (*GetMessageW)( MSG* lpmsg, HWND hwnd, 
+                                    UINT min, UINT max );
 
     LRESULT WINAPI (*SendMessage16)( HWND16 hwnd, UINT16 msg, 
                                      WPARAM16 wParam, LPARAM lParam );
-    LRESULT WINAPI (*SendMessage32A)( HWND32 hwnd, UINT32 msg, 
-                                      WPARAM32 wParam, LPARAM lParam );
-    LRESULT WINAPI (*SendMessage32W)( HWND32 hwnd, UINT32 msg, 
-                                      WPARAM32 wParam, LPARAM lParam );
+    LRESULT WINAPI (*SendMessageA)( HWND hwnd, UINT msg, 
+                                      WPARAM wParam, LPARAM lParam );
+    LRESULT WINAPI (*SendMessageW)( HWND hwnd, UINT msg, 
+                                      WPARAM wParam, LPARAM lParam );
 
     BOOL16 WINAPI (*PostMessage16)( HWND16 hwnd, UINT16 message, 
                                     WPARAM16 wParam, LPARAM lParam );
-    BOOL32 WINAPI (*PostMessage32A)( HWND32 hwnd, UINT32 message, 
-                                     WPARAM32 wParam, LPARAM lParam );
-    BOOL32 WINAPI (*PostMessage32W)( HWND32 hwnd, UINT32 message, 
-                                     WPARAM32 wParam, LPARAM lParam );
+    BOOL WINAPI (*PostMessageA)( HWND hwnd, UINT message, 
+                                     WPARAM wParam, LPARAM lParam );
+    BOOL WINAPI (*PostMessageW)( HWND hwnd, UINT message, 
+                                     WPARAM wParam, LPARAM lParam );
 
     BOOL16 WINAPI (*PostAppMessage16)( HTASK16 hTask, UINT16 message, 
                                        WPARAM16 wParam, LPARAM lParam );
-    BOOL32 WINAPI (*PostThreadMessage32A)( DWORD idThread , UINT32 message,
-                                           WPARAM32 wParam, LPARAM lParam );
-    BOOL32 WINAPI (*PostThreadMessage32W)( DWORD idThread , UINT32 message,
-                                           WPARAM32 wParam, LPARAM lParam );
+    BOOL WINAPI (*PostThreadMessageA)( DWORD idThread , UINT message,
+                                           WPARAM wParam, LPARAM lParam );
+    BOOL WINAPI (*PostThreadMessageW)( DWORD idThread , UINT message,
+                                           WPARAM wParam, LPARAM lParam );
 
     BOOL16 WINAPI (*TranslateMessage16)( const MSG16 *msg );
-    BOOL32 WINAPI (*TranslateMessage32)( const MSG32 *msg );
+    BOOL WINAPI (*TranslateMessage)( const MSG *msg );
 
     LONG WINAPI (*DispatchMessage16)( const MSG16* msg );
-    LONG WINAPI (*DispatchMessage32A)( const MSG32* msg );
-    LONG WINAPI (*DispatchMessage32W)( const MSG32* msg );
+    LONG WINAPI (*DispatchMessageA)( const MSG* msg );
+    LONG WINAPI (*DispatchMessageW)( const MSG* msg );
 
     BOOL16 WINAPI (*RedrawWindow16)( HWND16 hwnd, const RECT16 *rectUpdate,
                                      HRGN16 hrgnUpdate, UINT16 flags );
 
-    BOOL32 WINAPI (*RedrawWindow32)( HWND32 hwnd, const RECT32 *rectUpdate,
-                                     HRGN32 hrgnUpdate, UINT32 flags );
+    BOOL WINAPI (*RedrawWindow)( HWND hwnd, const RECT *rectUpdate,
+                                     HRGN hrgnUpdate, UINT flags );
 
-    HQUEUE16 WINAPI (*InitThreadInput)( WORD unknown, WORD flags );
-    void WINAPI (*UserYield)( void );
+    HQUEUE16 WINAPI (*InitThreadInput16)( WORD unknown, WORD flags );
+    void WINAPI (*UserYield16)( void );
     
 }  CALLOUT_TABLE;
 
diff --git a/include/cdrom.h b/include/cdrom.h
index 0c3405460d2..dcec85b08d2 100644
--- a/include/cdrom.h
+++ b/include/cdrom.h
@@ -58,8 +58,8 @@ int	CDAUDIO_Stop(WINE_CDAUDIO* wcda);
 int	CDAUDIO_Pause(WINE_CDAUDIO* wcda, int pauseOn);
 int	CDAUDIO_SetDoor(WINE_CDAUDIO* wcda, int open);
 UINT16 	CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda);
-BOOL32 	CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda);
-BOOL32	CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda);
+BOOL 	CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda);
+BOOL	CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda);
 
 #define CDFRAMES_PERSEC 		75
 #define CDFRAMES_PERMIN 		4500
diff --git a/include/class.h b/include/class.h
index 8d4ade69ca8..8fac41cee40 100644
--- a/include/class.h
+++ b/include/class.h
@@ -17,16 +17,16 @@ struct tagDCE;
 typedef struct tagCLASS
 {
     struct tagCLASS *next;          /* Next class */
-    UINT32           magic;         /* Magic number */
-    UINT32           cWindows;      /* Count of existing windows */
-    UINT32           style;         /* Class style */
+    UINT           magic;         /* Magic number */
+    UINT           cWindows;      /* Count of existing windows */
+    UINT           style;         /* Class style */
     HWINDOWPROC      winproc;       /* Window procedure */ 
-    INT32            cbClsExtra;    /* Class extra bytes */
-    INT32            cbWndExtra;    /* Window extra bytes */
+    INT            cbClsExtra;    /* Class extra bytes */
+    INT            cbWndExtra;    /* Window extra bytes */
     LPSTR            menuNameA;     /* Default menu name (ASCII string) */
     LPWSTR           menuNameW;     /* Default menu name (Unicode) */
     struct tagDCE   *dce;           /* Class DCE (if CS_CLASSDC) */
-    HINSTANCE32      hInstance;     /* Module that created the task */
+    HINSTANCE      hInstance;     /* Module that created the task */
     HICON16          hIcon;         /* Default icon */
     HICON16          hIconSm;       /* Default small icon */
     HCURSOR16        hCursor;       /* Default cursor */
@@ -40,6 +40,6 @@ typedef struct tagCLASS
 extern void CLASS_DumpClass( CLASS *class );
 extern void CLASS_WalkClasses(void);
 extern void CLASS_FreeModuleClasses( HMODULE16 hModule );
-extern CLASS *CLASS_FindClassByAtom( ATOM atom, HINSTANCE32 hinstance );
+extern CLASS *CLASS_FindClassByAtom( ATOM atom, HINSTANCE hinstance );
 
 #endif  /* __WINE_CLASS_H */
diff --git a/include/clipboard.h b/include/clipboard.h
index ac00b97a48d..f17b46718b0 100644
--- a/include/clipboard.h
+++ b/include/clipboard.h
@@ -4,30 +4,30 @@
 #include "win.h"
 #include "wintypes.h"
 
-typedef struct tagCLIPFORMAT {
+typedef struct tagWINE_CLIPFORMAT {
     WORD	wFormatID;
     WORD	wRefCount;
     WORD	wDataPresent;
     LPSTR	Name;
-    HANDLE32	hData32;
+    HANDLE	hData32;
     DWORD	BufSize;
-    struct tagCLIPFORMAT *PrevFormat;
-    struct tagCLIPFORMAT *NextFormat;
+    struct tagWINE_CLIPFORMAT *PrevFormat;
+    struct tagWINE_CLIPFORMAT *NextFormat;
     HANDLE16    hData16;
-} CLIPFORMAT, *LPCLIPFORMAT;
+} WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT;
 
 typedef struct _CLIPBOARD_DRIVER
 {
     void (*pEmptyClipboard)(void);
-    void (*pSetClipboardData)(UINT32);
-    BOOL32 (*pRequestSelection)(void);
-    void (*pResetOwner)(WND *, BOOL32);
+    void (*pSetClipboardData)(UINT);
+    BOOL (*pRequestSelection)(void);
+    void (*pResetOwner)(WND *, BOOL);
 } CLIPBOARD_DRIVER;
 
 CLIPBOARD_DRIVER *CLIPBOARD_GetDriver(void);
 
 extern void CLIPBOARD_ResetLock(HQUEUE16 hqRef, HQUEUE16 hqNew);
-extern void CLIPBOARD_DeleteRecord(LPCLIPFORMAT lpFormat, BOOL32 bChange);
-extern BOOL32 CLIPBOARD_IsPresent(WORD wFormat);
+extern void CLIPBOARD_DeleteRecord(LPWINE_CLIPFORMAT lpFormat, BOOL bChange);
+extern BOOL CLIPBOARD_IsPresent(WORD wFormat);
 
 #endif /* __WINE_CLIPBOARD_H */
diff --git a/include/color.h b/include/color.h
index d58f7b3692b..4907ab2ee34 100644
--- a/include/color.h
+++ b/include/color.h
@@ -14,20 +14,20 @@
 #define PC_SYS_RESERVED 0x40		/* system palentry is not to be mapped to */
 #define PC_SYS_MAPPED   0x10		/* logical palentry is a direct alias for system palentry */
 
-extern BOOL32     COLOR_Init(void);
+extern BOOL     COLOR_Init(void);
 extern void	  COLOR_Cleanup(void);
 extern COLORREF	  COLOR_ToLogical(int pixel);
 extern int 	  COLOR_ToPhysical( DC *dc, COLORREF color );
-extern int 	  COLOR_SetMapping( PALETTEOBJ* pal, UINT32 uStart, UINT32 uNum, BOOL32 mapOnly );
-extern BOOL32 	  COLOR_IsSolid( COLORREF color );
+extern int 	  COLOR_SetMapping( PALETTEOBJ* pal, UINT uStart, UINT uNum, BOOL mapOnly );
+extern BOOL 	  COLOR_IsSolid( COLORREF color );
 extern UINT16	  COLOR_GetSystemPaletteSize(void);
 extern UINT16	  COLOR_GetSystemPaletteFlags(void);
 extern const PALETTEENTRY* COLOR_GetSystemPaletteTemplate(void);
-extern BOOL32	  COLOR_GetMonoPlane( int* );
+extern BOOL	  COLOR_GetMonoPlane( int* );
 
 extern COLORREF	  COLOR_LookupNearestColor( PALETTEENTRY*, int, COLORREF );
-extern int        COLOR_PaletteLookupPixel( PALETTEENTRY*, int, int* , COLORREF, BOOL32 );
-extern COLORREF   COLOR_GetSystemPaletteEntry(UINT32);
+extern int        COLOR_PaletteLookupPixel( PALETTEENTRY*, int, int* , COLORREF, BOOL );
+extern COLORREF   COLOR_GetSystemPaletteEntry(UINT);
 extern int COLOR_LookupSystemPixel(COLORREF col);
 
 extern int 	COLOR_mapEGAPixel[16];
diff --git a/include/combo.h b/include/combo.h
index 3cf3b6bee29..0e4f1575d00 100644
--- a/include/combo.h
+++ b/include/combo.h
@@ -28,17 +28,17 @@
 typedef struct
 {
    WND*    	self;
-   HWND32  	owner;
-   UINT32  	dwStyle;
-   HWND32  	hWndEdit;
-   HWND32  	hWndLBox;
-   UINT32  	wState;
-   HFONT32 	hFont;
-   RECT32  	RectCombo;
-   RECT32  	RectEdit;
-   RECT32  	RectButton;
-   INT32   	droppedWidth;		/* last two are not used unless set */
-   INT32   	editHeight;		/* explicitly */
+   HWND  	owner;
+   UINT  	dwStyle;
+   HWND  	hWndEdit;
+   HWND  	hWndLBox;
+   UINT  	wState;
+   HFONT 	hFont;
+   RECT  	RectCombo;
+   RECT  	RectEdit;
+   RECT  	RectButton;
+   INT   	droppedWidth;		/* last two are not used unless set */
+   INT   	editHeight;		/* explicitly */
 } HEADCOMBO,*LPHEADCOMBO;
 
 /*
@@ -51,9 +51,9 @@ typedef struct
 #define CB_HASSTRINGS( lphc ) ((lphc)->dwStyle & CBS_HASSTRINGS)
 #define CB_HWND( lphc )       ((lphc)->self->hwndSelf)
 
-BOOL32 	COMBO_FlipListbox( LPHEADCOMBO, BOOL32 );
-HWND32 	COMBO_GetLBWindow( WND* );
-LRESULT COMBO_Directory( LPHEADCOMBO, UINT32, LPSTR, BOOL32 );
+BOOL 	COMBO_FlipListbox( LPHEADCOMBO, BOOL );
+HWND 	COMBO_GetLBWindow( WND* );
+LRESULT COMBO_Directory( LPHEADCOMBO, UINT, LPSTR, BOOL );
 
 #endif /* __WINE_COMBO_H */
 
diff --git a/include/comboex.h b/include/comboex.h
index 26fb6257cf6..338b29a7166 100644
--- a/include/comboex.h
+++ b/include/comboex.h
@@ -11,7 +11,7 @@
 typedef struct tagCOMBOEX_INFO
 {
     HIMAGELIST himl;
-    HWND32     hwndCombo;
+    HWND     hwndCombo;
     DWORD      dwExtStyle;
 
 
diff --git a/include/commctrl.h b/include/commctrl.h
index 990b05ec994..91d2fded21b 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -31,8 +31,8 @@
 extern "C" {
 #endif
 
-BOOL32 WINAPI ShowHideMenuCtl (HWND32, UINT32, LPINT32);
-VOID WINAPI GetEffectiveClientRect (HWND32, LPRECT32, LPINT32);
+BOOL WINAPI ShowHideMenuCtl (HWND, UINT, LPINT);
+VOID WINAPI GetEffectiveClientRect (HWND, LPRECT, LPINT);
 VOID WINAPI InitCommonControls (VOID);
 
 typedef struct tagINITCOMMONCONTROLSEX {
@@ -40,7 +40,7 @@ typedef struct tagINITCOMMONCONTROLSEX {
     DWORD dwICC;
 } INITCOMMONCONTROLSEX, *LPINITCOMMONCONTROLSEX;
 
-BOOL32 WINAPI InitCommonControlsEx (LPINITCOMMONCONTROLSEX);
+BOOL WINAPI InitCommonControlsEx (LPINITCOMMONCONTROLSEX);
 
 #define ICC_LISTVIEW_CLASSES   0x00000001  /* listview, header */
 #define ICC_TREEVIEW_CLASSES   0x00000002  /* treeview, tooltips */
@@ -106,8 +106,8 @@ BOOL32 WINAPI InitCommonControlsEx (LPINITCOMMONCONTROLSEX);
 
 
 /* callback constants */
-#define LPSTR_TEXTCALLBACK32A    ((LPSTR)-1L)
-#define LPSTR_TEXTCALLBACK32W    ((LPWSTR)-1L)
+#define LPSTR_TEXTCALLBACKA    ((LPSTR)-1L)
+#define LPSTR_TEXTCALLBACKW    ((LPWSTR)-1L)
 #define LPSTR_TEXTCALLBACK WINELIB_NAME_AW(LPSTR_TEXTCALLBACK)
 
 #define I_IMAGECALLBACK          (-1)
@@ -124,13 +124,13 @@ BOOL32 WINAPI InitCommonControlsEx (LPINITCOMMONCONTROLSEX);
 typedef struct tagNMTOOLTIPSCREATED
 {
     NMHDR  hdr;
-    HWND32 hwndToolTips;
+    HWND hwndToolTips;
 } NMTOOLTIPSCREATED, *LPNMTOOLTIPSCREATED;
 
 
 #ifndef CCSIZEOF_STRUCT
 #define CCSIZEOF_STRUCT(name, member) \
-    (((INT32)((LPBYTE)(&((name*)0)->member)-((LPBYTE)((name*)0))))+ \
+    (((INT)((LPBYTE)(&((name*)0)->member)-((LPBYTE)((name*)0))))+ \
     sizeof(((name*)0)->member))
 #endif
 
@@ -183,17 +183,17 @@ typedef struct tagNMCUSTOMDRAWINFO
 {
 	NMHDR	hdr;
 	DWORD	dwDrawStage;
-	HDC32	hdc;
-	RECT32	rc;
+	HDC	hdc;
+	RECT	rc;
 	DWORD	dwItemSpec; 
-	UINT32	uItemState;
+	UINT	uItemState;
 	LPARAM	lItemlParam;
 } NMCUSTOMDRAW, *LPNMCUSTOMDRAW;
 
 typedef struct tagNMTTCUSTOMDRAW
 {
     NMCUSTOMDRAW nmcd;
-    UINT32       uDrawFlags;
+    UINT       uDrawFlags;
 } NMTTCUSTOMDRAW, *LPNMTTCUSTOMDRAW;
 
 
@@ -202,14 +202,14 @@ typedef struct tagNMTTCUSTOMDRAW
 /* StatusWindow */
 
 #define STATUSCLASSNAME16	"msctls_statusbar"
-#define STATUSCLASSNAME32A	"msctls_statusbar32"
+#define STATUSCLASSNAMEA	"msctls_statusbar32"
 /* Does not work. gcc creates 4 byte wide strings.
  * #define STATUSCLASSNAME32W	L"msctls_statusbar32"
  */
 static const WCHAR	_scn32w[] = {
 'm','s','c','t','l','s','_','s','t','a','t','u','s','b','a','r','3','2',0
 };
-#define STATUSCLASSNAME32W	_scn32w
+#define STATUSCLASSNAMEW	_scn32w
 #define STATUSCLASSNAME		WINELIB_NAME_AW(STATUSCLASSNAME)
 
 #define SBT_NOBORDERS		0x0100
@@ -220,14 +220,14 @@ static const WCHAR	_scn32w[] = {
 
 #define SBARS_SIZEGRIP		0x0100
 
-#define SB_SETTEXT32A		(WM_USER+1)
-#define SB_SETTEXT32W		(WM_USER+11)
+#define SB_SETTEXTA		(WM_USER+1)
+#define SB_SETTEXTW		(WM_USER+11)
 #define SB_SETTEXT		WINELIB_NAME_AW(SB_SETTEXT)
-#define SB_GETTEXT32A		(WM_USER+2)
-#define SB_GETTEXT32W		(WM_USER+13)
+#define SB_GETTEXTA		(WM_USER+2)
+#define SB_GETTEXTW		(WM_USER+13)
 #define SB_GETTEXT		WINELIB_NAME_AW(SB_GETTEXT)
-#define SB_GETTEXTLENGTH32A	(WM_USER+3)
-#define SB_GETTEXTLENGTH32W	(WM_USER+12)
+#define SB_GETTEXTLENGTHA	(WM_USER+3)
+#define SB_GETTEXTLENGTHW	(WM_USER+12)
 #define SB_GETTEXTLENGTH	WINELIB_NAME_AW(SB_GETTEXTLENGTH)
 #define SB_SETPARTS		(WM_USER+4)
 #define SB_GETPARTS		(WM_USER+6)
@@ -237,11 +237,11 @@ static const WCHAR	_scn32w[] = {
 #define SB_GETRECT		(WM_USER+10)
 #define SB_ISSIMPLE		(WM_USER+14)
 #define SB_SETICON		(WM_USER+15)
-#define SB_SETTIPTEXT32A	(WM_USER+16)
-#define SB_SETTIPTEXT32W	(WM_USER+17)
+#define SB_SETTIPTEXTA	(WM_USER+16)
+#define SB_SETTIPTEXTW	(WM_USER+17)
 #define SB_SETTIPTEXT		WINELIB_NAME_AW(SB_SETTIPTEXT)
-#define SB_GETTIPTEXT32A	(WM_USER+18)
-#define SB_GETTIPTEXT32W	(WM_USER+19)
+#define SB_GETTIPTEXTA	(WM_USER+18)
+#define SB_GETTIPTEXTW	(WM_USER+19)
 #define SB_GETTIPTEXT		WINELIB_NAME_AW(SB_GETTIPTEXT)
 #define SB_GETICON		(WM_USER+20)
 #define SB_SETBKCOLOR		CCM_SETBKCOLOR   /* lParam = bkColor */
@@ -252,14 +252,14 @@ static const WCHAR	_scn32w[] = {
 #define SBN_LAST		(0U-899U)
 #define SBN_SIMPLEMODECHANGE	(SBN_FIRST-0)
 
-HWND32 WINAPI CreateStatusWindow32A (INT32, LPCSTR, HWND32, UINT32);
-HWND32 WINAPI CreateStatusWindow32W (INT32, LPCWSTR, HWND32, UINT32);
+HWND WINAPI CreateStatusWindowA (INT, LPCSTR, HWND, UINT);
+HWND WINAPI CreateStatusWindowW (INT, LPCWSTR, HWND, UINT);
 #define CreateStatusWindow WINELIB_NAME_AW(CreateStatusWindow)
-VOID WINAPI DrawStatusText32A (HDC32, LPRECT32, LPCSTR, UINT32);
-VOID WINAPI DrawStatusText32W (HDC32, LPRECT32, LPCWSTR, UINT32);
+VOID WINAPI DrawStatusTextA (HDC, LPRECT, LPCSTR, UINT);
+VOID WINAPI DrawStatusTextW (HDC, LPRECT, LPCWSTR, UINT);
 #define DrawStatusText WINELIB_NAME_AW(DrawStatusText)
-VOID WINAPI MenuHelp (UINT32, WPARAM32, LPARAM, HMENU32,
-                      HINSTANCE32, HWND32, LPUINT32);
+VOID WINAPI MenuHelp (UINT, WPARAM, LPARAM, HMENU,
+                      HINSTANCE, HWND, LPUINT);
 
 /**************************************************************************
  *  Drag List control
@@ -267,9 +267,9 @@ VOID WINAPI MenuHelp (UINT32, WPARAM32, LPARAM, HMENU32,
 
 typedef struct tagDRAGLISTINFO
 {
-    UINT32  uNotification;
-    HWND32  hWnd;
-    POINT32 ptCursor;
+    UINT  uNotification;
+    HWND  hWnd;
+    POINT ptCursor;
 } DRAGLISTINFO, *LPDRAGLISTINFO;
 
 #define DL_BEGINDRAG            (WM_USER+133)
@@ -284,22 +284,22 @@ typedef struct tagDRAGLISTINFO
 
 #define DRAGLISTMSGSTRING       TEXT("commctrl_DragListMsg")
 
-BOOL32 WINAPI MakeDragList (HWND32);
-VOID   WINAPI DrawInsert (HWND32, HWND32, INT32);
-INT32  WINAPI LBItemFromPt (HWND32, POINT32, BOOL32);
+BOOL WINAPI MakeDragList (HWND);
+VOID   WINAPI DrawInsert (HWND, HWND, INT);
+INT  WINAPI LBItemFromPt (HWND, POINT, BOOL);
 
   
 /* UpDown */
 
 #define UPDOWN_CLASS16          "msctls_updown"
-#define UPDOWN_CLASS32A         "msctls_updown32"
-#define UPDOWN_CLASS32W         L"msctls_updown32"
+#define UPDOWN_CLASSA         "msctls_updown32"
+#define UPDOWN_CLASSW         L"msctls_updown32"
 #define UPDOWN_CLASS            WINELIB_NAME_AW(UPDOWN_CLASS)
 
 typedef struct tagUDACCEL
 {
-    UINT32 nSec;
-    UINT32 nInc;
+    UINT nSec;
+    UINT nInc;
 } UDACCEL;
 
 #define UD_MAXVAL          0x7fff
@@ -318,8 +318,8 @@ typedef struct tagUDACCEL
 #define UDN_LAST           (0U-740)
 #define UDN_DELTAPOS       (UDN_FIRST-1)
 
-#define UDM_SETRANGE       (WM_USER+101)
-#define UDM_GETRANGE       (WM_USER+102)
+#define UDM_SETRANGE16       (WM_USER+101)
+#define UDM_GETRANGE16       (WM_USER+102)
 #define UDM_SETPOS         (WM_USER+103)
 #define UDM_GETPOS         (WM_USER+104)
 #define UDM_SETBUDDY       (WM_USER+105)
@@ -328,26 +328,26 @@ typedef struct tagUDACCEL
 #define UDM_GETACCEL       (WM_USER+108)
 #define UDM_SETBASE        (WM_USER+109)
 #define UDM_GETBASE        (WM_USER+110)
-#define UDM_SETRANGE32     (WM_USER+111)
-#define UDM_GETRANGE32     (WM_USER+112)
+#define UDM_SETRANGE     (WM_USER+111)
+#define UDM_GETRANGE     (WM_USER+112)
 
-HWND32 WINAPI CreateUpDownControl (DWORD, INT32, INT32, INT32, INT32,
-                                   HWND32, INT32, HINSTANCE32, HWND32,
-                                   INT32, INT32, INT32);
+HWND WINAPI CreateUpDownControl (DWORD, INT, INT, INT, INT,
+                                   HWND, INT, HINSTANCE, HWND,
+                                   INT, INT, INT);
 
 /* Progress Bar */
 
-#define PROGRESS_CLASS32A   "msctls_progress32"
-#define PROGRESS_CLASS32W  L"msctls_progress32"
+#define PROGRESS_CLASSA   "msctls_progress32"
+#define PROGRESS_CLASSW  L"msctls_progress32"
 #define PROGRESS_CLASS16    "msctls_progress"
 #define PROGRESS_CLASS      WINELIB_NAME_AW(PROGRESS_CLASS)
 
-#define PBM_SETRANGE        (WM_USER+1)
+#define PBM_SETRANGE16        (WM_USER+1)
 #define PBM_SETPOS          (WM_USER+2)
 #define PBM_DELTAPOS        (WM_USER+3)
 #define PBM_SETSTEP         (WM_USER+4)
 #define PBM_STEPIT          (WM_USER+5)
-#define PBM_SETRANGE32      (WM_USER+6)
+#define PBM_SETRANGE      (WM_USER+6)
 #define PBM_GETRANGE        (WM_USER+7)
 #define PBM_GETPOS          (WM_USER+8)
 #define PBM_SETBARCOLOR     (WM_USER+9)
@@ -358,8 +358,8 @@ HWND32 WINAPI CreateUpDownControl (DWORD, INT32, INT32, INT32, INT32,
 
 typedef struct
 {
-    INT32 iLow;
-    INT32 iHigh;
+    INT iLow;
+    INT iHigh;
 } PBRANGE, *PPBRANGE;
 
 
@@ -405,11 +405,11 @@ typedef struct _IMAGELIST *HIMAGELIST;
 
 typedef struct _IMAGEINFO
 {
-    HBITMAP32 hbmImage;
-    HBITMAP32 hbmMask;
-    INT32     Unused1;
-    INT32     Unused2;
-    RECT32    rcImage;
+    HBITMAP hbmImage;
+    HBITMAP hbmMask;
+    INT     Unused1;
+    INT     Unused2;
+    RECT    rcImage;
 } IMAGEINFO;
 
 
@@ -417,65 +417,65 @@ typedef struct _IMAGELISTDRAWPARAMS
 {
     DWORD       cbSize;
     HIMAGELIST  himl;
-    INT32       i;
-    HDC32       hdcDst;
-    INT32       x;
-    INT32       y;
-    INT32       cx;
-    INT32       cy;
-    INT32       xBitmap;  /* x offest from the upperleft of bitmap */
-    INT32       yBitmap;  /* y offset from the upperleft of bitmap */
+    INT       i;
+    HDC       hdcDst;
+    INT       x;
+    INT       y;
+    INT       cx;
+    INT       cy;
+    INT       xBitmap;  /* x offest from the upperleft of bitmap */
+    INT       yBitmap;  /* y offset from the upperleft of bitmap */
     COLORREF    rgbBk;
     COLORREF    rgbFg;
-    UINT32      fStyle;
+    UINT      fStyle;
     DWORD       dwRop;
 } IMAGELISTDRAWPARAMS, *LPIMAGELISTDRAWPARAMS;
 
  
-INT32      WINAPI ImageList_Add(HIMAGELIST,HBITMAP32,HBITMAP32);
-INT32      WINAPI ImageList_AddIcon (HIMAGELIST, HICON32);
-INT32      WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP32,COLORREF);
-BOOL32     WINAPI ImageList_BeginDrag(HIMAGELIST,INT32,INT32,INT32);
-BOOL32     WINAPI ImageList_Copy(HIMAGELIST,INT32,HIMAGELIST,INT32,INT32);
-HIMAGELIST WINAPI ImageList_Create(INT32,INT32,UINT32,INT32,INT32);
-BOOL32     WINAPI ImageList_Destroy(HIMAGELIST);
-BOOL32     WINAPI ImageList_DragEnter(HWND32,INT32,INT32);
-BOOL32     WINAPI ImageList_DragLeave(HWND32); 
-BOOL32     WINAPI ImageList_DragMove(INT32,INT32);
-BOOL32     WINAPI ImageList_DragShowNolock (BOOL32);
-BOOL32     WINAPI ImageList_Draw(HIMAGELIST,INT32,HDC32,INT32,INT32,UINT32);
-BOOL32     WINAPI ImageList_DrawEx(HIMAGELIST,INT32,HDC32,INT32,INT32,INT32,
-                                   INT32,COLORREF,COLORREF,UINT32);
-BOOL32     WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*); 
+INT      WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
+INT      WINAPI ImageList_AddIcon (HIMAGELIST, HICON);
+INT      WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF);
+BOOL     WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT);
+BOOL     WINAPI ImageList_Copy(HIMAGELIST,INT,HIMAGELIST,INT,INT);
+HIMAGELIST WINAPI ImageList_Create(INT,INT,UINT,INT,INT);
+BOOL     WINAPI ImageList_Destroy(HIMAGELIST);
+BOOL     WINAPI ImageList_DragEnter(HWND,INT,INT);
+BOOL     WINAPI ImageList_DragLeave(HWND); 
+BOOL     WINAPI ImageList_DragMove(INT,INT);
+BOOL     WINAPI ImageList_DragShowNolock (BOOL);
+BOOL     WINAPI ImageList_Draw(HIMAGELIST,INT,HDC,INT,INT,UINT);
+BOOL     WINAPI ImageList_DrawEx(HIMAGELIST,INT,HDC,INT,INT,INT,
+                                   INT,COLORREF,COLORREF,UINT);
+BOOL     WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*); 
 HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST);
-BOOL32     WINAPI ImageList_EndDrag(VOID);
+BOOL     WINAPI ImageList_EndDrag(VOID);
 COLORREF   WINAPI ImageList_GetBkColor(HIMAGELIST);
-HIMAGELIST WINAPI ImageList_GetDragImage(POINT32*,POINT32*);
-HICON32    WINAPI ImageList_GetIcon(HIMAGELIST,INT32,UINT32);
-BOOL32     WINAPI ImageList_GetIconSize(HIMAGELIST,INT32*,INT32*);
-INT32      WINAPI ImageList_GetImageCount(HIMAGELIST);
-BOOL32     WINAPI ImageList_GetImageInfo(HIMAGELIST,INT32,IMAGEINFO*);
-BOOL32     WINAPI ImageList_GetImageRect(HIMAGELIST,INT32,LPRECT32);
-HIMAGELIST WINAPI ImageList_LoadImage32A(HINSTANCE32,LPCSTR,INT32,INT32,
-                                         COLORREF,UINT32,UINT32);
-HIMAGELIST WINAPI ImageList_LoadImage32W(HINSTANCE32,LPCWSTR,INT32,INT32,
-                                         COLORREF,UINT32,UINT32);
+HIMAGELIST WINAPI ImageList_GetDragImage(POINT*,POINT*);
+HICON    WINAPI ImageList_GetIcon(HIMAGELIST,INT,UINT);
+BOOL     WINAPI ImageList_GetIconSize(HIMAGELIST,INT*,INT*);
+INT      WINAPI ImageList_GetImageCount(HIMAGELIST);
+BOOL     WINAPI ImageList_GetImageInfo(HIMAGELIST,INT,IMAGEINFO*);
+BOOL     WINAPI ImageList_GetImageRect(HIMAGELIST,INT,LPRECT);
+HIMAGELIST WINAPI ImageList_LoadImageA(HINSTANCE,LPCSTR,INT,INT,
+                                         COLORREF,UINT,UINT);
+HIMAGELIST WINAPI ImageList_LoadImageW(HINSTANCE,LPCWSTR,INT,INT,
+                                         COLORREF,UINT,UINT);
 #define    ImageList_LoadImage WINELIB_NAME_AW(ImageList_LoadImage)
-HIMAGELIST WINAPI ImageList_Merge(HIMAGELIST,INT32,HIMAGELIST,INT32,INT32,INT32);
+HIMAGELIST WINAPI ImageList_Merge(HIMAGELIST,INT,HIMAGELIST,INT,INT,INT);
 #ifdef __IStream_INTREFACE_DEFINED__
-HIMAGELIST WINAPI ImageList_Read(LPSTREAM32);
+HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
 #endif
-BOOL32     WINAPI ImageList_Remove(HIMAGELIST,INT32);
-BOOL32     WINAPI ImageList_Replace(HIMAGELIST,INT32,HBITMAP32,HBITMAP32);
-INT32      WINAPI ImageList_ReplaceIcon(HIMAGELIST,INT32,HICON32);
+BOOL     WINAPI ImageList_Remove(HIMAGELIST,INT);
+BOOL     WINAPI ImageList_Replace(HIMAGELIST,INT,HBITMAP,HBITMAP);
+INT      WINAPI ImageList_ReplaceIcon(HIMAGELIST,INT,HICON);
 COLORREF   WINAPI ImageList_SetBkColor(HIMAGELIST,COLORREF);
-BOOL32     WINAPI ImageList_SetDragCursorImage(HIMAGELIST,INT32,INT32,INT32);
+BOOL     WINAPI ImageList_SetDragCursorImage(HIMAGELIST,INT,INT,INT);
 
-BOOL32     WINAPI ImageList_SetIconSize(HIMAGELIST,INT32,INT32);
-BOOL32     WINAPI ImageList_SetImageCount(HIMAGELIST,INT32);
-BOOL32     WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT32,INT32);
+BOOL     WINAPI ImageList_SetIconSize(HIMAGELIST,INT,INT);
+BOOL     WINAPI ImageList_SetImageCount(HIMAGELIST,INT);
+BOOL     WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT);
 #ifdef __IStream_INTREFACE_DEFINED__
-BOOL32     WINAPI ImageList_Write(HIMAGELIST, LPSTREAM32);
+BOOL     WINAPI ImageList_Write(HIMAGELIST, LPSTREAM);
 #endif
 
 #ifndef __WINE__
@@ -490,29 +490,29 @@ BOOL32     WINAPI ImageList_Write(HIMAGELIST, LPSTREAM32);
 /* Flat Scrollbar control */
 
 #define FLATSB_CLASS16        "flatsb_class"
-#define FLATSB_CLASS32A       "flatsb_class32"
-#define FLATSB_CLASS32W       L"flatsb_class32"
+#define FLATSB_CLASSA       "flatsb_class32"
+#define FLATSB_CLASSW       L"flatsb_class32"
 #define FLATSB_CLASS          WINELIB_NAME_AW(FLATSB_CLASS)
 
-BOOL32  WINAPI FlatSB_EnableScrollBar(HWND32, INT32, UINT32);
-BOOL32  WINAPI FlatSB_ShowScrollBar(HWND32, INT32, BOOL32);
-BOOL32  WINAPI FlatSB_GetScrollRange(HWND32, INT32, LPINT32, LPINT32);
-BOOL32  WINAPI FlatSB_GetScrollInfo(HWND32, INT32, LPSCROLLINFO);
-INT32   WINAPI FlatSB_GetScrollPos(HWND32, INT32);
-BOOL32  WINAPI FlatSB_GetScrollProp(HWND32, INT32, LPINT32);
-INT32   WINAPI FlatSB_SetScrollPos(HWND32, INT32, INT32, BOOL32);
-INT32   WINAPI FlatSB_SetScrollInfo(HWND32, INT32, LPSCROLLINFO, BOOL32);
-INT32   WINAPI FlatSB_SetScrollRange(HWND32, INT32, INT32, INT32, BOOL32);
-BOOL32  WINAPI FlatSB_SetScrollProp(HWND32, UINT32, INT32, BOOL32);
-BOOL32  WINAPI InitializeFlatSB(HWND32);
-HRESULT WINAPI UninitializeFlatSB(HWND32);
+BOOL  WINAPI FlatSB_EnableScrollBar(HWND, INT, UINT);
+BOOL  WINAPI FlatSB_ShowScrollBar(HWND, INT, BOOL);
+BOOL  WINAPI FlatSB_GetScrollRange(HWND, INT, LPINT, LPINT);
+BOOL  WINAPI FlatSB_GetScrollInfo(HWND, INT, LPSCROLLINFO);
+INT   WINAPI FlatSB_GetScrollPos(HWND, INT);
+BOOL  WINAPI FlatSB_GetScrollProp(HWND, INT, LPINT);
+INT   WINAPI FlatSB_SetScrollPos(HWND, INT, INT, BOOL);
+INT   WINAPI FlatSB_SetScrollInfo(HWND, INT, LPSCROLLINFO, BOOL);
+INT   WINAPI FlatSB_SetScrollRange(HWND, INT, INT, INT, BOOL);
+BOOL  WINAPI FlatSB_SetScrollProp(HWND, UINT, INT, BOOL);
+BOOL  WINAPI InitializeFlatSB(HWND);
+HRESULT WINAPI UninitializeFlatSB(HWND);
 
 
 /* Header control */
 
 #define WC_HEADER16		"SysHeader" 
-#define WC_HEADER32A		"SysHeader32" 
-#define WC_HEADER32W		L"SysHeader32" 
+#define WC_HEADERA		"SysHeader32" 
+#define WC_HEADERW		L"SysHeader32" 
 #define WC_HEADER		WINELIB_NAME_AW(WC_HEADER)
  
 #define HDS_HORZ                0x0000 
@@ -554,15 +554,15 @@ HRESULT WINAPI UninitializeFlatSB(HWND32);
 
 #define HDM_FIRST               0x1200
 #define HDM_GETITEMCOUNT        (HDM_FIRST+0)
-#define HDM_INSERTITEM32A       (HDM_FIRST+1)
-#define HDM_INSERTITEM32W       (HDM_FIRST+10)
+#define HDM_INSERTITEMA       (HDM_FIRST+1)
+#define HDM_INSERTITEMW       (HDM_FIRST+10)
 #define HDM_INSERTITEM		WINELIB_NAME_AW(HDM_INSERTITEM)
 #define HDM_DELETEITEM          (HDM_FIRST+2)
-#define HDM_GETITEM32A          (HDM_FIRST+3)
-#define HDM_GETITEM32W          (HDM_FIRST+11)
+#define HDM_GETITEMA          (HDM_FIRST+3)
+#define HDM_GETITEMW          (HDM_FIRST+11)
 #define HDM_GETITEM		WINELIB_NAME_AW(HDM_GETITEM)
-#define HDM_SETITEM32A          (HDM_FIRST+4)
-#define HDM_SETITEM32W          (HDM_FIRST+12)
+#define HDM_SETITEMA          (HDM_FIRST+4)
+#define HDM_SETITEMW          (HDM_FIRST+12)
 #define HDM_SETITEM		WINELIB_NAME_AW(HDM_SETITEM)
 #define HDM_LAYOUT              (HDM_FIRST+5)
 #define HDM_HITTEST             (HDM_FIRST+6)
@@ -580,180 +580,180 @@ HRESULT WINAPI UninitializeFlatSB(HWND32);
 
 #define HDN_FIRST               (0U-300U)
 #define HDN_LAST                (0U-399U)
-#define HDN_ITEMCHANGING32A     (HDN_FIRST-0)
-#define HDN_ITEMCHANGING32W     (HDN_FIRST-20)
+#define HDN_ITEMCHANGINGA     (HDN_FIRST-0)
+#define HDN_ITEMCHANGINGW     (HDN_FIRST-20)
 #define HDN_ITEMCHANGING WINELIB_NAME_AW(HDN_ITEMCHANGING)
-#define HDN_ITEMCHANGED32A      (HDN_FIRST-1)
-#define HDN_ITEMCHANGED32W      (HDN_FIRST-21)
+#define HDN_ITEMCHANGEDA      (HDN_FIRST-1)
+#define HDN_ITEMCHANGEDW      (HDN_FIRST-21)
 #define HDN_ITEMCHANGED WINELIB_NAME_AW(HDN_ITEMCHANGED)
-#define HDN_ITEMCLICK32A        (HDN_FIRST-2)
-#define HDN_ITEMCLICK32W        (HDN_FIRST-22)
+#define HDN_ITEMCLICKA        (HDN_FIRST-2)
+#define HDN_ITEMCLICKW        (HDN_FIRST-22)
 #define HDN_ITEMCLICK WINELIB_NAME_AW(HDN_ITEMCLICK)
-#define HDN_ITEMDBLCLICK32A     (HDN_FIRST-3)
-#define HDN_ITEMDBLCLICK32W     (HDN_FIRST-23)
+#define HDN_ITEMDBLCLICKA     (HDN_FIRST-3)
+#define HDN_ITEMDBLCLICKW     (HDN_FIRST-23)
 #define HDN_ITEMDBLCLICK WINELIB_NAME_AW(HDN_ITEMDBLCLICK)
-#define HDN_DIVIDERDBLCLICK32A  (HDN_FIRST-5)
-#define HDN_DIVIDERDBLCLICK32W  (HDN_FIRST-25)
+#define HDN_DIVIDERDBLCLICKA  (HDN_FIRST-5)
+#define HDN_DIVIDERDBLCLICKW  (HDN_FIRST-25)
 #define HDN_DIVIDERDBLCLICK WINELIB_NAME_AW(HDN_DIVIDERDBLCLICK)
-#define HDN_BEGINTRACK32A       (HDN_FIRST-6)
-#define HDN_BEGINTRACK32W       (HDN_FIRST-26)
+#define HDN_BEGINTRACKA       (HDN_FIRST-6)
+#define HDN_BEGINTRACKW       (HDN_FIRST-26)
 #define HDN_BEGINTRACK WINELIB_NAME_AW(HDN_BEGINTRACK)
-#define HDN_ENDTRACK32A         (HDN_FIRST-7)
-#define HDN_ENDTRACK32W         (HDN_FIRST-27)
+#define HDN_ENDTRACKA         (HDN_FIRST-7)
+#define HDN_ENDTRACKW         (HDN_FIRST-27)
 #define HDN_ENDTRACK WINELIB_NAME_AW(HDN_ENDTRACK)
-#define HDN_TRACK32A            (HDN_FIRST-8)
-#define HDN_TRACK32W            (HDN_FIRST-28)
+#define HDN_TRACKA            (HDN_FIRST-8)
+#define HDN_TRACKW            (HDN_FIRST-28)
 #define HDN_TRACK WINELIB_NAME_AW(HDN_TRACK)
-#define HDN_GETDISPINFO32A      (HDN_FIRST-9)
-#define HDN_GETDISPINFO32W      (HDN_FIRST-29)
+#define HDN_GETDISPINFOA      (HDN_FIRST-9)
+#define HDN_GETDISPINFOW      (HDN_FIRST-29)
 #define HDN_GETDISPINFO WINELIB_NAME_AW(HDN_GETDISPINFO)
 #define HDN_BEGINDRACK          (HDN_FIRST-10)
 #define HDN_ENDDRACK            (HDN_FIRST-11)
 
 typedef struct _HD_LAYOUT
 {
-    RECT32      *prc;
-    WINDOWPOS32 *pwpos;
+    RECT      *prc;
+    WINDOWPOS *pwpos;
 } HDLAYOUT, *LPHDLAYOUT;
 
 #define HD_LAYOUT   HDLAYOUT
 
-typedef struct _HD_ITEM32A
+typedef struct _HD_ITEMA
 {
-    UINT32    mask;
-    INT32     cxy;
+    UINT    mask;
+    INT     cxy;
     LPSTR     pszText;
-    HBITMAP32 hbm;
-    INT32     cchTextMax;
-    INT32     fmt;
+    HBITMAP hbm;
+    INT     cchTextMax;
+    INT     fmt;
     LPARAM    lParam;
-    INT32     iImage;
-    INT32     iOrder;
-} HDITEM32A, *LPHDITEM32A;
+    INT     iImage;
+    INT     iOrder;
+} HDITEMA, *LPHDITEMA;
 
-typedef struct _HD_ITEM32W
+typedef struct _HD_ITEMW
 {
-    UINT32    mask;
-    INT32     cxy;
+    UINT    mask;
+    INT     cxy;
     LPWSTR    pszText;
-    HBITMAP32 hbm;
-    INT32     cchTextMax;
-    INT32     fmt;
+    HBITMAP hbm;
+    INT     cchTextMax;
+    INT     fmt;
     LPARAM    lParam;
-    INT32     iImage;
-    INT32     iOrder;
-} HDITEM32W, *LPHDITEM32W;
+    INT     iImage;
+    INT     iOrder;
+} HDITEMW, *LPHDITEMW;
 
 #define HDITEM   WINELIB_NAME_AW(HDITEM)
 #define LPHDITEM WINELIB_NAME_AW(LPHDITEM)
 #define HD_ITEM  HDITEM
 
-#define HDITEM_V1_SIZE32A CCSIZEOF_STRUCT(HDITEM32A, lParam)
-#define HDITEM_V1_SIZE32W CCSIZEOF_STRUCT(HDITEM32W, lParam)
+#define HDITEM_V1_SIZEA CCSIZEOF_STRUCT(HDITEMA, lParam)
+#define HDITEM_V1_SIZEW CCSIZEOF_STRUCT(HDITEMW, lParam)
 #define HDITEM_V1_SIZE WINELIB_NAME_AW(HDITEM_V1_SIZE)
 
 typedef struct _HD_HITTESTINFO
 {
-    POINT32 pt;
-    UINT32  flags;
-    INT32   iItem;
+    POINT pt;
+    UINT  flags;
+    INT   iItem;
 } HDHITTESTINFO, *LPHDHITTESTINFO;
 
 #define HD_HITTESTINFO   HDHITTESTINFO
 
-typedef struct tagNMHEADER32A
+typedef struct tagNMHEADERA
 {
     NMHDR     hdr;
-    INT32     iItem;
-    INT32     iButton;
-    HDITEM32A *pitem;
-} NMHEADER32A, *LPNMHEADER32A;
+    INT     iItem;
+    INT     iButton;
+    HDITEMA *pitem;
+} NMHEADERA, *LPNMHEADERA;
 
-typedef struct tagNMHEADER32W
+typedef struct tagNMHEADERW
 {
     NMHDR     hdr;
-    INT32     iItem;
-    INT32     iButton;
-    HDITEM32W *pitem;
-} NMHEADER32W, *LPNMHEADER32W;
+    INT     iItem;
+    INT     iButton;
+    HDITEMW *pitem;
+} NMHEADERW, *LPNMHEADERW;
 
 #define NMHEADER		WINELIB_NAME_AW(NMHEADER)
 #define LPNMHEADER		WINELIB_NAME_AW(LPNMHEADER)
 #define HD_NOTIFY               NMHEADER
 
-typedef struct tagNMHDDISPINFO32A
+typedef struct tagNMHDDISPINFOA
 {
     NMHDR     hdr;
-    INT32     iItem;
-    UINT32    mask;
+    INT     iItem;
+    UINT    mask;
     LPSTR     pszText;
-    INT32     cchTextMax;
-    INT32     iImage;
+    INT     cchTextMax;
+    INT     iImage;
     LPARAM    lParam;
-} NMHDDISPINFO32A, *LPNMHDDISPINFO32A;
+} NMHDDISPINFOA, *LPNMHDDISPINFOA;
 
-typedef struct tagNMHDDISPINFO32W
+typedef struct tagNMHDDISPINFOW
 {
     NMHDR     hdr;
-    INT32     iItem;
-    UINT32    mask;
+    INT     iItem;
+    UINT    mask;
     LPWSTR    pszText;
-    INT32     cchTextMax;
-    INT32     iImage;
+    INT     cchTextMax;
+    INT     iImage;
     LPARAM    lParam;
-} NMHDDISPINFO32W, *LPNMHDDISPINFO32W;
+} NMHDDISPINFOW, *LPNMHDDISPINFOW;
 
 #define NMHDDISPINFO		WINELIB_NAME_AW(NMHDDISPINFO)
 #define LPNMHDDISPINFO		WINELIB_NAME_AW(LPNMHDDISPINFO)
 
 #define Header_GetItemCount(hwndHD) \
-  (INT32)SendMessage32A((hwndHD),HDM_GETITEMCOUNT,0,0L)
-#define Header_InsertItem32A(hwndHD,i,phdi) \
-  (INT32)SendMessage32A((hwndHD),HDM_INSERTITEM32A,(WPARAM32)(INT32)(i),(LPARAM)(const HDITEM32A*)(phdi))
-#define Header_InsertItem32W(hwndHD,i,phdi) \
-  (INT32)SendMessage32W((hwndHD),HDM_INSERTITEM32W,(WPARAM32)(INT32)(i),(LPARAM)(const HDITEM32W*)(phdi))
+  (INT)SendMessageA((hwndHD),HDM_GETITEMCOUNT,0,0L)
+#define Header_InsertItemA(hwndHD,i,phdi) \
+  (INT)SendMessageA((hwndHD),HDM_INSERTITEMA,(WPARAM)(INT)(i),(LPARAM)(const HDITEMA*)(phdi))
+#define Header_InsertItemW(hwndHD,i,phdi) \
+  (INT)SendMessageW((hwndHD),HDM_INSERTITEMW,(WPARAM)(INT)(i),(LPARAM)(const HDITEMW*)(phdi))
 #define Header_InsertItem WINELIB_NAME_AW(Header_InsertItem)
 #define Header_DeleteItem(hwndHD,i) \
-  (BOOL32)SendMessage32A((hwndHD),HDM_DELETEITEM,(WPARAM32)(INT32)(i),0L)
-#define Header_GetItem32A(hwndHD,i,phdi) \
-  (BOOL32)SendMessage32A((hwndHD),HDM_GETITEM32A,(WPARAM32)(INT32)(i),(LPARAM)(HDITEM32A*)(phdi))
-#define Header_GetItem32W(hwndHD,i,phdi) \
-  (BOOL32)SendMessage32W((hwndHD),HDM_GETITEM32W,(WPARAM32)(INT32)(i),(LPARAM)(HDITEM32W*)(phdi))
+  (BOOL)SendMessageA((hwndHD),HDM_DELETEITEM,(WPARAM)(INT)(i),0L)
+#define Header_GetItemA(hwndHD,i,phdi) \
+  (BOOL)SendMessageA((hwndHD),HDM_GETITEMA,(WPARAM)(INT)(i),(LPARAM)(HDITEMA*)(phdi))
+#define Header_GetItemW(hwndHD,i,phdi) \
+  (BOOL)SendMessageW((hwndHD),HDM_GETITEMW,(WPARAM)(INT)(i),(LPARAM)(HDITEMW*)(phdi))
 #define Header_GetItem WINELIB_NAME_AW(Header_GetItem)
-#define Header_SetItem32A(hwndHD,i,phdi) \
-  (BOOL32)SendMessage32A((hwndHD),HDM_SETITEM32A,(WPARAM32)(INT32)(i),(LPARAM)(const HDITEM32A*)(phdi))
-#define Header_SetItem32W(hwndHD,i,phdi) \
-  (BOOL32)SendMessage32W((hwndHD),HDM_SETITEM32W,(WPARAM32)(INT32)(i),(LPARAM)(const HDITEM32W*)(phdi))
+#define Header_SetItemA(hwndHD,i,phdi) \
+  (BOOL)SendMessageA((hwndHD),HDM_SETITEMA,(WPARAM)(INT)(i),(LPARAM)(const HDITEMA*)(phdi))
+#define Header_SetItemW(hwndHD,i,phdi) \
+  (BOOL)SendMessageW((hwndHD),HDM_SETITEMW,(WPARAM)(INT)(i),(LPARAM)(const HDITEMW*)(phdi))
 #define Header_SetItem WINELIB_NAME_AW(Header_SetItem)
 #define Header_Layout(hwndHD,playout) \
-  (BOOL32)SendMessage32A((hwndHD),HDM_LAYOUT,0,(LPARAM)(LPHDLAYOUT)(playout))
+  (BOOL)SendMessageA((hwndHD),HDM_LAYOUT,0,(LPARAM)(LPHDLAYOUT)(playout))
 #define Header_GetItemRect(hwnd,iItem,lprc) \
-  (BOOL32)SendMessage32A((hwnd),HDM_GETITEMRECT,(WPARAM32)iItem,(LPARAM)lprc)
+  (BOOL)SendMessageA((hwnd),HDM_GETITEMRECT,(WPARAM)iItem,(LPARAM)lprc)
 #define Header_SetImageList(hwnd,himl) \
-  (HIMAGELIST)SendMessage32A((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl)
+  (HIMAGELIST)SendMessageA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl)
 #define Header_GetImageList(hwnd) \
-  (HIMAGELIST)SendMessage32A((hwnd),HDM_GETIMAGELIST,0,0)
+  (HIMAGELIST)SendMessageA((hwnd),HDM_GETIMAGELIST,0,0)
 #define Header_OrderToIndex(hwnd,i) \
-  (INT32)SendMessage32A((hwnd),HDM_ORDERTOINDEX,(WPARAM32)i,0)
+  (INT)SendMessageA((hwnd),HDM_ORDERTOINDEX,(WPARAM)i,0)
 #define Header_CreateDragImage(hwnd,i) \
-  (HIMAGELIST)SendMessage32A((hwnd),HDM_CREATEDRAGIMAGE,(WPARAM32)i,0)
+  (HIMAGELIST)SendMessageA((hwnd),HDM_CREATEDRAGIMAGE,(WPARAM)i,0)
 #define Header_GetOrderArray(hwnd,iCount,lpi) \
-  (BOOL32)SendMessage32A((hwnd),HDM_GETORDERARRAY,(WPARAM32)iCount,(LPARAM)lpi)
+  (BOOL)SendMessageA((hwnd),HDM_GETORDERARRAY,(WPARAM)iCount,(LPARAM)lpi)
 #define Header_SetOrderArray(hwnd,iCount,lpi) \
-  (BOOL32)SendMessage32A((hwnd),HDM_SETORDERARRAY,(WPARAM32)iCount,(LPARAM)lpi)
+  (BOOL)SendMessageA((hwnd),HDM_SETORDERARRAY,(WPARAM)iCount,(LPARAM)lpi)
 #define Header_SetHotDivider(hwnd,fPos,dw) \
-  (INT32)SendMessage32A((hwnd),HDM_SETHOTDIVIDER,(WPARAM32)fPos,(LPARAM)dw)
+  (INT)SendMessageA((hwnd),HDM_SETHOTDIVIDER,(WPARAM)fPos,(LPARAM)dw)
 #define Header_SetUnicodeFormat(hwnd,fUnicode) \
-  (BOOL32)SendMessage32A((hwnd),HDM_SETUNICODEFORMAT,(WPARAM32)(fUnicode),0)
+  (BOOL)SendMessageA((hwnd),HDM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0)
 #define Header_GetUnicodeFormat(hwnd) \
-  (BOOL32)SendMessage32A((hwnd),HDM_GETUNICODEFORMAT,0,0)
+  (BOOL)SendMessageA((hwnd),HDM_GETUNICODEFORMAT,0,0)
 
 
 /* Toolbar */
 
 #define TOOLBARCLASSNAME16      "ToolbarWindow" 
-#define TOOLBARCLASSNAME32W     L"ToolbarWindow32" 
-#define TOOLBARCLASSNAME32A     "ToolbarWindow32" 
+#define TOOLBARCLASSNAMEW     L"ToolbarWindow32" 
+#define TOOLBARCLASSNAMEA     "ToolbarWindow32" 
 #define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME)
 
 #define CMB_MASKED              0x02 
@@ -805,23 +805,23 @@ typedef struct tagNMHDDISPINFO32W
 #define TB_SETSTATE              (WM_USER+17)
 #define TB_GETSTATE              (WM_USER+18)
 #define TB_ADDBITMAP             (WM_USER+19)
-#define TB_ADDBUTTONS32A         (WM_USER+20)
-#define TB_ADDBUTTONS32W         (WM_USER+68)
+#define TB_ADDBUTTONSA         (WM_USER+20)
+#define TB_ADDBUTTONSW         (WM_USER+68)
 #define TB_ADDBUTTONS WINELIB_NAME_AW(TB_ADDBUTTONS)
 #define TB_HITTEST               (WM_USER+69)
-#define TB_INSERTBUTTON32A       (WM_USER+21)
-#define TB_INSERTBUTTON32W       (WM_USER+67)
+#define TB_INSERTBUTTONA       (WM_USER+21)
+#define TB_INSERTBUTTONW       (WM_USER+67)
 #define TB_INSERTBUTTON WINELIB_NAME_AW(TB_INSERTBUTTON)
 #define TB_DELETEBUTTON          (WM_USER+22)
 #define TB_GETBUTTON             (WM_USER+23)
 #define TB_BUTTONCOUNT           (WM_USER+24)
 #define TB_COMMANDTOINDEX        (WM_USER+25)
-#define TB_SAVERESTORE32A        (WM_USER+26)
-#define TB_SAVERESTORE32W        (WM_USER+76)
+#define TB_SAVERESTOREA        (WM_USER+26)
+#define TB_SAVERESTOREW        (WM_USER+76)
 #define TB_SAVERESTORE WINELIB_NAME_AW(TB_SAVERESTORE)
 #define TB_CUSTOMIZE             (WM_USER+27)
-#define TB_ADDSTRING32A          (WM_USER+28) 
-#define TB_ADDSTRING32W          (WM_USER+77) 
+#define TB_ADDSTRINGA          (WM_USER+28) 
+#define TB_ADDSTRINGW          (WM_USER+77) 
 #define TB_ADDSTRING WINELIB_NAME_AW(TB_ADDSTRING)
 #define TB_GETITEMRECT           (WM_USER+29)
 #define TB_BUTTONSTRUCTSIZE      (WM_USER+30)
@@ -837,8 +837,8 @@ typedef struct tagNMHDDISPINFO32W
 #define TB_SETCMDID              (WM_USER+42)
 #define TB_CHANGEBITMAP          (WM_USER+43)
 #define TB_GETBITMAP             (WM_USER+44)
-#define TB_GETBUTTONTEXT32A      (WM_USER+45)
-#define TB_GETBUTTONTEXT32W      (WM_USER+75)
+#define TB_GETBUTTONTEXTA      (WM_USER+45)
+#define TB_GETBUTTONTEXTW      (WM_USER+75)
 #define TB_GETBUTTONTEXT WINELIB_NAME_AW(TB_GETBUTTONTEXT)
 #define TB_REPLACEBITMAP         (WM_USER+46)
 #define TB_SETINDENT             (WM_USER+47)
@@ -857,19 +857,19 @@ typedef struct tagNMHDDISPINFO32W
 #define TB_SETMAXTEXTROWS        (WM_USER+60)
 #define TB_GETTEXTROWS           (WM_USER+61)
 #define TB_GETOBJECT             (WM_USER+62)
-#define TB_GETBUTTONINFO32W      (WM_USER+63)
-#define TB_GETBUTTONINFO32A      (WM_USER+65)
+#define TB_GETBUTTONINFOW      (WM_USER+63)
+#define TB_GETBUTTONINFOA      (WM_USER+65)
 #define TB_GETBUTTONINFO WINELIB_NAME_AW(TB_GETBUTTONINFO)
-#define TB_SETBUTTONINFO32W      (WM_USER+64)
-#define TB_SETBUTTONINFO32A      (WM_USER+66)
+#define TB_SETBUTTONINFOW      (WM_USER+64)
+#define TB_SETBUTTONINFOA      (WM_USER+66)
 #define TB_SETBUTTONINFO WINELIB_NAME_AW(TB_SETBUTTONINFO)
 #define TB_SETDRAWTEXTFLAGS      (WM_USER+70)
 #define TB_GETHOTITEM            (WM_USER+71)
 #define TB_SETHOTITEM            (WM_USER+72)
 #define TB_SETANCHORHIGHLIGHT    (WM_USER+73)
 #define TB_GETANCHORHIGHLIGHT    (WM_USER+74)
-#define TB_MAPACCELERATOR32A     (WM_USER+78)
-#define TB_MAPACCELERATOR32W     (WM_USER+90)
+#define TB_MAPACCELERATORA     (WM_USER+78)
+#define TB_MAPACCELERATORW     (WM_USER+90)
 #define TB_MAPACCELERATOR WINELIB_NAME_AW(TB_MAPACCELERATOR)
 #define TB_GETINSERTMARK         (WM_USER+79)
 #define TB_SETINSERTMARK         (WM_USER+80)
@@ -889,19 +889,19 @@ typedef struct tagNMHDDISPINFO32W
 
 #define TBN_FIRST               (0U-700U)
 #define TBN_LAST                (0U-720U)
-#define TBN_GETBUTTONINFO32A    (TBN_FIRST-0)
-#define TBN_GETBUTTONINFO32W    (TBN_FIRST-20)
+#define TBN_GETBUTTONINFOA    (TBN_FIRST-0)
+#define TBN_GETBUTTONINFOW    (TBN_FIRST-20)
 #define TBN_GETBUTTONINFO WINELIB_NAME_AW(TBN_GETBUTTONINFO)
-#define TBN_GETINFOTIP32A       (TBN_FIRST-18)
-#define TBN_GETINFOTIP32W       (TBN_FIRST-19)
+#define TBN_GETINFOTIPA       (TBN_FIRST-18)
+#define TBN_GETINFOTIPW       (TBN_FIRST-19)
 #define TBN_GETINFOTIP WINELIB_NAME_AW(TBN_GETINFOTIP)
 
 
 /* This is just for old CreateToolbar. */
 /* Don't use it in new programs. */
 typedef struct _OLDTBBUTTON {
-    INT32 iBitmap;
-    INT32 idCommand;
+    INT iBitmap;
+    INT idCommand;
     BYTE  fsState;
     BYTE  fsStyle;
     BYTE  bReserved[2];
@@ -911,13 +911,13 @@ typedef const OLDTBBUTTON *LPCOLDTBBUTTON;
 
 
 typedef struct _TBBUTTON {
-    INT32 iBitmap;
-    INT32 idCommand;
+    INT iBitmap;
+    INT idCommand;
     BYTE  fsState;
     BYTE  fsStyle;
     BYTE  bReserved[2];
     DWORD dwData;
-    INT32 iString;
+    INT iString;
 } TBBUTTON, *PTBBUTTON, *LPTBBUTTON;
 typedef const TBBUTTON *LPCTBBUTTON;
 
@@ -928,11 +928,11 @@ typedef struct _COLORMAP {
 } COLORMAP, *LPCOLORMAP;
 
 typedef struct tagTBADDBITMAP {
-    HINSTANCE32 hInst;
-    UINT32      nID;
+    HINSTANCE hInst;
+    UINT      nID;
 } TBADDBITMAP, *LPTBADDBITMAP;
 
-#define HINST_COMMCTRL         ((HINSTANCE32)-1)
+#define HINST_COMMCTRL         ((HINSTANCE)-1)
 #define IDB_STD_SMALL_COLOR     0
 #define IDB_STD_LARGE_COLOR     1
 #define IDB_VIEW_SMALL_COLOR    4
@@ -973,44 +973,44 @@ typedef struct tagTBSAVEPARAMSA {
     HKEY   hkr;
     LPCSTR pszSubKey;
     LPCSTR pszValueName;
-} TBSAVEPARAMS32A, *LPTBSAVEPARAMS32A;
+} TBSAVEPARAMSA, *LPTBSAVEPARAMSA;
 
 typedef struct tagTBSAVEPARAMSW {
     HKEY   hkr;
     LPCWSTR pszSubKey;
     LPCWSTR pszValueName;
-} TBSAVEPARAMSA32W, *LPTBSAVEPARAMSA32W;
+} TBSAVEPARAMSAW, *LPTBSAVEPARAMSAW;
 
 #define TBSAVEPARAMS   WINELIB_NAME_AW(TBSAVEPARAMS)
 #define LPTBSAVEPARAMS WINELIB_NAME_AW(LPTBSAVEPARAMS)
 
 typedef struct
 {
-    UINT32 cbSize;
+    UINT cbSize;
     DWORD  dwMask;
-    INT32  idCommand;
-    INT32  iImage;
+    INT  idCommand;
+    INT  iImage;
     BYTE   fsState;
     BYTE   fsStyle;
     WORD   cx;
     DWORD  lParam;
     LPSTR  pszText;
-    INT32  cchText;
-} TBBUTTONINFO32A, *LPTBBUTTONINFO32A;
+    INT  cchText;
+} TBBUTTONINFOA, *LPTBBUTTONINFOA;
 
 typedef struct
 {
-    UINT32 cbSize;
+    UINT cbSize;
     DWORD  dwMask;
-    INT32  idCommand;
-    INT32  iImage;
+    INT  idCommand;
+    INT  iImage;
     BYTE   fsState;
     BYTE   fsStyle;
     WORD   cx;
     DWORD  lParam;
     LPWSTR pszText;
-    INT32  cchText;
-} TBBUTTONINFO32W, *LPTBBUTTONINFO32W;
+    INT  cchText;
+} TBBUTTONINFOW, *LPTBBUTTONINFOW;
 
 #define TBBUTTONINFO   WINELIB_NAME_AW(TBBUTTONINFO)
 #define LPTBBUTTONINFO WINELIB_NAME_AW(LPTBBUTTONINFO)
@@ -1019,49 +1019,49 @@ typedef struct tagNMTBGETINFOTIPA
 {
     NMHDR  hdr;
     LPSTR  pszText;
-    INT32  cchTextMax;
-    INT32  iItem;
+    INT  cchTextMax;
+    INT  iItem;
     LPARAM lParam;
-} NMTBGETINFOTIP32A, *LPNMTBGETINFOTIP32A;
+} NMTBGETINFOTIPA, *LPNMTBGETINFOTIPA;
 
 typedef struct tagNMTBGETINFOTIPW
 {
     NMHDR  hdr;
     LPWSTR pszText;
-    INT32  cchTextMax;
-    INT32  iItem;
+    INT  cchTextMax;
+    INT  iItem;
     LPARAM lParam;
-} NMTBGETINFOTIP32W, *LPNMTBGETINFOTIP32W;
+} NMTBGETINFOTIPW, *LPNMTBGETINFOTIPW;
 
 #define NMTBGETINFOTIP   WINELIB_NAME_AW(NMTBGETINFOFTIP)
 #define LPNMTBGETINFOTIP WINELIB_NAME_AW(LPNMTBGETINFOTIP)
 
 typedef struct
 {
-	HINSTANCE32 hInstOld;
-	UINT32      nIDOld;
-	HINSTANCE32 hInstNew;
-	UINT32      nIDNew;
-	INT32       nButtons;
+	HINSTANCE hInstOld;
+	UINT      nIDOld;
+	HINSTANCE hInstNew;
+	UINT      nIDNew;
+	INT       nButtons;
 } TBREPLACEBITMAP, *LPTBREPLACEBITMAP;
 
-HWND32 WINAPI
-CreateToolbar(HWND32, DWORD, UINT32, INT32, HINSTANCE32,
-              UINT32, LPCOLDTBBUTTON, INT32); 
+HWND WINAPI
+CreateToolbar(HWND, DWORD, UINT, INT, HINSTANCE,
+              UINT, LPCOLDTBBUTTON, INT); 
  
-HWND32 WINAPI
-CreateToolbarEx(HWND32, DWORD, UINT32, INT32,
-                HINSTANCE32, UINT32, LPCTBBUTTON, 
-                INT32, INT32, INT32, INT32, INT32, UINT32); 
+HWND WINAPI
+CreateToolbarEx(HWND, DWORD, UINT, INT,
+                HINSTANCE, UINT, LPCTBBUTTON, 
+                INT, INT, INT, INT, INT, UINT); 
 
-HBITMAP32 WINAPI
-CreateMappedBitmap (HINSTANCE32, INT32, UINT32, LPCOLORMAP, INT32); 
+HBITMAP WINAPI
+CreateMappedBitmap (HINSTANCE, INT, UINT, LPCOLORMAP, INT); 
 
 
 /* Tool tips */
 
 #define TOOLTIPS_CLASS16        "tooltips_class"
-#define TOOLTIPS_CLASS32A       "tooltips_class32"
+#define TOOLTIPS_CLASSA       "tooltips_class32"
 #define TOOLTIPS_CLASS32W       L"tooltips_class32"
 #define TOOLTIPS_CLASS          WINELIB_NAME_AW(TOOLTIPS_CLASS)
 
@@ -1088,37 +1088,37 @@ CreateMappedBitmap (HINSTANCE32, INT32, UINT32, LPCOLORMAP, INT32);
 
 #define TTM_ACTIVATE            (WM_USER+1)
 #define TTM_SETDELAYTIME        (WM_USER+3)
-#define TTM_ADDTOOL32A          (WM_USER+4)
-#define TTM_ADDTOOL32W          (WM_USER+50)
+#define TTM_ADDTOOLA          (WM_USER+4)
+#define TTM_ADDTOOLW          (WM_USER+50)
 #define TTM_ADDTOOL WINELIB_NAME_AW(TTM_ADDTOOL)
-#define TTM_DELTOOL32A          (WM_USER+5)
-#define TTM_DELTOOL32W          (WM_USER+51)
+#define TTM_DELTOOLA          (WM_USER+5)
+#define TTM_DELTOOLW          (WM_USER+51)
 #define TTM_DELTOOL WINELIB_NAME_AW(TTM_DELTOOL)
-#define TTM_NEWTOOLRECT32A      (WM_USER+6)
-#define TTM_NEWTOOLRECT32W      (WM_USER+52)
+#define TTM_NEWTOOLRECTA      (WM_USER+6)
+#define TTM_NEWTOOLRECTW      (WM_USER+52)
 #define TTM_NEWTOOLRECT WINELIB_NAME_AW(TTM_NEWTOOLRECT)
 #define TTM_RELAYEVENT          (WM_USER+7)
-#define TTM_GETTOOLINFO32A      (WM_USER+8)
-#define TTM_GETTOOLINFO32W      (WM_USER+53)
+#define TTM_GETTOOLINFOA      (WM_USER+8)
+#define TTM_GETTOOLINFOW      (WM_USER+53)
 #define TTM_GETTOOLINFO WINELIB_NAME_AW(TTM_GETTOOLINFO)
-#define TTM_SETTOOLINFO32A      (WM_USER+9)
-#define TTM_SETTOOLINFO32W      (WM_USER+54)
+#define TTM_SETTOOLINFOA      (WM_USER+9)
+#define TTM_SETTOOLINFOW      (WM_USER+54)
 #define TTM_SETTOOLINFO WINELIB_NAME_AW(TTM_SETTOOLINFO)
-#define TTM_HITTEST32A          (WM_USER+10)
-#define TTM_HITTEST32W          (WM_USER+55)
+#define TTM_HITTESTA          (WM_USER+10)
+#define TTM_HITTESTW          (WM_USER+55)
 #define TTM_HITTEST WINELIB_NAME_AW(TTM_HITTEST)
-#define TTM_GETTEXT32A          (WM_USER+11)
-#define TTM_GETTEXT32W          (WM_USER+56)
+#define TTM_GETTEXTA          (WM_USER+11)
+#define TTM_GETTEXTW          (WM_USER+56)
 #define TTM_GETTEXT WINELIB_NAME_AW(TTM_GETTEXT)
-#define TTM_UPDATETIPTEXT32A    (WM_USER+12)
-#define TTM_UPDATETIPTEXT32W    (WM_USER+57)
+#define TTM_UPDATETIPTEXTA    (WM_USER+12)
+#define TTM_UPDATETIPTEXTW    (WM_USER+57)
 #define TTM_UPDATETIPTEXT WINELIB_NAME_AW(TTM_UPDATETIPTEXT)
 #define TTM_GETTOOLCOUNT        (WM_USER+13)
-#define TTM_ENUMTOOLS32A        (WM_USER+14)
-#define TTM_ENUMTOOLS32W        (WM_USER+58)
+#define TTM_ENUMTOOLSA        (WM_USER+14)
+#define TTM_ENUMTOOLSW        (WM_USER+58)
 #define TTM_ENUMTOOLS WINELIB_NAME_AW(TTM_ENUMTOOLS)
-#define TTM_GETCURRENTTOOL32A   (WM_USER+15)
-#define TTM_GETCURRENTTOOL32W   (WM_USER+59)
+#define TTM_GETCURRENTTOOLA   (WM_USER+15)
+#define TTM_GETCURRENTTOOLW   (WM_USER+59)
 #define TTM_GETCURRENTTOOL WINELIB_NAME_AW(TTM_GETCURRENTTOOL)
 #define TTM_WINDOWFROMPOINT     (WM_USER+16)
 #define TTM_TRACKACTIVATE       (WM_USER+17)
@@ -1138,37 +1138,37 @@ CreateMappedBitmap (HINSTANCE32, INT32, UINT32, LPCOLORMAP, INT32);
 
 #define TTN_FIRST               (0U-520U)
 #define TTN_LAST                (0U-549U)
-#define TTN_GETDISPINFO32A      (TTN_FIRST-0)
-#define TTN_GETDISPINFO32W      (TTN_FIRST-10)
+#define TTN_GETDISPINFOA      (TTN_FIRST-0)
+#define TTN_GETDISPINFOW      (TTN_FIRST-10)
 #define TTN_GETDISPINFO WINELIB_NAME_AW(TTN_GETDISPINFO)
 #define TTN_SHOW                (TTN_FIRST-1)
 #define TTN_POP                 (TTN_FIRST-2)
 
 #define TTN_NEEDTEXT TTN_GETDISPINFO
-#define TTN_NEEDTEXTA TTN_GETDISPINFO32A
-#define TTN_NEEDTEXTW TTN_GETDISPINFO32W
+#define TTN_NEEDTEXTA TTN_GETDISPINFOA
+#define TTN_NEEDTEXTW TTN_GETDISPINFOW
 
 typedef struct tagTOOLINFOA {
-    UINT32 cbSize;
-    UINT32 uFlags;
-    HWND32 hwnd;
-    UINT32 uId;
-    RECT32 rect;
-    HINSTANCE32 hinst;
+    UINT cbSize;
+    UINT uFlags;
+    HWND hwnd;
+    UINT uId;
+    RECT rect;
+    HINSTANCE hinst;
     LPSTR lpszText;
     LPARAM lParam;
-} TTTOOLINFO32A, *LPTOOLINFO32A, *PTOOLINFO32A, *LPTTTOOLINFO32A;
+} TTTOOLINFOA, *LPTOOLINFOA, *PTOOLINFOA, *LPTTTOOLINFOA;
 
 typedef struct tagTOOLINFOW {
-    UINT32 cbSize;
-    UINT32 uFlags;
-    HWND32 hwnd;
-    UINT32 uId;
-    RECT32 rect;
-    HINSTANCE32 hinst;
+    UINT cbSize;
+    UINT uFlags;
+    HWND hwnd;
+    UINT uId;
+    RECT rect;
+    HINSTANCE hinst;
     LPWSTR lpszText;
     LPARAM lParam;
-} TTTOOLINFO32W, *LPTOOLINFO32W, *PTOOLINFO32W, *LPTTTOOLINFO32W;
+} TTTOOLINFOW, *LPTOOLINFOW, *PTOOLINFOW, *LPTTTOOLINFOW;
 
 #define TTTOOLINFO WINELIB_NAME_AW(TTTOOLINFO)
 #define TOOLINFO WINELIB_NAME_AW(TTTOOLINFO)
@@ -1176,23 +1176,23 @@ typedef struct tagTOOLINFOW {
 #define LPTTTOOLINFO WINELIB_NAME_AW(LPTTTOOLINFO)
 #define LPTOOLINFO WINELIB_NAME_AW(LPTOOLINFO)
 
-#define TTTOOLINFO_V1_SIZE32A CCSIZEOF_STRUCT(TTTOOLINFO32A, lpszText)
-#define TTTOOLINFO_V1_SIZE32W CCSIZEOF_STRUCT(TTTOOLINFO32W, lpszText)
+#define TTTOOLINFO_V1_SIZEA CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText)
+#define TTTOOLINFO_V1_SIZEW CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText)
 #define TTTOOLINFO_V1_SIZE WINELIB_NAME_AW(TTTOOLINFO_V1_SIZE)
 
 typedef struct _TT_HITTESTINFOA
 {
-    HWND32        hwnd;
-    POINT32       pt;
-    TTTOOLINFO32A ti;
-} TTHITTESTINFO32A, *LPTTHITTESTINFO32A;
+    HWND        hwnd;
+    POINT       pt;
+    TTTOOLINFOA ti;
+} TTHITTESTINFOA, *LPTTHITTESTINFOA;
 
 typedef struct _TT_HITTESTINFOW
 {
-    HWND32        hwnd;
-    POINT32       pt;
-    TTTOOLINFO32W ti;
-} TTHITTESTINFO32W, *LPTTHITTESTINFO32W;
+    HWND        hwnd;
+    POINT       pt;
+    TTTOOLINFOW ti;
+} TTHITTESTINFOW, *LPTTHITTESTINFOW;
 
 #define TTHITTESTINFO WINELIB_NAME_AW(TTHITTESTINFO)
 #define LPTTHITTESTINFO WINELIB_NAME_AW(LPTTHITTESTINFO)
@@ -1202,30 +1202,30 @@ typedef struct tagNMTTDISPINFOA
     NMHDR hdr;
     LPSTR lpszText;
     CHAR  szText[80];
-    HINSTANCE32 hinst;
-    UINT32      uFlags;
+    HINSTANCE hinst;
+    UINT      uFlags;
     LPARAM      lParam;
-} NMTTDISPINFO32A, *LPNMTTDISPINFO32A;
+} NMTTDISPINFOA, *LPNMTTDISPINFOA;
 
 typedef struct tagNMTTDISPINFOW
 {
     NMHDR       hdr;
     LPWSTR      lpszText;
     WCHAR       szText[80];
-    HINSTANCE32 hinst;
-    UINT32      uFlags;
+    HINSTANCE hinst;
+    UINT      uFlags;
     LPARAM      lParam;
-} NMTTDISPINFO32W, *LPNMTTDISPINFO32W;
+} NMTTDISPINFOW, *LPNMTTDISPINFOW;
 
 #define NMTTDISPINFO WINELIB_NAME_AW(NMTTDISPINFO)
 #define LPNMTTDISPINFO WINELIB_NAME_AW(LPNMTTDISPINFO)
 
-#define NMTTDISPINFO_V1_SIZE32A CCSIZEOF_STRUCT(NMTTDISPINFO32A, uFlags)
-#define NMTTDISPINFO_V1_SIZE32W CCSIZEOF_STRUCT(NMTTDISPINFO32W, uFlags)
+#define NMTTDISPINFO_V1_SIZEA CCSIZEOF_STRUCT(NMTTDISPINFOA, uFlags)
+#define NMTTDISPINFO_V1_SIZEW CCSIZEOF_STRUCT(NMTTDISPINFOW, uFlags)
 #define NMTTDISPINFO_V1_SIZE WINELIB_NAME_AW(NMTTDISPINFO_V1_SIZE)
 
-#define TOOLTIPTEXTW    NMTTDISPINFO32W
-#define TOOLTIPTEXTA    NMTTDISPINFO32A
+#define TOOLTIPTEXTW    NMTTDISPINFOW
+#define TOOLTIPTEXTA    NMTTDISPINFOA
 #define TOOLTIPTEXT     NMTTDISPINFO
 #define LPTOOLTIPTEXTW  LPNMTTDISPINFOW
 #define LPTOOLTIPTEXTA  LPNMTTDISPINFOA
@@ -1235,8 +1235,8 @@ typedef struct tagNMTTDISPINFOW
 /* Rebar control */
 
 #define REBARCLASSNAME16        "ReBarWindow"
-#define REBARCLASSNAME32A       "ReBarWindow32"
-#define REBARCLASSNAME32W       L"ReBarWindow32"
+#define REBARCLASSNAMEA       "ReBarWindow32"
+#define REBARCLASSNAMEW       L"ReBarWindow32"
 #define REBARCLASSNAME          WINELIB_NAME_AW(REBARCLASSNAME)
 
 #define RBS_TOOLTIPS            0x0100
@@ -1282,15 +1282,15 @@ typedef struct tagNMTTDISPINFOW
 #define RBHT_CLIENT             0x0003
 #define RBHT_GRABBER            0x0004
 
-#define RB_INSERTBAND32A        (WM_USER+1)
-#define RB_INSERTBAND32W        (WM_USER+10)
+#define RB_INSERTBANDA        (WM_USER+1)
+#define RB_INSERTBANDW        (WM_USER+10)
 #define RB_INSERTBAND           WINELIB_NAME_AW(RB_INSERTBAND)
 #define RB_DELETEBAND           (WM_USER+2)
 #define RB_GETBARINFO           (WM_USER+3)
 #define RB_SETBARINFO           (WM_USER+4)
-#define RB_GETBANDINFO32        (WM_USER+5)   /* just for compatibility */
-#define RB_SETBANDINFO32A       (WM_USER+6)
-#define RB_SETBANDINFO32W       (WM_USER+11)
+#define RB_GETBANDINFO        (WM_USER+5)   /* just for compatibility */
+#define RB_SETBANDINFOA       (WM_USER+6)
+#define RB_SETBANDINFOW       (WM_USER+11)
 #define RB_SETBANDINFO          WINELIB_NAME_AW(RB_SETBANDINFO)
 #define RB_SETPARENT            (WM_USER+7)
 #define RB_HITTEST              (WM_USER+8)
@@ -1310,9 +1310,9 @@ typedef struct tagNMTTDISPINFOW
 #define RB_ENDDRAG              (WM_USER+25)
 #define RB_DRAGMOVE             (WM_USER+26)
 #define RB_GETBARHEIGHT         (WM_USER+27)
-#define RB_GETBANDINFO32W       (WM_USER+28)
-#define RB_GETBANDINFO32A       (WM_USER+29)
-#define RB_GETBANDINFO          WINELIB_NAME_AW(RB_GETBANDINFO)
+#define RB_GETBANDINFOW       (WM_USER+28)
+#define RB_GETBANDINFOA       (WM_USER+29)
+#define RB_GETBANDINFO16          WINELIB_NAME_AW(RB_GETBANDINFO16)
 #define RB_MINIMIZEBAND         (WM_USER+30)
 #define RB_MAXIMIZEBAND         (WM_USER+31)
 #define RB_GETBANDBORDERS       (WM_USER+34)
@@ -1340,111 +1340,111 @@ typedef struct tagNMTTDISPINFOW
 
 typedef struct tagREBARINFO
 {
-    UINT32     cbSize;
-    UINT32     fMask;
+    UINT     cbSize;
+    UINT     fMask;
     HIMAGELIST himl;
 } REBARINFO, *LPREBARINFO;
 
 typedef struct tagREBARBANDINFOA
 {
-    UINT32    cbSize;
-    UINT32    fMask;
-    UINT32    fStyle;
+    UINT    cbSize;
+    UINT    fMask;
+    UINT    fStyle;
     COLORREF  clrFore;
     COLORREF  clrBack;
     LPSTR     lpText;
-    UINT32    cch;
-    INT32     iImage;
-    HWND32    hwndChild;
-    UINT32    cxMinChild;
-    UINT32    cyMinChild;
-    UINT32    cx;
-    HBITMAP32 hbmBack;
-    UINT32    wID;
-    UINT32    cyChild;
-    UINT32    cyMaxChild;
-    UINT32    cyIntegral;
-    UINT32    cxIdeal;
+    UINT    cch;
+    INT     iImage;
+    HWND    hwndChild;
+    UINT    cxMinChild;
+    UINT    cyMinChild;
+    UINT    cx;
+    HBITMAP hbmBack;
+    UINT    wID;
+    UINT    cyChild;
+    UINT    cyMaxChild;
+    UINT    cyIntegral;
+    UINT    cxIdeal;
     LPARAM    lParam;
-    UINT32    cxHeader;
-} REBARBANDINFO32A, *LPREBARBANDINFO32A;
+    UINT    cxHeader;
+} REBARBANDINFOA, *LPREBARBANDINFOA;
 
-typedef REBARBANDINFO32A const *LPCREBARBANDINFO32A;
+typedef REBARBANDINFOA const *LPCREBARBANDINFOA;
 
 typedef struct tagREBARBANDINFOW
 {
-    UINT32    cbSize;
-    UINT32    fMask;
-    UINT32    fStyle;
+    UINT    cbSize;
+    UINT    fMask;
+    UINT    fStyle;
     COLORREF  clrFore;
     COLORREF  clrBack;
     LPWSTR    lpText;
-    UINT32    cch;
-    INT32     iImage;
-    HWND32    hwndChild;
-    UINT32    cxMinChild;
-    UINT32    cyMinChild;
-    UINT32    cx;
-    HBITMAP32 hbmBack;
-    UINT32    wID;
-    UINT32    cyChild;
-    UINT32    cyMaxChild;
-    UINT32    cyIntegral;
-    UINT32    cxIdeal;
+    UINT    cch;
+    INT     iImage;
+    HWND    hwndChild;
+    UINT    cxMinChild;
+    UINT    cyMinChild;
+    UINT    cx;
+    HBITMAP hbmBack;
+    UINT    wID;
+    UINT    cyChild;
+    UINT    cyMaxChild;
+    UINT    cyIntegral;
+    UINT    cxIdeal;
     LPARAM    lParam;
-    UINT32    cxHeader;
-} REBARBANDINFO32W, *LPREBARBANDINFO32W;
+    UINT    cxHeader;
+} REBARBANDINFOW, *LPREBARBANDINFOW;
 
-typedef REBARBANDINFO32W const *LPCREBARBANDINFO32W;
+typedef REBARBANDINFOW const *LPCREBARBANDINFOW;
 
 #define REBARBANDINFO    WINELIB_NAME_AW(REBARBANDINFO)
 #define LPREBARBANDINFO  WINELIB_NAME_AW(LPREBARBANDINFO)
 #define LPCREBARBANDINFO WINELIB_NAME_AW(LPCREBARBANDINFO)
 
-#define REBARBANDINFO_V3_SIZE32A CCSIZEOF_STRUCT(REBARBANDINFO32A, wID)
-#define REBARBANDINFO_V3_SIZE32W CCSIZEOF_STRUCT(REBARBANDINFO32W, wID)
+#define REBARBANDINFO_V3_SIZEA CCSIZEOF_STRUCT(REBARBANDINFOA, wID)
+#define REBARBANDINFO_V3_SIZEW CCSIZEOF_STRUCT(REBARBANDINFOW, wID)
 #define REBARBANDINFO_V3_SIZE WINELIB_NAME_AW(REBARBANDINFO_V3_SIZE)
 
 typedef struct tagNMREBARCHILDSIZE
 {
     NMHDR  hdr;
-    UINT32 uBand;
-    UINT32 wID;
-    RECT32 rcChild;
-    RECT32 rcBand;
+    UINT uBand;
+    UINT wID;
+    RECT rcChild;
+    RECT rcBand;
 } NMREBARCHILDSIZE, *LPNMREBARCHILDSIZE;
 
 typedef struct tagNMREBAR
 {
     NMHDR  hdr;
     DWORD  dwMask;
-    UINT32 uBand;
-    UINT32 fStyle;
-    UINT32 wID;
+    UINT uBand;
+    UINT fStyle;
+    UINT wID;
     LPARAM lParam;
 } NMREBAR, *LPNMREBAR;
 
 typedef struct tagNMRBAUTOSIZE
 {
     NMHDR hdr;
-    BOOL32 fChanged;
-    RECT32 rcTarget;
-    RECT32 rcActual;
+    BOOL fChanged;
+    RECT rcTarget;
+    RECT rcActual;
 } NMRBAUTOSIZE, *LPNMRBAUTOSIZE;
 
 typedef struct _RB_HITTESTINFO
 {
-    POINT32 pt;
-    UINT32  flags;
-    INT32   iBand;
+    POINT pt;
+    UINT  flags;
+    INT   iBand;
 } RBHITTESTINFO, *LPRBHITTESTINFO;
 
 
 /* Trackbar control */
 
 #define TRACKBAR_CLASS16        "msctls_trackbar"
-#define TRACKBAR_CLASS32A       "msctls_trackbar32"
-#define TRACKBAR_CLASS32W       L"msctls_trackbar32"
+#define TRACKBAR_CLASSA       "msctls_trackbar32"
+#define TRACKBAR_CLASSW       L"msctls_trackbar32"
 #define TRACKBAR_CLASS  WINELIB_NAME_AW(TRACKBAR_CLASS)
 
 #define TBS_AUTOTICKS           0x0001
@@ -1519,8 +1519,8 @@ typedef struct _RB_HITTESTINFO
 
 /* Pager control */
 
-#define WC_PAGESCROLLER32A      "SysPager"
-#define WC_PAGESCROLLER32W      L"SysPager"
+#define WC_PAGESCROLLERA      "SysPager"
+#define WC_PAGESCROLLERW      L"SysPager"
 #define WC_PAGESCROLLER  WINELIB_NAME_AW(WC_PAGESCROLLER)
 
 #define PGS_VERT                0x00000000
@@ -1575,34 +1575,34 @@ typedef struct
 {
     NMHDR hdr;
     WORD  fwKeys;
-    RECT32 rcParent;
-    INT32  iDir;
-    INT32  iXpos;
-    INT32  iYpos;
-    INT32  iScroll;
+    RECT rcParent;
+    INT  iDir;
+    INT  iXpos;
+    INT  iYpos;
+    INT  iScroll;
 } NMPGSCROLL, *LPNMPGSCROLL;
 
 typedef struct
 {
     NMHDR hdr;
     DWORD dwFlag;
-    INT32 iWidth;
-    INT32 iHeight;
+    INT iWidth;
+    INT iHeight;
 } NMPGCALCSIZE, *LPNMPGCALCSIZE;
 
 
 /* Treeview control */
 
-#define WC_TREEVIEW32A          "SysTreeView32"
-#define WC_TREEVIEW32W          L"SysTreeView32"
+#define WC_TREEVIEWA          "SysTreeView32"
+#define WC_TREEVIEWW          L"SysTreeView32"
 #define WC_TREEVIEW             WINELIB_NAME_AW(WC_TREEVIEW)
 
 #define TVSIL_NORMAL            0
 #define TVSIL_STATE             2
 
 #define TV_FIRST                0x1100
-#define TVM_INSERTITEM32A       (TV_FIRST+0)
-#define TVM_INSERTITEM32W       (TV_FIRST+50)
+#define TVM_INSERTITEMA       (TV_FIRST+0)
+#define TVM_INSERTITEMW       (TV_FIRST+50)
 #define TVM_INSERTITEM          WINELIB_NAME_AW(TVM_INSERTITEM)
 #define TVM_DELETEITEM          (TV_FIRST+1)
 #define TVM_EXPAND              (TV_FIRST+2)
@@ -1614,14 +1614,14 @@ typedef struct
 #define TVM_SETIMAGELIST        (TV_FIRST+9)
 #define TVM_GETNEXTITEM         (TV_FIRST+10)
 #define TVM_SELECTITEM          (TV_FIRST+11)
-#define TVM_GETITEM32A          (TV_FIRST+12)
-#define TVM_GETITEM32W          (TV_FIRST+62)
+#define TVM_GETITEMA          (TV_FIRST+12)
+#define TVM_GETITEMW          (TV_FIRST+62)
 #define TVM_GETITEM             WINELIB_NAME_AW(TVM_GETITEM)
-#define TVM_SETITEM32A          (TV_FIRST+13)
-#define TVM_SETITEM32W          (TV_FIRST+63)
+#define TVM_SETITEMA          (TV_FIRST+13)
+#define TVM_SETITEMW          (TV_FIRST+63)
 #define TVM_SETITEM             WINELIB_NAME_AW(TVM_SETITEM)
-#define TVM_EDITLABEL32A        (TV_FIRST+14)
-#define TVM_EDITLABEL32W        (TV_FIRST+65)
+#define TVM_EDITLABELA        (TV_FIRST+14)
+#define TVM_EDITLABELW        (TV_FIRST+65)
 #define TVM_EDITLABEL           WINELIB_NAME_AW(TVM_EDITLABEL)
 #define TVM_GETEDITCONTROL      (TV_FIRST+15)
 #define TVM_GETVISIBLECOUNT     (TV_FIRST+16)
@@ -1631,8 +1631,8 @@ typedef struct
 #define TVM_ENSUREVISIBLE       (TV_FIRST+20)
 #define TVM_SORTCHILDRENCB      (TV_FIRST+21)
 #define TVM_ENDEDITLABELNOW     (TV_FIRST+22)
-#define TVM_GETISEARCHSTRING32A (TV_FIRST+23)
-#define TVM_GETISEARCHSTRING32W (TV_FIRST+64)
+#define TVM_GETISEARCHSTRINGA (TV_FIRST+23)
+#define TVM_GETISEARCHSTRINGW (TV_FIRST+64)
 #define TVM_GETISEARCHSTRING    WINELIB_NAME_AW(TVM_GETISEARCHSTRING)
 #define TVM_SETTOOLTIPS         (TV_FIRST+24)
 #define TVM_GETTOOLTIPS         (TV_FIRST+25)
@@ -1771,128 +1771,128 @@ typedef struct
 typedef struct _TREEITEM *HTREEITEM;
 
 typedef struct {
-      UINT32 mask;
+      UINT mask;
       HTREEITEM hItem;
-      UINT32 state;
-      UINT32 stateMask;
+      UINT state;
+      UINT stateMask;
       LPSTR  pszText;
-      INT32  cchTextMax;
-      INT32  iImage;
-      INT32  iSelectedImage;
-      INT32  cChildren;
+      INT  cchTextMax;
+      INT  iImage;
+      INT  iSelectedImage;
+      INT  cChildren;
       LPARAM lParam;
-} TVITEM32A, *LPTVITEM32A;
+} TVITEMA, *LPTVITEMA;
 
 typedef struct {
-      UINT32 mask;
+      UINT mask;
       HTREEITEM hItem;
-      UINT32 state;
-      UINT32 stateMask;
+      UINT state;
+      UINT stateMask;
       LPWSTR pszText;
-      INT32 cchTextMax;
-      INT32 iImage;
-      INT32 iSelectedImage;
-      INT32 cChildren;
+      INT cchTextMax;
+      INT iImage;
+      INT iSelectedImage;
+      INT cChildren;
       LPARAM lParam;
-} TVITEM32W, *LPTVITEM32W;
+} TVITEMW, *LPTVITEMW;
 
 #define TVITEM     WINELIB_NAME_AW(TVITEM)
 #define LPTVITEM   WINELIB_NAME_AW(LPTVITEM)
 #define TV_ITEM	    TVITEM
 
 typedef struct {
-      UINT32 mask;
+      UINT mask;
       HTREEITEM hItem;
-      UINT32 state;
-      UINT32 stateMask;
+      UINT state;
+      UINT stateMask;
       LPSTR  pszText;
-      INT32  cchTextMax;
-      INT32  iImage;
-      INT32  iSelectedImage;
-      INT32  cChildren;
+      INT  cchTextMax;
+      INT  iImage;
+      INT  iSelectedImage;
+      INT  cChildren;
       LPARAM lParam;
-      INT32 iIntegral;
-} TVITEMEX32A, *LPTVITEMEX32A;
+      INT iIntegral;
+} TVITEMEXA, *LPTVITEMEXA;
 
 typedef struct {
-      UINT32 mask;
+      UINT mask;
       HTREEITEM hItem;
-      UINT32 state;
-      UINT32 stateMask;
+      UINT state;
+      UINT stateMask;
       LPWSTR pszText;
-      INT32 cchTextMax;
-      INT32 iImage;
-      INT32 iSelectedImage;
-      INT32 cChildren;
+      INT cchTextMax;
+      INT iImage;
+      INT iSelectedImage;
+      INT cChildren;
       LPARAM lParam;
-      INT32 iIntegral;
-} TVITEMEX32W, *LPTVITEMEX32W;
+      INT iIntegral;
+} TVITEMEXW, *LPTVITEMEXW;
 
 #define TVITEMEX   WINELIB_NAME_AW(TVITEMEX)
 #define LPTVITEMEX WINELIB_NAME_AW(LPTVITEMEX)
 
-typedef struct tagTVINSERTSTRUCT32A {
+typedef struct tagTVINSERTSTRUCTA {
         HTREEITEM hParent;
         HTREEITEM hInsertAfter;
         union {
-           TVITEMEX32A itemex;
-           TVITEM32A   item;
+           TVITEMEXA itemex;
+           TVITEMA   item;
         } DUMMYUNIONNAME;
-} TVINSERTSTRUCT32A, *LPTVINSERTSTRUCT32A;
+} TVINSERTSTRUCTA, *LPTVINSERTSTRUCTA;
 
-typedef struct tagTVINSERTSTRUCT32W {
+typedef struct tagTVINSERTSTRUCTW {
         HTREEITEM hParent;
         HTREEITEM hInsertAfter;
         union {
-           TVITEMEX32W itemex;
-           TVITEM32W   item;
+           TVITEMEXW itemex;
+           TVITEMW   item;
         } DUMMYUNIONNAME;
-} TVINSERTSTRUCT32W, *LPTVINSERTSTRUCT32W;
+} TVINSERTSTRUCTW, *LPTVINSERTSTRUCTW;
 
 #define TV_INSERTSTRUCT   WINELIB_NAME_AW(TVINSERTSTRUCT)
 #define LPTV_INSERTSTRUCT WINELIB_NAME_AW(LPTVINSERTSTRUCT)
 
-#define TVINSERTSTRUCT_V1_SIZE32A CCSIZEOF_STRUCT(TVINSERTSTRUCT32A, item)
-#define TVINSERTSTRUCT_V1_SIZE32W CCSIZEOF_STRUCT(TVINSERTSTRUCT32W, item)
+#define TVINSERTSTRUCT_V1_SIZEA CCSIZEOF_STRUCT(TVINSERTSTRUCTA, item)
+#define TVINSERTSTRUCT_V1_SIZEW CCSIZEOF_STRUCT(TVINSERTSTRUCTW, item)
 #define TVINSERTSTRUCT_V1_SIZE    WINELIB_NAME_AW(TVINSERTSTRUCT_V1_SIZE)
 
 
 
-typedef struct tagNMTREEVIEW32A {
+typedef struct tagNMTREEVIEWA {
 	NMHDR	hdr;
-	UINT32	action;
-	TVITEM32A	itemOld;
-	TVITEM32A	itemNew;
-	POINT32	ptDrag;
-} NMTREEVIEW32A, *LPNMTREEVIEW32A;
+	UINT	action;
+	TVITEMA	itemOld;
+	TVITEMA	itemNew;
+	POINT	ptDrag;
+} NMTREEVIEWA, *LPNMTREEVIEWA;
 
-typedef struct tagNMTREEVIEW32W {
+typedef struct tagNMTREEVIEWW {
 	NMHDR	hdr;
-	UINT32	action;
-	TVITEM32W	itemOld;
-	TVITEM32W	itemNew;
-	POINT32	ptDrag;
-} NMTREEVIEW32W, *LPNMTREEVIEW32W;
+	UINT	action;
+	TVITEMW	itemOld;
+	TVITEMW	itemNew;
+	POINT	ptDrag;
+} NMTREEVIEWW, *LPNMTREEVIEWW;
 
 #define NMTREEVIEW     WINELIB_NAME_AW(NMTREEVIEW)
 #define NM_TREEVIEW    WINELIB_NAME_AW(NMTREEVIEW)
 #define LPNMTREEVIEW   WINELIB_NAME_AW(LPNMTREEVIEW)
 
-typedef struct tagTVDISPINFO32A {
+typedef struct tagTVDISPINFOA {
 	NMHDR	hdr;
-	TVITEM32A	item;
-} NMTVDISPINFO32A, *LPNMTVDISPINFO32A;
+	TVITEMA	item;
+} NMTVDISPINFOA, *LPNMTVDISPINFOA;
 
-typedef struct tagTVDISPINFO32W {
+typedef struct tagTVDISPINFOW {
 	NMHDR	hdr;
-	TVITEM32W	item;
-} NMTVDISPINFO32W, *LPNMTVDISPINFO32W;
+	TVITEMW	item;
+} NMTVDISPINFOW, *LPNMTVDISPINFOW;
 
 #define NMTVDISPINFO            WINELIB_NAME_AW(NMTVDISPINFO)
 #define LPNMTVDISPINFO          WINELIB_NAME_AW(LPNMTVDISPINFO)
 #define TV_DISPINFO             NMTVDISPINFO
 
-typedef INT32 (CALLBACK *PFNTVCOMPARE)(LPARAM, LPARAM, LPARAM);
+typedef INT (CALLBACK *PFNTVCOMPARE)(LPARAM, LPARAM, LPARAM);
 
 typedef struct tagTVSORTCB
 {
@@ -1905,8 +1905,8 @@ typedef struct tagTVSORTCB
 #define LPTV_SORTCB LPTVSORTCB
 
 typedef struct tagTVHITTESTINFO {
-        POINT32 pt;
-        UINT32 flags;
+        POINT pt;
+        UINT flags;
         HTREEITEM hItem;
 } TVHITTESTINFO, *LPTVHITTESTINFO;
 
@@ -1924,67 +1924,66 @@ typedef struct tagNMTVCUSTOMDRAW
     NMCUSTOMDRAW nmcd;
     COLORREF     clrText;
     COLORREF     clrTextBk;
-    INT32 iLevel;                 /* IE>0x0400 */
+    INT iLevel;                 /* IE>0x0400 */
 } NMTVCUSTOMDRAW, *LPNMTVCUSTOMDRAW;
 
 /* Treeview tooltips */
 
-typedef struct tagNMTVGETINFOTIP32A
+typedef struct tagNMTVGETINFOTIPA
 {
     NMHDR hdr;
     LPSTR pszText;
-    INT32 cchTextMax;
+    INT cchTextMax;
     HTREEITEM hItem;
     LPARAM lParam;
-} NMTVGETINFOTIP32A, *LPNMTVGETINFOTIP32A;
+} NMTVGETINFOTIPA, *LPNMTVGETINFOTIPA;
 
-typedef struct tagNMTVGETINFOTIP32W
+typedef struct tagNMTVGETINFOTIPW
 {
     NMHDR hdr;
     LPWSTR pszText;
-    INT32 cchTextMax;
+    INT cchTextMax;
     HTREEITEM hItem;
     LPARAM lParam;
-} NMTVGETINFOTIP32W, *LPNMTVGETINFOTIP32W;
+} NMTVGETINFOTIPW, *LPNMTVGETINFOTIPW;
 
 
-#define NMTVGETINFOTIP          WINELIB_NAME(NMTVGETINFOTIP)
 
 
 
 
 
-#define TreeView_InsertItem32A(hwnd, phdi) \
-  (INT32)SendMessage32A((hwnd), TVM_INSERTITEM32A, 0, \
-                            (LPARAM)(LPTVINSERTSTRUCT32A)(phdi))
+#define TreeView_InsertItemA(hwnd, phdi) \
+  (INT)SendMessageA((hwnd), TVM_INSERTITEMA, 0, \
+                            (LPARAM)(LPTVINSERTSTRUCTA)(phdi))
 #define TreeView_DeleteItem(hwnd, hItem) \
-  (BOOL32)SendMessage32A((hwnd), TVM_DELETEITEM, 0, (LPARAM)(HTREEITEM)(hItem))
+  (BOOL)SendMessageA((hwnd), TVM_DELETEITEM, 0, (LPARAM)(HTREEITEM)(hItem))
 #define TreeView_DeleteAllItems(hwnd) \
-  (BOOL32)SendMessage32A((hwnd), TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT)
+  (BOOL)SendMessageA((hwnd), TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT)
 #define TreeView_Expand(hwnd, hitem, code) \
- (BOOL32)SendMessage32A((hwnd), TVM_EXPAND, (WPARAM)code, \
+ (BOOL)SendMessageA((hwnd), TVM_EXPAND, (WPARAM)code, \
 	(LPARAM)(HTREEITEM)(hitem))
 
 #define TreeView_GetItemRect(hwnd, hitem, prc, code) \
- (*(HTREEITEM *)prc = (hitem), (BOOL)SendMessage32A((hwnd), \
-			TVM_GETITEMRECT, (WPARAM32)(code), (LPARAM)(RECT *)(prc)))
+ (*(HTREEITEM *)prc = (hitem), (BOOL)SendMessageA((hwnd), \
+			TVM_GETITEMRECT, (WPARAM)(code), (LPARAM)(RECT *)(prc)))
 
 #define TreeView_GetCount(hwnd) \
-    (UINT32)SendMessage32A((hwnd), TVM_GETCOUNT, 0, 0)
+    (UINT)SendMessageA((hwnd), TVM_GETCOUNT, 0, 0)
 #define TreeView_GetIndent(hwnd) \
-    (UINT32)SendMessage32A((hwnd), TVM_GETINDENT, 0, 0)
+    (UINT)SendMessageA((hwnd), TVM_GETINDENT, 0, 0)
 #define TreeView_SetIndent(hwnd, indent) \
-    (BOOL32)SendMessage32A((hwnd), TVM_SETINDENT, (WPARAM)indent, 0)
+    (BOOL)SendMessageA((hwnd), TVM_SETINDENT, (WPARAM)indent, 0)
 
 #define TreeView_GetImageList(hwnd, iImage) \
-    (HIMAGELIST)SendMessage32A((hwnd), TVM_GETIMAGELIST, iImage, 0)
+    (HIMAGELIST)SendMessageA((hwnd), TVM_GETIMAGELIST, iImage, 0)
 
 #define TreeView_SetImageList(hwnd, himl, iImage) \
-    (HIMAGELIST)SendMessage32A((hwnd), TVM_SETIMAGELIST, iImage, \
- (LPARAM)(UINT32)(HIMAGELIST)(himl))
+    (HIMAGELIST)SendMessageA((hwnd), TVM_SETIMAGELIST, iImage, \
+ (LPARAM)(UINT)(HIMAGELIST)(himl))
 
 #define TreeView_GetNextItem(hwnd, hitem, code) \
-    (HTREEITEM)SendMessage32A((hwnd), TVM_GETNEXTITEM, (WPARAM)code,\
+    (HTREEITEM)SendMessageA((hwnd), TVM_GETNEXTITEM, (WPARAM)code,\
 (LPARAM)(HTREEITEM) (hitem))
 
 #define TreeView_GetChild(hwnd, hitem) \
@@ -2014,8 +2013,8 @@ typedef struct tagNMTVGETINFOTIP32W
 
 
 #define TreeView_Select(hwnd, hitem, code) \
- (UINT32)SendMessage32A((hwnd), TVM_SELECTITEM, (WPARAM32)code, \
-(LPARAM)(UINT32)(hitem))
+ (UINT)SendMessageA((hwnd), TVM_SELECTITEM, (WPARAM)code, \
+(LPARAM)(UINT)(hitem))
 
 
 #define TreeView_SelectItem(hwnd, hitem) \
@@ -2027,75 +2026,75 @@ typedef struct tagNMTVGETINFOTIP32W
 		TreeView_Select(hwnd, hitem, TVGN_FIRSTVISIBLE)
 */
 
-#define TreeView_GetItem32A(hwnd, pitem) \
- (BOOL32)SendMessage32A((hwnd), TVM_GETITEM32A, 0, (LPARAM) (TVITEM32A *)(pitem))
+#define TreeView_GetItemA(hwnd, pitem) \
+ (BOOL)SendMessageA((hwnd), TVM_GETITEMA, 0, (LPARAM) (TVITEMA *)(pitem))
 
-#define TreeView_SetItem32A(hwnd, pitem) \
- (BOOL32)SendMessage32A((hwnd), TVM_SETITEM32A, 0, (LPARAM)(const TVITEM32A *)(pitem)) 
+#define TreeView_SetItemA(hwnd, pitem) \
+ (BOOL)SendMessageA((hwnd), TVM_SETITEMA, 0, (LPARAM)(const TVITEMA *)(pitem)) 
 
 #define TreeView_EditLabel(hwnd, hitem) \
-    (HWND)SendMessage32A((hwnd), TVM_EDITLABEL, 0, (LPARAM)(HTREEITEM)(hitem))
+    (HWND)SendMessageA((hwnd), TVM_EDITLABEL, 0, (LPARAM)(HTREEITEM)(hitem))
 
 
 #define TreeView_GetEditControl(hwnd) \
-    (HWND)SendMessage32A((hwnd), TVM_GETEDITCONTROL, 0, 0)
+    (HWND)SendMessageA((hwnd), TVM_GETEDITCONTROL, 0, 0)
 
 #define TreeView_GetVisibleCount(hwnd) \
-    (UINT32)SendMessage32A((hwnd), TVM_GETVISIBLECOUNT, 0, 0)
+    (UINT)SendMessageA((hwnd), TVM_GETVISIBLECOUNT, 0, 0)
 
 #define TreeView_HitTest(hwnd, lpht) \
-    (HTREEITEM)SendMessage32A((hwnd), TVM_HITTEST, 0,\
+    (HTREEITEM)SendMessageA((hwnd), TVM_HITTEST, 0,\
 (LPARAM)(LPTVHITTESTINFO)(lpht))
 
 #define TreeView_CreateDragImage(hwnd, hitem) \
-    (HIMAGELIST)SendMessage32A((hwnd), TVM_CREATEDRAGIMAGE, 0,\
+    (HIMAGELIST)SendMessageA((hwnd), TVM_CREATEDRAGIMAGE, 0,\
 (LPARAM)(HTREEITEM)(hitem))
 
 #define TreeView_SortChildren(hwnd, hitem, recurse) \
-    (BOOL32)SendMessage32A((hwnd), TVM_SORTCHILDREN, (WPARAM32)recurse,\
+    (BOOL)SendMessageA((hwnd), TVM_SORTCHILDREN, (WPARAM)recurse,\
 (LPARAM)(HTREEITEM)(hitem))
 
 #define TreeView_EnsureVisible(hwnd, hitem) \
-    (BOOL32)SendMessage32A((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT32)(hitem))
+    (BOOL)SendMessageA((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem))
 
 #define TreeView_SortChildrenCB(hwnd, psort, recurse) \
-    (BOOL32)SendMessage32A((hwnd), TVM_SORTCHILDRENCB, (WPARAM32)recurse, \
+    (BOOL)SendMessageA((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \
     (LPARAM)(LPTV_SORTCB)(psort))
 
 #define TreeView_EndEditLabelNow(hwnd, fCancel) \
-    (BOOL32)SendMessage32A((hwnd), TVM_ENDEDITLABELNOW, (WPARAM32)fCancel, 0)
+    (BOOL)SendMessageA((hwnd), TVM_ENDEDITLABELNOW, (WPARAM)fCancel, 0)
 
 #define TreeView_GetISearchString(hwndTV, lpsz) \
-    (BOOL32)SendMessage32A((hwndTV), TVM_GETISEARCHSTRING, 0, \
+    (BOOL)SendMessageA((hwndTV), TVM_GETISEARCHSTRING, 0, \
 							(LPARAM)(LPTSTR)lpsz)
 
 #define TreeView_SetItemHeight(hwnd,  iHeight) \
-    (INT32)SendMessage32A((hwnd), TVM_SETITEMHEIGHT, (WPARAM32)iHeight, 0)
+    (INT)SendMessageA((hwnd), TVM_SETITEMHEIGHT, (WPARAM)iHeight, 0)
 #define TreeView_GetItemHeight(hwnd) \
-    (INT32)SendMessage32A((hwnd), TVM_GETITEMHEIGHT, 0, 0)
+    (INT)SendMessageA((hwnd), TVM_GETITEMHEIGHT, 0, 0)
 
 #define TreeView_SetBkColor(hwnd, clr) \
-    (COLORREF)SendMessage32A((hwnd), TVM_SETBKCOLOR, 0, (LPARAM)clr)
+    (COLORREF)SendMessageA((hwnd), TVM_SETBKCOLOR, 0, (LPARAM)clr)
 
 #define TreeView_SetTextColor(hwnd, clr) \
-    (COLORREF)SendMessage32A((hwnd), TVM_SETTEXTCOLOR, 0, (LPARAM)clr)
+    (COLORREF)SendMessageA((hwnd), TVM_SETTEXTCOLOR, 0, (LPARAM)clr)
 
 #define TreeView_GetBkColor(hwnd) \
-    (COLORREF)SendMessage32A((hwnd), TVM_GETBKCOLOR, 0, 0)
+    (COLORREF)SendMessageA((hwnd), TVM_GETBKCOLOR, 0, 0)
 
 #define TreeView_GetTextColor(hwnd) \
-    (COLORREF)SendMessage32A((hwnd), TVM_GETTEXTCOLOR, 0, 0)
+    (COLORREF)SendMessageA((hwnd), TVM_GETTEXTCOLOR, 0, 0)
 
 #define TreeView_SetScrollTime(hwnd, uTime) \
-    (UINT32)SendMessage32A((hwnd), TVM_SETSCROLLTIME, uTime, 0)
+    (UINT)SendMessageA((hwnd), TVM_SETSCROLLTIME, uTime, 0)
 
 #define TreeView_GetScrollTime(hwnd) \
-    (UINT32)SendMessage32A((hwnd), TVM_GETSCROLLTIME, 0, 0)
+    (UINT)SendMessageA((hwnd), TVM_GETSCROLLTIME, 0, 0)
 
 #define TreeView_SetInsertMarkColor(hwnd, clr) \
-    (COLORREF)SendMessage32A((hwnd), TVM_SETINSERTMARKCOLOR, 0, (LPARAM)clr)
+    (COLORREF)SendMessageA((hwnd), TVM_SETINSERTMARKCOLOR, 0, (LPARAM)clr)
 #define TreeView_GetInsertMarkColor(hwnd) \
-    (COLORREF)SendMessage32A((hwnd), TVM_GETINSERTMARKCOLOR, 0, 0)
+    (COLORREF)SendMessageA((hwnd), TVM_GETINSERTMARKCOLOR, 0, 0)
 
 
 
@@ -2107,8 +2106,8 @@ typedef struct tagNMTVGETINFOTIP32W
 
 /* Listview control */
 
-#define WC_LISTVIEW32A          "SysListView32"
-#define WC_LISTVIEW32W          L"SysListView32"
+#define WC_LISTVIEWA          "SysListView32"
+#define WC_LISTVIEWW          L"SysListView32"
 #define WC_LISTVIEW  WINELIB_NAME_AW(WC_LISTVIEW)
 
 #define LVS_ICON                0x0000
@@ -2214,46 +2213,46 @@ typedef struct tagNMTVGETINFOTIP32W
 #define LVM_GETIMAGELIST        (LVM_FIRST+2)
 #define LVM_SETIMAGELIST        (LVM_FIRST+3)
 #define LVM_GETITEMCOUNT        (LVM_FIRST+4)
-#define LVM_GETITEM32A          (LVM_FIRST+5)
-#define LVM_GETITEM32W          (LVM_FIRST+75)
+#define LVM_GETITEMA          (LVM_FIRST+5)
+#define LVM_GETITEMW          (LVM_FIRST+75)
 #define LVM_GETITEM             WINELIB_NAME_AW(LVM_GETITEM)
-#define LVM_SETITEM32A          (LVM_FIRST+6)
-#define LVM_SETITEM32W          (LVM_FIRST+76)
+#define LVM_SETITEMA          (LVM_FIRST+6)
+#define LVM_SETITEMW          (LVM_FIRST+76)
 #define LVM_SETITEM             WINELIB_NAME_AW(LVM_SETITEM)
-#define LVM_INSERTITEM32A       (LVM_FIRST+7)
-#define LVM_INSERTITEM32W       (LVM_FIRST+77)
+#define LVM_INSERTITEMA       (LVM_FIRST+7)
+#define LVM_INSERTITEMW       (LVM_FIRST+77)
 #define LVM_INSERTITEM          WINELIB_NAME_AW(LVM_INSERTITEM)
 #define LVM_DELETEITEM          (LVM_FIRST+8)
 #define LVM_DELETEALLITEMS      (LVM_FIRST+9)
 #define LVM_GETCALLBACKMASK     (LVM_FIRST+10)
 #define LVM_SETCALLBACKMASK     (LVM_FIRST+11)
 #define LVM_GETNEXTITEM         (LVM_FIRST+12)
-#define LVM_FINDITEM32A         (LVM_FIRST+13)
-#define LVM_FINDITEM32W         (LVM_FIRST+83)
+#define LVM_FINDITEMA         (LVM_FIRST+13)
+#define LVM_FINDITEMW         (LVM_FIRST+83)
 #define LVM_FINDITEM            WINELIB_NAME_AW(LVM_FINDITEM)
 #define LVM_GETITEMRECT         (LVM_FIRST+14)
-#define LVM_SETITEMPOSITION     (LVM_FIRST+15)
+#define LVM_SETITEMPOSITION16     (LVM_FIRST+15)
 #define LVM_GETITEMPOSITION     (LVM_FIRST+16)
-#define LVM_GETSTRINGWIDTH32A   (LVM_FIRST+17)
-#define LVM_GETSTRINGWIDTH32W   (LVM_FIRST+87)
+#define LVM_GETSTRINGWIDTHA   (LVM_FIRST+17)
+#define LVM_GETSTRINGWIDTHW   (LVM_FIRST+87)
 #define LVM_GETSTRINGWIDTH      WINELIB_NAME_AW(LVM_GETSTRINGWIDTH)
 #define LVM_HITTEST             (LVM_FIRST+18)
 #define LVM_ENSUREVISIBLE       (LVM_FIRST+19)
 #define LVM_SCROLL              (LVM_FIRST+20)
 #define LVM_REDRAWITEMS         (LVM_FIRST+21)
 #define LVM_ARRANGE             (LVM_FIRST+22)
-#define LVM_EDITLABEL32A        (LVM_FIRST+23)
-#define LVM_EDITLABEL32W        (LVM_FIRST+118)
+#define LVM_EDITLABELA        (LVM_FIRST+23)
+#define LVM_EDITLABELW        (LVM_FIRST+118)
 #define LVM_EDITLABEL           WINELIB_NAME_AW(LVM_EDITLABEL)
 #define LVM_GETEDITCONTROL      (LVM_FIRST+24)
-#define LVM_GETCOLUMN32A        (LVM_FIRST+25)
-#define LVM_GETCOLUMN32W        (LVM_FIRST+95)
+#define LVM_GETCOLUMNA        (LVM_FIRST+25)
+#define LVM_GETCOLUMNW        (LVM_FIRST+95)
 #define LVM_GETCOLUMN           WINELIB_NAME_AW(LVM_GETCOLUMN)
-#define LVM_SETCOLUMN32A        (LVM_FIRST+26)
-#define LVM_SETCOLUMN32W        (LVM_FIRST+96)
+#define LVM_SETCOLUMNA        (LVM_FIRST+26)
+#define LVM_SETCOLUMNW        (LVM_FIRST+96)
 #define LVM_SETCOLUMN           WINELIB_NAME_AW(LVM_SETCOLUMN)
-#define LVM_INSERTCOLUMN32A     (LVM_FIRST+27)
-#define LVM_INSERTCOLUMN32W     (LVM_FIRST+97)
+#define LVM_INSERTCOLUMNA     (LVM_FIRST+27)
+#define LVM_INSERTCOLUMNW     (LVM_FIRST+97)
 #define LVM_INSERTCOLUMN        WINELIB_NAME_AW(LVM_INSERTCOLUMN)
 #define LVM_DELETECOLUMN        (LVM_FIRST+28)
 #define LVM_GETCOLUMNWIDTH      (LVM_FIRST+29)
@@ -2272,19 +2271,19 @@ typedef struct tagNMTVGETINFOTIP32W
 #define LVM_UPDATE              (LVM_FIRST+42)
 #define LVM_SETITEMSTATE        (LVM_FIRST+43)
 #define LVM_GETITEMSTATE        (LVM_FIRST+44)
-#define LVM_GETITEMTEXT32A      (LVM_FIRST+45)
-#define LVM_GETITEMTEXT32W      (LVM_FIRST+115)
+#define LVM_GETITEMTEXTA      (LVM_FIRST+45)
+#define LVM_GETITEMTEXTW      (LVM_FIRST+115)
 #define LVM_GETITEMTEXT         WINELIB_NAME_AW(LVM_GETITEMTEXT)
-#define LVM_SETITEMTEXT32A      (LVM_FIRST+46)
-#define LVM_SETITEMTEXT32W      (LVM_FIRST+116)
+#define LVM_SETITEMTEXTA      (LVM_FIRST+46)
+#define LVM_SETITEMTEXTW      (LVM_FIRST+116)
 #define LVM_SETITEMTEXT         WINELIB_NAME_AW(LVM_SETITEMTEXT)
 #define LVM_SETITEMCOUNT        (LVM_FIRST+47)
 #define LVM_SORTITEMS           (LVM_FIRST+48)
-#define LVM_SETITEMPOSITION32   (LVM_FIRST+49)
+#define LVM_SETITEMPOSITION   (LVM_FIRST+49)
 #define LVM_GETSELECTEDCOUNT    (LVM_FIRST+50)
 #define LVM_GETITEMSPACING      (LVM_FIRST+51)
-#define LVM_GETISEARCHSTRING32A (LVM_FIRST+52)
-#define LVM_GETISEARCHSTRING32W (LVM_FIRST+117)
+#define LVM_GETISEARCHSTRINGA (LVM_FIRST+52)
+#define LVM_GETISEARCHSTRINGW (LVM_FIRST+117)
 #define LVM_GETISEARCHSTRING    WINELIB_NAME_AW(LVM_GETISEARCHSTRING)
 #define LVM_SETICONSPACING      (LVM_FIRST+53)
 #define LVM_SETEXTENDEDLISTVIEWSTYLE (LVM_FIRST+54)
@@ -2301,11 +2300,11 @@ typedef struct tagNMTVGETINFOTIP32W
 #define LVM_SETWORKAREAS        (LVM_FIRST+65)
 #define LVM_GETSELECTIONMARK    (LVM_FIRST+66)
 #define LVM_SETSELECTIONMARK    (LVM_FIRST+67)
-#define LVM_SETBKIMAGE32A       (LVM_FIRST+68)
-#define LVM_SETBKIMAGE32W       (LVM_FIRST+138)
+#define LVM_SETBKIMAGEA       (LVM_FIRST+68)
+#define LVM_SETBKIMAGEW       (LVM_FIRST+138)
 #define LVM_SETBKIMAGE          WINELIB_NAME_AW(LVM_SETBKIMAGE)
-#define LVM_GETBKIMAGE32A       (LVM_FIRST+69)
-#define LVM_GETBKIMAGE32W       (LVM_FIRST+139)
+#define LVM_GETBKIMAGEA       (LVM_FIRST+69)
+#define LVM_GETBKIMAGEW       (LVM_FIRST+139)
 #define LVM_GETBKIMAGE          WINELIB_NAME_AW(LVM_GETBKIMAGE)
 #define LVM_GETWORKAREAS        (LVM_FIRST+70)
 #define LVM_SETHOVERTIME        (LVM_FIRST+71)
@@ -2322,27 +2321,27 @@ typedef struct tagNMTVGETINFOTIP32W
 #define LVN_INSERTITEM          (LVN_FIRST-2)
 #define LVN_DELETEITEM          (LVN_FIRST-3)
 #define LVN_DELETEALLITEMS      (LVN_FIRST-4)
-#define LVN_BEGINLABELEDIT32A   (LVN_FIRST-5)
-#define LVN_BEGINLABELEDIT32W   (LVN_FIRST-75)
+#define LVN_BEGINLABELEDITA   (LVN_FIRST-5)
+#define LVN_BEGINLABELEDITW   (LVN_FIRST-75)
 #define LVN_BEGINLABELEDIT WINELIB_NAME_AW(LVN_BEGINLABELEDIT)
-#define LVN_ENDLABELEDIT32A     (LVN_FIRST-6)
-#define LVN_ENDLABELEDIT32W     (LVN_FIRST-76)
+#define LVN_ENDLABELEDITA     (LVN_FIRST-6)
+#define LVN_ENDLABELEDITW     (LVN_FIRST-76)
 #define LVN_ENDLABELEDIT WINELIB_NAME_AW(LVN_ENDLABELEDIT)
 #define LVN_COLUMNCLICK         (LVN_FIRST-8)
 #define LVN_BEGINDRAG           (LVN_FIRST-9)
 #define LVN_BEGINRDRAG          (LVN_FIRST-11)
 #define LVN_ODCACHEHINT         (LVN_FIRST-13)
-#define LVN_ODFINDITEM32A       (LVN_FIRST-52)
-#define LVN_ODFINDITEM32W       (LVN_FIRST-79)
+#define LVN_ODFINDITEMA       (LVN_FIRST-52)
+#define LVN_ODFINDITEMW       (LVN_FIRST-79)
 #define LVN_ODFINDITEM WINELIB_NAME_AW(LVN_ODFINDITEM)
 #define LVN_ITEMACTIVATE        (LVN_FIRST-14)
 #define LVN_ODSTATECHANGED      (LVN_FIRST-15)
 #define LVN_HOTTRACK            (LVN_FIRST-21)
-#define LVN_GETDISPINFO32A      (LVN_FIRST-50)
-#define LVN_GETDISPINFO32W      (LVN_FIRST-77)
+#define LVN_GETDISPINFOA      (LVN_FIRST-50)
+#define LVN_GETDISPINFOW      (LVN_FIRST-77)
 #define LVN_GETDISPINFO WINELIB_NAME_AW(LVN_GETDISPINFO)
-#define LVN_SETDISPINFO32A      (LVN_FIRST-51)
-#define LVN_SETDISPINFO32W      (LVN_FIRST-78)
+#define LVN_SETDISPINFOA      (LVN_FIRST-51)
+#define LVN_SETDISPINFOW      (LVN_FIRST-78)
 #define LVN_SETDISPINFO WINELIB_NAME_AW(LVN_SETDISPINFO)
 
 #define LVA_ALIGNLEFT           0x0000
@@ -2352,70 +2351,70 @@ typedef struct tagNMTVGETINFOTIP32W
 
 typedef struct tagLVITEMA
 {
-    UINT32 mask;
-    INT32  iItem;
-    INT32  iSubItem;
-    UINT32 state;
-    UINT32 stateMask;
+    UINT mask;
+    INT  iItem;
+    INT  iSubItem;
+    UINT state;
+    UINT stateMask;
     LPSTR  pszText;
-    INT32  cchTextMax;
-    INT32  iImage;
+    INT  cchTextMax;
+    INT  iImage;
     LPARAM lParam;
-    INT32  iIndent;	/* (_WIN32_IE >= 0x0300) */
-} LVITEM32A, *LPLVITEM32A;
+    INT  iIndent;	/* (_WIN32_IE >= 0x0300) */
+} LVITEMA, *LPLVITEMA;
 
 typedef struct tagLVITEMW
 {
-    UINT32 mask;
-    INT32  iItem;
-    INT32  iSubItem;
-    UINT32 state;
-    UINT32 stateMask;
+    UINT mask;
+    INT  iItem;
+    INT  iSubItem;
+    UINT state;
+    UINT stateMask;
     LPWSTR pszText;
-    INT32  cchTextMax;
-    INT32  iImage;
+    INT  cchTextMax;
+    INT  iImage;
     LPARAM lParam;
-    INT32  iIndent;	/* (_WIN32_IE >= 0x0300) */
-} LVITEM32W, *LPLVITEM32W;
+    INT  iIndent;	/* (_WIN32_IE >= 0x0300) */
+} LVITEMW, *LPLVITEMW;
 
 #define LVITEM   WINELIB_NAME_AW(LVITEM)
 #define LPLVITEM WINELIB_NAME_AW(LPLVITEM)
 
-#define LVITEM_V1_SIZE32A CCSIZEOF_STRUCT(LVITEM32A, lParam)
-#define LVITEM_V1_SIZE32W CCSIZEOF_STRUCT(LVITEM32W, lParam)
+#define LVITEM_V1_SIZEA CCSIZEOF_STRUCT(LVITEMA, lParam)
+#define LVITEM_V1_SIZEW CCSIZEOF_STRUCT(LVITEMW, lParam)
 #define LVITEM_V1_SIZE WINELIB_NAME_AW(LVITEM_V1_SIZE)
 
 #define LV_ITEM LVITEM
 
 typedef struct tagLVCOLUMNA
 {
-    UINT32 mask;
-    INT32  fmt;
-    INT32  cx;
+    UINT mask;
+    INT  fmt;
+    INT  cx;
     LPSTR  pszText;
-    INT32  cchTextMax;
-    INT32  iSubItem;
-    INT32  iImage;  /* (_WIN32_IE >= 0x0300) */
-    INT32  iOrder;  /* (_WIN32_IE >= 0x0300) */
-} LVCOLUMN32A, *LPLVCOLUMN32A;
+    INT  cchTextMax;
+    INT  iSubItem;
+    INT  iImage;  /* (_WIN32_IE >= 0x0300) */
+    INT  iOrder;  /* (_WIN32_IE >= 0x0300) */
+} LVCOLUMNA, *LPLVCOLUMNA;
 
 typedef struct tagLVCOLUMNW
 {
-    UINT32 mask;
-    INT32  fmt;
-    INT32  cx;
+    UINT mask;
+    INT  fmt;
+    INT  cx;
     LPWSTR pszText;
-    INT32  cchTextMax;
-    INT32  iSubItem;
-    INT32  iImage;	/* (_WIN32_IE >= 0x0300) */
-    INT32  iOrder;	/* (_WIN32_IE >= 0x0300) */
-} LVCOLUMN32W, *LPLVCOLUMN32W;
+    INT  cchTextMax;
+    INT  iSubItem;
+    INT  iImage;	/* (_WIN32_IE >= 0x0300) */
+    INT  iOrder;	/* (_WIN32_IE >= 0x0300) */
+} LVCOLUMNW, *LPLVCOLUMNW;
 
 #define LVCOLUMN   WINELIB_NAME_AW(LVCOLUMN)
 #define LPLVCOLUMN WINELIB_NAME_AW(LPLVCOLUMN)
 
-#define LVCOLUMN_V1_SIZE32A CCSIZEOF_STRUCT(LVCOLUMN32A, iSubItem)
-#define LVCOLUMN_V1_SIZE32W CCSIZEOF_STRUCT(LVCOLUMN32W, iSubItem)
+#define LVCOLUMN_V1_SIZEA CCSIZEOF_STRUCT(LVCOLUMNA, iSubItem)
+#define LVCOLUMN_V1_SIZEW CCSIZEOF_STRUCT(LVCOLUMNW, iSubItem)
 #define LVCOLUMN_V1_SIZE WINELIB_NAME_AW(LVCOLUMN_V1_SIZE)
 
 #define LV_COLUMN       LVCOLUMN
@@ -2424,12 +2423,12 @@ typedef struct tagLVCOLUMNW
 typedef struct tagNMLISTVIEW
 {
     NMHDR   hdr;
-    INT32   iItem;
-    INT32   iSubItem;
-    UINT32  uNewState;
-    UINT32  uOldState;
-    UINT32  uChanged;
-    POINT32 ptAction;
+    INT   iItem;
+    INT   iSubItem;
+    UINT  uNewState;
+    UINT  uOldState;
+    UINT  uChanged;
+    POINT ptAction;
     LPARAM  lParam;
 } NMLISTVIEW, *LPNMLISTVIEW;
 
@@ -2440,14 +2439,14 @@ typedef struct tagNMLISTVIEW
 typedef struct tagLVDISPINFO
 {
     NMHDR     hdr;
-    LVITEM32A item;
-} NMLVDISPINFO32A, *LPNMLVDISPINFO32A;
+    LVITEMA item;
+} NMLVDISPINFOA, *LPNMLVDISPINFOA;
 
 typedef struct tagLVDISPINFOW
 {
     NMHDR     hdr;
-    LVITEM32W item;
-} NMLVDISPINFO32W, *LPNMLVDISPINFO32W;
+    LVITEMW item;
+} NMLVDISPINFOW, *LPNMLVDISPINFOW;
 
 #define NMLVDISPINFO   WINELIB_NAME_AW(NMLVDISPINFO)
 #define LPNMLVDISPINFO WINELIB_NAME_AW(LPNMLVDISPINFO)
@@ -2460,17 +2459,17 @@ typedef struct tagLVKEYDOWN
 {
   NMHDR hdr;
   WORD  wVKey;
-  UINT32 flags;
+  UINT flags;
 } NMLVKEYDOWN, *LPNMLVKEYDOWN;
 
 #define LV_KEYDOWN     NMLVKEYDOWN
 
 typedef struct tagLVHITTESTINFO
 {
-    POINT32 pt;
-    UINT32  flags;
-    INT32   iItem;
-    INT32   iSubItem;
+    POINT pt;
+    UINT  flags;
+    INT   iItem;
+    INT   iSubItem;
 } LVHITTESTINFO, *LPLVHITTESTINFO;
 
 #define LV_HITTESTINFO LVHITTESTINFO
@@ -2479,65 +2478,65 @@ typedef struct tagLVHITTESTINFO
 
 typedef struct tagLVFINDINFO
 {
-	UINT32 flags;
+	UINT flags;
 	LPCSTR psz;
 	LPARAM lParam;
-	POINT32 pt;
-	UINT32 vkDirection;
+	POINT pt;
+	UINT vkDirection;
 } LVFINDINFO, *LPLVFINDINFO;
 
 #define LV_FINDINFO LVFINDINFO
 
 typedef struct tagTCHITTESTINFO
 {
-	POINT32 pt;
-	UINT32 flags;
+	POINT pt;
+	UINT flags;
 } TCHITTESTINFO, *LPTCHITTESTINFO;
 
 #define TC_HITTESTINFO TCHITTESTINFO
 
-typedef INT32 (CALLBACK *PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
+typedef INT (CALLBACK *PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
 
 #define ListView_SetBkColor(hwnd,clrBk) \
-    (BOOL32)SendMessage32A((hwnd),LVM_SETBKCOLOR,0,(LPARAM)(COLORREF)(clrBk))
+    (BOOL)SendMessageA((hwnd),LVM_SETBKCOLOR,0,(LPARAM)(COLORREF)(clrBk))
 #define ListView_GetImageList(hwnd,iImageList) \
-    (HIMAGELIST)SendMessage32A((hwnd),LVM_GETIMAGELIST,(WPARAM)(INT32)(iImageList),0L)
+    (HIMAGELIST)SendMessageA((hwnd),LVM_GETIMAGELIST,(WPARAM)(INT)(iImageList),0L)
 #define ListView_SetImageList(hwnd,himl,iImageList) \
-    (HIMAGELIST)(UINT32)SendMessage32A((hwnd),LVM_SETIMAGELIST,(WPARAM32)(iImageList),(LPARAM)(UINT32)(HIMAGELIST)(himl))
+    (HIMAGELIST)(UINT)SendMessageA((hwnd),LVM_SETIMAGELIST,(WPARAM)(iImageList),(LPARAM)(UINT)(HIMAGELIST)(himl))
 #define ListView_GetItemCount(hwnd) \
-    (INT32)SendMessage32A((hwnd),LVM_GETITEMCOUNT,0,0L)
-#define ListView_GetItem32A(hwnd,pitem) \
-    (BOOL32)SendMessage32A((hwnd),LVM_GETITEM32A,0,(LPARAM)(LVITEM32A *)(pitem))
-#define ListView_GetItem32W(hwnd,pitem) \
-    (BOOL32)SendMessage32W((hwnd),LVM_GETITEM32W,0,(LPARAM)(LVITEM32W *)(pitem))
+    (INT)SendMessageA((hwnd),LVM_GETITEMCOUNT,0,0L)
+#define ListView_GetItemA(hwnd,pitem) \
+    (BOOL)SendMessageA((hwnd),LVM_GETITEMA,0,(LPARAM)(LVITEMA *)(pitem))
+#define ListView_GetItemW(hwnd,pitem) \
+    (BOOL)SendMessageW((hwnd),LVM_GETITEMW,0,(LPARAM)(LVITEMW *)(pitem))
 #define ListView_GetItem WINELIB_NAME_AW(ListView_GetItem)
 #define ListView_HitTest(hwnd,pinfo) \
-    (INT32)SendMessage32A((hwnd),LVMHITTEST,0,(LPARAM)(LPLVHITTESTINFO)(pinfo))
-#define ListView_InsertItem32A(hwnd,pitem) \
-    (INT32)SendMessage32A((hwnd),LVM_INSERTITEM32A,0,(LPARAM)(const LVITEM32A *)(pitem))
-#define ListView_InsertItem32W(hwnd,pitem) \
-    (INT32)SendMessage32W((hwnd),LVM_INSERTITEM32W,0,(LPARAM)(const LVITEM32W *)(pitem))
+    (INT)SendMessageA((hwnd),LVMHITTEST,0,(LPARAM)(LPLVHITTESTINFO)(pinfo))
+#define ListView_InsertItemA(hwnd,pitem) \
+    (INT)SendMessageA((hwnd),LVM_INSERTITEMA,0,(LPARAM)(const LVITEMA *)(pitem))
+#define ListView_InsertItemW(hwnd,pitem) \
+    (INT)SendMessageW((hwnd),LVM_INSERTITEMW,0,(LPARAM)(const LVITEMW *)(pitem))
 #define ListView_InsertItem WINELIB_NAME_AW(ListView_InsertItem)
 #define ListView_DeleteAllItems(hwnd) \
-    (BOOL32)SendMessage32A((hwnd),LVM_DELETEALLITEMS,0,0L)
-#define ListView_InsertColumn32A(hwnd,iCol,pcol) \
-    (INT32)SendMessage32A((hwnd),LVM_INSERTCOLUMN32A,(WPARAM32)(INT32)(iCol),(LPARAM)(const LVCOLUMN32A *)(pcol))
-#define ListView_InsertColumn32W(hwnd,iCol,pcol) \
-    (INT32)SendMessage32W((hwnd),LVM_INSERTCOLUMN32W,(WPARAM32)(INT32)(iCol),(LPARAM)(const LVCOLUMN32W *)(pcol))
+    (BOOL)SendMessageA((hwnd),LVM_DELETEALLITEMS,0,0L)
+#define ListView_InsertColumnA(hwnd,iCol,pcol) \
+    (INT)SendMessageA((hwnd),LVM_INSERTCOLUMNA,(WPARAM)(INT)(iCol),(LPARAM)(const LVCOLUMNA *)(pcol))
+#define ListView_InsertColumnW(hwnd,iCol,pcol) \
+    (INT)SendMessageW((hwnd),LVM_INSERTCOLUMNW,(WPARAM)(INT)(iCol),(LPARAM)(const LVCOLUMNW *)(pcol))
 #define ListView_InsertColumn WINELIB_NAME_AW(ListView_InsertColumn)
 #define ListView_SortItems(hwndLV,_pfnCompare,_lPrm) \
-    (BOOL32)SendMessage32A((hwndLV),LVM_SORTITEMS,(WPARAM32)(LPARAM)_lPrm,(LPARAM)(PFNLVCOMPARE)_pfnCompare)
+    (BOOL)SendMessageA((hwndLV),LVM_SORTITEMS,(WPARAM)(LPARAM)_lPrm,(LPARAM)(PFNLVCOMPARE)_pfnCompare)
 #define ListView_SetItemPosition(hwndLV, i, x, y) \
-    (BOOL32)SendMessage32A((hwndLV),LVM_SETITEMPOSITION,(WPARAM32)(INT32)(i),MAKELPARAM((x),(y)))
+    (BOOL)SendMessageA((hwndLV),LVM_SETITEMPOSITION16,(WPARAM)(INT)(i),MAKELPARAM((x),(y)))
 #define ListView_GetSelectedCount(hwndLV) \
-    (UINT32)SendMessage32A((hwndLV),LVM_GETSELECTEDCOUNT,0,0L)
+    (UINT)SendMessageA((hwndLV),LVM_GETSELECTEDCOUNT,0,0L)
 
 
 /* Tab Control */
 
 #define WC_TABCONTROL16		 "SysTabControl"
-#define WC_TABCONTROL32A	 "SysTabControl32"
-#define WC_TABCONTROL32W	L"SysTabControl32"
+#define WC_TABCONTROLA	 "SysTabControl32"
+#define WC_TABCONTROLW	L"SysTabControl32"
 
 #define WC_TABCONTROL		WINELIB_NAME_AW(WC_TABCONTROL)
 
@@ -2572,13 +2571,13 @@ typedef INT32 (CALLBACK *PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
 #define TCM_SETIMAGELIST        (TCM_FIRST + 3)
 #define TCM_GETITEMCOUNT	(TCM_FIRST + 4)
 #define TCM_GETITEM				WINELIB_NAME_AW(TCM_GETITEM)
-#define TCM_GETITEM32A			(TCM_FIRST + 5)
-#define TCM_GETITEM32W			(TCM_FIRST + 60)
-#define TCM_SETITEM32A			(TCM_FIRST + 6)
-#define TCM_SETITEM32W			(TCM_FIRST + 61)
+#define TCM_GETITEMA			(TCM_FIRST + 5)
+#define TCM_GETITEMW			(TCM_FIRST + 60)
+#define TCM_SETITEMA			(TCM_FIRST + 6)
+#define TCM_SETITEMW			(TCM_FIRST + 61)
 #define TCM_SETITEM				WINELIB_NAME_AW(TCM_SETITEM)
-#define TCM_INSERTITEM32A		(TCM_FIRST + 7)
-#define TCM_INSERTITEM32W		(TCM_FIRST + 62)
+#define TCM_INSERTITEMA		(TCM_FIRST + 7)
+#define TCM_INSERTITEMW		(TCM_FIRST + 62)
 #define TCM_INSERTITEM			WINELIB_NAME_AW(TCM_INSERTITEM)
 #define TCM_DELETEITEM          (TCM_FIRST + 8)
 #define TCM_DELETEALLITEMS      (TCM_FIRST + 9)
@@ -2623,26 +2622,26 @@ typedef INT32 (CALLBACK *PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
 #define TCHT_ONITEM       (TCHT_ONITEMICON | TCHT_ONITEMLABEL)
 
 
-typedef struct tagTCITEM32A {
-    UINT32 mask;
-    UINT32 dwState;
-    UINT32 dwStateMask;
+typedef struct tagTCITEMA {
+    UINT mask;
+    UINT dwState;
+    UINT dwStateMask;
     LPSTR  pszText;
-    INT32  cchTextMax;
-    INT32  iImage;
+    INT  cchTextMax;
+    INT  iImage;
     LPARAM lParam;
-} TCITEM32A, *LPTCITEM32A;
+} TCITEMA, *LPTCITEMA;
 
-typedef struct tagTCITEM32W
+typedef struct tagTCITEMW
 {
-    UINT32 mask;
+    UINT mask;
     DWORD  dwState;
     DWORD  dwStateMask;
     LPWSTR pszText;
-    INT32  cchTextMax;
-    INT32  iImage;
+    INT  cchTextMax;
+    INT  iImage;
     LPARAM lParam;
-} TCITEM32W, *LPTCITEM32W;
+} TCITEMW, *LPTCITEMW;
 
 #define TCITEM   WINELIB_NAME_AW(TCITEM)
 #define LPTCITEM WINELIB_NAME_AW(LPTCITEM)
@@ -2658,20 +2657,20 @@ typedef struct tagTCITEM32W
 
 /* ComboBoxEx control */
 
-#define WC_COMBOBOXEX32A        "ComboBoxEx32"
-#define WC_COMBOBOXEX32W        L"ComboBoxEx32"
+#define WC_COMBOBOXEXA        "ComboBoxEx32"
+#define WC_COMBOBOXEXW        L"ComboBoxEx32"
 #define WC_COMBOBOXEX           WINELIB_NAME_AW(WC_COMBOBOXEX)
 
-#define CBEM_INSERTITEM32A      (WM_USER+1)
-#define CBEM_INSERTITEM32W      (WM_USER+11)
+#define CBEM_INSERTITEMA      (WM_USER+1)
+#define CBEM_INSERTITEMW      (WM_USER+11)
 #define CBEM_INSERTITEM         WINELIB_NAME_AW(CBEM_INSERTITEM)
 #define CBEM_SETIMAGELIST       (WM_USER+2)
 #define CBEM_GETIMAGELIST       (WM_USER+3)
-#define CBEM_GETITEM32A         (WM_USER+4)
-#define CBEM_GETITEM32W         (WM_USER+13)
+#define CBEM_GETITEMA         (WM_USER+4)
+#define CBEM_GETITEMW         (WM_USER+13)
 #define CBEM_GETITEM            WINELIB_NAME_AW(CBEM_GETITEM)
-#define CBEM_SETITEM32A         (WM_USER+5)
-#define CBEM_SETITEM32W         (WM_USER+12)
+#define CBEM_SETITEMA         (WM_USER+5)
+#define CBEM_SETITEMW         (WM_USER+12)
 #define CBEM_SETITEM            WINELIB_NAME_AW(CBEM_SETITEM)
 #define CBEM_GETCOMBOCONTROL    (WM_USER+6)
 #define CBEM_GETEDITCONTROL     (WM_USER+7)
@@ -2690,8 +2689,8 @@ typedef struct tagTCITEM32W
 /* Hotkey control */
 
 #define HOTKEY_CLASS16          "msctls_hotkey"
-#define HOTKEY_CLASS32A         "msctls_hotkey32"
-#define HOTKEY_CLASS32W         L"msctls_hotkey32"
+#define HOTKEY_CLASSA         "msctls_hotkey32"
+#define HOTKEY_CLASSW         L"msctls_hotkey32"
 #define HOTKEY_CLASS            WINELIB_NAME_AW(HOTKEY_CLASS)
 
 #define HOTKEYF_SHIFT           0x01
@@ -2715,8 +2714,8 @@ typedef struct tagTCITEM32W
 
 /* animate control */
 
-#define ANIMATE_CLASS32A        "SysAnimate32"
-#define ANIMATE_CLASS32W        L"SysAnimate32"
+#define ANIMATE_CLASSA        "SysAnimate32"
+#define ANIMATE_CLASSW        L"SysAnimate32"
 #define ANIMATE_CLASS           WINELIB_NAME_AW(ANIMATE_CLASS)
 
 #define ACS_CENTER              0x0001
@@ -2724,8 +2723,8 @@ typedef struct tagTCITEM32W
 #define ACS_AUTOPLAY            0x0004
 #define ACS_TIMER               0x0008  /* no threads, just timers */
 
-#define ACM_OPEN32A             (WM_USER+100)
-#define ACM_OPEN32W             (WM_USER+103)
+#define ACM_OPENA             (WM_USER+100)
+#define ACM_OPENW             (WM_USER+103)
 #define ACM_OPEN                WINELIB_NAME_AW(ACM_OPEN)
 #define ACM_PLAY                (WM_USER+101)
 #define ACM_STOP                (WM_USER+102)
@@ -2733,37 +2732,37 @@ typedef struct tagTCITEM32W
 #define ACN_START               1
 #define ACN_STOP                2
 
-#define Animate_Create32A(hwndP,id,dwStyle,hInstance) \
-    CreateWindow32A(ANIMATE_CLASS32A,NULL,dwStyle,0,0,0,0,hwndP,(HMENU32)(id),hInstance,NULL)
-#define Animate_Create32W(hwndP,id,dwStyle,hInstance) \
-    CreateWindow32W(ANIMATE_CLASS32W,NULL,dwStyle,0,0,0,0,hwndP,(HMENU32)(id),hInstance,NULL)
+#define Animate_CreateA(hwndP,id,dwStyle,hInstance) \
+    CreateWindowA(ANIMATE_CLASSA,NULL,dwStyle,0,0,0,0,hwndP,(HMENU)(id),hInstance,NULL)
+#define Animate_CreateW(hwndP,id,dwStyle,hInstance) \
+    CreateWindowW(ANIMATE_CLASSW,NULL,dwStyle,0,0,0,0,hwndP,(HMENU)(id),hInstance,NULL)
 #define Animate_Create WINELIB_NAME_AW(Animate_Create)
-#define Animate_Open32A(hwnd,szName) \
-    (BOOL32)SendMessage32A(hwnd,ACM_OPEN32A,0,(LPARAM)(LPSTR)(szName))
-#define Animate_Open32W(hwnd,szName) \
-    (BOOL32)SendMessage32W(hwnd,ACM_OPEN32W,0,(LPARAM)(LPWSTR)(szName))
+#define Animate_OpenA(hwnd,szName) \
+    (BOOL)SendMessageA(hwnd,ACM_OPENA,0,(LPARAM)(LPSTR)(szName))
+#define Animate_OpenW(hwnd,szName) \
+    (BOOL)SendMessageW(hwnd,ACM_OPENW,0,(LPARAM)(LPWSTR)(szName))
 #define Animate_Open WINELIB_NAME_AW(Animate_Open)
-#define Animate_OpenEx32A(hwnd,hInst,szName) \
-    (BOOL32)SendMessage32A(hwnd,ACM_OPEN32A,(WPARAM32)hInst,(LPARAM)(LPSTR)(szName))
-#define Animate_OpenEx32W(hwnd,hInst,szName) \
-    (BOOL32)SendMessage32W(hwnd,ACM_OPEN32W,(WPARAM32)hInst,(LPARAM)(LPWSTR)(szName))
+#define Animate_OpenExA(hwnd,hInst,szName) \
+    (BOOL)SendMessageA(hwnd,ACM_OPENA,(WPARAM)hInst,(LPARAM)(LPSTR)(szName))
+#define Animate_OpenExW(hwnd,hInst,szName) \
+    (BOOL)SendMessageW(hwnd,ACM_OPENW,(WPARAM)hInst,(LPARAM)(LPWSTR)(szName))
 #define Animate_OpenEx WINELIB_NAME_AW(Animate_OpenEx)
 #define Animate_Play(hwnd,from,to,rep) \
-    (BOOL32)SendMessage32A(hwnd,ACM_PLAY,(WPARAM32)(UINT32)(rep),(LPARAM)MAKELONG(from,to))
+    (BOOL)SendMessageA(hwnd,ACM_PLAY,(WPARAM)(UINT)(rep),(LPARAM)MAKELONG(from,to))
 #define Animate_Stop(hwnd) \
-    (BOOL32)SendMessage32A(hwnd,ACM_STOP,0,0)
+    (BOOL)SendMessageA(hwnd,ACM_STOP,0,0)
 #define Animate_Close(hwnd) \
-    (BOOL32)SendMessage32A(hwnd,ACM_OPEN32A,0,0)
+    (BOOL)SendMessageA(hwnd,ACM_OPENA,0,0)
 #define Animate_Seek(hwnd,frame) \
-    (BOOL32)SendMessage32A(hwnd,ACM_PLAY,1,(LPARAM)MAKELONG(frame,frame))
+    (BOOL)SendMessageA(hwnd,ACM_PLAY,1,(LPARAM)MAKELONG(frame,frame))
 
 
 /**************************************************************************
  * IP Address control
  */
 
-#define WC_IPADDRESS32A		"SysIPAddress32"
-#define WC_IPADDRESS32W		L"SysIPAddress32"
+#define WC_IPADDRESSA		"SysIPAddress32"
+#define WC_IPADDRESSW		L"SysIPAddress32"
 #define WC_IPADDRESS		WINELIB_NAME_AW(WC_IPADDRESS)
 
 #define IPM_CLEARADDRESS	(WM_USER+100)
@@ -2780,8 +2779,8 @@ typedef struct tagTCITEM32W
 typedef struct tagNMIPADDRESS
 {
     NMHDR hdr;
-    INT32 iField;
-    INT32 iValue;
+    INT iField;
+    INT iValue;
 } NMIPADDRESS, *LPNMIPADDRESS;
 
 #define MAKEIPRANGE(low,high) \
@@ -2799,8 +2798,8 @@ typedef struct tagNMIPADDRESS
  * Native Font control
  */
 
-#define WC_NATIVEFONTCTL32A	"NativeFontCtl"
-#define WC_NATIVEFONTCTL32W	L"NativeFontCtl"
+#define WC_NATIVEFONTCTLA	"NativeFontCtl"
+#define WC_NATIVEFONTCTLW	L"NativeFontCtl"
 #define WC_NATIVEFONTCTL	WINELIB_NAME_AW(WC_NATIVEFONTCTL)
 
 #define NFS_EDIT		0x0001
@@ -2814,8 +2813,8 @@ typedef struct tagNMIPADDRESS
  * Month calendar control
  */
 
-#define MONTHCAL_CLASS32A	"SysMonthCal32"
-#define MONTHCAL_CLASS32W	L"SysMonthCal32"
+#define MONTHCAL_CLASSA	"SysMonthCal32"
+#define MONTHCAL_CLASSW	L"SysMonthCal32"
 #define MONTHCAL_CLASS		WINELIB_NAME_AW(MONTHCAL_CLASS)
 
 
@@ -2823,8 +2822,8 @@ typedef struct tagNMIPADDRESS
  * Date and time picker control
  */
 
-#define DATETIMEPICK_CLASS32A	"SysDateTimePick32"
-#define DATETIMEPICK_CLASS32W	L"SysDateTimePick32"
+#define DATETIMEPICK_CLASSA	"SysDateTimePick32"
+#define DATETIMEPICK_CLASSW	L"SysDateTimePick32"
 #define DATETIMEPICK_CLASS	WINELIB_NAME_AW(DATETIMEPICK_CLASS)
 
 #define DTM_FIRST        0x1000
@@ -2833,8 +2832,8 @@ typedef struct tagNMIPADDRESS
 #define DTM_SETSYSTEMTIME	(DTM_FIRST+2)
 #define DTM_GETRANGE		(DTM_FIRST+3)
 #define DTM_SETRANGE		(DTM_FIRST+4)
-#define DTM_SETFORMAT32A	(DTM_FIRST+5)
-#define DTM_SETFORMAT32W	(DTM_FIRST + 50)
+#define DTM_SETFORMATA	(DTM_FIRST+5)
+#define DTM_SETFORMATW	(DTM_FIRST + 50)
 #define DTM_SETFORMAT		WINELIB_NAME_AW(DTM_SETFORMAT)
 #define DTM_SETMCCOLOR		(DTM_FIRST+6)
 #define DTM_GETMCCOLOR		(DTM_FIRST+7)
@@ -2864,14 +2863,14 @@ typedef struct tagNMIPADDRESS
 
 LPVOID WINAPI COMCTL32_Alloc (DWORD);
 LPVOID WINAPI COMCTL32_ReAlloc (LPVOID, DWORD);
-BOOL32 WINAPI COMCTL32_Free (LPVOID);
+BOOL WINAPI COMCTL32_Free (LPVOID);
 DWORD  WINAPI COMCTL32_GetSize (LPVOID);
 
 
-INT32  WINAPI Str_GetPtr32A (LPCSTR, LPSTR, INT32);
-BOOL32 WINAPI Str_SetPtr32A (LPSTR *, LPCSTR);
-INT32  WINAPI Str_GetPtr32W (LPCWSTR, LPWSTR, INT32);
-BOOL32 WINAPI Str_SetPtr32W (LPWSTR *, LPCWSTR);
+INT  WINAPI Str_GetPtrA (LPCSTR, LPSTR, INT);
+BOOL WINAPI Str_SetPtrA (LPSTR *, LPCSTR);
+INT  WINAPI Str_GetPtrW (LPCWSTR, LPWSTR, INT);
+BOOL WINAPI Str_SetPtrW (LPWSTR *, LPCWSTR);
 #define Str_GetPtr WINELIB_NAME_AW(Str_GetPtr)
 #define Str_SetPtr WINELIB_NAME_AW(Str_SetPtr)
 
@@ -2880,79 +2879,79 @@ BOOL32 WINAPI Str_SetPtr32W (LPWSTR *, LPCWSTR);
 
 typedef struct _DSA
 {
-    INT32  nItemCount;
+    INT  nItemCount;
     LPVOID pData;
-    INT32  nMaxCount;
-    INT32  nItemSize;
-    INT32  nGrow;
+    INT  nMaxCount;
+    INT  nItemSize;
+    INT  nGrow;
 } DSA, *HDSA;
 
-HDSA   WINAPI DSA_Create (INT32, INT32);
-BOOL32 WINAPI DSA_DeleteAllItems (const HDSA);
-INT32  WINAPI DSA_DeleteItem (const HDSA, INT32);
-BOOL32 WINAPI DSA_Destroy (const HDSA);
-BOOL32 WINAPI DSA_GetItem (const HDSA, INT32, LPVOID);
-LPVOID WINAPI DSA_GetItemPtr (const HDSA, INT32);
-INT32  WINAPI DSA_InsertItem (const HDSA, INT32, LPVOID);
-BOOL32 WINAPI DSA_SetItem (const HDSA, INT32, LPVOID);
+HDSA   WINAPI DSA_Create (INT, INT);
+BOOL WINAPI DSA_DeleteAllItems (const HDSA);
+INT  WINAPI DSA_DeleteItem (const HDSA, INT);
+BOOL WINAPI DSA_Destroy (const HDSA);
+BOOL WINAPI DSA_GetItem (const HDSA, INT, LPVOID);
+LPVOID WINAPI DSA_GetItemPtr (const HDSA, INT);
+INT  WINAPI DSA_InsertItem (const HDSA, INT, LPVOID);
+BOOL WINAPI DSA_SetItem (const HDSA, INT, LPVOID);
 
-typedef INT32 (CALLBACK *DSAENUMPROC)(LPVOID, DWORD);
+typedef INT (CALLBACK *DSAENUMPROC)(LPVOID, DWORD);
 VOID   WINAPI DSA_EnumCallback (const HDSA, DSAENUMPROC, LPARAM);
-BOOL32 WINAPI DSA_DestroyCallback (const HDSA, DSAENUMPROC, LPARAM);
+BOOL WINAPI DSA_DestroyCallback (const HDSA, DSAENUMPROC, LPARAM);
 
 
 /* Dynamic Pointer Array */
 
 typedef struct _DPA
 {
-    INT32    nItemCount;
+    INT    nItemCount;
     LPVOID   *ptrs; 
-    HANDLE32 hHeap;
-    INT32    nGrow;
-    INT32    nMaxCount;
+    HANDLE hHeap;
+    INT    nGrow;
+    INT    nMaxCount;
 } DPA, *HDPA;
 
-HDPA   WINAPI DPA_Create (INT32);
-HDPA   WINAPI DPA_CreateEx (INT32, HANDLE32);
-BOOL32 WINAPI DPA_Destroy (const HDPA);
+HDPA   WINAPI DPA_Create (INT);
+HDPA   WINAPI DPA_CreateEx (INT, HANDLE);
+BOOL WINAPI DPA_Destroy (const HDPA);
 HDPA   WINAPI DPA_Clone (const HDPA, const HDPA);
-LPVOID WINAPI DPA_GetPtr (const HDPA, INT32);
-INT32  WINAPI DPA_GetPtrIndex (const HDPA, LPVOID);
-BOOL32 WINAPI DPA_Grow (const HDPA, INT32);
-BOOL32 WINAPI DPA_SetPtr (const HDPA, INT32, LPVOID);
-INT32  WINAPI DPA_InsertPtr (const HDPA, INT32, LPVOID);
-LPVOID WINAPI DPA_DeletePtr (const HDPA, INT32);
-BOOL32 WINAPI DPA_DeleteAllPtrs (const HDPA);
+LPVOID WINAPI DPA_GetPtr (const HDPA, INT);
+INT  WINAPI DPA_GetPtrIndex (const HDPA, LPVOID);
+BOOL WINAPI DPA_Grow (const HDPA, INT);
+BOOL WINAPI DPA_SetPtr (const HDPA, INT, LPVOID);
+INT  WINAPI DPA_InsertPtr (const HDPA, INT, LPVOID);
+LPVOID WINAPI DPA_DeletePtr (const HDPA, INT);
+BOOL WINAPI DPA_DeleteAllPtrs (const HDPA);
 
-typedef INT32 (CALLBACK *PFNDPACOMPARE)(LPVOID, LPVOID, LPARAM);
-BOOL32 WINAPI DPA_Sort (const HDPA, PFNDPACOMPARE, LPARAM);
+typedef INT (CALLBACK *PFNDPACOMPARE)(LPVOID, LPVOID, LPARAM);
+BOOL WINAPI DPA_Sort (const HDPA, PFNDPACOMPARE, LPARAM);
 
 #define DPAS_SORTED             0x0001
 #define DPAS_INSERTBEFORE       0x0002
 #define DPAS_INSERTAFTER        0x0004
  
-INT32  WINAPI DPA_Search (const HDPA, LPVOID, INT32, PFNDPACOMPARE, LPARAM, UINT32);
+INT  WINAPI DPA_Search (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
 
 #define DPAM_SORT               0x0001
 
-BOOL32 WINAPI DPA_Merge (const HDPA, const HDPA, DWORD, PFNDPACOMPARE, LPVOID, LPARAM);
+BOOL WINAPI DPA_Merge (const HDPA, const HDPA, DWORD, PFNDPACOMPARE, LPVOID, LPARAM);
 
-typedef INT32 (CALLBACK *DPAENUMPROC)(LPVOID, DWORD);
+typedef INT (CALLBACK *DPAENUMPROC)(LPVOID, DWORD);
 VOID   WINAPI DPA_EnumCallback (const HDPA, DPAENUMPROC, LPARAM);
-BOOL32 WINAPI DPA_DestroyCallback (const HDPA, DPAENUMPROC, LPARAM);
+BOOL WINAPI DPA_DestroyCallback (const HDPA, DPAENUMPROC, LPARAM);
 
 
-#define DPA_GetPtrCount(hdpa)  (*(INT32*)(hdpa))
-#define DPA_GetPtrPtr(hdpa)    (*((LPVOID**)((BYTE*)(hdpa)+sizeof(INT32))))
+#define DPA_GetPtrCount(hdpa)  (*(INT*)(hdpa))
+#define DPA_GetPtrPtr(hdpa)    (*((LPVOID**)((BYTE*)(hdpa)+sizeof(INT))))
 #define DPA_FastGetPtr(hdpa,i) (DPA_GetPtrPtr(hdpa)[i])
 
 
 /* notification helper functions */
 
-LRESULT WINAPI COMCTL32_SendNotify (HWND32, HWND32, UINT32, LPNMHDR);
+LRESULT WINAPI COMCTL32_SendNotify (HWND, HWND, UINT, LPNMHDR);
 
 /* type and functionality of last parameter is still unknown */
-LRESULT WINAPI COMCTL32_SendNotifyEx (HWND32, HWND32, UINT32, LPNMHDR, DWORD);
+LRESULT WINAPI COMCTL32_SendNotifyEx (HWND, HWND, UINT, LPNMHDR, DWORD);
 
 #ifdef __cplusplus
 }
diff --git a/include/commdlg.h b/include/commdlg.h
index 34ce9e06368..1d0103a0b8f 100644
--- a/include/commdlg.h
+++ b/include/commdlg.h
@@ -38,7 +38,7 @@ extern "C" {
 
 /* WINE internal flags */
 #define OFN_UNICODE		     0x40000000	/*to differ between 32W/A hook*/
-#define OFN_WINE32		     0x80000000	/* comdlg32 */
+#define OFN_WINE		     0x80000000	/* comdlg32 */
 
 #define OFN_SHAREFALLTHROUGH     2
 #define OFN_SHARENOWARN          1
@@ -69,8 +69,8 @@ typedef struct {
 
 typedef struct {
 	DWORD		lStructSize;
-	HWND32		hwndOwner;
-	HINSTANCE32	hInstance;
+	HWND		hwndOwner;
+	HINSTANCE	hInstance;
 	LPCSTR		lpstrFilter;
 	LPSTR		lpstrCustomFilter;
 	DWORD		nMaxCustFilter;
@@ -86,14 +86,14 @@ typedef struct {
 	WORD		nFileExtension;
 	LPCSTR		lpstrDefExt;
 	LPARAM		lCustData;
-	WNDPROC32	lpfnHook;
+	WNDPROC	lpfnHook;
 	LPCSTR		lpTemplateName;
-} OPENFILENAME32A,*LPOPENFILENAME32A;
+} OPENFILENAMEA,*LPOPENFILENAMEA;
 
 typedef struct {
 	DWORD		lStructSize;
-	HWND32		hwndOwner;
-	HINSTANCE32	hInstance;
+	HWND		hwndOwner;
+	HINSTANCE	hInstance;
 	LPCWSTR		lpstrFilter;
 	LPWSTR		lpstrCustomFilter;
 	DWORD		nMaxCustFilter;
@@ -109,9 +109,9 @@ typedef struct {
 	WORD		nFileExtension;
 	LPCWSTR		lpstrDefExt;
 	LPARAM		lCustData;
-	WNDPROC32	lpfnHook;
+	WNDPROC	lpfnHook;
 	LPCWSTR		lpTemplateName;
-} OPENFILENAME32W,*LPOPENFILENAME32W;
+} OPENFILENAMEW,*LPOPENFILENAMEW;
 
 DECL_WINELIB_TYPE_AW(OPENFILENAME)
 DECL_WINELIB_TYPE_AW(LPOPENFILENAME)
@@ -119,21 +119,21 @@ DECL_WINELIB_TYPE_AW(LPOPENFILENAME)
 typedef struct
 {
 	NMHDR           hdr;
-	LPOPENFILENAME32A lpOFN;
+	LPOPENFILENAMEA lpOFN;
 	LPSTR           pszFile;
-} OFNOTIFY32A, *LPOFNOTIFY32A;
+} OFNOTIFYA, *LPOFNOTIFYA;
 
 typedef struct
 {
 	NMHDR           hdr;
-	LPOPENFILENAME32W lpOFN;
+	LPOPENFILENAMEW lpOFN;
 	LPWSTR          pszFile;
-} OFNOTIFY32W, *LPOFNOTIFY32W;
+} OFNOTIFYW, *LPOFNOTIFYW;
 
 DECL_WINELIB_TYPE_AW(OFNOTIFY)
 DECL_WINELIB_TYPE_AW(LPOFNOTIFY)
  
-typedef UINT32 (CALLBACK *LPCCHOOKPROC) (HWND32, UINT32, WPARAM32, LPARAM);
+typedef UINT (CALLBACK *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
 
 typedef struct {
 	DWORD		lStructSize;
@@ -150,29 +150,29 @@ typedef CHOOSECOLOR16 *LPCHOOSECOLOR16;
 
 typedef struct {
 	DWORD		lStructSize;
-	HWND32		hwndOwner;
-	HWND32		hInstance;
+	HWND		hwndOwner;
+	HWND		hInstance;
 	DWORD	        rgbResult;
 	LPDWORD         lpCustColors;
 	DWORD 		Flags;
 	DWORD		lCustData;
         LPCCHOOKPROC    lpfnHook;
 	LPCSTR 		lpTemplateName;
-} CHOOSECOLOR32A;
-typedef CHOOSECOLOR32A *LPCHOOSECOLOR32A;
+} CHOOSECOLORA;
+typedef CHOOSECOLORA *LPCHOOSECOLORA;
 
 typedef struct {
 	DWORD		lStructSize;
-	HWND32		hwndOwner;
-	HWND32		hInstance;
+	HWND		hwndOwner;
+	HWND		hInstance;
 	DWORD	        rgbResult;
 	LPDWORD         *lpCustColors;
 	DWORD 		Flags;
 	DWORD		lCustData;
         LPCCHOOKPROC    lpfnHook;
 	LPCWSTR 	lpTemplateName;
-} CHOOSECOLOR32W;
-typedef CHOOSECOLOR32W *LPCHOOSECOLOR32W;
+} CHOOSECOLORW;
+typedef CHOOSECOLORW *LPCHOOSECOLORW;
 
 DECL_WINELIB_TYPE_AW(CHOOSECOLOR)
 DECL_WINELIB_TYPE_AW(LPCHOOSECOLOR)
@@ -203,8 +203,8 @@ typedef struct {
 
 typedef struct {
 	DWORD		lStructSize;
-	HWND32		hwndOwner;
-	HINSTANCE32	hInstance;
+	HWND		hwndOwner;
+	HINSTANCE	hInstance;
 
 	DWORD		Flags;
 	LPSTR		lpstrFindWhat;
@@ -212,14 +212,14 @@ typedef struct {
 	WORD		wFindWhatLen;
 	WORD 		wReplaceWithLen;
 	LPARAM 		lCustData;
-        WNDPROC32       lpfnHook;
+        WNDPROC       lpfnHook;
 	LPCSTR 		lpTemplateName;
-	} FINDREPLACE32A, *LPFINDREPLACE32A;
+	} FINDREPLACEA, *LPFINDREPLACEA;
 
 typedef struct {
 	DWORD		lStructSize;
-	HWND32		hwndOwner;
-	HINSTANCE32	hInstance;
+	HWND		hwndOwner;
+	HINSTANCE	hInstance;
 
 	DWORD		Flags;
 	LPWSTR		lpstrFindWhat;
@@ -227,9 +227,9 @@ typedef struct {
 	WORD		wFindWhatLen;
 	WORD 		wReplaceWithLen;
 	LPARAM 		lCustData;
-        WNDPROC32       lpfnHook;
+        WNDPROC       lpfnHook;
 	LPCWSTR		lpTemplateName;
-	} FINDREPLACE32W, *LPFINDREPLACE32W;
+	} FINDREPLACEW, *LPFINDREPLACEW;
 	
 DECL_WINELIB_TYPE_AW(FINDREPLACE)
 DECL_WINELIB_TYPE_AW(LPFINDREPLACE)
@@ -282,43 +282,43 @@ typedef struct
 
 typedef struct
 {
-	UINT32  	lStructSize; 
-	HWND32 		hwndOwner; 
-	HDC32  		hDC; 
-	LPLOGFONT32A    lpLogFont; 
-	INT32		iPointSize; 
-	UINT32		Flags; 
+	UINT  	lStructSize; 
+	HWND 		hwndOwner; 
+	HDC  		hDC; 
+	LPLOGFONTA    lpLogFont; 
+	INT		iPointSize; 
+	UINT		Flags; 
 	COLORREF	rgbColors; 
 	LPARAM		lCustData; 
-	WNDPROC32 	lpfnHook; 
+	WNDPROC 	lpfnHook; 
 	LPCSTR		lpTemplateName; 
-	HINSTANCE32	hInstance; 
+	HINSTANCE	hInstance; 
 	LPSTR		lpszStyle; 
 	UINT16		nFontType; 
 	UINT16	___MISSING_ALIGNMENT__; 
-	INT32   	nSizeMin; 
-	INT32		nSizeMax; 
-} CHOOSEFONT32A, *LPCHOOSEFONT32A;
+	INT   	nSizeMin; 
+	INT		nSizeMax; 
+} CHOOSEFONTA, *LPCHOOSEFONTA;
 
 typedef struct
 {
-	UINT32  	lStructSize; 
-	HWND32 		hwndOwner; 
-	HDC32  		hDC; 
-	LPLOGFONT32W    lpLogFont; 
-	INT32		iPointSize; 
-	UINT32		Flags; 
+	UINT  	lStructSize; 
+	HWND 		hwndOwner; 
+	HDC  		hDC; 
+	LPLOGFONTW    lpLogFont; 
+	INT		iPointSize; 
+	UINT		Flags; 
 	COLORREF	rgbColors; 
 	LPARAM		lCustData; 
-	WNDPROC32 	lpfnHook; 
+	WNDPROC 	lpfnHook; 
 	LPCWSTR		lpTemplateName; 
-	HINSTANCE32	hInstance; 
+	HINSTANCE	hInstance; 
 	LPWSTR		lpszStyle; 
 	UINT16		nFontType; 
 	UINT16	___MISSING_ALIGNMENT__; 
-	INT32   	nSizeMin; 
-	INT32		nSizeMax; 
-} CHOOSEFONT32W, *LPCHOOSEFONT32W;
+	INT   	nSizeMin; 
+	INT		nSizeMax; 
+} CHOOSEFONTW, *LPCHOOSEFONTW;
 
 DECL_WINELIB_TYPE_AW(CHOOSEFONT)
 DECL_WINELIB_TYPE_AW(LPCHOOSEFONT)
@@ -423,54 +423,54 @@ typedef struct
     HGLOBAL16        hSetupTemplate;
 } PRINTDLG16, *LPPRINTDLG16;
 
-typedef UINT32 (CALLBACK *LPPRINTHOOKPROC) (HWND32, UINT32, WPARAM32, LPARAM);
-typedef UINT32 (CALLBACK *LPSETUPHOOKPROC) (HWND32, UINT32, WPARAM32, LPARAM);
+typedef UINT (CALLBACK *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef UINT (CALLBACK *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
 
 typedef struct tagPDA
 {
     DWORD            lStructSize;
-    HWND32           hwndOwner;
-    HGLOBAL32        hDevMode;
-    HGLOBAL32        hDevNames;
-    HDC32            hDC;
+    HWND           hwndOwner;
+    HGLOBAL        hDevMode;
+    HGLOBAL        hDevNames;
+    HDC            hDC;
     DWORD            Flags;
     WORD             nFromPage;
     WORD             nToPage;
     WORD             nMinPage;
     WORD             nMaxPage;
     WORD             nCopies;
-    HINSTANCE32      hInstance;
+    HINSTANCE      hInstance;
     LPARAM           lCustData;
     LPPRINTHOOKPROC  lpfnPrintHook;
     LPSETUPHOOKPROC  lpfnSetupHook;
     LPCSTR           lpPrintTemplateName;
     LPCSTR           lpSetupTemplateName;
-    HGLOBAL32        hPrintTemplate;
-    HGLOBAL32        hSetupTemplate;
-} PRINTDLG32A, *LPPRINTDLG32A;
+    HGLOBAL        hPrintTemplate;
+    HGLOBAL        hSetupTemplate;
+} PRINTDLGA, *LPPRINTDLGA;
 
 typedef struct tagPDW
 {
     DWORD            lStructSize;
-    HWND32           hwndOwner;
-    HGLOBAL32        hDevMode;
-    HGLOBAL32        hDevNames;
-    HDC32            hDC;
+    HWND           hwndOwner;
+    HGLOBAL        hDevMode;
+    HGLOBAL        hDevNames;
+    HDC            hDC;
     DWORD            Flags;
     WORD             nFromPage;
     WORD             nToPage;
     WORD             nMinPage;
     WORD             nMaxPage;
     WORD             nCopies;
-    HINSTANCE32      hInstance;
+    HINSTANCE      hInstance;
     LPARAM           lCustData;
     LPPRINTHOOKPROC  lpfnPrintHook;
     LPSETUPHOOKPROC  lpfnSetupHook;
     LPCWSTR          lpPrintTemplateName;
     LPCWSTR          lpSetupTemplateName;
-    HGLOBAL32        hPrintTemplate;
-    HGLOBAL32        hSetupTemplate;
-} PRINTDLG32W, *LPPRINTDLG32W;
+    HGLOBAL        hPrintTemplate;
+    HGLOBAL        hSetupTemplate;
+} PRINTDLGW, *LPPRINTDLGW;
 
 DECL_WINELIB_TYPE_AW(PRINTDLG)
 DECL_WINELIB_TYPE_AW(LPPRINTDLG)
@@ -558,44 +558,44 @@ typedef DEVNAMES * LPDEVNAMES;
 #define WM_PSD_ENVSTAMPRECT	(WM_USER+5)
 #define WM_PSD_YAFULLPAGERECT	(WM_USER+6)
 
-typedef UINT32 (CALLBACK* LPPAGEPAINTHOOK)( HWND32, UINT32, WPARAM32, LPARAM );
-typedef UINT32 (CALLBACK* LPPAGESETUPHOOK)( HWND32, UINT32, WPARAM32, LPARAM );
+typedef UINT (CALLBACK* LPPAGEPAINTHOOK)( HWND, UINT, WPARAM, LPARAM );
+typedef UINT (CALLBACK* LPPAGESETUPHOOK)( HWND, UINT, WPARAM, LPARAM );
 
-typedef struct tagPSD32A
+typedef struct tagPSDA
 {
 	DWORD		lStructSize;
-	HWND32		hwndOwner;
-	HGLOBAL32	hDevMode;
-	HGLOBAL32	hDevNames;
+	HWND		hwndOwner;
+	HGLOBAL	hDevMode;
+	HGLOBAL	hDevNames;
 	DWORD		Flags;
-	POINT32		ptPaperSize;
-	RECT32		rtMinMargin;
-	RECT32		rtMargin;
-	HINSTANCE32	hInstance;
+	POINT		ptPaperSize;
+	RECT		rtMinMargin;
+	RECT		rtMargin;
+	HINSTANCE	hInstance;
 	LPARAM		lCustData;
 	LPPAGESETUPHOOK	lpfnPageSetupHook;
 	LPPAGEPAINTHOOK	lpfnPagePaintHook;
 	LPCSTR		lpPageSetupTemplateName;
-	HGLOBAL32	hPageSetupTemplate;
-} PAGESETUPDLG32A,*LPPAGESETUPDLG32A;
+	HGLOBAL	hPageSetupTemplate;
+} PAGESETUPDLGA,*LPPAGESETUPDLGA;
 
-typedef struct tagPSD32W
+typedef struct tagPSDW
 {
 	DWORD		lStructSize;
-	HWND32		hwndOwner;
-	HGLOBAL32	hDevMode;
-	HGLOBAL32	hDevNames;
+	HWND		hwndOwner;
+	HGLOBAL	hDevMode;
+	HGLOBAL	hDevNames;
 	DWORD		Flags;
-	POINT32		ptPaperSize;
-	RECT32		rtMinMargin;
-	RECT32		rtMargin;
-	HINSTANCE32	hInstance;
+	POINT		ptPaperSize;
+	RECT		rtMinMargin;
+	RECT		rtMargin;
+	HINSTANCE	hInstance;
 	LPARAM		lCustData;
 	LPPAGESETUPHOOK	lpfnPageSetupHook;
 	LPPAGEPAINTHOOK	lpfnPagePaintHook;
 	LPCWSTR		lpPageSetupTemplateName;
-	HGLOBAL32	hPageSetupTemplate;
-} PAGESETUPDLG32W,*LPPAGESETUPDLG32W;
+	HGLOBAL	hPageSetupTemplate;
+} PAGESETUPDLGW,*LPPAGESETUPDLGW;
 DECL_WINELIB_TYPE_AW(PAGESETUPDLG)
 DECL_WINELIB_TYPE_AW(LPPAGESETUPDLG)
 
@@ -620,57 +620,57 @@ DECL_WINELIB_TYPE_AW(LPPAGESETUPDLG)
 #define PSD_DISABLEPAGEPAINTING           0x00080000
 
 BOOL16  WINAPI ChooseColor16(LPCHOOSECOLOR16 lpChCol);
-BOOL32  WINAPI ChooseColor32A(LPCHOOSECOLOR32A lpChCol);
-BOOL32  WINAPI ChooseColor32W(LPCHOOSECOLOR32W lpChCol);
+BOOL  WINAPI ChooseColorA(LPCHOOSECOLORA lpChCol);
+BOOL  WINAPI ChooseColorW(LPCHOOSECOLORW lpChCol);
 #define ChooseColor WINELIB_NAME_AW(ChooseColor)
 DWORD   WINAPI CommDlgExtendedError(void);
 HWND16  WINAPI FindText16( SEGPTR find);
-HWND32  WINAPI FindText32A(LPFINDREPLACE32A lpFind);
-HWND32  WINAPI FindText32W(LPFINDREPLACE32W lpFind);
+HWND  WINAPI FindTextA(LPFINDREPLACEA lpFind);
+HWND  WINAPI FindTextW(LPFINDREPLACEW lpFind);
 #define FindText WINELIB_NAME_AW(FindText)
 INT16   WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf);
-INT16   WINAPI GetFileTitle32A(LPCSTR lpFile, LPSTR lpTitle, UINT32 cbBuf);
-INT16   WINAPI GetFileTitle32W(LPCWSTR lpFile, LPWSTR lpTitle, UINT32 cbBuf);
+INT16   WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf);
+INT16   WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf);
 #define GetFileTitle WINELIB_NAME_AW(GetFileTitle)
 BOOL16  WINAPI GetOpenFileName16(SEGPTR ofn);
-BOOL32  WINAPI GetOpenFileName32A(LPOPENFILENAME32A ofn);
-BOOL32  WINAPI GetOpenFileName32W(LPOPENFILENAME32W ofn);
+BOOL  WINAPI GetOpenFileNameA(LPOPENFILENAMEA ofn);
+BOOL  WINAPI GetOpenFileNameW(LPOPENFILENAMEW ofn);
 #define GetOpenFileName WINELIB_NAME_AW(GetOpenFileName)
 BOOL16  WINAPI GetSaveFileName16(SEGPTR ofn);
-BOOL32  WINAPI GetSaveFileName32A(LPOPENFILENAME32A ofn);
-BOOL32  WINAPI GetSaveFileName32W(LPOPENFILENAME32W ofn);
+BOOL  WINAPI GetSaveFileNameA(LPOPENFILENAMEA ofn);
+BOOL  WINAPI GetSaveFileNameW(LPOPENFILENAMEW ofn);
 #define GetSaveFileName WINELIB_NAME_AW(GetSaveFileName)
-BOOL32 WINAPI PageSetupDlg32A( LPPAGESETUPDLG32A );
-BOOL32 WINAPI PageSetupDlg32W( LPPAGESETUPDLG32W );
+BOOL WINAPI PageSetupDlgA( LPPAGESETUPDLGA );
+BOOL WINAPI PageSetupDlgW( LPPAGESETUPDLGW );
 #define PageSetupDlg WINELIB_NAME_AW(PageSetupDlg)
 BOOL16  WINAPI PrintDlg16( SEGPTR print);
-BOOL32  WINAPI PrintDlg32A( LPPRINTDLG32A printdlg);
-BOOL32  WINAPI PrintDlg32W( LPPRINTDLG32W printdlg);
+BOOL  WINAPI PrintDlgA( LPPRINTDLGA printdlg);
+BOOL  WINAPI PrintDlgW( LPPRINTDLGW printdlg);
 #define PrintDlg WINELIB_NAME_AW(PrintDlg)
 HWND16  WINAPI ReplaceText16( SEGPTR find);
-HWND32  WINAPI ReplaceText32A( LPFINDREPLACE32A lpFind);
-HWND32  WINAPI ReplaceText32W( LPFINDREPLACE32W lpFind);
+HWND  WINAPI ReplaceTextA( LPFINDREPLACEA lpFind);
+HWND  WINAPI ReplaceTextW( LPFINDREPLACEW lpFind);
 #define ReplaceText WINELIB_NAME_AW(ReplaceText)
 BOOL16  WINAPI ChooseFont16(LPCHOOSEFONT16);
-BOOL32  WINAPI ChooseFont32A(LPCHOOSEFONT32A);
-BOOL32  WINAPI ChooseFont32W(LPCHOOSEFONT32W);
+BOOL  WINAPI ChooseFontA(LPCHOOSEFONTA);
+BOOL  WINAPI ChooseFontW(LPCHOOSEFONTW);
 #define ChooseFont WINELIB_NAME_AW(ChooseFont)
-LRESULT WINAPI FileOpenDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
-LRESULT WINAPI FileSaveDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
-LRESULT WINAPI ColorDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
+LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
+LRESULT WINAPI FileSaveDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
+LRESULT WINAPI ColorDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
 LRESULT WINAPI FindTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
-LRESULT WINAPI FindTextDlgProc32A(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam, LPARAM lParam);
-LRESULT WINAPI FindTextDlgProc32W(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam, LPARAM lParam);
+LRESULT WINAPI FindTextDlgProcA(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam);
+LRESULT WINAPI FindTextDlgProcW(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam);
 #define FindTextDlgProc WINELIB_NAME_AW(FindTextDlgProc)
 LRESULT WINAPI ReplaceTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
-LRESULT WINAPI ReplaceTextDlgProc32A(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam, LPARAM lParam);
-LRESULT WINAPI ReplaceTextDlgProc32W(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam, LPARAM lParam);
+LRESULT WINAPI ReplaceTextDlgProcA(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam);
+LRESULT WINAPI ReplaceTextDlgProcW(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam);
 #define ReplaceTextProc WINELIB_NAME_AW(ReplaceTextDlgProc)
-LRESULT WINAPI PrintDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
-LRESULT WINAPI PrintSetupDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
+LRESULT WINAPI PrintDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
+LRESULT WINAPI PrintSetupDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam);
 LRESULT WINAPI FormatCharDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
-LRESULT WINAPI FormatCharDlgProc32A(HWND32,UINT32,WPARAM32,LPARAM);
-LRESULT WINAPI FormatCharDlgProc32W(HWND32,UINT32,WPARAM32,LPARAM);
+LRESULT WINAPI FormatCharDlgProcA(HWND,UINT,WPARAM,LPARAM);
+LRESULT WINAPI FormatCharDlgProcW(HWND,UINT,WPARAM,LPARAM);
 #define FormatCharDlgProc WINELIB_NAME_AW(FormatCharDlgProc)
 #ifdef __cplusplus
 }
diff --git a/include/cursoricon.h b/include/cursoricon.h
index 470b887bd30..4702b580542 100644
--- a/include/cursoricon.h
+++ b/include/cursoricon.h
@@ -70,10 +70,10 @@ typedef struct
 #pragma pack(4)
 
 extern HCURSOR16 CURSORICON_IconToCursor( HICON16 hIcon,
-                                          BOOL32 bSemiTransparent );
+                                          BOOL bSemiTransparent );
 
-extern HGLOBAL32 CURSORICON_Load32( HINSTANCE32 hInstance, LPCWSTR name,
+extern HGLOBAL CURSORICON_Load( HINSTANCE hInstance, LPCWSTR name,
                                     int width, int height, int colors,
-                                    BOOL32 fCursor, UINT32 loadflags);
+                                    BOOL fCursor, UINT loadflags);
 				    
 #endif /* __WINE_CURSORICON_H */
diff --git a/include/d3d.h b/include/d3d.h
index 18306a6c94e..814e316cd56 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -504,7 +504,7 @@ typedef struct _D3DDeviceDesc {
 	D3DCOLORMODEL	dcmColorModel;
 	DWORD		dwDevCaps;
 	D3DTRANSFORMCAPS dtcTransformCaps;
-	BOOL32		bClipping;
+	BOOL		bClipping;
 	D3DLIGHTINGCAPS	dlcLightingCaps;
 	D3DPRIMCAPS	dpcLineCaps;
 	D3DPRIMCAPS	dpcTriCaps;
@@ -543,7 +543,7 @@ typedef HRESULT (CALLBACK* LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffs
 typedef struct {
     DWORD		dwSize;
     DWORD		dwFlags;
-    BOOL32		bHardware;
+    BOOL		bHardware;
     D3DCOLORMODEL	dcmColorModel;
     GUID		guid;
     DWORD		dwCaps;
@@ -1106,7 +1106,7 @@ typedef struct _D3DTEXTURELOAD {
 typedef struct _D3DBRANCH { 
   DWORD dwMask; 
   DWORD dwValue; 
-  BOOL32  bNegate; 
+  BOOL  bNegate; 
   DWORD dwOffset; 
 } D3DBRANCH, *LPD3DBRANCH; 
 
@@ -1344,9 +1344,9 @@ typedef struct IDirect3Viewport_VTable {
   STDMETHOD(TransformVertices) (THIS_ DWORD, LPD3DTRANSFORMDATA, DWORD, LPDWORD) PURE;
   STDMETHOD(LightElements) (THIS_ DWORD, LPD3DLIGHTDATA) PURE;
   STDMETHOD(SetBackground) (THIS_ D3DMATERIALHANDLE) PURE;
-  STDMETHOD(GetBackground) (THIS_ LPD3DMATERIALHANDLE, LPBOOL32) PURE;
+  STDMETHOD(GetBackground) (THIS_ LPD3DMATERIALHANDLE, LPBOOL) PURE;
   STDMETHOD(SetBackgroundDepth) (THIS_ LPDIRECTDRAWSURFACE) PURE;
-  STDMETHOD(GetBackgroundDepth) (THIS_ LPDIRECTDRAWSURFACE*, LPBOOL32) PURE;
+  STDMETHOD(GetBackgroundDepth) (THIS_ LPDIRECTDRAWSURFACE*, LPBOOL) PURE;
   STDMETHOD(Clear) (THIS_ DWORD, LPD3DRECT, DWORD) PURE;
   STDMETHOD(AddLight) (THIS_ LPDIRECT3DLIGHT) PURE;
   STDMETHOD(DeleteLight) (THIS_ LPDIRECT3DLIGHT) PURE;
@@ -1372,9 +1372,9 @@ typedef struct IDirect3Viewport2_VTable {
   STDMETHOD(TransformVertices) (THIS_ DWORD, LPD3DTRANSFORMDATA, DWORD, LPDWORD) PURE;
   STDMETHOD(LightElements) (THIS_ DWORD, LPD3DLIGHTDATA) PURE;
   STDMETHOD(SetBackground) (THIS_ D3DMATERIALHANDLE) PURE;
-  STDMETHOD(GetBackground) (THIS_ LPD3DMATERIALHANDLE, LPBOOL32) PURE;
+  STDMETHOD(GetBackground) (THIS_ LPD3DMATERIALHANDLE, LPBOOL) PURE;
   STDMETHOD(SetBackgroundDepth) (THIS_ LPDIRECTDRAWSURFACE) PURE;
-  STDMETHOD(GetBackgroundDepth) (THIS_ LPDIRECTDRAWSURFACE*, LPBOOL32) PURE;
+  STDMETHOD(GetBackgroundDepth) (THIS_ LPDIRECTDRAWSURFACE*, LPBOOL) PURE;
   STDMETHOD(Clear) (THIS_ DWORD, LPD3DRECT, DWORD) PURE;
   STDMETHOD(AddLight) (THIS_ LPDIRECT3DLIGHT) PURE;
   STDMETHOD(DeleteLight) (THIS_ LPDIRECT3DLIGHT) PURE;
@@ -1456,7 +1456,7 @@ struct IDirect3DExecuteBuffer {
 
   /* This flags is set to TRUE if we allocated ourselves the
      data buffer */
-  BOOL32 need_free;
+  BOOL need_free;
 
   void (*execute)(LPDIRECT3DEXECUTEBUFFER this,
 		  LPDIRECT3DDEVICE dev,
diff --git a/include/dc.h b/include/dc.h
index a422ce97660..95903e02bf1 100644
--- a/include/dc.h
+++ b/include/dc.h
@@ -15,16 +15,16 @@
 #define CLIP_KEEPRGN	0x0004
 
 extern DC * DC_AllocDC( const DC_FUNCTIONS *funcs );
-extern DC * DC_GetDCPtr( HDC32 hdc );
+extern DC * DC_GetDCPtr( HDC hdc );
 extern void DC_InitDC( DC * dc );
 extern void DC_UpdateXforms( DC * dc );
 
 
 /* objects/clipping.c */
-INT32 CLIPPING_IntersectClipRect( DC * dc, INT32 left, INT32 top,
-    INT32 right, INT32 bottom, UINT32 flags );
-INT32 CLIPPING_IntersectVisRect( DC * dc, INT32 left, INT32 top,
-    INT32 right, INT32 bottom, BOOL32 exclude );
+INT CLIPPING_IntersectClipRect( DC * dc, INT left, INT top,
+    INT right, INT bottom, UINT flags );
+INT CLIPPING_IntersectVisRect( DC * dc, INT left, INT top,
+    INT right, INT bottom, BOOL exclude );
 extern void CLIPPING_UpdateGCRegion( DC * dc );
 
 #endif /* __WINE_DC_H */
diff --git a/include/dce.h b/include/dce.h
index 96db5d11237..3fa10cb5557 100644
--- a/include/dce.h
+++ b/include/dce.h
@@ -37,21 +37,21 @@ typedef enum
 typedef struct tagDCE
 {
     struct tagDCE *next;
-    HDC32          hDC;
-    HWND32         hwndCurrent;
-    HWND32         hwndDC;
-    HRGN32         hClipRgn;
+    HDC          hDC;
+    HWND         hwndCurrent;
+    HWND         hwndDC;
+    HRGN         hClipRgn;
     DCE_TYPE       type;
     DWORD          DCXflags;
 } DCE;
 
 
 extern void  DCE_Init(void);
-extern DCE*  DCE_AllocDCE( HWND32 hWnd, DCE_TYPE type );
+extern DCE*  DCE_AllocDCE( HWND hWnd, DCE_TYPE type );
 extern DCE*  DCE_FreeDCE( DCE *dce );
 extern void  DCE_FreeWindowDCE( WND* );
-extern INT16 DCE_ExcludeRgn( HDC32, WND*, HRGN32 );
-extern HRGN32 DCE_GetVisRgn( HWND32, WORD, HWND32, WORD );
-extern BOOL32 DCE_InvalidateDCE( WND*, const RECT32* );
+extern INT16 DCE_ExcludeRgn( HDC, WND*, HRGN );
+extern HRGN DCE_GetVisRgn( HWND, WORD, HWND, WORD );
+extern BOOL DCE_InvalidateDCE( WND*, const RECT* );
 
 #endif  /* __WINE_DCE_H */
diff --git a/include/dde_proc.h b/include/dde_proc.h
index e8a7ab1194c..84697cf02f5 100644
--- a/include/dde_proc.h
+++ b/include/dde_proc.h
@@ -51,9 +51,9 @@ int  dde_reschedule();
 void dde_wnd_setup();		   /* setup Data structure of DDE windows */
 
 /* Send ack. to hnd indicating that posted/sent msg. got to destination*/
-void dde_proc_send_ack(HWND16 wnd, BOOL32 val);
-BOOL32 DDE_PostMessage( MSG16 *msg);
-BOOL32 DDE_SendMessage( MSG16 *msg);
+void dde_proc_send_ack(HWND16 wnd, BOOL val);
+BOOL DDE_PostMessage( MSG16 *msg);
+BOOL DDE_SendMessage( MSG16 *msg);
 int DDE_GetRemoteMessage();
 void DDE_DestroyWindow(HWND16 hwnd); /* delete DDE info regarding hwnd */
 void DDE_TestDDE(HWND16 hwnd);	   /* do we have dde handling in the window ?*/
diff --git a/include/ddeml.h b/include/ddeml.h
index cf76a8d0238..a8f6f3f710d 100644
--- a/include/ddeml.h
+++ b/include/ddeml.h
@@ -132,9 +132,8 @@ typedef CHAR *LPTSTR;
 
 typedef HDDEDATA (CALLBACK *PFNCALLBACK16)(UINT16,UINT16,HCONV,HSZ,HSZ,
                                            HDDEDATA,DWORD,DWORD);
-typedef HDDEDATA (CALLBACK *PFNCALLBACK32)(UINT32,UINT32,HCONV,HSZ,HSZ,
+typedef HDDEDATA (CALLBACK *PFNCALLBACK)(UINT,UINT,HCONV,HSZ,HSZ,
                                            HDDEDATA,DWORD,DWORD);
-DECL_WINELIB_TYPE(PFNCALLBACK)
 
 /***************************************************
 
@@ -154,13 +153,13 @@ typedef struct
 
 typedef struct
 {
-    UINT32  cb;
-    UINT32  wFlags;
-    UINT32  wCountryID;
-    INT32   iCodePage;
+    UINT  cb;
+    UINT  wFlags;
+    UINT  wCountryID;
+    INT   iCodePage;
     DWORD   dwLangID;
     DWORD   dwSecurity;
-} CONVCONTEXT32, *LPCONVCONTEXT32;
+} CONVCONTEXT, *LPCONVCONTEXT;
 
 //  Internal data structures
 
@@ -172,89 +171,69 @@ typedef struct DDE_HANDLE_ENTRY {
     BOOL16		Win16;		/* flag to indicate Win16 API used to initialize */
     LPDWORD            	Instance_id;  // needed to track monitor usage
     struct DDE_HANDLE_ENTRY    *Next_Entry;
-    PFNCALLBACK32	CallBack;
+    PFNCALLBACK	CallBack;
     DWORD               CBF_Flags;
     DWORD               Monitor_flags;
-    UINT32              Txn_count;      // count transactions open to simplify closure
+    UINT              Txn_count;      // count transactions open to simplify closure
 } DDE_HANDLE_ENTRY;
 
 //            Interface Definitions
 
-DECL_WINELIB_TYPE(CONVCONTEXT)
-DECL_WINELIB_TYPE(LPCONVCONTEXT)
 
 UINT16    WINAPI DdeInitialize16(LPDWORD,PFNCALLBACK16,DWORD,DWORD);
-UINT32    WINAPI DdeInitialize32A(LPDWORD,PFNCALLBACK32,DWORD,DWORD);
-UINT32    WINAPI DdeInitialize32W(LPDWORD,PFNCALLBACK32,DWORD,DWORD);
+UINT    WINAPI DdeInitializeA(LPDWORD,PFNCALLBACK,DWORD,DWORD);
+UINT    WINAPI DdeInitializeW(LPDWORD,PFNCALLBACK,DWORD,DWORD);
 #define   DdeInitialize WINELIB_NAME_AW(DdeInitialize)
 BOOL16    WINAPI DdeUninitialize16(DWORD);
-BOOL32    WINAPI DdeUninitialize32(DWORD);
-#define   DdeUninitialize WINELIB_NAME(DdeUninitialize)
+BOOL    WINAPI DdeUninitialize(DWORD);
 HCONVLIST WINAPI DdeConnectList16(DWORD,HSZ,HSZ,HCONVLIST,LPCONVCONTEXT16);
-HCONVLIST WINAPI DdeConnectList32(DWORD,HSZ,HSZ,HCONVLIST,LPCONVCONTEXT32);
-#define   DdeConnectList WINELIB_NAME(DdeConnectList)
+HCONVLIST WINAPI DdeConnectList(DWORD,HSZ,HSZ,HCONVLIST,LPCONVCONTEXT);
 HCONV     WINAPI DdeQueryNextServer16(HCONVLIST, HCONV);
-HCONV     WINAPI DdeQueryNextServer32(HCONVLIST, HCONV);
-#define   DdeQueryNextServer WINELIB_NAME(DdeQueryNextServer)
-DWORD     WINAPI DdeQueryString32A(DWORD, HSZ, LPSTR, DWORD, INT32);
-DWORD     WINAPI DdeQueryString32W(DWORD, HSZ, LPWSTR, DWORD, INT32);
+HCONV     WINAPI DdeQueryNextServer(HCONVLIST, HCONV);
+DWORD     WINAPI DdeQueryStringA(DWORD, HSZ, LPSTR, DWORD, INT);
+DWORD     WINAPI DdeQueryStringW(DWORD, HSZ, LPWSTR, DWORD, INT);
 #define   DdeQueryString WINELIB_NAME_AW(DdeQueryString)
 BOOL16    WINAPI DdeDisconnectList16(HCONVLIST);
-BOOL32    WINAPI DdeDisconnectList32(HCONVLIST);
-#define   DdeDisConnectList WINELIB_NAME(DdeDisconnectList)
+BOOL    WINAPI DdeDisconnectList(HCONVLIST);
 HCONV     WINAPI DdeConnect16(DWORD,HSZ,HSZ,LPCONVCONTEXT16);
-HCONV     WINAPI DdeConnect32(DWORD,HSZ,HSZ,LPCONVCONTEXT32);
-#define   DdeConnect WINELIB_NAME(DdeConnect)
+HCONV     WINAPI DdeConnect(DWORD,HSZ,HSZ,LPCONVCONTEXT);
 BOOL16    WINAPI DdeDisconnect16(HCONV);
-BOOL32    WINAPI DdeDisconnect32(HCONV);
-#define   DdeDisconnect WINELIB_NAME(DdeDisconnect)
-BOOL16    WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD);
+BOOL    WINAPI DdeDisconnect(HCONV);
+BOOL16    WINAPI DdeSetUserHandle16(HCONV,DWORD,DWORD);
 HDDEDATA  WINAPI DdeCreateDataHandle16(DWORD,LPBYTE,DWORD,DWORD,HSZ,UINT16,UINT16);
-HDDEDATA  WINAPI DdeCreateDataHandle32(DWORD,LPBYTE,DWORD,DWORD,HSZ,UINT32,UINT32);
-#define   DdeCreateDataHandle WINELIB_NAME(DdeCreateDataHandle)
+HDDEDATA  WINAPI DdeCreateDataHandle(DWORD,LPBYTE,DWORD,DWORD,HSZ,UINT,UINT);
 HCONV     WINAPI DdeReconnect(HCONV);
 HSZ       WINAPI DdeCreateStringHandle16(DWORD,LPCSTR,INT16);
-HSZ       WINAPI DdeCreateStringHandle32A(DWORD,LPCSTR,INT32);
-HSZ       WINAPI DdeCreateStringHandle32W(DWORD,LPCWSTR,INT32);
+HSZ       WINAPI DdeCreateStringHandleA(DWORD,LPCSTR,INT);
+HSZ       WINAPI DdeCreateStringHandleW(DWORD,LPCWSTR,INT);
 #define   DdeCreateStringHandle WINELIB_NAME_AW(DdeCreateStringHandle)
 BOOL16    WINAPI DdeFreeStringHandle16(DWORD,HSZ);
-BOOL32    WINAPI DdeFreeStringHandle32(DWORD,HSZ);
-#define   DdeFreeStringHandle WINELIB_NAME(DdeFreeStringHandle)
+BOOL    WINAPI DdeFreeStringHandle(DWORD,HSZ);
 BOOL16    WINAPI DdeFreeDataHandle16(HDDEDATA);
-BOOL32    WINAPI DdeFreeDataHandle32(HDDEDATA);
-#define   DdeFreeDataHandle WINELIB_NAME(DdeFreeDataHandle)
+BOOL    WINAPI DdeFreeDataHandle(HDDEDATA);
 BOOL16    WINAPI DdeKeepStringHandle16(DWORD,HSZ);
-BOOL32    WINAPI DdeKeepStringHandle32(DWORD,HSZ);
-#define   DdeKeepStringHandle WINELIB_NAME(DdeKeepStringHandle)
+BOOL    WINAPI DdeKeepStringHandle(DWORD,HSZ);
 HDDEDATA  WINAPI DdeClientTransaction16(LPVOID,DWORD,HCONV,HSZ,UINT16,
                                         UINT16,DWORD,LPDWORD);
-HDDEDATA  WINAPI DdeClientTransaction32(LPBYTE,DWORD,HCONV,HSZ,UINT32,
-                                        UINT32,DWORD,LPDWORD);
-#define   DdeClientTransaction WINELIB_NAME(DdeClientTransaction)
-BOOL16    WINAPI DdeAbandonTransaction(DWORD,HCONV,DWORD);
+HDDEDATA  WINAPI DdeClientTransaction(LPBYTE,DWORD,HCONV,HSZ,UINT,
+                                        UINT,DWORD,LPDWORD);
+BOOL16    WINAPI DdeAbandonTransaction16(DWORD,HCONV,DWORD);
 BOOL16    WINAPI DdePostAdvise16(DWORD,HSZ,HSZ);
-BOOL32    WINAPI DdePostAdvise32(DWORD,HSZ,HSZ);
-#define   DdePostAdvise WINELIB_NAME(DdePostAdvise)
-HDDEDATA  WINAPI DdeAddData(HDDEDATA,LPBYTE,DWORD,DWORD);
+BOOL    WINAPI DdePostAdvise(DWORD,HSZ,HSZ);
+HDDEDATA  WINAPI DdeAddData16(HDDEDATA,LPBYTE,DWORD,DWORD);
 DWORD     WINAPI DdeGetData(HDDEDATA,LPBYTE,DWORD,DWORD);
 LPBYTE    WINAPI DdeAccessData16(HDDEDATA,LPDWORD);
-LPBYTE    WINAPI DdeAccessData32(HDDEDATA,LPDWORD);
-#define   DdeAccessData WINELIB_NAME(DdeAccessData)
+LPBYTE    WINAPI DdeAccessData(HDDEDATA,LPDWORD);
 BOOL16    WINAPI DdeUnaccessData16(HDDEDATA);
-BOOL32    WINAPI DdeUnaccessData32(HDDEDATA);
-#define   DdeUnaccessData WINELIB_NAME(DdeUnaccessData)
+BOOL    WINAPI DdeUnaccessData(HDDEDATA);
 BOOL16    WINAPI DdeEnableCallback16(DWORD,HCONV,UINT16);
-BOOL32    WINAPI DdeEnableCallback32(DWORD,HCONV,UINT32);
-#define   DdeEnableCallback WINELIB_NAME(DdeEnableCallback)
+BOOL    WINAPI DdeEnableCallback(DWORD,HCONV,UINT);
 int       WINAPI DdeCmpStringHandles16(HSZ,HSZ);
-int       WINAPI DdeCmpStringHandles32(HSZ,HSZ);
-#define   DdeCmpStringHandles WINELIB_NAME(DdeCmpStringHandles)
+int       WINAPI DdeCmpStringHandles(HSZ,HSZ);
 
 HDDEDATA  WINAPI DdeNameService16(DWORD,HSZ,HSZ,UINT16);
-HDDEDATA  WINAPI DdeNameService32(DWORD,HSZ,HSZ,UINT32);
-#define   DdeNameService WINELIB_NAME(DdeNameService)
+HDDEDATA  WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT);
 UINT16    WINAPI DdeGetLastError16(DWORD);
-UINT32    WINAPI DdeGetLastError32(DWORD);
-#define   DdeGetLastError WINELIB_NAME(DdeGetLastError)
+UINT    WINAPI DdeGetLastError(DWORD);
 
 #endif  /* __WINE__DDEML_H */
diff --git a/include/ddraw.h b/include/ddraw.h
index 5c568e0fba2..1115e255a91 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -692,19 +692,19 @@ typedef struct {
 	DWORD	dwReserved1;
 } DDCOLORCONTROL,*LPDDCOLORCONTROL;
 
-typedef BOOL32 (CALLBACK * LPDDENUMCALLBACK32A)(GUID *, LPSTR, LPSTR, LPVOID);
-typedef BOOL32 (CALLBACK * LPDDENUMCALLBACK32W)(GUID *, LPWSTR, LPWSTR, LPVOID);
+typedef BOOL (CALLBACK * LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
+typedef BOOL (CALLBACK * LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
 DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
 
 typedef HRESULT (CALLBACK * LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
 typedef HRESULT (CALLBACK * LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
 
-typedef BOOL32 (CALLBACK * LPDDENUMCALLBACKEX32A)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
-typedef BOOL32 (CALLBACK * LPDDENUMCALLBACKEX32W)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
+typedef BOOL (CALLBACK * LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
+typedef BOOL (CALLBACK * LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
 DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
 
-HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEX32A lpCallback, LPVOID lpContext, DWORD dwFlags);
-HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEX32W lpCallback, LPVOID lpContext, DWORD dwFlags);
+HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
+HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
 
 /* flags for DirectDrawEnumerateEx */
 #define DDENUM_ATTACHEDSECONDARYDEVICES	0x00000001
@@ -806,9 +806,9 @@ typedef struct _DDOVERLAYFX
 
 typedef struct _DDBLTBATCH
 {
-    LPRECT32		lprDest;
+    LPRECT		lprDest;
     LPDIRECTDRAWSURFACE	lpDDSSrc;
-    LPRECT32		lprSrc;
+    LPRECT		lprSrc;
     DWORD		dwFlags;
     LPDDBLTFX		lpDDBltFx;
 } DDBLTBATCH,*LPDDBLTBATCH;
@@ -866,12 +866,12 @@ typedef struct IDirectDrawClipper_VTable {
     STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
     STDMETHOD_(ULONG,Release) (THIS) PURE;
     /*** IDirectDrawClipper methods ***/
-    STDMETHOD(GetClipList)(THIS_ LPRECT32, LPRGNDATA, LPDWORD) PURE;
-    STDMETHOD(GetHWnd)(THIS_ HWND32 FAR *) PURE;
+    STDMETHOD(GetClipList)(THIS_ LPRECT, LPRGNDATA, LPDWORD) PURE;
+    STDMETHOD(GetHWnd)(THIS_ HWND FAR *) PURE;
     STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, DWORD) PURE;
-    STDMETHOD(IsClipListChanged)(THIS_ BOOL32 FAR *) PURE;
+    STDMETHOD(IsClipListChanged)(THIS_ BOOL FAR *) PURE;
     STDMETHOD(SetClipList)(THIS_ LPRGNDATA,DWORD) PURE;
-    STDMETHOD(SetHWnd)(THIS_ DWORD, HWND32 ) PURE;
+    STDMETHOD(SetHWnd)(THIS_ DWORD, HWND ) PURE;
 } *LPDIRECTDRAWCLIPPER_VTABLE,IDirectDrawClipper_VTable;
 
 struct IDirectDrawClipper {
@@ -903,26 +903,26 @@ FAR * ) PURE;
     STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE FAR *) PURE;
     STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD) PURE;
     STDMETHOD(GetScanLine)(THIS_ LPDWORD) PURE;
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL32* ) PURE;
+    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* ) PURE;
     STDMETHOD(Initialize)(THIS_ GUID FAR *) PURE;
     STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND32, DWORD) PURE;
+    STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE;
     STDMETHOD(SetDisplayMode)(THIS_ DWORD , DWORD ,DWORD ) PURE;
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE32 ) PURE;
+    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
 } *LPDIRECTDRAW_VTABLE,IDirectDraw_VTable;
 
 struct _common_directdrawdata {
     DWORD			screen_depth;
     DWORD                       depth;          /* SetDisplayMode */
     DWORD			height,width;	/* SetDisplayMode */
-    HWND32                      mainWindow;     /* SetCooperativeLevel */
+    HWND                      mainWindow;     /* SetCooperativeLevel */
 
     /* This is for Wine's fake mainWindow.
        We need it also in DGA mode to make some games (for example Monkey Island III work) */
     ATOM		winclass;
-    HWND32		window;
+    HWND		window;
     Window		drawable;
-    PAINTSTRUCT32	ps;
+    PAINTSTRUCT	ps;
     int			paintable;
 };
 
@@ -989,12 +989,12 @@ typedef struct IDirectDraw2_VTable
 /*38*/	STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE FAR *) PURE;
 /*3C*/	STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD) PURE;
 /*40*/	STDMETHOD(GetScanLine)(THIS_ LPDWORD) PURE;
-/*44*/	STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL32* ) PURE;
+/*44*/	STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* ) PURE;
 /*48*/	STDMETHOD(Initialize)(THIS_ GUID FAR *) PURE;
 /*4C*/	STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-/*50*/	STDMETHOD(SetCooperativeLevel)(THIS_ HWND32, DWORD) PURE;
+/*50*/	STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE;
 /*54*/	STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD, DWORD, DWORD, DWORD) PURE;
-/*58*/	STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE32 ) PURE;
+/*58*/	STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
     /*** Added in the v2 interface ***/
 /*5C*/	STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS, LPDWORD, LPDWORD) PURE;
 } IDirectDraw2_VTable,*LPDIRECTDRAW2_VTABLE;
@@ -1038,16 +1038,16 @@ typedef struct IDirectDraw4_VTable
 /*38*/	STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE FAR *) PURE;
 /*3C*/	STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD) PURE;
 /*40*/	STDMETHOD(GetScanLine)(THIS_ LPDWORD) PURE;
-/*44*/	STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL32* ) PURE;
+/*44*/	STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* ) PURE;
 /*48*/	STDMETHOD(Initialize)(THIS_ GUID FAR *) PURE;
 /*4C*/	STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-/*50*/	STDMETHOD(SetCooperativeLevel)(THIS_ HWND32, DWORD) PURE;
+/*50*/	STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE;
 /*54*/	STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD, DWORD, DWORD, DWORD) PURE;
-/*58*/	STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE32 ) PURE;
+/*58*/	STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
     /*** Added in the v2 interface ***/
 /*5C*/	STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS, LPDWORD, LPDWORD) PURE;
     /*** Added in the V4 Interface ***/
-/*60*/   STDMETHOD(GetSurfaceFromDC) (THIS_ HDC32, LPDIRECTDRAWSURFACE *) PURE;
+/*60*/   STDMETHOD(GetSurfaceFromDC) (THIS_ HDC, LPDIRECTDRAWSURFACE *) PURE;
 /*64*/   STDMETHOD(RestoreAllSurfaces)(THIS) PURE;
 /*68*/   STDMETHOD(TestCooperativeLevel)(THIS) PURE;
 /*6C*/   STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER, DWORD ) PURE;
@@ -1092,10 +1092,10 @@ typedef struct IDirectDrawSurface_VTable {
     STDMETHOD_(ULONG,Release) (THIS) PURE;
     /*** IDirectDrawSurface methods ***/
     STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE) PURE;
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT32) PURE;
-    STDMETHOD(Blt)(THIS_ LPRECT32,LPDIRECTDRAWSURFACE, LPRECT32,DWORD, LPDDBLTFX) PURE;
+    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
+    STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE, LPRECT,DWORD, LPDDBLTFX) PURE;
     STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE;
-    STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE, LPRECT32,DWORD) PURE;
+    STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE, LPRECT,DWORD) PURE;
     STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE) PURE;
     STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
     STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
@@ -1105,7 +1105,7 @@ typedef struct IDirectDrawSurface_VTable {
     STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE;
     STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER FAR*) PURE;
     STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
-    STDMETHOD(GetDC)(THIS_ HDC32 FAR *) PURE;
+    STDMETHOD(GetDC)(THIS_ HDC FAR *) PURE;
     STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE;
     STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE;
     STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE FAR*) PURE;
@@ -1113,15 +1113,15 @@ typedef struct IDirectDrawSurface_VTable {
     STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE;
     STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE;
     STDMETHOD(IsLost)(THIS) PURE;
-    STDMETHOD(Lock)(THIS_ LPRECT32,LPDDSURFACEDESC,DWORD flags,HANDLE32) PURE;
-    STDMETHOD(ReleaseDC)(THIS_ HDC32) PURE;
+    STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD flags,HANDLE) PURE;
+    STDMETHOD(ReleaseDC)(THIS_ HDC) PURE;
     STDMETHOD(Restore)(THIS) PURE;
     STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE;
     STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
     STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE;
     STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE;
     STDMETHOD(Unlock)(THIS_ LPVOID) PURE;
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT32, LPDIRECTDRAWSURFACE,LPRECT32,DWORD, LPDDOVERLAYFX) PURE;
+    STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE,LPRECT,DWORD, LPDDOVERLAYFX) PURE;
     STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE;
     STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE) PURE;
 } *LPDIRECTDRAWSURFACE_VTABLE,IDirectDrawSurface_VTable;
@@ -1145,10 +1145,10 @@ typedef struct IDirectDrawSurface2_VTable {
     STDMETHOD_(ULONG,Release) (THIS) PURE;
     /*** IDirectDrawSurface methods ***/
     STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE2) PURE;
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT32) PURE;
-    STDMETHOD(Blt)(THIS_ LPRECT32,LPDIRECTDRAWSURFACE2, LPRECT32,DWORD, LPDDBLTFX) PURE;
+    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
+    STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE2, LPRECT,DWORD, LPDDBLTFX) PURE;
     STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE;
-    STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE2, LPRECT32,DWORD) PURE;
+    STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE2, LPRECT,DWORD) PURE;
     STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE2) PURE;
     STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
     STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
@@ -1158,7 +1158,7 @@ typedef struct IDirectDrawSurface2_VTable {
     STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE;
     STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER FAR*) PURE;
     STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
-    STDMETHOD(GetDC)(THIS_ HDC32 FAR *) PURE;
+    STDMETHOD(GetDC)(THIS_ HDC FAR *) PURE;
     STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE;
     STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE;
     STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE FAR*) PURE;
@@ -1166,15 +1166,15 @@ typedef struct IDirectDrawSurface2_VTable {
     STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE;
     STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE;
     STDMETHOD(IsLost)(THIS) PURE;
-    STDMETHOD(Lock)(THIS_ LPRECT32,LPDDSURFACEDESC,DWORD,HANDLE32) PURE;
-    STDMETHOD(ReleaseDC)(THIS_ HDC32) PURE;
+    STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD,HANDLE) PURE;
+    STDMETHOD(ReleaseDC)(THIS_ HDC) PURE;
     STDMETHOD(Restore)(THIS) PURE;
     STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE;
     STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
     STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE;
     STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE;
     STDMETHOD(Unlock)(THIS_ LPVOID) PURE;
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT32, LPDIRECTDRAWSURFACE2,LPRECT32,DWORD, LPDDOVERLAYFX) PURE;
+    STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE2,LPRECT,DWORD, LPDDOVERLAYFX) PURE;
     STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE;
     STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE2) PURE;
     /*** Added in the v2 interface ***/
@@ -1202,10 +1202,10 @@ typedef struct IDirectDrawSurface3_VTable {
 /*08*/STDMETHOD_(ULONG,Release) (THIS) PURE;
     /*** IDirectDrawSurface methods ***/
 /*0c*/STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE3) PURE;
-/*10*/STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT32) PURE;
-/*14*/STDMETHOD(Blt)(THIS_ LPRECT32,LPDIRECTDRAWSURFACE3, LPRECT32,DWORD, LPDDBLTFX) PURE;
+/*10*/STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
+/*14*/STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE3, LPRECT,DWORD, LPDDBLTFX) PURE;
 /*18*/STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE;
-/*1c*/STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE3, LPRECT32,DWORD) PURE;
+/*1c*/STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE3, LPRECT,DWORD) PURE;
 /*20*/STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE3) PURE;
 /*24*/STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE;    
 /*28*/STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
@@ -1215,7 +1215,7 @@ typedef struct IDirectDrawSurface3_VTable {
 /*38*/STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE;
 /*3c*/STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER FAR*) PURE;
 /*40*/STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
-/*44*/STDMETHOD(GetDC)(THIS_ HDC32 FAR *) PURE;
+/*44*/STDMETHOD(GetDC)(THIS_ HDC FAR *) PURE;
 /*48*/STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE;
 /*4c*/STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE;
 /*50*/STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE FAR*) PURE;
@@ -1223,15 +1223,15 @@ typedef struct IDirectDrawSurface3_VTable {
 /*58*/STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE;
 /*5c*/STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE;
 /*60*/STDMETHOD(IsLost)(THIS) PURE;
-/*64*/STDMETHOD(Lock)(THIS_ LPRECT32,LPDDSURFACEDESC,DWORD,HANDLE32) PURE;
-/*68*/STDMETHOD(ReleaseDC)(THIS_ HDC32) PURE;
+/*64*/STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD,HANDLE) PURE;
+/*68*/STDMETHOD(ReleaseDC)(THIS_ HDC) PURE;
 /*6c*/STDMETHOD(Restore)(THIS) PURE;
 /*70*/STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE;
 /*74*/STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
 /*78*/STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE;
 /*7c*/STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE;
 /*80*/STDMETHOD(Unlock)(THIS_ LPVOID) PURE;
-/*84*/STDMETHOD(UpdateOverlay)(THIS_ LPRECT32, LPDIRECTDRAWSURFACE3,LPRECT32,DWORD, LPDDOVERLAYFX) PURE;
+/*84*/STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE3,LPRECT,DWORD, LPDDOVERLAYFX) PURE;
 /*88*/STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE;
 /*8c*/STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE3) PURE;
     /*** Added in the v2 interface ***/
@@ -1262,10 +1262,10 @@ typedef struct IDirectDrawSurface4_VTable {
 /*08*/STDMETHOD_(ULONG,Release) (THIS) PURE;
     /*** IDirectDrawSurface methods ***/
 /*0c*/STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE4) PURE;
-/*10*/STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT32) PURE;
-/*14*/STDMETHOD(Blt)(THIS_ LPRECT32,LPDIRECTDRAWSURFACE4, LPRECT32,DWORD, LPDDBLTFX) PURE;
+/*10*/STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
+/*14*/STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE4, LPRECT,DWORD, LPDDBLTFX) PURE;
 /*18*/STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE;
-/*1c*/STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE4, LPRECT32,DWORD) PURE;
+/*1c*/STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE4, LPRECT,DWORD) PURE;
 /*20*/STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE4) PURE;
 /*24*/STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE;    
 /*28*/STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
@@ -1275,7 +1275,7 @@ typedef struct IDirectDrawSurface4_VTable {
 /*38*/STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE;
 /*3c*/STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER FAR*) PURE;
 /*40*/STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
-/*44*/STDMETHOD(GetDC)(THIS_ HDC32 FAR *) PURE;
+/*44*/STDMETHOD(GetDC)(THIS_ HDC FAR *) PURE;
 /*48*/STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE;
 /*4c*/STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE;
 /*50*/STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE FAR*) PURE;
@@ -1283,15 +1283,15 @@ typedef struct IDirectDrawSurface4_VTable {
 /*58*/STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE;
 /*5c*/STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE;
 /*60*/STDMETHOD(IsLost)(THIS) PURE;
-/*64*/STDMETHOD(Lock)(THIS_ LPRECT32,LPDDSURFACEDESC,DWORD,HANDLE32) PURE;
-/*68*/STDMETHOD(ReleaseDC)(THIS_ HDC32) PURE;
+/*64*/STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD,HANDLE) PURE;
+/*68*/STDMETHOD(ReleaseDC)(THIS_ HDC) PURE;
 /*6c*/STDMETHOD(Restore)(THIS) PURE;
 /*70*/STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE;
 /*74*/STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
 /*78*/STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE;
 /*7c*/STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE;
 /*80*/STDMETHOD(Unlock)(THIS_ LPVOID) PURE;
-/*84*/STDMETHOD(UpdateOverlay)(THIS_ LPRECT32, LPDIRECTDRAWSURFACE4,LPRECT32,DWORD, LPDDOVERLAYFX) PURE;
+/*84*/STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE4,LPRECT,DWORD, LPDDOVERLAYFX) PURE;
 /*88*/STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE;
 /*8c*/STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE4) PURE;
     /*** Added in the v2 interface ***/
@@ -1344,8 +1344,8 @@ struct IDirectDrawColorControl  {
 #undef STDMETHOD_
 
 HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN);
-HRESULT WINAPI DirectDrawEnumerate32A(LPDDENUMCALLBACK32A,LPVOID);
-HRESULT WINAPI DirectDrawEnumerate32W(LPDDENUMCALLBACK32W,LPVOID);
+HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
+HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
 HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN);
 #define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
 #endif
diff --git a/include/debugger.h b/include/debugger.h
index ec12229f748..602f25cc810 100644
--- a/include/debugger.h
+++ b/include/debugger.h
@@ -145,17 +145,17 @@ extern CONTEXT DEBUG_context;  /* debugger/registers.c */
 extern unsigned int dbg_mode;
 
   /* debugger/break.c */
-extern void DEBUG_SetBreakpoints( BOOL32 set );
+extern void DEBUG_SetBreakpoints( BOOL set );
 extern int DEBUG_FindBreakpoint( const DBG_ADDR *addr );
 extern void DEBUG_AddBreakpoint( const DBG_ADDR *addr );
 extern void DEBUG_DelBreakpoint( int num );
-extern void DEBUG_EnableBreakpoint( int num, BOOL32 enable );
+extern void DEBUG_EnableBreakpoint( int num, BOOL enable );
 extern void DEBUG_InfoBreakpoints(void);
 extern void DEBUG_AddTaskEntryBreakpoint( HTASK16 hTask );
-extern BOOL32 DEBUG_HandleTrap(void);
-extern BOOL32 DEBUG_ShouldContinue( enum exec_mode mode, int * count );
+extern BOOL DEBUG_HandleTrap(void);
+extern BOOL DEBUG_ShouldContinue( enum exec_mode mode, int * count );
 extern enum exec_mode DEBUG_RestartExecution( enum exec_mode mode, int count );
-extern BOOL32 DEBUG_IsFctReturn(void);
+extern BOOL DEBUG_IsFctReturn(void);
 
   /* debugger/db_disasm.c */
 extern void DEBUG_Disasm( DBG_ADDR *addr, int display );
@@ -200,9 +200,9 @@ extern struct name_hash * DEBUG_AddSymbol( const char *name,
 extern struct name_hash * DEBUG_AddInvSymbol( const char *name, 
 					   const DBG_ADDR *addr,
 					   const char * sourcefile);
-extern BOOL32 DEBUG_GetSymbolValue( const char * name, const int lineno,
+extern BOOL DEBUG_GetSymbolValue( const char * name, const int lineno,
 				    DBG_ADDR *addr, int );
-extern BOOL32 DEBUG_SetSymbolValue( const char * name, const DBG_ADDR *addr );
+extern BOOL DEBUG_SetSymbolValue( const char * name, const DBG_ADDR *addr );
 extern const char * DEBUG_FindNearestSymbol( const DBG_ADDR *addr, int flag,
 					     struct name_hash ** rtn,
 					     unsigned int ebp,
@@ -224,12 +224,12 @@ extern int DEBUG_SetSymbolSize(struct name_hash * sym, unsigned int len);
 extern int DEBUG_SetSymbolBPOff(struct name_hash * sym, unsigned int len);
 extern int DEBUG_GetSymbolAddr(struct name_hash * sym, DBG_ADDR * addr);
 extern int DEBUG_cmp_sym(const void * p1, const void * p2);
-extern BOOL32 DEBUG_GetLineNumberAddr( struct name_hash *, const int lineno, 
+extern BOOL DEBUG_GetLineNumberAddr( struct name_hash *, const int lineno, 
 				DBG_ADDR *addr, int bp_flag );
 
 extern int DEBUG_SetLocalSymbolType(struct wine_locals * sym, 
 				    struct datatype * type);
-BOOL32 DEBUG_Normalize(struct name_hash * nh );
+BOOL DEBUG_Normalize(struct name_hash * nh );
 
   /* debugger/info.c */
 extern void DEBUG_PrintBasic( const DBG_ADDR *addr, int count, char format );
@@ -243,8 +243,8 @@ extern struct symbol_info DEBUG_PrintAddressAndArgs( const DBG_ADDR *addr,
 						     int flag );
 
   /* debugger/memory.c */
-extern BOOL32 DEBUG_IsBadReadPtr( const DBG_ADDR *address, int size );
-extern BOOL32 DEBUG_IsBadWritePtr( const DBG_ADDR *address, int size );
+extern BOOL DEBUG_IsBadReadPtr( const DBG_ADDR *address, int size );
+extern BOOL DEBUG_IsBadWritePtr( const DBG_ADDR *address, int size );
 extern int DEBUG_ReadMemory( const DBG_ADDR *address );
 extern void DEBUG_WriteMemory( const DBG_ADDR *address, int value );
 extern void DEBUG_ExamineMemory( const DBG_ADDR *addr, int count, char format);
@@ -253,7 +253,7 @@ extern void DEBUG_ExamineMemory( const DBG_ADDR *addr, int count, char format);
 extern void DEBUG_SetRegister( enum debug_regs reg, int val );
 extern int DEBUG_GetRegister( enum debug_regs reg );
 extern void DEBUG_InfoRegisters(void);
-extern BOOL32 DEBUG_ValidateRegisters(void);
+extern BOOL DEBUG_ValidateRegisters(void);
 extern void DEBUG_SetSigContext( const SIGCONTEXT *sigcontext );
 extern void DEBUG_GetSigContext( SIGCONTEXT *sigcontext );
 extern int DEBUG_PrintRegister(enum debug_regs reg);
@@ -273,7 +273,7 @@ extern int DEBUG_ReadExecutableDbgInfo(void);
 extern int DEBUG_ParseStabs(char * addr, unsigned int load_offset, unsigned int staboff, int stablen, unsigned int strtaboff, int strtablen);
 
   /* debugger/msc.c */
-extern int DEBUG_RegisterDebugInfo( HMODULE32, const char *);
+extern int DEBUG_RegisterDebugInfo( HMODULE, const char *);
 extern int DEBUG_ProcessDeferredDebug(void);
 extern int DEBUG_RegisterELFDebugInfo(int load_addr, u_long size, char * name);
 extern void DEBUG_InfoShare(void);
@@ -321,12 +321,12 @@ extern void ctx_debug( int signal, CONTEXT *regs );
 extern void wine_debug( int signal, SIGCONTEXT *regs );
 
   /* miscemu/instr.c */
-extern BOOL32 INSTR_EmulateInstruction( SIGCONTEXT* );
+extern BOOL INSTR_EmulateInstruction( SIGCONTEXT* );
 
   /* loader/signal.c */
 extern void (*fnWINE_Debugger)(int,SIGCONTEXT*);
 extern void (*ctx_debug_call)( int, CONTEXT* );
-extern BOOL32 (*fnINSTR_EmulateInstruction)( SIGCONTEXT* );
+extern BOOL (*fnINSTR_EmulateInstruction)( SIGCONTEXT* );
 
 
 #endif  /* __WINE_DEBUGGER_H */
diff --git a/include/desktop.h b/include/desktop.h
index fa49ffa2708..09acd3d7dd4 100644
--- a/include/desktop.h
+++ b/include/desktop.h
@@ -15,10 +15,10 @@ struct _DESKTOP_DRIVER;
 
 typedef struct tagDESKTOP
 {
-  HBRUSH32                hbrushPattern;
-  HBITMAP32               hbitmapWallPaper;
-  SIZE32                  bitmapSize;
-  BOOL32                  fTileWallPaper;
+  HBRUSH                hbrushPattern;
+  HBITMAP               hbitmapWallPaper;
+  SIZE                  bitmapSize;
+  BOOL                  fTileWallPaper;
   struct tagMONITOR      *pPrimaryMonitor;
   struct _DESKTOP_DRIVER *pDriver;         /* Desktop driver */
   void                   *pDriverData;     /* Desktop driver data */
@@ -33,8 +33,8 @@ extern int DESKTOP_GetScreenWidth(void);
 extern int DESKTOP_GetScreenHeight(void);
 extern int DESKTOP_GetScreenDepth(void);
 
-extern BOOL32 DESKTOP_SetPattern( LPCSTR pattern );
-extern LRESULT WINAPI DesktopWndProc( HWND32 hwnd, UINT32 message,
-                                      WPARAM32 wParam, LPARAM lParam );
+extern BOOL DESKTOP_SetPattern( LPCSTR pattern );
+extern LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message,
+                                      WPARAM wParam, LPARAM lParam );
 
 #endif  /* __WINE_DESKTOP_H */
diff --git a/include/device.h b/include/device.h
index 456ef22da30..6a5216c5aaa 100644
--- a/include/device.h
+++ b/include/device.h
@@ -1,5 +1,5 @@
 #ifndef __WINE_DEVICE_H
 #define __WINE_DEVICE_H
-extern HANDLE32 DEVICE_Open( LPCSTR filename, DWORD access,
+extern HANDLE DEVICE_Open( LPCSTR filename, DWORD access,
                              LPSECURITY_ATTRIBUTES sa );
 #endif
diff --git a/include/dialog.h b/include/dialog.h
index fae9c9b1e90..dbd90fe01e0 100644
--- a/include/dialog.h
+++ b/include/dialog.h
@@ -18,7 +18,7 @@
 
 typedef struct
 {
-    INT32       msgResult;   /* +00 Last message result */
+    INT       msgResult;   /* +00 Last message result */
     HWINDOWPROC dlgProc;     /* +04 Dialog procedure */
     LONG        userInfo;    /* +08 User information (for DWL_USER) */
 
@@ -29,7 +29,7 @@ typedef struct
     HMENU16     hMenu;       /* Dialog menu */
     UINT16      xBaseUnit;   /* Dialog units (depends on the font) */
     UINT16      yBaseUnit;
-    INT32	idResult;    /* EndDialog() result / default pushbutton ID */
+    INT	idResult;    /* EndDialog() result / default pushbutton ID */
     UINT16      flags;       /* EndDialog() called for this dialog */
     HGLOBAL16   hDialogHeap;
 } DIALOGINFO;
@@ -38,11 +38,11 @@ typedef struct
 
 #define DF_END  0x0001
 
-extern BOOL32 DIALOG_Init(void);
-extern HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
-                                     BOOL32 win32Template, HWND32 owner,
+extern BOOL DIALOG_Init(void);
+extern HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate,
+                                     BOOL win32Template, HWND owner,
                                      DLGPROC16 dlgProc, LPARAM param,
                                      WINDOWPROCTYPE procType );
-extern INT32 DIALOG_DoDialogBox( HWND32 hwnd, HWND32 owner );
+extern INT DIALOG_DoDialogBox( HWND hwnd, HWND owner );
 
 #endif  /* __WINE_DIALOG_H */
diff --git a/include/dinput.h b/include/dinput.h
index 0da19891793..ebfb4708194 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -59,8 +59,8 @@ typedef struct IDirectInputA IDirectInputA,*LPDIRECTINPUTA;
 typedef struct IDirectInputDeviceA IDirectInputDeviceA,*LPDIRECTINPUTDEVICEA;
 typedef struct IDirectInputDevice2A IDirectInputDevice2A,*LPDIRECTINPUTDEVICE2A;
 typedef struct IDirectInputEffect IDirectInputEffect,*LPDIRECTINPUTEFFECT;
-typedef struct SysKeyboard32A SysKeyboard32A,*LPSYSKEYBOARD32A;
-typedef struct SysMouse32A SysMouse32A,*LPSYSMOUSE32A;
+typedef struct SysKeyboardA SysKeyboardA,*LPSYSKEYBOARDA;
+typedef struct SysMouseA SysMouseA,*LPSYSMOUSEA;
 
 #define DI_OK                           S_OK
 #define DI_NOTATTACHED                  S_FALSE
@@ -173,7 +173,7 @@ typedef struct {
     WORD	wExponent;
     WORD	wReserved;
 #endif /* DIRECTINPUT_VERSION >= 0x0500 */
-} DIDEVICEOBJECTINSTANCE32A, *LPDIDEVICEOBJECTINSTANCE32A,*LPCDIDEVICEOBJECTINSTANCE32A;
+} DIDEVICEOBJECTINSTANCEA, *LPDIDEVICEOBJECTINSTANCEA,*LPCDIDEVICEOBJECTINSTANCEA;
 
 typedef struct {
     DWORD	dwSize;
@@ -193,7 +193,7 @@ typedef struct {
     WORD	wExponent;
     WORD	wReserved;
 #endif /* DIRECTINPUT_VERSION >= 0x0500 */
-} DIDEVICEOBJECTINSTANCE32W, *LPDIDEVICEOBJECTINSTANCE32W,*LPCDIDEVICEOBJECTINSTANCE32W;
+} DIDEVICEOBJECTINSTANCEW, *LPDIDEVICEOBJECTINSTANCEW,*LPCDIDEVICEOBJECTINSTANCEW;
 DECL_WINELIB_TYPE_AW(LPDIDEVICEOBJECTINSTANCE)
 DECL_WINELIB_TYPE_AW(DIDEVICEOBJECTINSTANCE)
 
@@ -210,7 +210,7 @@ typedef struct {
     WORD	wUsagePage;
     WORD	wUsage;
 #endif /* DIRECTINPUT_VERSION >= 0x0500 */
-} DIDEVICEINSTANCE32A, *LPDIDEVICEINSTANCE32A, *LPCDIDEVICEINSTANCE32A;
+} DIDEVICEINSTANCEA, *LPDIDEVICEINSTANCEA, *LPCDIDEVICEINSTANCEA;
 
 typedef struct {
     DWORD	dwSize;
@@ -224,20 +224,20 @@ typedef struct {
     WORD	wUsagePage;
     WORD	wUsage;
 #endif /* DIRECTINPUT_VERSION >= 0x0500 */
-} DIDEVICEINSTANCE32W, *LPDIDEVICEINSTANCE32W, *LPCDIDEVICEINSTANCE32W;
+} DIDEVICEINSTANCEW, *LPDIDEVICEINSTANCEW, *LPCDIDEVICEINSTANCEW;
 DECL_WINELIB_TYPE_AW(DIDEVICEINSTANCE)
 DECL_WINELIB_TYPE_AW(LPDIDEVICEINSTANCE)
 DECL_WINELIB_TYPE_AW(LPCDIDEVICEINSTANCE)
 
-typedef BOOL32 (CALLBACK * LPDIENUMDEVICESCALLBACK32A)(LPCDIDEVICEINSTANCE32A,LPVOID);
-typedef BOOL32 (CALLBACK * LPDIENUMDEVICESCALLBACK32W)(LPCDIDEVICEINSTANCE32W,LPVOID);
+typedef BOOL (CALLBACK * LPDIENUMDEVICESCALLBACKA)(LPCDIDEVICEINSTANCEA,LPVOID);
+typedef BOOL (CALLBACK * LPDIENUMDEVICESCALLBACKW)(LPCDIDEVICEINSTANCEW,LPVOID);
 DECL_WINELIB_TYPE_AW(LPDIENUMDEVICESCALLBACK)
 
-typedef BOOL32 (CALLBACK * LPDIENUMDEVICEOBJECTSCALLBACK32A)(LPCDIDEVICEOBJECTINSTANCE32A, LPVOID);
-typedef BOOL32 (CALLBACK * LPDIENUMDEVICEOBJECTSCALLBACK32W)(LPCDIDEVICEOBJECTINSTANCE32W,LPVOID);
+typedef BOOL (CALLBACK * LPDIENUMDEVICEOBJECTSCALLBACKA)(LPCDIDEVICEOBJECTINSTANCEA, LPVOID);
+typedef BOOL (CALLBACK * LPDIENUMDEVICEOBJECTSCALLBACKW)(LPCDIDEVICEOBJECTINSTANCEW,LPVOID);
 DECL_WINELIB_TYPE_AW(LPDIENUMDEVICEOBJECTSCALLBACK)
 
-typedef BOOL32 (CALLBACK * LPDIENUMCREATEDEFFECTOBJECTSCALLBACK)(LPDIRECTINPUTEFFECT, LPVOID);
+typedef BOOL (CALLBACK * LPDIENUMCREATEDEFFECTOBJECTSCALLBACK)(LPDIRECTINPUTEFFECT, LPVOID);
 
 #define DIK_ESCAPE          0x01
 #define DIK_1               0x02
@@ -632,8 +632,8 @@ typedef const DIEFFECTINFOA *LPCDIEFFECTINFOA;
 typedef const DIEFFECTINFOW *LPCDIEFFECTINFOW;
 typedef const DIEFFECTINFO  *LPCDIEFFECTINFO;
 
-typedef BOOL32 (CALLBACK * LPDIENUMEFFECTSCALLBACKA)(LPCDIEFFECTINFOA, LPVOID);
-typedef BOOL32 (CALLBACK * LPDIENUMEFFECTSCALLBACKW)(LPCDIEFFECTINFOW, LPVOID);
+typedef BOOL (CALLBACK * LPDIENUMEFFECTSCALLBACKA)(LPCDIEFFECTINFOA, LPVOID);
+typedef BOOL (CALLBACK * LPDIENUMEFFECTSCALLBACKW)(LPCDIEFFECTINFOW, LPVOID);
 
 typedef struct DIEFFESCAPE {
 	DWORD			dwSize;
@@ -649,7 +649,7 @@ typedef struct DIEFFESCAPE {
  */
 #define ICOM_INTERFACE IDirectInputEffect
 #define IDirectInputEffect_METHODS \
-    ICOM_METHOD3(HRESULT,Initialize,      HINSTANCE32,, DWORD,, REFGUID,) \
+    ICOM_METHOD3(HRESULT,Initialize,      HINSTANCE,, DWORD,, REFGUID,) \
     ICOM_METHOD1(HRESULT,GetEffectGuid,   LPGUID,) \
     ICOM_METHOD2(HRESULT,GetParameters,   LPDIEFFECT,, DWORD,) \
     ICOM_METHOD2(HRESULT,SetParameters,   LPCDIEFFECT,, DWORD,) \
@@ -690,7 +690,7 @@ ICOM_DEFINE(IDirectInputEffect,IUnknown)
 #define ICOM_INTERFACE IDirectInputDeviceA
 #define IDirectInputDeviceA_METHODS \
     ICOM_METHOD1(HRESULT,GetCapabilities, LPDIDEVCAPS,lpDIDevCaps) \
-    ICOM_METHOD3(HRESULT,EnumObjects, LPDIENUMDEVICEOBJECTSCALLBACK32A,lpCallback, LPVOID,pvRef, DWORD,dwFlags) \
+    ICOM_METHOD3(HRESULT,EnumObjects, LPDIENUMDEVICEOBJECTSCALLBACKA,lpCallback, LPVOID,pvRef, DWORD,dwFlags) \
     ICOM_METHOD2(HRESULT,GetProperty, REFGUID,rguidProp, LPDIPROPHEADER,pdiph) \
     ICOM_METHOD2(HRESULT,SetProperty, REFGUID,rguidProp, LPCDIPROPHEADER,pdiph) \
     ICOM_METHOD (HRESULT,Acquire) \
@@ -698,12 +698,12 @@ ICOM_DEFINE(IDirectInputEffect,IUnknown)
     ICOM_METHOD2(HRESULT,GetDeviceState, DWORD,cbData, LPVOID,lpvData) \
     ICOM_METHOD4(HRESULT,GetDeviceData, DWORD,cbObjectData, LPDIDEVICEOBJECTDATA,rgdod, LPDWORD,pdwInOut, DWORD,dwFlags) \
     ICOM_METHOD1(HRESULT,SetDataFormat, LPCDIDATAFORMAT,lpdf) \
-    ICOM_METHOD1(HRESULT,SetEventNotification, HANDLE32,hEvent) \
-    ICOM_METHOD2(HRESULT,SetCooperativeLevel, HWND32,hwnd, DWORD,dwFlags) \
-    ICOM_METHOD3(HRESULT,GetObjectInfo, LPDIDEVICEOBJECTINSTANCE32A,pdidoi, DWORD,dwObj, DWORD,dwHow) \
-    ICOM_METHOD1(HRESULT,GetDeviceInfo, LPDIDEVICEINSTANCE32A,pdidi) \
-    ICOM_METHOD2(HRESULT,RunControlPanel, HWND32,hwndOwner, DWORD,dwFlags) \
-    ICOM_METHOD3(HRESULT,Initialize, HINSTANCE32,hinst, DWORD,dwVersion, REFGUID,rguid)
+    ICOM_METHOD1(HRESULT,SetEventNotification, HANDLE,hEvent) \
+    ICOM_METHOD2(HRESULT,SetCooperativeLevel, HWND,hwnd, DWORD,dwFlags) \
+    ICOM_METHOD3(HRESULT,GetObjectInfo, LPDIDEVICEOBJECTINSTANCEA,pdidoi, DWORD,dwObj, DWORD,dwHow) \
+    ICOM_METHOD1(HRESULT,GetDeviceInfo, LPDIDEVICEINSTANCEA,pdidi) \
+    ICOM_METHOD2(HRESULT,RunControlPanel, HWND,hwndOwner, DWORD,dwFlags) \
+    ICOM_METHOD3(HRESULT,Initialize, HINSTANCE,hinst, DWORD,dwVersion, REFGUID,rguid)
 #define IDirectInputDeviceA_IMETHODS \
     IUnknown_IMETHODS \
     IDirectInputDeviceA_METHODS
@@ -810,10 +810,10 @@ typedef struct DIMOUSESTATE {
 #define ICOM_INTERFACE IDirectInputA
 #define IDirectInputA_METHODS \
     ICOM_METHOD3(HRESULT,CreateDevice,    REFGUID,rguid, LPDIRECTINPUTDEVICEA*,lplpDirectInputDevice, LPUNKNOWN,pUnkOuter) \
-    ICOM_METHOD4(HRESULT,EnumDevices,     DWORD,dwDevType, LPDIENUMDEVICESCALLBACK32A,lpCallback, LPVOID,pvRef, DWORD,dwFlags) \
+    ICOM_METHOD4(HRESULT,EnumDevices,     DWORD,dwDevType, LPDIENUMDEVICESCALLBACKA,lpCallback, LPVOID,pvRef, DWORD,dwFlags) \
     ICOM_METHOD1(HRESULT,GetDeviceStatus, REFGUID,rguidInstance) \
-    ICOM_METHOD2(HRESULT,RunControlPanel, HWND32,hwndOwner, DWORD,dwFlags) \
-    ICOM_METHOD2(HRESULT,Initialize,      HINSTANCE32,hinst, DWORD,dwVersion)
+    ICOM_METHOD2(HRESULT,RunControlPanel, HWND,hwndOwner, DWORD,dwFlags) \
+    ICOM_METHOD2(HRESULT,Initialize,      HINSTANCE,hinst, DWORD,dwVersion)
 #define IDirectInputA_IMETHODS \
     IUnknown_IMETHODS \
     IDirectInputA_METHODS
diff --git a/include/dosexe.h b/include/dosexe.h
index 1d2aef1055d..2898aac1d62 100644
--- a/include/dosexe.h
+++ b/include/dosexe.h
@@ -43,8 +43,8 @@ extern LPDOSTASK MZ_AllocDPMITask( HMODULE16 hModule );
 
 extern void MZ_Tick( WORD handle );
 
-extern HINSTANCE16 MZ_CreateProcess( LPCSTR name, LPCSTR cmdline, LPCSTR env, BOOL32 inherit,
-                                     LPSTARTUPINFO32A startup, LPPROCESS_INFORMATION info );
+extern HINSTANCE16 MZ_CreateProcess( LPCSTR name, LPCSTR cmdline, LPCSTR env, BOOL inherit,
+                                     LPSTARTUPINFOA startup, LPPROCESS_INFORMATION info );
 extern int DOSVM_Enter( PCONTEXT context );
 extern void DOSVM_SetTimer( unsigned ticks );
 extern unsigned DOSVM_GetTimer( void );
diff --git a/include/dplay.h b/include/dplay.h
index d6d55068d62..2b4887d9bb8 100644
--- a/include/dplay.h
+++ b/include/dplay.h
@@ -334,14 +334,14 @@ typedef const DPCREDENTIALS *LPCDPCREDENTIALS;
 
 
 
-typedef BOOL32 (CALLBACK* LPDPENUMDPCALLBACKW)(
+typedef BOOL (CALLBACK* LPDPENUMDPCALLBACKW)(
     LPGUID      lpguidSP,
     LPWSTR      lpSPName,
     DWORD       dwMajorVersion,
     DWORD       dwMinorVersion,
     LPVOID      lpContext);
 
-typedef BOOL32 (CALLBACK* LPDPENUMDPCALLBACKA)(
+typedef BOOL (CALLBACK* LPDPENUMDPCALLBACKA)(
     LPGUID      lpguidSP,
     LPSTR       lpSPName,       /* ptr to str w/ driver description */
     DWORD       dwMajorVersion, /* Major # of driver spec in lpguidSP */
@@ -351,7 +351,7 @@ typedef BOOL32 (CALLBACK* LPDPENUMDPCALLBACKA)(
 typedef const GUID   *LPCGUID;
 typedef const DPNAME *LPCDPNAME;
 
-typedef BOOL32 (CALLBACK* LPDPENUMCONNECTIONSCALLBACK)(
+typedef BOOL (CALLBACK* LPDPENUMCONNECTIONSCALLBACK)(
     LPCGUID     lpguidSP,
     LPVOID      lpConnection,
     DWORD       dwConnectionSize,
@@ -359,7 +359,7 @@ typedef BOOL32 (CALLBACK* LPDPENUMCONNECTIONSCALLBACK)(
     DWORD       dwFlags,
     LPVOID      lpContext);
 
-typedef BOOL32 (CALLBACK* LPDPENUMSESSIONSCALLBACK)(
+typedef BOOL (CALLBACK* LPDPENUMSESSIONSCALLBACK)(
     LPDPSESSIONDESC lpDPSessionDesc,
     LPVOID      lpContext,
     LPDWORD     lpdwTimeOut,
@@ -384,30 +384,30 @@ extern HRESULT WINAPI DirectPlayLobbyCreateA(LPGUID, LPDIRECTPLAYLOBBYA *, IUnkn
 
 
 
-typedef BOOL32 (CALLBACK* LPDPENUMADDRESSCALLBACK)(
+typedef BOOL (CALLBACK* LPDPENUMADDRESSCALLBACK)(
     REFGUID         guidDataType,
     DWORD           dwDataSize,
     LPCVOID         lpData,
     LPVOID          lpContext );
 
-typedef BOOL32 (CALLBACK* LPDPLENUMADDRESSTYPESCALLBACK)(
+typedef BOOL (CALLBACK* LPDPLENUMADDRESSTYPESCALLBACK)(
     REFGUID         guidDataType,
     LPVOID          lpContext,
     DWORD           dwFlags );
 
-typedef BOOL32 (CALLBACK* LPDPLENUMLOCALAPPLICATIONSCALLBACK)(
+typedef BOOL (CALLBACK* LPDPLENUMLOCALAPPLICATIONSCALLBACK)(
     LPCDPLAPPINFO   lpAppInfo,
     LPVOID          lpContext,
     DWORD           dwFlags );
 
-typedef BOOL32 (CALLBACK* LPDPENUMPLAYERSCALLBACK2)(
+typedef BOOL (CALLBACK* LPDPENUMPLAYERSCALLBACK2)(
     DPID            dpId,
     DWORD           dwPlayerType,
     LPCDPNAME       lpName,
     DWORD           dwFlags,
     LPVOID          lpContext );
 
-typedef BOOL32 (CALLBACK* LPDPENUMSESSIONSCALLBACK2)(
+typedef BOOL (CALLBACK* LPDPENUMSESSIONSCALLBACK2)(
     LPCDPSESSIONDESC2   lpThisSD,
     LPDWORD             lpdwTimeOut,
     DWORD               dwFlags,
@@ -433,7 +433,7 @@ typedef struct tagLPDIRECTPLAY2_VTABLE
     STDMETHOD(AddPlayerToGroup)     (THIS_ DPID, DPID) PURE;
     STDMETHOD(Close)                (THIS) PURE;
     STDMETHOD(CreateGroup)          (THIS_ LPDPID,LPDPNAME,LPVOID,DWORD,DWORD) PURE;
-    STDMETHOD(CreatePlayer)         (THIS_ LPDPID,LPDPNAME,HANDLE32,LPVOID,DWORD,DWORD) PURE;
+    STDMETHOD(CreatePlayer)         (THIS_ LPDPID,LPDPNAME,HANDLE,LPVOID,DWORD,DWORD) PURE;
     STDMETHOD(DeletePlayerFromGroup)(THIS_ DPID,DPID) PURE;
     STDMETHOD(DestroyGroup)         (THIS_ DPID) PURE;
     STDMETHOD(DestroyPlayer)        (THIS_ DPID) PURE;
@@ -474,7 +474,7 @@ typedef struct tagLPDIRECTPLAY3_VTABLE
     STDMETHOD(AddPlayerToGroup)     (THIS_ DPID, DPID) PURE;
     STDMETHOD(Close)                (THIS) PURE;
     STDMETHOD(CreateGroup)          (THIS_ LPDPID,LPDPNAME,LPVOID,DWORD,DWORD) PURE;
-    STDMETHOD(CreatePlayer)         (THIS_ LPDPID,LPDPNAME,HANDLE32,LPVOID,DWORD,DWORD) PURE;
+    STDMETHOD(CreatePlayer)         (THIS_ LPDPID,LPDPNAME,HANDLE,LPVOID,DWORD,DWORD) PURE;
     STDMETHOD(DeletePlayerFromGroup)(THIS_ DPID,DPID) PURE;
     STDMETHOD(DestroyGroup)         (THIS_ DPID) PURE;
     STDMETHOD(DestroyPlayer)        (THIS_ DPID) PURE;
@@ -667,10 +667,10 @@ typedef struct tagLPDIRECTPLAYLOBBY_VTABLE
     STDMETHOD(EnumLocalApplications)(THIS_ LPDPLENUMLOCALAPPLICATIONSCALLBACK, LPVOID, DWORD) PURE;       
     STDMETHOD(GetConnectionSettings)(THIS_ DWORD, LPVOID, LPDWORD) PURE;                                  
     STDMETHOD(ReceiveLobbyMessage)  (THIS_ DWORD, DWORD, LPDWORD, LPVOID, LPDWORD) PURE;                  
-    STDMETHOD(RunApplication)       (THIS_ DWORD, LPDWORD, LPDPLCONNECTION, HANDLE32) PURE;               
+    STDMETHOD(RunApplication)       (THIS_ DWORD, LPDWORD, LPDPLCONNECTION, HANDLE) PURE;               
     STDMETHOD(SendLobbyMessage)     (THIS_ DWORD, DWORD, LPVOID, DWORD) PURE;                             
     STDMETHOD(SetConnectionSettings)(THIS_ DWORD, DWORD, LPDPLCONNECTION) PURE;                           
-    STDMETHOD(SetLobbyMessageEvent) (THIS_ DWORD, DWORD, HANDLE32) PURE;
+    STDMETHOD(SetLobbyMessageEvent) (THIS_ DWORD, DWORD, HANDLE) PURE;
 
 
 } DIRECTPLAYLOBBY_VTABLE, *LPDIRECTPLAYLOBBY_VTABLE;
@@ -692,10 +692,10 @@ typedef struct tagLPDIRECTPLAYLOBBY2_VTABLE
     STDMETHOD(EnumLocalApplications)(THIS_ LPDPLENUMLOCALAPPLICATIONSCALLBACK, LPVOID, DWORD) PURE;       
     STDMETHOD(GetConnectionSettings)(THIS_ DWORD, LPVOID, LPDWORD) PURE;                                  
     STDMETHOD(ReceiveLobbyMessage)  (THIS_ DWORD, DWORD, LPDWORD, LPVOID, LPDWORD) PURE;                  
-    STDMETHOD(RunApplication)       (THIS_ DWORD, LPDWORD, LPDPLCONNECTION, HANDLE32) PURE;               
+    STDMETHOD(RunApplication)       (THIS_ DWORD, LPDWORD, LPDPLCONNECTION, HANDLE) PURE;               
     STDMETHOD(SendLobbyMessage)     (THIS_ DWORD, DWORD, LPVOID, DWORD) PURE;                             
     STDMETHOD(SetConnectionSettings)(THIS_ DWORD, DWORD, LPDPLCONNECTION) PURE;                           
-    STDMETHOD(SetLobbyMessageEvent) (THIS_ DWORD, DWORD, HANDLE32) PURE;
+    STDMETHOD(SetLobbyMessageEvent) (THIS_ DWORD, DWORD, HANDLE) PURE;
 
     /*  IDirectPlayLobby2 Methods */
     STDMETHOD(CreateCompoundAddress)(THIS_ LPCDPCOMPOUNDADDRESSELEMENT, DWORD, LPVOID, LPDWORD) PURE;
diff --git a/include/drive.h b/include/drive.h
index f4aea646b90..f392c7d8d0e 100644
--- a/include/drive.h
+++ b/include/drive.h
@@ -39,13 +39,13 @@ extern const char * DRIVE_GetLabel( int drive );
 extern DWORD DRIVE_GetSerialNumber( int drive );
 extern int DRIVE_SetSerialNumber( int drive, DWORD serial );
 extern DRIVETYPE DRIVE_GetType( int drive );
-extern UINT32 DRIVE_GetFlags( int drive );
+extern UINT DRIVE_GetFlags( int drive );
 extern int DRIVE_Chdir( int drive, const char *path );
 extern int DRIVE_Disable( int drive  );
 extern int DRIVE_Enable( int drive  );
 extern int DRIVE_SetLogicalMapping ( int existing_drive, int new_drive );
 extern int DRIVE_OpenDevice( int drive, int flags );
-extern int DRIVE_RawRead(BYTE drive, DWORD begin, DWORD length, BYTE *dataptr, BOOL32 fake_success );
-extern int DRIVE_RawWrite(BYTE drive, DWORD begin, DWORD length, BYTE *dataptr, BOOL32 fake_success );
+extern int DRIVE_RawRead(BYTE drive, DWORD begin, DWORD length, BYTE *dataptr, BOOL fake_success );
+extern int DRIVE_RawWrite(BYTE drive, DWORD begin, DWORD length, BYTE *dataptr, BOOL fake_success );
 
 #endif  /* __WINE_DRIVE_H */
diff --git a/include/driver.h b/include/driver.h
index 362a8d33a6c..eee0979cb43 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -47,10 +47,8 @@ typedef struct {
     DWORD   			dwDCISize;
     LPCWSTR  			lpszDCISectionName;
     LPCWSTR  			lpszDCIAliasName;
-} DRVCONFIGINFO32, *LPDRVCONFIGINFO32;
+} DRVCONFIGINFO, *LPDRVCONFIGINFO;
 
-DECL_WINELIB_TYPE(DRVCONFIGINFO)
-DECL_WINELIB_TYPE(LPDRVCONFIGINFO)
 
 /* GetDriverInfo16 references this structure, so this a struct defined
  * in the Win16 API.
@@ -66,31 +64,27 @@ typedef struct
 
 LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, 
                                LPARAM dwParam1, LPARAM dwParam2);
-LRESULT WINAPI DefDriverProc32(DWORD dwDriverIdentifier, HDRVR32 hdrvr,
-                               UINT32 Msg, LPARAM lParam1, LPARAM lParam2);
-#define DefDriverProc WINELIB_NAME(DefDriverProc)
+LRESULT WINAPI DefDriverProc(DWORD dwDriverIdentifier, HDRVR hdrvr,
+                               UINT Msg, LPARAM lParam1, LPARAM lParam2);
 HDRVR16 WINAPI OpenDriver16(LPCSTR szDriverName, LPCSTR szSectionName,
                             LPARAM lParam2);
-HDRVR32 WINAPI OpenDriver32A(LPCSTR szDriverName, LPCSTR szSectionName,
+HDRVR WINAPI OpenDriverA(LPCSTR szDriverName, LPCSTR szSectionName,
                              LPARAM lParam2);
-HDRVR32 WINAPI OpenDriver32W(LPCWSTR szDriverName, LPCWSTR szSectionName,
+HDRVR WINAPI OpenDriverW(LPCWSTR szDriverName, LPCWSTR szSectionName,
                              LPARAM lParam2);
 #define OpenDriver WINELIB_NAME_AW(OpenDriver)
 LRESULT WINAPI CloseDriver16(HDRVR16 hDriver, LPARAM lParam1, LPARAM lParam2);
-LRESULT WINAPI CloseDriver32(HDRVR32 hDriver, LPARAM lParam1, LPARAM lParam2);
-#define CloseDriver WINELIB_NAME(CloseDriver)
+LRESULT WINAPI CloseDriver(HDRVR hDriver, LPARAM lParam1, LPARAM lParam2);
 LRESULT WINAPI SendDriverMessage16( HDRVR16 hDriver, UINT16 message,
                                     LPARAM lParam1, LPARAM lParam2 );
-LRESULT WINAPI SendDriverMessage32( HDRVR32 hDriver, UINT32 message,
+LRESULT WINAPI SendDriverMessage( HDRVR hDriver, UINT message,
                                     LPARAM lParam1, LPARAM lParam2 );
-#define SendDriverMessage WINELIB_NAME(SendDriverMessage)
 HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDriver);
-HMODULE32 WINAPI GetDriverModuleHandle32(HDRVR32 hDriver);
-#define GetDriverModuleHandle WINELIB_NAME(GetDriverModuleHandle)
+HMODULE WINAPI GetDriverModuleHandle(HDRVR hDriver);
 
 /* only win31 version for those below ? */
-HDRVR16 WINAPI GetNextDriver(HDRVR16, DWORD);
-BOOL16 WINAPI GetDriverInfo(HDRVR16, DRIVERINFOSTRUCT16 *);
+HDRVR16 WINAPI GetNextDriver16(HDRVR16, DWORD);
+BOOL16 WINAPI GetDriverInfo16(HDRVR16, DRIVERINFOSTRUCT16 *);
 
 /* The following definitions are WINE internals */
 /* FIXME: This is a WINE internal struct and should be moved in include/wine directory */
@@ -109,8 +103,8 @@ typedef struct tagWINE_DRIVER
 	  DRIVERPROC16          lpDrvProc;
        } d16;
        struct {
-	  HMODULE32		hModule;
-	  DRIVERPROC32		lpDrvProc;
+	  HMODULE		hModule;
+	  DRIVERPROC		lpDrvProc;
        } d32;
     } d;
     DWORD		  	dwDriverID;
@@ -125,18 +119,18 @@ typedef struct tagWINE_DRIVER
 #define WINE_DI_TYPE_32		0x00000002ul
 
 LPWINE_DRIVER	DRIVER_RegisterDriver16(LPCSTR, HMODULE16, DRIVERPROC16, LPARAM);
-LPWINE_DRIVER	DRIVER_RegisterDriver32(LPCSTR, HMODULE32, DRIVERPROC32, LPARAM);
+LPWINE_DRIVER	DRIVER_RegisterDriver32(LPCSTR, HMODULE, DRIVERPROC, LPARAM);
 
 #if 0
 #errro "it's never used"
 /* internal */
 typedef struct
 {
-    UINT32			length;
-    HDRVR32			hDriver;
-    HMODULE32			hModule;
+    UINT			length;
+    HDRVR			hDriver;
+    HMODULE			hModule;
     CHAR			szAliasName[128];
-} DRIVERINFOSTRUCT32A, *LPDRIVERINFOSTRUCT32A;
+} DRIVERINFOSTRUCTA, *LPDRIVERINFOSTRUCTA;
 #endif
 
 #endif  /* __WINE_DRIVER_H */
diff --git a/include/dsound.h b/include/dsound.h
index 3d874cfa917..3332c4d0413 100644
--- a/include/dsound.h
+++ b/include/dsound.h
@@ -149,7 +149,7 @@ typedef struct _DSBUFFERDESC
 typedef struct _DSBPOSITIONNOTIFY
 {
 	DWORD		dwOffset;
-	HANDLE32	hEventNotify;
+	HANDLE	hEventNotify;
 } DSBPOSITIONNOTIFY,*LPDSBPOSITIONNOTIFY;
 
 typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY;
@@ -168,8 +168,8 @@ typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY;
 
 typedef LPVOID* LPLPVOID;
 
-typedef BOOL32 (CALLBACK *LPDSENUMCALLBACK32W)(LPGUID,LPWSTR,LPWSTR,LPVOID);
-typedef BOOL32 (CALLBACK *LPDSENUMCALLBACK32A)(LPGUID,LPSTR,LPSTR,LPVOID);
+typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID,LPWSTR,LPWSTR,LPVOID);
+typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID,LPSTR,LPSTR,LPVOID);
 
 extern HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND * ppDS,IUnknown *pUnkOuter );
 
@@ -191,7 +191,7 @@ typedef struct tagLPDIRECTSOUND_VTABLE
     STDMETHOD( CreateSoundBuffer)(THIS_ LPDSBUFFERDESC, LPLPDIRECTSOUNDBUFFER, IUnknown FAR *) PURE;
     STDMETHOD( GetCaps)(THIS_ LPDSCAPS ) PURE;
     STDMETHOD( DuplicateSoundBuffer)(THIS_ LPDIRECTSOUNDBUFFER, LPLPDIRECTSOUNDBUFFER ) PURE;
-    STDMETHOD( SetCooperativeLevel)(THIS_ HWND32, DWORD ) PURE;
+    STDMETHOD( SetCooperativeLevel)(THIS_ HWND, DWORD ) PURE;
     STDMETHOD( Compact)(THIS ) PURE;
     STDMETHOD( GetSpeakerConfig)(THIS_ LPDWORD ) PURE;
     STDMETHOD( SetSpeakerConfig)(THIS_ DWORD ) PURE;
@@ -220,7 +220,7 @@ typedef struct tagLPDIRECTSOUNDBUFFER_VTABLE
     /*** IDirectSoundBuffer methods ***/
 
     STDMETHOD(           GetCaps)(THIS_ LPDSBCAPS ) PURE;
-    STDMETHOD(GetCurrentPosition)(THIS_ LPDWORD,LPDWORD ) PURE;
+    STDMETHOD(GetCurrentPosition16)(THIS_ LPDWORD,LPDWORD ) PURE;
     STDMETHOD(         GetFormat)(THIS_ LPWAVEFORMATEX, DWORD, LPDWORD ) PURE;
     STDMETHOD(         GetVolume)(THIS_ LPLONG ) PURE;
     STDMETHOD(            GetPan)(THIS_ LPLONG ) PURE;
diff --git a/include/file.h b/include/file.h
index a38ae070189..652b9bf8073 100644
--- a/include/file.h
+++ b/include/file.h
@@ -32,46 +32,46 @@ typedef struct
 
 /* files/file.c */
 extern void FILE_SetDosError(void);
-extern HFILE32 FILE_DupUnixHandle( int fd, DWORD access );
-extern BOOL32 FILE_Stat( LPCSTR unixName, BY_HANDLE_FILE_INFORMATION *info );
+extern HFILE FILE_DupUnixHandle( int fd, DWORD access );
+extern BOOL FILE_Stat( LPCSTR unixName, BY_HANDLE_FILE_INFORMATION *info );
 extern HFILE16 FILE_Dup2( HFILE16 hFile1, HFILE16 hFile2 );
-extern HFILE32 FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
+extern HFILE FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
                                 LPSECURITY_ATTRIBUTES sa, DWORD creation,
-                                DWORD attributes, HANDLE32 template );
-extern HFILE32 FILE_CreateDevice( int client_id, DWORD access,
+                                DWORD attributes, HANDLE template );
+extern HFILE FILE_CreateDevice( int client_id, DWORD access,
                                   LPSECURITY_ATTRIBUTES sa );
 extern LPVOID FILE_dommap( int unix_handle, LPVOID start,
                            DWORD size_high, DWORD size_low,
                            DWORD offset_high, DWORD offset_low,
                            int prot, int flags );
 extern int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low );
-extern HFILE16 FILE_AllocDosHandle( HANDLE32 handle );
-extern BOOL32 FILE_InitProcessDosHandles( void );
-extern HANDLE32 FILE_GetHandle32( HFILE16 hfile );
-extern HFILE16 _lcreat16_uniq( LPCSTR path, INT32 attr );
+extern HFILE16 FILE_AllocDosHandle( HANDLE handle );
+extern BOOL FILE_InitProcessDosHandles( void );
+extern HANDLE FILE_GetHandle( HFILE16 hfile );
+extern HFILE16 _lcreat16_uniq( LPCSTR path, INT attr );
 
 /* files/directory.c */
 extern int DIR_Init(void);
-extern UINT32 DIR_GetWindowsUnixDir( LPSTR path, UINT32 count );
-extern UINT32 DIR_GetSystemUnixDir( LPSTR path, UINT32 count );
+extern UINT DIR_GetWindowsUnixDir( LPSTR path, UINT count );
+extern UINT DIR_GetSystemUnixDir( LPSTR path, UINT count );
 extern DWORD DIR_SearchPath( LPCSTR path, LPCSTR name, LPCSTR ext,
-                             DOS_FULL_NAME *full_name, BOOL32 win32 );
+                             DOS_FULL_NAME *full_name, BOOL win32 );
 
 /* files/dos_fs.c */
 extern void DOSFS_UnixTimeToFileTime( time_t unixtime, LPFILETIME ft,
                                       DWORD remainder );
 extern time_t DOSFS_FileTimeToUnixTime( const FILETIME *ft, DWORD *remainder );
-extern BOOL32 DOSFS_ToDosFCBFormat( LPCSTR name, LPSTR buffer );
+extern BOOL DOSFS_ToDosFCBFormat( LPCSTR name, LPSTR buffer );
 extern const DOS_DEVICE *DOSFS_GetDevice( const char *name );
-extern const DOS_DEVICE *DOSFS_GetDeviceByHandle( HFILE32 hFile );
-extern HFILE32 DOSFS_OpenDevice( const char *name, DWORD access );
-extern BOOL32 DOSFS_FindUnixName( LPCSTR path, LPCSTR name, LPSTR long_buf,
-                                  INT32 long_len, LPSTR short_buf,
-                                  BOOL32 ignore_case );
-extern BOOL32 DOSFS_GetFullName( LPCSTR name, BOOL32 check_last,
+extern const DOS_DEVICE *DOSFS_GetDeviceByHandle( HFILE hFile );
+extern HFILE DOSFS_OpenDevice( const char *name, DWORD access );
+extern BOOL DOSFS_FindUnixName( LPCSTR path, LPCSTR name, LPSTR long_buf,
+                                  INT long_len, LPSTR short_buf,
+                                  BOOL ignore_case );
+extern BOOL DOSFS_GetFullName( LPCSTR name, BOOL check_last,
                                  DOS_FULL_NAME *full );
 extern int DOSFS_FindNext( const char *path, const char *short_mask,
                            const char *long_mask, int drive, BYTE attr,
-                           int skip, WIN32_FIND_DATA32A *entry );
+                           int skip, WIN32_FIND_DATAA *entry );
 
 #endif  /* __WINE_FILE_H */
diff --git a/include/flatthunk.h b/include/flatthunk.h
index 57e4257c368..2a8059bce17 100644
--- a/include/flatthunk.h
+++ b/include/flatthunk.h
@@ -96,7 +96,7 @@ struct ThunkDataSL
 struct SLTargetDB
 {
      struct SLTargetDB *   next;
-     PDB32 *               process;
+     PDB *               process;
      DWORD *               targetTable;
 };
 
diff --git a/include/font.h b/include/font.h
index a1bc16a2422..28cccf57fce 100644
--- a/include/font.h
+++ b/include/font.h
@@ -55,19 +55,19 @@ typedef struct {
 
 #define FONTCACHE 	32	/* dynamic font cache size */
 
-extern BOOL32 FONT_Init( UINT16* pTextCaps );
+extern BOOL FONT_Init( UINT16* pTextCaps );
 extern INT16  FONT_GetObject16( FONTOBJ * font, INT16 count, LPSTR buffer );
-extern INT32  FONT_GetObject32A( FONTOBJ * font, INT32 count, LPSTR buffer );
-extern INT32  FONT_GetObject32W( FONTOBJ * font, INT32 count, LPSTR buffer );
-extern void FONT_LogFont32ATo16( const LOGFONT32A* font32, LPLOGFONT16 font16 );
-extern void FONT_LogFont32WTo16( const LOGFONT32W* font32, LPLOGFONT16 font16 );
-extern void FONT_LogFont16To32A( const LPLOGFONT16 font16, LPLOGFONT32A font32 );
-extern void FONT_LogFont16To32W( const LPLOGFONT16 font16, LPLOGFONT32W font32 );
-extern void FONT_TextMetric32Ato16(const LPTEXTMETRIC32A ptm32, LPTEXTMETRIC16 ptm16 );
-extern void FONT_TextMetric32Wto16(const LPTEXTMETRIC32W ptm32, LPTEXTMETRIC16 ptm16 );
-extern void FONT_TextMetric16to32A(const LPTEXTMETRIC16 ptm16, LPTEXTMETRIC32A ptm32 );
-extern void FONT_TextMetric16to32W(const LPTEXTMETRIC16 ptm16, LPTEXTMETRIC32W ptm32 );
-extern void FONT_TextMetric32Ato32W(const LPTEXTMETRIC32A ptm32A, LPTEXTMETRIC32W ptm32W );
+extern INT  FONT_GetObjectA( FONTOBJ * font, INT count, LPSTR buffer );
+extern INT  FONT_GetObjectW( FONTOBJ * font, INT count, LPSTR buffer );
+extern void FONT_LogFont32ATo16( const LOGFONTA* font32, LPLOGFONT16 font16 );
+extern void FONT_LogFont32WTo16( const LOGFONTW* font32, LPLOGFONT16 font16 );
+extern void FONT_LogFont16To32A( const LPLOGFONT16 font16, LPLOGFONTA font32 );
+extern void FONT_LogFont16To32W( const LPLOGFONT16 font16, LPLOGFONTW font32 );
+extern void FONT_TextMetric32Ato16(const LPTEXTMETRICA ptm32, LPTEXTMETRIC16 ptm16 );
+extern void FONT_TextMetric32Wto16(const LPTEXTMETRICW ptm32, LPTEXTMETRIC16 ptm16 );
+extern void FONT_TextMetric16to32A(const LPTEXTMETRIC16 ptm16, LPTEXTMETRICA ptm32 );
+extern void FONT_TextMetric16to32W(const LPTEXTMETRIC16 ptm16, LPTEXTMETRICW ptm32 );
+extern void FONT_TextMetric32Ato32W(const LPTEXTMETRICA ptm32A, LPTEXTMETRICW ptm32W );
 
 
 
diff --git a/include/gdi.h b/include/gdi.h
index 90c0ea3ea7c..5ec178d9030 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -107,117 +107,117 @@ typedef struct
     short         breakExtra;        /* breakTotalExtra / breakCount */
     short         breakRem;          /* breakTotalExtra % breakCount */
 
-    RECT32        totalExtent;
+    RECT        totalExtent;
     BYTE          bitsPerPixel;
 
-    INT32         MapMode;
-    INT32         GraphicsMode;      /* Graphics mode */
-    INT32         DCOrgX;            /* DC origin */
-    INT32         DCOrgY;
+    INT         MapMode;
+    INT         GraphicsMode;      /* Graphics mode */
+    INT         DCOrgX;            /* DC origin */
+    INT         DCOrgY;
     FARPROC16     lpfnPrint;         /* AbortProc for Printing */
-    INT32         CursPosX;          /* Current position */
-    INT32         CursPosY;
-    INT32         ArcDirection;
+    INT         CursPosX;          /* Current position */
+    INT         CursPosY;
+    INT         ArcDirection;
     XFORM         xformWorld2Wnd;    /* World-to-window transformation */
     XFORM         xformWorld2Vport;  /* World-to-viewport transformation */
     XFORM         xformVport2World;  /* Inverse of the above transformation */
-    BOOL32        vport2WorldValid;  /* Is xformVport2World valid? */
+    BOOL        vport2WorldValid;  /* Is xformVport2World valid? */
 } WIN_DC_INFO;
 
 typedef struct tagDC
 {
     GDIOBJHDR      header;
-    HDC32          hSelf;            /* Handle to this DC */
+    HDC          hSelf;            /* Handle to this DC */
     const struct tagDC_FUNCS *funcs; /* DC function table */
     void          *physDev;          /* Physical device (driver-specific) */
-    INT32          saveLevel;
+    INT          saveLevel;
     DWORD          dwHookData;
     FARPROC16      hookProc;
 
-    INT32          wndOrgX;          /* Window origin */
-    INT32          wndOrgY;
-    INT32          wndExtX;          /* Window extent */
-    INT32          wndExtY;
-    INT32          vportOrgX;        /* Viewport origin */
-    INT32          vportOrgY;
-    INT32          vportExtX;        /* Viewport extent */
-    INT32          vportExtY;
+    INT          wndOrgX;          /* Window origin */
+    INT          wndOrgY;
+    INT          wndExtX;          /* Window extent */
+    INT          wndExtY;
+    INT          vportOrgX;        /* Viewport origin */
+    INT          vportOrgY;
+    INT          vportExtX;        /* Viewport extent */
+    INT          vportExtY;
 
     WIN_DC_INFO w;
 } DC;
 
 /* Device functions for the Wine driver interface */
 
-typedef INT32 (*DEVICEFONTENUMPROC)(LPENUMLOGFONT16,LPNEWTEXTMETRIC16,UINT16,LPARAM);
+typedef INT (*DEVICEFONTENUMPROC)(LPENUMLOGFONT16,LPNEWTEXTMETRIC16,UINT16,LPARAM);
 
 typedef struct tagDC_FUNCS
 {
-    BOOL32     (*pArc)(DC*,INT32,INT32,INT32,INT32,INT32,INT32,INT32,INT32);
-    BOOL32     (*pBitBlt)(DC*,INT32,INT32,INT32,INT32,DC*,INT32,INT32,DWORD);
-    LONG       (*pBitmapBits)(HBITMAP32,void*,LONG,WORD);
-    BOOL32     (*pChord)(DC*,INT32,INT32,INT32,INT32,INT32,INT32,INT32,INT32);
-    BOOL32     (*pCreateBitmap)(HBITMAP32); 
-    BOOL32     (*pCreateDC)(DC*,LPCSTR,LPCSTR,LPCSTR,const DEVMODE16*);
-    BOOL32     (*pDeleteDC)(DC*);
-    BOOL32     (*pDeleteObject)(HGDIOBJ32);
-    BOOL32     (*pEllipse)(DC*,INT32,INT32,INT32,INT32);
-    BOOL32     (*pEnumDeviceFonts)(DC*,LPLOGFONT16,DEVICEFONTENUMPROC,LPARAM);
-    INT32      (*pEscape)(DC*,INT32,INT32,SEGPTR,SEGPTR);
-    INT32      (*pExcludeClipRect)(DC*,INT32,INT32,INT32,INT32);
-    INT32      (*pExcludeVisRect)(DC*,INT32,INT32,INT32,INT32);
-    BOOL32     (*pExtFloodFill)(DC*,INT32,INT32,COLORREF,UINT32);
-    BOOL32     (*pExtTextOut)(DC*,INT32,INT32,UINT32,const RECT32*,LPCSTR,UINT32,const INT32*);
-    BOOL32     (*pGetCharWidth)(DC*,UINT32,UINT32,LPINT32);
-    COLORREF   (*pGetPixel)(DC*,INT32,INT32);
-    BOOL32     (*pGetTextExtentPoint)(DC*,LPCSTR,INT32,LPSIZE32);
-    BOOL32     (*pGetTextMetrics)(DC*,TEXTMETRIC32A*);
-    INT32      (*pIntersectClipRect)(DC*,INT32,INT32,INT32,INT32);
-    INT32      (*pIntersectVisRect)(DC*,INT32,INT32,INT32,INT32);
-    BOOL32     (*pLineTo)(DC*,INT32,INT32);
-    HANDLE32   (*pLoadOEMResource)(WORD,WORD);
-    BOOL32     (*pMoveToEx)(DC*,INT32,INT32,LPPOINT32);
-    INT32      (*pOffsetClipRgn)(DC*,INT32,INT32);
-    BOOL32     (*pOffsetViewportOrg)(DC*,INT32,INT32);
-    BOOL32     (*pOffsetWindowOrg)(DC*,INT32,INT32);
-    BOOL32     (*pPaintRgn)(DC*,HRGN32);
-    BOOL32     (*pPatBlt)(DC*,INT32,INT32,INT32,INT32,DWORD);
-    BOOL32     (*pPie)(DC*,INT32,INT32,INT32,INT32,INT32,INT32,INT32,INT32);
-    BOOL32     (*pPolyPolygon)(DC*,const POINT32*,const INT32*,UINT32);
-    BOOL32     (*pPolyPolyline)(DC*,const POINT32*,const DWORD*,DWORD);
-    BOOL32     (*pPolygon)(DC*,const POINT32*,INT32);
-    BOOL32     (*pPolyline)(DC*,const POINT32*,INT32);
-    BOOL32     (*pPolyBezier)(DC*,POINT32, const POINT32*,DWORD);
-    UINT32     (*pRealizePalette)(DC*);
-    BOOL32     (*pRectangle)(DC*,INT32,INT32,INT32,INT32);
-    BOOL32     (*pRestoreDC)(DC*,INT32);
-    BOOL32     (*pRoundRect)(DC*,INT32,INT32,INT32,INT32,INT32,INT32);
-    INT32      (*pSaveDC)(DC*);
-    BOOL32     (*pScaleViewportExt)(DC*,INT32,INT32,INT32,INT32);
-    BOOL32     (*pScaleWindowExt)(DC*,INT32,INT32,INT32,INT32);
-    INT32      (*pSelectClipRgn)(DC*,HRGN32);
-    HANDLE32   (*pSelectObject)(DC*,HANDLE32);
-    HPALETTE32 (*pSelectPalette)(DC*,HPALETTE32,BOOL32);
+    BOOL     (*pArc)(DC*,INT,INT,INT,INT,INT,INT,INT,INT);
+    BOOL     (*pBitBlt)(DC*,INT,INT,INT,INT,DC*,INT,INT,DWORD);
+    LONG       (*pBitmapBits)(HBITMAP,void*,LONG,WORD);
+    BOOL     (*pChord)(DC*,INT,INT,INT,INT,INT,INT,INT,INT);
+    BOOL     (*pCreateBitmap)(HBITMAP); 
+    BOOL     (*pCreateDC)(DC*,LPCSTR,LPCSTR,LPCSTR,const DEVMODE16*);
+    BOOL     (*pDeleteDC)(DC*);
+    BOOL     (*pDeleteObject)(HGDIOBJ);
+    BOOL     (*pEllipse)(DC*,INT,INT,INT,INT);
+    BOOL     (*pEnumDeviceFonts)(DC*,LPLOGFONT16,DEVICEFONTENUMPROC,LPARAM);
+    INT      (*pEscape)(DC*,INT,INT,SEGPTR,SEGPTR);
+    INT      (*pExcludeClipRect)(DC*,INT,INT,INT,INT);
+    INT      (*pExcludeVisRect)(DC*,INT,INT,INT,INT);
+    BOOL     (*pExtFloodFill)(DC*,INT,INT,COLORREF,UINT);
+    BOOL     (*pExtTextOut)(DC*,INT,INT,UINT,const RECT*,LPCSTR,UINT,const INT*);
+    BOOL     (*pGetCharWidth)(DC*,UINT,UINT,LPINT);
+    COLORREF   (*pGetPixel)(DC*,INT,INT);
+    BOOL     (*pGetTextExtentPoint)(DC*,LPCSTR,INT,LPSIZE);
+    BOOL     (*pGetTextMetrics)(DC*,TEXTMETRICA*);
+    INT      (*pIntersectClipRect)(DC*,INT,INT,INT,INT);
+    INT      (*pIntersectVisRect)(DC*,INT,INT,INT,INT);
+    BOOL     (*pLineTo)(DC*,INT,INT);
+    HANDLE   (*pLoadOEMResource)(WORD,WORD);
+    BOOL     (*pMoveToEx)(DC*,INT,INT,LPPOINT);
+    INT      (*pOffsetClipRgn)(DC*,INT,INT);
+    BOOL     (*pOffsetViewportOrg)(DC*,INT,INT);
+    BOOL     (*pOffsetWindowOrg)(DC*,INT,INT);
+    BOOL     (*pPaintRgn)(DC*,HRGN);
+    BOOL     (*pPatBlt)(DC*,INT,INT,INT,INT,DWORD);
+    BOOL     (*pPie)(DC*,INT,INT,INT,INT,INT,INT,INT,INT);
+    BOOL     (*pPolyPolygon)(DC*,const POINT*,const INT*,UINT);
+    BOOL     (*pPolyPolyline)(DC*,const POINT*,const DWORD*,DWORD);
+    BOOL     (*pPolygon)(DC*,const POINT*,INT);
+    BOOL     (*pPolyline)(DC*,const POINT*,INT);
+    BOOL     (*pPolyBezier)(DC*,POINT, const POINT*,DWORD);
+    UINT     (*pRealizePalette)(DC*);
+    BOOL     (*pRectangle)(DC*,INT,INT,INT,INT);
+    BOOL     (*pRestoreDC)(DC*,INT);
+    BOOL     (*pRoundRect)(DC*,INT,INT,INT,INT,INT,INT);
+    INT      (*pSaveDC)(DC*);
+    BOOL     (*pScaleViewportExt)(DC*,INT,INT,INT,INT);
+    BOOL     (*pScaleWindowExt)(DC*,INT,INT,INT,INT);
+    INT      (*pSelectClipRgn)(DC*,HRGN);
+    HANDLE   (*pSelectObject)(DC*,HANDLE);
+    HPALETTE (*pSelectPalette)(DC*,HPALETTE,BOOL);
     COLORREF   (*pSetBkColor)(DC*,COLORREF);
     WORD       (*pSetBkMode)(DC*,WORD);
     VOID       (*pSetDeviceClipping)(DC*);
-    INT32      (*pSetDIBitsToDevice)(DC*,INT32,INT32,DWORD,DWORD,INT32,INT32,UINT32,UINT32,LPCVOID,const BITMAPINFO*,UINT32);
-    INT32      (*pSetMapMode)(DC*,INT32);
+    INT      (*pSetDIBitsToDevice)(DC*,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT);
+    INT      (*pSetMapMode)(DC*,INT);
     DWORD      (*pSetMapperFlags)(DC*,DWORD);
-    COLORREF   (*pSetPixel)(DC*,INT32,INT32,COLORREF);
+    COLORREF   (*pSetPixel)(DC*,INT,INT,COLORREF);
     WORD       (*pSetPolyFillMode)(DC*,WORD);
     WORD       (*pSetROP2)(DC*,WORD);
     WORD       (*pSetRelAbs)(DC*,WORD);
     WORD       (*pSetStretchBltMode)(DC*,WORD);
     WORD       (*pSetTextAlign)(DC*,WORD);
-    INT32      (*pSetTextCharacterExtra)(DC*,INT32);
+    INT      (*pSetTextCharacterExtra)(DC*,INT);
     DWORD      (*pSetTextColor)(DC*,DWORD);
-    INT32      (*pSetTextJustification)(DC*,INT32,INT32);
-    BOOL32     (*pSetViewportExt)(DC*,INT32,INT32);
-    BOOL32     (*pSetViewportOrg)(DC*,INT32,INT32);
-    BOOL32     (*pSetWindowExt)(DC*,INT32,INT32);
-    BOOL32     (*pSetWindowOrg)(DC*,INT32,INT32);
-    BOOL32     (*pStretchBlt)(DC*,INT32,INT32,INT32,INT32,DC*,INT32,INT32,INT32,INT32,DWORD);
-    INT32     (*pStretchDIBits)(DC*,INT32,INT32,INT32,INT32,INT32,INT32,INT32,INT32,const void *,const BITMAPINFO *,UINT32,DWORD);
+    INT      (*pSetTextJustification)(DC*,INT,INT);
+    BOOL     (*pSetViewportExt)(DC*,INT,INT);
+    BOOL     (*pSetViewportOrg)(DC*,INT,INT);
+    BOOL     (*pSetWindowExt)(DC*,INT,INT);
+    BOOL     (*pSetWindowOrg)(DC*,INT,INT);
+    BOOL     (*pStretchBlt)(DC*,INT,INT,INT,INT,DC*,INT,INT,INT,INT,DWORD);
+    INT     (*pStretchDIBits)(DC*,INT,INT,INT,INT,INT,INT,INT,INT,const void *,const BITMAPINFO *,UINT,DWORD);
 } DC_FUNCTIONS;
 
   /* LoadOEMResource types */
@@ -284,7 +284,7 @@ typedef struct tagFLOAT_POINT
  * transformation process is done in floating point internally. This function
  * is then used to round these coordinates to integer values.
  */
-static __inline__ INT32 WINE_UNUSED GDI_ROUND(FLOAT val)
+static __inline__ INT WINE_UNUSED GDI_ROUND(FLOAT val)
 {
    return (int)floor(val + 0.5);
 }
@@ -292,7 +292,7 @@ static __inline__ INT32 WINE_UNUSED GDI_ROUND(FLOAT val)
 /* Performs a viewport-to-world transformation on the specified point (which
  * is in floating point format). Returns TRUE if successful, else FALSE.
  */
-static __inline__ BOOL32 WINE_UNUSED INTERNAL_DPTOLP_FLOAT(DC *dc, FLOAT_POINT *point)
+static __inline__ BOOL WINE_UNUSED INTERNAL_DPTOLP_FLOAT(DC *dc, FLOAT_POINT *point)
 {
     FLOAT x, y;
     
@@ -316,7 +316,7 @@ static __inline__ BOOL32 WINE_UNUSED INTERNAL_DPTOLP_FLOAT(DC *dc, FLOAT_POINT *
 /* Performs a viewport-to-world transformation on the specified point (which
  * is in integer format). Returns TRUE if successful, else FALSE.
  */
-static __inline__ BOOL32 WINE_UNUSED INTERNAL_DPTOLP(DC *dc, LPPOINT32 point)
+static __inline__ BOOL WINE_UNUSED INTERNAL_DPTOLP(DC *dc, LPPOINT point)
 {
     FLOAT_POINT floatPoint;
     
@@ -354,7 +354,7 @@ static __inline__ void WINE_UNUSED INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *po
 /* Performs a world-to-viewport transformation on the specified point (which
  * is in integer format).
  */
-static __inline__ void WINE_UNUSED INTERNAL_LPTODP(DC *dc, LPPOINT32 point)
+static __inline__ void WINE_UNUSED INTERNAL_LPTODP(DC *dc, LPPOINT point)
 {
     FLOAT_POINT floatPoint;
     
@@ -410,13 +410,13 @@ extern WORD GDI_HeapSel;
       ((HGDIOBJ16)(handle)<=LAST_STOCK_HANDLE)) ? \
       0 : LOCAL_Unlock( GDI_HeapSel, (handle) ))
 
-extern BOOL32 GDI_Init(void);
+extern BOOL GDI_Init(void);
 extern HGDIOBJ16 GDI_AllocObject( WORD, WORD );
-extern BOOL32 GDI_FreeObject( HGDIOBJ16 );
+extern BOOL GDI_FreeObject( HGDIOBJ16 );
 extern GDIOBJHDR * GDI_GetObjPtr( HGDIOBJ16, WORD );
 
-extern BOOL32 DRIVER_RegisterDriver( LPCSTR name, const DC_FUNCTIONS *funcs );
+extern BOOL DRIVER_RegisterDriver( LPCSTR name, const DC_FUNCTIONS *funcs );
 extern const DC_FUNCTIONS *DRIVER_FindDriver( LPCSTR name );
-extern BOOL32 DRIVER_UnregisterDriver( LPCSTR name );
+extern BOOL DRIVER_UnregisterDriver( LPCSTR name );
 
 #endif  /* __WINE_GDI_H */
diff --git a/include/global.h b/include/global.h
index 73f80116927..1a9ee6635b4 100644
--- a/include/global.h
+++ b/include/global.h
@@ -27,19 +27,19 @@ extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner,
                                BOOL16 isCode, BOOL16 is32Bit,
                                BOOL16 isReadOnly );
 
-extern WORD WINAPI GlobalHandleToSel( HGLOBAL16 handle );
+extern WORD WINAPI GlobalHandleToSel16( HGLOBAL16 handle );
 
 /* memory/virtual.c */
-extern BOOL32 VIRTUAL_Init( void );
+extern BOOL VIRTUAL_Init( void );
 extern DWORD VIRTUAL_GetPageSize(void);
 extern DWORD VIRTUAL_GetGranularity(void);
 extern LPVOID VIRTUAL_MapFileW( LPCWSTR name );
 
-typedef BOOL32 (*HANDLERPROC)(LPVOID, LPCVOID);
-extern BOOL32 VIRTUAL_SetFaultHandler(LPCVOID addr, HANDLERPROC proc, LPVOID arg);
-extern BOOL32 VIRTUAL_HandleFault(LPCVOID addr);
+typedef BOOL (*HANDLERPROC)(LPVOID, LPCVOID);
+extern BOOL VIRTUAL_SetFaultHandler(LPCVOID addr, HANDLERPROC proc, LPVOID arg);
+extern BOOL VIRTUAL_HandleFault(LPCVOID addr);
 
 /* memory/atom.c */
-extern BOOL32 ATOM_Init( WORD globalTableSel );
+extern BOOL ATOM_Init( WORD globalTableSel );
 
 #endif  /* __WINE_GLOBAL_H */
diff --git a/include/header.h b/include/header.h
index df6e0e5e40c..9d3ada91ec4 100644
--- a/include/header.h
+++ b/include/header.h
@@ -10,40 +10,40 @@
 
 typedef struct 
 {
-    INT32     cxy;
-    HBITMAP32 hbm;
+    INT     cxy;
+    HBITMAP hbm;
     LPWSTR    pszText;
-    INT32     fmt;
+    INT     fmt;
     LPARAM    lParam;
-    INT32     iImage;
-    INT32     iOrder;		/* see documentation of HD_ITEM */
+    INT     iImage;
+    INT     iOrder;		/* see documentation of HD_ITEM */
 
-    BOOL32    bDown;		/* is item pressed? (used for drawing) */
-    RECT32    rect;		/* bounding rectangle of the item */
+    BOOL    bDown;		/* is item pressed? (used for drawing) */
+    RECT    rect;		/* bounding rectangle of the item */
 } HEADER_ITEM;
 
 
 typedef struct
 {
-    UINT32      uNumItem;	/* number of items (columns) */
-    INT32       nHeight;	/* height of the header (pixels) */
-    HFONT32     hFont;		/* handle to the current font */
-    HCURSOR32   hcurArrow;	/* handle to the arrow cursor */
-    HCURSOR32   hcurDivider;	/* handle to a cursor (used over dividers) <-|-> */
-    HCURSOR32   hcurDivopen;	/* handle to a cursor (used over dividers) <-||-> */
-    BOOL32      bCaptured;	/* Is the mouse captured? */
-    BOOL32      bPressed;	/* Is a header item pressed (down)? */
-    BOOL32      bTracking;	/* Is in tracking mode? */
-    BOOL32      bUnicode;       /* Unicode flag */
-    INT32       iMoveItem;	/* index of tracked item. (Tracking mode) */
-    INT32       xTrackOffset;	/* distance between the right side of the tracked item and the cursor */
-    INT32       xOldTrack;	/* track offset (see above) after the last WM_MOUSEMOVE */
-    INT32       nOldWidth;	/* width of a sizing item after the last WM_MOUSEMOVE */
-    INT32       iHotItem;	/* index of hot item (cursor is over this item) */
+    UINT      uNumItem;	/* number of items (columns) */
+    INT       nHeight;	/* height of the header (pixels) */
+    HFONT     hFont;		/* handle to the current font */
+    HCURSOR   hcurArrow;	/* handle to the arrow cursor */
+    HCURSOR   hcurDivider;	/* handle to a cursor (used over dividers) <-|-> */
+    HCURSOR   hcurDivopen;	/* handle to a cursor (used over dividers) <-||-> */
+    BOOL      bCaptured;	/* Is the mouse captured? */
+    BOOL      bPressed;	/* Is a header item pressed (down)? */
+    BOOL      bTracking;	/* Is in tracking mode? */
+    BOOL      bUnicode;       /* Unicode flag */
+    INT       iMoveItem;	/* index of tracked item. (Tracking mode) */
+    INT       xTrackOffset;	/* distance between the right side of the tracked item and the cursor */
+    INT       xOldTrack;	/* track offset (see above) after the last WM_MOUSEMOVE */
+    INT       nOldWidth;	/* width of a sizing item after the last WM_MOUSEMOVE */
+    INT       iHotItem;	/* index of hot item (cursor is over this item) */
 
     HIMAGELIST  himl;		/* handle to a image list (may be 0) */
     HEADER_ITEM *items;		/* pointer to array of HEADER_ITEM's */
-    LPINT32     pOrder;         /* pointer to order array */
+    LPINT     pOrder;         /* pointer to order array */
 } HEADER_INFO;
 
 
diff --git a/include/heap.h b/include/heap.h
index 269b5bc1155..9b66825cc4c 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -9,17 +9,17 @@
 
 #include "winbase.h"
 
-extern HANDLE32 SystemHeap;
-extern HANDLE32 SegptrHeap;
+extern HANDLE SystemHeap;
+extern HANDLE SegptrHeap;
 extern CRITICAL_SECTION *HEAP_SystemLock;
 
-extern int HEAP_IsInsideHeap( HANDLE32 heap, DWORD flags, LPCVOID ptr );
-extern SEGPTR HEAP_GetSegptr( HANDLE32 heap, DWORD flags, LPCVOID ptr );
-extern LPVOID HEAP_xalloc( HANDLE32 heap, DWORD flags, DWORD size );
-extern LPSTR HEAP_strdupA( HANDLE32 heap, DWORD flags, LPCSTR str );
-extern LPWSTR HEAP_strdupW( HANDLE32 heap, DWORD flags, LPCWSTR str );
-extern LPWSTR HEAP_strdupAtoW( HANDLE32 heap, DWORD flags, LPCSTR str );
-extern LPSTR HEAP_strdupWtoA( HANDLE32 heap, DWORD flags, LPCWSTR str );
+extern int HEAP_IsInsideHeap( HANDLE heap, DWORD flags, LPCVOID ptr );
+extern SEGPTR HEAP_GetSegptr( HANDLE heap, DWORD flags, LPCVOID ptr );
+extern LPVOID HEAP_xalloc( HANDLE heap, DWORD flags, DWORD size );
+extern LPSTR HEAP_strdupA( HANDLE heap, DWORD flags, LPCSTR str );
+extern LPWSTR HEAP_strdupW( HANDLE heap, DWORD flags, LPCWSTR str );
+extern LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
+extern LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str );
 
 /* SEGPTR helper macros */
 
@@ -56,7 +56,7 @@ typedef struct
     WORD wFlags;
     union {
         struct {
-            HANDLE32 hMem;
+            HANDLE hMem;
             DWORD dwReserved[3];
         } Block;
         struct {
diff --git a/include/hook.h b/include/hook.h
index 9d53a110041..b98786ac773 100644
--- a/include/hook.h
+++ b/include/hook.h
@@ -25,28 +25,26 @@ typedef struct
 typedef struct
 {
   LPARAM        lParam;
-  WPARAM32      wParam;
-  UINT32        message;
-  HWND32        hwnd;
-} CWPSTRUCT32, *LPCWPSTRUCT32;
+  WPARAM      wParam;
+  UINT        message;
+  HWND        hwnd;
+} CWPSTRUCT, *LPCWPSTRUCT;
 
-DECL_WINELIB_TYPE(CWPSTRUCT)
-DECL_WINELIB_TYPE(LPCWPSTRUCT)
 
 /* hook type mask */
 #define HOOK_MAPTYPE (HOOK_WIN16 | HOOK_WIN32A | HOOK_WIN32W)
 
 extern HOOKPROC16 HOOK_GetProc16( HHOOK hhook );
-extern BOOL32 HOOK_IsHooked( INT16 id );
+extern BOOL HOOK_IsHooked( INT16 id );
 extern LRESULT HOOK_CallHooks16( INT16 id, INT16 code, WPARAM16 wParam,
 				 LPARAM lParam );
-extern LRESULT HOOK_CallHooks32A( INT32 id, INT32 code, WPARAM32 wParam,
+extern LRESULT HOOK_CallHooksA( INT id, INT code, WPARAM wParam,
 				  LPARAM lParam );
-extern LRESULT HOOK_CallHooks32W( INT32 id, INT32 code, WPARAM32 wParam,
+extern LRESULT HOOK_CallHooksW( INT id, INT code, WPARAM wParam,
 				  LPARAM lParam );
 extern void HOOK_FreeModuleHooks( HMODULE16 hModule );
 extern void HOOK_FreeQueueHooks( HQUEUE16 hQueue );
 extern void HOOK_ResetQueueHooks( HQUEUE16 hQueue );
-extern HOOKPROC32 HOOK_GetProc( HHOOK hook );
+extern HOOKPROC HOOK_GetProc( HHOOK hook );
 
 #endif  /* __WINE_HOOK_H */
diff --git a/include/hotkey.h b/include/hotkey.h
index c8dc19dcb9c..46f813c7e04 100644
--- a/include/hotkey.h
+++ b/include/hotkey.h
@@ -9,9 +9,9 @@
 
 typedef struct tagHOTKEY_INFO
 {
-    HFONT32 hFont;
-    BOOL32  bFocus;
-    INT32   nHeight;
+    HFONT hFont;
+    BOOL  bFocus;
+    INT   nHeight;
 
 } HOTKEY_INFO;
 
diff --git a/include/imagehlp.h b/include/imagehlp.h
index 53897be0090..fc404b20330 100644
--- a/include/imagehlp.h
+++ b/include/imagehlp.h
@@ -13,13 +13,13 @@
  * Types
  */
 
-typedef PVOID DIGEST_HANDLE32; 
+typedef PVOID DIGEST_HANDLE; 
 
 /***********************************************************************
  * Enums/Defines
  */
 
-typedef enum _IMAGEHLP_STATUS_REASON32 {
+typedef enum _IMAGEHLP_STATUS_REASON {
   BindOutOfMemory,
   BindRvaToVaFailed,
   BindNoRoomInImage,
@@ -34,7 +34,7 @@ typedef enum _IMAGEHLP_STATUS_REASON32 {
   BindImageComplete,
   BindMismatchedSymbols,
   BindSymbolsNotUpdated
-} IMAGEHLP_STATUS_REASON32;
+} IMAGEHLP_STATUS_REASON;
 
 #define BIND_NO_BOUND_IMPORTS  0x00000001
 #define BIND_NO_UPDATE         0x00000002
@@ -82,12 +82,12 @@ typedef enum _IMAGEHLP_STATUS_REASON32 {
 #define CHECKSUM_MAPVIEW_FAILURE 3
 #define CHECKSUM_UNICODE_FAILURE 4
 
-typedef enum _ADRESS_MODE32 {
+typedef enum _ADRESS_MODE {
   AddrMode1616,
   AddrMode1632,
   AddrModeReal,
   AddrModeFlat
-} ADDRESS_MODE32;
+} ADDRESS_MODE;
 
 #define SYMOPT_CASE_INSENSITIVE  0x00000001
 #define SYMOPT_UNDNAME           0x00000002
@@ -99,7 +99,7 @@ typedef enum _ADRESS_MODE32 {
 #define SYMF_OMAP_GENERATED   0x00000001
 #define SYMF_OMAP_MODIFIED    0x00000002
 
-typedef enum _SYM_TYPE32 {
+typedef enum _SYM_TYPE {
   SymNone,
   SymCoff,
   SymCv,
@@ -143,14 +143,14 @@ typedef enum _SYM_TYPE32 {
  * Structures
  */
 
-typedef struct _IMAGE_DATA_DIRECTORY32 {
+typedef struct _IMAGE_DATA_DIRECTORY {
   DWORD VirtualAddress;
   DWORD Size;
-} IMAGE_DATA_DIRECTORY32, *PIMAGE_DATA_DIRECTORY32;
+} IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY;
 
 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
 
-typedef struct _IMAGE_OPTIONAL_HEADER32 {
+typedef struct _IMAGE_OPTIONAL_HEADER {
 
   /* Standard fields */
 
@@ -187,10 +187,10 @@ typedef struct _IMAGE_OPTIONAL_HEADER32 {
   DWORD SizeOfHeapCommit;
   DWORD LoaderFlags;
   DWORD NumberOfRvaAndSizes;
-  IMAGE_DATA_DIRECTORY32 DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
-} IMAGE_OPTIONAL_HEADER32, *PIMAGE_OPTIONAL_HEADER32;
+  IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
+} IMAGE_OPTIONAL_HEADER, *PIMAGE_OPTIONAL_HEADER;
 
-typedef struct _IMAGE_FILE_HEADER32 {
+typedef struct _IMAGE_FILE_HEADER {
   WORD  Machine;
   WORD  NumberOfSections;
   DWORD TimeDateStamp;
@@ -198,17 +198,17 @@ typedef struct _IMAGE_FILE_HEADER32 {
   DWORD NumberOfSymbols;
   WORD  SizeOfOptionalHeader;
   WORD  Characteristics;
-} IMAGE_FILE_HEADER32, *PIMAGE_FILE_HEADER32;
+} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER;
 
-typedef struct _IMAGE_NT_HEADERS32 {
+typedef struct _IMAGE_NT_HEADERS {
   DWORD Signature;
-  IMAGE_FILE_HEADER32 FileHeader;
-  IMAGE_OPTIONAL_HEADER32 OptionalHeader;
-} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32;
+  IMAGE_FILE_HEADER FileHeader;
+  IMAGE_OPTIONAL_HEADER OptionalHeader;
+} IMAGE_NT_HEADERS, *PIMAGE_NT_HEADERS;
 
 #define IMAGE_SIZEOF_SHORT_NAME 8
 
-typedef struct _IMAGE_SECTION_HEADER32 {
+typedef struct _IMAGE_SECTION_HEADER {
   BYTE  Name[IMAGE_SIZEOF_SHORT_NAME];
   union {
     DWORD PhysicalAddress;
@@ -222,24 +222,24 @@ typedef struct _IMAGE_SECTION_HEADER32 {
   WORD  NumberOfRelocations;
   WORD  NumberOfLinenumbers;
   DWORD Characteristics;
-} IMAGE_SECTION_HEADER32, *PIMAGE_SECTION_HEADER32;
+} IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER;
 
-typedef struct _LOADED_IMAGE32 {
+typedef struct _LOADED_IMAGE {
   LPSTR                   ModuleName;
-  HANDLE32                hFile;
+  HANDLE                hFile;
   PUCHAR                  MappedAddress;
-  PIMAGE_NT_HEADERS32     FileHeader;
-  PIMAGE_SECTION_HEADER32 LastRvaSection;
+  PIMAGE_NT_HEADERS     FileHeader;
+  PIMAGE_SECTION_HEADER LastRvaSection;
   ULONG                   NumberOfSections;
-  PIMAGE_SECTION_HEADER32 Sections;
+  PIMAGE_SECTION_HEADER Sections;
   ULONG                   Characteristics;
   BOOLEAN                 fSystemImage;
   BOOLEAN                 fDOSImage;
-  LIST_ENTRY32            Links;
+  LIST_ENTRY            Links;
   ULONG                   SizeOfImage;
-} LOADED_IMAGE32, *PLOADED_IMAGE32;
+} LOADED_IMAGE, *PLOADED_IMAGE;
 
-typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY32 {
+typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY {
   DWORD Characteristics;
   DWORD TimeDateStamp;
   WORD  MajorVersion;
@@ -258,29 +258,29 @@ typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY32 {
   WORD  Reserved1;
   PVOID EditList;
   DWORD Reserved[1];
-} IMAGE_LOAD_CONFIG_DIRECTORY32, *PIMAGE_LOAD_CONFIG_DIRECTORY32;
+} IMAGE_LOAD_CONFIG_DIRECTORY, *PIMAGE_LOAD_CONFIG_DIRECTORY;
 
-typedef struct _WIN_CERTIFICATE32 {
+typedef struct _WIN_CERTIFICATE {
   DWORD dwLength;
   WORD  wRevision;                   /*  WIN_CERT_REVISON_xxx */ 
   WORD  wCertificateType;            /*  WIN_CERT_TYPE_xxx */
   BYTE  bCertificate[ANYSIZE_ARRAY];
-} WIN_CERTIFICATE32, *PWIN_CERTIFICATE32;
+} WIN_CERTIFICATE, *PWIN_CERTIFICATE;
 
-typedef struct _API_VERSION32 {
+typedef struct _API_VERSION {
   USHORT  MajorVersion;
   USHORT  MinorVersion;
   USHORT  Revision;
   USHORT  Reserved;
-} API_VERSION32, *PAPI_VERSION32;
+} API_VERSION, *PAPI_VERSION;
 
-typedef struct _IMAGE_FUNCTION_ENTRY32 {
+typedef struct _IMAGE_FUNCTION_ENTRY {
   DWORD StartingAddress;
   DWORD EndingAddress;
   DWORD EndOfPrologue;
-} IMAGE_FUNCTION_ENTRY32, *PIMAGE_FUNCTION_ENTRY32;
+} IMAGE_FUNCTION_ENTRY, *PIMAGE_FUNCTION_ENTRY;
 
-typedef struct _IMAGE_DEBUG_DIRECTORY32 {
+typedef struct _IMAGE_DEBUG_DIRECTORY {
   DWORD Characteristics;
   DWORD TimeDateStamp;
   WORD  MajorVersion;
@@ -289,9 +289,9 @@ typedef struct _IMAGE_DEBUG_DIRECTORY32 {
   DWORD SizeOfData;
   DWORD AddressOfRawData;
   DWORD PointerToRawData;
-} IMAGE_DEBUG_DIRECTORY32, *PIMAGE_DEBUG_DIRECTORY32;
+} IMAGE_DEBUG_DIRECTORY, *PIMAGE_DEBUG_DIRECTORY;
 
-typedef struct _IMAGE_COFF_SYMBOLS_HEADER32 {
+typedef struct _IMAGE_COFF_SYMBOLS_HEADER {
   DWORD NumberOfSymbols;
   DWORD LvaToFirstSymbol;
   DWORD NumberOfLinenumbers;
@@ -300,9 +300,9 @@ typedef struct _IMAGE_COFF_SYMBOLS_HEADER32 {
   DWORD RvaToLastByteOfCode;
   DWORD RvaToFirstByteOfData;
   DWORD RvaToLastByteOfData;
-} IMAGE_COFF_SYMBOLS_HEADER32, *PIMAGE_COFF_SYMBOLS_HEADER32;
+} IMAGE_COFF_SYMBOLS_HEADER, *PIMAGE_COFF_SYMBOLS_HEADER;
 
-typedef struct _FPO_DATA32 {
+typedef struct _FPO_DATA {
   DWORD ulOffStart;
   DWORD cbProcSize;
   DWORD cdwLocals;
@@ -313,10 +313,10 @@ typedef struct _FPO_DATA32 {
   WORD  fUseBP   : 1;
   WORD  reserved : 1;
   WORD  cbFrame  : 2;
-} FPO_DATA32, *PFPO_DATA32;
+} FPO_DATA, *PFPO_DATA;
 
-typedef struct _IMAGE_DEBUG_INFORMATION32 {
-  LIST_ENTRY32 List;
+typedef struct _IMAGE_DEBUG_INFORMATION {
+  LIST_ENTRY List;
   DWORD        Size;
   PVOID        MappedBase;
   USHORT       Machine;
@@ -326,21 +326,21 @@ typedef struct _IMAGE_DEBUG_INFORMATION32 {
   DWORD        SizeOfImage;
   
   DWORD NumberOfSections;
-  PIMAGE_SECTION_HEADER32 Sections;
+  PIMAGE_SECTION_HEADER Sections;
 
   DWORD ExportedNamesSize;
   LPSTR ExportedNames;
 
   DWORD NumberOfFunctionTableEntries;
-  PIMAGE_FUNCTION_ENTRY32 FunctionTableEntries;
+  PIMAGE_FUNCTION_ENTRY FunctionTableEntries;
   DWORD LowestFunctionStartingAddress;
   DWORD HighestFunctionEndingAddress;
 
   DWORD NumberOfFpoTableEntries;
-  PFPO_DATA32 FpoTableEntries;
+  PFPO_DATA FpoTableEntries;
 
   DWORD SizeOfCoffSymbols;
-  PIMAGE_COFF_SYMBOLS_HEADER32 CoffSymbols;
+  PIMAGE_COFF_SYMBOLS_HEADER CoffSymbols;
 
   DWORD SizeOfCodeViewSymbols;
   PVOID CodeViewSymbols;
@@ -351,20 +351,20 @@ typedef struct _IMAGE_DEBUG_INFORMATION32 {
 
   DWORD TimeDateStamp;
 
-  BOOL32 RomImage;
-  PIMAGE_DEBUG_DIRECTORY32 DebugDirectory;
+  BOOL RomImage;
+  PIMAGE_DEBUG_DIRECTORY DebugDirectory;
   DWORD  NumberOfDebugDirectories;
 
   DWORD Reserved[3];
-} IMAGE_DEBUG_INFORMATION32, *PIMAGE_DEBUG_INFORMATION32;
+} IMAGE_DEBUG_INFORMATION, *PIMAGE_DEBUG_INFORMATION;
 
-typedef struct _ADDRESS32 {
+typedef struct _ADDRESS {
     DWORD          Offset;
     WORD           Segment;
-    ADDRESS_MODE32 Mode;
-} ADDRESS32, *PADDRESS32;
+    ADDRESS_MODE Mode;
+} ADDRESS, *PADDRESS;
 
-typedef struct _KDHELP32 {
+typedef struct _KDHELP {
   DWORD Thread;
   DWORD ThCallbackStack;
   DWORD NextCallback;
@@ -372,31 +372,31 @@ typedef struct _KDHELP32 {
   DWORD KiCallUserMode;
   DWORD KeUserCallbackDispatcher;
   DWORD SystemRangeStart;
-} KDHELP32, *PKDHELP32;
+} KDHELP, *PKDHELP;
 
-typedef struct _STACKFRAME32 {
-  ADDRESS32 AddrPC;
-  ADDRESS32 AddrReturn;
-  ADDRESS32 AddrFrame;
-  ADDRESS32 AddrStack;
+typedef struct _STACKFRAME {
+  ADDRESS AddrPC;
+  ADDRESS AddrReturn;
+  ADDRESS AddrFrame;
+  ADDRESS AddrStack;
   PVOID     FuncTableEntry;
   DWORD     Params[4];
-  BOOL32    Far;
-  BOOL32    Virtual;
+  BOOL    Far;
+  BOOL    Virtual;
   DWORD     Reserved[3];
-  KDHELP32  KdHelp;
-} STACKFRAME32, *PSTACKFRAME32;
+  KDHELP  KdHelp;
+} STACKFRAME, *PSTACKFRAME;
 
-typedef struct _IMAGEHLP_SYMBOL32 {
+typedef struct _IMAGEHLP_SYMBOL {
   DWORD SizeOfStruct;
   DWORD Address;
   DWORD Size;
   DWORD Flags;
   DWORD MaxNameLength;
   CHAR  Name[ANYSIZE_ARRAY];
-} IMAGEHLP_SYMBOL32, *PIMAGEHLP_SYMBOL32;
+} IMAGEHLP_SYMBOL, *PIMAGEHLP_SYMBOL;
 
-typedef struct _IMAGEHLP_MODULE32 {
+typedef struct _IMAGEHLP_MODULE {
   DWORD      SizeOfStruct;
   DWORD      BaseOfImage;
   DWORD      ImageSize;
@@ -407,33 +407,33 @@ typedef struct _IMAGEHLP_MODULE32 {
   CHAR       ModuleName[32];
   CHAR       ImageName[256];
   CHAR       LoadedImageName[256];
-} IMAGEHLP_MODULE32, *PIMAGEHLP_MODULE32;
+} IMAGEHLP_MODULE, *PIMAGEHLP_MODULE;
 
-typedef struct _IMAGEHLP_LINE32 {
+typedef struct _IMAGEHLP_LINE {
   DWORD SizeOfStruct;
   DWORD Key;
   DWORD LineNumber;
   PCHAR FileName;
   DWORD Address;
-} IMAGEHLP_LINE32, *PIMAGEHLP_LINE32;
+} IMAGEHLP_LINE, *PIMAGEHLP_LINE;
 
-typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD32 {
+typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD {
   DWORD   SizeOfStruct;
   DWORD   BaseOfImage;
   DWORD   CheckSum;
   DWORD   TimeDateStamp;
   CHAR    FileName[MAX_PATH];
   BOOLEAN Reparse;
-} IMAGEHLP_DEFERRED_SYMBOL_LOAD32, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD32;
+} IMAGEHLP_DEFERRED_SYMBOL_LOAD, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD;
 
-typedef struct _IMAGEHLP_DUPLICATE_SYMBOL32 {
+typedef struct _IMAGEHLP_DUPLICATE_SYMBOL {
   DWORD              SizeOfStruct;
   DWORD              NumberOfDups;
-  PIMAGEHLP_SYMBOL32 Symbol;
+  PIMAGEHLP_SYMBOL Symbol;
   ULONG              SelectedSymbol;
-} IMAGEHLP_DUPLICATE_SYMBOL32, *PIMAGEHLP_DUPLICATE_SYMBOL32;
+} IMAGEHLP_DUPLICATE_SYMBOL, *PIMAGEHLP_DUPLICATE_SYMBOL;
 
-typedef struct _IMAGE_DOS_HEADER32 {
+typedef struct _IMAGE_DOS_HEADER {
   WORD e_magic;
   WORD e_cblp;
   WORD e_cp;
@@ -453,9 +453,9 @@ typedef struct _IMAGE_DOS_HEADER32 {
   WORD e_oeminfo;
   WORD e_res2[10];
   LONG e_lfanew;
-} IMAGE_DOS_HEADER32, *PIMAGE_DOS_HEADER32;
+} IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER;
 
-typedef struct _IMAGE_OS2_HEADER32 {
+typedef struct _IMAGE_OS2_HEADER {
   WORD ne_magic;
   CHAR ne_ver;
   CHAR ne_rev;
@@ -486,9 +486,9 @@ typedef struct _IMAGE_OS2_HEADER32 {
   WORD ne_psegrefbytes;
   WORD ne_swaparea;
   WORD ne_expver;
-} IMAGE_OS2_HEADER32, *PIMAGE_OS2_HEADER32;
+} IMAGE_OS2_HEADER, *PIMAGE_OS2_HEADER;
 
-typedef struct _IMAGE_VXD_HEADER32 {
+typedef struct _IMAGE_VXD_HEADER {
   WORD  e32_magic;
   BYTE  e32_border;
   BYTE  e32_worder;
@@ -540,278 +540,278 @@ typedef struct _IMAGE_VXD_HEADER32 {
   DWORD e32_winreslen;
   WORD  e32_devid;
   WORD  e32_ddkver;
-} IMAGE_VXD_HEADER32, *PIMAGE_VXD_HEADER32;
+} IMAGE_VXD_HEADER, *PIMAGE_VXD_HEADER;
 
 /***********************************************************************
  * Callbacks
  */
 
-typedef BOOL32 (CALLBACK *PIMAGEHLP_STATUS_ROUTINE32)(
-  IMAGEHLP_STATUS_REASON32 Reason, LPSTR ImageName, LPSTR DllName,
+typedef BOOL (CALLBACK *PIMAGEHLP_STATUS_ROUTINE)(
+  IMAGEHLP_STATUS_REASON Reason, LPSTR ImageName, LPSTR DllName,
   ULONG Va, ULONG Parameter
 );
 
-typedef BOOL32 (CALLBACK *PSYM_ENUMMODULES_CALLBACK32)(
+typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(
   LPSTR ModuleName, ULONG BaseOfDll, PVOID UserContext
 );
 
-typedef BOOL32 (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK32)(
+typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(
   LPSTR SymbolName, ULONG SymbolAddress, ULONG SymbolSize, 
   PVOID UserContext
 );
 
-typedef BOOL32 (CALLBACK *PENUMLOADED_MODULES_CALLBACK32)(
+typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK)(
   LPSTR ModuleName, ULONG ModuleBase, ULONG ModuleSize, 
   PVOID UserContext
 );
 
-typedef BOOL32 (CALLBACK *PSYMBOL_REGISTERED_CALLBACK32)(
-  HANDLE32 hProcess, ULONG ActionCode, PVOID CallbackData,
+typedef BOOL (CALLBACK *PSYMBOL_REGISTERED_CALLBACK)(
+  HANDLE hProcess, ULONG ActionCode, PVOID CallbackData,
   PVOID UserContext
 );
 
-typedef BOOL32 (CALLBACK *DIGEST_FUNCTION32)(
-  DIGEST_HANDLE32 refdata, PBYTE pData, DWORD dwLength
+typedef BOOL (CALLBACK *DIGEST_FUNCTION)(
+  DIGEST_HANDLE refdata, PBYTE pData, DWORD dwLength
 );
 
-typedef BOOL32 (CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE32)(
-  HANDLE32  hProcess, PCVOID lpBaseAddress, PVOID lpBuffer,
+typedef BOOL (CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE)(
+  HANDLE  hProcess, PCVOID lpBaseAddress, PVOID lpBuffer,
   DWORD nSize, PDWORD lpNumberOfBytesRead
 );
 
-typedef PVOID (CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE32)(
-  HANDLE32 hProcess, DWORD AddrBase
+typedef PVOID (CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE)(
+  HANDLE hProcess, DWORD AddrBase
 );
 
-typedef DWORD (CALLBACK *PGET_MODULE_BASE_ROUTINE32)(
-  HANDLE32 hProcess, DWORD ReturnAddress);
+typedef DWORD (CALLBACK *PGET_MODULE_BASE_ROUTINE)(
+  HANDLE hProcess, DWORD ReturnAddress);
 
-typedef DWORD (CALLBACK *PTRANSLATE_ADDRESS_ROUTINE32)(
-  HANDLE32 hProcess, HANDLE32 hThread, PADDRESS32 lpaddr
+typedef DWORD (CALLBACK *PTRANSLATE_ADDRESS_ROUTINE)(
+  HANDLE hProcess, HANDLE hThread, PADDRESS lpaddr
 );
 
 /***********************************************************************
  * Functions
  */
 
-BOOL32 WINAPI BindImage32(
+BOOL WINAPI BindImage(
   LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath
 );
-BOOL32 WINAPI BindImageEx32(
+BOOL WINAPI BindImageEx(
   DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath,
-  PIMAGEHLP_STATUS_ROUTINE32 StatusRoutine
+  PIMAGEHLP_STATUS_ROUTINE StatusRoutine
 );
-PIMAGE_NT_HEADERS32 WINAPI CheckSumMappedFile32(
+PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile(
   LPVOID BaseAddress, DWORD FileLength, 
   LPDWORD HeaderSum, LPDWORD CheckSum
 );
-BOOL32 WINAPI EnumerateLoadedModules32(
-  HANDLE32 hProcess,
-  PENUMLOADED_MODULES_CALLBACK32 EnumLoadedModulesCallback,
+BOOL WINAPI EnumerateLoadedModules(
+  HANDLE hProcess,
+  PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback,
   PVOID UserContext
 );
-HANDLE32 WINAPI FindDebugInfoFile32(
+HANDLE WINAPI FindDebugInfoFile(
   LPSTR FileName, LPSTR SymbolPath, LPSTR DebugFilePath
 );
-HANDLE32 WINAPI FindExecutableImage32(
+HANDLE WINAPI FindExecutableImage(
   LPSTR FileName, LPSTR SymbolPath, LPSTR ImageFilePath
 );
-BOOL32 WINAPI GetImageConfigInformation32(
-  PLOADED_IMAGE32 LoadedImage, 
-  PIMAGE_LOAD_CONFIG_DIRECTORY32 ImageConfigInformation
+BOOL WINAPI GetImageConfigInformation(
+  PLOADED_IMAGE LoadedImage, 
+  PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation
 );
-DWORD WINAPI GetImageUnusedHeaderBytes32(
-  PLOADED_IMAGE32 LoadedImage,
+DWORD WINAPI GetImageUnusedHeaderBytes(
+  PLOADED_IMAGE LoadedImage,
   LPDWORD SizeUnusedHeaderBytes
 );
-DWORD WINAPI GetTimestampForLoadedLibrary32(
-  HMODULE32 Module
+DWORD WINAPI GetTimestampForLoadedLibrary(
+  HMODULE Module
 );
-BOOL32 WINAPI ImageAddCertificate32(
-  HANDLE32 FileHandle, PWIN_CERTIFICATE32 Certificate, PDWORD Index
+BOOL WINAPI ImageAddCertificate(
+  HANDLE FileHandle, PWIN_CERTIFICATE Certificate, PDWORD Index
 );
-PVOID WINAPI ImageDirectoryEntryToData32(
+PVOID WINAPI ImageDirectoryEntryToData(
   PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size
 );
-BOOL32 WINAPI ImageEnumerateCertificates32(
-  HANDLE32 FileHandle, WORD TypeFilter, PDWORD CertificateCount,
+BOOL WINAPI ImageEnumerateCertificates(
+  HANDLE FileHandle, WORD TypeFilter, PDWORD CertificateCount,
   PDWORD Indices, DWORD IndexCount
 );
-BOOL32 WINAPI ImageGetCertificateData32(
-  HANDLE32 FileHandle, DWORD CertificateIndex,
-  PWIN_CERTIFICATE32 Certificate, PDWORD RequiredLength
+BOOL WINAPI ImageGetCertificateData(
+  HANDLE FileHandle, DWORD CertificateIndex,
+  PWIN_CERTIFICATE Certificate, PDWORD RequiredLength
 );
-BOOL32 WINAPI ImageGetCertificateHeader32(
-  HANDLE32 FileHandle, DWORD CertificateIndex,
-  PWIN_CERTIFICATE32 Certificateheader
+BOOL WINAPI ImageGetCertificateHeader(
+  HANDLE FileHandle, DWORD CertificateIndex,
+  PWIN_CERTIFICATE Certificateheader
 );
-BOOL32 WINAPI ImageGetDigestStream32(
-  HANDLE32 FileHandle, DWORD DigestLevel,
-  DIGEST_FUNCTION32 DigestFunction, DIGEST_HANDLE32 DigestHandle
+BOOL WINAPI ImageGetDigestStream(
+  HANDLE FileHandle, DWORD DigestLevel,
+  DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle
 );
-PLOADED_IMAGE32 WINAPI ImageLoad32(
+PLOADED_IMAGE WINAPI ImageLoad(
   LPSTR DllName, LPSTR DllPath
 );
-PIMAGE_NT_HEADERS32 WINAPI ImageNtHeader32(
+PIMAGE_NT_HEADERS WINAPI ImageNtHeader(
   PVOID Base
 );
-BOOL32 WINAPI ImageRemoveCertificate32(
-  HANDLE32 FileHandle, DWORD Index
+BOOL WINAPI ImageRemoveCertificate(
+  HANDLE FileHandle, DWORD Index
 );
-PIMAGE_SECTION_HEADER32 WINAPI ImageRvaToSection32(
-  PIMAGE_NT_HEADERS32 NtHeaders, PVOID Base, ULONG Rva
+PIMAGE_SECTION_HEADER WINAPI ImageRvaToSection(
+  PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva
 );
-PVOID WINAPI ImageRvaToVa32(
-  PIMAGE_NT_HEADERS32 NtHeaders, PVOID Base, ULONG Rva,
-  PIMAGE_SECTION_HEADER32 *LastRvaSection
+PVOID WINAPI ImageRvaToVa(
+  PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva,
+  PIMAGE_SECTION_HEADER *LastRvaSection
 );
-BOOL32 WINAPI ImageUnload32(
-  PLOADED_IMAGE32 LoadedImage
+BOOL WINAPI ImageUnload(
+  PLOADED_IMAGE LoadedImage
 );
-PAPI_VERSION32 WINAPI ImagehlpApiVersion32(
+PAPI_VERSION WINAPI ImagehlpApiVersion(
   void 
 );
-PAPI_VERSION32 WINAPI ImagehlpApiVersionEx32(
-  PAPI_VERSION32 AppVersion
+PAPI_VERSION WINAPI ImagehlpApiVersionEx(
+  PAPI_VERSION AppVersion
 );
-BOOL32 WINAPI MakeSureDirectoryPathExists32(
+BOOL WINAPI MakeSureDirectoryPathExists(
   LPCSTR DirPath
 );
-BOOL32 WINAPI MapAndLoad32(
-  LPSTR ImageName, LPSTR DllPath, PLOADED_IMAGE32 LoadedImage,
-  BOOL32 DotDll, BOOL32 ReadOnly
+BOOL WINAPI MapAndLoad(
+  LPSTR ImageName, LPSTR DllPath, PLOADED_IMAGE LoadedImage,
+  BOOL DotDll, BOOL ReadOnly
 );
-PIMAGE_DEBUG_INFORMATION32 WINAPI MapDebugInformation32(
-  HANDLE32 FileHandle, LPSTR FileName,
+PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(
+  HANDLE FileHandle, LPSTR FileName,
   LPSTR SymbolPath, DWORD ImageBase
 );
-DWORD WINAPI MapFileAndCheckSum32A(
+DWORD WINAPI MapFileAndCheckSumA(
   LPSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum
 );
-DWORD WINAPI MapFileAndCheckSum32W(
+DWORD WINAPI MapFileAndCheckSumW(
   LPWSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum
 );
-BOOL32 WINAPI ReBaseImage32(
-  LPSTR CurrentImageName, LPSTR SymbolPath, BOOL32 fReBase,
-  BOOL32 fRebaseSysfileOk, BOOL32 fGoingDown, ULONG CheckImageSize,
+BOOL WINAPI ReBaseImage(
+  LPSTR CurrentImageName, LPSTR SymbolPath, BOOL fReBase,
+  BOOL fRebaseSysfileOk, BOOL fGoingDown, ULONG CheckImageSize,
   ULONG *OldImageSize, ULONG *OldImageBase, ULONG *NewImageSize,
   ULONG *NewImageBase, ULONG TimeStamp
 );
-BOOL32 WINAPI RemovePrivateCvSymbolic32(
+BOOL WINAPI RemovePrivateCvSymbolic(
   PCHAR DebugData, PCHAR *NewDebugData, ULONG *NewDebugSize
 );
-VOID WINAPI RemoveRelocations32(
+VOID WINAPI RemoveRelocations(
   PCHAR ImageName
 );
-BOOL32 WINAPI SearchTreeForFile32(
+BOOL WINAPI SearchTreeForFile(
   LPSTR RootPath, LPSTR InputPathName, LPSTR OutputPathBuffer
 );
-BOOL32 WINAPI SetImageConfigInformation32(
-  PLOADED_IMAGE32 LoadedImage,
-  PIMAGE_LOAD_CONFIG_DIRECTORY32 ImageConfigInformation
+BOOL WINAPI SetImageConfigInformation(
+  PLOADED_IMAGE LoadedImage,
+  PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation
 );
-BOOL32 WINAPI SplitSymbols32(
+BOOL WINAPI SplitSymbols(
   LPSTR ImageName, LPSTR SymbolsPath, 
   LPSTR SymbolFilePath, DWORD Flags
 );
-BOOL32 WINAPI StackWalk32(
-  DWORD MachineType, HANDLE32 hProcess, HANDLE32 hThread,
-  PSTACKFRAME32 StackFrame, PVOID ContextRecord,
-  PREAD_PROCESS_MEMORY_ROUTINE32 ReadMemoryRoutine,
-  PFUNCTION_TABLE_ACCESS_ROUTINE32 FunctionTableAccessRoutine,
-  PGET_MODULE_BASE_ROUTINE32 GetModuleBaseRoutine,
-  PTRANSLATE_ADDRESS_ROUTINE32 TranslateAddress
+BOOL WINAPI StackWalk(
+  DWORD MachineType, HANDLE hProcess, HANDLE hThread,
+  PSTACKFRAME StackFrame, PVOID ContextRecord,
+  PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine,
+  PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine,
+  PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,
+  PTRANSLATE_ADDRESS_ROUTINE TranslateAddress
 );
-BOOL32 WINAPI SymCleanup32(
-  HANDLE32 hProcess
+BOOL WINAPI SymCleanup(
+  HANDLE hProcess
 );
-BOOL32 WINAPI SymEnumerateModules32(
-  HANDLE32 hProcess, PSYM_ENUMMODULES_CALLBACK32 EnumModulesCallback,
+BOOL WINAPI SymEnumerateModules(
+  HANDLE hProcess, PSYM_ENUMMODULES_CALLBACK EnumModulesCallback,
   PVOID UserContext
 );
-BOOL32 WINAPI SymEnumerateSymbols32(
-  HANDLE32 hProcess, DWORD BaseOfDll,
-  PSYM_ENUMSYMBOLS_CALLBACK32 EnumSymbolsCallback, PVOID UserContext
+BOOL WINAPI SymEnumerateSymbols(
+  HANDLE hProcess, DWORD BaseOfDll,
+  PSYM_ENUMSYMBOLS_CALLBACK EnumSymbolsCallback, PVOID UserContext
 );
-PVOID WINAPI SymFunctionTableAccess32(
-  HANDLE32 hProcess, DWORD AddrBase
+PVOID WINAPI SymFunctionTableAccess(
+  HANDLE hProcess, DWORD AddrBase
 );
-DWORD WINAPI SymGetModuleBase32(
-  HANDLE32 hProcess, DWORD dwAddr
+DWORD WINAPI SymGetModuleBase(
+  HANDLE hProcess, DWORD dwAddr
 );
-BOOL32 WINAPI SymGetModuleInfo32(
-  HANDLE32 hProcess, DWORD dwAddr,
-  PIMAGEHLP_MODULE32 ModuleInfo
+BOOL WINAPI SymGetModuleInfo(
+  HANDLE hProcess, DWORD dwAddr,
+  PIMAGEHLP_MODULE ModuleInfo
 );
-DWORD WINAPI SymGetOptions32(
+DWORD WINAPI SymGetOptions(
   void
 );
-BOOL32 WINAPI SymGetSearchPath32(
-  HANDLE32 hProcess, LPSTR szSearchPath, DWORD SearchPathLength
+BOOL WINAPI SymGetSearchPath(
+  HANDLE hProcess, LPSTR szSearchPath, DWORD SearchPathLength
 );
-BOOL32 WINAPI SymGetSymFromAddr32(
-  HANDLE32 hProcess, DWORD dwAddr,
-  PDWORD pdwDisplacement, PIMAGEHLP_SYMBOL32 Symbol
+BOOL WINAPI SymGetSymFromAddr(
+  HANDLE hProcess, DWORD dwAddr,
+  PDWORD pdwDisplacement, PIMAGEHLP_SYMBOL Symbol
 );
-BOOL32 WINAPI SymGetSymFromName32(
-  HANDLE32 hProcess, LPSTR Name, PIMAGEHLP_SYMBOL32 Symbol
+BOOL WINAPI SymGetSymFromName(
+  HANDLE hProcess, LPSTR Name, PIMAGEHLP_SYMBOL Symbol
 );
-BOOL32 WINAPI SymGetSymNext32(
-  HANDLE32 hProcess, PIMAGEHLP_SYMBOL32 Symbol
+BOOL WINAPI SymGetSymNext(
+  HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol
 );
-BOOL32 WINAPI SymGetSymPrev32(
-  HANDLE32 hProcess, PIMAGEHLP_SYMBOL32 Symbol
+BOOL WINAPI SymGetSymPrev(
+  HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol
 );
-BOOL32 WINAPI SymInitialize32(
-  HANDLE32 hProcess, LPSTR UserSearchPath, BOOL32 fInvadeProcess
+BOOL WINAPI SymInitialize(
+  HANDLE hProcess, LPSTR UserSearchPath, BOOL fInvadeProcess
 );
-BOOL32 WINAPI SymLoadModule32(
-  HANDLE32 hProcess, HANDLE32 hFile, LPSTR ImageName, LPSTR ModuleName,
+BOOL WINAPI SymLoadModule(
+  HANDLE hProcess, HANDLE hFile, LPSTR ImageName, LPSTR ModuleName,
   DWORD BaseOfDll, DWORD SizeOfDll
 );
-BOOL32 WINAPI SymRegisterCallback32(
-  HANDLE32 hProcess, PSYMBOL_REGISTERED_CALLBACK32 CallbackFunction,
+BOOL WINAPI SymRegisterCallback(
+  HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK CallbackFunction,
   PVOID UserContext
 );
-DWORD WINAPI SymSetOptions32(
+DWORD WINAPI SymSetOptions(
   DWORD SymOptions
 );
-BOOL32 WINAPI SymSetSearchPath32(
-  HANDLE32 hProcess, LPSTR szSearchPath
+BOOL WINAPI SymSetSearchPath(
+  HANDLE hProcess, LPSTR szSearchPath
 );
-BOOL32 WINAPI SymUnDName32(
-  PIMAGEHLP_SYMBOL32 sym, LPSTR UnDecName, DWORD UnDecNameLength
+BOOL WINAPI SymUnDName(
+  PIMAGEHLP_SYMBOL sym, LPSTR UnDecName, DWORD UnDecNameLength
 );
-BOOL32 WINAPI SymUnloadModule32(
-  HANDLE32 hProcess, DWORD BaseOfDll
+BOOL WINAPI SymUnloadModule(
+  HANDLE hProcess, DWORD BaseOfDll
 );
-BOOL32 WINAPI TouchFileTimes32(
-  HANDLE32 FileHandle, LPSYSTEMTIME lpSystemTime
+BOOL WINAPI TouchFileTimes(
+  HANDLE FileHandle, LPSYSTEMTIME lpSystemTime
 );
-DWORD WINAPI UnDecorateSymbolName32(
+DWORD WINAPI UnDecorateSymbolName(
   LPCSTR DecoratedName, LPSTR UnDecoratedName,
   DWORD UndecoratedLength, DWORD Flags
 );
-BOOL32 WINAPI UnMapAndLoad32(
-  PLOADED_IMAGE32 LoadedImage
+BOOL WINAPI UnMapAndLoad(
+  PLOADED_IMAGE LoadedImage
 );
-BOOL32 WINAPI UnmapDebugInformation32(
-  PIMAGE_DEBUG_INFORMATION32 DebugInfo
+BOOL WINAPI UnmapDebugInformation(
+  PIMAGE_DEBUG_INFORMATION DebugInfo
 );
-BOOL32 WINAPI UpdateDebugInfoFile32(
+BOOL WINAPI UpdateDebugInfoFile(
   LPSTR ImageFileName, LPSTR SymbolPath,
-  LPSTR DebugFilePath, PIMAGE_NT_HEADERS32 NtHeaders
+  LPSTR DebugFilePath, PIMAGE_NT_HEADERS NtHeaders
 );
-BOOL32 WINAPI UpdateDebugInfoFileEx32(
+BOOL WINAPI UpdateDebugInfoFileEx(
   LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath,
-  PIMAGE_NT_HEADERS32 NtHeaders, DWORD OldChecksum
+  PIMAGE_NT_HEADERS NtHeaders, DWORD OldChecksum
 );
 
 /***********************************************************************
  * Wine specific
  */
 
-extern HANDLE32 IMAGEHLP_hHeap32;
+extern HANDLE IMAGEHLP_hHeap;
 
 #endif  /* __WINE_IMAGEHLP_H */
 
diff --git a/include/imagelist.h b/include/imagelist.h
index 7db2bfa52ec..9bc4cd034a2 100644
--- a/include/imagelist.h
+++ b/include/imagelist.h
@@ -11,21 +11,21 @@
 
 struct _IMAGELIST
 {
-    HBITMAP32 hbmImage;
-    HBITMAP32 hbmMask;
-    HBRUSH32  hbrBlend25;
-    HBRUSH32  hbrBlend50;
+    HBITMAP hbmImage;
+    HBITMAP hbmMask;
+    HBRUSH  hbrBlend25;
+    HBRUSH  hbrBlend50;
     COLORREF  clrBk;
     COLORREF  clrFg;
-    INT32     cInitial;
-    INT32     cGrow;
-    INT32     cMaxImage;
-    INT32     cCurImage;
-    INT32     cx;
-    INT32     cy;
-    UINT32    flags;
-    UINT32    uBitsPixel;
-    INT32     nOvlIdx[15];
+    INT     cInitial;
+    INT     cGrow;
+    INT     cMaxImage;
+    INT     cCurImage;
+    INT     cx;
+    INT     cy;
+    UINT    flags;
+    UINT    uBitsPixel;
+    INT     nOvlIdx[15];
 };
  
 typedef struct _IMAGELIST *HIMAGELIST;
diff --git a/include/imm.h b/include/imm.h
index 31ee343b178..b1d5964f3aa 100644
--- a/include/imm.h
+++ b/include/imm.h
@@ -7,10 +7,10 @@
 
 #include "wintypes.h"
 
-typedef HANDLE32 HIMC32;
-typedef HANDLE32 HIMCC32;
+typedef HANDLE HIMC;
+typedef HANDLE HIMCC;
 
-typedef HKL32 *LPHKL32;
+typedef HKL *LPHKL;
 
 typedef int (CALLBACK *REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID);
 typedef int (CALLBACK *REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID);
diff --git a/include/input.h b/include/input.h
index 45e2405d087..63bf4b2be6f 100644
--- a/include/input.h
+++ b/include/input.h
@@ -7,8 +7,8 @@
 #ifndef __WINE_INPUT_H
 #define __WINE_INPUT_H
 
-extern BOOL32 MouseButtonsStates[3];
-extern BOOL32 AsyncMouseButtonsStates[3];
+extern BOOL MouseButtonsStates[3];
+extern BOOL AsyncMouseButtonsStates[3];
 extern BYTE InputKeyStateTable[256];
 extern BYTE QueueKeyStateTable[256];
 extern BYTE AsyncKeyStateTable[256];
diff --git a/include/ipaddress.h b/include/ipaddress.h
index 1c2a33605dc..943b2443690 100644
--- a/include/ipaddress.h
+++ b/include/ipaddress.h
@@ -13,17 +13,17 @@ typedef struct tagIPADDRESS_INFO
 	BYTE LowerLimit[4];
 	BYTE UpperLimit[4];
 
-	RECT32 	rcClient;
-	INT32	uFocus;
+	RECT 	rcClient;
+	INT	uFocus;
 } IPADDRESS_INFO;
 
 typedef struct tagIP_SUBCLASS_INFO
 {
-    WNDPROC32 wpOrigProc[4];
-    HWND32    hwndIP[4];
+    WNDPROC wpOrigProc[4];
+    HWND    hwndIP[4];
 	IPADDRESS_INFO *infoPtr;
 	WND 	  *wndPtr;
-    UINT32    uRefCount;
+    UINT    uRefCount;
 } IP_SUBCLASS_INFO, *LPIP_SUBCLASS_INFO;
 
 
diff --git a/include/k32obj.h b/include/k32obj.h
index 52941448d75..f9a00d564b5 100644
--- a/include/k32obj.h
+++ b/include/k32obj.h
@@ -53,11 +53,11 @@ extern const K32OBJ_OPS * const K32OBJ_Ops[K32OBJ_NBOBJECTS];
 
 extern void K32OBJ_IncCount( K32OBJ *ptr );
 extern void K32OBJ_DecCount( K32OBJ *ptr );
-extern BOOL32 K32OBJ_IsValid( K32OBJ *ptr, K32OBJ_TYPE type );
-extern BOOL32 K32OBJ_AddName( K32OBJ *obj, LPCSTR name );
+extern BOOL K32OBJ_IsValid( K32OBJ *ptr, K32OBJ_TYPE type );
+extern BOOL K32OBJ_AddName( K32OBJ *obj, LPCSTR name );
 extern K32OBJ *K32OBJ_Create( K32OBJ_TYPE type, DWORD size, LPCSTR name,
                               int server_handle, DWORD access,
-                              SECURITY_ATTRIBUTES *sa, HANDLE32 *handle );
+                              SECURITY_ATTRIBUTES *sa, HANDLE *handle );
 extern K32OBJ *K32OBJ_FindName( LPCSTR name );
 extern K32OBJ *K32OBJ_FindNameType( LPCSTR name, K32OBJ_TYPE type );
 
diff --git a/include/libres.h b/include/libres.h
index 6b1e57ddb0a..593b044f39f 100644
--- a/include/libres.h
+++ b/include/libres.h
@@ -6,8 +6,8 @@
 
 #include "wintypes.h"
 
-extern HRSRC32 LIBRES_FindResource( HINSTANCE32 hModule, LPCWSTR name, LPCWSTR type );
-extern HGLOBAL32 LIBRES_LoadResource( HINSTANCE32 hModule, HRSRC32 hRsrc );
-extern DWORD LIBRES_SizeofResource( HINSTANCE32 hModule, HRSRC32 hRsrc );
+extern HRSRC LIBRES_FindResource( HINSTANCE hModule, LPCWSTR name, LPCWSTR type );
+extern HGLOBAL LIBRES_LoadResource( HINSTANCE hModule, HRSRC hRsrc );
+extern DWORD LIBRES_SizeofResource( HINSTANCE hModule, HRSRC hRsrc );
 
 #endif /* __WINE_LIBRES_H */
diff --git a/include/listview.h b/include/listview.h
index f027c96b27c..55ab3b54780 100644
--- a/include/listview.h
+++ b/include/listview.h
@@ -10,11 +10,11 @@
 
 typedef struct tagLISTVIEW_ITEM
 {
-    UINT32 state;
+    UINT state;
     LPSTR  pszText;
-    INT32  iImage;
+    INT  iImage;
     LPARAM lParam;
-    INT32  iIndent;
+    INT  iIndent;
 
 } LISTVIEW_ITEM;
 
@@ -27,20 +27,20 @@ typedef struct tagLISTVIEW_INFO
     HIMAGELIST himlNormal;
     HIMAGELIST himlSmall;
     HIMAGELIST himlState;
-  BOOL32 bLButtonDown;
-  BOOL32 bRButtonDown;
-    INT32      nColumnCount;
-  INT32 nFocusedItem;
-  INT32 nItemCount;
-  INT32 nItemHeight;
-  INT32 nColumnWidth;
-  INT32 nSelectionMark;
-    HWND32     hwndHeader;
-    HFONT32    hDefaultFont;
-    HFONT32    hFont;
-  INT32 nWidth;
-  INT32 nHeight;
-    BOOL32     bFocus;
+  BOOL bLButtonDown;
+  BOOL bRButtonDown;
+    INT      nColumnCount;
+  INT nFocusedItem;
+  INT nItemCount;
+  INT nItemHeight;
+  INT nColumnWidth;
+  INT nSelectionMark;
+    HWND     hwndHeader;
+    HFONT    hDefaultFont;
+    HFONT    hFont;
+  INT nWidth;
+  INT nHeight;
+    BOOL     bFocus;
     DWORD      dwExStyle;    /* extended listview style */
     HDPA       hdpaItems;
 
diff --git a/include/lzexpand.h b/include/lzexpand.h
index e3198fb8e71..95b0a3ef1fe 100644
--- a/include/lzexpand.h
+++ b/include/lzexpand.h
@@ -20,33 +20,26 @@
 
 VOID        WINAPI LZDone(void);
 LONG        WINAPI CopyLZFile16(HFILE16,HFILE16);
-LONG        WINAPI CopyLZFile32(HFILE32,HFILE32);
-#define     CopyLZFile WINELIB_NAME(CopyLZFile)
+LONG        WINAPI CopyLZFile(HFILE,HFILE);
 HFILE16     WINAPI LZOpenFile16(LPCSTR,LPOFSTRUCT,UINT16);
-HFILE32     WINAPI LZOpenFile32A(LPCSTR,LPOFSTRUCT,UINT32);
-HFILE32     WINAPI LZOpenFile32W(LPCWSTR,LPOFSTRUCT,UINT32);
+HFILE     WINAPI LZOpenFileA(LPCSTR,LPOFSTRUCT,UINT);
+HFILE     WINAPI LZOpenFileW(LPCWSTR,LPOFSTRUCT,UINT);
 #define     LZOpenFile WINELIB_NAME_AW(LZOpenFile)
 INT16       WINAPI LZRead16(HFILE16,LPVOID,UINT16); 
-INT32       WINAPI LZRead32(HFILE32,LPVOID,UINT32); 
-#define     LZRead WINELIB_NAME(LZRead)
+INT       WINAPI LZRead(HFILE,LPVOID,UINT); 
 INT16       WINAPI LZStart16(void);
-INT32       WINAPI LZStart32(void);
-#define     LZStart WINELIB_NAME(LZStart)
+INT       WINAPI LZStart(void);
 void        WINAPI LZClose16(HFILE16);
-void        WINAPI LZClose32(HFILE32);
-#define     LZClose WINELIB_NAME(LZClose)
+void        WINAPI LZClose(HFILE);
 LONG        WINAPI LZCopy16(HFILE16,HFILE16);
-LONG        WINAPI LZCopy32(HFILE32,HFILE32);
-#define     LZCopy WINELIB_NAME(LZCopy)
+LONG        WINAPI LZCopy(HFILE,HFILE);
 HFILE16     WINAPI LZInit16(HFILE16);
-HFILE32     WINAPI LZInit32(HFILE32);
-#define     LZInit WINELIB_NAME(LZInit)
+HFILE     WINAPI LZInit(HFILE);
 LONG        WINAPI LZSeek16(HFILE16,LONG,INT16);
-LONG        WINAPI LZSeek32(HFILE32,LONG,INT32);
-#define     LZSeek WINELIB_NAME(LZSeek)
+LONG        WINAPI LZSeek(HFILE,LONG,INT);
 INT16       WINAPI GetExpandedName16(LPCSTR,LPSTR);
-INT32       WINAPI GetExpandedName32A(LPCSTR,LPSTR);
-INT32       WINAPI GetExpandedName32W(LPCWSTR,LPWSTR);
+INT       WINAPI GetExpandedNameA(LPCSTR,LPSTR);
+INT       WINAPI GetExpandedNameW(LPCWSTR,LPWSTR);
 #define     GetExpandedName WINELIB_NAME_AW(GetExpandedName)
 
 #endif  /* __WINE_LZEXPAND_H */
diff --git a/include/main.h b/include/main.h
index b6bf44db54f..6cd61abafc7 100644
--- a/include/main.h
+++ b/include/main.h
@@ -6,19 +6,19 @@
 #define __WINE_MAIN_H
 
 extern void MAIN_Usage(char*);
-extern BOOL32 MAIN_MainInit(void);
-extern BOOL32 MAIN_WineInit( int *argc, char *argv[] );
-extern HINSTANCE32 MAIN_WinelibInit( int *argc, char *argv[] );
+extern BOOL MAIN_MainInit(void);
+extern BOOL MAIN_WineInit( int *argc, char *argv[] );
+extern HINSTANCE MAIN_WinelibInit( int *argc, char *argv[] );
 extern int MAIN_GetLanguageID(char*lang, char*country, char*charset, char*dialect);
-extern BOOL32 MAIN_ParseDebugOptions(char *options);
+extern BOOL MAIN_ParseDebugOptions(char *options);
 
 extern void MAIN_ParseLanguageOption( char *arg );
 extern void MAIN_ParseModeOption( char *arg );
 
-extern BOOL32 RELAY_Init(void);
+extern BOOL RELAY_Init(void);
 extern int RELAY_ShowDebugmsgRelay(const char *func);
 extern void* CALL32_Init(void);
 
-extern BOOL32 THUNK_Init(void);
+extern BOOL THUNK_Init(void);
 
 #endif  /* __WINE_MAIN_H */
diff --git a/include/mdi.h b/include/mdi.h
index 074d45802bc..ee872cd929e 100644
--- a/include/mdi.h
+++ b/include/mdi.h
@@ -20,26 +20,26 @@
 
 #define WM_MDICALCCHILDSCROLL   0x10AC /* this is exactly what Windows uses */
 
-extern LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, 
-                                        WPARAM32 wParam, LPARAM lParam );
+extern LRESULT WINAPI MDIClientWndProc( HWND hwnd, UINT message, 
+                                        WPARAM wParam, LPARAM lParam );
 
 typedef struct 
 {
-    UINT32      nActiveChildren;
-    HWND32      hwndChildMaximized;
-    HWND32      hwndActiveChild;
-    HMENU32     hWindowMenu;
-    UINT32      idFirstChild;
+    UINT      nActiveChildren;
+    HWND      hwndChildMaximized;
+    HWND      hwndActiveChild;
+    HMENU     hWindowMenu;
+    UINT      idFirstChild;
     LPSTR       frameTitle;
-    UINT32      nTotalCreated;
-    UINT32      mdiFlags;
-    UINT32      sbRecalc;   /* SB_xxx flags for scrollbar fixup */
-    HWND32      self;
+    UINT      nTotalCreated;
+    UINT      mdiFlags;
+    UINT      sbRecalc;   /* SB_xxx flags for scrollbar fixup */
+    HWND      self;
 } MDICLIENTINFO;
 
-extern HWND32  MDI_CreateMDIWindow32A(LPCSTR,LPCSTR,DWORD,INT32,INT32,
-                                INT32,INT32,HWND32,HINSTANCE32,LPARAM);
-extern HWND32  MDI_CreateMDIWindow32W(LPCWSTR,LPCWSTR,DWORD,INT32,INT32,
-                                INT32,INT32,HWND32,HINSTANCE32,LPARAM);
+extern HWND  MDI_CreateMDIWindowA(LPCSTR,LPCSTR,DWORD,INT,INT,
+                                INT,INT,HWND,HINSTANCE,LPARAM);
+extern HWND  MDI_CreateMDIWindowW(LPCWSTR,LPCWSTR,DWORD,INT,INT,
+                                INT,INT,HWND,HINSTANCE,LPARAM);
 #endif /* __WINE_MDI_H */
 
diff --git a/include/menu.h b/include/menu.h
index e7fdc61dede..e071a017a1d 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -11,14 +11,14 @@
 #define MAGIC_RESTORE 2
 #define MAGIC_CLOSE   5
 
-extern BOOL32 MENU_Init(void);
-extern HMENU32 MENU_GetSysMenu(HWND32 hWndOwner, HMENU32 hSysPopup);
-extern UINT32 MENU_GetMenuBarHeight( HWND32 hwnd, UINT32 menubarWidth,
-                                     INT32 orgX, INT32 orgY );
-extern BOOL32 MENU_PatchResidentPopup( HQUEUE16, WND* );
-extern void MENU_TrackMouseMenuBar( WND *wnd, INT32 ht, POINT32 pt );
-extern void MENU_TrackKbdMenuBar( WND *wnd, UINT32 wParam, INT32 vkey );
-extern UINT32 MENU_DrawMenuBar( HDC32 hDC, LPRECT32 lprect,
-                                HWND32 hwnd, BOOL32 suppress_draw );
+extern BOOL MENU_Init(void);
+extern HMENU MENU_GetSysMenu(HWND hWndOwner, HMENU hSysPopup);
+extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth,
+                                     INT orgX, INT orgY );
+extern BOOL MENU_PatchResidentPopup( HQUEUE16, WND* );
+extern void MENU_TrackMouseMenuBar( WND *wnd, INT ht, POINT pt );
+extern void MENU_TrackKbdMenuBar( WND *wnd, UINT wParam, INT vkey );
+extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect,
+                                HWND hwnd, BOOL suppress_draw );
 
 #endif /* __WINE_MENU_H */
diff --git a/include/message.h b/include/message.h
index a6c8dd2700b..77c9dad13fd 100644
--- a/include/message.h
+++ b/include/message.h
@@ -13,18 +13,18 @@
 extern DWORD MSG_WineStartTicks;  /* Ticks at Wine startup */
 
 /* message.c */
-extern BOOL32 MSG_InternalGetMessage( MSG32 *msg, HWND32 hwnd,
-                                      HWND32 hwndOwner, WPARAM32 code,
-                                      WORD flags, BOOL32 sendIdle );
+extern BOOL MSG_InternalGetMessage( MSG *msg, HWND hwnd,
+                                      HWND hwndOwner, WPARAM code,
+                                      WORD flags, BOOL sendIdle );
 
 /* timer.c */
-extern void TIMER_RemoveWindowTimers( HWND32 hwnd );
+extern void TIMER_RemoveWindowTimers( HWND hwnd );
 extern void TIMER_RemoveQueueTimers( HQUEUE16 hqueue );
 extern void TIMER_SwitchQueue( HQUEUE16 hOldQueue, HQUEUE16 hNewQueue );
 extern LONG TIMER_GetNextExpiration(void);
 extern void TIMER_ExpireTimers(void);
-extern BOOL32 TIMER_GetTimerMsg( MSG32 *msg, HWND32 hwnd,
-                                 HQUEUE16 hQueue, BOOL32 remove );
+extern BOOL TIMER_GetTimerMsg( MSG *msg, HWND hwnd,
+                                 HQUEUE16 hQueue, BOOL remove );
 
 #define EVENT_IO_READ		0
 #define EVENT_IO_WRITE		1
@@ -33,34 +33,34 @@ extern BOOL32 TIMER_GetTimerMsg( MSG32 *msg, HWND32 hwnd,
 /* event.c */
 
 typedef struct _EVENT_DRIVER {
-  BOOL32 (*pInit)(void);
+  BOOL (*pInit)(void);
   void   (*pAddIO)(int, unsigned);
   void   (*pDeleteIO)(int, unsigned);
-  BOOL32 (*pWaitNetEvent)(BOOL32, BOOL32);
+  BOOL (*pWaitNetEvent)(BOOL, BOOL);
   void   (*pSynchronize)(void);
-  BOOL32 (*pCheckFocus)(void);
-  BOOL32 (*pQueryPointer)(DWORD *, DWORD *, DWORD *);
+  BOOL (*pCheckFocus)(void);
+  BOOL (*pQueryPointer)(DWORD *, DWORD *, DWORD *);
   void   (*pDummyMotionNotify)(void);
-  BOOL32 (*pPending)(void);
+  BOOL (*pPending)(void);
   BOOL16 (*pIsUserIdle)(void);
   void   (*pWakeUp)(void);
 } EVENT_DRIVER;
 
 extern void EVENT_AddIO( int fd, unsigned flag );
 extern void EVENT_DeleteIO( int fd, unsigned flag );
-extern BOOL32 EVENT_Init( void );
-extern BOOL32 EVENT_WaitNetEvent( BOOL32 sleep, BOOL32 peek );
+extern BOOL EVENT_Init( void );
+extern BOOL EVENT_WaitNetEvent( BOOL sleep, BOOL peek );
 extern void EVENT_Synchronize(void);
-extern BOOL32 EVENT_CheckFocus( void );
-extern BOOL32 EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state);
+extern BOOL EVENT_CheckFocus( void );
+extern BOOL EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state);
 extern void EVENT_DummyMotionNotify(void);
-extern BOOL32 EVENT_Pending(void);
+extern BOOL EVENT_Pending(void);
 extern void EVENT_WakeUp(void);
 
 /* input.c */
 
-extern HWND32 EVENT_Capture( HWND32, INT16 );
-extern BOOL32 EVENT_QueryPointer( DWORD *posX, DWORD *posY, DWORD *state );
+extern HWND EVENT_Capture( HWND, INT16 );
+extern BOOL EVENT_QueryPointer( DWORD *posX, DWORD *posY, DWORD *state );
 
 extern void joySendMessages(void);
 
diff --git a/include/metafile.h b/include/metafile.h
index f3344653470..1abef44c8b4 100644
--- a/include/metafile.h
+++ b/include/metafile.h
@@ -14,29 +14,29 @@
 #define MFVERSION 0x300
 #define META_EOF 0x0000
 
-BOOL32 MF_MetaParam0(DC *dc, short func);
-BOOL32 MF_MetaParam1(DC *dc, short func, short param1);
-BOOL32 MF_MetaParam2(DC *dc, short func, short param1, short param2);
-BOOL32 MF_MetaParam4(DC *dc, short func, short param1, short param2, 
+BOOL MF_MetaParam0(DC *dc, short func);
+BOOL MF_MetaParam1(DC *dc, short func, short param1);
+BOOL MF_MetaParam2(DC *dc, short func, short param1, short param2);
+BOOL MF_MetaParam4(DC *dc, short func, short param1, short param2, 
 		   short param3, short param4);
-BOOL32 MF_MetaParam6(DC *dc, short func, short param1, short param2, 
+BOOL MF_MetaParam6(DC *dc, short func, short param1, short param2, 
 		   short param3, short param4, short param5, short param6);
-BOOL32 MF_MetaParam8(DC *dc, short func, short param1, short param2, 
+BOOL MF_MetaParam8(DC *dc, short func, short param1, short param2, 
 		   short param3, short param4, short param5,
 		   short param6, short param7, short param8);
-BOOL32 MF_CreateBrushIndirect(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush);
-BOOL32 MF_CreatePatternBrush(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush);
-BOOL32 MF_CreatePenIndirect(DC *dc, HPEN16 hPen, LOGPEN16 *logpen);
-BOOL32 MF_CreateFontIndirect(DC *dc, HFONT16 hFont, LOGFONT16 *logfont);
-BOOL32 MF_TextOut(DC *dc, short x, short y, LPCSTR str, short count);
-BOOL32 MF_ExtTextOut(DC *dc, short x, short y, UINT16 flags, const RECT16 *rect,
+BOOL MF_CreateBrushIndirect(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush);
+BOOL MF_CreatePatternBrush(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush);
+BOOL MF_CreatePenIndirect(DC *dc, HPEN16 hPen, LOGPEN16 *logpen);
+BOOL MF_CreateFontIndirect(DC *dc, HFONT16 hFont, LOGFONT16 *logfont);
+BOOL MF_TextOut(DC *dc, short x, short y, LPCSTR str, short count);
+BOOL MF_ExtTextOut(DC *dc, short x, short y, UINT16 flags, const RECT16 *rect,
                    LPCSTR str, short count, const INT16 *lpDx);
-BOOL32 MF_MetaPoly(DC *dc, short func, LPPOINT16 pt, short count);
-BOOL32 MF_BitBlt(DC *dcDest, short xDest, short yDest, short width,
+BOOL MF_MetaPoly(DC *dc, short func, LPPOINT16 pt, short count);
+BOOL MF_BitBlt(DC *dcDest, short xDest, short yDest, short width,
 	       short height, DC *dcSrc, short xSrc, short ySrc, DWORD rop);
-BOOL32 MF_StretchBlt(DC *dcDest, short xDest, short yDest, short widthDest,
+BOOL MF_StretchBlt(DC *dcDest, short xDest, short yDest, short widthDest,
 		   short heightDest, DC *dcSrc, short xSrc, short ySrc, 
 		   short widthSrc, short heightSrc, DWORD rop);
-INT16 MF_CreateRegion(DC *dc, HRGN32 hrgn);
+INT16 MF_CreateRegion(DC *dc, HRGN hrgn);
 #endif   /* __WINE_METAFILE_H */
 
diff --git a/include/metafiledrv.h b/include/metafiledrv.h
index 96865162509..29048d1c2e3 100644
--- a/include/metafiledrv.h
+++ b/include/metafiledrv.h
@@ -18,63 +18,63 @@
 typedef struct
 {
     METAHEADER  *mh;           /* Pointer to metafile header */
-    UINT32       nextHandle;   /* Next handle number */
+    UINT       nextHandle;   /* Next handle number */
 } METAFILEDRV_PDEVICE;
 
 
 /* Metafile driver functions */
 
-extern BOOL32 MFDRV_BitBlt( struct tagDC *dcDst, INT32 xDst, INT32 yDst,
-                            INT32 width, INT32 height, struct tagDC *dcSrc,
-                            INT32 xSrc, INT32 ySrc, DWORD rop );
-extern BOOL32 MFDRV_PatBlt( struct tagDC *dc, INT32 left, INT32 top,
-                            INT32 width, INT32 height, DWORD rop );
-extern BOOL32 MFDRV_StretchBlt( struct tagDC *dcDst, INT32 xDst, INT32 yDst,
-                                INT32 widthDst, INT32 heightDst,
-                                struct tagDC *dcSrc, INT32 xSrc, INT32 ySrc,
-                                INT32 widthSrc, INT32 heightSrc, DWORD rop );
-extern INT32 MFDRV_SetMapMode( struct tagDC *dc, INT32 mode );
-extern BOOL32 MFDRV_SetViewportExt( struct tagDC *dc, INT32 x, INT32 y );
-extern BOOL32 MFDRV_SetViewportOrg( struct tagDC *dc, INT32 x, INT32 y );
-extern BOOL32 MFDRV_SetWindowExt( struct tagDC *dc, INT32 x, INT32 y );
-extern BOOL32 MFDRV_SetWindowOrg( struct tagDC *dc, INT32 x, INT32 y );
-extern BOOL32 MFDRV_OffsetViewportOrg( struct tagDC *dc, INT32 x, INT32 y );
-extern BOOL32 MFDRV_OffsetWindowOrg( struct tagDC *dc, INT32 x, INT32 y );
-extern BOOL32 MFDRV_ScaleViewportExt( struct tagDC *dc, INT32 xNum,
-                                      INT32 xDenom, INT32 yNum, INT32 yDenom );
-extern BOOL32 MFDRV_ScaleWindowExt( struct tagDC *dc, INT32 xNum, INT32 xDenom,
-                                    INT32 yNum, INT32 yDenom );
-extern BOOL32 MFDRV_MoveToEx(struct tagDC *dc, INT32 x, INT32 y, LPPOINT32 pt);
-extern BOOL32 MFDRV_LineTo( struct tagDC *dc, INT32 x, INT32 y );
-extern BOOL32 MFDRV_Arc( struct tagDC *dc, INT32 left, INT32 top, INT32 right,
-			 INT32 bottom, INT32 xstart, INT32 ystart, INT32 xend,
-			 INT32 yend );
-extern BOOL32 MFDRV_Pie( struct tagDC *dc, INT32 left, INT32 top, INT32 right,
-			 INT32 bottom, INT32 xstart, INT32 ystart, INT32 xend,
-			 INT32 yend );
-extern BOOL32 MFDRV_Chord( struct tagDC *dc, INT32 left, INT32 top, INT32 right,
-			   INT32 bottom, INT32 xstart, INT32 ystart, INT32 xend,
-			   INT32 yend );
-extern BOOL32 MFDRV_Ellipse( struct tagDC *dc, INT32 left, INT32 top,
-			     INT32 right, INT32 bottom );
-extern BOOL32 MFDRV_Rectangle( struct tagDC *dc, INT32 left, INT32 top,
-			       INT32 right, INT32 bottom);
-extern BOOL32 MFDRV_RoundRect( struct tagDC *dc, INT32 left, INT32 top,
-			       INT32 right, INT32 bottom, INT32 ell_width,
-			       INT32 ell_height );
-extern COLORREF MFDRV_SetPixel( struct tagDC *dc, INT32 x, INT32 y, COLORREF color );
-extern BOOL32 MFDRV_Polyline( struct tagDC *dc, const POINT32* pt,INT32 count);
-extern BOOL32 MFDRV_Polygon( struct tagDC *dc, const POINT32* pt, INT32 count );
-extern BOOL32 MFDRV_PolyPolygon( struct tagDC *dc, const POINT32* pt, const INT32* counts,
-				 UINT32 polygons);
-extern HGDIOBJ32 MFDRV_SelectObject( DC *dc, HGDIOBJ32 handle );
+extern BOOL MFDRV_BitBlt( struct tagDC *dcDst, INT xDst, INT yDst,
+                            INT width, INT height, struct tagDC *dcSrc,
+                            INT xSrc, INT ySrc, DWORD rop );
+extern BOOL MFDRV_PatBlt( struct tagDC *dc, INT left, INT top,
+                            INT width, INT height, DWORD rop );
+extern BOOL MFDRV_StretchBlt( struct tagDC *dcDst, INT xDst, INT yDst,
+                                INT widthDst, INT heightDst,
+                                struct tagDC *dcSrc, INT xSrc, INT ySrc,
+                                INT widthSrc, INT heightSrc, DWORD rop );
+extern INT MFDRV_SetMapMode( struct tagDC *dc, INT mode );
+extern BOOL MFDRV_SetViewportExt( struct tagDC *dc, INT x, INT y );
+extern BOOL MFDRV_SetViewportOrg( struct tagDC *dc, INT x, INT y );
+extern BOOL MFDRV_SetWindowExt( struct tagDC *dc, INT x, INT y );
+extern BOOL MFDRV_SetWindowOrg( struct tagDC *dc, INT x, INT y );
+extern BOOL MFDRV_OffsetViewportOrg( struct tagDC *dc, INT x, INT y );
+extern BOOL MFDRV_OffsetWindowOrg( struct tagDC *dc, INT x, INT y );
+extern BOOL MFDRV_ScaleViewportExt( struct tagDC *dc, INT xNum,
+                                      INT xDenom, INT yNum, INT yDenom );
+extern BOOL MFDRV_ScaleWindowExt( struct tagDC *dc, INT xNum, INT xDenom,
+                                    INT yNum, INT yDenom );
+extern BOOL MFDRV_MoveToEx(struct tagDC *dc, INT x, INT y, LPPOINT pt);
+extern BOOL MFDRV_LineTo( struct tagDC *dc, INT x, INT y );
+extern BOOL MFDRV_Arc( struct tagDC *dc, INT left, INT top, INT right,
+			 INT bottom, INT xstart, INT ystart, INT xend,
+			 INT yend );
+extern BOOL MFDRV_Pie( struct tagDC *dc, INT left, INT top, INT right,
+			 INT bottom, INT xstart, INT ystart, INT xend,
+			 INT yend );
+extern BOOL MFDRV_Chord( struct tagDC *dc, INT left, INT top, INT right,
+			   INT bottom, INT xstart, INT ystart, INT xend,
+			   INT yend );
+extern BOOL MFDRV_Ellipse( struct tagDC *dc, INT left, INT top,
+			     INT right, INT bottom );
+extern BOOL MFDRV_Rectangle( struct tagDC *dc, INT left, INT top,
+			       INT right, INT bottom);
+extern BOOL MFDRV_RoundRect( struct tagDC *dc, INT left, INT top,
+			       INT right, INT bottom, INT ell_width,
+			       INT ell_height );
+extern COLORREF MFDRV_SetPixel( struct tagDC *dc, INT x, INT y, COLORREF color );
+extern BOOL MFDRV_Polyline( struct tagDC *dc, const POINT* pt,INT count);
+extern BOOL MFDRV_Polygon( struct tagDC *dc, const POINT* pt, INT count );
+extern BOOL MFDRV_PolyPolygon( struct tagDC *dc, const POINT* pt, const INT* counts,
+				 UINT polygons);
+extern HGDIOBJ MFDRV_SelectObject( DC *dc, HGDIOBJ handle );
 extern COLORREF MFDRV_SetBkColor( DC *dc, COLORREF color );
 extern COLORREF MFDRV_SetTextColor( DC *dc, COLORREF color );
-extern BOOL32 MFDRV_ExtFloodFill( struct tagDC *dc, INT32 x, INT32 y,
-				  COLORREF color, UINT32 fillType );
-extern BOOL32 MFDRV_ExtTextOut( struct tagDC *dc, INT32 x, INT32 y,
-				UINT32 flags, const RECT32 *lprect, LPCSTR str,
-				UINT32 count, const INT32 *lpDx );
-extern BOOL32 MFDRV_PaintRgn( DC *dc, HRGN32 hrgn );
+extern BOOL MFDRV_ExtFloodFill( struct tagDC *dc, INT x, INT y,
+				  COLORREF color, UINT fillType );
+extern BOOL MFDRV_ExtTextOut( struct tagDC *dc, INT x, INT y,
+				UINT flags, const RECT *lprect, LPCSTR str,
+				UINT count, const INT *lpDx );
+extern BOOL MFDRV_PaintRgn( DC *dc, HRGN hrgn );
 
 #endif  /* __WINE_METAFILEDRV_H */
diff --git a/include/miscemu.h b/include/miscemu.h
index d7a1846be2a..e4596edb4cd 100644
--- a/include/miscemu.h
+++ b/include/miscemu.h
@@ -22,17 +22,17 @@ extern DWORD DOSMEM_CollateTable;
 extern DWORD DOSMEM_ErrorCall;
 extern DWORD DOSMEM_ErrorBuffer;
 
-extern BOOL32 DOSMEM_Init(HMODULE16 hModule);
+extern BOOL DOSMEM_Init(HMODULE16 hModule);
 extern void   DOSMEM_Tick(WORD timer);
 extern WORD   DOSMEM_AllocSelector(WORD);
 extern char * DOSMEM_MemoryBase(HMODULE16 hModule);
-extern LPVOID DOSMEM_GetBlock(HMODULE16 hModule, UINT32 size, UINT16* p);
-extern BOOL32 DOSMEM_FreeBlock(HMODULE16 hModule, void* ptr);
-extern LPVOID DOSMEM_ResizeBlock(HMODULE16 hModule, void* ptr, UINT32 size, UINT16* p);
-extern UINT32 DOSMEM_Available(HMODULE16 hModule);
+extern LPVOID DOSMEM_GetBlock(HMODULE16 hModule, UINT size, UINT16* p);
+extern BOOL DOSMEM_FreeBlock(HMODULE16 hModule, void* ptr);
+extern LPVOID DOSMEM_ResizeBlock(HMODULE16 hModule, void* ptr, UINT size, UINT16* p);
+extern UINT DOSMEM_Available(HMODULE16 hModule);
 extern LPVOID DOSMEM_MapRealToLinear(DWORD); /* real-mode to linear */
-extern LPVOID DOSMEM_MapDosToLinear(UINT32); /* linear DOS to Wine */
-extern UINT32 DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */
+extern LPVOID DOSMEM_MapDosToLinear(UINT); /* linear DOS to Wine */
+extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */
 
 /* msdos/interrupts.c */
 extern FARPROC16 INT_GetPMHandler( BYTE intnum );
@@ -101,9 +101,9 @@ extern void WINAPI DPMI_FreeInternalRMCB(FARPROC16);
 extern void WINAPI XMS_Handler(CONTEXT*);
 
 /* loader/signal.c */
-extern BOOL32 SIGNAL_Init(void);
+extern BOOL SIGNAL_Init(void);
 extern void SIGNAL_SetHandler( int sig, void (*func)(), int flags );
-extern void SIGNAL_MaskAsyncEvents( BOOL32 flag );
+extern void SIGNAL_MaskAsyncEvents( BOOL flag );
 extern void SIGNAL_InitHandlers(void);
 
 /* misc/aspi.c */
diff --git a/include/mmsystem.h b/include/mmsystem.h
index a86b5ff6474..310a6f4de19 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -28,14 +28,11 @@ typedef LPCSTR			HPCSTR;         /* a huge version of LPCSTR */
 typedef WORD    VERSION;        /* major (high byte), minor (low byte) */
 
 typedef UINT16	MMVERSION16;
-typedef UINT32	MMVERSION32;
-DECL_WINELIB_TYPE(MMVERSION)
+typedef UINT	MMVERSION;
 typedef UINT16	MCIDEVICEID16;
-typedef UINT32	MCIDEVICEID32;
-DECL_WINELIB_TYPE(MCIDEVICEID)
+typedef UINT	MCIDEVICEID;
 typedef	UINT16	MMRESULT16;
-typedef	UINT32	MMRESULT32;
-DECL_WINELIB_TYPE(MMRESULT)
+typedef	UINT	MMRESULT;
 
 typedef struct {
     UINT16    wType;		/* indicates the contents of the union */
@@ -58,7 +55,7 @@ typedef struct {
 } MMTIME16,  *LPMMTIME16;
 
 typedef struct {
-    UINT32    wType;
+    UINT    wType;
     union {
 	DWORD ms;
 	DWORD sample;
@@ -76,9 +73,7 @@ typedef struct {
 	    DWORD songptrpos;
 	} midi;
     } u;
-} MMTIME32,  *LPMMTIME32;
-DECL_WINELIB_TYPE(MMTIME)
-DECL_WINELIB_TYPE(LPMMTIME)
+} MMTIME,  *LPMMTIME;
 
 #define TIME_MS         0x0001  /* time in milliseconds */
 #define TIME_SAMPLES    0x0002  /* number of wave samples */
@@ -149,13 +144,12 @@ DECL_WINELIB_TYPE(LPMMTIME)
 #define CALLBACK_WINDOW     0x00010000l    /* dwCallback is a HWND */
 #define CALLBACK_TASK       0x00020000l    /* dwCallback is a HTASK */
 #define CALLBACK_FUNCTION   0x00030000l    /* dwCallback is a FARPROC */
-#define CALLBACK_FUNC32     0x00070000l    /* (ugly hack) 32-bit FARPROC */
+#define CALLBACK_FUNC     0x00070000l    /* (ugly hack) 32-bit FARPROC */
 #define CALLBACK32CONV(x)   ((((x)&CALLBACK_TYPEMASK)==CALLBACK_FUNCTION) ? \
-                             (((x)&~CALLBACK_TYPEMASK)|CALLBACK_FUNC32) : (x))
+                             (((x)&~CALLBACK_TYPEMASK)|CALLBACK_FUNC) : (x))
 
 typedef void (CALLBACK *LPDRVCALLBACK16) (HDRVR16 h, UINT16 uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
-typedef void (CALLBACK *LPDRVCALLBACK32) (HDRVR32 h, UINT32 uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
-DECL_WINELIB_TYPE(LPDRVCALLBACK)
+typedef void (CALLBACK *LPDRVCALLBACK) (HDRVR h, UINT uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
 
 #define MM_MICROSOFT            1       /* Microsoft Corp. */
 
@@ -177,11 +171,10 @@ DECL_WINELIB_TYPE(LPDRVCALLBACK)
 
 
 UINT16 WINAPI mmsystemGetVersion16(void);
-UINT32 WINAPI mmsystemGetVersion32(void);
-#define mmsystemGetVersion WINELIB_NAME(mmsystemGetVersion)
+UINT WINAPI mmsystemGetVersion(void);
 BOOL16 WINAPI sndPlaySound(LPCSTR lpszSoundName, UINT16 uFlags);
-BOOL32 WINAPI PlaySound32A(LPCSTR pszSound, HMODULE32 hmod, DWORD fdwSound);
-BOOL32 WINAPI PlaySound32W(LPCWSTR pszSound, HMODULE32 hmod, DWORD fdwSound);
+BOOL WINAPI PlaySoundA(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound);
+BOOL WINAPI PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound);
 #define PlaySound WINELIB_NAME_AW(PlaySound)
 
 #define SND_SYNC            0x0000  /* play synchronously (default) */
@@ -209,10 +202,9 @@ BOOL32 WINAPI PlaySound32W(LPCWSTR pszSound, HMODULE32 hmod, DWORD fdwSound);
 typedef HWAVEIN16 *LPHWAVEIN16;
 typedef HWAVEOUT16 *LPHWAVEOUT16;
 typedef LPDRVCALLBACK16 LPWAVECALLBACK16;
-typedef LPDRVCALLBACK32 LPWAVECALLBACK32;
-DECL_WINELIB_TYPE(LPWAVECALLBACK)
+typedef LPDRVCALLBACK LPWAVECALLBACK;
 typedef HMIXER16 *LPHMIXER16;
-typedef HMIXER32 *LPHMIXER32;
+typedef HMIXER *LPHMIXER;
 
 #define WOM_OPEN        MM_WOM_OPEN
 #define WOM_CLOSE       MM_WOM_CLOSE
@@ -257,24 +249,24 @@ typedef struct {
 typedef struct {
     WORD	wMid;			/* manufacturer ID */
     WORD	wPid;			/* product ID */
-    MMVERSION32	vDriverVersion;		/* version of the driver */
+    MMVERSION	vDriverVersion;		/* version of the driver */
     CHAR	szPname[MAXPNAMELEN];	/* product name (0 terminated string) */
     DWORD	dwFormats;		/* formats supported */
     WORD	wChannels;		/* number of sources supported */
     WORD	wReserved1;		/* padding */
     DWORD	dwSupport;		/* functionality supported by driver */
-} WAVEOUTCAPS32A, *LPWAVEOUTCAPS32A;
+} WAVEOUTCAPSA, *LPWAVEOUTCAPSA;
 
 typedef struct {
     WORD	wMid;			/* manufacturer ID */
     WORD	wPid;			/* product ID */
-    MMVERSION32	vDriverVersion;		/* version of the driver */
+    MMVERSION	vDriverVersion;		/* version of the driver */
     WCHAR	szPname[MAXPNAMELEN];	/* product name (0 terminated string) */
     DWORD	dwFormats;		/* formats supported */
     WORD	wChannels;		/* number of sources supported */
     WORD	wReserved1;		/* padding */
     DWORD	dwSupport;		/* functionality supported by driver */
-} WAVEOUTCAPS32W, *LPWAVEOUTCAPS32W;
+} WAVEOUTCAPSW, *LPWAVEOUTCAPSW;
 DECL_WINELIB_TYPE_AW(WAVEOUTCAPS)
 DECL_WINELIB_TYPE_AW(LPWAVEOUTCAPS)
 
@@ -296,21 +288,21 @@ typedef struct {
 typedef struct {
     WORD	wMid;			/* manufacturer ID */
     WORD	wPid;			/* product ID */
-    MMVERSION32	vDriverVersion;		/* version of the driver */
+    MMVERSION	vDriverVersion;		/* version of the driver */
     CHAR	szPname[MAXPNAMELEN];	/* product name (0 terminated string) */
     DWORD	dwFormats;		/* formats supported */
     WORD	wChannels;		/* number of channels supported */
     WORD	wReserved1;
-} WAVEINCAPS32A, *LPWAVEINCAPS32A;
+} WAVEINCAPSA, *LPWAVEINCAPSA;
 typedef struct {
     WORD	wMid;			/* manufacturer ID */
     WORD	wPid;			/* product ID */
-    MMVERSION32	vDriverVersion;		/* version of the driver */
+    MMVERSION	vDriverVersion;		/* version of the driver */
     WCHAR	szPname[MAXPNAMELEN];	/* product name (0 terminated string) */
     DWORD	dwFormats;		/* formats supported */
     WORD	wChannels;		/* number of channels supported */
     WORD	wReserved1;
-} WAVEINCAPS32W, *LPWAVEINCAPS32W;
+} WAVEINCAPSW, *LPWAVEINCAPSW;
 DECL_WINELIB_TYPE_AW(WAVEINCAPS)
 DECL_WINELIB_TYPE_AW(LPWAVEINCAPS)
 
@@ -360,116 +352,85 @@ typedef struct {
 #endif
 
 UINT16 WINAPI waveOutGetNumDevs16(void);
-UINT32 WINAPI waveOutGetNumDevs32(void);
-#define waveOutGetNumDevs WINELIB_NAME(waveOutGetNumDevs)
+UINT WINAPI waveOutGetNumDevs(void);
 UINT16 WINAPI waveOutGetDevCaps16(UINT16,LPWAVEOUTCAPS16,UINT16);
-UINT32 WINAPI waveOutGetDevCaps32A(UINT32,LPWAVEOUTCAPS32A,UINT32);
-UINT32 WINAPI waveOutGetDevCaps32W(UINT32,LPWAVEOUTCAPS32W,UINT32);
+UINT WINAPI waveOutGetDevCapsA(UINT,LPWAVEOUTCAPSA,UINT);
+UINT WINAPI waveOutGetDevCapsW(UINT,LPWAVEOUTCAPSW,UINT);
 #define waveOutGetDevCaps WINELIB_NAME_AW(waveOutGetDevCaps)
 UINT16 WINAPI waveOutGetVolume16(UINT16,DWORD*);
-UINT32 WINAPI waveOutGetVolume32(UINT32,DWORD*);
-#define waveOutGetVolume WINELIB_NAME(waveOutGetVolume)
+UINT WINAPI waveOutGetVolume(UINT,DWORD*);
 UINT16 WINAPI waveOutSetVolume16(UINT16,DWORD);
-UINT32 WINAPI waveOutSetVolume32(UINT32,DWORD);
-#define waveOutSetVolume WINELIB_NAME(waveOutSetVolume)
+UINT WINAPI waveOutSetVolume(UINT,DWORD);
 UINT16 WINAPI waveOutGetErrorText16(UINT16,LPSTR,UINT16);
-UINT32 WINAPI waveOutGetErrorText32A(UINT32,LPSTR,UINT32);
-UINT32 WINAPI waveOutGetErrorText32W(UINT32,LPWSTR,UINT32);
+UINT WINAPI waveOutGetErrorTextA(UINT,LPSTR,UINT);
+UINT WINAPI waveOutGetErrorTextW(UINT,LPWSTR,UINT);
 #define waveOutGetErrorText WINELIB_NAME_AW(waveOutGetErrorText)
 UINT16 WINAPI waveOutOpen16(HWAVEOUT16*,UINT16,const LPWAVEFORMATEX,DWORD,DWORD,DWORD);
-UINT32 WINAPI waveOutOpen32(HWAVEOUT32*,UINT32,const LPWAVEFORMATEX,DWORD,DWORD,DWORD);
-#define waveOutOpen WINELIB_NAME(waveOutOpen)
+UINT WINAPI waveOutOpen(HWAVEOUT*,UINT,const LPWAVEFORMATEX,DWORD,DWORD,DWORD);
 UINT16 WINAPI waveOutClose16(HWAVEOUT16);
-UINT32 WINAPI waveOutClose32(HWAVEOUT32);
-#define waveOutClose WINELIB_NAME(waveOutClose)
+UINT WINAPI waveOutClose(HWAVEOUT);
 UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16,WAVEHDR*,UINT16);
-UINT32 WINAPI waveOutPrepareHeader32(HWAVEOUT32,WAVEHDR*,UINT32);
-#define waveOutPrepareHeader WINELIB_NAME(waveOutPrepareHeader)
+UINT WINAPI waveOutPrepareHeader(HWAVEOUT,WAVEHDR*,UINT);
 UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16,WAVEHDR*,UINT16);
-UINT32 WINAPI waveOutUnprepareHeader32(HWAVEOUT32,WAVEHDR*,UINT32);
-#define waveOutUnprepareHeader WINELIB_NAME(waveOutUnprepareHeader)
+UINT WINAPI waveOutUnprepareHeader(HWAVEOUT,WAVEHDR*,UINT);
 UINT16 WINAPI waveOutWrite16(HWAVEOUT16,WAVEHDR*,UINT16);
-UINT32 WINAPI waveOutWrite32(HWAVEOUT32,WAVEHDR*,UINT32);
-#define waveOutWrite WINELIB_NAME(waveOutWrite)
+UINT WINAPI waveOutWrite(HWAVEOUT,WAVEHDR*,UINT);
 UINT16 WINAPI waveOutPause16(HWAVEOUT16);
-UINT32 WINAPI waveOutPause32(HWAVEOUT32);
-#define waveOutPause WINELIB_NAME(waveOutPause)
+UINT WINAPI waveOutPause(HWAVEOUT);
 UINT16 WINAPI waveOutRestart16(HWAVEOUT16);
-UINT32 WINAPI waveOutRestart32(HWAVEOUT32);
-#define waveOutRestart WINELIB_NAME(waveOutRestart)
+UINT WINAPI waveOutRestart(HWAVEOUT);
 UINT16 WINAPI waveOutReset16(HWAVEOUT16);
-UINT32 WINAPI waveOutReset32(HWAVEOUT32);
-#define waveOutReset WINELIB_NAME(waveOutReset)
+UINT WINAPI waveOutReset(HWAVEOUT);
 UINT16 WINAPI waveOutBreakLoop16(HWAVEOUT16);
-UINT32 WINAPI waveOutBreakLoop32(HWAVEOUT32);
-#define waveOutBreakLoop WINELIB_NAME(waveOutBreakLoop)
+UINT WINAPI waveOutBreakLoop(HWAVEOUT);
 UINT16 WINAPI waveOutGetPosition16(HWAVEOUT16,LPMMTIME16,UINT16);
-UINT32 WINAPI waveOutGetPosition32(HWAVEOUT32,LPMMTIME32,UINT32);
-#define waveOutGetPosition WINELIB_NAME(waveOutGetPosition)
+UINT WINAPI waveOutGetPosition(HWAVEOUT,LPMMTIME,UINT);
 UINT16 WINAPI waveOutGetPitch16(HWAVEOUT16,DWORD*);
-UINT32 WINAPI waveOutGetPitch32(HWAVEOUT32,DWORD*);
-#define waveOutGetPitch WINELIB_NAME(waveOutGetPitch)
+UINT WINAPI waveOutGetPitch(HWAVEOUT,DWORD*);
 UINT16 WINAPI waveOutSetPitch16(HWAVEOUT16,DWORD);
-UINT32 WINAPI waveOutSetPitch32(HWAVEOUT32,DWORD);
-#define waveOutSetPitch WINELIB_NAME(waveOutSetPitch)
+UINT WINAPI waveOutSetPitch(HWAVEOUT,DWORD);
 UINT16 WINAPI waveOutGetPlaybackRate16(HWAVEOUT16,DWORD*);
-UINT32 WINAPI waveOutGetPlaybackRate32(HWAVEOUT32,DWORD*);
-#define waveOutGetPlaybackRate WINELIB_NAME(waveOutGetPlaybackRate)
+UINT WINAPI waveOutGetPlaybackRate(HWAVEOUT,DWORD*);
 UINT16 WINAPI waveOutSetPlaybackRate16(HWAVEOUT16,DWORD);
-UINT32 WINAPI waveOutSetPlaybackRate32(HWAVEOUT32,DWORD);
-#define waveOutSetPlaybackRate WINELIB_NAME(waveOutSetPlaybackRate)
+UINT WINAPI waveOutSetPlaybackRate(HWAVEOUT,DWORD);
 UINT16 WINAPI waveOutGetID16(HWAVEOUT16,UINT16*);
-UINT32 WINAPI waveOutGetID32(HWAVEOUT32,UINT32*);
-#define waveOutGetID WINELIB_NAME(waveOutGetID)
+UINT WINAPI waveOutGetID(HWAVEOUT,UINT*);
 DWORD WINAPI waveOutMessage16(HWAVEOUT16,UINT16,DWORD,DWORD);
-DWORD WINAPI waveOutMessage32(HWAVEOUT32,UINT32,DWORD,DWORD);
-#define waveOutMessage WINELIB_NAME(waveOutMessage)
+DWORD WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD,DWORD);
 
 UINT16 WINAPI waveInGetNumDevs16(void);
-UINT32 WINAPI waveInGetNumDevs32(void);
-#define waveInGetNumDevs WINELIB_NAME(waveInGetNumDevs)
+UINT WINAPI waveInGetNumDevs(void);
 UINT16 WINAPI waveInGetDevCaps16(UINT16,LPWAVEINCAPS16,UINT16);
-UINT32 WINAPI waveInGetDevCaps32A(UINT32,LPWAVEINCAPS32A,UINT32);
-UINT32 WINAPI waveInGetDevCaps32W(UINT32,LPWAVEINCAPS32W,UINT32);
+UINT WINAPI waveInGetDevCapsA(UINT,LPWAVEINCAPSA,UINT);
+UINT WINAPI waveInGetDevCapsW(UINT,LPWAVEINCAPSW,UINT);
 #define waveInGetDevCaps WINELIB_NAME_AW(waveInGetDevCaps)
 UINT16 WINAPI waveInGetErrorText16(UINT16,LPSTR,UINT16);
-UINT32 WINAPI waveInGetErrorText32A(UINT32,LPSTR,UINT32);
-UINT32 WINAPI waveInGetErrorText32W(UINT32,LPWSTR,UINT32);
+UINT WINAPI waveInGetErrorTextA(UINT,LPSTR,UINT);
+UINT WINAPI waveInGetErrorTextW(UINT,LPWSTR,UINT);
 #define waveInGetErrorText WINELIB_NAME_AW(waveInGetErrorText)
 UINT16 WINAPI waveInOpen16(HWAVEIN16*,UINT16,const LPWAVEFORMAT,DWORD,DWORD,DWORD);
-UINT32 WINAPI waveInOpen32(HWAVEIN32*,UINT32,const LPWAVEFORMAT,DWORD,DWORD,DWORD);
-#define waveInOpen WINELIB_NAME(waveInOpen)
+UINT WINAPI waveInOpen(HWAVEIN*,UINT,const LPWAVEFORMAT,DWORD,DWORD,DWORD);
 UINT16 WINAPI waveInClose16(HWAVEIN16);
-UINT32 WINAPI waveInClose32(HWAVEIN32);
-#define waveInClose WINELIB_NAME(waveInClose)
+UINT WINAPI waveInClose(HWAVEIN);
 UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16,WAVEHDR*,UINT16);
-UINT32 WINAPI waveInPrepareHeader32(HWAVEIN32,WAVEHDR*,UINT32);
-#define waveInPrepareHeader WINELIB_NAME(waveInPrepareHeader)
+UINT WINAPI waveInPrepareHeader(HWAVEIN,WAVEHDR*,UINT);
 UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16,WAVEHDR*,UINT16);
-UINT32 WINAPI waveInUnprepareHeader32(HWAVEIN32,WAVEHDR*,UINT32);
-#define waveInUnprepareHeader WINELIB_NAME(waveInUnprepareHeader)
+UINT WINAPI waveInUnprepareHeader(HWAVEIN,WAVEHDR*,UINT);
 UINT16 WINAPI waveInAddBuffer16(HWAVEIN16,WAVEHDR*,UINT16);
-UINT32 WINAPI waveInAddBuffer32(HWAVEIN32,WAVEHDR*,UINT32);
-#define waveInAddBuffer WINELIB_NAME(waveInAddBuffer)
+UINT WINAPI waveInAddBuffer(HWAVEIN,WAVEHDR*,UINT);
 UINT16 WINAPI waveInStart16(HWAVEIN16);
-UINT32 WINAPI waveInStart32(HWAVEIN32);
-#define waveInStart WINELIB_NAME(waveInStart)
+UINT WINAPI waveInStart(HWAVEIN);
 UINT16 WINAPI waveInStop16(HWAVEIN16);
-UINT32 WINAPI waveInStop32(HWAVEIN32);
-#define waveInStop WINELIB_NAME(waveInStop)
+UINT WINAPI waveInStop(HWAVEIN);
 UINT16 WINAPI waveInReset16(HWAVEIN16);
-UINT32 WINAPI waveInReset32(HWAVEIN32);
-#define waveInReset WINELIB_NAME(waveInReset)
+UINT WINAPI waveInReset(HWAVEIN);
 UINT16 WINAPI waveInGetPosition16(HWAVEIN16,LPMMTIME16,UINT16);
-UINT32 WINAPI waveInGetPosition32(HWAVEIN32,LPMMTIME32,UINT32);
-#define waveInGetPosition WINELIB_NAME(waveInGetPosition)
+UINT WINAPI waveInGetPosition(HWAVEIN,LPMMTIME,UINT);
 UINT16 WINAPI waveInGetID16(HWAVEIN16,UINT16*);
-UINT32 WINAPI waveInGetID32(HWAVEIN32,UINT32*);
-#define waveInGetID WINELIB_NAME(waveInGetID)
+UINT WINAPI waveInGetID(HWAVEIN,UINT*);
 
 DWORD WINAPI waveInMessage16(HWAVEIN16,UINT16,DWORD,DWORD);
-DWORD WINAPI waveInMessage32(HWAVEIN32,UINT32,DWORD,DWORD);
-#define waveInMessage WINELIB_NAME(waveInMessage)
+DWORD WINAPI waveInMessage(HWAVEIN,UINT,DWORD,DWORD);
 
 #define MIDIERR_UNPREPARED    (MIDIERR_BASE + 0)   /* header not prepared */
 #define MIDIERR_STILLPLAYING  (MIDIERR_BASE + 1)   /* still something playing */
@@ -482,8 +443,7 @@ DWORD WINAPI waveInMessage32(HWAVEIN32,UINT32,DWORD,DWORD);
 typedef HMIDIIN16  *LPHMIDIIN16;
 typedef HMIDIOUT16  *LPHMIDIOUT16;
 typedef LPDRVCALLBACK16 LPMIDICALLBACK16;
-typedef LPDRVCALLBACK32 LPMIDICALLBACK32;
-DECL_WINELIB_TYPE(LPMIDICALLBACK)
+typedef LPDRVCALLBACK LPMIDICALLBACK;
 #define MIDIPATCHSIZE   128
 typedef WORD PATCHARRAY[MIDIPATCHSIZE];
 typedef WORD *LPPATCHARRAY;
@@ -528,26 +488,26 @@ typedef struct {
 typedef struct {
     WORD	wMid;		/* manufacturer ID */
     WORD	wPid;		/* product ID */
-    MMVERSION32	vDriverVersion;	/* version of the driver */
+    MMVERSION	vDriverVersion;	/* version of the driver */
     CHAR	szPname[MAXPNAMELEN];/* product name (NULL terminated string) */
     WORD	wTechnology;	/* type of device */
     WORD	wVoices;	/* # of voices (internal synth only) */
     WORD	wNotes;		/* max # of notes (internal synth only) */
     WORD	wChannelMask;	/* channels used (internal synth only) */
     DWORD	dwSupport;	/* functionality supported by driver */
-} MIDIOUTCAPS32A, *LPMIDIOUTCAPS32A;
+} MIDIOUTCAPSA, *LPMIDIOUTCAPSA;
 
 typedef struct {
     WORD	wMid;		/* manufacturer ID */
     WORD	wPid;		/* product ID */
-    MMVERSION32	vDriverVersion;	/* version of the driver */
+    MMVERSION	vDriverVersion;	/* version of the driver */
     WCHAR	szPname[MAXPNAMELEN];/* product name (NULL terminated string) */
     WORD	wTechnology;	/* type of device */
     WORD	wVoices;	/* # of voices (internal synth only) */
     WORD	wNotes;		/* max # of notes (internal synth only) */
     WORD	wChannelMask;	/* channels used (internal synth only) */
     DWORD	dwSupport;	/* functionality supported by driver */
-} MIDIOUTCAPS32W, *LPMIDIOUTCAPS32W;
+} MIDIOUTCAPSW, *LPMIDIOUTCAPSW;
 
 DECL_WINELIB_TYPE_AW(MIDIOUTCAPS)
 DECL_WINELIB_TYPE_AW(LPMIDIOUTCAPS)
@@ -574,18 +534,18 @@ typedef struct {
 typedef struct {
     WORD	wMid;		/* manufacturer ID */
     WORD	wPid;		/* product ID */
-    MMVERSION32	vDriverVersion;	/* version of the driver */
+    MMVERSION	vDriverVersion;	/* version of the driver */
     CHAR	szPname[MAXPNAMELEN];/* product name (NULL terminated string) */
     DWORD	dwSupport;	/* included in win95 and higher */
-} MIDIINCAPS32A, *LPMIDIINCAPS32A;
+} MIDIINCAPSA, *LPMIDIINCAPSA;
 
 typedef struct {
     WORD	wMid;		/* manufacturer ID */
     WORD	wPid;		/* product ID */
-    MMVERSION32	vDriverVersion;	/* version of the driver */
+    MMVERSION	vDriverVersion;	/* version of the driver */
     WCHAR	szPname[MAXPNAMELEN];/* product name (NULL terminated string) */
     DWORD	dwSupport;	/* included in win95 and higher */
-} MIDIINCAPS32W, *LPMIDIINCAPS32W;
+} MIDIINCAPSW, *LPMIDIINCAPSW;
 
 DECL_WINELIB_TYPE_AW(MIDIINCAPS)
 DECL_WINELIB_TYPE_AW(LPMIDIINCAPS)
@@ -598,7 +558,7 @@ typedef struct {
     DWORD	dwFlags;	/* assorted flags (see defines) */
     struct midihdr_tag *lpNext;	/* reserved for driver */
     DWORD	reserved;	/* reserved for driver */
-} MIDIHDR, *LPMIDIHDR;
+} MIDIHDR16, *LPMIDIHDR16;
 
 /* It seems that Win32 has a slightly different structure than Win 16.
  * sigh....
@@ -614,7 +574,7 @@ typedef struct {
     DWORD	dwOffset;	/* offset of playback in case of 
 				 * MIDISTRM buffer */
     DWORD	dwReserved[4];	/* reserved for driver */
-} MIDIHDR_WIN32, *LPMIDIHDR_WIN32;
+} MIDIHDR, *LPMIDIHDR;
 
 #define MHDR_DONE       0x00000001       /* done bit */
 #define MHDR_PREPARED   0x00000002       /* set if header prepared */
@@ -658,126 +618,93 @@ typedef struct {
 #define	MEVT_VERSION	0x84
 
 UINT16 WINAPI midiOutGetNumDevs16(void);
-UINT32 WINAPI midiOutGetNumDevs32(void);
-#define midiOutGetNumDevs WINELIB_NAME(midiOutGetNumDevs)
+UINT WINAPI midiOutGetNumDevs(void);
 UINT16 WINAPI midiOutGetDevCaps16(UINT16,LPMIDIOUTCAPS16,UINT16);
-UINT32 WINAPI midiOutGetDevCaps32A(UINT32,LPMIDIOUTCAPS32A,UINT32);
-UINT32 WINAPI midiOutGetDevCaps32W(UINT32,LPMIDIOUTCAPS32W,UINT32);
+UINT WINAPI midiOutGetDevCapsA(UINT,LPMIDIOUTCAPSA,UINT);
+UINT WINAPI midiOutGetDevCapsW(UINT,LPMIDIOUTCAPSW,UINT);
 #define midiOutGetDevCaps WINELIB_NAME_AW(midiOutGetDevCaps)
 UINT16 WINAPI midiOutGetVolume16(UINT16,DWORD*);
-UINT32 WINAPI midiOutGetVolume32(UINT32,DWORD*);
-#define midiOutGetVolume WINELIB_NAME(midiOutGetVolume)
+UINT WINAPI midiOutGetVolume(UINT,DWORD*);
 UINT16 WINAPI midiOutSetVolume16(UINT16,DWORD);
-UINT32 WINAPI midiOutSetVolume32(UINT32,DWORD);
-#define midiOutSetVolume WINELIB_NAME(midiOutSetVolume)
+UINT WINAPI midiOutSetVolume(UINT,DWORD);
 UINT16 WINAPI midiOutGetErrorText16(UINT16,LPSTR,UINT16);
-UINT32 WINAPI midiOutGetErrorText32A(UINT32,LPSTR,UINT32);
-UINT32 WINAPI midiOutGetErrorText32W(UINT32,LPWSTR,UINT32);
+UINT WINAPI midiOutGetErrorTextA(UINT,LPSTR,UINT);
+UINT WINAPI midiOutGetErrorTextW(UINT,LPWSTR,UINT);
 #define midiOutGetErrorText WINELIB_NAME_AW(midiOutGetErrorText)
 UINT16 WINAPI midiGetErrorText(UINT16,LPSTR,UINT16);
 UINT16 WINAPI midiOutOpen16(HMIDIOUT16*,UINT16,DWORD,DWORD,DWORD);
-UINT32 WINAPI midiOutOpen32(HMIDIOUT32*,UINT32,DWORD,DWORD,DWORD);
-#define midiOutOpen WINELIB_NAME(midiOutOpen)
+UINT WINAPI midiOutOpen(HMIDIOUT*,UINT,DWORD,DWORD,DWORD);
 UINT16 WINAPI midiOutClose16(HMIDIOUT16);
-UINT32 WINAPI midiOutClose32(HMIDIOUT32);
-#define midiOutClose WINELIB_NAME(midiOutClose)
-UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16,MIDIHDR*,UINT16);
-UINT32 WINAPI midiOutPrepareHeader32(HMIDIOUT32,MIDIHDR*,UINT32);
-#define midiOutPrepareHeader WINELIB_NAME(midiOutPrepareHeader)
-UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16,MIDIHDR*,UINT16);
-UINT32 WINAPI midiOutUnprepareHeader32(HMIDIOUT32,MIDIHDR*,UINT32);
-#define midiOutUnprepareHeader WINELIB_NAME(midiOutUnprepareHeader)
+UINT WINAPI midiOutClose(HMIDIOUT);
+UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16,MIDIHDR16*,UINT16);
+UINT WINAPI midiOutPrepareHeader(HMIDIOUT,MIDIHDR16*,UINT);
+UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16,MIDIHDR16*,UINT16);
+UINT WINAPI midiOutUnprepareHeader(HMIDIOUT,MIDIHDR16*,UINT);
 UINT16 WINAPI midiOutShortMsg16(HMIDIOUT16,DWORD);
-UINT32 WINAPI midiOutShortMsg32(HMIDIOUT32,DWORD);
-#define midiOutShortMsg WINELIB_NAME(midiOutShortMsg)
-UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16,MIDIHDR*,UINT16);
-UINT32 WINAPI midiOutLongMsg32(HMIDIOUT32,MIDIHDR*,UINT32);
-#define midiOutLongMsg WINELIB_NAME(midiOutLongMsg)
+UINT WINAPI midiOutShortMsg(HMIDIOUT,DWORD);
+UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16,MIDIHDR16*,UINT16);
+UINT WINAPI midiOutLongMsg(HMIDIOUT,MIDIHDR16*,UINT);
 UINT16 WINAPI midiOutReset16(HMIDIOUT16);
-UINT32 WINAPI midiOutReset32(HMIDIOUT32);
-#define midiOutReset WINELIB_NAME(midiOutReset)
+UINT WINAPI midiOutReset(HMIDIOUT);
 UINT16 WINAPI midiOutCachePatches16(HMIDIOUT16,UINT16,WORD*,UINT16);
-UINT32 WINAPI midiOutCachePatches32(HMIDIOUT32,UINT32,WORD*,UINT32);
-#define midiOutCachePatches WINELIB_NAME(midiOutCachePatches)
+UINT WINAPI midiOutCachePatches(HMIDIOUT,UINT,WORD*,UINT);
 UINT16 WINAPI midiOutCacheDrumPatches16(HMIDIOUT16,UINT16,WORD*,UINT16);
-UINT32 WINAPI midiOutCacheDrumPatches32(HMIDIOUT32,UINT32,WORD*,UINT32);
-#define midiOutCacheDrumPatches WINELIB_NAME(midiOutCacheDrumPatches)
+UINT WINAPI midiOutCacheDrumPatches(HMIDIOUT,UINT,WORD*,UINT);
 UINT16 WINAPI midiOutGetID16(HMIDIOUT16,UINT16*);
-UINT32 WINAPI midiOutGetID32(HMIDIOUT32,UINT32*);
-#define midiOutGetID WINELIB_NAME(midiOutGetID)
+UINT WINAPI midiOutGetID(HMIDIOUT,UINT*);
 
 DWORD WINAPI midiOutMessage16(HMIDIOUT16,UINT16,DWORD,DWORD);
-DWORD WINAPI midiOutMessage32(HMIDIOUT32,UINT32,DWORD,DWORD);
-#define midiOutMessage WINELIB_NAME(midiOutMessage)
+DWORD WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD,DWORD);
 
 UINT16 WINAPI midiInGetNumDevs16(void);
-UINT32 WINAPI midiInGetNumDevs32(void);
-#define midiInGetNumDevs WINELIB_NAME(midiInGetNumDevs)
+UINT WINAPI midiInGetNumDevs(void);
 UINT16 WINAPI midiInGetDevCaps16(UINT16,LPMIDIINCAPS16,UINT16);
-UINT32 WINAPI midiInGetDevCaps32A(UINT32,LPMIDIINCAPS32A,UINT32);
-UINT32 WINAPI midiInGetDevCaps32W(UINT32,LPMIDIINCAPS32W,UINT32);
+UINT WINAPI midiInGetDevCapsA(UINT,LPMIDIINCAPSA,UINT);
+UINT WINAPI midiInGetDevCapsW(UINT,LPMIDIINCAPSW,UINT);
 #define midiInGetDevCaps WINELIB_NAME_AW(midiInGetDevCaps)
 UINT16 WINAPI midiInGetErrorText16(UINT16,LPSTR,UINT16);
-UINT32 WINAPI midiInGetErrorText32A(UINT32,LPSTR,UINT32);
-UINT32 WINAPI midiInGetErrorText32W(UINT32,LPWSTR,UINT32);
+UINT WINAPI midiInGetErrorTextA(UINT,LPSTR,UINT);
+UINT WINAPI midiInGetErrorTextW(UINT,LPWSTR,UINT);
 #define midiInGetErrorText WINELIB_NAME_AW(midiInGetErrorText)
 UINT16 WINAPI midiInOpen16(HMIDIIN16*,UINT16,DWORD,DWORD,DWORD);
-UINT32 WINAPI midiInOpen32(HMIDIIN32*,UINT32,DWORD,DWORD,DWORD);
-#define midiInOpen WINELIB_NAME(midiInOpen)
+UINT WINAPI midiInOpen(HMIDIIN*,UINT,DWORD,DWORD,DWORD);
 UINT16 WINAPI midiInClose16(HMIDIIN16);
-UINT32 WINAPI midiInClose32(HMIDIIN32);
-#define midiInClose WINELIB_NAME(midiInClose)
-UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16,MIDIHDR*,UINT16);
-UINT32 WINAPI midiInPrepareHeader32(HMIDIIN32,MIDIHDR*,UINT32);
-#define midiInPrepareHeader WINELIB_NAME(midiInPrepareHeader)
-UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16,MIDIHDR*,UINT16);
-UINT32 WINAPI midiInUnprepareHeader32(HMIDIIN32,MIDIHDR*,UINT32);
-#define midiInUnprepareHeader WINELIB_NAME(midiInUnprepareHeader)
-UINT16 WINAPI midiInAddBuffer16(HMIDIIN16,MIDIHDR*,UINT16);
-UINT32 WINAPI midiInAddBuffer32(HMIDIIN32,MIDIHDR*,UINT32);
-#define midiInAddBuffer WINELIB_NAME(midiInAddBuffer)
+UINT WINAPI midiInClose(HMIDIIN);
+UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16,MIDIHDR16*,UINT16);
+UINT WINAPI midiInPrepareHeader(HMIDIIN,MIDIHDR16*,UINT);
+UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16,MIDIHDR16*,UINT16);
+UINT WINAPI midiInUnprepareHeader(HMIDIIN,MIDIHDR16*,UINT);
+UINT16 WINAPI midiInAddBuffer16(HMIDIIN16,MIDIHDR16*,UINT16);
+UINT WINAPI midiInAddBuffer(HMIDIIN,MIDIHDR16*,UINT);
 UINT16 WINAPI midiInStart16(HMIDIIN16);
-UINT32 WINAPI midiInStart32(HMIDIIN32);
-#define midiInStart WINELIB_NAME(midiInStart)
+UINT WINAPI midiInStart(HMIDIIN);
 UINT16 WINAPI midiInStop16(HMIDIIN16);
-UINT32 WINAPI midiInStop32(HMIDIIN32);
-#define midiInStop WINELIB_NAME(midiInStop)
+UINT WINAPI midiInStop(HMIDIIN);
 UINT16 WINAPI midiInReset16(HMIDIIN16);
-UINT32 WINAPI midiInReset32(HMIDIIN32);
-#define midiInReset WINELIB_NAME(midiInReset)
+UINT WINAPI midiInReset(HMIDIIN);
 UINT16 WINAPI midiInGetID16(HMIDIIN16,UINT16*);
-UINT32 WINAPI midiInGetID32(HMIDIIN32,UINT32*);
-#define midiInGetID WINELIB_NAME(midiInGetID)
+UINT WINAPI midiInGetID(HMIDIIN,UINT*);
 DWORD WINAPI midiInMessage16(HMIDIIN16,UINT16,DWORD,DWORD);
-DWORD WINAPI midiInMessage32(HMIDIIN32,UINT32,DWORD,DWORD);
-#define midiInMessage WINELIB_NAME(midiInMessage)
+DWORD WINAPI midiInMessage(HMIDIIN,UINT,DWORD,DWORD);
 
 MMRESULT16 WINAPI midiStreamClose16(HMIDISTRM16 hms);
-MMRESULT32 WINAPI midiStreamClose32(HMIDISTRM32 hms);
-#define midiStreamClose WINELIB_NAME(midiStreamClose)
-MMRESULT32 WINAPI midiStreamOpen32(HMIDISTRM32* phms, LPUINT32 uDeviceID, DWORD cMidi,
+MMRESULT WINAPI midiStreamClose(HMIDISTRM hms);
+MMRESULT WINAPI midiStreamOpen(HMIDISTRM* phms, LPUINT uDeviceID, DWORD cMidi,
 				   DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen); 
 MMRESULT16 WINAPI midiStreamOpen16(HMIDISTRM16* phms, LPUINT16 devid, DWORD cMidi,
 				   DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen); 
-#define midiStreamOpen WINELIB_NAME(midiStreamOpen)
-MMRESULT16 WINAPI midiStreamOut16(HMIDISTRM16 hms, LPMIDIHDR lpMidiHdr, UINT16 cbMidiHdr); 
-MMRESULT32 WINAPI midiStreamOut32(HMIDISTRM32 hms, LPMIDIHDR lpMidiHdr, UINT32 cbMidiHdr);
-#define midiStreamOut WINELIB_NAME(midiStreamOut)
+MMRESULT16 WINAPI midiStreamOut16(HMIDISTRM16 hms, LPMIDIHDR16 lpMidiHdr, UINT16 cbMidiHdr); 
+MMRESULT WINAPI midiStreamOut(HMIDISTRM hms, LPMIDIHDR16 lpMidiHdr, UINT cbMidiHdr);
 MMRESULT16 WINAPI midiStreamPause16(HMIDISTRM16 hms);
-MMRESULT32 WINAPI midiStreamPause32(HMIDISTRM32 hms);
-#define midiStreamPause WINELIB_NAME(midiStreamPause)
+MMRESULT WINAPI midiStreamPause(HMIDISTRM hms);
 MMRESULT16 WINAPI midiStreamPosition16(HMIDISTRM16 hms, LPMMTIME16 lpmmt, UINT16 cbmmt);
-MMRESULT32 WINAPI midiStreamPosition32(HMIDISTRM32 hms, LPMMTIME32 lpmmt, UINT32 cbmmt);
-#define midiStreamPosition WINELIB_NAME(midiStreamPosition)
+MMRESULT WINAPI midiStreamPosition(HMIDISTRM hms, LPMMTIME lpmmt, UINT cbmmt);
 MMRESULT16 WINAPI midiStreamProperty16(HMIDISTRM16 hms, LPBYTE lpPropData, DWORD dwProperty);
-MMRESULT32 WINAPI midiStreamProperty32(HMIDISTRM32 hms, LPBYTE lpPropData, DWORD dwProperty);
-#define midiStreamProperty WINELIB_NAME(midiStreamProperty)
+MMRESULT WINAPI midiStreamProperty(HMIDISTRM hms, LPBYTE lpPropData, DWORD dwProperty);
 MMRESULT16 WINAPI midiStreamRestart16(HMIDISTRM16 hms);
-MMRESULT32 WINAPI midiStreamRestart32(HMIDISTRM32 hms);
-#define midiStreamRestart WINELIB_NAME(midiStreamRestart)
+MMRESULT WINAPI midiStreamRestart(HMIDISTRM hms);
 MMRESULT16 WINAPI midiStreamStop16(HMIDISTRM16 hms);
-MMRESULT32 WINAPI midiStreamStop32(HMIDISTRM32 hms);
-#define midiStreamStop WINELIB_NAME(midiStreamStop)
+MMRESULT WINAPI midiStreamStop(HMIDISTRM hms);
 
 #define AUX_MAPPER     (-1)
 
@@ -793,22 +720,22 @@ typedef struct {
 typedef struct {
     WORD	wMid;			/* manufacturer ID */
     WORD	wPid;			/* product ID */
-    MMVERSION32	vDriverVersion;		/* version of the driver */
+    MMVERSION	vDriverVersion;		/* version of the driver */
     CHAR	szPname[MAXPNAMELEN];	/* product name (NULL terminated string) */
     WORD	wTechnology;		/* type of device */
     WORD	wReserved1;		/* padding */
     DWORD	dwSupport;		/* functionality supported by driver */
-} AUXCAPS32A, *LPAUXCAPS32A;
+} AUXCAPSA, *LPAUXCAPSA;
 
 typedef struct {
     WORD	wMid;			/* manufacturer ID */
     WORD	wPid;			/* product ID */
-    MMVERSION32	vDriverVersion;		/* version of the driver */
+    MMVERSION	vDriverVersion;		/* version of the driver */
     WCHAR	szPname[MAXPNAMELEN];	/* product name (NULL terminated string) */
     WORD	wTechnology;		/* type of device */
     WORD	wReserved1;		/* padding */
     DWORD	dwSupport;		/* functionality supported by driver */
-} AUXCAPS32W, *LPAUXCAPS32W;
+} AUXCAPSW, *LPAUXCAPSW;
 
 #define AUXCAPS_CDAUDIO    1       /* audio from internal CD-ROM drive */
 #define AUXCAPS_AUXIN      2       /* audio from auxiliary input jacks */
@@ -817,31 +744,26 @@ typedef struct {
 #define AUXCAPS_LRVOLUME        0x0002  /* separate left-right volume control */
 
 UINT16 WINAPI auxGetNumDevs16(void);
-UINT32 WINAPI auxGetNumDevs32(void);
-#define auxGetNumDevs WINELIB_NAME(auxGetNumDevs)
+UINT WINAPI auxGetNumDevs(void);
 UINT16 WINAPI auxGetDevCaps16 (UINT16,LPAUXCAPS16,UINT16);
-UINT32 WINAPI auxGetDevCaps32A(UINT32,LPAUXCAPS32A,UINT32);
-UINT32 WINAPI auxGetDevCaps32W(UINT32,LPAUXCAPS32W,UINT32);
+UINT WINAPI auxGetDevCapsA(UINT,LPAUXCAPSA,UINT);
+UINT WINAPI auxGetDevCapsW(UINT,LPAUXCAPSW,UINT);
 #define auxGetDevCaps WINELIB_NAME_AW(auxGetDevCaps)
 UINT16 WINAPI auxSetVolume16(UINT16,DWORD);
-UINT32 WINAPI auxSetVolume32(UINT32,DWORD);
-#define auxSetVolume WINELIB_NAME(auxSetVolume)
+UINT WINAPI auxSetVolume(UINT,DWORD);
 
 UINT16 WINAPI auxGetVolume16(UINT16,LPDWORD);
-UINT32 WINAPI auxGetVolume32(UINT32,LPDWORD);
-#define auxGetVolume WINELIB_NAME(auxGetVolume)
+UINT WINAPI auxGetVolume(UINT,LPDWORD);
 
 DWORD WINAPI auxOutMessage16(UINT16,UINT16,DWORD,DWORD);
-DWORD WINAPI auxOutMessage32(UINT32,UINT32,DWORD,DWORD);
-#define auxOutMessage WINELIB_NAME(auxOutMessage)
+DWORD WINAPI auxOutMessage(UINT,UINT,DWORD,DWORD);
 
 #define TIMERR_NOERROR        (0)                  /* no error */
 #define TIMERR_NOCANDO        (TIMERR_BASE+1)      /* request not completed */
 #define TIMERR_STRUCT         (TIMERR_BASE+33)     /* time struct size */
 
 typedef void (CALLBACK *LPTIMECALLBACK16)(UINT16 uTimerID, UINT16 uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
-typedef void (CALLBACK *LPTIMECALLBACK32)(UINT32 uTimerID, UINT32 uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
-DECL_WINELIB_TYPE(LPTIMECALLBACK)
+typedef void (CALLBACK *LPTIMECALLBACK)(UINT uTimerID, UINT uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
 
 #define TIME_ONESHOT		0x0000	/* program timer for single event */
 #define TIME_PERIODIC		0x0001	/* program for continuous periodic event */
@@ -855,32 +777,24 @@ typedef struct {
 } TIMECAPS16,*LPTIMECAPS16;
 
 typedef struct {
-    UINT32	wPeriodMin;
-    UINT32	wPeriodMax;
-} TIMECAPS32, *LPTIMECAPS32;
+    UINT	wPeriodMin;
+    UINT	wPeriodMax;
+} TIMECAPS, *LPTIMECAPS;
 
-DECL_WINELIB_TYPE(TIMECAPS)
-DECL_WINELIB_TYPE(LPTIMECAPS)
 
 MMRESULT16 WINAPI timeGetSystemTime16(LPMMTIME16,UINT16);
-MMRESULT32 WINAPI timeGetSystemTime32(LPMMTIME32,UINT32);
-#define timeGetSystemTime WINELIB_NAME(timeGetSystemTime)
+MMRESULT WINAPI timeGetSystemTime(LPMMTIME,UINT);
 DWORD WINAPI timeGetTime(void);	/* same for win32/win16 */
 MMRESULT16 WINAPI timeSetEvent16(UINT16,UINT16,LPTIMECALLBACK16,DWORD,UINT16);
-MMRESULT32 WINAPI timeSetEvent32(UINT32,UINT32,LPTIMECALLBACK32,DWORD,UINT32);
-#define timeSetEvent WINELIB_NAME(timeSetEvent)
+MMRESULT WINAPI timeSetEvent(UINT,UINT,LPTIMECALLBACK,DWORD,UINT);
 MMRESULT16 WINAPI timeKillEvent16(UINT16);
-MMRESULT32 WINAPI timeKillEvent32(UINT32);
-#define timeKillEvent WINELIB_NAME(timeKillEvent)
+MMRESULT WINAPI timeKillEvent(UINT);
 MMRESULT16 WINAPI timeGetDevCaps16(LPTIMECAPS16,UINT16);
-MMRESULT32 WINAPI timeGetDevCaps32(LPTIMECAPS32,UINT32);
-#define timeGetDevCaps WINELIB_NAME(timeGetDevCaps)
+MMRESULT WINAPI timeGetDevCaps(LPTIMECAPS,UINT);
 MMRESULT16 WINAPI timeBeginPeriod16(UINT16);
-MMRESULT32 WINAPI timeBeginPeriod32(UINT32);
-#define timeBeginPeriod WINELIB_NAME(timeBeginPeriod)
+MMRESULT WINAPI timeBeginPeriod(UINT);
 MMRESULT16 WINAPI timeEndPeriod16(UINT16);
-MMRESULT32 WINAPI timeEndPeriod32(UINT32);
-#define timeEndPeriod WINELIB_NAME(timeEndPeriod)
+MMRESULT WINAPI timeEndPeriod(UINT);
 
 #define JOYERR_NOERROR        (0)                  /* no error */
 #define JOYERR_PARMS          (JOYERR_BASE+5)      /* bad parameters */
@@ -976,55 +890,55 @@ typedef struct {
     WORD wMid;
     WORD wPid;
     CHAR szPname[MAXPNAMELEN];
-    UINT32 wXmin;
-    UINT32 wXmax;
-    UINT32 wYmin;
-    UINT32 wYmax;
-    UINT32 wZmin;
-    UINT32 wZmax;
-    UINT32 wNumButtons;
-    UINT32 wPeriodMin;
-    UINT32 wPeriodMax;
-    UINT32 wRmin;
-    UINT32 wRmax;
-    UINT32 wUmin;
-    UINT32 wUmax;
-    UINT32 wVmin;
-    UINT32 wVmax;
-    UINT32 wCaps;
-    UINT32 wMaxAxes;
-    UINT32 wNumAxes;
-    UINT32 wMaxButtons;
+    UINT wXmin;
+    UINT wXmax;
+    UINT wYmin;
+    UINT wYmax;
+    UINT wZmin;
+    UINT wZmax;
+    UINT wNumButtons;
+    UINT wPeriodMin;
+    UINT wPeriodMax;
+    UINT wRmin;
+    UINT wRmax;
+    UINT wUmin;
+    UINT wUmax;
+    UINT wVmin;
+    UINT wVmax;
+    UINT wCaps;
+    UINT wMaxAxes;
+    UINT wNumAxes;
+    UINT wMaxButtons;
     CHAR szRegKey[MAXPNAMELEN];
     CHAR szOEMVxD[MAX_JOYSTICKOEMVXDNAME];
-} JOYCAPS32A, *LPJOYCAPS32A;
+} JOYCAPSA, *LPJOYCAPSA;
 
 typedef struct {
     WORD wMid;
     WORD wPid;
     WCHAR szPname[MAXPNAMELEN];
-    UINT32 wXmin;
-    UINT32 wXmax;
-    UINT32 wYmin;
-    UINT32 wYmax;
-    UINT32 wZmin;
-    UINT32 wZmax;
-    UINT32 wNumButtons;
-    UINT32 wPeriodMin;
-    UINT32 wPeriodMax;
-    UINT32 wRmin;
-    UINT32 wRmax;
-    UINT32 wUmin;
-    UINT32 wUmax;
-    UINT32 wVmin;
-    UINT32 wVmax;
-    UINT32 wCaps;
-    UINT32 wMaxAxes;
-    UINT32 wNumAxes;
-    UINT32 wMaxButtons;
+    UINT wXmin;
+    UINT wXmax;
+    UINT wYmin;
+    UINT wYmax;
+    UINT wZmin;
+    UINT wZmax;
+    UINT wNumButtons;
+    UINT wPeriodMin;
+    UINT wPeriodMax;
+    UINT wRmin;
+    UINT wRmax;
+    UINT wUmin;
+    UINT wUmax;
+    UINT wVmin;
+    UINT wVmax;
+    UINT wCaps;
+    UINT wMaxAxes;
+    UINT wNumAxes;
+    UINT wMaxButtons;
     WCHAR szRegKey[MAXPNAMELEN];
     WCHAR szOEMVxD[MAX_JOYSTICKOEMVXDNAME];
-} JOYCAPS32W, *LPJOYCAPS32W;
+} JOYCAPSW, *LPJOYCAPSW;
 DECL_WINELIB_TYPE_AW(JOYCAPS)
 DECL_WINELIB_TYPE_AW(LPJOYCAPS)
 
@@ -1036,11 +950,11 @@ typedef struct {
 } JOYINFO16, *LPJOYINFO16;
 
 typedef struct {
-    UINT32 wXpos;
-    UINT32 wYpos;
-    UINT32 wZpos;
-    UINT32 wButtons;
-} JOYINFO32, *LPJOYINFO32;
+    UINT wXpos;
+    UINT wYpos;
+    UINT wZpos;
+    UINT wButtons;
+} JOYINFO, *LPJOYINFO;
 
 typedef struct {
     DWORD	dwSize;		/* size of structure */
@@ -1058,32 +972,24 @@ typedef struct {
     DWORD	dwReserved2;	/* reserved for future expansion */
 } JOYINFOEX,*LPJOYINFOEX;
 
-DECL_WINELIB_TYPE(JOYINFO)
-DECL_WINELIB_TYPE(LPJOYINFO)
 
 MMRESULT16 WINAPI joyGetDevCaps16 (UINT16,LPJOYCAPS16 ,UINT16);
-MMRESULT32 WINAPI joyGetDevCaps32A(UINT32,LPJOYCAPS32A,UINT32);
-MMRESULT32 WINAPI joyGetDevCaps32W(UINT32,LPJOYCAPS32W,UINT32);
+MMRESULT WINAPI joyGetDevCapsA(UINT,LPJOYCAPSA,UINT);
+MMRESULT WINAPI joyGetDevCapsW(UINT,LPJOYCAPSW,UINT);
 #define joyGetDevCaps WINELIB_NAME_AW(joyGetDevCaps)
 UINT16 WINAPI joyGetNumDevs16(void);
-UINT32 WINAPI joyGetNumDevs32(void);
-#define joyGetNumDevs WINELIB_NAME(joyGetNumDevs)
+UINT WINAPI joyGetNumDevs(void);
 MMRESULT16 WINAPI joyGetPos16(UINT16,LPJOYINFO16);
-MMRESULT32 WINAPI joyGetPos32(UINT32,LPJOYINFO32);
-#define joyGetPos WINELIB_NAME(joyGetPos)
-MMRESULT32 WINAPI joyGetPosEx(UINT32,LPJOYINFOEX);
+MMRESULT WINAPI joyGetPos(UINT,LPJOYINFO);
+MMRESULT WINAPI joyGetPosEx(UINT,LPJOYINFOEX);
 MMRESULT16 WINAPI joyGetThreshold16(UINT16,UINT16*);
-MMRESULT32 WINAPI joyGetThreshold32(UINT32,UINT32*);
-#define joyGetThreshold WINELIB_NAME(joyGetThreshold)
+MMRESULT WINAPI joyGetThreshold(UINT,UINT*);
 MMRESULT16 WINAPI joyReleaseCapture16(UINT16);
-MMRESULT32 WINAPI joyReleaseCapture32(UINT32);
-#define joyReleaseCapture WINELIB_NAME(joyReleaseCapture)
+MMRESULT WINAPI joyReleaseCapture(UINT);
 MMRESULT16 WINAPI joySetCapture16(HWND16,UINT16,UINT16,BOOL16);
-MMRESULT32 WINAPI joySetCapture32(HWND32,UINT32,UINT32,BOOL32);
-#define joySetCapture WINELIB_NAME(joySetCapture)
+MMRESULT WINAPI joySetCapture(HWND,UINT,UINT,BOOL);
 MMRESULT16 WINAPI joySetThreshold16(UINT16,UINT16);
-MMRESULT32 WINAPI joySetThreshold32(UINT32,UINT32);
-#define joySetThreshold WINELIB_NAME(joySetThreshold)
+MMRESULT WINAPI joySetThreshold(UINT,UINT);
 
 typedef struct {
 	WORD		wMid;		/* manufacturer id */
@@ -1097,20 +1003,20 @@ typedef struct {
 typedef struct {
 	WORD		wMid;
 	WORD		wPid;
-	MMVERSION32	vDriverVersion;
+	MMVERSION	vDriverVersion;
 	CHAR		szPname[MAXPNAMELEN];
 	DWORD		fdwSupport;
 	DWORD		cDestinations;
-} MIXERCAPS32A,*LPMIXERCAPS32A;
+} MIXERCAPSA,*LPMIXERCAPSA;
 
 typedef struct {
 	WORD		wMid;
 	WORD		wPid;
-	MMVERSION32	vDriverVersion;
+	MMVERSION	vDriverVersion;
 	WCHAR		szPname[MAXPNAMELEN];
 	DWORD		fdwSupport;
 	DWORD		cDestinations;
-} MIXERCAPS32W,*LPMIXERCAPS32W;
+} MIXERCAPSW,*LPMIXERCAPSW;
 
 DECL_WINELIB_TYPE_AW(MIXERCAPS)
 DECL_WINELIB_TYPE_AW(LPMIXERCAPS)
@@ -1200,10 +1106,10 @@ typedef struct {
 	DWORD	dwDeviceID;
 	WORD	wMid;
 	WORD	wPid;
-	MMVERSION32	vDriverVersion;
+	MMVERSION	vDriverVersion;
 	CHAR	szPname[MAXPNAMELEN];
     } Target;
-} MIXERLINE32A, *LPMIXERLINE32A;
+} MIXERLINEA, *LPMIXERLINEA;
 
 typedef struct {
     DWORD	cbStruct;
@@ -1223,10 +1129,10 @@ typedef struct {
 	DWORD	dwDeviceID;
 	WORD	wMid;
 	WORD	wPid;
-	MMVERSION32	vDriverVersion;
+	MMVERSION	vDriverVersion;
 	WCHAR	szPname[MAXPNAMELEN];
     } Target;
-} MIXERLINE32W, *LPMIXERLINE32W;
+} MIXERLINEW, *LPMIXERLINEW;
 
 DECL_WINELIB_TYPE_AW(MIXERLINE)
 DECL_WINELIB_TYPE_AW(LPMIXERLINE)
@@ -1351,7 +1257,7 @@ typedef struct {
 	DWORD		cbCustomData;
 	DWORD		dwReserved[6];
     } Metrics;
-} MIXERCONTROL32A, *LPMIXERCONTROL32A;
+} MIXERCONTROLA, *LPMIXERCONTROLA;
 
 typedef struct {
     DWORD		cbStruct;
@@ -1377,7 +1283,7 @@ typedef struct {
 	DWORD		cbCustomData;
 	DWORD		dwReserved[6];
     } Metrics;
-} MIXERCONTROL32W, *LPMIXERCONTROL32W;
+} MIXERCONTROLW, *LPMIXERCONTROLW;
 
 DECL_WINELIB_TYPE_AW(MIXERCONTROL)
 DECL_WINELIB_TYPE_AW(LPMIXERCONTROL)
@@ -1403,8 +1309,8 @@ typedef struct {
     } u;
     DWORD	cControls;
     DWORD	cbmxctrl;
-    LPMIXERCONTROL32A	pamxctrl;
-} MIXERLINECONTROLS32A, *LPMIXERLINECONTROLS32A;
+    LPMIXERCONTROLA	pamxctrl;
+} MIXERLINECONTROLSA, *LPMIXERLINECONTROLSA;
 
 typedef struct {
     DWORD	cbStruct;
@@ -1415,8 +1321,8 @@ typedef struct {
     } u;
     DWORD	cControls;
     DWORD	cbmxctrl;
-    LPMIXERCONTROL32W	pamxctrl;
-} MIXERLINECONTROLS32W, *LPMIXERLINECONTROLS32W;
+    LPMIXERCONTROLW	pamxctrl;
+} MIXERLINECONTROLSW, *LPMIXERLINECONTROLSW;
 
 DECL_WINELIB_TYPE_AW(MIXERLINECONTROLS)
 DECL_WINELIB_TYPE_AW(LPMIXERLINECONTROLS)
@@ -1438,15 +1344,13 @@ typedef struct {
     DWORD	dwControlID;
     DWORD	cChannels;
     union {
-        HWND32	hwndOwner;
+        HWND	hwndOwner;
         DWORD	cMultipleItems;
     } u;
     DWORD	cbDetails;
     LPVOID	paDetails;
-} MIXERCONTROLDETAILS32,*LPMIXERCONTROLDETAILS32;
+} MIXERCONTROLDETAILS,*LPMIXERCONTROLDETAILS;
 
-DECL_WINELIB_TYPE(MIXERCONTROLDETAILS)
-DECL_WINELIB_TYPE(LPMIXERCONTROLDETAILS)
 
 typedef struct {
     DWORD	dwParam1;
@@ -1458,13 +1362,13 @@ typedef struct {
     DWORD	dwParam1;
     DWORD	dwParam2;
     CHAR	szName[MIXER_LONG_NAME_CHARS];
-} MIXERCONTROLDETAILS_LISTTEXT32A,*LPMIXERCONTROLDETAILS_LISTTEXT32A;
+} MIXERCONTROLDETAILS_LISTTEXTA,*LPMIXERCONTROLDETAILS_LISTTEXTA;
 
 typedef struct {
     DWORD	dwParam1;
     DWORD	dwParam2;
     WCHAR	szName[MIXER_LONG_NAME_CHARS];
-} MIXERCONTROLDETAILS_LISTTEXT32W,*LPMIXERCONTROLDETAILS_LISTTEXT32W;
+} MIXERCONTROLDETAILS_LISTTEXTW,*LPMIXERCONTROLDETAILS_LISTTEXTW;
 
 DECL_WINELIB_TYPE_AW(MIXERCONTROLDETAILS_LISTTEXT)
 DECL_WINELIB_TYPE_AW(LPMIXERCONTROLDETAILS_LISTTEXT)
@@ -1507,39 +1411,33 @@ typedef struct {
 #define	MIXER_SETCONTROLDETAILSF_QUERYMASK	0x0000000FL
 
 UINT16 WINAPI mixerGetNumDevs16(void);
-UINT32 WINAPI mixerGetNumDevs32(void);
-#define mixerGetNumDevs WINELIB_NAME(mixerGetNumDevs)
+UINT WINAPI mixerGetNumDevs(void);
 UINT16 WINAPI mixerOpen16(LPHMIXER16,UINT16,DWORD,DWORD,DWORD);
-UINT32 WINAPI mixerOpen32(LPHMIXER32,UINT32,DWORD,DWORD,DWORD);
-#define mixerOpen WINELIB_NAME(mixerOpen)
+UINT WINAPI mixerOpen(LPHMIXER,UINT,DWORD,DWORD,DWORD);
 UINT16 WINAPI mixerClose16(HMIXER16);
-UINT32 WINAPI mixerClose32(HMIXER32);
-#define mixerClose WINELIB_NAME(mixerClose)
+UINT WINAPI mixerClose(HMIXER);
 UINT16 WINAPI mixerMessage16(HMIXER16,UINT16,DWORD,DWORD);
-UINT32 WINAPI mixerMessage32(HMIXER32,UINT32,DWORD,DWORD);
-#define mixerMessage WINELIB_NAME(mixerMessage)
+UINT WINAPI mixerMessage(HMIXER,UINT,DWORD,DWORD);
 UINT16 WINAPI mixerGetDevCaps16(UINT16,LPMIXERCAPS16,UINT16);
-UINT32 WINAPI mixerGetDevCaps32A(UINT32,LPMIXERCAPS32A,UINT32);
-UINT32 WINAPI mixerGetDevCaps32W(UINT32,LPMIXERCAPS32W,UINT32);
+UINT WINAPI mixerGetDevCapsA(UINT,LPMIXERCAPSA,UINT);
+UINT WINAPI mixerGetDevCapsW(UINT,LPMIXERCAPSW,UINT);
 #define mixerGetDevCaps WINELIB_NAME_AW(mixerGetDevCaps)
 UINT16 WINAPI mixerGetLineInfo16(HMIXEROBJ16,LPMIXERLINE16,DWORD);
-UINT32 WINAPI mixerGetLineInfo32A(HMIXEROBJ32,LPMIXERLINE32A,DWORD);
-UINT32 WINAPI mixerGetLineInfo32W(HMIXEROBJ32,LPMIXERLINE32W,DWORD);
+UINT WINAPI mixerGetLineInfoA(HMIXEROBJ,LPMIXERLINEA,DWORD);
+UINT WINAPI mixerGetLineInfoW(HMIXEROBJ,LPMIXERLINEW,DWORD);
 #define mixerGetLineInfo WINELIB_NAME_AW(mixerGetLineInfo)
 UINT16 WINAPI mixerGetID16(HMIXEROBJ16,LPUINT16,DWORD);
-UINT32 WINAPI mixerGetID32(HMIXEROBJ32,LPUINT32,DWORD);
-#define mixerGetID WINELIB_NAME(mixerGetID)
+UINT WINAPI mixerGetID(HMIXEROBJ,LPUINT,DWORD);
 UINT16 WINAPI mixerGetLineControls16(HMIXEROBJ16,LPMIXERLINECONTROLS16,DWORD);
-UINT32 WINAPI mixerGetLineControls32A(HMIXEROBJ32,LPMIXERLINECONTROLS32A,DWORD);
-UINT32 WINAPI mixerGetLineControls32W(HMIXEROBJ32,LPMIXERLINECONTROLS32W,DWORD);
+UINT WINAPI mixerGetLineControlsA(HMIXEROBJ,LPMIXERLINECONTROLSA,DWORD);
+UINT WINAPI mixerGetLineControlsW(HMIXEROBJ,LPMIXERLINECONTROLSW,DWORD);
 #define mixerGetLineControl WINELIB_NAME_AW(mixerGetLineControl)
 UINT16 WINAPI mixerGetControlDetails16(HMIXEROBJ16,LPMIXERCONTROLDETAILS16,DWORD);
-UINT32 WINAPI mixerGetControlDetails32A(HMIXEROBJ32,LPMIXERCONTROLDETAILS32,DWORD);
-UINT32 WINAPI mixerGetControlDetails32W(HMIXEROBJ32,LPMIXERCONTROLDETAILS32,DWORD);
+UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD);
+UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD);
 #define mixerGetControlDetails WINELIB_NAME_AW(mixerGetControlDetails)
 UINT16 WINAPI mixerSetControlDetails16(HMIXEROBJ16,LPMIXERCONTROLDETAILS16,DWORD);
-UINT32 WINAPI mixerSetControlDetails32(HMIXEROBJ32,LPMIXERCONTROLDETAILS32,DWORD);
-#define mixerSetControlDetails WINELIB_NAME(mixerSetControlDetails)
+UINT WINAPI mixerSetControlDetails(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD);
 
 #define MMIOERR_BASE            256
 #define MMIOERR_FILENOTFOUND    (MMIOERR_BASE + 1)  /* file not found */
@@ -1558,9 +1456,8 @@ UINT32 WINAPI mixerSetControlDetails32(HMIXEROBJ32,LPMIXERCONTROLDETAILS32,DWORD
 typedef DWORD           FOURCC;         /* a four character code */
 typedef LONG (CALLBACK *LPMMIOPROC16)(LPSTR lpmmioinfo, UINT16 uMessage,
                                       LPARAM lParam1, LPARAM lParam2);
-typedef LONG (CALLBACK *LPMMIOPROC32)(LPSTR lpmmioinfo, UINT32 uMessage,
+typedef LONG (CALLBACK *LPMMIOPROC)(LPSTR lpmmioinfo, UINT uMessage,
                                       LPARAM lParam1, LPARAM lParam2);
-DECL_WINELIB_TYPE(LPMMIOPROC)
 
 typedef struct {
         DWORD		dwFlags;	/* general status flags */
@@ -1587,9 +1484,9 @@ typedef struct {
 typedef struct {
         DWORD		dwFlags;
         FOURCC		fccIOProc;
-        LPMMIOPROC32	pIOProc;
-        UINT32		wErrorRet;
-        HTASK32		htask;
+        LPMMIOPROC	pIOProc;
+        UINT		wErrorRet;
+        HTASK		htask;
         /* fields maintained by MMIO functions during buffered I/O */
         LONG		cchBuffer;
         HPSTR		pchBuffer;
@@ -1603,12 +1500,9 @@ typedef struct {
         /* other fields maintained by MMIO */
         DWORD		dwReserved1;
         DWORD		dwReserved2;
-        HMMIO32		hmmio;
-} MMIOINFO32, *PMMIOINFO32, *LPMMIOINFO32;
+        HMMIO		hmmio;
+} MMIOINFO, *PMMIOINFO, *LPMMIOINFO;
 
-DECL_WINELIB_TYPE(MMIOINFO)
-DECL_WINELIB_TYPE(PMMIOINFO)
-DECL_WINELIB_TYPE(LPMMIOINFO)
 
 typedef struct _MMCKINFO
 {
@@ -1682,99 +1576,85 @@ typedef struct _MMCKINFO
                 ( (DWORD)(BYTE)(ch2) << 16 ) | ( (DWORD)(BYTE)(ch3) << 24 ) )
 
 LPMMIOPROC16 WINAPI mmioInstallIOProc16(FOURCC,LPMMIOPROC16,DWORD);
-LPMMIOPROC32 WINAPI mmioInstallIOProc32A(FOURCC,LPMMIOPROC32,DWORD);
-LPMMIOPROC32 WINAPI mmioInstallIOProc32W(FOURCC,LPMMIOPROC32,DWORD);
+LPMMIOPROC WINAPI mmioInstallIOProcA(FOURCC,LPMMIOPROC,DWORD);
+LPMMIOPROC WINAPI mmioInstallIOProcW(FOURCC,LPMMIOPROC,DWORD);
 #define      mmioInstallIOProc WINELIB_NAME_AW(mmioInstallIOProc)
 
 FOURCC WINAPI	mmioStringToFOURCC16(LPCSTR,UINT16);
-FOURCC WINAPI	mmioStringToFOURCC32A(LPCSTR,UINT32);
-FOURCC WINAPI	mmioStringToFOURCC32W(LPCWSTR,UINT32);
+FOURCC WINAPI	mmioStringToFOURCCA(LPCSTR,UINT);
+FOURCC WINAPI	mmioStringToFOURCCW(LPCWSTR,UINT);
 #define mmioStringToFOURCC WINELIB_NAME_AW(mmioStringToFOURCC)
 HMMIO16	WINAPI	mmioOpen16 (LPSTR ,MMIOINFO16*,DWORD);
-HMMIO32	WINAPI	mmioOpen32A(LPSTR ,MMIOINFO32*,DWORD);
-HMMIO32	WINAPI	mmioOpen32W(LPWSTR,MMIOINFO32*,DWORD);
+HMMIO	WINAPI	mmioOpenA(LPSTR ,MMIOINFO*,DWORD);
+HMMIO	WINAPI	mmioOpenW(LPWSTR,MMIOINFO*,DWORD);
 #define		mmioOpen WINELIB_NAME_AW(mmioOpen)
 
 UINT16 WINAPI	mmioRename16(LPCSTR szFileName, LPCSTR szNewFileName,
      MMIOINFO16 * lpmmioinfo, DWORD dwRenameFlags);
-UINT32 WINAPI	mmioRename32A(LPCSTR szFileName, LPCSTR szNewFileName,
-     MMIOINFO32 * lpmmioinfo, DWORD dwRenameFlags);
-UINT32 WINAPI	mmioRename32W(LPCWSTR szFileName, LPCWSTR szNewFileName,
-     MMIOINFO32 * lpmmioinfo, DWORD dwRenameFlags);
+UINT WINAPI	mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName,
+     MMIOINFO * lpmmioinfo, DWORD dwRenameFlags);
+UINT WINAPI	mmioRenameW(LPCWSTR szFileName, LPCWSTR szNewFileName,
+     MMIOINFO * lpmmioinfo, DWORD dwRenameFlags);
 #define 	mmioRename WINELIB_NAME_AW(mmioRename)
 
 MMRESULT16 WINAPI mmioClose16(HMMIO16,UINT16);
-MMRESULT32 WINAPI mmioClose32(HMMIO32,UINT32);
-#define		  mmioClose WINELIB_NAME(mmioClose)
+MMRESULT WINAPI mmioClose(HMMIO,UINT);
 LONG WINAPI	mmioRead16(HMMIO16,HPSTR,LONG);
-LONG WINAPI	mmioRead32(HMMIO32,HPSTR,LONG);
-#define		mmioRead WINELIB_NAME(mmioRead)
+LONG WINAPI	mmioRead(HMMIO,HPSTR,LONG);
 LONG WINAPI	mmioWrite16(HMMIO16,HPCSTR,LONG);
-LONG WINAPI	mmioWrite32(HMMIO32,HPCSTR,LONG);
-#define		mmioWrite WINELIB_NAME(mmioWrite)
+LONG WINAPI	mmioWrite(HMMIO,HPCSTR,LONG);
 LONG WINAPI	mmioSeek16(HMMIO16,LONG,INT16);
-LONG WINAPI	mmioSeek32(HMMIO32,LONG,INT32);
-#define		mmioSeek WINELIB_NAME(mmioSeek)
+LONG WINAPI	mmioSeek(HMMIO,LONG,INT);
 MMRESULT16 WINAPI	mmioGetInfo16(HMMIO16,MMIOINFO16*,UINT16);
-MMRESULT32 WINAPI	mmioGetInfo32(HMMIO32,MMIOINFO32*,UINT32);
-#define			mmioGetInfo WINELIB_NAME(mmioGetInfo)
+MMRESULT WINAPI	mmioGetInfo(HMMIO,MMIOINFO*,UINT);
 MMRESULT16 WINAPI	mmioSetInfo16(HMMIO16,const MMIOINFO16*,UINT16);
-MMRESULT32 WINAPI	mmioSetInfo32(HMMIO32,const MMIOINFO32*,UINT32);
-#define			mmioSetInfo WINELIB_NAME(mmioSetInfo)
+MMRESULT WINAPI	mmioSetInfo(HMMIO,const MMIOINFO*,UINT);
 UINT16 WINAPI	mmioSetBuffer16(HMMIO16,LPSTR,LONG,UINT16);
-UINT32 WINAPI	mmioSetBuffer32(HMMIO32,LPSTR,LONG,UINT32);
-#define			mmioSetBuffer WINELIB_NAME(mmioSetBuffer)
+UINT WINAPI	mmioSetBuffer(HMMIO,LPSTR,LONG,UINT);
 UINT16 WINAPI	mmioFlush16(HMMIO16,UINT16);
-UINT32 WINAPI	mmioFlush32(HMMIO32,UINT32);
-#define		mmioFlush WINELIB_NAME(mmioFlush)
+UINT WINAPI	mmioFlush(HMMIO,UINT);
 UINT16 WINAPI	mmioAdvance16(HMMIO16,MMIOINFO16*,UINT16);
-UINT32 WINAPI	mmioAdvance32(HMMIO32,MMIOINFO32*,UINT32);
-#define		mmioAdvance WINELIB_NAME(mmioAdvance)
+UINT WINAPI	mmioAdvance(HMMIO,MMIOINFO*,UINT);
 LONG WINAPI mmioSendMessage(HMMIO16,UINT16,LPARAM,LPARAM);
 UINT16 WINAPI mmioDescend(HMMIO16,MMCKINFO*,const MMCKINFO*,UINT16);
 
 UINT16 WINAPI	mmioAscend16(HMMIO16,MMCKINFO*,UINT16);
-UINT32 WINAPI	mmioAscend32(HMMIO32,MMCKINFO*,UINT32);
-#define		mmioAscend WINELIB_NAME(mmioAscend)
+UINT WINAPI	mmioAscend(HMMIO,MMCKINFO*,UINT);
 UINT16 WINAPI 	mmioCreateChunk16(HMMIO16,MMCKINFO*,UINT16);
-UINT32 WINAPI 	mmioCreateChunk32(HMMIO32,MMCKINFO*,UINT32);
-#define		mmioCreateChunk WINELIB_NAME(mmioCreateChunk)
+UINT WINAPI 	mmioCreateChunk(HMMIO,MMCKINFO*,UINT);
 
 typedef UINT16 (CALLBACK *YIELDPROC)(UINT16,DWORD);
 
 DWORD WINAPI mciSendCommand16(UINT16,UINT16,DWORD,DWORD);
-DWORD WINAPI mciSendCommand32A(UINT32,UINT32,DWORD,DWORD);
-DWORD WINAPI mciSendCommand32W(UINT32,UINT32,DWORD,DWORD);
+DWORD WINAPI mciSendCommandA(UINT,UINT,DWORD,DWORD);
+DWORD WINAPI mciSendCommandW(UINT,UINT,DWORD,DWORD);
 #define mciSendCommand WINELIB_NAME_AW(mciSendCommand)
 
 DWORD WINAPI mciSendString16(LPCSTR,LPSTR,UINT16,HWND16);
-DWORD WINAPI mciSendString32A(LPCSTR,LPSTR,UINT32,HWND32);
-DWORD WINAPI mciSendString32W(LPCWSTR,LPSTR,UINT32,HWND32);
+DWORD WINAPI mciSendStringA(LPCSTR,LPSTR,UINT,HWND);
+DWORD WINAPI mciSendStringW(LPCWSTR,LPSTR,UINT,HWND);
 #define mciSendString WINELIB_NAME_AW(mciSendString)
 
 UINT16 WINAPI mciGetDeviceID16(LPCSTR);
-UINT32 WINAPI mciGetDeviceID32A(LPCSTR);
-UINT32 WINAPI mciGetDeviceID32W(LPCWSTR);
+UINT WINAPI mciGetDeviceIDA(LPCSTR);
+UINT WINAPI mciGetDeviceIDW(LPCWSTR);
 #define mciGetDeviceID WINELIB_NAME_AW(mciGetDeviceID)
 
 UINT16 WINAPI mciGetDeviceIDFromElementID16(DWORD,LPCSTR);
 
 BOOL16 WINAPI mciGetErrorString16 (DWORD,LPSTR,UINT16);
-BOOL32 WINAPI mciGetErrorString32A(DWORD,LPSTR,UINT32);
-BOOL32 WINAPI mciGetErrorString32W(DWORD,LPWSTR,UINT32);
+BOOL WINAPI mciGetErrorStringA(DWORD,LPSTR,UINT);
+BOOL WINAPI mciGetErrorStringW(DWORD,LPWSTR,UINT);
 #define mciGetErrorString WINELIB_NAME_AW(mciGetErrorString)
 
 BOOL16 WINAPI mciSetYieldProc16(UINT16,YIELDPROC,DWORD);
-BOOL32 WINAPI mciSetYieldProc32(UINT32,YIELDPROC,DWORD);
-#define mciSetYieldProc WINELIB_NAME(mciSetYieldProc)
+BOOL WINAPI mciSetYieldProc(UINT,YIELDPROC,DWORD);
 
 HTASK16 WINAPI mciGetCreatorTask16(UINT16);
-HTASK32 WINAPI mciGetCreatorTask32(UINT32);
-#define mciGetCreatorTask WINELIB_NAME(mciGetCreatorTask)
+HTASK WINAPI mciGetCreatorTask(UINT);
 
 YIELDPROC WINAPI mciGetYieldProc16(UINT16,DWORD*);
-YIELDPROC WINAPI mciGetYieldProc32(UINT32,DWORD*);
-#define mciGetYieldProc WINELIB_NAME(mciGetYieldProc)
+YIELDPROC WINAPI mciGetYieldProc(UINT,DWORD*);
 
 #define MCIERR_INVALID_DEVICE_ID        (MCIERR_BASE + 1)
 #define MCIERR_UNRECOGNIZED_KEYWORD     (MCIERR_BASE + 3)
@@ -2049,19 +1929,19 @@ typedef struct {
 
 typedef struct {
 	DWORD		dwCallback;
-	MCIDEVICEID32	wDeviceID;
+	MCIDEVICEID	wDeviceID;
 	LPSTR		lpstrDeviceType;
 	LPSTR		lpstrElementName;
 	LPSTR		lpstrAlias;
-} MCI_OPEN_PARMS32A, *LPMCI_OPEN_PARMS32A;
+} MCI_OPEN_PARMSA, *LPMCI_OPEN_PARMSA;
 
 typedef struct {
 	DWORD		dwCallback;
-	MCIDEVICEID32	wDeviceID;
+	MCIDEVICEID	wDeviceID;
 	LPWSTR		lpstrDeviceType;
 	LPWSTR		lpstrElementName;
 	LPWSTR		lpstrAlias;
-} MCI_OPEN_PARMS32W, *LPMCI_OPEN_PARMS32W;
+} MCI_OPEN_PARMSW, *LPMCI_OPEN_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_OPEN_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_OPEN_PARMS)
@@ -2094,13 +1974,13 @@ typedef struct {
 	DWORD   dwCallback;
 	LPSTR   lpstrReturn;
 	DWORD   dwRetSize;
-} MCI_INFO_PARMS32A, *LPMCI_INFO_PARMS32A;
+} MCI_INFO_PARMSA, *LPMCI_INFO_PARMSA;
 
 typedef struct {
 	DWORD   dwCallback;
 	LPSTR   lpstrReturn;
 	DWORD   dwRetSize;
-} MCI_INFO_PARMS32W, *LPMCI_INFO_PARMS32W;
+} MCI_INFO_PARMSW, *LPMCI_INFO_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_INFO_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_INFO_PARMS)
@@ -2125,16 +2005,16 @@ typedef struct {
 	LPSTR	lpstrReturn;
 	DWORD	dwRetSize;
 	DWORD	dwNumber;
-	UINT32	wDeviceType;
-} MCI_SYSINFO_PARMS32A, *LPMCI_SYSINFO_PARMS32A;
+	UINT	wDeviceType;
+} MCI_SYSINFO_PARMSA, *LPMCI_SYSINFO_PARMSA;
 
 typedef struct {
 	DWORD	dwCallback;
 	LPWSTR	lpstrReturn;
 	DWORD	dwRetSize;
 	DWORD	dwNumber;
-	UINT32	wDeviceType;
-} MCI_SYSINFO_PARMS32W, *LPMCI_SYSINFO_PARMS32W;
+	UINT	wDeviceType;
+} MCI_SYSINFO_PARMSW, *LPMCI_SYSINFO_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_SYSINFO_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_SYSINFO_PARMS)
@@ -2155,12 +2035,10 @@ typedef struct {
 
 typedef struct {
 	DWORD	dwCallback;
-	INT32	nVirtKey;
-	HWND32	hwndBreak;
-} MCI_BREAK_PARMS32, *LPMCI_BREAK_PARMS32;
+	INT	nVirtKey;
+	HWND	hwndBreak;
+} MCI_BREAK_PARMS, *LPMCI_BREAK_PARMS;
 
-DECL_WINELIB_TYPE(MCI_BREAK_PARMS)
-DECL_WINELIB_TYPE(LPMCI_BREAK_PARMS)
 
 typedef struct {
 	DWORD   dwCallback;
@@ -2180,12 +2058,12 @@ typedef struct {
 typedef struct {
 	DWORD	dwCallback;
 	LPCSTR	lpfilename;
-} MCI_LOAD_PARMS32A, *LPMCI_LOAD_PARMS32A;
+} MCI_LOAD_PARMSA, *LPMCI_LOAD_PARMSA;
 
 typedef struct {
 	DWORD	dwCallback;
 	LPCWSTR	lpfilename;
-} MCI_LOAD_PARMS32W, *LPMCI_LOAD_PARMS32W;
+} MCI_LOAD_PARMSW, *LPMCI_LOAD_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_LOAD_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_LOAD_PARMS)
@@ -2260,12 +2138,12 @@ typedef struct {
 typedef struct {
 	DWORD	dwCallback;
 	LPCSTR	lpstrCommand;
-} MCI_VD_ESCAPE_PARMS32A, *LPMCI_VD_ESCAPE_PARMS32A;
+} MCI_VD_ESCAPE_PARMSA, *LPMCI_VD_ESCAPE_PARMSA;
 
 typedef struct {
 	DWORD	dwCallback;
 	LPCWSTR	lpstrCommand;
-} MCI_VD_ESCAPE_PARMS32W, *LPMCI_VD_ESCAPE_PARMS32W;
+} MCI_VD_ESCAPE_PARMSW, *LPMCI_VD_ESCAPE_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_VD_ESCAPE_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_VD_ESCAPE_PARMS)
@@ -2308,21 +2186,21 @@ typedef struct {
 
 typedef struct {
 	DWORD		dwCallback;
-	MCIDEVICEID32	wDeviceID;
+	MCIDEVICEID	wDeviceID;
 	LPCSTR		lpstrDeviceType;
 	LPCSTR		lpstrElementName;
 	LPCSTR		lpstrAlias;
 	DWORD   	dwBufferSeconds;
-} MCI_WAVE_OPEN_PARMS32A, *LPMCI_WAVE_OPEN_PARMS32A;
+} MCI_WAVE_OPEN_PARMSA, *LPMCI_WAVE_OPEN_PARMSA;
 
 typedef struct {
 	DWORD		dwCallback;
-	MCIDEVICEID32	wDeviceID;
+	MCIDEVICEID	wDeviceID;
 	LPCWSTR		lpstrDeviceType;
 	LPCWSTR		lpstrElementName;
 	LPCWSTR		lpstrAlias;
 	DWORD   	dwBufferSeconds;
-} MCI_WAVE_OPEN_PARMS32W, *LPMCI_WAVE_OPEN_PARMS32W;
+} MCI_WAVE_OPEN_PARMSW, *LPMCI_WAVE_OPEN_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_WAVE_OPEN_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_WAVE_OPEN_PARMS)
@@ -2357,18 +2235,16 @@ typedef struct {
 	DWORD	dwCallback;
 	DWORD	dwTimeFormat;
 	DWORD	dwAudio;
-	UINT32	wInput;
-	UINT32	wOutput;
-	UINT32	wFormatTag;
-	UINT32	nChannels;
+	UINT	wInput;
+	UINT	wOutput;
+	UINT	wFormatTag;
+	UINT	nChannels;
 	DWORD	nSamplesPerSec;
 	DWORD	nAvgBytesPerSec;
-	UINT32	nBlockAlign;
-	UINT32	wBitsPerSample;
-} MCI_WAVE_SET_PARMS32, * LPMCI_WAVE_SET_PARMS32;
+	UINT	nBlockAlign;
+	UINT	wBitsPerSample;
+} MCI_WAVE_SET_PARMS, * LPMCI_WAVE_SET_PARMS;
 
-DECL_WINELIB_TYPE(MCI_WAVE_SET_PARMS)
-DECL_WINELIB_TYPE(LPMCI_WAVE_SET_PARMS)
 
 #define     MCI_SEQ_DIV_PPQN            (0 + MCI_SEQ_OFFSET)
 #define     MCI_SEQ_DIV_SMPTE_24        (1 + MCI_SEQ_OFFSET)
@@ -2469,23 +2345,23 @@ typedef struct {
 
 typedef struct {
 	DWORD		dwCallback;
-	MCIDEVICEID32	wDeviceID;
+	MCIDEVICEID	wDeviceID;
 	LPCSTR		lpstrDeviceType;
 	LPCSTR		lpstrElementName;
 	LPCSTR		lpstrAlias;
 	DWORD		dwStyle;
-	HWND32		hWndParent;
-} MCI_ANIM_OPEN_PARMS32A, *LPMCI_ANIM_OPEN_PARMS32A;
+	HWND		hWndParent;
+} MCI_ANIM_OPEN_PARMSA, *LPMCI_ANIM_OPEN_PARMSA;
 
 typedef struct {
 	DWORD		dwCallback;
-	MCIDEVICEID32	wDeviceID;
+	MCIDEVICEID	wDeviceID;
 	LPCSTR		lpstrDeviceType;
 	LPCSTR		lpstrElementName;
 	LPCSTR		lpstrAlias;
 	DWORD		dwStyle;
-	HWND32		hWndParent;
-} MCI_ANIM_OPEN_PARMS32W, *LPMCI_ANIM_OPEN_PARMS32W;
+	HWND		hWndParent;
+} MCI_ANIM_OPEN_PARMSW, *LPMCI_ANIM_OPEN_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_ANIM_OPEN_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_ANIM_OPEN_PARMS)
@@ -2513,17 +2389,17 @@ typedef struct {
 
 typedef struct {
 	DWORD	dwCallback;
-	HWND32	hWnd;
-	UINT32	nCmdShow;
+	HWND	hWnd;
+	UINT	nCmdShow;
 	LPCSTR	lpstrText;
-} MCI_ANIM_WINDOW_PARMS32A, *LPMCI_ANIM_WINDOW_PARMS32A;
+} MCI_ANIM_WINDOW_PARMSA, *LPMCI_ANIM_WINDOW_PARMSA;
 
 typedef struct {
 	DWORD	dwCallback;
-	HWND32	hWnd;
-	UINT32	nCmdShow;
+	HWND	hWnd;
+	UINT	nCmdShow;
 	LPCWSTR	lpstrText;
-} MCI_ANIM_WINDOW_PARMS32W, *LPMCI_ANIM_WINDOW_PARMS32W;
+} MCI_ANIM_WINDOW_PARMSW, *LPMCI_ANIM_WINDOW_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_ANIM_WINDOW_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_ANIM_WINDOW_PARMS)
@@ -2541,15 +2417,13 @@ typedef struct {
 typedef struct {
 	DWORD	dwCallback;
 #ifdef MCI_USE_OFFEXT
-	POINT32	ptOffset;
-	POINT32	ptExtent;
+	POINT	ptOffset;
+	POINT	ptExtent;
 #else   /* ifdef MCI_USE_OFFEXT */
-	RECT32	rc;
+	RECT	rc;
 #endif  /* ifdef MCI_USE_OFFEXT */
-} MCI_ANIM_RECT_PARMS32, *LPMCI_ANIM_RECT_PARMS32;
+} MCI_ANIM_RECT_PARMS, *LPMCI_ANIM_RECT_PARMS;
 
-DECL_WINELIB_TYPE(MCI_ANIM_RECT_PARMS)
-DECL_WINELIB_TYPE(LPMCI_ANIM_RECT_PARMS)
 
 typedef struct {
 	DWORD   dwCallback;
@@ -2559,12 +2433,10 @@ typedef struct {
 
 typedef struct {
 	DWORD   dwCallback;
-	RECT32  rc;
-	HDC32   hDC;
-} MCI_ANIM_UPDATE_PARMS32, *LPMCI_ANIM_UPDATE_PARMS32;
+	RECT  rc;
+	HDC   hDC;
+} MCI_ANIM_UPDATE_PARMS, *LPMCI_ANIM_UPDATE_PARMS;
 
-DECL_WINELIB_TYPE(MCI_ANIM_UPDATE_PARMS)
-DECL_WINELIB_TYPE(LPMCI_ANIM_UPDATE_PARMS)
 
 #define MCI_OVLY_OPEN_WS                0x00010000L
 #define MCI_OVLY_OPEN_PARENT            0x00020000L
@@ -2611,23 +2483,23 @@ typedef struct {
 
 typedef struct {
 	DWORD		dwCallback;
-	MCIDEVICEID32	wDeviceID;
+	MCIDEVICEID	wDeviceID;
 	LPCSTR		lpstrDeviceType;
 	LPCSTR		lpstrElementName;
 	LPCSTR		lpstrAlias;
 	DWORD		dwStyle;
-	HWND32		hWndParent;
-} MCI_OVLY_OPEN_PARMS32A, *LPMCI_OVLY_OPEN_PARMS32A;
+	HWND		hWndParent;
+} MCI_OVLY_OPEN_PARMSA, *LPMCI_OVLY_OPEN_PARMSA;
 
 typedef struct {
 	DWORD		dwCallback;
-	MCIDEVICEID32	wDeviceID;
+	MCIDEVICEID	wDeviceID;
 	LPCWSTR		lpstrDeviceType;
 	LPCWSTR		lpstrElementName;
 	LPCWSTR		lpstrAlias;
 	DWORD		dwStyle;
-	HWND32		hWndParent;
-} MCI_OVLY_OPEN_PARMS32W, *LPMCI_OVLY_OPEN_PARMS32W;
+	HWND		hWndParent;
+} MCI_OVLY_OPEN_PARMSW, *LPMCI_OVLY_OPEN_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_OVLY_OPEN_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_OVLY_OPEN_PARMS)
@@ -2643,17 +2515,17 @@ typedef struct {
 
 typedef struct {
 	DWORD	dwCallback;
-	HWND32	hWnd;
-	UINT32	nCmdShow;
+	HWND	hWnd;
+	UINT	nCmdShow;
 	LPCSTR	lpstrText;
-} MCI_OVLY_WINDOW_PARMS32A, *LPMCI_OVLY_WINDOW_PARMS32A;
+} MCI_OVLY_WINDOW_PARMSA, *LPMCI_OVLY_WINDOW_PARMSA;
 
 typedef struct {
 	DWORD	dwCallback;
-	HWND32	hWnd;
-	UINT32	nCmdShow;
+	HWND	hWnd;
+	UINT	nCmdShow;
 	LPCWSTR	lpstrText;
-} MCI_OVLY_WINDOW_PARMS32W, *LPMCI_OVLY_WINDOW_PARMS32W;
+} MCI_OVLY_WINDOW_PARMSW, *LPMCI_OVLY_WINDOW_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_OVLY_WINDOW_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_OVLY_WINDOW_PARMS)
@@ -2671,15 +2543,13 @@ typedef struct {
 typedef struct {
 	DWORD   dwCallback;
 #ifdef MCI_USE_OFFEXT
-	POINT32 ptOffset;
-	POINT32 ptExtent;
+	POINT ptOffset;
+	POINT ptExtent;
 #else   /* ifdef MCI_USE_OFFEXT */
-	RECT32  rc;
+	RECT  rc;
 #endif  /* ifdef MCI_USE_OFFEXT */
-} MCI_OVLY_RECT_PARMS32, *LPMCI_OVLY_RECT_PARMS32;
+} MCI_OVLY_RECT_PARMS, *LPMCI_OVLY_RECT_PARMS;
 
-DECL_WINELIB_TYPE(MCI_OVLY_RECT_PARMS)
-DECL_WINELIB_TYPE(LPMCI_OVLY_RECT_PARMS)
 
 typedef struct {
 	DWORD   dwCallback;
@@ -2690,14 +2560,14 @@ typedef struct {
 typedef struct {
 	DWORD   dwCallback;
 	LPCSTR  lpfilename;
-	RECT32  rc;
-} MCI_OVLY_SAVE_PARMS32A, *LPMCI_OVLY_SAVE_PARMS32A;
+	RECT  rc;
+} MCI_OVLY_SAVE_PARMSA, *LPMCI_OVLY_SAVE_PARMSA;
 
 typedef struct {
 	DWORD   dwCallback;
 	LPCWSTR  lpfilename;
-	RECT32  rc;
-} MCI_OVLY_SAVE_PARMS32W, *LPMCI_OVLY_SAVE_PARMS32W;
+	RECT  rc;
+} MCI_OVLY_SAVE_PARMSW, *LPMCI_OVLY_SAVE_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_OVLY_SAVE_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_OVLY_SAVE_PARMS)
@@ -2711,14 +2581,14 @@ typedef struct {
 typedef struct {
 	DWORD	dwCallback;
 	LPCSTR	lpfilename;
-	RECT32	rc;
-} MCI_OVLY_LOAD_PARMS32A, *LPMCI_OVLY_LOAD_PARMS32A;
+	RECT	rc;
+} MCI_OVLY_LOAD_PARMSA, *LPMCI_OVLY_LOAD_PARMSA;
 
 typedef struct {
 	DWORD	dwCallback;
 	LPCWSTR	lpfilename;
-	RECT32	rc;
-} MCI_OVLY_LOAD_PARMS32W, *LPMCI_OVLY_LOAD_PARMS32W;
+	RECT	rc;
+} MCI_OVLY_LOAD_PARMSW, *LPMCI_OVLY_LOAD_PARMSW;
 
 DECL_WINELIB_TYPE_AW(MCI_OVLY_LOAD_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_OVLY_LOAD_PARMS)
@@ -2920,32 +2790,26 @@ typedef struct {
 } MCI_OPEN_DRIVER_PARMS, *LPMCI_OPEN_DRIVER_PARMS;
 
 DWORD  WINAPI mciGetDriverData16(UINT16 uDeviceID);
-DWORD  WINAPI mciGetDriverData32(UINT32 uDeviceID);
-#define mciGetDriverData WINELIB_NAME(mciGetDriverData)
+DWORD  WINAPI mciGetDriverData(UINT uDeviceID);
 
 BOOL16 WINAPI mciSetDriverData16(UINT16 uDeviceID, DWORD dwData);
-BOOL32 WINAPI mciSetDriverData32(UINT32 uDeviceID, DWORD dwData);
-#define mciSetDriverData WINELIB_NAME(mciSetDriverData)
+BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD dwData);
 
 UINT16 WINAPI mciDriverYield16(UINT16 uDeviceID);
-UINT32 WINAPI mciDriverYield32(UINT32 uDeviceID);
-#define mciDriverYield WINELIB_NAME(mciDriverYield)
+UINT WINAPI mciDriverYield(UINT uDeviceID);
 
 BOOL16 WINAPI mciDriverNotify16(HWND16 hwndCallback, UINT16 uDeviceID,
                               UINT16 uStatus);
-BOOL32 WINAPI mciDriverNotify32(HWND32 hwndCallback, UINT32 uDeviceID,
-				UINT32 uStatus);
-#define mciDriverNotify WINELIB_NAME(mciDriverNotify)
+BOOL WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
+				UINT uStatus);
 
 UINT16 WINAPI mciLoadCommandResource16(HINSTANCE16 hInstance,
                                      LPCSTR lpResName, UINT16 uType);
-UINT32 WINAPI mciLoadCommandResource32(HINSTANCE32 hInstance,
-				       LPCWSTR lpResName, UINT32 uType);
-#define mciLoadCommandResource WINELIB_NAME(mciLoadCommandResource)
+UINT WINAPI mciLoadCommandResource(HINSTANCE hInstance,
+				       LPCWSTR lpResName, UINT uType);
 
 BOOL16 WINAPI mciFreeCommandResource16(UINT16 uTable);
-BOOL32 WINAPI mciFreeCommandResource32(UINT32 uTable);
-#define mciFreeCommandResource WINELIB_NAME(mciFreeCommandResource)
+BOOL WINAPI mciFreeCommandResource(UINT uTable);
 
 #define DCB_NULL		0x0000
 #define DCB_WINDOW		0x0001			/* dwCallback is a HWND */
@@ -2955,7 +2819,7 @@ BOOL32 WINAPI mciFreeCommandResource32(UINT32 uTable);
 #define DCB_TYPEMASK	0x0007
 #define DCB_NOSWITCH	0x0008			/* don't switch stacks for callback */
 
-BOOL16 WINAPI DriverCallback(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev, 
+BOOL16 WINAPI DriverCallback16(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev, 
                              WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
 DWORD WINAPI auxMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
 					DWORD dwParam1, DWORD dwParam2);
diff --git a/include/module.h b/include/module.h
index 5b7c3848aeb..51160e26e21 100644
--- a/include/module.h
+++ b/include/module.h
@@ -47,7 +47,7 @@ typedef struct _NE_MODULE
     WORD    min_swap_area;    /* 3c Min. swap area size */
     WORD    expected_version; /* 3e Expected Windows version */
     /* From here, these are extra fields not present in normal Windows */
-    HMODULE32  module32;      /* 40 PE module handle for Win32 modules */
+    HMODULE  module32;      /* 40 PE module handle for Win32 modules */
     HMODULE16  self;          /* 44 Handle for this module */
     WORD    self_loading_sel; /* 46 Selector used for self-loading apps. */
     LPDOSTASK lpDosTask;
@@ -94,7 +94,7 @@ typedef struct
     SEGPTR    cmdLine WINE_PACKED;  /* Command-line */
     SEGPTR    showCmd WINE_PACKED;  /* Code for ShowWindow() */
     SEGPTR    reserved WINE_PACKED;
-} LOADPARAMS;
+} LOADPARAMS16;
 
 typedef struct 
 {
@@ -102,7 +102,7 @@ typedef struct
     LPSTR lpCmdLine;
     UINT16 *lpCmdShow;
     DWORD dwReserved;
-} LOADPARAMS32;
+} LOADPARAMS;
 
 #pragma pack(4)
 
@@ -117,7 +117,7 @@ typedef struct _wine_modref
 		ELF_MODREF	elf;
 	} binfmt;
 
-	HMODULE32		module;
+	HMODULE		module;
 
 	int			nDeps;
 	struct _wine_modref	**deps;
@@ -143,15 +143,15 @@ typedef struct resource_nameinfo_s NE_NAMEINFO;
     (((OFSTRUCT *)((char*)(pModule) + (pModule)->fileinfo))->szPathName)
 
 /* module.c */
-extern FARPROC32 MODULE_GetProcAddress32( HMODULE32 hModule, LPCSTR function, BOOL32 snoop );
-extern WINE_MODREF *MODULE32_LookupHMODULE( HMODULE32 hModule );
-extern void MODULE_InitializeDLLs( HMODULE32 root, DWORD type, LPVOID lpReserved );
-extern HMODULE32 MODULE_FindModule32( LPCSTR path );
-extern HMODULE32 MODULE_CreateDummyModule( const OFSTRUCT *ofs, LPCSTR modName );
+extern FARPROC MODULE_GetProcAddress( HMODULE hModule, LPCSTR function, BOOL snoop );
+extern WINE_MODREF *MODULE32_LookupHMODULE( HMODULE hModule );
+extern void MODULE_InitializeDLLs( HMODULE root, DWORD type, LPVOID lpReserved );
+extern HMODULE MODULE_FindModule( LPCSTR path );
+extern HMODULE MODULE_CreateDummyModule( const OFSTRUCT *ofs, LPCSTR modName );
 extern FARPROC16 MODULE_GetWndProcEntry16( const char *name );
-extern FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE32 hmodule, LPCSTR name );
-extern SEGPTR WINAPI HasGPHandler( SEGPTR address );
-HMODULE32 MODULE_LoadLibraryEx32A( LPCSTR libname, HFILE32 hfile, DWORD flags );
+extern FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE hmodule, LPCSTR name );
+extern SEGPTR WINAPI HasGPHandler16( SEGPTR address );
+HMODULE MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags );
 
 /* loader/ne/module.c */
 extern NE_MODULE *NE_GetPtr( HMODULE16 hModule );
@@ -162,13 +162,13 @@ extern WORD NE_GetOrdinal( HMODULE16 hModule, const char *name );
 extern FARPROC16 NE_GetEntryPoint( HMODULE16 hModule, WORD ordinal );
 extern FARPROC16 NE_GetEntryPointEx( HMODULE16 hModule, WORD ordinal, BOOL16 snoop );
 extern BOOL16 NE_SetEntryPoint( HMODULE16 hModule, WORD ordinal, WORD offset );
-extern HANDLE32 NE_OpenFile( NE_MODULE *pModule );
+extern HANDLE NE_OpenFile( NE_MODULE *pModule );
 extern HINSTANCE16 NE_LoadModule( LPCSTR name, HINSTANCE16 *hPrevInstance,
-                                  BOOL32 implicit, BOOL32 lib_only );
+                                  BOOL implicit, BOOL lib_only );
 
 /* loader/ne/resource.c */
 extern HGLOBAL16 WINAPI NE_DefResourceHandler(HGLOBAL16,HMODULE16,HRSRC16);
-extern BOOL32 NE_InitResourceHandler( HMODULE16 hModule );
+extern BOOL NE_InitResourceHandler( HMODULE16 hModule );
 extern HRSRC16 NE_FindResource( NE_MODULE *pModule, LPCSTR name, LPCSTR type );
 extern INT16 NE_AccessResource( NE_MODULE *pModule, HRSRC16 hRsrc );
 extern DWORD NE_SizeofResource( NE_MODULE *pModule, HRSRC16 hRsrc );
@@ -179,29 +179,29 @@ extern NE_NAMEINFO *NE_FindResourceFromType( LPBYTE pResTab, NE_TYPEINFO *pTypeI
 
 
 /* loader/ne/segment.c */
-extern BOOL32 NE_LoadSegment( NE_MODULE *pModule, WORD segnum );
-extern BOOL32 NE_LoadAllSegments( NE_MODULE *pModule );
+extern BOOL NE_LoadSegment( NE_MODULE *pModule, WORD segnum );
+extern BOOL NE_LoadAllSegments( NE_MODULE *pModule );
 extern void NE_FixupPrologs( NE_MODULE *pModule );
 extern void NE_InitializeDLLs( HMODULE16 hModule );
-extern BOOL32 NE_CreateSegments( NE_MODULE *pModule );
+extern BOOL NE_CreateSegments( NE_MODULE *pModule );
 extern HINSTANCE16 NE_CreateInstance( NE_MODULE *pModule, HINSTANCE16 *prev,
-                                      BOOL32 lib_only );
+                                      BOOL lib_only );
 
 /* loader/ne/convert.c */
 HGLOBAL16 NE_LoadPEResource( NE_MODULE *pModule, WORD type, LPVOID bits, DWORD size );
 BOOL16 NE_FreePEResource( NE_MODULE *pModule, HGLOBAL16 handle );
 
 /* if1632/builtin.c */
-extern BOOL32 BUILTIN_Init(void);
-extern HMODULE16 BUILTIN_LoadModule( LPCSTR name, BOOL32 force );
+extern BOOL BUILTIN_Init(void);
+extern HMODULE16 BUILTIN_LoadModule( LPCSTR name, BOOL force );
 extern LPCSTR BUILTIN_GetEntryPoint16( WORD cs, WORD ip, WORD *pOrd );
-extern BOOL32 BUILTIN_ParseDLLOptions( const char *str );
+extern BOOL BUILTIN_ParseDLLOptions( const char *str );
 extern void BUILTIN_PrintDLLs(void);
 
 /* relay32/builtin.c */
-extern HMODULE32 BUILTIN32_LoadImage( LPCSTR name, OFSTRUCT *ofs, BOOL32 force );
+extern HMODULE BUILTIN32_LoadImage( LPCSTR name, OFSTRUCT *ofs, BOOL force );
 
 /* if1632/builtin.c */
-extern HMODULE16 (*fnBUILTIN_LoadModule)(LPCSTR name, BOOL32 force);
+extern HMODULE16 (*fnBUILTIN_LoadModule)(LPCSTR name, BOOL force);
 
 #endif  /* __WINE_MODULE_H */
diff --git a/include/mouse.h b/include/mouse.h
index 7c0c88a13ca..1de96ddddc3 100644
--- a/include/mouse.h
+++ b/include/mouse.h
@@ -36,12 +36,12 @@ typedef struct _WINE_MOUSEEVENT
     DWORD magic;
     DWORD keyState;
     DWORD time;
-    HWND32 hWnd;
+    HWND hWnd;
 
 } WINE_MOUSEEVENT;
 
 void MOUSE_SendEvent( DWORD mouseStatus, DWORD posX, DWORD posY,
-                      DWORD keyState, DWORD time, HWND32 hWnd );
+                      DWORD keyState, DWORD time, HWND hWnd );
 
 /***********************************
  * 	MouseWheel support (defines)
diff --git a/include/msacm.h b/include/msacm.h
index 8ed6d3f344b..f0fc2aa9c3b 100644
--- a/include/msacm.h
+++ b/include/msacm.h
@@ -17,11 +17,11 @@
 /* FIXME: Move to wintypes.h */
 #define DECLARE_HANDLE(a) \
 typedef HANDLE16 a##16; \
-typedef HANDLE32 a##32; \
+typedef HANDLE a; \
 typedef a##16 *P##a##16; \
 typedef a##16 *NP##a##16; \
 typedef a##16 *LP##a##16; \
-typedef a##32 *P##a##32;
+typedef a *P##a;
 
 DECLARE_HANDLE(HACMDRIVERID)
 DECLARE_HANDLE(HACMDRIVER)
@@ -107,16 +107,16 @@ DECLARE_HANDLE(HACMOBJ)
 
 #define ACM_FILTERENUMF_DWFILTERTAG 0x00010000L
 
-#define ACMHELPMSGSTRING32A       "acmchoose_help"
-#define ACMHELPMSGSTRING32W       L"acmchoose_help"
+#define ACMHELPMSGSTRINGA       "acmchoose_help"
+#define ACMHELPMSGSTRINGW       L"acmchoose_help"
 #define ACMHELPMSGSTRING16       "acmchoose_help"
 
-#define ACMHELPMSGCONTEXTMENU32A  "acmchoose_contextmenu"
-#define ACMHELPMSGCONTEXTMENU32W  L"acmchoose_contextmenu"
+#define ACMHELPMSGCONTEXTMENUA  "acmchoose_contextmenu"
+#define ACMHELPMSGCONTEXTMENUW  L"acmchoose_contextmenu"
 #define ACMHELPMSGCONTEXTMENU16   "acmchoose_contextmenu"
 
-#define ACMHELPMSGCONTEXTHELP32A  "acmchoose_contexthelp"
-#define ACMHELPMSGCONTEXTHELP32W  L"acmchoose_contexthelp"
+#define ACMHELPMSGCONTEXTHELPA  "acmchoose_contexthelp"
+#define ACMHELPMSGCONTEXTHELPW  L"acmchoose_contexthelp"
 #define ACMHELPMSGCONTEXTHELP16   "acmchoose_contexthelp"
 
 #define MM_ACM_FORMATCHOOSE 0x8000
@@ -208,32 +208,32 @@ DECLARE_HANDLE(HACMOBJ)
  * Callbacks
  */
 
-typedef BOOL32 (CALLBACK *ACMDRIVERENUMCB32)(
-  HACMDRIVERID32 hadid, DWORD dwInstance, DWORD fdwSupport
+typedef BOOL (CALLBACK *ACMDRIVERENUMCB)(
+  HACMDRIVERID hadid, DWORD dwInstance, DWORD fdwSupport
 );
 
 typedef BOOL16 (CALLBACK *ACMDRIVERENUMCB16)(
   HACMDRIVERID16 hadid, DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef UINT32 (CALLBACK *ACMFILTERCHOOSEHOOKPROC32A)(
-  HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCA)(
+  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 );
 
-typedef UINT32 (CALLBACK *ACMFILTERCHOOSEHOOKPROC32W)(
-  HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCW)(
+  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 );
 
-typedef UINT32 (CALLBACK *ACMFILTERCHOOSEHOOKPROC16)(
-  HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROC16)(
+  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 );
 
-typedef UINT32 (CALLBACK *ACMFORMATCHOOSEHOOKPROC32A)(
-  HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCA)(
+  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 );
 
-typedef UINT32 (CALLBACK *ACMFORMATCHOOSEHOOKPROC32W)(
-  HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCW)(
+  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 );
 
 typedef UINT16 (CALLBACK *ACMFORMATCHOOSEHOOKPROC16)(
@@ -244,7 +244,7 @@ typedef UINT16 (CALLBACK *ACMFORMATCHOOSEHOOKPROC16)(
  * Structures
  */
 
-typedef struct _ACMDRIVERDETAILS32A
+typedef struct _ACMDRIVERDETAILSA
 {
   DWORD    cbStruct;
 
@@ -261,16 +261,16 @@ typedef struct _ACMDRIVERDETAILS32A
   DWORD    cFormatTags;
   DWORD    cFilterTags;
 
-  HICON32  hicon;
+  HICON  hicon;
 
   CHAR     szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS];
   CHAR     szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS];
   CHAR     szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS];
   CHAR     szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
   CHAR     szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
-} ACMDRIVERDETAILS32A, *PACMDRIVERDETAILS32A;
+} ACMDRIVERDETAILSA, *PACMDRIVERDETAILSA;
 
-typedef struct _ACMDRIVERDETAILS32W
+typedef struct _ACMDRIVERDETAILSW
 {
   DWORD    cbStruct;
 
@@ -287,14 +287,14 @@ typedef struct _ACMDRIVERDETAILS32W
   DWORD    cFormatTags;
   DWORD    cFilterTags;
 
-  HICON32  hicon;
+  HICON  hicon;
 
   WCHAR    szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS];
   WCHAR    szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS];
   WCHAR    szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS];
   WCHAR    szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
   WCHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
-} ACMDRIVERDETAILS32W, *PACMDRIVERDETAILS32W;
+} ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW;
 
 typedef struct _ACMDRIVERDETAILS16
 {
@@ -322,12 +322,12 @@ typedef struct _ACMDRIVERDETAILS16
   CHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
 } ACMDRIVERDETAILS16, *NPACMDRIVERDETAILS16, *LPACMDRIVERDETAILS16;
 
-typedef struct _ACMFILTERCHOOSE32A
+typedef struct _ACMFILTERCHOOSEA
 {
   DWORD         cbStruct;
   DWORD         fdwStyle;
 
-  HWND32        hwndOwner;
+  HWND        hwndOwner;
 
   PWAVEFILTER   pwfltr;
   DWORD         cbwfltr;
@@ -342,18 +342,18 @@ typedef struct _ACMFILTERCHOOSE32A
   DWORD         fdwEnum;
   PWAVEFILTER   pwfltrEnum;
     
-  HINSTANCE32   hInstance;
+  HINSTANCE   hInstance;
   LPCSTR        pszTemplateName;
   LPARAM        lCustData;
-  ACMFILTERCHOOSEHOOKPROC32A pfnHook;
-} ACMFILTERCHOOSE32A, *PACMFILTERCHOOSE32A;
+  ACMFILTERCHOOSEHOOKPROCA pfnHook;
+} ACMFILTERCHOOSEA, *PACMFILTERCHOOSEA;
 
-typedef struct _ACMFILTERCHOOSE32W
+typedef struct _ACMFILTERCHOOSEW
 {
   DWORD         cbStruct;
   DWORD         fdwStyle;
 
-  HWND32        hwndOwner;
+  HWND        hwndOwner;
 
   PWAVEFILTER   pwfltr;
   DWORD         cbwfltr;
@@ -368,11 +368,11 @@ typedef struct _ACMFILTERCHOOSE32W
   DWORD         fdwEnum;
   PWAVEFILTER   pwfltrEnum;
     
-  HINSTANCE32   hInstance;
+  HINSTANCE   hInstance;
   LPCWSTR       pszTemplateName;
   LPARAM        lCustData;
-  ACMFILTERCHOOSEHOOKPROC32W pfnHook;
-} ACMFILTERCHOOSE32W, *PACMFILTERCHOOSE32W;
+  ACMFILTERCHOOSEHOOKPROCW pfnHook;
+} ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW;
 
 typedef struct _ACMFILTERCHOOSE16
 {
@@ -400,7 +400,7 @@ typedef struct _ACMFILTERCHOOSE16
   ACMFILTERCHOOSEHOOKPROC16 pfnHook;
 } ACMFILTERCHOOSE16, *NPACMFILTERCHOOSE16, *LPACMFILTERCHOOSE16;
 
-typedef struct _ACMFILTERDETAILS32A
+typedef struct _ACMFILTERDETAILSA
 {
   DWORD           cbStruct;
   DWORD           dwFilterIndex;
@@ -409,9 +409,9 @@ typedef struct _ACMFILTERDETAILS32A
   PWAVEFILTER     pwfltr;
   DWORD           cbwfltr;
   CHAR            szFilter[ACMFILTERDETAILS_FILTER_CHARS];
-} ACMFILTERDETAILS32A, *PACMFILTERDETAILS32A;
+} ACMFILTERDETAILSA, *PACMFILTERDETAILSA;
 
-typedef struct _ACMFILTERDETAILS32W
+typedef struct _ACMFILTERDETAILSW
 {
   DWORD          cbStruct;
   DWORD          dwFilterIndex;
@@ -420,7 +420,7 @@ typedef struct _ACMFILTERDETAILS32W
   PWAVEFILTER    pwfltr;
   DWORD          cbwfltr;
   WCHAR          szFilter[ACMFILTERDETAILS_FILTER_CHARS];
-} ACMFILTERDETAILS32W, *PACMFILTERDETAILS32W;
+} ACMFILTERDETAILSW, *PACMFILTERDETAILSW;
 
 typedef struct _ACMFILTERDETAILS16
 {
@@ -433,7 +433,7 @@ typedef struct _ACMFILTERDETAILS16
   CHAR           szFilter[ACMFILTERDETAILS_FILTER_CHARS];
 } ACMFILTERDETAILS16, *NPACMFILTERDETAILS16, *LPACMFILTERDETAILS16;
 
-typedef struct _ACMFILTERTAGDETAILS32A
+typedef struct _ACMFILTERTAGDETAILSA
 {
   DWORD cbStruct;
   DWORD dwFilterTagIndex;
@@ -442,9 +442,9 @@ typedef struct _ACMFILTERTAGDETAILS32A
   DWORD fdwSupport;
   DWORD cStandardFilters;
   CHAR  szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
-} ACMFILTERTAGDETAILS32A, *PACMFILTERTAGDETAILS32A;
+} ACMFILTERTAGDETAILSA, *PACMFILTERTAGDETAILSA;
 
-typedef struct _ACMFILTERTAGDETAILS32W
+typedef struct _ACMFILTERTAGDETAILSW
 {
   DWORD cbStruct;
   DWORD dwFilterTagIndex;
@@ -453,7 +453,7 @@ typedef struct _ACMFILTERTAGDETAILS32W
   DWORD fdwSupport;
   DWORD cStandardFilters;
   WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
-} ACMFILTERTAGDETAILS32W, *PACMFILTERTAGDETAILS32W;
+} ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW;
 
 typedef struct _ACMFILTERTAGDETAILS16
 {
@@ -466,12 +466,12 @@ typedef struct _ACMFILTERTAGDETAILS16
   CHAR  szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
 } ACMFILTERTAGDETAILS16, *NPACMFILTERTAGDETAILS16, *LPACMFILTERTAGDETAILS16;
 
-typedef struct _ACMFORMATCHOOSE32A
+typedef struct _ACMFORMATCHOOSEA
 {
   DWORD           cbStruct;
   DWORD           fdwStyle;
  
-  HWND32          hwndOwner;
+  HWND          hwndOwner;
 
   PWAVEFORMATEX   pwfx;
   DWORD           cbwfx;
@@ -486,18 +486,18 @@ typedef struct _ACMFORMATCHOOSE32A
   DWORD           fdwEnum;
   PWAVEFORMATEX   pwfxEnum;
     
-  HINSTANCE32     hInstance;
+  HINSTANCE     hInstance;
   LPCSTR          pszTemplateName;
   LPARAM          lCustData;
-  ACMFORMATCHOOSEHOOKPROC32A pfnHook;
-} ACMFORMATCHOOSE32A, *PACMFORMATCHOOSE32A;
+  ACMFORMATCHOOSEHOOKPROCA pfnHook;
+} ACMFORMATCHOOSEA, *PACMFORMATCHOOSEA;
 
-typedef struct _ACMFORMATCHOOSE32W
+typedef struct _ACMFORMATCHOOSEW
 {
   DWORD           cbStruct;
   DWORD           fdwStyle;
     
-  HWND32          hwndOwner;
+  HWND          hwndOwner;
 
   PWAVEFORMATEX   pwfx;
   DWORD           cbwfx;
@@ -512,11 +512,11 @@ typedef struct _ACMFORMATCHOOSE32W
   DWORD           fdwEnum;
   LPWAVEFORMATEX  pwfxEnum;
     
-  HINSTANCE32     hInstance;
+  HINSTANCE     hInstance;
   LPCWSTR         pszTemplateName;
   LPARAM          lCustData;
-  ACMFORMATCHOOSEHOOKPROC32W pfnHook;
-} ACMFORMATCHOOSE32W, *PACMFORMATCHOOSE32W;
+  ACMFORMATCHOOSEHOOKPROCW pfnHook;
+} ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW;
 
 typedef struct _ACMFORMATCHOOSE16
 {
@@ -544,7 +544,7 @@ typedef struct _ACMFORMATCHOOSE16
   ACMFORMATCHOOSEHOOKPROC16 pfnHook;
 } ACMFORMATCHOOSE16, *NPACMFORMATCHOOSE16, *LPACMFORMATCHOOSE16;
 
-typedef struct _ACMFORMATDETAILS32A
+typedef struct _ACMFORMATDETAILSA
 {
   DWORD           cbStruct;
   DWORD           dwFormatIndex;
@@ -553,9 +553,9 @@ typedef struct _ACMFORMATDETAILS32A
   PWAVEFORMATEX   pwfx;
   DWORD           cbwfx;
   CHAR            szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
-} ACMFORMATDETAILS32A, *PACMFORMATDETAILS32A;
+} ACMFORMATDETAILSA, *PACMFORMATDETAILSA;
 
-typedef struct _ACMFORMATDETAILS32W
+typedef struct _ACMFORMATDETAILSW
 {
     DWORD           cbStruct;
     DWORD           dwFormatIndex;
@@ -564,7 +564,7 @@ typedef struct _ACMFORMATDETAILS32W
     PWAVEFORMATEX   pwfx;
     DWORD           cbwfx;
     WCHAR           szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
-} ACMFORMATDETAILS32W, *PACMFORMATDETAILS32W;
+} ACMFORMATDETAILSW, *PACMFORMATDETAILSW;
 
 typedef struct _ACMFORMATDETAILS16
 {
@@ -577,7 +577,7 @@ typedef struct _ACMFORMATDETAILS16
     CHAR             szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
 } ACMFORMATDETAILS16, *NPACMFORMATDETAILS16, *LPACMFORMATDETAILS16;
 
-typedef struct _ACMFORMATTAGDETAILS32A
+typedef struct _ACMFORMATTAGDETAILSA
 {
   DWORD cbStruct;
   DWORD dwFormatTagIndex;
@@ -586,9 +586,9 @@ typedef struct _ACMFORMATTAGDETAILS32A
   DWORD fdwSupport;
   DWORD cStandardFormats;
   CHAR  szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
-} ACMFORMATTAGDETAILS32A, *PACMFORMATTAGDETAILS32A;
+} ACMFORMATTAGDETAILSA, *PACMFORMATTAGDETAILSA;
 
-typedef struct _ACMFORMATTAGDETAILS32W
+typedef struct _ACMFORMATTAGDETAILSW
 {
   DWORD cbStruct;
   DWORD dwFormatTagIndex;
@@ -597,7 +597,7 @@ typedef struct _ACMFORMATTAGDETAILS32W
   DWORD fdwSupport;
   DWORD cStandardFormats;
   WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
-} ACMFORMATTAGDETAILS32W, *PACMFORMATTAGDETAILS32W;
+} ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW;
 
 typedef struct _ACMFORMATTAGDETAILS16
 {
@@ -625,19 +625,19 @@ typedef struct _ACMSTREAMHEADER
   DWORD  dwDstUser;
   DWORD  dwReservedDriver[10];
 } ACMSTREAMHEADER16, *NPACMSTREAMHEADER16, *LPACMSTREAMHEADER16,
-  ACMSTREAMHEADER32, *PACMSTREAMHEADER32;
+  ACMSTREAMHEADER, *PACMSTREAMHEADER;
 
 /***********************************************************************
  * Callbacks 2
  */
 
-typedef BOOL32 (CALLBACK *ACMFILTERENUMCB32A)(
-  HACMDRIVERID32 hadid, PACMFILTERDETAILS32A pafd,
+typedef BOOL (CALLBACK *ACMFILTERENUMCBA)(
+  HACMDRIVERID hadid, PACMFILTERDETAILSA pafd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL32 (CALLBACK *ACMFILTERENUMCB32W)(
-  HACMDRIVERID32 hadid, PACMFILTERDETAILS32W pafd,
+typedef BOOL (CALLBACK *ACMFILTERENUMCBW)(
+  HACMDRIVERID hadid, PACMFILTERDETAILSW pafd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
@@ -646,13 +646,13 @@ typedef BOOL16 (CALLBACK *ACMFILTERENUMCB16)(
  DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL32 (CALLBACK *ACMFILTERTAGENUMCB32A)(
-  HACMDRIVERID32 hadid, PACMFILTERTAGDETAILS32A paftd,
+typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBA)(
+  HACMDRIVERID hadid, PACMFILTERTAGDETAILSA paftd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL32 (CALLBACK *ACMFILTERTAGENUMCB32W)(
-  HACMDRIVERID32 hadid, PACMFILTERTAGDETAILS32W paftd,
+typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBW)(
+  HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
@@ -661,13 +661,13 @@ typedef BOOL16 (CALLBACK *ACMFILTERTAGENUMCB16)(
   DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL32 (CALLBACK *ACMFORMATENUMCB32A)(
-  HACMDRIVERID32 hadid, PACMFORMATDETAILS32A pafd,
+typedef BOOL (CALLBACK *ACMFORMATENUMCBA)(
+  HACMDRIVERID hadid, PACMFORMATDETAILSA pafd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL32 (CALLBACK *ACMFORMATENUMCB32W)(
-  HACMDRIVERID32 hadid, PACMFORMATDETAILS32W pafd,
+typedef BOOL (CALLBACK *ACMFORMATENUMCBW)(
+  HACMDRIVERID hadid, PACMFORMATDETAILSW pafd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
@@ -676,13 +676,13 @@ typedef BOOL16 (CALLBACK *ACMFORMATENUMCB16)(
   DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL32 (CALLBACK *ACMFORMATTAGENUMCB32A)(
-  HACMDRIVERID32 hadid, PACMFORMATTAGDETAILS32A paftd,
+typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA)(
+  HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL32 (CALLBACK *ACMFORMATTAGENUMCB32W)(
-  HACMDRIVERID32 hadid, PACMFORMATTAGDETAILS32W paftd,
+typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW)(
+  HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
@@ -796,207 +796,207 @@ MMRESULT16 WINAPI acmStreamUnprepareHeader16(
  * Functions - Win32
  */
 
-MMRESULT32 WINAPI acmDriverAdd32A(
-  PHACMDRIVERID32 phadid, HINSTANCE32 hinstModule,
+MMRESULT WINAPI acmDriverAddA(
+  PHACMDRIVERID phadid, HINSTANCE hinstModule,
   LPARAM lParam, DWORD dwPriority, DWORD fdwAdd
 );
-MMRESULT32 WINAPI acmDriverAdd32W(
-  PHACMDRIVERID32 phadid, HINSTANCE32 hinstModule,
+MMRESULT WINAPI acmDriverAddW(
+  PHACMDRIVERID phadid, HINSTANCE hinstModule,
   LPARAM lParam, DWORD dwPriority, DWORD fdwAdd
 );
-MMRESULT32 WINAPI acmDriverClose32(
-  HACMDRIVER32 had, DWORD fdwClose
+MMRESULT WINAPI acmDriverClose(
+  HACMDRIVER had, DWORD fdwClose
 );
-MMRESULT32 WINAPI acmDriverDetails32A(
-  HACMDRIVERID32 hadid, PACMDRIVERDETAILS32A padd, DWORD fdwDetails
+MMRESULT WINAPI acmDriverDetailsA(
+  HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmDriverDetails32W(
-  HACMDRIVERID32 hadid, PACMDRIVERDETAILS32W padd, DWORD fdwDetails
+MMRESULT WINAPI acmDriverDetailsW(
+  HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmDriverEnum32(
-  ACMDRIVERENUMCB32 fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmDriverEnum(
+  ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum
 );
-MMRESULT32 WINAPI acmDriverID32(
-  HACMOBJ32 hao, PHACMDRIVERID32 phadid, DWORD fdwDriverID
+MMRESULT WINAPI acmDriverID(
+  HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID
 );
-LRESULT WINAPI acmDriverMessage32(
-  HACMDRIVER32 had, UINT32 uMsg, LPARAM lParam1, LPARAM lParam2
+LRESULT WINAPI acmDriverMessage(
+  HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2
 );
-MMRESULT32 WINAPI acmDriverOpen32(
-  PHACMDRIVER32 phad, HACMDRIVERID32 hadid, DWORD fdwOpen
+MMRESULT WINAPI acmDriverOpen(
+  PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpen
 );
-MMRESULT32 WINAPI acmDriverPriority32(
-  HACMDRIVERID32 hadid, DWORD dwPriority, DWORD fdwPriority
+MMRESULT WINAPI acmDriverPriority(
+  HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority
 );
-MMRESULT32 WINAPI acmDriverRemove32(
-  HACMDRIVERID32 hadid, DWORD fdwRemove
+MMRESULT WINAPI acmDriverRemove(
+  HACMDRIVERID hadid, DWORD fdwRemove
 );
-MMRESULT32 WINAPI acmFilterChoose32A(
-  PACMFILTERCHOOSE32A pafltrc
+MMRESULT WINAPI acmFilterChooseA(
+  PACMFILTERCHOOSEA pafltrc
 );
-MMRESULT32 WINAPI acmFilterChoose32W(
-  PACMFILTERCHOOSE32W pafltrc
+MMRESULT WINAPI acmFilterChooseW(
+  PACMFILTERCHOOSEW pafltrc
 );
-MMRESULT32 WINAPI acmFilterDetails32A(
-  HACMDRIVER32 had, PACMFILTERDETAILS32A pafd, DWORD fdwDetails
+MMRESULT WINAPI acmFilterDetailsA(
+  HACMDRIVER had, PACMFILTERDETAILSA pafd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmFilterDetails32W(
-  HACMDRIVER32 had, PACMFILTERDETAILS32W pafd, DWORD fdwDetails
+MMRESULT WINAPI acmFilterDetailsW(
+  HACMDRIVER had, PACMFILTERDETAILSW pafd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmFilterEnum32A(
-  HACMDRIVER32 had, PACMFILTERDETAILS32A pafd, 
-  ACMFILTERENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFilterEnumA(
+  HACMDRIVER had, PACMFILTERDETAILSA pafd, 
+  ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
 );
-MMRESULT32 WINAPI acmFilterEnum32W(
-  HACMDRIVER32 had, PACMFILTERDETAILS32W pafd, 
-  ACMFILTERENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFilterEnumW(
+  HACMDRIVER had, PACMFILTERDETAILSW pafd, 
+  ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
 );
-MMRESULT32 WINAPI acmFilterTagDetails32A(
-  HACMDRIVER32 had, PACMFILTERTAGDETAILS32A paftd, DWORD fdwDetails
+MMRESULT WINAPI acmFilterTagDetailsA(
+  HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmFilterTagDetails32W(
-  HACMDRIVER32 had, PACMFILTERTAGDETAILS32W paftd, DWORD fdwDetails
+MMRESULT WINAPI acmFilterTagDetailsW(
+  HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmFilterTagEnum32A(
-  HACMDRIVER32 had, PACMFILTERTAGDETAILS32A paftd,
-  ACMFILTERTAGENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFilterTagEnumA(
+  HACMDRIVER had, PACMFILTERTAGDETAILSA paftd,
+  ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
 );
-MMRESULT32 WINAPI acmFilterTagEnum32W(
-  HACMDRIVER32 had, PACMFILTERTAGDETAILS32W paftd,
-  ACMFILTERTAGENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFilterTagEnumW(
+  HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
+  ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
 );
-MMRESULT32 WINAPI acmFormatChoose32A(
-  PACMFORMATCHOOSE32A pafmtc
+MMRESULT WINAPI acmFormatChooseA(
+  PACMFORMATCHOOSEA pafmtc
 );
-MMRESULT32 WINAPI acmFormatChoose32W(
-  PACMFORMATCHOOSE32W pafmtc
+MMRESULT WINAPI acmFormatChooseW(
+  PACMFORMATCHOOSEW pafmtc
 );
-MMRESULT32 WINAPI acmFormatDetails32A(
-  HACMDRIVER32 had, PACMFORMATDETAILS32A pafd, DWORD fdwDetails
+MMRESULT WINAPI acmFormatDetailsA(
+  HACMDRIVER had, PACMFORMATDETAILSA pafd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmFormatDetails32W(
-  HACMDRIVER32 had, PACMFORMATDETAILS32W pafd, DWORD fdwDetails
+MMRESULT WINAPI acmFormatDetailsW(
+  HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmFormatEnum32A(
-  HACMDRIVER32 had, PACMFORMATDETAILS32A pafd,
-  ACMFORMATENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFormatEnumA(
+  HACMDRIVER had, PACMFORMATDETAILSA pafd,
+  ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
 );
-MMRESULT32 WINAPI acmFormatEnum32W(
-  HACMDRIVER32 had, PACMFORMATDETAILS32W pafd,
-  ACMFORMATENUMCB32W fnCallback, DWORD dwInstance,  DWORD fdwEnum
+MMRESULT WINAPI acmFormatEnumW(
+  HACMDRIVER had, PACMFORMATDETAILSW pafd,
+  ACMFORMATENUMCBW fnCallback, DWORD dwInstance,  DWORD fdwEnum
 );
-MMRESULT32 WINAPI acmFormatSuggest32(
-  HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
+MMRESULT WINAPI acmFormatSuggest(
+  HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
   DWORD cbwfxDst, DWORD fdwSuggest
 );
-MMRESULT32 WINAPI acmFormatTagDetails32A(
-  HACMDRIVER32 had, PACMFORMATTAGDETAILS32A paftd, DWORD fdwDetails
+MMRESULT WINAPI acmFormatTagDetailsA(
+  HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmFormatTagDetails32W(
-  HACMDRIVER32 had, PACMFORMATTAGDETAILS32W paftd, DWORD fdwDetails
+MMRESULT WINAPI acmFormatTagDetailsW(
+  HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, DWORD fdwDetails
 );
-MMRESULT32 WINAPI acmFormatTagEnum32A(
-  HACMDRIVER32 had, PACMFORMATTAGDETAILS32A paftd,
-  ACMFORMATTAGENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFormatTagEnumA(
+  HACMDRIVER had, PACMFORMATTAGDETAILSA paftd,
+  ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
 );
-MMRESULT32 WINAPI acmFormatTagEnum32W(
-  HACMDRIVER32 had, PACMFORMATTAGDETAILS32W paftd,
-  ACMFORMATTAGENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFormatTagEnumW(
+  HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
+  ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
 );
-DWORD WINAPI acmGetVersion32(
+DWORD WINAPI acmGetVersion(
 );
-MMRESULT32 WINAPI acmMetrics32(
-  HACMOBJ32 hao, UINT32  uMetric, LPVOID  pMetric
+MMRESULT WINAPI acmMetrics(
+  HACMOBJ hao, UINT  uMetric, LPVOID  pMetric
 );
-MMRESULT32 WINAPI acmStreamClose32(
-  HACMSTREAM32 has, DWORD fdwClose
+MMRESULT WINAPI acmStreamClose(
+  HACMSTREAM has, DWORD fdwClose
 );
-MMRESULT32 WINAPI acmStreamConvert32(
-  HACMSTREAM32 has, PACMSTREAMHEADER32 pash, DWORD fdwConvert
+MMRESULT WINAPI acmStreamConvert(
+  HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwConvert
 );
-MMRESULT32 WINAPI acmStreamMessage32(
-  HACMSTREAM32 has, UINT32 uMsg, LPARAM lParam1, LPARAM lParam2
+MMRESULT WINAPI acmStreamMessage(
+  HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2
 );
-MMRESULT32 WINAPI acmStreamOpen32(
-  PHACMSTREAM32 phas, HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc,
+MMRESULT WINAPI acmStreamOpen(
+  PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc,
   PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback,
   DWORD dwInstance, DWORD fdwOpen
 );
-MMRESULT32 WINAPI acmStreamPrepareHeader32(
-  HACMSTREAM32 has, PACMSTREAMHEADER32 pash, DWORD fdwPrepare
+MMRESULT WINAPI acmStreamPrepareHeader(
+  HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare
 );
-MMRESULT32 WINAPI acmStreamReset32(
-  HACMSTREAM32 has, DWORD fdwReset
+MMRESULT WINAPI acmStreamReset(
+  HACMSTREAM has, DWORD fdwReset
 );
-MMRESULT32 WINAPI acmStreamSize32(
-  HACMSTREAM32 has, DWORD cbInput, 
+MMRESULT WINAPI acmStreamSize(
+  HACMSTREAM has, DWORD cbInput, 
   LPDWORD pdwOutputBytes, DWORD fdwSize
 );
-MMRESULT32 WINAPI acmStreamUnprepareHeader32(
-  HACMSTREAM32 has, PACMSTREAMHEADER32 pash, DWORD fdwUnprepare
+MMRESULT WINAPI acmStreamUnprepareHeader(
+  HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare
 );
 
 /***********************************************************************
  * Wine specific - Win32
  */
-typedef struct _WINE_ACMBUILTINDRIVER32
+typedef struct _WINE_ACMBUILTINDRIVER
 {
   LPSTR        pszDriverAlias;
-  DRIVERPROC32 pfnDriverProc;
-} WINE_ACMBUILTINDRIVER32, *PWINE_ACMBUILTINDRIVER32;
+  DRIVERPROC pfnDriverProc;
+} WINE_ACMBUILTINDRIVER, *PWINE_ACMBUILTINDRIVER;
 
-typedef struct _WINE_ACMLOCALDRIVER32
+typedef struct _WINE_ACMLOCALDRIVER
 {
-  DRIVERPROC32 pfnDriverProc;
-} WINE_ACMLOCALDRIVER32, *PWINE_ACMLOCALDRIVER32;
+  DRIVERPROC pfnDriverProc;
+} WINE_ACMLOCALDRIVER, *PWINE_ACMLOCALDRIVER;
 
-typedef struct _WINE_ACMDRIVERID32 *PWINE_ACMDRIVERID32;
+typedef struct _WINE_ACMDRIVERID *PWINE_ACMDRIVERID;
 
-typedef struct _WINE_ACMOBJ32
+typedef struct _WINE_ACMOBJ
 {
-  PWINE_ACMDRIVERID32 pACMDriverID;
-} WINE_ACMOBJ32, *PWINE_ACMOBJ32;
+  PWINE_ACMDRIVERID pACMDriverID;
+} WINE_ACMOBJ, *PWINE_ACMOBJ;
 
-typedef struct _WINE_ACMDRIVER32
+typedef struct _WINE_ACMDRIVER
 {
-  WINE_ACMOBJ32  obj;
-  HDRVR32        hDrvr;
-} WINE_ACMDRIVER32, *PWINE_ACMDRIVER32;
+  WINE_ACMOBJ  obj;
+  HDRVR        hDrvr;
+} WINE_ACMDRIVER, *PWINE_ACMDRIVER;
 
-typedef struct _WINE_ACMSTREAM32
+typedef struct _WINE_ACMSTREAM
 {
-  WINE_ACMOBJ32  obj;
+  WINE_ACMOBJ  obj;
   /* FIME: More fields needed */
-} WINE_ACMSTREAM32, *PWINE_ACMSTREAM32;
+} WINE_ACMSTREAM, *PWINE_ACMSTREAM;
 
-typedef struct _WINE_ACMDRIVERID32
+typedef struct _WINE_ACMDRIVERID
 {
   LPSTR                    pszDriverAlias;
   LPSTR                    pszFileName;
-  PWINE_ACMLOCALDRIVER32   pACMLocalDriver;
-  BOOL32                   bEnabled;
-  PWINE_ACMDRIVER32        pACMDriver;           /* NULL if not open */
-  PWINE_ACMDRIVERID32      pNextACMDriverID;
-  PWINE_ACMDRIVERID32      pPreviousACMDriverID;
-} WINE_ACMDRIVERID32;
+  PWINE_ACMLOCALDRIVER   pACMLocalDriver;
+  BOOL                   bEnabled;
+  PWINE_ACMDRIVER        pACMDriver;           /* NULL if not open */
+  PWINE_ACMDRIVERID      pNextACMDriverID;
+  PWINE_ACMDRIVERID      pPreviousACMDriverID;
+} WINE_ACMDRIVERID;
 
 /* From builtin.c */
-extern WINE_ACMBUILTINDRIVER32 MSACM_BuiltinDrivers32[];
+extern WINE_ACMBUILTINDRIVER MSACM_BuiltinDrivers[];
 
 /* From interal.c */
-extern HANDLE32 MSACM_hHeap32;
-extern PWINE_ACMDRIVERID32 MSACM_pFirstACMDriverID32;
-extern PWINE_ACMDRIVERID32 MSACM_pLastACMDriverID32;
-PWINE_ACMDRIVERID32 MSACM_RegisterDriver32(
+extern HANDLE MSACM_hHeap;
+extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID;
+extern PWINE_ACMDRIVERID MSACM_pLastACMDriverID;
+PWINE_ACMDRIVERID MSACM_RegisterDriver(
   LPSTR pszDriverAlias, LPSTR pszFileName,
-  PWINE_ACMLOCALDRIVER32 pLocalDriver);
-void MSACM_RegisterAllDrivers32();
-PWINE_ACMDRIVERID32 MSACM_UnregisterDriver32(PWINE_ACMDRIVERID32 p);
-void MSACM_UnregisterAllDrivers32();
-PWINE_ACMDRIVERID32 MSACM_GetDriverID32(HACMDRIVERID32 hDriverID);
-PWINE_ACMDRIVER32 MSACM_GetDriver32(HACMDRIVER32 hDriver);
-PWINE_ACMOBJ32 MSACM_GetObj32(HACMOBJ32 hObj);
-HDRVR32 MSACM_OpenDriverProc32(DRIVERPROC32 pfnDriverProc);
+  PWINE_ACMLOCALDRIVER pLocalDriver);
+void MSACM_RegisterAllDrivers();
+PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p);
+void MSACM_UnregisterAllDrivers();
+PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID);
+PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver);
+PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj);
+HDRVR MSACM_OpenDriverProc(DRIVERPROC pfnDriverProc);
 
 #endif  /* __WINE_MSACM_H */
 
diff --git a/include/msacmdrv.h b/include/msacmdrv.h
index 86dc34afb25..a756717291d 100644
--- a/include/msacmdrv.h
+++ b/include/msacmdrv.h
@@ -47,7 +47,7 @@
  * Structures
  */
 
-typedef struct _ACMDRVOPENDESC32A
+typedef struct _ACMDRVOPENDESCA
 {
   DWORD  cbStruct;
   FOURCC fccType;
@@ -58,9 +58,9 @@ typedef struct _ACMDRVOPENDESC32A
   LPCSTR pszSectionName;
   LPCSTR pszAliasName;
   DWORD  dnDevNode;
-} ACMDRVOPENDESC32A, *PACMDRVOPENDESC32A;
+} ACMDRVOPENDESCA, *PACMDRVOPENDESCA;
 
-typedef struct _ACMDRVOPENDESC32W
+typedef struct _ACMDRVOPENDESCW
 {
   DWORD   cbStruct;
   FOURCC  fccType;
@@ -71,7 +71,7 @@ typedef struct _ACMDRVOPENDESC32W
   LPCWSTR pszSectionName;
   LPCWSTR pszAliasName;
   DWORD   dnDevNode;
-} ACMDRVOPENDESC32W, *PACMDRVOPENDESC32W;
+} ACMDRVOPENDESCW, *PACMDRVOPENDESCW;
 
 typedef struct _ACMDRVOPENDESC16
 {
@@ -100,7 +100,7 @@ typedef struct _ACMDRVSTREAMINSTANCE16
   HACMSTREAM16     has;
 } ACMDRVSTREAMINSTANCE16, *NPACMDRVSTREAMINSTANCE16, *LPACMDRVSTREAMINSTANCE16;
 
-typedef struct _ACMDRVSTREAMINSTANCE32
+typedef struct _ACMDRVSTREAMINSTANCE
 {
   DWORD           cbStruct;
   PWAVEFORMATEX   pwfxSrc;
@@ -111,8 +111,8 @@ typedef struct _ACMDRVSTREAMINSTANCE32
   DWORD           fdwOpen;
   DWORD           fdwDriver;
   DWORD           dwDriver;
-  HACMSTREAM32    has;
-} ACMDRVSTREAMINSTANCE32, *PACMDRVSTREAMINSTANCE32;
+  HACMSTREAM    has;
+} ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE;
 
 
 typedef struct _ACMDRVSTREAMHEADER16 *LPACMDRVSTREAMHEADER16;
@@ -143,8 +143,8 @@ typedef struct _ACMDRVSTREAMHEADER16 {
   DWORD  cbPreparedDstLength;
 } ACMDRVSTREAMHEADER16, *NPACMDRVSTREAMHEADER16;
 
-typedef struct _ACMDRVSTREAMHEADER32 *PACMDRVSTREAMHEADER32;
-typedef struct _ACMDRVSTREAMHEADER32 {
+typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER;
+typedef struct _ACMDRVSTREAMHEADER {
   DWORD  cbStruct;
   DWORD  fdwStatus;
   DWORD  dwUser;
@@ -158,7 +158,7 @@ typedef struct _ACMDRVSTREAMHEADER32 {
   DWORD  dwDstUser;
 
   DWORD fdwConvert;
-  PACMDRVSTREAMHEADER32 *padshNext;
+  PACMDRVSTREAMHEADER *padshNext;
   DWORD fdwDriver;
   DWORD dwDriver;
 
@@ -169,7 +169,7 @@ typedef struct _ACMDRVSTREAMHEADER32 {
   DWORD  cbPreparedSrcLength;
   LPBYTE pbPreparedDst;
   DWORD  cbPreparedDstLength;
-} ACMDRVSTREAMHEADER32;
+} ACMDRVSTREAMHEADER;
 
 typedef struct _ACMDRVSTREAMSIZE
 {
@@ -178,7 +178,7 @@ typedef struct _ACMDRVSTREAMSIZE
   DWORD cbSrcLength;
   DWORD cbDstLength;
 } ACMDRVSTREAMSIZE16, *NPACMDRVSTREAMSIZE16, *LPACMDRVSTREAMSIZE16,
-  ACMDRVSTREAMSIZE32, *PACMDRVSTREAMSIZE;
+  ACMDRVSTREAMSIZE, *PACMDRVSTREAMSIZE;
 
 typedef struct _ACMDRVFORMATSUGGEST16
 {
@@ -190,7 +190,7 @@ typedef struct _ACMDRVFORMATSUGGEST16
   DWORD            cbwfxDst;
 } ACMDRVFORMATSUGGEST16, *NPACMDRVFORMATSUGGEST, *LPACMDRVFORMATSUGGEST;
 
-typedef struct _ACMDRVFORMATSUGGEST32
+typedef struct _ACMDRVFORMATSUGGEST
 {
   DWORD           cbStruct;
   DWORD           fdwSuggest;
@@ -198,6 +198,6 @@ typedef struct _ACMDRVFORMATSUGGEST32
   DWORD           cbwfxSrc;
   PWAVEFORMATEX   pwfxDst;
   DWORD           cbwfxDst;
-} ACMDRVFORMATSUGGEST32, *PACMDRVFORMATSUGGEST32;
+} ACMDRVFORMATSUGGEST, *PACMDRVFORMATSUGGEST;
 
 #endif  /* __WINE_MSACMDRV_H */
diff --git a/include/multimedia.h b/include/multimedia.h
index feebfd7c831..b8245fdec84 100644
--- a/include/multimedia.h
+++ b/include/multimedia.h
@@ -50,35 +50,35 @@ struct WINE_MCIDRIVER {
 };
 
 /* function prototypes */
-extern BOOL32 MULTIMEDIA_Init(void);
+extern BOOL MULTIMEDIA_Init(void);
 
 extern int    		MCI_DevIDToIndex(UINT16 wDevID);
 extern UINT16 		MCI_FirstDevID(void);
 extern UINT16 		MCI_NextDevID(UINT16 wDevID);
-extern BOOL32 		MCI_DevIDValid(UINT16 wDevID);
+extern BOOL 		MCI_DevIDValid(UINT16 wDevID);
 
 extern int		MCI_MapMsg16To32A(WORD uDevType, WORD wMsg, DWORD* lParam);
 extern int		MCI_UnMapMsg16To32A(WORD uDevTyp, WORD wMsg, DWORD lParam);
 
 typedef LONG		(*MCIPROC16)(DWORD, HDRVR16,  WORD, DWORD, DWORD);
-typedef LONG		(*MCIPROC32)(DWORD, HDRVR16, DWORD, DWORD, DWORD);
+typedef LONG		(*MCIPROC)(DWORD, HDRVR16, DWORD, DWORD, DWORD);
 
-extern MCIPROC32	MCI_GetProc32(UINT16 uDevType);
+extern MCIPROC	MCI_GetProc(UINT16 uDevType);
 extern WORD		   MCI_GetDevType(LPCSTR str);
 extern DWORD		MCI_WriteString(LPSTR lpDstStr, DWORD dstSize, LPCSTR lpSrcStr);
 extern const char* MCI_CommandToString(UINT16 wMsg);
 
 
-extern DWORD MCI_SendCommand32(UINT32 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2);
-extern DWORD MCI_SendCommandAsync32(UINT32 wDevID, UINT32 wMsg, DWORD dwParam1, DWORD dwParam2, UINT32 size);
+extern DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2);
+extern DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2, UINT size);
 
-LONG MCIWAVE_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG MCIWAVE_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 			  DWORD dwParam1, DWORD dwParam2);
-LONG MCIMIDI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG MCIMIDI_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 			  DWORD dwParam1, DWORD dwParam2);
-LONG MCICDAUDIO_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG MCICDAUDIO_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 			     DWORD dwParam1, DWORD dwParam2);
-LONG MCIANIM_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG MCIANIM_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 			  DWORD dwParam1, DWORD dwParam2);
 LONG MCIAVI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 			  DWORD dwParam1, DWORD dwParam2);
diff --git a/include/nonclient.h b/include/nonclient.h
index 7a3b04dfcd9..8e82b531c12 100644
--- a/include/nonclient.h
+++ b/include/nonclient.h
@@ -9,16 +9,16 @@
 
 #include "win.h"
 
-extern LONG   NC_HandleNCPaint( HWND32 hwnd , HRGN32 clip);
+extern LONG   NC_HandleNCPaint( HWND hwnd , HRGN clip);
 extern LONG   NC_HandleNCActivate( WND *pwnd, WPARAM16 wParam );
-extern LONG   NC_HandleNCCalcSize( WND *pWnd, RECT32 *winRect );
-extern LONG   NC_HandleNCHitTest( HWND32 hwnd, POINT16 pt );
+extern LONG   NC_HandleNCCalcSize( WND *pWnd, RECT *winRect );
+extern LONG   NC_HandleNCHitTest( HWND hwnd, POINT16 pt );
 extern LONG   NC_HandleNCLButtonDown( WND* pWnd, WPARAM16 wParam, LPARAM lParam );
 extern LONG   NC_HandleNCLButtonDblClk( WND *pWnd, WPARAM16 wParam, LPARAM lParam);
-extern LONG   NC_HandleSysCommand( HWND32 hwnd, WPARAM16 wParam, POINT16 pt );
-extern LONG   NC_HandleSetCursor( HWND32 hwnd, WPARAM16 wParam, LPARAM lParam );
-extern void   NC_DrawSysButton( HWND32 hwnd, HDC32 hdc, BOOL32 down );
-extern BOOL32 NC_DrawSysButton95( HWND32 hwnd, HDC32 hdc, BOOL32 down );
-extern BOOL32 NC_GetSysPopupPos( WND* wndPtr, RECT32* rect );
+extern LONG   NC_HandleSysCommand( HWND hwnd, WPARAM16 wParam, POINT16 pt );
+extern LONG   NC_HandleSetCursor( HWND hwnd, WPARAM16 wParam, LPARAM lParam );
+extern void   NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down );
+extern BOOL NC_DrawSysButton95( HWND hwnd, HDC hdc, BOOL down );
+extern BOOL NC_GetSysPopupPos( WND* wndPtr, RECT* rect );
 
 #endif /* __WINE_NONCLIENT_H */
diff --git a/include/ntddk.h b/include/ntddk.h
index 02eae9b9b9c..186a5e19377 100644
--- a/include/ntddk.h
+++ b/include/ntddk.h
@@ -317,8 +317,8 @@ DWORD WINAPI RtlUnicodeStringToOemString(PANSI_STRING oem,PUNICODE_STRING uni,BO
 DWORD WINAPI RtlUnicodeStringToAnsiString(PANSI_STRING oem,PUNICODE_STRING uni,BOOLEAN alloc);
 DWORD WINAPI RtlEqualUnicodeString(PUNICODE_STRING s1,PUNICODE_STRING s2,DWORD x);
 DWORD WINAPI RtlUpcaseUnicodeString(PUNICODE_STRING dest,PUNICODE_STRING src,BOOLEAN doalloc);
-UINT32 WINAPI RtlxOemStringToUnicodeSize(PSTRING str);
-UINT32 WINAPI RtlxAnsiStringToUnicodeSize(PANSI_STRING str);
+UINT WINAPI RtlxOemStringToUnicodeSize(PSTRING str);
+UINT WINAPI RtlxAnsiStringToUnicodeSize(PANSI_STRING str);
 DWORD WINAPI RtlIsTextUnicode(LPVOID buf, DWORD len, DWORD *pf);
 NTSTATUS WINAPI RtlCompareUnicodeString(PUNICODE_STRING String1, PUNICODE_STRING String2, BOOLEAN CaseInSensitive);
 
@@ -351,8 +351,8 @@ LPVOID WINAPI RtlNormalizeProcessParams(LPVOID x);
 DWORD WINAPI RtlNtStatusToDosError(DWORD error);
 BOOLEAN WINAPI RtlGetNtProductType(LPDWORD type);
 DWORD WINAPI RtlTimeToElapsedTimeFields( DWORD x1, DWORD x2 );
-INT32 WINAPI RtlExtendedLargeIntegerDivide(LARGE_INTEGER dividend, DWORD divisor, LPDWORD rest);
-LARGE_INTEGER WINAPI RtlExtendedIntegerMultiply(LARGE_INTEGER factor1,INT32 factor2);
+INT WINAPI RtlExtendedLargeIntegerDivide(LARGE_INTEGER dividend, DWORD divisor, LPDWORD rest);
+LARGE_INTEGER WINAPI RtlExtendedIntegerMultiply(LARGE_INTEGER factor1,INT factor2);
 DWORD WINAPI RtlFormatCurrentUserKeyPath(DWORD x);
 DWORD WINAPI RtlOpenCurrentUser(DWORD x1, DWORD *x2);
 BOOLEAN WINAPI RtlDosPathNameToNtPathName_U( LPWSTR from,PUNICODE_STRING us,DWORD x2,DWORD x3);
diff --git a/include/ntdef.h b/include/ntdef.h
index 059267c45d9..4de6fff4e09 100644
--- a/include/ntdef.h
+++ b/include/ntdef.h
@@ -52,7 +52,7 @@ typedef struct _UNICODE_STRING {
 
 typedef struct _OBJECT_ATTRIBUTES 
 {   ULONG Length;
-    HANDLE32 RootDirectory;
+    HANDLE RootDirectory;
     PUNICODE_STRING ObjectName;
     ULONG Attributes;
     PVOID SecurityDescriptor;        /* type SECURITY_DESCRIPTOR */
diff --git a/include/ntdll.h b/include/ntdll.h
index 6aff6d8a384..abebb826b5d 100644
--- a/include/ntdll.h
+++ b/include/ntdll.h
@@ -94,12 +94,12 @@ typedef enum tagSID_NAME_USE {
 
 typedef struct _RTL_RWLOCK {
 	CRITICAL_SECTION	rtlCS;
-	HANDLE32		hSharedReleaseSemaphore;
-	UINT32			uSharedWaiters;
-	HANDLE32		hExclusiveReleaseSemaphore;
-	UINT32			uExclusiveWaiters;
-	INT32			iNumberActive;
-	HANDLE32		hOwningThreadId;
+	HANDLE		hSharedReleaseSemaphore;
+	UINT			uSharedWaiters;
+	HANDLE		hExclusiveReleaseSemaphore;
+	UINT			uExclusiveWaiters;
+	INT			iNumberActive;
+	HANDLE		hOwningThreadId;
 	DWORD			dwTimeoutBoost;
 	PVOID			pDebugInfo;
 } RTL_RWLOCK, *LPRTL_RWLOCK;
@@ -111,27 +111,26 @@ BYTE   WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK, BYTE fWait);
 VOID   WINAPI RtlReleaseResource(LPRTL_RWLOCK);
 VOID   WINAPI RtlDumpResource(LPRTL_RWLOCK);
 
-BOOL32 WINAPI IsValidSid(PSID);
-BOOL32 WINAPI EqualSid(PSID,PSID);
-BOOL32 WINAPI EqualPrefixSid(PSID,PSID);
+BOOL WINAPI IsValidSid(PSID);
+BOOL WINAPI EqualSid(PSID,PSID);
+BOOL WINAPI EqualPrefixSid(PSID,PSID);
 DWORD  WINAPI GetSidLengthRequired(BYTE);
-BOOL32 WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,
+BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,
                                        DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,
                                        DWORD,PSID*);
 VOID*  WINAPI FreeSid(PSID);
-BOOL32 WINAPI InitializeSecurityDescriptor(SECURITY_DESCRIPTOR*,DWORD);
-BOOL32 WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE);
+BOOL WINAPI InitializeSecurityDescriptor(SECURITY_DESCRIPTOR*,DWORD);
+BOOL WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE);
 DWORD* WINAPI GetSidSubAuthority(PSID,DWORD);
 BYTE * WINAPI GetSidSubAuthorityCount(PSID);
 DWORD  WINAPI GetLengthSid(PSID);
-BOOL32 WINAPI CopySid(DWORD,PSID,PSID);
-BOOL32 WINAPI LookupAccountSid32A(LPCSTR,PSID,LPCSTR,LPDWORD,LPCSTR,LPDWORD,
+BOOL WINAPI CopySid(DWORD,PSID,PSID);
+BOOL WINAPI LookupAccountSidA(LPCSTR,PSID,LPCSTR,LPDWORD,LPCSTR,LPDWORD,
                                   PSID_NAME_USE);
-BOOL32 WINAPI LookupAccountSid32W(LPCWSTR,PSID,LPCWSTR,LPDWORD,LPCWSTR,LPDWORD,
+BOOL WINAPI LookupAccountSidW(LPCWSTR,PSID,LPCWSTR,LPDWORD,LPCWSTR,LPDWORD,
                                   PSID_NAME_USE);
 PSID_IDENTIFIER_AUTHORITY WINAPI GetSidIdentifierAuthority(PSID);
-INT32       WINAPI AccessResource32(HMODULE32,HRSRC32);
-#define     AccessResource WINELIB_NAME(AccessResource)
+INT       WINAPI AccessResource(HMODULE,HRSRC);
 
 #ifdef __cplusplus
 }
diff --git a/include/ole.h b/include/ole.h
index 06a2ce58a1a..a007d89936a 100644
--- a/include/ole.h
+++ b/include/ole.h
@@ -16,8 +16,7 @@
 
 
 #define OLESTR16(x) x
-#define OLESTR32(x) L##x	/* probably wrong */
-#define OLESTR WINELIB_NAME(OLESTR)
+#define OLESTR(x) L##x	/* probably wrong */
 
 /* object types */
 #define OT_LINK		1
@@ -274,7 +273,7 @@ OLESTATUS WINAPI OleRevokeServer16(LHSERVER);
 
 /* com functions */
 void WINAPI CoFreeUnusedLibraries(void);
-HINSTANCE32 WINAPI CoLoadLibrary(LPSTR lpszLibName, BOOL32 bAutoFree);
+HINSTANCE WINAPI CoLoadLibrary(LPSTR lpszLibName, BOOL bAutoFree);
 void WINAPI CoFreeUnusedLibraries(void);
 void WINAPI CoFreeAllLibraries(void);
 
diff --git a/include/ole2.h b/include/ole2.h
index 17541304b44..c9ecc1de793 100644
--- a/include/ole2.h
+++ b/include/ole2.h
@@ -17,21 +17,18 @@
  * API declarations
  */
 HRESULT     WINAPI RegisterDragDrop16(HWND16,LPDROPTARGET);
-HRESULT     WINAPI RegisterDragDrop32(HWND32,LPDROPTARGET);
-#define     RegisterDragDrop WINELIB_NAME(RegisterDragDrop)
+HRESULT     WINAPI RegisterDragDrop(HWND,LPDROPTARGET);
 HRESULT     WINAPI RevokeDragDrop16(HWND16);
-HRESULT     WINAPI RevokeDragDrop32(HWND32);
-#define     RevokeDragDrop WINELIB_NAME(RevokeDragDrop)
+HRESULT     WINAPI RevokeDragDrop(HWND);
 HRESULT     WINAPI DoDragDrop16(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
-HRESULT     WINAPI DoDragDrop32(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
-#define     DoDragDrop WINELIB_NAME(DoDragDrop)
-
-HOLEMENU32  WINAPI OleCreateMenuDescriptor(HMENU32              hmenuCombined,
-					   LPOLEMENUGROUPWIDTHS32 lpMenuWidths);
-void        WINAPI OleDestroyMenuDescriptor(HOLEMENU32 hmenuDescriptor);
-HRESULT     WINAPI OleSetMenuDescriptor(HOLEMENU32               hmenuDescriptor,
-					HWND32                   hwndFrame,
-					HWND32                   hwndActiveObject,
+HRESULT     WINAPI DoDragDrop(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
+
+HOLEMENU  WINAPI OleCreateMenuDescriptor(HMENU              hmenuCombined,
+					   LPOLEMENUGROUPWIDTHS lpMenuWidths);
+void        WINAPI OleDestroyMenuDescriptor(HOLEMENU hmenuDescriptor);
+HRESULT     WINAPI OleSetMenuDescriptor(HOLEMENU               hmenuDescriptor,
+					HWND                   hwndFrame,
+					HWND                   hwndActiveObject,
 					LPOLEINPLACEFRAME        lpFrame,
 					LPOLEINPLACEACTIVEOBJECT lpActiveObject);
 
diff --git a/include/oleauto.h b/include/oleauto.h
index 69d755b71f7..440d1392cd2 100644
--- a/include/oleauto.h
+++ b/include/oleauto.h
@@ -10,111 +10,84 @@ extern "C" {
 #include "oaidl.h"
 
 BSTR16 WINAPI SysAllocString16(LPOLESTR16);
-BSTR32 WINAPI SysAllocString32(LPOLESTR32);
-#define SysAllocString WINELIB_NAME(SysAllocString)
+BSTR WINAPI SysAllocString(LPOLESTR);
 INT16 WINAPI SysReAllocString16(LPBSTR16,LPOLESTR16);
-INT32 WINAPI SysReAllocString32(LPBSTR32,LPOLESTR32);
-#define SysReAllocString WINELIB_NAME(SysReAllocString)
+INT WINAPI SysReAllocString(LPBSTR,LPOLESTR);
 VOID WINAPI SysFreeString16(BSTR16);
-VOID WINAPI SysFreeString32(BSTR32);
-#define SysFreeString WINELIB_NAME(SysFreeString)
+VOID WINAPI SysFreeString(BSTR);
 BSTR16 WINAPI SysAllocStringLen16(char*, int);
-BSTR32 WINAPI SysAllocStringLen32(WCHAR*, int);
-#define SysAllocStringLen WINELIB_NAME(SysAllocStringLen)
+BSTR WINAPI SysAllocStringLen(WCHAR*, int);
 int WINAPI SysReAllocStringLen16(BSTR16*, char*,  int);
-int WINAPI SysReAllocStringLen32(BSTR32*, WCHAR*, int);
-#define SysReAllocStringLen WINELIB_NAME(SysReAllocStringLen)
+int WINAPI SysReAllocStringLen(BSTR*, WCHAR*, int);
 int WINAPI SysStringLen16(BSTR16);
-int WINAPI SysStringLen32(BSTR32);
-#define SysStringLen WINELIB_NAME(SysStringLen)
+int WINAPI SysStringLen(BSTR);
 
 /*****************************************************************
  *  SafeArray API
  */
 
 HRESULT WINAPI
-SafeArrayAllocDescriptor32(UINT32 cDims, SAFEARRAY **ppsaOut);
-#define SafeArrayAllocDescriptor WINELIB_NAME(SafeArrayAllocDescriptor)
+SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut);
 
 HRESULT WINAPI 
-SafeArrayAllocData32(SAFEARRAY *psa);
-#define SafeArrayAllocData WINELIB_NAME(SafeArrayAllocData)
+SafeArrayAllocData(SAFEARRAY *psa);
 
 SAFEARRAY* WINAPI 
-SafeArrayCreate32(VARTYPE vt, UINT32 cDims, SAFEARRAYBOUND *rgsabound);
-#define SafeArrayCreate WINELIB_NAME(SafeArrayCreate)
+SafeArrayCreate(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsabound);
 
 HRESULT WINAPI 
-SafeArrayDestroyDescriptor32(SAFEARRAY *psa);
-#define SafeArrayDestroyDescriptor WINELIB_NAME(SafeArrayDestroyDescriptor)
+SafeArrayDestroyDescriptor(SAFEARRAY *psa);
 
 HRESULT WINAPI 
-SafeArrayPutElement32(SAFEARRAY *psa, LONG *rgIndices, void *pv);
-#define SafeArrayPutElement WINELIB_NAME(SafeArrayPutElement)
+SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pv);
 
 HRESULT WINAPI 
-SafeArrayGetElement32(SAFEARRAY *psa, LONG *rgIndices, void *pv);
-#define SafeArrayGetElement WINELIB_NAME(SafeArrayGetElement)
+SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pv);
 
 HRESULT WINAPI 
-SafeArrayLock32(SAFEARRAY *psa);
-#define SafeArrayLock WINELIB_NAME(SafeArrayLock)
+SafeArrayLock(SAFEARRAY *psa);
 
 HRESULT WINAPI 
-SafeArrayUnlock32(SAFEARRAY *psa);
-#define SafeArrayUnlock WINELIB_NAME(SafeArrayUnlock)
+SafeArrayUnlock(SAFEARRAY *psa);
 
 HRESULT WINAPI 
-SafeArrayGetUBound32(SAFEARRAY *psa, UINT32 nDim, LONG *plUbound);
-#define SafeArrayGetUBound WINELIB_NAME(SafeArrayGetUBound)
+SafeArrayGetUBound(SAFEARRAY *psa, UINT nDim, LONG *plUbound);
 
 HRESULT WINAPI 
-SafeArrayGetLBound32(SAFEARRAY *psa, UINT32 nDim, LONG *plLbound);
-#define SafeArrayGetLBound WINELIB_NAME(SafeArrayGetLBound)
+SafeArrayGetLBound(SAFEARRAY *psa, UINT nDim, LONG *plLbound);
 
-UINT32  WINAPI 
-SafeArrayGetDim32(SAFEARRAY *psa);
-#define SafeArrayGetDim WINELIB_NAME(SafeArrayGetDim)
+UINT  WINAPI 
+SafeArrayGetDim(SAFEARRAY *psa);
 
-UINT32  WINAPI 
-SafeArrayGetElemsize32(SAFEARRAY *psa);
-#define SafeArrayGetElemsize WINELIB_NAME(SafeArrayGetElemsize)
+UINT  WINAPI 
+SafeArrayGetElemsize(SAFEARRAY *psa);
 
 HRESULT WINAPI 
-SafeArrayAccessData32(SAFEARRAY *psa, void **ppvData);
-#define SafeArrayAccessData WINELIB_NAME(SafeArrayAccessData)
+SafeArrayAccessData(SAFEARRAY *psa, void **ppvData);
 
 HRESULT WINAPI 
-SafeArrayUnaccessData32(SAFEARRAY *psa);
-#define SafeArrayUnaccessData WINELIB_NAME(SafeArrayUnaccessData)
+SafeArrayUnaccessData(SAFEARRAY *psa);
 
 HRESULT WINAPI 
-SafeArrayPtrOfIndex32(SAFEARRAY *psa, LONG *rgIndices, void **ppvData);
-#define SafeArrayPtrOfIndex WINELIB_NAME(SafeArrayPtrOfIndex)
+SafeArrayPtrOfIndex(SAFEARRAY *psa, LONG *rgIndices, void **ppvData);
 
 HRESULT WINAPI 
-SafeArrayCopyData32(SAFEARRAY *psaSource, SAFEARRAY **psaTarget);
-#define SafeArrayCopyData WINELIB_NAME(SafeArrayCopyData)
+SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY **psaTarget);
 
 HRESULT WINAPI 
-SafeArrayDestroyData32(SAFEARRAY *psa);
-#define SafeArrayDestroyData WINELIB_NAME(SafeArrayDestroyData)
+SafeArrayDestroyData(SAFEARRAY *psa);
 
 HRESULT WINAPI 
-SafeArrayDestroy32(SAFEARRAY *psa);
-#define SafeArrayDestroy WINELIB_NAME(SafeArrayDestroy)
+SafeArrayDestroy(SAFEARRAY *psa);
 
 HRESULT WINAPI 
-SafeArrayCopy32(SAFEARRAY *psa, SAFEARRAY **ppsaOut);
-#define SafeArrayCopy WINELIB_NAME(SafeArrayCopy)
+SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut);
 
 SAFEARRAY* WINAPI
-SafeArrayCreateVector32(VARTYPE vt, LONG lLbound, ULONG cElements);
-#define SafeArrayCreateVector WINELIB_NAME(SafeArrayCreateVector)
+SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements);
 
 HRESULT WINAPI 
-SafeArrayRedim32(SAFEARRAY *psa, SAFEARRAYBOUND *psaboundNew);
-#define SafeArrayRedim WINELIB_NAME(SafeArrayRedim)
+SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psaboundNew);
 
 
 /* These are macros that help accessing the VARIANT date type.
@@ -172,20 +145,14 @@ SafeArrayRedim32(SAFEARRAY *psa, SAFEARRAYBOUND *psaboundNew);
  * VARIANT API
  */
 
-void WINAPI VariantInit32(VARIANTARG* pvarg);
-#define VariantInit WINELIB_NAME(VariantInit)
-HRESULT WINAPI VariantClear32(VARIANTARG* pvarg);
-#define VariantClear WINELIB_NAME(VariantClear)
-HRESULT WINAPI VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc);
-#define VariantCopy WINELIB_NAME(VariantCopy)
-HRESULT WINAPI VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc);
-#define VariantCopyInd WINELIB_NAME(VariantCopyInd)
-HRESULT WINAPI VariantChangeType32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
+void WINAPI VariantInit(VARIANTARG* pvarg);
+HRESULT WINAPI VariantClear(VARIANTARG* pvarg);
+HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc);
+HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc);
+HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 						  USHORT wFlags, VARTYPE vt);
-#define VariantChangeType WINELIB_NAME(VariantChangeType)
-HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
+HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 							LCID lcid, USHORT wFlags, VARTYPE vt);
-#define VariantChangeTypeEx WINELIB_NAME(VariantChangeTypeEx)
 
 /*
  * These flags are used for the VariantChangeType and VariantChangeTypeEx APIs.
@@ -221,379 +188,210 @@ HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc
 #define VAR_DATEVALUEONLY	((DWORD)0x00000002)
 
 
-HRESULT WINAPI VarUI1FromI232(short sIn, BYTE* pbOut);
-#define VarUI1FromI2 WINELIB_NAME(VarUI1FromI2)
-HRESULT WINAPI VarUI1FromI432(LONG lIn, BYTE* pbOut);
-#define VarUI1FromI4 WINELIB_NAME(VarUI1FromI4)
-HRESULT WINAPI VarUI1FromR432(FLOAT fltIn, BYTE* pbOut);
-#define VarUI1FromR4 WINELIB_NAME(VarUI1FromR4)
-HRESULT WINAPI VarUI1FromR832(double dblIn, BYTE* pbOut);
-#define VarUI1FromR8 WINELIB_NAME(VarUI1FromR8)
-HRESULT WINAPI VarUI1FromDate32(DATE dateIn, BYTE* pbOut);
-#define VarUI1FromDate WINELIB_NAME(VarUI1FromDate)
-HRESULT WINAPI VarUI1FromBool32(VARIANT_BOOL boolIn, BYTE* pbOut);
-#define VarUI1FromBool WINELIB_NAME(VarUI1FromBool)
-HRESULT WINAPI VarUI1FromI132(CHAR cIn, BYTE*pbOut);
-#define VarUI1FromI1 WINELIB_NAME(VarUI1FromI1)
-HRESULT WINAPI VarUI1FromUI232(USHORT uiIn, BYTE*pbOut);
-#define VarUI1FromUI2 WINELIB_NAME(VarUI1FromUI2)
-HRESULT WINAPI VarUI1FromUI432(ULONG ulIn, BYTE*pbOut);
-#define VarUI1FromUI4 WINELIB_NAME(VarUI1FromUI4)
-HRESULT WINAPI VarUI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut);
-#define VarUI1FromStr WINELIB_NAME(VarUI1FromStr)
-HRESULT WINAPI VarUI1FromCy32(CY cyIn, BYTE* pbOut);
-#define VarUI1FromCy WINELIB_NAME(VarUI1FromCy)
+HRESULT WINAPI VarUI1FromI2(short sIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromI4(LONG lIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromR4(FLOAT fltIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromR8(double dblIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromDate(DATE dateIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromBool(VARIANT_BOOL boolIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromI1(CHAR cIn, BYTE*pbOut);
+HRESULT WINAPI VarUI1FromUI2(USHORT uiIn, BYTE*pbOut);
+HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE*pbOut);
+HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromCy(CY cyIn, BYTE* pbOut);
 
 /*
 HRESULT WINAPI VarUI1FromDec32(DECIMAL*pdecIn, BYTE*pbOut);
-#define VarUI1FromDec WINELIB_NAME(VarUI1FromDec)
 HRESULT WINAPI VarUI1FromDisp32(IDispatch* pdispIn, LCID lcid, BYTE* pbOut);
-#define VarUI1FromDisp WINELIB_NAME(VarUI1FromDisp)
 */
 
-HRESULT WINAPI VarI2FromUI132(BYTE bIn, short* psOut);
-#define VarI2FromUI1 WINELIB_NAME(VarI2FromUI1)
-HRESULT WINAPI VarI2FromI432(LONG lIn, short* psOut);
-#define VarI2FromI4 WINELIB_NAME(VarI2FromI4)
-HRESULT WINAPI VarI2FromR432(FLOAT fltIn, short* psOut);
-#define VarI2FromR4 WINELIB_NAME(VarI2FromR4)
-HRESULT WINAPI VarI2FromR832(double dblIn, short* psOut);
-#define VarI2FromR8 WINELIB_NAME(VarI2FromR8)
-HRESULT WINAPI VarI2FromDate32(DATE dateIn, short* psOut);
-#define VarI2FromDate WINELIB_NAME(VarI2FromDate)
-HRESULT WINAPI VarI2FromBool32(VARIANT_BOOL boolIn, short* psOut);
-#define VarI2FromBool WINELIB_NAME(VarI2FromBool)
-HRESULT WINAPI VarI2FromI132(CHAR cIn, short*psOut);
-#define VarI2FromI1 WINELIB_NAME(VarI2FromI1)
-HRESULT WINAPI VarI2FromUI232(USHORT uiIn, short*psOut);
-#define VarI2FromUI2 WINELIB_NAME(VarI2FromUI2)
-HRESULT WINAPI VarI2FromUI432(ULONG ulIn, short*psOut);
-#define VarI2FromUI4 WINELIB_NAME(VarI2FromUI4)
-HRESULT WINAPI VarI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, short* psOut);
-#define VarI2FromStr WINELIB_NAME(VarI2FromStr)
-HRESULT WINAPI VarI2FromCy32(CY cyIn, short* psOut);
-#define VarI2FromCy WINELIB_NAME(VarI2FromCy)
+HRESULT WINAPI VarI2FromUI1(BYTE bIn, short* psOut);
+HRESULT WINAPI VarI2FromI4(LONG lIn, short* psOut);
+HRESULT WINAPI VarI2FromR4(FLOAT fltIn, short* psOut);
+HRESULT WINAPI VarI2FromR8(double dblIn, short* psOut);
+HRESULT WINAPI VarI2FromDate(DATE dateIn, short* psOut);
+HRESULT WINAPI VarI2FromBool(VARIANT_BOOL boolIn, short* psOut);
+HRESULT WINAPI VarI2FromI1(CHAR cIn, short*psOut);
+HRESULT WINAPI VarI2FromUI2(USHORT uiIn, short*psOut);
+HRESULT WINAPI VarI2FromUI4(ULONG ulIn, short*psOut);
+HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, short* psOut);
+HRESULT WINAPI VarI2FromCy(CY cyIn, short* psOut);
 /*
 HRESULT WINAPI VarI2FromDec32(DECIMAL*pdecIn, short*psOut);
-#define VarI2FromDec WINELIB_NAME(VarI2FromDec)
 HRESULT WINAPI VarI2FromDisp32(IDispatch* pdispIn, LCID lcid, short* psOut);
-#define VarI2FromDisp WINELIB_NAME(VarI2FromDisp)
 */
 
-HRESULT WINAPI VarI4FromUI132(BYTE bIn, LONG* plOut);
-#define VarI4FromUI1 WINELIB_NAME(VarI4FromUI1)
-HRESULT WINAPI VarI4FromI232(short sIn, LONG* plOut);
-#define VarI4FromI2 WINELIB_NAME(VarI4FromI2)
-HRESULT WINAPI VarI4FromR432(FLOAT fltIn, LONG* plOut);
-#define VarI4FromR4 WINELIB_NAME(VarI4FromR4)
-HRESULT WINAPI VarI4FromR832(double dblIn, LONG* plOut);
-#define VarI4FromR8 WINELIB_NAME(VarI4FromR8)
-HRESULT WINAPI VarI4FromDate32(DATE dateIn, LONG* plOut);
-#define VarI4FromDate WINELIB_NAME(VarI4FromDate)
-HRESULT WINAPI VarI4FromBool32(VARIANT_BOOL boolIn, LONG* plOut);
-#define VarI4FromBool WINELIB_NAME(VarI4FromBool)
-HRESULT WINAPI VarI4FromI132(CHAR cIn, LONG* plOut);
-#define VarI4FromI1 WINELIB_NAME(VarI4FromI1)
-HRESULT WINAPI VarI4FromUI232(USHORT uiIn, LONG*plOut);
-#define VarI4FromUI2 WINELIB_NAME(VarI4FromUI2)
-HRESULT WINAPI VarI4FromUI432(ULONG ulIn, LONG*plOut);
-#define VarI4FromUI4 WINELIB_NAME(VarI4FromUI4)
-HRESULT WINAPI VarI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, LONG* plOut);
-#define VarI4FromStr WINELIB_NAME(VarI4FromStr)
-HRESULT WINAPI VarI4FromCy32(CY cyIn, LONG* plOut);
-#define VarI4FromCy WINELIB_NAME(VarI4FromCy)
+HRESULT WINAPI VarI4FromUI1(BYTE bIn, LONG* plOut);
+HRESULT WINAPI VarI4FromI2(short sIn, LONG* plOut);
+HRESULT WINAPI VarI4FromR4(FLOAT fltIn, LONG* plOut);
+HRESULT WINAPI VarI4FromR8(double dblIn, LONG* plOut);
+HRESULT WINAPI VarI4FromDate(DATE dateIn, LONG* plOut);
+HRESULT WINAPI VarI4FromBool(VARIANT_BOOL boolIn, LONG* plOut);
+HRESULT WINAPI VarI4FromI1(CHAR cIn, LONG* plOut);
+HRESULT WINAPI VarI4FromUI2(USHORT uiIn, LONG*plOut);
+HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG*plOut);
+HRESULT WINAPI VarI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG* plOut);
+HRESULT WINAPI VarI4FromCy(CY cyIn, LONG* plOut);
 /*
 HRESULT WINAPI VarI4FromDec32(DECIMAL*pdecIn, LONG*plOut);
-#define VarI4FromDec WINELIB_NAME(VarI4FromDec)
 HRESULT WINAPI VarI4FromDisp32(IDispatch* pdispIn, LCID lcid, LONG* plOut);
-#define VarI4FromDisp WINELIB_NAME(VarI4FromDisp)
 */
 
-HRESULT WINAPI VarR4FromUI132(BYTE bIn, FLOAT* pfltOut);
-#define VarR4FromUI1 WINELIB_NAME(VarR4FromUI1)
-HRESULT WINAPI VarR4FromI232(short sIn, FLOAT* pfltOut);
-#define VarR4FromI2 WINELIB_NAME(VarR4FromI2)
-HRESULT WINAPI VarR4FromI432(LONG lIn, FLOAT* pfltOut);
-#define VarR4FromI4 WINELIB_NAME(VarR4FromI4)
-HRESULT WINAPI VarR4FromR832(double dblIn, FLOAT* pfltOut);
-#define VarR4FromR8 WINELIB_NAME(VarR4FromR8)
-HRESULT WINAPI VarR4FromDate32(DATE dateIn, FLOAT* pfltOut);
-#define VarR4FromDate WINELIB_NAME(VarR4FromDate)
-HRESULT WINAPI VarR4FromBool32(VARIANT_BOOL boolIn, FLOAT* pfltOut);
-#define VarR4FromBool WINELIB_NAME(VarR4FromBool)
-HRESULT WINAPI VarR4FromI132(CHAR cIn, FLOAT*pfltOut);
-#define VarR4FromI1 WINELIB_NAME(VarR4FromI1)
-HRESULT WINAPI VarR4FromUI232(USHORT uiIn, FLOAT*pfltOut);
-#define VarR4FromUI2 WINELIB_NAME(VarR4FromUI2)
-HRESULT WINAPI VarR4FromUI432(ULONG ulIn, FLOAT*pfltOut);
-#define VarR4FromUI4 WINELIB_NAME(VarR4FromUI4)
-HRESULT WINAPI VarR4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, FLOAT*pfltOut);
-#define VarR4FromStr WINELIB_NAME(VarR4FromStr)
-HRESULT WINAPI VarR4FromCy32(CY cyIn, FLOAT* pfltOut);
-#define VarR4FromCy WINELIB_NAME(VarR4FromCy)
+HRESULT WINAPI VarR4FromUI1(BYTE bIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromI2(short sIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromI4(LONG lIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromR8(double dblIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromDate(DATE dateIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromBool(VARIANT_BOOL boolIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromI1(CHAR cIn, FLOAT*pfltOut);
+HRESULT WINAPI VarR4FromUI2(USHORT uiIn, FLOAT*pfltOut);
+HRESULT WINAPI VarR4FromUI4(ULONG ulIn, FLOAT*pfltOut);
+HRESULT WINAPI VarR4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, FLOAT*pfltOut);
+HRESULT WINAPI VarR4FromCy(CY cyIn, FLOAT* pfltOut);
 /*
 HRESULT WINAPI VarR4FromDec32(DECIMAL*pdecIn, FLOAT*pfltOut);
-#define VarR4FromDec WINELIB_NAME(VarR4FromDec)
 HRESULT WINAPI VarR4FromDisp32(IDispatch* pdispIn, LCID lcid, FLOAT* pfltOut);
-#define VarR4FromDisp WINELIB_NAME(VarR4FromDisp)
 */
 
-HRESULT WINAPI VarR8FromUI132(BYTE bIn, double* pdblOut);
-#define VarR8FromUI1 WINELIB_NAME(VarR8FromUI1)
-HRESULT WINAPI VarR8FromI232(short sIn, double* pdblOut);
-#define VarR8FromI2 WINELIB_NAME(VarR8FromI2)
-HRESULT WINAPI VarR8FromI432(LONG lIn, double* pdblOut);
-#define VarR8FromI4 WINELIB_NAME(VarR8FromI4)
-HRESULT WINAPI VarR8FromR432(FLOAT fltIn, double* pdblOut);
-#define VarR8FromR4 WINELIB_NAME(VarR8FromR4)
-HRESULT WINAPI VarR8FromDate32(DATE dateIn, double* pdblOut);
-#define VarR8FromDate WINELIB_NAME(VarR8FromDate)
-HRESULT WINAPI VarR8FromBool32(VARIANT_BOOL boolIn, double* pdblOut);
-#define VarR8FromBool WINELIB_NAME(VarR8FromBool)
-HRESULT WINAPI VarR8FromI132(CHAR cIn, double*pdblOut);
-#define VarR8FromI1 WINELIB_NAME(VarR8FromI1)
-HRESULT WINAPI VarR8FromUI232(USHORT uiIn, double*pdblOut);
-#define VarR8FromUI2 WINELIB_NAME(VarR8FromUI2)
-HRESULT WINAPI VarR8FromUI432(ULONG ulIn, double*pdblOut);
-#define VarR8FromUI4 WINELIB_NAME(VarR8FromUI4)
-HRESULT WINAPI VarR8FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, double*pdblOut);
-#define VarR8FromStr WINELIB_NAME(VarR8FromStr)
-HRESULT WINAPI VarR8FromCy32(CY cyIn, double* pdblOut);
-#define VarR8FromCy WINELIB_NAME(VarR8FromCy)
+HRESULT WINAPI VarR8FromUI1(BYTE bIn, double* pdblOut);
+HRESULT WINAPI VarR8FromI2(short sIn, double* pdblOut);
+HRESULT WINAPI VarR8FromI4(LONG lIn, double* pdblOut);
+HRESULT WINAPI VarR8FromR4(FLOAT fltIn, double* pdblOut);
+HRESULT WINAPI VarR8FromDate(DATE dateIn, double* pdblOut);
+HRESULT WINAPI VarR8FromBool(VARIANT_BOOL boolIn, double* pdblOut);
+HRESULT WINAPI VarR8FromI1(CHAR cIn, double*pdblOut);
+HRESULT WINAPI VarR8FromUI2(USHORT uiIn, double*pdblOut);
+HRESULT WINAPI VarR8FromUI4(ULONG ulIn, double*pdblOut);
+HRESULT WINAPI VarR8FromStr(OLECHAR*strIn, LCID lcid, ULONG dwFlags, double*pdblOut);
+HRESULT WINAPI VarR8FromCy(CY cyIn, double* pdblOut);
 /*
 HRESULT WINAPI VarR8FromDec32(DECIMAL*pdecIn, double*pdblOut);
-#define VarR8FromDec WINELIB_NAME(VarR8FromDec)
 HRESULT WINAPI VarR8FromDisp32(IDispatch* pdispIn, LCID lcid, double* pdblOut);
-#define VarR8FromDisp WINELIB_NAME(VarR8FromDisp)
 */
 
-HRESULT WINAPI VarDateFromUI132(BYTE bIn, DATE* pdateOut);
-#define VarDateFromUI1 WINELIB_NAME(VarDateFromUI1)
-HRESULT WINAPI VarDateFromI232(short sIn, DATE* pdateOut);
-#define VarDateFromI2 WINELIB_NAME(VarDateFromI2)
-HRESULT WINAPI VarDateFromI432(LONG lIn, DATE* pdateOut);
-#define VarDateFromI4 WINELIB_NAME(VarDateFromI4)
-HRESULT WINAPI VarDateFromR432(FLOAT fltIn, DATE* pdateOut);
-#define VarDateFromR4 WINELIB_NAME(VarDateFromR4)
-HRESULT WINAPI VarDateFromR832(double dblIn, DATE* pdateOut);
-#define VarDateFromR8 WINELIB_NAME(VarDateFromR8)
-HRESULT WINAPI VarDateFromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, DATE*pdateOut);
-#define VarDateFromStr WINELIB_NAME(VarDateFromStr)
-HRESULT WINAPI VarDateFromI132(CHAR cIn, DATE*pdateOut);
-#define VarDateFromI1 WINELIB_NAME(VarDateFromI1)
-HRESULT WINAPI VarDateFromUI232(USHORT uiIn, DATE*pdateOut);
-#define VarDateFromUI2 WINELIB_NAME(VarDateFromUI2)
-HRESULT WINAPI VarDateFromUI432(ULONG ulIn, DATE*pdateOut);
-#define VarDateFromUI4 WINELIB_NAME(VarDateFromUI4)
-HRESULT WINAPI VarDateFromBool32(VARIANT_BOOL boolIn, DATE* pdateOut);
-#define VarDateFromBool WINELIB_NAME(VarDateFromBool)
-HRESULT WINAPI VarDateFromCy32(CY cyIn, DATE* pdateOut);
-#define VarDateFromCy WINELIB_NAME(VarDateFromCy)
+HRESULT WINAPI VarDateFromUI1(BYTE bIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromI2(short sIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromI4(LONG lIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromR4(FLOAT fltIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromR8(double dblIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromStr(OLECHAR*strIn, LCID lcid, ULONG dwFlags, DATE*pdateOut);
+HRESULT WINAPI VarDateFromI1(CHAR cIn, DATE*pdateOut);
+HRESULT WINAPI VarDateFromUI2(USHORT uiIn, DATE*pdateOut);
+HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE*pdateOut);
+HRESULT WINAPI VarDateFromBool(VARIANT_BOOL boolIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromCy(CY cyIn, DATE* pdateOut);
 /*
 HRESULT WINAPI VarDateFromDec32(DECIMAL*pdecIn, DATE*pdateOut);
-#define VarDateFromDec WINELIB_NAME(VarDateFromDec)
 HRESULT WINAPI VarDateFromDisp32(IDispatch* pdispIn, LCID lcid, DATE* pdateOut);
-#define VarDateFromDisp WINELIB_NAME(VarDateFromDisp)
 */
-HRESULT WINAPI VarCyFromUI132(BYTE bIn, CY* pcyOut);
-#define VarCyFromUI1 WINELIB_NAME(VarCyFromUI1)
-HRESULT WINAPI VarCyFromI232(short sIn, CY* pcyOut);
-#define VarCyFromI2 WINELIB_NAME(VarCyFromI2)
-HRESULT WINAPI VarCyFromI432(LONG lIn, CY* pcyOut);
-#define VarCyFromI4 WINELIB_NAME(VarCyFromI4)
-HRESULT WINAPI VarCyFromR432(FLOAT fltIn, CY* pcyOut);
-#define VarCyFromR4 WINELIB_NAME(VarCyFromR4)
-HRESULT WINAPI VarCyFromR832(double dblIn, CY* pcyOut);
-#define VarCyFromR8 WINELIB_NAME(VarCyFromR8)
-HRESULT WINAPI VarCyFromDate32(DATE dateIn, CY* pcyOut);
-#define VarCyFromDate WINELIB_NAME(VarCyFromDate)
-HRESULT WINAPI VarCyFromBool32(VARIANT_BOOL boolIn, CY* pcyOut);
-#define VarCyFromBool WINELIB_NAME(VarCyFromBool)
-HRESULT WINAPI VarCyFromI132(CHAR cIn, CY*pcyOut);
-#define VarCyFromI1 WINELIB_NAME(VarCyFromI1)
-HRESULT WINAPI VarCyFromUI232(USHORT uiIn, CY*pcyOut);
-#define VarCyFromUI2 WINELIB_NAME(VarCyFromUI2)
-HRESULT WINAPI VarCyFromUI432(ULONG ulIn, CY*pcyOut);
-#define VarCyFromUI4 WINELIB_NAME(VarCyFromUI4)
+HRESULT WINAPI VarCyFromUI1(BYTE bIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromI2(short sIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromI4(LONG lIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromR4(FLOAT fltIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromR8(double dblIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromDate(DATE dateIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromBool(VARIANT_BOOL boolIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromI1(CHAR cIn, CY*pcyOut);
+HRESULT WINAPI VarCyFromUI2(USHORT uiIn, CY*pcyOut);
+HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY*pcyOut);
 /*
 HRESULT WINAPI VarCyFromDec32(DECIMAL*pdecIn, CY*pcyOut);
-#define VarCyFromDec WINELIB_NAME(VarCyFromDec)
 HRESULT WINAPI VarCyFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, CY* pcyOut);
-#define VarCyFromStr WINELIB_NAME(VarCyFromStr)
 HRESULT WINAPI VarCyFromDisp32(IDispatch* pdispIn, LCID lcid, CY* pcyOut);
-#define VarCyFromDisp WINELIB_NAME(VarCyFromDisp)
 */
 
-HRESULT WINAPI VarBstrFromUI132(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
-#define VarBstrFromUI1 WINELIB_NAME(VarBstrFromUI1)
-HRESULT WINAPI VarBstrFromI232(short iVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
-#define VarBstrFromI2 WINELIB_NAME(VarBstrFromI2)
-HRESULT WINAPI VarBstrFromI432(LONG lIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
-#define VarBstrFromI4 WINELIB_NAME(VarBstrFromI4)
-HRESULT WINAPI VarBstrFromR432(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
-#define VarBstrFromR4 WINELIB_NAME(VarBstrFromR4)
-HRESULT WINAPI VarBstrFromR832(double dblIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
-#define VarBstrFromR8 WINELIB_NAME(VarBstrFromR8)
-HRESULT WINAPI VarBstrFromDate32(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
-#define VarBstrFromDate WINELIB_NAME(VarBstrFromDate)
-HRESULT WINAPI VarBstrFromBool32(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
-#define VarBstrFromBool WINELIB_NAME(VarBstrFromBool)
-HRESULT WINAPI VarBstrFromI132(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
-#define VarBstrFromI1 WINELIB_NAME(VarBstrFromI1)
-HRESULT WINAPI VarBstrFromUI232(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
-#define VarBstrFromUI2 WINELIB_NAME(VarBstrFromUI2)
-HRESULT WINAPI VarBstrFromUI432(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
-#define VarBstrFromUI4 WINELIB_NAME(VarBstrFromUI4)
-HRESULT WINAPI VarBstrFromCy32(CY cyIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
-#define VarBstrFromCy WINELIB_NAME(VarBstrFromCy)
+HRESULT WINAPI VarBstrFromUI1(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
+HRESULT WINAPI VarBstrFromI2(short iVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
+HRESULT WINAPI VarBstrFromI4(LONG lIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
+HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
+HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
+HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
+HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
+HRESULT WINAPI VarBstrFromI1(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR*pbstrOut);
+HRESULT WINAPI VarBstrFromUI2(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR*pbstrOut);
+HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR*pbstrOut);
+HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
 /*
 HRESULT WINAPI VarBstrFromDec32(DECIMAL*pdecIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
-#define VarBstrFromDec WINELIB_NAME(VarBstrFromDec)
 HRESULT WINAPI VarBstrFromDisp32(IDispatch* pdispIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
-#define VarBstrFromDisp WINELIB_NAME(VarBstrFromDisp)
 */
 
-HRESULT WINAPI VarBoolFromUI132(BYTE bIn, VARIANT_BOOL* pboolOut);
-#define VarBoolFromUI1 WINELIB_NAME(VarBoolFromUI1)
-HRESULT WINAPI VarBoolFromI232(short sIn, VARIANT_BOOL* pboolOut);
-#define VarBoolFromI2 WINELIB_NAME(VarBoolFromI2)
-HRESULT WINAPI VarBoolFromI432(LONG lIn, VARIANT_BOOL* pboolOut);
-#define VarBoolFromI4 WINELIB_NAME(VarBoolFromI4)
-HRESULT WINAPI VarBoolFromR432(FLOAT fltIn, VARIANT_BOOL* pboolOut);
-#define VarBoolFromR4 WINELIB_NAME(VarBoolFromR4)
-HRESULT WINAPI VarBoolFromR832(double dblIn, VARIANT_BOOL* pboolOut);
-#define VarBoolFromR8 WINELIB_NAME(VarBoolFromR8)
-HRESULT WINAPI VarBoolFromDate32(DATE dateIn, VARIANT_BOOL* pboolOut);
-#define VarBoolFromDate WINELIB_NAME(VarBoolFromDate)
-HRESULT WINAPI VarBoolFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut);
-#define VarBoolFromStr WINELIB_NAME(VarBoolFromStr)
-HRESULT WINAPI VarBoolFromI132(CHAR cIn, VARIANT_BOOL*pboolOut);
-#define VarBoolFromI1 WINELIB_NAME(VarBoolFromI1)
-HRESULT WINAPI VarBoolFromUI232(USHORT uiIn, VARIANT_BOOL*pboolOut);
-#define VarBoolFromUI2 WINELIB_NAME(VarBoolFromUI2)
-HRESULT WINAPI VarBoolFromUI432(ULONG ulIn, VARIANT_BOOL*pboolOut);
-#define VarBoolFromUI4 WINELIB_NAME(VarBoolFromUI4)
-HRESULT WINAPI VarBoolFromCy32(CY cyIn, VARIANT_BOOL* pboolOut);
-#define VarBoolFromCy WINELIB_NAME(VarBoolFromCy)
+HRESULT WINAPI VarBoolFromUI1(BYTE bIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromI2(short sIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromI4(LONG lIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromR4(FLOAT fltIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromR8(double dblIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromDate(DATE dateIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromI1(CHAR cIn, VARIANT_BOOL*pboolOut);
+HRESULT WINAPI VarBoolFromUI2(USHORT uiIn, VARIANT_BOOL*pboolOut);
+HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL*pboolOut);
+HRESULT WINAPI VarBoolFromCy(CY cyIn, VARIANT_BOOL* pboolOut);
 /*
 HRESULT WINAPI VarBoolFromDec32(DECIMAL*pdecIn, VARIANT_BOOL*pboolOut);
-#define VarBoolFromDec WINELIB_NAME(VarBoolFromDec)
 HRESULT WINAPI VarBoolFromDisp32(IDispatch* pdispIn, LCID lcid, VARIANT_BOOL* pboolOut);
-#define VarBoolFromDisp WINELIB_NAME(VarBoolFromDisp)
 */
 
-HRESULT WINAPI VarI1FromUI132(BYTE bIn, CHAR*pcOut);
-#define VarI1FromUI1 WINELIB_NAME(VarI1FromUI1)
-HRESULT WINAPI VarI1FromI232(short uiIn, CHAR*pcOut);
-#define VarI1FromI2 WINELIB_NAME(VarI1FromI2)
-HRESULT WINAPI VarI1FromI432(LONG lIn, CHAR*pcOut);
-#define VarI1FromI4 WINELIB_NAME(VarI1FromI4)
-HRESULT WINAPI VarI1FromR432(FLOAT fltIn, CHAR*pcOut);
-#define VarI1FromR4 WINELIB_NAME(VarI1FromR4)
-HRESULT WINAPI VarI1FromR832(double dblIn, CHAR*pcOut);
-#define VarI1FromR8 WINELIB_NAME(VarI1FromR8)
-HRESULT WINAPI VarI1FromDate32(DATE dateIn, CHAR*pcOut);
-#define VarI1FromDate WINELIB_NAME(VarI1FromDate)
-HRESULT WINAPI VarI1FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, CHAR*pcOut);
-#define VarI1FromStr WINELIB_NAME(VarI1FromStr)
-HRESULT WINAPI VarI1FromBool32(VARIANT_BOOL boolIn, CHAR*pcOut);
-#define VarI1FromBool WINELIB_NAME(VarI1FromBool)
-HRESULT WINAPI VarI1FromUI232(USHORT uiIn, CHAR*pcOut);
-#define VarI1FromUI2 WINELIB_NAME(VarI1FromUI2)
-HRESULT WINAPI VarI1FromUI432(ULONG ulIn, CHAR*pcOut);
-#define VarI1FromUI4 WINELIB_NAME(VarI1FromUI4)
-HRESULT WINAPI VarI1FromCy32(CY cyIn, CHAR*pcOut);
-#define VarI1FromCy WINELIB_NAME(VarI1FromCy)
+HRESULT WINAPI VarI1FromUI1(BYTE bIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromI2(short uiIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromI4(LONG lIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromR4(FLOAT fltIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromR8(double dblIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromDate(DATE dateIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromStr(OLECHAR*strIn, LCID lcid, ULONG dwFlags, CHAR*pcOut);
+HRESULT WINAPI VarI1FromBool(VARIANT_BOOL boolIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromUI2(USHORT uiIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromUI4(ULONG ulIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromCy(CY cyIn, CHAR*pcOut);
 /*
 HRESULT WINAPI VarI1FromDec32(DECIMAL*pdecIn, CHAR*pcOut);
-#define VarI1FromDec WINELIB_NAME(VarI1FromDec)
 HRESULT WINAPI VarI1FromDisp32(IDispatch*pdispIn, LCID lcid, CHAR*pcOut);
-#define VarI1FromDisp WINELIB_NAME(VarI1FromDisp)
 */
 
-HRESULT WINAPI VarUI2FromUI132(BYTE bIn, USHORT*puiOut);
-#define VarUI2FromUI1 WINELIB_NAME(VarUI2FromUI1)
-HRESULT WINAPI VarUI2FromI232(short uiIn, USHORT*puiOut);
-#define VarUI2FromI2 WINELIB_NAME(VarUI2FromI2)
-HRESULT WINAPI VarUI2FromI432(LONG lIn, USHORT*puiOut);
-#define VarUI2FromI4 WINELIB_NAME(VarUI2FromI4)
-HRESULT WINAPI VarUI2FromR432(FLOAT fltIn, USHORT*puiOut);
-#define VarUI2FromR4 WINELIB_NAME(VarUI2FromR4)
-HRESULT WINAPI VarUI2FromR832(double dblIn, USHORT*puiOut);
-#define VarUI2FromR8 WINELIB_NAME(VarUI2FromR8)
-HRESULT WINAPI VarUI2FromDate32(DATE dateIn, USHORT*puiOut);
-#define VarUI2FromDate WINELIB_NAME(VarUI2FromDate)
-HRESULT WINAPI VarUI2FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, USHORT*puiOut);
-#define VarUI2FromStr WINELIB_NAME(VarUI2FromStr)
-HRESULT WINAPI VarUI2FromBool32(VARIANT_BOOL boolIn, USHORT*puiOut);
-#define VarUI2FromBool WINELIB_NAME(VarUI2FromBool)
-HRESULT WINAPI VarUI2FromI132(CHAR cIn, USHORT*puiOut);
-#define VarUI2FromI1 WINELIB_NAME(VarUI2FromI1)
-HRESULT WINAPI VarUI2FromUI432(ULONG ulIn, USHORT*puiOut);
-#define VarUI2FromUI4 WINELIB_NAME(VarUI2FromUI4)
-HRESULT WINAPI VarUI2FromCy32(CY cyIn, USHORT*puiOut);
-#define VarUI2FromCy WINELIB_NAME(VarUI2FromCy)
+HRESULT WINAPI VarUI2FromUI1(BYTE bIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromI2(short uiIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromI4(LONG lIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromR4(FLOAT fltIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromR8(double dblIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromDate(DATE dateIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromStr(OLECHAR*strIn, LCID lcid, ULONG dwFlags, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL boolIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromI1(CHAR cIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromCy(CY cyIn, USHORT*puiOut);
 /*
 HRESULT WINAPI VarUI2FromDec32(DECIMAL*pdecIn, USHORT*puiOut);
-#define VarUI2FromDec WINELIB_NAME(VarUI2FromDec)
 HRESULT WINAPI VarUI2FromDisp32(IDispatch*pdispIn, LCID lcid, USHORT*puiOut);
-#define VarUI2FromDisp WINELIB_NAME(VarUI2FromDisp)
 */
 
-HRESULT WINAPI VarUI4FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, ULONG*pulOut);
-#define VarUI4FromStr WINELIB_NAME(VarUI4FromStr)
-HRESULT WINAPI VarUI4FromUI132(BYTE bIn, ULONG*pulOut);
-#define VarUI4FromUI1 WINELIB_NAME(VarUI4FromUI1)
-HRESULT WINAPI VarUI4FromI232(short uiIn, ULONG*pulOut);
-#define VarUI4FromI2 WINELIB_NAME(VarUI4FromI2)
-HRESULT WINAPI VarUI4FromI432(LONG lIn, ULONG*pulOut);
-#define VarUI4FromI4 WINELIB_NAME(VarUI4FromI4)
-HRESULT WINAPI VarUI4FromR432(FLOAT fltIn, ULONG*pulOut);
-#define VarUI4FromR4 WINELIB_NAME(VarUI4FromR4)
-HRESULT WINAPI VarUI4FromR832(double dblIn, ULONG*pulOut);
-#define VarUI4FromR8 WINELIB_NAME(VarUI4FromR8)
-HRESULT WINAPI VarUI4FromDate32(DATE dateIn, ULONG*pulOut);
-#define VarUI4FromDate WINELIB_NAME(VarUI4FromDate)
-HRESULT WINAPI VarUI4FromBool32(VARIANT_BOOL boolIn, ULONG*pulOut);
-#define VarUI4FromBool WINELIB_NAME(VarUI4FromBool)
-HRESULT WINAPI VarUI4FromI132(CHAR cIn, ULONG*pulOut);
-#define VarUI4FromI1 WINELIB_NAME(VarUI4FromI1)
-HRESULT WINAPI VarUI4FromUI232(USHORT uiIn, ULONG*pulOut);
-#define VarUI4FromUI2 WINELIB_NAME(VarUI4FromUI2)
-HRESULT WINAPI VarUI4FromCy32(CY cyIn, ULONG*pulOut);
-#define VarUI4FromCy WINELIB_NAME(VarUI4FromCy)
+HRESULT WINAPI VarUI4FromStr(OLECHAR*strIn, LCID lcid, ULONG dwFlags, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromUI1(BYTE bIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromI2(short uiIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromI4(LONG lIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromR4(FLOAT fltIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromR8(double dblIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromDate(DATE dateIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromBool(VARIANT_BOOL boolIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromI1(CHAR cIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromUI2(USHORT uiIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromCy(CY cyIn, ULONG*pulOut);
 /*
 HRESULT WINAPI VarUI4FromDec32(DECIMAL*pdecIn, ULONG*pulOut);
-#define VarUI4FromDec WINELIB_NAME(VarUI4FromDec)
 HRESULT WINAPI VarUI4FromDisp32(IDispatch*pdispIn, LCID lcid, ULONG*pulOut);
-#define VarUI4FromDisp WINELIB_NAME(VarUI4FromDisp)
 
 HRESULT WINAPI VarDecFromUI132(BYTE bIn, DECIMAL*pdecOut);
-#define VarDecFromUI1 WINELIB_NAME(VarDecFromUI1)
 HRESULT WINAPI VarDecFromI232(short uiIn, DECIMAL*pdecOut);
-#define VarDecFromI2 WINELIB_NAME(VarDecFromI2)
 HRESULT WINAPI VarDecFromI432(LONG lIn, DECIMAL*pdecOut);
-#define VarDecFromI4 WINELIB_NAME(VarDecFromI4)
 HRESULT WINAPI VarDecFromR432(FLOAT fltIn, DECIMAL*pdecOut);
-#define VarDecFromR4 WINELIB_NAME(VarDecFromR4)
 HRESULT WINAPI VarDecFromR832(double dblIn, DECIMAL*pdecOut);
-#define VarDecFromR8 WINELIB_NAME(VarDecFromR8)
 HRESULT WINAPI VarDecFromDate32(DATE dateIn, DECIMAL*pdecOut);
-#define VarDecFromDate WINELIB_NAME(VarDecFromDate)
 HRESULT WINAPI VarDecFromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, DECIMAL*pdecOut);
-#define VarDecFromStr WINELIB_NAME(VarDecFromStr)
 HRESULT WINAPI VarDecFromBool32(VARIANT_BOOL boolIn, DECIMAL*pdecOut);
-#define VarDecFromBool WINELIB_NAME(VarDecFromBool)
 HRESULT WINAPI VarDecFromI132(CHAR cIn, DECIMAL*pdecOut);
-#define VarDecFromI1 WINELIB_NAME(VarDecFromI1)
 HRESULT WINAPI VarDecFromUI232(USHORT uiIn, DECIMAL*pdecOut);
-#define VarDecFromUI2 WINELIB_NAME(VarDecFromUI2)
 HRESULT WINAPI VarDecFromUI432(ULONG ulIn, DECIMAL*pdecOut);
-#define VarDecFromUI4 WINELIB_NAME(VarDecFromUI4)
 HRESULT WINAPI VarDecFromCy32(CY cyIn, DECIMAL*pdecOut);
-#define VarDecFromCy WINELIB_NAME(VarDecFromCy)
 HRESULT WINAPI VarDecFromDisp32(IDispatch*pdispIn, LCID lcid, DECIMAL*pdecOut);
-#define VarDecFromDisp WINELIB_NAME(VarDecFromDisp)
 */
 
 
@@ -601,62 +399,62 @@ HRESULT WINAPI VarDecFromDisp32(IDispatch*pdispIn, LCID lcid, DECIMAL*pdecOut);
 #define VarUI4FromUI4( in, pOut ) ( *(pOut) =  (in) )
 #define VarI4FromI4( in, pOut )   ( *(pOut) =  (in) )
 
-#define VarUI1FromInt32		VarUI1FromI432
-#define VarUI1FromUint32	VarUI1FromUI432
-#define VarI2FromInt32		VarI2FromI432
-#define VarI2FromUint32		VarI2FromUI432
-#define VarI4FromInt32		VarI4FromI432
-#define VarI4FromUint32		VarI4FromUI432
-#define VarR4FromInt32		VarR4FromI432
-#define VarR4FromUint32		VarR4FromUI432
-#define VarR8FromInt32		VarR8FromI432
-#define VarR8FromUint32		VarR8FromUI432
-#define VarDateFromInt32	VarDateFromI432
-#define VarDateFromUint32	VarDateFromUI432
-#define VarCyFromInt32		VarCyFromI432
-#define VarCyFromUint32		VarCyFromUI432
-#define VarBstrFromInt32	VarBstrFromI432
-#define VarBstrFromUint32	VarBstrFromUI432
-#define VarBoolFromInt32	VarBoolFromI432
-#define VarBoolFromUint32	VarBoolFromUI432
-#define VarI1FromInt32		VarI1FromI432
-#define VarI1FromUint32		VarI1FromUI432
-#define VarUI2FromInt32		VarUI2FromI432
-#define VarUI2FromUint32	VarUI2FromUI432
-#define VarUI4FromInt32		VarUI4FromI432
-#define VarUI4FromUint32	VarUI4FromUI432
-#define VarDecFromInt32		VarDecFromI432
-#define VarDecFromUint32	VarDecFromUI432
-#define VarIntFromUI132		VarI4FromUI132
-#define VarIntFromI232		VarI4FromI232
-#define VarIntFromI432		VarI4FromI432
-#define VarIntFromR432		VarI4FromR432
-#define VarIntFromR832		VarI4FromR832
-#define VarIntFromDate32	VarI4FromDate32
-#define VarIntFromCy32		VarI4FromCy32
-#define VarIntFromStr32		VarI4FromStr32
-#define VarIntFromDisp32	VarI4FromDisp32
-#define VarIntFromBool32	VarI4FromBool32
-#define VarIntFromI132		VarI4FromI132
-#define VarIntFromUI232		VarI4FromUI232
-#define VarIntFromUI432		VarI4FromUI432
-#define VarIntFromDec32		VarI4FromDec32
-#define VarIntFromUint32	VarI4FromUI432
-#define VarUintFromUI132	VarUI4FromUI132
-#define VarUintFromI232		VarUI4FromI232
-#define VarUintFromI432		VarUI4FromI432
-#define VarUintFromR432		VarUI4FromR432
-#define VarUintFromR832		VarUI4FromR832
-#define VarUintFromDate32	VarUI4FromDate32
-#define VarUintFromCy32		VarUI4FromCy32
-#define VarUintFromStr32	VarUI4FromStr32
-#define VarUintFromDisp32	VarUI4FromDisp32
-#define VarUintFromBool32	VarUI4FromBool32
-#define VarUintFromI132		VarUI4FromI132
-#define VarUintFromUI232	VarUI4FromUI232
-#define VarUintFromUI432	VarUI4FromUI432
-#define VarUintFromDec32	VarUI4FromDec32
-#define VarUintFromInt32	VarUI4FromI432
+#define VarUI1FromInt		VarUI1FromI4
+#define VarUI1FromUint	VarUI1FromUI4
+#define VarI2FromInt		VarI2FromI4
+#define VarI2FromUint		VarI2FromUI4
+#define VarI4FromInt		VarI4FromI432
+#define VarI4FromUint		VarI4FromUI4
+#define VarR4FromInt		VarR4FromI4
+#define VarR4FromUint		VarR4FromUI4
+#define VarR8FromInt		VarR8FromI4
+#define VarR8FromUint		VarR8FromUI4
+#define VarDateFromInt	VarDateFromI4
+#define VarDateFromUint	VarDateFromUI4
+#define VarCyFromInt		VarCyFromI4
+#define VarCyFromUint		VarCyFromUI4
+#define VarBstrFromInt	VarBstrFromI4
+#define VarBstrFromUint	VarBstrFromUI4
+#define VarBoolFromInt	VarBoolFromI4
+#define VarBoolFromUint	VarBoolFromUI4
+#define VarI1FromInt		VarI1FromI4
+#define VarI1FromUint		VarI1FromUI4
+#define VarUI2FromInt		VarUI2FromI4
+#define VarUI2FromUint	VarUI2FromUI4
+#define VarUI4FromInt		VarUI4FromI4
+#define VarUI4FromUint	VarUI4FromUI432
+#define VarDecFromInt		VarDecFromI432
+#define VarDecFromUint	VarDecFromUI432
+#define VarIntFromUI1		VarI4FromUI1
+#define VarIntFromI2		VarI4FromI2
+#define VarIntFromI4		VarI4FromI432
+#define VarIntFromR4		VarI4FromR4
+#define VarIntFromR8		VarI4FromR8
+#define VarIntFromDate	VarI4FromDate
+#define VarIntFromCy		VarI4FromCy
+#define VarIntFromStr		VarI4FromStr
+#define VarIntFromDisp	VarI4FromDisp32
+#define VarIntFromBool	VarI4FromBool
+#define VarIntFromI1		VarI4FromI1
+#define VarIntFromUI2		VarI4FromUI2
+#define VarIntFromUI4		VarI4FromUI4
+#define VarIntFromDec		VarI4FromDec32
+#define VarIntFromUint	VarI4FromUI4
+#define VarUintFromUI1	VarUI4FromUI1
+#define VarUintFromI2		VarUI4FromI2
+#define VarUintFromI4		VarUI4FromI4
+#define VarUintFromR4		VarUI4FromR4
+#define VarUintFromR8		VarUI4FromR8
+#define VarUintFromDate	VarUI4FromDate
+#define VarUintFromCy		VarUI4FromCy
+#define VarUintFromStr	VarUI4FromStr
+#define VarUintFromDisp	VarUI4FromDisp32
+#define VarUintFromBool	VarUI4FromBool
+#define VarUintFromI1		VarUI4FromI1
+#define VarUintFromUI2	VarUI4FromUI2
+#define VarUintFromUI4	VarUI4FromUI432
+#define VarUintFromDec	VarUI4FromDec32
+#define VarUintFromInt	VarUI4FromI4
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/include/olectl.h b/include/olectl.h
index 76c152a5380..abe7b752d6d 100644
--- a/include/olectl.h
+++ b/include/olectl.h
@@ -4,20 +4,20 @@
 #include "wintypes.h"
 #include "ole.h"
 
-#define WINOLECTLAPI INT32 WINAPI
+#define WINOLECTLAPI INT WINAPI
 
 /*
  * FONTDESC is used as an OLE encapsulation of the GDI fonts
  */
 typedef struct tagFONTDESC {
-  UINT32     cbSizeofstruct;
-  LPOLESTR32 lpstrName;
+  UINT     cbSizeofstruct;
+  LPOLESTR lpstrName;
   CY         cySize;
   SHORT      sWeight;
   SHORT      sCharset;
-  BOOL32     fItalic;
-  BOOL32     fUnderline;
-  BOOL32     fStrikeThrough;
+  BOOL     fItalic;
+  BOOL     fUnderline;
+  BOOL     fStrikeThrough;
 } FONTDESC, *LPFONTDESC;
 
 WINOLECTLAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, VOID** ppvObj);
diff --git a/include/oledlg.h b/include/oledlg.h
index 1b7ce5b7ebe..1b937fcfe90 100644
--- a/include/oledlg.h
+++ b/include/oledlg.h
@@ -10,32 +10,32 @@
 #define OLEUI_OK      1 /* OK button pressed */ 
 #define OLEUI_CANCEL  2 /* Cancel button pressed */
 
-typedef void *LPOLEUIINSERTOBJECT32A; /* FIXME: stub */
-typedef void *LPOLEUIINSERTOBJECT32W; /* FIXME: stub */
+typedef void *LPOLEUIINSERTOBJECTA; /* FIXME: stub */
+typedef void *LPOLEUIINSERTOBJECTW; /* FIXME: stub */
 
-typedef void *LPOLEUIPASTESPECIAL32A;  /* FIXME: stub */
-typedef void *LPOLEUIPASTESPECIAL32W;  /* FIXME: stub */
+typedef void *LPOLEUIPASTESPECIALA;  /* FIXME: stub */
+typedef void *LPOLEUIPASTESPECIALW;  /* FIXME: stub */
 
-typedef void *LPOLEUIEDITLINKS32A;  /* FIXME: stub */
-typedef void *LPOLEUIEDITLINKS32W;  /* FIXME: stub */
+typedef void *LPOLEUIEDITLINKSA;  /* FIXME: stub */
+typedef void *LPOLEUIEDITLINKSW;  /* FIXME: stub */
 
-typedef void *LPOLEUICHANGEICON32A; /* FIXME: stub */
-typedef void *LPOLEUICHANGEICON32W; /* FIXME: stub */
+typedef void *LPOLEUICHANGEICONA; /* FIXME: stub */
+typedef void *LPOLEUICHANGEICONW; /* FIXME: stub */
 
-typedef void *LPOLEUICONVERT32A; /* FIXME: stub */
-typedef void *LPOLEUICONVERT32W; /* FIXME: stub */
+typedef void *LPOLEUICONVERTA; /* FIXME: stub */
+typedef void *LPOLEUICONVERTW; /* FIXME: stub */
 
-typedef void *LPOLEUIBUSY32A; /* FIXME: stub */
-typedef void *LPOLEUIBUSY32W; /* FIXME: stub */
+typedef void *LPOLEUIBUSYA; /* FIXME: stub */
+typedef void *LPOLEUIBUSYW; /* FIXME: stub */
 
-typedef void *LPOLEUILINKCONTAINER32A; /* FIXME: stub */
-typedef void *LPOLEUILINKCONTAINER32W; /* FIXME: stub */
+typedef void *LPOLEUILINKCONTAINERA; /* FIXME: stub */
+typedef void *LPOLEUILINKCONTAINERW; /* FIXME: stub */
 
-typedef void *LPOLEUIOBJECTPROPS32A; /* FIXME: stub */
-typedef void *LPOLEUIOBJECTPROPS32W; /* FIXME: stub */
+typedef void *LPOLEUIOBJECTPROPSA; /* FIXME: stub */
+typedef void *LPOLEUIOBJECTPROPSW; /* FIXME: stub */
 
-typedef void *LPOLEUICHANGESOURCE32A; /* FIXME: stub */
-typedef void *LPOLEUICHANGESOURCE32W; /* FIXME: stub */
+typedef void *LPOLEUICHANGESOURCEA; /* FIXME: stub */
+typedef void *LPOLEUICHANGESOURCEW; /* FIXME: stub */
 
 #endif  /* __WINE_OLEDLG_H */
 
diff --git a/include/pager.h b/include/pager.h
index c02538e419f..993695d1960 100644
--- a/include/pager.h
+++ b/include/pager.h
@@ -10,14 +10,14 @@
 
 typedef struct tagPAGER_INFO
 {
-    HWND32   hwndChild;
+    HWND   hwndChild;
     COLORREF clrBk;
-    INT32    nBorder;
-    INT32    nButtonSize;
-    INT32    nPos;
-    BOOL32   bForward;
+    INT    nBorder;
+    INT    nButtonSize;
+    INT    nPos;
+    BOOL   bForward;
 
-    INT32    nChildSize;
+    INT    nChildSize;
 
 } PAGER_INFO;
 
diff --git a/include/palette.h b/include/palette.h
index 3b532039aed..c6e4cfb8c42 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -21,10 +21,10 @@ typedef struct
 
 extern HPALETTE16 PALETTE_Init(void);
 extern int PALETTE_GetObject( PALETTEOBJ * palette, int count, LPSTR buffer );
-extern BOOL32 PALETTE_DeleteObject( HPALETTE16 hpalette, PALETTEOBJ *palette );
-extern BOOL32 PALETTE_UnrealizeObject( HPALETTE16 hpalette, PALETTEOBJ *palette);
+extern BOOL PALETTE_DeleteObject( HPALETTE16 hpalette, PALETTEOBJ *palette );
+extern BOOL PALETTE_UnrealizeObject( HPALETTE16 hpalette, PALETTEOBJ *palette);
      
 extern HPALETTE16 WINAPI CreateHalftonePalette16(HDC16 hdc);
-extern HPALETTE32 WINAPI CreateHalftonePalette32(HDC32 hdc);
+extern HPALETTE WINAPI CreateHalftonePalette(HDC hdc);
 
 #endif /* __WINE_PALETTE_H */
diff --git a/include/path.h b/include/path.h
index 6bc39ca5da5..3782f52607e 100644
--- a/include/path.h
+++ b/include/path.h
@@ -25,10 +25,10 @@ typedef enum tagGdiPathState
 typedef struct tagGdiPath
 {
    GdiPathState state;
-   POINT32      *pPoints;
+   POINT      *pPoints;
    BYTE         *pFlags;
    int          numEntriesUsed, numEntriesAllocated;
-   BOOL32       newStroke;
+   BOOL       newStroke;
 } GdiPath;
 
 #define PATH_IsPathOpen(path) ((path).state==PATH_Open)
@@ -39,16 +39,16 @@ typedef struct tagGdiPath
 
 extern void   PATH_InitGdiPath(GdiPath *pPath);
 extern void   PATH_DestroyGdiPath(GdiPath *pPath);
-extern BOOL32 PATH_AssignGdiPath(GdiPath *pPathDest,
+extern BOOL PATH_AssignGdiPath(GdiPath *pPathDest,
    const GdiPath *pPathSrc);
 
-extern BOOL32 PATH_MoveTo(HDC32 hdc);
-extern BOOL32 PATH_LineTo(HDC32 hdc, INT32 x, INT32 y);
-extern BOOL32 PATH_Rectangle(HDC32 hdc, INT32 x1, INT32 y1,
-   INT32 x2, INT32 y2);
-extern BOOL32 PATH_Ellipse(HDC32 hdc, INT32 x1, INT32 y1,
-   INT32 x2, INT32 y2);
-extern BOOL32 PATH_Arc(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2,
-   INT32 xStart, INT32 yStart, INT32 xEnd, INT32 yEnd);
+extern BOOL PATH_MoveTo(HDC hdc);
+extern BOOL PATH_LineTo(HDC hdc, INT x, INT y);
+extern BOOL PATH_Rectangle(HDC hdc, INT x1, INT y1,
+   INT x2, INT y2);
+extern BOOL PATH_Ellipse(HDC hdc, INT x1, INT y1,
+   INT x2, INT y2);
+extern BOOL PATH_Arc(HDC hdc, INT x1, INT y1, INT x2, INT y2,
+   INT xStart, INT yStart, INT xEnd, INT yEnd);
 
 #endif /* __WINE_PATH_H */
diff --git a/include/pe_image.h b/include/pe_image.h
index 0b50343a446..20991a11678 100644
--- a/include/pe_image.h
+++ b/include/pe_image.h
@@ -21,33 +21,33 @@ typedef struct {
 } PE_MODREF;
 
 struct _wine_modref;
-extern int PE_unloadImage(HMODULE32 hModule);
-extern FARPROC32 PE_FindExportedFunction(struct _wine_modref *wm, LPCSTR funcName, BOOL32 snoop);
-extern BOOL32 PE_EnumResourceTypes32A(HMODULE32,ENUMRESTYPEPROC32A,LONG);
-extern BOOL32 PE_EnumResourceTypes32W(HMODULE32,ENUMRESTYPEPROC32W,LONG);
-extern BOOL32 PE_EnumResourceNames32A(HMODULE32,LPCSTR,ENUMRESNAMEPROC32A,LONG);
-extern BOOL32 PE_EnumResourceNames32W(HMODULE32,LPCWSTR,ENUMRESNAMEPROC32W,LONG);
-extern BOOL32 PE_EnumResourceLanguages32A(HMODULE32,LPCSTR,LPCSTR,ENUMRESLANGPROC32A,LONG);
-extern BOOL32 PE_EnumResourceLanguages32W(HMODULE32,LPCWSTR,LPCWSTR,ENUMRESLANGPROC32W,LONG);
-extern HRSRC32 PE_FindResourceEx32W(struct _wine_modref*,LPCWSTR,LPCWSTR,WORD);
-extern DWORD PE_SizeofResource32(HMODULE32,HRSRC32);
-extern HMODULE32 PE_LoadLibraryEx32A(LPCSTR,HFILE32,DWORD);
-extern HGLOBAL32 PE_LoadResource32(struct _wine_modref *wm,HRSRC32);
-extern HMODULE32 PE_LoadImage( LPCSTR name, OFSTRUCT *ofs, LPCSTR *modName );
-extern struct _wine_modref *PE_CreateModule( HMODULE32 hModule, OFSTRUCT *ofs, 
-                                             DWORD flags, BOOL32 builtin );
+extern int PE_unloadImage(HMODULE hModule);
+extern FARPROC PE_FindExportedFunction(struct _wine_modref *wm, LPCSTR funcName, BOOL snoop);
+extern BOOL PE_EnumResourceTypesA(HMODULE,ENUMRESTYPEPROCA,LONG);
+extern BOOL PE_EnumResourceTypesW(HMODULE,ENUMRESTYPEPROCW,LONG);
+extern BOOL PE_EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROCA,LONG);
+extern BOOL PE_EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROCW,LONG);
+extern BOOL PE_EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG);
+extern BOOL PE_EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG);
+extern HRSRC PE_FindResourceExW(struct _wine_modref*,LPCWSTR,LPCWSTR,WORD);
+extern DWORD PE_SizeofResource(HMODULE,HRSRC);
+extern HMODULE PE_LoadLibraryExA(LPCSTR,HFILE,DWORD);
+extern HGLOBAL PE_LoadResource(struct _wine_modref *wm,HRSRC);
+extern HMODULE PE_LoadImage( LPCSTR name, OFSTRUCT *ofs, LPCSTR *modName );
+extern struct _wine_modref *PE_CreateModule( HMODULE hModule, OFSTRUCT *ofs, 
+                                             DWORD flags, BOOL builtin );
 extern HINSTANCE16 PE_CreateProcess( LPCSTR name, LPCSTR cmd_line,
-                                     LPCSTR env, BOOL32 inherit, LPSTARTUPINFO32A startup,
+                                     LPCSTR env, BOOL inherit, LPSTARTUPINFOA startup,
                                      LPPROCESS_INFORMATION info );
 
 struct _THDB; /* forward definition */
 extern void PE_InitTls(struct _THDB*);
 extern void PE_InitDLL(struct _wine_modref *wm, DWORD type, LPVOID lpReserved);
 
-extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA(PIMAGE_RESOURCE_DIRECTORY,LPCSTR,DWORD,BOOL32);
-extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY,LPCWSTR,DWORD,BOOL32);
+extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA(PIMAGE_RESOURCE_DIRECTORY,LPCSTR,DWORD,BOOL);
+extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY,LPCWSTR,DWORD,BOOL);
 
-typedef DWORD (CALLBACK*DLLENTRYPROC32)(HMODULE32,DWORD,LPVOID);
+typedef DWORD (CALLBACK*DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
 
 typedef struct {
 	WORD	popl	WINE_PACKED;	/* 0x8f 0x05 */
@@ -70,7 +70,7 @@ typedef struct {
 } ELF_MODREF;
 
 extern struct _wine_modref *ELF_CreateDummyModule(LPCSTR,LPCSTR);
-extern HMODULE32 ELF_LoadLibraryEx32A(LPCSTR,HFILE32,DWORD);
-extern FARPROC32 ELF_FindExportedFunction(struct _wine_modref *wm, LPCSTR funcName);
+extern HMODULE ELF_LoadLibraryExA(LPCSTR,HFILE,DWORD);
+extern FARPROC ELF_FindExportedFunction(struct _wine_modref *wm, LPCSTR funcName);
 
 #endif /* __WINE_PE_IMAGE_H */
diff --git a/include/peexe.h b/include/peexe.h
index fce36690814..bc202dfb750 100644
--- a/include/peexe.h
+++ b/include/peexe.h
@@ -239,7 +239,7 @@ typedef struct _IMAGE_IMPORT_BY_NAME {
 typedef struct _IMAGE_THUNK_DATA {
 	union {
 		LPBYTE    ForwarderString;
-		FARPROC32 Function;
+		FARPROC Function;
 		DWORD     Ordinal;
 		PIMAGE_IMPORT_BY_NAME	AddressOfData;
 	} u1;
@@ -413,7 +413,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY {
 #define IMAGE_REL_BASED_HIGHADJ			4
 #define IMAGE_REL_BASED_MIPS_JMPADDR		5
 #define IMAGE_REL_BASED_SECTION			6
-#define	IMAGE_REL_BASED_REL32			7
+#define	IMAGE_REL_BASED_REL			7
 #define IMAGE_REL_BASED_MIPS_JMPADDR16		9
 #define IMAGE_REL_BASED_IA64_IMM64		9 /* yes, 9 too */
 #define IMAGE_REL_BASED_DIR64			10
@@ -423,12 +423,12 @@ typedef struct _IMAGE_DEBUG_DIRECTORY {
 #define	IMAGE_REL_I386_ABSOLUTE			0
 #define	IMAGE_REL_I386_DIR16			1
 #define	IMAGE_REL_I386_REL16			2
-#define	IMAGE_REL_I386_DIR32			6
+#define	IMAGE_REL_I386_DIR			6
 #define	IMAGE_REL_I386_DIR32NB			7
 #define	IMAGE_REL_I386_SEG12			9
 #define	IMAGE_REL_I386_SECTION			10
 #define	IMAGE_REL_I386_SECREL			11
-#define	IMAGE_REL_I386_REL32			20
+#define	IMAGE_REL_I386_REL			20
 
 /* MIPS relocation types */
 #define IMAGE_REL_MIPS_ABSOLUTE		0x0000
@@ -451,7 +451,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY {
 #define IMAGE_REL_ALPHA_ABSOLUTE	0x0000
 #define IMAGE_REL_ALPHA_REFLONG		0x0001
 #define IMAGE_REL_ALPHA_REFQUAD		0x0002
-#define IMAGE_REL_ALPHA_GPREL32		0x0003
+#define IMAGE_REL_ALPHA_GPREL		0x0003
 #define IMAGE_REL_ALPHA_LITERAL		0x0004
 #define IMAGE_REL_ALPHA_LITUSE		0x0005
 #define IMAGE_REL_ALPHA_GPDISP		0x0006
@@ -476,7 +476,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY {
 /* PowerPC relocation types */
 #define IMAGE_REL_PPC_ABSOLUTE          0x0000
 #define IMAGE_REL_PPC_ADDR64            0x0001
-#define IMAGE_REL_PPC_ADDR32            0x0002
+#define IMAGE_REL_PPC_ADDR            0x0002
 #define IMAGE_REL_PPC_ADDR24            0x0003
 #define IMAGE_REL_PPC_ADDR16            0x0004
 #define IMAGE_REL_PPC_ADDR14            0x0005
@@ -506,7 +506,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY {
 /* SH3 ? relocation type */
 #define IMAGE_REL_SH3_ABSOLUTE          0x0000
 #define IMAGE_REL_SH3_DIRECT16          0x0001
-#define IMAGE_REL_SH3_DIRECT32          0x0002
+#define IMAGE_REL_SH3_DIRECT          0x0002
 #define IMAGE_REL_SH3_DIRECT8           0x0003
 #define IMAGE_REL_SH3_DIRECT8_WORD      0x0004
 #define IMAGE_REL_SH3_DIRECT8_LONG      0x0005
@@ -524,7 +524,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY {
 
 /* ARM (Archimedes?) relocation types */
 #define IMAGE_REL_ARM_ABSOLUTE		0x0000
-#define IMAGE_REL_ARM_ADDR32		0x0001
+#define IMAGE_REL_ARM_ADDR		0x0001
 #define IMAGE_REL_ARM_ADDR32NB		0x0002
 #define IMAGE_REL_ARM_BRANCH24		0x0003
 #define IMAGE_REL_ARM_BRANCH11		0x0004
@@ -536,7 +536,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY {
 #define IMAGE_REL_IA64_IMM14		0x0001
 #define IMAGE_REL_IA64_IMM22		0x0002
 #define IMAGE_REL_IA64_IMM64		0x0003
-#define IMAGE_REL_IA64_DIR32		0x0004
+#define IMAGE_REL_IA64_DIR		0x0004
 #define IMAGE_REL_IA64_DIR64		0x0005
 #define IMAGE_REL_IA64_PCREL21B		0x0006
 #define IMAGE_REL_IA64_PCREL21M		0x0007
@@ -546,7 +546,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY {
 #define IMAGE_REL_IA64_SECTION		0x000B
 #define IMAGE_REL_IA64_SECREL22		0x000C
 #define IMAGE_REL_IA64_SECREL64I	0x000D
-#define IMAGE_REL_IA64_SECREL32		0x000E
+#define IMAGE_REL_IA64_SECREL		0x000E
 #define IMAGE_REL_IA64_LTOFF64		0x000F
 #define IMAGE_REL_IA64_DIR32NB		0x0010
 #define IMAGE_REL_IA64_RESERVED_11	0x0011
diff --git a/include/pen.h b/include/pen.h
index effed43776d..7f89ec3b3e5 100644
--- a/include/pen.h
+++ b/include/pen.h
@@ -13,10 +13,10 @@
 typedef struct
 {
     GDIOBJHDR   header;
-    LOGPEN32    logpen;
+    LOGPEN    logpen;
 } PENOBJ;
 
 extern INT16 PEN_GetObject16( PENOBJ * pen, INT16 count, LPSTR buffer );
-extern INT32 PEN_GetObject32( PENOBJ * pen, INT32 count, LPSTR buffer );
+extern INT PEN_GetObject( PENOBJ * pen, INT count, LPSTR buffer );
 
 #endif  /* __WINE_PEN_H */
diff --git a/include/process.h b/include/process.h
index 764fd1628e9..bf3def87761 100644
--- a/include/process.h
+++ b/include/process.h
@@ -30,7 +30,7 @@ typedef struct
 } HANDLE_TABLE;
 
 /* Current Process pseudo-handle - Returned by GetCurrentProcess*/
-#define CURRENT_PROCESS_PSEUDOHANDLE ((HANDLE32)0x7fffffff)
+#define CURRENT_PROCESS_PSEUDOHANDLE ((HANDLE)0x7fffffff)
 
 /* Win32 process environment database */
 typedef struct
@@ -39,10 +39,10 @@ typedef struct
     DWORD            unknown1;         /* 04 Unknown */
     LPSTR            cmd_line;         /* 08 Command line */
     LPSTR            cur_dir;          /* 0c Current directory */
-    STARTUPINFO32A  *startup_info;     /* 10 Startup information */
-    HANDLE32         hStdin;           /* 14 Handle for standard input */
-    HANDLE32         hStdout;          /* 18 Handle for standard output */
-    HANDLE32         hStderr;          /* 1c Handle for standard error */
+    STARTUPINFOA  *startup_info;     /* 10 Startup information */
+    HANDLE         hStdin;           /* 14 Handle for standard input */
+    HANDLE         hStdout;          /* 18 Handle for standard output */
+    HANDLE         hStderr;          /* 1c Handle for standard error */
     DWORD            unknown2;         /* 20 Unknown */
     DWORD            inherit_console;  /* 24 Inherit console flag */
     DWORD            break_type;       /* 28 Console events flag */
@@ -57,15 +57,15 @@ typedef struct
 } ENVDB;
 
 /* Win32 process database */
-typedef struct _PDB32
+typedef struct _PDB
 {
     K32OBJ           header;           /* 00 Kernel object header */
     DWORD            unknown1;         /* 08 Unknown */
     K32OBJ          *event;            /* 0c Pointer to an event object (unused) */
     DWORD            exit_code;        /* 10 Process exit code */
     DWORD            unknown2;         /* 14 Unknown */
-    HANDLE32         heap;             /* 18 Default process heap */
-    HANDLE32         mem_context;      /* 1c Process memory context */
+    HANDLE         heap;             /* 18 Default process heap */
+    HANDLE         mem_context;      /* 1c Process memory context */
     DWORD            flags;            /* 20 Flags */
     void            *pdb16;            /* 24 DOS PSP */
     WORD             PSP_sel;          /* 28 Selector to DOS PSP */
@@ -74,12 +74,12 @@ typedef struct _PDB32
     WORD             running_threads;  /* 2e Number of running threads */
     WORD             unknown3;         /* 30 Unknown */
     WORD             ring0_threads;    /* 32 Number of ring 0 threads */
-    HANDLE32         system_heap;      /* 34 System heap to allocate handles */
-    HTASK32          task;             /* 38 Win16 task */
+    HANDLE         system_heap;      /* 34 System heap to allocate handles */
+    HTASK          task;             /* 38 Win16 task */
     void            *mem_map_files;    /* 3c Pointer to mem-mapped files */
     ENVDB           *env_db;           /* 40 Environment database */
     HANDLE_TABLE    *handle_table;     /* 44 Handle table */
-    struct _PDB32   *parent;           /* 48 Parent process */
+    struct _PDB   *parent;           /* 48 Parent process */
     WINE_MODREF     *modref_list;      /* 4c MODREF list */
     void            *thread_list;      /* 50 List of threads */
     void            *debuggee_CB;      /* 54 Debuggee context block */
@@ -90,26 +90,26 @@ typedef struct _PDB32
     K32OBJ          *console;          /* 84 Console */
     DWORD            tls_bits[2];      /* 88 TLS in-use bits */
     DWORD            process_dword;    /* 90 Unknown */
-    struct _PDB32   *group;            /* 94 Process group */
+    struct _PDB   *group;            /* 94 Process group */
     WINE_MODREF     *exe_modref;       /* 98 MODREF for the process EXE */
     LPTOP_LEVEL_EXCEPTION_FILTER top_filter; /* 9c Top exception filter */
     DWORD            priority;         /* a0 Priority level */
-    HANDLE32         heap_list;        /* a4 Head of process heap list */
+    HANDLE         heap_list;        /* a4 Head of process heap list */
     void            *heap_handles;     /* a8 Head of heap handles list */
     DWORD            unknown6;         /* ac Unknown */
     K32OBJ          *console_provider; /* b0 Console provider (??) */
     WORD             env_selector;     /* b4 Selector to process environment */
     WORD             error_mode;       /* b6 Error mode */
-    HANDLE32         load_done_evt;    /* b8 Event for process loading done */
+    HANDLE         load_done_evt;    /* b8 Event for process loading done */
     DWORD            unknown7;         /* bc Unknown */
     DWORD            unknown8;         /* c0 Unknown (NT) */
     LCID             locale;           /* c4 Locale to be queried by GetThreadLocale (NT) */
     /* The following are Wine-specific fields */
     void            *server_pid;       /*    Server id for this process */
-    HANDLE32        *dos_handles;      /*    Handles mapping DOS -> Win32 */
-    struct _PDB32   *list_next;        /*    List reference - list of PDB's */
-    struct _PDB32   *list_prev;        /*    List reference - list of PDB's */
-} PDB32;
+    HANDLE        *dos_handles;      /*    Handles mapping DOS -> Win32 */
+    struct _PDB   *list_next;        /*    List reference - list of PDB's */
+    struct _PDB   *list_prev;        /*    List reference - list of PDB's */
+} PDB;
 
 /* Process flags */
 #define PDB32_WIN16_PROC    0x0008  /* Win16 process */
@@ -120,44 +120,44 @@ typedef struct _PDB32
 
 /* PDB <-> Process id conversion macros */
 #define PROCESS_OBFUSCATOR     ((DWORD)0xdeadbeef)
-#define PROCESS_ID_TO_PDB(id)  ((PDB32 *)((id) ^ PROCESS_OBFUSCATOR))
+#define PROCESS_ID_TO_PDB(id)  ((PDB *)((id) ^ PROCESS_OBFUSCATOR))
 #define PDB_TO_PROCESS_ID(pdb) ((DWORD)(pdb) ^ PROCESS_OBFUSCATOR)
 
 /* scheduler/environ.c */
-extern BOOL32 ENV_BuildEnvironment( PDB32 *pdb );
-extern BOOL32 ENV_InheritEnvironment( PDB32 *pdb, LPCSTR env );
-extern void ENV_FreeEnvironment( PDB32 *pdb );
+extern BOOL ENV_BuildEnvironment( PDB *pdb );
+extern BOOL ENV_InheritEnvironment( PDB *pdb, LPCSTR env );
+extern void ENV_FreeEnvironment( PDB *pdb );
 
 /* scheduler/handle.c */
-extern BOOL32 HANDLE_CreateTable( PDB32 *pdb, BOOL32 inherit );
-extern HANDLE32 HANDLE_Alloc( PDB32 *pdb, K32OBJ *ptr, DWORD access,
-                              BOOL32 inherit, int server_handle );
-extern int HANDLE_GetServerHandle( PDB32 *pdb, HANDLE32 handle,
+extern BOOL HANDLE_CreateTable( PDB *pdb, BOOL inherit );
+extern HANDLE HANDLE_Alloc( PDB *pdb, K32OBJ *ptr, DWORD access,
+                              BOOL inherit, int server_handle );
+extern int HANDLE_GetServerHandle( PDB *pdb, HANDLE handle,
                                    K32OBJ_TYPE type, DWORD access );
-extern void HANDLE_CloseAll( PDB32 *pdb, K32OBJ *ptr );
+extern void HANDLE_CloseAll( PDB *pdb, K32OBJ *ptr );
 
 /* Global handle macros */
 #define HANDLE_OBFUSCATOR         ((DWORD)0x544a4def)
 #define HANDLE_IS_GLOBAL(h)       (((DWORD)(h) ^ HANDLE_OBFUSCATOR) < 0x10000)
-#define HANDLE_LOCAL_TO_GLOBAL(h) ((HANDLE32)((DWORD)(h) ^ HANDLE_OBFUSCATOR))
-#define HANDLE_GLOBAL_TO_LOCAL(h) ((HANDLE32)((DWORD)(h) ^ HANDLE_OBFUSCATOR))
+#define HANDLE_LOCAL_TO_GLOBAL(h) ((HANDLE)((DWORD)(h) ^ HANDLE_OBFUSCATOR))
+#define HANDLE_GLOBAL_TO_LOCAL(h) ((HANDLE)((DWORD)(h) ^ HANDLE_OBFUSCATOR))
 
 
 /* scheduler/process.c */
-extern BOOL32 PROCESS_Init( void );
-extern PDB32 *PROCESS_Current(void);
-extern BOOL32 PROCESS_IsCurrent( HANDLE32 handle );
-extern PDB32 *PROCESS_Initial(void);
-extern PDB32 *PROCESS_IdToPDB( DWORD id );
-extern PDB32 *PROCESS_Create( struct _NE_MODULE *pModule, LPCSTR cmd_line,
+extern BOOL PROCESS_Init( void );
+extern PDB *PROCESS_Current(void);
+extern BOOL PROCESS_IsCurrent( HANDLE handle );
+extern PDB *PROCESS_Initial(void);
+extern PDB *PROCESS_IdToPDB( DWORD id );
+extern PDB *PROCESS_Create( struct _NE_MODULE *pModule, LPCSTR cmd_line,
                               LPCSTR env, HINSTANCE16 hInstance,
-                              HINSTANCE16 hPrevInstance, BOOL32 inherit,
-                              STARTUPINFO32A *startup, PROCESS_INFORMATION *info );
+                              HINSTANCE16 hPrevInstance, BOOL inherit,
+                              STARTUPINFOA *startup, PROCESS_INFORMATION *info );
 extern void PROCESS_SuspendOtherThreads(void);
 extern void PROCESS_ResumeOtherThreads(void);
 extern int  	PROCESS_PDBList_Getsize (void);
-extern PDB32*  	PROCESS_PDBList_Getfirst (void);
-extern PDB32*  	PROCESS_PDBList_Getnext (PDB32*);
+extern PDB*  	PROCESS_PDBList_Getfirst (void);
+extern PDB*  	PROCESS_PDBList_Getnext (PDB*);
 
 #endif  /* __WINE_PROCESS_H */
 
diff --git a/include/progress.h b/include/progress.h
index fdd5415f892..7a1a7213c5b 100644
--- a/include/progress.h
+++ b/include/progress.h
@@ -11,13 +11,13 @@
 
 typedef struct
 {
-  INT32       CurVal;       /* Current progress value */
-  INT32       MinVal;       /* Minimum progress value */
-  INT32       MaxVal;       /* Maximum progress value */
-  INT32       Step;         /* Step to use on PMB_STEPIT */
+  INT       CurVal;       /* Current progress value */
+  INT       MinVal;       /* Minimum progress value */
+  INT       MaxVal;       /* Maximum progress value */
+  INT       Step;         /* Step to use on PMB_STEPIT */
   COLORREF    ColorBar;     /* Bar color */
   COLORREF    ColorBk;      /* Background color */
-  HFONT32     hFont;        /* Handle to font (not unused) */
+  HFONT     hFont;        /* Handle to font (not unused) */
 } PROGRESS_INFO;
 
 
diff --git a/include/prsht.h b/include/prsht.h
index 6a8472f3073..26bbaa2823c 100644
--- a/include/prsht.h
+++ b/include/prsht.h
@@ -13,21 +13,21 @@ extern "C" {
  */
 
 
-#define WC_PROPSHEET32A      "SysPropertySheet"
-#define WC_PROPSHEET32W      L"SysPropertySheet"
+#define WC_PROPSHEETA      "SysPropertySheet"
+#define WC_PROPSHEETW      L"SysPropertySheet"
 #define WC_PROPSHEET         WINELIB_NAME_AW(WC_PROPSHEET)
 
-struct _PROPSHEETPAGE32A;  /** need to forward declare those structs **/
-struct _PROPSHEETPAGE32W;
+struct _PROPSHEETPAGEA;  /** need to forward declare those structs **/
+struct _PROPSHEETPAGEW;
 struct _PSP;
 typedef struct _PSP *HPROPSHEETPAGE;
 
 
-typedef UINT32 (CALLBACK *LPFNPSPCALLBACK32A)(HWND32, UINT32, struct _PROPSHEETPAGE32A*);
-typedef UINT32 (CALLBACK *LPFNPSPCALLBACK32W)(HWND32, UINT32, struct _PROPSHEETPAGE32W*);
-typedef INT32  (CALLBACK *PFNPROPSHEETCALLBACK32)(HWND32, UINT32, LPARAM);
-typedef BOOL32 (CALLBACK *LPFNADDPROPSHEETPAGE)(HPROPSHEETPAGE, LPARAM);
-typedef BOOL32 (CALLBACK *LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPARAM);
+typedef UINT (CALLBACK *LPFNPSPCALLBACKA)(HWND, UINT, struct _PROPSHEETPAGEA*);
+typedef UINT (CALLBACK *LPFNPSPCALLBACKW)(HWND, UINT, struct _PROPSHEETPAGEW*);
+typedef INT  (CALLBACK *PFNPROPSHEETCALLBACK)(HWND, UINT, LPARAM);
+typedef BOOL (CALLBACK *LPFNADDPROPSHEETPAGE)(HPROPSHEETPAGE, LPARAM);
+typedef BOOL (CALLBACK *LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPARAM);
 
 /* c++ likes nameless unions whereas c doesnt */
 /* (used in property sheet structures)        */
@@ -50,11 +50,11 @@ typedef BOOL32 (CALLBACK *LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, L
 /*
  * Property sheet support (structures)
  */
-typedef struct _PROPSHEETPAGE32A
+typedef struct _PROPSHEETPAGEA
 {
     DWORD              dwSize;
     DWORD              dwFlags;
-    HINSTANCE32        hInstance;
+    HINSTANCE        hInstance;
     union 
     {
         LPCSTR           pszTemplate;
@@ -62,25 +62,25 @@ typedef struct _PROPSHEETPAGE32A
     }DUMMYUNIONNAME1;
     union
     {
-        HICON32          hIcon;
+        HICON          hIcon;
         LPCSTR           pszIcon;
     }DUMMYUNIONNAME2;
     LPCSTR             pszTitle;
-    DLGPROC32          pfnDlgProc;
+    DLGPROC          pfnDlgProc;
     LPARAM             lParam;
-    LPFNPSPCALLBACK32A pfnCallback;
-    UINT32*            pcRefParent;
+    LPFNPSPCALLBACKA pfnCallback;
+    UINT*            pcRefParent;
     LPCWSTR            pszHeaderTitle;
     LPCWSTR            pszHeaderSubTitle;
-} PROPSHEETPAGE32A, *LPPROPSHEETPAGE32A;
+} PROPSHEETPAGEA, *LPPROPSHEETPAGEA;
 
-typedef const PROPSHEETPAGE32A *LPCPROPSHEETPAGE32A;
+typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA;
 
-typedef struct _PROPSHEETPAGE32W
+typedef struct _PROPSHEETPAGEW
 {
     DWORD               dwSize;
     DWORD               dwFlags;
-    HINSTANCE32         hInstance;
+    HINSTANCE         hInstance;
     union 
     {
         LPCWSTR          pszTemplate;
@@ -88,111 +88,110 @@ typedef struct _PROPSHEETPAGE32W
     }DUMMYUNIONNAME1;
     union
     {
-        HICON32          hIcon;
+        HICON          hIcon;
         LPCWSTR          pszIcon;
     }DUMMYUNIONNAME2;
     LPCWSTR            pszTitle;
-    DLGPROC32          pfnDlgProc;
+    DLGPROC          pfnDlgProc;
     LPARAM             lParam;
-    LPFNPSPCALLBACK32W pfnCallback;
-    UINT32*            pcRefParent;
+    LPFNPSPCALLBACKW pfnCallback;
+    UINT*            pcRefParent;
     LPCWSTR            pszHeaderTitle;
     LPCWSTR            pszHeaderSubTitle;
-} PROPSHEETPAGE32W, *LPPROPSHEETPAGE32W;
+} PROPSHEETPAGEW, *LPPROPSHEETPAGEW;
 
-typedef const PROPSHEETPAGE32W *LPCPROPSHEETPAGE32W;
+typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW;
 
 
-typedef struct _PROPSHEETHEADER32A
+typedef struct _PROPSHEETHEADERA
 {
     DWORD                    dwSize;
     DWORD                    dwFlags;
-    HWND32                   hwndParent;
-    HINSTANCE32              hInstance;
+    HWND                   hwndParent;
+    HINSTANCE              hInstance;
     union
     {
-      HICON32                  hIcon;
+      HICON                  hIcon;
       LPCSTR                   pszIcon;
     }DUMMYUNIONNAME1;
     LPCSTR                   pszCaption;
-    UINT32                   nPages;
+    UINT                   nPages;
     union
     {
-        UINT32                 nStartPage;
+        UINT                 nStartPage;
         LPCSTR                 pStartPage;
     }DUMMYUNIONNAME2;
     union
     {
-        LPCPROPSHEETPAGE32A    ppsp;
+        LPCPROPSHEETPAGEA    ppsp;
         HPROPSHEETPAGE*        phpage;
     }DUMMYUNIONNAME3;
-    PFNPROPSHEETCALLBACK32   pfnCallback;
+    PFNPROPSHEETCALLBACK   pfnCallback;
     union
     {
-        HBITMAP32              hbmWatermark;
+        HBITMAP              hbmWatermark;
         LPCSTR                 pszbmWatermark;
     }DUMMYUNIONNAME4;
-    HPALETTE32               hplWatermark;
+    HPALETTE               hplWatermark;
     union
     {
-        HBITMAP32              hbmHeader;
+        HBITMAP              hbmHeader;
         LPCSTR                 pszbmHeader;
     }DUMMYUNIONNAME5;
-} PROPSHEETHEADER32A, *LPPROPSHEETHEADER32A;
+} PROPSHEETHEADERA, *LPPROPSHEETHEADERA;
 
-typedef const PROPSHEETHEADER32A *LPCPROPSHEETHEADER32A;
+typedef const PROPSHEETHEADERA *LPCPROPSHEETHEADERA;
 
-typedef struct _PROPSHEETHEADER32W
+typedef struct _PROPSHEETHEADERW
 {
     DWORD                    dwSize;
     DWORD                    dwFlags;
-    HWND32                   hwndParent;
-    HINSTANCE32              hInstance;
+    HWND                   hwndParent;
+    HINSTANCE              hInstance;
     union
     {
-      HICON32                  hIcon;
+      HICON                  hIcon;
       LPCSTR                   pszIcon;
     }DUMMYUNIONNAME1;
     LPCWSTR                  pszCaption;
-    UINT32                   nPages;
+    UINT                   nPages;
     union
     {
-        UINT32                 nStartPage;
+        UINT                 nStartPage;
         LPCWSTR                pStartPage;
     }DUMMYUNIONNAME2;
     union
     {
-        LPCPROPSHEETPAGE32W    ppsp;
+        LPCPROPSHEETPAGEW    ppsp;
         HPROPSHEETPAGE*        phpage;
     }DUMMYUNIONNAME3;
-    PFNPROPSHEETCALLBACK32   pfnCallback;
+    PFNPROPSHEETCALLBACK   pfnCallback;
     union
     {
-        HBITMAP32              hbmWatermark;
+        HBITMAP              hbmWatermark;
         LPCWSTR                pszbmWatermark;
     }DUMMYUNIONNAME4;
-    HPALETTE32               hplWatermark;
+    HPALETTE               hplWatermark;
     union
     {
-        HBITMAP32              hbmHeader;
+        HBITMAP              hbmHeader;
         LPCWSTR                pszbmHeader;
     }DUMMYUNIONNAME5;
-} PROPSHEETHEADER32W, *LPPROPSHEETHEADER32W;
+} PROPSHEETHEADERW, *LPPROPSHEETHEADERW;
 
-typedef const PROPSHEETHEADER32W *LPCPROPSHEETHEADER32W;
+typedef const PROPSHEETHEADERW *LPCPROPSHEETHEADERW;
 
 
 /*
  * Property sheet support (methods)
  */
-INT32 WINAPI PropertySheet32A(LPCPROPSHEETHEADER32A);
-INT32 WINAPI PropertySheet32W(LPCPROPSHEETHEADER32W);
+INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA);
+INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW);
 #define PropertySheet WINELIB_NAME_AW(PropertySheet)
-HPROPSHEETPAGE WINAPI CreatePropertySheetPage32A(LPCPROPSHEETPAGE32A);
-HPROPSHEETPAGE WINAPI CreatePropertySheetPage32W(LPCPROPSHEETPAGE32W);
+HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(LPCPROPSHEETPAGEA);
+HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW);
 #define CreatePropertySheetPage WINELIB_NAME_AW(CreatePropertySheetPage)
-BOOL32 WINAPI DestroyPropertySheetPage32(HPROPSHEETPAGE hPropPage);
-#define DestroyPropertySheetPage WINELIB_NAME(DestroyPropertySheetPage)
+BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage);
 
 /*
  * Property sheet support (UNICODE-WineLib)
@@ -205,7 +204,6 @@ DECL_WINELIB_TYPE_AW(PROPSHEETHEADER)
 DECL_WINELIB_TYPE_AW(LPPROPSHEETHEADER) 
 DECL_WINELIB_TYPE_AW(LPCPROPSHEETHEADER) 
 DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK) 
-DECL_WINELIB_TYPE(PFNPROPSHEETCALLBACK) 
 
 
 /*
@@ -273,14 +271,14 @@ DECL_WINELIB_TYPE(PFNPROPSHEETCALLBACK)
 #define PSM_QUERYSIBLINGS       (WM_USER + 108)
 #define PSM_UNCHANGED           (WM_USER + 109)
 #define PSM_APPLY               (WM_USER + 110)
-#define PSM_SETTITLE32A         (WM_USER + 111)
-#define PSM_SETTITLE32W         (WM_USER + 120)
+#define PSM_SETTITLEA         (WM_USER + 111)
+#define PSM_SETTITLEW         (WM_USER + 120)
 #define PSM_SETTITLE WINELIB_NAME_AW(PSM_SETTITLE)
 #define PSM_SETWIZBUTTONS       (WM_USER + 112)
 #define PSM_PRESSBUTTON         (WM_USER + 113)
 #define PSM_SETCURSELID         (WM_USER + 114)
-#define PSM_SETFINISHTEXT32A    (WM_USER + 115)
-#define PSM_SETFINISHTEXT32W    (WM_USER + 121)
+#define PSM_SETFINISHTEXTA    (WM_USER + 115)
+#define PSM_SETFINISHTEXTW    (WM_USER + 121)
 #define PSM_SETFINISHTEXT WINELIB_NAME_AW(PSM_SETFINISHTEXT)
 #define PSM_GETTABCONTROL       (WM_USER + 116)
 #define PSM_ISDIALOGMESSAGE     (WM_USER + 117)
@@ -326,7 +324,7 @@ DECL_WINELIB_TYPE(PFNPROPSHEETCALLBACK)
  */
 
 #define PropSheet_SetCurSel(hDlg, hpage, index) \
-	SeandMessage32A(hDlg, PSM_SETCURSEL, (WPARAM32)index, (LPARAM)hpage)
+	SeandMessage32A(hDlg, PSM_SETCURSEL, (WPARAM)index, (LPARAM)hpage)
 	 
 #define PropSheet_RemovePage(hDlg, index, hpage) \
 	SNDMSG(hDlg, PSM_REMOVEPAGE, index, (LPARAM)hpage)
diff --git a/include/psapi.h b/include/psapi.h
index fd4ff943f3d..389bad8eb1f 100644
--- a/include/psapi.h
+++ b/include/psapi.h
@@ -5,13 +5,13 @@
 #ifndef __WINE_PSAPI_H
 #define __WINE_PSAPI_H
 
-typedef struct _MODULEINFO32 {
+typedef struct _MODULEINFO {
   LPVOID lpBaseOfDll;
   DWORD SizeOfImage;
   LPVOID EntryPoint;
-} MODULEINFO32, *LPMODULEINFO32;
+} MODULEINFO, *LPMODULEINFO;
 
-typedef struct _PROCESS_MEMORY_COUNTERS32 {  
+typedef struct _PROCESS_MEMORY_COUNTERS {  
   DWORD cb;    
   DWORD PageFaultCount;
   DWORD PeakWorkingSetSize;
@@ -22,12 +22,12 @@ typedef struct _PROCESS_MEMORY_COUNTERS32 {
   DWORD QuotaNonPagedPoolUsage;
   DWORD PagefileUsage;    
   DWORD PeakPagefileUsage;
-} PROCESS_MEMORY_COUNTERS32;
-typedef PROCESS_MEMORY_COUNTERS32 *PPROCESS_MEMORY_COUNTERS32;
+} PROCESS_MEMORY_COUNTERS;
+typedef PROCESS_MEMORY_COUNTERS *PPROCESS_MEMORY_COUNTERS;
 
-typedef struct _PSAPI_WS_WATCH_INFORMATION32 {
+typedef struct _PSAPI_WS_WATCH_INFORMATION {
   LPVOID FaultingPc;
   LPVOID FaultingVa;
-} PSAPI_WS_WATCH_INFORMATION32, *PPSAPI_WS_WATCH_INFORMATION32;
+} PSAPI_WS_WATCH_INFORMATION, *PPSAPI_WS_WATCH_INFORMATION;
 
 #endif  /* __WINE_PSAPI_H */
diff --git a/include/psdrv.h b/include/psdrv.h
index 110e1dbe822..3aa5946fc8e 100644
--- a/include/psdrv.h
+++ b/include/psdrv.h
@@ -37,7 +37,7 @@ typedef struct _tagAFM {
     char		*EncodingScheme;
     int			Weight;			/* FW_NORMAL etc. */
     float		ItalicAngle;
-    BOOL32		IsFixedPitch;
+    BOOL		IsFixedPitch;
     float		UnderlinePosition;
     float		UnderlineThickness;
     AFMBBOX		FontBBox;
@@ -127,7 +127,7 @@ typedef struct _tagINPUTSLOT {
 typedef struct {
     char		*NickName;
     int			LanguageLevel;
-    BOOL32		ColorDevice;
+    BOOL		ColorDevice;
     int			DefaultResolution;
     signed int		LandscapeOrientation;
     char		*JCLBegin;
@@ -147,7 +147,7 @@ typedef struct {
     }				dmDocPrivate;
     struct _tagdrvprivate {
       char	ppdFileName[100]; /* Hack */
-      UINT32	numInstalledOptions; /* Options at end of struct */
+      UINT	numInstalledOptions; /* Options at end of struct */
     }				dmDrvPrivate;
 
 /* Now comes:
@@ -189,32 +189,32 @@ typedef struct {
 
 typedef struct {
     AFM			*afm;
-    TEXTMETRIC32A	tm;
-    INT32		size;
+    TEXTMETRICA	tm;
+    INT		size;
     float		scale;
-    INT32		escapement;
+    INT		escapement;
     PSCOLOR		color;
-    BOOL32		set;		/* Have we done a setfont yet */
+    BOOL		set;		/* Have we done a setfont yet */
 } PSFONT;
 
 typedef struct {
     PSCOLOR		color;
-    BOOL32		set;
+    BOOL		set;
 } PSBRUSH;
 
 typedef struct {
-    INT32		width;
+    INT		width;
     char		*dash;
     PSCOLOR		color;
-    BOOL32		set;
+    BOOL		set;
 } PSPEN;
 
 typedef struct {
     HANDLE16		hJob;
     LPSTR		output;		/* Output file/port */
-    BOOL32              banding;        /* Have we received a NEXTBAND */
-    BOOL32		NeedPageHeader; /* Page header not sent yet */
-    INT32		PageNo;
+    BOOL              banding;        /* Have we received a NEXTBAND */
+    BOOL		NeedPageHeader; /* Page header not sent yet */
+    INT		PageNo;
 } JOB;
 
 typedef struct {
@@ -228,109 +228,109 @@ typedef struct {
     PRINTERINFO		*pi;
 } PSDRV_PDEVICE;
 
-extern HANDLE32 PSDRV_Heap;
+extern HANDLE PSDRV_Heap;
 extern char *PSDRV_ANSIVector[256];
 
 extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE16 *dm1, PSDRV_DEVMODE16 *dm2,
 			 PRINTERINFO *pi);
-extern BOOL32 PSDRV_GetFontMetrics(void);
+extern BOOL PSDRV_GetFontMetrics(void);
 extern PPD *PSDRV_ParsePPD(char *fname);
 extern PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name);
 extern AFM *PSDRV_FindAFMinList(FONTFAMILY *head, char *name);
 extern void PSDRV_AddAFMtoList(FONTFAMILY **head, AFM *afm);
 extern void PSDRV_FreeAFMList( FONTFAMILY *head );
 
-extern BOOL32 PSDRV_Init(void);
+extern BOOL PSDRV_Init(void);
 extern HFONT16 PSDRV_FONT_SelectObject( DC *dc, HFONT16 hfont, FONTOBJ *font);
-extern HPEN32 PSDRV_PEN_SelectObject( DC * dc, HPEN32 hpen, PENOBJ * pen );
-extern HBRUSH32 PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH32 hbrush,
+extern HPEN PSDRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen );
+extern HBRUSH PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush,
 					  BRUSHOBJ * brush );
 
-extern BOOL32 PSDRV_Brush(DC *dc, BOOL32 EO);
-extern BOOL32 PSDRV_SetFont( DC *dc );
-extern BOOL32 PSDRV_SetPen( DC *dc );
+extern BOOL PSDRV_Brush(DC *dc, BOOL EO);
+extern BOOL PSDRV_SetFont( DC *dc );
+extern BOOL PSDRV_SetPen( DC *dc );
 
-extern BOOL32 PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2);
-extern BOOL32 PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2);
+extern BOOL PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2);
+extern BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2);
 extern void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor,
 		     COLORREF wincolor );
 
 
-extern INT32 PSDRV_WriteHeader( DC *dc, char *title, int len );
-extern INT32 PSDRV_WriteFooter( DC *dc );
-extern INT32 PSDRV_WriteNewPage( DC *dc );
-extern INT32 PSDRV_WriteEndPage( DC *dc );
-extern BOOL32 PSDRV_WriteMoveTo(DC *dc, INT32 x, INT32 y);
-extern BOOL32 PSDRV_WriteLineTo(DC *dc, INT32 x, INT32 y);
-extern BOOL32 PSDRV_WriteStroke(DC *dc);
-extern BOOL32 PSDRV_WriteRectangle(DC *dc, INT32 x, INT32 y, INT32 width, 
-			INT32 height);
-extern BOOL32 PSDRV_WriteSetFont(DC *dc, BOOL32 UseANSI);
-extern BOOL32 PSDRV_WriteShow(DC *dc, char *str, INT32 count);
-extern BOOL32 PSDRV_WriteReencodeFont(DC *dc);
-extern BOOL32 PSDRV_WriteSetPen(DC *dc);
-extern BOOL32 PSDRV_WriteArc(DC *dc, INT32 x, INT32 y, INT32 w, INT32 h,
+extern INT PSDRV_WriteHeader( DC *dc, char *title, int len );
+extern INT PSDRV_WriteFooter( DC *dc );
+extern INT PSDRV_WriteNewPage( DC *dc );
+extern INT PSDRV_WriteEndPage( DC *dc );
+extern BOOL PSDRV_WriteMoveTo(DC *dc, INT x, INT y);
+extern BOOL PSDRV_WriteLineTo(DC *dc, INT x, INT y);
+extern BOOL PSDRV_WriteStroke(DC *dc);
+extern BOOL PSDRV_WriteRectangle(DC *dc, INT x, INT y, INT width, 
+			INT height);
+extern BOOL PSDRV_WriteSetFont(DC *dc, BOOL UseANSI);
+extern BOOL PSDRV_WriteShow(DC *dc, char *str, INT count);
+extern BOOL PSDRV_WriteReencodeFont(DC *dc);
+extern BOOL PSDRV_WriteSetPen(DC *dc);
+extern BOOL PSDRV_WriteArc(DC *dc, INT x, INT y, INT w, INT h,
 			     double ang1, double ang2);
-extern BOOL32 PSDRV_WriteSetColor(DC *dc, PSCOLOR *color);
-extern BOOL32 PSDRV_WriteSetBrush(DC *dc);
-extern BOOL32 PSDRV_WriteFill(DC *dc);
-extern BOOL32 PSDRV_WriteEOFill(DC *dc);
-extern BOOL32 PSDRV_WriteGSave(DC *dc);
-extern BOOL32 PSDRV_WriteGRestore(DC *dc);
-extern BOOL32 PSDRV_WriteClosePath(DC *dc);
-extern BOOL32 PSDRV_WriteClip(DC *dc);
-extern BOOL32 PSDRV_WriteEOClip(DC *dc);
-extern BOOL32 PSDRV_WriteHatch(DC *dc);
-extern BOOL32 PSDRV_WriteRotate(DC *dc, float ang);
-
-
-
-
-
-extern BOOL32 PSDRV_Arc( DC *dc, INT32 left, INT32 top, INT32 right,
-			 INT32 bottom, INT32 xstart, INT32 ystart,
-			 INT32 xend, INT32 yend );
-extern BOOL32 PSDRV_Chord( DC *dc, INT32 left, INT32 top, INT32 right,
-			   INT32 bottom, INT32 xstart, INT32 ystart,
-			   INT32 xend, INT32 yend );
-extern BOOL32 PSDRV_Ellipse( DC *dc, INT32 left, INT32 top, INT32 right,
-			     INT32 bottom );
-extern BOOL32 PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
+extern BOOL PSDRV_WriteSetColor(DC *dc, PSCOLOR *color);
+extern BOOL PSDRV_WriteSetBrush(DC *dc);
+extern BOOL PSDRV_WriteFill(DC *dc);
+extern BOOL PSDRV_WriteEOFill(DC *dc);
+extern BOOL PSDRV_WriteGSave(DC *dc);
+extern BOOL PSDRV_WriteGRestore(DC *dc);
+extern BOOL PSDRV_WriteClosePath(DC *dc);
+extern BOOL PSDRV_WriteClip(DC *dc);
+extern BOOL PSDRV_WriteEOClip(DC *dc);
+extern BOOL PSDRV_WriteHatch(DC *dc);
+extern BOOL PSDRV_WriteRotate(DC *dc, float ang);
+
+
+
+
+
+extern BOOL PSDRV_Arc( DC *dc, INT left, INT top, INT right,
+			 INT bottom, INT xstart, INT ystart,
+			 INT xend, INT yend );
+extern BOOL PSDRV_Chord( DC *dc, INT left, INT top, INT right,
+			   INT bottom, INT xstart, INT ystart,
+			   INT xend, INT yend );
+extern BOOL PSDRV_Ellipse( DC *dc, INT left, INT top, INT right,
+			     INT bottom );
+extern BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
 				     DEVICEFONTENUMPROC proc, LPARAM lp );
-extern INT32 PSDRV_Escape( DC *dc, INT32 nEscape, INT32 cbInput, 
+extern INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput, 
 			   SEGPTR lpInData, SEGPTR lpOutData );
-extern BOOL32 PSDRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
-				const RECT32 *lprect, LPCSTR str, UINT32 count,
-				const INT32 *lpDx );
-extern BOOL32 PSDRV_GetCharWidth( DC *dc, UINT32 firstChar, UINT32 lastChar,
-				  LPINT32 buffer );
-extern BOOL32 PSDRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT32 count,
-					LPSIZE32 size );
-extern BOOL32 PSDRV_GetTextMetrics( DC *dc, TEXTMETRIC32A *metrics );
-extern BOOL32 PSDRV_LineTo( DC *dc, INT32 x, INT32 y );
-extern BOOL32 PSDRV_MoveToEx( DC *dc, INT32 x, INT32 y, LPPOINT32 pt );
-extern BOOL32 PSDRV_Pie( DC *dc, INT32 left, INT32 top, INT32 right,
-			 INT32 bottom, INT32 xstart, INT32 ystart,
-			 INT32 xend, INT32 yend );
-extern BOOL32 PSDRV_Polygon( DC *dc, const POINT32* pt, INT32 count );
-extern BOOL32 PSDRV_Polyline( DC *dc, const POINT32* pt, INT32 count );
-extern BOOL32 PSDRV_PolyPolygon( DC *dc, const POINT32* pts, const INT32* counts,
-				 UINT32 polygons );
-extern BOOL32 PSDRV_PolyPolyline( DC *dc, const POINT32* pts, const DWORD* counts,
+extern BOOL PSDRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
+				const RECT *lprect, LPCSTR str, UINT count,
+				const INT *lpDx );
+extern BOOL PSDRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
+				  LPINT buffer );
+extern BOOL PSDRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
+					LPSIZE size );
+extern BOOL PSDRV_GetTextMetrics( DC *dc, TEXTMETRICA *metrics );
+extern BOOL PSDRV_LineTo( DC *dc, INT x, INT y );
+extern BOOL PSDRV_MoveToEx( DC *dc, INT x, INT y, LPPOINT pt );
+extern BOOL PSDRV_Pie( DC *dc, INT left, INT top, INT right,
+			 INT bottom, INT xstart, INT ystart,
+			 INT xend, INT yend );
+extern BOOL PSDRV_Polygon( DC *dc, const POINT* pt, INT count );
+extern BOOL PSDRV_Polyline( DC *dc, const POINT* pt, INT count );
+extern BOOL PSDRV_PolyPolygon( DC *dc, const POINT* pts, const INT* counts,
+				 UINT polygons );
+extern BOOL PSDRV_PolyPolyline( DC *dc, const POINT* pts, const DWORD* counts,
 				  DWORD polylines );
-extern BOOL32 PSDRV_Rectangle( DC *dc, INT32 left, INT32 top, INT32 right,
-			      INT32 bottom );
-extern BOOL32 PSDRV_RoundRect(DC *dc, INT32 left, INT32 top, INT32 right,
-			      INT32 bottom, INT32 ell_width, INT32 ell_height);
-extern HGDIOBJ32 PSDRV_SelectObject( DC *dc, HGDIOBJ32 handle );
+extern BOOL PSDRV_Rectangle( DC *dc, INT left, INT top, INT right,
+			      INT bottom );
+extern BOOL PSDRV_RoundRect(DC *dc, INT left, INT top, INT right,
+			      INT bottom, INT ell_width, INT ell_height);
+extern HGDIOBJ PSDRV_SelectObject( DC *dc, HGDIOBJ handle );
 extern COLORREF PSDRV_SetBkColor( DC *dc, COLORREF color );
-extern COLORREF PSDRV_SetPixel( DC *dc, INT32 x, INT32 y, COLORREF color );
+extern COLORREF PSDRV_SetPixel( DC *dc, INT x, INT y, COLORREF color );
 extern COLORREF PSDRV_SetTextColor( DC *dc, COLORREF color );
-extern INT32 PSDRV_StretchDIBits( DC *dc, INT32 xDst, INT32 yDst,
-				  INT32 widthDst, INT32 heightDst, INT32 xSrc,
-				  INT32 ySrc, INT32 widthSrc, INT32 heightSrc,
+extern INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst,
+				  INT widthDst, INT heightDst, INT xSrc,
+				  INT ySrc, INT widthSrc, INT heightSrc,
 				  const void *bits, const BITMAPINFO *info,
-				  UINT32 wUsage, DWORD dwRop );
+				  UINT wUsage, DWORD dwRop );
 
 #endif
 
diff --git a/include/queue.h b/include/queue.h
index 13ebb499da1..f8f375e7359 100644
--- a/include/queue.h
+++ b/include/queue.h
@@ -15,7 +15,7 @@
   /* Message as stored in the queue (contains the extraInfo field) */
 typedef struct tagQMSG
 {
-    MSG32   msg;
+    MSG   msg;
     DWORD   extraInfo;  /* Only in 3.1 */
     
     struct tagQMSG *nextMsg;
@@ -32,9 +32,9 @@ typedef struct tagSMSG
     HQUEUE16       hSrcQueue;       /* sending Queue, (NULL if it didn't wait) */
     HQUEUE16       hDstQueue;       /* destination Queue */
 
-    HWND32         hWnd;            /* destinantion window */
-    UINT32         msg;             /* message sent */
-    WPARAM32       wParam;          /* wParam of the sent message */
+    HWND         hWnd;            /* destinantion window */
+    UINT         msg;             /* message sent */
+    WPARAM       wParam;          /* wParam of the sent message */
     LPARAM         lParam;          /* lParam of the sent message */
 
     LRESULT        lResult;         /* result of SendMessage */
@@ -68,9 +68,9 @@ typedef struct tagSMSG
  */
 typedef struct tagPERQUEUEDATA      
 {
-  HWND32    hWndFocus;              /* Focus window */
-  HWND32    hWndActive;             /* Active window */
-  HWND32    hWndCapture;            /* Capture window */
+  HWND    hWndFocus;              /* Focus window */
+  HWND    hWndActive;             /* Active window */
+  HWND    hWndCapture;            /* Capture window */
   INT16     nCaptureHT;             /* Capture info (hit-test) */
   ULONG     ulRefCount;             /* Reference count */
   CRITICAL_SECTION cSection;        /* Critical section for thread safe access */
@@ -82,7 +82,7 @@ typedef struct tagMESSAGEQUEUE
   HQUEUE16  next;                   /* Next queue */
   HQUEUE16  self;                   /* Handle to self (was: reserved) */
   THDB*     thdb;                   /* Thread owning queue */
-  HANDLE32  hEvent;                 /* Event handle */
+  HANDLE  hEvent;                 /* Event handle */
   CRITICAL_SECTION cSection;        /* Queue access critical section */
 
   DWORD     magic;                  /* magic number should be QUEUE_MAGIC */
@@ -132,12 +132,12 @@ typedef struct tagMESSAGEQUEUE
 PERQUEUEDATA* PERQDATA_CreateInstance( void );
 ULONG PERQDATA_Addref( PERQUEUEDATA* pQData );
 ULONG PERQDATA_Release( PERQUEUEDATA* pQData );
-HWND32 PERQDATA_GetFocusWnd( PERQUEUEDATA *pQData );
-HWND32 PERQDATA_SetFocusWnd( PERQUEUEDATA *pQData, HWND32 hWndFocus );
-HWND32 PERQDATA_GetActiveWnd( PERQUEUEDATA *pQData );
-HWND32 PERQDATA_SetActiveWnd( PERQUEUEDATA *pQData, HWND32 hWndActive );
-HWND32 PERQDATA_GetCaptureWnd( PERQUEUEDATA *pQData );
-HWND32 PERQDATA_SetCaptureWnd( PERQUEUEDATA *pQData, HWND32 hWndCapture );
+HWND PERQDATA_GetFocusWnd( PERQUEUEDATA *pQData );
+HWND PERQDATA_SetFocusWnd( PERQUEUEDATA *pQData, HWND hWndFocus );
+HWND PERQDATA_GetActiveWnd( PERQUEUEDATA *pQData );
+HWND PERQDATA_SetActiveWnd( PERQUEUEDATA *pQData, HWND hWndActive );
+HWND PERQDATA_GetCaptureWnd( PERQUEUEDATA *pQData );
+HWND PERQDATA_SetCaptureWnd( PERQUEUEDATA *pQData, HWND hWndCapture );
 INT16  PERQDATA_GetCaptureInfo( PERQUEUEDATA *pQData );
 INT16 PERQDATA_SetCaptureInfo( PERQUEUEDATA *pQData, INT16 nCaptureHT );
     
@@ -146,7 +146,7 @@ extern MESSAGEQUEUE *QUEUE_Lock( HQUEUE16 hQueue );
 extern void QUEUE_Unlock( MESSAGEQUEUE *queue );
 extern void QUEUE_DumpQueue( HQUEUE16 hQueue );
 extern void QUEUE_WalkQueues(void);
-extern BOOL32 QUEUE_IsExitingQueue( HQUEUE16 hQueue );
+extern BOOL QUEUE_IsExitingQueue( HQUEUE16 hQueue );
 extern void QUEUE_SetExitingQueue( HQUEUE16 hQueue );
 extern MESSAGEQUEUE *QUEUE_GetSysQueue(void);
 extern void QUEUE_SetWakeBit( MESSAGEQUEUE *queue, WORD bit );
@@ -157,18 +157,18 @@ extern void QUEUE_IncPaintCount( HQUEUE16 hQueue );
 extern void QUEUE_DecPaintCount( HQUEUE16 hQueue );
 extern void QUEUE_IncTimerCount( HQUEUE16 hQueue );
 extern void QUEUE_DecTimerCount( HQUEUE16 hQueue );
-extern BOOL32 QUEUE_CreateSysMsgQueue( int size );
-extern BOOL32 QUEUE_DeleteMsgQueue( HQUEUE16 hQueue );
+extern BOOL QUEUE_CreateSysMsgQueue( int size );
+extern BOOL QUEUE_DeleteMsgQueue( HQUEUE16 hQueue );
 extern HTASK16 QUEUE_GetQueueTask( HQUEUE16 hQueue );
-extern BOOL32 QUEUE_AddMsg( HQUEUE16 hQueue, MSG32 * msg, DWORD extraInfo );
-extern QMSG* QUEUE_FindMsg( MESSAGEQUEUE * msgQueue, HWND32 hwnd,
+extern BOOL QUEUE_AddMsg( HQUEUE16 hQueue, MSG * msg, DWORD extraInfo );
+extern QMSG* QUEUE_FindMsg( MESSAGEQUEUE * msgQueue, HWND hwnd,
                           int first, int last );
 extern void QUEUE_RemoveMsg( MESSAGEQUEUE * msgQueue, QMSG *qmsg );
 extern SMSG *QUEUE_RemoveSMSG( MESSAGEQUEUE *queue, int list, SMSG *smsg );
-extern BOOL32 QUEUE_AddSMSG( MESSAGEQUEUE *queue, int list, SMSG *smsg );
+extern BOOL QUEUE_AddSMSG( MESSAGEQUEUE *queue, int list, SMSG *smsg );
 extern void hardware_event( WORD message, WORD wParam, LONG lParam,
 			    int xPos, int yPos, DWORD time, DWORD extraInfo );
 
-extern HQUEUE16 WINAPI InitThreadInput( WORD unknown, WORD flags );
+extern HQUEUE16 WINAPI InitThreadInput16( WORD unknown, WORD flags );
 
 #endif  /* __WINE_QUEUE_H */
diff --git a/include/ras.h b/include/ras.h
index 497ead663a3..c988984bc94 100644
--- a/include/ras.h
+++ b/include/ras.h
@@ -5,11 +5,11 @@
 
 #define RAS_MaxEntryName	256
 
-typedef struct tagRASCONN32A {
+typedef struct tagRASCONNA {
 	DWORD		dwSize;
-	HRASCONN32	hRasConn;
+	HRASCONN	hRasConn;
 	CHAR		szEntryName[RAS_MaxEntryName+1];
-} RASCONN32A,*LPRASCONN32A;
+} RASCONNA,*LPRASCONNA;
 
-DWORD WINAPI RasEnumConnections32A( LPRASCONN32A rc, LPDWORD x, LPDWORD y);
+DWORD WINAPI RasEnumConnectionsA( LPRASCONNA rc, LPDWORD x, LPDWORD y);
 #endif
diff --git a/include/rebar.h b/include/rebar.h
index d5033be2192..f704f311414 100644
--- a/include/rebar.h
+++ b/include/rebar.h
@@ -9,33 +9,33 @@
 
 typedef struct tagREBAR_BAND
 {
-    UINT32    fStyle;
+    UINT    fStyle;
     COLORREF  clrFore;
     COLORREF  clrBack;
-    INT32     iImage;
-    HWND32    hwndChild;
-    UINT32    cxMinChild;
-    UINT32    cyMinChild;
-    UINT32    cx;
-    HBITMAP32 hbmBack;
-    UINT32    wID;
-    UINT32    cyChild;
-    UINT32    cyMaxChild;
-    UINT32    cyIntegral;
-    UINT32    cxIdeal;
+    INT     iImage;
+    HWND    hwndChild;
+    UINT    cxMinChild;
+    UINT    cyMinChild;
+    UINT    cx;
+    HBITMAP hbmBack;
+    UINT    wID;
+    UINT    cyChild;
+    UINT    cyMaxChild;
+    UINT    cyIntegral;
+    UINT    cxIdeal;
     LPARAM    lParam;
-    UINT32    cxHeader;
+    UINT    cxHeader;
 
-    UINT32    uMinHeight;
-    UINT32    fDraw;          /* drawing flags */
-    RECT32    rcBand;         /* calculated band rectangle */
-    RECT32    rcGripper;      /* calculated gripper rectangle */
-    RECT32    rcCapImage;     /* calculated caption image rectangle */
-    RECT32    rcCapText;      /* calculated caption text rectangle */
-    RECT32    rcChild;        /* calculated child rectangle */
+    UINT    uMinHeight;
+    UINT    fDraw;          /* drawing flags */
+    RECT    rcBand;         /* calculated band rectangle */
+    RECT    rcGripper;      /* calculated gripper rectangle */
+    RECT    rcCapImage;     /* calculated caption image rectangle */
+    RECT    rcCapText;      /* calculated caption text rectangle */
+    RECT    rcChild;        /* calculated child rectangle */
 
     LPWSTR    lpText;
-    HWND32    hwndPrevParent;
+    HWND    hwndPrevParent;
 } REBAR_BAND;
 
 typedef struct tagREBAR_INFO
@@ -43,19 +43,19 @@ typedef struct tagREBAR_INFO
     COLORREF   clrBk;       /* background color */
     COLORREF   clrText;     /* text color */
     HIMAGELIST himl;        /* handle to imagelist */
-    UINT32     uNumBands;   /* number of bands in the rebar */
-    HWND32     hwndToolTip; /* handle to the tool tip control */
-    HWND32     hwndNotify;  /* notification window (parent) */
-    HFONT32    hFont;       /* handle to the rebar's font */
-    SIZE32     imageSize;   /* image size (image list) */
+    UINT     uNumBands;   /* number of bands in the rebar */
+    HWND     hwndToolTip; /* handle to the tool tip control */
+    HWND     hwndNotify;  /* notification window (parent) */
+    HFONT    hFont;       /* handle to the rebar's font */
+    SIZE     imageSize;   /* image size (image list) */
 
-    SIZE32     calcSize;    /* calculated rebar size */
-    BOOL32     bAutoResize; /* auto resize deadlock flag */
-    BOOL32     bUnicode;    /* Unicode flag */
-    HCURSOR32  hcurArrow;   /* handle to the arrow cursor */
-    HCURSOR32  hcurHorz;    /* handle to the EW cursor */
-    HCURSOR32  hcurVert;    /* handle to the NS cursor */
-    HCURSOR32  hcurDrag;    /* handle to the drag cursor */
+    SIZE     calcSize;    /* calculated rebar size */
+    BOOL     bAutoResize; /* auto resize deadlock flag */
+    BOOL     bUnicode;    /* Unicode flag */
+    HCURSOR  hcurArrow;   /* handle to the arrow cursor */
+    HCURSOR  hcurHorz;    /* handle to the EW cursor */
+    HCURSOR  hcurVert;    /* handle to the NS cursor */
+    HCURSOR  hcurDrag;    /* handle to the drag cursor */
 
     REBAR_BAND *bands;      /* pointer to the array of rebar bands */
 
diff --git a/include/region.h b/include/region.h
index d296f4877e1..42ddff88586 100644
--- a/include/region.h
+++ b/include/region.h
@@ -59,11 +59,11 @@ SOFTWARE.
 
 
 typedef struct {
-    INT32 size;
-    INT32 numRects;
-    INT32 type; /* NULL, SIMPLE or COMPLEX */
-    RECT32 *rects;
-    RECT32 extents;
+    INT size;
+    INT numRects;
+    INT type; /* NULL, SIMPLE or COMPLEX */
+    RECT *rects;
+    RECT extents;
 } WINEREGION;
 
   /* GDI logical region object */
@@ -88,7 +88,7 @@ typedef struct
 #define MEMCHECK(reg, rect, firstrect){\
         if ((reg)->numRects >= ((reg)->size - 1)){\
           (firstrect) = HeapReAlloc( SystemHeap, 0, \
-           (firstrect), (2 * (sizeof(RECT32)) * ((reg)->size)));\
+           (firstrect), (2 * (sizeof(RECT)) * ((reg)->size)));\
           if ((firstrect) == 0)\
             return;\
           (reg)->size *= 2;\
@@ -124,7 +124,7 @@ typedef struct
  */
 
 typedef struct _POINTBLOCK {
-    POINT32 pts[NUMPTSTOBUFFER];
+    POINT pts[NUMPTSTOBUFFER];
     struct _POINTBLOCK *next;
 } POINTBLOCK;
 
@@ -221,10 +221,10 @@ typedef struct _POINTBLOCK {
  *     register declarations.
  */
 typedef struct {
-    INT32 minor_axis;	/* minor axis        */
-    INT32 d;		/* decision variable */
-    INT32 m, m1;       	/* slope and slope+1 */
-    INT32 incr1, incr2;	/* error increments */
+    INT minor_axis;	/* minor axis        */
+    INT d;		/* decision variable */
+    INT m, m1;       	/* slope and slope+1 */
+    INT incr1, incr2;	/* error increments */
 } BRESINFO;
 
 
@@ -290,7 +290,7 @@ typedef struct {
 #define COUNTERCLOCKWISE  -1 
 
 typedef struct _EdgeTableEntry {
-     INT32 ymax;           /* ycoord at which we exit this edge. */
+     INT ymax;           /* ycoord at which we exit this edge. */
      BRESINFO bres;        /* Bresenham info to run the edge     */
      struct _EdgeTableEntry *next;       /* next in the list     */
      struct _EdgeTableEntry *back;       /* for insertion sort   */
@@ -300,15 +300,15 @@ typedef struct _EdgeTableEntry {
 
 
 typedef struct _ScanLineList{
-     INT32 scanline;            /* the scanline represented */
+     INT scanline;            /* the scanline represented */
      EdgeTableEntry *edgelist;  /* header node              */
      struct _ScanLineList *next;  /* next in the list       */
 } ScanLineList;
 
 
 typedef struct {
-     INT32 ymax;               /* ymax for the polygon     */
-     INT32 ymin;               /* ymin for the polygon     */
+     INT ymax;               /* ymax for the polygon     */
+     INT ymin;               /* ymin for the polygon     */
      ScanLineList scanlines;   /* header node              */
 } EdgeTable;
 
@@ -376,10 +376,10 @@ typedef struct _ScanLineListBlock {
    } \
 }
 
-extern BOOL32 REGION_DeleteObject( HRGN32 hrgn, RGNOBJ * obj );
-extern BOOL32 REGION_UnionRectWithRgn( HRGN32 hrgn, const RECT32 *lpRect );
-extern BOOL32 REGION_FrameRgn( HRGN32 dest, HRGN32 src, INT32 x, INT32 y );
-extern BOOL32 REGION_LPTODP( HDC32 hdc, HRGN32 hDest, HRGN32 hSrc );
+extern BOOL REGION_DeleteObject( HRGN hrgn, RGNOBJ * obj );
+extern BOOL REGION_UnionRectWithRgn( HRGN hrgn, const RECT *lpRect );
+extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y );
+extern BOOL REGION_LPTODP( HDC hdc, HRGN hDest, HRGN hSrc );
 
 #endif  /* __WINE_REGION_H */
 
diff --git a/include/scroll.h b/include/scroll.h
index eace4bbf03b..0912ee85421 100644
--- a/include/scroll.h
+++ b/include/scroll.h
@@ -12,18 +12,18 @@
 
 typedef struct
 {
-    INT32   CurVal;   /* Current scroll-bar value */
-    INT32   MinVal;   /* Minimum scroll-bar value */
-    INT32   MaxVal;   /* Maximum scroll-bar value */
-    INT32   Page;     /* Page size of scroll bar (Win32) */
-    UINT32  flags;    /* EnableScrollBar flags */
+    INT   CurVal;   /* Current scroll-bar value */
+    INT   MinVal;   /* Minimum scroll-bar value */
+    INT   MaxVal;   /* Maximum scroll-bar value */
+    INT   Page;     /* Page size of scroll bar (Win32) */
+    UINT  flags;    /* EnableScrollBar flags */
 } SCROLLBAR_INFO;
 
-extern LRESULT WINAPI ScrollBarWndProc( HWND32 hwnd, UINT32 uMsg,
-                                        WPARAM32 wParam, LPARAM lParam );
-extern void SCROLL_DrawScrollBar( HWND32 hwnd, HDC32 hdc, INT32 nBar,
-                                  BOOL32 arrows, BOOL32 interior );
-extern void SCROLL_HandleScrollEvent( HWND32 hwnd, INT32 nBar,
-                                      UINT32 msg, POINT32 pt );
+extern LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT uMsg,
+                                        WPARAM wParam, LPARAM lParam );
+extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar,
+                                  BOOL arrows, BOOL interior );
+extern void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar,
+                                      UINT msg, POINT pt );
 
 #endif  /* __WINE_SCROLL_H */
diff --git a/include/selectors.h b/include/selectors.h
index a203354b393..deb72ee0508 100644
--- a/include/selectors.h
+++ b/include/selectors.h
@@ -11,11 +11,11 @@
 #include "ldt.h"
 
 extern WORD SELECTOR_AllocBlock( const void *base, DWORD size,
-				 enum seg_type type, BOOL32 is32bit,
-				 BOOL32 readonly );
+				 enum seg_type type, BOOL is32bit,
+				 BOOL readonly );
 extern WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size,
-                                   enum seg_type type, BOOL32 is32bit,
-                                   BOOL32 readonly );
+                                   enum seg_type type, BOOL is32bit,
+                                   BOOL readonly );
 extern void SELECTOR_MoveBlock( WORD sel, const void *new_base );
 extern void SELECTOR_FreeBlock( WORD sel, WORD count );
 
diff --git a/include/shell.h b/include/shell.h
index b6f488fdbcc..4d80bbc3afb 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -16,8 +16,8 @@ extern void SHELL_SaveRegistry(void);
 extern void SHELL_Init(void);
 
 /* global functions used from shell32 */
-extern HINSTANCE32 SHELL_FindExecutable(LPCSTR,LPCSTR ,LPSTR);
-extern HGLOBAL16 WINAPI InternalExtractIcon(HINSTANCE16,LPCSTR,UINT16,WORD);
+extern HINSTANCE SHELL_FindExecutable(LPCSTR,LPCSTR ,LPSTR);
+extern HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD);
 
 /****************************************************************************
 * shell 32
@@ -75,28 +75,23 @@ typedef struct { 	   /* structure for dropped files */
 
 typedef struct { 	   /* structure for dropped files */ 
 	DWORD		lSize;
-	POINT32		ptMousePos;   
-	BOOL32		fInNonClientArea;
-        BOOL32          fWideChar;
+	POINT		ptMousePos;   
+	BOOL		fInNonClientArea;
+        BOOL          fWideChar;
 	/* memory block with filenames follows */     
-} DROPFILESTRUCT32, *LPDROPFILESTRUCT32; 
+} DROPFILESTRUCT, *LPDROPFILESTRUCT; 
 
-DECL_WINELIB_TYPE(DROPFILESTRUCT)
-DECL_WINELIB_TYPE(LPDROPFILESTRUCT)
 
 void        WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b);
-void        WINAPI DragAcceptFiles32(HWND32 hWnd, BOOL32 b);
-#define     DragAcceptFiles WINELIB_NAME(DragAcceptFiles)
+void        WINAPI DragAcceptFiles(HWND hWnd, BOOL b);
 UINT16      WINAPI DragQueryFile16(HDROP16 hDrop, WORD wFile, LPSTR lpszFile, WORD wLength);
-UINT32      WINAPI DragQueryFile32A(HDROP32 hDrop, UINT32 lFile, LPSTR lpszFile, UINT32 lLength);
-UINT32      WINAPI DragQueryFile32W(HDROP32 hDrop, UINT32 lFile, LPWSTR lpszFile, UINT32 lLength);
+UINT      WINAPI DragQueryFileA(HDROP hDrop, UINT lFile, LPSTR lpszFile, UINT lLength);
+UINT      WINAPI DragQueryFileW(HDROP hDrop, UINT lFile, LPWSTR lpszFile, UINT lLength);
 #define     DragQueryFile WINELIB_NAME_AW(DragQueryFile)
-void        WINAPI DragFinish32(HDROP32 h);
+void        WINAPI DragFinish(HDROP h);
 void        WINAPI DragFinish16(HDROP16 h);
-#define     DragFinish WINELIB_NAME(DragFinish)
-BOOL32      WINAPI DragQueryPoint32(HDROP32 hDrop, POINT32 *p);
+BOOL      WINAPI DragQueryPoint(HDROP hDrop, POINT *p);
 BOOL16      WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p);
-#define     DragQueryPoint WINELIB_NAME(DragQueryPoint)
 
 
 /****************************************************************************
@@ -104,11 +99,11 @@ BOOL16      WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p);
 */
 typedef struct _NOTIFYICONDATA {
 	DWORD cbSize;
-	HWND32 hWnd;
-	UINT32 uID;
-	UINT32 uFlags;
-	UINT32 uCallbackMessage;
-	HICON32 hIcon;
+	HWND hWnd;
+	UINT uID;
+	UINT uFlags;
+	UINT uCallbackMessage;
+	HICON hIcon;
 	CHAR szTip[64];
 } NOTIFYICONDATA, *PNOTIFYICONDATA;
 
@@ -126,78 +121,78 @@ typedef struct
 } ITEMIDLIST,*LPITEMIDLIST,*LPCITEMIDLIST;
 #pragma pack(4)
 
-DWORD WINAPI SHGetPathFromIDList32A (LPCITEMIDLIST pidl,LPSTR pszPath);
-DWORD WINAPI SHGetPathFromIDList32W (LPCITEMIDLIST pidl,LPWSTR pszPath);
+DWORD WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath);
+DWORD WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath);
 #define  SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)
 
 /****************************************************************************
 * SHFILEINFO API 
 */
-typedef struct tagSHFILEINFO32A {
-	HICON32	hIcon;			/* icon */
+typedef struct tagSHFILEINFOA {
+	HICON	hIcon;			/* icon */
 	int	iIcon;			/* icon index */
 	DWORD	dwAttributes;		/* SFGAO_ flags */
 	CHAR	szDisplayName[MAX_PATH];/* display name (or path) */
 	CHAR	szTypeName[80];		/* type name */
-} SHFILEINFO32A;
+} SHFILEINFOA;
 
-typedef struct tagSHFILEINFO32W {
-	HICON32	hIcon;			/* icon */
+typedef struct tagSHFILEINFOW {
+	HICON	hIcon;			/* icon */
 	int	iIcon;			/* icon index */
 	DWORD	dwAttributes;		/* SFGAO_ flags */
 	WCHAR	szDisplayName[MAX_PATH];/* display name (or path) */
 	WCHAR	szTypeName[80];		/* type name */
-} SHFILEINFO32W;
+} SHFILEINFOW;
 
 DECL_WINELIB_TYPE_AW(SHFILEINFO)
 
-DWORD    WINAPI SHGetFileInfo32A(LPCSTR,DWORD,SHFILEINFO32A*,UINT32,UINT32);
-DWORD    WINAPI SHGetFileInfo32W(LPCWSTR,DWORD,SHFILEINFO32W*,UINT32,UINT32);
+DWORD    WINAPI SHGetFileInfoA(LPCSTR,DWORD,SHFILEINFOA*,UINT,UINT);
+DWORD    WINAPI SHGetFileInfoW(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT);
 #define  SHGetFileInfo WINELIB_NAME_AW(SHGetFileInfo)
 
 /****************************************************************************
 * SHFILEOPSTRUCT API 
 */
 typedef struct _SHFILEOPSTRUCTA
-{ HWND32          hwnd;
-  UINT32          wFunc;
+{ HWND          hwnd;
+  UINT          wFunc;
   LPCSTR          pFrom;
   LPCSTR          pTo;
   FILEOP_FLAGS    fFlags;
-  BOOL32          fAnyOperationsAborted;
+  BOOL          fAnyOperationsAborted;
   LPVOID          hNameMappings;
   LPCSTR          lpszProgressTitle;
-} SHFILEOPSTRUCT32A, *LPSHFILEOPSTRUCT32A;
+} SHFILEOPSTRUCTA, *LPSHFILEOPSTRUCTA;
 
 typedef struct _SHFILEOPSTRUCTW
-{ HWND32          hwnd;
-  UINT32          wFunc;
+{ HWND          hwnd;
+  UINT          wFunc;
   LPCWSTR         pFrom;
   LPCWSTR         pTo;
   FILEOP_FLAGS    fFlags;
-  BOOL32          fAnyOperationsAborted;
+  BOOL          fAnyOperationsAborted;
   LPVOID          hNameMappings;
   LPCWSTR         lpszProgressTitle;
-} SHFILEOPSTRUCT32W, *LPSHFILEOPSTRUCT32W;
+} SHFILEOPSTRUCTW, *LPSHFILEOPSTRUCTW;
 
 #define  SHFILEOPSTRUCT WINELIB_NAME_AW(SHFILEOPSTRUCT)
 #define  LPSHFILEOPSTRUCT WINELIB_NAME_AW(LPSHFILEOPSTRUCT)
 
-DWORD WINAPI SHFileOperation32A (LPSHFILEOPSTRUCT32A lpFileOp);  
-DWORD WINAPI SHFileOperation32W (LPSHFILEOPSTRUCT32W lpFileOp);
+DWORD WINAPI SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp);  
+DWORD WINAPI SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp);
 #define  SHFileOperation WINELIB_NAME_AW(SHFileOperation)
 
-DWORD WINAPI SHFileOperation32(DWORD x);
+DWORD WINAPI SHFileOperationAW(DWORD x);
 
 /****************************************************************************
 * APPBARDATA 
 */
 typedef struct _AppBarData {
 	DWORD	cbSize;
-	HWND32	hWnd;
-	UINT32	uCallbackMessage;
-	UINT32	uEdge;
-	RECT32	rc;
+	HWND	hWnd;
+	UINT	uCallbackMessage;
+	UINT	uEdge;
+	RECT	rc;
 	LPARAM	lParam;
 } APPBARDATA, *PAPPBARDATA;
 
@@ -225,7 +220,7 @@ typedef struct
   DWORD unknown;
 } IDSTRUCT;
 
-DWORD WINAPI SHChangeNotifyRegister(HWND32 hwnd,LONG events1,LONG events2,DWORD msg,int count,IDSTRUCT *idlist);
+DWORD WINAPI SHChangeNotifyRegister(HWND hwnd,LONG events1,LONG events2,DWORD msg,int count,IDSTRUCT *idlist);
 DWORD WINAPI SHChangeNotifyDeregister(LONG x1);
 
 /****************************************************************************
@@ -234,92 +229,92 @@ DWORD WINAPI SHChangeNotifyDeregister(LONG x1);
 #define SHARD_PIDL      0x00000001L
 #define SHARD_PATH      0x00000002L
 
-DWORD WINAPI SHAddToRecentDocs(UINT32 uFlags, LPCVOID pv);
+DWORD WINAPI SHAddToRecentDocs(UINT uFlags, LPCVOID pv);
 
 /****************************************************************************
 * SHGetSpecialFolderLocation API
 */
-HRESULT WINAPI SHGetSpecialFolderLocation(HWND32, INT32, LPITEMIDLIST *);
+HRESULT WINAPI SHGetSpecialFolderLocation(HWND, INT, LPITEMIDLIST *);
 /****************************************************************************
 *  string and path functions
 */
-BOOL32 WINAPI PathIsRoot32A(LPCSTR x);
-BOOL32 WINAPI PathIsRoot32W(LPCWSTR x);
+BOOL WINAPI PathIsRootA(LPCSTR x);
+BOOL WINAPI PathIsRootW(LPCWSTR x);
 #define  PathIsRoot WINELIB_NAME_AW(PathIsRoot)
-BOOL32 WINAPI PathIsRoot32AW(LPCVOID x);
+BOOL WINAPI PathIsRootAW(LPCVOID x);
 
-LPSTR  WINAPI PathAddBackslash32A(LPSTR path);	
-LPWSTR WINAPI PathAddBackslash32W(LPWSTR path);	
+LPSTR  WINAPI PathAddBackslashA(LPSTR path);	
+LPWSTR WINAPI PathAddBackslashW(LPWSTR path);	
 #define  PathAddBackslash WINELIB_NAME_AW(PathAddBackslash)
-LPVOID  WINAPI PathAddBackslash32AW(LPVOID path);	
+LPVOID  WINAPI PathAddBackslashAW(LPVOID path);	
 
-BOOL32  WINAPI PathQualify32A(LPCSTR path);	
-BOOL32 WINAPI PathQualify32W(LPCWSTR path);	
+BOOL  WINAPI PathQualifyA(LPCSTR path);	
+BOOL WINAPI PathQualifyW(LPCWSTR path);	
 #define  PathQualify WINELIB_NAME_AW(PathQualify)
-BOOL32  WINAPI PathQualify32AW(LPCVOID path);	
+BOOL  WINAPI PathQualifyAW(LPCVOID path);	
 
-LPSTR  WINAPI PathQuoteSpaces32A(LPCSTR path);	
-LPWSTR WINAPI PathQuoteSpaces32W(LPCWSTR path);	
+LPSTR  WINAPI PathQuoteSpacesA(LPCSTR path);	
+LPWSTR WINAPI PathQuoteSpacesW(LPCWSTR path);	
 #define  PathQuoteSpaces WINELIB_NAME_AW(PathQuoteSpaces)
-LPVOID  WINAPI PathQuoteSpaces32AW(LPCVOID path);	
+LPVOID  WINAPI PathQuoteSpacesAW(LPCVOID path);	
 
-LPSTR  WINAPI PathCombine32A(LPSTR szDest, LPCSTR lpszDir, LPCSTR lpszFile);
-LPWSTR WINAPI PathCombine32W(LPWSTR szDest, LPCWSTR lpszDir, LPCWSTR lpszFile);
+LPSTR  WINAPI PathCombineA(LPSTR szDest, LPCSTR lpszDir, LPCSTR lpszFile);
+LPWSTR WINAPI PathCombineW(LPWSTR szDest, LPCWSTR lpszDir, LPCWSTR lpszFile);
 #define  PathCombine WINELIB_NAME_AW(PathCombine)
-LPVOID WINAPI PathCombine32AW(LPVOID szDest, LPCVOID lpszDir, LPCVOID lpszFile);
+LPVOID WINAPI PathCombineAW(LPVOID szDest, LPCVOID lpszDir, LPCVOID lpszFile);
 
-LPCSTR WINAPI PathFindExtension32A(LPCSTR path);
-LPCWSTR WINAPI PathFindExtension32W(LPCWSTR path);
+LPCSTR WINAPI PathFindExtensionA(LPCSTR path);
+LPCWSTR WINAPI PathFindExtensionW(LPCWSTR path);
 #define  PathFindExtension WINELIB_NAME_AW(PathFindExtension)
-LPCVOID WINAPI PathFindExtension32AW(LPCVOID path); 
+LPCVOID WINAPI PathFindExtensionAW(LPCVOID path); 
 
-LPCSTR WINAPI PathGetExtension32A(LPCSTR path, DWORD y, DWORD x);
-LPCWSTR WINAPI PathGetExtension32W(LPCWSTR path, DWORD y, DWORD x);
+LPCSTR WINAPI PathGetExtensionA(LPCSTR path, DWORD y, DWORD x);
+LPCWSTR WINAPI PathGetExtensionW(LPCWSTR path, DWORD y, DWORD x);
 #define  PathGetExtension WINELIB_NAME_AW(PathGetExtension)
-LPCVOID WINAPI PathGetExtension32AW(LPCVOID path, DWORD y, DWORD x); 
+LPCVOID WINAPI PathGetExtensionAW(LPCVOID path, DWORD y, DWORD x); 
 
-LPCSTR WINAPI PathFindFilename32A(LPCSTR path);
-LPCWSTR WINAPI PathFindFilename32W(LPCWSTR path);
+LPCSTR WINAPI PathFindFilenameA(LPCSTR path);
+LPCWSTR WINAPI PathFindFilenameW(LPCWSTR path);
 #define  PathFindFilename WINELIB_NAME_AW(PathFindFilename)
-LPCVOID WINAPI PathFindFilename32AW(LPCVOID path); 
+LPCVOID WINAPI PathFindFilenameAW(LPCVOID path); 
 
-BOOL32 WINAPI PathMatchSpec32A(LPCSTR x, LPCSTR y);
-BOOL32 WINAPI PathMatchSpec32W(LPCWSTR x, LPCWSTR y);
+BOOL WINAPI PathMatchSpecA(LPCSTR x, LPCSTR y);
+BOOL WINAPI PathMatchSpecW(LPCWSTR x, LPCWSTR y);
 #define  PathMatchSpec WINELIB_NAME_AW(PathMatchSpec)
-BOOL32 WINAPI PathMatchSpec32AW(LPVOID x, LPVOID y);
+BOOL WINAPI PathMatchSpecAW(LPVOID x, LPVOID y);
 
-LPSTR WINAPI PathRemoveBlanks32A(LPSTR str);
-LPWSTR WINAPI PathRemoveBlanks32W(LPWSTR str);
+LPSTR WINAPI PathRemoveBlanksA(LPSTR str);
+LPWSTR WINAPI PathRemoveBlanksW(LPWSTR str);
 #define  PathRemoveBlanks WINELIB_NAME_AW(PathRemoveBlanks)
-LPVOID WINAPI PathRemoveBlanks32AW(LPVOID str);
+LPVOID WINAPI PathRemoveBlanksAW(LPVOID str);
 
-BOOL32 WINAPI PathIsRelative32A(LPCSTR str);
-BOOL32 WINAPI PathIsRelative32W(LPCWSTR str);
+BOOL WINAPI PathIsRelativeA(LPCSTR str);
+BOOL WINAPI PathIsRelativeW(LPCWSTR str);
 #define  PathIsRelative WINELIB_NAME_AW(PathIsRelative)
-BOOL32 WINAPI PathIsRelative32AW(LPCVOID str);
+BOOL WINAPI PathIsRelativeAW(LPCVOID str);
 
-BOOL32 WINAPI PathIsUNC32A(LPCSTR str);
-BOOL32 WINAPI PathIsUNC32W(LPCWSTR str);
+BOOL WINAPI PathIsUNCA(LPCSTR str);
+BOOL WINAPI PathIsUNCW(LPCWSTR str);
 #define  PathIsUNC WINELIB_NAME_AW(PathIsUNC)
-BOOL32 WINAPI PathIsUNC32AW(LPCVOID str);
+BOOL WINAPI PathIsUNCAW(LPCVOID str);
 
-BOOL32 WINAPI PathFindOnPath32A(LPSTR sFile, LPCSTR sOtherDirs);
-BOOL32 WINAPI PathFindOnPath32W(LPWSTR sFile, LPCWSTR sOtherDirs);
+BOOL WINAPI PathFindOnPathA(LPSTR sFile, LPCSTR sOtherDirs);
+BOOL WINAPI PathFindOnPathW(LPWSTR sFile, LPCWSTR sOtherDirs);
 #define PathFindOnPath WINELIB_NAME_AW(PathFindOnPath)
-BOOL32 WINAPI PathFindOnPath32AW(LPVOID sFile, LPCVOID sOtherDirs);
+BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs);
 
-LPSTR WINAPI StrFormatByteSize32A ( DWORD dw, LPSTR pszBuf, UINT32 cchBuf );
-LPWSTR WINAPI StrFormatByteSize32W ( DWORD dw, LPWSTR pszBuf, UINT32 cchBuf );
+LPSTR WINAPI StrFormatByteSizeA ( DWORD dw, LPSTR pszBuf, UINT cchBuf );
+LPWSTR WINAPI StrFormatByteSizeW ( DWORD dw, LPWSTR pszBuf, UINT cchBuf );
 #define  StrFormatByteSize WINELIB_NAME_AW(StrFormatByteSize)
 
 /****************************************************************************
 *  other functions
 */
 HICON16 WINAPI ExtractIconEx16 ( LPCSTR, INT16, HICON16 *, HICON16 *, UINT16 );
-HICON32 WINAPI ExtractIconEx32A( LPCSTR, INT32, HICON32 *, HICON32 *, UINT32 );
-HICON32 WINAPI ExtractIconEx32W( LPCWSTR, INT32, HICON32 *, HICON32 *, UINT32 );
+HICON WINAPI ExtractIconExA( LPCSTR, INT, HICON *, HICON *, UINT );
+HICON WINAPI ExtractIconExW( LPCWSTR, INT, HICON *, HICON *, UINT );
 #define  ExtractIconEx WINELIB_NAME_AW(ExtractIconEx)
-HICON32 WINAPI ExtractIconEx32AW(LPCVOID, INT32, HICON32 *, HICON32 *, UINT32 );
+HICON WINAPI ExtractIconExAW(LPCVOID, INT, HICON *, HICON *, UINT );
 
 LPVOID WINAPI SHAlloc(DWORD len);
 DWORD WINAPI SHFree(LPVOID x);
diff --git a/include/shellapi.h b/include/shellapi.h
index c91554f594a..e4d3cafb87f 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -4,24 +4,24 @@
 #include "wintypes.h"
 
 HICON16     WINAPI ExtractIcon16(HINSTANCE16,LPCSTR,UINT16);
-HICON32     WINAPI ExtractIcon32A(HINSTANCE32,LPCSTR,UINT32);
-HICON32     WINAPI ExtractIcon32W(HINSTANCE32,LPCWSTR,UINT32);
+HICON     WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);
+HICON     WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
 #define     ExtractIcon WINELIB_NAME_AW(ExtractIcon)
 HICON16     WINAPI ExtractAssociatedIcon16(HINSTANCE16,LPSTR,LPWORD);
-HICON32     WINAPI ExtractAssociatedIcon32A(HINSTANCE32,LPSTR,LPWORD);
-HICON32     WINAPI ExtractAssociatedIcon32W(HINSTANCE32,LPWSTR,LPWORD);
+HICON     WINAPI ExtractAssociatedIconA(HINSTANCE,LPSTR,LPWORD);
+HICON     WINAPI ExtractAssociatedIconW(HINSTANCE,LPWSTR,LPWORD);
 #define     ExtractAssociatedIcon WINELIB_NAME_AW(ExtractAssociatedIcon)
 HINSTANCE16 WINAPI FindExecutable16(LPCSTR,LPCSTR,LPSTR);
-HINSTANCE32 WINAPI FindExecutable32A(LPCSTR,LPCSTR,LPSTR);
-HINSTANCE32 WINAPI FindExecutable32W(LPCWSTR,LPCWSTR,LPWSTR);
+HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
+HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
 #define     FindExecutable WINELIB_NAME_AW(FindExecutable)
 BOOL16      WINAPI ShellAbout16(HWND16,LPCSTR,LPCSTR,HICON16);
-BOOL32      WINAPI ShellAbout32A(HWND32,LPCSTR,LPCSTR,HICON32);
-BOOL32      WINAPI ShellAbout32W(HWND32,LPCWSTR,LPCWSTR,HICON32);
+BOOL      WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
+BOOL      WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
 #define     ShellAbout WINELIB_NAME_AW(ShellAbout)
 HINSTANCE16 WINAPI ShellExecute16(HWND16,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT16);
-HINSTANCE32 WINAPI ShellExecute32A(HWND32,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT32);
-HINSTANCE32 WINAPI ShellExecute32W(HWND32,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT32);
+HINSTANCE WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT);
+HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);
 #define     ShellExecute WINELIB_NAME_AW(ShellExecute)
 
 
diff --git a/include/shlobj.h b/include/shlobj.h
index 672b1f86580..1b8262a8537 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -45,11 +45,11 @@ typedef struct tagCOMMDLGBROWSER	*LPCOMMDLGBROWSER,	ICommDlgBrowser;
 
 
 typedef struct _STRRET
-{ UINT32 uType;		/* STRRET_xxx */
+{ UINT uType;		/* STRRET_xxx */
   union
   { LPWSTR	pOleStr;	/* OLESTR that will be freed */
     LPSTR	pStr;
-    UINT32	uOffset;	/* OffsetINT32o SHITEMID (ANSI) */
+    UINT	uOffset;	/* OffsetINT32o SHITEMID (ANSI) */
     char	cStr[MAX_PATH];	/* Buffer to fill in */
     WCHAR	cStrW[MAX_PATH];
   }u;
@@ -118,45 +118,45 @@ typedef struct _STRRET
 typedef struct tagCMINVOKECOMMANDINFO 
 {   DWORD cbSize;        /* sizeof(CMINVOKECOMMANDINFO) */
     DWORD fMask;         /* any combination of CMIC_MASK_* */
-    HWND32 hwnd;         /* might be NULL (indicating no owner window) */
+    HWND hwnd;         /* might be NULL (indicating no owner window) */
     LPCSTR lpVerb;       /* either a string or MAKEINTRESOURCE(idOffset) */
     LPCSTR lpParameters; /* might be NULL (indicating no parameter) */
     LPCSTR lpDirectory;  /* might be NULL (indicating no specific directory) */
-   INT32 nShow;           /* one of SW_ values for ShowWindow() API */
+   INT nShow;           /* one of SW_ values for ShowWindow() API */
 
     DWORD dwHotKey;
-    HANDLE32 hIcon;
-} CMINVOKECOMMANDINFO32,  *LPCMINVOKECOMMANDINFO32;
+    HANDLE hIcon;
+} CMINVOKECOMMANDINFO,  *LPCMINVOKECOMMANDINFO;
 
 typedef struct tagCMInvokeCommandInfoEx 
 {   DWORD cbSize;        /* must be sizeof(CMINVOKECOMMANDINFOEX) */
     DWORD fMask;         /* any combination of CMIC_MASK_* */
-    HWND32 hwnd;         /* might be NULL (indicating no owner window) */
+    HWND hwnd;         /* might be NULL (indicating no owner window) */
     LPCSTR lpVerb;       /* either a string or MAKEINTRESOURCE(idOffset) */
     LPCSTR lpParameters; /* might be NULL (indicating no parameter) */
     LPCSTR lpDirectory;  /* might be NULL (indicating no specific directory) */
-	INT32 nShow;           /* one of SW_ values for ShowWindow() API */
+	INT nShow;           /* one of SW_ values for ShowWindow() API */
 
     DWORD dwHotKey;
     
-    HANDLE32 hIcon;
+    HANDLE hIcon;
     LPCSTR lpTitle;        /* For CreateProcess-StartupInfo.lpTitle */
     LPCWSTR lpVerbW;       /* Unicode verb (for those who can use it) */
     LPCWSTR lpParametersW; /* Unicode parameters (for those who can use it) */
     LPCWSTR lpDirectoryW;  /* Unicode directory (for those who can use it) */
     LPCWSTR lpTitleW;      /* Unicode title (for those who can use it) */
-    POINT32 ptInvoke;      /* Point where it's invoked */
+    POINT ptInvoke;      /* Point where it's invoked */
 
-} CMINVOKECOMMANDINFOEX32,  *LPCMINVOKECOMMANDINFOEX32;
+} CMINVOKECOMMANDINFOEX,  *LPCMINVOKECOMMANDINFOEX;
 #undef THIS
 
 
 #define ICOM_INTERFACE IContextMenu
 #define IContextMenu_METHODS \
-    ICOM_METHOD5(HRESULT,QueryContextMenu,       HMENU32,hmenu, UINT32,indexMenu, UINT32,idCmdFirst, UINT32,idCmdLast, UINT32,uFlags) \
-    ICOM_METHOD1(HRESULT,InvokeCommand,       LPCMINVOKECOMMANDINFO32,lpici) \
-    ICOM_METHOD5(HRESULT,GetCommandString,       UINT32,idCmd, UINT32,uType, UINT32*,pwReserved, LPSTR,pszName, UINT32,cchMax) \
-    ICOM_METHOD3(HRESULT,HandleMenuMsg,        UINT32,uMsg,WPARAM32,wParam,LPARAM,lParam) \
+    ICOM_METHOD5(HRESULT,QueryContextMenu,       HMENU,hmenu, UINT,indexMenu, UINT,idCmdFirst, UINT,idCmdLast, UINT,uFlags) \
+    ICOM_METHOD1(HRESULT,InvokeCommand,       LPCMINVOKECOMMANDINFO,lpici) \
+    ICOM_METHOD5(HRESULT,GetCommandString,       UINT,idCmd, UINT,uType, UINT*,pwReserved, LPSTR,pszName, UINT,cchMax) \
+    ICOM_METHOD3(HRESULT,HandleMenuMsg,        UINT,uMsg,WPARAM,wParam,LPARAM,lParam) \
     void * guard;   /*possibly another nasty entry from ContextMenu3 ?*/
 #define IContextMenu_IMETHODS \
 		IUnknown_IMETHODS \
@@ -191,11 +191,11 @@ typedef enum tagDVASPECT
 /* DATAOBJECT_InitShellIDList*/
 #define CFSTR_SHELLIDLIST       "Shell IDList Array"      /* CF_IDLIST */
 
-extern UINT32 cfShellIDList;
+extern UINT cfShellIDList;
 
 typedef struct
-{	UINT32 cidl;
-	UINT32 aoffset[1];
+{	UINT cidl;
+	UINT aoffset[1];
 } CIDA, *LPCIDA;
 
 #define CFSTR_SHELLIDLISTOFFSET "Shell Object Offsets"    /* CF_OBJECTPOSITIONS */
@@ -203,13 +203,13 @@ typedef struct
 
 /* DATAOBJECT_InitFileGroupDesc */
 #define CFSTR_FILEDESCRIPTORA   "FileGroupDescriptor"     /* CF_FILEGROUPDESCRIPTORA */
-extern UINT32 cfFileGroupDesc;
+extern UINT cfFileGroupDesc;
 
 #define CFSTR_FILEDESCRIPTORW   "FileGroupDescriptorW"    /* CF_FILEGROUPDESCRIPTORW */
 
 /* DATAOBJECT_InitFileContents*/
 #define CFSTR_FILECONTENTS      "FileContents"            /* CF_FILECONTENTS */
-extern UINT32 cfFileContents;
+extern UINT cfFileContents;
 
 #define CFSTR_FILENAMEA         "FileName"                /* CF_FILENAMEA */
 #define CFSTR_FILENAMEW         "FileNameW"               /* CF_FILENAMEW */
@@ -239,22 +239,22 @@ typedef enum
 } IDLListState;
  
 typedef struct IDLList_VTable
-{	STDMETHOD_(UINT32, GetState)(THIS);
-	STDMETHOD_(LPITEMIDLIST, GetElement)(THIS_ UINT32 nIndex);
-	STDMETHOD_(UINT32, GetCount)(THIS);
-	STDMETHOD_(BOOL32, StoreItem)(THIS_ LPITEMIDLIST pidl);
-	STDMETHOD_(BOOL32, AddItems)(THIS_ LPITEMIDLIST *apidl, UINT32 cidl);
-	STDMETHOD_(BOOL32, InitList)(THIS);
+{	STDMETHOD_(UINT, GetState)(THIS);
+	STDMETHOD_(LPITEMIDLIST, GetElement)(THIS_ UINT nIndex);
+	STDMETHOD_(UINT, GetCount)(THIS);
+	STDMETHOD_(BOOL, StoreItem)(THIS_ LPITEMIDLIST pidl);
+	STDMETHOD_(BOOL, AddItems)(THIS_ LPITEMIDLIST *apidl, UINT cidl);
+	STDMETHOD_(BOOL, InitList)(THIS);
 	STDMETHOD_(void, CleanList)(THIS);
 } IDLList_VTable,*LPIDLLIST_VTABLE;
 
 struct tagLPIDLLIST
 {	LPIDLLIST_VTABLE	lpvtbl;
 	HDPA	dpa;
-	UINT32	uStep;
+	UINT	uStep;
 };
 
-extern LPIDLLIST IDLList_Constructor (UINT32 uStep);
+extern LPIDLLIST IDLList_Constructor (UINT uStep);
 extern void IDLList_Destructor(LPIDLLIST this);
 #undef THIS
 
@@ -305,9 +305,9 @@ typedef struct IEnumIDList_VTable
     STDMETHOD(Reset) (THIS) PURE;
     STDMETHOD(Clone) (THIS_ IEnumIDList **ppenum) PURE;
 		/* *** private methods *** */
-    STDMETHOD_(BOOL32,CreateEnumList)(THIS_ LPCSTR, DWORD) PURE;
-    STDMETHOD_(BOOL32,AddToEnumList)(THIS_ LPITEMIDLIST) PURE;
-    STDMETHOD_(BOOL32,DeleteList)(THIS) PURE;
+    STDMETHOD_(BOOL,CreateEnumList)(THIS_ LPCSTR, DWORD) PURE;
+    STDMETHOD_(BOOL,AddToEnumList)(THIS_ LPITEMIDLIST) PURE;
+    STDMETHOD_(BOOL,DeleteList)(THIS) PURE;
 
 		
 } IEnumIDList_VTable,*LPENUMIDLIST_VTABLE;
@@ -362,8 +362,8 @@ typedef enum
 } FOLDERVIEWMODE;
 
 typedef struct
-{ UINT32 ViewMode;       /* View mode (FOLDERVIEWMODE values) */
-  UINT32 fFlags;         /* View options (FOLDERFLAGS bits) */
+{ UINT ViewMode;       /* View mode (FOLDERVIEWMODE values) */
+  UINT fFlags;         /* View options (FOLDERFLAGS bits) */
 } FOLDERSETTINGS, *LPFOLDERSETTINGS;
 
 typedef const FOLDERSETTINGS * LPCFOLDERSETTINGS;
@@ -417,19 +417,19 @@ typedef struct IShellFolder_VTable {
     STDMETHOD_(ULONG,Release) (THIS) PURE;
 
     /* *** IShellFolder methods *** */
-    STDMETHOD(ParseDisplayName) (THIS_ HWND32 hwndOwner,LPBC pbcReserved, LPOLESTR32 lpszDisplayName,ULONG * pchEaten, LPITEMIDLIST * ppidl, ULONG *pdwAttributes) PURE;
-    STDMETHOD(EnumObjects)( THIS_ HWND32 hwndOwner, DWORD grfFlags, LPENUMIDLIST * ppenumIDList) PURE;
+    STDMETHOD(ParseDisplayName) (THIS_ HWND hwndOwner,LPBC pbcReserved, LPOLESTR lpszDisplayName,ULONG * pchEaten, LPITEMIDLIST * ppidl, ULONG *pdwAttributes) PURE;
+    STDMETHOD(EnumObjects)( THIS_ HWND hwndOwner, DWORD grfFlags, LPENUMIDLIST * ppenumIDList) PURE;
     STDMETHOD(BindToObject)(THIS_ LPCITEMIDLIST pidl, LPBC pbcReserved,REFIID riid, LPVOID * ppvOut) PURE;
     STDMETHOD(BindToStorage)(THIS_ LPCITEMIDLIST pidl, LPBC pbcReserved,REFIID riid, LPVOID * ppvObj) PURE;
     STDMETHOD(CompareIDs)(THIS_ LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) PURE;
-    STDMETHOD(CreateViewObject)(THIS_ HWND32 hwndOwner, REFIID riid, LPVOID * ppvOut) PURE;
-    STDMETHOD(GetAttributesOf)(THIS_ UINT32 cidl, LPCITEMIDLIST * apidl,ULONG * rgfInOut) PURE;
-    STDMETHOD(GetUIObjectOf)(THIS_ HWND32 hwndOwner, UINT32 cidl, LPCITEMIDLIST * apidl,REFIID riid, UINT32 * prgfInOut, LPVOID * ppvOut) PURE;
+    STDMETHOD(CreateViewObject)(THIS_ HWND hwndOwner, REFIID riid, LPVOID * ppvOut) PURE;
+    STDMETHOD(GetAttributesOf)(THIS_ UINT cidl, LPCITEMIDLIST * apidl,ULONG * rgfInOut) PURE;
+    STDMETHOD(GetUIObjectOf)(THIS_ HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl,REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) PURE;
     STDMETHOD(GetDisplayNameOf)(THIS_ LPCITEMIDLIST pidl, DWORD uFlags, LPSTRRET lpName) PURE;
-    STDMETHOD(SetNameOf)(THIS_ HWND32 hwndOwner, LPCITEMIDLIST pidl,LPCOLESTR32 lpszName, DWORD uFlags,LPITEMIDLIST * ppidlOut) PURE;
+    STDMETHOD(SetNameOf)(THIS_ HWND hwndOwner, LPCITEMIDLIST pidl,LPCOLESTR lpszName, DWORD uFlags,LPITEMIDLIST * ppidlOut) PURE;
 
 	/* utility functions */
-   STDMETHOD_(BOOL32,GetFolderPath)(THIS_ LPSTR, DWORD);
+   STDMETHOD_(BOOL,GetFolderPath)(THIS_ LPSTR, DWORD);
    
 } *LPSHELLFOLDER_VTABLE,IShellFolder_VTable;
 
@@ -501,25 +501,25 @@ typedef struct IShellBrowser_VTable
     STDMETHOD_(ULONG,Release) (THIS) PURE;
 
     /* *** IOleWindow methods *** */
-    STDMETHOD(GetWindow) (THIS_ HWND32 * lphwnd) PURE;
-    STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL32 fEnterMode) PURE;
+    STDMETHOD(GetWindow) (THIS_ HWND * lphwnd) PURE;
+    STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL fEnterMode) PURE;
 
     /* *** IShellBrowser methods *** (same as IOleInPlaceFrame) */
-    STDMETHOD(InsertMenusSB) (THIS_ HMENU32 hmenuShared, LPOLEMENUGROUPWIDTHS32 lpMenuWidths) PURE;
-    STDMETHOD(SetMenuSB) (THIS_ HMENU32 hmenuShared, HOLEMENU32 holemenuReserved, HWND32 hwndActiveObject) PURE;
-    STDMETHOD(RemoveMenusSB) (THIS_ HMENU32 hmenuShared) PURE;
-    STDMETHOD(SetStatusTextSB) (THIS_ LPCOLESTR32 lpszStatusText) PURE;
-    STDMETHOD(EnableModelessSB) (THIS_ BOOL32 fEnable) PURE;
-    STDMETHOD(TranslateAcceleratorSB) (THIS_ LPMSG32 lpmsg, WORD wID) PURE;
+    STDMETHOD(InsertMenusSB) (THIS_ HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) PURE;
+    STDMETHOD(SetMenuSB) (THIS_ HMENU hmenuShared, HOLEMENU holemenuReserved, HWND hwndActiveObject) PURE;
+    STDMETHOD(RemoveMenusSB) (THIS_ HMENU hmenuShared) PURE;
+    STDMETHOD(SetStatusTextSB) (THIS_ LPCOLESTR lpszStatusText) PURE;
+    STDMETHOD(EnableModelessSB) (THIS_ BOOL fEnable) PURE;
+    STDMETHOD(TranslateAcceleratorSB) (THIS_ LPMSG lpmsg, WORD wID) PURE;
 
     /* *** IShellBrowser methods *** */
-    STDMETHOD(BrowseObject)(THIS_ LPCITEMIDLIST pidl, UINT32 wFlags) PURE;
-    STDMETHOD(GetViewStateStream)(THIS_ DWORD grfMode, LPSTREAM32  *ppStrm) PURE;
-    STDMETHOD(GetControlWindow)(THIS_ UINT32 id, HWND32 * lphwnd) PURE;
-    STDMETHOD(SendControlMsg)(THIS_ UINT32 id, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam, LRESULT * pret) PURE;
+    STDMETHOD(BrowseObject)(THIS_ LPCITEMIDLIST pidl, UINT wFlags) PURE;
+    STDMETHOD(GetViewStateStream)(THIS_ DWORD grfMode, LPSTREAM  *ppStrm) PURE;
+    STDMETHOD(GetControlWindow)(THIS_ UINT id, HWND * lphwnd) PURE;
+    STDMETHOD(SendControlMsg)(THIS_ UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT * pret) PURE;
     STDMETHOD(QueryActiveShellView)(THIS_ IShellView ** ppshv) PURE;
     STDMETHOD(OnViewWindowActive)(THIS_ IShellView * ppshv) PURE;
-    STDMETHOD(SetToolbarItems)(THIS_ LPTBBUTTON lpButtons, UINT32 nButtons, UINT32 uFlags) PURE;
+    STDMETHOD(SetToolbarItems)(THIS_ LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags) PURE;
 } *LPSHELLBROWSER_VTABLE,IShellBrowser_VTable;
 
 struct tagSHELLBROWSER 
@@ -623,21 +623,21 @@ typedef struct IShellView_VTable
     STDMETHOD_(ULONG,Release) (THIS) PURE;
 
     /* *** IOleWindow methods *** */
-    STDMETHOD(GetWindow) (THIS_ HWND32 * lphwnd) PURE;
-    STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL32 fEnterMode) PURE;
+    STDMETHOD(GetWindow) (THIS_ HWND * lphwnd) PURE;
+    STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL fEnterMode) PURE;
 
     /* *** IShellView methods *** */
-    STDMETHOD(TranslateAccelerator) (THIS_ LPMSG32 lpmsg) PURE;
-    STDMETHOD(EnableModeless) (THIS_ BOOL32 fEnable) PURE;
-    STDMETHOD(UIActivate) (THIS_ UINT32 uState) PURE;
+    STDMETHOD(TranslateAccelerator) (THIS_ LPMSG lpmsg) PURE;
+    STDMETHOD(EnableModeless) (THIS_ BOOL fEnable) PURE;
+    STDMETHOD(UIActivate) (THIS_ UINT uState) PURE;
     STDMETHOD(Refresh) (THIS) PURE;
-    STDMETHOD(CreateViewWindow)(THIS_ IShellView *lpPrevView,LPCFOLDERSETTINGS lpfs, IShellBrowser * psb,RECT32 * prcView, HWND32  *phWnd) PURE;
+    STDMETHOD(CreateViewWindow)(THIS_ IShellView *lpPrevView,LPCFOLDERSETTINGS lpfs, IShellBrowser * psb,RECT * prcView, HWND  *phWnd) PURE;
     STDMETHOD(DestroyViewWindow)(THIS) PURE;
     STDMETHOD(GetCurrentInfo)(THIS_ LPFOLDERSETTINGS lpfs) PURE;
     STDMETHOD(AddPropertySheetPages)(THIS_ DWORD dwReserved,LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam) PURE;
     STDMETHOD(SaveViewState)(THIS) PURE;
-    STDMETHOD(SelectItem)(THIS_ LPCITEMIDLIST pidlItem, UINT32 uFlags) PURE;
-    STDMETHOD(GetItemObject)(THIS_ UINT32 uItem, REFIID riid,LPVOID *ppv) PURE;
+    STDMETHOD(SelectItem)(THIS_ LPCITEMIDLIST pidlItem, UINT uFlags) PURE;
+    STDMETHOD(GetItemObject)(THIS_ UINT uItem, REFIID riid,LPVOID *ppv) PURE;
 } IShellView_VTable,*LPSHELLVIEW_VTABLE;
 
 struct tagSHELLVIEW 
@@ -647,13 +647,13 @@ struct tagSHELLVIEW
   LPSHELLFOLDER	pSFParent;
   LPSHELLBROWSER	pShellBrowser;
   LPCOMMDLGBROWSER	pCommDlgBrowser;
-  HWND32	hWnd;
-  HWND32	hWndList;
-  HWND32	hWndParent;
+  HWND	hWnd;
+  HWND	hWndList;
+  HWND	hWndParent;
   FOLDERSETTINGS	FolderSettings;
-  HMENU32	hMenu;
-  UINT32	uState;
-  UINT32	uSelected;
+  HMENU	hMenu;
+  UINT	uState;
+  UINT	uSelected;
   LPITEMIDLIST	*aSelectedItems;
 };
 
@@ -718,8 +718,8 @@ typedef struct IExtractIcon_VTable
   STDMETHOD_(ULONG,Release) (THIS) PURE;
 
   /*** IExtractIcon methods ***/
-  STDMETHOD(GetIconLocation)(THIS_ UINT32 uFlags, LPSTR szIconFile, UINT32 cchMax,INT32 * piIndex, UINT32 * pwFlags) PURE;
-  STDMETHOD(Extract)(THIS_ LPCSTR pszFile, UINT32 nIconIndex, HICON32 *phiconLarge, HICON32 *phiconSmall, UINT32 nIconSize) PURE;
+  STDMETHOD(GetIconLocation)(THIS_ UINT uFlags, LPSTR szIconFile, UINT cchMax,INT * piIndex, UINT * pwFlags) PURE;
+  STDMETHOD(Extract)(THIS_ LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) PURE;
 }IExtractIcon_VTable,*LPEXTRACTICON_VTABLE;
 
 struct IExtractIcon 
@@ -745,7 +745,7 @@ typedef struct IShellIcon_VTable
   STDMETHOD_(ULONG,Release) (THIS) PURE;
 
   /*** IShellIcon methods ***/
-  STDMETHOD(GetIconOf)(THIS_ LPCITEMIDLIST pidl, UINT32 flags, LPINT32 lpIconIndex) PURE;
+  STDMETHOD(GetIconOf)(THIS_ LPCITEMIDLIST pidl, UINT flags, LPINT lpIconIndex) PURE;
 } IShellIcon_VTable,*LPSHELLICON_VTABLE;
 
 struct tagSHELLICON
@@ -768,8 +768,8 @@ typedef struct IDockingWindowFrame_VTable
     STDMETHOD_(ULONG,Release) (THIS) PURE;
 
     /*** IOleWindow methods ***/
-    STDMETHOD(GetWindow) (THIS_ HWND32 * lphwnd) PURE;
-    STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL32 fEnterMode) PURE;
+    STDMETHOD(GetWindow) (THIS_ HWND * lphwnd) PURE;
+    STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL fEnterMode) PURE;
 
     /*** IDockingWindowFrame methods ***/
     STDMETHOD(AddToolbar) (THIS_ IUnknown* punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags) PURE;
@@ -817,56 +817,56 @@ struct tagDOCKINGWINDOWFRAME
 typedef struct _SHELLEXECUTEINFOA
 {       DWORD cbSize;
         ULONG fMask;
-        HWND32 hwnd;
+        HWND hwnd;
         LPCSTR   lpVerb;
         LPCSTR   lpFile;
         LPCSTR   lpParameters;
         LPCSTR   lpDirectory;
-       INT32 nShow;
-        HINSTANCE32 hInstApp;
+       INT nShow;
+        HINSTANCE hInstApp;
         /* Optional fields */
         LPVOID lpIDList;
         LPCSTR   lpClass;
         HKEY hkeyClass;
         DWORD dwHotKey;
         union 
-        { HANDLE32 hIcon;
-          HANDLE32 hMonitor;
+        { HANDLE hIcon;
+          HANDLE hMonitor;
         } u;
-        HANDLE32 hProcess;
-} SHELLEXECUTEINFO32A, *LPSHELLEXECUTEINFO32A;
+        HANDLE hProcess;
+} SHELLEXECUTEINFOA, *LPSHELLEXECUTEINFOA;
 
 typedef struct _SHELLEXECUTEINFOW
 {       DWORD cbSize;
         ULONG fMask;
-        HWND32 hwnd;
+        HWND hwnd;
         LPCWSTR  lpVerb;
         LPCWSTR  lpFile;
         LPCWSTR  lpParameters;
         LPCWSTR  lpDirectory;
-       INT32 nShow;
-        HINSTANCE32 hInstApp;
+       INT nShow;
+        HINSTANCE hInstApp;
         /* Optional fields*/
         LPVOID lpIDList;
         LPCWSTR  lpClass;
         HKEY hkeyClass;
         DWORD dwHotKey;
         union
-        { HANDLE32 hIcon;
-          HANDLE32 hMonitor;
+        { HANDLE hIcon;
+          HANDLE hMonitor;
         } u;
-        HANDLE32 hProcess;
-} SHELLEXECUTEINFO32W, *LPSHELLEXECUTEINFO32W;
+        HANDLE hProcess;
+} SHELLEXECUTEINFOW, *LPSHELLEXECUTEINFOW;
 
 #define SHELLEXECUTEINFO   WINELIB_NAME_AW(SHELLEXECUTEINFO)
 #define LPSHELLEXECUTEINFO WINELIB_NAME_AW(LPSHELLEXECUTEINFO)
 
-BOOL32 WINAPI ShellExecuteEx32A(LPSHELLEXECUTEINFO32A lpExecInfo);
-BOOL32 WINAPI ShellExecuteEx32W(LPSHELLEXECUTEINFO32W lpExecInfo);
+BOOL WINAPI ShellExecuteExA(LPSHELLEXECUTEINFOA lpExecInfo);
+BOOL WINAPI ShellExecuteExW(LPSHELLEXECUTEINFOW lpExecInfo);
 #define ShellExecuteEx  WINELIB_NAME_AW(ShellExecuteEx)
 
-void WINAPI WinExecError32A(HWND32 hwnd,INT32 error, LPCSTR lpstrFileName, LPCSTR lpstrTitle);
-void WINAPI WinExecError32W(HWND32 hwnd,INT32 error, LPCWSTR lpstrFileName, LPCWSTR lpstrTitle);
+void WINAPI WinExecErrorA(HWND hwnd,INT error, LPCSTR lpstrFileName, LPCSTR lpstrTitle);
+void WINAPI WinExecErrorW(HWND hwnd,INT error, LPCWSTR lpstrFileName, LPCWSTR lpstrTitle);
 #define WinExecError  WINELIB_NAME_AW(WinExecError)
 
 
@@ -874,29 +874,29 @@ void WINAPI WinExecError32W(HWND32 hwnd,INT32 error, LPCWSTR lpstrFileName, LPCW
 /****************************************************************************
  * SHBrowseForFolder API
  */
-typedef INT32 (CALLBACK* BFFCALLBACK)(HWND32 hwnd, UINT32 uMsg, LPARAM lParam, LPARAM lpData);
+typedef INT (CALLBACK* BFFCALLBACK)(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData);
 
-typedef struct tagBROWSEINFO32A {
-    HWND32        hwndOwner;
+typedef struct tagBROWSEINFOA {
+    HWND        hwndOwner;
     LPCITEMIDLIST pidlRoot;
     LPSTR         pszDisplayName;
     LPCSTR        lpszTitle;
-    UINT32        ulFlags;
+    UINT        ulFlags;
     BFFCALLBACK   lpfn;
     LPARAM        lParam;
-	INT32         iImage;
-} BROWSEINFO32A, *PBROWSEINFO32A, *LPBROWSEINFO32A;
+	INT         iImage;
+} BROWSEINFOA, *PBROWSEINFOA, *LPBROWSEINFOA;
 
-typedef struct tagBROWSEINFO32W {
-    HWND32        hwndOwner;
+typedef struct tagBROWSEINFOW {
+    HWND        hwndOwner;
     LPCITEMIDLIST pidlRoot;
     LPWSTR        pszDisplayName;
     LPCWSTR       lpszTitle;
-    UINT32        ulFlags;
+    UINT        ulFlags;
     BFFCALLBACK   lpfn;
     LPARAM        lParam;
-	INT32         iImage;
-} BROWSEINFO32W, *PBROWSEINFO32W, *LPBROWSEINFO32W; 
+	INT         iImage;
+} BROWSEINFOW, *PBROWSEINFOW, *LPBROWSEINFOW; 
 
 #define BROWSEINFO   WINELIB_NAME_AW(BROWSEINFO)
 #define PBROWSEINFO  WINELIB_NAME_AW(PBROWSEINFO)
@@ -943,7 +943,7 @@ typedef struct tagBROWSEINFO32W {
 #endif 
 */
 
-LPITEMIDLIST WINAPI SHBrowseForFolder32A(LPBROWSEINFO32A lpbi);
+LPITEMIDLIST WINAPI SHBrowseForFolderA(LPBROWSEINFOA lpbi);
 /*LPITEMIDLIST WINAPI SHBrowseForFolder32W(LPBROWSEINFO32W lpbi);*/
 #define  SHBrowseForFolder WINELIB_NAME_AW(SHBrowseForFolder)
 
@@ -1002,7 +1002,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int n
 */
 
 typedef HRESULT(CALLBACK *SHELLVIEWPROC)(DWORD dwUserParam,LPSHELLFOLDER psf,
-                         HWND32 hwnd,UINT32 uMsg,UINT32 wParam,LPARAM lParam);
+                         HWND hwnd,UINT uMsg,UINT wParam,LPARAM lParam);
 
 /* NF valid values for the "viewmode" item of the SHELLTEMPLATE*/
 #define NF_INHERITVIEW    0x0000
@@ -1024,24 +1024,24 @@ typedef struct _SHELLVIEWDATA   /* idl */
  The key one requested right now is "DoubleClickInWebView".
 */
 typedef struct 
-{   BOOL32 fShowAllObjects : 1;
-    BOOL32 fShowExtensions : 1;
-    BOOL32 fNoConfirmRecycle : 1;
-    BOOL32 fShowSysFiles : 1;
-    BOOL32 fShowCompColor : 1;
-    BOOL32 fDoubleClickInWebView : 1;
-    BOOL32 fDesktopHTML : 1;
-    BOOL32 fWin95Classic : 1;
-    BOOL32 fDontPrettyPath : 1;
-    BOOL32 fShowAttribCol : 1;
-    BOOL32 fMapNetDrvBtn : 1;
-    BOOL32 fShowInfoTip : 1;
-    BOOL32 fHideIcons : 1;
-    UINT32 fRestFlags : 3;
+{   BOOL fShowAllObjects : 1;
+    BOOL fShowExtensions : 1;
+    BOOL fNoConfirmRecycle : 1;
+    BOOL fShowSysFiles : 1;
+    BOOL fShowCompColor : 1;
+    BOOL fDoubleClickInWebView : 1;
+    BOOL fDesktopHTML : 1;
+    BOOL fWin95Classic : 1;
+    BOOL fDontPrettyPath : 1;
+    BOOL fShowAttribCol : 1;
+    BOOL fMapNetDrvBtn : 1;
+    BOOL fShowInfoTip : 1;
+    BOOL fHideIcons : 1;
+    UINT fRestFlags : 3;
 } SHELLFLAGSTATE, * LPSHELLFLAGSTATE;
 
 
-DWORD WINAPI SHGetMalloc(LPMALLOC32 *lpmal) ;
+DWORD WINAPI SHGetMalloc(LPMALLOC *lpmal) ;
 
 #undef PURE
 #undef FAR
diff --git a/include/snoop.h b/include/snoop.h
index e4714c47291..09f4fc63b81 100644
--- a/include/snoop.h
+++ b/include/snoop.h
@@ -6,8 +6,8 @@
 
 #include "module.h"
 
-extern void SNOOP_RegisterDLL(HMODULE32,LPCSTR,DWORD);
-extern FARPROC32 SNOOP_GetProcAddress32(HMODULE32,LPCSTR,DWORD,FARPROC32);
+extern void SNOOP_RegisterDLL(HMODULE,LPCSTR,DWORD);
+extern FARPROC SNOOP_GetProcAddress(HMODULE,LPCSTR,DWORD,FARPROC);
 extern void (*fnSNOOP16_RegisterDLL)(NE_MODULE*,LPCSTR);
 extern FARPROC16 (*fnSNOOP16_GetProcAddress16)(HMODULE16,DWORD,FARPROC16);
 extern void SNOOP16_Init();
diff --git a/include/spy.h b/include/spy.h
index bb6f776b0ec..b0bb7eeab76 100644
--- a/include/spy.h
+++ b/include/spy.h
@@ -8,24 +8,24 @@
 #include "wintypes.h"
 
 #define SPY_DISPATCHMESSAGE16     0x0100
-#define SPY_DISPATCHMESSAGE32     0x0101
+#define SPY_DISPATCHMESSAGE     0x0101
 #define SPY_SENDMESSAGE16         0x0102
-#define SPY_SENDMESSAGE32         0x0103
+#define SPY_SENDMESSAGE         0x0103
 #define SPY_DEFWNDPROC16          0x0104
-#define SPY_DEFWNDPROC32          0x0105
+#define SPY_DEFWNDPROC          0x0105
 
 #define SPY_RESULT_OK16           0x0000
-#define SPY_RESULT_OK32           0x0001
+#define SPY_RESULT_OK           0x0001
 #define SPY_RESULT_INVALIDHWND16  0x0002
-#define SPY_RESULT_INVALIDHWND32  0x0003
+#define SPY_RESULT_INVALIDHWND  0x0003
 #define SPY_RESULT_DEFWND16       0x0004
-#define SPY_RESULT_DEFWND32       0x0005
+#define SPY_RESULT_DEFWND       0x0005
 
 
-extern const char *SPY_GetMsgName( UINT32 msg );
-extern void SPY_EnterMessage( INT32 iFlag, HWND32 hwnd, UINT32 msg,
-                              WPARAM32 wParam, LPARAM lParam );
-extern void SPY_ExitMessage( INT32 iFlag, HWND32 hwnd, UINT32 msg,
+extern const char *SPY_GetMsgName( UINT msg );
+extern void SPY_EnterMessage( INT iFlag, HWND hwnd, UINT msg,
+                              WPARAM wParam, LPARAM lParam );
+extern void SPY_ExitMessage( INT iFlag, HWND hwnd, UINT msg,
                              LRESULT lReturn );
 extern int SPY_Init(void);
 
diff --git a/include/static.h b/include/static.h
index 54484bfd891..817b5cb0208 100644
--- a/include/static.h
+++ b/include/static.h
@@ -17,7 +17,7 @@ typedef struct
     HICON16  hIcon;   /* Icon handle for SS_ICON controls */ 
 } STATICINFO;
 
-extern LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
+extern LRESULT WINAPI StaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam,
                                      LPARAM lParam );
 
 #endif  /* __WINE_STATIC_H */
diff --git a/include/status.h b/include/status.h
index ec44579dfb8..6afeec18672 100644
--- a/include/status.h
+++ b/include/status.h
@@ -9,24 +9,24 @@
 
 typedef struct
 {
-    INT32	x;
-    INT32	style;
-    RECT32	bound;
+    INT	x;
+    INT	style;
+    RECT	bound;
     LPWSTR	text;
-    HICON32     hIcon;
+    HICON     hIcon;
 } STATUSWINDOWPART;
 
 typedef struct
 {
     UINT16              numParts;
     UINT16              textHeight;
-    UINT32              height;
-    BOOL32              simple;
-    HWND32              hwndToolTip;
-    HFONT32             hFont;
-    HFONT32             hDefaultFont;
+    UINT              height;
+    BOOL              simple;
+    HWND              hwndToolTip;
+    HFONT             hFont;
+    HFONT             hDefaultFont;
     COLORREF            clrBk;     /* background color */
-    BOOL32              bUnicode;  /* unicode flag */
+    BOOL              bUnicode;  /* unicode flag */
     STATUSWINDOWPART	part0;	   /* simple window */
     STATUSWINDOWPART   *parts;
 } STATUSWINDOWINFO;
diff --git a/include/struct32.h b/include/struct32.h
index a239ece2f28..3c1c8189cb1 100644
--- a/include/struct32.h
+++ b/include/struct32.h
@@ -6,24 +6,24 @@
 #include "wine/winuser16.h"
 #include "queue.h"
 
-extern void STRUCT32_MINMAXINFO32to16( const MINMAXINFO32*, MINMAXINFO16* );
-extern void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16*, MINMAXINFO32* );
-extern void STRUCT32_WINDOWPOS32to16( const WINDOWPOS32*, WINDOWPOS16* );
-extern void STRUCT32_WINDOWPOS16to32( const WINDOWPOS16*, WINDOWPOS32* );
-extern void STRUCT32_NCCALCSIZE32to16Flat( const NCCALCSIZE_PARAMS32 *from,
+extern void STRUCT32_MINMAXINFO32to16( const MINMAXINFO*, MINMAXINFO16* );
+extern void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16*, MINMAXINFO* );
+extern void STRUCT32_WINDOWPOS32to16( const WINDOWPOS*, WINDOWPOS16* );
+extern void STRUCT32_WINDOWPOS16to32( const WINDOWPOS16*, WINDOWPOS* );
+extern void STRUCT32_NCCALCSIZE32to16Flat( const NCCALCSIZE_PARAMS *from,
                                            NCCALCSIZE_PARAMS16 *to,
                                            int validRects );
 extern void STRUCT32_NCCALCSIZE16to32Flat( const NCCALCSIZE_PARAMS16* from,
-                                           NCCALCSIZE_PARAMS32* to,
+                                           NCCALCSIZE_PARAMS* to,
                                            int validRects );
 
-void STRUCT32_MSG16to32(const MSG16 *msg16,MSG32 *msg32);
-void STRUCT32_MSG32to16(const MSG32 *msg32,MSG16 *msg16);
+void STRUCT32_MSG16to32(const MSG16 *msg16,MSG *msg32);
+void STRUCT32_MSG32to16(const MSG *msg32,MSG16 *msg16);
 
-void STRUCT32_CREATESTRUCT32Ato16(const CREATESTRUCT32A*,CREATESTRUCT16*);
-void STRUCT32_CREATESTRUCT16to32A(const CREATESTRUCT16*,CREATESTRUCT32A*);
-void STRUCT32_MDICREATESTRUCT32Ato16( const MDICREATESTRUCT32A*,
+void STRUCT32_CREATESTRUCT32Ato16(const CREATESTRUCTA*,CREATESTRUCT16*);
+void STRUCT32_CREATESTRUCT16to32A(const CREATESTRUCT16*,CREATESTRUCTA*);
+void STRUCT32_MDICREATESTRUCT32Ato16( const MDICREATESTRUCTA*,
                                       MDICREATESTRUCT16*);
 void STRUCT32_MDICREATESTRUCT16to32A( const MDICREATESTRUCT16*,
-                                      MDICREATESTRUCT32A*);
+                                      MDICREATESTRUCTA*);
 #endif  /* __WINE_STRUCT32_H */
diff --git a/include/syslevel.h b/include/syslevel.h
index aad7a054f00..68039a0d8b4 100644
--- a/include/syslevel.h
+++ b/include/syslevel.h
@@ -19,7 +19,7 @@ VOID WINAPI SYSLEVEL_LeaveWin16Lock(VOID);
 VOID SYSLEVEL_ReleaseWin16Lock(VOID);
 VOID SYSLEVEL_RestoreWin16Lock(VOID);
 
-VOID WINAPI GetpWin16Lock32(CRITICAL_SECTION **lock);
+VOID WINAPI GetpWin16Lock(CRITICAL_SECTION **lock);
 SEGPTR WINAPI GetpWin16Lock16(void);
 
 VOID WINAPI _EnterSysLevel(CRITICAL_SECTION *lock);
diff --git a/include/tab.h b/include/tab.h
index e3bfb45fac1..b776ce6b9b7 100644
--- a/include/tab.h
+++ b/include/tab.h
@@ -9,29 +9,29 @@
 
 typedef struct tagTAB_ITEM
 {
-	UINT32  mask;
+	UINT  mask;
 	DWORD	dwState;
     LPSTR	pszText;
-	INT32   cchTextMax;
-    INT32	iImage;
+	INT   cchTextMax;
+    INT	iImage;
     LPARAM	lParam;
-    RECT32   	rect;		/* bounding rectangle of the item */
+    RECT   	rect;		/* bounding rectangle of the item */
 } TAB_ITEM;
 
 typedef struct tagTAB_INFO
 {
-    UINT32	    uNumItem;	/* number of tab items */
-    INT32	    nHeight;	/* height of the tab row */
-    HFONT32	    hFont;		/* handle to the current font */
-    HCURSOR32	hcurArrow;	/* handle to the current cursor */
+    UINT	    uNumItem;	/* number of tab items */
+    INT	    nHeight;	/* height of the tab row */
+    HFONT	    hFont;		/* handle to the current font */
+    HCURSOR	hcurArrow;	/* handle to the current cursor */
 	HIMAGELIST  himl;       /* handle to a image list (may be 0) */
-	HWND32		hwndToolTip; /* handle to tab's tooltip */
-	UINT32		cchTextMax;
-    INT32	    iSelected;	/* the currently selected item */
-    INT32	    uFocus;		/* item which has the focus */
+	HWND		hwndToolTip; /* handle to tab's tooltip */
+	UINT		cchTextMax;
+    INT	    iSelected;	/* the currently selected item */
+    INT	    uFocus;		/* item which has the focus */
     TAB_ITEM	*items;		/* pointer to an array of TAB_ITEM's */
-    RECT32	    rect;
-    BOOL32	    DoRedraw;	/* flag for redrawing when tab contents is changed*/
+    RECT	    rect;
+    BOOL	    DoRedraw;	/* flag for redrawing when tab contents is changed*/
 } TAB_INFO;
 
 
diff --git a/include/task.h b/include/task.h
index 090620090bc..af64809a01f 100644
--- a/include/task.h
+++ b/include/task.h
@@ -34,7 +34,7 @@ typedef struct
     BYTE      fcb2[20];                /* 6c Second FCB */
     BYTE      cmdLine[128];            /* 80 Command-line (first byte is len)*/
     BYTE      padding[16];             /* Some apps access beyond the end of the cmd line */
-} PDB;
+} PDB16;
 
 
   /* Segment containing MakeProcInstance() thunks */
@@ -108,7 +108,7 @@ typedef struct _TDB
     BYTE      module_name[8];             /* f2 Module name for task */
     WORD      magic;                      /* fa TDB signature */
     DWORD     unused7;                    /* fc */
-    PDB       pdb;                        /* 100 PDB for this task */
+    PDB16       pdb;                        /* 100 PDB for this task */
 } TDB;
 
 #define TDB_MAGIC    ('T' | ('D' << 8))
@@ -152,13 +152,13 @@ extern HTASK16 TASK_Create( struct _THDB *thdb, struct _NE_MODULE *pModule,
 extern void TASK_StartTask( HTASK16 hTask );
 extern void TASK_KillCurrentTask( INT16 exitCode );
 extern HTASK16 TASK_GetNextTask( HTASK16 hTask );
-extern BOOL32 TASK_Reschedule(void);
+extern BOOL TASK_Reschedule(void);
 extern void TASK_InstallTHHook( THHOOK *pNewThook );
 
-extern HQUEUE16 WINAPI SetThreadQueue( DWORD thread, HQUEUE16 hQueue );
-extern HQUEUE16 WINAPI GetThreadQueue( DWORD thread );
-extern VOID WINAPI SetFastQueue( DWORD thread, HANDLE32 hQueue );
-extern HANDLE32 WINAPI GetFastQueue( void );
+extern HQUEUE16 WINAPI SetThreadQueue16( DWORD thread, HQUEUE16 hQueue );
+extern HQUEUE16 WINAPI GetThreadQueue16( DWORD thread );
+extern VOID WINAPI SetFastQueue16( DWORD thread, HANDLE hQueue );
+extern HANDLE WINAPI GetFastQueue16( void );
 
 
 #endif /* __WINE_TASK_H */
diff --git a/include/tchar.h b/include/tchar.h
index 0396997c540..d4472e1fd05 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -250,18 +250,18 @@ char *_strupr(char *string);
 #define _TEXT(x) __T(x)
 #define __T(x) x
 
-typedef CHAR  _TCHAR32A;
-typedef WCHAR _TCHAR32W;
+typedef CHAR  _TCHARA;
+typedef WCHAR _TCHARW;
 DECL_WINELIB_TYPE_AW (_TCHAR)
-typedef UCHAR  _TUCHAR32A;
-typedef WCHAR _TUCHAR32W;
+typedef UCHAR  _TUCHARA;
+typedef WCHAR _TUCHARW;
 DECL_WINELIB_TYPE_AW (_TUCHAR)
-typedef CHAR TCHAR32A, *PTCHAR32A;
-typedef WCHAR TCHAR32W, *PTCHAR32W;
+typedef CHAR TCHARA, *PTCHARA;
+typedef WCHAR TCHARW, *PTCHARW;
 DECL_WINELIB_TYPE_AW (TCHAR)
 DECL_WINELIB_TYPE_AW (PTCHAR)
-typedef LPWSTR PTSTR32W, LPTSTR32W;
-typedef LPSTR PTSTR32A, LPTSTR32A;
+typedef LPWSTR PTSTRW, LPTSTRW;
+typedef LPSTR PTSTRA, LPTSTRA;
 DECL_WINELIB_TYPE_AW (PTSTR)
 DECL_WINELIB_TYPE_AW (LPTSTR)
 	 
diff --git a/include/thread.h b/include/thread.h
index fafa4711411..4eac025cd89 100644
--- a/include/thread.h
+++ b/include/thread.h
@@ -28,7 +28,7 @@
 #define USE_THREADS
 #endif
 
-struct _PDB32;
+struct _PDB;
 
 /* Thread exception block */
 typedef struct _TEB
@@ -48,7 +48,7 @@ typedef struct _TEB
     HQUEUE16     queue;          /* 28 Message queue */
     WORD         pad1;           /* 2a */
     LPVOID      *tls_ptr;        /* 2c Pointer to TLS array */
-    struct _PDB32 *process;      /* 30 owning process (used by NT3.51 applets)*/
+    struct _PDB *process;      /* 30 owning process (used by NT3.51 applets)*/
 } TEB;
 
 /* Thread exception flags */
@@ -59,8 +59,8 @@ typedef struct _TEB
 typedef struct _THDB
 {
     K32OBJ         header;         /*  00 Kernel object header */
-    struct _PDB32 *process;        /*  08 Process owning this thread */
-    HANDLE32       event;          /*  0c Thread event */
+    struct _PDB *process;        /*  08 Process owning this thread */
+    HANDLE       event;          /*  0c Thread event */
     TEB            teb;            /*  10 Thread exception block */
     DWORD          flags;          /*  44 Flags */
     DWORD          exit_code;      /*  48 Termination status */
@@ -122,13 +122,13 @@ extern THDB *pCurrentThread;
 
 
 /* scheduler/thread.c */
-extern THDB *THREAD_CreateInitialThread( struct _PDB32 *pdb );
-extern THDB *THREAD_Create( struct _PDB32 *pdb, DWORD stack_size,
-                            BOOL32 alloc_stack16,
+extern THDB *THREAD_CreateInitialThread( struct _PDB *pdb );
+extern THDB *THREAD_Create( struct _PDB *pdb, DWORD stack_size,
+                            BOOL alloc_stack16,
                             int *server_thandle, int *server_phandle,
                             LPTHREAD_START_ROUTINE start_addr, LPVOID param );
 extern THDB *THREAD_Current(void);
-extern BOOL32 THREAD_IsWin16( THDB *thdb );
+extern BOOL THREAD_IsWin16( THDB *thdb );
 extern THDB *THREAD_IdToTHDB( DWORD id );
 extern void THREAD_Start( THDB *thdb );
 extern DWORD THREAD_TlsAlloc( THDB *thread );
diff --git a/include/toolbar.h b/include/toolbar.h
index 55a4274c310..2c943c0ce15 100644
--- a/include/toolbar.h
+++ b/include/toolbar.h
@@ -10,54 +10,54 @@
 
 typedef struct tagTBUTTON_INFO
 {
-    INT32 iBitmap;
-    INT32 idCommand;
+    INT iBitmap;
+    INT idCommand;
     BYTE  fsState;
     BYTE  fsStyle;
     DWORD dwData;
-    INT32 iString;
+    INT iString;
 
-    INT32 nRow;
-    RECT32 rect;
+    INT nRow;
+    RECT rect;
 } TBUTTON_INFO; 
 
 
 typedef struct tagTOOLBAR_INFO
 {
     DWORD      dwStructSize;   /* size of TBBUTTON struct */
-    INT32      nHeight;        /* height of the toolbar */
-    INT32      nWidth;         /* width of the toolbar */
-    INT32      nButtonHeight;
-    INT32      nButtonWidth;
-    INT32      nBitmapHeight;
-    INT32      nBitmapWidth;
-    INT32      nIndent;
-    INT32      nRows;           /* number of button rows */
-    INT32      nMaxTextRows;    /* maximum number of text rows */
-    INT32      cxMin;           /* minimum button width */
-    INT32      cxMax;           /* maximum button width */
-    INT32      nNumButtons;     /* number of buttons */
-    INT32      nNumBitmaps;     /* number of bitmaps */
-    INT32      nNumStrings;     /* number of strings */
-    BOOL32     bUnicode;        /* ASCII (FALSE) or Unicode (TRUE)? */
-    BOOL32     bCaptured;       /* mouse captured? */
-    INT32      nButtonDown;
-    INT32      nOldHit;
-    INT32      nHotItem;        /* index of the "hot" item */
-    HFONT32    hFont;           /* text font */
+    INT      nHeight;        /* height of the toolbar */
+    INT      nWidth;         /* width of the toolbar */
+    INT      nButtonHeight;
+    INT      nButtonWidth;
+    INT      nBitmapHeight;
+    INT      nBitmapWidth;
+    INT      nIndent;
+    INT      nRows;           /* number of button rows */
+    INT      nMaxTextRows;    /* maximum number of text rows */
+    INT      cxMin;           /* minimum button width */
+    INT      cxMax;           /* maximum button width */
+    INT      nNumButtons;     /* number of buttons */
+    INT      nNumBitmaps;     /* number of bitmaps */
+    INT      nNumStrings;     /* number of strings */
+    BOOL     bUnicode;        /* ASCII (FALSE) or Unicode (TRUE)? */
+    BOOL     bCaptured;       /* mouse captured? */
+    INT      nButtonDown;
+    INT      nOldHit;
+    INT      nHotItem;        /* index of the "hot" item */
+    HFONT    hFont;           /* text font */
     HIMAGELIST himlStd;         /* standard image list */
     HIMAGELIST himlDef;         /* default image list */
     HIMAGELIST himlHot;         /* hot image list */
     HIMAGELIST himlDis;         /* disabled image list */
-    HWND32     hwndToolTip;     /* handle to tool tip control */
-    HWND32     hwndNotify;      /* handle to the window that gets notifications */
-    BOOL32     bTransparent;    /* background transparency flag */
-    BOOL32     bAutoSize;       /* auto size deadlock indicator */
+    HWND     hwndToolTip;     /* handle to tool tip control */
+    HWND     hwndNotify;      /* handle to the window that gets notifications */
+    BOOL     bTransparent;    /* background transparency flag */
+    BOOL     bAutoSize;       /* auto size deadlock indicator */
     DWORD      dwExStyle;       /* extended toolbar style */
     DWORD      dwDTFlags;       /* DrawText flags */
 
     COLORREF   clrInsertMark;   /* insert mark color */
-    RECT32     rcBound;         /* bounding rectangle */
+    RECT     rcBound;         /* bounding rectangle */
 
     TBUTTON_INFO *buttons;      /* pointer to button array */
     LPWSTR       *strings;      /* pointer to string array */
diff --git a/include/toolhelp.h b/include/toolhelp.h
index 1286d3d9d1a..e416ed0a9b8 100644
--- a/include/toolhelp.h
+++ b/include/toolhelp.h
@@ -77,12 +77,12 @@ typedef struct
 /* wFlags values */
 #define GF_PDB_OWNER        0x0100      /* Low byte is KERNEL flags */
 
-WORD   WINAPI GlobalHandleToSel( HGLOBAL16 handle );
-BOOL16 WINAPI GlobalInfo( GLOBALINFO *pInfo );
-BOOL16 WINAPI GlobalFirst( GLOBALENTRY *pGlobal, WORD wFlags );
-BOOL16 WINAPI GlobalNext( GLOBALENTRY *pGlobal, WORD wFlags) ;
-BOOL16 WINAPI GlobalEntryHandle( GLOBALENTRY *pGlobal, HGLOBAL16 hItem );
-BOOL16 WINAPI GlobalEntryModule( GLOBALENTRY *pGlobal, HMODULE16 hModule,
+WORD   WINAPI GlobalHandleToSel16( HGLOBAL16 handle );
+BOOL16 WINAPI GlobalInfo16( GLOBALINFO *pInfo );
+BOOL16 WINAPI GlobalFirst16( GLOBALENTRY *pGlobal, WORD wFlags );
+BOOL16 WINAPI GlobalNext16( GLOBALENTRY *pGlobal, WORD wFlags) ;
+BOOL16 WINAPI GlobalEntryHandle16( GLOBALENTRY *pGlobal, HGLOBAL16 hItem );
+BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule,
                                  WORD wSeg );
 
 /* Local heap */
@@ -157,9 +157,9 @@ typedef struct
 #define LT_USER_HANDLETABLE         32
 #define LT_USER_MAX                 LT_USER_HANDLETABLE
 
-BOOL16 WINAPI LocalInfo( LOCALINFO *pLocalInfo, HGLOBAL16 handle );
-BOOL16 WINAPI LocalFirst( LOCALENTRY *pLocalEntry, HGLOBAL16 handle );
-BOOL16 WINAPI LocalNext( LOCALENTRY *pLocalEntry );
+BOOL16 WINAPI LocalInfo16( LOCALINFO *pLocalInfo, HGLOBAL16 handle );
+BOOL16 WINAPI LocalFirst16( LOCALENTRY *pLocalEntry, HGLOBAL16 handle );
+BOOL16 WINAPI LocalNext16( LOCALENTRY *pLocalEntry );
 
 /* Local 32-bit heap */
 
@@ -191,9 +191,9 @@ typedef struct
 /* LOCAL32ENTRY.wFlags same as LOCALENTRY.wFlags */
 /* LOCAL32ENTRY.wType same as LOCALENTRY.wType */
 
-BOOL16 WINAPI Local32Info( LOCAL32INFO *pLocal32Info, HGLOBAL16 handle );
-BOOL16 WINAPI Local32First( LOCAL32ENTRY *pLocal32Entry, HGLOBAL16 handle );
-BOOL16 WINAPI Local32Next( LOCAL32ENTRY *pLocal32Entry );
+BOOL16 WINAPI Local32Info16( LOCAL32INFO *pLocal32Info, HGLOBAL16 handle );
+BOOL16 WINAPI Local32First16( LOCAL32ENTRY *pLocal32Entry, HGLOBAL16 handle );
+BOOL16 WINAPI Local32Next16( LOCAL32ENTRY *pLocal32Entry );
 
 
 /* modules */
@@ -208,10 +208,10 @@ typedef struct
     HANDLE16   wNext;
 } MODULEENTRY, *LPMODULEENTRY;
 
-BOOL16 WINAPI ModuleFirst(MODULEENTRY *lpModule);
-BOOL16 WINAPI ModuleNext(MODULEENTRY *lpModule);
-BOOL16 WINAPI ModuleFindName(MODULEENTRY *lpModule, LPCSTR lpstrName);
-BOOL16 WINAPI ModuleFindHandle(MODULEENTRY *lpModule, HMODULE16 hModule);
+BOOL16 WINAPI ModuleFirst16(MODULEENTRY *lpModule);
+BOOL16 WINAPI ModuleNext16(MODULEENTRY *lpModule);
+BOOL16 WINAPI ModuleFindName16(MODULEENTRY *lpModule, LPCSTR lpstrName);
+BOOL16 WINAPI ModuleFindHandle16(MODULEENTRY *lpModule, HMODULE16 hModule);
 
 /* tasks */
 
@@ -234,9 +234,9 @@ typedef struct
     HANDLE16     hNext;
 } TASKENTRY, *LPTASKENTRY;
 
-BOOL16 WINAPI TaskFirst(LPTASKENTRY lpTask);
-BOOL16 WINAPI TaskNext(LPTASKENTRY lpTask);
-BOOL16 WINAPI TaskFindHandle(LPTASKENTRY lpTask, HTASK16 hTask);
+BOOL16 WINAPI TaskFirst16(LPTASKENTRY lpTask);
+BOOL16 WINAPI TaskNext16(LPTASKENTRY lpTask);
+BOOL16 WINAPI TaskFindHandle16(LPTASKENTRY lpTask, HTASK16 hTask);
 DWORD  WINAPI TaskSetCSIP(HTASK16 hTask, WORD wCS, WORD wIP);
 DWORD  WINAPI TaskGetCSIP(HTASK16 hTask);
 BOOL16 WINAPI TaskSwitch(HTASK16 hTask, DWORD dwNewCSIP);
@@ -267,8 +267,8 @@ typedef struct
     HGLOBAL16 hGDISegment;
 } SYSHEAPINFO;
 
-BOOL16 WINAPI MemManInfo(LPMEMMANINFO lpEnhMode);
-BOOL16 WINAPI SystemHeapInfo( SYSHEAPINFO *pHeapInfo );
+BOOL16 WINAPI MemManInfo16(LPMEMMANINFO lpEnhMode);
+BOOL16 WINAPI SystemHeapInfo16( SYSHEAPINFO *pHeapInfo );
 
 /* timer info */
 
@@ -278,7 +278,7 @@ typedef struct tagTIMERINFO {
 	DWORD dwmsThisVM;
 } TIMERINFO;
 
-BOOL16 WINAPI TimerCount( TIMERINFO *pTimerInfo );
+BOOL16 WINAPI TimerCount16( TIMERINFO *pTimerInfo );
 
 /* Window classes */
 
@@ -290,14 +290,14 @@ typedef struct
     HANDLE16  wNext;
 } CLASSENTRY;
 
-BOOL16 WINAPI ClassFirst( CLASSENTRY *pClassEntry );
-BOOL16 WINAPI ClassNext( CLASSENTRY *pClassEntry );
+BOOL16 WINAPI ClassFirst16( CLASSENTRY *pClassEntry );
+BOOL16 WINAPI ClassNext16( CLASSENTRY *pClassEntry );
 
 
 /* Memory read/write */
 
-DWORD WINAPI MemoryRead( WORD sel, DWORD offset, void *buffer, DWORD count );
-DWORD WINAPI MemoryWrite( WORD sel, DWORD offset, void *buffer, DWORD count );
+DWORD WINAPI MemoryRead16( WORD sel, DWORD offset, void *buffer, DWORD count );
+DWORD WINAPI MemoryWrite16( WORD sel, DWORD offset, void *buffer, DWORD count );
 
 /* flags to NotifyRegister() */
 #define NF_NORMAL	0	/* everything except taskswitches, debugerrors,
@@ -306,7 +306,7 @@ DWORD WINAPI MemoryWrite( WORD sel, DWORD offset, void *buffer, DWORD count );
 #define NF_TASKSWITCH	1	/* get taskswitch information */
 #define NF_RIP		2	/* get debugerrors of system */
 
-BOOL16 WINAPI NotifyRegister(HTASK16 htask,FARPROC16 lpfnCallback,WORD wFlags);
+BOOL16 WINAPI NotifyRegister16(HTASK16 htask,FARPROC16 lpfnCallback,WORD wFlags);
 
 #define NFY_UNKNOWN	0
 #define NFY_LOADSEG	1
@@ -401,7 +401,7 @@ typedef struct {
  * Process Entry list as created by CreateToolHelp32Snapshot 
  */
 
-typedef struct tagPROCESSENTRY32 { 
+typedef struct tagPROCESSENTRY { 
     DWORD dwSize; 
     DWORD cntUsage; 
     DWORD th32ProcessID; 
@@ -412,12 +412,12 @@ typedef struct tagPROCESSENTRY32 {
     LONG  pcPriClassBase; 
     DWORD dwFlags; 
     char szExeFile[MAX_PATH]; 
-} PROCESSENTRY32; 
-typedef PROCESSENTRY32 *  PPROCESSENTRY32; 
-typedef PROCESSENTRY32 *  LPPROCESSENTRY32; 
+} PROCESSENTRY; 
+typedef PROCESSENTRY *  PPROCESSENTRY; 
+typedef PROCESSENTRY *  LPPROCESSENTRY; 
 
-BOOL32      WINAPI Process32First(HANDLE32,LPPROCESSENTRY32);
-BOOL32      WINAPI Process32Next(HANDLE32,LPPROCESSENTRY32);
+BOOL      WINAPI Process32First(HANDLE,LPPROCESSENTRY);
+BOOL      WINAPI Process32Next(HANDLE,LPPROCESSENTRY);
 
 
 #endif /* __WINE_TOOLHELP_H */
diff --git a/include/tooltips.h b/include/tooltips.h
index 22e7bb5dff9..d932f7c0724 100644
--- a/include/tooltips.h
+++ b/include/tooltips.h
@@ -10,19 +10,19 @@
 
 typedef struct tagTT_SUBCLASS_INFO
 {
-    WNDPROC32 wpOrigProc;
-    HWND32    hwndToolTip;
-    UINT32    uRefCount;
+    WNDPROC wpOrigProc;
+    HWND    hwndToolTip;
+    UINT    uRefCount;
 } TT_SUBCLASS_INFO, *LPTT_SUBCLASS_INFO;
 
 
 typedef struct tagTTTOOL_INFO
 {
-    UINT32      uFlags;
-    HWND32      hwnd;
-    UINT32      uId;
-    RECT32      rect;
-    HINSTANCE32 hinst;
+    UINT      uFlags;
+    HWND      hwnd;
+    UINT      uId;
+    RECT      rect;
+    HINSTANCE hinst;
     LPWSTR      lpszText;
     LPARAM      lParam;
 } TTTOOL_INFO; 
@@ -31,24 +31,24 @@ typedef struct tagTTTOOL_INFO
 typedef struct tagTOOLTIPS_INFO
 {
     WCHAR      szTipText[INFOTIPSIZE];
-    BOOL32     bActive;
-    BOOL32     bTrackActive;
-    UINT32     uNumTools;
+    BOOL     bActive;
+    BOOL     bTrackActive;
+    UINT     uNumTools;
     COLORREF   clrBk;
     COLORREF   clrText;
-    HFONT32    hFont;
-    INT32      xTrackPos;
-    INT32      yTrackPos;
-    INT32      nMaxTipWidth;
-    INT32      nTool;
-    INT32      nOldTool;
-    INT32      nCurrentTool;
-    INT32      nTrackTool;
-    INT32      nAutomaticTime;
-    INT32      nReshowTime;
-    INT32      nAutoPopTime;
-    INT32      nInitialTime;
-    RECT32     rcMargin;
+    HFONT    hFont;
+    INT      xTrackPos;
+    INT      yTrackPos;
+    INT      nMaxTipWidth;
+    INT      nTool;
+    INT      nOldTool;
+    INT      nCurrentTool;
+    INT      nTrackTool;
+    INT      nAutomaticTime;
+    INT      nReshowTime;
+    INT      nAutoPopTime;
+    INT      nInitialTime;
+    RECT     rcMargin;
 
     TTTOOL_INFO *tools;
 } TOOLTIPS_INFO;
diff --git a/include/trackbar.h b/include/trackbar.h
index 468791ebdf9..39884b265e9 100644
--- a/include/trackbar.h
+++ b/include/trackbar.h
@@ -9,29 +9,29 @@
 
 typedef struct tagTRACKBAR_INFO
 {
-    INT32  nRangeMin;
-    INT32  nRangeMax;
-    INT32  nLineSize;
-    INT32  nPageSize;
-    INT32  nSelMin;
-    INT32  nSelMax;
-    INT32  nPos;
-    UINT32 uThumbLen;
-    UINT32 uNumTics;
-	UINT32  uTicFreq;
-	HWND32 hwndNotify;
-    HWND32 hwndToolTip;
-    HWND32 hwndBuddyLA;
-    HWND32 hwndBuddyRB;
-    INT32  fLocation;
+    INT  nRangeMin;
+    INT  nRangeMax;
+    INT  nLineSize;
+    INT  nPageSize;
+    INT  nSelMin;
+    INT  nSelMax;
+    INT  nPos;
+    UINT uThumbLen;
+    UINT uNumTics;
+	UINT  uTicFreq;
+	HWND hwndNotify;
+    HWND hwndToolTip;
+    HWND hwndBuddyLA;
+    HWND hwndBuddyRB;
+    INT  fLocation;
 	COLORREF clrBk;
 	
-	INT32  flags;
-    BOOL32 bFocus;
-    RECT32 rcChannel;
-    RECT32 rcSelection;
-    RECT32 rcThumb;
-	INT32  dragPos;
+	INT  flags;
+    BOOL bFocus;
+    RECT rcChannel;
+    RECT rcSelection;
+    RECT rcThumb;
+	INT  dragPos;
     LPLONG tics;
 } TRACKBAR_INFO;
 
diff --git a/include/treeview.h b/include/treeview.h
index a2d98f86df0..aab977558cc 100644
--- a/include/treeview.h
+++ b/include/treeview.h
@@ -17,10 +17,10 @@
 /* internal structures */
 
 typedef struct {
-    UINT32 mask;
+    UINT mask;
     HTREEITEM hItem;
-    UINT32 state;
-    UINT32 stateMask;
+    UINT state;
+    UINT stateMask;
     LPSTR pszText;
     int cchTextMax;
     int iImage;
@@ -36,30 +36,30 @@ typedef struct {
 	HTREEITEM sibling;        /* handle to next item in list, 0 if last */
 	HTREEITEM upsibling;      /* handle to previous item in list, 0 if first */
 	int visible;
-    RECT32 rect;
-	RECT32 text;
+    RECT rect;
+	RECT text;
 } TREEVIEW_ITEM;
 
 
 
 typedef struct tagTREEVIEW_INFO
 {
-    UINT32	uInternalStatus;		
-	UINT32  bAutoSize;			/* merge with uInternalStatus */
-	INT32	Timer;
-    UINT32  uNumItems;	/* number of valid TREEVIEW_ITEMs */
-    UINT32	uNumPtrsAlloced; 
+    UINT	uInternalStatus;		
+	UINT  bAutoSize;			/* merge with uInternalStatus */
+	INT	Timer;
+    UINT  uNumItems;	/* number of valid TREEVIEW_ITEMs */
+    UINT	uNumPtrsAlloced; 
     HTREEITEM	uMaxHandle;	/* needed for delete_item */
     HTREEITEM 	TopRootItem;	/* handle to first item in treeview */
-	INT32	cdmode;		/* last custom draw setting */
-
-	UINT32	uItemHeight;		/* item height, -1 for default item height */
-	UINT32 	uRealItemHeight;	/* current item height in pixels */
-	UINT32	uVisibleHeight;	    /* visible height of treeview in pixels */
-    UINT32	uTotalHeight;		/* total height of treeview in pixels */
-	UINT32	uVisibleWidth;	    
-    UINT32	uTotalWidth;	
-    UINT32	uIndent;			/* indentation in pixels */
+	INT	cdmode;		/* last custom draw setting */
+
+	UINT	uItemHeight;		/* item height, -1 for default item height */
+	UINT 	uRealItemHeight;	/* current item height in pixels */
+	UINT	uVisibleHeight;	    /* visible height of treeview in pixels */
+    UINT	uTotalHeight;		/* total height of treeview in pixels */
+	UINT	uVisibleWidth;	    
+    UINT	uTotalWidth;	
+    UINT	uIndent;			/* indentation in pixels */
     HTREEITEM	selectedItem;   /* handle to selected item or 0 if none */
 	HTREEITEM	focusItem;		/* handle to item that has focus, 0 if none */
 	HTREEITEM	hotItem;		/* handle currently under cursor, 0 if none */
@@ -67,19 +67,19 @@ typedef struct tagTREEVIEW_INFO
     HTREEITEM   firstVisible;	/* handle to first visible item */
     HTREEITEM   dropItem;	/* handle to item selected by drag cursor */
 	HIMAGELIST  dragList;	/* Bitmap of dragged item */
-    INT32		cx,cy;		/* current x/y place in list */
+    INT		cx,cy;		/* current x/y place in list */
     COLORREF	clrBk;		
     COLORREF	clrText;
-    HFONT32 	hFont;
-    HFONT32 	hBoldFont;
-	HWND32		hwndToolTip;
-	HWND32		hwndEdit;
-	WNDPROC32   wpEditOrig;     /* needed for subclassing edit control */
+    HFONT 	hFont;
+    HFONT 	hBoldFont;
+	HWND		hwndToolTip;
+	HWND		hwndEdit;
+	WNDPROC   wpEditOrig;     /* needed for subclassing edit control */
 
     HIMAGELIST	himlNormal;	
     HIMAGELIST	himlState;
     TREEVIEW_ITEM *items;	/* itemlist */
-    INT32		*freeList;	/* bitmap indicating which elements are valid */
+    INT		*freeList;	/* bitmap indicating which elements are valid */
 				/* 1=valid, 0=free; 	*/
 				/* size of list= uNumPtrsAlloced/32 */
 
diff --git a/include/ttydrv.h b/include/ttydrv.h
index 8600722a0d3..3a5e32b71bc 100644
--- a/include/ttydrv.h
+++ b/include/ttydrv.h
@@ -18,20 +18,20 @@ struct tagWND;
 typedef struct {
 } TTYDRV_PDEVICE;
 
-extern BOOL32 TTYDRV_GDI_Initialize(void);
+extern BOOL TTYDRV_GDI_Initialize(void);
 extern void TTDRV_GDI_Finalize(void);
-extern BOOL32 TTYDRV_GDI_CreateDC(struct tagDC *dc, LPCSTR driver, LPCSTR device, LPCSTR output, const DEVMODE16 *initData);
-extern BOOL32 TTYDRV_GDI_DeleteDC(struct tagDC *dc);
-extern INT32 TTYDRV_GDI_Escape(struct tagDC *dc, INT32 nEscape, INT32 cbInput, SEGPTR lpInData, SEGPTR lpOutData);
+extern BOOL TTYDRV_GDI_CreateDC(struct tagDC *dc, LPCSTR driver, LPCSTR device, LPCSTR output, const DEVMODE16 *initData);
+extern BOOL TTYDRV_GDI_DeleteDC(struct tagDC *dc);
+extern INT TTYDRV_GDI_Escape(struct tagDC *dc, INT nEscape, INT cbInput, SEGPTR lpInData, SEGPTR lpOutData);
 
 /* TTY clipboard driver */
 
 extern struct _CLIPBOARD_DRIVER TTYDRV_CLIPBOARD_Driver;
 
 extern void TTYDRV_CLIPBOARD_EmptyClipboard(void);
-extern void TTYDRV_CLIPBOARD_SetClipboardData(UINT32 wFormat);
-extern BOOL32 TTYDRV_CLIPBOARD_RequestSelection(void);
-extern void TTYDRV_CLIPBOARD_ResetOwner(struct tagWND *pWnd, BOOL32 bFooBar);
+extern void TTYDRV_CLIPBOARD_SetClipboardData(UINT wFormat);
+extern BOOL TTYDRV_CLIPBOARD_RequestSelection(void);
+extern void TTYDRV_CLIPBOARD_ResetOwner(struct tagWND *pWnd, BOOL bFooBar);
 
 /* TTY desktop driver */
 
@@ -47,15 +47,15 @@ extern int TTYDRV_DESKTOP_GetScreenDepth(struct tagDESKTOP *pDesktop);
 
 extern struct _EVENT_DRIVER TTYDRV_EVENT_Driver;
 
-extern BOOL32 TTYDRV_EVENT_Init(void);
+extern BOOL TTYDRV_EVENT_Init(void);
 extern void TTYDRV_EVENT_AddIO(int fd, unsigned flag);
 extern void TTYDRV_EVENT_DeleteIO(int fd, unsigned flag);
-extern BOOL32 TTYDRV_EVENT_WaitNetEvent(BOOL32 sleep, BOOL32 peek);
+extern BOOL TTYDRV_EVENT_WaitNetEvent(BOOL sleep, BOOL peek);
 extern void TTYDRV_EVENT_Synchronize(void);
-extern BOOL32 TTYDRV_EVENT_CheckFocus(void);
-extern BOOL32 TTYDRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state);
+extern BOOL TTYDRV_EVENT_CheckFocus(void);
+extern BOOL TTYDRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state);
 extern void TTYDRV_EVENT_DummyMotionNotify(void);
-extern BOOL32 TTYDRV_EVENT_Pending(void);
+extern BOOL TTYDRV_EVENT_Pending(void);
 extern BOOL16 TTYDRV_EVENT_IsUserIdle(void);
 extern void TTYDRV_EVENT_WakeUp(void);
 
@@ -109,18 +109,18 @@ extern struct _WND_DRIVER TTYDRV_WND_Driver;
 
 extern void TTYDRV_WND_Initialize(struct tagWND *wndPtr);
 extern void TTYDRV_WND_Finalize(struct tagWND *wndPtr);
-extern BOOL32 TTYDRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, BOOL32 bUnicode);
-extern BOOL32 TTYDRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, CREATESTRUCT32A *cs, BOOL32 bUnicode);
-extern BOOL32 TTYDRV_WND_DestroyWindow(struct tagWND *pWnd);
+extern BOOL TTYDRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, BOOL bUnicode);
+extern BOOL TTYDRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, CREATESTRUCTA *cs, BOOL bUnicode);
+extern BOOL TTYDRV_WND_DestroyWindow(struct tagWND *pWnd);
 extern struct tagWND *TTYDRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent);
 extern void TTYDRV_WND_ForceWindowRaise(struct tagWND *pWnd);
-extern void TTYDRV_WND_SetWindowPos(struct tagWND *wndPtr, const WINDOWPOS32 *winpos, BOOL32 bSMC_SETXPOS);
+extern void TTYDRV_WND_SetWindowPos(struct tagWND *wndPtr, const WINDOWPOS *winpos, BOOL bSMC_SETXPOS);
 extern void TTYDRV_WND_SetText(struct tagWND *wndPtr, LPCSTR text);
 extern void TTYDRV_WND_SetFocus(struct tagWND *wndPtr);
 extern void TTYDRV_WND_PreSizeMove(struct tagWND *wndPtr);
 extern void TTYDRV_WND_PostSizeMove(struct tagWND *wndPtr);
-extern void TTYDRV_WND_ScrollWindow(struct tagWND *wndPtr, struct tagDC *dcPtr, INT32 dx, INT32 dy, const RECT32 *clipRect, BOOL32 bUpdate);
-extern void TTYDRV_WND_SetDrawable(struct tagWND *wndPtr, struct tagDC *dc, WORD flags, BOOL32 bSetClipOrigin);
-extern BOOL32 TTYDRV_WND_IsSelfClipping(struct tagWND *wndPtr);
+extern void TTYDRV_WND_ScrollWindow(struct tagWND *wndPtr, struct tagDC *dcPtr, INT dx, INT dy, const RECT *clipRect, BOOL bUpdate);
+extern void TTYDRV_WND_SetDrawable(struct tagWND *wndPtr, struct tagDC *dc, WORD flags, BOOL bSetClipOrigin);
+extern BOOL TTYDRV_WND_IsSelfClipping(struct tagWND *wndPtr);
 
 #endif /* !defined(__WINE_TTYDRV_H) */
diff --git a/include/updown.h b/include/updown.h
index e33ab2299be..e7bfbd93ded 100644
--- a/include/updown.h
+++ b/include/updown.h
@@ -12,14 +12,14 @@
 
 typedef struct
 {
-  UINT32      AccelCount;   /* Number of elements in AccelVect */
+  UINT      AccelCount;   /* Number of elements in AccelVect */
   UDACCEL*    AccelVect;    /* Vector containing AccelCount elements */
-  INT32       Base;         /* Base to display nr in the buddy window */
-  INT32       CurVal;       /* Current up-down value */
-  INT32       MinVal;       /* Minimum up-down value */
-  INT32       MaxVal;       /* Maximum up-down value */
-  HWND32      Buddy;        /* Handle to the buddy window */
-  INT32       Flags;        /* Internal Flags FLAG_* */
+  INT       Base;         /* Base to display nr in the buddy window */
+  INT       CurVal;       /* Current up-down value */
+  INT       MinVal;       /* Minimum up-down value */
+  INT       MaxVal;       /* Maximum up-down value */
+  HWND      Buddy;        /* Handle to the buddy window */
+  INT       Flags;        /* Internal Flags FLAG_* */
 } UPDOWN_INFO;
 
 typedef struct tagNM_UPDOWN
diff --git a/include/ver.h b/include/ver.h
index 5ee399299f5..e09ec48a872 100644
--- a/include/ver.h
+++ b/include/ver.h
@@ -138,10 +138,10 @@ typedef struct tagVS_FIXEDFILEINFO {
 
 #ifdef __WINE__
 
-DWORD WINAPI GetFileResourceSize32( LPCSTR lpszFileName,
+DWORD WINAPI GetFileResourceSize( LPCSTR lpszFileName,
                                     LPCSTR lpszResType, LPCSTR lpszResId,
                                     LPDWORD lpdwFileOffset );
-DWORD WINAPI GetFileResource32( LPCSTR lpszFileName,
+DWORD WINAPI GetFileResource( LPCSTR lpszFileName,
                                 LPCSTR lpszResType, LPCSTR lpszResId,
                                 DWORD dwFileOffset,
                                 DWORD dwResLen, LPVOID lpvData );
diff --git a/include/vfw.h b/include/vfw.h
index 2ceb2e3d07e..ce4af502b7b 100644
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -29,12 +29,12 @@ DWORD VFWAPI VideoForWindowsVersion(void);
 /* HIC32 struct (same layout as Win95 one) */
 typedef struct tagWINE_HIC {
 	DWORD		magic;		/* 00: 'Smag' */
-	HANDLE32	curthread;	/* 04: */
+	HANDLE	curthread;	/* 04: */
 	DWORD		type;		/* 08: */
 	DWORD		handler;	/* 0C: */
-	HDRVR32		hdrv;		/* 10: */
+	HDRVR		hdrv;		/* 10: */
 	DWORD		private;	/* 14:(handled by SendDriverMessage32)*/
-	FARPROC32	driverproc;	/* 18:(handled by SendDriverMessage32)*/
+	FARPROC	driverproc;	/* 18:(handled by SendDriverMessage32)*/
 	DWORD		x1;		/* 1c: name? */
 	WORD		x2;		/* 20: */
 	DWORD		x3;		/* 22: */
@@ -170,47 +170,41 @@ typedef struct {
     LPVOID		lpPrev;
 } ICCOMPRESS;
 
-DWORD VFWAPIV ICCompress32(
-	HIC32 hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiOutput,LPVOID lpData,
+DWORD VFWAPIV ICCompress(
+	HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiOutput,LPVOID lpData,
 	LPBITMAPINFOHEADER lpbiInput,LPVOID lpBits,LPDWORD lpckid,
 	LPDWORD lpdwFlags,LONG lFrameNum,DWORD dwFrameSize,DWORD dwQuality,
 	LPBITMAPINFOHEADER lpbiPrev,LPVOID lpPrev
 );
 
-#define ICCompressGetFormat32(hic, lpbiInput, lpbiOutput) 		\
-	ICSendMessage32(						\
+#define ICCompressGetFormat(hic, lpbiInput, lpbiOutput) 		\
+	ICSendMessage(						\
 	    hic,ICM_COMPRESS_GET_FORMAT,(DWORD)(LPVOID)(lpbiInput),	\
 	    (DWORD)(LPVOID)(lpbiOutput)					\
 	)
-#define ICCompressGetFormat WINELIB_NAME(ICCompressGetFormat)
 
-#define ICCompressGetFormatSize32(hic,lpbi) ICCompressGetFormat32(hic,lpbi,NULL)
-#define ICCompressGetFormatSize WINELIB_NAME(ICCompressGetFormatSize)
+#define ICCompressGetFormatSize(hic,lpbi) ICCompressGetFormat(hic,lpbi,NULL)
 
-#define ICCompressBegin32(hic, lpbiInput, lpbiOutput) 			\
-    ICSendMessage32(							\
+#define ICCompressBegin(hic, lpbiInput, lpbiOutput) 			\
+    ICSendMessage(							\
     	hic, ICM_COMPRESS_BEGIN, (DWORD)(LPVOID)(lpbiInput),		\
 	(DWORD)(LPVOID)(lpbiOutput)					\
     )
-#define ICCompressBegin WINELIB_NAME(ICCompressBegin)
 
-#define ICCompressGetSize32(hic, lpbiInput, lpbiOutput) 		\
-    ICSendMessage32(							\
+#define ICCompressGetSize(hic, lpbiInput, lpbiOutput) 		\
+    ICSendMessage(							\
     	hic, ICM_COMPRESS_GET_SIZE, (DWORD)(LPVOID)(lpbiInput), 	\
 	(DWORD)(LPVOID)(lpbiOutput)					\
     )
-#define ICCompressGetSize WINELIB_NAME(ICCompressGetSize)
 
-#define ICCompressQuery32(hic, lpbiInput, lpbiOutput)		\
-    ICSendMessage32(						\
+#define ICCompressQuery(hic, lpbiInput, lpbiOutput)		\
+    ICSendMessage(						\
     	hic, ICM_COMPRESS_QUERY, (DWORD)(LPVOID)(lpbiInput),	\
 	(DWORD)(LPVOID)(lpbiOutput)				\
     )
-#define ICCompressQuery WINELIB_NAME(ICCompressQuery)
 
 
-#define ICCompressEnd32(hic) ICSendMessage32(hic, ICM_COMPRESS_END, 0, 0)
-#define ICCompressEnd WINELIB_NAME(ICCompressEnd)
+#define ICCompressEnd(hic) ICSendMessage(hic, ICM_COMPRESS_END, 0, 0)
 
 /* ICCOMPRESSFRAMES.dwFlags */
 #define ICCOMPRESSFRAMES_PADDING        0x00000001
@@ -260,8 +254,7 @@ typedef struct {
 	WCHAR	szDescription[128];	/* 38:long name */
 	WCHAR	szDriver[128];		/* 138:driver that contains compressor*/
 					/* 238: */
-} ICINFO32;
-DECL_WINELIB_TYPE(ICINFO)
+} ICINFO;
 
 /* ICINFO.dwFlags */
 #define	VIDCF_QUALITY		0x0001  /* supports quality */
@@ -280,22 +273,18 @@ DECL_WINELIB_TYPE(ICINFO)
 /* ICM_ABOUT */
 #define ICMF_ABOUT_QUERY         0x00000001
 
-#define ICQueryAbout32(hic) \
-	(ICSendMessage32(hic,ICM_ABOUT,(DWORD)-1,ICMF_ABOUT_QUERY)==ICERR_OK)
-#define ICQueryAbout WINELIB_NAME(ICQueryAbout)
+#define ICQueryAbout(hic) \
+	(ICSendMessage(hic,ICM_ABOUT,(DWORD)-1,ICMF_ABOUT_QUERY)==ICERR_OK)
 
-#define ICAbout32(hic, hwnd) ICSendMessage32(hic,ICM_ABOUT,(DWORD)(UINT)(hwnd),0)
-#define ICAbout WINELIB_NAME(ICAbout)
+#define ICAbout(hic, hwnd) ICSendMessage(hic,ICM_ABOUT,(DWORD)(UINT)(hwnd),0)
 
 /* ICM_CONFIGURE */
 #define ICMF_CONFIGURE_QUERY	0x00000001
-#define ICQueryConfigure32(hic) \
-	(ICSendMessage32(hic,ICM_CONFIGURE,(DWORD)-1,ICMF_CONFIGURE_QUERY)==ICERR_OK)
-#define ICQueryConfigure WINELIB_NAME(ICQueryConfigure)
+#define ICQueryConfigure(hic) \
+	(ICSendMessage(hic,ICM_CONFIGURE,(DWORD)-1,ICMF_CONFIGURE_QUERY)==ICERR_OK)
 
-#define ICConfigure32(hic,hwnd) \
-	ICSendMessage32(hic,ICM_CONFIGURE,(DWORD)(UINT)(hwnd),0)
-#define ICConfigure WINELIB_NAME(ICConfigure)
+#define ICConfigure(hic,hwnd) \
+	ICSendMessage(hic,ICM_CONFIGURE,(DWORD)(UINT)(hwnd),0)
 
 /* Decompression stuff */
 #define ICDECOMPRESS_HURRYUP		0x80000000	/* don't draw just buffer (hurry up!) */
@@ -321,100 +310,85 @@ typedef struct {
     LPVOID		lpDst;
 
     /* changed for ICM_DECOMPRESSEX */
-    INT32		xDst;       /* destination rectangle */
-    INT32		yDst;
-    INT32		dxDst;
-    INT32		dyDst;
-
-    INT32		xSrc;       /* source rectangle */
-    INT32		ySrc;
-    INT32		dxSrc;
-    INT32		dySrc;
+    INT		xDst;       /* destination rectangle */
+    INT		yDst;
+    INT		dxDst;
+    INT		dyDst;
+
+    INT		xSrc;       /* source rectangle */
+    INT		ySrc;
+    INT		dxSrc;
+    INT		dySrc;
 } ICDECOMPRESSEX;
 
-DWORD VFWAPIV ICDecompress32(HIC32 hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,LPVOID lpData,LPBITMAPINFOHEADER lpbi,LPVOID lpBits);
-#define ICDecompress WINELIB_NAME(ICDecompress)
+DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,LPVOID lpData,LPBITMAPINFOHEADER lpbi,LPVOID lpBits);
 
 
-#define ICDecompressBegin32(hic, lpbiInput, lpbiOutput) 	\
-    ICSendMessage32(						\
+#define ICDecompressBegin(hic, lpbiInput, lpbiOutput) 	\
+    ICSendMessage(						\
     	hic, ICM_DECOMPRESS_BEGIN, (DWORD)(LPVOID)(lpbiInput),	\
 	(DWORD)(LPVOID)(lpbiOutput)				\
     )
-#define ICDecompressBegin WINELIB_NAME(ICDecompressBegin)
 
-#define ICDecompressQuery32(hic, lpbiInput, lpbiOutput) 	\
-    ICSendMessage32(						\
+#define ICDecompressQuery(hic, lpbiInput, lpbiOutput) 	\
+    ICSendMessage(						\
     	hic,ICM_DECOMPRESS_QUERY, (DWORD)(LPVOID)(lpbiInput),	\
 	(DWORD) (LPVOID)(lpbiOutput)				\
     )
-#define ICDecompressQuery WINELIB_NAME(ICDecompressQuery)
 
-#define ICDecompressGetFormat32(hic, lpbiInput, lpbiOutput)		\
-    ((LONG)ICSendMessage32(						\
+#define ICDecompressGetFormat(hic, lpbiInput, lpbiOutput)		\
+    ((LONG)ICSendMessage(						\
     	hic,ICM_DECOMPRESS_GET_FORMAT, (DWORD)(LPVOID)(lpbiInput),	\
 	(DWORD)(LPVOID)(lpbiOutput)					\
     ))
-#define ICDecompressGetFormat WINELIB_NAME(ICDecompressGetFormat)
 
-#define ICDecompressGetFormatSize32(hic, lpbi) 				\
-	ICDecompressGetFormat32(hic, lpbi, NULL)
-#define ICDecompressGetFormatSize WINELIB_NAME(ICDecompressGetFormatSize)
+#define ICDecompressGetFormatSize(hic, lpbi) 				\
+	ICDecompressGetFormat(hic, lpbi, NULL)
 
-#define ICDecompressGetPalette32(hic, lpbiInput, lpbiOutput)		\
-    ICSendMessage32(							\
+#define ICDecompressGetPalette(hic, lpbiInput, lpbiOutput)		\
+    ICSendMessage(							\
     	hic, ICM_DECOMPRESS_GET_PALETTE, (DWORD)(LPVOID)(lpbiInput), 	\
 	(DWORD)(LPVOID)(lpbiOutput)					\
     )
-#define ICDecompressGetPalette WINELIB_NAME(ICDecompressGetPalette)
 
-#define ICDecompressSetPalette32(hic,lpbiPalette)	\
-        ICSendMessage32(				\
+#define ICDecompressSetPalette(hic,lpbiPalette)	\
+        ICSendMessage(				\
 		hic,ICM_DECOMPRESS_SET_PALETTE,		\
 		(DWORD)(LPVOID)(lpbiPalette),0		\
 	)
-#define ICDecompressSetPalette WINELIB_NAME(ICDecompressSetPalette)
 
-#define ICDecompressEnd32(hic) ICSendMessage32(hic, ICM_DECOMPRESS_END, 0, 0)
-#define ICDecompressEnd WINELIB_NAME(ICDecompressEnd)
+#define ICDecompressEnd(hic) ICSendMessage(hic, ICM_DECOMPRESS_END, 0, 0)
 
 
 #define ICDRAW_QUERY        0x00000001L   /* test for support */
 #define ICDRAW_FULLSCREEN   0x00000002L   /* draw to full screen */
 #define ICDRAW_HDC          0x00000004L   /* draw to a HDC/HWND */
 
-BOOL32	VFWAPI	ICInfo32(DWORD fccType, DWORD fccHandler, ICINFO32 * lpicinfo);
-#define ICInfo WINELIB_NAME(ICInfo)
-LRESULT	VFWAPI	ICGetInfo32(HIC32 hic,ICINFO32 *picinfo, DWORD cb);
-#define ICGetInfo WINELIB_NAME(ICGetInfo)
-HIC32	VFWAPI	ICOpen32(DWORD fccType, DWORD fccHandler, UINT32 wMode);
-#define ICOpen WINELIB_NAME(ICOpen)
-LRESULT VFWAPI ICClose32(HIC32 hic);
-#define ICClose WINELIB_NAME(ICClose)
-LRESULT	VFWAPI	ICSendMessage32(HIC32 hic, UINT32 msg, DWORD dw1, DWORD dw2);
-#define ICSendMessage WINELIB_NAME(ICSendMessage)
-HIC32	VFWAPI ICLocate32(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, WORD wFlags);
-#define ICLocate WINELIB_NAME(ICLocate)
-
-DWORD	VFWAPIV	ICDrawBegin32(
-        HIC32			hic,
+BOOL	VFWAPI	ICInfo(DWORD fccType, DWORD fccHandler, ICINFO * lpicinfo);
+LRESULT	VFWAPI	ICGetInfo(HIC hic,ICINFO *picinfo, DWORD cb);
+HIC	VFWAPI	ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode);
+LRESULT VFWAPI ICClose(HIC hic);
+LRESULT	VFWAPI	ICSendMessage(HIC hic, UINT msg, DWORD dw1, DWORD dw2);
+HIC	VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, WORD wFlags);
+
+DWORD	VFWAPIV	ICDrawBegin(
+        HIC			hic,
         DWORD			dwFlags,/* flags */
-        HPALETTE32		hpal,	/* palette to draw with */
-        HWND32			hwnd,	/* window to draw to */
-        HDC32			hdc,	/* HDC to draw to */
-        INT32			xDst,	/* destination rectangle */
-        INT32			yDst,
-        INT32			dxDst,
-        INT32			dyDst,
+        HPALETTE		hpal,	/* palette to draw with */
+        HWND			hwnd,	/* window to draw to */
+        HDC			hdc,	/* HDC to draw to */
+        INT			xDst,	/* destination rectangle */
+        INT			yDst,
+        INT			dxDst,
+        INT			dyDst,
         LPBITMAPINFOHEADER	lpbi,	/* format of frame to draw */
-        INT32			xSrc,	/* source rectangle */
-        INT32			ySrc,
-        INT32			dxSrc,
-        INT32			dySrc,
+        INT			xSrc,	/* source rectangle */
+        INT			ySrc,
+        INT			dxSrc,
+        INT			dySrc,
         DWORD			dwRate,	/* frames/second = (dwRate/dwScale) */
         DWORD			dwScale
 );
-#define ICDrawBegin WINELIB_NAME(ICDrawBegin)
 
 /********************* AVIFILE function declarations *************************/
 
@@ -503,7 +477,7 @@ typedef struct _AVIPALCHANGE {
 
 #define	AVIGETFRAMEF_BESTDISPLAYFMT	1
 
-typedef struct _AVISTREAMINFO32A {
+typedef struct _AVISTREAMINFOA {
     DWORD	fccType;
     DWORD	fccHandler;
     DWORD	dwFlags;        /* AVIIF_* */
@@ -518,13 +492,13 @@ typedef struct _AVISTREAMINFO32A {
     DWORD	dwSuggestedBufferSize;
     DWORD	dwQuality;
     DWORD	dwSampleSize;
-    RECT32	rcFrame;
+    RECT	rcFrame;
     DWORD	dwEditCount;
     DWORD	dwFormatChangeCount;
     CHAR	szName[64];
-} AVISTREAMINFO32A, * LPAVISTREAMINFO32A, *PAVISTREAMINFO32A;
+} AVISTREAMINFOA, * LPAVISTREAMINFOA, *PAVISTREAMINFOA;
 
-typedef struct _AVISTREAMINFO32W {
+typedef struct _AVISTREAMINFOW {
     DWORD	fccType;
     DWORD	fccHandler;
     DWORD	dwFlags;
@@ -539,11 +513,11 @@ typedef struct _AVISTREAMINFO32W {
     DWORD	dwSuggestedBufferSize;
     DWORD	dwQuality;
     DWORD	dwSampleSize;
-    RECT32	rcFrame;
+    RECT	rcFrame;
     DWORD	dwEditCount;
     DWORD	dwFormatChangeCount;
     WCHAR	szName[64];
-} AVISTREAMINFO32W, * LPAVISTREAMINFO32W, *PAVISTREAMINFO32W;
+} AVISTREAMINFOW, * LPAVISTREAMINFOW, *PAVISTREAMINFOW;
 DECL_WINELIB_TYPE_AW(AVISTREAMINFO)
 DECL_WINELIB_TYPE_AW(LPAVISTREAMINFO)
 DECL_WINELIB_TYPE_AW(PAVISTREAMINFO)
@@ -564,7 +538,7 @@ DECL_WINELIB_TYPE_AW(PAVISTREAMINFO)
 #define AVIFILECAPS_ALLKEYFRAMES	0x00000010
 #define AVIFILECAPS_NOCOMPRESSION	0x00000020
 
-typedef struct _AVIFILEINFO32W {
+typedef struct _AVIFILEINFOW {
     DWORD               dwMaxBytesPerSec;
     DWORD               dwFlags;
     DWORD               dwCaps;
@@ -577,8 +551,8 @@ typedef struct _AVIFILEINFO32W {
     DWORD               dwLength;
     DWORD               dwEditCount;
     WCHAR               szFileType[64];
-} AVIFILEINFO32W, * LPAVIFILEINFO32W, *PAVIFILEINFO32W;
-typedef struct _AVIFILEINFO32A {
+} AVIFILEINFOW, * LPAVIFILEINFOW, *PAVIFILEINFOW;
+typedef struct _AVIFILEINFOA {
     DWORD               dwMaxBytesPerSec;
     DWORD               dwFlags;
     DWORD               dwCaps;
@@ -591,7 +565,7 @@ typedef struct _AVIFILEINFO32A {
     DWORD               dwLength;
     DWORD               dwEditCount;
     CHAR		szFileType[64];
-} AVIFILEINFO32A, * LPAVIFILEINFO32A, *PAVIFILEINFO32A;
+} AVIFILEINFOA, * LPAVIFILEINFOA, *PAVIFILEINFOA;
 DECL_WINELIB_TYPE_AW(AVIFILEINFO)
 DECL_WINELIB_TYPE_AW(PAVIFILEINFO)
 DECL_WINELIB_TYPE_AW(LPAVIFILEINFO)
@@ -631,11 +605,11 @@ DEFINE_AVIGUID(CLSID_AVIFile,           0x00020000, 0, 0);
 
 
 /* IAVIStream32 interface. */
-#define ICOM_INTERFACE IAVIStream32
-typedef struct IAVIStream32 IAVIStream32,*PAVISTREAM32;
-ICOM_BEGIN(IAVIStream32, IUnknown)
+#define ICOM_INTERFACE IAVIStream
+typedef struct IAVIStream IAVIStream,*PAVISTREAM;
+ICOM_BEGIN(IAVIStream, IUnknown)
     ICOM_METHOD2(HRESULT,Create,LPARAM,,LPARAM,);
-    ICOM_METHOD2(HRESULT,Info,AVISTREAMINFO32W*,,LONG,);
+    ICOM_METHOD2(HRESULT,Info,AVISTREAMINFOW*,,LONG,);
     ICOM_METHOD2(LONG,FindSample,LONG,,LONG,);
     ICOM_METHOD3(HRESULT,ReadFormat,LONG,,LPVOID,,LONG*,);
     ICOM_METHOD3(HRESULT,SetFormat,LONG,,LPVOID,,LONG,);
@@ -644,43 +618,37 @@ ICOM_BEGIN(IAVIStream32, IUnknown)
     ICOM_METHOD2(HRESULT,Delete,LONG,,LONG,);
     ICOM_METHOD3(HRESULT,ReadData,DWORD,,LPVOID,,LONG*,);
     ICOM_METHOD3(HRESULT,WriteData,DWORD,,LPVOID,,LONG,);
-    ICOM_METHOD2(HRESULT,SetInfo,AVISTREAMINFO32W*,,LONG,);
-ICOM_END(IAVIStream32)
+    ICOM_METHOD2(HRESULT,SetInfo,AVISTREAMINFOW*,,LONG,);
+ICOM_END(IAVIStream)
 #undef ICOM_INTERFACE
 
-DECL_WINELIB_TYPE(IAVIStream)
-DECL_WINELIB_TYPE(PAVISTREAM)
 
 /* IAVIFile32 interface. In Win32 this interface uses UNICODE only */
-#define ICOM_INTERFACE IAVIFile32
-typedef struct IAVIFile32 IAVIFile32,*PAVIFILE32;
-ICOM_BEGIN(IAVIFile32,IUnknown)
-	ICOM_METHOD2(HRESULT,Info,AVIFILEINFO32W*,,LONG,);
-	ICOM_METHOD3(HRESULT,GetStream,PAVISTREAM32*,,DWORD,,LONG,);
-	ICOM_METHOD2(HRESULT,CreateStream,PAVISTREAM32*,,AVISTREAMINFO32W*,);
+#define ICOM_INTERFACE IAVIFile
+typedef struct IAVIFile IAVIFile,*PAVIFILE;
+ICOM_BEGIN(IAVIFile,IUnknown)
+	ICOM_METHOD2(HRESULT,Info,AVIFILEINFOW*,,LONG,);
+	ICOM_METHOD3(HRESULT,GetStream,PAVISTREAM*,,DWORD,,LONG,);
+	ICOM_METHOD2(HRESULT,CreateStream,PAVISTREAM*,,AVISTREAMINFOW*,);
 	ICOM_METHOD3(HRESULT,WriteData,DWORD,,LPVOID,,LONG,);
 	ICOM_METHOD3(HRESULT,ReadData,DWORD,,LPVOID,,LONG*,);
 	ICOM_METHOD (HRESULT,EndRecord);
 	ICOM_METHOD2(HRESULT,DeleteStream,DWORD,,LONG,);
-ICOM_END(IAVIFile32)
+ICOM_END(IAVIFile)
 #undef ICOM_INTERFACE
 
-DECL_WINELIB_TYPE(IAVIFile)
-DECL_WINELIB_TYPE(PAVIFILE)
 
 /* IGetFrame32 interface */
-#define ICOM_INTERFACE IGetFrame32
-typedef struct IGetFrame32 IGetFrame32,*PGETFRAME32;
-ICOM_BEGIN(IGetFrame32,IUnknown)
+#define ICOM_INTERFACE IGetFrame
+typedef struct IGetFrame IGetFrame,*PGETFRAME;
+ICOM_BEGIN(IGetFrame,IUnknown)
 	ICOM_METHOD1(LPVOID,GetFrame,LONG,);
 	ICOM_METHOD3(HRESULT,Begin,LONG,,LONG,,LONG,);
 	ICOM_METHOD (HRESULT,End);
-	ICOM_METHOD6(HRESULT,SetFormat,LPBITMAPINFOHEADER,,LPVOID,,INT32,,INT32,,INT32,,INT32,);
-ICOM_END(IGetFrame32)
+	ICOM_METHOD6(HRESULT,SetFormat,LPBITMAPINFOHEADER,,LPVOID,,INT,,INT,,INT,,INT,);
+ICOM_END(IGetFrame)
 #undef ICOM_INTERFACE
 
-DECL_WINELIB_TYPE(IGetFrame)
-DECL_WINELIB_TYPE(PGETFRAME)
 
 #define AVIERR_OK		0
 #define MAKE_AVIERR(error)	MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x4000+error)
@@ -705,55 +673,37 @@ DECL_WINELIB_TYPE(PGETFRAME)
 #define AVIERR_USERABORT	MAKE_AVIERR(198)
 #define AVIERR_ERROR		MAKE_AVIERR(199)
 
-HRESULT WINAPI AVIMakeCompressedStream32(PAVISTREAM32*ppsCompressed,PAVISTREAM32 ppsSource,AVICOMPRESSOPTIONS *lpOptions,CLSID*pclsidHandler); 
+HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM*ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *lpOptions,CLSID*pclsidHandler); 
 #define AVIMakeCompressedStream WINELIB_NAME_AW(AVIMakeCompressedStream)
-HRESULT WINAPI AVIStreamSetFormat32(PAVISTREAM32 iface,LONG pos,LPVOID format,LONG formatsize);
-#define AVIStreamSetFormat WINELIB_NAME(AVIStreamSetFormat)
-HRESULT WINAPI AVIStreamWrite32(PAVISTREAM32 iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten);
-#define AVIStreamWrite WINELIB_NAME(AVIStreamWrite)
-ULONG WINAPI AVIStreamRelease32(PAVISTREAM32 iface);
-#define AVIStreamRelease WINELIB_NAME(AVIStreamRelease)
-LONG WINAPI AVIStreamStart32(PAVISTREAM32 iface);
-#define AVIStreamStart WINELIB_NAME(AVIStreamStart)
-LONG WINAPI AVIStreamLength32(PAVISTREAM32 iface);
-#define AVIStreamLength WINELIB_NAME(AVIStreamLength)
-HRESULT WINAPI AVIStreamReadFormat32(PAVISTREAM32 iface,LONG pos,LPVOID format,LONG *formatsize);
-#define AVIStreamReadFormat WINELIB_NAME(AVIStreamReadFormat)
-HRESULT WINAPI AVIStreamWrite32(PAVISTREAM32 iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten);
-#define AVIStreamWrite WINELIB_NAME(AVIStreamWrite)
-HRESULT WINAPI AVIStreamRead32(PAVISTREAM32 iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread);
-#define AVIStreamRead WINELIB_NAME(AVIStreamRead)
-HRESULT WINAPI AVIStreamWriteData32(PAVISTREAM32 iface,DWORD fcc,LPVOID lp,LONG size);
-#define AVIStreamWriteData WINELIB_NAME(AVIStreamWriteData)
-HRESULT WINAPI AVIStreamReadData32(PAVISTREAM32 iface,DWORD fcc,LPVOID lp,LONG *lpread);
-#define AVIStreamReadData WINELIB_NAME(AVIStreamReadData)
-HRESULT WINAPI AVIStreamInfo32A(PAVISTREAM32 iface,AVISTREAMINFO32A *asi,LONG size);
-HRESULT WINAPI AVIStreamInfo32W(PAVISTREAM32 iface,AVISTREAMINFO32W *asi,LONG size);
+HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG formatsize);
+HRESULT WINAPI AVIStreamWrite(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten);
+ULONG WINAPI AVIStreamRelease(PAVISTREAM iface);
+LONG WINAPI AVIStreamStart(PAVISTREAM iface);
+LONG WINAPI AVIStreamLength(PAVISTREAM iface);
+HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG *formatsize);
+HRESULT WINAPI AVIStreamWrite(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten);
+HRESULT WINAPI AVIStreamRead(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread);
+HRESULT WINAPI AVIStreamWriteData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG size);
+HRESULT WINAPI AVIStreamReadData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG *lpread);
+HRESULT WINAPI AVIStreamInfoA(PAVISTREAM iface,AVISTREAMINFOA *asi,LONG size);
+HRESULT WINAPI AVIStreamInfoW(PAVISTREAM iface,AVISTREAMINFOW *asi,LONG size);
 #define AVIStreamInfo WINELIB_NAME_AW(AVIStreamInfo)
-PGETFRAME32 WINAPI AVIStreamGetFrameOpen32(PAVISTREAM32 pavi,LPBITMAPINFOHEADER lpbiWanted);
-#define AVIStreamGetFrameOpen WINELIB_NAME(AVIStreamGetFrameOpen)
-HRESULT WINAPI AVIStreamGetFrameClose32(PGETFRAME32 pg);
-#define AVIStreamGetFrameClose WINELIB_NAME(AVIStreamGetFrameClose)
-PGETFRAME32 WINAPI AVIStreamGetFrameOpen32(PAVISTREAM32 pavi,LPBITMAPINFOHEADER lpbiWanted);
-#define AVIStreamGetFrameOpen WINELIB_NAME(AVIStreamGetFrameOpen)
-LPVOID WINAPI AVIStreamGetFrame32(PGETFRAME32 pg,LONG pos);
-#define AVIStreamGetFrame WINELIB_NAME(AVIStreamGetFrame)
-
-void WINAPI AVIFileInit32(void);
-#define AVIFileInit WINELIB_NAME(AVIFileInit)
-HRESULT WINAPI AVIFileOpen32A(PAVIFILE32 * ppfile,LPCSTR szFile,UINT32 uMode,LPCLSID lpHandler);
+PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pavi,LPBITMAPINFOHEADER lpbiWanted);
+HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME pg);
+PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pavi,LPBITMAPINFOHEADER lpbiWanted);
+LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg,LONG pos);
+
+void WINAPI AVIFileInit(void);
+HRESULT WINAPI AVIFileOpenA(PAVIFILE * ppfile,LPCSTR szFile,UINT uMode,LPCLSID lpHandler);
 #define AVIFileOpen WINELIB_NAME_AW(AVIFileOpen)
-HRESULT WINAPI AVIFileCreateStream32A(PAVIFILE32 pfile,PAVISTREAM32 *ppavi,AVISTREAMINFO32A * psi);
-HRESULT WINAPI AVIFileCreateStream32W(PAVIFILE32 pfile,PAVISTREAM32 *ppavi,AVISTREAMINFO32W * psi);
+HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE pfile,PAVISTREAM *ppavi,AVISTREAMINFOA * psi);
+HRESULT WINAPI AVIFileCreateStreamW(PAVIFILE pfile,PAVISTREAM *ppavi,AVISTREAMINFOW * psi);
 #define AVIFileCreateStream WINELIB_NAME_AW(AVIFileCreateStream)
-ULONG WINAPI AVIFileRelease32(PAVIFILE32 iface);
-#define AVIFileRelease WINELIB_NAME(AVIFileRelease)
-HRESULT WINAPI AVIFileInfo32A(PAVIFILE32 pfile,PAVIFILEINFO32A,LONG);
-HRESULT WINAPI AVIFileInfo32W(PAVIFILE32 pfile,PAVIFILEINFO32W,LONG);
+ULONG WINAPI AVIFileRelease(PAVIFILE iface);
+HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile,PAVIFILEINFOA,LONG);
+HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile,PAVIFILEINFOW,LONG);
 #define AVIFileInfo WINELIB_NAME_AW(AVIFileInfo)
-HRESULT WINAPI AVIFileGetStream32(PAVIFILE32 pfile,PAVISTREAM32*avis,DWORD fccType,LONG lParam);
-#define AVIFileGetStream WINELIB_NAME(AVIFileGetStream)
-void WINAPI AVIFileExit32(void);
-#define AVIFileExit WINELIB_NAME(AVIFileExit)
+HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile,PAVISTREAM*avis,DWORD fccType,LONG lParam);
+void WINAPI AVIFileExit(void);
 
 #endif
diff --git a/include/win.h b/include/win.h
index 64763f6d927..f81eeedc64c 100644
--- a/include/win.h
+++ b/include/win.h
@@ -61,10 +61,10 @@ typedef struct tagWND
     struct tagCLASS *class;       /* Window class */
     HWINDOWPROC    winproc;       /* Window procedure */
     DWORD          dwMagic;       /* Magic number (must be WND_MAGIC) */
-    HWND32         hwndSelf;      /* Handle of this window */
-    HINSTANCE32    hInstance;     /* Window hInstance (from CreateWindow) */
-    RECT32         rectClient;    /* Client area rel. to parent client area */
-    RECT32         rectWindow;    /* Whole window rel. to parent client area */
+    HWND         hwndSelf;      /* Handle of this window */
+    HINSTANCE    hInstance;     /* Window hInstance (from CreateWindow) */
+    RECT         rectClient;    /* Client area rel. to parent client area */
+    RECT         rectWindow;    /* Whole window rel. to parent client area */
     LPSTR          text;          /* Window text */
     void          *pVScroll;      /* Vertical scroll-bar info */
     void          *pHScroll;      /* Horizontal scroll-bar info */
@@ -72,10 +72,10 @@ typedef struct tagWND
     struct tagDCE *dce;           /* Window DCE (if CS_OWNDC or CS_CLASSDC) */
     HGLOBAL16      hmemTaskQ;     /* Task queue global memory handle */
     HRGN16         hrgnUpdate;    /* Update region */
-    HWND32         hwndLastActive;/* Last active popup hwnd */
+    HWND         hwndLastActive;/* Last active popup hwnd */
     DWORD          dwStyle;       /* Window style (from CreateWindow) */
     DWORD          dwExStyle;     /* Extended style (from CreateWindowEx) */
-    UINT32         wIDmenu;       /* ID or hmenu (from CreateWindow) */
+    UINT         wIDmenu;       /* ID or hmenu (from CreateWindow) */
     DWORD          helpContext;   /* Help context ID */
     WORD           flags;         /* Misc. flags (see below) */
     HMENU16        hSysMenu;      /* window's copy of System Menu */
@@ -90,19 +90,19 @@ typedef struct _WND_DRIVER
 {
     void   (*pInitialize)(WND *);
     void   (*pFinalize)(WND *);
-    BOOL32 (*pCreateDesktopWindow)(WND *, struct tagCLASS *, BOOL32);
-    BOOL32 (*pCreateWindow)(WND *, struct tagCLASS *, CREATESTRUCT32A *, BOOL32);
-    BOOL32 (*pDestroyWindow)(WND *);
+    BOOL (*pCreateDesktopWindow)(WND *, struct tagCLASS *, BOOL);
+    BOOL (*pCreateWindow)(WND *, struct tagCLASS *, CREATESTRUCTA *, BOOL);
+    BOOL (*pDestroyWindow)(WND *);
     WND*   (*pSetParent)(WND *, WND *);
     void   (*pForceWindowRaise)(WND *);
-    void   (*pSetWindowPos)(WND *, const WINDOWPOS32 *, BOOL32);
+    void   (*pSetWindowPos)(WND *, const WINDOWPOS *, BOOL);
     void   (*pSetText)(WND *, LPCSTR);
     void   (*pSetFocus)(WND *);
     void   (*pPreSizeMove)(WND *);
     void   (*pPostSizeMove)(WND *);
-    void   (*pScrollWindow)(WND *, struct tagDC *, INT32, INT32, const RECT32 *, BOOL32);
-    void   (*pSetDrawable)(WND *, struct tagDC *, WORD, BOOL32);
-    BOOL32 (*pIsSelfClipping)(WND *);
+    void   (*pScrollWindow)(WND *, struct tagDC *, INT, INT, const RECT *, BOOL);
+    void   (*pSetDrawable)(WND *, struct tagDC *, WORD, BOOL);
+    BOOL (*pIsSelfClipping)(WND *);
 } WND_DRIVER;
 
 typedef struct
@@ -138,44 +138,44 @@ extern void   WIN_LockWnds();
 extern void   WIN_UnlockWnds();
 extern int    WIN_SuspendWndsLock();
 extern void   WIN_RestoreWndsLock(int ipreviousLock);
-extern WND*   WIN_FindWndPtr( HWND32 hwnd );
+extern WND*   WIN_FindWndPtr( HWND hwnd );
 extern void   WIN_ReleaseWndPtr(WND *wndPtr);
 extern WND*   WIN_GetDesktop(void);
-extern void   WIN_DumpWindow( HWND32 hwnd );
-extern void   WIN_WalkWindows( HWND32 hwnd, int indent );
-extern BOOL32 WIN_UnlinkWindow( HWND32 hwnd );
-extern BOOL32 WIN_LinkWindow( HWND32 hwnd, HWND32 hwndInsertAfter );
-extern HWND32 WIN_FindWinToRepaint( HWND32 hwnd, HQUEUE16 hQueue );
-extern BOOL32 WIN_ResetQueueWindows( WND* wnd, HQUEUE16 hQueue, HQUEUE16 hNew);
-extern BOOL32 WIN_CreateDesktopWindow(void);
-extern HWND32 WIN_GetTopParent( HWND32 hwnd );
+extern void   WIN_DumpWindow( HWND hwnd );
+extern void   WIN_WalkWindows( HWND hwnd, int indent );
+extern BOOL WIN_UnlinkWindow( HWND hwnd );
+extern BOOL WIN_LinkWindow( HWND hwnd, HWND hwndInsertAfter );
+extern HWND WIN_FindWinToRepaint( HWND hwnd, HQUEUE16 hQueue );
+extern BOOL WIN_ResetQueueWindows( WND* wnd, HQUEUE16 hQueue, HQUEUE16 hNew);
+extern BOOL WIN_CreateDesktopWindow(void);
+extern HWND WIN_GetTopParent( HWND hwnd );
 extern WND*   WIN_GetTopParentPtr( WND* pWnd );
-extern BOOL32 WIN_IsWindowDrawable(WND*, BOOL32 );
-extern HINSTANCE32 WIN_GetWindowInstance( HWND32 hwnd );
-extern WND**  WIN_BuildWinArray( WND *wndPtr, UINT32 bwa, UINT32* pnum );
+extern BOOL WIN_IsWindowDrawable(WND*, BOOL );
+extern HINSTANCE WIN_GetWindowInstance( HWND hwnd );
+extern WND**  WIN_BuildWinArray( WND *wndPtr, UINT bwa, UINT* pnum );
 
-extern HWND32 CARET_GetHwnd(void);
-extern void CARET_GetRect(LPRECT32 lprc);  /* windows/caret.c */
+extern HWND CARET_GetHwnd(void);
+extern void CARET_GetRect(LPRECT lprc);  /* windows/caret.c */
 
-extern BOOL16 DRAG_QueryUpdate( HWND32, SEGPTR, BOOL32 );
+extern BOOL16 DRAG_QueryUpdate( HWND, SEGPTR, BOOL );
 extern void DEFWND_SetText( WND *wndPtr, LPCSTR text );
-extern HBRUSH32 DEFWND_ControlColor( HDC32 hDC, UINT16 ctlType );     /* windows/defwnd.c */
+extern HBRUSH DEFWND_ControlColor( HDC hDC, UINT16 ctlType );     /* windows/defwnd.c */
 
 extern void PROPERTY_RemoveWindowProps( WND *pWnd );  		      /* windows/property.c */
 
-extern BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
-                                  HRGN32 hrgnUpdate, UINT32 flags,
-                                  UINT32 control );		      /* windows/painting.c */
+extern BOOL PAINT_RedrawWindow( HWND hwnd, const RECT *rectUpdate,
+                                  HRGN hrgnUpdate, UINT flags,
+                                  UINT control );		      /* windows/painting.c */
 
 /* controls/widgets.c */
-extern BOOL32 WIDGETS_Init( void );
-extern BOOL32 WIDGETS_IsControl32( WND* pWnd, BUILTIN_CLASS32 cls );  
+extern BOOL WIDGETS_Init( void );
+extern BOOL WIDGETS_IsControl( WND* pWnd, BUILTIN_CLASS32 cls );  
 
 /* controls/icontitle.c */
-extern HWND32 ICONTITLE_Create( WND* );
-extern BOOL32 ICONTITLE_Init( void );
+extern HWND ICONTITLE_Create( WND* );
+extern BOOL ICONTITLE_Init( void );
 
 /* windows/focus.c */
-extern void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND32 , HWND32 );
+extern void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND , HWND );
 
 #endif  /* __WINE_WIN_H */
diff --git a/include/win16drv.h b/include/win16drv.h
index 8f943e8f29d..04fbe4621b6 100644
--- a/include/win16drv.h
+++ b/include/win16drv.h
@@ -182,7 +182,7 @@ extern WORD PRTDRV_Output(LPPDEVICE 	 lpDestDev,
 			  LPLOGPEN16 	 lpPen,
 			  LPLOGBRUSH16	 lpBrush,
 			  SEGPTR	 lpDrawMode,
-			  HRGN32 	 hClipRgn);
+			  HRGN 	 hClipRgn);
 
 DWORD PRTDRV_StretchBlt(LPPDEVICE lpDestDev,
                         WORD wDestX, WORD wDestY,
@@ -195,33 +195,33 @@ DWORD PRTDRV_StretchBlt(LPPDEVICE lpDestDev,
                         SEGPTR lpDrawMode,
                         RECT16 *lpClipRect);
 
-extern WORD PRTDRV_GetCharWidth(LPPDEVICE lpDestDev, LPINT32 lpBuffer, 
+extern WORD PRTDRV_GetCharWidth(LPPDEVICE lpDestDev, LPINT lpBuffer, 
 		      WORD wFirstChar, WORD wLastChar, LPFONTINFO16 lpFontInfo,
 		      SEGPTR lpDrawMode, SEGPTR lpTextXForm );
 
 /* Wine driver functions */
 
-extern BOOL32 WIN16DRV_Init(void);
-extern BOOL32 WIN16DRV_GetCharWidth( struct tagDC *dc, UINT32 firstChar, UINT32 lastChar,
-				   LPINT32 buffer );
-
-extern BOOL32 WIN16DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT32 count,
-                                           LPSIZE32 size );
-extern BOOL32 WIN16DRV_GetTextMetrics( DC *dc, TEXTMETRIC32A *metrics );
-
-extern BOOL32 WIN16DRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
-                                  const RECT32 *lprect, LPCSTR str, UINT32 count,
-                                  const INT32 *lpDx );
-extern BOOL32 WIN16DRV_LineTo( DC *dc, INT32 x, INT32 y );
-extern BOOL32 WIN16DRV_MoveToEx(DC *dc,INT32 x,INT32 y,LPPOINT32 pt);
-extern BOOL32 WIN16DRV_Polygon(DC *dc, const POINT32* pt, INT32 count );
-extern BOOL32 WIN16DRV_Polyline(DC *dc, const POINT32* pt, INT32 count );
-extern BOOL32 WIN16DRV_Rectangle(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom);
-extern HGDIOBJ32 WIN16DRV_SelectObject( DC *dc, HGDIOBJ32 handle );
-extern BOOL32 WIN16DRV_PatBlt( struct tagDC *dc, INT32 left, INT32 top,
-                               INT32 width, INT32 height, DWORD rop );
-extern BOOL32 WIN16DRV_Ellipse(DC *dc, INT32 left, INT32 top, INT32 right, INT32 bottom);
-extern BOOL32 WIN16DRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
+extern BOOL WIN16DRV_Init(void);
+extern BOOL WIN16DRV_GetCharWidth( struct tagDC *dc, UINT firstChar, UINT lastChar,
+				   LPINT buffer );
+
+extern BOOL WIN16DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
+                                           LPSIZE size );
+extern BOOL WIN16DRV_GetTextMetrics( DC *dc, TEXTMETRICA *metrics );
+
+extern BOOL WIN16DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
+                                  const RECT *lprect, LPCSTR str, UINT count,
+                                  const INT *lpDx );
+extern BOOL WIN16DRV_LineTo( DC *dc, INT x, INT y );
+extern BOOL WIN16DRV_MoveToEx(DC *dc,INT x,INT y,LPPOINT pt);
+extern BOOL WIN16DRV_Polygon(DC *dc, const POINT* pt, INT count );
+extern BOOL WIN16DRV_Polyline(DC *dc, const POINT* pt, INT count );
+extern BOOL WIN16DRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom);
+extern HGDIOBJ WIN16DRV_SelectObject( DC *dc, HGDIOBJ handle );
+extern BOOL WIN16DRV_PatBlt( struct tagDC *dc, INT left, INT top,
+                               INT width, INT height, DWORD rop );
+extern BOOL WIN16DRV_Ellipse(DC *dc, INT left, INT top, INT right, INT bottom);
+extern BOOL WIN16DRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, 
 				        DEVICEFONTENUMPROC proc, LPARAM lp );
 
 
diff --git a/include/winbase.h b/include/winbase.h
index 73abf0c42d1..91f987e0cdd 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -38,15 +38,15 @@ typedef struct _EXCEPTION_DEBUG_INFO {
 } EXCEPTION_DEBUG_INFO;
 
 typedef struct _CREATE_THREAD_DEBUG_INFO {
-    HANDLE32 hThread;
+    HANDLE hThread;
     LPVOID lpThreadLocalBase;
     LPTHREAD_START_ROUTINE lpStartAddress;
 } CREATE_THREAD_DEBUG_INFO;
 
 typedef struct _CREATE_PROCESS_DEBUG_INFO {
-    HANDLE32 hFile;
-    HANDLE32 hProcess;
-    HANDLE32 hThread;
+    HANDLE hFile;
+    HANDLE hProcess;
+    HANDLE hThread;
     LPVOID lpBaseOfImage;
     DWORD dwDebugInfoFileOffset;
     DWORD nDebugInfoSize;
@@ -65,7 +65,7 @@ typedef struct _EXIT_PROCESS_DEBUG_INFO {
 } EXIT_PROCESS_DEBUG_INFO;
 
 typedef struct _LOAD_DLL_DEBUG_INFO {
-    HANDLE32 hFile;
+    HANDLE hFile;
     LPVOID   lpBaseOfDll;
     DWORD    dwDebugInfoFileOffset;
     DWORD    nDebugInfoSize;
@@ -161,7 +161,7 @@ typedef struct
 {
     DWORD   nLength;
     LPVOID  lpSecurityDescriptor;
-    BOOL32  bInheritHandle;
+    BOOL  bInheritHandle;
 } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 
 #ifndef _FILETIME_
@@ -187,7 +187,7 @@ typedef struct
     DWORD     dwReserved1;
     CHAR      cFileName[260];
     CHAR      cAlternateFileName[14];
-} WIN32_FIND_DATA32A, *LPWIN32_FIND_DATA32A;
+} WIN32_FIND_DATAA, *LPWIN32_FIND_DATAA;
 
 typedef struct
 {
@@ -201,14 +201,13 @@ typedef struct
     DWORD     dwReserved1;
     WCHAR     cFileName[260];
     WCHAR     cAlternateFileName[14];
-} WIN32_FIND_DATA32W, *LPWIN32_FIND_DATA32W;
+} WIN32_FIND_DATAW, *LPWIN32_FIND_DATAW;
 
 DECL_WINELIB_TYPE_AW(WIN32_FIND_DATA)
 DECL_WINELIB_TYPE_AW(LPWIN32_FIND_DATA)
 
 #define INVALID_HANDLE_VALUE16  ((HANDLE16) -1)
-#define INVALID_HANDLE_VALUE32  ((HANDLE32) -1)
-#define INVALID_HANDLE_VALUE WINELIB_NAME(INVALID_HANDLE_VALUE)
+#define INVALID_HANDLE_VALUE  ((HANDLE) -1)
 
 /* comm */
 
@@ -237,8 +236,7 @@ DECL_WINELIB_TYPE_AW(LPWIN32_FIND_DATA)
 
 #define IGNORE		0
 #define INFINITE16      0xFFFF
-#define INFINITE32      0xFFFFFFFF
-#define INFINITE WINELIB_NAME(INFINITE)
+#define INFINITE      0xFFFFFFFF
 
 #define CE_RXOVER	0x0001
 #define CE_OVERRUN	0x0002
@@ -324,49 +322,49 @@ DECL_WINELIB_TYPE_AW(LPWIN32_FIND_DATA)
 #define CSTF_EOF	0x20
 #define CSTF_TXIM	0x40
 
-#define MAKEINTRESOURCE32A(i) (LPSTR)((DWORD)((WORD)(i)))
-#define MAKEINTRESOURCE32W(i) (LPWSTR)((DWORD)((WORD)(i)))
+#define MAKEINTRESOURCEA(i) (LPSTR)((DWORD)((WORD)(i)))
+#define MAKEINTRESOURCEW(i) (LPWSTR)((DWORD)((WORD)(i)))
 #define MAKEINTRESOURCE WINELIB_NAME_AW(MAKEINTRESOURCE)
 
 /* Predefined resource types */
-#define RT_CURSOR32A         MAKEINTRESOURCE32A(1)
-#define RT_CURSOR32W         MAKEINTRESOURCE32W(1)
+#define RT_CURSORA         MAKEINTRESOURCEA(1)
+#define RT_CURSORW         MAKEINTRESOURCEW(1)
 #define RT_CURSOR            WINELIB_NAME_AW(RT_CURSOR)
-#define RT_BITMAP32A         MAKEINTRESOURCE32A(2)
-#define RT_BITMAP32W         MAKEINTRESOURCE32W(2)
+#define RT_BITMAPA         MAKEINTRESOURCEA(2)
+#define RT_BITMAPW         MAKEINTRESOURCEW(2)
 #define RT_BITMAP            WINELIB_NAME_AW(RT_BITMAP)
-#define RT_ICON32A           MAKEINTRESOURCE32A(3)
-#define RT_ICON32W           MAKEINTRESOURCE32W(3)
+#define RT_ICONA           MAKEINTRESOURCEA(3)
+#define RT_ICONW           MAKEINTRESOURCEW(3)
 #define RT_ICON              WINELIB_NAME_AW(RT_ICON)
-#define RT_MENU32A           MAKEINTRESOURCE32A(4)
-#define RT_MENU32W           MAKEINTRESOURCE32W(4)
+#define RT_MENUA           MAKEINTRESOURCEA(4)
+#define RT_MENUW           MAKEINTRESOURCEW(4)
 #define RT_MENU              WINELIB_NAME_AW(RT_MENU)
-#define RT_DIALOG32A         MAKEINTRESOURCE32A(5)
-#define RT_DIALOG32W         MAKEINTRESOURCE32W(5)
+#define RT_DIALOGA         MAKEINTRESOURCEA(5)
+#define RT_DIALOGW         MAKEINTRESOURCEW(5)
 #define RT_DIALOG            WINELIB_NAME_AW(RT_DIALOG)
-#define RT_STRING32A         MAKEINTRESOURCE32A(6)
-#define RT_STRING32W         MAKEINTRESOURCE32W(6)
+#define RT_STRINGA         MAKEINTRESOURCEA(6)
+#define RT_STRINGW         MAKEINTRESOURCEW(6)
 #define RT_STRING            WINELIB_NAME_AW(RT_STRING)
-#define RT_FONTDIR32A        MAKEINTRESOURCE32A(7)
-#define RT_FONTDIR32W        MAKEINTRESOURCE32W(7)
+#define RT_FONTDIRA        MAKEINTRESOURCEA(7)
+#define RT_FONTDIRW        MAKEINTRESOURCEW(7)
 #define RT_FONTDIR           WINELIB_NAME_AW(RT_FONTDIR)
-#define RT_FONT32A           MAKEINTRESOURCE32A(8)
-#define RT_FONT32W           MAKEINTRESOURCE32W(8)
+#define RT_FONTA           MAKEINTRESOURCEA(8)
+#define RT_FONTW           MAKEINTRESOURCEW(8)
 #define RT_FONT              WINELIB_NAME_AW(RT_FONT)
-#define RT_ACCELERATOR32A    MAKEINTRESOURCE32A(9)
-#define RT_ACCELERATOR32W    MAKEINTRESOURCE32W(9)
+#define RT_ACCELERATORA    MAKEINTRESOURCEA(9)
+#define RT_ACCELERATORW    MAKEINTRESOURCEW(9)
 #define RT_ACCELERATOR       WINELIB_NAME_AW(RT_ACCELERATOR)
-#define RT_RCDATA32A         MAKEINTRESOURCE32A(10)
-#define RT_RCDATA32W         MAKEINTRESOURCE32W(10)
+#define RT_RCDATAA         MAKEINTRESOURCEA(10)
+#define RT_RCDATAW         MAKEINTRESOURCEW(10)
 #define RT_RCDATA            WINELIB_NAME_AW(RT_RCDATA)
-#define RT_MESSAGELIST32A    MAKEINTRESOURCE32A(11)
-#define RT_MESSAGELIST32W    MAKEINTRESOURCE32W(11)
+#define RT_MESSAGELISTA    MAKEINTRESOURCEA(11)
+#define RT_MESSAGELISTW    MAKEINTRESOURCEW(11)
 #define RT_MESSAGELIST       WINELIB_NAME_AW(RT_MESSAGELIST)
-#define RT_GROUP_CURSOR32A   MAKEINTRESOURCE32A(12)
-#define RT_GROUP_CURSOR32W   MAKEINTRESOURCE32W(12)
+#define RT_GROUP_CURSORA   MAKEINTRESOURCEA(12)
+#define RT_GROUP_CURSORW   MAKEINTRESOURCEW(12)
 #define RT_GROUP_CURSOR      WINELIB_NAME_AW(RT_GROUP_CURSOR)
-#define RT_GROUP_ICON32A     MAKEINTRESOURCE32A(14)
-#define RT_GROUP_ICON32W     MAKEINTRESOURCE32W(14)
+#define RT_GROUP_ICONA     MAKEINTRESOURCEA(14)
+#define RT_GROUP_ICONW     MAKEINTRESOURCEW(14)
 #define RT_GROUP_ICON        WINELIB_NAME_AW(RT_GROUP_ICON)
 
 
@@ -576,7 +574,7 @@ typedef struct {
 
 typedef struct
 {
-    UINT32 MaxCharSize;
+    UINT MaxCharSize;
     BYTE   DefaultChar[MAX_DEFAULTCHAR];
     BYTE   LeadByte[MAX_LEADBYTES];
 } CPINFO, *LPCPINFO;
@@ -588,7 +586,7 @@ typedef struct {
         DWORD InternalHigh;
         DWORD Offset;
         DWORD OffsetHigh;
-        HANDLE32 hEvent;
+        HANDLE hEvent;
 } OVERLAPPED, *LPOVERLAPPED;
 
 /* Process startup information.
@@ -622,10 +620,10 @@ typedef struct {
         WORD wShowWindow;	/* 30: */
         WORD cbReserved2;	/* 32: */
         BYTE *lpReserved2;	/* 34: */
-        HANDLE32 hStdInput;	/* 38: */
-        HANDLE32 hStdOutput;	/* 3c: */
-        HANDLE32 hStdError;	/* 40: */
-} STARTUPINFO32A, *LPSTARTUPINFO32A;
+        HANDLE hStdInput;	/* 38: */
+        HANDLE hStdOutput;	/* 3c: */
+        HANDLE hStdError;	/* 40: */
+} STARTUPINFOA, *LPSTARTUPINFOA;
 
 typedef struct {
         DWORD cb;
@@ -643,17 +641,17 @@ typedef struct {
         WORD wShowWindow;
         WORD cbReserved2;
         BYTE *lpReserved2;
-        HANDLE32 hStdInput;
-        HANDLE32 hStdOutput;
-        HANDLE32 hStdError;
-} STARTUPINFO32W, *LPSTARTUPINFO32W;
+        HANDLE hStdInput;
+        HANDLE hStdOutput;
+        HANDLE hStdError;
+} STARTUPINFOW, *LPSTARTUPINFOW;
 
 DECL_WINELIB_TYPE_AW(STARTUPINFO)
 DECL_WINELIB_TYPE_AW(LPSTARTUPINFO)
 
 typedef struct {
-	HANDLE32	hProcess;
-	HANDLE32	hThread;
+	HANDLE	hProcess;
+	HANDLE	hThread;
 	DWORD		dwProcessId;
 	DWORD		dwThreadId;
 } PROCESS_INFORMATION,*LPPROCESS_INFORMATION;
@@ -761,11 +759,11 @@ typedef struct _MEMORY_BASIC_INFORMATION
 } MEMORY_BASIC_INFORMATION,*LPMEMORY_BASIC_INFORMATION;
 
 
-typedef BOOL32 (CALLBACK *CODEPAGE_ENUMPROC32A)(LPSTR);
-typedef BOOL32 (CALLBACK *CODEPAGE_ENUMPROC32W)(LPWSTR);
+typedef BOOL (CALLBACK *CODEPAGE_ENUMPROCA)(LPSTR);
+typedef BOOL (CALLBACK *CODEPAGE_ENUMPROCW)(LPWSTR);
 DECL_WINELIB_TYPE_AW(CODEPAGE_ENUMPROC)
-typedef BOOL32 (CALLBACK *LOCALE_ENUMPROC32A)(LPSTR);
-typedef BOOL32 (CALLBACK *LOCALE_ENUMPROC32W)(LPWSTR);
+typedef BOOL (CALLBACK *LOCALE_ENUMPROCA)(LPSTR);
+typedef BOOL (CALLBACK *LOCALE_ENUMPROCW)(LPWSTR);
 DECL_WINELIB_TYPE_AW(LOCALE_ENUMPROC)
 
 typedef struct tagSYSTEM_INFO
@@ -789,22 +787,22 @@ typedef struct tagSYSTEM_INFO
 } SYSTEM_INFO, *LPSYSTEM_INFO;
 
 /* service main function prototype */
-typedef VOID (CALLBACK *LPSERVICE_MAIN_FUNCTION32A)(DWORD,LPSTR);
-typedef VOID (CALLBACK *LPSERVICE_MAIN_FUNCTION32W)(DWORD,LPWSTR);
+typedef VOID (CALLBACK *LPSERVICE_MAIN_FUNCTIONA)(DWORD,LPSTR);
+typedef VOID (CALLBACK *LPSERVICE_MAIN_FUNCTIONW)(DWORD,LPWSTR);
 DECL_WINELIB_TYPE_AW(LPSERVICE_MAIN_FUNCTION)
 
 /* service start table */
 typedef struct
 {
     LPSTR			lpServiceName;
-    LPSERVICE_MAIN_FUNCTION32A	lpServiceProc;
-} *LPSERVICE_TABLE_ENTRY32A, SERVICE_TABLE_ENTRY32A;
+    LPSERVICE_MAIN_FUNCTIONA	lpServiceProc;
+} *LPSERVICE_TABLE_ENTRYA, SERVICE_TABLE_ENTRYA;
 
 typedef struct
 {
     LPWSTR			lpServiceName;
-    LPSERVICE_MAIN_FUNCTION32W	lpServiceProc;
-} *LPSERVICE_TABLE_ENTRY32W, SERVICE_TABLE_ENTRY32W;
+    LPSERVICE_MAIN_FUNCTIONW	lpServiceProc;
+} *LPSERVICE_TABLE_ENTRYW, SERVICE_TABLE_ENTRYW;
 
 DECL_WINELIB_TYPE_AW(SERVICE_TABLE_ENTRY)
 DECL_WINELIB_TYPE_AW(LPSERVICE_TABLE_ENTRY)
@@ -815,12 +813,12 @@ DECL_WINELIB_TYPE_AW(LPSERVICE_TABLE_ENTRY)
 #define	HIGH_PRIORITY_CLASS	0x00000080
 #define	REALTIME_PRIORITY_CLASS	0x00000100
 
-typedef BOOL32 (CALLBACK *ENUMRESTYPEPROC32A)(HMODULE32,LPSTR,LONG);
-typedef BOOL32 (CALLBACK *ENUMRESTYPEPROC32W)(HMODULE32,LPWSTR,LONG);
-typedef BOOL32 (CALLBACK *ENUMRESNAMEPROC32A)(HMODULE32,LPCSTR,LPSTR,LONG);
-typedef BOOL32 (CALLBACK *ENUMRESNAMEPROC32W)(HMODULE32,LPCWSTR,LPWSTR,LONG);
-typedef BOOL32 (CALLBACK *ENUMRESLANGPROC32A)(HMODULE32,LPCSTR,LPCSTR,WORD,LONG);
-typedef BOOL32 (CALLBACK *ENUMRESLANGPROC32W)(HMODULE32,LPCWSTR,LPCWSTR,WORD,LONG);
+typedef BOOL (CALLBACK *ENUMRESTYPEPROCA)(HMODULE,LPSTR,LONG);
+typedef BOOL (CALLBACK *ENUMRESTYPEPROCW)(HMODULE,LPWSTR,LONG);
+typedef BOOL (CALLBACK *ENUMRESNAMEPROCA)(HMODULE,LPCSTR,LPSTR,LONG);
+typedef BOOL (CALLBACK *ENUMRESNAMEPROCW)(HMODULE,LPCWSTR,LPWSTR,LONG);
+typedef BOOL (CALLBACK *ENUMRESLANGPROCA)(HMODULE,LPCSTR,LPCSTR,WORD,LONG);
+typedef BOOL (CALLBACK *ENUMRESLANGPROCW)(HMODULE,LPCWSTR,LPCWSTR,WORD,LONG);
 
 DECL_WINELIB_TYPE_AW(ENUMRESTYPEPROC)
 DECL_WINELIB_TYPE_AW(ENUMRESNAMEPROC)
@@ -908,8 +906,8 @@ typedef struct _DllVersionInfo {
  * WINAPI instead of CALLBACK in the windows headers.
  */
 typedef DWORD (WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER, 
-                                           LARGE_INTEGER, DWORD, DWORD, HANDLE32,
-                                           HANDLE32, LPVOID);
+                                           LARGE_INTEGER, DWORD, DWORD, HANDLE,
+                                           HANDLE, LPVOID);
 
 #define DM_UPDATE	1
 #define DM_COPY		2
@@ -1109,8 +1107,8 @@ typedef struct {
 	LPVOID	DebugInfo;
 	LONG LockCount;
 	LONG RecursionCount;
-	HANDLE32 OwningThread;
-	HANDLE32 LockSemaphore;
+	HANDLE OwningThread;
+	HANDLE LockSemaphore;
 	DWORD Reserved;
 }CRITICAL_SECTION;
 
@@ -1130,7 +1128,7 @@ typedef struct {
 	DWORD dwBuildNumber;
 	DWORD dwPlatformId;
 	CHAR szCSDVersion[128];
-} OSVERSIONINFO32A;
+} OSVERSIONINFOA;
 
 typedef struct {
 	DWORD dwOSVersionInfoSize;
@@ -1139,7 +1137,7 @@ typedef struct {
 	DWORD dwBuildNumber;
 	DWORD dwPlatformId;
 	WCHAR szCSDVersion[128];
-} OSVERSIONINFO32W;
+} OSVERSIONINFOW;
 
 DECL_WINELIB_TYPE_AW(OSVERSIONINFO)
 
@@ -1192,7 +1190,7 @@ typedef struct tagDCB16
     UINT16 TxDelay WINE_PACKED;
 } DCB16, *LPDCB16;
 
-typedef struct tagDCB32
+typedef struct tagDCB
 {
     DWORD DCBlength;
     DWORD BaudRate;
@@ -1221,10 +1219,8 @@ typedef struct tagDCB32
     char ErrorChar;
     char EofChar;
     char EvtChar;
-} DCB32, *LPDCB32;
+} DCB, *LPDCB;
 
-DECL_WINELIB_TYPE(DCB)
-DECL_WINELIB_TYPE(LPDCB)
 
 
 typedef struct tagCOMMTIMEOUTS {
@@ -1239,27 +1235,24 @@ typedef struct tagCOMMTIMEOUTS {
 
 typedef VOID (CALLBACK *PAPCFUNC)(ULONG_PTR);
 
-BOOL32      WINAPI ClearCommError(INT32,LPDWORD,LPCOMSTAT);
-BOOL32      WINAPI BuildCommDCB32A(LPCSTR,LPDCB32);
-BOOL32      WINAPI BuildCommDCB32W(LPCWSTR,LPDCB32);
+BOOL      WINAPI ClearCommError(INT,LPDWORD,LPCOMSTAT);
+BOOL      WINAPI BuildCommDCBA(LPCSTR,LPDCB);
+BOOL      WINAPI BuildCommDCBW(LPCWSTR,LPDCB);
 #define     BuildCommDCB WINELIB_NAME_AW(BuildCommDCB)
-BOOL32      WINAPI BuildCommDCBAndTimeouts32A(LPCSTR,LPDCB32,LPCOMMTIMEOUTS);
-BOOL32      WINAPI BuildCommDCBAndTimeouts32W(LPCWSTR,LPDCB32,LPCOMMTIMEOUTS);
+BOOL      WINAPI BuildCommDCBAndTimeoutsA(LPCSTR,LPDCB,LPCOMMTIMEOUTS);
+BOOL      WINAPI BuildCommDCBAndTimeoutsW(LPCWSTR,LPDCB,LPCOMMTIMEOUTS);
 #define     BuildCommDCBAndTimeouts WINELIB_NAME_AW(BuildCommDCBAndTimeouts)
-BOOL32      WINAPI GetCommTimeouts(INT32,LPCOMMTIMEOUTS);
-BOOL32      WINAPI SetCommTimeouts(INT32,LPCOMMTIMEOUTS);
-BOOL32      WINAPI GetCommState32(INT32,LPDCB32);
-#define     GetCommState WINELIB_NAME(GetCommState)
-BOOL32      WINAPI SetCommState32(INT32,LPDCB32);
-#define     SetCommState WINELIB_NAME(SetCommState)
-BOOL32      WINAPI TransmitCommChar32(INT32,CHAR);
-#define     TransmitCommChar WINELIB_NAME(TransmitCommChar)
+BOOL      WINAPI GetCommTimeouts(INT,LPCOMMTIMEOUTS);
+BOOL      WINAPI SetCommTimeouts(INT,LPCOMMTIMEOUTS);
+BOOL      WINAPI GetCommState(INT,LPDCB);
+BOOL      WINAPI SetCommState(INT,LPDCB);
+BOOL      WINAPI TransmitCommChar(INT,CHAR);
 
   
 /*DWORD WINAPI GetVersion( void );*/
 BOOL16 WINAPI GetVersionEx16(OSVERSIONINFO16*);
-BOOL32 WINAPI GetVersionEx32A(OSVERSIONINFO32A*);
-BOOL32 WINAPI GetVersionEx32W(OSVERSIONINFO32W*);
+BOOL WINAPI GetVersionExA(OSVERSIONINFOA*);
+BOOL WINAPI GetVersionExW(OSVERSIONINFOW*);
 #define GetVersionEx WINELIB_NAME_AW(GetVersionEx)
 
 /*int WinMain(HINSTANCE, HINSTANCE prev, char *cmd, int show);*/
@@ -1269,13 +1262,13 @@ void      WINAPI EnterCriticalSection(CRITICAL_SECTION *lpCrit);
 void      WINAPI InitializeCriticalSection(CRITICAL_SECTION *lpCrit);
 void      WINAPI LeaveCriticalSection(CRITICAL_SECTION *lpCrit);
 void      WINAPI MakeCriticalSectionGlobal(CRITICAL_SECTION *lpCrit);
-HANDLE32  WINAPI OpenProcess(DWORD access, BOOL32 inherit, DWORD id);
-BOOL32    WINAPI GetProcessWorkingSetSize(HANDLE32,LPDWORD,LPDWORD);
-DWORD     WINAPI QueueUserAPC(PAPCFUNC,HANDLE32,ULONG_PTR);
+HANDLE  WINAPI OpenProcess(DWORD access, BOOL inherit, DWORD id);
+BOOL    WINAPI GetProcessWorkingSetSize(HANDLE,LPDWORD,LPDWORD);
+DWORD     WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR);
 void      WINAPI RaiseException(DWORD,DWORD,DWORD,const LPDWORD);
-BOOL32    WINAPI SetProcessWorkingSetSize(HANDLE32,DWORD,DWORD);
-BOOL32    WINAPI TerminateProcess(HANDLE32,DWORD);
-BOOL32    WINAPI TerminateThread(HANDLE32,DWORD);
+BOOL    WINAPI SetProcessWorkingSetSize(HANDLE,DWORD,DWORD);
+BOOL    WINAPI TerminateProcess(HANDLE,DWORD);
+BOOL    WINAPI TerminateThread(HANDLE,DWORD);
 
 
 /* GetBinaryType return values.
@@ -1288,308 +1281,307 @@ BOOL32    WINAPI TerminateThread(HANDLE32,DWORD);
 #define SCS_POSIX_BINARY    4
 #define SCS_OS216_BINARY    5
 
-BOOL32 WINAPI GetBinaryType32A( LPCSTR lpApplicationName, LPDWORD lpBinaryType );
-BOOL32 WINAPI GetBinaryType32W( LPCWSTR lpApplicationName, LPDWORD lpBinaryType );
+BOOL WINAPI GetBinaryTypeA( LPCSTR lpApplicationName, LPDWORD lpBinaryType );
+BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType );
 #define GetBinaryType WINELIB_NAME_AW(GetBinaryType)
 
-BOOL16      WINAPI GetWinDebugInfo(LPWINDEBUGINFO,UINT16);
-BOOL16      WINAPI SetWinDebugInfo(LPWINDEBUGINFO);
+BOOL16      WINAPI GetWinDebugInfo16(LPWINDEBUGINFO,UINT16);
+BOOL16      WINAPI SetWinDebugInfo16(LPWINDEBUGINFO);
 /* Declarations for functions that exist only in Win32 */
 
-BOOL32      WINAPI AllocConsole(void);
-BOOL32      WINAPI AreFileApisANSI(void);
-BOOL32      WINAPI Beep(DWORD,DWORD);
-BOOL32      WINAPI CloseHandle(HANDLE32);
-HANDLE32    WINAPI ConvertToGlobalHandle(HANDLE32 hSrc);
-BOOL32      WINAPI CopyFile32A(LPCSTR,LPCSTR,BOOL32);
-BOOL32      WINAPI CopyFile32W(LPCWSTR,LPCWSTR,BOOL32);
+BOOL      WINAPI AllocConsole(void);
+BOOL      WINAPI AreFileApisANSI(void);
+BOOL      WINAPI Beep(DWORD,DWORD);
+BOOL      WINAPI CloseHandle(HANDLE);
+HANDLE    WINAPI ConvertToGlobalHandle(HANDLE hSrc);
+BOOL      WINAPI CopyFileA(LPCSTR,LPCSTR,BOOL);
+BOOL      WINAPI CopyFileW(LPCWSTR,LPCWSTR,BOOL);
 #define     CopyFile WINELIB_NAME_AW(CopyFile)
-BOOL32      WINAPI CopyFileEx32A(LPCSTR, LPCSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL32, DWORD);
-BOOL32      WINAPI CopyFileEx32W(LPCWSTR, LPCWSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL32, DWORD);
+BOOL      WINAPI CopyFileExA(LPCSTR, LPCSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD);
+BOOL      WINAPI CopyFileExW(LPCWSTR, LPCWSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD);
 #define     CopyFileEx WINELIB_NAME_AW(CopyFileEx)
-INT32       WINAPI CompareFileTime(LPFILETIME,LPFILETIME);
-HANDLE32    WINAPI CreateEvent32A(LPSECURITY_ATTRIBUTES,BOOL32,BOOL32,LPCSTR);
-HANDLE32    WINAPI CreateEvent32W(LPSECURITY_ATTRIBUTES,BOOL32,BOOL32,LPCWSTR);
+INT       WINAPI CompareFileTime(LPFILETIME,LPFILETIME);
+HANDLE    WINAPI CreateEventA(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCSTR);
+HANDLE    WINAPI CreateEventW(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR);
 #define     CreateEvent WINELIB_NAME_AW(CreateEvent)
-HFILE32     WINAPI CreateFile32A(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,
-                                 DWORD,DWORD,HANDLE32);
-HFILE32     WINAPI CreateFile32W(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,
-                                 DWORD,DWORD,HANDLE32);
+HFILE     WINAPI CreateFileA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,
+                                 DWORD,DWORD,HANDLE);
+HFILE     WINAPI CreateFileW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,
+                                 DWORD,DWORD,HANDLE);
 #define     CreateFile WINELIB_NAME_AW(CreateFile)
-HANDLE32    WINAPI CreateFileMapping32A(HANDLE32,LPSECURITY_ATTRIBUTES,DWORD,
+HANDLE    WINAPI CreateFileMappingA(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,
                                         DWORD,DWORD,LPCSTR);
-HANDLE32    WINAPI CreateFileMapping32W(HANDLE32,LPSECURITY_ATTRIBUTES,DWORD,
+HANDLE    WINAPI CreateFileMappingW(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,
                                         DWORD,DWORD,LPCWSTR);
 #define     CreateFileMapping WINELIB_NAME_AW(CreateFileMapping)
-HANDLE32    WINAPI CreateMutex32A(LPSECURITY_ATTRIBUTES,BOOL32,LPCSTR);
-HANDLE32    WINAPI CreateMutex32W(LPSECURITY_ATTRIBUTES,BOOL32,LPCWSTR);
+HANDLE    WINAPI CreateMutexA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR);
+HANDLE    WINAPI CreateMutexW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR);
 #define     CreateMutex WINELIB_NAME_AW(CreateMutex)
-BOOL32      WINAPI CreateProcess32A(LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,
-                                    LPSECURITY_ATTRIBUTES,BOOL32,DWORD,LPVOID,LPCSTR,
-                                    LPSTARTUPINFO32A,LPPROCESS_INFORMATION);
-BOOL32      WINAPI CreateProcess32W(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,
-                                    LPSECURITY_ATTRIBUTES,BOOL32,DWORD,LPVOID,LPCWSTR,
-                                    LPSTARTUPINFO32W,LPPROCESS_INFORMATION);
+BOOL      WINAPI CreateProcessA(LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,
+                                    LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,
+                                    LPSTARTUPINFOA,LPPROCESS_INFORMATION);
+BOOL      WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,
+                                    LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,
+                                    LPSTARTUPINFOW,LPPROCESS_INFORMATION);
 #define     CreateProcess WINELIB_NAME_AW(CreateProcess)
-HANDLE32    WINAPI CreateSemaphore32A(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR);
-HANDLE32    WINAPI CreateSemaphore32W(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR);
+HANDLE    WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR);
+HANDLE    WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR);
 #define     CreateSemaphore WINELIB_NAME_AW(CreateSemaphore)
-HANDLE32    WINAPI CreateThread(LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD);
-BOOL32      WINAPI DisableThreadLibraryCalls(HMODULE32);
-BOOL32      WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME);
-BOOL32      WINAPI DuplicateHandle(HANDLE32,HANDLE32,HANDLE32,HANDLE32*,DWORD,BOOL32,DWORD);
-BOOL32      WINAPI EnumDateFormats32A(DATEFMT_ENUMPROC32A lpDateFmtEnumProc, LCID Locale, DWORD dwFlags);
-BOOL32      WINAPI EnumDateFormats32W(DATEFMT_ENUMPROC32W lpDateFmtEnumProc, LCID Locale, DWORD dwFlags);
+HANDLE    WINAPI CreateThread(LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD);
+BOOL      WINAPI DisableThreadLibraryCalls(HMODULE);
+BOOL      WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME);
+BOOL      WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD,BOOL,DWORD);
+BOOL      WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA lpDateFmtEnumProc, LCID Locale, DWORD dwFlags);
+BOOL      WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW lpDateFmtEnumProc, LCID Locale, DWORD dwFlags);
 #define     EnumDateFormats WINELIB_NAME_AW(EnumDateFormats)
-BOOL32      WINAPI EnumResourceLanguages32A(HMODULE32,LPCSTR,LPCSTR,
-                                            ENUMRESLANGPROC32A,LONG);
-BOOL32      WINAPI EnumResourceLanguages32W(HMODULE32,LPCWSTR,LPCWSTR,
-                                            ENUMRESLANGPROC32W,LONG);
+BOOL      WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,
+                                            ENUMRESLANGPROCA,LONG);
+BOOL      WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,
+                                            ENUMRESLANGPROCW,LONG);
 #define     EnumResourceLanguages WINELIB_NAME_AW(EnumResourceLanguages)
-BOOL32      WINAPI EnumResourceNames32A(HMODULE32,LPCSTR,ENUMRESNAMEPROC32A,
+BOOL      WINAPI EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROCA,
                                         LONG);
-BOOL32      WINAPI EnumResourceNames32W(HMODULE32,LPCWSTR,ENUMRESNAMEPROC32W,
+BOOL      WINAPI EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROCW,
                                         LONG);
 #define     EnumResourceNames WINELIB_NAME_AW(EnumResourceNames)
-BOOL32      WINAPI EnumResourceTypes32A(HMODULE32,ENUMRESTYPEPROC32A,LONG);
-BOOL32      WINAPI EnumResourceTypes32W(HMODULE32,ENUMRESTYPEPROC32W,LONG);
+BOOL      WINAPI EnumResourceTypesA(HMODULE,ENUMRESTYPEPROCA,LONG);
+BOOL      WINAPI EnumResourceTypesW(HMODULE,ENUMRESTYPEPROCW,LONG);
 #define     EnumResourceTypes WINELIB_NAME_AW(EnumResourceTypes)
-BOOL32      WINAPI EnumSystemCodePages32A(CODEPAGE_ENUMPROC32A,DWORD);
-BOOL32      WINAPI EnumSystemCodePages32W(CODEPAGE_ENUMPROC32W,DWORD);
+BOOL      WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA,DWORD);
+BOOL      WINAPI EnumSystemCodePagesW(CODEPAGE_ENUMPROCW,DWORD);
 #define     EnumSystemCodePages WINELIB_NAME_AW(EnumSystemCodePages)
-BOOL32      WINAPI EnumSystemLocales32A(LOCALE_ENUMPROC32A,DWORD);
-BOOL32      WINAPI EnumSystemLocales32W(LOCALE_ENUMPROC32W,DWORD);
+BOOL      WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD);
+BOOL      WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD);
 #define     EnumSystemLocales WINELIB_NAME_AW(EnumSystemLocales)
-BOOL32      WINAPI EnumTimeFormats32A(TIMEFMT_ENUMPROC32A lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags);
-BOOL32      WINAPI EnumTimeFormats32W(TIMEFMT_ENUMPROC32W lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags);
+BOOL      WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags);
+BOOL      WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags);
 #define     EnumTimeFormats WINELIB_NAME_AW(EnumTimeFormats)
 VOID        WINAPI ExitProcess(DWORD);
 VOID        WINAPI ExitThread(DWORD);
-DWORD       WINAPI ExpandEnvironmentStrings32A(LPCSTR,LPSTR,DWORD);
-DWORD       WINAPI ExpandEnvironmentStrings32W(LPCWSTR,LPWSTR,DWORD);
+DWORD       WINAPI ExpandEnvironmentStringsA(LPCSTR,LPSTR,DWORD);
+DWORD       WINAPI ExpandEnvironmentStringsW(LPCWSTR,LPWSTR,DWORD);
 #define     ExpandEnvironmentStrings WINELIB_NAME_AW(ExpandEnvironmentStrings)
-BOOL32      WINAPI FileTimeToDosDateTime(const FILETIME*,LPWORD,LPWORD);
-BOOL32      WINAPI FileTimeToLocalFileTime(const FILETIME*,LPFILETIME);
-BOOL32      WINAPI FileTimeToSystemTime(const FILETIME*,LPSYSTEMTIME);
-HANDLE32    WINAPI FindFirstChangeNotification32A(LPCSTR,BOOL32,DWORD);
-HANDLE32    WINAPI FindFirstChangeNotification32W(LPCWSTR,BOOL32,DWORD);
+BOOL      WINAPI FileTimeToDosDateTime(const FILETIME*,LPWORD,LPWORD);
+BOOL      WINAPI FileTimeToLocalFileTime(const FILETIME*,LPFILETIME);
+BOOL      WINAPI FileTimeToSystemTime(const FILETIME*,LPSYSTEMTIME);
+HANDLE    WINAPI FindFirstChangeNotificationA(LPCSTR,BOOL,DWORD);
+HANDLE    WINAPI FindFirstChangeNotificationW(LPCWSTR,BOOL,DWORD);
 #define     FindFirstChangeNotification WINELIB_NAME_AW(FindFirstChangeNotification)
-BOOL32      WINAPI FindNextChangeNotification(HANDLE32);
-BOOL32      WINAPI FindCloseChangeNotification(HANDLE32);
-HRSRC32     WINAPI FindResourceEx32A(HMODULE32,LPCSTR,LPCSTR,WORD);
-HRSRC32     WINAPI FindResourceEx32W(HMODULE32,LPCWSTR,LPCWSTR,WORD);
+BOOL      WINAPI FindNextChangeNotification(HANDLE);
+BOOL      WINAPI FindCloseChangeNotification(HANDLE);
+HRSRC     WINAPI FindResourceExA(HMODULE,LPCSTR,LPCSTR,WORD);
+HRSRC     WINAPI FindResourceExW(HMODULE,LPCWSTR,LPCWSTR,WORD);
 #define     FindResourceEx WINELIB_NAME_AW(FindResourceEx)
-BOOL32      WINAPI FlushConsoleInputBuffer(HANDLE32);
-BOOL32      WINAPI FlushFileBuffers(HFILE32);
-BOOL32      WINAPI FlushViewOfFile(LPCVOID, DWORD);
-DWORD       WINAPI FormatMessage32A(DWORD,LPCVOID,DWORD,DWORD,LPSTR,
+BOOL      WINAPI FlushConsoleInputBuffer(HANDLE);
+BOOL      WINAPI FlushFileBuffers(HFILE);
+BOOL      WINAPI FlushViewOfFile(LPCVOID, DWORD);
+DWORD       WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,
 				    DWORD,LPDWORD);
-DWORD       WINAPI FormatMessage32W(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,
+DWORD       WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,
 				    DWORD,LPDWORD);
 #define     FormatMessage WINELIB_NAME_AW(FormatMessage)
-BOOL32      WINAPI FreeConsole(void);
-BOOL32      WINAPI FreeEnvironmentStrings32A(LPSTR);
-BOOL32      WINAPI FreeEnvironmentStrings32W(LPWSTR);
+BOOL      WINAPI FreeConsole(void);
+BOOL      WINAPI FreeEnvironmentStringsA(LPSTR);
+BOOL      WINAPI FreeEnvironmentStringsW(LPWSTR);
 #define     FreeEnvironmentStrings WINELIB_NAME_AW(FreeEnvironmentStrings)
-UINT32      WINAPI GetACP(void);
-LPCSTR      WINAPI GetCommandLine32A(void);
-LPCWSTR     WINAPI GetCommandLine32W(void);
+UINT      WINAPI GetACP(void);
+LPCSTR      WINAPI GetCommandLineA(void);
+LPCWSTR     WINAPI GetCommandLineW(void);
 #define     GetCommandLine WINELIB_NAME_AW(GetCommandLine)
-BOOL32      WINAPI GetComputerName32A(LPSTR,LPDWORD);
-BOOL32      WINAPI GetComputerName32W(LPWSTR,LPDWORD);
+BOOL      WINAPI GetComputerNameA(LPSTR,LPDWORD);
+BOOL      WINAPI GetComputerNameW(LPWSTR,LPDWORD);
 #define     GetComputerName WINELIB_NAME_AW(GetComputerName)
-UINT32      WINAPI GetConsoleCP(void);
-BOOL32      WINAPI GetConsoleMode(HANDLE32,LPDWORD);
-UINT32      WINAPI GetConsoleOutputCP(void);
-DWORD       WINAPI GetConsoleTitle32A(LPSTR,DWORD);
-DWORD       WINAPI GetConsoleTitle32W(LPWSTR,DWORD);
+UINT      WINAPI GetConsoleCP(void);
+BOOL      WINAPI GetConsoleMode(HANDLE,LPDWORD);
+UINT      WINAPI GetConsoleOutputCP(void);
+DWORD       WINAPI GetConsoleTitleA(LPSTR,DWORD);
+DWORD       WINAPI GetConsoleTitleW(LPWSTR,DWORD);
 #define     GetConsoleTitle WINELIB_NAME_AW(GetConsoleTitle)
-BOOL32      WINAPI GetCPInfo(UINT32,LPCPINFO);
-BOOL32      WINAPI GetCommMask(HANDLE32, LPDWORD);
-BOOL32      WINAPI GetCommModemStatus(HANDLE32, LPDWORD);
-HANDLE32    WINAPI GetCurrentProcess(void);
+BOOL      WINAPI GetCPInfo(UINT,LPCPINFO);
+BOOL      WINAPI GetCommMask(HANDLE, LPDWORD);
+BOOL      WINAPI GetCommModemStatus(HANDLE, LPDWORD);
+HANDLE    WINAPI GetCurrentProcess(void);
 DWORD       WINAPI GetCurrentProcessId(void);
-HANDLE32    WINAPI GetCurrentThread(void);
+HANDLE    WINAPI GetCurrentThread(void);
 DWORD       WINAPI GetCurrentThreadId(void);
-INT32       WINAPI GetDateFormat32A(LCID,DWORD,LPSYSTEMTIME,LPCSTR,LPSTR,INT32);
-INT32       WINAPI GetDateFormat32W(LCID,DWORD,LPSYSTEMTIME,LPCWSTR,LPWSTR,INT32);
+INT       WINAPI GetDateFormatA(LCID,DWORD,LPSYSTEMTIME,LPCSTR,LPSTR,INT);
+INT       WINAPI GetDateFormatW(LCID,DWORD,LPSYSTEMTIME,LPCWSTR,LPWSTR,INT);
 #define     GetDateFormat WINELIB_NAME_AW(GetDateFormat)
-LPSTR       WINAPI GetEnvironmentStrings32A(void);
-LPWSTR      WINAPI GetEnvironmentStrings32W(void);
+LPSTR       WINAPI GetEnvironmentStringsA(void);
+LPWSTR      WINAPI GetEnvironmentStringsW(void);
 #define     GetEnvironmentStrings WINELIB_NAME_AW(GetEnvironmentStrings)
-DWORD       WINAPI GetEnvironmentVariable32A(LPCSTR,LPSTR,DWORD);
-DWORD       WINAPI GetEnvironmentVariable32W(LPCWSTR,LPWSTR,DWORD);
+DWORD       WINAPI GetEnvironmentVariableA(LPCSTR,LPSTR,DWORD);
+DWORD       WINAPI GetEnvironmentVariableW(LPCWSTR,LPWSTR,DWORD);
 #define     GetEnvironmentVariable WINELIB_NAME_AW(GetEnvironmentVariable)
-BOOL32      WINAPI GetFileAttributesEx32A(LPCSTR,GET_FILEEX_INFO_LEVELS,LPVOID);
-BOOL32      WINAPI GetFileAttributesEx32W(LPCWSTR,GET_FILEEX_INFO_LEVELS,LPVOID);
+BOOL      WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS,LPVOID);
+BOOL      WINAPI GetFileAttributesExW(LPCWSTR,GET_FILEEX_INFO_LEVELS,LPVOID);
 #define     GetFileattributesEx WINELIB_NAME_AW(GetFileAttributesEx)
-DWORD       WINAPI GetFileInformationByHandle(HFILE32,BY_HANDLE_FILE_INFORMATION*);
-DWORD       WINAPI GetFileSize(HFILE32,LPDWORD);
-BOOL32      WINAPI GetFileTime(HFILE32,LPFILETIME,LPFILETIME,LPFILETIME);
-DWORD       WINAPI GetFileType(HFILE32);
-DWORD       WINAPI GetFullPathName32A(LPCSTR,DWORD,LPSTR,LPSTR*);
-DWORD       WINAPI GetFullPathName32W(LPCWSTR,DWORD,LPWSTR,LPWSTR*);
+DWORD       WINAPI GetFileInformationByHandle(HFILE,BY_HANDLE_FILE_INFORMATION*);
+DWORD       WINAPI GetFileSize(HFILE,LPDWORD);
+BOOL      WINAPI GetFileTime(HFILE,LPFILETIME,LPFILETIME,LPFILETIME);
+DWORD       WINAPI GetFileType(HFILE);
+DWORD       WINAPI GetFullPathNameA(LPCSTR,DWORD,LPSTR,LPSTR*);
+DWORD       WINAPI GetFullPathNameW(LPCWSTR,DWORD,LPWSTR,LPWSTR*);
 #define     GetFullPathName WINELIB_NAME_AW(GetFullPathName)
-BOOL32      WINAPI GetHandleInformation(HANDLE32,LPDWORD);
-DWORD       WINAPI GetLargestConsoleWindowSize(HANDLE32);
+BOOL      WINAPI GetHandleInformation(HANDLE,LPDWORD);
+DWORD       WINAPI GetLargestConsoleWindowSize(HANDLE);
 VOID        WINAPI GetLocalTime(LPSYSTEMTIME);
 DWORD       WINAPI GetLogicalDrives(void);
-DWORD       WINAPI GetLongPathName32A(LPCSTR,LPSTR,DWORD);
-DWORD       WINAPI GetLongPathName32W(LPCWSTR,LPWSTR,DWORD);
+DWORD       WINAPI GetLongPathNameA(LPCSTR,LPSTR,DWORD);
+DWORD       WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD);
 #define     GetLongPathName WINELIB_NAME_AW(GetLongPathName)
-BOOL32      WINAPI GetNumberOfConsoleInputEvents(HANDLE32,LPDWORD);
-BOOL32      WINAPI GetNumberOfConsoleMouseButtons(LPDWORD);
-UINT32      WINAPI GetOEMCP(void);
-DWORD       WINAPI GetPriorityClass(HANDLE32);
-HANDLE32    WINAPI GetProcessHeap(void);
+BOOL      WINAPI GetNumberOfConsoleInputEvents(HANDLE,LPDWORD);
+BOOL      WINAPI GetNumberOfConsoleMouseButtons(LPDWORD);
+UINT      WINAPI GetOEMCP(void);
+DWORD       WINAPI GetPriorityClass(HANDLE);
+HANDLE    WINAPI GetProcessHeap(void);
 DWORD       WINAPI GetProcessVersion(DWORD);
-DWORD       WINAPI GetShortPathName32A(LPCSTR,LPSTR,DWORD);
-DWORD       WINAPI GetShortPathName32W(LPCWSTR,LPWSTR,DWORD);
+DWORD       WINAPI GetShortPathNameA(LPCSTR,LPSTR,DWORD);
+DWORD       WINAPI GetShortPathNameW(LPCWSTR,LPWSTR,DWORD);
 #define     GetShortPathName WINELIB_NAME_AW(GetShortPathName)
-HFILE32     WINAPI GetStdHandle(DWORD);
-BOOL32      WINAPI GetStringTypeEx32A(LCID,DWORD,LPCSTR,INT32,LPWORD);
-BOOL32      WINAPI GetStringTypeEx32W(LCID,DWORD,LPCWSTR,INT32,LPWORD);
+HFILE     WINAPI GetStdHandle(DWORD);
+BOOL      WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD);
+BOOL      WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,INT,LPWORD);
 #define     GetStringTypeEx WINELIB_NAME_AW(GetStringTypeEx)
 VOID        WINAPI GetSystemInfo(LPSYSTEM_INFO);
-BOOL32      WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS);
+BOOL      WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS);
 VOID        WINAPI GetSystemTime(LPSYSTEMTIME);
-INT32       WINAPI GetTimeFormat32A(LCID,DWORD,LPSYSTEMTIME,LPCSTR,LPSTR,INT32);
-INT32       WINAPI GetTimeFormat32W(LCID,DWORD,LPSYSTEMTIME,LPCWSTR,LPWSTR,INT32);
+INT       WINAPI GetTimeFormatA(LCID,DWORD,LPSYSTEMTIME,LPCSTR,LPSTR,INT);
+INT       WINAPI GetTimeFormatW(LCID,DWORD,LPSYSTEMTIME,LPCWSTR,LPWSTR,INT);
 #define     GetTimeFormat WINELIB_NAME_AW(GetTimeFormat)
 LCID        WINAPI GetThreadLocale(void);
-INT32       WINAPI GetThreadPriority(HANDLE32);
-BOOL32      WINAPI GetThreadSelectorEntry(HANDLE32,DWORD,LPLDT_ENTRY);
+INT       WINAPI GetThreadPriority(HANDLE);
+BOOL      WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY);
 VOID        WINAPI GlobalMemoryStatus(LPMEMORYSTATUS);
-LPVOID      WINAPI HeapAlloc(HANDLE32,DWORD,DWORD);
-DWORD       WINAPI HeapCompact(HANDLE32,DWORD);
-HANDLE32    WINAPI HeapCreate(DWORD,DWORD,DWORD);
-BOOL32      WINAPI HeapDestroy(HANDLE32);
-BOOL32      WINAPI HeapFree(HANDLE32,DWORD,LPVOID);
-BOOL32      WINAPI HeapLock(HANDLE32);
-LPVOID      WINAPI HeapReAlloc(HANDLE32,DWORD,LPVOID,DWORD);
-DWORD       WINAPI HeapSize(HANDLE32,DWORD,LPVOID);
-BOOL32      WINAPI HeapUnlock(HANDLE32);
-BOOL32      WINAPI HeapValidate(HANDLE32,DWORD,LPCVOID);
+LPVOID      WINAPI HeapAlloc(HANDLE,DWORD,DWORD);
+DWORD       WINAPI HeapCompact(HANDLE,DWORD);
+HANDLE    WINAPI HeapCreate(DWORD,DWORD,DWORD);
+BOOL      WINAPI HeapDestroy(HANDLE);
+BOOL      WINAPI HeapFree(HANDLE,DWORD,LPVOID);
+BOOL      WINAPI HeapLock(HANDLE);
+LPVOID      WINAPI HeapReAlloc(HANDLE,DWORD,LPVOID,DWORD);
+DWORD       WINAPI HeapSize(HANDLE,DWORD,LPVOID);
+BOOL      WINAPI HeapUnlock(HANDLE);
+BOOL      WINAPI HeapValidate(HANDLE,DWORD,LPCVOID);
 LONG        WINAPI InterlockedDecrement(LPLONG);
 LONG        WINAPI InterlockedExchange(LPLONG,LONG);
 LONG        WINAPI InterlockedIncrement(LPLONG);
-BOOL32      WINAPI IsDBCSLeadByteEx(UINT32,BYTE);
-BOOL32      WINAPI IsProcessorFeaturePresent(DWORD);
-BOOL32      WINAPI IsValidLocale(DWORD,DWORD);
-BOOL32      WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME);
-BOOL32      WINAPI LockFile(HFILE32,DWORD,DWORD,DWORD,DWORD);
-HMODULE32   WINAPI MapHModuleSL(HMODULE16);
-HMODULE16   WINAPI MapHModuleLS(HMODULE32);
+BOOL      WINAPI IsDBCSLeadByteEx(UINT,BYTE);
+BOOL      WINAPI IsProcessorFeaturePresent(DWORD);
+BOOL      WINAPI IsValidLocale(DWORD,DWORD);
+BOOL      WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME);
+BOOL      WINAPI LockFile(HFILE,DWORD,DWORD,DWORD,DWORD);
+HMODULE   WINAPI MapHModuleSL(HMODULE16);
+HMODULE16   WINAPI MapHModuleLS(HMODULE);
 SEGPTR      WINAPI MapLS(LPVOID);
 LPVOID      WINAPI MapSL(SEGPTR);
-LPVOID      WINAPI MapViewOfFile(HANDLE32,DWORD,DWORD,DWORD,DWORD);
-LPVOID      WINAPI MapViewOfFileEx(HANDLE32,DWORD,DWORD,DWORD,DWORD,LPVOID);
-BOOL32      WINAPI MoveFile32A(LPCSTR,LPCSTR);
-BOOL32      WINAPI MoveFile32W(LPCWSTR,LPCWSTR);
+LPVOID      WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,DWORD);
+LPVOID      WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,DWORD,LPVOID);
+BOOL      WINAPI MoveFileA(LPCSTR,LPCSTR);
+BOOL      WINAPI MoveFileW(LPCWSTR,LPCWSTR);
 #define     MoveFile WINELIB_NAME_AW(MoveFile)
-BOOL32      WINAPI MoveFileEx32A(LPCSTR,LPCSTR,DWORD);
-BOOL32      WINAPI MoveFileEx32W(LPCWSTR,LPCWSTR,DWORD);
+BOOL      WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD);
+BOOL      WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD);
 #define     MoveFileEx WINELIB_NAME_AW(MoveFileEx)
-INT32       WINAPI MultiByteToWideChar(UINT32,DWORD,LPCSTR,INT32,LPWSTR,INT32);
-INT32       WINAPI WideCharToMultiByte(UINT32,DWORD,LPCWSTR,INT32,LPSTR,INT32,LPCSTR,BOOL32*);
-HANDLE32    WINAPI OpenEvent32A(DWORD,BOOL32,LPCSTR);
-HANDLE32    WINAPI OpenEvent32W(DWORD,BOOL32,LPCWSTR);
+INT       WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT);
+INT       WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,BOOL*);
+HANDLE    WINAPI OpenEventA(DWORD,BOOL,LPCSTR);
+HANDLE    WINAPI OpenEventW(DWORD,BOOL,LPCWSTR);
 #define     OpenEvent WINELIB_NAME_AW(OpenEvent)
-HANDLE32    WINAPI OpenFileMapping32A(DWORD,BOOL32,LPCSTR);
-HANDLE32    WINAPI OpenFileMapping32W(DWORD,BOOL32,LPCWSTR);
+HANDLE    WINAPI OpenFileMappingA(DWORD,BOOL,LPCSTR);
+HANDLE    WINAPI OpenFileMappingW(DWORD,BOOL,LPCWSTR);
 #define     OpenFileMapping WINELIB_NAME_AW(OpenFileMapping)
-HANDLE32    WINAPI OpenMutex32A(DWORD,BOOL32,LPCSTR);
-HANDLE32    WINAPI OpenMutex32W(DWORD,BOOL32,LPCWSTR);
+HANDLE    WINAPI OpenMutexA(DWORD,BOOL,LPCSTR);
+HANDLE    WINAPI OpenMutexW(DWORD,BOOL,LPCWSTR);
 #define     OpenMutex WINELIB_NAME_AW(OpenMutex)
-HANDLE32    WINAPI OpenProcess(DWORD,BOOL32,DWORD);
-HANDLE32    WINAPI OpenSemaphore32A(DWORD,BOOL32,LPCSTR);
-HANDLE32    WINAPI OpenSemaphore32W(DWORD,BOOL32,LPCWSTR);
+HANDLE    WINAPI OpenProcess(DWORD,BOOL,DWORD);
+HANDLE    WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR);
+HANDLE    WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR);
 #define     OpenSemaphore WINELIB_NAME_AW(OpenSemaphore)
-BOOL32      WINAPI PulseEvent(HANDLE32);
-BOOL32      WINAPI PurgeComm(HANDLE32,DWORD);
-DWORD       WINAPI QueryDosDevice32A(LPCSTR,LPSTR,DWORD);
-DWORD       WINAPI QueryDosDevice32W(LPCWSTR,LPWSTR,DWORD);
+BOOL      WINAPI PulseEvent(HANDLE);
+BOOL      WINAPI PurgeComm(HANDLE,DWORD);
+DWORD       WINAPI QueryDosDeviceA(LPCSTR,LPSTR,DWORD);
+DWORD       WINAPI QueryDosDeviceW(LPCWSTR,LPWSTR,DWORD);
 #define     QueryDosDevice WINELIB_NAME_AW(QueryDosDevice)
-BOOL32      WINAPI QueryPerformanceCounter(PLARGE_INTEGER);
-BOOL32      WINAPI ReadConsole32A(HANDLE32,LPVOID,DWORD,LPDWORD,LPVOID);
-BOOL32      WINAPI ReadConsole32W(HANDLE32,LPVOID,DWORD,LPDWORD,LPVOID);
+BOOL      WINAPI QueryPerformanceCounter(PLARGE_INTEGER);
+BOOL      WINAPI ReadConsoleA(HANDLE,LPVOID,DWORD,LPDWORD,LPVOID);
+BOOL      WINAPI ReadConsoleW(HANDLE,LPVOID,DWORD,LPDWORD,LPVOID);
 #define     ReadConsole WINELIB_NAME_AW(ReadConsole)
-BOOL32      WINAPI ReadConsoleOutputCharacter32A(HANDLE32,LPSTR,DWORD,
+BOOL      WINAPI ReadConsoleOutputCharacterA(HANDLE,LPSTR,DWORD,
 						 COORD,LPDWORD);
 #define     ReadConsoleOutputCharacter WINELIB_NAME_AW(ReadConsoleOutputCharacter)
-BOOL32      WINAPI ReadFile(HANDLE32,LPVOID,DWORD,LPDWORD,LPOVERLAPPED);
-BOOL32      WINAPI ReleaseMutex(HANDLE32);
-BOOL32      WINAPI ReleaseSemaphore(HANDLE32,LONG,LPLONG);
-BOOL32      WINAPI ResetEvent(HANDLE32);
-DWORD       WINAPI ResumeThread(HANDLE32);
-VOID        WINAPI RtlFillMemory(LPVOID,UINT32,UINT32);
-VOID        WINAPI RtlMoveMemory(LPVOID,LPCVOID,UINT32);
-VOID        WINAPI RtlZeroMemory(LPVOID,UINT32);
-DWORD       WINAPI SearchPath32A(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*);
-DWORD       WINAPI SearchPath32W(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*);
-#define     SearchPath WINELIB_NAME(SearchPath)
-BOOL32      WINAPI SetCommMask(INT32,DWORD);
-BOOL32      WINAPI SetComputerName32A(LPCSTR);
-BOOL32      WINAPI SetComputerName32W(LPCWSTR);
+BOOL      WINAPI ReadFile(HANDLE,LPVOID,DWORD,LPDWORD,LPOVERLAPPED);
+BOOL      WINAPI ReleaseMutex(HANDLE);
+BOOL      WINAPI ReleaseSemaphore(HANDLE,LONG,LPLONG);
+BOOL      WINAPI ResetEvent(HANDLE);
+DWORD       WINAPI ResumeThread(HANDLE);
+VOID        WINAPI RtlFillMemory(LPVOID,UINT,UINT);
+VOID        WINAPI RtlMoveMemory(LPVOID,LPCVOID,UINT);
+VOID        WINAPI RtlZeroMemory(LPVOID,UINT);
+DWORD       WINAPI SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*);
+DWORD       WINAPI SearchPathW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*);
+BOOL      WINAPI SetCommMask(INT,DWORD);
+BOOL      WINAPI SetComputerNameA(LPCSTR);
+BOOL      WINAPI SetComputerNameW(LPCWSTR);
 #define     SetComputerName WINELIB_NAME_AW(SetComputerName)
-BOOL32      WINAPI SetConsoleCursorPosition(HANDLE32,COORD);
-BOOL32      WINAPI SetConsoleMode(HANDLE32,DWORD);
-BOOL32      WINAPI SetConsoleTitle32A(LPCSTR);
-BOOL32      WINAPI SetConsoleTitle32W(LPCWSTR);
+BOOL      WINAPI SetConsoleCursorPosition(HANDLE,COORD);
+BOOL      WINAPI SetConsoleMode(HANDLE,DWORD);
+BOOL      WINAPI SetConsoleTitleA(LPCSTR);
+BOOL      WINAPI SetConsoleTitleW(LPCWSTR);
 #define     SetConsoleTitle WINELIB_NAME_AW(SetConsoleTitle)
-BOOL32      WINAPI SetEndOfFile(HFILE32);
-BOOL32      WINAPI SetEnvironmentVariable32A(LPCSTR,LPCSTR);
-BOOL32      WINAPI SetEnvironmentVariable32W(LPCWSTR,LPCWSTR);
+BOOL      WINAPI SetEndOfFile(HFILE);
+BOOL      WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR);
+BOOL      WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR);
 #define     SetEnvironmentVariable WINELIB_NAME_AW(SetEnvironmentVariable)
-BOOL32      WINAPI SetEvent(HANDLE32);
+BOOL      WINAPI SetEvent(HANDLE);
 VOID        WINAPI SetFileApisToANSI(void);
 VOID        WINAPI SetFileApisToOEM(void);
-DWORD       WINAPI SetFilePointer(HFILE32,LONG,LPLONG,DWORD);
-BOOL32      WINAPI SetFileTime(HFILE32,const FILETIME*,const FILETIME*,
+DWORD       WINAPI SetFilePointer(HFILE,LONG,LPLONG,DWORD);
+BOOL      WINAPI SetFileTime(HFILE,const FILETIME*,const FILETIME*,
                                const FILETIME*);
-BOOL32      WINAPI SetHandleInformation(HANDLE32,DWORD,DWORD);
-BOOL32      WINAPI SetPriorityClass(HANDLE32,DWORD);
-BOOL32      WINAPI SetStdHandle(DWORD,HANDLE32);
-BOOL32      WINAPI SetSystemPowerState(BOOL32,BOOL32);
-BOOL32      WINAPI SetSystemTime(const SYSTEMTIME*);
-DWORD       WINAPI SetThreadAffinityMask(HANDLE32,DWORD);
-BOOL32      WINAPI SetThreadLocale(LCID);
-BOOL32      WINAPI SetThreadPriority(HANDLE32,INT32);
-BOOL32      WINAPI SetTimeZoneInformation(const LPTIME_ZONE_INFORMATION);
+BOOL      WINAPI SetHandleInformation(HANDLE,DWORD,DWORD);
+BOOL      WINAPI SetPriorityClass(HANDLE,DWORD);
+BOOL      WINAPI SetStdHandle(DWORD,HANDLE);
+BOOL      WINAPI SetSystemPowerState(BOOL,BOOL);
+BOOL      WINAPI SetSystemTime(const SYSTEMTIME*);
+DWORD       WINAPI SetThreadAffinityMask(HANDLE,DWORD);
+BOOL      WINAPI SetThreadLocale(LCID);
+BOOL      WINAPI SetThreadPriority(HANDLE,INT);
+BOOL      WINAPI SetTimeZoneInformation(const LPTIME_ZONE_INFORMATION);
 VOID        WINAPI Sleep(DWORD);
-DWORD       WINAPI SleepEx(DWORD,BOOL32);
-DWORD       WINAPI SuspendThread(HANDLE32);
-BOOL32      WINAPI SystemTimeToFileTime(const SYSTEMTIME*,LPFILETIME);
+DWORD       WINAPI SleepEx(DWORD,BOOL);
+DWORD       WINAPI SuspendThread(HANDLE);
+BOOL      WINAPI SystemTimeToFileTime(const SYSTEMTIME*,LPFILETIME);
 DWORD       WINAPI TlsAlloc(void);
-BOOL32      WINAPI TlsFree(DWORD);
+BOOL      WINAPI TlsFree(DWORD);
 LPVOID      WINAPI TlsGetValue(DWORD);
-BOOL32      WINAPI TlsSetValue(DWORD,LPVOID);
+BOOL      WINAPI TlsSetValue(DWORD,LPVOID);
 VOID        WINAPI UnMapLS(SEGPTR);
-BOOL32      WINAPI UnlockFile(HFILE32,DWORD,DWORD,DWORD,DWORD);
-BOOL32      WINAPI UnmapViewOfFile(LPVOID);
+BOOL      WINAPI UnlockFile(HFILE,DWORD,DWORD,DWORD,DWORD);
+BOOL      WINAPI UnmapViewOfFile(LPVOID);
 LPVOID      WINAPI VirtualAlloc(LPVOID,DWORD,DWORD,DWORD);
-BOOL32      WINAPI VirtualFree(LPVOID,DWORD,DWORD);
-BOOL32      WINAPI VirtualLock(LPVOID,DWORD);
-BOOL32      WINAPI VirtualProtect(LPVOID,DWORD,DWORD,LPDWORD);
-BOOL32      WINAPI VirtualProtectEx(HANDLE32,LPVOID,DWORD,DWORD,LPDWORD);
+BOOL      WINAPI VirtualFree(LPVOID,DWORD,DWORD);
+BOOL      WINAPI VirtualLock(LPVOID,DWORD);
+BOOL      WINAPI VirtualProtect(LPVOID,DWORD,DWORD,LPDWORD);
+BOOL      WINAPI VirtualProtectEx(HANDLE,LPVOID,DWORD,DWORD,LPDWORD);
 DWORD       WINAPI VirtualQuery(LPCVOID,LPMEMORY_BASIC_INFORMATION,DWORD);
-DWORD       WINAPI VirtualQueryEx(HANDLE32,LPCVOID,LPMEMORY_BASIC_INFORMATION,DWORD);
-BOOL32      WINAPI VirtualUnlock(LPVOID,DWORD);
-BOOL32      WINAPI WaitCommEvent(HANDLE32,LPDWORD,LPOVERLAPPED);
-BOOL32      WINAPI WaitForDebugEvent(LPDEBUG_EVENT,DWORD);
-DWORD       WINAPI WaitForMultipleObjects(DWORD,const HANDLE32*,BOOL32,DWORD);
-DWORD       WINAPI WaitForMultipleObjectsEx(DWORD,const HANDLE32*,BOOL32,DWORD,BOOL32);
-DWORD       WINAPI WaitForSingleObject(HANDLE32,DWORD);
-DWORD       WINAPI WaitForSingleObjectEx(HANDLE32,DWORD,BOOL32);
+DWORD       WINAPI VirtualQueryEx(HANDLE,LPCVOID,LPMEMORY_BASIC_INFORMATION,DWORD);
+BOOL      WINAPI VirtualUnlock(LPVOID,DWORD);
+BOOL      WINAPI WaitCommEvent(HANDLE,LPDWORD,LPOVERLAPPED);
+BOOL      WINAPI WaitForDebugEvent(LPDEBUG_EVENT,DWORD);
+DWORD       WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DWORD);
+DWORD       WINAPI WaitForMultipleObjectsEx(DWORD,const HANDLE*,BOOL,DWORD,BOOL);
+DWORD       WINAPI WaitForSingleObject(HANDLE,DWORD);
+DWORD       WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL);
 SEGPTR      WINAPI WOWGlobalAllocLock16(DWORD,DWORD,HGLOBAL16*);
 DWORD       WINAPI WOWCallback16(FARPROC16,DWORD);
-BOOL32      WINAPI WOWCallback16Ex(FARPROC16,DWORD,DWORD,LPVOID,LPDWORD);
-HANDLE32    WINAPI WOWHandle32(WORD,WOW_HANDLE_TYPE);
-BOOL32      WINAPI WriteConsole32A(HANDLE32,LPCVOID,DWORD,LPDWORD,LPVOID);
-BOOL32      WINAPI WriteConsole32W(HANDLE32,LPCVOID,DWORD,LPDWORD,LPVOID);
+BOOL      WINAPI WOWCallback16Ex(FARPROC16,DWORD,DWORD,LPVOID,LPDWORD);
+HANDLE    WINAPI WOWHandle32(WORD,WOW_HANDLE_TYPE);
+BOOL      WINAPI WriteConsoleA(HANDLE,LPCVOID,DWORD,LPDWORD,LPVOID);
+BOOL      WINAPI WriteConsoleW(HANDLE,LPCVOID,DWORD,LPDWORD,LPVOID);
 #define     WriteConsole WINELIB_NAME_AW(WriteConsole)
-BOOL32      WINAPI WriteFile(HANDLE32,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED);
-VOID        WINAPI ZeroMemory(LPVOID,UINT32);
+BOOL      WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED);
+VOID        WINAPI ZeroMemory(LPVOID,UINT);
 #define     ZeroMemory RtlZeroMemory
 DWORD       WINAPI GetLastError(void);
 LANGID      WINAPI GetSystemDefaultLangID(void);
@@ -1597,304 +1589,244 @@ LCID        WINAPI GetSystemDefaultLCID(void);
 LANGID      WINAPI GetUserDefaultLangID(void);
 LCID        WINAPI GetUserDefaultLCID(void);
 VOID        WINAPI SetLastError(DWORD);
-ATOM        WINAPI AddAtom32A(LPCSTR);
-ATOM        WINAPI AddAtom32W(LPCWSTR);
+ATOM        WINAPI AddAtomA(LPCSTR);
+ATOM        WINAPI AddAtomW(LPCWSTR);
 #define     AddAtom WINELIB_NAME_AW(AddAtom)
-UINT32      WINAPI CompareString32A(DWORD,DWORD,LPCSTR,DWORD,LPCSTR,DWORD);
-UINT32      WINAPI CompareString32W(DWORD,DWORD,LPCWSTR,DWORD,LPCWSTR,DWORD);
+UINT      WINAPI CompareStringA(DWORD,DWORD,LPCSTR,DWORD,LPCSTR,DWORD);
+UINT      WINAPI CompareStringW(DWORD,DWORD,LPCWSTR,DWORD,LPCWSTR,DWORD);
 #define     CompareString WINELIB_NAME_AW(CompareString)
-BOOL32      WINAPI CreateDirectory32A(LPCSTR,LPSECURITY_ATTRIBUTES);
-BOOL32      WINAPI CreateDirectory32W(LPCWSTR,LPSECURITY_ATTRIBUTES);
+BOOL      WINAPI CreateDirectoryA(LPCSTR,LPSECURITY_ATTRIBUTES);
+BOOL      WINAPI CreateDirectoryW(LPCWSTR,LPSECURITY_ATTRIBUTES);
 #define     CreateDirectory WINELIB_NAME_AW(CreateDirectory)
-BOOL32      WINAPI CreateDirectoryEx32A(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES);
-BOOL32      WINAPI CreateDirectoryEx32W(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES);
+BOOL      WINAPI CreateDirectoryExA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES);
+BOOL      WINAPI CreateDirectoryExW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES);
 #define     CreateDirectoryEx WINELIB_NAME_AW(CreateDirectoryEx)
-#define     DefineHandleTable32(w) ((w),TRUE)
-#define     DefineHandleTable WINELIB_NAME(DefineHandleTable)
-ATOM        WINAPI DeleteAtom32(ATOM);
-#define     DeleteAtom WINELIB_NAME(DeleteAtom)
-BOOL32      WINAPI DeleteFile32A(LPCSTR);
-BOOL32      WINAPI DeleteFile32W(LPCWSTR);
+#define     DefineHandleTable(w) ((w),TRUE)
+ATOM        WINAPI DeleteAtom(ATOM);
+BOOL      WINAPI DeleteFileA(LPCSTR);
+BOOL      WINAPI DeleteFileW(LPCWSTR);
 #define     DeleteFile WINELIB_NAME_AW(DeleteFile)
-void        WINAPI FatalAppExit32A(UINT32,LPCSTR);
-void        WINAPI FatalAppExit32W(UINT32,LPCWSTR);
+void        WINAPI FatalAppExitA(UINT,LPCSTR);
+void        WINAPI FatalAppExitW(UINT,LPCWSTR);
 #define     FatalAppExit WINELIB_NAME_AW(FatalAppExit)
-ATOM        WINAPI FindAtom32A(LPCSTR);
-ATOM        WINAPI FindAtom32W(LPCWSTR);
+ATOM        WINAPI FindAtomA(LPCSTR);
+ATOM        WINAPI FindAtomW(LPCWSTR);
 #define     FindAtom WINELIB_NAME_AW(FindAtom)
-BOOL32      WINAPI FindClose32(HANDLE32);
-#define     FindClose WINELIB_NAME(FindClose)
-HANDLE16    WINAPI FindFirstFile16(LPCSTR,LPWIN32_FIND_DATA32A);
-HANDLE32    WINAPI FindFirstFile32A(LPCSTR,LPWIN32_FIND_DATA32A);
-HANDLE32    WINAPI FindFirstFile32W(LPCWSTR,LPWIN32_FIND_DATA32W);
+BOOL      WINAPI FindClose(HANDLE);
+HANDLE16    WINAPI FindFirstFile16(LPCSTR,LPWIN32_FIND_DATAA);
+HANDLE    WINAPI FindFirstFileA(LPCSTR,LPWIN32_FIND_DATAA);
+HANDLE    WINAPI FindFirstFileW(LPCWSTR,LPWIN32_FIND_DATAW);
 #define     FindFirstFile WINELIB_NAME_AW(FindFirstFile)
-BOOL16      WINAPI FindNextFile16(HANDLE16,LPWIN32_FIND_DATA32A);
-BOOL32      WINAPI FindNextFile32A(HANDLE32,LPWIN32_FIND_DATA32A);
-BOOL32      WINAPI FindNextFile32W(HANDLE32,LPWIN32_FIND_DATA32W);
+BOOL16      WINAPI FindNextFile16(HANDLE16,LPWIN32_FIND_DATAA);
+BOOL      WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
+BOOL      WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW);
 #define     FindNextFile WINELIB_NAME_AW(FindNextFile)
-HRSRC32     WINAPI FindResource32A(HMODULE32,LPCSTR,LPCSTR);
-HRSRC32     WINAPI FindResource32W(HMODULE32,LPCWSTR,LPCWSTR);
+HRSRC     WINAPI FindResourceA(HMODULE,LPCSTR,LPCSTR);
+HRSRC     WINAPI FindResourceW(HMODULE,LPCWSTR,LPCWSTR);
 #define     FindResource WINELIB_NAME_AW(FindResource)
 VOID        WINAPI FreeLibrary16(HINSTANCE16);
-BOOL32      WINAPI FreeLibrary32(HMODULE32);
-#define     FreeLibrary WINELIB_NAME(FreeLibrary)
-#define     FreeModule32(handle) FreeLibrary32(handle)
-#define     FreeProcInstance32(proc) /*nothing*/
-#define     FreeProcInstance WINELIB_NAME(FreeProcInstance)
-BOOL32      WINAPI FreeResource32(HGLOBAL32);
-#define     FreeResource WINELIB_NAME(FreeResource)
-UINT32      WINAPI GetAtomName32A(ATOM,LPSTR,INT32);
-UINT32      WINAPI GetAtomName32W(ATOM,LPWSTR,INT32);
+BOOL      WINAPI FreeLibrary(HMODULE);
+#define     FreeModule(handle) FreeLibrary(handle)
+#define     FreeProcInstance(proc) /*nothing*/
+BOOL      WINAPI FreeResource(HGLOBAL);
+UINT      WINAPI GetAtomNameA(ATOM,LPSTR,INT);
+UINT      WINAPI GetAtomNameW(ATOM,LPWSTR,INT);
 #define     GetAtomName WINELIB_NAME_AW(GetAtomName)
-UINT32      WINAPI GetCurrentDirectory32A(UINT32,LPSTR);
-UINT32      WINAPI GetCurrentDirectory32W(UINT32,LPWSTR);
+UINT      WINAPI GetCurrentDirectoryA(UINT,LPSTR);
+UINT      WINAPI GetCurrentDirectoryW(UINT,LPWSTR);
 #define     GetCurrentDirectory WINELIB_NAME_AW(GetCurrentDirectory)
-BOOL32      WINAPI GetDiskFreeSpace32A(LPCSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
-BOOL32      WINAPI GetDiskFreeSpace32W(LPCWSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
+BOOL      WINAPI GetDiskFreeSpaceA(LPCSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
+BOOL      WINAPI GetDiskFreeSpaceW(LPCWSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
 #define     GetDiskFreeSpace WINELIB_NAME_AW(GetDiskFreeSpace)
-BOOL32      WINAPI GetDiskFreeSpaceEx32A(LPCSTR,PULARGE_INTEGER,PULARGE_INTEGER,PULARGE_INTEGER);
-BOOL32      WINAPI GetDiskFreeSpaceEx32W(LPCWSTR,PULARGE_INTEGER,PULARGE_INTEGER,PULARGE_INTEGER);
+BOOL      WINAPI GetDiskFreeSpaceExA(LPCSTR,PULARGE_INTEGER,PULARGE_INTEGER,PULARGE_INTEGER);
+BOOL      WINAPI GetDiskFreeSpaceExW(LPCWSTR,PULARGE_INTEGER,PULARGE_INTEGER,PULARGE_INTEGER);
 #define     GetDiskFreeSpaceEx WINELIB_NAME_AW(GetDiskFreeSpaceEx)
-UINT32      WINAPI GetDriveType32A(LPCSTR);
-UINT32      WINAPI GetDriveType32W(LPCWSTR);
+UINT      WINAPI GetDriveTypeA(LPCSTR);
+UINT      WINAPI GetDriveTypeW(LPCWSTR);
 #define     GetDriveType WINELIB_NAME_AW(GetDriveType)
-DWORD       WINAPI GetFileAttributes32A(LPCSTR);
-DWORD       WINAPI GetFileAttributes32W(LPCWSTR);
+DWORD       WINAPI GetFileAttributesA(LPCSTR);
+DWORD       WINAPI GetFileAttributesW(LPCWSTR);
 #define     GetFileAttributes WINELIB_NAME_AW(GetFileAttributes)
-#define     GetFreeSpace32(w) (0x100000L)
-#define     GetFreeSpace WINELIB_NAME(GetFreeSpace)
-UINT32      WINAPI GetLogicalDriveStrings32A(UINT32,LPSTR);
-UINT32      WINAPI GetLogicalDriveStrings32W(UINT32,LPWSTR);
+#define     GetFreeSpace(w) (0x100000L)
+UINT      WINAPI GetLogicalDriveStringsA(UINT,LPSTR);
+UINT      WINAPI GetLogicalDriveStringsW(UINT,LPWSTR);
 #define     GetLogicalDriveStrings WINELIB_NAME_AW(GetLogicalDriveStrings)
-INT32       WINAPI GetLocaleInfo32A(LCID,LCTYPE,LPSTR,INT32);
-INT32       WINAPI GetLocaleInfo32W(LCID,LCTYPE,LPWSTR,INT32);
+INT       WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,INT);
+INT       WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,INT);
 #define     GetLocaleInfo WINELIB_NAME_AW(GetLocaleInfo)
-DWORD       WINAPI GetModuleFileName32A(HMODULE32,LPSTR,DWORD);
-DWORD       WINAPI GetModuleFileName32W(HMODULE32,LPWSTR,DWORD);
+DWORD       WINAPI GetModuleFileNameA(HMODULE,LPSTR,DWORD);
+DWORD       WINAPI GetModuleFileNameW(HMODULE,LPWSTR,DWORD);
 #define     GetModuleFileName WINELIB_NAME_AW(GetModuleFileName)
-HMODULE32   WINAPI GetModuleHandle32A(LPCSTR);
-HMODULE32   WINAPI GetModuleHandle32W(LPCWSTR);
+HMODULE   WINAPI GetModuleHandleA(LPCSTR);
+HMODULE   WINAPI GetModuleHandleW(LPCWSTR);
 #define     GetModuleHandle WINELIB_NAME_AW(GetModuleHandle)
-UINT32      WINAPI GetPrivateProfileInt32A(LPCSTR,LPCSTR,INT32,LPCSTR);
-UINT32      WINAPI GetPrivateProfileInt32W(LPCWSTR,LPCWSTR,INT32,LPCWSTR);
+UINT      WINAPI GetPrivateProfileIntA(LPCSTR,LPCSTR,INT,LPCSTR);
+UINT      WINAPI GetPrivateProfileIntW(LPCWSTR,LPCWSTR,INT,LPCWSTR);
 #define     GetPrivateProfileInt WINELIB_NAME_AW(GetPrivateProfileInt)
-INT32       WINAPI GetPrivateProfileSection32A(LPCSTR,LPSTR,DWORD,LPCSTR);
-INT32       WINAPI GetPrivateProfileSection32W(LPCWSTR,LPWSTR,DWORD,LPCWSTR);
+INT       WINAPI GetPrivateProfileSectionA(LPCSTR,LPSTR,DWORD,LPCSTR);
+INT       WINAPI GetPrivateProfileSectionW(LPCWSTR,LPWSTR,DWORD,LPCWSTR);
 #define     GetPrivateProfileSection WINELIB_NAME_AW(GetPrivateProfileSection)
-DWORD       WINAPI GetPrivateProfileSectionNames32A(LPSTR,DWORD,LPCSTR);
-DWORD       WINAPI GetPrivateProfileSectionNames32W(LPWSTR,DWORD,LPCWSTR);
+DWORD       WINAPI GetPrivateProfileSectionNamesA(LPSTR,DWORD,LPCSTR);
+DWORD       WINAPI GetPrivateProfileSectionNamesW(LPWSTR,DWORD,LPCWSTR);
 #define     GetPrivateProfileSectionNames WINELIB_NAME_AW(GetPrivateProfileSectionNames)
-INT32       WINAPI GetPrivateProfileString32A(LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT32,LPCSTR);
-INT32       WINAPI GetPrivateProfileString32W(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT32,LPCWSTR);
+INT       WINAPI GetPrivateProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT,LPCSTR);
+INT       WINAPI GetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT,LPCWSTR);
 #define     GetPrivateProfileString WINELIB_NAME_AW(GetPrivateProfileString)
-BOOL32      WINAPI GetPrivateProfileStruct32A(LPCSTR,LPCSTR,LPVOID,UINT32,LPCSTR);
-BOOL32      WINAPI GetPrivateProfileStruct32W(LPCWSTR,LPCWSTR,LPVOID,UINT32,LPCWSTR);
+BOOL      WINAPI GetPrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR);
+BOOL      WINAPI GetPrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR);
 #define     GetPrivateProfileStruct WINELIB_NAME_AW(GetPrivateProfileStruct)
-FARPROC32   WINAPI GetProcAddress32(HMODULE32,LPCSTR);
-#define     GetProcAddress WINELIB_NAME(GetProcAddress)
-UINT32      WINAPI GetProfileInt32A(LPCSTR,LPCSTR,INT32);
-UINT32      WINAPI GetProfileInt32W(LPCWSTR,LPCWSTR,INT32);
+FARPROC   WINAPI GetProcAddress(HMODULE,LPCSTR);
+UINT      WINAPI GetProfileIntA(LPCSTR,LPCSTR,INT);
+UINT      WINAPI GetProfileIntW(LPCWSTR,LPCWSTR,INT);
 #define     GetProfileInt WINELIB_NAME_AW(GetProfileInt)
-INT32       WINAPI GetProfileSection32A(LPCSTR,LPSTR,DWORD);
-INT32       WINAPI GetProfileSection32W(LPCWSTR,LPWSTR,DWORD);
+INT       WINAPI GetProfileSectionA(LPCSTR,LPSTR,DWORD);
+INT       WINAPI GetProfileSectionW(LPCWSTR,LPWSTR,DWORD);
 #define     GetProfileSection WINELIB_NAME_AW(GetProfileSection)
-INT32       WINAPI GetProfileString32A(LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT32);
-INT32       WINAPI GetProfileString32W(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT32);
+INT       WINAPI GetProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT);
+INT       WINAPI GetProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT);
 #define     GetProfileString WINELIB_NAME_AW(GetProfileString)
-BOOL32      WINAPI GetStringType32A(LCID,DWORD,LPCSTR,INT32,LPWORD);
-BOOL32      WINAPI GetStringType32W(DWORD,LPCWSTR,INT32,LPWORD);
+BOOL      WINAPI GetStringTypeA(LCID,DWORD,LPCSTR,INT,LPWORD);
+BOOL      WINAPI GetStringTypeW(DWORD,LPCWSTR,INT,LPWORD);
 #define     GetStringType WINELIB_NAME_AW(GetStringType)
-UINT32      WINAPI GetSystemDirectory32A(LPSTR,UINT32);
-UINT32      WINAPI GetSystemDirectory32W(LPWSTR,UINT32);
+UINT      WINAPI GetSystemDirectoryA(LPSTR,UINT);
+UINT      WINAPI GetSystemDirectoryW(LPWSTR,UINT);
 #define     GetSystemDirectory WINELIB_NAME_AW(GetSystemDirectory)
-UINT32      WINAPI GetTempFileName32A(LPCSTR,LPCSTR,UINT32,LPSTR);
-UINT32      WINAPI GetTempFileName32W(LPCWSTR,LPCWSTR,UINT32,LPWSTR);
+UINT      WINAPI GetTempFileNameA(LPCSTR,LPCSTR,UINT,LPSTR);
+UINT      WINAPI GetTempFileNameW(LPCWSTR,LPCWSTR,UINT,LPWSTR);
 #define     GetTempFileName WINELIB_NAME_AW(GetTempFileName)
-UINT32      WINAPI GetTempPath32A(UINT32,LPSTR);
-UINT32      WINAPI GetTempPath32W(UINT32,LPWSTR);
+UINT      WINAPI GetTempPathA(UINT,LPSTR);
+UINT      WINAPI GetTempPathW(UINT,LPWSTR);
 #define     GetTempPath WINELIB_NAME_AW(GetTempPath)
-LONG        WINAPI GetVersion32(void);
-#define     GetVersion WINELIB_NAME(GetVersion)
-BOOL32      WINAPI GetExitCodeProcess(HANDLE32,LPDWORD);
-BOOL32      WINAPI GetVolumeInformation32A(LPCSTR,LPSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD);
-BOOL32      WINAPI GetVolumeInformation32W(LPCWSTR,LPWSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD);
+LONG        WINAPI GetVersion(void);
+BOOL      WINAPI GetExitCodeProcess(HANDLE,LPDWORD);
+BOOL      WINAPI GetVolumeInformationA(LPCSTR,LPSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD);
+BOOL      WINAPI GetVolumeInformationW(LPCWSTR,LPWSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD);
 #define     GetVolumeInformation WINELIB_NAME_AW(GetVolumeInformation)
-UINT32      WINAPI GetWindowsDirectory32A(LPSTR,UINT32);
-UINT32      WINAPI GetWindowsDirectory32W(LPWSTR,UINT32);
+UINT      WINAPI GetWindowsDirectoryA(LPSTR,UINT);
+UINT      WINAPI GetWindowsDirectoryW(LPWSTR,UINT);
 #define     GetWindowsDirectory WINELIB_NAME_AW(GetWindowsDirectory)
 HGLOBAL16   WINAPI GlobalAlloc16(UINT16,DWORD);
-HGLOBAL32   WINAPI GlobalAlloc32(UINT32,DWORD);
-#define     GlobalAlloc WINELIB_NAME(GlobalAlloc)
-DWORD       WINAPI GlobalCompact32(DWORD);
-#define     GlobalCompact WINELIB_NAME(GlobalCompact)
-UINT32      WINAPI GlobalFlags32(HGLOBAL32);
-#define     GlobalFlags WINELIB_NAME(GlobalFlags)
+HGLOBAL   WINAPI GlobalAlloc(UINT,DWORD);
+DWORD       WINAPI GlobalCompact(DWORD);
+UINT      WINAPI GlobalFlags(HGLOBAL);
 HGLOBAL16   WINAPI GlobalFree16(HGLOBAL16);
-HGLOBAL32   WINAPI GlobalFree32(HGLOBAL32);
-#define     GlobalFree WINELIB_NAME(GlobalFree)
-HGLOBAL32   WINAPI GlobalHandle32(LPCVOID);
-#define     GlobalHandle WINELIB_NAME(GlobalHandle)
+HGLOBAL   WINAPI GlobalFree(HGLOBAL);
+HGLOBAL   WINAPI GlobalHandle(LPCVOID);
 WORD        WINAPI GlobalFix16(HGLOBAL16);
-VOID        WINAPI GlobalFix32(HGLOBAL32);
-#define     GlobalFix WINELIB_NAME(GlobalFix)
+VOID        WINAPI GlobalFix(HGLOBAL);
 LPVOID      WINAPI GlobalLock16(HGLOBAL16);
-LPVOID      WINAPI GlobalLock32(HGLOBAL32);
-#define     GlobalLock WINELIB_NAME(GlobalLock)
-HGLOBAL32   WINAPI GlobalReAlloc32(HGLOBAL32,DWORD,UINT32);
-#define     GlobalReAlloc WINELIB_NAME(GlobalReAlloc)
+LPVOID      WINAPI GlobalLock(HGLOBAL);
+HGLOBAL   WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT);
 DWORD       WINAPI GlobalSize16(HGLOBAL16);
-DWORD       WINAPI GlobalSize32(HGLOBAL32);
-#define     GlobalSize WINELIB_NAME(GlobalSize)
+DWORD       WINAPI GlobalSize(HGLOBAL);
 VOID        WINAPI GlobalUnfix16(HGLOBAL16);
-VOID        WINAPI GlobalUnfix32(HGLOBAL32);
-#define     GlobalUnfix WINELIB_NAME(GlobalUnfix)
+VOID        WINAPI GlobalUnfix(HGLOBAL);
 BOOL16      WINAPI GlobalUnlock16(HGLOBAL16);
-BOOL32      WINAPI GlobalUnlock32(HGLOBAL32);
-#define     GlobalUnlock WINELIB_NAME(GlobalUnlock)
+BOOL      WINAPI GlobalUnlock(HGLOBAL);
 BOOL16      WINAPI GlobalUnWire16(HGLOBAL16);
-BOOL32      WINAPI GlobalUnWire32(HGLOBAL32);
-#define     GlobalUnWire WINELIB_NAME(GlobalUnWire)
+BOOL      WINAPI GlobalUnWire(HGLOBAL);
 SEGPTR      WINAPI GlobalWire16(HGLOBAL16);
-LPVOID      WINAPI GlobalWire32(HGLOBAL32);
-#define     GlobalWire WINELIB_NAME(GlobalWire)
-BOOL32      WINAPI InitAtomTable32(DWORD);
-#define     InitAtomTable WINELIB_NAME(InitAtomTable)
-BOOL32      WINAPI IsBadCodePtr32(FARPROC32);
-#define     IsBadCodePtr WINELIB_NAME(IsBadCodePtr)
-BOOL32      WINAPI IsBadHugeReadPtr32(LPCVOID,UINT32);
-#define     IsBadHugeReadPtr WINELIB_NAME(IsBadHugeReadPtr)
-BOOL32      WINAPI IsBadHugeWritePtr32(LPVOID,UINT32);
-#define     IsBadHugeWritePtr WINELIB_NAME(IsBadHugeWritePtr)
-BOOL32      WINAPI IsBadReadPtr32(LPCVOID,UINT32);
-#define     IsBadReadPtr WINELIB_NAME(IsBadReadPtr)
-BOOL32      WINAPI IsBadStringPtr32A(LPCSTR,UINT32);
-BOOL32      WINAPI IsBadStringPtr32W(LPCWSTR,UINT32);
+LPVOID      WINAPI GlobalWire(HGLOBAL);
+BOOL      WINAPI InitAtomTable(DWORD);
+BOOL      WINAPI IsBadCodePtr(FARPROC);
+BOOL      WINAPI IsBadHugeReadPtr(LPCVOID,UINT);
+BOOL      WINAPI IsBadHugeWritePtr(LPVOID,UINT);
+BOOL      WINAPI IsBadReadPtr(LPCVOID,UINT);
+BOOL      WINAPI IsBadStringPtrA(LPCSTR,UINT);
+BOOL      WINAPI IsBadStringPtrW(LPCWSTR,UINT);
 #define     IsBadStringPtr WINELIB_NAME_AW(IsBadStringPtr)
-BOOL32      WINAPI IsBadWritePtr32(LPVOID,UINT32);
-#define     IsBadWritePtr WINELIB_NAME(IsBadWritePtr)
-BOOL32      WINAPI IsDBCSLeadByte32(BYTE);
-#define     IsDBCSLeadByte WINELIB_NAME(IsDBCSLeadByte)
+BOOL      WINAPI IsBadWritePtr(LPVOID,UINT);
+BOOL      WINAPI IsDBCSLeadByte(BYTE);
 HINSTANCE16 WINAPI LoadLibrary16(LPCSTR);
-HMODULE32   WINAPI LoadLibrary32A(LPCSTR);
-HMODULE32   WINAPI LoadLibrary32W(LPCWSTR);
+HMODULE   WINAPI LoadLibraryA(LPCSTR);
+HMODULE   WINAPI LoadLibraryW(LPCWSTR);
 #define     LoadLibrary WINELIB_NAME_AW(LoadLibrary)
-HMODULE32   WINAPI LoadLibraryEx32A(LPCSTR,HFILE32,DWORD);
-HMODULE32   WINAPI LoadLibraryEx32W(LPCWSTR,HFILE32,DWORD);
+HMODULE   WINAPI LoadLibraryExA(LPCSTR,HFILE,DWORD);
+HMODULE   WINAPI LoadLibraryExW(LPCWSTR,HFILE,DWORD);
 #define     LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx)
 HINSTANCE16 WINAPI LoadModule16(LPCSTR,LPVOID);
-HINSTANCE32 WINAPI LoadModule32(LPCSTR,LPVOID);
-#define     LoadModule WINELIB_NAME(LoadModule)
-HGLOBAL32   WINAPI LoadResource32(HMODULE32,HRSRC32);
-#define     LoadResource WINELIB_NAME(LoadResource)
-HLOCAL32    WINAPI LocalAlloc32(UINT32,DWORD);
-#define     LocalAlloc WINELIB_NAME(LocalAlloc)
-UINT32      WINAPI LocalCompact32(UINT32);
-#define     LocalCompact WINELIB_NAME(LocalCompact)
-UINT32      WINAPI LocalFlags32(HLOCAL32);
-#define     LocalFlags WINELIB_NAME(LocalFlags)
-HLOCAL32    WINAPI LocalFree32(HLOCAL32);
-#define     LocalFree WINELIB_NAME(LocalFree)
-HLOCAL32    WINAPI LocalHandle32(LPCVOID);
-#define     LocalHandle WINELIB_NAME(LocalHandle)
-LPVOID      WINAPI LocalLock32(HLOCAL32);
-#define     LocalLock WINELIB_NAME(LocalLock)
-HLOCAL32    WINAPI LocalReAlloc32(HLOCAL32,DWORD,UINT32);
-#define     LocalReAlloc WINELIB_NAME(LocalReAlloc)
-UINT32      WINAPI LocalShrink32(HGLOBAL32,UINT32);
-#define     LocalShrink WINELIB_NAME(LocalShrink)
-UINT32      WINAPI LocalSize32(HLOCAL32);
-#define     LocalSize WINELIB_NAME(LocalSize)
-BOOL32      WINAPI LocalUnlock32(HLOCAL32);
-#define     LocalUnlock WINELIB_NAME(LocalUnlock)
-LPVOID      WINAPI LockResource32(HGLOBAL32);
-#define     LockResource WINELIB_NAME(LockResource)
-#define     LockSegment32(handle) GlobalFix32((HANDLE32)(handle))
-#define     LockSegment WINELIB_NAME(LockSegment)
-#define     MakeProcInstance32(proc,inst) (proc)
-#define     MakeProcInstance WINELIB_NAME(MakeProcInstance)
+HINSTANCE WINAPI LoadModule(LPCSTR,LPVOID);
+HGLOBAL   WINAPI LoadResource(HMODULE,HRSRC);
+HLOCAL    WINAPI LocalAlloc(UINT,DWORD);
+UINT      WINAPI LocalCompact(UINT);
+UINT      WINAPI LocalFlags(HLOCAL);
+HLOCAL    WINAPI LocalFree(HLOCAL);
+HLOCAL    WINAPI LocalHandle(LPCVOID);
+LPVOID      WINAPI LocalLock(HLOCAL);
+HLOCAL    WINAPI LocalReAlloc(HLOCAL,DWORD,UINT);
+UINT      WINAPI LocalShrink(HGLOBAL,UINT);
+UINT      WINAPI LocalSize(HLOCAL);
+BOOL      WINAPI LocalUnlock(HLOCAL);
+LPVOID      WINAPI LockResource(HGLOBAL);
+#define     LockSegment(handle) GlobalFix((HANDLE)(handle))
+#define     MakeProcInstance(proc,inst) (proc)
 HFILE16     WINAPI OpenFile16(LPCSTR,OFSTRUCT*,UINT16);
-HFILE32     WINAPI OpenFile32(LPCSTR,OFSTRUCT*,UINT32);
-#define     OpenFile WINELIB_NAME(OpenFile)
-VOID        WINAPI OutputDebugString32A(LPCSTR);
-VOID        WINAPI OutputDebugString32W(LPCWSTR);
+HFILE     WINAPI OpenFile(LPCSTR,OFSTRUCT*,UINT);
+VOID        WINAPI OutputDebugStringA(LPCSTR);
+VOID        WINAPI OutputDebugStringW(LPCWSTR);
 #define     OutputDebugString WINELIB_NAME_AW(OutputDebugString)
-BOOL32      WINAPI RemoveDirectory32A(LPCSTR);
-BOOL32      WINAPI RemoveDirectory32W(LPCWSTR);
+BOOL      WINAPI RemoveDirectoryA(LPCSTR);
+BOOL      WINAPI RemoveDirectoryW(LPCWSTR);
 #define     RemoveDirectory WINELIB_NAME_AW(RemoveDirectory)
-BOOL32      WINAPI SetCurrentDirectory32A(LPCSTR);
-BOOL32      WINAPI SetCurrentDirectory32W(LPCWSTR);
+BOOL      WINAPI SetCurrentDirectoryA(LPCSTR);
+BOOL      WINAPI SetCurrentDirectoryW(LPCWSTR);
 #define     SetCurrentDirectory WINELIB_NAME_AW(SetCurrentDirectory)
-UINT32      WINAPI SetErrorMode32(UINT32);
-#define     SetErrorMode WINELIB_NAME(SetErrorMode)
-BOOL32      WINAPI SetFileAttributes32A(LPCSTR,DWORD);
-BOOL32      WINAPI SetFileAttributes32W(LPCWSTR,DWORD);
+UINT      WINAPI SetErrorMode(UINT);
+BOOL      WINAPI SetFileAttributesA(LPCSTR,DWORD);
+BOOL      WINAPI SetFileAttributesW(LPCWSTR,DWORD);
 #define     SetFileAttributes WINELIB_NAME_AW(SetFileAttributes)
-UINT32      WINAPI SetHandleCount32(UINT32);
-#define     SetHandleCount WINELIB_NAME(SetHandleCount)
-#define     SetSwapAreaSize32(w) (w)
-#define     SetSwapAreaSize WINELIB_NAME(SetSwapAreaSize)
-DWORD       WINAPI SizeofResource32(HMODULE32,HRSRC32);
-#define     SizeofResource WINELIB_NAME(SizeofResource)
-#define     UnlockSegment32(handle) GlobalUnfix((HANDLE32)(handle))
-#define     UnlockSegment WINELIB_NAME(UnlockSegment)
-DWORD       WINAPI VerLanguageName32A(UINT32,LPSTR,UINT32);
-DWORD       WINAPI VerLanguageName32W(UINT32,LPWSTR,UINT32);
+UINT      WINAPI SetHandleCount(UINT);
+#define     SetSwapAreaSize(w) (w)
+DWORD       WINAPI SizeofResource(HMODULE,HRSRC);
+#define     UnlockSegment(handle) GlobalUnfix((HANDLE)(handle))
+DWORD       WINAPI VerLanguageNameA(UINT,LPSTR,UINT);
+DWORD       WINAPI VerLanguageNameW(UINT,LPWSTR,UINT);
 #define     VerLanguageName WINELIB_NAME_AW(VerLanguageName)
-BOOL32      WINAPI WritePrivateProfileSection32A(LPCSTR,LPCSTR,LPCSTR);
-BOOL32      WINAPI WritePrivateProfileSection32W(LPCWSTR,LPCWSTR,LPCWSTR);
+BOOL      WINAPI WritePrivateProfileSectionA(LPCSTR,LPCSTR,LPCSTR);
+BOOL      WINAPI WritePrivateProfileSectionW(LPCWSTR,LPCWSTR,LPCWSTR);
 #define     WritePrivateProfileSection WINELIB_NAME_AW(WritePrivateProfileSection)
-BOOL32      WINAPI WritePrivateProfileString32A(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
-BOOL32      WINAPI WritePrivateProfileString32W(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
-BOOL32	     WINAPI WriteProfileSection32A(LPCSTR,LPCSTR);
-BOOL32	     WINAPI WriteProfileSection32W(LPCWSTR,LPCWSTR);
+BOOL      WINAPI WritePrivateProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
+BOOL      WINAPI WritePrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
+BOOL	     WINAPI WriteProfileSectionA(LPCSTR,LPCSTR);
+BOOL	     WINAPI WriteProfileSectionW(LPCWSTR,LPCWSTR);
 #define     WritePrivateProfileString WINELIB_NAME_AW(WritePrivateProfileString)
-BOOL32      WINAPI WritePrivateProfileStruct32A(LPCSTR,LPCSTR,LPVOID,UINT32,LPCSTR);
-BOOL32      WINAPI WritePrivateProfileStruct32W(LPCWSTR,LPCWSTR,LPVOID,UINT32,LPCWSTR);
+BOOL      WINAPI WritePrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR);
+BOOL      WINAPI WritePrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR);
 #define     WritePrivateProfileStruct WINELIB_NAME_AW(WritePrivateProfileStruct)
-BOOL32      WINAPI WriteProfileString32A(LPCSTR,LPCSTR,LPCSTR);
-BOOL32      WINAPI WriteProfileString32W(LPCWSTR,LPCWSTR,LPCWSTR);
+BOOL      WINAPI WriteProfileStringA(LPCSTR,LPCSTR,LPCSTR);
+BOOL      WINAPI WriteProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR);
 #define     WriteProfileString WINELIB_NAME_AW(WriteProfileString)
 #define     Yield32()
-#define     Yield WINELIB_NAME(Yield)
-LPSTR       WINAPI lstrcat32A(LPSTR,LPCSTR);
-LPWSTR      WINAPI lstrcat32W(LPWSTR,LPCWSTR);
+LPSTR       WINAPI lstrcatA(LPSTR,LPCSTR);
+LPWSTR      WINAPI lstrcatW(LPWSTR,LPCWSTR);
 #define     lstrcat WINELIB_NAME_AW(lstrcat)
-LPSTR       WINAPI lstrcatn32A(LPSTR,LPCSTR,INT32);
-LPWSTR      WINAPI lstrcatn32W(LPWSTR,LPCWSTR,INT32);
+LPSTR       WINAPI lstrcatnA(LPSTR,LPCSTR,INT);
+LPWSTR      WINAPI lstrcatnW(LPWSTR,LPCWSTR,INT);
 #define     lstrcatn WINELIB_NAME_AW(lstrcatn)
-LPSTR       WINAPI lstrcpy32A(LPSTR,LPCSTR);
-LPWSTR      WINAPI lstrcpy32W(LPWSTR,LPCWSTR);
+LPSTR       WINAPI lstrcpyA(LPSTR,LPCSTR);
+LPWSTR      WINAPI lstrcpyW(LPWSTR,LPCWSTR);
 #define     lstrcpy WINELIB_NAME_AW(lstrcpy)
-LPSTR       WINAPI lstrcpyn32A(LPSTR,LPCSTR,INT32);
-LPWSTR      WINAPI lstrcpyn32W(LPWSTR,LPCWSTR,INT32);
+LPSTR       WINAPI lstrcpynA(LPSTR,LPCSTR,INT);
+LPWSTR      WINAPI lstrcpynW(LPWSTR,LPCWSTR,INT);
 #define     lstrcpyn WINELIB_NAME_AW(lstrcpyn)
-INT32       WINAPI lstrlen32A(LPCSTR);
-INT32       WINAPI lstrlen32W(LPCWSTR);
+INT       WINAPI lstrlenA(LPCSTR);
+INT       WINAPI lstrlenW(LPCWSTR);
 #define     lstrlen WINELIB_NAME_AW(lstrlen)
-HINSTANCE32 WINAPI WinExec32(LPCSTR,UINT32);
-#define     WinExec WINELIB_NAME(WinExec)
-LONG        WINAPI _hread32(HFILE32,LPVOID,LONG);
-#define     _hread WINELIB_NAME(_hread)
-LONG        WINAPI _hwrite32(HFILE32,LPCSTR,LONG);
-#define     _hwrite WINELIB_NAME(_hwrite)
-HFILE32     WINAPI _lcreat32(LPCSTR,INT32);
-#define     _lcreat WINELIB_NAME(_lcreat)
-HFILE32     WINAPI _lclose32(HFILE32);
-#define     _lclose WINELIB_NAME(_lclose)
-LONG        WINAPI _llseek32(HFILE32,LONG,INT32);
-#define     _llseek WINELIB_NAME(_llseek)
-HFILE32     WINAPI _lopen32(LPCSTR,INT32);
-#define     _lopen WINELIB_NAME(_lopen)
-UINT32      WINAPI _lread32(HFILE32,LPVOID,UINT32);
-#define     _lread WINELIB_NAME(_lread)
-UINT32      WINAPI _lwrite32(HFILE32,LPCSTR,UINT32);
-#define     _lwrite WINELIB_NAME(_lwrite)
+HINSTANCE WINAPI WinExec(LPCSTR,UINT);
+LONG        WINAPI _hread(HFILE,LPVOID,LONG);
+LONG        WINAPI _hwrite(HFILE,LPCSTR,LONG);
+HFILE     WINAPI _lcreat(LPCSTR,INT);
+HFILE     WINAPI _lclose(HFILE);
+LONG        WINAPI _llseek(HFILE,LONG,INT);
+HFILE     WINAPI _lopen(LPCSTR,INT);
+UINT      WINAPI _lread(HFILE,LPVOID,UINT);
+UINT      WINAPI _lwrite(HFILE,LPCSTR,UINT);
 SEGPTR      WINAPI WIN16_GlobalLock16(HGLOBAL16);
-INT32       WINAPI lstrcmp32A(LPCSTR,LPCSTR);
-INT32       WINAPI lstrcmp32W(LPCWSTR,LPCWSTR);
+INT       WINAPI lstrcmpA(LPCSTR,LPCSTR);
+INT       WINAPI lstrcmpW(LPCWSTR,LPCWSTR);
 #define     lstrcmp WINELIB_NAME_AW(lstrcmp)
-INT32       WINAPI lstrcmpi32A(LPCSTR,LPCSTR);
-INT32       WINAPI lstrcmpi32W(LPCWSTR,LPCWSTR);
+INT       WINAPI lstrcmpiA(LPCSTR,LPCSTR);
+INT       WINAPI lstrcmpiW(LPCWSTR,LPCWSTR);
 #define     lstrcmpi WINELIB_NAME_AW(lstrcmpi)
 
 
diff --git a/include/wincon.h b/include/wincon.h
index a32a71a6562..fd73cda224e 100644
--- a/include/wincon.h
+++ b/include/wincon.h
@@ -20,7 +20,7 @@
 #define ENABLE_WRAP_AT_EOL_OUTPUT 0x02
 
 
-typedef BOOL32 HANDLER_ROUTINE(WORD);
+typedef BOOL HANDLER_ROUTINE(WORD);
 
 /* Attributes flags: */
 
@@ -35,7 +35,7 @@ typedef BOOL32 HANDLER_ROUTINE(WORD);
 
 typedef struct _CONSOLE_CURSOR_INFO {
     DWORD	dwSize;   /* Between 1 & 100 for percentage of cell filled */
-    BOOL32	bVisible; /* Visibility of cursor */
+    BOOL	bVisible; /* Visibility of cursor */
 } CONSOLE_CURSOR_INFO, *LPCONSOLE_CURSOR_INFO;
 
 /*
@@ -75,7 +75,7 @@ typedef struct tagCHAR_INFO
 
 typedef struct tagKEY_EVENT_RECORD
 {
-    BOOL32	bKeyDown;		/* 04 */
+    BOOL	bKeyDown;		/* 04 */
     WORD	wRepeatCount;		/* 08 */
     WORD	wVirtualKeyCode;	/* 0A */
     WORD	wVirtualScanCode;	/* 0C */
@@ -113,12 +113,12 @@ typedef struct tagWINDOW_BUFFER_SIZE_RECORD
 
 typedef struct tagMENU_EVENT_RECORD
 {
-    UINT32	dwCommandId; /* perhaps UINT16 ??? */
+    UINT	dwCommandId; /* perhaps UINT16 ??? */
 } MENU_EVENT_RECORD,*LPMENU_EVENT_RECORD;
 
 typedef struct tagFOCUS_EVENT_RECORD
 {
-    BOOL32      bSetFocus; /* perhaps BOOL16 ??? */
+    BOOL      bSetFocus; /* perhaps BOOL16 ??? */
 } FOCUS_EVENT_RECORD,*LPFOCUS_EVENT_RECORD;
 
 typedef struct tagINPUT_RECORD
@@ -141,36 +141,36 @@ typedef struct tagINPUT_RECORD
 #define MENU_EVENT			0x08
 #define FOCUS_EVENT 			0x10
 
-BOOL32 WINAPI WriteConsoleOutput32A( HANDLE32 hConsoleOutput, LPCHAR_INFO lpBuffer, COORD dwBufferSize, COORD dwBufferCoord, LPSMALL_RECT lpWriteRegion);
-BOOL32 WINAPI WriteConsoleOutput32W( HANDLE32 hConsoleOutput, LPCHAR_INFO lpBuffer, COORD dwBufferSize, COORD dwBufferCoord, LPSMALL_RECT lpWriteRegion);
+BOOL WINAPI WriteConsoleOutputA( HANDLE hConsoleOutput, LPCHAR_INFO lpBuffer, COORD dwBufferSize, COORD dwBufferCoord, LPSMALL_RECT lpWriteRegion);
+BOOL WINAPI WriteConsoleOutputW( HANDLE hConsoleOutput, LPCHAR_INFO lpBuffer, COORD dwBufferSize, COORD dwBufferCoord, LPSMALL_RECT lpWriteRegion);
 #define WriteConsoleOutput WINELIB_NAME_AW(WriteConsoleOutput)
-BOOL32 WINAPI WriteConsoleInput32A( HANDLE32 handle, INPUT_RECORD *buffer,
+BOOL WINAPI WriteConsoleInputA( HANDLE handle, INPUT_RECORD *buffer,
                                     DWORD count, LPDWORD written );
-BOOL32 WINAPI WriteConsoleInput32W( HANDLE32 handle, INPUT_RECORD *buffer,
+BOOL WINAPI WriteConsoleInputW( HANDLE handle, INPUT_RECORD *buffer,
                                     DWORD count, LPDWORD written );
 #define WriteConsoleInput WINELIB_NAME_AW(WriteConsoleInput)
-BOOL32 WINAPI PeekConsoleInput32A( HANDLE32 handle, LPINPUT_RECORD buffer,
+BOOL WINAPI PeekConsoleInputA( HANDLE handle, LPINPUT_RECORD buffer,
                                    DWORD count, LPDWORD read );
-BOOL32 WINAPI PeekConsoleInput32W( HANDLE32 handle, LPINPUT_RECORD buffer,
+BOOL WINAPI PeekConsoleInputW( HANDLE handle, LPINPUT_RECORD buffer,
                                    DWORD count, LPDWORD read );
 #define PeekConsoleInput WINELIB_NAME_AW(PeekConsoleInput)
-BOOL32 WINAPI ReadConsole32A(	HANDLE32 hConsoleInput, LPVOID lpBuffer,
+BOOL WINAPI ReadConsoleA(	HANDLE hConsoleInput, LPVOID lpBuffer,
 				DWORD nNumberOfCharsToRead,
 	  			LPDWORD lpNumberOfCharsRead, LPVOID lpReserved);
-BOOL32 WINAPI ReadConsole32W(	HANDLE32 hConsoleInput, LPVOID lpBuffer,
+BOOL WINAPI ReadConsoleW(	HANDLE hConsoleInput, LPVOID lpBuffer,
 				DWORD nNumberOfCharsToRead,
 	  			LPDWORD lpNumberOfCharsRead, LPVOID lpReserved);
 #define ReadConsole WINELIB_NAME_AW(ReadConsole)
-BOOL32 WINAPI ReadConsoleInput32A(HANDLE32 hConsoleInput,
+BOOL WINAPI ReadConsoleInputA(HANDLE hConsoleInput,
 				  LPINPUT_RECORD lpBuffer, DWORD nLength,
 				  LPDWORD lpNumberOfEventsRead);
-BOOL32 WINAPI ReadConsoleInput32W(HANDLE32 hConsoleInput,
+BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput,
 				  LPINPUT_RECORD lpBuffer, DWORD nLength,
 				  LPDWORD lpNumberOfEventsRead);
 #define ReadConsoleInput WINELIB_NAME_AW(ReadConsoleInput)
 
 #ifdef __WINE__
-extern HANDLE32 CONSOLE_OpenHandle( BOOL32 output, DWORD access, LPSECURITY_ATTRIBUTES sa );
+extern HANDLE CONSOLE_OpenHandle( BOOL output, DWORD access, LPSECURITY_ATTRIBUTES sa );
 #endif
 
 #endif  /* __WINE_WINCON_H */
diff --git a/include/wincrypt.h b/include/wincrypt.h
index c1e5f757881..16b47c65c06 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -11,7 +11,7 @@ typedef unsigned long HCRYPTHASH;
 
 /* function declarations */
 
-BOOL32 WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer,
+BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer,
 				   LPCSTR pszProvider, DWORD dwProvType, 
 				   DWORD dwFlags);
 #endif
diff --git a/include/windef.h b/include/windef.h
index a1bbf3b7284..b9372ea8bf1 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -23,8 +23,7 @@
 #define MAX_PATH 260
 
 #define HFILE_ERROR16   ((HFILE16)-1)
-#define HFILE_ERROR32   ((HFILE32)-1)
-#define HFILE_ERROR     WINELIB_NAME(HFILE_ERROR)
+#define HFILE_ERROR   ((HFILE)-1)
 
 #pragma pack(4)
 
diff --git a/include/windows.h b/include/windows.h
index 813e6bb6c67..97e3dc0c89f 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -29,9 +29,8 @@ typedef KANJISTRUCT *NPKANJISTRUCT;
 typedef KANJISTRUCT *PKANJISTRUCT;
 
 BOOL16      WINAPI CheckMenuRadioButton16(HMENU16,UINT16,UINT16,UINT16,BOOL16);
-BOOL32      WINAPI CheckMenuRadioButton32(HMENU32,UINT32,UINT32,UINT32,BOOL32);
-#define     CheckMenuRadioButton WINELIB_NAME(CheckMenuRadioButton)
-WORD        WINAPI WOWHandle16(HANDLE32,WOW_HANDLE_TYPE);
+BOOL      WINAPI CheckMenuRadioButton(HMENU,UINT,UINT,UINT,BOOL);
+WORD        WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE);
 BOOL16      WINAPI GetPrivateProfileStruct16(LPCSTR,LPCSTR,LPVOID,UINT16,LPCSTR);
 INT16       WINAPI GetPrivateProfileSection16(LPCSTR,LPSTR,UINT16,LPCSTR);
 
diff --git a/include/windowsx.h b/include/windowsx.h
index cde7c6b1348..7e28af68ebe 100644
--- a/include/windowsx.h
+++ b/include/windowsx.h
@@ -268,7 +268,7 @@ extern "C" {
 #define _nmsize     _msize
 #define _nrealloc   realloc
 #define _nstrdup    _strdup
-#define hmemcpy     MoveMemory
+#define hmemcpy16     MoveMemory
 
 #ifdef __cplusplus
 }
diff --git a/include/wine/obj_base.h b/include/wine/obj_base.h
index d43d8611346..e75a370d54e 100644
--- a/include/wine/obj_base.h
+++ b/include/wine/obj_base.h
@@ -35,21 +35,18 @@
  * GUID API
  */
 HRESULT WINAPI StringFromCLSID16(REFCLSID id, LPOLESTR16*);
-HRESULT WINAPI StringFromCLSID32(REFCLSID id, LPOLESTR32*);
-#define StringFromCLSID WINELIB_NAME(StringFromCLSID)
+HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*);
 
 HRESULT WINAPI CLSIDFromString16(LPCOLESTR16, CLSID *);
-HRESULT WINAPI CLSIDFromString32(LPCOLESTR32, CLSID *);
-#define CLSIDFromString WINELIB_NAME(CLSIDFromString)
+HRESULT WINAPI CLSIDFromString(LPCOLESTR, CLSID *);
 
 HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid);
-HRESULT WINAPI CLSIDFromProgID32(LPCOLESTR32 progid, LPCLSID riid);
-#define CLSIDFromProgID WINELIB_NAME(CLSIDFromProgID)
+HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid);
 
-INT32 WINAPI StringFromGUID2(REFGUID id, LPOLESTR32 str, INT32 cmax);
+INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
 
 BOOL16 WINAPI IsEqualGUID16(GUID* g1,GUID* g2);
-BOOL32 WINAPI IsEqualGUID32(REFGUID rguid1,REFGUID rguid2);
+BOOL WINAPI IsEqualGUID32(REFGUID rguid1,REFGUID rguid2);
 /*#define IsEqualGUID WINELIB_NAME(IsEqualGUID)*/
 #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
 #define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
@@ -668,9 +665,7 @@ typedef struct IClassFactory IClassFactory, *LPCLASSFACTORY;
 
 DEFINE_OLEGUID(IID_IMalloc,		0x00000002L, 0, 0);
 typedef struct IMalloc16 IMalloc16,*LPMALLOC16;
-typedef struct IMalloc32 IMalloc32,*LPMALLOC32;
-DECL_WINELIB_TYPE(IMalloc)
-DECL_WINELIB_TYPE(LPMALLOC)
+typedef struct IMalloc IMalloc,*LPMALLOC;
 
 DEFINE_OLEGUID(IID_IUnknown,		0x00000000L, 0, 0);
 typedef struct IUnknown IUnknown, *LPUNKNOWN;
@@ -719,7 +714,7 @@ struct IUnknown {
 #define ICOM_INTERFACE IClassFactory
 #define IClassFactory_METHODS \
     ICOM_METHOD3(HRESULT,CreateInstance, LPUNKNOWN,pUnkOuter, REFIID,riid, LPVOID*,ppvObject) \
-    ICOM_METHOD1(HRESULT,LockServer,     BOOL32,fLock)
+    ICOM_METHOD1(HRESULT,LockServer,     BOOL,fLock)
 #define IClassFactory_IMETHODS \
     IUnknown_IMETHODS \
     IClassFactory_METHODS
@@ -769,32 +764,32 @@ ICOM_DEFINE(IMalloc16,IUnknown)
 #endif
 
 
-#define ICOM_INTERFACE IMalloc32
-#define IMalloc32_METHODS \
+#define ICOM_INTERFACE IMalloc
+#define IMalloc_METHODS \
     ICOM_METHOD1 (LPVOID,Alloc,       DWORD,cb) \
     ICOM_METHOD2 (LPVOID,Realloc,     LPVOID,pv, DWORD,cb) \
     ICOM_VMETHOD1(       Free,        LPVOID,pv) \
     ICOM_CMETHOD1(DWORD, GetSize,     LPVOID,pv) \
-    ICOM_CMETHOD1(INT32, DidAlloc,    LPVOID,pv) \
+    ICOM_CMETHOD1(INT, DidAlloc,    LPVOID,pv) \
     ICOM_METHOD  (LPVOID,HeapMinimize)
-#define IMalloc32_IMETHODS \
+#define IMalloc_IMETHODS \
     IUnknown_IMETHODS \
-    IMalloc32_METHODS
-ICOM_DEFINE(IMalloc32,IUnknown)
+    IMalloc_METHODS
+ICOM_DEFINE(IMalloc,IUnknown)
 #undef ICOM_INTERFACE
 
 #ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
-#define IMalloc32_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
-#define IMalloc32_AddRef(p)             ICOM_CALL (AddRef,p)
-#define IMalloc32_Release(p)            ICOM_CALL (Release,p)
+#define IMalloc_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
+#define IMalloc_AddRef(p)             ICOM_CALL (AddRef,p)
+#define IMalloc_Release(p)            ICOM_CALL (Release,p)
 /*** IMalloc32 methods ***/
-#define IMalloc32_Alloc(p,a)      ICOM_CALL1(Alloc,p,a)
-#define IMalloc32_Realloc(p,a,b)  ICOM_CALL2(Realloc,p,a,b)
-#define IMalloc32_Free(p,a)       ICOM_CALL1(Free,p,a)
-#define IMalloc32_GetSize(p,a)    ICOM_CALL1(GetSize,p,a)
-#define IMalloc32_DidAlloc(p,a)   ICOM_CALL1(DidAlloc,p,a)
-#define IMalloc32_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
+#define IMalloc_Alloc(p,a)      ICOM_CALL1(Alloc,p,a)
+#define IMalloc_Realloc(p,a,b)  ICOM_CALL2(Realloc,p,a,b)
+#define IMalloc_Free(p,a)       ICOM_CALL1(Free,p,a)
+#define IMalloc_GetSize(p,a)    ICOM_CALL1(GetSize,p,a)
+#define IMalloc_DidAlloc(p,a)   ICOM_CALL1(DidAlloc,p,a)
+#define IMalloc_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
 
 #ifndef __WINE__
 /* Duplicated for WINELIB */
@@ -814,11 +809,9 @@ ICOM_DEFINE(IMalloc32,IUnknown)
 
 
 HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext, LPMALLOC16* lpMalloc);
-#define CoCreateStandardMalloc WINELIB_NAME(CoCreateStandardMalloc)
 
 HRESULT WINAPI CoGetMalloc16(DWORD dwMemContext,LPMALLOC16* lpMalloc);
-HRESULT WINAPI CoGetMalloc32(DWORD dwMemContext,LPMALLOC32* lpMalloc);
-#define CoGetMalloc WINELIB_NAME(CoGetMalloc)
+HRESULT WINAPI CoGetMalloc(DWORD dwMemContext,LPMALLOC* lpMalloc);
 
 LPVOID WINAPI CoTaskMemAlloc(ULONG size);
 
@@ -836,7 +829,7 @@ HRESULT WINAPI CoCreateGuid(GUID* pguid);
 
 void WINAPI CoFreeAllLibraries(void);
 
-void WINAPI CoFreeLibrary(HINSTANCE32 hLibrary);
+void WINAPI CoFreeLibrary(HINSTANCE hLibrary);
 
 void WINAPI CoFreeUnusedLibraries(void);
 
@@ -845,8 +838,7 @@ HRESULT WINAPI CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwCl
 HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, LPVOID pvReserved, REFIID iid, LPVOID *ppv);
 
 HRESULT WINAPI CoInitialize16(LPVOID lpReserved);
-HRESULT WINAPI CoInitialize32(LPVOID lpReserved);
-#define CoInitialize WINELIB_NAME(CoInitialize)
+HRESULT WINAPI CoInitialize(LPVOID lpReserved);
 
 typedef enum tagCOINIT
 {
@@ -856,17 +848,15 @@ typedef enum tagCOINIT
     COINIT_SPEED_OVER_MEMORY  = 0x8  /* Trade memory for speed */
 } COINIT;
 
-HRESULT WINAPI CoInitializeEx32(LPVOID lpReserved, DWORD dwCoInit);
-#define CoInitializeEx WINELIB_NAME(CoInitializeEx)
+HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit);
 
 /* FIXME: not implemented */
-BOOL32 WINAPI CoIsOle1Class(REFCLSID rclsid);
+BOOL WINAPI CoIsOle1Class(REFCLSID rclsid);
 
-HINSTANCE32 WINAPI CoLoadLibrary(LPOLESTR16 lpszLibName, BOOL32 bAutoFree);
+HINSTANCE WINAPI CoLoadLibrary(LPOLESTR16 lpszLibName, BOOL bAutoFree);
 
 HRESULT WINAPI CoLockObjectExternal16(LPUNKNOWN pUnk, BOOL16 fLock, BOOL16 fLastUnlockReleases);
-HRESULT WINAPI CoLockObjectExternal32(LPUNKNOWN pUnk, BOOL32 fLock, BOOL32 fLastUnlockReleases);
-#define CoLockObjectExternal WINELIB_NAME(CoLockObjectExternal)
+HRESULT WINAPI CoLockObjectExternal(LPUNKNOWN pUnk, BOOL fLock, BOOL fLastUnlockReleases);
 
 /* class registration flags; passed to CoRegisterClassObject */
 typedef enum tagREGCLS
@@ -878,15 +868,12 @@ typedef enum tagREGCLS
 } REGCLS;
 
 HRESULT WINAPI CoRegisterClassObject16(REFCLSID rclsid, LPUNKNOWN pUnk, DWORD dwClsContext, DWORD flags, LPDWORD lpdwRegister);
-HRESULT WINAPI CoRegisterClassObject32(REFCLSID rclsid,LPUNKNOWN pUnk,DWORD dwClsContext,DWORD flags,LPDWORD lpdwRegister);
-#define CoRegisterClassObject WINELIB_NAME(CoRegisterClassObject)
+HRESULT WINAPI CoRegisterClassObject(REFCLSID rclsid,LPUNKNOWN pUnk,DWORD dwClsContext,DWORD flags,LPDWORD lpdwRegister);
 
-HRESULT WINAPI CoRevokeClassObject32(DWORD dwRegister);
-#define CoRevokeClassObject WINELIB_NAME(CoRevokeClassObject)
+HRESULT WINAPI CoRevokeClassObject(DWORD dwRegister);
 
 void WINAPI CoUninitialize16(void);
-void WINAPI CoUninitialize32(void);
-#define CoUninitialize WINELIB_NAME(CoUninitialize)
+void WINAPI CoUninitialize(void);
 
 
 /*****************************************************************************
diff --git a/include/wine/obj_cache.h b/include/wine/obj_cache.h
index 63e46f3c0e7..390165b1581 100644
--- a/include/wine/obj_cache.h
+++ b/include/wine/obj_cache.h
@@ -34,11 +34,11 @@ typedef struct IOleCacheControl IOleCacheControl, *LPOLECACHECONTROL;
  */
 #define ICOM_INTERFACE IOleCache
 #define IOleCache_METHODS \
-	ICOM_METHOD3(HRESULT,Cache, FORMATETC32*,pformatetc, DWORD,advf, DWORD*, pdwConnection); \
+	ICOM_METHOD3(HRESULT,Cache, FORMATETC*,pformatetc, DWORD,advf, DWORD*, pdwConnection); \
 	ICOM_METHOD1(HRESULT,Uncache, DWORD,dwConnection); \
 	ICOM_METHOD1(HRESULT,EnumCache, IEnumSTATDATA**,ppenumSTATDATA); \
 	ICOM_METHOD1(HRESULT,InitCache, IDataObject*,pDataObject); \
-	ICOM_METHOD3(HRESULT,SetData, FORMATETC32*,pformatetc, STGMEDIUM32*,pmedium, BOOL32,fRelease);
+	ICOM_METHOD3(HRESULT,SetData, FORMATETC*,pformatetc, STGMEDIUM*,pmedium, BOOL,fRelease);
 #define IOleCache_IMETHODS \
 	IUnknown_IMETHODS \
 	IOleCache_METHODS
diff --git a/include/wine/obj_clientserver.h b/include/wine/obj_clientserver.h
index 01b79c2fd34..bafa86596ba 100644
--- a/include/wine/obj_clientserver.h
+++ b/include/wine/obj_clientserver.h
@@ -31,7 +31,7 @@ typedef struct tagSOLE_AUTHENTICATION_SERVICE
 {
     DWORD dwAuthnSvc;
     DWORD dwAuthzSvc;
-    OLECHAR32* pPrincipalName;
+    OLECHAR* pPrincipalName;
     HRESULT hr;
 } SOLE_AUTHENTICATION_SERVICE, *PSOLE_AUTHENTICATION_SERVICE;
 
@@ -45,8 +45,8 @@ typedef enum tagEOLE_AUTHENTICATION_CAPABILITIES
 
 #define ICOM_INTERFACE IClientSecurity
 #define IClientSecurity_METHODS \
-     ICOM_METHOD8(HRESULT,QueryBlanket, IUnknown*,pProxy, DWORD*,pAuthnSvc, DWORD*,pAuthzSvc, OLECHAR32**,pServerPrincName, DWORD*,pAuthnLevel, DWORD*,pImpLevel, void**,pAuthInfo, DWORD*,pCapabilites); \
-    ICOM_METHOD8(HRESULT,SetBlanket,   IUnknown*,pProxy, DWORD,pAuthnSvc, DWORD,pAuthzSvc, OLECHAR32*,pServerPrincName, DWORD,pAuthnLevel, DWORD,pImpLevel, void*,pAuthInfo, DWORD,pCapabilites); \
+     ICOM_METHOD8(HRESULT,QueryBlanket, IUnknown*,pProxy, DWORD*,pAuthnSvc, DWORD*,pAuthzSvc, OLECHAR**,pServerPrincName, DWORD*,pAuthnLevel, DWORD*,pImpLevel, void**,pAuthInfo, DWORD*,pCapabilites); \
+    ICOM_METHOD8(HRESULT,SetBlanket,   IUnknown*,pProxy, DWORD,pAuthnSvc, DWORD,pAuthzSvc, OLECHAR*,pServerPrincName, DWORD,pAuthnLevel, DWORD,pImpLevel, void*,pAuthInfo, DWORD,pCapabilites); \
     ICOM_METHOD2(HRESULT,CopyProxy,    IUnknown*,pProxy, IUnknown**,ppCopy);
 #define IClientSecurity_IMETHODS \
     IUnknown_IMETHODS \
@@ -79,7 +79,7 @@ typedef enum tagEXTCONN
 #define ICOM_INTERFACE IExternalConnection
 #define IExternalConnection_METHODS \
     ICOM_METHOD2(DWORD,AddConnection,     DWORD,extconn, DWORD,reserved); \
-    ICOM_METHOD3(DWORD,ReleaseConnection, DWORD,extconn, DWORD,reserved, BOOL32,fLastReleaseCloses);
+    ICOM_METHOD3(DWORD,ReleaseConnection, DWORD,extconn, DWORD,reserved, BOOL,fLastReleaseCloses);
 #define IExternalConnection_IMETHODS \
     IUnknown_IMETHODS \
     IExternalConnection_METHODS
@@ -141,9 +141,9 @@ typedef struct tagINTERFACEINFO
 
 #define ICOM_INTERFACE IMessageFilter
 #define IMessageFilter_METHODS \
-    ICOM_METHOD4(DWORD,HandleInComingCall, DWORD,dwCallType, HTASK32,htaskCaller, DWORD,dwTickCount, LPINTERFACEINFO,lpInterfaceInfo); \
-    ICOM_METHOD3(DWORD,RetryRejectedCall,  HTASK32,htaskCallee, DWORD,dwTickCount, DWORD,dwRejectType); \
-    ICOM_METHOD3(DWORD,MessagePending,     HTASK32,htaskCallee, DWORD,dwTickCount, DWORD,dwRejectType);
+    ICOM_METHOD4(DWORD,HandleInComingCall, DWORD,dwCallType, HTASK,htaskCaller, DWORD,dwTickCount, LPINTERFACEINFO,lpInterfaceInfo); \
+    ICOM_METHOD3(DWORD,RetryRejectedCall,  HTASK,htaskCallee, DWORD,dwTickCount, DWORD,dwRejectType); \
+    ICOM_METHOD3(DWORD,MessagePending,     HTASK,htaskCallee, DWORD,dwTickCount, DWORD,dwRejectType);
 #define IMessageFilter_IMETHODS \
     IUnknown_IMETHODS \
     IMessageFilter_METHODS
@@ -163,8 +163,7 @@ ICOM_DEFINE(IMessageFilter,IUnknown)
 
 
 HRESULT WINAPI CoRegisterMessageFilter16(LPMESSAGEFILTER lpMessageFilter,LPMESSAGEFILTER *lplpMessageFilter);
-HRESULT WINAPI CoRegisterMessageFilter32(LPMESSAGEFILTER lpMessageFilter,LPMESSAGEFILTER *lplpMessageFilter);
-#define CoRegisterMessageFilter WINELIB_NAME(CoRegisterMessageFilter)
+HRESULT WINAPI CoRegisterMessageFilter(LPMESSAGEFILTER lpMessageFilter,LPMESSAGEFILTER *lplpMessageFilter);
 
 
 /*****************************************************************************
@@ -172,10 +171,10 @@ HRESULT WINAPI CoRegisterMessageFilter32(LPMESSAGEFILTER lpMessageFilter,LPMESSA
  */
 #define ICOM_INTERFACE IServerSecurity
 #define IServerSecurity_METHODS \
-    ICOM_METHOD7(HRESULT,QueryBlanket,     DWORD*,pAuthnSvc, DWORD*,pAuthzSvc, OLECHAR32**,pServerPrincName, DWORD*,pAuthnLevel, DWORD*,pImpLevel, void**,pPrivs, DWORD*,pCapabilities); \
+    ICOM_METHOD7(HRESULT,QueryBlanket,     DWORD*,pAuthnSvc, DWORD*,pAuthzSvc, OLECHAR**,pServerPrincName, DWORD*,pAuthnLevel, DWORD*,pImpLevel, void**,pPrivs, DWORD*,pCapabilities); \
     ICOM_METHOD (HRESULT,ImpersonateClient); \
     ICOM_METHOD (HRESULT,RevertToSelf); \
-    ICOM_METHOD (BOOL32,   IsImpersonating);
+    ICOM_METHOD (BOOL,   IsImpersonating);
 #define IServerSecurity_IMETHODS \
     IUnknown_IMETHODS \
     IServerSecurity_METHODS
@@ -203,10 +202,10 @@ ICOM_DEFINE(IServerSecurity,IUnknown)
 HRESULT WINAPI CoCopyProxy(IUnknown* pProxy, IUnknown** ppCopy);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoQueryProxyBlanket(IUnknown* pProxy, DWORD* pwAuthnSvc, DWORD* pAuthzSvc, OLECHAR32** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTH_IDENTITY_HANDLE* pAuthInfo, DWORD* pCapabilites);
+HRESULT WINAPI CoQueryProxyBlanket(IUnknown* pProxy, DWORD* pwAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTH_IDENTITY_HANDLE* pAuthInfo, DWORD* pCapabilites);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoSetProxyBlanket(IUnknown* pProxy, DWORD dwAuthnSvc, DWORD dwAuthzSvc, OLECHAR32* pServerPrincName, DWORD dwAuthnLevel, DWORD dwImpLevel, RPC_AUTH_IDENTITY_HANDLE pAuthInfo, DWORD dwCapabilities);
+HRESULT WINAPI CoSetProxyBlanket(IUnknown* pProxy, DWORD dwAuthnSvc, DWORD dwAuthzSvc, OLECHAR* pServerPrincName, DWORD dwAuthnLevel, DWORD dwImpLevel, RPC_AUTH_IDENTITY_HANDLE pAuthInfo, DWORD dwCapabilities);
 
 
 /*****************************************************************************
@@ -246,7 +245,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID* pClsid);
 HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE* asAuthSvc, void* pReserved1, DWORD dwAuthnLevel, DWORD dwImpLevel, void* pReserved2, DWORD dwCapabilities, void* pReserved3);
 
 /* FIXME: not implemented */
-BOOL32 WINAPI CoIsHandlerConnected(LPUNKNOWN pUnk);
+BOOL WINAPI CoIsHandlerConnected(LPUNKNOWN pUnk);
 
 /* FIXME: not implemented */
 HRESULT WINAPI CoQueryAuthenticationServices(DWORD* pcAuthSvc, SOLE_AUTHENTICATION_SERVICE** asAuthSvc);
diff --git a/include/wine/obj_control.h b/include/wine/obj_control.h
index 9ed743561d2..a1c4864fda9 100644
--- a/include/wine/obj_control.h
+++ b/include/wine/obj_control.h
@@ -30,14 +30,14 @@ typedef struct tagUserVARIANT
 typedef struct tagLICINFO
 {
 	LONG cbLicInfo;
-	BOOL32 fRuntimeKeyAvail;
-	BOOL32 fLicVerified;
+	BOOL fRuntimeKeyAvail;
+	BOOL fLicVerified;
 } LICINFO, *LPLICINFO;
 
 typedef struct tagCONTROLINFO
 {
 	ULONG cb;
-	HACCEL32 hAccel;
+	HACCEL hAccel;
 	USHORT cAccel;
 	DWORD dwFlags;
 } CONTROLINFO, *LPCONTROLINFO;
@@ -101,9 +101,9 @@ typedef struct IClassFactory2 IClassFactory2, *LPCLASSFACTORY2;
 #define ICOM_INTERFACE IOleControl
 #define IOleControl_METHODS \
 	ICOM_METHOD1(HRESULT,GetControlInfo, CONTROLINFO*,pCI); \
-	ICOM_METHOD1(HRESULT,OnMnemonic, MSG32*,pMsg); \
+	ICOM_METHOD1(HRESULT,OnMnemonic, MSG*,pMsg); \
 	ICOM_METHOD1(HRESULT,OnAmbientPropertyChange, DISPID,dispID); \
-	ICOM_METHOD1(HRESULT,FreezeEvents, BOOL32,bFreeze);
+	ICOM_METHOD1(HRESULT,FreezeEvents, BOOL,bFreeze);
 #define IOleControl_IMETHODS \
 	IUnknown_IMETHODS \
 	IOleControl_METHODS
@@ -129,10 +129,10 @@ ICOM_DEFINE(IOleControl,IUnknown)
 #define ICOM_INTERFACE IOleControlSite 
 #define IOleControlSite_METHODS \
 	ICOM_METHOD (HRESULT,OnControlInfoChanged); \
-	ICOM_METHOD1(HRESULT,LockInPlaceActive, BOOL32,fLock); \
+	ICOM_METHOD1(HRESULT,LockInPlaceActive, BOOL,fLock); \
 	ICOM_METHOD3(HRESULT,TransformCoords, POINTL*,pPtlHimetric, POINTF*,pPtfContainer, DWORD,dwFlags); \
-	ICOM_METHOD2(HRESULT,TranslateAccelerator, MSG32*,pMsg, DWORD,grfModifiers) ;\
-	ICOM_METHOD1(HRESULT,OnFocus, BOOL32,fGotFocus); \
+	ICOM_METHOD2(HRESULT,TranslateAccelerator, MSG*,pMsg, DWORD,grfModifiers) ;\
+	ICOM_METHOD1(HRESULT,OnFocus, BOOL,fGotFocus); \
 	ICOM_METHOD (HRESULT,ShowPropertyFrame);
 #define IOleControlSite_IMETHODS \
 	IUnknown_IMETHODS \
@@ -160,8 +160,8 @@ ICOM_DEFINE(IOleControlSite,IUnknown)
  */
 #define ICOM_INTERFACE IOleInPlaceSiteEx
 #define IOleInPlaceSiteEx_METHODS \
-	ICOM_METHOD2(HRESULT,OnInPlaceActivateEx, BOOL32*,pfNoRedraw, DWORD,dwFlags); \
-	ICOM_METHOD1(HRESULT,OnInPlaceDeactivateEx, BOOL32,fNoRedraw); \
+	ICOM_METHOD2(HRESULT,OnInPlaceActivateEx, BOOL*,pfNoRedraw, DWORD,dwFlags); \
+	ICOM_METHOD1(HRESULT,OnInPlaceDeactivateEx, BOOL,fNoRedraw); \
 	ICOM_METHOD (HRESULT,RequestUIActivate);
 #define IOleInPlaceSiteEx_IMETHODS \
 	IOleInPlaceSite_IMETHODS \
@@ -202,16 +202,16 @@ ICOM_DEFINE(IOleInPlaceSiteEx,IOleInPlaceSite)
 #define IOleInPlaceSiteWindowless_METHODS \
 	ICOM_METHOD (HRESULT,CanWindowlessActivate); \
 	ICOM_METHOD (HRESULT,GetCapture); \
-	ICOM_METHOD1(HRESULT,SetCapture, BOOL32,fCapture); \
+	ICOM_METHOD1(HRESULT,SetCapture, BOOL,fCapture); \
 	ICOM_METHOD (HRESULT,GetFocus); \
-	ICOM_METHOD1(HRESULT,SetFocus, BOOL32,fFocus); \
-	ICOM_METHOD3(HRESULT,GetDC, LPCRECT32,pRect, DWORD,grfFlags, HDC32*,phDC); \
-	ICOM_METHOD1(HRESULT,ReleaseDC, HDC32,hDC); \
-	ICOM_METHOD2(HRESULT,InvalidateRect, LPCRECT32,pRect, BOOL32,fErase); \
-	ICOM_METHOD2(HRESULT,InvalidateRgn, HRGN32,hRgn, BOOL32,fErase); \
-	ICOM_METHOD4(HRESULT,ScrollRect, INT32,dx, INT32,dy, LPCRECT32,pRectScroll, LPCRECT32,pRectClip); \
-	ICOM_METHOD1(HRESULT,AdjustRect, LPRECT32,prc); \
-	ICOM_METHOD4(HRESULT,OnDefWindowMessage, UINT32,msg, WPARAM32,wParam, LPARAM,lParam, LRESULT*,plResult);
+	ICOM_METHOD1(HRESULT,SetFocus, BOOL,fFocus); \
+	ICOM_METHOD3(HRESULT,GetDC, LPCRECT32,pRect, DWORD,grfFlags, HDC*,phDC); \
+	ICOM_METHOD1(HRESULT,ReleaseDC, HDC,hDC); \
+	ICOM_METHOD2(HRESULT,InvalidateRect, LPCRECT32,pRect, BOOL,fErase); \
+	ICOM_METHOD2(HRESULT,InvalidateRgn, HRGN,hRgn, BOOL,fErase); \
+	ICOM_METHOD4(HRESULT,ScrollRect, INT,dx, INT,dy, LPCRECT32,pRectScroll, LPCRECT32,pRectClip); \
+	ICOM_METHOD1(HRESULT,AdjustRect, LPRECT,prc); \
+	ICOM_METHOD4(HRESULT,OnDefWindowMessage, UINT,msg, WPARAM,wParam, LPARAM,lParam, LRESULT*,plResult);
 #define IOleInPlaceSiteWindowless_IMETHODS \
 	IOleInPlaceSite_IMETHODS \
 	IOleInPlaceSiteWindowless_METHODS
@@ -258,7 +258,7 @@ ICOM_DEFINE(IOleInPlaceSiteWindowless,IOleInPlaceSite)
  */
 #define ICOM_INTERFACE IOleInPlaceObjectWindowless
 #define IOleInPlaceObjectWindowless_METHODS \
-	ICOM_METHOD4(HRESULT,OnWindowMessage, UINT32,msg, WPARAM32,wParam, LPARAM,lParam, LRESULT*,plResult); \
+	ICOM_METHOD4(HRESULT,OnWindowMessage, UINT,msg, WPARAM,wParam, LPARAM,lParam, LRESULT*,plResult); \
 	ICOM_METHOD1(HRESULT,GetDropTarget, IDropTarget**,ppDropTarget);
 #define IOleInPlaceObjectWindowless_IMETHODS \
 	IOleInPlaceObject_IMETHODS \
@@ -291,8 +291,8 @@ ICOM_DEFINE(IOleInPlaceObjectWindowless,IOleInPlaceObject)
 #define ICOM_INTERFACE IClassFactory2
 #define IClassFactory2_METHODS \
 	ICOM_METHOD1(HRESULT,GetLicInfo, LICINFO*,pLicInfo); \
-	ICOM_METHOD2(HRESULT,RequestLicKey, DWORD,dwReserved, BSTR32*,pBstrKey); \
-	ICOM_METHOD5(HRESULT,CreateInstanceLic, IUnknown*,pUnkOuter, IUnknown*,pUnkReserved, REFIID,riid, BSTR32,bstrKey, PVOID*,ppvObj);
+	ICOM_METHOD2(HRESULT,RequestLicKey, DWORD,dwReserved, BSTR*,pBstrKey); \
+	ICOM_METHOD5(HRESULT,CreateInstanceLic, IUnknown*,pUnkOuter, IUnknown*,pUnkReserved, REFIID,riid, BSTR,bstrKey, PVOID*,ppvObj);
 #define IClassFactory2_IMETHODS \
 	IClassFactory_IMETHODS \
 	IClassFactory2_METHODS
diff --git a/include/wine/obj_dataobject.h b/include/wine/obj_dataobject.h
index 1c0ab52a3be..78f4823bca0 100644
--- a/include/wine/obj_dataobject.h
+++ b/include/wine/obj_dataobject.h
@@ -12,18 +12,12 @@
  * Predeclare the structures
  */
 typedef struct DVTARGETDEVICE16 DVTARGETDEVICE16, *LPDVTARGETDEVICE16;
-typedef struct DVTARGETDEVICE32 DVTARGETDEVICE32, *LPDVTARGETDEVICE32;
-DECL_WINELIB_TYPE(DVTARGETDEVICE)
-DECL_WINELIB_TYPE(LPDVTARGETDEVICE)
+typedef struct DVTARGETDEVICE DVTARGETDEVICE, *LPDVTARGETDEVICE;
 
 typedef struct FORMATETC16 FORMATETC16, *LPFORMATETC16;
-typedef struct FORMATETC32 FORMATETC32, *LPFORMATETC32;
-DECL_WINELIB_TYPE(FORMATETC)
-DECL_WINELIB_TYPE(LPFORMATETC)
+typedef struct FORMATETC FORMATETC, *LPFORMATETC;
 
-typedef struct STGMEDIUM32 STGMEDIUM32, *LPSTGMEDIUM32;
-DECL_WINELIB_TYPE(STGMEDIUM)
-DECL_WINELIB_TYPE(LPSTGMEDIUM)
+typedef struct STGMEDIUM STGMEDIUM, *LPSTGMEDIUM;
 
 
 /*****************************************************************************
@@ -51,7 +45,7 @@ typedef struct IEnumSTATDATA IEnumSTATDATA,*LPENUMSTATDATA;
 /*****************************************************************************
  * DVTARGETDEVICE structure
  */
-struct DVTARGETDEVICE32
+struct DVTARGETDEVICE
 {
     DWORD tdSize;
     WORD tdDriverNameOffset;
@@ -66,10 +60,10 @@ struct DVTARGETDEVICE32
  * FORMATETC structure
  */
 /* wished data format */
-struct FORMATETC32
+struct FORMATETC
 {
-    CLIPFORMAT32 cfFormat;
-    DVTARGETDEVICE32* ptd;
+    CLIPFORMAT cfFormat;
+    DVTARGETDEVICE* ptd;
     DWORD dwAspect;
     LONG lindex;
     DWORD tymed;
@@ -92,17 +86,17 @@ typedef enum tagTYMED
 } TYMED;
   
 /* dataobject as answer to a request */
-struct STGMEDIUM32
+struct STGMEDIUM
 {
     DWORD tymed;
     union {
-        HBITMAP32 hBitmap;
-        HMETAFILEPICT32 hMetaFilePict;
-        HENHMETAFILE32 hEnhMetaFile;
-        HGLOBAL32 hGlobal;
-        LPOLESTR32 lpszFileName;
-        IStream32 *pstm;
-        IStorage32 *pstg;
+        HBITMAP hBitmap;
+        HMETAFILEPICT hMetaFilePict;
+        HENHMETAFILE hEnhMetaFile;
+        HGLOBAL hGlobal;
+        LPOLESTR lpszFileName;
+        IStream *pstm;
+        IStorage *pstg;
     } u;
     IUnknown *pUnkForRelease;
 };   
@@ -113,7 +107,7 @@ struct STGMEDIUM32
  */
 #define ICOM_INTERFACE IAdviseSink
 #define IAdviseSink_METHODS \
-    ICOM_VMETHOD2(OnDataChange, FORMATETC32*,pFormatetc, STGMEDIUM32*,pStgmed) \
+    ICOM_VMETHOD2(OnDataChange, FORMATETC*,pFormatetc, STGMEDIUM*,pStgmed) \
     ICOM_VMETHOD2(OnViewChange, DWORD,dwAspect, LONG,lindex) \
     ICOM_VMETHOD1(OnRename,     IMoniker*,pmk) \
     ICOM_VMETHOD (OnSave) \
@@ -171,7 +165,7 @@ ICOM_DEFINE(IAdviseSink2,IAdviseSink)
  */
 #define ICOM_INTERFACE IDataAdviseHolder
 #define IDataAdviseHolder_METHODS \
-    ICOM_METHOD5(HRESULT,Advise,           IDataObject*,pDataObject, FORMATETC32*,pFetc, DWORD,advf, IAdviseSink*,pAdvise, DWORD*,pdwConnection) \
+    ICOM_METHOD5(HRESULT,Advise,           IDataObject*,pDataObject, FORMATETC*,pFetc, DWORD,advf, IAdviseSink*,pAdvise, DWORD*,pdwConnection) \
     ICOM_METHOD1(HRESULT,Unadvise,         DWORD,dwConnection) \
     ICOM_METHOD1(HRESULT,EnumAdvise,       IEnumSTATDATA**,ppenumAdvise) \
     ICOM_METHOD3(HRESULT,SendOnDataChange, IDataObject*,pDataObject, DWORD,dwReserved, DWORD,advf)
@@ -202,13 +196,13 @@ HRESULT WINAPI CreateDataAdviseHolder(LPDATAADVISEHOLDER* ppDAHolder);
  */
 #define ICOM_INTERFACE IDataObject
 #define IDataObject_METHODS \
-    ICOM_METHOD2(HRESULT,GetData,               LPFORMATETC32,pformatetcIn, STGMEDIUM32*,pmedium) \
-    ICOM_METHOD2(HRESULT,GetDataHere,           LPFORMATETC32,pformatetc, STGMEDIUM32*,pmedium) \
-    ICOM_METHOD1(HRESULT,QueryGetData,          LPFORMATETC32,pformatetc) \
-    ICOM_METHOD2(HRESULT,GetCanonicalFormatEtc, LPFORMATETC32,pformatectIn, LPFORMATETC32,pformatetcOut) \
-    ICOM_METHOD3(HRESULT,SetData,               LPFORMATETC32,pformatetc, STGMEDIUM32*,pmedium, BOOL32,fRelease) \
+    ICOM_METHOD2(HRESULT,GetData,               LPFORMATETC,pformatetcIn, STGMEDIUM*,pmedium) \
+    ICOM_METHOD2(HRESULT,GetDataHere,           LPFORMATETC,pformatetc, STGMEDIUM*,pmedium) \
+    ICOM_METHOD1(HRESULT,QueryGetData,          LPFORMATETC,pformatetc) \
+    ICOM_METHOD2(HRESULT,GetCanonicalFormatEtc, LPFORMATETC,pformatectIn, LPFORMATETC,pformatetcOut) \
+    ICOM_METHOD3(HRESULT,SetData,               LPFORMATETC,pformatetc, STGMEDIUM*,pmedium, BOOL,fRelease) \
     ICOM_METHOD2(HRESULT,EnumFormatEtc,         DWORD,dwDirection, IEnumFORMATETC**,ppenumFormatEtc) \
-    ICOM_METHOD4(HRESULT,DAdvise,               LPFORMATETC32*,pformatetc, DWORD,advf, IAdviseSink*,pAdvSink, DWORD*,pdwConnection) \
+    ICOM_METHOD4(HRESULT,DAdvise,               LPFORMATETC*,pformatetc, DWORD,advf, IAdviseSink*,pAdvSink, DWORD*,pdwConnection) \
     ICOM_METHOD1(HRESULT,DUnadvise,             DWORD,dwConnection) \
     ICOM_METHOD1(HRESULT,EnumDAdvise,           IEnumSTATDATA**,ppenumAdvise)
 #define IDataObject_IMETHODS \
@@ -240,7 +234,7 @@ ICOM_DEFINE(IDataObject,IUnknown)
  */
 #define ICOM_INTERFACE IEnumFORMATETC
 #define IEnumFORMATETC_METHODS \
-    ICOM_METHOD3(HRESULT,Next,  ULONG,celt, FORMATETC32*,rgelt, ULONG*,pceltFethed) \
+    ICOM_METHOD3(HRESULT,Next,  ULONG,celt, FORMATETC*,rgelt, ULONG*,pceltFethed) \
     ICOM_METHOD1(HRESULT,Skip,  ULONG,celt) \
     ICOM_METHOD (HRESULT,Reset) \
     ICOM_METHOD1(HRESULT,Clone, IEnumFORMATETC**,ppenum)
@@ -268,7 +262,7 @@ ICOM_DEFINE(IEnumFORMATETC,IUnknown)
  */
 typedef struct tagSTATDATA
 {
-    FORMATETC32 formatetc;
+    FORMATETC formatetc;
     DWORD advf;
     IAdviseSink* pAdvSink;
     DWORD dwConnection;
diff --git a/include/wine/obj_dragdrop.h b/include/wine/obj_dragdrop.h
index c798094073b..b5736fac1c5 100644
--- a/include/wine/obj_dragdrop.h
+++ b/include/wine/obj_dragdrop.h
@@ -33,7 +33,7 @@ typedef struct IDropTarget IDropTarget,*LPDROPTARGET;
  */
 #define ICOM_INTERFACE IDropSource
 #define IDropSource_METHODS \
-    ICOM_METHOD2(HRESULT, QueryContinueDrag, BOOL32, fEscapePressed, DWORD, grfKeyState); \
+    ICOM_METHOD2(HRESULT, QueryContinueDrag, BOOL, fEscapePressed, DWORD, grfKeyState); \
     ICOM_METHOD1(HRESULT, GiveFeedback, DWORD, dwEffect);
 #define IDropSource_IMETHODS \
   ICOM_INHERITS(IDropSource,IUnknown)
diff --git a/include/wine/obj_inplace.h b/include/wine/obj_inplace.h
index 4e5e657a9e6..8e29c91be6d 100644
--- a/include/wine/obj_inplace.h
+++ b/include/wine/obj_inplace.h
@@ -17,18 +17,16 @@
 typedef struct  tagOleMenuGroupWidths
 {
 	LONG width[ 6 ];
-} OLEMENUGROUPWIDTHS32, *LPOLEMENUGROUPWIDTHS32;
+} OLEMENUGROUPWIDTHS, *LPOLEMENUGROUPWIDTHS;
 
-DECL_WINELIB_TYPE(OLEMENUGROUPWIDTHS)
-DECL_WINELIB_TYPE(LPOLEMENUGROUPWIDTHS)
 
 typedef struct tagOleInPlaceFrameInfo
 {
-	UINT32 cb;
-	BOOL32 fMDIApp;
-	HWND32 hwndFrame;
-	HACCEL32 haccel;
-	UINT32 cAccelEntries;
+	UINT cb;
+	BOOL fMDIApp;
+	HWND hwndFrame;
+	HACCEL haccel;
+	UINT cAccelEntries;
 } OLEINPLACEFRAMEINFO, *LPOLEINPLACEFRAMEINFO;
 
 typedef enum tagOLEGETMONIKER
@@ -70,14 +68,13 @@ typedef enum tagOLEUPDATE
 typedef struct tagOLEVERB
 {
 	LONG lVerb;
-	LPOLESTR32 lpszVerbName;
+	LPOLESTR lpszVerbName;
 	DWORD fuFlags;
 	DWORD grfAttribs;
 } OLEVERB, *LPOLEVERB;
 	
-typedef HGLOBAL32 HOLEMENU32;
-DECL_WINELIB_TYPE(HOLEMENU)
-typedef LPRECT32 LPBORDERWIDTHS;
+typedef HGLOBAL HOLEMENU;
+typedef LPRECT LPBORDERWIDTHS;
 typedef LPCRECT32 LPCBORDERWIDTHS;
 	
 	
@@ -119,8 +116,8 @@ typedef struct IOleItemContainer IOleItemContainer, *LPOLEITEMCONTAINER;
  */
 #define ICOM_INTERFACE IOleWindow
 #define IOleWindow_METHODS \
-	ICOM_METHOD1(HRESULT,GetWindow, HWND32*,phwnd); \
-	ICOM_METHOD1(HRESULT,ContextSensitiveHelp, BOOL32,fEnterMode);
+	ICOM_METHOD1(HRESULT,GetWindow, HWND*,phwnd); \
+	ICOM_METHOD1(HRESULT,ContextSensitiveHelp, BOOL,fEnterMode);
 #define IOleWindow_IMETHODS \
 	IUnknown_IMETHODS \
 	IOleWindow_METHODS
@@ -173,11 +170,11 @@ ICOM_DEFINE(IOleInPlaceObject,IOleWindow)
  */
 #define ICOM_INTERFACE IOleInPlaceActiveObject
 #define IOleInPlaceActiveObject_METHODS \
-	ICOM_METHOD1(HRESULT,TranslateAccelerator, LPMSG32,lpmsg); \
-	ICOM_METHOD1(HRESULT,OnFrameWindowActivate, BOOL32,fActivate); \
-	ICOM_METHOD1(HRESULT,OnDocWindowActivate, BOOL32,fActivate); \
-	ICOM_METHOD3(HRESULT,ResizeBorder, LPCRECT32,prcBorder, IOleInPlaceUIWindow*,pUIWindow, BOOL32,fWindowFrame); \
-	ICOM_METHOD1(HRESULT,EnableModeless, BOOL32,fEnable);
+	ICOM_METHOD1(HRESULT,TranslateAccelerator, LPMSG,lpmsg); \
+	ICOM_METHOD1(HRESULT,OnFrameWindowActivate, BOOL,fActivate); \
+	ICOM_METHOD1(HRESULT,OnDocWindowActivate, BOOL,fActivate); \
+	ICOM_METHOD3(HRESULT,ResizeBorder, LPCRECT32,prcBorder, IOleInPlaceUIWindow*,pUIWindow, BOOL,fWindowFrame); \
+	ICOM_METHOD1(HRESULT,EnableModeless, BOOL,fEnable);
 #define IOleInPlaceActiveObject_IMETHODS \
 	IOleWindow_IMETHODS \
 	IOleInPlaceActiveObject_METHODS
@@ -205,10 +202,10 @@ ICOM_DEFINE(IOleInPlaceActiveObject,IOleWindow)
  */
 #define ICOM_INTERFACE IOleInPlaceUIWindow
 #define IOleInPlaceUIWindow_METHODS \
-	ICOM_METHOD1(HRESULT,GetBorder, LPRECT32,lprectBorder); \
+	ICOM_METHOD1(HRESULT,GetBorder, LPRECT,lprectBorder); \
 	ICOM_METHOD1(HRESULT,RequestBorderSpace, LPCBORDERWIDTHS,pborderwidths); \
 	ICOM_METHOD1(HRESULT,SetBorderSpace, LPCBORDERWIDTHS,pborderwidths); \
-	ICOM_METHOD2(HRESULT,SetActiveObject, IOleInPlaceActiveObject*,pActiveObject, LPCOLESTR32,pszObjName);
+	ICOM_METHOD2(HRESULT,SetActiveObject, IOleInPlaceActiveObject*,pActiveObject, LPCOLESTR,pszObjName);
 #define IOleInPlaceUIWindow_IMETHODS \
 	IOleWindow_IMETHODS \
 	IOleInPlaceUIWindow_METHODS
@@ -236,12 +233,12 @@ ICOM_DEFINE(IOleInPlaceUIWindow,IOleWindow)
  */
 #define ICOM_INTERFACE IOleInPlaceFrame
 #define IOleInPlaceFrame_METHODS \
-	ICOM_METHOD2 (HRESULT,InsertMenus, HMENU,hemnuShared, LPOLEMENUGROUPWIDTHS32,lpMenuWidths); \
-	ICOM_METHOD3 (HRESULT,SetMenu, HMENU,hemnuShared, HOLEMENU,holemenu, HWND32,hwndActiveObject); \
+	ICOM_METHOD2 (HRESULT,InsertMenus, HMENU,hemnuShared, LPOLEMENUGROUPWIDTHS,lpMenuWidths); \
+	ICOM_METHOD3 (HRESULT,SetMenu, HMENU,hemnuShared, HOLEMENU,holemenu, HWND,hwndActiveObject); \
 	ICOM_METHOD1 (HRESULT,RemoveMenus, HMENU,hemnuShared); \
-	ICOM_METHOD1 (HRESULT,SetStatusText, LPCOLESTR32,pszStatusText); \
-	ICOM_METHOD1 (HRESULT,EnableModeless, BOOL32,fEnable); \
-	ICOM_METHOD2 (HRESULT,TranslateAccelerator, LPMSG32,lpmsg, WORD,wID);
+	ICOM_METHOD1 (HRESULT,SetStatusText, LPCOLESTR,pszStatusText); \
+	ICOM_METHOD1 (HRESULT,EnableModeless, BOOL,fEnable); \
+	ICOM_METHOD2 (HRESULT,TranslateAccelerator, LPMSG,lpmsg, WORD,wID);
 #define IOleInPlaceFrame_IMETHODS \
 	IOleInPlaceUIWindow_IMETHODS \
 	IOleInPlaceFrame_METHODS
@@ -278,9 +275,9 @@ ICOM_DEFINE(IOleInPlaceUIWindow,IOleWindow)
 	ICOM_METHOD (HRESULT,CanInPlaceActivate); \
 	ICOM_METHOD (HRESULT,OnInPlaceActivate); \
 	ICOM_METHOD (HRESULT,OnUIActivate); \
-	ICOM_METHOD5(HRESULT,GetWindowContext, IOleInPlaceFrame**,ppFrame, IOleInPlaceUIWindow**,ppDoc, LPRECT32,lprcPosRect, LPRECT32,lprcClipRect, LPOLEINPLACEFRAMEINFO,lpFrameInfo); \
-	ICOM_METHOD1(HRESULT,Scroll, SIZE32,scrollExtant); \
-	ICOM_METHOD1(HRESULT,OnUIDeactivate, BOOL32,fUndoable); \
+	ICOM_METHOD5(HRESULT,GetWindowContext, IOleInPlaceFrame**,ppFrame, IOleInPlaceUIWindow**,ppDoc, LPRECT,lprcPosRect, LPRECT,lprcClipRect, LPOLEINPLACEFRAMEINFO,lpFrameInfo); \
+	ICOM_METHOD1(HRESULT,Scroll, SIZE,scrollExtant); \
+	ICOM_METHOD1(HRESULT,OnUIDeactivate, BOOL,fUndoable); \
 	ICOM_METHOD (HRESULT,OnInPlaceDeactivate); \
 	ICOM_METHOD (HRESULT,DiscardUndoState); \
 	ICOM_METHOD (HRESULT,DeactivateAndUndo); \
@@ -322,7 +319,7 @@ ICOM_DEFINE(IOleInPlaceSite,IOleWindow)
 	ICOM_METHOD3(HRESULT,GetMoniker, DWORD,dwAssign, DWORD,dwWhichMoniker, IMoniker**,ppmk); \
 	ICOM_METHOD1(HRESULT,GetContainer, IOleContainer**,ppContainer); \
 	ICOM_METHOD (HRESULT,ShowObject); \
-	ICOM_METHOD1(HRESULT,OnShowWindow, BOOL32,fShow); \
+	ICOM_METHOD1(HRESULT,OnShowWindow, BOOL,fShow); \
 	ICOM_METHOD (HRESULT,RequestNewObjectLayout);
 #define IOleClientSite_IMETHODS \
 	IUnknown_IMETHODS \
@@ -350,7 +347,7 @@ ICOM_DEFINE(IOleClientSite,IUnknown)
  */
 #define ICOM_INTERFACE IParseDisplayName
 #define IParseDisplayName_METHODS \
-	ICOM_METHOD4(HRESULT,ParseDisplayName, IBindCtx*,pbc, LPOLESTR32,pszDisplayName, ULONG*,pchEaten, IMoniker**,ppmkOut);
+	ICOM_METHOD4(HRESULT,ParseDisplayName, IBindCtx*,pbc, LPOLESTR,pszDisplayName, ULONG*,pchEaten, IMoniker**,ppmkOut);
 #define IParseDisplayName_IMETHODS \
 	IUnknown_IMETHODS \
 	IParseDisplayName_METHODS
@@ -373,7 +370,7 @@ ICOM_DEFINE(IParseDisplayName,IUnknown)
 #define ICOM_INTERFACE IOleContainer
 #define IOleContainer_METHODS \
 	ICOM_METHOD2(HRESULT,EnumObjects, DWORD,grfFlags, IEnumUnknown**,ppenum); \
-	ICOM_METHOD1(HRESULT,LockContainer, BOOL32,fLock);
+	ICOM_METHOD1(HRESULT,LockContainer, BOOL,fLock);
 #define IOleContainer_IMETHODS \
 	IParseDisplayName_IMETHODS \
 	IOleContainer_METHODS
@@ -398,9 +395,9 @@ ICOM_DEFINE(IOleContainer,IParseDisplayName)
  */
 #define ICOM_INTERFACE IOleItemContainer
 #define IOleItemContainer_METHODS \
-	ICOM_METHOD5(HRESULT,GetObject, LPOLESTR32,pszItem, DWORD,dwSpeedNeeded, IBindCtx*,pbc, REFIID,riid, void*,ppvObject); \
-	ICOM_METHOD4(HRESULT,GetObjectStorage, LPOLESTR32,pszItem, IBindCtx*,pbc, REFIID,riid, void*,ppvStorage); \
-	ICOM_METHOD1(HRESULT,IsRunning, LPOLESTR32,pszItem);
+	ICOM_METHOD5(HRESULT,GetObject, LPOLESTR,pszItem, DWORD,dwSpeedNeeded, IBindCtx*,pbc, REFIID,riid, void*,ppvObject); \
+	ICOM_METHOD4(HRESULT,GetObjectStorage, LPOLESTR,pszItem, IBindCtx*,pbc, REFIID,riid, void*,ppvStorage); \
+	ICOM_METHOD1(HRESULT,IsRunning, LPOLESTR,pszItem);
 #define IOleItemContainer_IMETHODS \
 	IOleContainer_IMETHODS \
 	IOleItemContainer_METHODS
diff --git a/include/wine/obj_marshal.h b/include/wine/obj_marshal.h
index 1e8d3aabc2c..5054cb6390e 100644
--- a/include/wine/obj_marshal.h
+++ b/include/wine/obj_marshal.h
@@ -26,9 +26,9 @@ typedef struct IStdMarshalInfo IStdMarshalInfo,*LPSTDMARSHALINFO;
 #define IMarshal_METHODS \
     ICOM_METHOD6(HRESULT,GetUnmarshalClass,  REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags, CLSID*,pCid); \
     ICOM_METHOD6(HRESULT,GetMarshalSizeMax,  REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags, DWORD*,pSize); \
-    ICOM_METHOD6(HRESULT,MarshalInterface,   IStream32*,pStm, REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags); \
-    ICOM_METHOD3(HRESULT,UnmarshalInterface, IStream32*,pStm, REFIID,riid, void**,ppv); \
-    ICOM_METHOD1(HRESULT,ReleaseMarshalData, IStream32*,pStm); \
+    ICOM_METHOD6(HRESULT,MarshalInterface,   IStream*,pStm, REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags); \
+    ICOM_METHOD3(HRESULT,UnmarshalInterface, IStream*,pStm, REFIID,riid, void**,ppv); \
+    ICOM_METHOD1(HRESULT,ReleaseMarshalData, IStream*,pStm); \
     ICOM_METHOD1(HRESULT,DisconnectObject,   DWORD,dwReserved);
 #define IMarshal_IMETHODS \
     IUnknown_IMETHODS \
@@ -81,7 +81,7 @@ ICOM_DEFINE(IStdMarshalInfo,IUnknown)
 HRESULT WINAPI CoCreateFreeThreadedMarshaler(LPUNKNOWN punkOuter, LPUNKNOWN* ppunkMarshal);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM32 pStm, REFIID iid, LPVOID* ppv);
+HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM pStm, REFIID iid, LPVOID* ppv);
 
 /* FIXME: not implemented */
 HRESULT WINAPI CoGetMarshalSizeMax(ULONG* pulSize, REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags);
@@ -90,22 +90,22 @@ HRESULT WINAPI CoGetMarshalSizeMax(ULONG* pulSize, REFIID riid, LPUNKNOWN pUnk,
 HRESULT WINAPI CoGetStandardMarshal(REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags, LPMARSHAL* ppMarshal);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoMarshalHresult(LPSTREAM32 pstm, HRESULT hresult);
+HRESULT WINAPI CoMarshalHresult(LPSTREAM pstm, HRESULT hresult);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoMarshalInterface(LPSTREAM32 pStm, REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags);
+HRESULT WINAPI CoMarshalInterface(LPSTREAM pStm, REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(REFIID riid, LPUNKNOWN pUnk, LPSTREAM32* ppStm);
+HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(REFIID riid, LPUNKNOWN pUnk, LPSTREAM* ppStm);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoReleaseMarshalData(LPSTREAM32 pStm);
+HRESULT WINAPI CoReleaseMarshalData(LPSTREAM pStm);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoUnmarshalHresult(LPSTREAM32 pstm, HRESULT* phresult);
+HRESULT WINAPI CoUnmarshalHresult(LPSTREAM pstm, HRESULT* phresult);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoUnmarshalInterface(LPSTREAM32 pStm, REFIID riid, LPVOID* ppv);
+HRESULT WINAPI CoUnmarshalInterface(LPSTREAM pStm, REFIID riid, LPVOID* ppv);
 
 
 #endif /* __WINE_WINE_OBJ_MARSHAL_H */
diff --git a/include/wine/obj_misc.h b/include/wine/obj_misc.h
index b493df569df..8472c84e53a 100644
--- a/include/wine/obj_misc.h
+++ b/include/wine/obj_misc.h
@@ -32,7 +32,7 @@ typedef struct IMultiQI IMultiQI,*LPMULTIQI;
  */
 #define ICOM_INTERFACE IEnumString
 #define IEnumString_METHODS \
-    ICOM_METHOD3(HRESULT,Next,  ULONG,celt, LPOLESTR32*,rgelt, ULONG*,pceltFethed); \
+    ICOM_METHOD3(HRESULT,Next,  ULONG,celt, LPOLESTR*,rgelt, ULONG*,pceltFethed); \
     ICOM_METHOD1(HRESULT,Skip,  ULONG,celt); \
     ICOM_METHOD (HRESULT,Reset); \
     ICOM_METHOD1 (HRESULT, Clone, IEnumString**, ppenum);
@@ -54,7 +54,6 @@ ICOM_DEFINE(IEnumString,IUnknown)
 #define IEnumString_Clone(p,a)    ICOM_CALL1(Clone,p,a)
 #endif
 
-#define CreateEnumString WINELIB_NAME(CreateEnumString)
 
 
 /*****************************************************************************
@@ -92,14 +91,14 @@ ICOM_DEFINE(IEnumUnknown,IUnknown)
 #define IMallocSpy_METHODS \
     ICOM_METHOD1 (ULONG,PreAlloc,        ULONG,cbRequest); \
     ICOM_VMETHOD1(      PostAlloc,       void*,pActual); \
-    ICOM_METHOD2 (void*,PreFree,         void*,pRequest, BOOL32,fSpyed); \
-    ICOM_VMETHOD1(      PostFree,        BOOL32,fSpyed); \
-    ICOM_METHOD4 (ULONG,PreRealloc,      void*,pRequest, ULONG,cbRequest, void**,ppNewRequest, BOOL32,fSpyed); \
-    ICOM_METHOD2 (void*,PostRealloc,     void*,pActual, BOOL32,fSpyed); \
-    ICOM_METHOD2 (void*,PreGetSize,      void*,pRequest, BOOL32,fSpyed); \
-    ICOM_METHOD2 (ULONG,PostGetSize,     ULONG,cbActual, BOOL32,fSpyed); \
-    ICOM_METHOD2 (void*,PreDidAlloc,     void*,pRequest, BOOL32,fSpyed); \
-    ICOM_METHOD3 (int,  PostDidAlloc,    void*,pRequest, BOOL32,fSpyed, int,fActual); \
+    ICOM_METHOD2 (void*,PreFree,         void*,pRequest, BOOL,fSpyed); \
+    ICOM_VMETHOD1(      PostFree,        BOOL,fSpyed); \
+    ICOM_METHOD4 (ULONG,PreRealloc,      void*,pRequest, ULONG,cbRequest, void**,ppNewRequest, BOOL,fSpyed); \
+    ICOM_METHOD2 (void*,PostRealloc,     void*,pActual, BOOL,fSpyed); \
+    ICOM_METHOD2 (void*,PreGetSize,      void*,pRequest, BOOL,fSpyed); \
+    ICOM_METHOD2 (ULONG,PostGetSize,     ULONG,cbActual, BOOL,fSpyed); \
+    ICOM_METHOD2 (void*,PreDidAlloc,     void*,pRequest, BOOL,fSpyed); \
+    ICOM_METHOD3 (int,  PostDidAlloc,    void*,pRequest, BOOL,fSpyed, int,fActual); \
     ICOM_METHOD  (int,  PreHeapMinimize); \
     ICOM_METHOD  (int,  PostHeapMinimize);
 #define IMallocSpy_IMETHODS \
diff --git a/include/wine/obj_moniker.h b/include/wine/obj_moniker.h
index b0f4504533b..58c3f13ffb6 100644
--- a/include/wine/obj_moniker.h
+++ b/include/wine/obj_moniker.h
@@ -72,10 +72,10 @@ typedef struct tagBIND_OPTS2
     ICOM_METHOD1 (HRESULT, SetBindOptions,       LPBIND_OPTS2,pbindopts) \
     ICOM_METHOD1 (HRESULT, GetBindOptions,       LPBIND_OPTS2,pbindopts) \
     ICOM_METHOD1 (HRESULT, GetRunningObjectTable,IRunningObjectTable**,pprot) \
-    ICOM_METHOD2 (HRESULT, RegisterObjectParam,  LPOLESTR32,pszkey, IUnknown*,punk) \
-    ICOM_METHOD2 (HRESULT, GetObjectParam,       LPOLESTR32,pszkey, IUnknown*,punk) \
+    ICOM_METHOD2 (HRESULT, RegisterObjectParam,  LPOLESTR,pszkey, IUnknown*,punk) \
+    ICOM_METHOD2 (HRESULT, GetObjectParam,       LPOLESTR,pszkey, IUnknown*,punk) \
     ICOM_METHOD1 (HRESULT, EnumObjectParam,      IEnumString**,ppenum) \
-    ICOM_METHOD1 (HRESULT, RevokeObjectParam,    LPOLESTR32,pszkey)
+    ICOM_METHOD1 (HRESULT, RevokeObjectParam,    LPOLESTR,pszkey)
 #define IBindCtx_IMETHODS \
     IUnknown_IMETHODS \
     IBindCtx_METHODS
@@ -101,8 +101,7 @@ ICOM_DEFINE(IBindCtx,IUnknown)
 #endif
 
 HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC* ppbc);
-HRESULT WINAPI CreateBindCtx32(DWORD reserved, LPBC* ppbc);
-#define CreateBindCtx WINELIB_NAME(CreateBindCtx)
+HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC* ppbc);
 
 
 /*****************************************************************************
@@ -183,8 +182,8 @@ typedef enum tagMKREDUCE
     ICOM_METHOD4(HRESULT,BindToObject,        IBindCtx*,pbc, IMoniker*,pmkToLeft, REFIID,riidResult, void**,ppvResult) \
     ICOM_METHOD4(HRESULT,BindToStorage,       IBindCtx*,pbc, IMoniker*,pmkToLeft, REFIID,riid, void**,ppvObj) \
     ICOM_METHOD4(HRESULT,Reduce,              IBindCtx*,pbc, DWORD,dwReduceHowFar, IMoniker**,ppmkToLeft, IMoniker**,ppmkReduced) \
-    ICOM_METHOD3(HRESULT,ComposeWith,         IMoniker*,pmkRight, BOOL32,fOnlyIfNotGeneric, IMoniker**,ppmkComposite) \
-    ICOM_METHOD2(HRESULT,Enum,                BOOL32,fForward, IEnumMoniker**,ppenumMoniker) \
+    ICOM_METHOD3(HRESULT,ComposeWith,         IMoniker*,pmkRight, BOOL,fOnlyIfNotGeneric, IMoniker**,ppmkComposite) \
+    ICOM_METHOD2(HRESULT,Enum,                BOOL,fForward, IEnumMoniker**,ppenumMoniker) \
     ICOM_METHOD1(HRESULT,IsEqual,             IMoniker*,pmkOtherMoniker) \
     ICOM_METHOD1(HRESULT,Hash,                DWORD*,pdwHash) \
     ICOM_METHOD3(HRESULT,IsRunning,           IBindCtx*,pbc, IMoniker*,pmkToLeft, IMoniker*,pmkNewlyRunning) \
@@ -192,8 +191,8 @@ typedef enum tagMKREDUCE
     ICOM_METHOD1(HRESULT,Inverse,             IMoniker**,ppmk) \
     ICOM_METHOD2(HRESULT,CommonPrefixWith,    IMoniker*,pmkOtherMoniker, IMoniker**,ppmkPrefix) \
     ICOM_METHOD2(HRESULT,RelativePathTo,      IMoniker*,pmkOther, IMoniker**,ppmkRelPath) \
-    ICOM_METHOD3(HRESULT,GetDisplayName,      IBindCtx*,pbc, IMoniker*,pmkToLeft, LPOLESTR32*,ppszDisplayName) \
-    ICOM_METHOD5(HRESULT,ParseDisplayName,    IBindCtx*,pbc, IMoniker*,pmkToLeft, LPOLESTR32,pszDisplayName, ULONG*,pchEaten, IMoniker**,ppmkOut) \
+    ICOM_METHOD3(HRESULT,GetDisplayName,      IBindCtx*,pbc, IMoniker*,pmkToLeft, LPOLESTR*,ppszDisplayName) \
+    ICOM_METHOD5(HRESULT,ParseDisplayName,    IBindCtx*,pbc, IMoniker*,pmkToLeft, LPOLESTR,pszDisplayName, ULONG*,pchEaten, IMoniker**,ppmkOut) \
     ICOM_METHOD1(HRESULT,IsSystemMoniker,     DWORD*,pdwMksys)
 #define IMoniker_IMETHODS \
     IPersistStream_IMETHODS \
@@ -241,12 +240,10 @@ HRESULT WINAPI CreateAntiMoniker(LPMONIKER* ppmk);
 HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, LPMONIKER* ppmk);
 
 HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName, LPMONIKER* ppmk);
-HRESULT WINAPI CreateFileMoniker32(LPCOLESTR32 lpszPathName, LPMONIKER* ppmk);
-#define CreateFileMoniker WINELIB_NAME(CreateFileMoniker)
+HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER* ppmk);
 
-HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim, LPCOLESTR32  lpszItem, LPMONIKER* ppmk);
-HRESULT WINAPI CreateItemMoniker32(LPCOLESTR32 lpszDelim, LPCOLESTR32  lpszItem, LPMONIKER* ppmk);
-#define CreateItemMoniker WINELIB_NAME(CreateItemMoniker)
+HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim, LPCOLESTR  lpszItem, LPMONIKER* ppmk);
+HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR  lpszItem, LPMONIKER* ppmk);
 
 /* FIXME: not implemented */
 HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite);
@@ -284,9 +281,9 @@ ICOM_DEFINE(IROTData,IUnknown)
 #define IRunnableObject_METHODS \
     ICOM_METHOD1(HRESULT,GetRunningClass,    LPCLSID,lpClsid) \
     ICOM_METHOD1(HRESULT,Run,                IBindCtx*,pbc) \
-    ICOM_METHOD (BOOL32,IsRunning) \
-    ICOM_METHOD2(HRESULT,LockRunning,        BOOL32,fLock, BOOL32,fLastUnlockCloses) \
-    ICOM_METHOD1(HRESULT,SetContainedObject, BOOL32,fContained)
+    ICOM_METHOD (BOOL,IsRunning) \
+    ICOM_METHOD2(HRESULT,LockRunning,        BOOL,fLock, BOOL,fLastUnlockCloses) \
+    ICOM_METHOD1(HRESULT,SetContainedObject, BOOL,fContained)
 #define IRunnableObject_IMETHODS \
     IUnknown_IMETHODS \
     IRunnableObject_METHODS
@@ -346,10 +343,10 @@ ICOM_DEFINE(IRunningObjectTable,IUnknown)
  */
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, DWORD grfMode, OLECHAR32* pwszName, DWORD dwCount, MULTI_QI* pResults);
+HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, DWORD grfMode, OLECHAR* pwszName, DWORD dwCount, MULTI_QI* pResults);
 
 /* FIXME: not implemented */
-HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage32* pstg, DWORD dwCount, MULTI_QI* pResults);
+HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage* pstg, DWORD dwCount, MULTI_QI* pResults);
 
 
 #endif /* __WINE_WINE_OBJ_MONIKER_H */
diff --git a/include/wine/obj_oleaut.h b/include/wine/obj_oleaut.h
index d753ed9bd2f..2e67c2fc546 100644
--- a/include/wine/obj_oleaut.h
+++ b/include/wine/obj_oleaut.h
@@ -159,8 +159,8 @@ struct tagVARIANT {
 		CHAR cVal;
 		USHORT uiVal;
 		ULONG ulVal;
-		INT32 intVal;
-		UINT32 uintVal;
+		INT intVal;
+		UINT uintVal;
 		BYTE bVal;
 		short iVal;
 		long lVal;
@@ -169,7 +169,7 @@ struct tagVARIANT {
 		VARIANT_BOOL boolVal;
 		SCODE scode;
 		DATE date;
-		BSTR32 bstrVal;
+		BSTR bstrVal;
 		CY cyVal;
         /*
         DECIMAL decVal;
@@ -183,8 +183,8 @@ struct tagVARIANT {
 		CHAR* pcVal;
 		USHORT* puiVal;
 		ULONG* pulVal;
-		INT32* pintVal;
-		UINT32* puintVal;
+		INT* pintVal;
+		UINT* puintVal;
 		BYTE* pbVal;
 		short* piVal;
 		long* plVal;
@@ -193,7 +193,7 @@ struct tagVARIANT {
 		VARIANT_BOOL* pboolVal;
 		SCODE* pscode;
 		DATE* pdate;
-		BSTR32* pbstrVal;
+		BSTR* pbstrVal;
 		VARIANT* pvarVal;
 		PVOID byref;
 		CY* pcyVal;
@@ -212,16 +212,16 @@ typedef struct  tagDISPPARAMS
 {
   VARIANTARG* rgvarg;
   DISPID*     rgdispidNamedArgs;
-  UINT32      cArgs;
-  UINT32      cNamedArgs;
+  UINT      cArgs;
+  UINT      cNamedArgs;
 } DISPPARAMS;
 
 typedef struct tagEXCEPINFO {
     WORD  wCode;
     WORD  wReserved;
-    BSTR32  bstrSource;
-    BSTR32  bstrDescription;
-    BSTR32  bstrHelpFile;
+    BSTR  bstrSource;
+    BSTR  bstrDescription;
+    BSTR  bstrHelpFile;
     DWORD dwHelpContext;
     PVOID pvReserved;
     HRESULT (__stdcall *pfnDeferredFillIn)(struct tagEXCEPINFO *);
@@ -233,10 +233,10 @@ typedef struct tagEXCEPINFO {
  */
 #define ICOM_INTERFACE IDispatch
 #define IDispatch_METHODS \
-  ICOM_METHOD1(HRESULT, GetTypeInfoCount, UINT32*, pctinfo); \
-  ICOM_METHOD3(HRESULT, GetTypeInfo, UINT32, iTInfo, LCID, lcid, ITypeInfo**, ppTInfo); \
-  ICOM_METHOD5(HRESULT, GetIDsOfNames, REFIID, riid, LPOLESTR32*, rgszNames, UINT32, cNames, LCID, lcid, DISPID*, rgDispId); \
-  ICOM_METHOD8(HRESULT, Invoke, DISPID, dispIdMember, REFIID, riid, LCID, lcid, WORD, wFlags, DISPPARAMS*, pDispParams, VARIANT*, pVarResult, EXCEPINFO*, pExepInfo, UINT32*, puArgErr); 
+  ICOM_METHOD1(HRESULT, GetTypeInfoCount, UINT*, pctinfo); \
+  ICOM_METHOD3(HRESULT, GetTypeInfo, UINT, iTInfo, LCID, lcid, ITypeInfo**, ppTInfo); \
+  ICOM_METHOD5(HRESULT, GetIDsOfNames, REFIID, riid, LPOLESTR*, rgszNames, UINT, cNames, LCID, lcid, DISPID*, rgDispId); \
+  ICOM_METHOD8(HRESULT, Invoke, DISPID, dispIdMember, REFIID, riid, LCID, lcid, WORD, wFlags, DISPPARAMS*, pDispParams, VARIANT*, pVarResult, EXCEPINFO*, pExepInfo, UINT*, puArgErr); 
 #define IDispatch_IMETHODS \
   ICOM_INHERITS(IDispatch,IUnknown)
 ICOM_DEFINE(IDispatch,IUnknown)
diff --git a/include/wine/obj_olefont.h b/include/wine/obj_olefont.h
index 3ffae6e86b1..8293f2a2a40 100644
--- a/include/wine/obj_olefont.h
+++ b/include/wine/obj_olefont.h
@@ -19,38 +19,38 @@ typedef struct IFont IFont,*LPFONT;
 DEFINE_GUID(IID_IFontDisp, 0xBEF6E003, 0xA874, 0x101A, 0x8B, 0xBA, 0x00, 0xAA, 0x00, 0x30, 0x0C, 0xAB);
 typedef struct IFontDisp IFontDisp,*LPFONTDISP;
 
-typedef TEXTMETRIC32W TEXTMETRICOLE;
+typedef TEXTMETRICW TEXTMETRICOLE;
 
 /*****************************************************************************
  * IFont interface
  */
 #define ICOM_INTERFACE IFont
 #define IFont_METHODS \
-  ICOM_METHOD1(HRESULT, get_Name, BSTR32*, pname); \
-  ICOM_METHOD1(HRESULT, put_Name, BSTR32, name); \
+  ICOM_METHOD1(HRESULT, get_Name, BSTR*, pname); \
+  ICOM_METHOD1(HRESULT, put_Name, BSTR, name); \
   ICOM_METHOD1(HRESULT, get_Size, CY*, psize); \
   ICOM_METHOD1(HRESULT, put_Size, CY, size); \
-  ICOM_METHOD1(HRESULT, get_Bold, BOOL32*, pbold); \
-  ICOM_METHOD1(HRESULT, put_Bold, BOOL32, bold); \
-  ICOM_METHOD1(HRESULT, get_Italic, BOOL32*, pitalic); \
-  ICOM_METHOD1(HRESULT, put_Italic, BOOL32, italic); \
-  ICOM_METHOD1(HRESULT, get_Underline, BOOL32*, punderline); \
-  ICOM_METHOD1(HRESULT, put_Underline, BOOL32, underline); \
-  ICOM_METHOD1(HRESULT, get_Strikethrough, BOOL32*, pstrikethrough); \
-  ICOM_METHOD1(HRESULT, put_Strikethrough, BOOL32, strikethrough); \
+  ICOM_METHOD1(HRESULT, get_Bold, BOOL*, pbold); \
+  ICOM_METHOD1(HRESULT, put_Bold, BOOL, bold); \
+  ICOM_METHOD1(HRESULT, get_Italic, BOOL*, pitalic); \
+  ICOM_METHOD1(HRESULT, put_Italic, BOOL, italic); \
+  ICOM_METHOD1(HRESULT, get_Underline, BOOL*, punderline); \
+  ICOM_METHOD1(HRESULT, put_Underline, BOOL, underline); \
+  ICOM_METHOD1(HRESULT, get_Strikethrough, BOOL*, pstrikethrough); \
+  ICOM_METHOD1(HRESULT, put_Strikethrough, BOOL, strikethrough); \
   ICOM_METHOD1(HRESULT, get_Weight, short*, pweight); \
   ICOM_METHOD1(HRESULT, put_Weight, short, weight); \
   ICOM_METHOD1(HRESULT, get_Charset, short*, pcharset); \
   ICOM_METHOD1(HRESULT, put_Charset, short, charset); \
-  ICOM_METHOD1(HRESULT, get_hFont, HFONT32*, phfont); \
-  ICOM_METHOD1(HRESULT, put_hFont, HFONT32, hfont); \
+  ICOM_METHOD1(HRESULT, get_hFont, HFONT*, phfont); \
+  ICOM_METHOD1(HRESULT, put_hFont, HFONT, hfont); \
   ICOM_METHOD1(HRESULT, Clone, IFont**, ppfont); \
   ICOM_METHOD1(HRESULT, IsEqual, IFont*, pFontOther); \
   ICOM_METHOD2(HRESULT, SetRatio, long, cyLogical, long, cyHimetric); \
   ICOM_METHOD1(HRESULT, QueryTextMetrics, TEXTMETRICOLE*, ptm); \
-  ICOM_METHOD1(HRESULT, AddRefHfont, HFONT32, hfont); \
-  ICOM_METHOD1(HRESULT, ReleaseHfont, HFONT32, hfont); \
-  ICOM_METHOD1(HRESULT, SetHdc, HDC32, hdc);     
+  ICOM_METHOD1(HRESULT, AddRefHfont, HFONT, hfont); \
+  ICOM_METHOD1(HRESULT, ReleaseHfont, HFONT, hfont); \
+  ICOM_METHOD1(HRESULT, SetHdc, HDC, hdc);     
 #define IFont_IMETHODS \
   ICOM_INHERITS(IFont,IUnknown)
 ICOM_DEFINE(IFont,IUnknown)
diff --git a/include/wine/obj_propertystorage.h b/include/wine/obj_propertystorage.h
index cec645cda05..1e7de55626d 100644
--- a/include/wine/obj_propertystorage.h
+++ b/include/wine/obj_propertystorage.h
@@ -85,7 +85,7 @@ typedef struct tagPROPSPEC
     union 
     {
         PROPID propid;
-        LPOLESTR32 lpwstr;
+        LPOLESTR lpwstr;
     } u;
 } PROPSPEC;
 
@@ -116,7 +116,7 @@ struct tagSTATPROPSETSTG
  */
 struct tagSTATPROPSTG
 {
-    LPOLESTR32 lpwstrName;
+    LPOLESTR lpwstrName;
     PROPID propid;
     VARTYPE vt;
 };
@@ -270,7 +270,7 @@ typedef struct tagCADATE
 typedef struct tagCABSTR
 {
     ULONG cElems;
-    BSTR32 *pElems;
+    BSTR *pElems;
 } CABSTR;
 
 typedef struct tagCABOOL
@@ -363,9 +363,9 @@ struct tagPROPVARIANT
         CLSID *puuid;
         BLOB blob;
         CLIPDATA *pclipdata;
-        IStream32 *pStream;
-        IStorage32 *pStorage;
-        BSTR32 bstrVal;
+        IStream *pStream;
+        IStorage *pStorage;
+        BSTR bstrVal;
         LPSTR pszVal;
         LPWSTR pwszVal;
         CAUB caub;
@@ -397,8 +397,8 @@ struct tagPROPVARIANT
     ICOM_METHOD3(HRESULT,ReadMultiple,        ULONG,cpspec, const PROPSPEC*,rgpspec, PROPVARIANT*,rgpropvar); \
     ICOM_METHOD4(HRESULT,WriteMultiple,       ULONG,cpspec, const PROPSPEC*,rgpspec, const PROPVARIANT*,rgpropvar, PROPID,propidNameFirst); \
     ICOM_METHOD2(HRESULT,DeleteMultiple,      ULONG,cpspec, const PROPSPEC*,rgpspec); \
-    ICOM_METHOD2(HRESULT,ReadPropertyNames,   const PROPID*,rgpropid, LPOLESTR32*,rglpwstrName); \
-    ICOM_METHOD3(HRESULT,WritePropertyNames,  ULONG,cpropid, const PROPID*,rgpropid, LPOLESTR32*,rglpwstrName); \
+    ICOM_METHOD2(HRESULT,ReadPropertyNames,   const PROPID*,rgpropid, LPOLESTR*,rglpwstrName); \
+    ICOM_METHOD3(HRESULT,WritePropertyNames,  ULONG,cpropid, const PROPID*,rgpropid, LPOLESTR*,rglpwstrName); \
     ICOM_METHOD2(HRESULT,DeletePropertyNames, ULONG,cpropid, const PROPID*,rgpropid); \
     ICOM_METHOD1(HRESULT,Commit,              DWORD,grfCommitFlags); \
     ICOM_METHOD (HRESULT,Revert); \
diff --git a/include/wine/obj_shelllink.h b/include/wine/obj_shelllink.h
index b2ee72e6d92..d31f268805e 100644
--- a/include/wine/obj_shelllink.h
+++ b/include/wine/obj_shelllink.h
@@ -41,23 +41,23 @@ typedef enum
  */
 #define ICOM_INTERFACE IShellLink
 #define IShellLink_METHODS \
-    ICOM_METHOD4( HRESULT, GetPath, LPSTR, pszFile, INT32, cchMaxPath, WIN32_FIND_DATA32A *, pfd, DWORD, fFlags) \
+    ICOM_METHOD4( HRESULT, GetPath, LPSTR, pszFile, INT, cchMaxPath, WIN32_FIND_DATAA *, pfd, DWORD, fFlags) \
     ICOM_METHOD1( HRESULT, GetIDList, LPITEMIDLIST *, ppidl) \
     ICOM_METHOD1( HRESULT, SetIDList, LPCITEMIDLIST, pidl) \
-    ICOM_METHOD2( HRESULT, GetDescription, LPSTR, pszName, INT32, cchMaxName) \
+    ICOM_METHOD2( HRESULT, GetDescription, LPSTR, pszName, INT, cchMaxName) \
     ICOM_METHOD1( HRESULT, SetDescription, LPCSTR, pszName) \
-    ICOM_METHOD2( HRESULT, GetWorkingDirectory, LPSTR, pszDir,INT32, cchMaxPath) \
+    ICOM_METHOD2( HRESULT, GetWorkingDirectory, LPSTR, pszDir,INT, cchMaxPath) \
     ICOM_METHOD1( HRESULT, SetWorkingDirectory, LPCSTR, pszDir) \
-    ICOM_METHOD2( HRESULT, GetArguments, LPSTR, pszArgs, INT32, cchMaxPath) \
+    ICOM_METHOD2( HRESULT, GetArguments, LPSTR, pszArgs, INT, cchMaxPath) \
     ICOM_METHOD1( HRESULT, SetArguments, LPCSTR, pszArgs) \
     ICOM_METHOD1( HRESULT, GetHotkey, WORD*, pwHotkey) \
     ICOM_METHOD1( HRESULT, SetHotkey, WORD, wHotkey) \
-    ICOM_METHOD1( HRESULT, GetShowCmd, INT32*, piShowCmd) \
-    ICOM_METHOD1( HRESULT, SetShowCmd, INT32, iShowCmd) \
-    ICOM_METHOD3( HRESULT, GetIconLocation, LPSTR, pszIconPath, INT32, cchIconPath,INT32 *, piIcon) \
-    ICOM_METHOD2( HRESULT, SetIconLocation, LPCSTR, pszIconPath,INT32, iIcon) \
+    ICOM_METHOD1( HRESULT, GetShowCmd, INT*, piShowCmd) \
+    ICOM_METHOD1( HRESULT, SetShowCmd, INT, iShowCmd) \
+    ICOM_METHOD3( HRESULT, GetIconLocation, LPSTR, pszIconPath, INT, cchIconPath,INT *, piIcon) \
+    ICOM_METHOD2( HRESULT, SetIconLocation, LPCSTR, pszIconPath,INT, iIcon) \
     ICOM_METHOD2( HRESULT, SetRelativePath, LPCSTR, pszPathRel, DWORD, dwReserved) \
-    ICOM_METHOD2( HRESULT, Resolve, HWND32, hwnd, DWORD, fFlags) \
+    ICOM_METHOD2( HRESULT, Resolve, HWND, hwnd, DWORD, fFlags) \
     ICOM_METHOD1( HRESULT, SetPath, LPCSTR, pszFile)
 #define IShellLink_IMETHODS \
     IUnknown_IMETHODS \
@@ -96,23 +96,23 @@ ICOM_DEFINE(IShellLink,IUnknown)
  */
 #define ICOM_INTERFACE IShellLinkW
 #define IShellLinkW_METHODS \
-    ICOM_METHOD4( HRESULT, GetPath, LPWSTR, pszFile, INT32, cchMaxPath, WIN32_FIND_DATA32A *, pfd, DWORD, fFlags) \
+    ICOM_METHOD4( HRESULT, GetPath, LPWSTR, pszFile, INT, cchMaxPath, WIN32_FIND_DATAA *, pfd, DWORD, fFlags) \
     ICOM_METHOD1( HRESULT, GetIDList, LPITEMIDLIST *, ppidl) \
     ICOM_METHOD1( HRESULT, SetIDList, LPCITEMIDLIST, pidl) \
-    ICOM_METHOD2( HRESULT, GetDescription, LPWSTR, pszName, INT32, cchMaxName) \
+    ICOM_METHOD2( HRESULT, GetDescription, LPWSTR, pszName, INT, cchMaxName) \
     ICOM_METHOD1( HRESULT, SetDescription, LPCWSTR, pszName) \
-    ICOM_METHOD2( HRESULT, GetWorkingDirectory, LPWSTR, pszDir,INT32, cchMaxPath) \
+    ICOM_METHOD2( HRESULT, GetWorkingDirectory, LPWSTR, pszDir,INT, cchMaxPath) \
     ICOM_METHOD1( HRESULT, SetWorkingDirectory, LPCWSTR, pszDir) \
-    ICOM_METHOD2( HRESULT, GetArguments, LPWSTR, pszArgs, INT32, cchMaxPath) \
+    ICOM_METHOD2( HRESULT, GetArguments, LPWSTR, pszArgs, INT, cchMaxPath) \
     ICOM_METHOD1( HRESULT, SetArguments, LPCWSTR, pszArgs) \
     ICOM_METHOD1( HRESULT, GetHotkey, WORD*, pwHotkey) \
     ICOM_METHOD1( HRESULT, SetHotkey, WORD, wHotkey) \
-    ICOM_METHOD1( HRESULT, GetShowCmd, INT32*, piShowCmd) \
-    ICOM_METHOD1( HRESULT, SetShowCmd, INT32, iShowCmd) \
-    ICOM_METHOD3( HRESULT, GetIconLocation, LPWSTR, pszIconPath, INT32, cchIconPath,INT32 *, piIcon) \
-    ICOM_METHOD2( HRESULT, SetIconLocation, LPCWSTR, pszIconPath,INT32, iIcon) \
+    ICOM_METHOD1( HRESULT, GetShowCmd, INT*, piShowCmd) \
+    ICOM_METHOD1( HRESULT, SetShowCmd, INT, iShowCmd) \
+    ICOM_METHOD3( HRESULT, GetIconLocation, LPWSTR, pszIconPath, INT, cchIconPath,INT *, piIcon) \
+    ICOM_METHOD2( HRESULT, SetIconLocation, LPCWSTR, pszIconPath,INT, iIcon) \
     ICOM_METHOD2( HRESULT, SetRelativePath, LPCWSTR, pszPathRel, DWORD, dwReserved) \
-    ICOM_METHOD2( HRESULT, Resolve, HWND32, hwnd, DWORD, fFlags) \
+    ICOM_METHOD2( HRESULT, Resolve, HWND, hwnd, DWORD, fFlags) \
     ICOM_METHOD1( HRESULT, SetPath, LPCWSTR, pszFile)
 #define IShellLinkW_IMETHODS \
     IUnknown_IMETHODS \
diff --git a/include/wine/obj_storage.h b/include/wine/obj_storage.h
index a698e7ede28..63f230267dc 100644
--- a/include/wine/obj_storage.h
+++ b/include/wine/obj_storage.h
@@ -15,8 +15,7 @@
  * Predeclare the structures
  */
 typedef LPOLESTR16 *SNB16;
-typedef LPOLESTR32 *SNB32;
-DECL_WINELIB_TYPE(SNB)
+typedef LPOLESTR *SNB;
 
 typedef struct STATSTG STATSTG;
 
@@ -59,15 +58,11 @@ typedef struct ISequentialStream ISequentialStream,*LPSEQUENTIALSTREAM;
 
 DEFINE_OLEGUID(IID_IStorage,		0x0000000bL, 0, 0);
 typedef struct IStorage16 IStorage16,*LPSTORAGE16;
-typedef struct IStorage32 IStorage32,*LPSTORAGE32;
-DECL_WINELIB_TYPE(IStorage)
-DECL_WINELIB_TYPE(LPSTORAGE)
+typedef struct IStorage IStorage,*LPSTORAGE;
 
 DEFINE_OLEGUID(IID_IStream,		0x0000000cL, 0, 0);
 typedef struct IStream16 IStream16,*LPSTREAM16;
-typedef struct IStream32 IStream32,*LPSTREAM32;
-DECL_WINELIB_TYPE(IStream)
-DECL_WINELIB_TYPE(LPSTREAM)
+typedef struct IStream IStream,*LPSTREAM;
 
 
 /*****************************************************************************
@@ -172,7 +167,7 @@ ICOM_DEFINE(IEnumSTATSTG,IUnknown)
     ICOM_METHOD3(HRESULT,FillAppend,  const void*,pv, ULONG,cb, ULONG*,pcbWritten) \
     ICOM_METHOD4(HRESULT,FillAt,      ULARGE_INTEGER,ulOffset, const void*,pv, ULONG,cb, ULONG*,pcbWritten) \
     ICOM_METHOD1(HRESULT,SetFillSize, ULARGE_INTEGER,ulSize) \
-    ICOM_METHOD1(HRESULT,Terminate,   BOOL32,bCanceled)
+    ICOM_METHOD1(HRESULT,Terminate,   BOOL,bCanceled)
 #define IFillLockBytes_IMETHODS \
     IUnknown_IMETHODS \
     IFillLockBytes_METHODS
@@ -292,10 +287,10 @@ ICOM_DEFINE(IPersist,IUnknown)
 #define ICOM_INTERFACE IPersistFile
 #define IPersistFile_METHODS \
     ICOM_CMETHOD (HRESULT,IsDirty) \
-    ICOM_METHOD2 (HRESULT,Load,          LPCOLESTR32,pszFileName, DWORD,dwMode) \
-    ICOM_METHOD2 (HRESULT,Save,          LPCOLESTR32,pszFileName, BOOL32,fRemember) \
-    ICOM_METHOD1 (HRESULT,SaveCompleted, LPCOLESTR32,pszFileName) \
-    ICOM_CMETHOD1(HRESULT,GetCurFile,    LPOLESTR32*,ppszFileName)
+    ICOM_METHOD2 (HRESULT,Load,          LPCOLESTR,pszFileName, DWORD,dwMode) \
+    ICOM_METHOD2 (HRESULT,Save,          LPCOLESTR,pszFileName, BOOL,fRemember) \
+    ICOM_METHOD1 (HRESULT,SaveCompleted, LPCOLESTR,pszFileName) \
+    ICOM_CMETHOD1(HRESULT,GetCurFile,    LPOLESTR*,ppszFileName)
 #define IPersistFile_IMETHODS \
     IPersist_IMETHODS \
     IPersistFile_METHODS
@@ -324,10 +319,10 @@ ICOM_DEFINE(IPersistFile,IPersist)
 #define ICOM_INTERFACE IPersistStorage
 #define IPersistStorage_METHODS \
     ICOM_METHOD (HRESULT,IsDirty) \
-    ICOM_METHOD1(HRESULT,InitNew,        IStorage32*,pStg) \
-    ICOM_METHOD1(HRESULT,Load,           IStorage32*,pStg) \
-    ICOM_METHOD2(HRESULT,Save,           IStorage32*,pStg, BOOL32,fSameAsLoad) \
-    ICOM_METHOD1(HRESULT,SaveCompleted,  IStorage32*,pStgNew) \
+    ICOM_METHOD1(HRESULT,InitNew,        IStorage*,pStg) \
+    ICOM_METHOD1(HRESULT,Load,           IStorage*,pStg) \
+    ICOM_METHOD2(HRESULT,Save,           IStorage*,pStg, BOOL,fSameAsLoad) \
+    ICOM_METHOD1(HRESULT,SaveCompleted,  IStorage*,pStgNew) \
 		ICOM_METHOD (HRESULT,HandsOffStorage)
 #define IPersistStorage_IMETHODS \
     IPersist_IMETHODS \
@@ -358,8 +353,8 @@ ICOM_DEFINE(IPersistStorage,IPersist)
 #define ICOM_INTERFACE IPersistStream
 #define IPersistStream_METHODS \
     ICOM_METHOD (HRESULT,IsDirty) \
-    ICOM_METHOD1(HRESULT,Load,       IStream32*,pStm) \
-    ICOM_METHOD2(HRESULT,Save,       IStream32*,pStm, BOOL32,fClearDirty) \
+    ICOM_METHOD1(HRESULT,Load,       IStream*,pStm) \
+    ICOM_METHOD2(HRESULT,Save,       IStream*,pStm, BOOL,fClearDirty) \
     ICOM_METHOD1(HRESULT,GetSizeMax, ULARGE_INTEGER*,pcbSize)
 #define IPersistStream_IMETHODS \
     IPersist_IMETHODS \
@@ -387,7 +382,7 @@ ICOM_DEFINE(IPersistStream,IPersist)
  */
 #define ICOM_INTERFACE IProgressNotify
 #define IProgressNotify_METHODS \
-    ICOM_METHOD4(HRESULT,OnProgress, DWORD,dwProgressCurrent, DWORD,dwProgressMaximum, BOOL32,fAccurate, BOOL32,fOwner)
+    ICOM_METHOD4(HRESULT,OnProgress, DWORD,dwProgressCurrent, DWORD,dwProgressMaximum, BOOL,fAccurate, BOOL,fOwner)
 #define IProgressNotify_IMETHODS \
     IUnknown_IMETHODS \
     IProgressNotify_METHODS
@@ -409,7 +404,7 @@ ICOM_DEFINE(IProgressNotify,IUnknown)
  */
 #define ICOM_INTERFACE IRootStorage
 #define IRootStorage_METHODS \
-    ICOM_METHOD1(HRESULT,SwitchToFile, LPOLESTR32,pszFile)
+    ICOM_METHOD1(HRESULT,SwitchToFile, LPOLESTR,pszFile)
 #define IRootStorage_IMETHODS \
     IUnknown_IMETHODS \
     IRootStorage_METHODS
@@ -500,50 +495,50 @@ ICOM_DEFINE(IStorage16,IUnknown)
 #endif
 
 
-#define ICOM_INTERFACE IStorage32
-#define IStorage32_METHODS \
-    ICOM_METHOD5(HRESULT,CreateStream,   LPCOLESTR32,pwcsName, DWORD,grfMode, DWORD,reserved1, DWORD,reserved2, IStream32**,ppstm) \
-    ICOM_METHOD5(HRESULT,OpenStream,     LPCOLESTR32,pwcsName, void*,reserved1, DWORD,grfMode, DWORD,reserved2, IStream32**,ppstm) \
-    ICOM_METHOD5(HRESULT,CreateStorage,  LPCOLESTR32,pwcsName, DWORD,grfMode, DWORD,dwStgFmt, DWORD,reserved2, IStorage32**,ppstg) \
-    ICOM_METHOD6(HRESULT,OpenStorage,    LPCOLESTR32,pwcsName, IStorage32*,pstgPriority, DWORD,grfMode, SNB32,snb16Exclude, DWORD,reserved, IStorage32**,ppstg) \
-    ICOM_METHOD4(HRESULT,CopyTo,         DWORD,ciidExclude, const IID*,rgiidExclude, SNB32,snb16Exclude, IStorage32*,pstgDest) \
-    ICOM_METHOD4(HRESULT,MoveElementTo,  LPCOLESTR32,pwcsName, IStorage32*,pstgDest, LPCOLESTR32,pwcsNewName, DWORD,grfFlags) \
+#define ICOM_INTERFACE IStorage
+#define IStorage_METHODS \
+    ICOM_METHOD5(HRESULT,CreateStream,   LPCOLESTR,pwcsName, DWORD,grfMode, DWORD,reserved1, DWORD,reserved2, IStream**,ppstm) \
+    ICOM_METHOD5(HRESULT,OpenStream,     LPCOLESTR,pwcsName, void*,reserved1, DWORD,grfMode, DWORD,reserved2, IStream**,ppstm) \
+    ICOM_METHOD5(HRESULT,CreateStorage,  LPCOLESTR,pwcsName, DWORD,grfMode, DWORD,dwStgFmt, DWORD,reserved2, IStorage**,ppstg) \
+    ICOM_METHOD6(HRESULT,OpenStorage,    LPCOLESTR,pwcsName, IStorage*,pstgPriority, DWORD,grfMode, SNB,snb16Exclude, DWORD,reserved, IStorage**,ppstg) \
+    ICOM_METHOD4(HRESULT,CopyTo,         DWORD,ciidExclude, const IID*,rgiidExclude, SNB,snb16Exclude, IStorage*,pstgDest) \
+    ICOM_METHOD4(HRESULT,MoveElementTo,  LPCOLESTR,pwcsName, IStorage*,pstgDest, LPCOLESTR,pwcsNewName, DWORD,grfFlags) \
     ICOM_METHOD1(HRESULT,Commit,         DWORD,grfCommitFlags) \
     ICOM_METHOD (HRESULT,Revert) \
     ICOM_METHOD4(HRESULT,EnumElements,   DWORD,reserved1, void*,reserved2, DWORD,reserved3, IEnumSTATSTG**,ppenum) \
-    ICOM_METHOD1(HRESULT,DestroyElement, LPCOLESTR32,pwcsName) \
-    ICOM_METHOD2(HRESULT,RenameElement,  LPCOLESTR32,pwcsOldName, LPCOLESTR32,pwcsNewName) \
-    ICOM_METHOD4(HRESULT,SetElementTimes,LPCOLESTR32,pwcsName, const FILETIME*,pctime, const FILETIME*,patime, const FILETIME*,pmtime) \
+    ICOM_METHOD1(HRESULT,DestroyElement, LPCOLESTR,pwcsName) \
+    ICOM_METHOD2(HRESULT,RenameElement,  LPCOLESTR,pwcsOldName, LPCOLESTR,pwcsNewName) \
+    ICOM_METHOD4(HRESULT,SetElementTimes,LPCOLESTR,pwcsName, const FILETIME*,pctime, const FILETIME*,patime, const FILETIME*,pmtime) \
     ICOM_METHOD1(HRESULT,SetClass,       REFCLSID,clsid) \
     ICOM_METHOD2(HRESULT,SetStateBits,   DWORD,grfStateBits, DWORD,grfMask) \
     ICOM_METHOD2(HRESULT,Stat,           STATSTG*,pstatstg, DWORD,grfStatFlag)
-#define IStorage32_IMETHODS \
+#define IStorage_IMETHODS \
     IUnknown_IMETHODS \
-    IStorage32_METHODS
-ICOM_DEFINE(IStorage32,IUnknown)
+    IStorage_METHODS
+ICOM_DEFINE(IStorage,IUnknown)
 #undef ICOM_INTERFACE
 
 #ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
-#define IStorage32_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
-#define IStorage32_AddRef(p)             ICOM_CALL (AddRef,p)
-#define IStorage32_Release(p)            ICOM_CALL (Release,p)
+#define IStorage_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
+#define IStorage_AddRef(p)             ICOM_CALL (AddRef,p)
+#define IStorage_Release(p)            ICOM_CALL (Release,p)
 /*** IStorage32 methods ***/
-#define IStorage32_CreateStream(p,a,b,c,d,e)  ICOM_CALL5(CreateStream,p,a,b,c,d,e)
-#define IStorage32_OpenStream(p,a,b,c,d,e)    ICOM_CALL5(OpenStream,p,a,b,c,d,e)
-#define IStorage32_CreateStorage(p,a,b,c,d,e) ICOM_CALL5(CreateStorage,p,a,b,c,d,e)
-#define IStorage32_OpenStorage(p,a,b,c,d,e,f) ICOM_CALL6(OpenStorage,p,a,b,c,d,e,f)
-#define IStorage32_CopyTo(p,a,b,c,d)          ICOM_CALL4(CopyTo,p,a,b,c,d)
-#define IStorage32_MoveElementTo(p,a,b,c,d)   ICOM_CALL4(MoveElementTo,p,a,b,c,d)
-#define IStorage32_Commit(p,a)                ICOM_CALL1(Commit,p,a)
-#define IStorage32_Revert(p)                  ICOM_CALL (Revert,p)
-#define IStorage32_EnumElements(p,a,b,c,d)    ICOM_CALL4(EnumElements,p,a,b,c,d)
-#define IStorage32_DestroyElement(p,a)        ICOM_CALL1(DestroyElement,p,a)
-#define IStorage32_RenameElement(p,a,b)       ICOM_CALL2(RenameElement,p,a,b)
-#define IStorage32_SetElementTimes(p,a,b,c,d) ICOM_CALL4(SetElementTimes,p,a,b,c,d)
-#define IStorage32_SetClass(p,a)              ICOM_CALL1(SetClass,p,a)
-#define IStorage32_SetStateBits(p,a,b)        ICOM_CALL2(SetStateBits,p,a,b)
-#define IStorage32_Stat(p,a,b)                ICOM_CALL2(Stat,p,a,b)
+#define IStorage_CreateStream(p,a,b,c,d,e)  ICOM_CALL5(CreateStream,p,a,b,c,d,e)
+#define IStorage_OpenStream(p,a,b,c,d,e)    ICOM_CALL5(OpenStream,p,a,b,c,d,e)
+#define IStorage_CreateStorage(p,a,b,c,d,e) ICOM_CALL5(CreateStorage,p,a,b,c,d,e)
+#define IStorage_OpenStorage(p,a,b,c,d,e,f) ICOM_CALL6(OpenStorage,p,a,b,c,d,e,f)
+#define IStorage_CopyTo(p,a,b,c,d)          ICOM_CALL4(CopyTo,p,a,b,c,d)
+#define IStorage_MoveElementTo(p,a,b,c,d)   ICOM_CALL4(MoveElementTo,p,a,b,c,d)
+#define IStorage_Commit(p,a)                ICOM_CALL1(Commit,p,a)
+#define IStorage_Revert(p)                  ICOM_CALL (Revert,p)
+#define IStorage_EnumElements(p,a,b,c,d)    ICOM_CALL4(EnumElements,p,a,b,c,d)
+#define IStorage_DestroyElement(p,a)        ICOM_CALL1(DestroyElement,p,a)
+#define IStorage_RenameElement(p,a,b)       ICOM_CALL2(RenameElement,p,a,b)
+#define IStorage_SetElementTimes(p,a,b,c,d) ICOM_CALL4(SetElementTimes,p,a,b,c,d)
+#define IStorage_SetClass(p,a)              ICOM_CALL1(SetClass,p,a)
+#define IStorage_SetStateBits(p,a,b)        ICOM_CALL2(SetStateBits,p,a,b)
+#define IStorage_Stat(p,a,b)                ICOM_CALL2(Stat,p,a,b)
 
 #ifndef __WINE__
 /* Duplicated for WINELIB */
@@ -612,41 +607,41 @@ ICOM_DEFINE(IStream16,ISequentialStream)
 #endif
 
 
-#define ICOM_INTERFACE IStream32
-#define IStream32_METHODS \
+#define ICOM_INTERFACE IStream
+#define IStream_METHODS \
     ICOM_METHOD3(HRESULT,Seek,        LARGE_INTEGER,dlibMove, DWORD,dwOrigin, ULARGE_INTEGER*,plibNewPosition) \
     ICOM_METHOD1(HRESULT,SetSize,     ULARGE_INTEGER,libNewSize) \
-    ICOM_METHOD4(HRESULT,CopyTo,      IStream32*,pstm, ULARGE_INTEGER,cb, ULARGE_INTEGER*,pcbRead, ULARGE_INTEGER*,pcbWritten) \
+    ICOM_METHOD4(HRESULT,CopyTo,      IStream*,pstm, ULARGE_INTEGER,cb, ULARGE_INTEGER*,pcbRead, ULARGE_INTEGER*,pcbWritten) \
     ICOM_METHOD1(HRESULT,Commit,      DWORD,grfCommitFlags) \
     ICOM_METHOD (HRESULT,Revert) \
     ICOM_METHOD3(HRESULT,LockRegion,  ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType) \
     ICOM_METHOD3(HRESULT,UnlockRegion,ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType) \
     ICOM_METHOD2(HRESULT,Stat,        STATSTG*,pstatstg, DWORD,grfStatFlag) \
-    ICOM_METHOD1(HRESULT,Clone,       IStream32**,ppstm)
-#define IStream32_IMETHODS \
+    ICOM_METHOD1(HRESULT,Clone,       IStream**,ppstm)
+#define IStream_IMETHODS \
     ISequentialStream_IMETHODS \
-    IStream32_METHODS
-ICOM_DEFINE(IStream32,ISequentialStream)
+    IStream_METHODS
+ICOM_DEFINE(IStream,ISequentialStream)
 #undef ICOM_INTERFACE
 
 #ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
-#define IStream32_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
-#define IStream32_AddRef(p)             ICOM_CALL (AddRef,p)
-#define IStream32_Release(p)            ICOM_CALL (Release,p)
+#define IStream_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
+#define IStream_AddRef(p)             ICOM_CALL (AddRef,p)
+#define IStream_Release(p)            ICOM_CALL (Release,p)
 /*** ISequentialStream methods ***/
-#define IStream32_Read(p,a,b,c)  ICOM_CALL3(Read,p,a,b,c)
-#define IStream32_Write(p,a,b,c) ICOM_CALL3(Write,p,a,b,c)
+#define IStream_Read(p,a,b,c)  ICOM_CALL3(Read,p,a,b,c)
+#define IStream_Write(p,a,b,c) ICOM_CALL3(Write,p,a,b,c)
 /*** IStream32 methods ***/
-#define IStream32_Seek(p,a,b,c)         ICOM_CALL3(Seek,p,a,b,c)
-#define IStream32_SetSize(p,a)          ICOM_CALL1(SetSize,p,a)
-#define IStream32_CopyTo(pa,b,c,d)      ICOM_CALL4(CopyTo,pa,b,c,d)
-#define IStream32_Commit(p,a)           ICOM_CALL1(Commit,p,a)
-#define IStream32_Revert(p)             ICOM_CALL (Revert,p)
-#define IStream32_LockRegion(pa,b,c)    ICOM_CALL3(LockRegion,pa,b,c)
-#define IStream32_UnlockRegion(p,a,b,c) ICOM_CALL3(UnlockRegion,p,a,b,c)
-#define IStream32_Stat(p,a,b)           ICOM_CALL2(Stat,p,a,b)
-#define IStream32_Clone(p,a)            ICOM_CALL1(Clone,p,a)
+#define IStream_Seek(p,a,b,c)         ICOM_CALL3(Seek,p,a,b,c)
+#define IStream_SetSize(p,a)          ICOM_CALL1(SetSize,p,a)
+#define IStream_CopyTo(pa,b,c,d)      ICOM_CALL4(CopyTo,pa,b,c,d)
+#define IStream_Commit(p,a)           ICOM_CALL1(Commit,p,a)
+#define IStream_Revert(p)             ICOM_CALL (Revert,p)
+#define IStream_LockRegion(pa,b,c)    ICOM_CALL3(LockRegion,pa,b,c)
+#define IStream_UnlockRegion(p,a,b,c) ICOM_CALL3(UnlockRegion,p,a,b,c)
+#define IStream_Stat(p,a,b)           ICOM_CALL2(Stat,p,a,b)
+#define IStream_Clone(p,a)            ICOM_CALL1(Clone,p,a)
 
 #ifndef __WINE__
 /* Duplicated for WINELIB */
@@ -676,19 +671,15 @@ ICOM_DEFINE(IStream32,ISequentialStream)
  */
 /* FIXME: many functions are missing */
 HRESULT WINAPI StgCreateDocFile16(LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved,IStorage16 **ppstgOpen);
-HRESULT WINAPI StgCreateDocfile32(LPCOLESTR32 pwcsName,DWORD grfMode,DWORD reserved,IStorage32 **ppstgOpen);
-#define StgCreateDocfile WINELIB_NAME(StgCreateDocfile)
+HRESULT WINAPI StgCreateDocfile(LPCOLESTR pwcsName,DWORD grfMode,DWORD reserved,IStorage **ppstgOpen);
 
 HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn);
-HRESULT WINAPI StgIsStorageFile32(LPCOLESTR32 fn);
-#define StgIsStorageFile WINELIB_NAME(StgIsStorageFile)
+HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn);
 
 HRESULT WINAPI StgOpenStorage16(const OLECHAR16* pwcsName,IStorage16* pstgPriority,DWORD grfMode,SNB16 snbExclude,DWORD reserved,IStorage16**ppstgOpen);
-HRESULT WINAPI StgOpenStorage32(const OLECHAR32* pwcsName,IStorage32* pstgPriority,DWORD grfMode,SNB32 snbExclude,DWORD reserved,IStorage32**ppstgOpen);
-#define StgOpenStorage WINELIB_NAME(StgOpenStorage)
+HRESULT WINAPI StgOpenStorage(const OLECHAR* pwcsName,IStorage* pstgPriority,DWORD grfMode,SNB snbExclude,DWORD reserved,IStorage**ppstgOpen);
 
-HRESULT WINAPI WriteClassStg32(IStorage32* pStg, REFCLSID rclsid);
-#define WriteClassStg WINELIB_NAME(WriteClassStg)
+HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid);
 
 
 /*****************************************************************************
@@ -696,10 +687,10 @@ HRESULT WINAPI WriteClassStg32(IStorage32* pStg, REFCLSID rclsid);
  */
 
 /* FIXME: not implemented */
-BOOL32 WINAPI CoDosDateTimeToFileTime(WORD nDosDate, WORD nDosTime, FILETIME* lpFileTime);
+BOOL WINAPI CoDosDateTimeToFileTime(WORD nDosDate, WORD nDosTime, FILETIME* lpFileTime);
 
 /* FIXME: not implemented */
-BOOL32 WINAPI CoFileTimeToDosDateTime(FILETIME* lpFileTime, WORD* lpDosDate, WORD* lpDosTime);
+BOOL WINAPI CoFileTimeToDosDateTime(FILETIME* lpFileTime, WORD* lpDosDate, WORD* lpDosTime);
 
 
 #endif /* __WINE_WINE_OBJ_STORAGE_H */
diff --git a/include/wine/shell16.h b/include/wine/shell16.h
index be924b59bae..629d0164bae 100644
--- a/include/wine/shell16.h
+++ b/include/wine/shell16.h
@@ -2,8 +2,7 @@
 #define _SHELL16_H
 
 BOOL16      WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
-BOOL32      WINAPI AboutDlgProc32(HWND32,UINT32,WPARAM32,LPARAM);
-#define     AboutDlgProc WINELIB_NAME(AboutDlgProc)
+BOOL      WINAPI AboutDlgProc(HWND,UINT,WPARAM,LPARAM);
 
 
 #endif /* _SHELL16_H */
diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h
index 00c28dbc6e7..3d44d1f85e8 100644
--- a/include/wine/winbase16.h
+++ b/include/wine/winbase16.h
@@ -41,69 +41,69 @@ HLOCAL16    WINAPI LocalAlloc16(UINT16,WORD);
 LPVOID      WINAPI LockResource16(HGLOBAL16);
 
 #ifdef __WINE__
-WORD        WINAPI AllocCStoDSAlias(WORD);
-WORD        WINAPI AllocDStoCSAlias(WORD);
-HGLOBAL16   WINAPI AllocResource(HINSTANCE16,HRSRC16,DWORD);
-WORD        WINAPI AllocSelector(WORD);
-WORD        WINAPI AllocSelectorArray(WORD);
-VOID        WINAPI DirectedYield(HTASK16);
-HGLOBAL16   WINAPI DirectResAlloc(HINSTANCE16,WORD,UINT16);
-HANDLE16    WINAPI FarGetOwner(HGLOBAL16);
-VOID        WINAPI FarSetOwner(HGLOBAL16,HANDLE16);
-FARPROC16   WINAPI FileCDR(FARPROC16);
-WORD        WINAPI FreeSelector(WORD);
-HANDLE16    WINAPI GetAtomHandle(ATOM);
-HANDLE16    WINAPI GetCodeHandle(FARPROC16);
-VOID        WINAPI GetCodeInfo(FARPROC16,SEGINFO*);
-DWORD       WINAPI GetCurrentPDB(void);
+WORD        WINAPI AllocCStoDSAlias16(WORD);
+WORD        WINAPI AllocDStoCSAlias16(WORD);
+HGLOBAL16   WINAPI AllocResource16(HINSTANCE16,HRSRC16,DWORD);
+WORD        WINAPI AllocSelector16(WORD);
+WORD        WINAPI AllocSelectorArray16(WORD);
+VOID        WINAPI DirectedYield16(HTASK16);
+HGLOBAL16   WINAPI DirectResAlloc16(HINSTANCE16,WORD,UINT16);
+HANDLE16    WINAPI FarGetOwner16(HGLOBAL16);
+VOID        WINAPI FarSetOwner16(HGLOBAL16,HANDLE16);
+FARPROC16   WINAPI FileCDR16(FARPROC16);
+WORD        WINAPI FreeSelector16(WORD);
+HANDLE16    WINAPI GetAtomHandle16(ATOM);
+HANDLE16    WINAPI GetCodeHandle16(FARPROC16);
+VOID        WINAPI GetCodeInfo16(FARPROC16,SEGINFO*);
+DWORD       WINAPI GetCurrentPDB16(void);
 HTASK16     WINAPI GetCurrentTask(void);
-SEGPTR      WINAPI GetDOSEnvironment(void);
+SEGPTR      WINAPI GetDOSEnvironment16(void);
 HMODULE16   WINAPI GetExePtr(HANDLE16);
-WORD        WINAPI GetExeVersion(void);
-WORD        WINAPI GetExpWinVer(HMODULE16);
-DWORD       WINAPI GetHeapSpaces(HMODULE16);
-INT16       WINAPI GetInstanceData(HINSTANCE16,WORD,INT16);
-BOOL16      WINAPI GetModuleName(HINSTANCE16,LPSTR,INT16);
-INT16       WINAPI GetModuleUsage(HINSTANCE16);
-UINT16      WINAPI GetNumTasks(void);
-DWORD       WINAPI GetSelectorLimit(WORD);
-FARPROC16   WINAPI GetSetKernelDOSProc(FARPROC16 DosProc);
-HINSTANCE16 WINAPI GetTaskDS(void);
-HQUEUE16    WINAPI GetTaskQueue(HTASK16);
-DWORD       WINAPI GetWinFlags(void);
-DWORD       WINAPI GlobalDOSAlloc(DWORD);
-WORD        WINAPI GlobalDOSFree(WORD);
-void        WINAPI GlobalFreeAll(HGLOBAL16);
-DWORD       WINAPI GlobalHandleNoRIP(WORD);
-HGLOBAL16   WINAPI GlobalLRUNewest(HGLOBAL16);
-HGLOBAL16   WINAPI GlobalLRUOldest(HGLOBAL16);
-VOID        WINAPI GlobalNotify(FARPROC16);
-WORD        WINAPI GlobalPageLock(HGLOBAL16);
-WORD        WINAPI GlobalPageUnlock(HGLOBAL16);
-BOOL16      WINAPI IsSharedSelector(HANDLE16);
-BOOL16      WINAPI IsTask(HTASK16);
-HTASK16     WINAPI IsTaskLocked(void);
-VOID        WINAPI LogError(UINT16, LPVOID);
-VOID        WINAPI LogParamError(UINT16,FARPROC16,LPVOID);
-WORD        WINAPI LocalCountFree(void);
-WORD        WINAPI LocalHandleDelta(WORD);
-WORD        WINAPI LocalHeapSize(void);
-BOOL16      WINAPI LocalInit(HANDLE16,WORD,WORD);
-HMODULE32   WINAPI LoadLibraryEx32W16(LPCSTR,HANDLE16,DWORD);
-FARPROC16   WINAPI LocalNotify(FARPROC16);
-HTASK16     WINAPI LockCurrentTask(BOOL16);
-VOID        WINAPI OldYield(void);
-VOID        WINAPI PostEvent(HTASK16);
-WORD        WINAPI PrestoChangoSelector(WORD,WORD);
-WORD        WINAPI SelectorAccessRights(WORD,WORD,WORD);
-VOID        WINAPI SetPriority(HTASK16,INT16);
-FARPROC16   WINAPI SetResourceHandler(HINSTANCE16,SEGPTR,FARPROC16);
-WORD        WINAPI SetSelectorLimit(WORD,DWORD);
-HQUEUE16    WINAPI SetTaskQueue(HTASK16,HQUEUE16);
-VOID        WINAPI SwitchStackTo(WORD,WORD,WORD);
-BOOL16      WINAPI WaitEvent(HTASK16);
-VOID        WINAPI WriteOutProfiles(VOID);
-VOID        WINAPI hmemcpy(LPVOID,LPCVOID,LONG);
+WORD        WINAPI GetExeVersion16(void);
+WORD        WINAPI GetExpWinVer16(HMODULE16);
+DWORD       WINAPI GetHeapSpaces16(HMODULE16);
+INT16       WINAPI GetInstanceData16(HINSTANCE16,WORD,INT16);
+BOOL16      WINAPI GetModuleName16(HINSTANCE16,LPSTR,INT16);
+INT16       WINAPI GetModuleUsage16(HINSTANCE16);
+UINT16      WINAPI GetNumTasks16(void);
+DWORD       WINAPI GetSelectorLimit16(WORD);
+FARPROC16   WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc);
+HINSTANCE16 WINAPI GetTaskDS16(void);
+HQUEUE16    WINAPI GetTaskQueue16(HTASK16);
+DWORD       WINAPI GetWinFlags16(void);
+DWORD       WINAPI GlobalDOSAlloc16(DWORD);
+WORD        WINAPI GlobalDOSFree16(WORD);
+void        WINAPI GlobalFreeAll16(HGLOBAL16);
+DWORD       WINAPI GlobalHandleNoRIP16(WORD);
+HGLOBAL16   WINAPI GlobalLRUNewest16(HGLOBAL16);
+HGLOBAL16   WINAPI GlobalLRUOldest16(HGLOBAL16);
+VOID        WINAPI GlobalNotify16(FARPROC16);
+WORD        WINAPI GlobalPageLock16(HGLOBAL16);
+WORD        WINAPI GlobalPageUnlock16(HGLOBAL16);
+BOOL16      WINAPI IsSharedSelector16(HANDLE16);
+BOOL16      WINAPI IsTask16(HTASK16);
+HTASK16     WINAPI IsTaskLocked16(void);
+VOID        WINAPI LogError16(UINT16, LPVOID);
+VOID        WINAPI LogParamError16(UINT16,FARPROC16,LPVOID);
+WORD        WINAPI LocalCountFree16(void);
+WORD        WINAPI LocalHandleDelta16(WORD);
+WORD        WINAPI LocalHeapSize16(void);
+BOOL16      WINAPI LocalInit16(HANDLE16,WORD,WORD);
+HMODULE   WINAPI LoadLibraryEx32W16(LPCSTR,HANDLE16,DWORD);
+FARPROC16   WINAPI LocalNotify16(FARPROC16);
+HTASK16     WINAPI LockCurrentTask16(BOOL16);
+VOID        WINAPI OldYield16(void);
+VOID        WINAPI PostEvent16(HTASK16);
+WORD        WINAPI PrestoChangoSelector16(WORD,WORD);
+WORD        WINAPI SelectorAccessRights16(WORD,WORD,WORD);
+VOID        WINAPI SetPriority16(HTASK16,INT16);
+FARPROC16   WINAPI SetResourceHandler16(HINSTANCE16,SEGPTR,FARPROC16);
+WORD        WINAPI SetSelectorLimit16(WORD,DWORD);
+HQUEUE16    WINAPI SetTaskQueue16(HTASK16,HQUEUE16);
+VOID        WINAPI SwitchStackTo16(WORD,WORD,WORD);
+BOOL16      WINAPI WaitEvent16(HTASK16);
+VOID        WINAPI WriteOutProfiles16(VOID);
+VOID        WINAPI hmemcpy16(LPVOID,LPCVOID,LONG);
 #endif  /* __WINE__ */
 
 INT16       WINAPI AccessResource16(HINSTANCE16,HRSRC16);
@@ -117,7 +117,6 @@ ATOM        WINAPI FindAtom16(SEGPTR);
 BOOL16      WINAPI FindClose16(HANDLE16);
 HRSRC16     WINAPI FindResource16(HINSTANCE16,SEGPTR,SEGPTR);
 BOOL16      WINAPI FreeModule16(HMODULE16);
-#define     FreeModule WINELIB_NAME(FreeModule)
 void        WINAPI FreeProcInstance16(FARPROC16);
 BOOL16      WINAPI FreeResource16(HGLOBAL16);
 UINT16      WINAPI GetAtomName16(ATOM,LPSTR,INT16);
@@ -205,7 +204,7 @@ WORD        WINAPI SetSelectorBase(WORD,DWORD);
 /* Extra functions that don't exist in the Windows API */
 
 HPEN16      WINAPI GetSysColorPen16(INT16);
-UINT32      WINAPI WIN16_GetTempDrive(BYTE);
+UINT      WINAPI WIN16_GetTempDrive(BYTE);
 SEGPTR      WINAPI WIN16_LockResource16(HGLOBAL16);
 LONG        WINAPI WIN16_hread(HFILE16,SEGPTR,LONG);
 UINT16      WINAPI WIN16_lread(HFILE16,SEGPTR,UINT16);
diff --git a/include/wine/winesound.h b/include/wine/winesound.h
index 0200bbe664a..78ea0854d5b 100644
--- a/include/wine/winesound.h
+++ b/include/wine/winesound.h
@@ -3,51 +3,36 @@
 
 #include "wintypes.h"
 
-VOID        WINAPI CloseSound(VOID);
+VOID        WINAPI CloseSound16(VOID);
 INT16       WINAPI CountVoiceNotes16(INT16);
-DWORD       WINAPI CountVoiceNotes32(DWORD);
-#define     CountVoiceNotes WINELIB_NAME(CountVoiceNotes)
+DWORD       WINAPI CountVoiceNotes(DWORD);
 LPINT16     WINAPI GetThresholdEvent16(void);
-LPDWORD     WINAPI GetThresholdEvent32(void);
-#define     GetThresholdEvent WINELIB_NAME(GetThresholdEvent)
+LPDWORD     WINAPI GetThresholdEvent(void);
 INT16       WINAPI GetThresholdStatus16(void);
-DWORD       WINAPI GetThresholdStatus32(void);
-#define     GetThresholdStatus WINELIB_NAME(GetThresholdStatus)
+DWORD       WINAPI GetThresholdStatus(void);
 INT16       WINAPI OpenSound16(void);
-VOID        WINAPI OpenSound32(void);
-#define     OpenSound WINELIB_NAME(OpenSound)
+VOID        WINAPI OpenSound(void);
 INT16       WINAPI SetSoundNoise16(INT16,INT16);
-DWORD       WINAPI SetSoundNoise32(DWORD,DWORD);
-#define     SetSoundNoise WINELIB_NAME(SetSoundNoise)
+DWORD       WINAPI SetSoundNoise(DWORD,DWORD);
 INT16       WINAPI SetVoiceAccent16(INT16,INT16,INT16,INT16,INT16);
-DWORD       WINAPI SetVoiceAccent32(DWORD,DWORD,DWORD,DWORD,DWORD);
-#define     SetVoiceAccent WINELIB_NAME(SetVoiceAccent)
+DWORD       WINAPI SetVoiceAccent(DWORD,DWORD,DWORD,DWORD,DWORD);
 INT16       WINAPI SetVoiceEnvelope16(INT16,INT16,INT16);
-DWORD       WINAPI SetVoiceEnvelope32(DWORD,DWORD,DWORD);
-#define     SetVoiceEnvelope WINELIB_NAME(SetVoiceEnvelope)
+DWORD       WINAPI SetVoiceEnvelope(DWORD,DWORD,DWORD);
 INT16       WINAPI SetVoiceNote16(INT16,INT16,INT16,INT16);
-DWORD       WINAPI SetVoiceNote32(DWORD,DWORD,DWORD,DWORD);
-#define     SetVoiceNote WINELIB_NAME(SetVoiceNote)
+DWORD       WINAPI SetVoiceNote(DWORD,DWORD,DWORD,DWORD);
 INT16       WINAPI SetVoiceQueueSize16(INT16,INT16);
-DWORD       WINAPI SetVoiceQueueSize32(DWORD,DWORD);
-#define     SetVoiceQueueSize WINELIB_NAME(SetVoiceQueueSize)
+DWORD       WINAPI SetVoiceQueueSize(DWORD,DWORD);
 INT16       WINAPI SetVoiceSound16(INT16,DWORD,INT16);
-DWORD       WINAPI SetVoiceSound32(DWORD,DWORD,DWORD);
-#define     SetVoiceSound WINELIB_NAME(SetVoiceSound)
+DWORD       WINAPI SetVoiceSound(DWORD,DWORD,DWORD);
 INT16       WINAPI SetVoiceThreshold16(INT16,INT16);
-DWORD       WINAPI SetVoiceThreshold32(DWORD,DWORD);
-#define     SetVoiceThreshold WINELIB_NAME(SetVoiceThreshold)
+DWORD       WINAPI SetVoiceThreshold(DWORD,DWORD);
 INT16       WINAPI StartSound16(void);
-VOID        WINAPI StartSound32(void);
-#define     StartSound WINELIB_NAME(StartSound)
+VOID        WINAPI StartSound(void);
 INT16       WINAPI StopSound16(void);
-VOID        WINAPI StopSound32(void);
-#define     StopSound WINELIB_NAME(StopSound)
+VOID        WINAPI StopSound(void);
 INT16       WINAPI SyncAllVoices16(void);
-DWORD       WINAPI SyncAllVoices32(void);
-#define     SyncAllVoices WINELIB_NAME(SyncAllVoices)
+DWORD       WINAPI SyncAllVoices(void);
 INT16       WINAPI WaitSoundState16(INT16);
-DWORD       WINAPI WaitSoundState32(DWORD);
-#define     WaitSoundState WINELIB_NAME(WaitSoundState)
+DWORD       WINAPI WaitSoundState(DWORD);
 
 #endif /* _WINE_SOUND_H */
diff --git a/include/wine/winestring.h b/include/wine/winestring.h
index ee013312a59..4207588eb15 100644
--- a/include/wine/winestring.h
+++ b/include/wine/winestring.h
@@ -4,17 +4,15 @@
 #include "wintypes.h"
 
 INT16       WINAPI WideCharToLocal16(LPSTR,LPWSTR,INT16);
-INT32       WINAPI WideCharToLocal32(LPSTR,LPWSTR,INT32);
-#define			WideCharToLocal WINELIB_NAME(WideCharToLocal)
+INT       WINAPI WideCharToLocal(LPSTR,LPWSTR,INT);
 INT16       WINAPI LocalToWideChar16(LPWSTR,LPSTR,INT16);
-INT32       WINAPI LocalToWideChar32(LPWSTR,LPSTR,INT32);
-#define			LocalToWideChar WINELIB_NAME(LocalToWideChar)
-INT32       WINAPI lstrncmp32A(LPCSTR,LPCSTR,INT32);
-INT32       WINAPI lstrncmp32W(LPCWSTR,LPCWSTR,INT32);
-INT32       WINAPI lstrncmpi32A(LPCSTR,LPCSTR,INT32);
-INT32       WINAPI lstrncmpi32W(LPCWSTR,LPCWSTR,INT32);
+INT       WINAPI LocalToWideChar(LPWSTR,LPSTR,INT);
+INT       WINAPI lstrncmpA(LPCSTR,LPCSTR,INT);
+INT       WINAPI lstrncmpW(LPCWSTR,LPCWSTR,INT);
+INT       WINAPI lstrncmpiA(LPCSTR,LPCSTR,INT);
+INT       WINAPI lstrncmpiW(LPCWSTR,LPCWSTR,INT);
 LPWSTR      WINAPI lstrcpyAtoW(LPWSTR,LPCSTR);
 LPSTR       WINAPI lstrcpyWtoA(LPSTR,LPCWSTR);
-LPWSTR      WINAPI lstrcpynAtoW(LPWSTR,LPCSTR,INT32);
-LPSTR       WINAPI lstrcpynWtoA(LPSTR,LPCWSTR,INT32);
+LPWSTR      WINAPI lstrcpynAtoW(LPWSTR,LPCSTR,INT);
+LPSTR       WINAPI lstrcpynWtoA(LPSTR,LPCWSTR,INT);
 #endif /* _INCLUDE_WINE_STRINGS_H */
diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h
index 6dabd8e0fb0..8313681da24 100644
--- a/include/wine/winuser16.h
+++ b/include/wine/winuser16.h
@@ -35,8 +35,8 @@ typedef struct
 
 typedef struct
 {
-    UINT32      cbSize;
-    UINT32      style;
+    UINT      cbSize;
+    UINT      style;
     WNDPROC16   lpfnWndProc;
     INT16       cbClsExtra;
     INT16       cbWndExtra;
@@ -63,7 +63,7 @@ typedef struct
 {
     MSG16 msg;
     WORD wParamHigh;
-} MSG16_32, *LPMSG16_32;
+} MSG32_16, *LPMSG16_32;
 
 /* Cursors / Icons */
 
@@ -178,7 +178,7 @@ typedef BOOL16 (CALLBACK *DRAWSTATEPROC16)(HDC16,LPARAM,WPARAM16,INT16,INT16);
 
 typedef struct /* not sure if the 16bit version is correct */
 {
-    UINT32	cbSize;
+    UINT	cbSize;
     HWND16	hwndOwner;
     HINSTANCE16	hInstance;
     SEGPTR	lpszText;
@@ -497,40 +497,40 @@ BOOL16      WINAPI UnhookWindowsHookEx16(HHOOK);
 INT16       WINAPIV wsnprintf16(LPSTR,UINT16,LPCSTR,...);
 INT16       WINAPIV wsprintf16(LPSTR,LPCSTR,...);
 INT16       WINAPI wvsnprintf16(LPSTR,UINT16,LPCSTR,LPCVOID);
-VOID        WINAPI CalcChildScroll(HWND16,WORD);
-VOID        WINAPI CascadeChildWindows(HWND16,WORD);
-INT16       WINAPI CloseComm(INT16);
-HGLOBAL16   WINAPI CreateCursorIconIndirect(HINSTANCE16,CURSORICONINFO*,
+VOID        WINAPI CalcChildScroll16(HWND16,WORD);
+VOID        WINAPI CascadeChildWindows16(HWND16,WORD);
+INT16       WINAPI CloseComm16(INT16);
+HGLOBAL16   WINAPI CreateCursorIconIndirect16(HINSTANCE16,CURSORICONINFO*,
                                             LPCVOID,LPCVOID);
-BOOL16      WINAPI DCHook(HDC16,WORD,DWORD,LPARAM);
-BOOL16      WINAPI DlgDirSelect(HWND16,LPSTR,INT16);
-BOOL16      WINAPI DlgDirSelectComboBox(HWND16,LPSTR,INT16);
-DWORD       WINAPI DumpIcon(SEGPTR,WORD*,SEGPTR*,SEGPTR*);
-BOOL16      WINAPI EnableCommNotification(INT16,HWND16,INT16,INT16);
-BOOL16      WINAPI EnableHardwareInput(BOOL16);
-VOID        WINAPI FillWindow(HWND16,HWND16,HDC16,HBRUSH16);
-INT16       WINAPI FlushComm(INT16,INT16);
-UINT16      WINAPI GetCommEventMask(INT16,UINT16);
-HBRUSH16    WINAPI GetControlBrush(HWND16,HDC16,UINT16);
-HWND16      WINAPI GetDesktopHwnd(void);
-WORD        WINAPI GetIconID(HGLOBAL16,DWORD);
-FARPROC16   WINAPI GetMouseEventProc(void);
-INT16       WINAPI InitApp(HINSTANCE16);
-BOOL16      WINAPI IsUserIdle(void);
-HGLOBAL16   WINAPI LoadCursorIconHandler(HGLOBAL16,HMODULE16,HRSRC16);
-HGLOBAL16   WINAPI LoadDIBCursorHandler(HGLOBAL16,HMODULE16,HRSRC16);
-HGLOBAL16   WINAPI LoadDIBIconHandler(HGLOBAL16,HMODULE16,HRSRC16);
-HICON16     WINAPI LoadIconHandler(HGLOBAL16,BOOL16);
-HMENU16     WINAPI LookupMenuHandle(HMENU16,INT16);
-INT16       WINAPI OpenComm(LPCSTR,UINT16,UINT16);
-VOID        WINAPI PaintRect(HWND16,HWND16,HDC16,HBRUSH16,const RECT16*);
-INT16       WINAPI ReadComm(INT16,LPSTR,INT16);
-SEGPTR      WINAPI SetCommEventMask(INT16,UINT16);
+BOOL16      WINAPI DCHook16(HDC16,WORD,DWORD,LPARAM);
+BOOL16      WINAPI DlgDirSelect16(HWND16,LPSTR,INT16);
+BOOL16      WINAPI DlgDirSelectComboBox16(HWND16,LPSTR,INT16);
+DWORD       WINAPI DumpIcon16(SEGPTR,WORD*,SEGPTR*,SEGPTR*);
+BOOL16      WINAPI EnableCommNotification16(INT16,HWND16,INT16,INT16);
+BOOL16      WINAPI EnableHardwareInput16(BOOL16);
+VOID        WINAPI FillWindow16(HWND16,HWND16,HDC16,HBRUSH16);
+INT16       WINAPI FlushComm16(INT16,INT16);
+UINT16      WINAPI GetCommEventMask16(INT16,UINT16);
+HBRUSH16    WINAPI GetControlBrush16(HWND16,HDC16,UINT16);
+HWND16      WINAPI GetDesktopHwnd16(void);
+WORD        WINAPI GetIconID16(HGLOBAL16,DWORD);
+FARPROC16   WINAPI GetMouseEventProc16(void);
+INT16       WINAPI InitApp16(HINSTANCE16);
+BOOL16      WINAPI IsUserIdle16(void);
+HGLOBAL16   WINAPI LoadCursorIconHandler16(HGLOBAL16,HMODULE16,HRSRC16);
+HGLOBAL16   WINAPI LoadDIBCursorHandler16(HGLOBAL16,HMODULE16,HRSRC16);
+HGLOBAL16   WINAPI LoadDIBIconHandler16(HGLOBAL16,HMODULE16,HRSRC16);
+HICON16     WINAPI LoadIconHandler16(HGLOBAL16,BOOL16);
+HMENU16     WINAPI LookupMenuHandle16(HMENU16,INT16);
+INT16       WINAPI OpenComm16(LPCSTR,UINT16,UINT16);
+VOID        WINAPI PaintRect16(HWND16,HWND16,HDC16,HBRUSH16,const RECT16*);
+INT16       WINAPI ReadComm16(INT16,LPSTR,INT16);
+SEGPTR      WINAPI SetCommEventMask16(INT16,UINT16);
 BOOL16      WINAPI SetDeskPattern(void);
-VOID        WINAPI TileChildWindows(HWND16,WORD);
-INT16       WINAPI UngetCommChar(INT16,CHAR);
-VOID        WINAPI UserYield(void);
-INT16       WINAPI WriteComm(INT16,LPSTR,INT16);
+VOID        WINAPI TileChildWindows16(HWND16,WORD);
+INT16       WINAPI UngetCommChar16(INT16,CHAR);
+VOID        WINAPI UserYield16(void);
+INT16       WINAPI WriteComm16(INT16,LPSTR,INT16);
 BOOL16      WINAPI AdjustWindowRect16(LPRECT16,DWORD,BOOL16);
 BOOL16      WINAPI AdjustWindowRectEx16(LPRECT16,DWORD,BOOL16,DWORD);
 SEGPTR      WINAPI AnsiLower16(SEGPTR);
@@ -546,7 +546,7 @@ HDWP16      WINAPI BeginDeferWindowPos16(INT16);
 HDC16       WINAPI BeginPaint16(HWND16,LPPAINTSTRUCT16);
 BOOL16      WINAPI BringWindowToTop16(HWND16);
 BOOL16      WINAPI CallMsgFilter16(SEGPTR,INT16);
-BOOL16      WINAPI WIN16_CallMsgFilter32(SEGPTR,INT16,BOOL16);
+BOOL16      WINAPI CallMsgFilter32_16(SEGPTR,INT16,BOOL16);
 LRESULT     WINAPI CallNextHookEx16(HHOOK,INT16,WPARAM16,LPARAM);
 LRESULT     WINAPI CallWindowProc16(WNDPROC16,HWND16,UINT16,WPARAM16,LPARAM);
 BOOL16      WINAPI ChangeClipboardChain16(HWND16,HWND16);
@@ -597,7 +597,7 @@ INT16       WINAPI DialogBoxIndirect16(HINSTANCE16,HANDLE16,HWND16,DLGPROC16);
 INT16       WINAPI DialogBoxIndirectParam16(HINSTANCE16,HANDLE16,HWND16,DLGPROC16,LPARAM);
 INT16       WINAPI DialogBoxParam16(HINSTANCE16,SEGPTR,HWND16,DLGPROC16,LPARAM);
 LONG        WINAPI DispatchMessage16(const MSG16*);
-LONG        WINAPI WIN16_DispatchMessage32(const MSG16_32*,BOOL16);
+LONG        WINAPI DispatchMessage32_16(const MSG32_16*,BOOL16);
 INT16       WINAPI DlgDirList16(HWND16,LPSTR,INT16,INT16,UINT16);
 INT16       WINAPI DlgDirListComboBox16(HWND16,LPSTR,INT16,INT16,UINT16);
 BOOL16      WINAPI DlgDirSelectComboBoxEx16(HWND16,LPSTR,INT16,INT16);
@@ -675,7 +675,7 @@ BOOL16      WINAPI GetMenuItemRect16(HWND16,HMENU16,UINT16,LPRECT16);
 UINT16      WINAPI GetMenuState16(HMENU16,UINT16,UINT16);
 INT16       WINAPI GetMenuString16(HMENU16,UINT16,LPSTR,INT16,UINT16);
 BOOL16      WINAPI GetMessage16(SEGPTR,HWND16,UINT16,UINT16);
-BOOL16      WINAPI WIN16_GetMessage32(SEGPTR,HWND16,UINT16,UINT16,BOOL16);
+BOOL16      WINAPI GetMessage32_16(SEGPTR,HWND16,UINT16,UINT16,BOOL16);
 HWND16      WINAPI GetNextDlgGroupItem16(HWND16,HWND16,BOOL16);
 HWND16      WINAPI GetNextDlgTabItem16(HWND16,HWND16,BOOL16);
 HWND16      WINAPI GetNextWindow16(HWND16,WORD);
@@ -755,7 +755,7 @@ void        WINAPI OffsetRect16(LPRECT16,INT16,INT16);
 BOOL16      WINAPI OpenClipboard16(HWND16);
 BOOL16      WINAPI OpenIcon16(HWND16);
 BOOL16      WINAPI PeekMessage16(LPMSG16,HWND16,UINT16,UINT16,UINT16);
-BOOL16      WINAPI WIN16_PeekMessage32(LPMSG16_32,HWND16,UINT16,UINT16,UINT16,BOOL16);
+BOOL16      WINAPI PeekMessage32_16(LPMSG16_32,HWND16,UINT16,UINT16,UINT16,BOOL16);
 BOOL16      WINAPI PostAppMessage16(HTASK16,UINT16,WPARAM16,LPARAM);
 BOOL16      WINAPI PostMessage16(HWND16,UINT16,WPARAM16,LPARAM);
 void        WINAPI PostQuitMessage16(INT16);
@@ -832,7 +832,7 @@ BOOL16      WINAPI TrackPopupMenu16(HMENU16,UINT16,INT16,INT16,INT16,HWND16,cons
 INT16       WINAPI TranslateAccelerator16(HWND16,HACCEL16,LPMSG16);
 BOOL16      WINAPI TranslateMDISysAccel16(HWND16,LPMSG16);
 BOOL16      WINAPI TranslateMessage16(const MSG16*);
-BOOL16      WINAPI WIN16_TranslateMessage32(const MSG16_32*,BOOL16);
+BOOL16      WINAPI TranslateMessage32_16(const MSG32_16*,BOOL16);
 INT16       WINAPI TransmitCommChar16(INT16,CHAR);
 BOOL16      WINAPI UnionRect16(LPRECT16,const RECT16*,const RECT16*);
 BOOL16      WINAPI UnregisterClass16(SEGPTR,HINSTANCE16);
@@ -846,7 +846,7 @@ UINT16      WINAPI WNetAddConnection16(LPCSTR,LPCSTR,LPCSTR);
 INT16       WINAPI wvsprintf16(LPSTR,LPCSTR,LPCVOID);
 BOOL16      WINAPI DrawState16A(HDC16,HBRUSH16,DRAWSTATEPROC16,LPARAM,WPARAM16,INT16,INT16,INT16,INT16,UINT16);
 BOOL16      WINAPI IsDialogMessage16(HWND16,LPMSG16);
-INT16       WINAPI GetCommError(INT16,LPCOMSTAT);
+INT16       WINAPI GetCommError16(INT16,LPCOMSTAT);
 BOOL16      WINAPI BuildCommDCB16(LPCSTR,LPDCB16);
 INT16       WINAPI GetCommState16(INT16,LPDCB16);
 INT16       WINAPI SetCommState16(LPDCB16);
@@ -857,10 +857,10 @@ INT16       WINAPI lstrcmpi16(LPCSTR,LPCSTR);
 typedef VOID (*SYSTEMTIMERPROC)(WORD);
 
 WORD        WINAPI CreateSystemTimer(WORD,SYSTEMTIMERPROC);
-VOID        WINAPI DisableSystemTimers(void);
-VOID        WINAPI EnableSystemTimers(void);
-DWORD       WINAPI GetFileResourceSize(LPCSTR,SEGPTR,SEGPTR,LPDWORD);
-DWORD       WINAPI GetFileResource(LPCSTR,SEGPTR,SEGPTR,DWORD,DWORD,LPVOID);
+VOID        WINAPI DisableSystemTimers16(void);
+VOID        WINAPI EnableSystemTimers16(void);
+DWORD       WINAPI GetFileResourceSize16(LPCSTR,SEGPTR,SEGPTR,LPDWORD);
+DWORD       WINAPI GetFileResource16(LPCSTR,SEGPTR,SEGPTR,DWORD,DWORD,LPVOID);
 BYTE        WINAPI GetTempDrive(BYTE);
 FARPROC16   WINAPI SetTaskSignalProc(HTASK16,FARPROC16);
 #endif  /* __WINE__ */
diff --git a/include/wingdi.h b/include/wingdi.h
index 7345b9daa77..ede2b61986d 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -22,11 +22,9 @@ typedef struct
 {
     WORD   wFirst;
     WORD   wSecond;
-    INT32  iKernAmount;
-} KERNINGPAIR32, *LPKERNINGPAIR32;
+    INT  iKernAmount;
+} KERNINGPAIR, *LPKERNINGPAIR;
 
-DECL_WINELIB_TYPE(KERNINGPAIR)
-DECL_WINELIB_TYPE(LPKERNINGPAIR)
 
 typedef struct
 {
@@ -40,16 +38,14 @@ typedef struct
 
 typedef struct
 {
-    HDC32   hdc;
-    BOOL32  fErase;
-    RECT32  rcPaint;
-    BOOL32  fRestore;
-    BOOL32  fIncUpdate;
+    HDC   hdc;
+    BOOL  fErase;
+    RECT  rcPaint;
+    BOOL  fRestore;
+    BOOL  fIncUpdate;
     BYTE    rgbReserved[32];
-} PAINTSTRUCT32, *LPPAINTSTRUCT32;
+} PAINTSTRUCT, *LPPAINTSTRUCT;
 
-DECL_WINELIB_TYPE(PAINTSTRUCT)
-DECL_WINELIB_TYPE(LPPAINTSTRUCT)
 
 
 typedef struct tagPIXELFORMATDESCRIPTOR {
@@ -345,17 +341,15 @@ typedef struct
 
 typedef struct
 {
-    INT32  bmType;
-    INT32  bmWidth;
-    INT32  bmHeight;
-    INT32  bmWidthBytes;
+    INT  bmType;
+    INT  bmWidth;
+    INT  bmHeight;
+    INT  bmWidthBytes;
     WORD   bmPlanes;
     WORD   bmBitsPixel;
     LPVOID bmBits WINE_PACKED;
-} BITMAP32, *LPBITMAP32;
+} BITMAP, *LPBITMAP;
 
-DECL_WINELIB_TYPE(BITMAP)
-DECL_WINELIB_TYPE(LPBITMAP)
 
   /* Brushes */
 
@@ -368,13 +362,11 @@ typedef struct
 
 typedef struct
 { 
-    UINT32     lbStyle;
+    UINT     lbStyle;
     COLORREF   lbColor;
-    INT32      lbHatch;
-} LOGBRUSH32, *LPLOGBRUSH32;
+    INT      lbHatch;
+} LOGBRUSH, *LPLOGBRUSH;
 
-DECL_WINELIB_TYPE(LOGBRUSH)
-DECL_WINELIB_TYPE(LPLOGBRUSH)
 
   /* Brush styles */
 #define BS_SOLID	    0
@@ -426,11 +418,11 @@ typedef struct
 
 typedef struct
 {
-    INT32  lfHeight;
-    INT32  lfWidth;
-    INT32  lfEscapement;
-    INT32  lfOrientation;
-    INT32  lfWeight;
+    INT  lfHeight;
+    INT  lfWidth;
+    INT  lfEscapement;
+    INT  lfOrientation;
+    INT  lfWeight;
     BYTE   lfItalic;
     BYTE   lfUnderline;
     BYTE   lfStrikeOut;
@@ -440,15 +432,15 @@ typedef struct
     BYTE   lfQuality;
     BYTE   lfPitchAndFamily;
     CHAR   lfFaceName[LF_FACESIZE];
-} LOGFONT32A, *LPLOGFONT32A;
+} LOGFONTA, *LPLOGFONTA;
 
 typedef struct
 {
-    INT32  lfHeight;
-    INT32  lfWidth;
-    INT32  lfEscapement;
-    INT32  lfOrientation;
-    INT32  lfWeight;
+    INT  lfHeight;
+    INT  lfWidth;
+    INT  lfEscapement;
+    INT  lfOrientation;
+    INT  lfWeight;
     BYTE   lfItalic;
     BYTE   lfUnderline;
     BYTE   lfStrikeOut;
@@ -458,7 +450,7 @@ typedef struct
     BYTE   lfQuality;
     BYTE   lfPitchAndFamily;
     WCHAR  lfFaceName[LF_FACESIZE];
-} LOGFONT32W, *LPLOGFONT32W;
+} LOGFONTW, *LPLOGFONTW;
 
 DECL_WINELIB_TYPE_AW(LOGFONT)
 DECL_WINELIB_TYPE_AW(LPLOGFONT)
@@ -472,17 +464,17 @@ typedef struct
 
 typedef struct
 {
-  LOGFONT32A elfLogFont;
+  LOGFONTA elfLogFont;
   BYTE       elfFullName[LF_FULLFACESIZE] WINE_PACKED;
   BYTE       elfStyle[LF_FACESIZE] WINE_PACKED;
-} ENUMLOGFONT32A, *LPENUMLOGFONT32A;
+} ENUMLOGFONTA, *LPENUMLOGFONTA;
 
 typedef struct
 {
-  LOGFONT32W elfLogFont;
+  LOGFONTW elfLogFont;
   WCHAR      elfFullName[LF_FULLFACESIZE] WINE_PACKED;
   WCHAR      elfStyle[LF_FACESIZE] WINE_PACKED;
-} ENUMLOGFONT32W, *LPENUMLOGFONT32W;
+} ENUMLOGFONTW, *LPENUMLOGFONTW;
 
 typedef struct
 {
@@ -494,19 +486,19 @@ typedef struct
 
 typedef struct
 {
-  LOGFONT32A elfLogFont;
+  LOGFONTA elfLogFont;
   BYTE       elfFullName[LF_FULLFACESIZE] WINE_PACKED;
   BYTE       elfStyle[LF_FACESIZE] WINE_PACKED;
   BYTE       elfScript[LF_FACESIZE] WINE_PACKED;
-} ENUMLOGFONTEX32A,*LPENUMLOGFONTEX32A;
+} ENUMLOGFONTEXA,*LPENUMLOGFONTEXA;
 
 typedef struct
 {
-  LOGFONT32W elfLogFont;
+  LOGFONTW elfLogFont;
   WCHAR      elfFullName[LF_FULLFACESIZE] WINE_PACKED;
   WCHAR      elfStyle[LF_FACESIZE] WINE_PACKED;
   WCHAR      elfScript[LF_FACESIZE] WINE_PACKED;
-} ENUMLOGFONTEX32W,*LPENUMLOGFONTEX32W;
+} ENUMLOGFONTEXW,*LPENUMLOGFONTEXW;
 
 DECL_WINELIB_TYPE_AW(ENUMLOGFONT)
 DECL_WINELIB_TYPE_AW(LPENUMLOGFONT)
@@ -532,8 +524,8 @@ typedef struct
 
 typedef struct 
 {
-  UINT32	ciCharset; /* character set */
-  UINT32	ciACP; /* ANSI code page */
+  UINT	ciCharset; /* character set */
+  UINT	ciACP; /* ANSI code page */
   FONTSIGNATURE	fs;
 } CHARSETINFO,*LPCHARSETINFO;
 
@@ -733,17 +725,17 @@ typedef struct
 
 typedef struct
 {
-    INT32     tmHeight;
-    INT32     tmAscent;
-    INT32     tmDescent;
-    INT32     tmInternalLeading;
-    INT32     tmExternalLeading;
-    INT32     tmAveCharWidth;
-    INT32     tmMaxCharWidth;
-    INT32     tmWeight;
-    INT32     tmOverhang;
-    INT32     tmDigitizedAspectX;
-    INT32     tmDigitizedAspectY;
+    INT     tmHeight;
+    INT     tmAscent;
+    INT     tmDescent;
+    INT     tmInternalLeading;
+    INT     tmExternalLeading;
+    INT     tmAveCharWidth;
+    INT     tmMaxCharWidth;
+    INT     tmWeight;
+    INT     tmOverhang;
+    INT     tmDigitizedAspectX;
+    INT     tmDigitizedAspectY;
     BYTE      tmFirstChar;
     BYTE      tmLastChar;
     BYTE      tmDefaultChar;
@@ -753,21 +745,21 @@ typedef struct
     BYTE      tmStruckOut;
     BYTE      tmPitchAndFamily;
     BYTE      tmCharSet;
-} TEXTMETRIC32A, *LPTEXTMETRIC32A;
+} TEXTMETRICA, *LPTEXTMETRICA;
 
 typedef struct
 {
-    INT32     tmHeight;
-    INT32     tmAscent;
-    INT32     tmDescent;
-    INT32     tmInternalLeading;
-    INT32     tmExternalLeading;
-    INT32     tmAveCharWidth;
-    INT32     tmMaxCharWidth;
-    INT32     tmWeight;
-    INT32     tmOverhang;
-    INT32     tmDigitizedAspectX;
-    INT32     tmDigitizedAspectY;
+    INT     tmHeight;
+    INT     tmAscent;
+    INT     tmDescent;
+    INT     tmInternalLeading;
+    INT     tmExternalLeading;
+    INT     tmAveCharWidth;
+    INT     tmMaxCharWidth;
+    INT     tmWeight;
+    INT     tmOverhang;
+    INT     tmDigitizedAspectX;
+    INT     tmDigitizedAspectY;
     WCHAR     tmFirstChar;
     WCHAR     tmLastChar;
     WCHAR     tmDefaultChar;
@@ -777,7 +769,7 @@ typedef struct
     BYTE      tmStruckOut;
     BYTE      tmPitchAndFamily;
     BYTE      tmCharSet;
-} TEXTMETRIC32W, *LPTEXTMETRIC32W;
+} TEXTMETRICW, *LPTEXTMETRICW;
 
 DECL_WINELIB_TYPE_AW(TEXTMETRIC)
 DECL_WINELIB_TYPE_AW(LPTEXTMETRIC)
@@ -798,77 +790,77 @@ typedef struct tagPANOSE
 } PANOSE;
 
 
-typedef struct _OUTLINETEXTMETRIC32A
+typedef struct _OUTLINETEXTMETRICA
 {
-    UINT32          otmSize;
-    TEXTMETRIC32A   otmTextMetrics;
+    UINT          otmSize;
+    TEXTMETRICA   otmTextMetrics;
     BYTE            otmFilter;
     PANOSE          otmPanoseNumber;
-    UINT32          otmfsSelection;
-    UINT32          otmfsType;
-    INT32           otmsCharSlopeRise;
-    INT32           otmsCharSlopeRun;
-    INT32           otmItalicAngle;
-    UINT32          otmEMSquare;
-    INT32           otmAscent;
-    INT32           otmDescent;
-    UINT32          otmLineGap;
-    UINT32          otmsCapEmHeight;
-    UINT32          otmsXHeight;
-    RECT32          otmrcFontBox;
-    INT32           otmMacAscent;
-    INT32           otmMacDescent;
-    UINT32          otmMacLineGap;
-    UINT32          otmusMinimumPPEM;
-    POINT32         otmptSubscriptSize;
-    POINT32         otmptSubscriptOffset;
-    POINT32         otmptSuperscriptSize;
-    POINT32         otmptSuperscriptOffset;
-    UINT32          otmsStrikeoutSize;
-    INT32           otmsStrikeoutPosition;
-    INT32           otmsUnderscoreSize;
-    INT32           otmsUnderscorePosition;
+    UINT          otmfsSelection;
+    UINT          otmfsType;
+    INT           otmsCharSlopeRise;
+    INT           otmsCharSlopeRun;
+    INT           otmItalicAngle;
+    UINT          otmEMSquare;
+    INT           otmAscent;
+    INT           otmDescent;
+    UINT          otmLineGap;
+    UINT          otmsCapEmHeight;
+    UINT          otmsXHeight;
+    RECT          otmrcFontBox;
+    INT           otmMacAscent;
+    INT           otmMacDescent;
+    UINT          otmMacLineGap;
+    UINT          otmusMinimumPPEM;
+    POINT         otmptSubscriptSize;
+    POINT         otmptSubscriptOffset;
+    POINT         otmptSuperscriptSize;
+    POINT         otmptSuperscriptOffset;
+    UINT          otmsStrikeoutSize;
+    INT           otmsStrikeoutPosition;
+    INT           otmsUnderscoreSize;
+    INT           otmsUnderscorePosition;
     LPSTR           otmpFamilyName;
     LPSTR           otmpFaceName;
     LPSTR           otmpStyleName;
     LPSTR           otmpFullName;
-} OUTLINETEXTMETRIC32A, *LPOUTLINETEXTMETRIC32A;
+} OUTLINETEXTMETRICA, *LPOUTLINETEXTMETRICA;
 
-typedef struct _OUTLINETEXTMETRIC32W
+typedef struct _OUTLINETEXTMETRICW
 {
-    UINT32          otmSize;
-    TEXTMETRIC32W   otmTextMetrics;
+    UINT          otmSize;
+    TEXTMETRICW   otmTextMetrics;
     BYTE            otmFilter;
     PANOSE          otmPanoseNumber;
-    UINT32          otmfsSelection;
-    UINT32          otmfsType;
-    INT32           otmsCharSlopeRise;
-    INT32           otmsCharSlopeRun;
-    INT32           otmItalicAngle;
-    UINT32          otmEMSquare;
-    INT32           otmAscent;
-    INT32           otmDescent;
-    UINT32          otmLineGap;
-    UINT32          otmsCapEmHeight;
-    UINT32          otmsXHeight;
-    RECT32          otmrcFontBox;
-    INT32           otmMacAscent;
-    INT32           otmMacDescent;
-    UINT32          otmMacLineGap;
-    UINT32          otmusMinimumPPEM;
-    POINT32         otmptSubscriptSize;
-    POINT32         otmptSubscriptOffset;
-    POINT32         otmptSuperscriptSize;
-    POINT32         otmptSuperscriptOffset;
-    UINT32          otmsStrikeoutSize;
-    INT32           otmsStrikeoutPosition;
-    INT32           otmsUnderscoreSize;
-    INT32           otmsUnderscorePosition;
+    UINT          otmfsSelection;
+    UINT          otmfsType;
+    INT           otmsCharSlopeRise;
+    INT           otmsCharSlopeRun;
+    INT           otmItalicAngle;
+    UINT          otmEMSquare;
+    INT           otmAscent;
+    INT           otmDescent;
+    UINT          otmLineGap;
+    UINT          otmsCapEmHeight;
+    UINT          otmsXHeight;
+    RECT          otmrcFontBox;
+    INT           otmMacAscent;
+    INT           otmMacDescent;
+    UINT          otmMacLineGap;
+    UINT          otmusMinimumPPEM;
+    POINT         otmptSubscriptSize;
+    POINT         otmptSubscriptOffset;
+    POINT         otmptSuperscriptSize;
+    POINT         otmptSuperscriptOffset;
+    UINT          otmsStrikeoutSize;
+    INT           otmsStrikeoutPosition;
+    INT           otmsUnderscoreSize;
+    INT           otmsUnderscorePosition;
     LPSTR           otmpFamilyName;
     LPSTR           otmpFaceName;
     LPSTR           otmpStyleName;
     LPSTR           otmpFullName;
-} OUTLINETEXTMETRIC32W, *LPOUTLINETEXTMETRIC32W;
+} OUTLINETEXTMETRICW, *LPOUTLINETEXTMETRICW;
 
 typedef struct _OUTLINETEXTMETRIC16
 {
@@ -899,7 +891,7 @@ typedef struct _OUTLINETEXTMETRIC16
     UINT16          otmsStrikeoutSize;
     INT16           otmsStrikeoutPosition;
     INT16           otmsUnderscoreSize;
-    INT32           otmsUnderscorePosition;
+    INT           otmsUnderscorePosition;
     LPSTR           otmpFamilyName;
     LPSTR           otmpFaceName;
     LPSTR           otmpStyleName;
@@ -946,17 +938,17 @@ typedef struct
 
 typedef struct
 {
-    INT32     tmHeight;
-    INT32     tmAscent;
-    INT32     tmDescent;
-    INT32     tmInternalLeading;
-    INT32     tmExternalLeading;
-    INT32     tmAveCharWidth;
-    INT32     tmMaxCharWidth;
-    INT32     tmWeight;
-    INT32     tmOverhang;
-    INT32     tmDigitizedAspectX;
-    INT32     tmDigitizedAspectY;
+    INT     tmHeight;
+    INT     tmAscent;
+    INT     tmDescent;
+    INT     tmInternalLeading;
+    INT     tmExternalLeading;
+    INT     tmAveCharWidth;
+    INT     tmMaxCharWidth;
+    INT     tmWeight;
+    INT     tmOverhang;
+    INT     tmDigitizedAspectX;
+    INT     tmDigitizedAspectY;
     BYTE      tmFirstChar;
     BYTE      tmLastChar;
     BYTE      tmDefaultChar;
@@ -967,24 +959,24 @@ typedef struct
     BYTE      tmPitchAndFamily;
     BYTE      tmCharSet;
     DWORD     ntmFlags;
-    UINT32    ntmSizeEM;
-    UINT32    ntmCellHeight;
-    UINT32    ntmAvgWidth;
-} NEWTEXTMETRIC32A, *LPNEWTEXTMETRIC32A;
+    UINT    ntmSizeEM;
+    UINT    ntmCellHeight;
+    UINT    ntmAvgWidth;
+} NEWTEXTMETRICA, *LPNEWTEXTMETRICA;
 
 typedef struct
 {
-    INT32     tmHeight;
-    INT32     tmAscent;
-    INT32     tmDescent;
-    INT32     tmInternalLeading;
-    INT32     tmExternalLeading;
-    INT32     tmAveCharWidth;
-    INT32     tmMaxCharWidth;
-    INT32     tmWeight;
-    INT32     tmOverhang;
-    INT32     tmDigitizedAspectX;
-    INT32     tmDigitizedAspectY;
+    INT     tmHeight;
+    INT     tmAscent;
+    INT     tmDescent;
+    INT     tmInternalLeading;
+    INT     tmExternalLeading;
+    INT     tmAveCharWidth;
+    INT     tmMaxCharWidth;
+    INT     tmWeight;
+    INT     tmOverhang;
+    INT     tmDigitizedAspectX;
+    INT     tmDigitizedAspectY;
     WCHAR     tmFirstChar;
     WCHAR     tmLastChar;
     WCHAR     tmDefaultChar;
@@ -995,10 +987,10 @@ typedef struct
     BYTE      tmPitchAndFamily;
     BYTE      tmCharSet;
     DWORD     ntmFlags;
-    UINT32    ntmSizeEM;
-    UINT32    ntmCellHeight;
-    UINT32    ntmAvgWidth;
-} NEWTEXTMETRIC32W, *LPNEWTEXTMETRIC32W;
+    UINT    ntmSizeEM;
+    UINT    ntmCellHeight;
+    UINT    ntmAvgWidth;
+} NEWTEXTMETRICW, *LPNEWTEXTMETRICW;
 
 DECL_WINELIB_TYPE_AW(NEWTEXTMETRIC)
 DECL_WINELIB_TYPE_AW(LPNEWTEXTMETRIC)
@@ -1011,30 +1003,30 @@ typedef struct
 
 typedef struct
 {
-    NEWTEXTMETRIC32A	ntmetm;
+    NEWTEXTMETRICA	ntmetm;
     FONTSIGNATURE       ntmeFontSignature;
-} NEWTEXTMETRICEX32A,*LPNEWTEXTMETRICEX32A;
+} NEWTEXTMETRICEXA,*LPNEWTEXTMETRICEXA;
 
 typedef struct
 {
-    NEWTEXTMETRIC32W	ntmetm;
+    NEWTEXTMETRICW	ntmetm;
     FONTSIGNATURE       ntmeFontSignature;
-} NEWTEXTMETRICEX32W,*LPNEWTEXTMETRICEX32W;
+} NEWTEXTMETRICEXW,*LPNEWTEXTMETRICEXW;
 
 DECL_WINELIB_TYPE_AW(NEWTEXTMETRICEX)
 DECL_WINELIB_TYPE_AW(LPNEWTEXTMETRICEX)
 
 
 typedef INT16 (CALLBACK *FONTENUMPROC16)(SEGPTR,SEGPTR,UINT16,LPARAM);
-typedef INT32 (CALLBACK *FONTENUMPROC32A)(LPENUMLOGFONT32A,LPNEWTEXTMETRIC32A,
-                                          UINT32,LPARAM);
-typedef INT32 (CALLBACK *FONTENUMPROC32W)(LPENUMLOGFONT32W,LPNEWTEXTMETRIC32W,
-                                          UINT32,LPARAM);
+typedef INT (CALLBACK *FONTENUMPROCA)(LPENUMLOGFONTA,LPNEWTEXTMETRICA,
+                                          UINT,LPARAM);
+typedef INT (CALLBACK *FONTENUMPROCW)(LPENUMLOGFONTW,LPNEWTEXTMETRICW,
+                                          UINT,LPARAM);
 DECL_WINELIB_TYPE_AW(FONTENUMPROC)
 
 typedef INT16 (CALLBACK *FONTENUMPROCEX16)(SEGPTR,SEGPTR,UINT16,LPARAM);
-typedef INT32 (CALLBACK *FONTENUMPROCEX32A)(LPENUMLOGFONTEX32A,LPNEWTEXTMETRICEX32A,UINT32,LPARAM);
-typedef INT32 (CALLBACK *FONTENUMPROCEX32W)(LPENUMLOGFONTEX32W,LPNEWTEXTMETRICEX32W,UINT32,LPARAM);
+typedef INT (CALLBACK *FONTENUMPROCEXA)(LPENUMLOGFONTEXA,LPNEWTEXTMETRICEXA,UINT,LPARAM);
+typedef INT (CALLBACK *FONTENUMPROCEXW)(LPENUMLOGFONTEXW,LPNEWTEXTMETRICEXW,UINT,LPARAM);
 DECL_WINELIB_TYPE_AW(FONTENUMPROCEX)
 
   /* tmPitchAndFamily bits */
@@ -1069,15 +1061,13 @@ typedef struct
 
 typedef struct
 {
-    UINT32	gmBlackBoxX;
-    UINT32	gmBlackBoxY;
-    POINT32	gmptGlyphOrigin;
+    UINT	gmBlackBoxX;
+    UINT	gmBlackBoxY;
+    POINT	gmptGlyphOrigin;
     INT16	gmCellIncX;
     INT16	gmCellIncY;
-} GLYPHMETRICS32, *LPGLYPHMETRICS32;
+} GLYPHMETRICS, *LPGLYPHMETRICS;
 
-DECL_WINELIB_TYPE(GLYPHMETRICS)
-DECL_WINELIB_TYPE(LPGLYPHMETRICS)
 
 #define GGO_METRICS         0
 #define GGO_BITMAP          1
@@ -1107,40 +1097,38 @@ typedef struct
 
 typedef struct
 {
-    INT32   abcA;
-    UINT32  abcB;
-    INT32   abcC;
-} ABC32, *LPABC32;
+    INT   abcA;
+    UINT  abcB;
+    INT   abcC;
+} ABC, *LPABC;
 
-DECL_WINELIB_TYPE(ABC)
-DECL_WINELIB_TYPE(LPABC)
 
   /* for GetCharacterPlacement () */
-typedef struct tagGCP_RESULTS32A
+typedef struct tagGCP_RESULTSA
 {
     DWORD  lStructSize;
     LPSTR  lpOutString;
-    UINT32 *lpOrder;
-    INT32  *lpDx;
-    INT32  *lpCaretPos;
+    UINT *lpOrder;
+    INT  *lpDx;
+    INT  *lpCaretPos;
     LPSTR  lpClass;
-    UINT32 *lpGlyphs;
-    UINT32 nGlyphs;
-    UINT32 nMaxFit;
-} GCP_RESULTS32A;
+    UINT *lpGlyphs;
+    UINT nGlyphs;
+    UINT nMaxFit;
+} GCP_RESULTSA;
 
-typedef struct tagGCP_RESULTS32W
+typedef struct tagGCP_RESULTSW
 {
     DWORD  lStructSize;
     LPWSTR lpOutString;
-    UINT32 *lpOrder;
-    INT32  *lpDx;
-    INT32  *lpCaretPos;
+    UINT *lpOrder;
+    INT  *lpDx;
+    INT  *lpCaretPos;
     LPWSTR lpClass;
-    UINT32 *lpGlyphs;
-    UINT32 nGlyphs;
-    UINT32 nMaxFit;
-} GCP_RESULTS32W;
+    UINT *lpGlyphs;
+    UINT nGlyphs;
+    UINT nMaxFit;
+} GCP_RESULTSW;
 
 DECL_WINELIB_TYPE_AW(GCP_RESULTS)
 
@@ -1187,13 +1175,11 @@ typedef struct
 
 typedef struct
 {
-    UINT32   lopnStyle; 
-    POINT32  lopnWidth WINE_PACKED;
+    UINT   lopnStyle; 
+    POINT  lopnWidth WINE_PACKED;
     COLORREF lopnColor WINE_PACKED;
-} LOGPEN32, *LPLOGPEN32;
+} LOGPEN, *LPLOGPEN;
 
-DECL_WINELIB_TYPE(LOGPEN)
-DECL_WINELIB_TYPE(LPLOGPEN)
 
 typedef struct tagEXTLOGPEN
 {
@@ -1559,10 +1545,10 @@ typedef struct
 
 typedef struct 
 {
-	BITMAP32		dsBm;
+	BITMAP		dsBm;
 	BITMAPINFOHEADER	dsBmih;
 	DWORD			dsBitfields[3];
-	HANDLE32		dshSection;
+	HANDLE		dshSection;
 	DWORD			dsOffset;
 } DIBSECTION,*LPDIBSECTION;
 
@@ -1620,11 +1606,9 @@ typedef struct
 
 typedef struct
 {
-    HGDIOBJ32 objectHandle[1];
-} HANDLETABLE32, *LPHANDLETABLE32;
+    HGDIOBJ objectHandle[1];
+} HANDLETABLE, *LPHANDLETABLE;
 
-DECL_WINELIB_TYPE(HANDLETABLE)
-DECL_WINELIB_TYPE(LPHANDLETABLE)
 
 /* Clipboard metafile picture structure */
 typedef struct
@@ -1637,14 +1621,12 @@ typedef struct
 
 typedef struct
 {
-    INT32        mm;
-    INT32        xExt;
-    INT32        yExt;
-    HMETAFILE32  hMF;
-} METAFILEPICT32, *LPMETAFILEPICT32;
+    INT        mm;
+    INT        xExt;
+    INT        yExt;
+    HMETAFILE  hMF;
+} METAFILEPICT, *LPMETAFILEPICT;
 
-DECL_WINELIB_TYPE(METAFILEPICT)
-DECL_WINELIB_TYPE(LPMETAFILEPICT)
 
 /* Metafile functions */
 #define META_SETBKCOLOR              0x0201
@@ -1729,9 +1711,8 @@ DECL_WINELIB_TYPE(LPMETAFILEPICT)
 
 typedef INT16 (CALLBACK *MFENUMPROC16)(HDC16,HANDLETABLE16*,METARECORD*,
                                        INT16,LPARAM);
-typedef INT32 (CALLBACK *MFENUMPROC32)(HDC32,HANDLETABLE32*,METARECORD*,
-                                       INT32,LPARAM);
-DECL_WINELIB_TYPE(MFENUMPROC)
+typedef INT (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,
+                                       INT,LPARAM);
 
 /* enhanced metafile structures and functions */
 
@@ -1740,8 +1721,8 @@ DECL_WINELIB_TYPE(MFENUMPROC)
 typedef struct {
     DWORD iType; 
     DWORD nSize; 
-    RECT32 rclBounds; 
-    RECT32 rclFrame; 
+    RECT rclBounds; 
+    RECT rclFrame; 
     DWORD dSignature; 
     DWORD nVersion; 
     DWORD nBytes; 
@@ -1751,8 +1732,8 @@ typedef struct {
     DWORD nDescription; 
     DWORD offDescription; 
     DWORD nPalEntries; 
-    SIZE32 szlDevice; 
-    SIZE32 szlMillimeters;
+    SIZE szlDevice; 
+    SIZE szlMillimeters;
     DWORD cbPixelFormat;
     DWORD offPixelFormat;
     DWORD bOpenGL;
@@ -1764,8 +1745,8 @@ typedef struct {
     DWORD dParm[1]; 
 } ENHMETARECORD, *LPENHMETARECORD; 
 
-typedef INT32 (CALLBACK *ENHMFENUMPROC32)(HDC32, LPHANDLETABLE32, 
-					  LPENHMETARECORD, INT32, LPVOID);
+typedef INT (CALLBACK *ENHMFENUMPROC)(HDC, LPHANDLETABLE, 
+					  LPENHMETARECORD, INT, LPVOID);
 
 #define EMR_HEADER	1
 #define EMR_POLYBEZIER	2
@@ -1940,7 +1921,7 @@ typedef struct
     DWORD  dmDitherType;
     DWORD  dmReserved1;
     DWORD  dmReserved2;
-} DEVMODE32A, *LPDEVMODE32A;
+} DEVMODEA, *LPDEVMODEA;
 
 typedef struct
 {
@@ -1976,7 +1957,7 @@ typedef struct
     DWORD  dmDitherType;
     DWORD  dmReserved1;
     DWORD  dmReserved2;
-} DEVMODE32W, *LPDEVMODE32W;
+} DEVMODEW, *LPDEVMODEW;
 
 DECL_WINELIB_TYPE_AW(DEVMODE)
 DECL_WINELIB_TYPE_AW(LPDEVMODE)
@@ -1990,21 +1971,21 @@ typedef struct
 
 typedef struct 
 {
-    INT32    cbSize;
+    INT    cbSize;
     LPCSTR   lpszDocName;
     LPCSTR   lpszOutput;
     LPCSTR   lpszDatatype;
     DWORD    fwType;
-} DOCINFO32A, *LPDOCINFO32A;
+} DOCINFOA, *LPDOCINFOA;
 
 typedef struct 
 {
-    INT32    cbSize;
+    INT    cbSize;
     LPCWSTR  lpszDocName;
     LPCWSTR  lpszOutput;
     LPCWSTR  lpszDatatype;
     DWORD    fwType;
-} DOCINFO32W, *LPDOCINFO32W;
+} DOCINFOW, *LPDOCINFOW;
 
 DECL_WINELIB_TYPE_AW(DOCINFO)
 DECL_WINELIB_TYPE_AW(LPDOCINFO)
@@ -2028,40 +2009,40 @@ typedef struct {
 } NONCLIENTMETRICS16,*LPNONCLIENTMETRICS16;
 
 typedef struct {
-	UINT32		cbSize;
-	INT32		iBorderWidth;
-	INT32		iScrollWidth;
-	INT32		iScrollHeight;
-	INT32		iCaptionWidth;
-	INT32		iCaptionHeight;
-	LOGFONT32A	lfCaptionFont;
-	INT32		iSmCaptionWidth;
-	INT32		iSmCaptionHeight;
-	LOGFONT32A	lfSmCaptionFont;
-	INT32		iMenuWidth;
-	INT32		iMenuHeight;
-	LOGFONT32A	lfMenuFont;
-	LOGFONT32A	lfStatusFont;
-	LOGFONT32A	lfMessageFont;
-} NONCLIENTMETRICS32A,*LPNONCLIENTMETRICS32A;
+	UINT		cbSize;
+	INT		iBorderWidth;
+	INT		iScrollWidth;
+	INT		iScrollHeight;
+	INT		iCaptionWidth;
+	INT		iCaptionHeight;
+	LOGFONTA	lfCaptionFont;
+	INT		iSmCaptionWidth;
+	INT		iSmCaptionHeight;
+	LOGFONTA	lfSmCaptionFont;
+	INT		iMenuWidth;
+	INT		iMenuHeight;
+	LOGFONTA	lfMenuFont;
+	LOGFONTA	lfStatusFont;
+	LOGFONTA	lfMessageFont;
+} NONCLIENTMETRICSA,*LPNONCLIENTMETRICSA;
 
 typedef struct {
-	UINT32		cbSize;
-	INT32		iBorderWidth;
-	INT32		iScrollWidth;
-	INT32		iScrollHeight;
-	INT32		iCaptionWidth;
-	INT32		iCaptionHeight;
-	LOGFONT32W	lfCaptionFont;
-	INT32		iSmCaptionWidth;
-	INT32		iSmCaptionHeight;
-	LOGFONT32W	lfSmCaptionFont;
-	INT32		iMenuWidth;
-	INT32		iMenuHeight;
-	LOGFONT32W	lfMenuFont;
-	LOGFONT32W	lfStatusFont;
-	LOGFONT32W	lfMessageFont;
-} NONCLIENTMETRICS32W,*LPNONCLIENTMETRICS32W;
+	UINT		cbSize;
+	INT		iBorderWidth;
+	INT		iScrollWidth;
+	INT		iScrollHeight;
+	INT		iCaptionWidth;
+	INT		iCaptionHeight;
+	LOGFONTW	lfCaptionFont;
+	INT		iSmCaptionWidth;
+	INT		iSmCaptionHeight;
+	LOGFONTW	lfSmCaptionFont;
+	INT		iMenuWidth;
+	INT		iMenuHeight;
+	LOGFONTW	lfMenuFont;
+	LOGFONTW	lfStatusFont;
+	LOGFONTW	lfMessageFont;
+} NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
 
 DECL_WINELIB_TYPE_AW(NONCLIENTMETRICS)
 DECL_WINELIB_TYPE_AW(LPNONCLIENTMETRICS)
@@ -2079,7 +2060,7 @@ typedef struct _RGNDATAHEADER {
     DWORD	iType;
     DWORD	nCount;
     DWORD	nRgnSize;
-    RECT32	rcBound;
+    RECT	rcBound;
 } RGNDATAHEADER,*LPRGNDATAHEADER;
 
 typedef struct _RGNDATA {
@@ -2088,769 +2069,601 @@ typedef struct _RGNDATA {
 } RGNDATA,*PRGNDATA,*LPRGNDATA;
 
 typedef BOOL16 (CALLBACK* ABORTPROC16)(HDC16, INT16);
-typedef BOOL32 (CALLBACK* ABORTPROC32)(HDC32, INT32);
-DECL_WINELIB_TYPE(ABORTPROC)
+typedef BOOL (CALLBACK* ABORTPROC)(HDC, INT);
 
 #pragma pack(4)
 
 /* Declarations for functions that exist only in Win16 */
 
-VOID        WINAPI Death(HDC16);
-VOID        WINAPI Resurrection(HDC16,WORD,WORD,WORD,WORD,WORD,WORD);
+VOID        WINAPI Death16(HDC16);
+VOID        WINAPI Resurrection16(HDC16,WORD,WORD,WORD,WORD,WORD,WORD);
 
 /* Declarations for functions that exist only in Win32 */
 
-BOOL32      WINAPI AngleArc(HDC32, INT32, INT32, DWORD, FLOAT, FLOAT);
-BOOL32      WINAPI ArcTo(HDC32, INT32, INT32, INT32, INT32, INT32, INT32, INT32, INT32); 
-HENHMETAFILE32 WINAPI CloseEnhMetaFile(HDC32);
-HBRUSH32    WINAPI CreateDIBPatternBrushPt(const void*,UINT32);
-HDC32       WINAPI CreateEnhMetaFile32A(HDC32,LPCSTR,const RECT32*,LPCSTR);
-HDC32       WINAPI CreateEnhMetaFile32W(HDC32,LPCWSTR,const RECT32*,LPCWSTR);
+BOOL      WINAPI AngleArc(HDC, INT, INT, DWORD, FLOAT, FLOAT);
+BOOL      WINAPI ArcTo(HDC, INT, INT, INT, INT, INT, INT, INT, INT); 
+HENHMETAFILE WINAPI CloseEnhMetaFile(HDC);
+HBRUSH    WINAPI CreateDIBPatternBrushPt(const void*,UINT);
+HDC       WINAPI CreateEnhMetaFileA(HDC,LPCSTR,const RECT*,LPCSTR);
+HDC       WINAPI CreateEnhMetaFileW(HDC,LPCWSTR,const RECT*,LPCWSTR);
 #define     CreateEnhMetaFile WINELIB_NAME_AW(CreateEnhMetaFile)
-INT32       WINAPI DrawEscape(HDC32,INT32,INT32,LPCSTR);
-INT16       WINAPI ExcludeVisRect(HDC16,INT16,INT16,INT16,INT16);
-BOOL16      WINAPI FastWindowFrame(HDC16,const RECT16*,INT16,INT16,DWORD);
-UINT16      WINAPI GDIRealizePalette(HDC16);
-HPALETTE16  WINAPI GDISelectPalette(HDC16,HPALETTE16,WORD);
-BOOL32      WINAPI GdiComment(HDC32,UINT32,const BYTE *);
-DWORD       WINAPI GetBitmapDimension(HBITMAP16);
-DWORD       WINAPI GetBrushOrg(HDC16);
-BOOL32      WINAPI GetCharABCWidthsFloat32A(HDC32,UINT32,UINT32,LPABCFLOAT);
-BOOL32      WINAPI GetCharABCWidthsFloat32W(HDC32,UINT32,UINT32,LPABCFLOAT);
+INT       WINAPI DrawEscape(HDC,INT,INT,LPCSTR);
+INT16       WINAPI ExcludeVisRect16(HDC16,INT16,INT16,INT16,INT16);
+BOOL16      WINAPI FastWindowFrame16(HDC16,const RECT16*,INT16,INT16,DWORD);
+UINT16      WINAPI GDIRealizePalette16(HDC16);
+HPALETTE16  WINAPI GDISelectPalette16(HDC16,HPALETTE16,WORD);
+BOOL      WINAPI GdiComment(HDC,UINT,const BYTE *);
+DWORD       WINAPI GetBitmapDimension16(HBITMAP16);
+DWORD       WINAPI GetBrushOrg16(HDC16);
+BOOL      WINAPI GetCharABCWidthsFloatA(HDC,UINT,UINT,LPABCFLOAT);
+BOOL      WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT);
 #define     GetCharABCWidthsFloat WINELIB_NAME_AW(GetCharABCWidthsFloat)
-BOOL32      WINAPI GetCharWidthFloat32A(HDC32,UINT32,UINT32,PFLOAT);
-BOOL32      WINAPI GetCharWidthFloat32W(HDC32,UINT32,UINT32,PFLOAT);
+BOOL      WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
+BOOL      WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
 #define     GetCharWidthFloat WINELIB_NAME_AW(GetCharWidthFloat)
-BOOL32      WINAPI GetColorAdjustment(HDC32, LPCOLORADJUSTMENT);
-HFONT16     WINAPI GetCurLogFont(HDC16);
-DWORD       WINAPI GetCurrentPosition(HDC16);
+BOOL      WINAPI GetColorAdjustment(HDC, LPCOLORADJUSTMENT);
+HFONT16     WINAPI GetCurLogFont16(HDC16);
+DWORD       WINAPI GetCurrentPosition16(HDC16);
 DWORD       WINAPI GetDCHook(HDC16,FARPROC16*);
-DWORD       WINAPI GetDCOrg(HDC16);
-HDC16       WINAPI GetDCState(HDC16);
-INT16       WINAPI GetEnvironment(LPCSTR,LPDEVMODE16,UINT16);
-HGLOBAL16   WINAPI GetMetaFileBits(HMETAFILE16);
-BOOL32      WINAPI GetMiterLimit(HDC32, PFLOAT);
-DWORD       WINAPI GetTextExtent(HDC16,LPCSTR,INT16);
-DWORD       WINAPI GetViewportExt(HDC16);
-DWORD       WINAPI GetViewportOrg(HDC16);
-DWORD       WINAPI GetWindowExt(HDC16);
-DWORD       WINAPI GetWindowOrg(HDC16);
-HRGN16      WINAPI InquireVisRgn(HDC16);
-INT16       WINAPI IntersectVisRect(HDC16,INT16,INT16,INT16,INT16);
-BOOL16      WINAPI IsDCCurrentPalette(HDC16);
-BOOL16      WINAPI IsGDIObject(HGDIOBJ16);
-BOOL16      WINAPI IsValidMetaFile(HMETAFILE16);
-BOOL32      WINAPI MaskBlt(HDC32,INT32,INT32,INT32,INT32,HDC32,INT32,INT32,HBITMAP32,INT32,INT32,DWORD);
-DWORD       WINAPI MoveTo(HDC16,INT16,INT16);
-DWORD       WINAPI OffsetViewportOrg(HDC16,INT16,INT16);
-INT16       WINAPI OffsetVisRgn(HDC16,INT16,INT16);
-DWORD       WINAPI OffsetWindowOrg(HDC16,INT16,INT16);
-BOOL32      WINAPI PlgBlt32(HDC32,const POINT32*,HDC32,INT32,INT32,INT32,INT32,HBITMAP32,INT32,INT32);
-BOOL32      WINAPI PolyDraw32(HDC32,const POINT32*,const BYTE*,DWORD);
-UINT16      WINAPI RealizeDefaultPalette(HDC16);
-INT16       WINAPI RestoreVisRgn(HDC16);
-HRGN16      WINAPI SaveVisRgn(HDC16);
-DWORD       WINAPI ScaleViewportExt(HDC16,INT16,INT16,INT16,INT16);
-DWORD       WINAPI ScaleWindowExt(HDC16,INT16,INT16,INT16,INT16);
-INT16       WINAPI SelectVisRgn(HDC16,HRGN16);
-DWORD       WINAPI SetBitmapDimension(HBITMAP16,INT16,INT16);
-DWORD       WINAPI SetBrushOrg(HDC16,INT16,INT16);
-BOOL32      WINAPI SetColorAdjustment32(HDC32,const COLORADJUSTMENT*);
+DWORD       WINAPI GetDCOrg16(HDC16);
+HDC16       WINAPI GetDCState16(HDC16);
+INT16       WINAPI GetEnvironment16(LPCSTR,LPDEVMODE16,UINT16);
+HGLOBAL16   WINAPI GetMetaFileBits16(HMETAFILE16);
+BOOL      WINAPI GetMiterLimit(HDC, PFLOAT);
+DWORD       WINAPI GetTextExtent16(HDC16,LPCSTR,INT16);
+DWORD       WINAPI GetViewportExt16(HDC16);
+DWORD       WINAPI GetViewportOrg16(HDC16);
+DWORD       WINAPI GetWindowExt16(HDC16);
+DWORD       WINAPI GetWindowOrg16(HDC16);
+HRGN16      WINAPI InquireVisRgn16(HDC16);
+INT16       WINAPI IntersectVisRect16(HDC16,INT16,INT16,INT16,INT16);
+BOOL16      WINAPI IsDCCurrentPalette16(HDC16);
+BOOL16      WINAPI IsGDIObject16(HGDIOBJ16);
+BOOL16      WINAPI IsValidMetaFile16(HMETAFILE16);
+BOOL      WINAPI MaskBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,HBITMAP,INT,INT,DWORD);
+DWORD       WINAPI MoveTo16(HDC16,INT16,INT16);
+DWORD       WINAPI OffsetViewportOrg16(HDC16,INT16,INT16);
+INT16       WINAPI OffsetVisRgn16(HDC16,INT16,INT16);
+DWORD       WINAPI OffsetWindowOrg16(HDC16,INT16,INT16);
+BOOL      WINAPI PlgBlt(HDC,const POINT*,HDC,INT,INT,INT,INT,HBITMAP,INT,INT);
+BOOL      WINAPI PolyDraw(HDC,const POINT*,const BYTE*,DWORD);
+UINT16      WINAPI RealizeDefaultPalette16(HDC16);
+INT16       WINAPI RestoreVisRgn16(HDC16);
+HRGN16      WINAPI SaveVisRgn16(HDC16);
+DWORD       WINAPI ScaleViewportExt16(HDC16,INT16,INT16,INT16,INT16);
+DWORD       WINAPI ScaleWindowExt16(HDC16,INT16,INT16,INT16,INT16);
+INT16       WINAPI SelectVisRgn16(HDC16,HRGN16);
+DWORD       WINAPI SetBitmapDimension16(HBITMAP16,INT16,INT16);
+DWORD       WINAPI SetBrushOrg16(HDC16,INT16,INT16);
+BOOL      WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*);
 BOOL16      WINAPI SetDCHook(HDC16,FARPROC16,DWORD);
-DWORD       WINAPI SetDCOrg(HDC16,INT16,INT16);
-VOID        WINAPI SetDCState(HDC16,HDC16);
-INT16       WINAPI SetEnvironment(LPCSTR,LPDEVMODE16,UINT16);
-WORD        WINAPI SetHookFlags(HDC16,WORD);
-HMETAFILE16 WINAPI SetMetaFileBits(HGLOBAL16);
-BOOL32      WINAPI SetMiterLimit(HDC32, FLOAT, PFLOAT);
-DWORD       WINAPI SetViewportExt(HDC16,INT16,INT16);
-DWORD       WINAPI SetViewportOrg(HDC16,INT16,INT16);
-DWORD       WINAPI SetWindowExt(HDC16,INT16,INT16);
-DWORD       WINAPI SetWindowOrg(HDC16,INT16,INT16);
-BOOL32      WINAPI CombineTransform(LPXFORM,const XFORM *,const XFORM *);
-HENHMETAFILE32 WINAPI CopyEnhMetaFile32A(HENHMETAFILE32,LPCSTR);
-HENHMETAFILE32 WINAPI CopyEnhMetaFile32W(HENHMETAFILE32,LPCWSTR);
+DWORD       WINAPI SetDCOrg16(HDC16,INT16,INT16);
+VOID        WINAPI SetDCState16(HDC16,HDC16);
+INT16       WINAPI SetEnvironment16(LPCSTR,LPDEVMODE16,UINT16);
+WORD        WINAPI SetHookFlags16(HDC16,WORD);
+HMETAFILE16 WINAPI SetMetaFileBits16(HGLOBAL16);
+BOOL      WINAPI SetMiterLimit(HDC, FLOAT, PFLOAT);
+DWORD       WINAPI SetViewportExt16(HDC16,INT16,INT16);
+DWORD       WINAPI SetViewportOrg16(HDC16,INT16,INT16);
+DWORD       WINAPI SetWindowExt16(HDC16,INT16,INT16);
+DWORD       WINAPI SetWindowOrg16(HDC16,INT16,INT16);
+BOOL      WINAPI CombineTransform(LPXFORM,const XFORM *,const XFORM *);
+HENHMETAFILE WINAPI CopyEnhMetaFileA(HENHMETAFILE,LPCSTR);
+HENHMETAFILE WINAPI CopyEnhMetaFileW(HENHMETAFILE,LPCWSTR);
 #define     CopyEnhMetaFile WINELIB_NAME_AW(CopyEnhMetaFile)
-HPALETTE32  WINAPI CreateHalftonePalette(HDC32);
-BOOL32      WINAPI DeleteEnhMetaFile(HENHMETAFILE32);
-INT32       WINAPI ExtSelectClipRgn(HDC32,HRGN32,INT32);
-HRGN32      WINAPI ExtCreateRegion(const XFORM*,DWORD,const RGNDATA*);
-INT32       WINAPI ExtEscape(HDC32,INT32,INT32,LPCSTR,INT32,LPSTR);
-BOOL32      WINAPI FixBrushOrgEx(HDC32,INT32,INT32,LPPOINT32);
-HANDLE32    WINAPI GetCurrentObject(HDC32,UINT32);
-BOOL32      WINAPI GetDCOrgEx(HDC32,LPPOINT32);
-HENHMETAFILE32 WINAPI GetEnhMetaFile32A(LPCSTR);
-HENHMETAFILE32 WINAPI GetEnhMetaFile32W(LPCWSTR);
+HPALETTE  WINAPI CreateHalftonePalette(HDC);
+BOOL      WINAPI DeleteEnhMetaFile(HENHMETAFILE);
+INT       WINAPI ExtSelectClipRgn(HDC,HRGN,INT);
+HRGN      WINAPI ExtCreateRegion(const XFORM*,DWORD,const RGNDATA*);
+INT       WINAPI ExtEscape(HDC,INT,INT,LPCSTR,INT,LPSTR);
+BOOL      WINAPI FixBrushOrgEx(HDC,INT,INT,LPPOINT);
+HANDLE    WINAPI GetCurrentObject(HDC,UINT);
+BOOL      WINAPI GetDCOrgEx(HDC,LPPOINT);
+HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR);
+HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR);
 #define     GetEnhMetaFile WINELIB_NAME_AW(GetEnhMetaFile)
-UINT32      WINAPI GetEnhMetaFileBits(HENHMETAFILE32,UINT32,LPBYTE);
-UINT32      WINAPI GetEnhMetaFileHeader(HENHMETAFILE32,UINT32,LPENHMETAHEADER);
-UINT32      WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE32,UINT32,LPPALETTEENTRY);
-INT32       WINAPI GetGraphicsMode(HDC32);
-UINT32      WINAPI GetMetaFileBitsEx(HMETAFILE32,UINT32,LPVOID);
-DWORD       WINAPI GetObjectType(HANDLE32);
-UINT32      WINAPI GetTextCharsetInfo(HDC32,LPFONTSIGNATURE,DWORD);
-BOOL32      WINAPI GetTextExtentExPoint32A(HDC32,LPCSTR,INT32,INT32,
-                                           LPINT32,LPINT32,LPSIZE32);
-BOOL32      WINAPI GetTextExtentExPoint32W(HDC32,LPCWSTR,INT32,INT32,
-                                           LPINT32,LPINT32,LPSIZE32);
+UINT      WINAPI GetEnhMetaFileBits(HENHMETAFILE,UINT,LPBYTE);
+UINT      WINAPI GetEnhMetaFileHeader(HENHMETAFILE,UINT,LPENHMETAHEADER);
+UINT      WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY);
+INT       WINAPI GetGraphicsMode(HDC);
+UINT      WINAPI GetMetaFileBitsEx(HMETAFILE,UINT,LPVOID);
+DWORD       WINAPI GetObjectType(HANDLE);
+UINT      WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
+BOOL      WINAPI GetTextExtentExPointA(HDC,LPCSTR,INT,INT,
+                                           LPINT,LPINT,LPSIZE);
+BOOL      WINAPI GetTextExtentExPointW(HDC,LPCWSTR,INT,INT,
+                                           LPINT,LPINT,LPSIZE);
 #define     GetTextExtentExPoint WINELIB_NAME_AW(GetTextExtentExPoint)
-BOOL32      WINAPI GetWorldTransform(HDC32,LPXFORM);
-BOOL32      WINAPI ModifyWorldTransform(HDC32,const XFORM *, DWORD);
-BOOL32      WINAPI PlayEnhMetaFile(HDC32,HENHMETAFILE32,const RECT32*);
-BOOL32      WINAPI PlayEnhMetaFileRecord(HDC32,LPHANDLETABLE32,const ENHMETARECORD*,UINT32);
-BOOL32      WINAPI PolyPolyline(HDC32,const POINT32*,const DWORD*,DWORD);
-BOOL32      WINAPI SetBrushOrgEx(HDC32,INT32,INT32,LPPOINT32);
-HENHMETAFILE32 WINAPI SetEnhMetaFileBits(UINT32,const BYTE *);
-INT32       WINAPI SetGraphicsMode(HDC32,INT32);
-HMETAFILE32 WINAPI SetMetaFileBitsEx(UINT32,const BYTE*);
-BOOL32      WINAPI SetWorldTransform(HDC32,const XFORM*);
-BOOL32      WINAPI TranslateCharsetInfo(LPDWORD,LPCHARSETINFO,DWORD);
+BOOL      WINAPI GetWorldTransform(HDC,LPXFORM);
+BOOL      WINAPI ModifyWorldTransform(HDC,const XFORM *, DWORD);
+BOOL      WINAPI PlayEnhMetaFile(HDC,HENHMETAFILE,const RECT*);
+BOOL      WINAPI PlayEnhMetaFileRecord(HDC,LPHANDLETABLE,const ENHMETARECORD*,UINT);
+BOOL      WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD);
+BOOL      WINAPI SetBrushOrgEx(HDC,INT,INT,LPPOINT);
+HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE *);
+INT       WINAPI SetGraphicsMode(HDC,INT);
+HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE*);
+BOOL      WINAPI SetWorldTransform(HDC,const XFORM*);
+BOOL      WINAPI TranslateCharsetInfo(LPDWORD,LPCHARSETINFO,DWORD);
 
 /* Declarations for functions that change between Win16 and Win32 */
 
 INT16       WINAPI AbortDoc16(HDC16);
-INT32       WINAPI AbortDoc32(HDC32);
-#define     AbortDoc WINELIB_NAME(AbortDoc)
+INT       WINAPI AbortDoc(HDC);
 BOOL16      WINAPI AbortPath16(HDC16);
-BOOL32      WINAPI AbortPath32(HDC32);
-#define     AbortPath WINELIB_NAME(AbortPath)
+BOOL      WINAPI AbortPath(HDC);
 INT16       WINAPI AddFontResource16(LPCSTR);
-INT32       WINAPI AddFontResource32A(LPCSTR);
-INT32       WINAPI AddFontResource32W(LPCWSTR);
+INT       WINAPI AddFontResourceA(LPCSTR);
+INT       WINAPI AddFontResourceW(LPCWSTR);
 #define     AddFontResource WINELIB_NAME_AW(AddFontResource)
 void        WINAPI AnimatePalette16(HPALETTE16,UINT16,UINT16,const PALETTEENTRY*);
-BOOL32      WINAPI AnimatePalette32(HPALETTE32,UINT32,UINT32,const PALETTEENTRY*);
-#define     AnimatePalette WINELIB_NAME(AnimatePalette)
+BOOL      WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*);
 BOOL16      WINAPI Arc16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
-BOOL32      WINAPI Arc32(HDC32,INT32,INT32,INT32,INT32,INT32,INT32,INT32,INT32);
-#define     Arc WINELIB_NAME(Arc)
+BOOL      WINAPI Arc(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
 BOOL16      WINAPI BeginPath16(HDC16);
-BOOL32      WINAPI BeginPath32(HDC32);
-#define     BeginPath WINELIB_NAME(BeginPath)
+BOOL      WINAPI BeginPath(HDC);
 BOOL16      WINAPI BitBlt16(HDC16,INT16,INT16,INT16,INT16,HDC16,INT16,INT16,DWORD);
-BOOL32      WINAPI BitBlt32(HDC32,INT32,INT32,INT32,INT32,HDC32,INT32,INT32,DWORD);
-#define     BitBlt WINELIB_NAME(BitBlt)
-INT32       WINAPI ChoosePixelFormat(HDC32,const PIXELFORMATDESCRIPTOR*);
+BOOL      WINAPI BitBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,DWORD);
+INT       WINAPI ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR*);
 BOOL16      WINAPI Chord16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
-BOOL32      WINAPI Chord32(HDC32,INT32,INT32,INT32,INT32,INT32,INT32,INT32,INT32);
-#define     Chord WINELIB_NAME(Chord)
+BOOL      WINAPI Chord(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
 BOOL16      WINAPI CloseFigure16(HDC16);
-BOOL32      WINAPI CloseFigure32(HDC32);
-#define     CloseFigure WINELIB_NAME(CloseFigure)
+BOOL      WINAPI CloseFigure(HDC);
 HMETAFILE16 WINAPI CloseMetaFile16(HDC16);
-HMETAFILE32 WINAPI CloseMetaFile32(HDC32);
-#define     CloseMetaFile WINELIB_NAME(CloseMetaFile)
+HMETAFILE WINAPI CloseMetaFile(HDC);
 INT16       WINAPI CombineRgn16(HRGN16,HRGN16,HRGN16,INT16);
-INT32       WINAPI CombineRgn32(HRGN32,HRGN32,HRGN32,INT32);
-#define     CombineRgn WINELIB_NAME(CombineRgn)
+INT       WINAPI CombineRgn(HRGN,HRGN,HRGN,INT);
 HMETAFILE16 WINAPI CopyMetaFile16(HMETAFILE16,LPCSTR);
-HMETAFILE32 WINAPI CopyMetaFile32A(HMETAFILE32,LPCSTR);
-HMETAFILE32 WINAPI CopyMetaFile32W(HMETAFILE32,LPCWSTR);
+HMETAFILE WINAPI CopyMetaFileA(HMETAFILE,LPCSTR);
+HMETAFILE WINAPI CopyMetaFileW(HMETAFILE,LPCWSTR);
 #define     CopyMetaFile WINELIB_NAME_AW(CopyMetaFile)
 HBITMAP16   WINAPI CreateBitmap16(INT16,INT16,UINT16,UINT16,LPCVOID);
-HBITMAP32   WINAPI CreateBitmap32(INT32,INT32,UINT32,UINT32,LPCVOID);
-#define     CreateBitmap WINELIB_NAME(CreateBitmap)
+HBITMAP   WINAPI CreateBitmap(INT,INT,UINT,UINT,LPCVOID);
 HBITMAP16   WINAPI CreateBitmapIndirect16(const BITMAP16*);
-HBITMAP32   WINAPI CreateBitmapIndirect32(const BITMAP32*);
-#define     CreateBitmapIndirect WINELIB_NAME(CreateBitmapIndirect)
+HBITMAP   WINAPI CreateBitmapIndirect(const BITMAP*);
 HBRUSH16    WINAPI CreateBrushIndirect16(const LOGBRUSH16*);
-HBRUSH32    WINAPI CreateBrushIndirect32(const LOGBRUSH32*);
-#define     CreateBrushIndirect WINELIB_NAME(CreateBrushIndirect)
+HBRUSH    WINAPI CreateBrushIndirect(const LOGBRUSH*);
 HBITMAP16   WINAPI CreateCompatibleBitmap16(HDC16,INT16,INT16);
-HBITMAP32   WINAPI CreateCompatibleBitmap32(HDC32,INT32,INT32);
-#define     CreateCompatibleBitmap WINELIB_NAME(CreateCompatibleBitmap)
+HBITMAP   WINAPI CreateCompatibleBitmap(HDC,INT,INT);
 HDC16       WINAPI CreateCompatibleDC16(HDC16);
-HDC32       WINAPI CreateCompatibleDC32(HDC32);
-#define     CreateCompatibleDC WINELIB_NAME(CreateCompatibleDC)
+HDC       WINAPI CreateCompatibleDC(HDC);
 HDC16       WINAPI CreateDC16(LPCSTR,LPCSTR,LPCSTR,const DEVMODE16*);
-HDC32       WINAPI CreateDC32A(LPCSTR,LPCSTR,LPCSTR,const DEVMODE32A*);
-HDC32       WINAPI CreateDC32W(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODE32W*);
+HDC       WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
+HDC       WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
 #define     CreateDC WINELIB_NAME_AW(CreateDC)
 HBITMAP16   WINAPI CreateDIBitmap16(HDC16,const BITMAPINFOHEADER*,DWORD,
                                     LPCVOID,const BITMAPINFO*,UINT16);
-HBITMAP32   WINAPI CreateDIBitmap32(HDC32,const BITMAPINFOHEADER*,DWORD,
-                                    LPCVOID,const BITMAPINFO*,UINT32);
-#define     CreateDIBitmap WINELIB_NAME(CreateDIBitmap)
+HBITMAP   WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,
+                                    LPCVOID,const BITMAPINFO*,UINT);
 HBRUSH16    WINAPI CreateDIBPatternBrush16(HGLOBAL16,UINT16);
-HBRUSH32    WINAPI CreateDIBPatternBrush32(HGLOBAL32,UINT32);
-#define     CreateDIBPatternBrush WINELIB_NAME(CreateDIBPatternBrush)
+HBRUSH    WINAPI CreateDIBPatternBrush(HGLOBAL,UINT);
 HBITMAP16   WINAPI CreateDIBSection16 (HDC16, BITMAPINFO *, UINT16,
-				       SEGPTR *, HANDLE32, DWORD offset);
-HBITMAP32   WINAPI CreateDIBSection32 (HDC32, BITMAPINFO *, UINT32,
-				       LPVOID *, HANDLE32, DWORD offset);
-#define     CreateDIBSection WINELIB_NAME(CreateDIBSection)
+				       SEGPTR *, HANDLE, DWORD offset);
+HBITMAP   WINAPI CreateDIBSection (HDC, BITMAPINFO *, UINT,
+				       LPVOID *, HANDLE, DWORD offset);
 HBITMAP16   WINAPI CreateDiscardableBitmap16(HDC16,INT16,INT16);
-HBITMAP32   WINAPI CreateDiscardableBitmap32(HDC32,INT32,INT32);
-#define     CreateDiscardableBitmap WINELIB_NAME(CreateDiscardableBitmap)
+HBITMAP   WINAPI CreateDiscardableBitmap(HDC,INT,INT);
 HRGN16      WINAPI CreateEllipticRgn16(INT16,INT16,INT16,INT16);
-HRGN32      WINAPI CreateEllipticRgn32(INT32,INT32,INT32,INT32);
-#define     CreateEllipticRgn WINELIB_NAME(CreateEllipticRgn)
+HRGN      WINAPI CreateEllipticRgn(INT,INT,INT,INT);
 HRGN16      WINAPI CreateEllipticRgnIndirect16(const RECT16 *);
-HRGN32      WINAPI CreateEllipticRgnIndirect32(const RECT32 *);
-#define     CreateEllipticRgnIndirect WINELIB_NAME(CreateEllipticRgnIndirect)
+HRGN      WINAPI CreateEllipticRgnIndirect(const RECT *);
 HFONT16     WINAPI CreateFont16(INT16,INT16,INT16,INT16,INT16,BYTE,BYTE,BYTE,
                                 BYTE,BYTE,BYTE,BYTE,BYTE,LPCSTR);
-HFONT32     WINAPI CreateFont32A(INT32,INT32,INT32,INT32,INT32,DWORD,DWORD,
+HFONT     WINAPI CreateFontA(INT,INT,INT,INT,INT,DWORD,DWORD,
                                  DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCSTR);
-HFONT32     WINAPI CreateFont32W(INT32,INT32,INT32,INT32,INT32,DWORD,DWORD,
+HFONT     WINAPI CreateFontW(INT,INT,INT,INT,INT,DWORD,DWORD,
                                  DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR);
 #define     CreateFont WINELIB_NAME_AW(CreateFont)
 HFONT16     WINAPI CreateFontIndirect16(const LOGFONT16*);
-HFONT32     WINAPI CreateFontIndirect32A(const LOGFONT32A*);
-HFONT32     WINAPI CreateFontIndirect32W(const LOGFONT32W*);
+HFONT     WINAPI CreateFontIndirectA(const LOGFONTA*);
+HFONT     WINAPI CreateFontIndirectW(const LOGFONTW*);
 #define     CreateFontIndirect WINELIB_NAME_AW(CreateFontIndirect)
 HBRUSH16    WINAPI CreateHatchBrush16(INT16,COLORREF);
-HBRUSH32    WINAPI CreateHatchBrush32(INT32,COLORREF);
-#define     CreateHatchBrush WINELIB_NAME(CreateHatchBrush)
+HBRUSH    WINAPI CreateHatchBrush(INT,COLORREF);
 HDC16       WINAPI CreateIC16(LPCSTR,LPCSTR,LPCSTR,const DEVMODE16*);
-HDC32       WINAPI CreateIC32A(LPCSTR,LPCSTR,LPCSTR,const DEVMODE32A*);
-HDC32       WINAPI CreateIC32W(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODE32W*);
+HDC       WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
+HDC       WINAPI CreateICW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
 #define     CreateIC WINELIB_NAME_AW(CreateIC)
 HDC16       WINAPI CreateMetaFile16(LPCSTR);
-HDC32       WINAPI CreateMetaFile32A(LPCSTR);
-HDC32       WINAPI CreateMetaFile32W(LPCWSTR);
+HDC       WINAPI CreateMetaFileA(LPCSTR);
+HDC       WINAPI CreateMetaFileW(LPCWSTR);
 #define     CreateMetaFile WINELIB_NAME_AW(CreateMetaFile)
 HPALETTE16  WINAPI CreatePalette16(const LOGPALETTE*);
-HPALETTE32  WINAPI CreatePalette32(const LOGPALETTE*);
-#define     CreatePalette WINELIB_NAME(CreatePalette)
+HPALETTE  WINAPI CreatePalette(const LOGPALETTE*);
 HBRUSH16    WINAPI CreatePatternBrush16(HBITMAP16);
-HBRUSH32    WINAPI CreatePatternBrush32(HBITMAP32);
-#define     CreatePatternBrush WINELIB_NAME(CreatePatternBrush)
+HBRUSH    WINAPI CreatePatternBrush(HBITMAP);
 HPEN16      WINAPI CreatePen16(INT16,INT16,COLORREF);
-HPEN32      WINAPI CreatePen32(INT32,INT32,COLORREF);
-#define     CreatePen WINELIB_NAME(CreatePen)
+HPEN      WINAPI CreatePen(INT,INT,COLORREF);
 HPEN16      WINAPI CreatePenIndirect16(const LOGPEN16*);
-HPEN32      WINAPI CreatePenIndirect32(const LOGPEN32*);
-#define     CreatePenIndirect WINELIB_NAME(CreatePenIndirect)
+HPEN      WINAPI CreatePenIndirect(const LOGPEN*);
 HRGN16      WINAPI CreatePolyPolygonRgn16(const POINT16*,const INT16*,INT16,INT16);
-HRGN32      WINAPI CreatePolyPolygonRgn32(const POINT32*,const INT32*,INT32,INT32);
-#define     CreatePolyPolygonRgn WINELIB_NAME(CreatePolyPolygonRgn)
+HRGN      WINAPI CreatePolyPolygonRgn(const POINT*,const INT*,INT,INT);
 HRGN16      WINAPI CreatePolygonRgn16(const POINT16*,INT16,INT16);
-HRGN32      WINAPI CreatePolygonRgn32(const POINT32*,INT32,INT32);
-#define     CreatePolygonRgn WINELIB_NAME(CreatePolygonRgn)
+HRGN      WINAPI CreatePolygonRgn(const POINT*,INT,INT);
 HRGN16      WINAPI CreateRectRgn16(INT16,INT16,INT16,INT16);
-HRGN32      WINAPI CreateRectRgn32(INT32,INT32,INT32,INT32);
-#define     CreateRectRgn WINELIB_NAME(CreateRectRgn)
+HRGN      WINAPI CreateRectRgn(INT,INT,INT,INT);
 HRGN16      WINAPI CreateRectRgnIndirect16(const RECT16*);
-HRGN32      WINAPI CreateRectRgnIndirect32(const RECT32*);
-#define     CreateRectRgnIndirect WINELIB_NAME(CreateRectRgnIndirect)
+HRGN      WINAPI CreateRectRgnIndirect(const RECT*);
 HRGN16      WINAPI CreateRoundRectRgn16(INT16,INT16,INT16,INT16,INT16,INT16);
-HRGN32      WINAPI CreateRoundRectRgn32(INT32,INT32,INT32,INT32,INT32,INT32);
-#define     CreateRoundRectRgn WINELIB_NAME(CreateRoundRectRgn)
+HRGN      WINAPI CreateRoundRectRgn(INT,INT,INT,INT,INT,INT);
 BOOL16      WINAPI CreateScalableFontResource16(UINT16,LPCSTR,LPCSTR,LPCSTR);
-BOOL32      WINAPI CreateScalableFontResource32A(DWORD,LPCSTR,LPCSTR,LPCSTR);
-BOOL32      WINAPI CreateScalableFontResource32W(DWORD,LPCWSTR,LPCWSTR,LPCWSTR);
+BOOL      WINAPI CreateScalableFontResourceA(DWORD,LPCSTR,LPCSTR,LPCSTR);
+BOOL      WINAPI CreateScalableFontResourceW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR);
 #define     CreateScalableFontResource WINELIB_NAME_AW(CreateScalableFontResource)
 HBRUSH16    WINAPI CreateSolidBrush16(COLORREF);
-HBRUSH32    WINAPI CreateSolidBrush32(COLORREF);
-#define     CreateSolidBrush WINELIB_NAME(CreateSolidBrush)
+HBRUSH    WINAPI CreateSolidBrush(COLORREF);
 BOOL16      WINAPI DeleteDC16(HDC16);
-BOOL32      WINAPI DeleteDC32(HDC32);
-#define     DeleteDC WINELIB_NAME(DeleteDC)
+BOOL      WINAPI DeleteDC(HDC);
 BOOL16      WINAPI DeleteMetaFile16(HMETAFILE16);
-BOOL32      WINAPI DeleteMetaFile32(HMETAFILE32);
-#define     DeleteMetaFile WINELIB_NAME(DeleteMetaFile)
+BOOL      WINAPI DeleteMetaFile(HMETAFILE);
 BOOL16      WINAPI DeleteObject16(HGDIOBJ16);
-BOOL32      WINAPI DeleteObject32(HGDIOBJ32);
-#define     DeleteObject WINELIB_NAME(DeleteObject)
-INT32       WINAPI DescribePixelFormat(HDC32,int,UINT32,
+BOOL      WINAPI DeleteObject(HGDIOBJ);
+INT       WINAPI DescribePixelFormat(HDC,int,UINT,
                                        LPPIXELFORMATDESCRIPTOR);
 BOOL16      WINAPI DPtoLP16(HDC16,LPPOINT16,INT16);
-BOOL32      WINAPI DPtoLP32(HDC32,LPPOINT32,INT32);
-#define     DPtoLP WINELIB_NAME(DPtoLP)
+BOOL      WINAPI DPtoLP(HDC,LPPOINT,INT);
 BOOL16      WINAPI Ellipse16(HDC16,INT16,INT16,INT16,INT16);
-BOOL32      WINAPI Ellipse32(HDC32,INT32,INT32,INT32,INT32);
-#define     Ellipse WINELIB_NAME(Ellipse)
+BOOL      WINAPI Ellipse(HDC,INT,INT,INT,INT);
 INT16       WINAPI EndDoc16(HDC16);
-INT32       WINAPI EndDoc32(HDC32);
-#define     EndDoc WINELIB_NAME(EndDoc)
+INT       WINAPI EndDoc(HDC);
 BOOL16      WINAPI EndPath16(HDC16);
-BOOL32      WINAPI EndPath32(HDC32);
-#define     EndPath WINELIB_NAME(EndPath)
+BOOL      WINAPI EndPath(HDC);
 INT16       WINAPI EnumFontFamilies16(HDC16,LPCSTR,FONTENUMPROC16,LPARAM);
-INT32       WINAPI EnumFontFamilies32A(HDC32,LPCSTR,FONTENUMPROC32A,LPARAM);
-INT32       WINAPI EnumFontFamilies32W(HDC32,LPCWSTR,FONTENUMPROC32W,LPARAM);
+INT       WINAPI EnumFontFamiliesA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
+INT       WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
 #define     EnumFontFamilies WINELIB_NAME_AW(EnumFontFamilies)
 INT16       WINAPI EnumFontFamiliesEx16(HDC16,LPLOGFONT16,FONTENUMPROCEX16,LPARAM,DWORD);
-INT32       WINAPI EnumFontFamiliesEx32A(HDC32,LPLOGFONT32A,FONTENUMPROCEX32A,LPARAM,DWORD);
-INT32       WINAPI EnumFontFamiliesEx32W(HDC32,LPLOGFONT32W,FONTENUMPROCEX32W,LPARAM,DWORD);
+INT       WINAPI EnumFontFamiliesExA(HDC,LPLOGFONTA,FONTENUMPROCEXA,LPARAM,DWORD);
+INT       WINAPI EnumFontFamiliesExW(HDC,LPLOGFONTW,FONTENUMPROCEXW,LPARAM,DWORD);
 #define     EnumFontFamiliesEx WINELIB_NAME_AW(EnumFontFamiliesEx)
 INT16       WINAPI EnumFonts16(HDC16,LPCSTR,FONTENUMPROC16,LPARAM);
-INT32       WINAPI EnumFonts32A(HDC32,LPCSTR,FONTENUMPROC32A,LPARAM);
-INT32       WINAPI EnumFonts32W(HDC32,LPCWSTR,FONTENUMPROC32W,LPARAM);
+INT       WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
+INT       WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
 #define     EnumFonts WINELIB_NAME_AW(EnumFonts)
 BOOL16      WINAPI EnumMetaFile16(HDC16,HMETAFILE16,MFENUMPROC16,LPARAM);
-BOOL32      WINAPI EnumMetaFile32(HDC32,HMETAFILE32,MFENUMPROC32,LPARAM);
-#define     EnumMetaFile WINELIB_NAME(EnumMetaFile)
+BOOL      WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM);
 INT16       WINAPI EnumObjects16(HDC16,INT16,GOBJENUMPROC16,LPARAM);
-INT32       WINAPI EnumObjects32(HDC32,INT32,GOBJENUMPROC32,LPARAM);
-#define     EnumObjects WINELIB_NAME(EnumObjects)
+INT       WINAPI EnumObjects(HDC,INT,GOBJENUMPROC,LPARAM);
 BOOL16      WINAPI EqualRgn16(HRGN16,HRGN16);
-BOOL32      WINAPI EqualRgn32(HRGN32,HRGN32);
-#define     EqualRgn WINELIB_NAME(EqualRgn)
+BOOL      WINAPI EqualRgn(HRGN,HRGN);
 INT16       WINAPI Escape16(HDC16,INT16,INT16,SEGPTR,SEGPTR);
-INT32       WINAPI Escape32(HDC32,INT32,INT32,LPCSTR,LPVOID);
-#define     Escape WINELIB_NAME(Escape)
+INT       WINAPI Escape(HDC,INT,INT,LPCSTR,LPVOID);
 INT16       WINAPI ExcludeClipRect16(HDC16,INT16,INT16,INT16,INT16);
-INT32       WINAPI ExcludeClipRect32(HDC32,INT32,INT32,INT32,INT32);
-#define     ExcludeClipRect WINELIB_NAME(ExcludeClipRect)
+INT       WINAPI ExcludeClipRect(HDC,INT,INT,INT,INT);
 HPEN16      WINAPI ExtCreatePen16(DWORD,DWORD,const LOGBRUSH16*,DWORD,const DWORD*);
-HPEN32      WINAPI ExtCreatePen32(DWORD,DWORD,const LOGBRUSH32*,DWORD,const DWORD*);
-#define     ExtCreatePen WINELIB_NAME(ExtCreatePen)
+HPEN      WINAPI ExtCreatePen(DWORD,DWORD,const LOGBRUSH*,DWORD,const DWORD*);
 BOOL16      WINAPI ExtFloodFill16(HDC16,INT16,INT16,COLORREF,UINT16);
-BOOL32      WINAPI ExtFloodFill32(HDC32,INT32,INT32,COLORREF,UINT32);
-#define     ExtFloodFill WINELIB_NAME(ExtFloodFill)
+BOOL      WINAPI ExtFloodFill(HDC,INT,INT,COLORREF,UINT);
 BOOL16      WINAPI ExtTextOut16(HDC16,INT16,INT16,UINT16,const RECT16*,
                                 LPCSTR,UINT16,const INT16*);
-BOOL32      WINAPI ExtTextOut32A(HDC32,INT32,INT32,UINT32,const RECT32*,
-                                 LPCSTR,UINT32,const INT32*);
-BOOL32      WINAPI ExtTextOut32W(HDC32,INT32,INT32,UINT32,const RECT32*,
-                                 LPCWSTR,UINT32,const INT32*);
+BOOL      WINAPI ExtTextOutA(HDC,INT,INT,UINT,const RECT*,
+                                 LPCSTR,UINT,const INT*);
+BOOL      WINAPI ExtTextOutW(HDC,INT,INT,UINT,const RECT*,
+                                 LPCWSTR,UINT,const INT*);
 #define     ExtTextOut WINELIB_NAME_AW(ExtTextOut)
 BOOL16      WINAPI FillPath16(HDC16);
-BOOL32      WINAPI FillPath32(HDC32);
-#define     FillPath WINELIB_NAME(FillPath)
+BOOL      WINAPI FillPath(HDC);
 BOOL16      WINAPI FillRgn16(HDC16,HRGN16,HBRUSH16);
-BOOL32      WINAPI FillRgn32(HDC32,HRGN32,HBRUSH32);
-#define     FillRgn WINELIB_NAME(FillRgn)
+BOOL      WINAPI FillRgn(HDC,HRGN,HBRUSH);
 BOOL16      WINAPI FlattenPath16(HDC16);
-BOOL32      WINAPI FlattenPath32(HDC32);
-#define     FlattenPath WINELIB_NAME(FlattenPath)
+BOOL      WINAPI FlattenPath(HDC);
 BOOL16      WINAPI FloodFill16(HDC16,INT16,INT16,COLORREF);
-BOOL32      WINAPI FloodFill32(HDC32,INT32,INT32,COLORREF);
-#define     FloodFill WINELIB_NAME(FloodFill)
+BOOL      WINAPI FloodFill(HDC,INT,INT,COLORREF);
 BOOL16      WINAPI FrameRgn16(HDC16,HRGN16,HBRUSH16,INT16,INT16);
-BOOL32      WINAPI FrameRgn32(HDC32,HRGN32,HBRUSH32,INT32,INT32);
-#define     FrameRgn WINELIB_NAME(FrameRgn)
+BOOL      WINAPI FrameRgn(HDC,HRGN,HBRUSH,INT,INT);
 INT16       WINAPI GetArcDirection16(HDC16);
-INT32       WINAPI GetArcDirection32(HDC32);
-#define     GetArcDirection WINELIB_NAME(GetArcDirection)
+INT       WINAPI GetArcDirection(HDC);
 BOOL16      WINAPI GetAspectRatioFilterEx16(HDC16,LPSIZE16);
-BOOL32      WINAPI GetAspectRatioFilterEx32(HDC32,LPSIZE32);
-#define     GetAspectRatioFilterEx WINELIB_NAME(GetAspectRatioFilterEx)
+BOOL      WINAPI GetAspectRatioFilterEx(HDC,LPSIZE);
 LONG        WINAPI GetBitmapBits16(HBITMAP16,LONG,LPVOID);
-LONG        WINAPI GetBitmapBits32(HBITMAP32,LONG,LPVOID);
-#define     GetBitmapBits WINELIB_NAME(GetBitmapBits)
+LONG        WINAPI GetBitmapBits(HBITMAP,LONG,LPVOID);
 BOOL16      WINAPI GetBitmapDimensionEx16(HBITMAP16,LPSIZE16);
-BOOL32      WINAPI GetBitmapDimensionEx32(HBITMAP32,LPSIZE32);
-#define     GetBitmapDimensionEx WINELIB_NAME(GetBitmapDimensionEx)
+BOOL      WINAPI GetBitmapDimensionEx(HBITMAP,LPSIZE);
 BOOL16      WINAPI GetBrushOrgEx16(HDC16,LPPOINT16);
-BOOL32      WINAPI GetBrushOrgEx32(HDC32,LPPOINT32);
-#define     GetBrushOrgEx WINELIB_NAME(GetBrushOrgEx)
+BOOL      WINAPI GetBrushOrgEx(HDC,LPPOINT);
 COLORREF    WINAPI GetBkColor16(HDC16);
-COLORREF    WINAPI GetBkColor32(HDC32);
-#define     GetBkColor WINELIB_NAME(GetBkColor)
+COLORREF    WINAPI GetBkColor(HDC);
 INT16       WINAPI GetBkMode16(HDC16);
-INT32       WINAPI GetBkMode32(HDC32);
-#define     GetBkMode WINELIB_NAME(GetBkMode)
+INT       WINAPI GetBkMode(HDC);
 UINT16      WINAPI GetBoundsRect16(HDC16,LPRECT16,UINT16);
-UINT32      WINAPI GetBoundsRect32(HDC32,LPRECT32,UINT32);
-#define     GetBoundsRect WINELIB_NAME(GetBoundsRect)
+UINT      WINAPI GetBoundsRect(HDC,LPRECT,UINT);
 BOOL16      WINAPI GetCharABCWidths16(HDC16,UINT16,UINT16,LPABC16);
-BOOL32      WINAPI GetCharABCWidths32A(HDC32,UINT32,UINT32,LPABC32);
-BOOL32      WINAPI GetCharABCWidths32W(HDC32,UINT32,UINT32,LPABC32);
+BOOL      WINAPI GetCharABCWidthsA(HDC,UINT,UINT,LPABC);
+BOOL      WINAPI GetCharABCWidthsW(HDC,UINT,UINT,LPABC);
 #define     GetCharABCWidths WINELIB_NAME_AW(GetCharABCWidths)
-DWORD       WINAPI GetCharacterPlacement32A(HDC32,LPCSTR,INT32,INT32,GCP_RESULTS32A*,DWORD);
-DWORD       WINAPI GetCharacterPlacement32W(HDC32,LPCWSTR,INT32,INT32,GCP_RESULTS32W*,DWORD);
+DWORD       WINAPI GetCharacterPlacementA(HDC,LPCSTR,INT,INT,GCP_RESULTSA*,DWORD);
+DWORD       WINAPI GetCharacterPlacementW(HDC,LPCWSTR,INT,INT,GCP_RESULTSW*,DWORD);
 #define     GetCharacterPlacement WINELIB_NAME_AW(GetCharacterPlacement)
 BOOL16      WINAPI GetCharWidth16(HDC16,UINT16,UINT16,LPINT16);
-BOOL32      WINAPI GetCharWidth32A(HDC32,UINT32,UINT32,LPINT32);
-BOOL32      WINAPI GetCharWidth32W(HDC32,UINT32,UINT32,LPINT32);
+BOOL      WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
+BOOL      WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
 #define     GetCharWidth WINELIB_NAME_AW(GetCharWidth)
 INT16       WINAPI GetClipBox16(HDC16,LPRECT16);
-INT32       WINAPI GetClipBox32(HDC32,LPRECT32);
-#define     GetClipBox WINELIB_NAME(GetClipBox)
+INT       WINAPI GetClipBox(HDC,LPRECT);
 HRGN16      WINAPI GetClipRgn16(HDC16);
-INT32       WINAPI GetClipRgn32(HDC32,HRGN32);
-#define     GetClipRgn WINELIB_NAME(GetClipRgn)
+INT       WINAPI GetClipRgn(HDC,HRGN);
 BOOL16      WINAPI GetCurrentPositionEx16(HDC16,LPPOINT16);
-BOOL32      WINAPI GetCurrentPositionEx32(HDC32,LPPOINT32);
-#define     GetCurrentPositionEx WINELIB_NAME(GetCurrentPositionEx)
+BOOL      WINAPI GetCurrentPositionEx(HDC,LPPOINT);
 INT16       WINAPI GetDeviceCaps16(HDC16,INT16);
-INT32       WINAPI GetDeviceCaps32(HDC32,INT32);
-#define     GetDeviceCaps WINELIB_NAME(GetDeviceCaps)
+INT       WINAPI GetDeviceCaps(HDC,INT);
 UINT16      WINAPI GetDIBColorTable16(HDC16,UINT16,UINT16,RGBQUAD*);
-UINT32      WINAPI GetDIBColorTable32(HDC32,UINT32,UINT32,RGBQUAD*);
-#define     GetDIBColorTable WINELIB_NAME(GetDIBColorTable)
+UINT      WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);
 INT16       WINAPI GetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPVOID,LPBITMAPINFO,UINT16);
-INT32       WINAPI GetDIBits32(HDC32,HBITMAP32,UINT32,UINT32,LPVOID,LPBITMAPINFO,UINT32);
-#define     GetDIBits WINELIB_NAME(GetDIBits)
-DWORD       WINAPI GetFontData32(HDC32,DWORD,DWORD,LPVOID,DWORD);
-#define     GetFontData WINELIB_NAME(GetFontData)
+INT       WINAPI GetDIBits(HDC,HBITMAP,UINT,UINT,LPVOID,LPBITMAPINFO,UINT);
+DWORD       WINAPI GetFontData(HDC,DWORD,DWORD,LPVOID,DWORD);
 DWORD       WINAPI GetFontLanguageInfo16(HDC16);
-DWORD       WINAPI GetFontLanguageInfo32(HDC32);
-#define     GetFontLanguageInfo WINELIB_NAME(GetFontLanguageInfo)
+DWORD       WINAPI GetFontLanguageInfo(HDC);
 DWORD       WINAPI GetGlyphOutline16(HDC16,UINT16,UINT16,LPGLYPHMETRICS16,DWORD,LPVOID,const MAT2*);
-DWORD       WINAPI GetGlyphOutline32A(HDC32,UINT32,UINT32,LPGLYPHMETRICS32,DWORD,LPVOID,const MAT2*);
-DWORD       WINAPI GetGlyphOutline32W(HDC32,UINT32,UINT32,LPGLYPHMETRICS32,DWORD,LPVOID,const MAT2*);
+DWORD       WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
+DWORD       WINAPI GetGlyphOutlineW(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*);
 #define     GetGlyphOutline WINELIB_NAME_AW(GetGlyphOutline)
 INT16       WINAPI GetKerningPairs16(HDC16,INT16,LPKERNINGPAIR16);
-DWORD       WINAPI GetKerningPairs32A(HDC32,DWORD,LPKERNINGPAIR32);
-DWORD       WINAPI GetKerningPairs32W(HDC32,DWORD,LPKERNINGPAIR32);
+DWORD       WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR);
+DWORD       WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR);
 #define     GetKerningPairs WINELIB_NAME_AW(GetKerningPairs)
 INT16       WINAPI GetMapMode16(HDC16);
-INT32       WINAPI GetMapMode32(HDC32);
-#define     GetMapMode WINELIB_NAME(GetMapMode)
+INT       WINAPI GetMapMode(HDC);
 HMETAFILE16 WINAPI GetMetaFile16(LPCSTR);
-HMETAFILE32 WINAPI GetMetaFile32A(LPCSTR);
-HMETAFILE32 WINAPI GetMetaFile32W(LPCWSTR);
+HMETAFILE WINAPI GetMetaFileA(LPCSTR);
+HMETAFILE WINAPI GetMetaFileW(LPCWSTR);
 #define     GetMetaFile WINELIB_NAME_AW(GetMetaFile)
 DWORD       WINAPI GetNearestColor16(HDC16,DWORD);
-DWORD       WINAPI GetNearestColor32(HDC32,DWORD);
-#define     GetNearestColor WINELIB_NAME(GetNearestColor)
+DWORD       WINAPI GetNearestColor(HDC,DWORD);
 UINT16      WINAPI GetNearestPaletteIndex16(HPALETTE16,COLORREF);
-UINT32      WINAPI GetNearestPaletteIndex32(HPALETTE32,COLORREF);
-#define     GetNearestPaletteIndex WINELIB_NAME(GetNearestPaletteIndex)
+UINT      WINAPI GetNearestPaletteIndex(HPALETTE,COLORREF);
 INT16       WINAPI GetObject16(HANDLE16,INT16,LPVOID);
-INT32       WINAPI GetObject32A(HANDLE32,INT32,LPVOID);
-INT32       WINAPI GetObject32W(HANDLE32,INT32,LPVOID);
+INT       WINAPI GetObjectA(HANDLE,INT,LPVOID);
+INT       WINAPI GetObjectW(HANDLE,INT,LPVOID);
 #define     GetObject WINELIB_NAME_AW(GetObject)
 UINT16      WINAPI GetOutlineTextMetrics16(HDC16,UINT16,LPOUTLINETEXTMETRIC16);
-UINT32      WINAPI GetOutlineTextMetrics32A(HDC32,UINT32,LPOUTLINETEXTMETRIC32A);
-UINT32      WINAPI GetOutlineTextMetrics32W(HDC32,UINT32,LPOUTLINETEXTMETRIC32W);
+UINT      WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
+UINT      WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
 #define     GetOutlineTextMetrics WINELIB_NAME_AW(GetOutlineTextMetrics)
 UINT16      WINAPI GetPaletteEntries16(HPALETTE16,UINT16,UINT16,LPPALETTEENTRY);
-UINT32      WINAPI GetPaletteEntries32(HPALETTE32,UINT32,UINT32,LPPALETTEENTRY);
-#define     GetPaletteEntries WINELIB_NAME(GetPaletteEntries)
+UINT      WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
 INT16       WINAPI GetPath16(HDC16,LPPOINT16,LPBYTE,INT16);
-INT32       WINAPI GetPath32(HDC32,LPPOINT32,LPBYTE,INT32);
-#define     GetPath WINELIB_NAME(GetPath)
+INT       WINAPI GetPath(HDC,LPPOINT,LPBYTE,INT);
 COLORREF    WINAPI GetPixel16(HDC16,INT16,INT16);
-COLORREF    WINAPI GetPixel32(HDC32,INT32,INT32);
-#define     GetPixel WINELIB_NAME(GetPixel)
-INT32       WINAPI GetPixelFormat(HDC32);
+COLORREF    WINAPI GetPixel(HDC,INT,INT);
+INT       WINAPI GetPixelFormat(HDC);
 INT16       WINAPI GetPolyFillMode16(HDC16);
-INT32       WINAPI GetPolyFillMode32(HDC32);
-#define     GetPolyFillMode WINELIB_NAME(GetPolyFillMode)
+INT       WINAPI GetPolyFillMode(HDC);
 BOOL16      WINAPI GetRasterizerCaps16(LPRASTERIZER_STATUS,UINT16);
-BOOL32      WINAPI GetRasterizerCaps32(LPRASTERIZER_STATUS,UINT32);
-#define     GetRasterizerCaps WINELIB_NAME(GetRasterizerCaps)
+BOOL      WINAPI GetRasterizerCaps(LPRASTERIZER_STATUS,UINT);
 DWORD       WINAPI GetRegionData16(HRGN16,DWORD,LPRGNDATA);
-DWORD       WINAPI GetRegionData32(HRGN32,DWORD,LPRGNDATA);
-#define     GetRegionData WINELIB_NAME(GetRegionData)
+DWORD       WINAPI GetRegionData(HRGN,DWORD,LPRGNDATA);
 INT16       WINAPI GetRelAbs16(HDC16);
-INT32       WINAPI GetRelAbs32(HDC32);
-#define     GetRelAbs WINELIB_NAME(GetRelAbs)
+INT       WINAPI GetRelAbs(HDC);
 INT16       WINAPI GetRgnBox16(HRGN16,LPRECT16);
-INT32       WINAPI GetRgnBox32(HRGN32,LPRECT32);
-#define     GetRgnBox WINELIB_NAME(GetRgnBox)
+INT       WINAPI GetRgnBox(HRGN,LPRECT);
 INT16       WINAPI GetROP216(HDC16);
-INT32       WINAPI GetROP232(HDC32);
-#define     GetROP2 WINELIB_NAME(GetROP2)
+INT       WINAPI GetROP2(HDC);
 HGDIOBJ16   WINAPI GetStockObject16(INT16);
-HGDIOBJ32   WINAPI GetStockObject32(INT32);
-#define     GetStockObject WINELIB_NAME(GetStockObject)
+HGDIOBJ   WINAPI GetStockObject(INT);
 INT16       WINAPI GetStretchBltMode16(HDC16);
-INT32       WINAPI GetStretchBltMode32(HDC32);
-#define     GetStretchBltMode WINELIB_NAME(GetStretchBltMode)
+INT       WINAPI GetStretchBltMode(HDC);
 UINT16      WINAPI GetSystemPaletteEntries16(HDC16,UINT16,UINT16,LPPALETTEENTRY);
-UINT32      WINAPI GetSystemPaletteEntries32(HDC32,UINT32,UINT32,LPPALETTEENTRY);
-#define     GetSystemPaletteEntries WINELIB_NAME(GetSystemPaletteEntries)
+UINT      WINAPI GetSystemPaletteEntries(HDC,UINT,UINT,LPPALETTEENTRY);
 UINT16      WINAPI GetSystemPaletteUse16(HDC16);
-UINT32      WINAPI GetSystemPaletteUse32(HDC32);
-#define     GetSystemPaletteUse WINELIB_NAME(GetSystemPaletteUse)
+UINT      WINAPI GetSystemPaletteUse(HDC);
 UINT16      WINAPI GetTextAlign16(HDC16);
-UINT32      WINAPI GetTextAlign32(HDC32);
-#define     GetTextAlign WINELIB_NAME(GetTextAlign)
+UINT      WINAPI GetTextAlign(HDC);
 INT16       WINAPI GetTextCharacterExtra16(HDC16);
-INT32       WINAPI GetTextCharacterExtra32(HDC32);
-#define     GetTextCharacterExtra WINELIB_NAME(GetTextCharacterExtra)
+INT       WINAPI GetTextCharacterExtra(HDC);
 UINT16      WINAPI GetTextCharset16(HDC16);
-UINT32      WINAPI GetTextCharset32(HDC32);
-#define     GetTextCharset WINELIB_NAME(GetTextCharset)
+UINT      WINAPI GetTextCharset(HDC);
 COLORREF    WINAPI GetTextColor16(HDC16);
-COLORREF    WINAPI GetTextColor32(HDC32);
-#define     GetTextColor WINELIB_NAME(GetTextColor)
+COLORREF    WINAPI GetTextColor(HDC);
 /* this one is different, because Win32 has *both* 
  * GetTextExtentPoint and GetTextExtentPoint32 !
  */
 BOOL16      WINAPI GetTextExtentPoint16(HDC16,LPCSTR,INT16,LPSIZE16);
-BOOL32      WINAPI GetTextExtentPoint32A(HDC32,LPCSTR,INT32,LPSIZE32);
-BOOL32      WINAPI GetTextExtentPoint32W(HDC32,LPCWSTR,INT32,LPSIZE32);
-BOOL32      WINAPI GetTextExtentPoint32ABuggy(HDC32,LPCSTR,INT32,LPSIZE32);
-BOOL32      WINAPI GetTextExtentPoint32WBuggy(HDC32,LPCWSTR,INT32,LPSIZE32);
+BOOL      WINAPI GetTextExtentPoint32A(HDC,LPCSTR,INT,LPSIZE);
+BOOL      WINAPI GetTextExtentPoint32W(HDC,LPCWSTR,INT,LPSIZE);
+BOOL      WINAPI GetTextExtentPointA(HDC,LPCSTR,INT,LPSIZE);
+BOOL      WINAPI GetTextExtentPointW(HDC,LPCWSTR,INT,LPSIZE);
 #ifdef UNICODE
-#define     GetTextExtentPoint GetTextExtentPoint32WBuggy
+#define     GetTextExtentPoint GetTextExtentPointW
 #define     GetTextExtentPoint32 GetTextExtentPoint32W
 #else
-#define     GetTextExtentPoint GetTextExtentPoint32ABuggy
+#define     GetTextExtentPoint GetTextExtentPointA
 #define     GetTextExtentPoint32 GetTextExtentPoint32A
 #endif
 INT16       WINAPI GetTextFace16(HDC16,INT16,LPSTR);
-INT32       WINAPI GetTextFace32A(HDC32,INT32,LPSTR);
-INT32       WINAPI GetTextFace32W(HDC32,INT32,LPWSTR);
+INT       WINAPI GetTextFaceA(HDC,INT,LPSTR);
+INT       WINAPI GetTextFaceW(HDC,INT,LPWSTR);
 #define     GetTextFace WINELIB_NAME_AW(GetTextFace)
 BOOL16      WINAPI GetTextMetrics16(HDC16,LPTEXTMETRIC16);
-BOOL32      WINAPI GetTextMetrics32A(HDC32,LPTEXTMETRIC32A);
-BOOL32      WINAPI GetTextMetrics32W(HDC32,LPTEXTMETRIC32W);
+BOOL      WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);
+BOOL      WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
 #define     GetTextMetrics WINELIB_NAME_AW(GetTextMetrics)
 BOOL16      WINAPI GetViewportExtEx16(HDC16,LPSIZE16);
-BOOL32      WINAPI GetViewportExtEx32(HDC32,LPSIZE32);
-#define     GetViewportExtEx WINELIB_NAME(GetViewportExtEx)
+BOOL      WINAPI GetViewportExtEx(HDC,LPSIZE);
 BOOL16      WINAPI GetViewportOrgEx16(HDC16,LPPOINT16);
-BOOL32      WINAPI GetViewportOrgEx32(HDC32,LPPOINT32);
-#define     GetViewportOrgEx WINELIB_NAME(GetViewportOrgEx)
+BOOL      WINAPI GetViewportOrgEx(HDC,LPPOINT);
 BOOL16      WINAPI GetWindowExtEx16(HDC16,LPSIZE16);
-BOOL32      WINAPI GetWindowExtEx32(HDC32,LPSIZE32);
-#define     GetWindowExtEx WINELIB_NAME(GetWindowExtEx)
+BOOL      WINAPI GetWindowExtEx(HDC,LPSIZE);
 BOOL16      WINAPI GetWindowOrgEx16(HDC16,LPPOINT16);
-BOOL32      WINAPI GetWindowOrgEx32(HDC32,LPPOINT32);
-#define     GetWindowOrgEx WINELIB_NAME(GetWindowOrgEx)
+BOOL      WINAPI GetWindowOrgEx(HDC,LPPOINT);
 INT16       WINAPI IntersectClipRect16(HDC16,INT16,INT16,INT16,INT16);
-INT32       WINAPI IntersectClipRect32(HDC32,INT32,INT32,INT32,INT32);
-#define     IntersectClipRect WINELIB_NAME(IntersectClipRect)
+INT       WINAPI IntersectClipRect(HDC,INT,INT,INT,INT);
 BOOL16      WINAPI InvertRgn16(HDC16,HRGN16);
-BOOL32      WINAPI InvertRgn32(HDC32,HRGN32);
-#define     InvertRgn WINELIB_NAME(InvertRgn)
+BOOL      WINAPI InvertRgn(HDC,HRGN);
 VOID        WINAPI LineDDA16(INT16,INT16,INT16,INT16,LINEDDAPROC16,LPARAM);
-BOOL32      WINAPI LineDDA32(INT32,INT32,INT32,INT32,LINEDDAPROC32,LPARAM);
-#define     LineDDA WINELIB_NAME(LineDDA)
+BOOL      WINAPI LineDDA(INT,INT,INT,INT,LINEDDAPROC,LPARAM);
 BOOL16      WINAPI LineTo16(HDC16,INT16,INT16);
-BOOL32      WINAPI LineTo32(HDC32,INT32,INT32);
-#define     LineTo WINELIB_NAME(LineTo)
+BOOL      WINAPI LineTo(HDC,INT,INT);
 BOOL16      WINAPI LPtoDP16(HDC16,LPPOINT16,INT16);
-BOOL32      WINAPI LPtoDP32(HDC32,LPPOINT32,INT32);
-#define     LPtoDP WINELIB_NAME(LPtoDP)
+BOOL      WINAPI LPtoDP(HDC,LPPOINT,INT);
 BOOL16      WINAPI MoveToEx16(HDC16,INT16,INT16,LPPOINT16);
-BOOL32      WINAPI MoveToEx32(HDC32,INT32,INT32,LPPOINT32);
-#define     MoveToEx WINELIB_NAME(MoveToEx)
+BOOL      WINAPI MoveToEx(HDC,INT,INT,LPPOINT);
 INT16       WINAPI MulDiv16(INT16,INT16,INT16);
 /* FIXME This is defined in kernel32.spec !?*/
-INT32       WINAPI MulDiv32(INT32,INT32,INT32);
-#define     MulDiv WINELIB_NAME(MulDiv)
+INT       WINAPI MulDiv(INT,INT,INT);
 INT16       WINAPI OffsetClipRgn16(HDC16,INT16,INT16);
-INT32       WINAPI OffsetClipRgn32(HDC32,INT32,INT32);
-#define     OffsetClipRgn WINELIB_NAME(OffsetClipRgn)
+INT       WINAPI OffsetClipRgn(HDC,INT,INT);
 INT16       WINAPI OffsetRgn16(HRGN16,INT16,INT16);
-INT32       WINAPI OffsetRgn32(HRGN32,INT32,INT32);
-#define     OffsetRgn WINELIB_NAME(OffsetRgn)
+INT       WINAPI OffsetRgn(HRGN,INT,INT);
 BOOL16      WINAPI OffsetViewportOrgEx16(HDC16,INT16,INT16,LPPOINT16);
-BOOL32      WINAPI OffsetViewportOrgEx32(HDC32,INT32,INT32,LPPOINT32);
-#define     OffsetViewportOrgEx WINELIB_NAME(OffsetViewportOrgEx)
+BOOL      WINAPI OffsetViewportOrgEx(HDC,INT,INT,LPPOINT);
 BOOL16      WINAPI OffsetWindowOrgEx16(HDC16,INT16,INT16,LPPOINT16);
-BOOL32      WINAPI OffsetWindowOrgEx32(HDC32,INT32,INT32,LPPOINT32);
-#define     OffsetWindowOrgEx WINELIB_NAME(OffsetWindowOrgEx)
+BOOL      WINAPI OffsetWindowOrgEx(HDC,INT,INT,LPPOINT);
 BOOL16      WINAPI PaintRgn16(HDC16,HRGN16);
-BOOL32      WINAPI PaintRgn32(HDC32,HRGN32);
-#define     PaintRgn WINELIB_NAME(PaintRgn)
+BOOL      WINAPI PaintRgn(HDC,HRGN);
 BOOL16      WINAPI PatBlt16(HDC16,INT16,INT16,INT16,INT16,DWORD);
-BOOL32      WINAPI PatBlt32(HDC32,INT32,INT32,INT32,INT32,DWORD);
-#define     PatBlt WINELIB_NAME(PatBlt)
+BOOL      WINAPI PatBlt(HDC,INT,INT,INT,INT,DWORD);
 HRGN16      WINAPI PathToRegion16(HDC16);
-HRGN32      WINAPI PathToRegion32(HDC32);
-#define     PathToRegion WINELIB_NAME(PathToRegion)
+HRGN      WINAPI PathToRegion(HDC);
 BOOL16      WINAPI Pie16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
-BOOL32      WINAPI Pie32(HDC32,INT32,INT32,INT32,INT32,INT32,INT32,INT32,INT32);
-#define     Pie WINELIB_NAME(Pie)
+BOOL      WINAPI Pie(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
 BOOL16      WINAPI PlayMetaFile16(HDC16,HMETAFILE16);
-BOOL32      WINAPI PlayMetaFile32(HDC32,HMETAFILE32);
-#define     PlayMetaFile WINELIB_NAME(PlayMetaFile)
+BOOL      WINAPI PlayMetaFile(HDC,HMETAFILE);
 VOID        WINAPI PlayMetaFileRecord16(HDC16,LPHANDLETABLE16,LPMETARECORD,UINT16);
-BOOL32      WINAPI PlayMetaFileRecord32(HDC32,LPHANDLETABLE32,LPMETARECORD,UINT32);
-#define     PlayMetaFileRecord WINELIB_NAME(PlayMetaFileRecord)
+BOOL      WINAPI PlayMetaFileRecord(HDC,LPHANDLETABLE,LPMETARECORD,UINT);
 BOOL16      WINAPI PolyBezier16(HDC16,const POINT16*,INT16);
-BOOL32      WINAPI PolyBezier32(HDC32,const POINT32*,DWORD);
-#define     PolyBezier WINELIB_NAME(PolyBezier)
+BOOL      WINAPI PolyBezier(HDC,const POINT*,DWORD);
 BOOL16      WINAPI PolyBezierTo16(HDC16,const POINT16*,INT16);
-BOOL32      WINAPI PolyBezierTo32(HDC32,const POINT32*,DWORD);
-#define     PolyBezierTo WINELIB_NAME(PolyBezierTo)
+BOOL      WINAPI PolyBezierTo(HDC,const POINT*,DWORD);
 BOOL16      WINAPI PolyPolygon16(HDC16,const POINT16*,const INT16*,UINT16);
-BOOL32      WINAPI PolyPolygon32(HDC32,const POINT32*,const INT32*,UINT32);
-#define     PolyPolygon WINELIB_NAME(PolyPolygon)
+BOOL      WINAPI PolyPolygon(HDC,const POINT*,const INT*,UINT);
 BOOL16      WINAPI Polygon16(HDC16,const POINT16*,INT16);
-BOOL32      WINAPI Polygon32(HDC32,const POINT32*,INT32);
-#define     Polygon WINELIB_NAME(Polygon)
+BOOL      WINAPI Polygon(HDC,const POINT*,INT);
 BOOL16      WINAPI Polyline16(HDC16,const POINT16*,INT16);
-BOOL32      WINAPI Polyline32(HDC32,const POINT32*,INT32);
-#define     Polyline WINELIB_NAME(Polyline)
-BOOL32      WINAPI PolylineTo32(HDC32,const POINT32*,DWORD);
+BOOL      WINAPI Polyline(HDC,const POINT*,INT);
+BOOL      WINAPI PolylineTo(HDC,const POINT*,DWORD);
 BOOL16      WINAPI PtInRegion16(HRGN16,INT16,INT16);
-BOOL32      WINAPI PtInRegion32(HRGN32,INT32,INT32);
-#define     PtInRegion WINELIB_NAME(PtInRegion)
+BOOL      WINAPI PtInRegion(HRGN,INT,INT);
 BOOL16      WINAPI PtVisible16(HDC16,INT16,INT16);
-BOOL32      WINAPI PtVisible32(HDC32,INT32,INT32);
-#define     PtVisible WINELIB_NAME(PtVisible)
+BOOL      WINAPI PtVisible(HDC,INT,INT);
 /* FIXME This is defined in user.spec !? */
 UINT16      WINAPI RealizePalette16(HDC16);
-UINT32      WINAPI RealizePalette32(HDC32);
-#define     RealizePalette WINELIB_NAME(RealizePalette)
+UINT      WINAPI RealizePalette(HDC);
 BOOL16      WINAPI Rectangle16(HDC16,INT16,INT16,INT16,INT16);
-BOOL32      WINAPI Rectangle32(HDC32,INT32,INT32,INT32,INT32);
-#define     Rectangle WINELIB_NAME(Rectangle)
+BOOL      WINAPI Rectangle(HDC,INT,INT,INT,INT);
 BOOL16      WINAPI RectInRegion16(HRGN16,const RECT16 *);
-BOOL32      WINAPI RectInRegion32(HRGN32,const RECT32 *);
-#define     RectInRegion WINELIB_NAME(RectInRegion)
+BOOL      WINAPI RectInRegion(HRGN,const RECT *);
 BOOL16      WINAPI RectVisible16(HDC16,const RECT16*);
-BOOL32      WINAPI RectVisible32(HDC32,const RECT32*);
-#define     RectVisible WINELIB_NAME(RectVisible)
+BOOL      WINAPI RectVisible(HDC,const RECT*);
 BOOL16      WINAPI RemoveFontResource16(SEGPTR);
-BOOL32      WINAPI RemoveFontResource32A(LPCSTR);
-BOOL32      WINAPI RemoveFontResource32W(LPCWSTR);
+BOOL      WINAPI RemoveFontResourceA(LPCSTR);
+BOOL      WINAPI RemoveFontResourceW(LPCWSTR);
 #define     RemoveFontResource WINELIB_NAME_AW(RemoveFontResource)
 HDC16       WINAPI ResetDC16(HDC16,const DEVMODE16 *);
-HDC32       WINAPI ResetDC32A(HDC32,const DEVMODE32A *);
-HDC32       WINAPI ResetDC32W(HDC32,const DEVMODE32W *);
+HDC       WINAPI ResetDCA(HDC,const DEVMODEA *);
+HDC       WINAPI ResetDCW(HDC,const DEVMODEW *);
 #define     ResetDC WINELIB_NAME_AW(ResetDC)
 BOOL16      WINAPI ResizePalette16(HPALETTE16,UINT16);
-BOOL32      WINAPI ResizePalette32(HPALETTE32,UINT32);
-#define     ResizePalette WINELIB_NAME(ResizePalette)
+BOOL      WINAPI ResizePalette(HPALETTE,UINT);
 BOOL16      WINAPI RestoreDC16(HDC16,INT16);
-BOOL32      WINAPI RestoreDC32(HDC32,INT32);
-#define     RestoreDC WINELIB_NAME(RestoreDC)
+BOOL      WINAPI RestoreDC(HDC,INT);
 BOOL16      WINAPI RoundRect16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16);
-BOOL32      WINAPI RoundRect32(HDC32,INT32,INT32,INT32,INT32,INT32,INT32);
-#define     RoundRect WINELIB_NAME(RoundRect)
+BOOL      WINAPI RoundRect(HDC,INT,INT,INT,INT,INT,INT);
 INT16       WINAPI SaveDC16(HDC16);
-INT32       WINAPI SaveDC32(HDC32);
-#define     SaveDC WINELIB_NAME(SaveDC)
+INT       WINAPI SaveDC(HDC);
 BOOL16      WINAPI ScaleViewportExtEx16(HDC16,INT16,INT16,INT16,INT16,LPSIZE16);
-BOOL32      WINAPI ScaleViewportExtEx32(HDC32,INT32,INT32,INT32,INT32,LPSIZE32);
-#define     ScaleViewportExtEx WINELIB_NAME(ScaleViewportExtEx)
+BOOL      WINAPI ScaleViewportExtEx(HDC,INT,INT,INT,INT,LPSIZE);
 BOOL16      WINAPI ScaleWindowExtEx16(HDC16,INT16,INT16,INT16,INT16,LPSIZE16);
-BOOL32      WINAPI ScaleWindowExtEx32(HDC32,INT32,INT32,INT32,INT32,LPSIZE32);
-#define     ScaleWindowExtEx WINELIB_NAME(ScaleWindowExtEx)
+BOOL      WINAPI ScaleWindowExtEx(HDC,INT,INT,INT,INT,LPSIZE);
 BOOL16      WINAPI SelectClipPath16(HDC16,INT16);
-BOOL32      WINAPI SelectClipPath32(HDC32,INT32);
-#define     SelectClipPath WINELIB_NAME(SelectClipPath)
+BOOL      WINAPI SelectClipPath(HDC,INT);
 INT16       WINAPI SelectClipRgn16(HDC16,HRGN16);
-INT32       WINAPI SelectClipRgn32(HDC32,HRGN32);
-#define     SelectClipRgn WINELIB_NAME(SelectClipRgn)
+INT       WINAPI SelectClipRgn(HDC,HRGN);
 HGDIOBJ16   WINAPI SelectObject16(HDC16,HGDIOBJ16);
-HGDIOBJ32   WINAPI SelectObject32(HDC32,HGDIOBJ32);
-#define     SelectObject WINELIB_NAME(SelectObject)
+HGDIOBJ   WINAPI SelectObject(HDC,HGDIOBJ);
 /* FIXME This is defined in user.spec !? */
 HPALETTE16  WINAPI SelectPalette16(HDC16,HPALETTE16,BOOL16);
-HPALETTE32  WINAPI SelectPalette32(HDC32,HPALETTE32,BOOL32);
-#define     SelectPalette WINELIB_NAME(SelectPalette)
+HPALETTE  WINAPI SelectPalette(HDC,HPALETTE,BOOL);
 INT16       WINAPI SetAbortProc16(HDC16,SEGPTR);
-INT32       WINAPI SetAbortProc32(HDC32,ABORTPROC32);
-#define     SetAbortProc WINELIB_NAME(SetAbortProc)
+INT       WINAPI SetAbortProc(HDC,ABORTPROC);
 INT16       WINAPI SetArcDirection16(HDC16,INT16);
-INT32       WINAPI SetArcDirection32(HDC32,INT32);
-#define     SetArcDirection WINELIB_NAME(SetArcDirection)
+INT       WINAPI SetArcDirection(HDC,INT);
 LONG        WINAPI SetBitmapBits16(HBITMAP16,LONG,LPCVOID);
-LONG        WINAPI SetBitmapBits32(HBITMAP32,LONG,LPCVOID);
-#define     SetBitmapBits WINELIB_NAME(SetBitmapBits)
+LONG        WINAPI SetBitmapBits(HBITMAP,LONG,LPCVOID);
 BOOL16      WINAPI SetBitmapDimensionEx16(HBITMAP16,INT16,INT16,LPSIZE16);
-BOOL32      WINAPI SetBitmapDimensionEx32(HBITMAP32,INT32,INT32,LPSIZE32);
-#define     SetBitmapDimensionEx WINELIB_NAME(SetBitmapDimensionEx)
+BOOL      WINAPI SetBitmapDimensionEx(HBITMAP,INT,INT,LPSIZE);
 COLORREF    WINAPI SetBkColor16(HDC16,COLORREF);
-COLORREF    WINAPI SetBkColor32(HDC32,COLORREF);
-#define     SetBkColor WINELIB_NAME(SetBkColor)
+COLORREF    WINAPI SetBkColor(HDC,COLORREF);
 INT16       WINAPI SetBkMode16(HDC16,INT16);
-INT32       WINAPI SetBkMode32(HDC32,INT32);
-#define     SetBkMode WINELIB_NAME(SetBkMode)
+INT       WINAPI SetBkMode(HDC,INT);
 UINT16      WINAPI SetBoundsRect16(HDC16,const RECT16*,UINT16);
-UINT32      WINAPI SetBoundsRect32(HDC32,const RECT32*,UINT32);
-#define     SetBoundsRect WINELIB_NAME(SetBoundsRect)
+UINT      WINAPI SetBoundsRect(HDC,const RECT*,UINT);
 UINT16      WINAPI SetDIBColorTable16(HDC16,UINT16,UINT16,RGBQUAD*);
-UINT32      WINAPI SetDIBColorTable32(HDC32,UINT32,UINT32,RGBQUAD*);
-#define     SetDIBColorTable WINELIB_NAME(SetDIBColorTable)
+UINT      WINAPI SetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);
 INT16       WINAPI SetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPCVOID,const BITMAPINFO*,UINT16);
-INT32       WINAPI SetDIBits32(HDC32,HBITMAP32,UINT32,UINT32,LPCVOID,const BITMAPINFO*,UINT32);
-#define     SetDIBits WINELIB_NAME(SetDIBits)
+INT       WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT);
 INT16       WINAPI SetDIBitsToDevice16(HDC16,INT16,INT16,INT16,INT16,INT16,
                          INT16,UINT16,UINT16,LPCVOID,const BITMAPINFO*,UINT16);
-INT32       WINAPI SetDIBitsToDevice32(HDC32,INT32,INT32,DWORD,DWORD,INT32,
-                         INT32,UINT32,UINT32,LPCVOID,const BITMAPINFO*,UINT32);
-#define     SetDIBitsToDevice WINELIB_NAME(SetDIBitsToDevice)
+INT       WINAPI SetDIBitsToDevice(HDC,INT,INT,DWORD,DWORD,INT,
+                         INT,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT);
 INT16       WINAPI SetMapMode16(HDC16,INT16);
-INT32       WINAPI SetMapMode32(HDC32,INT32);
-#define     SetMapMode WINELIB_NAME(SetMapMode)
+INT       WINAPI SetMapMode(HDC,INT);
 DWORD       WINAPI SetMapperFlags16(HDC16,DWORD);
-DWORD       WINAPI SetMapperFlags32(HDC32,DWORD);
-#define     SetMapperFlags WINELIB_NAME(SetMapperFlags)
+DWORD       WINAPI SetMapperFlags(HDC,DWORD);
 UINT16      WINAPI SetPaletteEntries16(HPALETTE16,UINT16,UINT16,LPPALETTEENTRY);
-UINT32      WINAPI SetPaletteEntries32(HPALETTE32,UINT32,UINT32,LPPALETTEENTRY);
-#define     SetPaletteEntries WINELIB_NAME(SetPaletteEntries)
+UINT      WINAPI SetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
 COLORREF    WINAPI SetPixel16(HDC16,INT16,INT16,COLORREF);
-COLORREF    WINAPI SetPixel32(HDC32,INT32,INT32,COLORREF);
-#define     SetPixel WINELIB_NAME(SetPixel)
-BOOL32      WINAPI SetPixelV32(HDC32,INT32,INT32,COLORREF);
-#define     SetPixelV WINELIB_NAME(SetPixelV)
-BOOL32      WINAPI SetPixelFormat(HDC32,int,const PIXELFORMATDESCRIPTOR*);
+COLORREF    WINAPI SetPixel(HDC,INT,INT,COLORREF);
+BOOL      WINAPI SetPixelV(HDC,INT,INT,COLORREF);
+BOOL      WINAPI SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR*);
 INT16       WINAPI SetPolyFillMode16(HDC16,INT16);
-INT32       WINAPI SetPolyFillMode32(HDC32,INT32);
-#define     SetPolyFillMode WINELIB_NAME(SetPolyFillMode)
+INT       WINAPI SetPolyFillMode(HDC,INT);
 VOID        WINAPI SetRectRgn16(HRGN16,INT16,INT16,INT16,INT16);
-VOID        WINAPI SetRectRgn32(HRGN32,INT32,INT32,INT32,INT32);
-#define     SetRectRgn WINELIB_NAME(SetRectRgn)
+VOID        WINAPI SetRectRgn(HRGN,INT,INT,INT,INT);
 INT16       WINAPI SetRelAbs16(HDC16,INT16);
-INT32       WINAPI SetRelAbs32(HDC32,INT32);
-#define     SetRelAbs WINELIB_NAME(SetRelAbs)
+INT       WINAPI SetRelAbs(HDC,INT);
 INT16       WINAPI SetROP216(HDC16,INT16);
-INT32       WINAPI SetROP232(HDC32,INT32);
-#define     SetROP2 WINELIB_NAME(SetROP2)
+INT       WINAPI SetROP2(HDC,INT);
 INT16       WINAPI SetStretchBltMode16(HDC16,INT16);
-INT32       WINAPI SetStretchBltMode32(HDC32,INT32);
-#define     SetStretchBltMode WINELIB_NAME(SetStretchBltMode)
+INT       WINAPI SetStretchBltMode(HDC,INT);
 UINT16      WINAPI SetSystemPaletteUse16(HDC16,UINT16);
-UINT32      WINAPI SetSystemPaletteUse32(HDC32,UINT32);
-#define     SetSystemPaletteUse WINELIB_NAME(SetSystemPaletteUse)
+UINT      WINAPI SetSystemPaletteUse(HDC,UINT);
 UINT16      WINAPI SetTextAlign16(HDC16,UINT16);
-UINT32      WINAPI SetTextAlign32(HDC32,UINT32);
-#define     SetTextAlign WINELIB_NAME(SetTextAlign)
+UINT      WINAPI SetTextAlign(HDC,UINT);
 INT16       WINAPI SetTextCharacterExtra16(HDC16,INT16);
-INT32       WINAPI SetTextCharacterExtra32(HDC32,INT32);
-#define     SetTextCharacterExtra WINELIB_NAME(SetTextCharacterExtra)
+INT       WINAPI SetTextCharacterExtra(HDC,INT);
 COLORREF    WINAPI SetTextColor16(HDC16,COLORREF);
-COLORREF    WINAPI SetTextColor32(HDC32,COLORREF);
-#define     SetTextColor WINELIB_NAME(SetTextColor)
+COLORREF    WINAPI SetTextColor(HDC,COLORREF);
 INT16       WINAPI SetTextJustification16(HDC16,INT16,INT16);
-BOOL32      WINAPI SetTextJustification32(HDC32,INT32,INT32);
-#define     SetTextJustification WINELIB_NAME(SetTextJustification)
+BOOL      WINAPI SetTextJustification(HDC,INT,INT);
 BOOL16      WINAPI SetViewportExtEx16(HDC16,INT16,INT16,LPSIZE16);
-BOOL32      WINAPI SetViewportExtEx32(HDC32,INT32,INT32,LPSIZE32);
-#define     SetViewportExtEx WINELIB_NAME(SetViewportExtEx)
+BOOL      WINAPI SetViewportExtEx(HDC,INT,INT,LPSIZE);
 BOOL16      WINAPI SetViewportOrgEx16(HDC16,INT16,INT16,LPPOINT16);
-BOOL32      WINAPI SetViewportOrgEx32(HDC32,INT32,INT32,LPPOINT32);
-#define     SetViewportOrgEx WINELIB_NAME(SetViewportOrgEx)
+BOOL      WINAPI SetViewportOrgEx(HDC,INT,INT,LPPOINT);
 BOOL16      WINAPI SetWindowExtEx16(HDC16,INT16,INT16,LPSIZE16);
-BOOL32      WINAPI SetWindowExtEx32(HDC32,INT32,INT32,LPSIZE32);
-#define     SetWindowExtEx WINELIB_NAME(SetWindowExtEx)
+BOOL      WINAPI SetWindowExtEx(HDC,INT,INT,LPSIZE);
 BOOL16      WINAPI SetWindowOrgEx16(HDC16,INT16,INT16,LPPOINT16);
-BOOL32      WINAPI SetWindowOrgEx32(HDC32,INT32,INT32,LPPOINT32);
-#define     SetWindowOrgEx WINELIB_NAME(SetWindowOrgEx)
-HENHMETAFILE32 WINAPI SetWinMetaFileBits(UINT32,CONST BYTE*,HDC32,CONST METAFILEPICT32 *);
+BOOL      WINAPI SetWindowOrgEx(HDC,INT,INT,LPPOINT);
+HENHMETAFILE WINAPI SetWinMetaFileBits(UINT,CONST BYTE*,HDC,CONST METAFILEPICT *);
 INT16       WINAPI StartDoc16(HDC16,const DOCINFO16*);
-INT32       WINAPI StartDoc32A(HDC32,const DOCINFO32A*);
-INT32       WINAPI StartDoc32W(HDC32,const DOCINFO32W*);
+INT       WINAPI StartDocA(HDC,const DOCINFOA*);
+INT       WINAPI StartDocW(HDC,const DOCINFOW*);
 #define     StartDoc WINELIB_NAME_AW(StartDoc)
 INT16       WINAPI StartPage16(HDC16);
-INT32       WINAPI StartPage32(HDC32);
-#define     StartPage WINELIB_NAME(StartPage)
+INT       WINAPI StartPage(HDC);
 INT16       WINAPI EndPage16(HDC16);
-INT32       WINAPI EndPage32(HDC32);
-#define     EndPage WINELIB_NAME(EndPage)
+INT       WINAPI EndPage(HDC);
 BOOL16      WINAPI StretchBlt16(HDC16,INT16,INT16,INT16,INT16,HDC16,INT16,
                                 INT16,INT16,INT16,DWORD);
-BOOL32      WINAPI StretchBlt32(HDC32,INT32,INT32,INT32,INT32,HDC32,INT32,
-                                INT32,INT32,INT32,DWORD);
-#define     StretchBlt WINELIB_NAME(StretchBlt)
+BOOL      WINAPI StretchBlt(HDC,INT,INT,INT,INT,HDC,INT,
+                                INT,INT,INT,DWORD);
 INT16       WINAPI StretchDIBits16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,
                        INT16,INT16,const VOID*,const BITMAPINFO*,UINT16,DWORD);
-INT32       WINAPI StretchDIBits32(HDC32,INT32,INT32,INT32,INT32,INT32,INT32,
-                       INT32,INT32,const VOID*,const BITMAPINFO*,UINT32,DWORD);
-#define     StretchDIBits WINELIB_NAME(StretchDIBits)
+INT       WINAPI StretchDIBits(HDC,INT,INT,INT,INT,INT,INT,
+                       INT,INT,const VOID*,const BITMAPINFO*,UINT,DWORD);
 BOOL16      WINAPI StrokeAndFillPath16(HDC16);
-BOOL32      WINAPI StrokeAndFillPath32(HDC32);
-#define     StrokeAndFillPath WINELIB_NAME(StrokeAndFillPath)
+BOOL      WINAPI StrokeAndFillPath(HDC);
 BOOL16      WINAPI StrokePath16(HDC16);
-BOOL32      WINAPI StrokePath32(HDC32);
-#define     StrokePath WINELIB_NAME(StrokePath)
-BOOL32      WINAPI SwapBuffers(HDC32);
+BOOL      WINAPI StrokePath(HDC);
+BOOL      WINAPI SwapBuffers(HDC);
 BOOL16      WINAPI TextOut16(HDC16,INT16,INT16,LPCSTR,INT16);
-BOOL32      WINAPI TextOut32A(HDC32,INT32,INT32,LPCSTR,INT32);
-BOOL32      WINAPI TextOut32W(HDC32,INT32,INT32,LPCWSTR,INT32);
+BOOL      WINAPI TextOutA(HDC,INT,INT,LPCSTR,INT);
+BOOL      WINAPI TextOutW(HDC,INT,INT,LPCWSTR,INT);
 #define     TextOut WINELIB_NAME_AW(TextOut)
 BOOL16      WINAPI UnrealizeObject16(HGDIOBJ16);
-BOOL32      WINAPI UnrealizeObject32(HGDIOBJ32);
-#define     UnrealizeObject WINELIB_NAME(UnrealizeObject)
+BOOL      WINAPI UnrealizeObject(HGDIOBJ);
 INT16       WINAPI UpdateColors16(HDC16);
-BOOL32      WINAPI UpdateColors32(HDC32);
-#define     UpdateColors WINELIB_NAME(UpdateColors)
+BOOL      WINAPI UpdateColors(HDC);
 BOOL16      WINAPI WidenPath16(HDC16);
-BOOL32      WINAPI WidenPath32(HDC32);
-#define     WidenPath WINELIB_NAME(WidenPath)
+BOOL      WINAPI WidenPath(HDC);
 
 #endif /* __WINE_WINGDI_H */
diff --git a/include/winioctl.h b/include/winioctl.h
index cc197c7b131..3d7b7f80f7c 100644
--- a/include/winioctl.h
+++ b/include/winioctl.h
@@ -207,7 +207,7 @@
 #define PARTITION_EXTENDED              0x05      /* Extended partition entry */
 #define PARTITION_HUGE                  0x06      /* Huge partition MS-DOS V4 */
 #define PARTITION_IFS                   0x07      /* IFS Partition */
-#define PARTITION_FAT32                 0x0B      /* FAT32 */
+#define PARTITION_FAT                 0x0B      /* FAT32 */
 #define PARTITION_FAT32_XINT13          0x0C      /* FAT32 using extended int13 services */
 #define PARTITION_XINT13                0x0E      /* Win95 partition using extended int13 services */
 #define PARTITION_XINT13_EXTENDED       0x0F      /* Same as type 5 but uses extended int13 services */
diff --git a/include/winnetwk.h b/include/winnetwk.h
index 99997067c5d..55515b4acf5 100644
--- a/include/winnetwk.h
+++ b/include/winnetwk.h
@@ -13,7 +13,7 @@ typedef struct {
 	LPSTR	lpRemoteName;
 	LPSTR	lpComment ;
 	LPSTR	lpProvider;
-} NETRESOURCE32A,*LPNETRESOURCE32A;
+} NETRESOURCEA,*LPNETRESOURCEA;
 
 typedef struct {
 	DWORD	dwScope;
@@ -24,25 +24,25 @@ typedef struct {
 	LPWSTR	lpRemoteName;
 	LPWSTR	lpComment ;
 	LPWSTR	lpProvider;
-} NETRESOURCE32W,*LPNETRESOURCE32W;
+} NETRESOURCEW,*LPNETRESOURCEW;
 
 DECL_WINELIB_TYPE_AW(NETRESOURCE)
 DECL_WINELIB_TYPE_AW(LPNETRESOURCE)
 
 typedef struct {
     DWORD cbStructure;       /* size of this structure in bytes */
-    HWND32 hwndOwner;          /* owner window for the dialog */
-    LPNETRESOURCE32A lpConnRes;/* Requested Resource info    */
+    HWND hwndOwner;          /* owner window for the dialog */
+    LPNETRESOURCEA lpConnRes;/* Requested Resource info    */
     DWORD dwFlags;           /* flags (see below) */
     DWORD dwDevNum;          /* number of devices connected to */
-} CONNECTDLGSTRUCT32A, *LPCONNECTDLGSTRUCT32A;
+} CONNECTDLGSTRUCTA, *LPCONNECTDLGSTRUCTA;
 typedef struct {
     DWORD cbStructure;       /* size of this structure in bytes */
-    HWND32 hwndOwner;          /* owner window for the dialog */
-    LPNETRESOURCE32W lpConnRes;/* Requested Resource info    */
+    HWND hwndOwner;          /* owner window for the dialog */
+    LPNETRESOURCEW lpConnRes;/* Requested Resource info    */
     DWORD dwFlags;           /* flags (see below) */
     DWORD dwDevNum;          /* number of devices connected to */
-} CONNECTDLGSTRUCT32W, *LPCONNECTDLGSTRUCT32W;
+} CONNECTDLGSTRUCTW, *LPCONNECTDLGSTRUCTW;
 
 DECL_WINELIB_TYPE_AW(CONNECTDLGSTRUCT)
 DECL_WINELIB_TYPE_AW(LPCONNECTDLGSTRUCT)
@@ -66,18 +66,18 @@ typedef struct {
 } NETCONNECTINFOSTRUCT,*LPNETCONNECTINFOSTRUCT;
   
 
-UINT32      WINAPI WNetAddConnection2_32A(LPNETRESOURCE32A,LPCSTR,LPCSTR,DWORD);
-UINT32      WINAPI WNetAddConnection2_32W(LPNETRESOURCE32W,LPCWSTR,LPCWSTR,DWORD);
+UINT      WINAPI WNetAddConnection2A(LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD);
+UINT      WINAPI WNetAddConnection2W(LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD);
 #define     WNetAddConnection2 WINELIB_NAME_AW(WNetAddConnection2_)
-UINT32      WINAPI WNetAddConnection3_32A(HWND32,LPNETRESOURCE32A,LPCSTR,LPCSTR,DWORD);
-UINT32      WINAPI WNetAddConnection3_32W(HWND32,LPNETRESOURCE32W,LPCWSTR,LPCWSTR,DWORD);
+UINT      WINAPI WNetAddConnection3A(HWND,LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD);
+UINT      WINAPI WNetAddConnection3W(HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD);
 #define     WNetAddConnection3 WINELIB_NAME_AW(WNetAddConnection3_)
-UINT32      WINAPI WNetConnectionDialog1_32(HWND32,DWORD);
-UINT32      WINAPI WNetConnectionDialog1_32A(LPCONNECTDLGSTRUCT32A);
-UINT32      WINAPI WNetConnectionDialog1_32W(LPCONNECTDLGSTRUCT32W);
+UINT      WINAPI WNetConnectionDialog1(HWND,DWORD);
+UINT      WINAPI WNetConnectionDialog1A(LPCONNECTDLGSTRUCTA);
+UINT      WINAPI WNetConnectionDialog1W(LPCONNECTDLGSTRUCTW);
 #define     WNetConnectionDialog1 WINELIB_NAME_AW(WNetConnectionDialog1_)
-UINT32      WINAPI MultinetGetErrorText32A(DWORD,DWORD,DWORD);
-UINT32      WINAPI MultinetGetErrorText32W(DWORD,DWORD,DWORD);
+UINT      WINAPI MultinetGetErrorTextA(DWORD,DWORD,DWORD);
+UINT      WINAPI MultinetGetErrorTextW(DWORD,DWORD,DWORD);
 #define     MultinetGetErrorText WINELIB_NAME_AW(MultinetGetErrorText_)
 
 
diff --git a/include/winnt.h b/include/winnt.h
index 2c4e89d1641..d97bbc1fa8e 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -37,7 +37,7 @@
 #define ANYSIZE_ARRAY 1
 
 #define FIELD_OFFSET(type, field) \
-  ((LONG)(INT32)&(((type *)0)->field))
+  ((LONG)(INT)&(((type *)0)->field))
 
 #define CONTAINING_RECORD(address, type, field) \
   ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field)))
@@ -47,14 +47,14 @@
 typedef BYTE     BOOLEAN;
 typedef BOOLEAN *PBOOLEAN;
 
-typedef struct _LIST_ENTRY32 {
-  struct _LIST_ENTRY32 *Flink;
-  struct _LIST_ENTRY32 *Blink;
-} LIST_ENTRY32, *PLIST_ENTRY32;
+typedef struct _LIST_ENTRY {
+  struct _LIST_ENTRY *Flink;
+  struct _LIST_ENTRY *Blink;
+} LIST_ENTRY, *PLIST_ENTRY;
 
-typedef struct _SINGLE_LIST_ENTRY32 {
-  struct _SINGLE_LIST_ENTRY32 *Next;
-} SINGLE_LIST_ENTRY32, *PSINGLE_LIST_ENTRY32;
+typedef struct _SINGLE_LIST_ENTRY {
+  struct _SINGLE_LIST_ENTRY *Next;
+} SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY;
 
 /* Heap flags */
 
@@ -145,7 +145,7 @@ typedef struct
     DWORD   SegSs;
 } CONTEXT, *PCONTEXT;
 
-typedef HANDLE32 *PHANDLE;
+typedef HANDLE *PHANDLE;
 
 #ifdef __WINE__
 
diff --git a/include/winpos.h b/include/winpos.h
index 5cd0116caf5..66bbcecbcdf 100644
--- a/include/winpos.h
+++ b/include/winpos.h
@@ -10,7 +10,7 @@
 #include "win.h"
 #include "wine/winuser16.h" /* for WINDOWPOS16 */
 
-#define DWP_MAGIC  ((INT32)('W' | ('P' << 8) | ('O' << 16) | ('S' << 24)))
+#define DWP_MAGIC  ((INT)('W' | ('P' << 8) | ('O' << 16) | ('S' << 24)))
 
 /* undocumented SWP flags - from SDK 3.1 */
 #define SWP_NOCLIENTSIZE	0x0800
@@ -18,32 +18,32 @@
 
 typedef struct
 {
-    INT32       actualCount;
-    INT32       suggestedCount;
-    BOOL32      valid;
-    INT32       wMagic;
-    HWND32      hwndParent;
-    WINDOWPOS32 winPos[1];
+    INT       actualCount;
+    INT       suggestedCount;
+    BOOL      valid;
+    INT       wMagic;
+    HWND      hwndParent;
+    WINDOWPOS winPos[1];
 } DWP;
 
-extern BOOL32 WINPOS_RedrawIconTitle( HWND32 hWnd );
-extern BOOL32 WINPOS_ShowIconTitle( WND* pWnd, BOOL32 bShow );
-extern void   WINPOS_GetMinMaxInfo( WND* pWnd, POINT32 *maxSize,
-                                    POINT32 *maxPos, POINT32 *minTrack,
-                                    POINT32 *maxTrack );
+extern BOOL WINPOS_RedrawIconTitle( HWND hWnd );
+extern BOOL WINPOS_ShowIconTitle( WND* pWnd, BOOL bShow );
+extern void   WINPOS_GetMinMaxInfo( WND* pWnd, POINT *maxSize,
+                                    POINT *maxPos, POINT *minTrack,
+                                    POINT *maxTrack );
 extern UINT16 WINPOS_MinMaximize( WND* pWnd, UINT16 cmd, LPRECT16 lpPos);
-extern BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse,
-                                      BOOL32 fChangeFocus );
-extern BOOL32 WINPOS_ChangeActiveWindow( HWND32 hwnd, BOOL32 mouseMsg );
-extern LONG WINPOS_SendNCCalcSize(HWND32 hwnd, BOOL32 calcValidRect,
-                                  RECT32 *newWindowRect, RECT32 *oldWindowRect,
-                                  RECT32 *oldClientRect, WINDOWPOS32 *winpos,
-                                  RECT32 *newClientRect );
+extern BOOL WINPOS_SetActiveWindow( HWND hWnd, BOOL fMouse,
+                                      BOOL fChangeFocus );
+extern BOOL WINPOS_ChangeActiveWindow( HWND hwnd, BOOL mouseMsg );
+extern LONG WINPOS_SendNCCalcSize(HWND hwnd, BOOL calcValidRect,
+                                  RECT *newWindowRect, RECT *oldWindowRect,
+                                  RECT *oldClientRect, WINDOWPOS *winpos,
+                                  RECT *newClientRect );
 extern LONG WINPOS_HandleWindowPosChanging16(WND *wndPtr, WINDOWPOS16 *winpos);
-extern LONG WINPOS_HandleWindowPosChanging32(WND *wndPtr, WINDOWPOS32 *winpos);
+extern LONG WINPOS_HandleWindowPosChanging(WND *wndPtr, WINDOWPOS *winpos);
 extern INT16 WINPOS_WindowFromPoint( WND* scopeWnd, POINT16 pt, WND **ppWnd );
 extern void WINPOS_CheckInternalPos( WND* wndPtr );
-extern BOOL32 WINPOS_ActivateOtherWindow(WND* pWnd);
-extern BOOL32 WINPOS_CreateInternalPosAtom(void);
+extern BOOL WINPOS_ActivateOtherWindow(WND* pWnd);
+extern BOOL WINPOS_CreateInternalPosAtom(void);
 
 #endif  /* __WINE_WINPOS_H */
diff --git a/include/winproc.h b/include/winproc.h
index df76418417a..bc9289424d8 100644
--- a/include/winproc.h
+++ b/include/winproc.h
@@ -35,44 +35,44 @@ typedef struct
 
 typedef struct
 {
-    WPARAM32    wParam;
+    WPARAM    wParam;
     LPARAM	lParam;
     LRESULT	lResult;
-} MSGPARAM32;
+} MSGPARAM;
 
-extern BOOL32 WINPROC_Init(void);
+extern BOOL WINPROC_Init(void);
 extern WNDPROC16 WINPROC_GetProc( HWINDOWPROC proc, WINDOWPROCTYPE type );
-extern BOOL32 WINPROC_SetProc( HWINDOWPROC *pFirst, WNDPROC16 func,
+extern BOOL WINPROC_SetProc( HWINDOWPROC *pFirst, WNDPROC16 func,
                                WINDOWPROCTYPE type, WINDOWPROCUSER user );
 extern void WINPROC_FreeProc( HWINDOWPROC proc, WINDOWPROCUSER user );
 extern WINDOWPROCTYPE WINPROC_GetProcType( HWINDOWPROC proc );
 
-extern INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+extern INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam,
                                      LPARAM *plparam );
-extern INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+extern INT WINPROC_MapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM wParam,
                                      LPARAM *plparam );
-extern INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16,
-                                    UINT32 *pmsg32, WPARAM32 *pwparam32,
+extern INT WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16,
+                                    UINT *pmsg32, WPARAM *pwparam32,
                                     LPARAM *plparam );
-extern INT32 WINPROC_MapMsg16To32W( HWND16, UINT16 msg16, WPARAM16 wParam16,
-                                    UINT32 *pmsg32, WPARAM32 *pwparam32,
+extern INT WINPROC_MapMsg16To32W( HWND16, UINT16 msg16, WPARAM16 wParam16,
+                                    UINT *pmsg32, WPARAM *pwparam32,
                                     LPARAM *plparam );
-extern INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32,
-                                    WPARAM32 wParam32, UINT16 *pmsg16,
+extern INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32,
+                                    WPARAM wParam32, UINT16 *pmsg16,
                                     WPARAM16 *pwparam16, LPARAM *plparam );
-extern INT32 WINPROC_MapMsg32WTo16( HWND32 hwnd, UINT32 msg32,
-                                    WPARAM32 wParam32, UINT16 *pmsg16,
+extern INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32,
+                                    WPARAM wParam32, UINT16 *pmsg16,
                                     WPARAM16 *pwparam16, LPARAM *plparam );
-extern void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+extern void WINPROC_UnmapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam,
                                       LPARAM lParam );
-extern void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+extern void WINPROC_UnmapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM wParam,
                                       LPARAM lParam );
-extern LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam,
+extern LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT msg, WPARAM wParam,
                                         LPARAM lParam, LRESULT result );
-extern LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT32 msg, WPARAM32 wParam,
+extern LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT msg, WPARAM wParam,
                                         LPARAM lParam, LRESULT result );
-extern void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+extern void WINPROC_UnmapMsg32ATo16( HWND hwnd, UINT msg, WPARAM wParam,
                                      LPARAM lParam, MSGPARAM16* pm16 );
-extern void WINPROC_UnmapMsg32WTo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+extern void WINPROC_UnmapMsg32WTo16( HWND hwnd, UINT msg, WPARAM wParam,
                                      LPARAM lParam, MSGPARAM16* pm16 );
 #endif  /* __WINE_WINPROC_H */
diff --git a/include/winreg.h b/include/winreg.h
index 8c45d71bb47..faa726efef1 100644
--- a/include/winreg.h
+++ b/include/winreg.h
@@ -108,75 +108,75 @@ typedef struct _SERVICE_STATUS {
     DWORD dwWaitHint;
 } SERVICE_STATUS, *LPSERVICE_STATUS;
 
-HANDLE32    WINAPI OpenSCManager32A(LPCSTR,LPCSTR,DWORD);
-HANDLE32    WINAPI OpenSCManager32W(LPCWSTR,LPCWSTR,DWORD);
+HANDLE    WINAPI OpenSCManagerA(LPCSTR,LPCSTR,DWORD);
+HANDLE    WINAPI OpenSCManagerW(LPCWSTR,LPCWSTR,DWORD);
 #define     OpenSCManager WINELIB_NAME_AW(OpenSCManager)
-HANDLE32    WINAPI OpenService32A(HANDLE32,LPCSTR,DWORD);
-HANDLE32    WINAPI OpenService32W(HANDLE32,LPCWSTR,DWORD);
+HANDLE    WINAPI OpenServiceA(HANDLE,LPCSTR,DWORD);
+HANDLE    WINAPI OpenServiceW(HANDLE,LPCWSTR,DWORD);
 #define     OpenService WINELIB_NAME_AW(OpenService)
-BOOL32      WINAPI LookupPrivilegeValue32A(LPCSTR,LPCSTR,LPVOID);
-BOOL32      WINAPI LookupPrivilegeValue32W(LPCWSTR,LPCWSTR,LPVOID);
+BOOL      WINAPI LookupPrivilegeValueA(LPCSTR,LPCSTR,LPVOID);
+BOOL      WINAPI LookupPrivilegeValueW(LPCWSTR,LPCWSTR,LPVOID);
 #define     LookupPrivilegeValue WINELIB_NAME_AW(LookupPrivilegeValue)
-HANDLE32    WINAPI RegisterEventSource32A(LPCSTR,LPCSTR);
-HANDLE32    WINAPI RegisterEventSource32W(LPCWSTR,LPCWSTR);
+HANDLE    WINAPI RegisterEventSourceA(LPCSTR,LPCSTR);
+HANDLE    WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR);
 #define     RegisterEventSource WINELIB_NAME_AW(RegisterEventSource)
-DWORD       WINAPI RegCreateKeyEx32A(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,
+DWORD       WINAPI RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,
                                      LPSECURITY_ATTRIBUTES,LPHKEY,LPDWORD);
-DWORD       WINAPI RegCreateKeyEx32W(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,
+DWORD       WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,
                                      LPSECURITY_ATTRIBUTES,LPHKEY,LPDWORD);
 #define     RegCreateKeyEx WINELIB_NAME_AW(RegCreateKeyEx)
-LONG        WINAPI RegSaveKey32A(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES);
-LONG        WINAPI RegSaveKey32W(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES);
+LONG        WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES);
+LONG        WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES);
 #define     RegSaveKey WINELIB_NAME_AW(RegSaveKey)
 LONG        WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-BOOL32      WINAPI CloseServiceHandle(HANDLE32);
-BOOL32      WINAPI ControlService(HANDLE32,DWORD,LPSERVICE_STATUS);
-BOOL32      WINAPI DeleteService(HANDLE32);
-BOOL32      WINAPI DeregisterEventSource(HANDLE32);
-BOOL32      WINAPI GetFileSecurity32A(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
-BOOL32      WINAPI GetFileSecurity32W(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
+BOOL      WINAPI CloseServiceHandle(HANDLE);
+BOOL      WINAPI ControlService(HANDLE,DWORD,LPSERVICE_STATUS);
+BOOL      WINAPI DeleteService(HANDLE);
+BOOL      WINAPI DeregisterEventSource(HANDLE);
+BOOL      WINAPI GetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
+BOOL      WINAPI GetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
 #define     GetFileSecurity WINELIB_NAME_AW(GetFileSecurity)
-BOOL32      WINAPI GetUserName32A(LPSTR,LPDWORD);
-BOOL32      WINAPI GetUserName32W(LPWSTR,LPDWORD);
+BOOL      WINAPI GetUserNameA(LPSTR,LPDWORD);
+BOOL      WINAPI GetUserNameW(LPWSTR,LPDWORD);
 #define     GetUserName WINELIB_NAME_AW(GetUserName)
-BOOL32      WINAPI OpenProcessToken(HANDLE32,DWORD,HANDLE32*);
-LONG        WINAPI RegConnectRegistry32A(LPCSTR,HKEY,LPHKEY);
-LONG        WINAPI RegConnectRegistry32W(LPCWSTR,HKEY,LPHKEY);
+BOOL      WINAPI OpenProcessToken(HANDLE,DWORD,HANDLE*);
+LONG        WINAPI RegConnectRegistryA(LPCSTR,HKEY,LPHKEY);
+LONG        WINAPI RegConnectRegistryW(LPCWSTR,HKEY,LPHKEY);
 #define     RegConnectRegistry WINELIB_NAME_AW(RegConnectRegistry)
-DWORD       WINAPI RegEnumKeyEx32A(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPSTR,
+DWORD       WINAPI RegEnumKeyExA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPSTR,
                                    LPDWORD,LPFILETIME);
-DWORD       WINAPI RegEnumKeyEx32W(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPWSTR,
+DWORD       WINAPI RegEnumKeyExW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPWSTR,
                                    LPDWORD,LPFILETIME);
 #define     RegEnumKeyEx WINELIB_NAME_AW(RegEnumKeyEx)
 LONG        WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,LPDWORD);
-LONG        WINAPI RegLoadKey32A(HKEY,LPCSTR,LPCSTR);
-LONG        WINAPI RegLoadKey32W(HKEY,LPCWSTR,LPCWSTR);
+LONG        WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR);
+LONG        WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR);
 #define     RegLoadKey WINELIB_NAME_AW(RegLoadKey)
-LONG        WINAPI RegNotifyChangeKeyValue(HKEY,BOOL32,DWORD,HANDLE32,BOOL32);
-DWORD       WINAPI RegOpenKeyEx32W(HKEY,LPCWSTR,DWORD,REGSAM,LPHKEY);
-DWORD       WINAPI RegOpenKeyEx32A(HKEY,LPCSTR,DWORD,REGSAM,LPHKEY);
+LONG        WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL);
+DWORD       WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,LPHKEY);
+DWORD       WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,LPHKEY);
 #define     RegOpenKeyEx WINELIB_NAME_AW(RegOpenKeyEx)
-DWORD       WINAPI RegQueryInfoKey32W(HKEY,LPWSTR,LPDWORD,LPDWORD,LPDWORD,
+DWORD       WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPDWORD,
                                       LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,
                                       LPDWORD,LPFILETIME);
-DWORD       WINAPI RegQueryInfoKey32A(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,
+DWORD       WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,
                                       LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,
                                       LPDWORD,LPFILETIME);
 #define     RegQueryInfoKey WINELIB_NAME_AW(RegQueryInfoKey)
-LONG        WINAPI RegReplaceKey32A(HKEY,LPCSTR,LPCSTR,LPCSTR);
-LONG        WINAPI RegReplaceKey32W(HKEY,LPCWSTR,LPCWSTR,LPCWSTR);
+LONG        WINAPI RegReplaceKeyA(HKEY,LPCSTR,LPCSTR,LPCSTR);
+LONG        WINAPI RegReplaceKeyW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR);
 #define     RegReplaceKey WINELIB_NAME_AW(RegReplaceKey)
-LONG        WINAPI RegRestoreKey32A(HKEY,LPCSTR,DWORD);
-LONG        WINAPI RegRestoreKey32W(HKEY,LPCWSTR,DWORD);
+LONG        WINAPI RegRestoreKeyA(HKEY,LPCSTR,DWORD);
+LONG        WINAPI RegRestoreKeyW(HKEY,LPCWSTR,DWORD);
 #define     RegRestoreKey WINELIB_NAME_AW(RegRestoreKey)
-LONG        WINAPI RegUnLoadKey32A(HKEY,LPCSTR);
-LONG        WINAPI RegUnLoadKey32W(HKEY,LPCWSTR);
+LONG        WINAPI RegUnLoadKeyA(HKEY,LPCSTR);
+LONG        WINAPI RegUnLoadKeyW(HKEY,LPCWSTR);
 #define     RegUnLoadKey WINELIB_NAME_AW(RegUnLoadKey)
-BOOL32      WINAPI SetFileSecurity32A(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-BOOL32      WINAPI SetFileSecurity32W(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
+BOOL      WINAPI SetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
+BOOL      WINAPI SetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
 #define     SetFileSecurity WINELIB_NAME_AW(SetFileSecurity)
-BOOL32      WINAPI StartService32A(HANDLE32,DWORD,LPCSTR*);
-BOOL32      WINAPI StartService32W(HANDLE32,DWORD,LPCWSTR*);
+BOOL      WINAPI StartServiceA(HANDLE,DWORD,LPCSTR*);
+BOOL      WINAPI StartServiceW(HANDLE,DWORD,LPCWSTR*);
 #define     StartService WINELIB_NAME_AW(StartService)
 
 /* Declarations for functions that are the same in Win16 and Win32 */
@@ -184,35 +184,35 @@ BOOL32      WINAPI StartService32W(HANDLE32,DWORD,LPCWSTR*);
 DWORD       WINAPI RegCloseKey(HKEY);
 DWORD       WINAPI RegFlushKey(HKEY);
 
-DWORD       WINAPI RegCreateKey32A(HKEY,LPCSTR,LPHKEY);
-DWORD       WINAPI RegCreateKey32W(HKEY,LPCWSTR,LPHKEY);
+DWORD       WINAPI RegCreateKeyA(HKEY,LPCSTR,LPHKEY);
+DWORD       WINAPI RegCreateKeyW(HKEY,LPCWSTR,LPHKEY);
 #define     RegCreateKey WINELIB_NAME_AW(RegCreateKey)
-DWORD       WINAPI RegDeleteKey32A(HKEY,LPCSTR);
-DWORD       WINAPI RegDeleteKey32W(HKEY,LPWSTR);
+DWORD       WINAPI RegDeleteKeyA(HKEY,LPCSTR);
+DWORD       WINAPI RegDeleteKeyW(HKEY,LPWSTR);
 #define     RegDeleteKey WINELIB_NAME_AW(RegDeleteKey)
-DWORD       WINAPI RegDeleteValue32A(HKEY,LPSTR);
-DWORD       WINAPI RegDeleteValue32W(HKEY,LPWSTR);
+DWORD       WINAPI RegDeleteValueA(HKEY,LPSTR);
+DWORD       WINAPI RegDeleteValueW(HKEY,LPWSTR);
 #define     RegDeleteValue WINELIB_NAME_AW(RegDeleteValue)
-DWORD       WINAPI RegEnumKey32A(HKEY,DWORD,LPSTR,DWORD);
-DWORD       WINAPI RegEnumKey32W(HKEY,DWORD,LPWSTR,DWORD);
+DWORD       WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD);
+DWORD       WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD);
 #define     RegEnumKey WINELIB_NAME_AW(RegEnumKey)
-DWORD       WINAPI RegEnumValue32A(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-DWORD       WINAPI RegEnumValue32W(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
+DWORD       WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
+DWORD       WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
 #define     RegEnumValue WINELIB_NAME_AW(RegEnumValue)
-DWORD       WINAPI RegOpenKey32A(HKEY,LPCSTR,LPHKEY);
-DWORD       WINAPI RegOpenKey32W(HKEY,LPCWSTR,LPHKEY);
+DWORD       WINAPI RegOpenKeyA(HKEY,LPCSTR,LPHKEY);
+DWORD       WINAPI RegOpenKeyW(HKEY,LPCWSTR,LPHKEY);
 #define     RegOpenKey WINELIB_NAME_AW(RegOpenKey)
-DWORD       WINAPI RegQueryValue32A(HKEY,LPCSTR,LPSTR,LPLONG);
-DWORD       WINAPI RegQueryValue32W(HKEY,LPCWSTR,LPWSTR,LPLONG);
+DWORD       WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG);
+DWORD       WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG);
 #define     RegQueryValue WINELIB_NAME_AW(RegQueryValue)
-DWORD       WINAPI RegQueryValueEx32A(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-DWORD       WINAPI RegQueryValueEx32W(HKEY,LPWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
+DWORD       WINAPI RegQueryValueExA(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
+DWORD       WINAPI RegQueryValueExW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
 #define     RegQueryValueEx WINELIB_NAME_AW(RegQueryValueEx)
-DWORD       WINAPI RegSetValue32A(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
-DWORD       WINAPI RegSetValue32W(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
+DWORD       WINAPI RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
+DWORD       WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
 #define     RegSetValue WINELIB_NAME_AW(RegSetValue)
-DWORD       WINAPI RegSetValueEx32A(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD);
-DWORD       WINAPI RegSetValueEx32W(HKEY,LPWSTR,DWORD,DWORD,LPBYTE,DWORD);
+DWORD       WINAPI RegSetValueExA(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD);
+DWORD       WINAPI RegSetValueExW(HKEY,LPWSTR,DWORD,DWORD,LPBYTE,DWORD);
 #define     RegSetValueEx WINELIB_NAME_AW(RegSetValueEx)
 
 #endif  /* __WINE_WINREG_H */
diff --git a/include/winsock.h b/include/winsock.h
index 6961d967522..84f015378c4 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -34,7 +34,7 @@
 /* Win16 socket-related types */
 
 typedef UINT16		SOCKET16;
-typedef UINT32		SOCKET32;
+typedef UINT		SOCKET;
 
 typedef struct ws_hostent
 {
@@ -65,7 +65,7 @@ typedef struct ws_netent
         SEGPTR  n_name;         /* official name of net */
         SEGPTR  n_aliases;      /* alias list */
         INT16   n_addrtype;     /* net address type */
-        INT32   n_net;          /* network # */
+        INT   n_net;          /* network # */
 } _ws_netent;
 
 typedef struct sockaddr		ws_sockaddr;
@@ -78,15 +78,14 @@ typedef struct
 
 typedef struct
 {
-        UINT32    fd_count;               /* how many are SET? */
-        SOCKET32  fd_array[FD_SETSIZE];   /* an array of SOCKETs */
+        UINT    fd_count;               /* how many are SET? */
+        SOCKET  fd_array[FD_SETSIZE];   /* an array of SOCKETs */
 } ws_fd_set32;
 
 /* ws_fd_set operations */
 
 INT16 WINAPI __WSAFDIsSet16( SOCKET16, ws_fd_set16 * );
-INT32 WINAPI __WSAFDIsSet32( SOCKET32, ws_fd_set32 * );
-#define __WSAFDIsSet WINELIB_NAME(__WSAFDIsSet)
+INT WINAPI __WSAFDIsSet( SOCKET, ws_fd_set32 * );
 
 #define __WS_FD_CLR(fd, set, cast) do { \
     UINT16 __i; \
@@ -106,24 +105,20 @@ INT32 WINAPI __WSAFDIsSet32( SOCKET32, ws_fd_set32 * );
     } \
 } while(0)
 #define WS_FD_CLR16(fd, set)	__WS_FD_CLR((fd),(set), ws_fd_set16)
-#define WS_FD_CLR32(fd, set)	__WS_FD_CLR((fd),(set), ws_fd_set32)
-#define WS_FD_CLR 		WINELIB_NAME(WS_FD_CLR)
+#define WS_FD_CLR(fd, set)	__WS_FD_CLR((fd),(set), ws_fd_set32)
 
 #define __WS_FD_SET(fd, set, cast) do { \
     if (((cast*)(set))->fd_count < FD_SETSIZE) \
         ((cast*)(set))->fd_array[((cast*)(set))->fd_count++]=(fd);\
 } while(0)
 #define WS_FD_SET16(fd, set)    __WS_FD_SET((fd),(set), ws_fd_set16)
-#define WS_FD_SET32(fd, set)    __WS_FD_SET((fd),(set), ws_fd_set32)
-#define WS_FD_SET		WINELIB_NAME(WS_FD_SET)
+#define WS_FD_SET(fd, set)    __WS_FD_SET((fd),(set), ws_fd_set32)
 
 #define WS_FD_ZERO16(set) (((ws_fd_set16*)(set))->fd_count=0)
-#define WS_FD_ZERO32(set) (((ws_fd_set32*)(set))->fd_count=0)
-#define WS_FD_ZERO		WINELIB_NAME(WS_FD_ZERO)
+#define WS_FD_ZERO(set) (((ws_fd_set32*)(set))->fd_count=0)
 
 #define WS_FD_ISSET16(fd, set) __WSAFDIsSet16((SOCKET16)(fd), (ws_fd_set16*)(set))
-#define WS_FD_ISSET32(fd, set) __WSAFDIsSet32((SOCKET32)(fd), (ws_fd_set32*)(set))
-#define WS_FD_ISSET		WINELIB_NAME(WS_FD_ISSET)
+#define WS_FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(fd), (ws_fd_set32*)(set))
 
 /* 
  * Internet address (old style... should be updated) 
@@ -134,7 +129,7 @@ struct ws_in_addr
         union {
                 struct { BYTE   s_b1,s_b2,s_b3,s_b4; } S_un_b;
                 struct { UINT16 s_w1,s_w2; } S_un_w;
-                UINT32 S_addr;
+                UINT S_addr;
         } S_un;
 #define ws_addr  S_un.S_addr		/* can be used for most tcp & ip code */
 #define ws_host  S_un.S_un_b.s_b2	/* host on imp */
@@ -174,11 +169,9 @@ typedef struct WSAData {
  * SOCKET type is unsigned.
  */
 #define INVALID_SOCKET16 	   (~0)
-#define INVALID_SOCKET32 	   (~0)
+#define INVALID_SOCKET 	   (~0)
 #define SOCKET_ERROR               (-1)
 
-DECL_WINELIB_TYPE(INVALID_SOCKET)
-DECL_WINELIB_TYPE(SOCKET)
 
 /*
  * Types
@@ -205,7 +198,7 @@ DECL_WINELIB_TYPE(SOCKET)
 #define WS_SO_LINGER       0x0080          /* linger on close if data present */
 #define WS_SO_OOBINLINE    0x0100          /* leave received OOB data in line */
 
-#define WS_SO_DONTLINGER   (UINT32)(~WS_SO_LINGER)
+#define WS_SO_DONTLINGER   (UINT)(~WS_SO_LINGER)
 
 /*
  * Additional options.
@@ -224,8 +217,8 @@ DECL_WINELIB_TYPE(SOCKET)
 #define WS_IOC_OUT         0x40000000      /* copy out parameters */
 #define WS_IOC_IN          0x80000000      /* copy in parameters */
 #define WS_IOC_INOUT       (WS_IOC_IN|WS_IOC_OUT)
-#define WS_IOR(x,y,t)      (WS_IOC_OUT|(((UINT32)sizeof(t)&WS_IOCPARM_MASK)<<16)|((x)<<8)|(y))
-#define WS_IOW(x,y,t)      (WS_IOC_IN|(((UINT32)sizeof(t)&WS_IOCPARM_MASK)<<16)|((x)<<8)|(y))
+#define WS_IOR(x,y,t)      (WS_IOC_OUT|(((UINT)sizeof(t)&WS_IOCPARM_MASK)<<16)|((x)<<8)|(y))
+#define WS_IOW(x,y,t)      (WS_IOC_IN|(((UINT)sizeof(t)&WS_IOCPARM_MASK)<<16)|((x)<<8)|(y))
 
 /*
  * Socket I/O flags (supported by spec 1.1)
@@ -370,65 +363,53 @@ extern "C" {
 /* Microsoft Windows Extension function prototypes */
 
 INT16     WINAPI WSAStartup16(UINT16 wVersionRequired, LPWSADATA lpWSAData);
-INT32     WINAPI WSAStartup32(UINT32 wVersionRequired, LPWSADATA lpWSAData);
-#define   WSAStartup WINELIB_NAME(WSAStartup)
+INT     WINAPI WSAStartup(UINT wVersionRequired, LPWSADATA lpWSAData);
 void      WINAPI WSASetLastError16(INT16 iError);
-void      WINAPI WSASetLastError32(INT32 iError);
-#define   WSASetLastError WINELIB_NAME(WSASetLastError)
-INT32     WINAPI WSACleanup(void);
-INT32     WINAPI WSAGetLastError(void);
-BOOL32    WINAPI WSAIsBlocking(void);
-INT32     WINAPI WSACancelBlockingCall(void);
+void      WINAPI WSASetLastError(INT iError);
+INT     WINAPI WSACleanup(void);
+INT     WINAPI WSAGetLastError(void);
+BOOL    WINAPI WSAIsBlocking(void);
+INT     WINAPI WSACancelBlockingCall(void);
 INT16     WINAPI WSAUnhookBlockingHook16(void);
-INT32     WINAPI WSAUnhookBlockingHook32(void);
-#define   WSAUnhookBlockingHook WINELIB_NAME(WSAUnhookBlockingHook)
+INT     WINAPI WSAUnhookBlockingHook(void);
 FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc);
-FARPROC32 WINAPI WSASetBlockingHook32(FARPROC32 lpBlockFunc);
-#define   WSASetBlockingHook WINELIB_NAME(WSASetBlockingHook)
+FARPROC WINAPI WSASetBlockingHook(FARPROC lpBlockFunc);
 
 HANDLE16  WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 wMsg, LPCSTR name, LPCSTR proto,
                                          SEGPTR buf, INT16 buflen);
-HANDLE32  WINAPI WSAAsyncGetServByName32(HWND32 hWnd, UINT32 uMsg, LPCSTR name, LPCSTR proto,
-					 LPSTR sbuf, INT32 buflen);
-#define   WSAAsyncGetServByName WINELIB_NAME(WSAAsyncGetServByName)
+HANDLE  WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, LPCSTR proto,
+					 LPSTR sbuf, INT buflen);
 
 HANDLE16  WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 wMsg, INT16 port,
                                          LPCSTR proto, SEGPTR buf, INT16 buflen);
-HANDLE32  WINAPI WSAAsyncGetServByPort32(HWND32 hWnd, UINT32 uMsg, INT32 port,
-					 LPCSTR proto, LPSTR sbuf, INT32 buflen);
-#define   WSAAsyncGetServByPort WINELIB_NAME(WSAAsyncGetServByPort)
+HANDLE  WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port,
+					 LPCSTR proto, LPSTR sbuf, INT buflen);
 
 HANDLE16  WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 wMsg,
                                           LPCSTR name, SEGPTR buf, INT16 buflen);
-HANDLE32  WINAPI WSAAsyncGetProtoByName32(HWND32 hWnd, UINT32 uMsg,
-					  LPCSTR name, LPSTR sbuf, INT32 buflen);
-#define   WSAAsyncGetProtoByByName WINELIB_NAME(WSAAsyncGetProtoByByName)
+HANDLE  WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg,
+					  LPCSTR name, LPSTR sbuf, INT buflen);
 
 HANDLE16  WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd, UINT16 wMsg,
                                             INT16 number, SEGPTR buf, INT16 buflen);
-HANDLE32  WINAPI WSAAsyncGetProtoByNumber32(HWND32 hWnd, UINT32 uMsg,
-					    INT32 number, LPSTR sbuf, INT32 buflen);
-#define   WSAAsyncGetProtoByNumber WINELIB_NAME(WSAAsyncGetProtoByNumber)
+HANDLE  WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg,
+					    INT number, LPSTR sbuf, INT buflen);
 
 HANDLE16  WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 wMsg,
                                          LPCSTR name, SEGPTR buf, INT16 buflen);
-HANDLE32  WINAPI WSAAsyncGetHostByName32(HWND32 hWnd, UINT32 uMsg,
-					 LPCSTR name, LPSTR sbuf, INT32 buflen);
-#define   WSAAsyncGetHostByName WINELIB_NAME(WSAAsyncGetHostByName)
+HANDLE  WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg,
+					 LPCSTR name, LPSTR sbuf, INT buflen);
 
 HANDLE16  WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 wMsg, LPCSTR addr,
                               INT16 len, INT16 type, SEGPTR buf, INT16 buflen);
-HANDLE32  WINAPI WSAAsyncGetHostByAddr32(HWND32 hWnd, UINT32 uMsg, LPCSTR addr,
-			      INT32 len, INT32 type, LPSTR sbuf, INT32 buflen);
-#define   WSAAsyncGetHostByAddr WINELIB_NAME(WSAAsyncGetHostByAddr)
+HANDLE  WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr,
+			      INT len, INT type, LPSTR sbuf, INT buflen);
 
 INT16 	  WINAPI WSACancelAsyncRequest16(HANDLE16 hAsyncTaskHandle);
-INT32     WINAPI WSACancelAsyncRequest32(HANDLE32 hAsyncTaskHandle);
-#define   WSACancelAsyncRequest WINELIB_NAME(WSACancelAsyncRequest)
+INT     WINAPI WSACancelAsyncRequest(HANDLE hAsyncTaskHandle);
 
-INT16     WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, UINT32 lEvent);
-INT32     WINAPI WSAAsyncSelect32(SOCKET32 s, HWND32 hWnd, UINT32 uMsg, UINT32 lEvent);
-#define   WSAAsyncSelect WINELIB_NAME(WSAAsyncSelect)
+INT16     WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, UINT lEvent);
+INT     WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent);
 
 
 /*
@@ -469,7 +450,7 @@ INT32     WINAPI WSAAsyncSelect32(SOCKET32 s, HWND32 hWnd, UINT32 uMsg, UINT32 l
 struct ws_sockaddr_ipx
 {
 	INT16		sipx_family	__attribute__((packed));
-	UINT32		sipx_network	__attribute__((packed));
+	UINT		sipx_network	__attribute__((packed));
 	CHAR		sipx_node[6]	__attribute__((packed));
 	UINT16		sipx_port	__attribute__((packed));
 };
@@ -554,8 +535,8 @@ typedef struct  __aop
 
   /* custom data */
 
-  HWND32        hWnd;				/* hWnd to post */ 
-  UINT32        uMsg;				/* uMsg message to. */
+  HWND        hWnd;				/* hWnd to post */ 
+  UINT        uMsg;				/* uMsg message to. */
 
   union 
   {
@@ -564,8 +545,8 @@ typedef struct  __aop
     void*  ptr_base;
   } 		b;				/* buffer to copy result to */
 
-  UINT32        buflen;
-  UINT32	flags;				/* WSMSG_ASYNC_... */
+  UINT        buflen;
+  UINT	flags;				/* WSMSG_ASYNC_... */
 } ws_async_op;
 
 #define WSMSG_ASYNC_HOSTBYNAME  0x0001
@@ -584,8 +565,8 @@ typedef struct __sop	/* WSAAsyncSelect() control struct */
   struct __sop *next, *prev;
 
   struct __ws*  pws;
-  HWND32        hWnd;
-  UINT32        uMsg;
+  HWND        hWnd;
+  UINT        uMsg;
 } ws_select_op;
 
 typedef struct	__ws	/* socket */
@@ -599,14 +580,14 @@ typedef struct	__ws	/* socket */
 #define WS_MAX_UDP_DATAGRAM             1024
 
 #define WSI_BLOCKINGCALL	0x00000001	/* per-thread info flags */
-#define WSI_BLOCKINGHOOK32	0x00000002	/* 32-bit callback */
+#define WSI_BLOCKINGHOOK	0x00000002	/* 32-bit callback */
 
 typedef struct _WSINFO
 {
   struct _WSINFO*       prev,*next;
 
   unsigned		flags;
-  INT32			err;			/* WSAGetLastError() return value */
+  INT			err;			/* WSAGetLastError() return value */
   INT16			num_startup;		/* reference counter */
   INT16			num_async_rq;
   INT16			last_free;		/* entry in the socket table */
@@ -635,9 +616,9 @@ void WS_do_async_getproto(LPWSINFO, unsigned);
 void WS_do_async_getserv(LPWSINFO, unsigned);
 
 /* winsock_dns.c */
-extern HANDLE16 __WSAsyncDBQuery(LPWSINFO pwsi, HWND32 hWnd, UINT32 uMsg, 
-    INT32 type, LPCSTR init, INT32 len, LPCSTR proto, void* sbuf, 
-    INT32 buflen, UINT32 flag);
+extern HANDLE16 __WSAsyncDBQuery(LPWSINFO pwsi, HWND hWnd, UINT uMsg, 
+    INT type, LPCSTR init, INT len, LPCSTR proto, void* sbuf, 
+    INT buflen, UINT flag);
 
 int WINSOCK_async_io(int fd, int async);
 int WINSOCK_unblock_io(int fd, int noblock);
@@ -649,12 +630,12 @@ int  WINSOCK_cancel_async_op(ws_async_op* p_aop);
 
 void WINSOCK_cancel_task_aops(HTASK16, void (*__memfree)(void*) );
 
-BOOL32 WINSOCK_HandleIO(int* fd_max, int num_pending, fd_set pending_set[3], fd_set master_set[3] );
+BOOL WINSOCK_HandleIO(int* fd_max, int num_pending, fd_set pending_set[3], fd_set master_set[3] );
 void   WINSOCK_Shutdown(void);
 UINT16 wsaErrno(void);
 UINT16 wsaHerrno(void);
 
-extern INT32 WINSOCK_DeleteTaskWSI( TDB* pTask, struct _WSINFO* );
+extern INT WINSOCK_DeleteTaskWSI( TDB* pTask, struct _WSINFO* );
 
 #endif  /* _WINSOCKAPI_ */
 
diff --git a/include/winspool.h b/include/winspool.h
index 99dc631b005..821ad33f38b 100644
--- a/include/winspool.h
+++ b/include/winspool.h
@@ -58,68 +58,68 @@ extern "C" {
 #define PRINTER_ENUM_ICON8       0x00800000
 
 /* TYPES */
-typedef struct _PRINTER_DEFAULTS32A {
+typedef struct _PRINTER_DEFAULTSA {
   LPSTR        pDatatype;
-  LPDEVMODE32A pDevMode;
+  LPDEVMODEA pDevMode;
   ACCESS_MASK  DesiredAccess;
-} PRINTER_DEFAULTS32A, *LPPRINTER_DEFAULTS32A;
+} PRINTER_DEFAULTSA, *LPPRINTER_DEFAULTSA;
 
-typedef struct _PRINTER_DEFAULTS32W {
+typedef struct _PRINTER_DEFAULTSW {
   LPWSTR       pDatatype;
-  LPDEVMODE32W pDevMode;
+  LPDEVMODEW pDevMode;
   ACCESS_MASK  DesiredAccess;
-} PRINTER_DEFAULTS32W, *LPPRINTER_DEFAULTS32W;
+} PRINTER_DEFAULTSW, *LPPRINTER_DEFAULTSW;
 
 DECL_WINELIB_TYPE_AW(PRINTER_DEFAULTS)
 DECL_WINELIB_TYPE_AW(LPPRINTER_DEFAULTS)
 
-typedef struct _DRIVER_INFO_132A {
+typedef struct _DRIVER_INFO_1A {
   LPSTR     pName;
-} DRIVER_INFO_132A, *PDRIVER_INFO_132A, *LPDRIVER_INFO_132A;
+} DRIVER_INFO_1A, *PDRIVER_INFO_1A, *LPDRIVER_INFO_1A;
 
-typedef struct _DRIVER_INFO_132W {
+typedef struct _DRIVER_INFO_1W {
   LPWSTR    pName;
-} DRIVER_INFO_132W, *PDRIVER_INFO_132W, *LPDRIVER_INFO_132W;
+} DRIVER_INFO_1W, *PDRIVER_INFO_1W, *LPDRIVER_INFO_1W;
 
 DECL_WINELIB_TYPE_AW(DRIVER_INFO_1)
 DECL_WINELIB_TYPE_AW(PDRIVER_INFO_1)
 DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_1)
 
-typedef struct _DRIVER_INFO_232A {
+typedef struct _DRIVER_INFO_2A {
   DWORD   cVersion;
   LPSTR     pName;
   LPSTR     pEnvironment;
   LPSTR     pDriverPath;
   LPSTR     pDataFile; 
   LPSTR     pConfigFile;
-} DRIVER_INFO_232A, *PDRIVER_INFO_232A, *LPDRIVER_INFO_232A;
+} DRIVER_INFO_2A, *PDRIVER_INFO_2A, *LPDRIVER_INFO_2A;
 
-typedef struct _DRIVER_INFO_232W {
+typedef struct _DRIVER_INFO_2W {
   DWORD   cVersion;
   LPWSTR    pName;     
   LPWSTR    pEnvironment;
   LPWSTR    pDriverPath;
   LPWSTR    pDataFile; 
   LPWSTR    pConfigFile;
-} DRIVER_INFO_232W, *PDRIVER_INFO_232W, *LPDRIVER_INFO_232W;
+} DRIVER_INFO_2W, *PDRIVER_INFO_2W, *LPDRIVER_INFO_2W;
 
 DECL_WINELIB_TYPE_AW(DRIVER_INFO_2)
 DECL_WINELIB_TYPE_AW(PDRIVER_INFO_2)
 DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_2)
 
-typedef struct _PRINTER_INFO_132A {
+typedef struct _PRINTER_INFO_1A {
   DWORD   Flags;
   LPSTR   pDescription;
   LPSTR   pName;
   LPSTR   pComment;
-} PRINTER_INFO_132A, *PPRINTER_INFO_132A, *LPPRINTER_INFO_132A;
+} PRINTER_INFO_1A, *PPRINTER_INFO_1A, *LPPRINTER_INFO_1A;
 
-typedef struct _PRINTER_INFO_132W {
+typedef struct _PRINTER_INFO_1W {
   DWORD   Flags;
   LPWSTR  pDescription;
   LPWSTR  pName;
   LPWSTR  pComment;
-} PRINTER_INFO_132W, *PPRINTER_INFO_132W, *LPPRINTER_INFO_132W;
+} PRINTER_INFO_1W, *PPRINTER_INFO_1W, *LPPRINTER_INFO_1W;
 
 DECL_WINELIB_TYPE_AW(PRINTER_INFO_1)
 DECL_WINELIB_TYPE_AW(PPRINTER_INFO_1)
@@ -130,7 +130,7 @@ DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_1)
  * therfore the following hack */
 #ifndef Status
 
-typedef struct _PRINTER_INFO_232A {
+typedef struct _PRINTER_INFO_2A {
   LPSTR     pServerName;
   LPSTR     pPrinterName;
   LPSTR     pShareName;
@@ -138,7 +138,7 @@ typedef struct _PRINTER_INFO_232A {
   LPSTR     pDriverName;
   LPSTR     pComment;
   LPSTR     pLocation;
-  LPDEVMODE32A pDevMode;
+  LPDEVMODEA pDevMode;
   LPSTR     pSepFile;
   LPSTR     pPrintProcessor;
   LPSTR     pDatatype;
@@ -152,9 +152,9 @@ typedef struct _PRINTER_INFO_232A {
   DWORD   Status;
   DWORD   cJobs;
   DWORD   AveragePPM;
-} PRINTER_INFO_232A, *PPRINTER_INFO_232A, *LPPRINTER_INFO_232A;
+} PRINTER_INFO_2A, *PPRINTER_INFO_2A, *LPPRINTER_INFO_2A;
 
-typedef struct _PRINTER_INFO_232W {
+typedef struct _PRINTER_INFO_2W {
   LPWSTR    pServerName;
   LPWSTR    pPrinterName;
   LPWSTR    pShareName;
@@ -162,7 +162,7 @@ typedef struct _PRINTER_INFO_232W {
   LPWSTR    pDriverName;
   LPWSTR    pComment;
   LPWSTR    pLocation;
-  LPDEVMODE32W pDevMode;
+  LPDEVMODEW pDevMode;
   LPWSTR    pSepFile;
   LPWSTR    pPrintProcessor;
   LPWSTR    pDatatype;
@@ -176,7 +176,7 @@ typedef struct _PRINTER_INFO_232W {
   DWORD   Status;
   DWORD   cJobs;
   DWORD   AveragePPM;
-} PRINTER_INFO_232W, *PPRINTER_INFO_232W, *LPPRINTER_INFO_232W;
+} PRINTER_INFO_2W, *PPRINTER_INFO_2W, *LPPRINTER_INFO_2W;
 
 DECL_WINELIB_TYPE_AW(PRINTER_INFO_2)
 DECL_WINELIB_TYPE_AW(PPRINTER_INFO_2)
@@ -185,47 +185,46 @@ DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_2)
 #endif /* Status */
 
 /* DECLARATIONS */
-DWORD WINAPI DrvGetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
+DWORD WINAPI DrvGetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
 	  LPDWORD lpType, LPBYTE lpPrinterData, int cbData, LPDWORD lpNeeded);
-DWORD WINAPI DrvSetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
+DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
           DWORD lpType, LPBYTE lpPrinterData, DWORD dwSize);
-HANDLE16 WINAPI OpenJob(LPSTR lpOutput, LPSTR lpTitle, HDC16 hDC);
-int WINAPI CloseJob(HANDLE16 hJob);
-int WINAPI WriteSpool(HANDLE16 hJob, LPSTR lpData, WORD cch);
-int WINAPI DeleteJob(HANDLE16 hJob, WORD wNotUsed);
-int WINAPI StartSpoolPage(HANDLE16 hJob);
-int WINAPI EndSpoolPage(HANDLE16 hJob);
-DWORD WINAPI GetSpoolJob(int nOption, LONG param);
-int WINAPI WriteDialog(HANDLE16 hJob, LPSTR lpMsg, WORD cchMsg);
-
-INT32 WINAPI DeviceCapabilities32A(LPCSTR printer,LPCSTR target,WORD z,
-                                   LPSTR a,LPDEVMODE32A b);
-INT32 WINAPI DeviceCapabilities32W(LPCWSTR pDevice, LPCWSTR pPort,
+HANDLE16 WINAPI OpenJob16(LPSTR lpOutput, LPSTR lpTitle, HDC16 hDC);
+int WINAPI CloseJob16(HANDLE16 hJob);
+int WINAPI WriteSpool16(HANDLE16 hJob, LPSTR lpData, WORD cch);
+int WINAPI DeleteJob16(HANDLE16 hJob, WORD wNotUsed);
+int WINAPI StartSpoolPage16(HANDLE16 hJob);
+int WINAPI EndSpoolPage16(HANDLE16 hJob);
+DWORD WINAPI GetSpoolJob16(int nOption, LONG param);
+int WINAPI WriteDialog16(HANDLE16 hJob, LPSTR lpMsg, WORD cchMsg);
+
+INT WINAPI DeviceCapabilitiesA(LPCSTR printer,LPCSTR target,WORD z,
+                                   LPSTR a,LPDEVMODEA b);
+INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort,
                                    WORD fwCapability, LPWSTR pOutput,
-                                   const DEVMODE32W *pDevMode);
+                                   const DEVMODEW *pDevMode);
 
 #define DeviceCapabilities WINELIB_NAME_AW(DeviceCapabilities)
 
-LONG WINAPI DocumentProperties32A(HWND32 hWnd,HANDLE32 hPrinter,
-                                LPSTR pDeviceName, LPDEVMODE32A pDevModeOutput,
-                                  LPDEVMODE32A pDevModeInput,DWORD fMode );
-LONG WINAPI DocumentProperties32W(HWND32 hWnd, HANDLE32 hPrinter,
+LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter,
+                                LPSTR pDeviceName, LPDEVMODEA pDevModeOutput,
+                                  LPDEVMODEA pDevModeInput,DWORD fMode );
+LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
                                   LPWSTR pDeviceName,
-                                  LPDEVMODE32W pDevModeOutput,
-                                  LPDEVMODE32W pDevModeInput, DWORD fMode);
+                                  LPDEVMODEW pDevModeOutput,
+                                  LPDEVMODEW pDevModeInput, DWORD fMode);
 
 #define DocumentProperties WINELIB_NAME_AW(DocumentProperties)
 
-BOOL32 WINAPI OpenPrinter32A(LPSTR lpPrinterName,HANDLE32 *phPrinter,
-			     LPPRINTER_DEFAULTS32A pDefault);
-BOOL32 WINAPI OpenPrinter32W(LPWSTR lpPrinterName,HANDLE32 *phPrinter,
-			     LPPRINTER_DEFAULTS32W pDefault);
+BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter,
+			     LPPRINTER_DEFAULTSA pDefault);
+BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter,
+			     LPPRINTER_DEFAULTSW pDefault);
 
 #define OpenPrinter WINELIB_NAME_AW(OpenPrinter)
 
-BOOL32 WINAPI ClosePrinter32 (HANDLE32 phPrinter);
+BOOL WINAPI ClosePrinter (HANDLE phPrinter);
 
-#define ClosePrinter WINELIB_NAME(ClosePrinter)
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/include/wintypes.h b/include/wintypes.h
index 3e3f9672f23..7728a6afbf8 100644
--- a/include/wintypes.h
+++ b/include/wintypes.h
@@ -38,22 +38,18 @@ extern "C" {
 /* Note that Winelib is purely Win32.                             */
 
 #ifdef __WINE__
-# define WINELIB_NAME(func)      this_is_a_syntax_error this_is_a_syntax_error
 # define WINELIB_NAME_AW(func)   this_is_a_syntax_error this_is_a_syntax_error
 #else  /* __WINE__ */
-# define WINELIB_NAME(func)     func##32
 # ifdef UNICODE
-#  define WINELIB_NAME_AW(func) func##32W
+#  define WINELIB_NAME_AW(func) func##W
 # else
-#  define WINELIB_NAME_AW(func) func##32A
+#  define WINELIB_NAME_AW(func) func##A
 # endif  /* UNICODE */
 #endif  /* __WINE__ */
 
 #ifdef __WINE__
-# define DECL_WINELIB_TYPE(type)     /* nothing */
 # define DECL_WINELIB_TYPE_AW(type)  /* nothing */
 #else   /* __WINE__ */
-# define DECL_WINELIB_TYPE(type)     typedef WINELIB_NAME(type) type;
 # define DECL_WINELIB_TYPE_AW(type)  typedef WINELIB_NAME_AW(type) type;
 #endif  /* __WINE__ */
 
@@ -90,8 +86,8 @@ extern "C" {
 typedef void            VOID;
 typedef short           INT16;
 typedef unsigned short  UINT16;
-typedef int             INT32;
-typedef unsigned int    UINT32;
+typedef int             INT;
+typedef unsigned int    UINT;
 typedef unsigned short  WORD;
 typedef unsigned long   DWORD;
 typedef unsigned long   ULONG;
@@ -104,7 +100,7 @@ typedef unsigned char   UCHAR;
 /* Some systems might have wchar_t, but we really need 16 bit characters */
 typedef unsigned short  WCHAR;
 typedef unsigned short  BOOL16;
-typedef int             BOOL32;
+typedef int             BOOL;
 typedef double          DATE;
 typedef long            LONG_PTR;
 typedef unsigned long   ULONG_PTR;
@@ -115,11 +111,11 @@ typedef double          ULONGLONG;
 /* Integer types. These are the same for emulator and library. */
 
 typedef UINT16          HANDLE16;
-typedef UINT32          HANDLE32;
+typedef UINT            HANDLE;
 typedef UINT16         *LPHANDLE16;
-typedef UINT32         *LPHANDLE32;
+typedef UINT           *LPHANDLE;
 typedef UINT16          WPARAM16;
-typedef UINT32          WPARAM32;
+typedef UINT            WPARAM;
 typedef LONG            LPARAM;
 typedef LONG            HRESULT;
 typedef LONG            LRESULT;
@@ -128,9 +124,9 @@ typedef WORD            CATCHBUF[9];
 typedef WORD           *LPCATCHBUF;
 typedef DWORD           ACCESS_MASK;
 typedef ACCESS_MASK     REGSAM;
-typedef HANDLE32        HHOOK;
-typedef HANDLE32        HKEY;
-typedef HANDLE32        HMONITOR;
+typedef HANDLE          HHOOK;
+typedef HANDLE          HKEY;
+typedef HANDLE          HMONITOR;
 typedef DWORD           LCID;
 typedef WORD            LANGID;
 typedef DWORD           LCTYPE;
@@ -164,16 +160,16 @@ typedef VOID           *LPVOID;
 typedef const VOID     *LPCVOID;
 typedef INT16          *LPINT16;
 typedef UINT16         *LPUINT16;
-typedef INT32          *PINT32;
-typedef INT32          *LPINT32;
-typedef UINT32         *PUINT32;
-typedef UINT32         *LPUINT32;
+typedef INT            *PINT;
+typedef INT            *LPINT;
+typedef UINT           *PUINT;
+typedef UINT           *LPUINT;
 typedef HKEY           *LPHKEY;
 typedef HKEY           *PHKEY;
 typedef FLOAT          *PFLOAT;
 typedef FLOAT          *LPFLOAT;
-typedef BOOL32         *PBOOL32;
-typedef BOOL32         *LPBOOL32;
+typedef BOOL           *PBOOL;
+typedef BOOL           *LPBOOL;
 
 /* Special case: a segmented pointer is just a pointer in the user's code. */
 
@@ -185,7 +181,7 @@ typedef void* SEGPTR;
 
 /* Handle types that exist both in Win16 and Win32. */
 
-#define DECLARE_HANDLE(a)  typedef HANDLE16 a##16; typedef HANDLE32 a##32
+#define DECLARE_HANDLE(a)  typedef HANDLE16 a##16; typedef HANDLE a
 DECLARE_HANDLE(HACCEL);
 DECLARE_HANDLE(HBITMAP);
 DECLARE_HANDLE(HBRUSH);
@@ -232,56 +228,45 @@ DECLARE_HANDLE(HRASCONN);
 
 /* Callback function pointers types */
 
-typedef BOOL32 (CALLBACK* DATEFMT_ENUMPROC32A)(LPSTR);
-typedef BOOL32 (CALLBACK* DATEFMT_ENUMPROC32W)(LPWSTR);
+typedef BOOL    (CALLBACK* DATEFMT_ENUMPROCA)(LPSTR);
+typedef BOOL    (CALLBACK* DATEFMT_ENUMPROCW)(LPWSTR);
 DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROC)
-typedef BOOL16 (CALLBACK *DLGPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
-typedef BOOL32 (CALLBACK *DLGPROC32)(HWND32,UINT32,WPARAM32,LPARAM);
-DECL_WINELIB_TYPE(DLGPROC)
+typedef BOOL16  (CALLBACK *DLGPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
+typedef BOOL    (CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
 typedef LRESULT (CALLBACK *DRIVERPROC16)(DWORD,HDRVR16,UINT16,LPARAM,LPARAM);
-typedef LRESULT (CALLBACK *DRIVERPROC32)(DWORD,HDRVR32,UINT32,LPARAM,LPARAM);
-DECL_WINELIB_TYPE(DRIVERPROC)
+typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);
 typedef INT16   (CALLBACK *EDITWORDBREAKPROC16)(LPSTR,INT16,INT16,INT16);
-typedef INT32   (CALLBACK *EDITWORDBREAKPROC32A)(LPSTR,INT32,INT32,INT32);
-typedef INT32   (CALLBACK *EDITWORDBREAKPROC32W)(LPWSTR,INT32,INT32,INT32);
+typedef INT     (CALLBACK *EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT);
+typedef INT     (CALLBACK *EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT);
 DECL_WINELIB_TYPE_AW(EDITWORDBREAKPROC)
 typedef LRESULT (CALLBACK *FARPROC16)();
-typedef LRESULT (CALLBACK *FARPROC32)();
-DECL_WINELIB_TYPE(FARPROC)
+typedef LRESULT (CALLBACK *FARPROC)();
 typedef INT16   (CALLBACK *PROC16)();
-typedef INT32   (CALLBACK *PROC32)();
-DECL_WINELIB_TYPE(PROC)
+typedef INT     (CALLBACK *PROC)();
 typedef INT16   (CALLBACK *GOBJENUMPROC16)(SEGPTR,LPARAM);
-typedef INT32   (CALLBACK *GOBJENUMPROC32)(LPVOID,LPARAM);
-DECL_WINELIB_TYPE(GOBJENUMPROC)
+typedef INT     (CALLBACK *GOBJENUMPROC)(LPVOID,LPARAM);
 typedef BOOL16  (CALLBACK *GRAYSTRINGPROC16)(HDC16,LPARAM,INT16);
-typedef BOOL32  (CALLBACK *GRAYSTRINGPROC32)(HDC32,LPARAM,INT32);
-DECL_WINELIB_TYPE(GRAYSTRINGPROC)
+typedef BOOL    (CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,INT);
 typedef LRESULT (CALLBACK *HOOKPROC16)(INT16,WPARAM16,LPARAM);
-typedef LRESULT (CALLBACK *HOOKPROC32)(INT32,WPARAM32,LPARAM);
-DECL_WINELIB_TYPE(HOOKPROC)
+typedef LRESULT (CALLBACK *HOOKPROC)(INT,WPARAM,LPARAM);
 typedef VOID    (CALLBACK *LINEDDAPROC16)(INT16,INT16,LPARAM);
-typedef VOID    (CALLBACK *LINEDDAPROC32)(INT32,INT32,LPARAM);
-DECL_WINELIB_TYPE(LINEDDAPROC)
+typedef VOID    (CALLBACK *LINEDDAPROC)(INT,INT,LPARAM);
 typedef BOOL16  (CALLBACK *PROPENUMPROC16)(HWND16,SEGPTR,HANDLE16);
-typedef BOOL32  (CALLBACK *PROPENUMPROC32A)(HWND32,LPCSTR,HANDLE32);
-typedef BOOL32  (CALLBACK *PROPENUMPROC32W)(HWND32,LPCWSTR,HANDLE32);
+typedef BOOL    (CALLBACK *PROPENUMPROCA)(HWND,LPCSTR,HANDLE);
+typedef BOOL    (CALLBACK *PROPENUMPROCW)(HWND,LPCWSTR,HANDLE);
 DECL_WINELIB_TYPE_AW(PROPENUMPROC)
-typedef BOOL32  (CALLBACK *PROPENUMPROCEX32A)(HWND32,LPCSTR,HANDLE32,LPARAM);
-typedef BOOL32  (CALLBACK *PROPENUMPROCEX32W)(HWND32,LPCWSTR,HANDLE32,LPARAM);
+typedef BOOL    (CALLBACK *PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,LPARAM);
+typedef BOOL    (CALLBACK *PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,LPARAM);
 DECL_WINELIB_TYPE_AW(PROPENUMPROCEX)
-typedef BOOL32 (CALLBACK* TIMEFMT_ENUMPROC32A)(LPSTR);
-typedef BOOL32 (CALLBACK* TIMEFMT_ENUMPROC32W)(LPWSTR);
+typedef BOOL    (CALLBACK* TIMEFMT_ENUMPROCA)(LPSTR);
+typedef BOOL    (CALLBACK* TIMEFMT_ENUMPROCW)(LPWSTR);
 DECL_WINELIB_TYPE_AW(TIMEFMT_ENUMPROC)
 typedef VOID    (CALLBACK *TIMERPROC16)(HWND16,UINT16,UINT16,DWORD);
-typedef VOID    (CALLBACK *TIMERPROC32)(HWND32,UINT32,UINT32,DWORD);
-DECL_WINELIB_TYPE(TIMERPROC)
+typedef VOID    (CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD);
 typedef LRESULT (CALLBACK *WNDENUMPROC16)(HWND16,LPARAM);
-typedef LRESULT (CALLBACK *WNDENUMPROC32)(HWND32,LPARAM);
-DECL_WINELIB_TYPE(WNDENUMPROC)
+typedef LRESULT (CALLBACK *WNDENUMPROC)(HWND,LPARAM);
 typedef LRESULT (CALLBACK *WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
-typedef LRESULT (CALLBACK *WNDPROC32)(HWND32,UINT32,WPARAM32,LPARAM);
-DECL_WINELIB_TYPE(WNDPROC)
+typedef LRESULT (CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM);
 
 /* TCHAR data types definitions for Winelib. */
 /* These types are _not_ defined for the emulator, because they */
@@ -304,52 +289,7 @@ typedef LPCSTR LPCTSTR;
 
 /* Data types specific to the library. These do _not_ exist in the emulator. */
 
-DECL_WINELIB_TYPE(INT)
-DECL_WINELIB_TYPE(LPINT)
-DECL_WINELIB_TYPE(PUINT)
-DECL_WINELIB_TYPE(LPUINT)
-DECL_WINELIB_TYPE(UINT)
-DECL_WINELIB_TYPE(BOOL)
-DECL_WINELIB_TYPE(LPBOOL)
-DECL_WINELIB_TYPE(WPARAM)
-
-DECL_WINELIB_TYPE(HACCEL)
-DECL_WINELIB_TYPE(HANDLE)
-DECL_WINELIB_TYPE(LPHANDLE)
-DECL_WINELIB_TYPE(HBITMAP)
-DECL_WINELIB_TYPE(HBRUSH)
-DECL_WINELIB_TYPE(HCOLORSPACE)
-DECL_WINELIB_TYPE(HCURSOR)
-DECL_WINELIB_TYPE(HDC)
-DECL_WINELIB_TYPE(HDROP)
-DECL_WINELIB_TYPE(HDRVR)
-DECL_WINELIB_TYPE(HDWP)
-DECL_WINELIB_TYPE(HENHMETAFILE)
-DECL_WINELIB_TYPE(HFILE)
-DECL_WINELIB_TYPE(HFONT)
-DECL_WINELIB_TYPE(HGDIOBJ)
-DECL_WINELIB_TYPE(HGLOBAL)
-DECL_WINELIB_TYPE(HIC)
-DECL_WINELIB_TYPE(HICON)
-DECL_WINELIB_TYPE(HINSTANCE)
-DECL_WINELIB_TYPE(HLOCAL)
-DECL_WINELIB_TYPE(HMENU)
-DECL_WINELIB_TYPE(HMETAFILE)
-DECL_WINELIB_TYPE(HMIDI)
-DECL_WINELIB_TYPE(HMIDIIN)
-DECL_WINELIB_TYPE(HMIDIOUT)
-DECL_WINELIB_TYPE(HMMIO)
-DECL_WINELIB_TYPE(HMODULE)
-DECL_WINELIB_TYPE(HPALETTE)
-DECL_WINELIB_TYPE(HPEN)
-DECL_WINELIB_TYPE(HQUEUE)
-DECL_WINELIB_TYPE(HRGN)
-DECL_WINELIB_TYPE(HRSRC)
-DECL_WINELIB_TYPE(HTASK)
-DECL_WINELIB_TYPE(HWAVE)
-DECL_WINELIB_TYPE(HWAVEIN)
-DECL_WINELIB_TYPE(HWAVEOUT)
-DECL_WINELIB_TYPE(HWND)
+
 
 /* Define some empty macros for compatibility with Windows code. */
 
@@ -387,7 +327,7 @@ DECL_WINELIB_TYPE(HWND)
 #define MAKEWORD(low,high)     ((WORD)(((BYTE)(low)) | ((WORD)((BYTE)(high))) << 8))
 #define MAKELONG(low,high)     ((LONG)(((WORD)(low)) | (((DWORD)((WORD)(high))) << 16)))
 #define MAKELPARAM(low,high)   ((LPARAM)MAKELONG(low,high))
-#define MAKEWPARAM(low,high)   ((WPARAM32)MAKELONG(low,high))
+#define MAKEWPARAM(low,high)   ((WPARAM)MAKELONG(low,high))
 #define MAKELRESULT(low,high)  ((LRESULT)MAKELONG(low,high))
 #define MAKEINTATOM(atom)      ((LPCSTR)MAKELONG((atom),0))
 
@@ -461,18 +401,15 @@ typedef struct
 
 typedef struct tagSIZE
 {
-    INT32  cx;
-    INT32  cy;
-} SIZE32, *PSIZE32, *LPSIZE32;
+    INT  cx;
+    INT  cy;
+} SIZE, *PSIZE, *LPSIZE;
 
-DECL_WINELIB_TYPE(SIZE)
-DECL_WINELIB_TYPE(PSIZE)
-DECL_WINELIB_TYPE(LPSIZE)
 
-typedef SIZE32 SIZEL, *PSIZEL, *LPSIZEL;
+typedef SIZE SIZEL, *PSIZEL, *LPSIZEL;
 
 #define CONV_SIZE16TO32(s16,s32) \
-            ((s32)->cx = (INT32)(s16)->cx, (s32)->cy = (INT32)(s16)->cy)
+            ((s32)->cx = (INT)(s16)->cx, (s32)->cy = (INT)(s16)->cy)
 #define CONV_SIZE32TO16(s32,s16) \
             ((s16)->cx = (INT16)(s32)->cx, (s16)->cy = (INT16)(s32)->cy)
 
@@ -488,19 +425,15 @@ typedef struct tagPOINT
 {
     LONG  x;
     LONG  y;
-} POINT32, *PPOINT32, *LPPOINT32;
+} POINT, *PPOINT, *LPPOINT;
 
-DECL_WINELIB_TYPE(POINT)
-DECL_WINELIB_TYPE(PPOINT)
-DECL_WINELIB_TYPE(LPPOINT)
 
 #define CONV_POINT16TO32(p16,p32) \
-            ((p32)->x = (INT32)(p16)->x, (p32)->y = (INT32)(p16)->y)
+            ((p32)->x = (INT)(p16)->x, (p32)->y = (INT)(p16)->y)
 #define CONV_POINT32TO16(p32,p16) \
             ((p16)->x = (INT16)(p32)->x, (p16)->y = (INT16)(p32)->y)
 
 #define MAKEPOINT16(l) (*((POINT16 *)&(l)))
-#define MAKEPOINT WINELIB_NAME(MAKEPOINT)
 
 /* The POINTS structure */
 
@@ -508,11 +441,8 @@ typedef struct tagPOINTS
 {
 	SHORT x;
 	SHORT y;
-} POINTS32, *PPOINTS32, *LPPOINTS32;
+} POINTS, *PPOINTS, *LPPOINTS;
 
-DECL_WINELIB_TYPE(POINTS)
-DECL_WINELIB_TYPE(PPOINTS)
-DECL_WINELIB_TYPE(LPPOINTS)
 
 #define MAKEPOINTS(l)  (*((POINTS *)&(l)))
 
@@ -529,17 +459,13 @@ typedef struct
 
 typedef struct tagRECT
 {
-    INT32  left;
-    INT32  top;
-    INT32  right;
-    INT32  bottom;
-} RECT32, *PRECT32, *LPRECT32;
-typedef const RECT32 *LPCRECT32;
-
-DECL_WINELIB_TYPE(RECT)
-DECL_WINELIB_TYPE(PRECT)
-DECL_WINELIB_TYPE(LPRECT)
-DECL_WINELIB_TYPE(LPCRECT)
+    INT  left;
+    INT  top;
+    INT  right;
+    INT  bottom;
+} RECT, *PRECT, *LPRECT;
+typedef const RECT *LPCRECT32;
+
 
 typedef struct tagRECTL
 {
@@ -552,8 +478,8 @@ typedef struct tagRECTL
 typedef const RECTL *LPCRECTL;
 
 #define CONV_RECT16TO32(r16,r32) \
-    ((r32)->left  = (INT32)(r16)->left,  (r32)->top    = (INT32)(r16)->top, \
-     (r32)->right = (INT32)(r16)->right, (r32)->bottom = (INT32)(r16)->bottom)
+    ((r32)->left  = (INT)(r16)->left,  (r32)->top    = (INT)(r16)->top, \
+     (r32)->right = (INT)(r16)->right, (r32)->bottom = (INT)(r16)->bottom)
 #define CONV_RECT32TO16(r32,r16) \
     ((r16)->left  = (INT16)(r32)->left,  (r16)->top    = (INT16)(r32)->top, \
      (r16)->right = (INT16)(r32)->right, (r16)->bottom = (INT16)(r32)->bottom)
diff --git a/include/winuser.h b/include/winuser.h
index ffc5d61aa9b..51d98bafe16 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -19,61 +19,54 @@
 #define HCF_INDICATOR       0x00000020
 #define HCF_HOTKEYAVAILABLE 0x00000040
 
-typedef struct tagHIGHCONTRAST32A
+typedef struct tagHIGHCONTRASTA
 {
-    UINT32  cbSize;
+    UINT  cbSize;
     DWORD   dwFlags;
     LPSTR   lpszDefaultScheme;
-} HIGHCONTRAST32A, *LPHIGHCONTRAST32A;
+} HIGHCONTRASTA, *LPHIGHCONTRASTA;
 
 typedef struct tagHIGHCONTRAST32W
 {
-    UINT32  cbSize;
+    UINT  cbSize;
     DWORD   dwFlags;
     LPWSTR  lpszDefaultScheme;
-} HIGHCONTRAST32W, *LPHIGHCONTRAST32W;
+} HIGHCONTRASTW, *LPHIGHCONTRASTW;
 
 DECL_WINELIB_TYPE_AW(HIGHCONTRAST)
 DECL_WINELIB_TYPE_AW(LPHIGHCONTRAST)
 
 typedef struct
 {
-    UINT32  message;
-    UINT32  paramL;
-    UINT32  paramH;
+    UINT  message;
+    UINT  paramL;
+    UINT  paramH;
     DWORD   time;
-    HWND32  hwnd;
-} EVENTMSG32, *LPEVENTMSG32;
+    HWND  hwnd;
+} EVENTMSG, *LPEVENTMSG;
 
-DECL_WINELIB_TYPE(EVENTMSG)
-DECL_WINELIB_TYPE(LPEVENTMSG)
 
     /* Mouse hook structure */
 
 typedef struct
 {
-    POINT32 pt;
-    HWND32  hwnd;
-    UINT32  wHitTestCode;
+    POINT pt;
+    HWND  hwnd;
+    UINT  wHitTestCode;
     DWORD   dwExtraInfo;
-} MOUSEHOOKSTRUCT32, *PMOUSEHOOKSTRUCT32, *LPMOUSEHOOKSTRUCT32;
+} MOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT32, *LPMOUSEHOOKSTRUCT;
 
-DECL_WINELIB_TYPE(MOUSEHOOKSTRUCT)
-DECL_WINELIB_TYPE(PMOUSEHOOKSTRUCT)
-DECL_WINELIB_TYPE(LPMOUSEHOOKSTRUCT)
 
     /* Hardware hook structure */
 
 typedef struct
 {
-    HWND32    hWnd;
-    UINT32    wMessage;
-    WPARAM32  wParam;
+    HWND    hWnd;
+    UINT    wMessage;
+    WPARAM  wParam;
     LPARAM    lParam;
-} HARDWAREHOOKSTRUCT32, *LPHARDWAREHOOKSTRUCT32;
+} HARDWAREHOOKSTRUCT, *LPHARDWAREHOOKSTRUCT;
 
-DECL_WINELIB_TYPE(HARDWAREHOOKSTRUCT)
-DECL_WINELIB_TYPE(LPHARDWAREHOOKSTRUCT)
 
   /* Debug hook structure */
 
@@ -82,12 +75,10 @@ typedef struct
     DWORD       idThread;
     DWORD       idThreadInstaller;
     LPARAM      lParam;
-    WPARAM32    wParam;
-    INT32       code;
-} DEBUGHOOKINFO32, *LPDEBUGHOOKINFO32;
+    WPARAM    wParam;
+    INT       code;
+} DEBUGHOOKINFO, *LPDEBUGHOOKINFO;
 
-DECL_WINELIB_TYPE(DEBUGHOOKINFO)
-DECL_WINELIB_TYPE(LPDEBUGHOOKINFO)
 
   /***** Dialogs *****/
 #ifdef FSHIFT
@@ -104,40 +95,38 @@ DECL_WINELIB_TYPE(LPDEBUGHOOKINFO)
 
 typedef struct tagANIMATIONINFO
 {
-       UINT32          cbSize;
-       INT32           iMinAnimate;
+       UINT          cbSize;
+       INT           iMinAnimate;
 } ANIMATIONINFO, *LPANIMATIONINFO;
 
 typedef struct tagNMHDR
 {
-    HWND32  hwndFrom;
-    UINT32  idFrom;
-    UINT32  code;
+    HWND  hwndFrom;
+    UINT  idFrom;
+    UINT  code;
 } NMHDR, *LPNMHDR;
 
 typedef struct
 {
-	UINT32	cbSize;
-	INT32	iTabLength;
-	INT32	iLeftMargin;
-	INT32	iRightMargin;
-	UINT32	uiLengthDrawn;
+	UINT	cbSize;
+	INT	iTabLength;
+	INT	iLeftMargin;
+	INT	iRightMargin;
+	UINT	uiLengthDrawn;
 } DRAWTEXTPARAMS,*LPDRAWTEXTPARAMS;
 
 #define WM_USER             0x0400
 
 typedef struct
 {
-    UINT32   length;
-    UINT32   flags;
-    UINT32   showCmd;
-    POINT32  ptMinPosition WINE_PACKED;
-    POINT32  ptMaxPosition WINE_PACKED;
-    RECT32   rcNormalPosition WINE_PACKED;
-} WINDOWPLACEMENT32, *LPWINDOWPLACEMENT32;
+    UINT   length;
+    UINT   flags;
+    UINT   showCmd;
+    POINT  ptMinPosition WINE_PACKED;
+    POINT  ptMaxPosition WINE_PACKED;
+    RECT   rcNormalPosition WINE_PACKED;
+} WINDOWPLACEMENT, *LPWINDOWPLACEMENT;
 
-DECL_WINELIB_TYPE(WINDOWPLACEMENT)
-DECL_WINELIB_TYPE(LPWINDOWPLACEMENT)
 
   /* WINDOWPLACEMENT flags */
 #define WPF_SETMINPOSITION      0x0001
@@ -297,84 +286,47 @@ DECL_WINELIB_TYPE(LPWINDOWPLACEMENT)
 #define OIC_WINEICON        32519
 
 /* Edit control messages */
-#define EM_GETSEL32                0x00b0
-#define EM_GETSEL                  WINELIB_NAME(EM_GETSEL)
-#define EM_SETSEL32                0x00b1
-#define EM_SETSEL                  WINELIB_NAME(EM_SETSEL)
-#define EM_GETRECT32               0x00b2
-#define EM_GETRECT                 WINELIB_NAME(EM_GETRECT)
-#define EM_SETRECT32               0x00b3
-#define EM_SETRECT                 WINELIB_NAME(EM_SETRECT)
-#define EM_SETRECTNP32             0x00b4
-#define EM_SETRECTNP               WINELIB_NAME(EM_SETRECTNP)
-#define EM_SCROLL32                0x00b5
-#define EM_SCROLL                  WINELIB_NAME(EM_SCROLL)
-#define EM_LINESCROLL32            0x00b6
-#define EM_LINESCROLL              WINELIB_NAME(EM_LINESCROLL)
-#define EM_SCROLLCARET32           0x00b7
-#define EM_SCROLLCARET             WINELIB_NAME(EM_SCROLLCARET)
-#define EM_GETMODIFY32             0x00b8
-#define EM_GETMODIFY               WINELIB_NAME(EM_GETMODIFY)
-#define EM_SETMODIFY32             0x00b9
-#define EM_SETMODIFY               WINELIB_NAME(EM_SETMODIFY)
-#define EM_GETLINECOUNT32          0x00ba
-#define EM_GETLINECOUNT            WINELIB_NAME(EM_GETLINECOUNT)
-#define EM_LINEINDEX32             0x00bb
-#define EM_LINEINDEX               WINELIB_NAME(EM_LINEINDEX)
-#define EM_SETHANDLE32             0x00bc
-#define EM_SETHANDLE               WINELIB_NAME(EM_SETHANDLE)
-#define EM_GETHANDLE32             0x00bd
-#define EM_GETHANDLE               WINELIB_NAME(EM_GETHANDLE)
-#define EM_GETTHUMB32              0x00be
-#define EM_GETTHUMB                WINELIB_NAME(EM_GETTHUMB)
+#define EM_GETSEL                0x00b0
+#define EM_SETSEL                0x00b1
+#define EM_GETRECT               0x00b2
+#define EM_SETRECT               0x00b3
+#define EM_SETRECTNP             0x00b4
+#define EM_SCROLL                0x00b5
+#define EM_LINESCROLL            0x00b6
+#define EM_SCROLLCARET           0x00b7
+#define EM_GETMODIFY             0x00b8
+#define EM_SETMODIFY             0x00b9
+#define EM_GETLINECOUNT          0x00ba
+#define EM_LINEINDEX             0x00bb
+#define EM_SETHANDLE             0x00bc
+#define EM_GETHANDLE             0x00bd
+#define EM_GETTHUMB              0x00be
 /* FIXME : missing from specs 0x00bf and 0x00c0 */
-#define EM_LINELENGTH32            0x00c1
-#define EM_LINELENGTH              WINELIB_NAME(EM_LINELENGTH)
-#define EM_REPLACESEL32            0x00c2
-#define EM_REPLACESEL              WINELIB_NAME(EM_REPLACESEL)
+#define EM_LINELENGTH            0x00c1
+#define EM_REPLACESEL            0x00c2
 /* FIXME : missing from specs 0x00c3 */
-#define EM_GETLINE32               0x00c4
-#define EM_GETLINE                 WINELIB_NAME(EM_GETLINE)
-#define EM_LIMITTEXT32             0x00c5
-#define EM_LIMITTEXT               WINELIB_NAME(EM_LIMITTEXT)
-#define EM_CANUNDO32               0x00c6
-#define EM_CANUNDO                 WINELIB_NAME(EM_CANUNDO)
-#define EM_UNDO32                  0x00c7
-#define EM_UNDO                    WINELIB_NAME(EM_UNDO)
-#define EM_FMTLINES32              0x00c8
-#define EM_FMTLINES                WINELIB_NAME(EM_FMTLINES)
-#define EM_LINEFROMCHAR32          0x00c9
-#define EM_LINEFROMCHAR            WINELIB_NAME(EM_LINEFROMCHAR)
+#define EM_GETLINE               0x00c4
+#define EM_LIMITTEXT             0x00c5
+#define EM_CANUNDO               0x00c6
+#define EM_UNDO                  0x00c7
+#define EM_FMTLINES              0x00c8
+#define EM_LINEFROMCHAR          0x00c9
 /* FIXME : missing from specs 0x00ca */
-#define EM_SETTABSTOPS32           0x00cb
-#define EM_SETTABSTOPS             WINELIB_NAME(EM_SETTABSTOPS)
-#define EM_SETPASSWORDCHAR32       0x00cc
-#define EM_SETPASSWORDCHAR         WINELIB_NAME(EM_SETPASSWORDCHAR)
-#define EM_EMPTYUNDOBUFFER32       0x00cd
-#define EM_EMPTYUNDOBUFFER         WINELIB_NAME(EM_EMPTYUNDOBUFFER)
-#define EM_GETFIRSTVISIBLELINE32   0x00ce
-#define EM_GETFIRSTVISIBLELINE     WINELIB_NAME(EM_GETFIRSTVISIBLELINE)
-#define EM_SETREADONLY32           0x00cf
-#define EM_SETREADONLY             WINELIB_NAME(EM_SETREADONLY)
-#define EM_SETWORDBREAKPROC32      0x00d0
-#define EM_SETWORDBREAKPROC        WINELIB_NAME(EM_SETWORDBREAKPROC)
-#define EM_GETWORDBREAKPROC32      0x00d1
-#define EM_GETWORDBREAKPROC        WINELIB_NAME(EM_GETWORDBREAKPROC)
-#define EM_GETPASSWORDCHAR32       0x00d2
-#define EM_GETPASSWORDCHAR         WINELIB_NAME(EM_GETPASSWORDCHAR)
-#define EM_SETMARGINS32            0x00d3
-#define EM_SETMARGINS              WINELIB_NAME(EM_SETMARGINS)
-#define EM_GETMARGINS32            0x00d4
-#define EM_GETMARGINS              WINELIB_NAME(EM_GETMARGINS)
-#define EM_GETLIMITTEXT32          0x00d5
-#define EM_GETLIMITTEXT            WINELIB_NAME(EM_GETLIMITTEXT)
-#define EM_POSFROMCHAR32           0x00d6
-#define EM_POSFROMCHAR             WINELIB_NAME(EM_POSFROMCHAR)
-#define EM_CHARFROMPOS32           0x00d7
-#define EM_CHARFROMPOS             WINELIB_NAME(EM_CHARFROMPOS)
+#define EM_SETTABSTOPS           0x00cb
+#define EM_SETPASSWORDCHAR       0x00cc
+#define EM_EMPTYUNDOBUFFER       0x00cd
+#define EM_GETFIRSTVISIBLELINE   0x00ce
+#define EM_SETREADONLY           0x00cf
+#define EM_SETWORDBREAKPROC      0x00d0
+#define EM_GETWORDBREAKPROC      0x00d1
+#define EM_GETPASSWORDCHAR       0x00d2
+#define EM_SETMARGINS            0x00d3
+#define EM_GETMARGINS            0x00d4
+#define EM_GETLIMITTEXT          0x00d5
+#define EM_POSFROMCHAR           0x00d6
+#define EM_CHARFROMPOS           0x00d7
 /* a name change since win95 */
-#define EM_SETLIMITTEXT32          EM_LIMITTEXT32
-#define EM_SETLIMITTEXT            WINELIB_NAME(EM_SETLIMITTEXT)
+#define EM_SETLIMITTEXT          EM_LIMITTEXT
 
 /* EDITWORDBREAKPROC code values */
 #define WB_LEFT         0
@@ -691,72 +643,70 @@ DECL_WINELIB_TYPE(LPWINDOWPLACEMENT)
 typedef struct
 {
     LPVOID      lpCreateParams;
-    HINSTANCE32 hInstance;
-    HMENU32     hMenu;
-    HWND32      hwndParent;
-    INT32       cy;
-    INT32       cx;
-    INT32       y;
-    INT32       x;
+    HINSTANCE hInstance;
+    HMENU     hMenu;
+    HWND      hwndParent;
+    INT       cy;
+    INT       cx;
+    INT       y;
+    INT       x;
     LONG        style;
     LPCSTR      lpszName;
     LPCSTR      lpszClass;
     DWORD       dwExStyle;
-} CREATESTRUCT32A, *LPCREATESTRUCT32A;
+} CREATESTRUCTA, *LPCREATESTRUCTA;
 
 typedef struct
 {
     LPVOID      lpCreateParams;
-    HINSTANCE32 hInstance;
-    HMENU32     hMenu;
-    HWND32      hwndParent;
-    INT32       cy;
-    INT32       cx;
-    INT32       y;
-    INT32       x;
+    HINSTANCE hInstance;
+    HMENU     hMenu;
+    HWND      hwndParent;
+    INT       cy;
+    INT       cx;
+    INT       y;
+    INT       x;
     LONG        style;
     LPCWSTR     lpszName;
     LPCWSTR     lpszClass;
     DWORD       dwExStyle;
-} CREATESTRUCT32W, *LPCREATESTRUCT32W;
+} CREATESTRUCTW, *LPCREATESTRUCTW;
 
 DECL_WINELIB_TYPE_AW(CREATESTRUCT)
 DECL_WINELIB_TYPE_AW(LPCREATESTRUCT)
 
 typedef struct 
 {
-    HMENU32   hWindowMenu;
-    UINT32    idFirstChild;
-} CLIENTCREATESTRUCT32, *LPCLIENTCREATESTRUCT32;
+    HMENU   hWindowMenu;
+    UINT    idFirstChild;
+} CLIENTCREATESTRUCT, *LPCLIENTCREATESTRUCT;
 
-DECL_WINELIB_TYPE(CLIENTCREATESTRUCT)
-DECL_WINELIB_TYPE(LPCLIENTCREATESTRUCT)
 
 typedef struct
 {
     LPCSTR       szClass;
     LPCSTR       szTitle;
-    HINSTANCE32  hOwner;
-    INT32        x;
-    INT32        y;
-    INT32        cx;
-    INT32        cy;
+    HINSTANCE  hOwner;
+    INT        x;
+    INT        y;
+    INT        cx;
+    INT        cy;
     DWORD        style;
     LPARAM       lParam;
-} MDICREATESTRUCT32A, *LPMDICREATESTRUCT32A;
+} MDICREATESTRUCTA, *LPMDICREATESTRUCTA;
 
 typedef struct
 {
     LPCWSTR      szClass;
     LPCWSTR      szTitle;
-    HINSTANCE32  hOwner;
-    INT32        x;
-    INT32        y;
-    INT32        cx;
-    INT32        cy;
+    HINSTANCE  hOwner;
+    INT        x;
+    INT        y;
+    INT        cx;
+    INT        cy;
     DWORD        style;
     LPARAM       lParam;
-} MDICREATESTRUCT32W, *LPMDICREATESTRUCT32W;
+} MDICREATESTRUCTW, *LPMDICREATESTRUCTW;
 
 DECL_WINELIB_TYPE_AW(MDICREATESTRUCT)
 DECL_WINELIB_TYPE_AW(LPMDICREATESTRUCT)
@@ -798,16 +748,13 @@ typedef struct {
   /* WM_GETMINMAXINFO struct */
 typedef struct
 {
-    POINT32   ptReserved;
-    POINT32   ptMaxSize;
-    POINT32   ptMaxPosition;
-    POINT32   ptMinTrackSize;
-    POINT32   ptMaxTrackSize;
-} MINMAXINFO32, *PMINMAXINFO32, *LPMINMAXINFO32;
+    POINT   ptReserved;
+    POINT   ptMaxSize;
+    POINT   ptMaxPosition;
+    POINT   ptMinTrackSize;
+    POINT   ptMaxTrackSize;
+} MINMAXINFO, *PMINMAXINFO32, *LPMINMAXINFO32;
 
-DECL_WINELIB_TYPE(MINMAXINFO)
-DECL_WINELIB_TYPE(PMINMAXINFO)
-DECL_WINELIB_TYPE(LPMINMAXINFO)
 
   /* RedrawWindow() flags */
 #define RDW_INVALIDATE       0x0001
@@ -832,18 +779,15 @@ DECL_WINELIB_TYPE(LPMINMAXINFO)
   /* WM_WINDOWPOSCHANGING/CHANGED struct */
 typedef struct
 {
-    HWND32  hwnd;
-    HWND32  hwndInsertAfter;
-    INT32   x;
-    INT32   y;
-    INT32   cx;
-    INT32   cy;
-    UINT32  flags;
-} WINDOWPOS32, *PWINDOWPOS32, *LPWINDOWPOS32;
-
-DECL_WINELIB_TYPE(WINDOWPOS)
-DECL_WINELIB_TYPE(PWINDOWPOS)
-DECL_WINELIB_TYPE(LPWINDOWPOS)
+    HWND  hwnd;
+    HWND  hwndInsertAfter;
+    INT   x;
+    INT   y;
+    INT   cx;
+    INT   cy;
+    UINT  flags;
+} WINDOWPOS, *PWINDOWPOS32, *LPWINDOWPOS;
+
 
   /* WM_MOUSEACTIVATE return values */
 #define MA_ACTIVATE             1
@@ -859,12 +803,10 @@ DECL_WINELIB_TYPE(LPWINDOWPOS)
   /* WM_NCCALCSIZE parameter structure */
 typedef struct
 {
-    RECT32       rgrc[3];
-    WINDOWPOS32 *lppos;
-} NCCALCSIZE_PARAMS32, *LPNCCALCSIZE_PARAMS32;
+    RECT       rgrc[3];
+    WINDOWPOS *lppos;
+} NCCALCSIZE_PARAMS, *LPNCCALCSIZE_PARAMS;
 
-DECL_WINELIB_TYPE(NCCALCSIZE_PARAMS)
-DECL_WINELIB_TYPE(LPNCCALCSIZE_PARAMS)
 
   /* WM_NCCALCSIZE return flags */
 #define WVR_ALIGNTOP        0x0010
@@ -1014,31 +956,31 @@ DECL_WINELIB_TYPE(LPNCCALCSIZE_PARAMS)
 
 typedef struct
 {
-    UINT32      style;
-    WNDPROC32   lpfnWndProc;
-    INT32       cbClsExtra;
-    INT32       cbWndExtra;
-    HINSTANCE32 hInstance;
-    HICON32     hIcon;
-    HCURSOR32   hCursor;
-    HBRUSH32    hbrBackground;
+    UINT      style;
+    WNDPROC   lpfnWndProc;
+    INT       cbClsExtra;
+    INT       cbWndExtra;
+    HINSTANCE hInstance;
+    HICON     hIcon;
+    HCURSOR   hCursor;
+    HBRUSH    hbrBackground;
     LPCSTR      lpszMenuName;
     LPCSTR      lpszClassName;
-} WNDCLASS32A, *LPWNDCLASS32A;
+} WNDCLASSA, *LPWNDCLASSA;
 
 typedef struct
 {
-    UINT32      style;
-    WNDPROC32   lpfnWndProc;
-    INT32       cbClsExtra;
-    INT32       cbWndExtra;
-    HINSTANCE32 hInstance;
-    HICON32     hIcon;
-    HCURSOR32   hCursor;
-    HBRUSH32    hbrBackground;
+    UINT      style;
+    WNDPROC   lpfnWndProc;
+    INT       cbClsExtra;
+    INT       cbWndExtra;
+    HINSTANCE hInstance;
+    HICON     hIcon;
+    HCURSOR   hCursor;
+    HBRUSH    hbrBackground;
     LPCWSTR     lpszMenuName;
     LPCWSTR     lpszClassName;
-} WNDCLASS32W, *LPWNDCLASS32W;
+} WNDCLASSW, *LPWNDCLASSW;
 
 DECL_WINELIB_TYPE_AW(WNDCLASS)
 DECL_WINELIB_TYPE_AW(LPWNDCLASS)
@@ -1050,9 +992,9 @@ typedef struct {
 } COPYDATASTRUCT, *PCOPYDATASTRUCT, *LPCOPYDATASTRUCT;
 
 typedef struct {
-    HMENU32 hmenuIn;
-    HMENU32 hmenuNext;
-    HWND32  hwndNext;
+    HMENU hmenuIn;
+    HMENU hmenuNext;
+    HWND  hwndNext;
 } MDINEXTMENU, *PMDINEXTMENU, *LPMDINEXTMENU;
 
 /* WinHelp internal structure */
@@ -1126,64 +1068,60 @@ typedef struct {
 
 typedef struct
 {
-    UINT32      cbSize;
-    UINT32      style;
-    WNDPROC32   lpfnWndProc;
-    INT32       cbClsExtra;
-    INT32       cbWndExtra;
-    HINSTANCE32 hInstance;
-    HICON32     hIcon;
-    HCURSOR32   hCursor;
-    HBRUSH32    hbrBackground;
+    UINT      cbSize;
+    UINT      style;
+    WNDPROC   lpfnWndProc;
+    INT       cbClsExtra;
+    INT       cbWndExtra;
+    HINSTANCE hInstance;
+    HICON     hIcon;
+    HCURSOR   hCursor;
+    HBRUSH    hbrBackground;
     LPCSTR      lpszMenuName;
     LPCSTR      lpszClassName;
-    HICON32     hIconSm;
-} WNDCLASSEX32A, *LPWNDCLASSEX32A;
+    HICON     hIconSm;
+} WNDCLASSEXA, *LPWNDCLASSEXA;
 
 typedef struct
 {
-    UINT32      cbSize;
-    UINT32      style;
-    WNDPROC32   lpfnWndProc;
-    INT32       cbClsExtra;
-    INT32       cbWndExtra;
-    HINSTANCE32 hInstance;
-    HICON32     hIcon;
-    HCURSOR32   hCursor;
-    HBRUSH32    hbrBackground;
+    UINT      cbSize;
+    UINT      style;
+    WNDPROC   lpfnWndProc;
+    INT       cbClsExtra;
+    INT       cbWndExtra;
+    HINSTANCE hInstance;
+    HICON     hIcon;
+    HCURSOR   hCursor;
+    HBRUSH    hbrBackground;
     LPCWSTR     lpszMenuName;
     LPCWSTR     lpszClassName;
-    HICON32     hIconSm;
-} WNDCLASSEX32W, *LPWNDCLASSEX32W;
+    HICON     hIconSm;
+} WNDCLASSEXW, *LPWNDCLASSEXW;
 
 DECL_WINELIB_TYPE_AW(WNDCLASSEX)
 DECL_WINELIB_TYPE_AW(LPWNDCLASSEX)
 
 typedef struct
 {
-    HWND32    hwnd;
-    UINT32    message;
-    WPARAM32  wParam;
+    HWND    hwnd;
+    UINT    message;
+    WPARAM  wParam;
     LPARAM    lParam;
     DWORD     time;
-    POINT32   pt;
-} MSG32, *LPMSG32;
+    POINT   pt;
+} MSG, *LPMSG;
 
-DECL_WINELIB_TYPE(MSG)
-DECL_WINELIB_TYPE(LPMSG)
 	
 /* Cursors / Icons */
 
 typedef struct {
-	BOOL32		fIcon;
+	BOOL		fIcon;
 	DWORD		xHotspot;
 	DWORD		yHotspot;
-	HBITMAP32	hbmMask;
-	HBITMAP32	hbmColor;
-} ICONINFO32,*LPICONINFO32;
+	HBITMAP	hbmMask;
+	HBITMAP	hbmColor;
+} ICONINFO,*LPICONINFO;
 
-DECL_WINELIB_TYPE(ICONINFO)
-DECL_WINELIB_TYPE(LPICONINFO)
 
 /* this is the 6 byte accel struct used in Win32 when presented to the user */
 typedef struct
@@ -1192,7 +1130,7 @@ typedef struct
     BYTE   pad0;
     WORD   key;
     WORD   cmd;
-} ACCEL32, *LPACCEL32;
+} ACCEL, *LPACCEL;
 
 /* this is the 8 byte accel struct used in Win32 resources (internal only) */
 typedef struct
@@ -1204,8 +1142,6 @@ typedef struct
     WORD   pad1;
 } PE_ACCEL, *LPPE_ACCEL;
 
-DECL_WINELIB_TYPE(ACCEL)
-DECL_WINELIB_TYPE(LPACCEL)
 
 /* Flags for TrackPopupMenu */
 #define TPM_LEFTBUTTON    0x0000
@@ -1223,38 +1159,38 @@ DECL_WINELIB_TYPE(LPACCEL)
 
 typedef struct 
 {
-    UINT32   cbSize;
-    RECT32   rcExclude;
+    UINT   cbSize;
+    RECT   rcExclude;
 } TPMPARAMS, *LPTPMPARAMS;
 
 /* FIXME: not sure this one is correct */
 typedef struct {
-  UINT32    cbSize;
-  UINT32    fMask;
-  UINT32    fType;
-  UINT32    fState;
-  UINT32    wID;
-  HMENU32   hSubMenu;
-  HBITMAP32 hbmpChecked;
-  HBITMAP32 hbmpUnchecked;
+  UINT    cbSize;
+  UINT    fMask;
+  UINT    fType;
+  UINT    fState;
+  UINT    wID;
+  HMENU   hSubMenu;
+  HBITMAP hbmpChecked;
+  HBITMAP hbmpUnchecked;
   DWORD     dwItemData;
   LPSTR     dwTypeData;
-  UINT32    cch;
-} MENUITEMINFO32A, *LPMENUITEMINFO32A;
+  UINT    cch;
+} MENUITEMINFOA, *LPMENUITEMINFOA;
 
 typedef struct {
-  UINT32    cbSize;
-  UINT32    fMask;
-  UINT32    fType;
-  UINT32    fState;
-  UINT32    wID;
-  HMENU32   hSubMenu;
-  HBITMAP32 hbmpChecked;
-  HBITMAP32 hbmpUnchecked;
+  UINT    cbSize;
+  UINT    fMask;
+  UINT    fType;
+  UINT    fState;
+  UINT    wID;
+  HMENU   hSubMenu;
+  HBITMAP hbmpChecked;
+  HBITMAP hbmpUnchecked;
   DWORD     dwItemData;
   LPWSTR    dwTypeData;
-  UINT32    cch;
-} MENUITEMINFO32W, *LPMENUITEMINFO32W;
+  UINT    cch;
+} MENUITEMINFOW, *LPMENUITEMINFOW;
 
 DECL_WINELIB_TYPE_AW(MENUITEMINFO)
 DECL_WINELIB_TYPE_AW(LPMENUITEMINFO)
@@ -1268,8 +1204,7 @@ DECL_WINELIB_TYPE_AW(LPMENUITEMINFO)
 #define MIIM_DATA        0x00000020
 
 /* DrawState defines ... */
-typedef BOOL32 (CALLBACK *DRAWSTATEPROC32)(HDC32,LPARAM,WPARAM32,INT32,INT32);
-DECL_WINELIB_TYPE(DRAWSTATEPROC)
+typedef BOOL (CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,INT,INT);
 
 /* WM_H/VSCROLL commands */
 #define SB_LINEUP           0
@@ -1320,23 +1255,15 @@ DECL_WINELIB_TYPE(DRAWSTATEPROC)
 #define ESB_DISABLE_RTDN    ESB_DISABLE_RIGHT
 
 /* Win32 button control messages */
-#define BM_GETCHECK32          0x00f0
-#define BM_SETCHECK32          0x00f1
-#define BM_GETSTATE32          0x00f2
-#define BM_SETSTATE32          0x00f3
-#define BM_SETSTYLE32          0x00f4
-#define BM_CLICK32             0x00f5
-#define BM_GETIMAGE32          0x00f6
-#define BM_SETIMAGE32          0x00f7
+#define BM_GETCHECK          0x00f0
+#define BM_SETCHECK          0x00f1
+#define BM_GETSTATE          0x00f2
+#define BM_SETSTATE          0x00f3
+#define BM_SETSTYLE          0x00f4
+#define BM_CLICK             0x00f5
+#define BM_GETIMAGE          0x00f6
+#define BM_SETIMAGE          0x00f7
 /* Winelib button control messages */
-#define BM_GETCHECK            WINELIB_NAME(BM_GETCHECK)
-#define BM_SETCHECK            WINELIB_NAME(BM_SETCHECK)
-#define BM_GETSTATE            WINELIB_NAME(BM_GETSTATE)
-#define BM_SETSTATE            WINELIB_NAME(BM_SETSTATE)
-#define BM_SETSTYLE            WINELIB_NAME(BM_SETSTYLE)
-#define BM_CLICK               WINELIB_NAME(BM_CLICK)
-#define BM_GETIMAGE            WINELIB_NAME(BM_GETIMAGE)
-#define BM_SETIMAGE            WINELIB_NAME(BM_SETIMAGE)
 
 /* Button notification codes */
 #define BN_CLICKED             0
@@ -1378,41 +1305,31 @@ DECL_WINELIB_TYPE(DRAWSTATEPROC)
 #define SS_SUNKEN           0x00001000L
 
 /* Static Control Messages */
-#define STM_SETICON32       0x0170
-#define STM_SETICON	    WINELIB_NAME(STM_SETICON)
-#define STM_GETICON32       0x0171
-#define STM_GETICON	    WINELIB_NAME(STM_GETICON)
+#define STM_SETICON       0x0170
+#define STM_GETICON       0x0171
 #define STM_SETIMAGE        0x0172
 #define STM_GETIMAGE        0x0173
 
 /* Scrollbar messages */
-#define SBM_SETPOS32             0x00e0
-#define SBM_SETPOS               WINELIB_NAME(SBM_SETPOS)
-#define SBM_GETPOS32             0x00e1
-#define SBM_GETPOS               WINELIB_NAME(SBM_GETPOS)
-#define SBM_SETRANGE32           0x00e2
-#define SBM_SETRANGE             WINELIB_NAME(SBM_SETRANGE)
-#define SBM_GETRANGE32           0x00e3
-#define SBM_GETRANGE             WINELIB_NAME(SBM_GETRANGE)
-#define SBM_ENABLE_ARROWS32      0x00e4
-#define SBM_ENABLE_ARROWS        WINELIB_NAME(SBM_ENABLE_ARROWS)
-#define SBM_SETRANGEREDRAW32     0x00e6
-#define SBM_SETRANGEREDRAW       WINELIB_NAME(SBM_SETRANGEREDRAW)
-#define SBM_SETSCROLLINFO32      0x00e9
-#define SBM_SETSCROLLINFO        WINELIB_NAME(SBM_SETSCROLLINFO)
-#define SBM_GETSCROLLINFO32      0x00ea
-#define SBM_GETSCROLLINFO        WINELIB_NAME(SBM_GETSCROLLINFO)
+#define SBM_SETPOS             0x00e0
+#define SBM_GETPOS             0x00e1
+#define SBM_SETRANGE           0x00e2
+#define SBM_GETRANGE           0x00e3
+#define SBM_ENABLE_ARROWS      0x00e4
+#define SBM_SETRANGEREDRAW     0x00e6
+#define SBM_SETSCROLLINFO      0x00e9
+#define SBM_GETSCROLLINFO      0x00ea
 
 /* Scrollbar info */
 typedef struct
 {
-    UINT32    cbSize;
-    UINT32    fMask;
-    INT32     nMin;
-    INT32     nMax;
-    UINT32    nPage;
-    INT32     nPos;
-    INT32     nTrackPos;
+    UINT    cbSize;
+    UINT    fMask;
+    INT     nMin;
+    INT     nMax;
+    UINT    nPage;
+    INT     nPos;
+    INT     nTrackPos;
 } SCROLLINFO, *LPSCROLLINFO;
  
 /* GetScrollInfo() flags */ 
@@ -1442,90 +1359,48 @@ typedef struct
 #define LBS_STANDARD  (LBS_NOTIFY | LBS_SORT | WS_VSCROLL | WS_BORDER)
 
 /* Listbox messages */
-#define LB_ADDSTRING32           0x0180
-#define LB_ADDSTRING             WINELIB_NAME(LB_ADDSTRING)
-#define LB_INSERTSTRING32        0x0181
-#define LB_INSERTSTRING          WINELIB_NAME(LB_INSERTSTRING)
-#define LB_DELETESTRING32        0x0182
-#define LB_DELETESTRING          WINELIB_NAME(LB_DELETESTRING)
-#define LB_SELITEMRANGEEX32      0x0183
-#define LB_SELITEMRANGEEX        WINELIB_NAME(LB_SELITEMRANGEEX)
-#define LB_RESETCONTENT32        0x0184
-#define LB_RESETCONTENT          WINELIB_NAME(LB_RESETCONTENT)
-#define LB_SETSEL32              0x0185
-#define LB_SETSEL                WINELIB_NAME(LB_SETSEL)
-#define LB_SETCURSEL32           0x0186
-#define LB_SETCURSEL             WINELIB_NAME(LB_SETCURSEL)
-#define LB_GETSEL32              0x0187
-#define LB_GETSEL                WINELIB_NAME(LB_GETSEL)
-#define LB_GETCURSEL32           0x0188
-#define LB_GETCURSEL             WINELIB_NAME(LB_GETCURSEL)
-#define LB_GETTEXT32             0x0189
-#define LB_GETTEXT               WINELIB_NAME(LB_GETTEXT)
-#define LB_GETTEXTLEN32          0x018a
-#define LB_GETTEXTLEN            WINELIB_NAME(LB_GETTEXTLEN)
-#define LB_GETCOUNT32            0x018b
-#define LB_GETCOUNT              WINELIB_NAME(LB_GETCOUNT)
-#define LB_SELECTSTRING32        0x018c
-#define LB_SELECTSTRING          WINELIB_NAME(LB_SELECTSTRING)
-#define LB_DIR32                 0x018d
-#define LB_DIR                   WINELIB_NAME(LB_DIR)
-#define LB_GETTOPINDEX32         0x018e
-#define LB_GETTOPINDEX           WINELIB_NAME(LB_GETTOPINDEX)
-#define LB_FINDSTRING32          0x018f
-#define LB_FINDSTRING            WINELIB_NAME(LB_FINDSTRING)
-#define LB_GETSELCOUNT32         0x0190
-#define LB_GETSELCOUNT           WINELIB_NAME(LB_GETSELCOUNT)
-#define LB_GETSELITEMS32         0x0191
-#define LB_GETSELITEMS           WINELIB_NAME(LB_GETSELITEMS)
-#define LB_SETTABSTOPS32         0x0192
-#define LB_SETTABSTOPS           WINELIB_NAME(LB_SETTABSTOPS)
-#define LB_GETHORIZONTALEXTENT32 0x0193
-#define LB_GETHORIZONTALEXTENT   WINELIB_NAME(LB_GETHORIZONTALEXTENT)
-#define LB_SETHORIZONTALEXTENT32 0x0194
-#define LB_SETHORIZONTALEXTENT   WINELIB_NAME(LB_SETHORIZONTALEXTENT)
-#define LB_SETCOLUMNWIDTH32      0x0195
-#define LB_SETCOLUMNWIDTH        WINELIB_NAME(LB_SETCOLUMNWIDTH)
-#define LB_ADDFILE32             0x0196
-#define LB_ADDFILE               WINELIB_NAME(LB_ADDFILE)
-#define LB_SETTOPINDEX32         0x0197
-#define LB_SETTOPINDEX           WINELIB_NAME(LB_SETTOPINDEX)
-#define LB_GETITEMRECT32         0x0198
-#define LB_GETITEMRECT           WINELIB_NAME(LB_GETITEMRECT)
-#define LB_GETITEMDATA32         0x0199
-#define LB_GETITEMDATA           WINELIB_NAME(LB_GETITEMDATA)
-#define LB_SETITEMDATA32         0x019a
-#define LB_SETITEMDATA           WINELIB_NAME(LB_SETITEMDATA)
-#define LB_SELITEMRANGE32        0x019b
-#define LB_SELITEMRANGE          WINELIB_NAME(LB_SELITEMRANGE)
-#define LB_SETANCHORINDEX32      0x019c
-#define LB_SETANCHORINDEX        WINELIB_NAME(LB_SETANCHORINDEX)
-#define LB_GETANCHORINDEX32      0x019d
-#define LB_GETANCHORINDEX        WINELIB_NAME(LB_GETANCHORINDEX)
-#define LB_SETCARETINDEX32       0x019e
-#define LB_SETCARETINDEX         WINELIB_NAME(LB_SETCARETINDEX)
-#define LB_GETCARETINDEX32       0x019f
-#define LB_GETCARETINDEX         WINELIB_NAME(LB_GETCARETINDEX)
-#define LB_SETITEMHEIGHT32       0x01a0
-#define LB_SETITEMHEIGHT         WINELIB_NAME(LB_SETITEMHEIGHT)
-#define LB_GETITEMHEIGHT32       0x01a1
-#define LB_GETITEMHEIGHT         WINELIB_NAME(LB_GETITEMHEIGHT)
-#define LB_FINDSTRINGEXACT32     0x01a2
-#define LB_FINDSTRINGEXACT       WINELIB_NAME(LB_FINDSTRINGEXACT)
-#define LB_CARETON32             0x01a3
-#define LB_CARETON               WINELIB_NAME(LB_CARETON)
-#define LB_CARETOFF32            0x01a4
-#define LB_CARETOFF              WINELIB_NAME(LB_CARETOFF)
-#define LB_SETLOCALE32           0x01a5
-#define LB_SETLOCALE             WINELIB_NAME(LB_SETLOCALE)
-#define LB_GETLOCALE32           0x01a6
-#define LB_GETLOCALE             WINELIB_NAME(LB_GETLOCALE)
-#define LB_SETCOUNT32            0x01a7
-#define LB_SETCOUNT              WINELIB_NAME(LB_SETCOUNT)
-#define LB_INITSTORAGE32         0x01a8
-#define LB_INITSTORAGE           WINELIB_NAME(LB_INITSTORAGE)
-#define LB_ITEMFROMPOINT32       0x01a9
-#define LB_ITEMFROMPOINT         WINELIB_NAME(LB_ITEMFROMPOINT)
+#define LB_ADDSTRING           0x0180
+#define LB_INSERTSTRING        0x0181
+#define LB_DELETESTRING        0x0182
+#define LB_SELITEMRANGEEX      0x0183
+#define LB_RESETCONTENT        0x0184
+#define LB_SETSEL              0x0185
+#define LB_SETCURSEL           0x0186
+#define LB_GETSEL              0x0187
+#define LB_GETCURSEL           0x0188
+#define LB_GETTEXT             0x0189
+#define LB_GETTEXTLEN          0x018a
+#define LB_GETCOUNT            0x018b
+#define LB_SELECTSTRING        0x018c
+#define LB_DIR                 0x018d
+#define LB_GETTOPINDEX         0x018e
+#define LB_FINDSTRING          0x018f
+#define LB_GETSELCOUNT         0x0190
+#define LB_GETSELITEMS         0x0191
+#define LB_SETTABSTOPS         0x0192
+#define LB_GETHORIZONTALEXTENT 0x0193
+#define LB_SETHORIZONTALEXTENT 0x0194
+#define LB_SETCOLUMNWIDTH      0x0195
+#define LB_ADDFILE             0x0196
+#define LB_SETTOPINDEX         0x0197
+#define LB_GETITEMRECT         0x0198
+#define LB_GETITEMDATA         0x0199
+#define LB_SETITEMDATA         0x019a
+#define LB_SELITEMRANGE        0x019b
+#define LB_SETANCHORINDEX      0x019c
+#define LB_GETANCHORINDEX      0x019d
+#define LB_SETCARETINDEX       0x019e
+#define LB_GETCARETINDEX       0x019f
+#define LB_SETITEMHEIGHT       0x01a0
+#define LB_GETITEMHEIGHT       0x01a1
+#define LB_FINDSTRINGEXACT     0x01a2
+#define LB_CARETON             0x01a3
+#define LB_CARETOFF            0x01a4
+#define LB_SETLOCALE           0x01a5
+#define LB_GETLOCALE           0x01a6
+#define LB_SETCOUNT            0x01a7
+#define LB_INITSTORAGE         0x01a8
+#define LB_ITEMFROMPOINT       0x01a9
 
 /* Listbox notification codes */
 #define LBN_ERRSPACE        (-2)
@@ -1560,74 +1435,40 @@ typedef struct
 
 
 /* Combo box messages */
-#define CB_GETEDITSEL32            0x0140
-#define CB_GETEDITSEL              WINELIB_NAME(CB_GETEDITSEL)
-#define CB_LIMITTEXT32             0x0141
-#define CB_LIMITTEXT               WINELIB_NAME(CB_LIMITTEXT)
-#define CB_SETEDITSEL32            0x0142
-#define CB_SETEDITSEL              WINELIB_NAME(CB_SETEDITSEL)
-#define CB_ADDSTRING32             0x0143
-#define CB_ADDSTRING               WINELIB_NAME(CB_ADDSTRING)
-#define CB_DELETESTRING32          0x0144
-#define CB_DELETESTRING            WINELIB_NAME(CB_DELETESTRING)
-#define CB_DIR32                   0x0145
-#define CB_DIR                     WINELIB_NAME(CB_DIR)
-#define CB_GETCOUNT32              0x0146
-#define CB_GETCOUNT                WINELIB_NAME(CB_GETCOUNT)
-#define CB_GETCURSEL32             0x0147
-#define CB_GETCURSEL               WINELIB_NAME(CB_GETCURSEL)
-#define CB_GETLBTEXT32             0x0148
-#define CB_GETLBTEXT               WINELIB_NAME(CB_GETLBTEXT)
-#define CB_GETLBTEXTLEN32          0x0149
-#define CB_GETLBTEXTLEN            WINELIB_NAME(CB_GETLBTEXTLEN)
-#define CB_INSERTSTRING32          0x014a
-#define CB_INSERTSTRING            WINELIB_NAME(CB_INSERTSTRING)
-#define CB_RESETCONTENT32          0x014b
-#define CB_RESETCONTENT            WINELIB_NAME(CB_RESETCONTENT)
-#define CB_FINDSTRING32            0x014c
-#define CB_FINDSTRING              WINELIB_NAME(CB_FINDSTRING)
-#define CB_SELECTSTRING32          0x014d
-#define CB_SELECTSTRING            WINELIB_NAME(CB_SELECTSTRING)
-#define CB_SETCURSEL32             0x014e
-#define CB_SETCURSEL               WINELIB_NAME(CB_SETCURSEL)
-#define CB_SHOWDROPDOWN32          0x014f
-#define CB_SHOWDROPDOWN            WINELIB_NAME(CB_SHOWDROPDOWN)
-#define CB_GETITEMDATA32           0x0150
-#define CB_GETITEMDATA             WINELIB_NAME(CB_GETITEMDATA)
-#define CB_SETITEMDATA32           0x0151
-#define CB_SETITEMDATA             WINELIB_NAME(CB_SETITEMDATA)
-#define CB_GETDROPPEDCONTROLRECT32 0x0152
-#define CB_GETDROPPEDCONTROLRECT   WINELIB_NAME(CB_GETDROPPEDCONTROLRECT)
-#define CB_SETITEMHEIGHT32         0x0153
-#define CB_SETITEMHEIGHT           WINELIB_NAME(CB_SETITEMHEIGHT)
-#define CB_GETITEMHEIGHT32         0x0154
-#define CB_GETITEMHEIGHT           WINELIB_NAME(CB_GETITEMHEIGHT)
-#define CB_SETEXTENDEDUI32         0x0155
-#define CB_SETEXTENDEDUI           WINELIB_NAME(CB_SETEXTENDEDUI)
-#define CB_GETEXTENDEDUI32         0x0156
-#define CB_GETEXTENDEDUI           WINELIB_NAME(CB_GETEXTENDEDUI)
-#define CB_GETDROPPEDSTATE32       0x0157
-#define CB_GETDROPPEDSTATE         WINELIB_NAME(CB_GETDROPPEDSTATE)
-#define CB_FINDSTRINGEXACT32       0x0158
-#define CB_FINDSTRINGEXACT         WINELIB_NAME(CB_FINDSTRINGEXACT)
-#define CB_SETLOCALE32             0x0159
-#define CB_SETLOCALE               WINELIB_NAME(CB_SETLOCALE)
-#define CB_GETLOCALE32             0x015a
-#define CB_GETLOCALE               WINELIB_NAME(CB_GETLOCALE)
-#define CB_GETTOPINDEX32           0x015b
-#define CB_GETTOPINDEX             WINELIB_NAME(CB_GETTOPINDEX)
-#define CB_SETTOPINDEX32           0x015c
-#define CB_SETTOPINDEX             WINELIB_NAME(CB_SETTOPINDEX)
-#define CB_GETHORIZONTALEXTENT32   0x015d
-#define CB_GETHORIZONTALEXTENT     WINELIB_NAME(CB_GETHORIZONTALEXTENT)
-#define CB_SETHORIZONTALEXTENT32   0x015e
-#define CB_SETHORIZONTALEXTENT     WINELIB_NAME(CB_SETHORIZONTALEXTENT)
-#define CB_GETDROPPEDWIDTH32       0x015f
-#define CB_GETDROPPEDWIDTH         WINELIB_NAME(CB_GETDROPPEDWIDTH)
-#define CB_SETDROPPEDWIDTH32       0x0160
-#define CB_SETDROPPEDWIDTH         WINELIB_NAME(CB_SETDROPPEDWIDTH)
-#define CB_INITSTORAGE32           0x0161
-#define CB_INITSTORAGE             WINELIB_NAME(CB_INITSTORAGE)
+#define CB_GETEDITSEL            0x0140
+#define CB_LIMITTEXT             0x0141
+#define CB_SETEDITSEL            0x0142
+#define CB_ADDSTRING             0x0143
+#define CB_DELETESTRING          0x0144
+#define CB_DIR                   0x0145
+#define CB_GETCOUNT              0x0146
+#define CB_GETCURSEL             0x0147
+#define CB_GETLBTEXT             0x0148
+#define CB_GETLBTEXTLEN          0x0149
+#define CB_INSERTSTRING          0x014a
+#define CB_RESETCONTENT          0x014b
+#define CB_FINDSTRING            0x014c
+#define CB_SELECTSTRING          0x014d
+#define CB_SETCURSEL             0x014e
+#define CB_SHOWDROPDOWN          0x014f
+#define CB_GETITEMDATA           0x0150
+#define CB_SETITEMDATA           0x0151
+#define CB_GETDROPPEDCONTROLRECT 0x0152
+#define CB_SETITEMHEIGHT         0x0153
+#define CB_GETITEMHEIGHT         0x0154
+#define CB_SETEXTENDEDUI         0x0155
+#define CB_GETEXTENDEDUI         0x0156
+#define CB_GETDROPPEDSTATE       0x0157
+#define CB_FINDSTRINGEXACT       0x0158
+#define CB_SETLOCALE             0x0159
+#define CB_GETLOCALE             0x015a
+#define CB_GETTOPINDEX           0x015b
+#define CB_SETTOPINDEX           0x015c
+#define CB_GETHORIZONTALEXTENT   0x015d
+#define CB_SETHORIZONTALEXTENT   0x015e
+#define CB_GETDROPPEDWIDTH       0x015f
+#define CB_SETDROPPEDWIDTH       0x0160
+#define CB_INITSTORAGE           0x0161
 
 /* Combo box notification codes */
 #define CBN_ERRSPACE        (-1)
@@ -1695,21 +1536,21 @@ typedef struct
 /* Structure pointed to by lParam of WM_HELP */
 typedef struct			
 {
-    UINT32	cbSize;		/* Size in bytes of this struct  */
-    INT32	iContextType;	/* Either HELPINFO_WINDOW or HELPINFO_MENUITEM */
-    INT32	iCtrlId;	/* Control Id or a Menu item Id. */
-    HANDLE32	hItemHandle;	/* hWnd of control or hMenu.     */
+    UINT	cbSize;		/* Size in bytes of this struct  */
+    INT	iContextType;	/* Either HELPINFO_WINDOW or HELPINFO_MENUITEM */
+    INT	iCtrlId;	/* Control Id or a Menu item Id. */
+    HANDLE	hItemHandle;	/* hWnd of control or hMenu.     */
     DWORD	dwContextId;	/* Context Id associated with this item */
-    POINT32	MousePos;	/* Mouse Position in screen co-ordinates */
+    POINT	MousePos;	/* Mouse Position in screen co-ordinates */
 }  HELPINFO,*LPHELPINFO;
 
 typedef void (CALLBACK *MSGBOXCALLBACK)(LPHELPINFO lpHelpInfo);
 
 typedef struct
 {
-    UINT32	cbSize;
-    HWND32	hwndOwner;
-    HINSTANCE32	hInstance;
+    UINT	cbSize;
+    HWND	hwndOwner;
+    HINSTANCE	hInstance;
     LPCSTR	lpszText;
     LPCSTR	lpszCaption;
     DWORD	dwStyle;
@@ -1717,13 +1558,13 @@ typedef struct
     DWORD	dwContextHelpId;
     MSGBOXCALLBACK	lpfnMsgBoxCallback;
     DWORD	dwLanguageId;
-} MSGBOXPARAMS32A,*LPMSGBOXPARAMS32A;
+} MSGBOXPARAMSA,*LPMSGBOXPARAMSA;
 
 typedef struct
 {
-    UINT32	cbSize;
-    HWND32	hwndOwner;
-    HINSTANCE32	hInstance;
+    UINT	cbSize;
+    HWND	hwndOwner;
+    HINSTANCE	hInstance;
     LPCWSTR	lpszText;
     LPCWSTR	lpszCaption;
     DWORD	dwStyle;
@@ -1731,28 +1572,28 @@ typedef struct
     DWORD	dwContextHelpId;
     MSGBOXCALLBACK	lpfnMsgBoxCallback;
     DWORD	dwLanguageId;
-} MSGBOXPARAMS32W,*LPMSGBOXPARAMS32W;
+} MSGBOXPARAMSW,*LPMSGBOXPARAMSW;
 
 DECL_WINELIB_TYPE_AW(MSGBOXPARAMS)
 DECL_WINELIB_TYPE_AW(LPMSGBOXPARAMS)
 
 typedef struct _numberfmt32a {
-    UINT32 NumDigits;
-    UINT32 LeadingZero;
-    UINT32 Grouping;
+    UINT NumDigits;
+    UINT LeadingZero;
+    UINT Grouping;
     LPCSTR lpDecimalSep;
     LPCSTR lpThousandSep;
-    UINT32 NegativeOrder;
-} NUMBERFMT32A;
+    UINT NegativeOrder;
+} NUMBERFMTA;
 
 typedef struct _numberfmt32w {
-    UINT32 NumDigits;
-    UINT32 LeadingZero;
-    UINT32 Grouping;
+    UINT NumDigits;
+    UINT LeadingZero;
+    UINT Grouping;
     LPCWSTR lpDecimalSep;
     LPCWSTR lpThousandSep;
-    UINT32 NegativeOrder;
-} NUMBERFMT32W;
+    UINT NegativeOrder;
+} NUMBERFMTW;
 
 #define MONITOR_DEFAULTTONULL       0x00000000
 #define MONITOR_DEFAULTTOPRIMARY    0x00000001
@@ -1763,27 +1604,27 @@ typedef struct _numberfmt32w {
 typedef struct tagMONITORINFO
 {
     DWORD   cbSize;
-    RECT32  rcMonitor;
-    RECT32  rcWork;
+    RECT  rcMonitor;
+    RECT  rcWork;
     DWORD   dwFlags;
 } MONITORINFO, *LPMONITORINFO;
 
-typedef struct tagMONITORINFOEX32A
+typedef struct tagMONITORINFOEXA
 {
     MONITORINFO dummy;
     CHAR        szDevice[CCHDEVICENAME];
-} MONITORINFOEX32A, *LPMONITORINFOEX32A;
+} MONITORINFOEXA, *LPMONITORINFOEXA;
 
-typedef struct tagMONITORINFOEX32W
+typedef struct tagMONITORINFOEXW
 {
     MONITORINFO dummy;
     WCHAR       szDevice[CCHDEVICENAME];
-} MONITORINFOEX32W, *LPMONITORINFOEX32W;
+} MONITORINFOEXW, *LPMONITORINFOEXW;
 
 DECL_WINELIB_TYPE_AW(MONITORINFOEX)
 DECL_WINELIB_TYPE_AW(LPMONITORINFOEX)
 
-typedef BOOL32  (CALLBACK *MONITORENUMPROC)(HMONITOR,HDC32,LPRECT32,LPARAM);
+typedef BOOL  (CALLBACK *MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM);
 
 typedef struct tagDLGTEMPLATE
 {
@@ -1827,27 +1668,25 @@ typedef const DLGITEMTEMPLATE *LPCDLGITEMTEMPLATE;
 
 typedef struct
 {
-    CREATESTRUCT32A *lpcs;
-    HWND32           hwndInsertAfter;
-} CBT_CREATEWND32A, *LPCBT_CREATEWND32A;
+    CREATESTRUCTA *lpcs;
+    HWND           hwndInsertAfter;
+} CBT_CREATEWNDA, *LPCBT_CREATEWNDA;
 
 typedef struct
 {
-    CREATESTRUCT32W *lpcs;
-    HWND32           hwndInsertAfter;
-} CBT_CREATEWND32W, *LPCBT_CREATEWND32W;
+    CREATESTRUCTW *lpcs;
+    HWND           hwndInsertAfter;
+} CBT_CREATEWNDW, *LPCBT_CREATEWNDW;
 
 DECL_WINELIB_TYPE_AW(CBT_CREATEWND)
 DECL_WINELIB_TYPE_AW(LPCBT_CREATEWND)
 
 typedef struct
 {
-    BOOL32    fMouse;
-    HWND32    hWndActive;
-} CBTACTIVATESTRUCT32, *LPCBTACTIVATESTRUCT32;
+    BOOL    fMouse;
+    HWND    hWndActive;
+} CBTACTIVATESTRUCT, *LPCBTACTIVATESTRUCT;
 
-DECL_WINELIB_TYPE(CBTACTIVATESTRUCT)
-DECL_WINELIB_TYPE(LPCBTACTIVATESTRUCT)
 
 /* modifiers for RegisterHotKey */
 #define	MOD_ALT		0x0001
@@ -1892,69 +1731,69 @@ DECL_WINELIB_TYPE(LPCBTACTIVATESTRUCT)
 #define	SLE_WARNING	0x00000003
 
 /* Predefined resources */
-#define IDI_APPLICATION32A MAKEINTRESOURCE32A(32512)
-#define IDI_APPLICATION32W MAKEINTRESOURCE32W(32512)
+#define IDI_APPLICATIONA MAKEINTRESOURCEA(32512)
+#define IDI_APPLICATIONW MAKEINTRESOURCEW(32512)
 #define IDI_APPLICATION    WINELIB_NAME_AW(IDI_APPLICATION)
-#define IDI_HAND32A        MAKEINTRESOURCE32A(32513)
-#define IDI_HAND32W        MAKEINTRESOURCE32W(32513)
+#define IDI_HANDA        MAKEINTRESOURCEA(32513)
+#define IDI_HANDW        MAKEINTRESOURCEW(32513)
 #define IDI_HAND           WINELIB_NAME_AW(IDI_HAND)
-#define IDI_QUESTION32A    MAKEINTRESOURCE32A(32514)
-#define IDI_QUESTION32W    MAKEINTRESOURCE32W(32514)
+#define IDI_QUESTIONA    MAKEINTRESOURCEA(32514)
+#define IDI_QUESTIONW    MAKEINTRESOURCEW(32514)
 #define IDI_QUESTION       WINELIB_NAME_AW(IDI_QUESTION)
-#define IDI_EXCLAMATION32A MAKEINTRESOURCE32A(32515)
-#define IDI_EXCLAMATION32W MAKEINTRESOURCE32W(32515)
+#define IDI_EXCLAMATIONA MAKEINTRESOURCEA(32515)
+#define IDI_EXCLAMATIONW MAKEINTRESOURCEW(32515)
 #define IDI_EXCLAMATION    WINELIB_NAME_AW(IDI_EXCLAMATION)
-#define IDI_ASTERISK32A    MAKEINTRESOURCE32A(32516)
-#define IDI_ASTERISK32W    MAKEINTRESOURCE32W(32516)
+#define IDI_ASTERISKA    MAKEINTRESOURCEA(32516)
+#define IDI_ASTERISKW    MAKEINTRESOURCEW(32516)
 #define IDI_ASTERISK       WINELIB_NAME_AW(IDI_ASTERISK)
 
-#define IDC_BUMMER32A      MAKEINTRESOURCE32A(100)
-#define IDC_BUMMER32W      MAKEINTRESOURCE32W(100)
+#define IDC_BUMMERA      MAKEINTRESOURCEA(100)
+#define IDC_BUMMERW      MAKEINTRESOURCEW(100)
 #define IDC_BUMMER         WINELIB_NAME_AW(IDC_BUMMER)
-#define IDC_ARROW32A       MAKEINTRESOURCE32A(32512)
-#define IDC_ARROW32W       MAKEINTRESOURCE32W(32512)
+#define IDC_ARROWA       MAKEINTRESOURCEA(32512)
+#define IDC_ARROWW       MAKEINTRESOURCEW(32512)
 #define IDC_ARROW          WINELIB_NAME_AW(IDC_ARROW)
-#define IDC_IBEAM32A       MAKEINTRESOURCE32A(32513)
-#define IDC_IBEAM32W       MAKEINTRESOURCE32W(32513)
+#define IDC_IBEAMA       MAKEINTRESOURCEA(32513)
+#define IDC_IBEAMW       MAKEINTRESOURCEW(32513)
 #define IDC_IBEAM          WINELIB_NAME_AW(IDC_IBEAM)
-#define IDC_WAIT32A        MAKEINTRESOURCE32A(32514)
-#define IDC_WAIT32W        MAKEINTRESOURCE32W(32514)
+#define IDC_WAITA        MAKEINTRESOURCEA(32514)
+#define IDC_WAITW        MAKEINTRESOURCEW(32514)
 #define IDC_WAIT           WINELIB_NAME_AW(IDC_WAIT)
-#define IDC_CROSS32A       MAKEINTRESOURCE32A(32515)
-#define IDC_CROSS32W       MAKEINTRESOURCE32W(32515)
+#define IDC_CROSSA       MAKEINTRESOURCEA(32515)
+#define IDC_CROSSW       MAKEINTRESOURCEW(32515)
 #define IDC_CROSS          WINELIB_NAME_AW(IDC_CROSS)
-#define IDC_UPARROW32A     MAKEINTRESOURCE32A(32516)
-#define IDC_UPARROW32W     MAKEINTRESOURCE32W(32516)
+#define IDC_UPARROWA     MAKEINTRESOURCEA(32516)
+#define IDC_UPARROWW     MAKEINTRESOURCEW(32516)
 #define IDC_UPARROW        WINELIB_NAME_AW(IDC_UPARROW)
-#define IDC_SIZE32A        MAKEINTRESOURCE32A(32640)
-#define IDC_SIZE32W        MAKEINTRESOURCE32W(32640)
+#define IDC_SIZEA        MAKEINTRESOURCEA(32640)
+#define IDC_SIZEW        MAKEINTRESOURCEW(32640)
 #define IDC_SIZE           WINELIB_NAME_AW(IDC_SIZE)
-#define IDC_ICON32A        MAKEINTRESOURCE32A(32641)
-#define IDC_ICON32W        MAKEINTRESOURCE32W(32641)
+#define IDC_ICONA        MAKEINTRESOURCEA(32641)
+#define IDC_ICONW        MAKEINTRESOURCEW(32641)
 #define IDC_ICON           WINELIB_NAME_AW(IDC_ICON)
-#define IDC_SIZENWSE32A    MAKEINTRESOURCE32A(32642)
-#define IDC_SIZENWSE32W    MAKEINTRESOURCE32W(32642)
+#define IDC_SIZENWSEA    MAKEINTRESOURCEA(32642)
+#define IDC_SIZENWSEW    MAKEINTRESOURCEW(32642)
 #define IDC_SIZENWSE       WINELIB_NAME_AW(IDC_SIZENWSE)
-#define IDC_SIZENESW32A    MAKEINTRESOURCE32A(32643)
-#define IDC_SIZENESW32W    MAKEINTRESOURCE32W(32643)
+#define IDC_SIZENESWA    MAKEINTRESOURCEA(32643)
+#define IDC_SIZENESWW    MAKEINTRESOURCEW(32643)
 #define IDC_SIZENESW       WINELIB_NAME_AW(IDC_SIZENESW)
-#define IDC_SIZEWE32A      MAKEINTRESOURCE32A(32644)
-#define IDC_SIZEWE32W      MAKEINTRESOURCE32W(32644)
+#define IDC_SIZEWEA      MAKEINTRESOURCEA(32644)
+#define IDC_SIZEWEW      MAKEINTRESOURCEW(32644)
 #define IDC_SIZEWE         WINELIB_NAME_AW(IDC_SIZEWE)
-#define IDC_SIZENS32A      MAKEINTRESOURCE32A(32645)
-#define IDC_SIZENS32W      MAKEINTRESOURCE32W(32645)
+#define IDC_SIZENSA      MAKEINTRESOURCEA(32645)
+#define IDC_SIZENSW      MAKEINTRESOURCEW(32645)
 #define IDC_SIZENS         WINELIB_NAME_AW(IDC_SIZENS)
-#define IDC_SIZEALL32A     MAKEINTRESOURCE32A(32646)
-#define IDC_SIZEALL32W     MAKEINTRESOURCE32W(32646)
+#define IDC_SIZEALLA     MAKEINTRESOURCEA(32646)
+#define IDC_SIZEALLW     MAKEINTRESOURCEW(32646)
 #define IDC_SIZEALL        WINELIB_NAME_AW(IDC_SIZEALL)
-#define IDC_NO32A          MAKEINTRESOURCE32A(32648)
-#define IDC_NO32W          MAKEINTRESOURCE32W(32648)
+#define IDC_NOA          MAKEINTRESOURCEA(32648)
+#define IDC_NOW          MAKEINTRESOURCEW(32648)
 #define IDC_NO             WINELIB_NAME_AW(IDC_NO)
-#define IDC_APPSTARTING32A MAKEINTRESOURCE32A(32650)
-#define IDC_APPSTARTING32W MAKEINTRESOURCE32W(32650)
+#define IDC_APPSTARTINGA MAKEINTRESOURCEA(32650)
+#define IDC_APPSTARTINGW MAKEINTRESOURCEW(32650)
 #define IDC_APPSTARTING    WINELIB_NAME_AW(IDC_APPSTARTING)
-#define IDC_HELP32A        MAKEINTRESOURCE32A(32651)
-#define IDC_HELP32W        MAKEINTRESOURCE32W(32651)
+#define IDC_HELPA        MAKEINTRESOURCEA(32651)
+#define IDC_HELPW        MAKEINTRESOURCEW(32651)
 #define IDC_HELP           WINELIB_NAME_AW(IDC_HELP)
 
 /* SystemParametersInfo */
@@ -2168,8 +2007,7 @@ DECL_WINELIB_TYPE(LPCBTACTIVATESTRUCT)
 #define SW_ERASE               0x0004
 
 /* CreateWindow() coordinates */
-#define CW_USEDEFAULT32 ((INT32)0x80000000)
-#define CW_USEDEFAULT   WINELIB_NAME(CW_USEDEFAULT)
+#define CW_USEDEFAULT ((INT)0x80000000)
 
 /* ChildWindowFromPointEx Flags */
 #define CWP_ALL                0x0000
@@ -2237,14 +2075,14 @@ DECL_WINELIB_TYPE(LPCBTACTIVATESTRUCT)
 #define SWP_NOSENDCHANGING  0x0400
 #define SWP_DEFERERASE      0x2000
 
-#define HWND_DESKTOP        ((HWND32)0)
-#define HWND_BROADCAST      ((HWND32)0xffff)
+#define HWND_DESKTOP        ((HWND)0)
+#define HWND_BROADCAST      ((HWND)0xffff)
 
 /* SetWindowPos() hwndInsertAfter field values */
-#define HWND_TOP            ((HWND32)0)
-#define HWND_BOTTOM         ((HWND32)1)
-#define HWND_TOPMOST        ((HWND32)-1)
-#define HWND_NOTOPMOST      ((HWND32)-2)
+#define HWND_TOP            ((HWND)0)
+#define HWND_BOTTOM         ((HWND)1)
+#define HWND_TOPMOST        ((HWND)-1)
+#define HWND_NOTOPMOST      ((HWND)-2)
 
 #define MF_INSERT          0x0000
 #define MF_CHANGE          0x0080
@@ -2418,61 +2256,51 @@ DECL_WINELIB_TYPE(LPCBTACTIVATESTRUCT)
 
 typedef struct
 {
-    UINT32      CtlType;
-    UINT32      CtlID;
-    UINT32      itemID;
-    UINT32      itemAction;
-    UINT32      itemState;
-    HWND32      hwndItem;
-    HDC32       hDC;
-    RECT32      rcItem WINE_PACKED;
+    UINT      CtlType;
+    UINT      CtlID;
+    UINT      itemID;
+    UINT      itemAction;
+    UINT      itemState;
+    HWND      hwndItem;
+    HDC       hDC;
+    RECT      rcItem WINE_PACKED;
     DWORD       itemData WINE_PACKED;
-} DRAWITEMSTRUCT32, *PDRAWITEMSTRUCT32, *LPDRAWITEMSTRUCT32;
+} DRAWITEMSTRUCT, *PDRAWITEMSTRUCT, *LPDRAWITEMSTRUCT;
 
-DECL_WINELIB_TYPE(DRAWITEMSTRUCT)
-DECL_WINELIB_TYPE(PDRAWITEMSTRUCT)
-DECL_WINELIB_TYPE(LPDRAWITEMSTRUCT)
 
 typedef struct
 {
-    UINT32      CtlType;
-    UINT32      CtlID;
-    UINT32      itemID;
-    UINT32      itemWidth;
-    UINT32      itemHeight;
+    UINT      CtlType;
+    UINT      CtlID;
+    UINT      itemID;
+    UINT      itemWidth;
+    UINT      itemHeight;
     DWORD       itemData;
-} MEASUREITEMSTRUCT32, *PMEASUREITEMSTRUCT32, *LPMEASUREITEMSTRUCT32;
+} MEASUREITEMSTRUCT, *PMEASUREITEMSTRUCT, *LPMEASUREITEMSTRUCT;
 
-DECL_WINELIB_TYPE(MEASUREITEMSTRUCT)
-DECL_WINELIB_TYPE(PMEASUREITEMSTRUCT)
-DECL_WINELIB_TYPE(LPMEASUREITEMSTRUCT)
 
 typedef struct
 {
-    UINT32     CtlType;
-    UINT32     CtlID;
-    UINT32     itemID;
-    HWND32     hwndItem;
+    UINT     CtlType;
+    UINT     CtlID;
+    UINT     itemID;
+    HWND     hwndItem;
     DWORD      itemData;
-} DELETEITEMSTRUCT32, *LPDELETEITEMSTRUCT32;
+} DELETEITEMSTRUCT, *LPDELETEITEMSTRUCT;
 
-DECL_WINELIB_TYPE(DELETEITEMSTRUCT)
-DECL_WINELIB_TYPE(LPDELETEITEMSTRUCT)
 
 typedef struct
 {
-    UINT32      CtlType;
-    UINT32      CtlID;
-    HWND32      hwndItem;
-    UINT32      itemID1;
+    UINT      CtlType;
+    UINT      CtlID;
+    HWND      hwndItem;
+    UINT      itemID1;
     DWORD       itemData1;
-    UINT32      itemID2;
+    UINT      itemID2;
     DWORD       itemData2;
     DWORD       dwLocaleId;
-} COMPAREITEMSTRUCT32, *LPCOMPAREITEMSTRUCT32;
+} COMPAREITEMSTRUCT, *LPCOMPAREITEMSTRUCT;
 
-DECL_WINELIB_TYPE(COMPAREITEMSTRUCT)
-DECL_WINELIB_TYPE(LPCOMPAREITEMSTRUCT)
 
 /* WM_KEYUP/DOWN/CHAR HIWORD(lParam) flags */
 #define KF_EXTENDED         0x0100
@@ -2793,84 +2621,79 @@ typedef struct
 #define NF_REQUERY	    4
 
 #pragma pack(4)
-#define     EnumTaskWindows32(handle,proc,lparam) \
+#define     EnumTaskWindows(handle,proc,lparam) \
             EnumThreadWindows(handle,proc,lparam)
-#define     EnumTaskWindows WINELIB_NAME(EnumTaskWindows)
-#define     OemToAnsi32A OemToChar32A
-#define     OemToAnsi32W OemToChar32W
+#define     OemToAnsiA OemToCharA
+#define     OemToAnsiW OemToCharW
 #define     OemToAnsi WINELIB_NAME_AW(OemToAnsi)
-#define     OemToAnsiBuff32A OemToCharBuff32A
-#define     OemToAnsiBuff32W OemToCharBuff32W
+#define     OemToAnsiBuffA OemToCharBuffA
+#define     OemToAnsiBuffW OemToCharBuffW
 #define     OemToAnsiBuff WINELIB_NAME_AW(OemToAnsiBuff)
-#define     AnsiToOem32A CharToOem32A
-#define     AnsiToOem32W CharToOem32W
+#define     AnsiToOemA CharToOemA
+#define     AnsiToOemW CharToOemW
 #define     AnsiToOem WINELIB_NAME_AW(AnsiToOem)
-#define     AnsiToOemBuff32A CharToOemBuff32A
-#define     AnsiToOemBuff32W CharToOemBuff32W
+#define     AnsiToOemBuffA CharToOemBuffA
+#define     AnsiToOemBuffW CharToOemBuffW
 #define     AnsiToOemBuff WINELIB_NAME_AW(AnsiToOemBuff)
-WORD        WINAPI CascadeWindows (HWND32, UINT32, const LPRECT32,
-                                   UINT32, const HWND32 *);
-INT32       WINAPI CopyAcceleratorTable32A(HACCEL32,LPACCEL32,INT32);
-INT32       WINAPI CopyAcceleratorTable32W(HACCEL32,LPACCEL32,INT32);
+WORD        WINAPI CascadeWindows (HWND, UINT, const LPRECT,
+                                   UINT, const HWND *);
+INT       WINAPI CopyAcceleratorTableA(HACCEL,LPACCEL,INT);
+INT       WINAPI CopyAcceleratorTableW(HACCEL,LPACCEL,INT);
 #define     CopyAcceleratorTable WINELIB_NAME_AW(CopyAcceleratorTable)
-HICON32     WINAPI CreateIconIndirect(LPICONINFO32);
-BOOL32      WINAPI DestroyAcceleratorTable(HACCEL32);
-BOOL32      WINAPI EnumDisplayMonitors(HDC32,LPRECT32,MONITORENUMPROC,LPARAM);
-INT32       WINAPI EnumPropsEx32A(HWND32,PROPENUMPROCEX32A,LPARAM);
-INT32       WINAPI EnumPropsEx32W(HWND32,PROPENUMPROCEX32W,LPARAM);
+HICON     WINAPI CreateIconIndirect(LPICONINFO);
+BOOL      WINAPI DestroyAcceleratorTable(HACCEL);
+BOOL      WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM);
+INT       WINAPI EnumPropsExA(HWND,PROPENUMPROCEXA,LPARAM);
+INT       WINAPI EnumPropsExW(HWND,PROPENUMPROCEXW,LPARAM);
 #define     EnumPropsEx WINELIB_NAME_AW(EnumPropsEx)
-BOOL32      WINAPI EnumThreadWindows(DWORD,WNDENUMPROC32,LPARAM);
-BOOL32      WINAPI ExitWindowsEx(UINT32,DWORD);
-BOOL32      WINAPI GetIconInfo32(HICON32,LPICONINFO32);
-#define     GetIconInfo WINELIB_NAME(GetIconInfo)
-DWORD       WINAPI GetMenuContextHelpId32(HMENU32);
-#define     GetMenuContextHelpId WINELIB_NAME(GetMenuContextHelpId)
-UINT32      WINAPI GetMenuDefaultItem32(HMENU32,UINT32,UINT32);
-#define     GetMenuDefaultItem WINELIB_NAME(GetMenuDefaultItem)
-BOOL32      WINAPI GetMenuItemInfo32A(HMENU32,UINT32,BOOL32,MENUITEMINFO32A*);
-BOOL32      WINAPI GetMenuItemInfo32W(HMENU32,UINT32,BOOL32,MENUITEMINFO32W*);
+BOOL      WINAPI EnumThreadWindows(DWORD,WNDENUMPROC,LPARAM);
+BOOL      WINAPI ExitWindowsEx(UINT,DWORD);
+BOOL      WINAPI GetIconInfo(HICON,LPICONINFO);
+DWORD       WINAPI GetMenuContextHelpId(HMENU);
+UINT      WINAPI GetMenuDefaultItem(HMENU,UINT,UINT);
+BOOL      WINAPI GetMenuItemInfoA(HMENU,UINT,BOOL,MENUITEMINFOA*);
+BOOL      WINAPI GetMenuItemInfoW(HMENU,UINT,BOOL,MENUITEMINFOW*);
 #define     GetMenuItemInfo WINELIB_NAME_AW(GetMenuItemInfo)
-BOOL32      WINAPI GetMonitorInfo32A(HMONITOR,LPMONITORINFO);
-BOOL32      WINAPI GetMonitorInfo32W(HMONITOR,LPMONITORINFO);
+BOOL      WINAPI GetMonitorInfoA(HMONITOR,LPMONITORINFO);
+BOOL      WINAPI GetMonitorInfoW(HMONITOR,LPMONITORINFO);
 #define     GetMonitorInfo WINELIB_NAME_AW(GetMonitorInfo)
-INT32       WINAPI GetNumberFormat32A(LCID,DWORD,LPCSTR,const NUMBERFMT32A*,LPSTR,int);
-INT32       WINAPI GetNumberFormat32W(LCID,DWORD,LPCWSTR,const NUMBERFMT32W*,LPWSTR,int);
+INT       WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMTA*,LPSTR,int);
+INT       WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,int);
 #define     GetNumberFormat WINELIB_NAME_AW(GetNumberFormat);
-DWORD       WINAPI GetWindowContextHelpId(HWND32);
-DWORD       WINAPI GetWindowThreadProcessId(HWND32,LPDWORD);
-BOOL32      WINAPI IsWindowUnicode(HWND32);
-HKL32       WINAPI LoadKeyboardLayout32A(LPCSTR,UINT32);
-HKL32       WINAPI LoadKeyboardLayout32W(LPCWSTR,UINT32);
+DWORD       WINAPI GetWindowContextHelpId(HWND);
+DWORD       WINAPI GetWindowThreadProcessId(HWND,LPDWORD);
+BOOL      WINAPI IsWindowUnicode(HWND);
+HKL       WINAPI LoadKeyboardLayoutA(LPCSTR,UINT);
+HKL       WINAPI LoadKeyboardLayoutW(LPCWSTR,UINT);
 #define     LoadKeyboardLayout WINELIB_NAME_AW(LoadKeyboardLayout)
-INT32       WINAPI MessageBoxEx32A(HWND32,LPCSTR,LPCSTR,UINT32,WORD);
-INT32       WINAPI MessageBoxEx32W(HWND32,LPCWSTR,LPCWSTR,UINT32,WORD);
+INT       WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD);
+INT       WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
 #define     MessageBoxEx WINELIB_NAME_AW(MessageBoxEx)
-HMONITOR    WINAPI MonitorFromPoint(POINT32,DWORD);
-HMONITOR    WINAPI MonitorFromRect(LPRECT32,DWORD);
-HMONITOR    WINAPI MonitorFromWindow(HWND32,DWORD);
-DWORD       WINAPI MsgWaitForMultipleObjects(DWORD,HANDLE32*,BOOL32,DWORD,DWORD);
-BOOL32      WINAPI PaintDesktop(HDC32);
-BOOL32      WINAPI PostThreadMessage32A(DWORD, UINT32, WPARAM32, LPARAM);
-BOOL32      WINAPI PostThreadMessage32W(DWORD, UINT32, WPARAM32, LPARAM);
+HMONITOR    WINAPI MonitorFromPoint(POINT,DWORD);
+HMONITOR    WINAPI MonitorFromRect(LPRECT,DWORD);
+HMONITOR    WINAPI MonitorFromWindow(HWND,DWORD);
+DWORD       WINAPI MsgWaitForMultipleObjects(DWORD,HANDLE*,BOOL,DWORD,DWORD);
+BOOL      WINAPI PaintDesktop(HDC);
+BOOL      WINAPI PostThreadMessageA(DWORD, UINT, WPARAM, LPARAM);
+BOOL      WINAPI PostThreadMessageW(DWORD, UINT, WPARAM, LPARAM);
 #define     PostThreadMessage WINELIB_NAME_AW(PostThreadMessage)
-UINT32      WINAPI ReuseDDElParam(UINT32,UINT32,UINT32,UINT32,UINT32);
-BOOL32      WINAPI SendNotifyMessage32A(HWND32,UINT32,WPARAM32,LPARAM);
-BOOL32      WINAPI SendNotifyMessage32W(HWND32,UINT32,WPARAM32,LPARAM);
+UINT      WINAPI ReuseDDElParam(UINT,UINT,UINT,UINT,UINT);
+BOOL      WINAPI SendNotifyMessageA(HWND,UINT,WPARAM,LPARAM);
+BOOL      WINAPI SendNotifyMessageW(HWND,UINT,WPARAM,LPARAM);
 #define     SendNotifyMessage WINELIB_NAME_AW(SendNotifyMessage)
 VOID        WINAPI SetDebugErrorLevel(DWORD);
 VOID        WINAPI SetLastErrorEx(DWORD,DWORD);
-BOOL32      WINAPI SetMenuDefaultItem32(HMENU32,UINT32,UINT32);
-#define     SetMenuDefaultItem WINELIB_NAME(SetMenuDefaultItem)
-BOOL32      WINAPI SetMenuItemInfo32A(HMENU32,UINT32,BOOL32,const MENUITEMINFO32A*);
-BOOL32      WINAPI SetMenuItemInfo32W(HMENU32,UINT32,BOOL32,const MENUITEMINFO32W*);
+BOOL      WINAPI SetMenuDefaultItem(HMENU,UINT,UINT);
+BOOL      WINAPI SetMenuItemInfoA(HMENU,UINT,BOOL,const MENUITEMINFOA*);
+BOOL      WINAPI SetMenuItemInfoW(HMENU,UINT,BOOL,const MENUITEMINFOW*);
 #define     SetMenuItemInfo WINELIB_NAME_AW(SetMenuItemInfo)
-BOOL32      WINAPI SetWindowContextHelpId(HWND32,DWORD);
-WORD        WINAPI TileWindows (HWND32, UINT32, const LPRECT32,
-                                UINT32, const HWND32 *);
-BOOL32      WINAPI TrackPopupMenuEx(HMENU32,UINT32,INT32,INT32,HWND32,
+BOOL      WINAPI SetWindowContextHelpId(HWND,DWORD);
+WORD        WINAPI TileWindows (HWND, UINT, const LPRECT,
+                                UINT, const HWND *);
+BOOL      WINAPI TrackPopupMenuEx(HMENU,UINT,INT,INT,HWND,
                                     LPTPMPARAMS);
-UINT32      WINAPI UnpackDDElParam(UINT32,UINT32,UINT32*,UINT32*);
-DWORD       WINAPI WaitForInputIdle(HANDLE32,DWORD);
+UINT      WINAPI UnpackDDElParam(UINT,UINT,UINT*,UINT*);
+DWORD       WINAPI WaitForInputIdle(HANDLE,DWORD);
 VOID        WINAPI keybd_event(BYTE,BYTE,DWORD,DWORD);
 VOID        WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,DWORD);
 
@@ -2892,846 +2715,620 @@ VOID        WINAPI WaitMessage(VOID);
 
 /* Declarations for functions that change between Win16 and Win32 */
 
-BOOL32      WINAPI AdjustWindowRect32(LPRECT32,DWORD,BOOL32);
-#define     AdjustWindowRect WINELIB_NAME(AdjustWindowRect)
-BOOL32      WINAPI AdjustWindowRectEx32(LPRECT32,DWORD,BOOL32,DWORD);
-#define     AdjustWindowRectEx WINELIB_NAME(AdjustWindowRectEx)
-#define     AnsiLower32A CharLower32A
-#define     AnsiLower32W CharLower32W
+BOOL      WINAPI AdjustWindowRect(LPRECT,DWORD,BOOL);
+BOOL      WINAPI AdjustWindowRectEx(LPRECT,DWORD,BOOL,DWORD);
+#define     AnsiLowerA CharLowerA
+#define     AnsiLowerW CharLowerW
 #define     AnsiLower WINELIB_NAME_AW(AnsiLower)
-#define     AnsiLowerBuff32A CharLowerBuff32A
-#define     AnsiLowerBuff32W CharLowerBuff32W
+#define     AnsiLowerBuffA CharLowerBuffA
+#define     AnsiLowerBuffW CharLowerBuffW
 #define     AnsiLowerBuff WINELIB_NAME_AW(AnsiLowerBuff)
-#define     AnsiNext32A CharNext32A
-#define     AnsiNext32W CharNext32W
+#define     AnsiNextA CharNextA
+#define     AnsiNextW CharNextW
 #define     AnsiNext WINELIB_NAME_AW(AnsiNext)
-#define     AnsiPrev32A CharPrev32A
-#define     AnsiPrev32W CharPrev32W
+#define     AnsiPrevA CharPrevA
+#define     AnsiPrevW CharPrevW
 #define     AnsiPrev WINELIB_NAME_AW(AnsiPrev)
-#define     AnsiUpper32A CharUpper32A
-#define     AnsiUpper32W CharUpper32W
+#define     AnsiUpperA CharUpperA
+#define     AnsiUpperW CharUpperW
 #define     AnsiUpper WINELIB_NAME_AW(AnsiUpper)
-#define     AnsiUpperBuff32A CharUpperBuff32A
-#define     AnsiUpperBuff32W CharUpperBuff32W
+#define     AnsiUpperBuffA CharUpperBuffA
+#define     AnsiUpperBuffW CharUpperBuffW
 #define     AnsiUpperBuff WINELIB_NAME_AW(AnsiUpperBuff)
-BOOL32      WINAPI AnyPopup32(void);
-#define     AnyPopup WINELIB_NAME(AnyPopup)
-BOOL32      WINAPI AppendMenu32A(HMENU32,UINT32,UINT32,LPCSTR);
-BOOL32      WINAPI AppendMenu32W(HMENU32,UINT32,UINT32,LPCWSTR);
+BOOL      WINAPI AnyPopup(void);
+BOOL      WINAPI AppendMenuA(HMENU,UINT,UINT,LPCSTR);
+BOOL      WINAPI AppendMenuW(HMENU,UINT,UINT,LPCWSTR);
 #define     AppendMenu WINELIB_NAME_AW(AppendMenu)
-UINT32      WINAPI ArrangeIconicWindows32(HWND32);
-#define     ArrangeIconicWindows WINELIB_NAME(ArrangeIconicWindows)
-HDWP32      WINAPI BeginDeferWindowPos32(INT32);
-#define     BeginDeferWindowPos WINELIB_NAME(BeginDeferWindowPos)
-HDC32       WINAPI BeginPaint32(HWND32,LPPAINTSTRUCT32);
-#define     BeginPaint WINELIB_NAME(BeginPaint)
-BOOL32      WINAPI BringWindowToTop32(HWND32);
-#define     BringWindowToTop WINELIB_NAME(BringWindowToTop)
-BOOL32      WINAPI CallMsgFilter32A(LPMSG32,INT32);
-BOOL32      WINAPI CallMsgFilter32W(LPMSG32,INT32);
+UINT      WINAPI ArrangeIconicWindows(HWND);
+HDWP      WINAPI BeginDeferWindowPos(INT);
+HDC       WINAPI BeginPaint(HWND,LPPAINTSTRUCT);
+BOOL      WINAPI BringWindowToTop(HWND);
+BOOL      WINAPI CallMsgFilterA(LPMSG,INT);
+BOOL      WINAPI CallMsgFilterW(LPMSG,INT);
 #define     CallMsgFilter WINELIB_NAME_AW(CallMsgFilter)
-LRESULT     WINAPI CallNextHookEx32(HHOOK,INT32,WPARAM32,LPARAM);
-#define     CallNextHookEx WINELIB_NAME(CallNextHookEx)
-LRESULT     WINAPI CallWindowProc32A(WNDPROC32,HWND32,UINT32,WPARAM32,LPARAM);
-LRESULT     WINAPI CallWindowProc32W(WNDPROC32,HWND32,UINT32,WPARAM32,LPARAM);
+LRESULT     WINAPI CallNextHookEx(HHOOK,INT,WPARAM,LPARAM);
+LRESULT     WINAPI CallWindowProcA(WNDPROC,HWND,UINT,WPARAM,LPARAM);
+LRESULT     WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM);
 #define     CallWindowProc WINELIB_NAME_AW(CallWindowProc)
-BOOL32      WINAPI ChangeClipboardChain32(HWND32,HWND32);
-#define     ChangeClipboardChain WINELIB_NAME(ChangeClipboardChain)
-BOOL32      WINAPI ChangeMenu32A(HMENU32,UINT32,LPCSTR,UINT32,UINT32);
-BOOL32      WINAPI ChangeMenu32W(HMENU32,UINT32,LPCWSTR,UINT32,UINT32);
+BOOL      WINAPI ChangeClipboardChain(HWND,HWND);
+BOOL      WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT);
+BOOL      WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT);
 #define     ChangeMenu WINELIB_NAME_AW(ChangeMenu)
-LPSTR       WINAPI CharLower32A(LPSTR);
-LPWSTR      WINAPI CharLower32W(LPWSTR);
+LPSTR       WINAPI CharLowerA(LPSTR);
+LPWSTR      WINAPI CharLowerW(LPWSTR);
 #define     CharLower WINELIB_NAME_AW(CharLower)
-DWORD       WINAPI CharLowerBuff32A(LPSTR,DWORD);
-DWORD       WINAPI CharLowerBuff32W(LPWSTR,DWORD);
+DWORD       WINAPI CharLowerBuffA(LPSTR,DWORD);
+DWORD       WINAPI CharLowerBuffW(LPWSTR,DWORD);
 #define     CharLowerBuff WINELIB_NAME_AW(CharLowerBuff)
-LPSTR       WINAPI CharNext32A(LPCSTR);
-LPWSTR      WINAPI CharNext32W(LPCWSTR);
+LPSTR       WINAPI CharNextA(LPCSTR);
+LPWSTR      WINAPI CharNextW(LPCWSTR);
 #define     CharNext WINELIB_NAME_AW(CharNext)
-LPSTR       WINAPI CharNextEx32A(WORD,LPCSTR,DWORD);
-LPWSTR      WINAPI CharNextEx32W(WORD,LPCWSTR,DWORD);
+LPSTR       WINAPI CharNextExA(WORD,LPCSTR,DWORD);
+LPWSTR      WINAPI CharNextExW(WORD,LPCWSTR,DWORD);
 #define     CharNextEx WINELIB_NAME_AW(CharNextEx)
-LPSTR       WINAPI CharPrev32A(LPCSTR,LPCSTR);
-LPWSTR      WINAPI CharPrev32W(LPCWSTR,LPCWSTR);
+LPSTR       WINAPI CharPrevA(LPCSTR,LPCSTR);
+LPWSTR      WINAPI CharPrevW(LPCWSTR,LPCWSTR);
 #define     CharPrev WINELIB_NAME_AW(CharPrev)
-LPSTR       WINAPI CharPrevEx32A(WORD,LPCSTR,LPCSTR,DWORD);
-LPWSTR      WINAPI CharPrevEx32W(WORD,LPCWSTR,LPCWSTR,DWORD);
+LPSTR       WINAPI CharPrevExA(WORD,LPCSTR,LPCSTR,DWORD);
+LPWSTR      WINAPI CharPrevExW(WORD,LPCWSTR,LPCWSTR,DWORD);
 #define     CharPrevEx WINELIB_NAME_AW(CharPrevEx)
-LPSTR       WINAPI CharUpper32A(LPSTR);
-LPWSTR      WINAPI CharUpper32W(LPWSTR);
+LPSTR       WINAPI CharUpperA(LPSTR);
+LPWSTR      WINAPI CharUpperW(LPWSTR);
 #define     CharUpper WINELIB_NAME_AW(CharUpper)
-DWORD       WINAPI CharUpperBuff32A(LPSTR,DWORD);
-DWORD       WINAPI CharUpperBuff32W(LPWSTR,DWORD);
+DWORD       WINAPI CharUpperBuffA(LPSTR,DWORD);
+DWORD       WINAPI CharUpperBuffW(LPWSTR,DWORD);
 #define     CharUpperBuff WINELIB_NAME_AW(CharUpperBuff)
-BOOL32      WINAPI CharToOem32A(LPCSTR,LPSTR);
-BOOL32      WINAPI CharToOem32W(LPCWSTR,LPSTR);
+BOOL      WINAPI CharToOemA(LPCSTR,LPSTR);
+BOOL      WINAPI CharToOemW(LPCWSTR,LPSTR);
 #define     CharToOem WINELIB_NAME_AW(CharToOem)
-BOOL32      WINAPI CharToOemBuff32A(LPCSTR,LPSTR,DWORD);
-BOOL32      WINAPI CharToOemBuff32W(LPCWSTR,LPSTR,DWORD);
+BOOL      WINAPI CharToOemBuffA(LPCSTR,LPSTR,DWORD);
+BOOL      WINAPI CharToOemBuffW(LPCWSTR,LPSTR,DWORD);
 #define     CharToOemBuff WINELIB_NAME_AW(CharToOemBuff)
-BOOL32      WINAPI CheckDlgButton32(HWND32,INT32,UINT32);
-#define     CheckDlgButton WINELIB_NAME(CheckDlgButton)
-DWORD       WINAPI CheckMenuItem32(HMENU32,UINT32,UINT32);
-#define     CheckMenuItem WINELIB_NAME(CheckMenuItem)
-BOOL32      WINAPI CheckMenuRadioItem32(HMENU32,UINT32,UINT32,UINT32,UINT32);
-#define     CheckMenuRadioItem WINELIB_NAME(CheckMenuRadioItem)
-BOOL32      WINAPI CheckRadioButton32(HWND32,UINT32,UINT32,UINT32);
-#define     CheckRadioButton WINELIB_NAME(CheckRadioButton)
-HWND32      WINAPI ChildWindowFromPoint32(HWND32,POINT32);
-#define     ChildWindowFromPoint WINELIB_NAME(ChildWindowFromPoint)
-HWND32      WINAPI ChildWindowFromPointEx32(HWND32,POINT32,UINT32);
-#define     ChildWindowFromPointEx WINELIB_NAME(ChildWindowFromPointEx)
-BOOL32      WINAPI ClearCommBreak32(INT32);
-#define     ClearCommBreak WINELIB_NAME(ClearCommBreak)
-BOOL32      WINAPI ClientToScreen32(HWND32,LPPOINT32);
-#define     ClientToScreen WINELIB_NAME(ClientToScreen)
-BOOL32      WINAPI ClipCursor32(const RECT32*);
-#define     ClipCursor WINELIB_NAME(ClipCursor)
-BOOL32      WINAPI CloseClipboard32(void);
-#define     CloseClipboard WINELIB_NAME(CloseClipboard)
-BOOL32      WINAPI CloseWindow32(HWND32);
-#define     CloseWindow WINELIB_NAME(CloseWindow)
-#define     CopyCursor32(cur) ((HCURSOR32)CopyIcon32((HICON32)(cur)))
-#define     CopyCursor WINELIB_NAME(CopyCursor)
-HICON32     WINAPI CopyIcon32(HICON32);
-#define     CopyIcon WINELIB_NAME(CopyIcon)
-HICON32     WINAPI CopyImage32(HANDLE32,UINT32,INT32,INT32,UINT32);
-#define     CopyImage WINELIB_NAME(CopyImage)
-BOOL32      WINAPI CopyRect32(RECT32*,const RECT32*);
-#define     CopyRect WINELIB_NAME(CopyRect)
-INT32       WINAPI CountClipboardFormats32(void);
-#define     CountClipboardFormats WINELIB_NAME(CountClipboardFormats)
-BOOL32      WINAPI CreateCaret32(HWND32,HBITMAP32,INT32,INT32);
-#define     CreateCaret WINELIB_NAME(CreateCaret)
-HCURSOR32   WINAPI CreateCursor32(HINSTANCE32,INT32,INT32,INT32,INT32,LPCVOID,LPCVOID);
-#define     CreateCursor WINELIB_NAME(CreateCursor)
-#define     CreateDialog32A(inst,ptr,hwnd,dlg) \
-           CreateDialogParam32A(inst,ptr,hwnd,dlg,0)
-#define     CreateDialog32W(inst,ptr,hwnd,dlg) \
-           CreateDialogParam32W(inst,ptr,hwnd,dlg,0)
+BOOL      WINAPI CheckDlgButton(HWND,INT,UINT);
+DWORD       WINAPI CheckMenuItem(HMENU,UINT,UINT);
+BOOL      WINAPI CheckMenuRadioItem(HMENU,UINT,UINT,UINT,UINT);
+BOOL      WINAPI CheckRadioButton(HWND,UINT,UINT,UINT);
+HWND      WINAPI ChildWindowFromPoint(HWND,POINT);
+HWND      WINAPI ChildWindowFromPointEx(HWND,POINT,UINT);
+BOOL      WINAPI ClearCommBreak(INT);
+BOOL      WINAPI ClientToScreen(HWND,LPPOINT);
+BOOL      WINAPI ClipCursor(const RECT*);
+BOOL      WINAPI CloseClipboard(void);
+BOOL      WINAPI CloseWindow(HWND);
+#define     CopyCursor(cur) ((HCURSOR)CopyIcon((HICON)(cur)))
+HICON     WINAPI CopyIcon(HICON);
+HICON     WINAPI CopyImage(HANDLE,UINT,INT,INT,UINT);
+BOOL      WINAPI CopyRect(RECT*,const RECT*);
+INT       WINAPI CountClipboardFormats(void);
+BOOL      WINAPI CreateCaret(HWND,HBITMAP,INT,INT);
+HCURSOR   WINAPI CreateCursor(HINSTANCE,INT,INT,INT,INT,LPCVOID,LPCVOID);
+#define     CreateDialogA(inst,ptr,hwnd,dlg) \
+           CreateDialogParamA(inst,ptr,hwnd,dlg,0)
+#define     CreateDialogW(inst,ptr,hwnd,dlg) \
+           CreateDialogParamW(inst,ptr,hwnd,dlg,0)
 #define     CreateDialog WINELIB_NAME_AW(CreateDialog)
-#define     CreateDialogIndirect32A(inst,ptr,hwnd,dlg) \
-           CreateDialogIndirectParam32A(inst,ptr,hwnd,dlg,0)
-#define     CreateDialogIndirect32W(inst,ptr,hwnd,dlg) \
-           CreateDialogIndirectParam32W(inst,ptr,hwnd,dlg,0)
+#define     CreateDialogIndirectA(inst,ptr,hwnd,dlg) \
+           CreateDialogIndirectParamA(inst,ptr,hwnd,dlg,0)
+#define     CreateDialogIndirectW(inst,ptr,hwnd,dlg) \
+           CreateDialogIndirectParamW(inst,ptr,hwnd,dlg,0)
 #define     CreateDialogIndirect WINELIB_NAME_AW(CreateDialogIndirect)
-HWND32      WINAPI CreateDialogIndirectParam32A(HINSTANCE32,LPCVOID,HWND32,
-                                                DLGPROC32,LPARAM);
-HWND32      WINAPI CreateDialogIndirectParam32W(HINSTANCE32,LPCVOID,HWND32,
-                                                DLGPROC32,LPARAM);
+HWND      WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCVOID,HWND,
+                                                DLGPROC,LPARAM);
+HWND      WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCVOID,HWND,
+                                                DLGPROC,LPARAM);
 #define     CreateDialogIndirectParam WINELIB_NAME_AW(CreateDialogIndirectParam)
-HWND32      WINAPI CreateDialogParam32A(HINSTANCE32,LPCSTR,HWND32,DLGPROC32,LPARAM);
-HWND32      WINAPI CreateDialogParam32W(HINSTANCE32,LPCWSTR,HWND32,DLGPROC32,LPARAM);
+HWND      WINAPI CreateDialogParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
+HWND      WINAPI CreateDialogParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
 #define     CreateDialogParam WINELIB_NAME_AW(CreateDialogParam)
-HICON32     WINAPI CreateIcon32(HINSTANCE32,INT32,INT32,BYTE,BYTE,LPCVOID,LPCVOID);
-#define     CreateIcon WINELIB_NAME(CreateIcon)
-HICON32     WINAPI CreateIconFromResource32(LPBYTE,UINT32,BOOL32,DWORD);
-#define     CreateIconFromResource WINELIB_NAME(CreateIconFromResource)
-HICON32     WINAPI CreateIconFromResourceEx32(LPBYTE,UINT32,BOOL32,DWORD,INT32,INT32,UINT32);
-#define     CreateIconFromResourceEx WINELIB_NAME(CreateIconFromResourceEx)
-HMENU32     WINAPI CreateMenu32(void);
-#define     CreateMenu WINELIB_NAME(CreateMenu)
-HMENU32     WINAPI CreatePopupMenu32(void);
-#define     CreatePopupMenu WINELIB_NAME(CreatePopupMenu)
-#define     CreateWindow32A(className,titleName,style,x,y,width,height,\
+HICON     WINAPI CreateIcon(HINSTANCE,INT,INT,BYTE,BYTE,LPCVOID,LPCVOID);
+HICON     WINAPI CreateIconFromResource(LPBYTE,UINT,BOOL,DWORD);
+HICON     WINAPI CreateIconFromResourceEx(LPBYTE,UINT,BOOL,DWORD,INT,INT,UINT);
+HMENU     WINAPI CreateMenu(void);
+HMENU     WINAPI CreatePopupMenu(void);
+#define     CreateWindowA(className,titleName,style,x,y,width,height,\
                             parent,menu,instance,param) \
-            CreateWindowEx32A(0,className,titleName,style,x,y,width,height,\
+            CreateWindowExA(0,className,titleName,style,x,y,width,height,\
                               parent,menu,instance,param)
-#define     CreateWindow32W(className,titleName,style,x,y,width,height,\
+#define     CreateWindowW(className,titleName,style,x,y,width,height,\
                             parent,menu,instance,param) \
-            CreateWindowEx32W(0,className,titleName,style,x,y,width,height,\
+            CreateWindowExW(0,className,titleName,style,x,y,width,height,\
                               parent,menu,instance,param)
 #define     CreateWindow WINELIB_NAME_AW(CreateWindow)
-HWND32      WINAPI CreateWindowEx32A(DWORD,LPCSTR,LPCSTR,DWORD,INT32,INT32,
-                                INT32,INT32,HWND32,HMENU32,HINSTANCE32,LPVOID);
-HWND32      WINAPI CreateWindowEx32W(DWORD,LPCWSTR,LPCWSTR,DWORD,INT32,INT32,
-                                INT32,INT32,HWND32,HMENU32,HINSTANCE32,LPVOID);
+HWND      WINAPI CreateWindowExA(DWORD,LPCSTR,LPCSTR,DWORD,INT,INT,
+                                INT,INT,HWND,HMENU,HINSTANCE,LPVOID);
+HWND      WINAPI CreateWindowExW(DWORD,LPCWSTR,LPCWSTR,DWORD,INT,INT,
+                                INT,INT,HWND,HMENU,HINSTANCE,LPVOID);
 #define     CreateWindowEx WINELIB_NAME_AW(CreateWindowEx)
-HWND32      WINAPI CreateMDIWindow32A(LPCSTR,LPCSTR,DWORD,INT32,INT32,
-                                INT32,INT32,HWND32,HINSTANCE32,LPARAM);
-HWND32      WINAPI CreateMDIWindow32W(LPCWSTR,LPCWSTR,DWORD,INT32,INT32,
-                                INT32,INT32,HWND32,HINSTANCE32,LPARAM);
+HWND      WINAPI CreateMDIWindowA(LPCSTR,LPCSTR,DWORD,INT,INT,
+                                INT,INT,HWND,HINSTANCE,LPARAM);
+HWND      WINAPI CreateMDIWindowW(LPCWSTR,LPCWSTR,DWORD,INT,INT,
+                                INT,INT,HWND,HINSTANCE,LPARAM);
 #define     CreateMDIWindow WINELIB_NAME_AW(CreateMDIWindow)
-LRESULT     WINAPI DefDlgProc32A(HWND32,UINT32,WPARAM32,LPARAM);
-LRESULT     WINAPI DefDlgProc32W(HWND32,UINT32,WPARAM32,LPARAM);
+LRESULT     WINAPI DefDlgProcA(HWND,UINT,WPARAM,LPARAM);
+LRESULT     WINAPI DefDlgProcW(HWND,UINT,WPARAM,LPARAM);
 #define     DefDlgProc WINELIB_NAME_AW(DefDlgProc)
-HDWP32      WINAPI DeferWindowPos32(HDWP32,HWND32,HWND32,INT32,INT32,INT32,INT32,UINT32);
-#define     DeferWindowPos WINELIB_NAME(DeferWindowPos)
-LRESULT     WINAPI DefFrameProc32A(HWND32,HWND32,UINT32,WPARAM32,LPARAM);
-LRESULT     WINAPI DefFrameProc32W(HWND32,HWND32,UINT32,WPARAM32,LPARAM);
+HDWP      WINAPI DeferWindowPos(HDWP,HWND,HWND,INT,INT,INT,INT,UINT);
+LRESULT     WINAPI DefFrameProcA(HWND,HWND,UINT,WPARAM,LPARAM);
+LRESULT     WINAPI DefFrameProcW(HWND,HWND,UINT,WPARAM,LPARAM);
 #define     DefFrameProc WINELIB_NAME_AW(DefFrameProc)
-#define     DefHookProc32(code,wparam,lparam,phhook) \
-            CallNextHookEx32(*(phhook),code,wparam,lparam)
-#define     DefHookProc WINELIB_NAME(DefHookProc)
-LRESULT     WINAPI DefMDIChildProc32A(HWND32,UINT32,WPARAM32,LPARAM);
-LRESULT     WINAPI DefMDIChildProc32W(HWND32,UINT32,WPARAM32,LPARAM);
+#define     DefHookProc(code,wparam,lparam,phhook) \
+            CallNextHookEx(*(phhook),code,wparam,lparam)
+LRESULT     WINAPI DefMDIChildProcA(HWND,UINT,WPARAM,LPARAM);
+LRESULT     WINAPI DefMDIChildProcW(HWND,UINT,WPARAM,LPARAM);
 #define     DefMDIChildProc WINELIB_NAME_AW(DefMDIChildProc)
-LRESULT     WINAPI DefWindowProc32A(HWND32,UINT32,WPARAM32,LPARAM);
-LRESULT     WINAPI DefWindowProc32W(HWND32,UINT32,WPARAM32,LPARAM);
+LRESULT     WINAPI DefWindowProcA(HWND,UINT,WPARAM,LPARAM);
+LRESULT     WINAPI DefWindowProcW(HWND,UINT,WPARAM,LPARAM);
 #define     DefWindowProc WINELIB_NAME_AW(DefWindowProc)
-BOOL32      WINAPI DeleteMenu32(HMENU32,UINT32,UINT32);
-#define     DeleteMenu WINELIB_NAME(DeleteMenu)
-BOOL32      WINAPI DestroyCaret32(void);
-#define     DestroyCaret WINELIB_NAME(DestroyCaret)
-BOOL32      WINAPI DestroyCursor32(HCURSOR32);
-#define     DestroyCursor WINELIB_NAME(DestroyCursor)
-BOOL32      WINAPI DestroyIcon32(HICON32);
-#define     DestroyIcon WINELIB_NAME(DestroyIcon)
-BOOL32      WINAPI DestroyMenu32(HMENU32);
-#define     DestroyMenu WINELIB_NAME(DestroyMenu)
-BOOL32      WINAPI DestroyWindow32(HWND32);
-#define     DestroyWindow WINELIB_NAME(DestroyWindow)
-#define     DialogBox32A(inst,template,owner,func) \
-            DialogBoxParam32A(inst,template,owner,func,0)
-#define     DialogBox32W(inst,template,owner,func) \
-            DialogBoxParam32W(inst,template,owner,func,0)
+BOOL      WINAPI DeleteMenu(HMENU,UINT,UINT);
+BOOL      WINAPI DestroyCaret(void);
+BOOL      WINAPI DestroyCursor(HCURSOR);
+BOOL      WINAPI DestroyIcon(HICON);
+BOOL      WINAPI DestroyMenu(HMENU);
+BOOL      WINAPI DestroyWindow(HWND);
+#define     DialogBoxA(inst,template,owner,func) \
+            DialogBoxParamA(inst,template,owner,func,0)
+#define     DialogBoxW(inst,template,owner,func) \
+            DialogBoxParamW(inst,template,owner,func,0)
 #define     DialogBox WINELIB_NAME_AW(DialogBox)
-#define     DialogBoxIndirect32A(inst,template,owner,func) \
-            DialogBoxIndirectParam32A(inst,template,owner,func,0)
-#define     DialogBoxIndirect32W(inst,template,owner,func) \
-            DialogBoxIndirectParam32W(inst,template,owner,func,0)
+#define     DialogBoxIndirectA(inst,template,owner,func) \
+            DialogBoxIndirectParamA(inst,template,owner,func,0)
+#define     DialogBoxIndirectW(inst,template,owner,func) \
+            DialogBoxIndirectParamW(inst,template,owner,func,0)
 #define     DialogBoxIndirect WINELIB_NAME_AW(DialogBoxIndirect)
-INT32       WINAPI DialogBoxIndirectParam32A(HINSTANCE32,LPCVOID,HWND32,DLGPROC32,LPARAM);
-INT32       WINAPI DialogBoxIndirectParam32W(HINSTANCE32,LPCVOID,HWND32,DLGPROC32,LPARAM);
+INT       WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCVOID,HWND,DLGPROC,LPARAM);
+INT       WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCVOID,HWND,DLGPROC,LPARAM);
 #define     DialogBoxIndirectParam WINELIB_NAME_AW(DialogBoxIndirectParam)
-INT32       WINAPI DialogBoxParam32A(HINSTANCE32,LPCSTR,HWND32,DLGPROC32,LPARAM);
-INT32       WINAPI DialogBoxParam32W(HINSTANCE32,LPCWSTR,HWND32,DLGPROC32,LPARAM);
+INT       WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
+INT       WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
 #define     DialogBoxParam WINELIB_NAME_AW(DialogBoxParam)
-LONG        WINAPI DispatchMessage32A(const MSG32*);
-LONG        WINAPI DispatchMessage32W(const MSG32*);
+LONG        WINAPI DispatchMessageA(const MSG*);
+LONG        WINAPI DispatchMessageW(const MSG*);
 #define     DispatchMessage WINELIB_NAME_AW(DispatchMessage)
-INT32       WINAPI DlgDirList32A(HWND32,LPSTR,INT32,INT32,UINT32);
-INT32       WINAPI DlgDirList32W(HWND32,LPWSTR,INT32,INT32,UINT32);
+INT       WINAPI DlgDirListA(HWND,LPSTR,INT,INT,UINT);
+INT       WINAPI DlgDirListW(HWND,LPWSTR,INT,INT,UINT);
 #define     DlgDirList WINELIB_NAME_AW(DlgDirList)
-INT32       WINAPI DlgDirListComboBox32A(HWND32,LPSTR,INT32,INT32,UINT32);
-INT32       WINAPI DlgDirListComboBox32W(HWND32,LPWSTR,INT32,INT32,UINT32);
+INT       WINAPI DlgDirListComboBoxA(HWND,LPSTR,INT,INT,UINT);
+INT       WINAPI DlgDirListComboBoxW(HWND,LPWSTR,INT,INT,UINT);
 #define     DlgDirListComboBox WINELIB_NAME_AW(DlgDirListComboBox)
-BOOL32      WINAPI DlgDirSelectComboBoxEx32A(HWND32,LPSTR,INT32,INT32);
-BOOL32      WINAPI DlgDirSelectComboBoxEx32W(HWND32,LPWSTR,INT32,INT32);
+BOOL      WINAPI DlgDirSelectComboBoxExA(HWND,LPSTR,INT,INT);
+BOOL      WINAPI DlgDirSelectComboBoxExW(HWND,LPWSTR,INT,INT);
 #define     DlgDirSelectComboBoxEx WINELIB_NAME_AW(DlgDirSelectComboBoxEx)
-BOOL32      WINAPI DlgDirSelectEx32A(HWND32,LPSTR,INT32,INT32);
-BOOL32      WINAPI DlgDirSelectEx32W(HWND32,LPWSTR,INT32,INT32);
+BOOL      WINAPI DlgDirSelectExA(HWND,LPSTR,INT,INT);
+BOOL      WINAPI DlgDirSelectExW(HWND,LPWSTR,INT,INT);
 #define     DlgDirSelectEx WINELIB_NAME_AW(DlgDirSelectEx)
-BOOL32      WINAPI DragDetect32(HWND32,POINT32);
-#define     DragDetect WINELIB_NAME(DragDetect)
-DWORD       WINAPI DragObject32(HWND32,HWND32,UINT32,DWORD,HCURSOR32);
-#define     DragObject WINELIB_NAME(DragObject)
-BOOL32      WINAPI DrawAnimatedRects32(HWND32,int,const RECT32*,const RECT32*);
-#define     DrawAnimatedRects WINELIB_NAME(DrawAnimatedRects)
-BOOL32      WINAPI DrawCaption32(HWND32,HDC32,const RECT32*,UINT32);
-#define     DrawCaption WINELIB_NAME(DrawCaption)
-BOOL32      WINAPI DrawCaptionTemp32A(HWND32,HDC32,const RECT32*,HFONT32,HICON32,LPCSTR,UINT32);
-BOOL32      WINAPI DrawCaptionTemp32W(HWND32,HDC32,const RECT32*,HFONT32,HICON32,LPCWSTR,UINT32);
+BOOL      WINAPI DragDetect(HWND,POINT);
+DWORD       WINAPI DragObject(HWND,HWND,UINT,DWORD,HCURSOR);
+BOOL      WINAPI DrawAnimatedRects(HWND,int,const RECT*,const RECT*);
+BOOL      WINAPI DrawCaption(HWND,HDC,const RECT*,UINT);
+BOOL      WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT);
+BOOL      WINAPI DrawCaptionTempW(HWND,HDC,const RECT*,HFONT,HICON,LPCWSTR,UINT);
 #define     DrawCaptionTemp WINELIB_NAME_AW(DrawCaptionTemp)
-BOOL32      WINAPI DrawEdge32(HDC32,LPRECT32,UINT32,UINT32);
-#define     DrawEdge WINELIB_NAME(DrawEdge)
-BOOL32      WINAPI DrawFocusRect32(HDC32,const RECT32*);
-#define     DrawFocusRect WINELIB_NAME(DrawFocusRect)
-BOOL32      WINAPI DrawFrameControl32(HDC32,LPRECT32,UINT32,UINT32);
-#define     DrawFrameControl WINELIB_NAME(DrawFrameControl)
-BOOL32      WINAPI DrawIcon32(HDC32,INT32,INT32,HICON32);
-#define     DrawIcon WINELIB_NAME(DrawIcon)
-BOOL32      WINAPI DrawIconEx32(HDC32,INT32,INT32,HICON32,INT32,INT32,
-				UINT32,HBRUSH32,UINT32);
-#define     DrawIconEx WINELIB_NAME(DrawIconEx)
-BOOL32      WINAPI DrawMenuBar32(HWND32);
-#define     DrawMenuBar WINELIB_NAME(DrawMenuBar)
-BOOL32      WINAPI DrawState32A(HDC32,HBRUSH32,DRAWSTATEPROC32,LPARAM,WPARAM32,INT32,INT32,INT32,INT32,UINT32);
-BOOL32      WINAPI DrawState32W(HDC32,HBRUSH32,DRAWSTATEPROC32,LPARAM,WPARAM32,INT32,INT32,INT32,INT32,UINT32);
+BOOL      WINAPI DrawEdge(HDC,LPRECT,UINT,UINT);
+BOOL      WINAPI DrawFocusRect(HDC,const RECT*);
+BOOL      WINAPI DrawFrameControl(HDC,LPRECT,UINT,UINT);
+BOOL      WINAPI DrawIcon(HDC,INT,INT,HICON);
+BOOL      WINAPI DrawIconEx(HDC,INT,INT,HICON,INT,INT,
+				UINT,HBRUSH,UINT);
+BOOL      WINAPI DrawMenuBar(HWND);
+BOOL      WINAPI DrawStateA(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,INT,INT,INT,INT,UINT);
+BOOL      WINAPI DrawStateW(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,INT,INT,INT,INT,UINT);
 #define     DrawState WINELIB_NAME_AW(DrawState)
-INT32       WINAPI DrawText32A(HDC32,LPCSTR,INT32,LPRECT32,UINT32);
-INT32       WINAPI DrawText32W(HDC32,LPCWSTR,INT32,LPRECT32,UINT32);
+INT       WINAPI DrawTextA(HDC,LPCSTR,INT,LPRECT,UINT);
+INT       WINAPI DrawTextW(HDC,LPCWSTR,INT,LPRECT,UINT);
 #define     DrawText WINELIB_NAME_AW(DrawText)
-BOOL32      WINAPI EmptyClipboard32(void);
-#define     EmptyClipboard WINELIB_NAME(EmptyClipboard)
-UINT32      WINAPI EnableMenuItem32(HMENU32,UINT32,UINT32);
-#define     EnableMenuItem WINELIB_NAME(EnableMenuItem)
-BOOL32      WINAPI EnableScrollBar32(HWND32,INT32,UINT32);
-#define     EnableScrollBar WINELIB_NAME(EnableScrollBar)
-BOOL32      WINAPI EnableWindow32(HWND32,BOOL32);
-#define     EnableWindow WINELIB_NAME(EnableWindow)
-BOOL32      WINAPI EndDeferWindowPos32(HDWP32);
-#define     EndDeferWindowPos WINELIB_NAME(EndDeferWindowPos)
-BOOL32      WINAPI EndDialog32(HWND32,INT32);
-#define     EndDialog WINELIB_NAME(EndDialog)
-BOOL32      WINAPI EndPaint32(HWND32,const PAINTSTRUCT32*);
-#define     EndPaint WINELIB_NAME(EndPaint)
-BOOL32      WINAPI EnumChildWindows32(HWND32,WNDENUMPROC32,LPARAM);
-#define     EnumChildWindows WINELIB_NAME(EnumChildWindows)
-UINT32      WINAPI EnumClipboardFormats32(UINT32);
-#define     EnumClipboardFormats WINELIB_NAME(EnumClipboardFormats)
-INT32       WINAPI EnumProps32A(HWND32,PROPENUMPROC32A);
-INT32       WINAPI EnumProps32W(HWND32,PROPENUMPROC32W);
+BOOL      WINAPI EmptyClipboard(void);
+UINT      WINAPI EnableMenuItem(HMENU,UINT,UINT);
+BOOL      WINAPI EnableScrollBar(HWND,INT,UINT);
+BOOL      WINAPI EnableWindow(HWND,BOOL);
+BOOL      WINAPI EndDeferWindowPos(HDWP);
+BOOL      WINAPI EndDialog(HWND,INT);
+BOOL      WINAPI EndPaint(HWND,const PAINTSTRUCT*);
+BOOL      WINAPI EnumChildWindows(HWND,WNDENUMPROC,LPARAM);
+UINT      WINAPI EnumClipboardFormats(UINT);
+INT       WINAPI EnumPropsA(HWND,PROPENUMPROCA);
+INT       WINAPI EnumPropsW(HWND,PROPENUMPROCW);
 #define     EnumProps WINELIB_NAME_AW(EnumProps)
-BOOL32      WINAPI EnumWindows32(WNDENUMPROC32,LPARAM);
-#define     EnumWindows WINELIB_NAME(EnumWindows)
-BOOL32      WINAPI EqualRect32(const RECT32*,const RECT32*);
-#define     EqualRect WINELIB_NAME(EqualRect)
-BOOL32      WINAPI EscapeCommFunction32(INT32,UINT32);
-#define     EscapeCommFunction WINELIB_NAME(EscapeCommFunction)
-INT32       WINAPI ExcludeUpdateRgn32(HDC32,HWND32);
-#define     ExcludeUpdateRgn WINELIB_NAME(ExcludeUpdateRgn)
-#define     ExitWindows32(a,b) ExitWindowsEx(EWX_LOGOFF,0xffffffff)
-#define     ExitWindows WINELIB_NAME(ExitWindows)
-INT32       WINAPI FillRect32(HDC32,const RECT32*,HBRUSH32);
-#define     FillRect WINELIB_NAME(FillRect)
-HWND32      WINAPI FindWindow32A(LPCSTR,LPCSTR);
-HWND32      WINAPI FindWindow32W(LPCWSTR,LPCWSTR);
+BOOL      WINAPI EnumWindows(WNDENUMPROC,LPARAM);
+BOOL      WINAPI EqualRect(const RECT*,const RECT*);
+BOOL      WINAPI EscapeCommFunction(INT,UINT);
+INT       WINAPI ExcludeUpdateRgn(HDC,HWND);
+#define     ExitWindows(a,b) ExitWindowsEx(EWX_LOGOFF,0xffffffff)
+INT       WINAPI FillRect(HDC,const RECT*,HBRUSH);
+HWND      WINAPI FindWindowA(LPCSTR,LPCSTR);
+HWND      WINAPI FindWindowW(LPCWSTR,LPCWSTR);
 #define     FindWindow WINELIB_NAME_AW(FindWindow)
-HWND32      WINAPI FindWindowEx32A(HWND32,HWND32,LPCSTR,LPCSTR);
-HWND32      WINAPI FindWindowEx32W(HWND32,HWND32,LPCWSTR,LPCWSTR);
+HWND      WINAPI FindWindowExA(HWND,HWND,LPCSTR,LPCSTR);
+HWND      WINAPI FindWindowExW(HWND,HWND,LPCWSTR,LPCWSTR);
 #define     FindWindowEx WINELIB_NAME_AW(FindWindowEx)
-BOOL32      WINAPI FlashWindow32(HWND32,BOOL32);
-#define     FlashWindow WINELIB_NAME(FlashWindow)
-INT32       WINAPI FrameRect32(HDC32,const RECT32*,HBRUSH32);
-#define     FrameRect WINELIB_NAME(FrameRect)
-HWND32      WINAPI GetActiveWindow32(void);
-#define     GetActiveWindow WINELIB_NAME(GetActiveWindow)
-DWORD       WINAPI GetAppCompatFlags32(HTASK32);
-#define     GetAppCompatFlags WINELIB_NAME(GetAppCompatFlags)
-WORD        WINAPI GetAsyncKeyState32(INT32);
-#define     GetAsyncKeyState WINELIB_NAME(GetAsyncKeyState)
-HWND32      WINAPI GetCapture32(void);
-#define     GetCapture WINELIB_NAME(GetCapture)
-UINT32      WINAPI GetCaretBlinkTime32(void);
-#define     GetCaretBlinkTime WINELIB_NAME(GetCaretBlinkTime)
-BOOL32      WINAPI GetCaretPos32(LPPOINT32);
-#define     GetCaretPos WINELIB_NAME(GetCaretPos)
-BOOL32      WINAPI GetClassInfo32A(HINSTANCE32,LPCSTR,WNDCLASS32A *);
-BOOL32      WINAPI GetClassInfo32W(HINSTANCE32,LPCWSTR,WNDCLASS32W *);
+BOOL      WINAPI FlashWindow(HWND,BOOL);
+INT       WINAPI FrameRect(HDC,const RECT*,HBRUSH);
+HWND      WINAPI GetActiveWindow(void);
+DWORD       WINAPI GetAppCompatFlags(HTASK);
+WORD        WINAPI GetAsyncKeyState(INT);
+HWND      WINAPI GetCapture(void);
+UINT      WINAPI GetCaretBlinkTime(void);
+BOOL      WINAPI GetCaretPos(LPPOINT);
+BOOL      WINAPI GetClassInfoA(HINSTANCE,LPCSTR,WNDCLASSA *);
+BOOL      WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,WNDCLASSW *);
 #define     GetClassInfo WINELIB_NAME_AW(GetClassInfo)
-BOOL32      WINAPI GetClassInfoEx32A(HINSTANCE32,LPCSTR,WNDCLASSEX32A *);
-BOOL32      WINAPI GetClassInfoEx32W(HINSTANCE32,LPCWSTR,WNDCLASSEX32W *);
+BOOL      WINAPI GetClassInfoExA(HINSTANCE,LPCSTR,WNDCLASSEXA *);
+BOOL      WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,WNDCLASSEXW *);
 #define     GetClassInfoEx WINELIB_NAME_AW(GetClassInfoEx)
-LONG        WINAPI GetClassLong32A(HWND32,INT32);
-LONG        WINAPI GetClassLong32W(HWND32,INT32);
+LONG        WINAPI GetClassLongA(HWND,INT);
+LONG        WINAPI GetClassLongW(HWND,INT);
 #define     GetClassLong WINELIB_NAME_AW(GetClassLong)
-INT32       WINAPI GetClassName32A(HWND32,LPSTR,INT32);
-INT32       WINAPI GetClassName32W(HWND32,LPWSTR,INT32);
+INT       WINAPI GetClassNameA(HWND,LPSTR,INT);
+INT       WINAPI GetClassNameW(HWND,LPWSTR,INT);
 #define     GetClassName WINELIB_NAME_AW(GetClassName)
-WORD        WINAPI GetClassWord32(HWND32,INT32);
-#define     GetClassWord WINELIB_NAME(GetClassWord)
-BOOL32      WINAPI GetClientRect32(HWND32,LPRECT32);
-#define     GetClientRect WINELIB_NAME(GetClientRect)
-HANDLE32    WINAPI GetClipboardData32(UINT32);
-#define     GetClipboardData WINELIB_NAME(GetClipboardData)
-INT32       WINAPI GetClipboardFormatName32A(UINT32,LPSTR,INT32);
-INT32       WINAPI GetClipboardFormatName32W(UINT32,LPWSTR,INT32);
+WORD        WINAPI GetClassWord(HWND,INT);
+BOOL      WINAPI GetClientRect(HWND,LPRECT);
+HANDLE    WINAPI GetClipboardData(UINT);
+INT       WINAPI GetClipboardFormatNameA(UINT,LPSTR,INT);
+INT       WINAPI GetClipboardFormatNameW(UINT,LPWSTR,INT);
 #define     GetClipboardFormatName WINELIB_NAME_AW(GetClipboardFormatName)
-HWND32      WINAPI GetClipboardOwner32(void);
-#define     GetClipboardOwner WINELIB_NAME(GetClipboardOwner)
-HWND32      WINAPI GetClipboardViewer32(void);
-#define     GetClipboardViewer WINELIB_NAME(GetClipboardViewer)
-BOOL32      WINAPI GetClipCursor32(LPRECT32);
-#define     GetClipCursor WINELIB_NAME(GetClipCursor)
-#define     GetCurrentTime32() GetTickCount()
-#define     GetCurrentTime WINELIB_NAME(GetCurrentTime)
-HCURSOR32   WINAPI GetCursor32(void);
-#define     GetCursor WINELIB_NAME(GetCursor)
-BOOL32      WINAPI GetCursorPos32(LPPOINT32);
-#define     GetCursorPos WINELIB_NAME(GetCursorPos)
-HDC32       WINAPI GetDC32(HWND32);
-#define     GetDC WINELIB_NAME(GetDC)
-HDC32       WINAPI GetDCEx32(HWND32,HRGN32,DWORD);
-#define     GetDCEx WINELIB_NAME(GetDCEx)
-HWND32      WINAPI GetDesktopWindow32(void);
-#define     GetDesktopWindow WINELIB_NAME(GetDesktopWindow)
-INT32       WINAPI GetDlgCtrlID32(HWND32);
-#define     GetDlgCtrlID WINELIB_NAME(GetDlgCtrlID)
-HWND32      WINAPI GetDlgItem32(HWND32,INT32);
-#define     GetDlgItem WINELIB_NAME(GetDlgItem)
-UINT32      WINAPI GetDlgItemInt32(HWND32,INT32,BOOL32*,BOOL32);
-#define     GetDlgItemInt WINELIB_NAME(GetDlgItemInt)
-INT32       WINAPI GetDlgItemText32A(HWND32,INT32,LPSTR,UINT32);
-INT32       WINAPI GetDlgItemText32W(HWND32,INT32,LPWSTR,UINT32);
+HWND      WINAPI GetClipboardOwner(void);
+HWND      WINAPI GetClipboardViewer(void);
+BOOL      WINAPI GetClipCursor(LPRECT);
+#define     GetCurrentTime() GetTickCount()
+HCURSOR   WINAPI GetCursor(void);
+BOOL      WINAPI GetCursorPos(LPPOINT);
+HDC       WINAPI GetDC(HWND);
+HDC       WINAPI GetDCEx(HWND,HRGN,DWORD);
+HWND      WINAPI GetDesktopWindow(void);
+INT       WINAPI GetDlgCtrlID(HWND);
+HWND      WINAPI GetDlgItem(HWND,INT);
+UINT      WINAPI GetDlgItemInt(HWND,INT,BOOL*,BOOL);
+INT       WINAPI GetDlgItemTextA(HWND,INT,LPSTR,UINT);
+INT       WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,UINT);
 #define     GetDlgItemText WINELIB_NAME_AW(GetDlgItemText)
-UINT32      WINAPI GetDoubleClickTime32(void);
-#define     GetDoubleClickTime WINELIB_NAME(GetDoubleClickTime)
-HWND32      WINAPI GetFocus32(void);
-#define     GetFocus WINELIB_NAME(GetFocus)
-HWND32      WINAPI GetForegroundWindow32(void);
-#define     GetForegroundWindow WINELIB_NAME(GetForegroundWindow)
-BOOL32      WINAPI GetInputState32(void);
-#define     GetInputState WINELIB_NAME(GetInputState)
-UINT32      WINAPI GetInternalWindowPos32(HWND32,LPRECT32,LPPOINT32);
-#define     GetInternalWindowPos WINELIB_NAME(GetInternalWindowPos)
-UINT32      WINAPI GetKBCodePage32(void);
-#define     GetKBCodePage WINELIB_NAME(GetKBCodePage)
-INT32       WINAPI GetKeyboardType32(INT32);
-#define     GetKeyboardType WINELIB_NAME(GetKeyboardType)
-INT32       WINAPI GetKeyNameText32A(LONG,LPSTR,INT32);
-INT32       WINAPI GetKeyNameText32W(LONG,LPWSTR,INT32);
+UINT      WINAPI GetDoubleClickTime(void);
+HWND      WINAPI GetFocus(void);
+HWND      WINAPI GetForegroundWindow(void);
+BOOL      WINAPI GetInputState(void);
+UINT      WINAPI GetInternalWindowPos(HWND,LPRECT,LPPOINT);
+UINT      WINAPI GetKBCodePage(void);
+INT       WINAPI GetKeyboardType(INT);
+INT       WINAPI GetKeyNameTextA(LONG,LPSTR,INT);
+INT       WINAPI GetKeyNameTextW(LONG,LPWSTR,INT);
 #define     GetKeyNameText WINELIB_NAME_AW(GetKeyNameText)
-INT32       WINAPI GetKeyboardLayoutName32A(LPSTR);
-INT32       WINAPI GetKeyboardLayoutName32W(LPWSTR);
+INT       WINAPI GetKeyboardLayoutNameA(LPSTR);
+INT       WINAPI GetKeyboardLayoutNameW(LPWSTR);
 #define     GetKeyboardLayoutName WINELIB_NAME_AW(GetKeyboardLayoutName)
-INT16       WINAPI GetKeyState32(INT32);
-#define     GetKeyState WINELIB_NAME(GetKeyState)
-HWND32      WINAPI GetLastActivePopup32(HWND32);
-#define     GetLastActivePopup WINELIB_NAME(GetLastActivePopup)
-HMENU32     WINAPI GetMenu32(HWND32);
-#define     GetMenu WINELIB_NAME(GetMenu)
-INT32       WINAPI GetMenuItemCount32(HMENU32);
-#define     GetMenuItemCount WINELIB_NAME(GetMenuItemCount)
-UINT32      WINAPI GetMenuItemID32(HMENU32,INT32);
-#define     GetMenuItemID WINELIB_NAME(GetMenuItemID)
-BOOL32      WINAPI GetMenuItemRect32(HWND32,HMENU32,UINT32,LPRECT32);
-#define     GetMenuItemRect WINELIB_NAME(GetMenuItemRect)
-UINT32      WINAPI GetMenuState32(HMENU32,UINT32,UINT32);
-#define     GetMenuState WINELIB_NAME(GetMenuState)
-INT32       WINAPI GetMenuString32A(HMENU32,UINT32,LPSTR,INT32,UINT32);
-INT32       WINAPI GetMenuString32W(HMENU32,UINT32,LPWSTR,INT32,UINT32);
+INT16       WINAPI GetKeyState(INT);
+HWND      WINAPI GetLastActivePopup(HWND);
+HMENU     WINAPI GetMenu(HWND);
+INT       WINAPI GetMenuItemCount(HMENU);
+UINT      WINAPI GetMenuItemID(HMENU,INT);
+BOOL      WINAPI GetMenuItemRect(HWND,HMENU,UINT,LPRECT);
+UINT      WINAPI GetMenuState(HMENU,UINT,UINT);
+INT       WINAPI GetMenuStringA(HMENU,UINT,LPSTR,INT,UINT);
+INT       WINAPI GetMenuStringW(HMENU,UINT,LPWSTR,INT,UINT);
 #define     GetMenuString WINELIB_NAME_AW(GetMenuString)
-BOOL32      WINAPI GetMessage32A(LPMSG32,HWND32,UINT32,UINT32);
-BOOL32      WINAPI GetMessage32W(LPMSG32,HWND32,UINT32,UINT32);
+BOOL      WINAPI GetMessageA(LPMSG,HWND,UINT,UINT);
+BOOL      WINAPI GetMessageW(LPMSG,HWND,UINT,UINT);
 #define     GetMessage WINELIB_NAME_AW(GetMessage)
-HWND32      WINAPI GetNextDlgGroupItem32(HWND32,HWND32,BOOL32);
-#define     GetNextDlgGroupItem WINELIB_NAME(GetNextDlgGroupItem)
-HWND32      WINAPI GetNextDlgTabItem32(HWND32,HWND32,BOOL32);
-#define     GetNextDlgTabItem WINELIB_NAME(GetNextDlgTabItem)
-#define     GetNextWindow32 GetWindow32
-#define     GetNextWindow WINELIB_NAME(GetNextWindow)
-HWND32      WINAPI GetOpenClipboardWindow32(void);
-#define     GetOpenClipboardWindow WINELIB_NAME(GetOpenClipboardWindow)
-HWND32      WINAPI GetParent32(HWND32);
-#define     GetParent WINELIB_NAME(GetParent)
-INT32       WINAPI GetPriorityClipboardFormat32(UINT32*,INT32);
-#define     GetPriorityClipboardFormat WINELIB_NAME(GetPriorityClipboardFormat)
-HANDLE32    WINAPI GetProp32A(HWND32,LPCSTR);
-HANDLE32    WINAPI GetProp32W(HWND32,LPCWSTR);
+HWND      WINAPI GetNextDlgGroupItem(HWND,HWND,BOOL);
+HWND      WINAPI GetNextDlgTabItem(HWND,HWND,BOOL);
+#define     GetNextWindow GetWindow
+HWND      WINAPI GetOpenClipboardWindow(void);
+HWND      WINAPI GetParent(HWND);
+INT       WINAPI GetPriorityClipboardFormat(UINT*,INT);
+HANDLE    WINAPI GetPropA(HWND,LPCSTR);
+HANDLE    WINAPI GetPropW(HWND,LPCWSTR);
 #define     GetProp WINELIB_NAME_AW(GetProp)
-DWORD       WINAPI GetQueueStatus32(UINT32);
-#define     GetQueueStatus WINELIB_NAME(GetQueueStatus)
-BOOL32      WINAPI GetScrollInfo32(HWND32,INT32,LPSCROLLINFO);
-#define     GetScrollInfo WINELIB_NAME(GetScrollInfo)
-INT32       WINAPI GetScrollPos32(HWND32,INT32);
-#define     GetScrollPos WINELIB_NAME(GetScrollPos)
-BOOL32      WINAPI GetScrollRange32(HWND32,INT32,LPINT32,LPINT32);
-#define     GetScrollRange WINELIB_NAME(GetScrollRange)
-HWND32      WINAPI GetShellWindow32(void);
-#define     GetShellWindow WINELIB_NAME(GetShellWindow)
-HMENU32     WINAPI GetSubMenu32(HMENU32,INT32);
-#define     GetSubMenu WINELIB_NAME(GetSubMenu)
-COLORREF    WINAPI GetSysColor32(INT32);
-#define     GetSysColor WINELIB_NAME(GetSysColor)
-HBRUSH32    WINAPI GetSysColorBrush32(INT32);
-#define     GetSysColorBrush WINELIB_NAME(GetSysColorBrush)
-#define     GetSysModalWindow32() ((HWND32)0)
-#define     GetSysModalWindow WINELIB_NAME(GetSysModalWindow)
-HMENU32     WINAPI GetSystemMenu32(HWND32,BOOL32);
-#define     GetSystemMenu WINELIB_NAME(GetSystemMenu)
-INT32       WINAPI GetSystemMetrics32(INT32);
-#define     GetSystemMetrics WINELIB_NAME(GetSystemMetrics)
-DWORD       WINAPI GetTabbedTextExtent32A(HDC32,LPCSTR,INT32,INT32,const INT32*);
-DWORD       WINAPI GetTabbedTextExtent32W(HDC32,LPCWSTR,INT32,INT32,const INT32*);
+DWORD       WINAPI GetQueueStatus(UINT);
+BOOL      WINAPI GetScrollInfo(HWND,INT,LPSCROLLINFO);
+INT       WINAPI GetScrollPos(HWND,INT);
+BOOL      WINAPI GetScrollRange(HWND,INT,LPINT,LPINT);
+HWND      WINAPI GetShellWindow(void);
+HMENU     WINAPI GetSubMenu(HMENU,INT);
+COLORREF    WINAPI GetSysColor(INT);
+HBRUSH    WINAPI GetSysColorBrush(INT);
+#define     GetSysModalWindow() ((HWND)0)
+HMENU     WINAPI GetSystemMenu(HWND,BOOL);
+INT       WINAPI GetSystemMetrics(INT);
+DWORD       WINAPI GetTabbedTextExtentA(HDC,LPCSTR,INT,INT,const INT*);
+DWORD       WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,INT,INT,const INT*);
 #define     GetTabbedTextExtent WINELIB_NAME_AW(GetTabbedTextExtent)
-HWND32      WINAPI GetTopWindow32(HWND32);
-#define     GetTopWindow WINELIB_NAME(GetTopWindow)
-BOOL32      WINAPI GetUpdateRect32(HWND32,LPRECT32,BOOL32);
-#define     GetUpdateRect WINELIB_NAME(GetUpdateRect)
-INT32       WINAPI GetUpdateRgn32(HWND32,HRGN32,BOOL32);
-#define     GetUpdateRgn WINELIB_NAME(GetUpdateRgn)
-HWND32      WINAPI GetWindow32(HWND32,WORD);
-#define     GetWindow WINELIB_NAME(GetWindow)
-HDC32       WINAPI GetWindowDC32(HWND32);
-#define     GetWindowDC WINELIB_NAME(GetWindowDC)
-LONG        WINAPI GetWindowLong32A(HWND32,INT32);
-LONG        WINAPI GetWindowLong32W(HWND32,INT32);
+HWND      WINAPI GetTopWindow(HWND);
+BOOL      WINAPI GetUpdateRect(HWND,LPRECT,BOOL);
+INT       WINAPI GetUpdateRgn(HWND,HRGN,BOOL);
+HWND      WINAPI GetWindow(HWND,WORD);
+HDC       WINAPI GetWindowDC(HWND);
+LONG        WINAPI GetWindowLongA(HWND,INT);
+LONG        WINAPI GetWindowLongW(HWND,INT);
 #define     GetWindowLong WINELIB_NAME_AW(GetWindowLong)
-BOOL32      WINAPI GetWindowPlacement32(HWND32,LPWINDOWPLACEMENT32);
-#define     GetWindowPlacement WINELIB_NAME(GetWindowPlacement)
-BOOL32      WINAPI GetWindowRect32(HWND32,LPRECT32);
-#define     GetWindowRect WINELIB_NAME(GetWindowRect)
-INT32       WINAPI GetWindowRgn32(HWND32,HRGN32);
-#define     GetWindowRgn WINELIB_NAME(GetWindowRgn)
-#define     GetWindowTask32(hwnd) ((HTASK32)GetWindowThreadProcessId(hwnd,NULL))
-#define     GetWindowTask WINELIB_NAME(GetWindowTask)
-INT32       WINAPI GetWindowText32A(HWND32,LPSTR,INT32);
-INT32       WINAPI GetWindowText32W(HWND32,LPWSTR,INT32);
+BOOL      WINAPI GetWindowPlacement(HWND,LPWINDOWPLACEMENT);
+BOOL      WINAPI GetWindowRect(HWND,LPRECT);
+INT       WINAPI GetWindowRgn(HWND,HRGN);
+#define     GetWindowTask(hwnd) ((HTASK)GetWindowThreadProcessId(hwnd,NULL))
+INT       WINAPI GetWindowTextA(HWND,LPSTR,INT);
+INT       WINAPI GetWindowTextW(HWND,LPWSTR,INT);
 #define     GetWindowText WINELIB_NAME_AW(GetWindowText)
-INT32       WINAPI GetWindowTextLength32A(HWND32);
-INT32       WINAPI GetWindowTextLength32W(HWND32);
+INT       WINAPI GetWindowTextLengthA(HWND);
+INT       WINAPI GetWindowTextLengthW(HWND);
 #define     GetWindowTextLength WINELIB_NAME_AW(GetWindowTextLength)
-WORD        WINAPI GetWindowWord32(HWND32,INT32);
-#define     GetWindowWord WINELIB_NAME(GetWindowWord)
-ATOM        WINAPI GlobalAddAtom32A(LPCSTR);
-ATOM        WINAPI GlobalAddAtom32W(LPCWSTR);
+WORD        WINAPI GetWindowWord(HWND,INT);
+ATOM        WINAPI GlobalAddAtomA(LPCSTR);
+ATOM        WINAPI GlobalAddAtomW(LPCWSTR);
 #define     GlobalAddAtom WINELIB_NAME_AW(GlobalAddAtom)
-ATOM        WINAPI GlobalFindAtom32A(LPCSTR);
-ATOM        WINAPI GlobalFindAtom32W(LPCWSTR);
+ATOM        WINAPI GlobalFindAtomA(LPCSTR);
+ATOM        WINAPI GlobalFindAtomW(LPCWSTR);
 #define     GlobalFindAtom WINELIB_NAME_AW(GlobalFindAtom)
-UINT32      WINAPI GlobalGetAtomName32A(ATOM,LPSTR,INT32);
-UINT32      WINAPI GlobalGetAtomName32W(ATOM,LPWSTR,INT32);
+UINT      WINAPI GlobalGetAtomNameA(ATOM,LPSTR,INT);
+UINT      WINAPI GlobalGetAtomNameW(ATOM,LPWSTR,INT);
 #define     GlobalGetAtomName WINELIB_NAME_AW(GlobalGetAtomName)
-BOOL32      WINAPI GrayString32A(HDC32,HBRUSH32,GRAYSTRINGPROC32,LPARAM,
-                                 INT32,INT32,INT32,INT32,INT32);
-BOOL32      WINAPI GrayString32W(HDC32,HBRUSH32,GRAYSTRINGPROC32,LPARAM,
-                                 INT32,INT32,INT32,INT32,INT32);
+BOOL      WINAPI GrayStringA(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,
+                                 INT,INT,INT,INT,INT);
+BOOL      WINAPI GrayStringW(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,
+                                 INT,INT,INT,INT,INT);
 #define     GrayString WINELIB_NAME_AW(GrayString)
-BOOL32      WINAPI HideCaret32(HWND32);
-#define     HideCaret WINELIB_NAME(HideCaret)
-BOOL32      WINAPI HiliteMenuItem32(HWND32,HMENU32,UINT32,UINT32);
-#define     HiliteMenuItem WINELIB_NAME(HiliteMenuItem)
-BOOL32      WINAPI InflateRect32(LPRECT32,INT32,INT32);
-#define     InflateRect WINELIB_NAME(InflateRect)
-BOOL32      WINAPI InSendMessage32(void);
-#define     InSendMessage WINELIB_NAME(InSendMessage)
-BOOL32      WINAPI InsertMenu32A(HMENU32,UINT32,UINT32,UINT32,LPCSTR);
-BOOL32      WINAPI InsertMenu32W(HMENU32,UINT32,UINT32,UINT32,LPCWSTR);
+BOOL      WINAPI HideCaret(HWND);
+BOOL      WINAPI HiliteMenuItem(HWND,HMENU,UINT,UINT);
+BOOL      WINAPI InflateRect(LPRECT,INT,INT);
+BOOL      WINAPI InSendMessage(void);
+BOOL      WINAPI InsertMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
+BOOL      WINAPI InsertMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
 #define     InsertMenu WINELIB_NAME_AW(InsertMenu)
-BOOL32      WINAPI InsertMenuItem32A(HMENU32,UINT32,BOOL32,const MENUITEMINFO32A*);
-BOOL32      WINAPI InsertMenuItem32W(HMENU32,UINT32,BOOL32,const MENUITEMINFO32W*);
+BOOL      WINAPI InsertMenuItemA(HMENU,UINT,BOOL,const MENUITEMINFOA*);
+BOOL      WINAPI InsertMenuItemW(HMENU,UINT,BOOL,const MENUITEMINFOW*);
 #define     InsertMenuItem WINELIB_NAME_AW(InsertMenuItem)
-BOOL32      WINAPI IntersectRect32(LPRECT32,const RECT32*,const RECT32*);
-#define     IntersectRect WINELIB_NAME(IntersectRect)
-BOOL32      WINAPI InvalidateRect32(HWND32,const RECT32*,BOOL32);
-#define     InvalidateRect WINELIB_NAME(InvalidateRect)
-BOOL32      WINAPI InvalidateRgn32(HWND32,HRGN32,BOOL32);
-#define     InvalidateRgn WINELIB_NAME(InvalidateRgn)
-BOOL32      WINAPI InvertRect32(HDC32,const RECT32*);
-#define     InvertRect WINELIB_NAME(InvertRect)
-BOOL32      WINAPI IsCharAlpha32A(CHAR);
-BOOL32      WINAPI IsCharAlpha32W(WCHAR);
+BOOL      WINAPI IntersectRect(LPRECT,const RECT*,const RECT*);
+BOOL      WINAPI InvalidateRect(HWND,const RECT*,BOOL);
+BOOL      WINAPI InvalidateRgn(HWND,HRGN,BOOL);
+BOOL      WINAPI InvertRect(HDC,const RECT*);
+BOOL      WINAPI IsCharAlphaA(CHAR);
+BOOL      WINAPI IsCharAlphaW(WCHAR);
 #define     IsCharAlpha WINELIB_NAME_AW(IsCharAlpha)
-BOOL32      WINAPI IsCharAlphaNumeric32A(CHAR);
-BOOL32      WINAPI IsCharAlphaNumeric32W(WCHAR);
+BOOL      WINAPI IsCharAlphaNumericA(CHAR);
+BOOL      WINAPI IsCharAlphaNumericW(WCHAR);
 #define     IsCharAlphaNumeric WINELIB_NAME_AW(IsCharAlphaNumeric)
-BOOL32      WINAPI IsCharLower32A(CHAR);
-BOOL32      WINAPI IsCharLower32W(WCHAR);
+BOOL      WINAPI IsCharLowerA(CHAR);
+BOOL      WINAPI IsCharLowerW(WCHAR);
 #define     IsCharLower WINELIB_NAME_AW(IsCharLower)
-BOOL32      WINAPI IsCharUpper32A(CHAR);
-BOOL32      WINAPI IsCharUpper32W(WCHAR);
+BOOL      WINAPI IsCharUpperA(CHAR);
+BOOL      WINAPI IsCharUpperW(WCHAR);
 #define     IsCharUpper WINELIB_NAME_AW(IsCharUpper)
-BOOL32      WINAPI IsChild32(HWND32,HWND32);
-#define     IsChild WINELIB_NAME(IsChild)
-BOOL32      WINAPI IsClipboardFormatAvailable32(UINT32);
-#define     IsClipboardFormatAvailable WINELIB_NAME(IsClipboardFormatAvailable)
-BOOL32      WINAPI IsDialogMessage32A(HWND32,LPMSG32);
-BOOL32      WINAPI IsDialogMessage32W(HWND32,LPMSG32);
+BOOL      WINAPI IsChild(HWND,HWND);
+BOOL      WINAPI IsClipboardFormatAvailable(UINT);
+BOOL      WINAPI IsDialogMessageA(HWND,LPMSG);
+BOOL      WINAPI IsDialogMessageW(HWND,LPMSG);
 #define     IsDialogMessage WINELIB_NAME_AW(IsDialogMessage)
-UINT32      WINAPI IsDlgButtonChecked32(HWND32,UINT32);
-#define     IsDlgButtonChecked WINELIB_NAME(IsDlgButtonChecked)
-BOOL32      WINAPI IsIconic32(HWND32);
-#define     IsIconic WINELIB_NAME(IsIconic)
-BOOL32      WINAPI IsMenu32(HMENU32);
-#define     IsMenu WINELIB_NAME(IsMenu)
-BOOL32      WINAPI IsRectEmpty32(const RECT32*);
-#define     IsRectEmpty WINELIB_NAME(IsRectEmpty)
-BOOL32      WINAPI IsWindow32(HWND32);
-#define     IsWindow WINELIB_NAME(IsWindow)
-BOOL32      WINAPI IsWindowEnabled32(HWND32);
-#define     IsWindowEnabled WINELIB_NAME(IsWindowEnabled)
-BOOL32      WINAPI IsWindowVisible32(HWND32);
-#define     IsWindowVisible WINELIB_NAME(IsWindowVisible)
-BOOL32      WINAPI IsZoomed32(HWND32);
-#define     IsZoomed WINELIB_NAME(IsZoomed)
-BOOL32      WINAPI KillSystemTimer32(HWND32,UINT32);
-#define     KillSystemTimer WINELIB_NAME(KillSystemTimer)
-BOOL32      WINAPI KillTimer32(HWND32,UINT32);
-#define     KillTimer WINELIB_NAME(KillTimer)
-HACCEL32    WINAPI LoadAccelerators32A(HINSTANCE32,LPCSTR);
-HACCEL32    WINAPI LoadAccelerators32W(HINSTANCE32,LPCWSTR);
+UINT      WINAPI IsDlgButtonChecked(HWND,UINT);
+BOOL      WINAPI IsIconic(HWND);
+BOOL      WINAPI IsMenu(HMENU);
+BOOL      WINAPI IsRectEmpty(const RECT*);
+BOOL      WINAPI IsWindow(HWND);
+BOOL      WINAPI IsWindowEnabled(HWND);
+BOOL      WINAPI IsWindowVisible(HWND);
+BOOL      WINAPI IsZoomed(HWND);
+BOOL      WINAPI KillSystemTimer(HWND,UINT);
+BOOL      WINAPI KillTimer(HWND,UINT);
+HACCEL    WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
+HACCEL    WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
 #define     LoadAccelerators WINELIB_NAME_AW(LoadAccelerators)
-HBITMAP32   WINAPI LoadBitmap32A(HANDLE32,LPCSTR);
-HBITMAP32   WINAPI LoadBitmap32W(HANDLE32,LPCWSTR);
+HBITMAP   WINAPI LoadBitmapA(HANDLE,LPCSTR);
+HBITMAP   WINAPI LoadBitmapW(HANDLE,LPCWSTR);
 #define     LoadBitmap WINELIB_NAME_AW(LoadBitmap)
-HCURSOR32   WINAPI LoadCursor32A(HINSTANCE32,LPCSTR);
-HCURSOR32   WINAPI LoadCursor32W(HINSTANCE32,LPCWSTR);
+HCURSOR   WINAPI LoadCursorA(HINSTANCE,LPCSTR);
+HCURSOR   WINAPI LoadCursorW(HINSTANCE,LPCWSTR);
 #define     LoadCursor WINELIB_NAME_AW(LoadCursor)
-HCURSOR32   WINAPI LoadCursorFromFile32A(LPCSTR);
-HCURSOR32   WINAPI LoadCursorFromFile32W(LPCWSTR);
+HCURSOR   WINAPI LoadCursorFromFileA(LPCSTR);
+HCURSOR   WINAPI LoadCursorFromFileW(LPCWSTR);
 #define     LoadCursorFromFile WINELIB_NAME_AW(LoadCursorFromFile)
-HICON32     WINAPI LoadIcon32A(HINSTANCE32,LPCSTR);
-HICON32     WINAPI LoadIcon32W(HINSTANCE32,LPCWSTR);
+HICON     WINAPI LoadIconA(HINSTANCE,LPCSTR);
+HICON     WINAPI LoadIconW(HINSTANCE,LPCWSTR);
 #define     LoadIcon WINELIB_NAME_AW(LoadIcon)
-HANDLE32    WINAPI LoadImage32A(HINSTANCE32,LPCSTR,UINT32,INT32,INT32,UINT32);
-HANDLE32    WINAPI LoadImage32W(HINSTANCE32,LPCWSTR,UINT32,INT32,INT32,UINT32);
+HANDLE    WINAPI LoadImageA(HINSTANCE,LPCSTR,UINT,INT,INT,UINT);
+HANDLE    WINAPI LoadImageW(HINSTANCE,LPCWSTR,UINT,INT,INT,UINT);
 #define     LoadImage WINELIB_NAME_AW(LoadImage)
-HMENU32     WINAPI LoadMenu32A(HINSTANCE32,LPCSTR);
-HMENU32     WINAPI LoadMenu32W(HINSTANCE32,LPCWSTR);
+HMENU     WINAPI LoadMenuA(HINSTANCE,LPCSTR);
+HMENU     WINAPI LoadMenuW(HINSTANCE,LPCWSTR);
 #define     LoadMenu WINELIB_NAME_AW(LoadMenu)
-HMENU32     WINAPI LoadMenuIndirect32A(LPCVOID);
-HMENU32     WINAPI LoadMenuIndirect32W(LPCVOID);
+HMENU     WINAPI LoadMenuIndirectA(LPCVOID);
+HMENU     WINAPI LoadMenuIndirectW(LPCVOID);
 #define     LoadMenuIndirect WINELIB_NAME_AW(LoadMenuIndirect)
-INT32       WINAPI LoadString32A(HINSTANCE32,UINT32,LPSTR,INT32);
-INT32       WINAPI LoadString32W(HINSTANCE32,UINT32,LPWSTR,INT32);
+INT       WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,INT);
+INT       WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,INT);
 #define     LoadString WINELIB_NAME_AW(LoadString)
-BOOL32      WINAPI LockWindowUpdate32(HWND32);
-#define     LockWindowUpdate WINELIB_NAME(LockWindowUpdate)
-INT32       WINAPI LookupIconIdFromDirectory32(LPBYTE,BOOL32);
-#define     LookupIconIdFromDirectory WINELIB_NAME(LookupIconIdFromDirectory)
-INT32       WINAPI LookupIconIdFromDirectoryEx32(LPBYTE,BOOL32,INT32,INT32,UINT32);
-#define     LookupIconIdFromDirectoryEx WINELIB_NAME(LookupIconIdFromDirectoryEx)
-UINT32      WINAPI MapVirtualKey32A(UINT32,UINT32);
-UINT32      WINAPI MapVirtualKey32W(UINT32,UINT32);
+BOOL      WINAPI LockWindowUpdate(HWND);
+INT       WINAPI LookupIconIdFromDirectory(LPBYTE,BOOL);
+INT       WINAPI LookupIconIdFromDirectoryEx(LPBYTE,BOOL,INT,INT,UINT);
+UINT      WINAPI MapVirtualKeyA(UINT,UINT);
+UINT      WINAPI MapVirtualKeyW(UINT,UINT);
 #define     MapVirtualKey WINELIB_NAME_AW(MapVirtualKey)
-UINT32      WINAPI MapVirtualKeyEx32A(UINT32,UINT32,HKL32);
+UINT      WINAPI MapVirtualKeyEx32A(UINT,UINT,HKL);
 #define     MapVirtualKeyEx WINELIB_NAME_AW(MapVirtualKeyEx)
-BOOL32      WINAPI MapDialogRect32(HWND32,LPRECT32);
-#define     MapDialogRect WINELIB_NAME(MapDialogRect)
-INT32       WINAPI MapWindowPoints32(HWND32,HWND32,LPPOINT32,UINT32);
-#define     MapWindowPoints WINELIB_NAME(MapWindowPoints)
-BOOL32      WINAPI MessageBeep32(UINT32);
-#define     MessageBeep WINELIB_NAME(MessageBeep)
-INT32       WINAPI MessageBox32A(HWND32,LPCSTR,LPCSTR,UINT32);
-INT32       WINAPI MessageBox32W(HWND32,LPCWSTR,LPCWSTR,UINT32);
+BOOL      WINAPI MapDialogRect(HWND,LPRECT);
+INT       WINAPI MapWindowPoints(HWND,HWND,LPPOINT,UINT);
+BOOL      WINAPI MessageBeep(UINT);
+INT       WINAPI MessageBoxA(HWND,LPCSTR,LPCSTR,UINT);
+INT       WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
 #define     MessageBox WINELIB_NAME_AW(MessageBox)
-INT32       WINAPI MessageBoxIndirect32A(LPMSGBOXPARAMS32A);
-INT32       WINAPI MessageBoxIndirect32W(LPMSGBOXPARAMS32W);
+INT       WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA);
+INT       WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW);
 #define     MessageBoxIndirect WINELIB_NAME_AW(MessageBoxIndirect)
-BOOL32      WINAPI ModifyMenu32A(HMENU32,UINT32,UINT32,UINT32,LPCSTR);
-BOOL32      WINAPI ModifyMenu32W(HMENU32,UINT32,UINT32,UINT32,LPCWSTR);
+BOOL      WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
+BOOL      WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
 #define     ModifyMenu WINELIB_NAME_AW(ModifyMenu)
-BOOL32      WINAPI MoveWindow32(HWND32,INT32,INT32,INT32,INT32,BOOL32);
-#define     MoveWindow WINELIB_NAME(MoveWindow)
-BOOL32      WINAPI OemToChar32A(LPCSTR,LPSTR);
-BOOL32      WINAPI OemToChar32W(LPCSTR,LPWSTR);
+BOOL      WINAPI MoveWindow(HWND,INT,INT,INT,INT,BOOL);
+BOOL      WINAPI OemToCharA(LPCSTR,LPSTR);
+BOOL      WINAPI OemToCharW(LPCSTR,LPWSTR);
 #define     OemToChar WINELIB_NAME_AW(OemToChar)
-BOOL32      WINAPI OemToCharBuff32A(LPCSTR,LPSTR,DWORD);
-BOOL32      WINAPI OemToCharBuff32W(LPCSTR,LPWSTR,DWORD);
+BOOL      WINAPI OemToCharBuffA(LPCSTR,LPSTR,DWORD);
+BOOL      WINAPI OemToCharBuffW(LPCSTR,LPWSTR,DWORD);
 #define     OemToCharBuff WINELIB_NAME_AW(OemToCharBuff)
-BOOL32      WINAPI OffsetRect32(LPRECT32,INT32,INT32);
-#define     OffsetRect WINELIB_NAME(OffsetRect)
-BOOL32      WINAPI OpenClipboard32(HWND32);
-#define     OpenClipboard WINELIB_NAME(OpenClipboard)
-BOOL32      WINAPI OpenIcon32(HWND32);
-#define     OpenIcon WINELIB_NAME(OpenIcon)
-BOOL32      WINAPI PeekMessage32A(LPMSG32,HWND32,UINT32,UINT32,UINT32);
-BOOL32      WINAPI PeekMessage32W(LPMSG32,HWND32,UINT32,UINT32,UINT32);
+BOOL      WINAPI OffsetRect(LPRECT,INT,INT);
+BOOL      WINAPI OpenClipboard(HWND);
+BOOL      WINAPI OpenIcon(HWND);
+BOOL      WINAPI PeekMessageA(LPMSG,HWND,UINT,UINT,UINT);
+BOOL      WINAPI PeekMessageW(LPMSG,HWND,UINT,UINT,UINT);
 #define     PeekMessage WINELIB_NAME_AW(PeekMessage)
-#define     PostAppMessage32A(thread,msg,wparam,lparam) \
-            PostThreadMessage32A((DWORD)(thread),msg,wparam,lparam)
-#define     PostAppMessage32W(thread,msg,wparam,lparam) \
-            PostThreadMessage32W((DWORD)(thread),msg,wparam,lparam)
+#define     PostAppMessageA(thread,msg,wparam,lparam) \
+            PostThreadMessageA((DWORD)(thread),msg,wparam,lparam)
+#define     PostAppMessageW(thread,msg,wparam,lparam) \
+            PostThreadMessageW((DWORD)(thread),msg,wparam,lparam)
 #define     PostAppMessage WINELIB_NAME_AW(PostAppMessage)
-BOOL32      WINAPI PostMessage32A(HWND32,UINT32,WPARAM32,LPARAM);
-BOOL32      WINAPI PostMessage32W(HWND32,UINT32,WPARAM32,LPARAM);
+BOOL      WINAPI PostMessageA(HWND,UINT,WPARAM,LPARAM);
+BOOL      WINAPI PostMessageW(HWND,UINT,WPARAM,LPARAM);
 #define     PostMessage WINELIB_NAME_AW(PostMessage)
-void        WINAPI PostQuitMessage32(INT32);
-#define     PostQuitMessage WINELIB_NAME(PostQuitMessage)
-BOOL32      WINAPI PtInRect32(const RECT32*,POINT32);
-#define     PtInRect WINELIB_NAME(PtInRect)
-BOOL32      WINAPI RedrawWindow32(HWND32,const RECT32*,HRGN32,UINT32);
-#define     RedrawWindow WINELIB_NAME(RedrawWindow)
-ATOM        WINAPI RegisterClass32A(const WNDCLASS32A *);
-ATOM        WINAPI RegisterClass32W(const WNDCLASS32W *);
+void        WINAPI PostQuitMessage(INT);
+BOOL      WINAPI PtInRect(const RECT*,POINT);
+BOOL      WINAPI RedrawWindow(HWND,const RECT*,HRGN,UINT);
+ATOM        WINAPI RegisterClassA(const WNDCLASSA *);
+ATOM        WINAPI RegisterClassW(const WNDCLASSW *);
 #define     RegisterClass WINELIB_NAME_AW(RegisterClass)
-ATOM        WINAPI RegisterClassEx32A(const WNDCLASSEX32A *);
-ATOM        WINAPI RegisterClassEx32W(const WNDCLASSEX32W *);
+ATOM        WINAPI RegisterClassExA(const WNDCLASSEXA *);
+ATOM        WINAPI RegisterClassExW(const WNDCLASSEXW *);
 #define     RegisterClassEx WINELIB_NAME_AW(RegisterClassEx)
-UINT32      WINAPI RegisterClipboardFormat32A(LPCSTR);
-UINT32      WINAPI RegisterClipboardFormat32W(LPCWSTR);
+UINT      WINAPI RegisterClipboardFormatA(LPCSTR);
+UINT      WINAPI RegisterClipboardFormatW(LPCWSTR);
 #define     RegisterClipboardFormat WINELIB_NAME_AW(RegisterClipboardFormat)
-WORD        WINAPI RegisterWindowMessage32A(LPCSTR);
-WORD        WINAPI RegisterWindowMessage32W(LPCWSTR);
+WORD        WINAPI RegisterWindowMessageA(LPCSTR);
+WORD        WINAPI RegisterWindowMessageW(LPCWSTR);
 #define     RegisterWindowMessage WINELIB_NAME_AW(RegisterWindowMessage)
-INT32       WINAPI ReleaseDC32(HWND32,HDC32);
-#define     ReleaseDC WINELIB_NAME(ReleaseDC)
-BOOL32      WINAPI RemoveMenu32(HMENU32,UINT32,UINT32);
-#define     RemoveMenu WINELIB_NAME(RemoveMenu)
-HANDLE32    WINAPI RemoveProp32A(HWND32,LPCSTR);
-HANDLE32    WINAPI RemoveProp32W(HWND32,LPCWSTR);
+INT       WINAPI ReleaseDC(HWND,HDC);
+BOOL      WINAPI RemoveMenu(HMENU,UINT,UINT);
+HANDLE    WINAPI RemovePropA(HWND,LPCSTR);
+HANDLE    WINAPI RemovePropW(HWND,LPCWSTR);
 #define     RemoveProp WINELIB_NAME_AW(RemoveProp)
-BOOL32      WINAPI ReplyMessage32(LRESULT);
-#define     ReplyMessage WINELIB_NAME(ReplyMessage)
-BOOL32      WINAPI ScreenToClient32(HWND32,LPPOINT32);
-#define     ScreenToClient WINELIB_NAME(ScreenToClient)
-VOID        WINAPI ScrollChildren32(HWND32,UINT32,WPARAM32,LPARAM);
-#define     ScrollChildren WINELIB_NAME(ScrollChildren)
-BOOL32      WINAPI ScrollDC32(HDC32,INT32,INT32,const RECT32*,const RECT32*,
-                      HRGN32,LPRECT32);
-#define     ScrollDC WINELIB_NAME(ScrollDC)
-BOOL32      WINAPI ScrollWindow32(HWND32,INT32,INT32,const RECT32*,const RECT32*);
-#define     ScrollWindow WINELIB_NAME(ScrollWindow)
-INT32       WINAPI ScrollWindowEx32(HWND32,INT32,INT32,const RECT32*,
-                                    const RECT32*,HRGN32,LPRECT32,UINT32);
-#define     ScrollWindowEx WINELIB_NAME(ScrollWindowEx)
-LRESULT     WINAPI SendDlgItemMessage32A(HWND32,INT32,UINT32,WPARAM32,LPARAM);
-LRESULT     WINAPI SendDlgItemMessage32W(HWND32,INT32,UINT32,WPARAM32,LPARAM);
+BOOL      WINAPI ReplyMessage(LRESULT);
+BOOL      WINAPI ScreenToClient(HWND,LPPOINT);
+VOID        WINAPI ScrollChildren(HWND,UINT,WPARAM,LPARAM);
+BOOL      WINAPI ScrollDC(HDC,INT,INT,const RECT*,const RECT*,
+                      HRGN,LPRECT);
+BOOL      WINAPI ScrollWindow(HWND,INT,INT,const RECT*,const RECT*);
+INT       WINAPI ScrollWindowEx(HWND,INT,INT,const RECT*,
+                                    const RECT*,HRGN,LPRECT,UINT);
+LRESULT     WINAPI SendDlgItemMessageA(HWND,INT,UINT,WPARAM,LPARAM);
+LRESULT     WINAPI SendDlgItemMessageW(HWND,INT,UINT,WPARAM,LPARAM);
 #define     SendDlgItemMessage WINELIB_NAME_AW(SendDlgItemMessage)
-LRESULT     WINAPI SendMessage32A(HWND32,UINT32,WPARAM32,LPARAM);
-LRESULT     WINAPI SendMessage32W(HWND32,UINT32,WPARAM32,LPARAM);
+LRESULT     WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM);
+LRESULT     WINAPI SendMessageW(HWND,UINT,WPARAM,LPARAM);
 #define     SendMessage WINELIB_NAME_AW(SendMessage)
-LRESULT     WINAPI SendMessageTimeout32A(HWND32,UINT32,WPARAM32,LPARAM,UINT32,
-					 UINT32,LPDWORD);
-LRESULT     WINAPI SendMessageTimeout32W(HWND32,UINT32,WPARAM32,LPARAM,UINT32,
-					 UINT32,LPDWORD);
+LRESULT     WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT,
+					 UINT,LPDWORD);
+LRESULT     WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT,
+					 UINT,LPDWORD);
 #define     SendMessageTimeout WINELIB_NAME_AW(SendMessageTimeout)
-HWND32      WINAPI SetActiveWindow32(HWND32);
-#define     SetActiveWindow WINELIB_NAME(SetActiveWindow)
-HWND32      WINAPI SetCapture32(HWND32);
-#define     SetCapture WINELIB_NAME(SetCapture)
-BOOL32      WINAPI SetCaretBlinkTime32(UINT32);
-#define     SetCaretBlinkTime WINELIB_NAME(SetCaretBlinkTime)
-BOOL32      WINAPI SetCaretPos32(INT32,INT32);
-#define     SetCaretPos WINELIB_NAME(SetCaretPos)
-LONG        WINAPI SetClassLong32A(HWND32,INT32,LONG);
-LONG        WINAPI SetClassLong32W(HWND32,INT32,LONG);
+HWND      WINAPI SetActiveWindow(HWND);
+HWND      WINAPI SetCapture(HWND);
+BOOL      WINAPI SetCaretBlinkTime(UINT);
+BOOL      WINAPI SetCaretPos(INT,INT);
+LONG        WINAPI SetClassLongA(HWND,INT,LONG);
+LONG        WINAPI SetClassLongW(HWND,INT,LONG);
 #define     SetClassLong WINELIB_NAME_AW(SetClassLong)
-WORD        WINAPI SetClassWord32(HWND32,INT32,WORD);
-#define     SetClassWord WINELIB_NAME(SetClassWord)
-HANDLE32    WINAPI SetClipboardData32(UINT32,HANDLE32);
-#define     SetClipboardData WINELIB_NAME(SetClipboardData)
-HWND32      WINAPI SetClipboardViewer32(HWND32);
-#define     SetClipboardViewer WINELIB_NAME(SetClipboardViewer)
-BOOL32      WINAPI SetCommBreak32(INT32);
-#define     SetCommBreak WINELIB_NAME(SetCommBreak)
-HCURSOR32   WINAPI SetCursor32(HCURSOR32);
-#define     SetCursor WINELIB_NAME(SetCursor)
-BOOL32      WINAPI SetCursorPos32(INT32,INT32);
-#define     SetCursorPos WINELIB_NAME(SetCursorPos)
-BOOL32      WINAPI SetDeskWallPaper32(LPCSTR);
-#define     SetDeskWallPaper WINELIB_NAME(SetDeskWallPaper)
-BOOL32      WINAPI SetDlgItemInt32(HWND32,INT32,UINT32,BOOL32);
-#define     SetDlgItemInt WINELIB_NAME(SetDlgItemInt)
-BOOL32      WINAPI SetDlgItemText32A(HWND32,INT32,LPCSTR);
-BOOL32      WINAPI SetDlgItemText32W(HWND32,INT32,LPCWSTR);
+WORD        WINAPI SetClassWord(HWND,INT,WORD);
+HANDLE    WINAPI SetClipboardData(UINT,HANDLE);
+HWND      WINAPI SetClipboardViewer(HWND);
+BOOL      WINAPI SetCommBreak(INT);
+HCURSOR   WINAPI SetCursor(HCURSOR);
+BOOL      WINAPI SetCursorPos(INT,INT);
+BOOL      WINAPI SetDeskWallPaper(LPCSTR);
+BOOL      WINAPI SetDlgItemInt(HWND,INT,UINT,BOOL);
+BOOL      WINAPI SetDlgItemTextA(HWND,INT,LPCSTR);
+BOOL      WINAPI SetDlgItemTextW(HWND,INT,LPCWSTR);
 #define     SetDlgItemText WINELIB_NAME_AW(SetDlgItemText)
-BOOL32      WINAPI SetDoubleClickTime32(UINT32);
-#define     SetDoubleClickTime WINELIB_NAME(SetDoubleClickTime)
-HWND32      WINAPI SetFocus32(HWND32);
-#define     SetFocus WINELIB_NAME(SetFocus)
-BOOL32      WINAPI SetForegroundWindow32(HWND32);
-#define     SetForegroundWindow WINELIB_NAME(SetForegroundWindow)
-void        WINAPI SetInternalWindowPos32(HWND32,UINT32,LPRECT32,LPPOINT32);
-#define     SetInternalWindowPos WINELIB_NAME(SetInternalWindowPos)
-BOOL32      WINAPI SetMenu32(HWND32,HMENU32);
-#define     SetMenu WINELIB_NAME(SetMenu)
-BOOL32      WINAPI SetMenuContextHelpId32(HMENU32,DWORD);
-#define     SetMenuContextHelpId WINELIB_NAME(SetMenuContextHelpId)
-BOOL32      WINAPI SetMenuItemBitmaps32(HMENU32,UINT32,UINT32,HBITMAP32,HBITMAP32);
-#define     SetMenuItemBitmaps WINELIB_NAME(SetMenuItemBitmaps)
-BOOL32      WINAPI SetMessageQueue32(INT32);
-#define     SetMessageQueue WINELIB_NAME(SetMessageQueue)
-HWND32      WINAPI SetParent32(HWND32,HWND32);
-#define     SetParent WINELIB_NAME(SetParent)
-BOOL32      WINAPI SetProp32A(HWND32,LPCSTR,HANDLE32);
-BOOL32      WINAPI SetProp32W(HWND32,LPCWSTR,HANDLE32);
+BOOL      WINAPI SetDoubleClickTime(UINT);
+HWND      WINAPI SetFocus(HWND);
+BOOL      WINAPI SetForegroundWindow(HWND);
+void        WINAPI SetInternalWindowPos(HWND,UINT,LPRECT,LPPOINT);
+BOOL      WINAPI SetMenu(HWND,HMENU);
+BOOL      WINAPI SetMenuContextHelpId(HMENU,DWORD);
+BOOL      WINAPI SetMenuItemBitmaps(HMENU,UINT,UINT,HBITMAP,HBITMAP);
+BOOL      WINAPI SetMessageQueue(INT);
+HWND      WINAPI SetParent(HWND,HWND);
+BOOL      WINAPI SetPropA(HWND,LPCSTR,HANDLE);
+BOOL      WINAPI SetPropW(HWND,LPCWSTR,HANDLE);
 #define     SetProp WINELIB_NAME_AW(SetProp)
-BOOL32      WINAPI SetRect32(LPRECT32,INT32,INT32,INT32,INT32);
-#define     SetRect WINELIB_NAME(SetRect)
-BOOL32      WINAPI SetRectEmpty32(LPRECT32);
-#define     SetRectEmpty WINELIB_NAME(SetRectEmpty)
-INT32       WINAPI SetScrollInfo32(HWND32,INT32,const SCROLLINFO*,BOOL32);
-#define     SetScrollInfo WINELIB_NAME(SetScrollInfo)
-INT32       WINAPI SetScrollPos32(HWND32,INT32,INT32,BOOL32);
-#define     SetScrollPos WINELIB_NAME(SetScrollPos)
-BOOL32      WINAPI SetScrollRange32(HWND32,INT32,INT32,INT32,BOOL32);
-#define     SetScrollRange WINELIB_NAME(SetScrollRange)
-BOOL32      WINAPI SetSysColors32(INT32,const INT32*,const COLORREF*);
-#define     SetSysColors WINELIB_NAME(SetSysColors)
-#define     SetSysModalWindow32(hwnd) ((HWND32)0)
-#define     SetSysModalWindow WINELIB_NAME(SetSysModalWindow)
-BOOL32      WINAPI SetSystemMenu32(HWND32,HMENU32);
-#define     SetSystemMenu WINELIB_NAME(SetSystemMenu)
-UINT32      WINAPI SetSystemTimer32(HWND32,UINT32,UINT32,TIMERPROC32);
-#define     SetSystemTimer WINELIB_NAME(SetSystemTimer)
-UINT32      WINAPI SetTimer32(HWND32,UINT32,UINT32,TIMERPROC32);
-#define     SetTimer WINELIB_NAME(SetTimer)
-LONG        WINAPI SetWindowLong32A(HWND32,INT32,LONG);
-LONG        WINAPI SetWindowLong32W(HWND32,INT32,LONG);
+BOOL      WINAPI SetRect(LPRECT,INT,INT,INT,INT);
+BOOL      WINAPI SetRectEmpty(LPRECT);
+INT       WINAPI SetScrollInfo(HWND,INT,const SCROLLINFO*,BOOL);
+INT       WINAPI SetScrollPos(HWND,INT,INT,BOOL);
+BOOL      WINAPI SetScrollRange(HWND,INT,INT,INT,BOOL);
+BOOL      WINAPI SetSysColors(INT,const INT*,const COLORREF*);
+#define     SetSysModalWindow(hwnd) ((HWND)0)
+BOOL      WINAPI SetSystemMenu(HWND,HMENU);
+UINT      WINAPI SetSystemTimer(HWND,UINT,UINT,TIMERPROC);
+UINT      WINAPI SetTimer(HWND,UINT,UINT,TIMERPROC);
+LONG        WINAPI SetWindowLongA(HWND,INT,LONG);
+LONG        WINAPI SetWindowLongW(HWND,INT,LONG);
 #define     SetWindowLong WINELIB_NAME_AW(SetWindowLong)
-BOOL32      WINAPI SetWindowPlacement32(HWND32,const WINDOWPLACEMENT32*);
-#define     SetWindowPlacement WINELIB_NAME(SetWindowPlacement)
-HHOOK       WINAPI SetWindowsHook32A(INT32,HOOKPROC32);
-HHOOK       WINAPI SetWindowsHook32W(INT32,HOOKPROC32);
+BOOL      WINAPI SetWindowPlacement(HWND,const WINDOWPLACEMENT*);
+HHOOK       WINAPI SetWindowsHookA(INT,HOOKPROC);
+HHOOK       WINAPI SetWindowsHookW(INT,HOOKPROC);
 #define     SetWindowsHook WINELIB_NAME_AW(SetWindowsHook)
-HHOOK       WINAPI SetWindowsHookEx32A(INT32,HOOKPROC32,HINSTANCE32,DWORD);
-HHOOK       WINAPI SetWindowsHookEx32W(INT32,HOOKPROC32,HINSTANCE32,DWORD);
+HHOOK       WINAPI SetWindowsHookExA(INT,HOOKPROC,HINSTANCE,DWORD);
+HHOOK       WINAPI SetWindowsHookExW(INT,HOOKPROC,HINSTANCE,DWORD);
 #define     SetWindowsHookEx WINELIB_NAME_AW(SetWindowsHookEx)
-BOOL32      WINAPI SetWindowPos32(HWND32,HWND32,INT32,INT32,INT32,INT32,WORD);
-#define     SetWindowPos WINELIB_NAME(SetWindowPos)
-INT32       WINAPI SetWindowRgn32(HWND32,HRGN32,BOOL32);
-#define     SetWindowRgn WINELIB_NAME(SetWindowRgn)
-BOOL32      WINAPI SetWindowText32A(HWND32,LPCSTR);
-BOOL32      WINAPI SetWindowText32W(HWND32,LPCWSTR);
+BOOL      WINAPI SetWindowPos(HWND,HWND,INT,INT,INT,INT,WORD);
+INT       WINAPI SetWindowRgn(HWND,HRGN,BOOL);
+BOOL      WINAPI SetWindowTextA(HWND,LPCSTR);
+BOOL      WINAPI SetWindowTextW(HWND,LPCWSTR);
 #define     SetWindowText WINELIB_NAME_AW(SetWindowText)
-WORD        WINAPI SetWindowWord32(HWND32,INT32,WORD);
-#define     SetWindowWord WINELIB_NAME(SetWindowWord)
-BOOL32      WINAPI ShowCaret32(HWND32);
-#define     ShowCaret WINELIB_NAME(ShowCaret)
-INT32       WINAPI ShowCursor32(BOOL32);
-#define     ShowCursor WINELIB_NAME(ShowCursor)
-BOOL32      WINAPI ShowScrollBar32(HWND32,INT32,BOOL32);
-#define     ShowScrollBar WINELIB_NAME(ShowScrollBar)
-BOOL32      WINAPI ShowOwnedPopups32(HWND32,BOOL32);
-#define     ShowOwnedPopups WINELIB_NAME(ShowOwnedPopups)
-BOOL32      WINAPI ShowWindow32(HWND32,INT32);
-#define     ShowWindow WINELIB_NAME(ShowWindow)
-BOOL32      WINAPI SubtractRect32(LPRECT32,const RECT32*,const RECT32*);
-#define     SubtractRect WINELIB_NAME(SubtractRect)
-BOOL32      WINAPI SwapMouseButton32(BOOL32);
-#define     SwapMouseButton WINELIB_NAME(SwapMouseButton)
-VOID        WINAPI SwitchToThisWindow32(HWND32,BOOL32);
-#define     SwitchToThisWindow WINELIB_NAME(SwitchToThisWindow)
-BOOL32      WINAPI SystemParametersInfo32A(UINT32,UINT32,LPVOID,UINT32);
-BOOL32      WINAPI SystemParametersInfo32W(UINT32,UINT32,LPVOID,UINT32);
+WORD        WINAPI SetWindowWord(HWND,INT,WORD);
+BOOL      WINAPI ShowCaret(HWND);
+INT       WINAPI ShowCursor(BOOL);
+BOOL      WINAPI ShowScrollBar(HWND,INT,BOOL);
+BOOL      WINAPI ShowOwnedPopups(HWND,BOOL);
+BOOL      WINAPI ShowWindow(HWND,INT);
+BOOL      WINAPI SubtractRect(LPRECT,const RECT*,const RECT*);
+BOOL      WINAPI SwapMouseButton(BOOL);
+VOID        WINAPI SwitchToThisWindow(HWND,BOOL);
+BOOL      WINAPI SystemParametersInfoA(UINT,UINT,LPVOID,UINT);
+BOOL      WINAPI SystemParametersInfoW(UINT,UINT,LPVOID,UINT);
 #define     SystemParametersInfo WINELIB_NAME_AW(SystemParametersInfo)
-LONG        WINAPI TabbedTextOut32A(HDC32,INT32,INT32,LPCSTR,INT32,INT32,const INT32*,INT32);
-LONG        WINAPI TabbedTextOut32W(HDC32,INT32,INT32,LPCWSTR,INT32,INT32,const INT32*,INT32);
+LONG        WINAPI TabbedTextOutA(HDC,INT,INT,LPCSTR,INT,INT,const INT*,INT);
+LONG        WINAPI TabbedTextOutW(HDC,INT,INT,LPCWSTR,INT,INT,const INT*,INT);
 #define     TabbedTextOut WINELIB_NAME_AW(TabbedTextOut)
-INT32       WINAPI ToAscii32(UINT32,UINT32,LPBYTE,LPWORD,UINT32);
-#define     ToAscii WINELIB_NAME(ToAscii)
-BOOL32      WINAPI TrackPopupMenu32(HMENU32,UINT32,INT32,INT32,INT32,HWND32,const RECT32*);
-#define     TrackPopupMenu WINELIB_NAME(TrackPopupMenu)
-INT32       WINAPI TranslateAccelerator32(HWND32,HACCEL32,LPMSG32);
-#define     TranslateAccelerator WINELIB_NAME(TranslateAccelerator)
-BOOL32      WINAPI TranslateMDISysAccel32(HWND32,LPMSG32);
-#define     TranslateMDISysAccel WINELIB_NAME(TranslateMDISysAccel)
-BOOL32      WINAPI TranslateMessage32(const MSG32*);
-#define     TranslateMessage WINELIB_NAME(TranslateMessage)
-BOOL32      WINAPI UnhookWindowsHook32(INT32,HOOKPROC32);
-#define     UnhookWindowsHook WINELIB_NAME(UnhookWindowsHook)
-BOOL32      WINAPI UnhookWindowsHookEx32(HHOOK);
-#define     UnhookWindowsHookEx WINELIB_NAME(UnhookWindowsHookEx)
-BOOL32      WINAPI UnionRect32(LPRECT32,const RECT32*,const RECT32*);
-#define     UnionRect WINELIB_NAME(UnionRect)
-BOOL32      WINAPI UnregisterClass32A(LPCSTR,HINSTANCE32);
-BOOL32      WINAPI UnregisterClass32W(LPCWSTR,HINSTANCE32);
+INT       WINAPI ToAscii(UINT,UINT,LPBYTE,LPWORD,UINT);
+BOOL      WINAPI TrackPopupMenu(HMENU,UINT,INT,INT,INT,HWND,const RECT*);
+INT       WINAPI TranslateAccelerator(HWND,HACCEL,LPMSG);
+BOOL      WINAPI TranslateMDISysAccel(HWND,LPMSG);
+BOOL      WINAPI TranslateMessage(const MSG*);
+BOOL      WINAPI UnhookWindowsHook(INT,HOOKPROC);
+BOOL      WINAPI UnhookWindowsHookEx(HHOOK);
+BOOL      WINAPI UnionRect(LPRECT,const RECT*,const RECT*);
+BOOL      WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
+BOOL      WINAPI UnregisterClassW(LPCWSTR,HINSTANCE);
 #define     UnregisterClass WINELIB_NAME_AW(UnregisterClass)
-VOID        WINAPI UpdateWindow32(HWND32);
-#define     UpdateWindow WINELIB_NAME(UpdateWindow)
-VOID        WINAPI ValidateRect32(HWND32,const RECT32*);
-#define     ValidateRect WINELIB_NAME(ValidateRect)
-VOID        WINAPI ValidateRgn32(HWND32,HRGN32);
-#define     ValidateRgn WINELIB_NAME(ValidateRgn)
-WORD        WINAPI VkKeyScan32A(CHAR);
-WORD        WINAPI VkKeyScan32W(WCHAR);
+VOID        WINAPI UpdateWindow(HWND);
+VOID        WINAPI ValidateRect(HWND,const RECT*);
+VOID        WINAPI ValidateRgn(HWND,HRGN);
+WORD        WINAPI VkKeyScanA(CHAR);
+WORD        WINAPI VkKeyScanW(WCHAR);
 #define     VkKeyScan WINELIB_NAME_AW(VkKeyScan)
-HWND32      WINAPI WindowFromDC32(HDC32);
-#define     WindowFromDC WINELIB_NAME(WindowFromDC)
-HWND32      WINAPI WindowFromPoint32(POINT32);
-#define     WindowFromPoint WINELIB_NAME(WindowFromPoint)
-BOOL32      WINAPI WinHelp32A(HWND32,LPCSTR,UINT32,DWORD);
-BOOL32      WINAPI WinHelp32W(HWND32,LPCWSTR,UINT32,DWORD);
+HWND      WINAPI WindowFromDC(HDC);
+HWND      WINAPI WindowFromPoint(POINT);
+BOOL      WINAPI WinHelpA(HWND,LPCSTR,UINT,DWORD);
+BOOL      WINAPI WinHelpW(HWND,LPCWSTR,UINT,DWORD);
 #define     WinHelp WINELIB_NAME_AW(WinHelp)
-UINT32      WINAPI WNetAddConnection32A(LPCSTR,LPCSTR,LPCSTR);
-UINT32      WINAPI WNetAddConnection32W(LPCWSTR,LPCWSTR,LPCWSTR);
+UINT      WINAPI WNetAddConnectionA(LPCSTR,LPCSTR,LPCSTR);
+UINT      WINAPI WNetAddConnectionW(LPCWSTR,LPCWSTR,LPCWSTR);
 #define     WNetAddConnection WINELIB_NAME_AW(WNetAddConnection)
-INT32       WINAPIV wsnprintf32A(LPSTR,UINT32,LPCSTR,...);
-INT32       WINAPIV wsnprintf32W(LPWSTR,UINT32,LPCWSTR,...);
+INT       WINAPIV wsnprintfA(LPSTR,UINT,LPCSTR,...);
+INT       WINAPIV wsnprintfW(LPWSTR,UINT,LPCWSTR,...);
 #define     wsnprintf WINELIB_NAME_AW(wsnprintf)
-INT32       WINAPIV wsprintf32A(LPSTR,LPCSTR,...);
-INT32       WINAPIV wsprintf32W(LPWSTR,LPCWSTR,...);
+INT       WINAPIV wsprintfA(LPSTR,LPCSTR,...);
+INT       WINAPIV wsprintfW(LPWSTR,LPCWSTR,...);
 #define     wsprintf WINELIB_NAME_AW(wsprintf)
-INT32       WINAPI wvsnprintf32A(LPSTR,UINT32,LPCSTR,va_list);
-INT32       WINAPI wvsnprintf32W(LPWSTR,UINT32,LPCWSTR,va_list);
+INT       WINAPI wvsnprintfA(LPSTR,UINT,LPCSTR,va_list);
+INT       WINAPI wvsnprintfW(LPWSTR,UINT,LPCWSTR,va_list);
 #define     wvsnprintf WINELIB_NAME_AW(wvsnprintf)
-INT32       WINAPI wvsprintf32A(LPSTR,LPCSTR,va_list);
-INT32       WINAPI wvsprintf32W(LPWSTR,LPCWSTR,va_list);
+INT       WINAPI wvsprintfA(LPSTR,LPCSTR,va_list);
+INT       WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list);
 #define     wvsprintf WINELIB_NAME_AW(wvsprintf)
 
-BOOL32      WINAPI RegisterShellHook(HWND16,UINT16);
+BOOL      WINAPI RegisterShellHook16(HWND16,UINT16);
 /* NOTE: This is SYSTEM.3, not USER.182, which is also named KillSystemTimer */
 WORD        WINAPI SYSTEM_KillSystemTimer( WORD );
 
 /* Extra functions that don't exist in the Windows API */
 
-HPEN32      WINAPI GetSysColorPen32(INT32);
-INT32       WINAPI LoadMessage32A(HMODULE32,UINT32,WORD,LPSTR,INT32);
-INT32       WINAPI LoadMessage32W(HMODULE32,UINT32,WORD,LPWSTR,INT32);
+HPEN      WINAPI GetSysColorPen(INT);
+INT       WINAPI LoadMessageA(HMODULE,UINT,WORD,LPSTR,INT);
+INT       WINAPI LoadMessageW(HMODULE,UINT,WORD,LPWSTR,INT);
 
-VOID        WINAPI ScreenSwitchEnable(WORD);
+VOID        WINAPI ScreenSwitchEnable16(WORD);
 
 #endif /* __INCLUDE_WINUSER_H */
diff --git a/include/winver.h b/include/winver.h
index a489eb75738..437496762a5 100644
--- a/include/winver.h
+++ b/include/winver.h
@@ -4,25 +4,25 @@
 #include "wintypes.h"
 
 DWORD       WINAPI VerFindFile16(UINT16,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT16*,LPSTR,UINT16*);
-DWORD       WINAPI VerFindFile32A(UINT32,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT32*,LPSTR,UINT32*);
-DWORD       WINAPI VerFindFile32W(UINT32,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT32*,LPWSTR,UINT32*);
+DWORD       WINAPI VerFindFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*,LPSTR,UINT*);
+DWORD       WINAPI VerFindFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*,LPWSTR,UINT*);
 #define     VerFindFile WINELIB_NAME_AW(VerFindFile)
 DWORD       WINAPI VerInstallFile16(UINT16,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT16*);
-DWORD       WINAPI VerInstallFile32A(UINT32,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT32*);
-DWORD       WINAPI VerInstallFile32W(UINT32,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT32*);
+DWORD       WINAPI VerInstallFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*);
+DWORD       WINAPI VerInstallFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*);
 #define     VerInstallFile WINELIB_NAME_AW(VerInstallFile)
 DWORD       WINAPI VerLanguageName16(UINT16,LPSTR,UINT16);
 DWORD       WINAPI VerQueryValue16(SEGPTR,LPCSTR,SEGPTR*,UINT16*);
-DWORD       WINAPI VerQueryValue32A(LPVOID,LPCSTR,LPVOID*,UINT32*);
-DWORD       WINAPI VerQueryValue32W(LPVOID,LPCWSTR,LPVOID*,UINT32*);
+DWORD       WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*);
+DWORD       WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*);
 #define     VerQueryValue WINELIB_NAME_AW(VerQueryValue)
 DWORD       WINAPI GetFileVersionInfoSize16(LPCSTR,LPDWORD);
-DWORD       WINAPI GetFileVersionInfoSize32A(LPCSTR,LPDWORD);
-DWORD       WINAPI GetFileVersionInfoSize32W(LPCWSTR,LPDWORD);
+DWORD       WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD);
+DWORD       WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD);
 #define     GetFileVersionInfoSize WINELIB_NAME_AW(GetFileVersionInfoSize)
 DWORD       WINAPI GetFileVersionInfo16(LPCSTR,DWORD,DWORD,LPVOID);
-DWORD       WINAPI GetFileVersionInfo32A(LPCSTR,DWORD,DWORD,LPVOID);
-DWORD       WINAPI GetFileVersionInfo32W(LPCWSTR,DWORD,DWORD,LPVOID);
+DWORD       WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,LPVOID);
+DWORD       WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,LPVOID);
 #define     GetFileVersionInfo WINELIB_NAME_AW(GetFileVersionInfo)
 
 #endif /* __WINE_WINVER_H */
diff --git a/include/winversion.h b/include/winversion.h
index a9f798e5e44..e3fb5c87906 100644
--- a/include/winversion.h
+++ b/include/winversion.h
@@ -12,6 +12,6 @@ typedef enum
 
 extern WINDOWS_VERSION VERSION_GetVersion(void); 
 extern char *VERSION_GetVersionName(void); 
-extern BOOL32 VERSION_OsIsUnicode(void);
+extern BOOL VERSION_OsIsUnicode(void);
 
 #endif  /* __WINE_WINVERSION_H */
diff --git a/include/wnaspi32.h b/include/wnaspi32.h
index b62a6338753..78702d97d38 100644
--- a/include/wnaspi32.h
+++ b/include/wnaspi32.h
@@ -3,9 +3,9 @@
 
 #pragma pack(1)
 
-typedef union SRB32 * LPSRB32;
+typedef union SRB * LPSRB;
 
-typedef struct tagSRB_HaInquiry32 {
+typedef struct tagSRB_HaInquiry {
  BYTE  SRB_Cmd;                 /* ASPI command code = SC_HA_INQUIRY */
  BYTE  SRB_Status;              /* ASPI command status byte */
  BYTE  SRB_HaId;                /* ASPI host adapter number */
@@ -17,9 +17,9 @@ typedef struct tagSRB_HaInquiry32 {
  BYTE  HA_Identifier[16];       /* String describing the host adapter */
  BYTE  HA_Unique[16];           /* Host Adapter Unique parameters */
  WORD  HA_Rsvd1;
-} SRB_HaInquiry32 WINE_PACKED;
+} SRB_HaInquiry WINE_PACKED;
 
-typedef struct tagSRB_ExecSCSICmd32 {
+typedef struct tagSRB_ExecSCSICmd {
   BYTE        SRB_Cmd;            /* ASPI command code = SC_EXEC_SCSI_CMD */
   BYTE        SRB_Status;         /* ASPI command status byte */
   BYTE        SRB_HaId;           /* ASPI host adapter number */
@@ -39,18 +39,18 @@ typedef struct tagSRB_ExecSCSICmd32 {
   BYTE        SRB_Rsvd3[16];      /* Reserved for expansion */
   BYTE        CDBByte[16];        /* SCSI CDB */
   BYTE        SenseArea[0];       /* Request sense buffer - var length */
-} SRB_ExecSCSICmd32 WINE_PACKED;
+} SRB_ExecSCSICmd WINE_PACKED;
 
-typedef struct tagSRB_Abort32 {
+typedef struct tagSRB_Abort {
   BYTE        SRB_Cmd;            /* ASPI command code = SC_ABORT_SRB */
   BYTE        SRB_Status;         /* ASPI command status byte */
   BYTE        SRB_HaId;           /* ASPI host adapter number */
   BYTE        SRB_Flags;          /* Reserved */
   DWORD       SRB_Hdr_Rsvd;       /* Reserved, MUST = 0 */
-  LPSRB32     SRB_ToAbort;        /* Pointer to SRB to abort */
-} SRB_Abort32 WINE_PACKED;
+  LPSRB     SRB_ToAbort;        /* Pointer to SRB to abort */
+} SRB_Abort WINE_PACKED;
 
-typedef struct tagSRB_BusDeviceReset32 {
+typedef struct tagSRB_BusDeviceReset {
  BYTE         SRB_Cmd;                  /* ASPI command code = SC_RESET_DEV */
  BYTE         SRB_Status;               /* ASPI command status byte */
  BYTE         SRB_HaId;                 /* ASPI host adapter number */
@@ -64,9 +64,9 @@ typedef struct tagSRB_BusDeviceReset32 {
  void         (*SRB_PostProc)();        /* Post routine */
  void         *SRB_Rsvd2;               /* Reserved */
  BYTE         SRB_Rsvd3[32];            /* Reserved */
-} SRB_BusDeviceReset32 WINE_PACKED;
+} SRB_BusDeviceReset WINE_PACKED;
 
-typedef struct tagSRB_GDEVBlock32 {
+typedef struct tagSRB_GDEVBlock {
  BYTE  SRB_Cmd;                 /* ASPI command code = SC_GET_DEV_TYPE */
  BYTE  SRB_Status;              /* ASPI command status byte */
  BYTE  SRB_HaId;                /* ASPI host adapter number */
@@ -76,21 +76,21 @@ typedef struct tagSRB_GDEVBlock32 {
  BYTE  SRB_Lun;                 /* Target's LUN number */
  BYTE  SRB_DeviceType;          /* Target's peripheral device type */
  BYTE  SRB_Rsvd1;
-} SRB_GDEVBlock32 WINE_PACKED;
+} SRB_GDEVBlock WINE_PACKED;
 
-typedef struct tagSRB_Common32 {
+typedef struct tagSRB_Common {
   BYTE  SRB_Cmd;
-} SRB_Common32;
+} SRB_Common;
 
-union SRB32 {
-  SRB_Common32          common;
-  SRB_HaInquiry32       inquiry;
-  SRB_ExecSCSICmd32     cmd;
-  SRB_Abort32           abort;
-  SRB_BusDeviceReset32  reset;
-  SRB_GDEVBlock32       devtype;
+union SRB {
+  SRB_Common          common;
+  SRB_HaInquiry       inquiry;
+  SRB_ExecSCSICmd     cmd;
+  SRB_Abort           abort;
+  SRB_BusDeviceReset  reset;
+  SRB_GDEVBlock       devtype;
 };
 
-typedef union SRB32 SRB32;
+typedef union SRB SRB;
 
 #endif
diff --git a/include/wrc_rsc.h b/include/wrc_rsc.h
index 5cd0a5b8920..2ceaad14a29 100644
--- a/include/wrc_rsc.h
+++ b/include/wrc_rsc.h
@@ -24,22 +24,22 @@
 
 typedef struct wrc_resource16
 {
-	INT32	resid;		/* The resource id if resname == NULL */
+	INT	resid;		/* The resource id if resname == NULL */
 	LPSTR	resname;
-	INT32	restype;	/* The resource type-id if typename == NULL */
+	INT	restype;	/* The resource type-id if typename == NULL */
 	LPSTR	restypename;
 	LPBYTE	data;		/* Actual resource data */
-	UINT32	datasize;	/* The size of the resource */
+	UINT	datasize;	/* The size of the resource */
 } wrc_resource16_t;
 
 typedef struct wrc_resource32
 {
-	INT32	resid;		/* The resource id if resname == NULL */
+	INT	resid;		/* The resource id if resname == NULL */
 	LPWSTR	resname;
-	INT32	restype;	/* The resource type-id if typename == NULL */
+	INT	restype;	/* The resource type-id if typename == NULL */
 	LPWSTR	restypename;
 	LPBYTE	data;		/* Actual resource data */
-	UINT32	datasize;	/* The size of the resource */
+	UINT	datasize;	/* The size of the resource */
 } wrc_resource32_t;
 
 #endif
diff --git a/include/wtypes.h b/include/wtypes.h
index 2dc5b1458ea..3089ae407b0 100644
--- a/include/wtypes.h
+++ b/include/wtypes.h
@@ -16,28 +16,22 @@ typedef void* RPC_AUTH_IDENTITY_HANDLE;
 typedef void* RPC_AUTHZ_HANDLE;
 
 
-typedef WORD CLIPFORMAT32, *LPCLIPFORMAT32;
-DECL_WINELIB_TYPE(CLIPFORMAT)
+typedef WORD CLIPFORMAT, *LPCLIPFORMAT;
 
 typedef CHAR		OLECHAR16;
-typedef WCHAR		OLECHAR32;
-DECL_WINELIB_TYPE(OLECHAR)
+typedef WCHAR		OLECHAR;
 
 typedef LPSTR		LPOLESTR16;
-typedef LPWSTR		LPOLESTR32;
-DECL_WINELIB_TYPE(LPOLESTR)
+typedef LPWSTR		LPOLESTR;
 
 typedef LPCSTR		LPCOLESTR16;
-typedef LPCWSTR		LPCOLESTR32;
-DECL_WINELIB_TYPE(LPCOLESTR)
+typedef LPCWSTR		LPCOLESTR;
 
 typedef OLECHAR16	*BSTR16;
-typedef OLECHAR32	*BSTR32;
-DECL_WINELIB_TYPE(BSTR)
+typedef OLECHAR	*BSTR;
 
 typedef BSTR16		*LPBSTR16;
-typedef BSTR32		*LPBSTR32;
-DECL_WINELIB_TYPE(LPBSTR)
+typedef BSTR		*LPBSTR;
 
 #ifndef GUID_DEFINED
 #define GUID_DEFINED
@@ -67,7 +61,7 @@ typedef struct _GUID	FMTID,*LPFMTID;
 #endif // !__cplusplus
 
 
-#define DECLARE_HANDLE(a)  typedef HANDLE16 a##16; typedef HANDLE32 a##32
+#define DECLARE_HANDLE(a)  typedef HANDLE16 a##16; typedef HANDLE a
 DECLARE_HANDLE(HMETAFILEPICT);
 #undef DECLARE_HANDLE
 
diff --git a/include/x11drv.h b/include/x11drv.h
index b3bf74d3808..9b70a81078a 100644
--- a/include/x11drv.h
+++ b/include/x11drv.h
@@ -46,7 +46,7 @@ typedef struct
 } X_PHYSBRUSH;
 
   /* X physical font */
-typedef UINT32	 X_PHYSFONT;
+typedef UINT	 X_PHYSFONT;
 
   /* X physical device */
 typedef struct
@@ -74,98 +74,98 @@ extern GC BITMAP_monoGC, BITMAP_colorGC;
 
 /* Wine driver X11 functions */
 
-extern BOOL32 X11DRV_Init(void);
-extern BOOL32 X11DRV_BitBlt( struct tagDC *dcDst, INT32 xDst, INT32 yDst,
-                             INT32 width, INT32 height, struct tagDC *dcSrc,
-                             INT32 xSrc, INT32 ySrc, DWORD rop );
-extern BOOL32 X11DRV_EnumDeviceFonts( struct tagDC *dc, LPLOGFONT16 plf,
+extern BOOL X11DRV_Init(void);
+extern BOOL X11DRV_BitBlt( struct tagDC *dcDst, INT xDst, INT yDst,
+                             INT width, INT height, struct tagDC *dcSrc,
+                             INT xSrc, INT ySrc, DWORD rop );
+extern BOOL X11DRV_EnumDeviceFonts( struct tagDC *dc, LPLOGFONT16 plf,
 				      DEVICEFONTENUMPROC dfeproc, LPARAM lp );
-extern BOOL32 X11DRV_GetCharWidth( struct tagDC *dc, UINT32 firstChar,
-                                   UINT32 lastChar, LPINT32 buffer );
-extern BOOL32 X11DRV_GetTextExtentPoint( struct tagDC *dc, LPCSTR str,
-                                         INT32 count, LPSIZE32 size );
-extern BOOL32 X11DRV_GetTextMetrics(struct tagDC *dc, TEXTMETRIC32A *metrics);
-extern BOOL32 X11DRV_PatBlt( struct tagDC *dc, INT32 left, INT32 top,
-                             INT32 width, INT32 height, DWORD rop );
+extern BOOL X11DRV_GetCharWidth( struct tagDC *dc, UINT firstChar,
+                                   UINT lastChar, LPINT buffer );
+extern BOOL X11DRV_GetTextExtentPoint( struct tagDC *dc, LPCSTR str,
+                                         INT count, LPSIZE size );
+extern BOOL X11DRV_GetTextMetrics(struct tagDC *dc, TEXTMETRICA *metrics);
+extern BOOL X11DRV_PatBlt( struct tagDC *dc, INT left, INT top,
+                             INT width, INT height, DWORD rop );
 extern VOID   X11DRV_SetDeviceClipping(struct tagDC *dc);
-extern BOOL32 X11DRV_StretchBlt( struct tagDC *dcDst, INT32 xDst, INT32 yDst,
-                                 INT32 widthDst, INT32 heightDst,
-                                 struct tagDC *dcSrc, INT32 xSrc, INT32 ySrc,
-                                 INT32 widthSrc, INT32 heightSrc, DWORD rop );
-extern BOOL32 X11DRV_MoveToEx( struct tagDC *dc, INT32 x, INT32 y,LPPOINT32 pt);
-extern BOOL32 X11DRV_LineTo( struct tagDC *dc, INT32 x, INT32 y);
-extern BOOL32 X11DRV_Arc( struct tagDC *dc, INT32 left, INT32 top, INT32 right,
-			  INT32 bottom, INT32 xstart, INT32 ystart, INT32 xend,
-			  INT32 yend );
-extern BOOL32 X11DRV_Pie( struct tagDC *dc, INT32 left, INT32 top, INT32 right,
-			  INT32 bottom, INT32 xstart, INT32 ystart, INT32 xend,
-			  INT32 yend );
-extern BOOL32 X11DRV_Chord( struct tagDC *dc, INT32 left, INT32 top,
-			    INT32 right, INT32 bottom, INT32 xstart,
-			    INT32 ystart, INT32 xend, INT32 yend );
-extern BOOL32 X11DRV_Ellipse( struct tagDC *dc, INT32 left, INT32 top,
-			      INT32 right, INT32 bottom );
-extern BOOL32 X11DRV_Rectangle(struct tagDC *dc, INT32 left, INT32 top,
-			      INT32 right, INT32 bottom);
-extern BOOL32 X11DRV_RoundRect( struct tagDC *dc, INT32 left, INT32 top,
-				INT32 right, INT32 bottom, INT32 ell_width,
-				INT32 ell_height );
-extern COLORREF X11DRV_SetPixel( struct tagDC *dc, INT32 x, INT32 y,
+extern BOOL X11DRV_StretchBlt( struct tagDC *dcDst, INT xDst, INT yDst,
+                                 INT widthDst, INT heightDst,
+                                 struct tagDC *dcSrc, INT xSrc, INT ySrc,
+                                 INT widthSrc, INT heightSrc, DWORD rop );
+extern BOOL X11DRV_MoveToEx( struct tagDC *dc, INT x, INT y,LPPOINT pt);
+extern BOOL X11DRV_LineTo( struct tagDC *dc, INT x, INT y);
+extern BOOL X11DRV_Arc( struct tagDC *dc, INT left, INT top, INT right,
+			  INT bottom, INT xstart, INT ystart, INT xend,
+			  INT yend );
+extern BOOL X11DRV_Pie( struct tagDC *dc, INT left, INT top, INT right,
+			  INT bottom, INT xstart, INT ystart, INT xend,
+			  INT yend );
+extern BOOL X11DRV_Chord( struct tagDC *dc, INT left, INT top,
+			    INT right, INT bottom, INT xstart,
+			    INT ystart, INT xend, INT yend );
+extern BOOL X11DRV_Ellipse( struct tagDC *dc, INT left, INT top,
+			      INT right, INT bottom );
+extern BOOL X11DRV_Rectangle(struct tagDC *dc, INT left, INT top,
+			      INT right, INT bottom);
+extern BOOL X11DRV_RoundRect( struct tagDC *dc, INT left, INT top,
+				INT right, INT bottom, INT ell_width,
+				INT ell_height );
+extern COLORREF X11DRV_SetPixel( struct tagDC *dc, INT x, INT y,
 				 COLORREF color );
-extern COLORREF X11DRV_GetPixel( struct tagDC *dc, INT32 x, INT32 y);
-extern BOOL32 X11DRV_PaintRgn( struct tagDC *dc, HRGN32 hrgn );
-extern BOOL32 X11DRV_Polyline( struct tagDC *dc,const POINT32* pt,INT32 count);
-extern BOOL32 X11DRV_PolyBezier( struct tagDC *dc, const POINT32 start, const POINT32* lppt, DWORD cPoints);
-extern BOOL32 X11DRV_Polygon( struct tagDC *dc, const POINT32* pt, INT32 count );
-extern BOOL32 X11DRV_PolyPolygon( struct tagDC *dc, const POINT32* pt, 
-				  const INT32* counts, UINT32 polygons);
-extern BOOL32 X11DRV_PolyPolyline( struct tagDC *dc, const POINT32* pt, 
+extern COLORREF X11DRV_GetPixel( struct tagDC *dc, INT x, INT y);
+extern BOOL X11DRV_PaintRgn( struct tagDC *dc, HRGN hrgn );
+extern BOOL X11DRV_Polyline( struct tagDC *dc,const POINT* pt,INT count);
+extern BOOL X11DRV_PolyBezier( struct tagDC *dc, const POINT start, const POINT* lppt, DWORD cPoints);
+extern BOOL X11DRV_Polygon( struct tagDC *dc, const POINT* pt, INT count );
+extern BOOL X11DRV_PolyPolygon( struct tagDC *dc, const POINT* pt, 
+				  const INT* counts, UINT polygons);
+extern BOOL X11DRV_PolyPolyline( struct tagDC *dc, const POINT* pt, 
 				  const DWORD* counts, DWORD polylines);
 
-extern HGDIOBJ32 X11DRV_SelectObject( struct tagDC *dc, HGDIOBJ32 handle );
+extern HGDIOBJ X11DRV_SelectObject( struct tagDC *dc, HGDIOBJ handle );
 
 extern COLORREF X11DRV_SetBkColor( struct tagDC *dc, COLORREF color );
 extern COLORREF X11DRV_SetTextColor( struct tagDC *dc, COLORREF color );
-extern BOOL32 X11DRV_ExtFloodFill( struct tagDC *dc, INT32 x, INT32 y,
-				   COLORREF color, UINT32 fillType );
-extern BOOL32 X11DRV_ExtTextOut( struct tagDC *dc, INT32 x, INT32 y,
-				 UINT32 flags, const RECT32 *lprect,
-				 LPCSTR str, UINT32 count, const INT32 *lpDx );
-extern BOOL32 X11DRV_CreateBitmap( HBITMAP32 hbitmap );
-extern BOOL32 X11DRV_DeleteObject( HGDIOBJ32 handle );
-extern LONG X11DRV_BitmapBits( HBITMAP32 hbitmap, void *bits, LONG count,
+extern BOOL X11DRV_ExtFloodFill( struct tagDC *dc, INT x, INT y,
+				   COLORREF color, UINT fillType );
+extern BOOL X11DRV_ExtTextOut( struct tagDC *dc, INT x, INT y,
+				 UINT flags, const RECT *lprect,
+				 LPCSTR str, UINT count, const INT *lpDx );
+extern BOOL X11DRV_CreateBitmap( HBITMAP hbitmap );
+extern BOOL X11DRV_DeleteObject( HGDIOBJ handle );
+extern LONG X11DRV_BitmapBits( HBITMAP hbitmap, void *bits, LONG count,
 			       WORD flags );
-extern INT32 X11DRV_SetDIBitsToDevice( struct tagDC *dc, INT32 xDest,
-				       INT32 yDest, DWORD cx, DWORD cy,
-				       INT32 xSrc, INT32 ySrc,
-				       UINT32 startscan, UINT32 lines,
+extern INT X11DRV_SetDIBitsToDevice( struct tagDC *dc, INT xDest,
+				       INT yDest, DWORD cx, DWORD cy,
+				       INT xSrc, INT ySrc,
+				       UINT startscan, UINT lines,
 				       LPCVOID bits, const BITMAPINFO *info,
-				       UINT32 coloruse );
-extern INT32 X11DRV_DeviceBitmapBits( struct tagDC *dc, HBITMAP32 hbitmap,
-				      WORD fGet, UINT32 startscan,
-				      UINT32 lines, LPSTR bits,
-				      LPBITMAPINFO info, UINT32 coloruse );
-extern HANDLE32 X11DRV_LoadOEMResource( WORD id, WORD type );
+				       UINT coloruse );
+extern INT X11DRV_DeviceBitmapBits( struct tagDC *dc, HBITMAP hbitmap,
+				      WORD fGet, UINT startscan,
+				      UINT lines, LPSTR bits,
+				      LPBITMAPINFO info, UINT coloruse );
+extern HANDLE X11DRV_LoadOEMResource( WORD id, WORD type );
 
 /* X11 driver internal functions */
 
-extern BOOL32 X11DRV_BITMAP_Init(void);
-extern BOOL32 X11DRV_BRUSH_Init(void);
-extern BOOL32 X11DRV_DIB_Init(void);
-extern BOOL32 X11DRV_FONT_Init( struct tagDeviceCaps* );
-extern BOOL32 X11DRV_OBM_Init(void);
+extern BOOL X11DRV_BITMAP_Init(void);
+extern BOOL X11DRV_BRUSH_Init(void);
+extern BOOL X11DRV_DIB_Init(void);
+extern BOOL X11DRV_FONT_Init( struct tagDeviceCaps* );
+extern BOOL X11DRV_OBM_Init(void);
 
 struct tagBITMAPOBJ;
 extern XImage *X11DRV_BITMAP_GetXImage( const struct tagBITMAPOBJ *bmp );
 extern int X11DRV_DIB_GetXImageWidthBytes( int width, int depth );
-extern BOOL32 X11DRV_DIB_Init(void);
+extern BOOL X11DRV_DIB_Init(void);
 extern X11DRV_PHYSBITMAP *X11DRV_AllocBitmap( struct tagBITMAPOBJ *bmp );
 
-extern BOOL32 X11DRV_SetupGCForPatBlt( struct tagDC *dc, GC gc,
-				       BOOL32 fMapColors );
-extern BOOL32 X11DRV_SetupGCForBrush( struct tagDC *dc );
-extern BOOL32 X11DRV_SetupGCForPen( struct tagDC *dc );
-extern BOOL32 X11DRV_SetupGCForText( struct tagDC *dc );
+extern BOOL X11DRV_SetupGCForPatBlt( struct tagDC *dc, GC gc,
+				       BOOL fMapColors );
+extern BOOL X11DRV_SetupGCForBrush( struct tagDC *dc );
+extern BOOL X11DRV_SetupGCForPen( struct tagDC *dc );
+extern BOOL X11DRV_SetupGCForText( struct tagDC *dc );
 
 extern const int X11DRV_XROPfunction[];
 
@@ -219,12 +219,12 @@ extern int *X11DRV_DIB_BuildColorMap( struct tagDC *dc, WORD coloruse,
 extern struct _CLIPBOARD_DRIVER X11DRV_CLIPBOARD_Driver;
 
 extern void X11DRV_CLIPBOARD_EmptyClipboard(void);
-extern void X11DRV_CLIPBOARD_SetClipboardData(UINT32 wFormat);
-extern BOOL32 X11DRV_CLIPBOARD_RequestSelection(void);
-extern void X11DRV_CLIPBOARD_ResetOwner(struct tagWND *pWnd, BOOL32 bFooBar);
+extern void X11DRV_CLIPBOARD_SetClipboardData(UINT wFormat);
+extern BOOL X11DRV_CLIPBOARD_RequestSelection(void);
+extern void X11DRV_CLIPBOARD_ResetOwner(struct tagWND *pWnd, BOOL bFooBar);
 
 void X11DRV_CLIPBOARD_ReadSelection(Window w, Atom prop);
-void X11DRV_CLIPBOARD_ReleaseSelection(Window w, HWND32 hwnd);
+void X11DRV_CLIPBOARD_ReleaseSelection(Window w, HWND hwnd);
 
 /* X11 color driver */
 
@@ -252,15 +252,15 @@ extern int X11DRV_DESKTOP_GetScreenDepth(struct tagDESKTOP *pDesktop);
 
 extern struct _EVENT_DRIVER X11DRV_EVENT_Driver;
 
-extern BOOL32 X11DRV_EVENT_Init(void);
+extern BOOL X11DRV_EVENT_Init(void);
 extern void X11DRV_EVENT_AddIO(int fd, unsigned flag);
 extern void X11DRV_EVENT_DeleteIO(int fd, unsigned flag);
-extern BOOL32 X11DRV_EVENT_WaitNetEvent(BOOL32 sleep, BOOL32 peek);
+extern BOOL X11DRV_EVENT_WaitNetEvent(BOOL sleep, BOOL peek);
 extern void X11DRV_EVENT_Synchronize(void);
-extern BOOL32 X11DRV_EVENT_CheckFocus( void );
-extern BOOL32 X11DRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state);
+extern BOOL X11DRV_EVENT_CheckFocus( void );
+extern BOOL X11DRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state);
 extern void X11DRV_EVENT_DummyMotionNotify(void);
-extern BOOL32 X11DRV_EVENT_Pending(void);
+extern BOOL X11DRV_EVENT_Pending(void);
 extern BOOL16 X11DRV_EVENT_IsUserIdle(void);
 extern void X11DRV_EVENT_WakeUp(void);
 
@@ -334,18 +334,18 @@ extern Window X11DRV_WND_GetXRootWindow(struct tagWND *wndPtr);
 
 extern void X11DRV_WND_Initialize(struct tagWND *wndPtr);
 extern void X11DRV_WND_Finalize(struct tagWND *wndPtr);
-extern BOOL32 X11DRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, BOOL32 bUnicode);
-extern BOOL32 X11DRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, CREATESTRUCT32A *cs, BOOL32 bUnicode);
-extern BOOL32 X11DRV_WND_DestroyWindow(struct tagWND *pWnd);
+extern BOOL X11DRV_WND_CreateDesktopWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, BOOL bUnicode);
+extern BOOL X11DRV_WND_CreateWindow(struct tagWND *wndPtr, struct tagCLASS *classPtr, CREATESTRUCTA *cs, BOOL bUnicode);
+extern BOOL X11DRV_WND_DestroyWindow(struct tagWND *pWnd);
 extern struct tagWND *X11DRV_WND_SetParent(struct tagWND *wndPtr, struct tagWND *pWndParent);
 extern void X11DRV_WND_ForceWindowRaise(struct tagWND *pWnd);
-extern void X11DRV_WND_SetWindowPos(struct tagWND *wndPtr, const WINDOWPOS32 *winpos, BOOL32 bSMC_SETXPOS);
+extern void X11DRV_WND_SetWindowPos(struct tagWND *wndPtr, const WINDOWPOS *winpos, BOOL bSMC_SETXPOS);
 extern void X11DRV_WND_SetText(struct tagWND *wndPtr, LPCSTR text);
 extern void X11DRV_WND_SetFocus(struct tagWND *wndPtr);
 extern void X11DRV_WND_PreSizeMove(struct tagWND *wndPtr);
 extern void X11DRV_WND_PostSizeMove(struct tagWND *wndPtr);
-extern void X11DRV_WND_ScrollWindow(struct tagWND *wndPtr, struct tagDC *dcPtr, INT32 dx, INT32 dy, const RECT32 *clipRect, BOOL32 bUpdate);
-extern void X11DRV_WND_SetDrawable(struct tagWND *wndPtr, struct tagDC *dc, WORD flags, BOOL32 bSetClipOrigin);
-extern BOOL32 X11DRV_WND_IsSelfClipping(struct tagWND *wndPtr);
+extern void X11DRV_WND_ScrollWindow(struct tagWND *wndPtr, struct tagDC *dcPtr, INT dx, INT dy, const RECT *clipRect, BOOL bUpdate);
+extern void X11DRV_WND_SetDrawable(struct tagWND *wndPtr, struct tagDC *dc, WORD flags, BOOL bSetClipOrigin);
+extern BOOL X11DRV_WND_IsSelfClipping(struct tagWND *wndPtr);
 
 #endif  /* __WINE_X11DRV_H */
diff --git a/include/x11font.h b/include/x11font.h
index 89196370793..718b14f2960 100644
--- a/include/x11font.h
+++ b/include/x11font.h
@@ -103,7 +103,7 @@ typedef struct tagFontResource
   UINT16			fo_count;
   fontInfo*			fi;
   char*                         resource;
-  HANDLE32			hOwner;		/*  For FR_SOFTFONT/FR_SOFTRESOURCE fonts */
+  HANDLE			hOwner;		/*  For FR_SOFTFONT/FR_SOFTRESOURCE fonts */
   CHAR				lfFaceName[LF_FACESIZE];
 } fontResource;
 
@@ -182,12 +182,12 @@ typedef struct
 
 typedef struct
 {
-  LPLOGFONT32W		lpLogFontParam;
-  FONTENUMPROC32W	lpEnumFunc;
+  LPLOGFONTW		lpLogFontParam;
+  FONTENUMPROCW	lpEnumFunc;
   LPARAM		lpData;
 
-  LPNEWTEXTMETRICEX32W  lpTextMetric;
-  LPENUMLOGFONTEX32W    lpLogFont;
+  LPNEWTEXTMETRICEXW  lpTextMetric;
+  LPENUMLOGFONTEXW    lpLogFont;
   DWORD			dwFlags;
 } fontEnum32;
 
diff --git a/ipc/dde_mem.c b/ipc/dde_mem.c
index ecfd164ca3f..9edd2e0be75 100644
--- a/ipc/dde_mem.c
+++ b/ipc/dde_mem.c
@@ -230,7 +230,7 @@ void *DDE_AttachHandle(HGLOBAL16 handle, SEGPTR *segptr)
   struct handle_info *h_info;
   SHMDATA shmdata;
   void *ptr;
-  HGLOBAL16 hOwner = GetCurrentPDB();
+  HGLOBAL16 hOwner = GetCurrentPDB16();
 
   assert(is_dde_handle(handle));
   if (segptr != NULL)
diff --git a/ipc/dde_proc.c b/ipc/dde_proc.c
index 379538ffce4..76232c92994 100644
--- a/ipc/dde_proc.c
+++ b/ipc/dde_proc.c
@@ -145,7 +145,7 @@ void dde_proc_add(dde_proc procs)
 }
 
 /* wait for dde - acknowledge message - or timout */
-static BOOL32 get_ack()
+static BOOL get_ack()
 {
     struct timeval timeout;
     int size;
@@ -183,7 +183,7 @@ static BOOL32 get_ack()
 }
 
 /* Transfer one message to a given process */
-static BOOL32 DDE_DoOneMessage (int proc_idx, int size, struct msgbuf *msgbuf)
+static BOOL DDE_DoOneMessage (int proc_idx, int size, struct msgbuf *msgbuf)
 {
   dde_proc proc= &main_block->proc[ proc_idx ];
 
@@ -282,13 +282,13 @@ static HWND16 HWND_Local2Remote(HWND16 orig)
   return 0;			
 }
 
-static BOOL32 DDE_DoMessage( MSG16 *msg, int type )
+static BOOL DDE_DoMessage( MSG16 *msg, int type )
 {
   int proc_idx;
 
   MSG16 *remote_message;
   struct msg_dat msg_dat;
-  BOOL32 success;
+  BOOL success;
   
   if (msg->wParam == 0)
       return FALSE;
@@ -337,18 +337,18 @@ static BOOL32 DDE_DoMessage( MSG16 *msg, int type )
   }
 }
 
-BOOL32 DDE_SendMessage( MSG16 *msg)
+BOOL DDE_SendMessage( MSG16 *msg)
 {
   return DDE_DoMessage(msg, DDE_SEND);
 }
 
-BOOL32 DDE_PostMessage( MSG16 *msg)
+BOOL DDE_PostMessage( MSG16 *msg)
 {
   return DDE_DoMessage(msg, DDE_POST);
 }
 
 
-void dde_proc_send_ack(HWND16 wnd, BOOL32 val) {
+void dde_proc_send_ack(HWND16 wnd, BOOL val) {
    int proc,msg;
 
    static struct msgbuf msg_ack={DDE_ACK,{'0'}};
@@ -373,8 +373,8 @@ int DDE_GetRemoteMessage()
   MSG16 *remote_message;
   int size;
   struct msg_dat msg_dat;
-  BOOL32 was_sent;		   /* sent/received */
-  BOOL32 passed;
+  BOOL was_sent;		   /* sent/received */
+  BOOL passed;
   WND *wndPtr;
 
   if (curr_proc_idx==-1)	   /* do we have DDE initialized ? */
@@ -460,7 +460,7 @@ int DDE_GetRemoteMessage()
   }
 
   /* iterate through all the windows */
-  for (wndPtr = WIN_FindWndPtr(GetTopWindow32(GetDesktopWindow32()));
+  for (wndPtr = WIN_FindWndPtr(GetTopWindow(GetDesktopWindow()));
        wndPtr != NULL;
        wndPtr = wndPtr->next)
   {
@@ -653,7 +653,7 @@ void dde_wnd_setup()
     main_block->windows[i].proc_idx = FREE_WND;
 }
 
-static BOOL32 DDE_ProcHasWindows(int proc_idx)
+static BOOL DDE_ProcHasWindows(int proc_idx)
 {
   WND_DATA *tested;
   int i;
diff --git a/ipc/generic_hash.c b/ipc/generic_hash.c
index 98d4e1728aa..df0449b8281 100644
--- a/ipc/generic_hash.c
+++ b/ipc/generic_hash.c
@@ -24,12 +24,12 @@
 	       (i)*(size)) )
 
 static HASH_ITEM *locate_entry(HASH_CONTAINER* hash, DWORD key,
-			       HASH_VAL *seeked_data, BOOL32 skip_deleted);
+			       HASH_VAL *seeked_data, BOOL skip_deleted);
 
 static void copy_hash_items(HASH_CONTAINER *hash, HASH_ITEM *old_items,
 			    int old_n_items);
 
-static BOOL32 arrays_initialized = FALSE;
+static BOOL arrays_initialized = FALSE;
 static int primes[NO_OF_PRIMES];
 static int best_primes[NO_OF_PRIMES];
 static int no_of_primes;
@@ -37,7 +37,7 @@ static int no_of_best_primes;
 static int max_num;
 
 /* binary search for `num' in the `primes' array */
-static BOOL32 prime_binary_search_found(int num)
+static BOOL prime_binary_search_found(int num)
 {
   int min_idx, max_idx, idx;
   
@@ -56,7 +56,7 @@ static BOOL32 prime_binary_search_found(int num)
   return FALSE;
 }
 
-static BOOL32 is_prime(int num)
+static BOOL is_prime(int num)
 {
   int i;
   if ((num & 0x1) == 0)		   /* can be divided by 2 */
@@ -218,7 +218,7 @@ static void setup_arrays()
 static void static_collect_garbge(HASH_CONTAINER *hash)
 {
    int i;
-   BOOL32 change;
+   BOOL change;
    HASH_ITEM *items;
    HASH_ITEM *located;
    HASH_ITEM *item;
@@ -516,9 +516,9 @@ void detach_hash(HASH_CONTAINER *hash)
 
 
 /********** Hash usage *************/
-static __inline__ BOOL32
+static __inline__ BOOL
 correct_entry(HASH_ITEM *item, int key, HASH_VAL *seeked_data,
-	      HASH_ITEM_TEST *is_correct_item, BOOL32 skip_deleted)
+	      HASH_ITEM_TEST *is_correct_item, BOOL skip_deleted)
 {
    switch(item->key) {
       case FREE_ENTRY:
@@ -549,7 +549,7 @@ correct_entry(HASH_ITEM *item, int key, HASH_VAL *seeked_data,
  */
 
 static HASH_ITEM *locate_entry(HASH_CONTAINER* hash, DWORD key,
-			       HASH_VAL *seeked_data, BOOL32 skip_deleted)
+			       HASH_VAL *seeked_data, BOOL skip_deleted)
 {
    DWORD hash_idx, hash_leaps;
    HASH_ITEM *item;
@@ -619,7 +619,7 @@ HASH_VAL *hash_locate_item(HASH_CONTAINER* hash,
 }
 
 
-BOOL32 hash_add_item(HASH_CONTAINER* hash, int key, HASH_VAL *data)
+BOOL hash_add_item(HASH_CONTAINER* hash, int key, HASH_VAL *data)
 {
     HASH_SHARED *shared;
     HASH_ITEM *item;
@@ -649,7 +649,7 @@ BOOL32 hash_add_item(HASH_CONTAINER* hash, int key, HASH_VAL *data)
 }
 
 
-BOOL32 hash_delete_item(HASH_CONTAINER* hash, int key, HASH_VAL *seeked_data)
+BOOL hash_delete_item(HASH_CONTAINER* hash, int key, HASH_VAL *seeked_data)
 {
     HASH_ITEM *item;
     
diff --git a/ipc/generic_hash.h b/ipc/generic_hash.h
index daa3409b50e..67f09752a4e 100644
--- a/ipc/generic_hash.h
+++ b/ipc/generic_hash.h
@@ -48,7 +48,7 @@ typedef struct hash_share_struct {
 				/* changes to the pointer. */
     HASH_PTR items;		/* pointer to the items */
 } HASH_SHARED;
-typedef BOOL32 HASH_ITEM_TEST(HASH_VAL *value, HASH_VAL *seeked_data);
+typedef BOOL HASH_ITEM_TEST(HASH_VAL *value, HASH_VAL *seeked_data);
 
 /* NOTE:
  * 1. Keys 0 and -1 are reserved.
@@ -62,7 +62,7 @@ typedef struct hash_container_struct {
 				   (Function of maximum_load) */
 
     int last_ptr_update;	/* to be compared with shared.ptr_updates */
-    BOOL32 shared_was_malloced;	/* Need that to know how to destroy hash */
+    BOOL shared_was_malloced;	/* Need that to know how to destroy hash */
     
     /* This is an optional handler.
      * If not NULL, this function is used for distinguishing between
@@ -129,8 +129,8 @@ void detach_hash(HASH_CONTAINER *hash);
  *        2. data to store. (for hash_add_item).
  */
 HASH_VAL *hash_locate_item(HASH_CONTAINER* hash,int key, HASH_VAL* seeked_data);
-BOOL32 hash_add_item(HASH_CONTAINER* hash, int key, HASH_VAL* data);
-BOOL32 hash_delete_item(HASH_CONTAINER* hash, int key, HASH_VAL* seeked_data);
+BOOL hash_add_item(HASH_CONTAINER* hash, int key, HASH_VAL* data);
+BOOL hash_delete_item(HASH_CONTAINER* hash, int key, HASH_VAL* seeked_data);
 
 
 void *ret_null();		/* function returning null (used for */
diff --git a/ipc/wine_test_stub.c b/ipc/wine_test_stub.c
index 2229351561e..109a440650a 100644
--- a/ipc/wine_test_stub.c
+++ b/ipc/wine_test_stub.c
@@ -33,7 +33,7 @@ void dummy_usage_of_debug_msg_name()
 }
 
 /* stub */
-HWND32 GetDesktopWindow32()
+HWND GetDesktopWindow()
 {
   printf("GetDesktopWindow\n");
   return 0;
@@ -67,7 +67,7 @@ HWND GetTopWindow(HWND a)
   return 1;
 }
 /* stub */
-WORD FreeSelector(WORD a)
+WORD FreeSelector16(WORD a)
 {
   printf("FreeSelector(%04x)\n",a);
   return 0;
@@ -103,7 +103,7 @@ WND *WIN_FindWndPtr(HWND hwnd)
 }
 
 /* stub */
-WORD GetCurrentPDB(void)
+WORD GetCurrentPDB16(void)
 {
   printf("GetCurrentPDB()\n");
   
diff --git a/library/winestub.c b/library/winestub.c
index f5aa038832c..f761634c8d5 100644
--- a/library/winestub.c
+++ b/library/winestub.c
@@ -4,13 +4,13 @@
 #include "windows.h"
 #include "xmalloc.h"
 
-extern int PASCAL WinMain(HINSTANCE32,HINSTANCE32,LPSTR,int);
+extern int PASCAL WinMain(HINSTANCE,HINSTANCE,LPSTR,int);
 
 /* external declaration here because we don't want to depend on Wine headers */
 #ifdef __cplusplus
-extern "C" HINSTANCE32 MAIN_WinelibInit( int *argc, char *argv[] );
+extern "C" HINSTANCE MAIN_WinelibInit( int *argc, char *argv[] );
 #else
-extern HINSTANCE32 MAIN_WinelibInit( int *argc, char *argv[] );
+extern HINSTANCE MAIN_WinelibInit( int *argc, char *argv[] );
 #endif
 
 /* Most Windows C/C++ compilers use something like this to */
@@ -20,7 +20,7 @@ char **_ARGV;
 
 int main( int argc, char *argv [] )
 {
-  HINSTANCE32 hInstance;
+  HINSTANCE hInstance;
   LPSTR lpszCmdParam;
   int i, len = 0;
   _ARGC = argc;
diff --git a/libtest/hello4.c b/libtest/hello4.c
index b625f65167a..54771159fa3 100644
--- a/libtest/hello4.c
+++ b/libtest/hello4.c
@@ -30,7 +30,7 @@ LRESULT WndProc (HWND wnd, UINT msg, WPARAM w, LPARAM l)
     case WM_HSCROLL:
     case WM_VSCROLL:
 	InvalidateRect(wnd, &rectHola, TRUE );
-        ScrollChildren32(wnd, msg, w, l);
+        ScrollChildren(wnd, msg, w, l);
         return 0;
 
     case WM_PAINT:
@@ -81,7 +81,7 @@ LRESULT WndProc2 (HWND wnd, UINT msg, WPARAM w, LPARAM l)
     case WM_MOVE:
     case WM_SIZE:
 	InvalidateRect( wnd, &rectInfo, TRUE );
-	CalcChildScroll( (UINT16)GetParent(wnd), SB_BOTH );
+	CalcChildScroll16( (UINT16)GetParent(wnd), SB_BOTH );
 	break;
 
     case WM_DESTROY:
diff --git a/libtest/hello5.c b/libtest/hello5.c
index 39d1ad09059..2dc6e6d783f 100644
--- a/libtest/hello5.c
+++ b/libtest/hello5.c
@@ -8,7 +8,7 @@ int PASCAL WinMain (HANDLE inst, HANDLE prev, LPSTR cmdline, int show)
 {
 	SYSTEM_INFO	si;
 	void (CALLBACK *fnGetSystemInfo)(LPSYSTEM_INFO si);
-	HMODULE32	kernel32;
+	HMODULE	kernel32;
 
 	kernel32 = LoadLibrary("KERNEL32");
 	if (kernel32<32) {
diff --git a/libtest/new.c b/libtest/new.c
index 67f68f5ddd8..fb1ea404b40 100644
--- a/libtest/new.c
+++ b/libtest/new.c
@@ -142,7 +142,7 @@ long FAR PASCAL ChildProc(HWND hwnd, WORD message, WPARAM wParam, LPARAM lParam)
             break;
             hDC = BeginPaint(hwnd, &ps);
 */
-            MoveTo(hDC, 0, 0);
+            MoveTo16(hDC, 0, 0);
             LineTo(hDC, 500, 500);
             EndPaint(hwnd, &ps);
             break;
diff --git a/libtest/vartest.c b/libtest/vartest.c
index 8506cf207cf..38abc675df7 100644
--- a/libtest/vartest.c
+++ b/libtest/vartest.c
@@ -64,7 +64,7 @@
 #ifdef WINDOWS
 #else
 #include <debugstr.h>
-extern LPWSTR HEAP_strdupAtoW( HANDLE32 heap, DWORD flags, LPCSTR str );
+extern LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
 #endif
 
 
diff --git a/loader/dos/module.c b/loader/dos/module.c
index 7de55e49716..69a1aa5aeb1 100644
--- a/loader/dos/module.c
+++ b/loader/dos/module.c
@@ -49,7 +49,7 @@
 
 static void MZ_InitPSP( LPVOID lpPSP, LPCSTR cmdline, WORD env )
 {
- PDB*psp=lpPSP;
+ PDB16*psp=lpPSP;
  const char*cmd=cmdline?strchr(cmdline,' '):NULL;
 
  psp->int20=0x20CD; /* int 20 */
@@ -230,7 +230,7 @@ static int MZ_LoadImage( HFILE16 hFile, LPCSTR name, LPCSTR cmdline,
 #endif
   old_com=1; /* assume .COM file */
   image_start=0;
-  image_size=GetFileSize(FILE_GetHandle32(hFile),NULL);
+  image_size=GetFileSize(FILE_GetHandle(hFile),NULL);
   min_size=0x10000; max_size=0x100000;
   mz_header.e_crlc=0;
   mz_header.e_ss=0; mz_header.e_sp=0xFFFE;
@@ -411,13 +411,13 @@ int MZ_InitTask( LPDOSTASK lpDosTask )
  return lpDosTask->hModule;
 }
 
-HINSTANCE16 MZ_CreateProcess( LPCSTR name, LPCSTR cmdline, LPCSTR env, BOOL32 inherit,
-                              LPSTARTUPINFO32A startup, LPPROCESS_INFORMATION info )
+HINSTANCE16 MZ_CreateProcess( LPCSTR name, LPCSTR cmdline, LPCSTR env, BOOL inherit,
+                              LPSTARTUPINFOA startup, LPPROCESS_INFORMATION info )
 {
  LPDOSTASK lpDosTask = NULL; /* keep gcc from complaining */
  HMODULE16 hModule;
  HINSTANCE16 hInstance;
- PDB32 *pdb = PROCESS_Current();
+ PDB *pdb = PROCESS_Current();
  TDB *pTask = (TDB*)GlobalLock16( GetCurrentTask() );
  NE_MODULE *pModule = pTask ? NE_GetPtr( pTask->hModule ) : NULL;
  HFILE16 hFile;
@@ -494,8 +494,8 @@ void MZ_KillModule( LPDOSTASK lpDosTask )
 
 #else /* !MZ_SUPPORTED */
 
-HINSTANCE16 MZ_CreateProcess( LPCSTR name, LPCSTR cmdline, LPCSTR env, BOOL32 inherit,
-                              LPSTARTUPINFO32A startup, LPPROCESS_INFORMATION info )
+HINSTANCE16 MZ_CreateProcess( LPCSTR name, LPCSTR cmdline, LPCSTR env, BOOL inherit,
+                              LPSTARTUPINFOA startup, LPPROCESS_INFORMATION info )
 {
  WARN(module,"DOS executables not supported on this architecture\n");
  return (HMODULE16)11;  /* invalid exe */
diff --git a/loader/elf.c b/loader/elf.c
index 23655375982..853ae064da3 100644
--- a/loader/elf.c
+++ b/loader/elf.c
@@ -31,7 +31,7 @@ WINE_MODREF *ELF_CreateDummyModule( LPCSTR libname, LPCSTR modname )
 	PIMAGE_NT_HEADERS	nth;
 	PIMAGE_SECTION_HEADER	sh;
 	WINE_MODREF *wm;
-	HMODULE32 hmod;
+	HMODULE hmod;
 
 	wm=(WINE_MODREF*)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wm) );
 	wm->type = MODULE32_ELF;
@@ -43,7 +43,7 @@ WINE_MODREF *ELF_CreateDummyModule( LPCSTR libname, LPCSTR modname )
 	wm->modname = HEAP_strdupA( GetProcessHeap(), 0, modname );
 	wm->longname = HEAP_strdupA( GetProcessHeap(), 0, libname );
 
-	hmod = (HMODULE32)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 
+	hmod = (HMODULE)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 
                                      sizeof(IMAGE_DOS_HEADER) + 
                                      sizeof(IMAGE_NT_HEADERS) +
                                      sizeof(IMAGE_SECTION_HEADER) + 100 );
@@ -96,7 +96,7 @@ WINE_MODREF *ELF_CreateDummyModule( LPCSTR libname, LPCSTR modname )
 
 #include <dlfcn.h>
 
-HMODULE32 ELF_LoadLibraryEx32A( LPCSTR libname, HANDLE32 hf, DWORD flags )
+HMODULE ELF_LoadLibraryExA( LPCSTR libname, HANDLE hf, DWORD flags )
 {
 	WINE_MODREF	*wm;
 	char		*modname,*s,*t,*x;
@@ -144,7 +144,7 @@ HMODULE32 ELF_LoadLibraryEx32A( LPCSTR libname, HANDLE32 hf, DWORD flags )
 	return wm->module;
 }
 
-FARPROC32 ELF_FindExportedFunction( WINE_MODREF *wm, LPCSTR funcName) 
+FARPROC ELF_FindExportedFunction( WINE_MODREF *wm, LPCSTR funcName) 
 {
 	LPVOID			fun;
 	int			i,nrofargs = 0;
@@ -153,7 +153,7 @@ FARPROC32 ELF_FindExportedFunction( WINE_MODREF *wm, LPCSTR funcName)
 	assert(wm->type == MODULE32_ELF);
 	if (!HIWORD(funcName)) {
 		ERR(win32,"Can't import from UNIX dynamic libs by ordinal, sorry.\n");
-		return (FARPROC32)0;
+		return (FARPROC)0;
 	}
 	fun = dlsym(wm->binfmt.elf.dlhandle,funcName);
 	/* we sometimes have an excess '_' at the beginning of the name */
@@ -234,24 +234,24 @@ FARPROC32 ELF_FindExportedFunction( WINE_MODREF *wm, LPCSTR funcName)
 			/* filled out by entrycode */
 		stub->oldret	  = 0xdeadbeef;
 		stub->ret2	  = 0xc3;
-		fun=(FARPROC32)stub;
+		fun=(FARPROC)stub;
 	}
 	if (!fun) {
 		FIXME(win32,"function %s not found: %s\n",funcName,dlerror());
 		return fun;
 	}
-	fun = SNOOP_GetProcAddress32(wm->module,funcName,stub-wm->binfmt.elf.stubs,fun);
-	return (FARPROC32)fun;
+	fun = SNOOP_GetProcAddress(wm->module,funcName,stub-wm->binfmt.elf.stubs,fun);
+	return (FARPROC)fun;
 }
 #else
 
-HMODULE32 ELF_LoadLibraryEx32A( LPCSTR libname, HANDLE32 hf, DWORD flags)
+HMODULE ELF_LoadLibraryExA( LPCSTR libname, HANDLE hf, DWORD flags)
 {
 	return 0;
 }
-FARPROC32 ELF_FindExportedFunction( WINE_MODREF *wm, LPCSTR funcName) 
+FARPROC ELF_FindExportedFunction( WINE_MODREF *wm, LPCSTR funcName) 
 {
-	return (FARPROC32)0;
+	return (FARPROC)0;
 }
 
 #endif
diff --git a/loader/libres.c b/loader/libres.c
index c1485dbfb56..d2ed8a17991 100644
--- a/loader/libres.c
+++ b/loader/libres.c
@@ -34,7 +34,7 @@ void LIBRES_RegisterResources(const wrc_resource32_t * const * Res)
 /**********************************************************************
  *	    LIBRES_FindResource
  */
-HRSRC32 LIBRES_FindResource( HINSTANCE32 hModule, LPCWSTR name, LPCWSTR type )
+HRSRC LIBRES_FindResource( HINSTANCE hModule, LPCWSTR name, LPCWSTR type )
 {
   int nameid=0,typeid;
   ResListE* ResBlock;
@@ -77,12 +77,12 @@ HRSRC32 LIBRES_FindResource( HINSTANCE32 hModule, LPCWSTR name, LPCWSTR type )
     for(Res=ResBlock->Resources; *Res; Res++)
       if(name)
       {
-	if((*Res)->restype==typeid && !lstrncmpi32W((LPCWSTR)((*Res)->resname+1), name, *((*Res)->resname)))
-	  return (HRSRC32)*Res;
+	if((*Res)->restype==typeid && !lstrncmpiW((LPCWSTR)((*Res)->resname+1), name, *((*Res)->resname)))
+	  return (HRSRC)*Res;
       }
       else
 	if((*Res)->restype==typeid && (*Res)->resid==nameid)
-	  return (HRSRC32)*Res;
+	  return (HRSRC)*Res;
   return 0;
 }
 
@@ -90,16 +90,16 @@ HRSRC32 LIBRES_FindResource( HINSTANCE32 hModule, LPCWSTR name, LPCWSTR type )
 /**********************************************************************
  *	    LIBRES_LoadResource    
  */
-HGLOBAL32 LIBRES_LoadResource( HINSTANCE32 hModule, HRSRC32 hRsrc )
+HGLOBAL LIBRES_LoadResource( HINSTANCE hModule, HRSRC hRsrc )
 {
-  return (HGLOBAL32)(((wrc_resource32_t*)hRsrc)->data);
+  return (HGLOBAL)(((wrc_resource32_t*)hRsrc)->data);
 }
 
 
 /**********************************************************************
  *	    LIBRES_SizeofResource    
  */
-DWORD LIBRES_SizeofResource( HINSTANCE32 hModule, HRSRC32 hRsrc )
+DWORD LIBRES_SizeofResource( HINSTANCE hModule, HRSRC hRsrc )
 {
   return (DWORD)(((wrc_resource32_t*)hRsrc)->datasize);
 }
diff --git a/loader/main.c b/loader/main.c
index 106452ab5c9..761b324d5f9 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -50,7 +50,7 @@ int __winelib = 1;  /* Winelib run-time flag */
 /***********************************************************************
  *           Main initialisation routine
  */
-BOOL32 MAIN_MainInit(void)
+BOOL MAIN_MainInit(void)
 {
     /* Set server debug level */
     /* To fool make_debug: TRACE(server) */
@@ -95,9 +95,9 @@ BOOL32 MAIN_MainInit(void)
 /***********************************************************************
  *           KERNEL initialisation routine
  */
-BOOL32 WINAPI MAIN_KernelInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI MAIN_KernelInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    static BOOL32 initDone = FALSE;
+    static BOOL initDone = FALSE;
 
     HMODULE16 hModule;
 
@@ -111,7 +111,7 @@ BOOL32 WINAPI MAIN_KernelInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvR
         WORD cs, ds;
 
         /* Initialize KERNEL.178 (__WINFLAGS) with the correct flags value */
-        NE_SetEntryPoint( hModule, 178, GetWinFlags() );
+        NE_SetEntryPoint( hModule, 178, GetWinFlags16() );
 
         /* Initialize KERNEL.454/455 (__FLATCS/__FLATDS) */
         GET_CS(cs); GET_DS(ds);
@@ -146,7 +146,7 @@ BOOL32 WINAPI MAIN_KernelInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvR
 /***********************************************************************
  *           GDI initialisation routine
  */
-BOOL32 WINAPI MAIN_GdiInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI MAIN_GdiInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     NE_MODULE *pModule;
 
@@ -156,13 +156,13 @@ BOOL32 WINAPI MAIN_GdiInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvRese
     pModule = NE_GetPtr( GetModuleHandle16( "GDI" ) );
     if ( pModule )
     {
-        GDI_HeapSel = GlobalHandleToSel( (NE_SEG_TABLE( pModule ) + 
+        GDI_HeapSel = GlobalHandleToSel16( (NE_SEG_TABLE( pModule ) + 
                                           pModule->dgroup - 1)->hSeg );
     }
     else
     {
         GDI_HeapSel = GlobalAlloc16( GMEM_FIXED, GDI_HEAP_SIZE );
-        LocalInit( GDI_HeapSel, 0, GDI_HEAP_SIZE-1 );
+        LocalInit16( GDI_HeapSel, 0, GDI_HEAP_SIZE-1 );
     }
 
     if (!TWEAK_Init()) return FALSE;
@@ -180,7 +180,7 @@ BOOL32 WINAPI MAIN_GdiInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvRese
 /***********************************************************************
  *           USER initialisation routine
  */
-BOOL32 WINAPI MAIN_UserInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI MAIN_UserInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     NE_MODULE *pModule;
     int queueSize;
@@ -191,13 +191,13 @@ BOOL32 WINAPI MAIN_UserInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvRes
     pModule = NE_GetPtr( GetModuleHandle16( "USER" ) );
     if ( pModule )
     {
-        USER_HeapSel = GlobalHandleToSel( (NE_SEG_TABLE( pModule ) + 
+        USER_HeapSel = GlobalHandleToSel16( (NE_SEG_TABLE( pModule ) + 
                                            pModule->dgroup - 1)->hSeg );
     }
     else
     {
         USER_HeapSel = GlobalAlloc16( GMEM_FIXED, 0x10000 );
-        LocalInit( USER_HeapSel, 0, 0xffff );
+        LocalInit16( USER_HeapSel, 0, 0xffff );
     }
 
      /* Global atom table initialisation */
@@ -232,15 +232,15 @@ BOOL32 WINAPI MAIN_UserInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvRes
     if (!TWEAK_CheckConfiguration()) return FALSE;
 
     /* Create system message queue */
-    queueSize = GetProfileInt32A( "windows", "TypeAhead", 120 );
+    queueSize = GetProfileIntA( "windows", "TypeAhead", 120 );
     if (!QUEUE_CreateSysMsgQueue( queueSize )) return FALSE;
 
     /* Set double click time */
-    SetDoubleClickTime32( GetProfileInt32A("windows","DoubleClickSpeed",452) );
+    SetDoubleClickTime( GetProfileIntA("windows","DoubleClickSpeed",452) );
 
     /* Create task message queue for the initial task */
-    queueSize = GetProfileInt32A( "windows", "DefaultQueueSize", 8 );
-    if (!SetMessageQueue32( queueSize )) return FALSE;
+    queueSize = GetProfileIntA( "windows", "DefaultQueueSize", 8 );
+    if (!SetMessageQueue( queueSize )) return FALSE;
 
     /* Create desktop window */
     if (!WIN_CreateDesktopWindow()) return FALSE;
@@ -261,7 +261,7 @@ BOOL32 WINAPI MAIN_UserInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvRes
 /***********************************************************************
  *           Winelib initialisation routine
  */
-HINSTANCE32 MAIN_WinelibInit( int *argc, char *argv[] )
+HINSTANCE MAIN_WinelibInit( int *argc, char *argv[] )
 {
     WINE_MODREF *wm;
     NE_MODULE *pModule;
diff --git a/loader/module.c b/loader/module.c
index 916ce5d0c31..a771e6f269a 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -29,14 +29,14 @@
 #include "debug.h"
 #include "callback.h"
 
-extern BOOL32 THREAD_InitDone;
+extern BOOL THREAD_InitDone;
 
 
 /*************************************************************************
  *		MODULE32_LookupHMODULE
  * looks for the referenced HMODULE in the current process
  */
-WINE_MODREF *MODULE32_LookupHMODULE( HMODULE32 hmod )
+WINE_MODREF *MODULE32_LookupHMODULE( HMODULE hmod )
 {
     WINE_MODREF	*wm;
 
@@ -107,9 +107,9 @@ static void MODULE_DoInitializeDLLs( WINE_MODREF *wm,
            wm->module, type, lpReserved );
 }
 
-void MODULE_InitializeDLLs( HMODULE32 root, DWORD type, LPVOID lpReserved )
+void MODULE_InitializeDLLs( HMODULE root, DWORD type, LPVOID lpReserved )
 {
-    BOOL32 inProgress = FALSE;
+    BOOL inProgress = FALSE;
     WINE_MODREF *wm;
 
     /* Grab the process critical section to protect the recursion flags */
@@ -176,18 +176,18 @@ void MODULE_InitializeDLLs( HMODULE32 root, DWORD type, LPVOID lpReserved )
  *
  * Create a dummy NE module for Win32 or Winelib.
  */
-HMODULE32 MODULE_CreateDummyModule( const OFSTRUCT *ofs, LPCSTR modName )
+HMODULE MODULE_CreateDummyModule( const OFSTRUCT *ofs, LPCSTR modName )
 {
-    HMODULE32 hModule;
+    HMODULE hModule;
     NE_MODULE *pModule;
     SEGTABLEENTRY *pSegment;
     char *pStr,*s;
     int len;
     const char* basename;
 
-    INT32 of_size = sizeof(OFSTRUCT) - sizeof(ofs->szPathName)
+    INT of_size = sizeof(OFSTRUCT) - sizeof(ofs->szPathName)
                     + strlen(ofs->szPathName) + 1;
-    INT32 size = sizeof(NE_MODULE) +
+    INT size = sizeof(NE_MODULE) +
                  /* loaded file info */
                  of_size +
                  /* segment table: DS,CS */
@@ -198,9 +198,9 @@ HMODULE32 MODULE_CreateDummyModule( const OFSTRUCT *ofs, LPCSTR modName )
                  8;
 
     hModule = GlobalAlloc16( GMEM_MOVEABLE | GMEM_ZEROINIT, size );
-    if (!hModule) return (HMODULE32)11;  /* invalid exe */
+    if (!hModule) return (HMODULE)11;  /* invalid exe */
 
-    FarSetOwner( hModule, hModule );
+    FarSetOwner16( hModule, hModule );
     pModule = (NE_MODULE *)GlobalLock16( hModule );
 
     /* Set all used entries */
@@ -276,34 +276,34 @@ FARPROC16 MODULE_GetWndProcEntry16( LPCSTR name )
     if (__winelib)
     {
         /* FIXME: hack for Winelib */
-        extern LRESULT ColorDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
-        extern LRESULT FileOpenDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
-        extern LRESULT FileSaveDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
+        extern LRESULT ColorDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
+        extern LRESULT FileOpenDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
+        extern LRESULT FileSaveDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
         extern LRESULT FindTextDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
-        extern LRESULT PrintDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
-        extern LRESULT PrintSetupDlgProc(HWND16,UINT16,WPARAM16,LPARAM);
+        extern LRESULT PrintDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
+        extern LRESULT PrintSetupDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
         extern LRESULT ReplaceTextDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
 
         if (!strcmp(name,"ColorDlgProc"))
-            return (FARPROC16)ColorDlgProc;
+            return (FARPROC16)ColorDlgProc16;
         if (!strcmp(name,"FileOpenDlgProc"))
-            return (FARPROC16)FileOpenDlgProc;
+            return (FARPROC16)FileOpenDlgProc16;
         if (!strcmp(name,"FileSaveDlgProc"))
-            return (FARPROC16)FileSaveDlgProc;
+            return (FARPROC16)FileSaveDlgProc16;
         if (!strcmp(name,"FindTextDlgProc"))
             return (FARPROC16)FindTextDlgProc16;
         if (!strcmp(name,"PrintDlgProc"))
-            return (FARPROC16)PrintDlgProc;
+            return (FARPROC16)PrintDlgProc16;
         if (!strcmp(name,"PrintSetupDlgProc"))
-            return (FARPROC16)PrintSetupDlgProc;
+            return (FARPROC16)PrintSetupDlgProc16;
         if (!strcmp(name,"ReplaceTextDlgProc"))
             return (FARPROC16)ReplaceTextDlgProc16;
         if (!strcmp(name,"DefResourceHandler"))
             return (FARPROC16)NE_DefResourceHandler;
         if (!strcmp(name,"LoadDIBIconHandler"))
-            return (FARPROC16)LoadDIBIconHandler;
+            return (FARPROC16)LoadDIBIconHandler16;
         if (!strcmp(name,"LoadDIBCursorHandler"))
-            return (FARPROC16)LoadDIBCursorHandler;
+            return (FARPROC16)LoadDIBCursorHandler16;
         FIXME(module,"No mapping for %s(), add one in library/miscstubs.c\n",name);
         assert( FALSE );
         return NULL;
@@ -311,7 +311,7 @@ FARPROC16 MODULE_GetWndProcEntry16( LPCSTR name )
     else
     {
         WORD ordinal;
-        static HMODULE32 hModule = 0;
+        static HMODULE hModule = 0;
 
         if (!hModule) hModule = GetModuleHandle16( "WPROCS" );
         ordinal = NE_GetOrdinal( hModule, name );
@@ -337,7 +337,7 @@ FARPROC16 MODULE_GetWndProcEntry16( LPCSTR name )
  *	the module handle if found
  * 	0 if not
  */
-HMODULE32 MODULE_FindModule32(
+HMODULE MODULE_FindModule(
 	LPCSTR path	/* [in] pathname of module/library to be found */
 ) {
     LPSTR	filename;
@@ -408,7 +408,7 @@ HMODULE32 MODULE_FindModule32(
  *	    NE_CreateProcess
  */
 static HINSTANCE16 NE_CreateProcess( LPCSTR name, LPCSTR cmd_line, LPCSTR env, 
-                                     BOOL32 inherit, LPSTARTUPINFO32A startup, 
+                                     BOOL inherit, LPSTARTUPINFOA startup, 
                                      LPPROCESS_INFORMATION info )
 {
     HINSTANCE16 hInstance, hPrevInstance;
@@ -442,14 +442,14 @@ static HINSTANCE16 NE_CreateProcess( LPCSTR name, LPCSTR cmd_line, LPCSTR env,
  */
 HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock )
 {
-    LOADPARAMS *params;
+    LOADPARAMS16 *params;
     LPSTR cmd_line, new_cmd_line;
     LPCVOID env = NULL;
-    STARTUPINFO32A startup;
+    STARTUPINFOA startup;
     PROCESS_INFORMATION info;
     HINSTANCE16 hInstance, hPrevInstance;
     NE_MODULE *pModule;
-    PDB32 *pdb;
+    PDB *pdb;
 
     /* Load module */
 
@@ -465,7 +465,7 @@ HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock )
 
     pModule->flags |= NE_FFLAGS_GUI;  /* FIXME: is this necessary? */
 
-    params = (LOADPARAMS *)paramBlock;
+    params = (LOADPARAMS16 *)paramBlock;
     cmd_line = (LPSTR)PTR_SEG_TO_LIN( params->cmdLine );
     if (!cmd_line) cmd_line = "";
     else if (*cmd_line) cmd_line++;  /* skip the length byte */
@@ -507,13 +507,13 @@ HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock )
 /**********************************************************************
  *	    LoadModule32    (KERNEL32.499)
  */
-HINSTANCE32 WINAPI LoadModule32( LPCSTR name, LPVOID paramBlock ) 
+HINSTANCE WINAPI LoadModule( LPCSTR name, LPVOID paramBlock ) 
 {
-    LOADPARAMS32 *params = (LOADPARAMS32 *)paramBlock;
+    LOADPARAMS *params = (LOADPARAMS *)paramBlock;
     PROCESS_INFORMATION info;
-    STARTUPINFO32A startup;
-    HINSTANCE32 hInstance;
-    PDB32 *pdb;
+    STARTUPINFOA startup;
+    HINSTANCE hInstance;
+    PDB *pdb;
     TDB *tdb;
 
     memset( &startup, '\0', sizeof(startup) );
@@ -521,7 +521,7 @@ HINSTANCE32 WINAPI LoadModule32( LPCSTR name, LPVOID paramBlock )
     startup.dwFlags = STARTF_USESHOWWINDOW;
     startup.wShowWindow = params->lpCmdShow? params->lpCmdShow[1] : 0;
 
-    if (!CreateProcess32A( name, params->lpCmdLine,
+    if (!CreateProcessA( name, params->lpCmdLine,
                            NULL, NULL, FALSE, 0, params->lpEnvAddress,
                            NULL, &startup, &info ))
         return GetLastError();  /* guaranteed to be < 32 */
@@ -541,17 +541,17 @@ HINSTANCE32 WINAPI LoadModule32( LPCSTR name, LPVOID paramBlock )
 /**********************************************************************
  *       CreateProcess32A          (KERNEL32.171)
  */
-BOOL32 WINAPI CreateProcess32A( LPCSTR lpApplicationName, LPSTR lpCommandLine, 
+BOOL WINAPI CreateProcessA( LPCSTR lpApplicationName, LPSTR lpCommandLine, 
                                 LPSECURITY_ATTRIBUTES lpProcessAttributes,
                                 LPSECURITY_ATTRIBUTES lpThreadAttributes,
-                                BOOL32 bInheritHandles, DWORD dwCreationFlags,
+                                BOOL bInheritHandles, DWORD dwCreationFlags,
                                 LPVOID lpEnvironment, LPCSTR lpCurrentDirectory,
-                                LPSTARTUPINFO32A lpStartupInfo,
+                                LPSTARTUPINFOA lpStartupInfo,
                                 LPPROCESS_INFORMATION lpProcessInfo )
 {
     HINSTANCE16 hInstance;
     LPCSTR cmdline;
-    PDB32 *pdb;
+    PDB *pdb;
     char name[256];
 
     /* Get name and command line */
@@ -565,7 +565,7 @@ BOOL32 WINAPI CreateProcess32A( LPCSTR lpApplicationName, LPSTR lpCommandLine,
     cmdline = lpCommandLine? lpCommandLine : lpApplicationName;
 
     if (lpApplicationName)
-        lstrcpyn32A(name, lpApplicationName, sizeof(name) - 4);
+        lstrcpynA(name, lpApplicationName, sizeof(name) - 4);
     else {
         char	*ptr;
         int	len;
@@ -575,10 +575,10 @@ BOOL32 WINAPI CreateProcess32A( LPCSTR lpApplicationName, LPSTR lpCommandLine,
 	do {
 	    len = (ptr? ptr-lpCommandLine : strlen(lpCommandLine)) + 1;
 	    if (len > sizeof(name) - 4) len = sizeof(name) - 4;
-	    lstrcpyn32A(name, lpCommandLine, len);
+	    lstrcpynA(name, lpCommandLine, len);
 	    if (!strchr(name, '\\') && !strchr(name, '.'))
 		strcat(name, ".exe");
-	    if (GetFileAttributes32A(name)!=-1)
+	    if (GetFileAttributesA(name)!=-1)
 	    	break;
 	    /* if there is a space and no file found yet, include the word
 	     * up to the next space too. If there is no next space, just
@@ -590,7 +590,7 @@ BOOL32 WINAPI CreateProcess32A( LPCSTR lpApplicationName, LPSTR lpCommandLine,
 	        ptr = strchr(lpCommandLine, ' ');
 		len = (ptr? ptr-lpCommandLine : strlen(lpCommandLine)) + 1;
 		if (len > sizeof(name) - 4) len = sizeof(name) - 4;
-		lstrcpyn32A(name, lpCommandLine, len);
+		lstrcpynA(name, lpCommandLine, len);
 		break;
 	    }
 	} while (1);
@@ -699,21 +699,21 @@ BOOL32 WINAPI CreateProcess32A( LPCSTR lpApplicationName, LPSTR lpCommandLine,
  * NOTES
  *  lpReserved is not converted
  */
-BOOL32 WINAPI CreateProcess32W( LPCWSTR lpApplicationName, LPWSTR lpCommandLine, 
+BOOL WINAPI CreateProcessW( LPCWSTR lpApplicationName, LPWSTR lpCommandLine, 
                                 LPSECURITY_ATTRIBUTES lpProcessAttributes,
                                 LPSECURITY_ATTRIBUTES lpThreadAttributes,
-                                BOOL32 bInheritHandles, DWORD dwCreationFlags,
+                                BOOL bInheritHandles, DWORD dwCreationFlags,
                                 LPVOID lpEnvironment, LPCWSTR lpCurrentDirectory,
-                                LPSTARTUPINFO32W lpStartupInfo,
+                                LPSTARTUPINFOW lpStartupInfo,
                                 LPPROCESS_INFORMATION lpProcessInfo )
-{   BOOL32 ret;
-    STARTUPINFO32A StartupInfoA;
+{   BOOL ret;
+    STARTUPINFOA StartupInfoA;
     
     LPSTR lpApplicationNameA = HEAP_strdupWtoA (GetProcessHeap(),0,lpApplicationName);
     LPSTR lpCommandLineA = HEAP_strdupWtoA (GetProcessHeap(),0,lpCommandLine);
     LPSTR lpCurrentDirectoryA = HEAP_strdupWtoA (GetProcessHeap(),0,lpCurrentDirectory);
 
-    memcpy (&StartupInfoA, lpStartupInfo, sizeof(STARTUPINFO32A));
+    memcpy (&StartupInfoA, lpStartupInfo, sizeof(STARTUPINFOA));
     StartupInfoA.lpDesktop = HEAP_strdupWtoA (GetProcessHeap(),0,lpStartupInfo->lpDesktop);
     StartupInfoA.lpTitle = HEAP_strdupWtoA (GetProcessHeap(),0,lpStartupInfo->lpTitle);
 
@@ -722,7 +722,7 @@ BOOL32 WINAPI CreateProcess32W( LPCWSTR lpApplicationName, LPWSTR lpCommandLine,
     if (lpStartupInfo->lpReserved)
       FIXME(win32,"StartupInfo.lpReserved is used, please report (%s)\n", debugstr_w(lpStartupInfo->lpReserved));
       
-    ret = CreateProcess32A(  lpApplicationNameA,  lpCommandLineA, 
+    ret = CreateProcessA(  lpApplicationNameA,  lpCommandLineA, 
                              lpProcessAttributes, lpThreadAttributes,
                              bInheritHandles, dwCreationFlags,
                              lpEnvironment, lpCurrentDirectoryA,
@@ -739,19 +739,19 @@ BOOL32 WINAPI CreateProcess32W( LPCWSTR lpApplicationName, LPWSTR lpCommandLine,
 /***********************************************************************
  *              GetModuleHandle         (KERNEL32.237)
  */
-HMODULE32 WINAPI GetModuleHandle32A(LPCSTR module)
+HMODULE WINAPI GetModuleHandleA(LPCSTR module)
 {
     if (module == NULL)
     	return PROCESS_Current()->exe_modref->module;
     else
-	return MODULE_FindModule32( module );
+	return MODULE_FindModule( module );
 }
 
-HMODULE32 WINAPI GetModuleHandle32W(LPCWSTR module)
+HMODULE WINAPI GetModuleHandleW(LPCWSTR module)
 {
-    HMODULE32 hModule;
+    HMODULE hModule;
     LPSTR modulea = HEAP_strdupWtoA( GetProcessHeap(), 0, module );
-    hModule = GetModuleHandle32A( modulea );
+    hModule = GetModuleHandleA( modulea );
     HeapFree( GetProcessHeap(), 0, modulea );
     return hModule;
 }
@@ -760,8 +760,8 @@ HMODULE32 WINAPI GetModuleHandle32W(LPCWSTR module)
 /***********************************************************************
  *              GetModuleFileName32A      (KERNEL32.235)
  */
-DWORD WINAPI GetModuleFileName32A( 
-	HMODULE32 hModule,	/* [in] module handle (32bit) */
+DWORD WINAPI GetModuleFileNameA( 
+	HMODULE hModule,	/* [in] module handle (32bit) */
 	LPSTR lpFileName,	/* [out] filenamebuffer */
         DWORD size		/* [in] size of filenamebuffer */
 ) {                   
@@ -771,9 +771,9 @@ DWORD WINAPI GetModuleFileName32A(
     	return 0;
 
     if (PE_HEADER(wm->module)->OptionalHeader.MajorOperatingSystemVersion >= 4.0)
-      lstrcpyn32A( lpFileName, wm->longname, size );
+      lstrcpynA( lpFileName, wm->longname, size );
     else
-      lstrcpyn32A( lpFileName, wm->shortname, size );
+      lstrcpynA( lpFileName, wm->shortname, size );
        
     TRACE(module, "%s\n", lpFileName );
     return strlen(lpFileName);
@@ -783,11 +783,11 @@ DWORD WINAPI GetModuleFileName32A(
 /***********************************************************************
  *              GetModuleFileName32W      (KERNEL32.236)
  */
-DWORD WINAPI GetModuleFileName32W( HMODULE32 hModule, LPWSTR lpFileName,
+DWORD WINAPI GetModuleFileNameW( HMODULE hModule, LPWSTR lpFileName,
                                    DWORD size )
 {
     LPSTR fnA = (char*)HeapAlloc( GetProcessHeap(), 0, size );
-    DWORD res = GetModuleFileName32A( hModule, fnA, size );
+    DWORD res = GetModuleFileNameA( hModule, fnA, size );
     lstrcpynAtoW( lpFileName, fnA, size );
     HeapFree( GetProcessHeap(), 0, fnA );
     return res;
@@ -798,20 +798,20 @@ DWORD WINAPI GetModuleFileName32W( HMODULE32 hModule, LPWSTR lpFileName,
  *           LoadLibraryEx32W   (KERNEL.513)
  * FIXME
  */
-HMODULE32 WINAPI LoadLibraryEx32W16( LPCSTR libname, HANDLE16 hf,
+HMODULE WINAPI LoadLibraryEx32W16( LPCSTR libname, HANDLE16 hf,
                                        DWORD flags )
 {
     TRACE(module,"(%s,%d,%08lx)\n",libname,hf,flags);
-    return LoadLibraryEx32A(libname, hf,flags);
+    return LoadLibraryExA(libname, hf,flags);
 }
 
 /***********************************************************************
  *           LoadLibraryEx32A   (KERNEL32)
  */
-HMODULE32 WINAPI LoadLibraryEx32A(LPCSTR libname,HFILE32 hfile,DWORD flags)
+HMODULE WINAPI LoadLibraryExA(LPCSTR libname,HFILE hfile,DWORD flags)
 {
-    HMODULE32 hmod;
-    hmod = MODULE_LoadLibraryEx32A( libname, hfile, flags );
+    HMODULE hmod;
+    hmod = MODULE_LoadLibraryExA( libname, hfile, flags );
 
     /* at least call not the dllmain...*/
     if ( DONT_RESOLVE_DLL_REFERENCES==flags || LOAD_LIBRARY_AS_DATAFILE==flags )
@@ -826,39 +826,39 @@ HMODULE32 WINAPI LoadLibraryEx32A(LPCSTR libname,HFILE32 hfile,DWORD flags)
     return hmod;
 }
 
-HMODULE32 MODULE_LoadLibraryEx32A( LPCSTR libname, HFILE32 hfile, DWORD flags )
+HMODULE MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags )
 {
-    HMODULE32 hmod;
+    HMODULE hmod;
     
-    hmod = ELF_LoadLibraryEx32A( libname, hfile, flags );
+    hmod = ELF_LoadLibraryExA( libname, hfile, flags );
     if (hmod) return hmod;
 
-    hmod = PE_LoadLibraryEx32A( libname, hfile, flags );
+    hmod = PE_LoadLibraryExA( libname, hfile, flags );
     return hmod;
 }
 
 /***********************************************************************
  *           LoadLibraryA         (KERNEL32)
  */
-HMODULE32 WINAPI LoadLibrary32A(LPCSTR libname) {
-	return LoadLibraryEx32A(libname,0,0);
+HMODULE WINAPI LoadLibraryA(LPCSTR libname) {
+	return LoadLibraryExA(libname,0,0);
 }
 
 /***********************************************************************
  *           LoadLibraryW         (KERNEL32)
  */
-HMODULE32 WINAPI LoadLibrary32W(LPCWSTR libnameW)
+HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW)
 {
-    return LoadLibraryEx32W(libnameW,0,0);
+    return LoadLibraryExW(libnameW,0,0);
 }
 
 /***********************************************************************
  *           LoadLibraryExW       (KERNEL32)
  */
-HMODULE32 WINAPI LoadLibraryEx32W(LPCWSTR libnameW,HFILE32 hfile,DWORD flags)
+HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW,HFILE hfile,DWORD flags)
 {
     LPSTR libnameA = HEAP_strdupWtoA( GetProcessHeap(), 0, libnameW );
-    HMODULE32 ret = LoadLibraryEx32A( libnameA , hfile, flags );
+    HMODULE ret = LoadLibraryExA( libnameA , hfile, flags );
 
     HeapFree( GetProcessHeap(), 0, libnameA );
     return ret;
@@ -867,7 +867,7 @@ HMODULE32 WINAPI LoadLibraryEx32W(LPCWSTR libnameW,HFILE32 hfile,DWORD flags)
 /***********************************************************************
  *           FreeLibrary
  */
-BOOL32 WINAPI FreeLibrary32(HINSTANCE32 hLibModule)
+BOOL WINAPI FreeLibrary(HINSTANCE hLibModule)
 {
     FIXME(module,"(0x%08x): stub\n", hLibModule);
     return TRUE;  /* FIXME */
@@ -879,9 +879,9 @@ BOOL32 WINAPI FreeLibrary32(HINSTANCE32 hLibModule)
  *
  * FIXME: rough guesswork, don't know what "Private" means
  */
-HINSTANCE32 WINAPI PrivateLoadLibrary(LPCSTR libname)
+HINSTANCE WINAPI PrivateLoadLibrary(LPCSTR libname)
 {
-        return (HINSTANCE32)LoadLibrary16(libname);
+        return (HINSTANCE)LoadLibrary16(libname);
 }
 
 
@@ -891,7 +891,7 @@ HINSTANCE32 WINAPI PrivateLoadLibrary(LPCSTR libname)
  *
  * FIXME: rough guesswork, don't know what "Private" means
  */
-void WINAPI PrivateFreeLibrary(HINSTANCE32 handle)
+void WINAPI PrivateFreeLibrary(HINSTANCE handle)
 {
 	FreeLibrary16((HINSTANCE16)handle);
 }
@@ -902,19 +902,19 @@ void WINAPI PrivateFreeLibrary(HINSTANCE32 handle)
  */
 HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow )
 {
-    return WinExec32( lpCmdLine, nCmdShow );
+    return WinExec( lpCmdLine, nCmdShow );
 }
 
 
 /***********************************************************************
  *           WinExec32   (KERNEL32.566)
  */
-HINSTANCE32 WINAPI WinExec32( LPCSTR lpCmdLine, UINT32 nCmdShow )
+HINSTANCE WINAPI WinExec( LPCSTR lpCmdLine, UINT nCmdShow )
 {
-    HINSTANCE32 handle = 2;
+    HINSTANCE handle = 2;
     char *p, filename[256];
     int  spacelimit = 0, exhausted = 0;
-    LOADPARAMS32 params;
+    LOADPARAMS params;
     UINT16 paramCmdShow[2];
 
     if (!lpCmdLine)
@@ -939,7 +939,7 @@ HINSTANCE32 WINAPI WinExec32( LPCSTR lpCmdLine, UINT32 nCmdShow )
 
 	/* Build the filename and command-line */
 
-	lstrcpyn32A(filename, lpCmdLine,
+	lstrcpynA(filename, lpCmdLine,
 		    sizeof(filename) - 4 /* for extension */);
 
 	/* Keep grabbing characters until end-of-string, tab, or until the
@@ -966,7 +966,7 @@ HINSTANCE32 WINAPI WinExec32( LPCSTR lpCmdLine, UINT32 nCmdShow )
 
 	if (!__winelib)
 	{
-            handle = LoadModule32( filename, &params );
+            handle = LoadModule( filename, &params );
 	    if (handle == 2)  /* file not found */
 	    {
 		/* Check that the original file name did not have a suffix */
@@ -976,7 +976,7 @@ HINSTANCE32 WINAPI WinExec32( LPCSTR lpCmdLine, UINT32 nCmdShow )
 		{
 		    p = filename + strlen(filename);
 		    strcpy( p, ".exe" );
-                    handle = LoadModule32( filename, &params );
+                    handle = LoadModule( filename, &params );
                     *p = '\0';  /* Remove extension */
 		}
 	    }
@@ -1058,7 +1058,7 @@ HINSTANCE32 WINAPI WinExec32( LPCSTR lpCmdLine, UINT32 nCmdShow )
  *           WIN32_GetProcAddress16   (KERNEL32.36)
  * Get procaddress in 16bit module from win32... (kernel32 undoc. ordinal func)
  */
-FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE32 hModule, LPCSTR name )
+FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE hModule, LPCSTR name )
 {
     WORD	ordinal;
     FARPROC16	ret;
@@ -1084,7 +1084,7 @@ FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE32 hModule, LPCSTR name )
     }
     if (!ordinal) return (FARPROC16)0;
     ret = NE_GetEntryPoint( hModule, ordinal );
-    TRACE(module,"returning %08x\n",(UINT32)ret);
+    TRACE(module,"returning %08x\n",(UINT)ret);
     return ret;
 }
 
@@ -1115,7 +1115,7 @@ FARPROC16 WINAPI GetProcAddress16( HMODULE16 hModule, SEGPTR name )
 
     ret = NE_GetEntryPoint( hModule, ordinal );
 
-    TRACE(module, "returning %08x\n", (UINT32)ret );
+    TRACE(module, "returning %08x\n", (UINT)ret );
     return ret;
 }
 
@@ -1123,26 +1123,26 @@ FARPROC16 WINAPI GetProcAddress16( HMODULE16 hModule, SEGPTR name )
 /***********************************************************************
  *           GetProcAddress32   		(KERNEL32.257)
  */
-FARPROC32 WINAPI GetProcAddress32( HMODULE32 hModule, LPCSTR function )
+FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function )
 {
-    return MODULE_GetProcAddress32( hModule, function, TRUE );
+    return MODULE_GetProcAddress( hModule, function, TRUE );
 }
 
 /***********************************************************************
  *           WIN16_GetProcAddress32   		(KERNEL.453)
  */
-FARPROC32 WINAPI WIN16_GetProcAddress32( HMODULE32 hModule, LPCSTR function )
+FARPROC WINAPI GetProcAddress32_16( HMODULE hModule, LPCSTR function )
 {
-    return MODULE_GetProcAddress32( hModule, function, FALSE );
+    return MODULE_GetProcAddress( hModule, function, FALSE );
 }
 
 /***********************************************************************
  *           MODULE_GetProcAddress32   		(internal)
  */
-FARPROC32 MODULE_GetProcAddress32( 
-	HMODULE32 hModule, 	/* [in] current module handle */
+FARPROC MODULE_GetProcAddress( 
+	HMODULE hModule, 	/* [in] current module handle */
 	LPCSTR function,	/* [in] function to be looked up */
-	BOOL32 snoop )
+	BOOL snoop )
 {
     WINE_MODREF	*wm = MODULE32_LookupHMODULE( hModule );
 
@@ -1151,7 +1151,7 @@ FARPROC32 MODULE_GetProcAddress32(
     else
 	TRACE(win32,"(%08lx,%p)\n",(DWORD)hModule,function);
     if (!wm)
-        return (FARPROC32)0;
+        return (FARPROC)0;
     switch (wm->type)
     {
     case MODULE32_PE:
@@ -1160,7 +1160,7 @@ FARPROC32 MODULE_GetProcAddress32(
     	return ELF_FindExportedFunction( wm, function);
     default:
     	ERR(module,"wine_modref type %d not handled.\n",wm->type);
-    	return (FARPROC32)0;
+    	return (FARPROC)0;
     }
 }
 
@@ -1168,7 +1168,7 @@ FARPROC32 MODULE_GetProcAddress32(
 /***********************************************************************
  *           RtlImageNtHeaders   (NTDLL)
  */
-PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE32 hModule)
+PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule)
 {
     /* basically:
      * return  hModule+(((IMAGE_DOS_HEADER*)hModule)->e_lfanew); 
@@ -1195,14 +1195,14 @@ typedef struct _GPHANDLERDEF
 } GPHANDLERDEF;
 #pragma pack(4)
 
-SEGPTR WINAPI HasGPHandler( SEGPTR address )
+SEGPTR WINAPI HasGPHandler16( SEGPTR address )
 {
     HMODULE16 hModule;
     int gpOrdinal;
     SEGPTR gpPtr;
     GPHANDLERDEF *gpHandler;
    
-    if (    (hModule = FarGetOwner( SELECTOROF(address) )) != 0
+    if (    (hModule = FarGetOwner16( SELECTOROF(address) )) != 0
          && (gpOrdinal = NE_GetOrdinal( hModule, "__GP" )) != 0
          && (gpPtr = (SEGPTR)NE_GetEntryPointEx( hModule, gpOrdinal, FALSE )) != 0
          && !IsBadReadPtr16( gpPtr, sizeof(GPHANDLERDEF) )
diff --git a/loader/ne/convert.c b/loader/ne/convert.c
index a342072812e..e421236a253 100644
--- a/loader/ne/convert.c
+++ b/loader/ne/convert.c
@@ -42,8 +42,8 @@ VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
     case 0xffff:  ((WORD *)p)++; *((BYTE *)dialog16)++ = 0xff; 
                   *((WORD *)dialog16)++ = *((WORD *)p)++; break;
     default:      lstrcpyWtoA( (LPSTR)dialog16, (LPWSTR)p );
-                  ((LPSTR)dialog16) += lstrlen32A( (LPSTR)dialog16 ) + 1;
-                  ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+                  ((LPSTR)dialog16) += lstrlenA( (LPSTR)dialog16 ) + 1;
+                  ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
                   break;
     }
 
@@ -54,15 +54,15 @@ VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
     case 0xffff:  ((WORD *)p)++; *((BYTE *)dialog16)++ = 0xff; 
                   *((WORD *)dialog16)++ = *((WORD *)p)++; break;
     default:      lstrcpyWtoA( (LPSTR)dialog16, (LPWSTR)p );
-                  ((LPSTR)dialog16) += lstrlen32A( (LPSTR)dialog16 ) + 1;
-                  ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+                  ((LPSTR)dialog16) += lstrlenA( (LPSTR)dialog16 ) + 1;
+                  ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
                   break;
     }
 
     /* Transfer window caption */
     lstrcpyWtoA( (LPSTR)dialog16, (LPWSTR)p );
-    ((LPSTR)dialog16) += lstrlen32A( (LPSTR)dialog16 ) + 1;
-    ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+    ((LPSTR)dialog16) += lstrlenA( (LPSTR)dialog16 ) + 1;
+    ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
 
     /* Transfer font info */
     if (style & DS_SETFONT)
@@ -74,8 +74,8 @@ VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
             *((WORD *)dialog16)++ = *((WORD *)p)++; /* italic */
         }
         lstrcpyWtoA( (LPSTR)dialog16, (LPWSTR)p );  /* faceName */
-        ((LPSTR)dialog16) += lstrlen32A( (LPSTR)dialog16 ) + 1;
-        ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+        ((LPSTR)dialog16) += lstrlenA( (LPSTR)dialog16 ) + 1;
+        ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
     }
 
     /* Transfer dialog items */
@@ -116,8 +116,8 @@ VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
         case 0xffff:  ((WORD *)p)++; 
                       *((BYTE *)dialog16)++ = (BYTE)*((WORD *)p)++; break;
         default:      lstrcpyWtoA( (LPSTR)dialog16, (LPWSTR)p );
-                      ((LPSTR)dialog16) += lstrlen32A( (LPSTR)dialog16 ) + 1;
-                      ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+                      ((LPSTR)dialog16) += lstrlenA( (LPSTR)dialog16 ) + 1;
+                      ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
                       break;
         }
 
@@ -128,8 +128,8 @@ VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
         case 0xffff:  ((WORD *)p)++; *((BYTE *)dialog16)++ = 0xff; 
                       *((WORD *)dialog16)++ = *((WORD *)p)++; break;
         default:      lstrcpyWtoA( (LPSTR)dialog16, (LPWSTR)p );
-                      ((LPSTR)dialog16) += lstrlen32A( (LPSTR)dialog16 ) + 1;
-                      ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+                      ((LPSTR)dialog16) += lstrlenA( (LPSTR)dialog16 ) + 1;
+                      ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
                       break;
         }
        
@@ -155,7 +155,7 @@ VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
 /**********************************************************************
  *	    GetDialog32Size   (KERNEL.618)
  */
-WORD WINAPI GetDialog32Size( LPVOID dialog32 )
+WORD WINAPI GetDialog32Size16( LPVOID dialog32 )
 {
     LPVOID p = dialog32;
     WORD nbItems, data, dialogEx;
@@ -183,7 +183,7 @@ WORD WINAPI GetDialog32Size( LPVOID dialog32 )
     {
     case 0x0000:  ((WORD *)p)++; break;
     case 0xffff:  ((WORD *)p) += 2; break;
-    default:      ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1; break;
+    default:      ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1; break;
     }
 
     /* Skip class name */
@@ -191,11 +191,11 @@ WORD WINAPI GetDialog32Size( LPVOID dialog32 )
     {
     case 0x0000:  ((WORD *)p)++; break;
     case 0xffff:  ((WORD *)p) += 2; break;
-    default:      ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1; break;
+    default:      ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1; break;
     }
 
     /* Skip window caption */
-    ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1; 
+    ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1; 
 
     /* Skip font info */
     if (style & DS_SETFONT)
@@ -206,7 +206,7 @@ WORD WINAPI GetDialog32Size( LPVOID dialog32 )
             ((WORD *)p)++; /* weight */
             ((WORD *)p)++; /* italic */
         }
-        ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;  /* faceName */
+        ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;  /* faceName */
     }
 
     /* Skip dialog items */
@@ -242,7 +242,7 @@ WORD WINAPI GetDialog32Size( LPVOID dialog32 )
         {
         case 0x0000:  ((WORD *)p)++; break;
         case 0xffff:  ((WORD *)p) += 2; break;
-        default:      ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1; break;
+        default:      ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1; break;
         }
 
         /* Skip window name */
@@ -250,7 +250,7 @@ WORD WINAPI GetDialog32Size( LPVOID dialog32 )
         {
         case 0x0000:  ((WORD *)p)++; break;
         case 0xffff:  ((WORD *)p) += 2; break;
-        default:      ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1; break;
+        default:      ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1; break;
         }
        
         /* Skip data */
@@ -291,8 +291,8 @@ VOID WINAPI ConvertMenu32To16( LPVOID menu32, DWORD size, LPVOID menu16 )
                 level++;
        
             lstrcpyWtoA( (LPSTR)menu16, (LPWSTR)p );
-            ((LPSTR)menu16) += lstrlen32A( (LPSTR)menu16 ) + 1;
-            ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+            ((LPSTR)menu16) += lstrlenA( (LPSTR)menu16 ) + 1;
+            ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
 
             if ( flags & MF_END )
                 level--;
@@ -305,8 +305,8 @@ VOID WINAPI ConvertMenu32To16( LPVOID menu32, DWORD size, LPVOID menu16 )
             flags = *((BYTE *)menu16)++ = (BYTE)*((WORD *)p)++;  
        
             lstrcpyWtoA( (LPSTR)menu16, (LPWSTR)p );
-            ((LPSTR)menu16) += lstrlen32A( (LPSTR)menu16 ) + 1;
-            ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+            ((LPSTR)menu16) += lstrlenA( (LPSTR)menu16 ) + 1;
+            ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
 
             /* align on DWORD boundary (32-bit only) */
             p = (LPVOID)((((int)p) + 3) & ~3);
@@ -326,7 +326,7 @@ VOID WINAPI ConvertMenu32To16( LPVOID menu32, DWORD size, LPVOID menu16 )
 /**********************************************************************
  *	    GetMenu32Size   (KERNEL.617)
  */
-WORD WINAPI GetMenu32Size( LPVOID menu32 )
+WORD WINAPI GetMenu32Size16( LPVOID menu32 )
 {
     LPVOID p = menu32;
     WORD version, headersize, flags, level = 1;
@@ -344,7 +344,7 @@ WORD WINAPI GetMenu32Size( LPVOID menu32 )
             else
                 level++;
        
-            ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+            ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
 
             if ( flags & MF_END )
                 level--;
@@ -356,7 +356,7 @@ WORD WINAPI GetMenu32Size( LPVOID menu32 )
             ((DWORD *)p)++; /* ID */
             flags = *((WORD *)p)++; 
        
-            ((LPWSTR)p) += lstrlen32W( (LPWSTR)p ) + 1;
+            ((LPWSTR)p) += lstrlenW( (LPWSTR)p ) + 1;
 
             /* align on DWORD boundary (32-bit only) */
             p = (LPVOID)((((int)p) + 3) & ~3);
diff --git a/loader/ne/module.c b/loader/ne/module.c
index c68c784a1ea..f8c53c2a674 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -33,8 +33,8 @@ void (*fnSNOOP16_RegisterDLL)(NE_MODULE*,LPCSTR) = NULL;
 
 static NE_MODULE *pCachedModule = 0;  /* Module cached by NE_OpenFile */
 
-static HMODULE16 NE_LoadBuiltin(LPCSTR name,BOOL32 force) { return 0; }
-HMODULE16 (*fnBUILTIN_LoadModule)(LPCSTR name,BOOL32 force) = NE_LoadBuiltin;
+static HMODULE16 NE_LoadBuiltin(LPCSTR name,BOOL force) { return 0; }
+HMODULE16 (*fnBUILTIN_LoadModule)(LPCSTR name,BOOL force) = NE_LoadBuiltin;
 
 
 /***********************************************************************
@@ -131,7 +131,7 @@ void NE_DumpModule( HMODULE16 hModule )
         for (i = 0; i < pModule->modref_count; i++, pword++)
         {
             char name[10];
-            GetModuleName( *pword, name, sizeof(name) );
+            GetModuleName16( *pword, name, sizeof(name) );
 	    DUMP( "%d: %04x -> '%s'\n", i, *pword, name );
         }
     }
@@ -249,7 +249,7 @@ WORD NE_GetOrdinal( HMODULE16 hModule, const char *name )
       /* Now copy and uppercase the string */
 
     strcpy( buffer, name );
-    CharUpper32A( buffer );
+    CharUpperA( buffer );
     len = strlen( buffer );
 
       /* First search the resident names */
@@ -340,7 +340,7 @@ FARPROC16 NE_GetEntryPointEx( HMODULE16 hModule, WORD ordinal, BOOL16 snoop )
     }
 
     if (sel == 0xfe) sel = 0xffff;  /* constant entry */
-    else sel = GlobalHandleToSel(NE_SEG_TABLE(pModule)[sel-1].hSeg);
+    else sel = GlobalHandleToSel16(NE_SEG_TABLE(pModule)[sel-1].hSeg);
     if (sel==0xffff)
 	return (FARPROC16)PTR_SEG_OFF_TO_SEGPTR( sel, offset );
     if (!snoop || !fnSNOOP16_GetProcAddress16)
@@ -399,11 +399,11 @@ BOOL16 NE_SetEntryPoint( HMODULE16 hModule, WORD ordinal, WORD offset )
 /***********************************************************************
  *           NE_OpenFile
  */
-HANDLE32 NE_OpenFile( NE_MODULE *pModule )
+HANDLE NE_OpenFile( NE_MODULE *pModule )
 {
     char *name;
 
-    static HANDLE32 cachedfd = -1;
+    static HANDLE cachedfd = -1;
 
     TRACE( module, "(%p) cache: mod=%p fd=%d\n",
            pModule, pCachedModule, cachedfd );
@@ -411,7 +411,7 @@ HANDLE32 NE_OpenFile( NE_MODULE *pModule )
     CloseHandle( cachedfd );
     pCachedModule = pModule;
     name = NE_MODULE_NAME( pModule );
-    if ((cachedfd = CreateFile32A( name, GENERIC_READ, FILE_SHARE_READ,
+    if ((cachedfd = CreateFileA( name, GENERIC_READ, FILE_SHARE_READ,
                                    NULL, OPEN_EXISTING, 0, -1 )) == -1)
         MSG( "Can't open file '%s' for module %04x\n", name, pModule->self );
     else
@@ -482,7 +482,7 @@ static HMODULE16 NE_LoadExeHeader( HFILE16 hFile, OFSTRUCT *ofs )
 
     hModule = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, size );
     if (!hModule) return (HMODULE16)11;  /* invalid exe */
-    FarSetOwner( hModule, hModule );
+    FarSetOwner16( hModule, hModule );
     pModule = (NE_MODULE *)GlobalLock16( hModule );
     memcpy( pModule, &ne_header, sizeof(ne_header) );
     pModule->count = 0;
@@ -686,7 +686,7 @@ static HMODULE16 NE_LoadExeHeader( HFILE16 hFile, OFSTRUCT *ofs )
  *
  * Load all DLLs implicitly linked to a module.
  */
-static BOOL32 NE_LoadDLLs( NE_MODULE *pModule )
+static BOOL NE_LoadDLLs( NE_MODULE *pModule )
 {
     int i;
     WORD *pModRef = (WORD *)((char *)pModule + pModule->modref_table);
@@ -748,7 +748,7 @@ static BOOL32 NE_LoadDLLs( NE_MODULE *pModule )
  * Implementation of LoadModule16().
  */
 HINSTANCE16 NE_LoadModule( LPCSTR name, HINSTANCE16 *hPrevInstance,
-                           BOOL32 implicit, BOOL32 lib_only )
+                           BOOL implicit, BOOL lib_only )
 {
     HMODULE16 hModule;
     HINSTANCE16 hInstance;
@@ -801,7 +801,7 @@ HINSTANCE16 NE_LoadModule( LPCSTR name, HINSTANCE16 *hPrevInstance,
     if (!NE_CreateSegments( pModule ) ||
         !(hInstance = NE_CreateInstance( pModule, NULL, lib_only )))
     {
-        GlobalFreeAll( hModule );
+        GlobalFreeAll16( hModule );
         return 8;  /* Insufficient memory */
     }
 
@@ -891,7 +891,7 @@ static BOOL16 MODULE_CallWEP( HMODULE16 hModule )
  *
  * Implementation of FreeModule16().
  */
-static BOOL16 NE_FreeModule( HMODULE16 hModule, BOOL32 call_wep )
+static BOOL16 NE_FreeModule( HMODULE16 hModule, BOOL call_wep )
 {
     HMODULE16 *hPrevModule;
     NE_MODULE *pModule;
@@ -950,7 +950,7 @@ static BOOL16 NE_FreeModule( HMODULE16 hModule, BOOL32 call_wep )
 
     /* Free the module storage */
 
-    GlobalFreeAll( hModule );
+    GlobalFreeAll16( hModule );
 
     /* Remove module from cache */
 
@@ -981,7 +981,7 @@ void WINAPI FreeLibrary16( HINSTANCE16 handle )
 /**********************************************************************
  *	    GetModuleName    (KERNEL.27)
  */
-BOOL16 WINAPI GetModuleName( HINSTANCE16 hinst, LPSTR buf, INT16 count )
+BOOL16 WINAPI GetModuleName16( HINSTANCE16 hinst, LPSTR buf, INT16 count )
 {
     NE_MODULE *pModule;
     BYTE *p;
@@ -1001,7 +1001,7 @@ BOOL16 WINAPI GetModuleName( HINSTANCE16 hinst, LPSTR buf, INT16 count )
 /**********************************************************************
  *	    GetModuleUsage    (KERNEL.48)
  */
-INT16 WINAPI GetModuleUsage( HINSTANCE16 hModule )
+INT16 WINAPI GetModuleUsage16( HINSTANCE16 hModule )
 {
     NE_MODULE *pModule = NE_GetPtr( hModule );
     return pModule ? pModule->count : 0;
@@ -1011,7 +1011,7 @@ INT16 WINAPI GetModuleUsage( HINSTANCE16 hModule )
 /**********************************************************************
  *	    GetExpWinVer    (KERNEL.167)
  */
-WORD WINAPI GetExpWinVer( HMODULE16 hModule )
+WORD WINAPI GetExpWinVer16( HMODULE16 hModule )
 {
     NE_MODULE *pModule = NE_GetPtr( hModule );
     return pModule ? pModule->expected_version : 0;
@@ -1028,7 +1028,7 @@ INT16 WINAPI GetModuleFileName16( HINSTANCE16 hModule, LPSTR lpFileName,
 
     if (!hModule) hModule = GetCurrentTask();
     if (!(pModule = NE_GetPtr( hModule ))) return 0;
-    lstrcpyn32A( lpFileName, NE_MODULE_NAME(pModule), nSize );
+    lstrcpynA( lpFileName, NE_MODULE_NAME(pModule), nSize );
     TRACE(module, "%s\n", lpFileName );
     return strlen(lpFileName);
 }
@@ -1073,10 +1073,10 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name )
         if (!(modulename = strrchr( modulepath, '\\' )))
             modulename = modulepath;
         else modulename++;
-        if (!lstrcmpi32A( modulename, filename )) return hModule;
+        if (!lstrcmpiA( modulename, filename )) return hModule;
 
         name_table = (BYTE *)pModule + pModule->name_table;
-        if ((*name_table == len) && !lstrncmpi32A(filename, name_table+1, len))
+        if ((*name_table == len) && !lstrncmpiA(filename, name_table+1, len))
             return hModule;
         hModule = pModule->next;
     }
@@ -1087,17 +1087,17 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name )
 /**********************************************************************
  *	    ModuleFirst    (TOOLHELP.59)
  */
-BOOL16 WINAPI ModuleFirst( MODULEENTRY *lpme )
+BOOL16 WINAPI ModuleFirst16( MODULEENTRY *lpme )
 {
     lpme->wNext = hFirstModule;
-    return ModuleNext( lpme );
+    return ModuleNext16( lpme );
 }
 
 
 /**********************************************************************
  *	    ModuleNext    (TOOLHELP.60)
  */
-BOOL16 WINAPI ModuleNext( MODULEENTRY *lpme )
+BOOL16 WINAPI ModuleNext16( MODULEENTRY *lpme )
 {
     NE_MODULE *pModule;
     char *name;
@@ -1109,7 +1109,7 @@ BOOL16 WINAPI ModuleNext( MODULEENTRY *lpme )
     lpme->szModule[min(*name, MAX_MODULE_NAME)] = '\0';
     lpme->hModule = lpme->wNext;
     lpme->wcUsage = pModule->count;
-    lstrcpyn32A( lpme->szExePath, NE_MODULE_NAME(pModule), sizeof(lpme->szExePath) );
+    lstrcpynA( lpme->szExePath, NE_MODULE_NAME(pModule), sizeof(lpme->szExePath) );
     lpme->wNext = pModule->next;
     return TRUE;
 }
@@ -1118,27 +1118,27 @@ BOOL16 WINAPI ModuleNext( MODULEENTRY *lpme )
 /**********************************************************************
  *	    ModuleFindName    (TOOLHELP.61)
  */
-BOOL16 WINAPI ModuleFindName( MODULEENTRY *lpme, LPCSTR name )
+BOOL16 WINAPI ModuleFindName16( MODULEENTRY *lpme, LPCSTR name )
 {
     lpme->wNext = GetModuleHandle16( name );
-    return ModuleNext( lpme );
+    return ModuleNext16( lpme );
 }
 
 
 /**********************************************************************
  *	    ModuleFindHandle    (TOOLHELP.62)
  */
-BOOL16 WINAPI ModuleFindHandle( MODULEENTRY *lpme, HMODULE16 hModule )
+BOOL16 WINAPI ModuleFindHandle16( MODULEENTRY *lpme, HMODULE16 hModule )
 {
     hModule = GetExePtr( hModule );
     lpme->wNext = hModule;
-    return ModuleNext( lpme );
+    return ModuleNext16( lpme );
 }
 
 /***************************************************************************
  *		MapHModuleLS			(KERNEL32.520)
  */
-HMODULE16 WINAPI MapHModuleLS(HMODULE32 hmod) {
+HMODULE16 WINAPI MapHModuleLS(HMODULE hmod) {
 	NE_MODULE	*pModule;
 
 	if (!hmod)
@@ -1157,7 +1157,7 @@ HMODULE16 WINAPI MapHModuleLS(HMODULE32 hmod) {
 /***************************************************************************
  *		MapHModuleSL			(KERNEL32.521)
  */
-HMODULE32 WINAPI MapHModuleSL(HMODULE16 hmod) {
+HMODULE WINAPI MapHModuleSL(HMODULE16 hmod) {
 	NE_MODULE	*pModule;
 
 	if (!hmod) {
diff --git a/loader/ne/resource.c b/loader/ne/resource.c
index 06e740de72a..359f6c9caf1 100644
--- a/loader/ne/resource.c
+++ b/loader/ne/resource.c
@@ -63,7 +63,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId
                 if (p[1] & 0x8000)
                 {
                     if (!HIWORD(typeId)) continue;
-                    if (lstrcmpi32A( typeId,
+                    if (lstrcmpiA( typeId,
                                      (char *)(p + 3) )) continue;
                 }
                 else if (HIWORD(typeId) || (((DWORD)typeId & ~0x8000)!= p[1]))
@@ -74,7 +74,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId
                 if (p[2] & 0x8000)
                 {
                     if (!HIWORD(resId)) continue;
-                    if (lstrcmpi32A( resId,
+                    if (lstrcmpiA( resId,
                                (char*)(p+3)+strlen((char*)(p+3))+1 )) continue;
                     
                 }
@@ -113,7 +113,7 @@ NE_TYPEINFO *NE_FindTypeSection( LPBYTE pResTab,
 	    if (!(pTypeInfo->type_id & 0x8000))
 	    {
 		BYTE *p = pResTab + pTypeInfo->type_id;
-		if ((*p == len) && !lstrncmpi32A( p+1, str, len ))
+		if ((*p == len) && !lstrncmpiA( p+1, str, len ))
 		{
 		    TRACE(resource, "  Found type '%s'\n", str );
 		    return pTypeInfo;
@@ -160,7 +160,7 @@ NE_NAMEINFO *NE_FindResourceFromType( LPBYTE pResTab,
         {
             if (pNameInfo->id & 0x8000) continue;
             p = pResTab + pNameInfo->id;
-            if ((*p == len) && !lstrncmpi32A( p+1, str, len ))
+            if ((*p == len) && !lstrncmpiA( p+1, str, len ))
                 return pNameInfo;
         }
     }
@@ -183,7 +183,7 @@ NE_NAMEINFO *NE_FindResourceFromType( LPBYTE pResTab,
 HGLOBAL16 WINAPI NE_DefResourceHandler( HGLOBAL16 hMemObj, HMODULE16 hModule,
                                         HRSRC16 hRsrc )
 {
-    HANDLE32 fd;
+    HANDLE fd;
     NE_MODULE* pModule = NE_GetPtr( hModule );
     if (pModule && (fd = NE_OpenFile( pModule )) >= 0)
     {
@@ -197,7 +197,7 @@ HGLOBAL16 WINAPI NE_DefResourceHandler( HGLOBAL16 hMemObj, HMODULE16 hModule,
 	if( hMemObj )
 	    handle = GlobalReAlloc16( hMemObj, pNameInfo->length << sizeShift, 0 );
 	else
-	    handle = AllocResource( hModule, hRsrc, 0 );
+	    handle = AllocResource16( hModule, hRsrc, 0 );
 
 	if( handle )
 	{
@@ -216,7 +216,7 @@ HGLOBAL16 WINAPI NE_DefResourceHandler( HGLOBAL16 hMemObj, HMODULE16 hModule,
  *
  * Fill in 'resloader' fields in the resource table.
  */
-BOOL32 NE_InitResourceHandler( HMODULE16 hModule )
+BOOL NE_InitResourceHandler( HMODULE16 hModule )
 {
     NE_MODULE *pModule = NE_GetPtr( hModule );
     NE_TYPEINFO *pTypeInfo = (NE_TYPEINFO *)((char *)pModule + pModule->res_table + 2);
@@ -237,7 +237,7 @@ BOOL32 NE_InitResourceHandler( HMODULE16 hModule )
 /**********************************************************************
  *	SetResourceHandler	(KERNEL.43)
  */
-FARPROC16 WINAPI SetResourceHandler( HMODULE16 hModule, SEGPTR typeId,
+FARPROC16 WINAPI SetResourceHandler16( HMODULE16 hModule, SEGPTR typeId,
                                      FARPROC16 resourceHandler )
 {
     FARPROC16 prevHandler = NULL;
@@ -333,7 +333,7 @@ HRSRC16 NE_FindResource( NE_MODULE *pModule, LPCSTR name, LPCSTR type )
 /**********************************************************************
  *	    AllocResource    (KERNEL.66)
  */
-HGLOBAL16 WINAPI AllocResource( HMODULE16 hModule, HRSRC16 hRsrc, DWORD size)
+HGLOBAL16 WINAPI AllocResource16( HMODULE16 hModule, HRSRC16 hRsrc, DWORD size)
 {
     NE_NAMEINFO *pNameInfo=NULL;
     WORD sizeShift;
@@ -356,7 +356,7 @@ HGLOBAL16 WINAPI AllocResource( HMODULE16 hModule, HRSRC16 hRsrc, DWORD size)
  *
  * Check Schulman, p. 232 for details
  */
-HGLOBAL16 WINAPI DirectResAlloc( HINSTANCE16 hInstance, WORD wType,
+HGLOBAL16 WINAPI DirectResAlloc16( HINSTANCE16 hInstance, WORD wType,
                                  UINT16 wSize )
 {
     TRACE(resource,"(%04x,%04x,%04x)\n",
diff --git a/loader/ne/segment.c b/loader/ne/segment.c
index 0fd0605e124..ef7b8429002 100644
--- a/loader/ne/segment.c
+++ b/loader/ne/segment.c
@@ -28,7 +28,7 @@
 #include "debug.h"
 #include "xmalloc.h"
 
-#define SEL(x) GlobalHandleToSel(x)
+#define SEL(x) GlobalHandleToSel16(x)
 
 /***********************************************************************
  *           NE_GetRelocAddrName
@@ -51,14 +51,14 @@ static const char *NE_GetRelocAddrName( BYTE addr_type, int additive )
 /***********************************************************************
  *           NE_LoadSegment
  */
-BOOL32 NE_LoadSegment( NE_MODULE *pModule, WORD segnum )
+BOOL NE_LoadSegment( NE_MODULE *pModule, WORD segnum )
 {
     SEGTABLEENTRY *pSegTable, *pSeg;
     WORD *pModuleTable;
     WORD count, i, offset, next_offset;
     HMODULE16 module;
     FARPROC16 address = 0;
-    HFILE32 hf;
+    HFILE hf;
     DWORD res;
     struct relocation_entry_s *rep, *reloc_entries;
     BYTE *func_name;
@@ -94,7 +94,7 @@ BOOL32 NE_LoadSegment( NE_MODULE *pModule, WORD segnum )
         DWORD oldstack;
  	WORD old_hSeg, new_hSeg;
         THDB *thdb = THREAD_Current();
-        HFILE32 hFile32;
+        HFILE hFile32;
         HFILE16 hFile16;
 
  	selfloadheader = (SELFLOADHEADER *)
@@ -130,12 +130,12 @@ BOOL32 NE_LoadSegment( NE_MODULE *pModule, WORD segnum )
  	    memcpy(PTR_SEG_OFF_TO_LIN(SEL(old_hSeg),0),
  		   PTR_SEG_OFF_TO_LIN(SEL(new_hSeg),0), 
  		   pSeg->minsize ? pSeg->minsize : 0x10000);
- 	    FreeSelector(SEL(new_hSeg));
+ 	    FreeSelector16(SEL(new_hSeg));
  	    pSeg->hSeg = old_hSeg;
  	    TRACE(module, "New hSeg allocated for dgroup segment:Old=%d,New=%d\n", 
                 old_hSeg, new_hSeg);
  	  } else {
- 	    FreeSelector(SEL(pSeg->hSeg));
+ 	    FreeSelector16(SEL(pSeg->hSeg));
  	    pSeg->hSeg = new_hSeg;
  	  }
  	} 
@@ -308,7 +308,7 @@ BOOL32 NE_LoadSegment( NE_MODULE *pModule, WORD segnum )
 	if (rep->address_type > NE_RADDR_OFFSET32)
         {
             char module[10];
-            GetModuleName( pModule->self, module, sizeof(module) );
+            GetModuleName16( pModule->self, module, sizeof(module) );
             ERR( fixup, "WARNING: module %s: unknown reloc addr type = 0x%02x. Please report.\n",
                  module, rep->address_type );
         }
@@ -387,14 +387,14 @@ unknown:
 /***********************************************************************
  *           NE_LoadAllSegments
  */
-BOOL32 NE_LoadAllSegments( NE_MODULE *pModule )
+BOOL NE_LoadAllSegments( NE_MODULE *pModule )
 {
     int i;
     SEGTABLEENTRY * pSegTable = (SEGTABLEENTRY *) NE_SEG_TABLE(pModule);
 
     if (pModule->flags & NE_FFLAGS_SELFLOAD)
     {
-        HFILE32 hf;
+        HFILE hf;
         HFILE16 hFile16;
         /* Handle self loading modules */
         SELFLOADHEADER *selfloadheader;
@@ -413,7 +413,7 @@ BOOL32 NE_LoadAllSegments( NE_MODULE *pModule )
         selfloadheader->EntryAddrProc = NE_GetEntryPoint(hselfload,27);
         selfloadheader->MyAlloc  = NE_GetEntryPoint(hselfload,28);
         selfloadheader->SetOwner = NE_GetEntryPoint(GetModuleHandle16("KERNEL"),403);
-        pModule->self_loading_sel = GlobalHandleToSel(GLOBAL_Alloc(GMEM_ZEROINIT, 0xFF00, pModule->self, FALSE, FALSE, FALSE));
+        pModule->self_loading_sel = GlobalHandleToSel16(GLOBAL_Alloc(GMEM_ZEROINIT, 0xFF00, pModule->self, FALSE, FALSE, FALSE));
         oldstack = thdb->cur_stack;
         thdb->cur_stack = PTR_SEG_OFF_TO_SEGPTR(pModule->self_loading_sel,
                                                 0xff00 - sizeof(*stack16Top) );
@@ -459,7 +459,7 @@ BOOL32 NE_LoadAllSegments( NE_MODULE *pModule )
  */
 
 /* It does nothing */
-DWORD WINAPI PatchCodeHandle(HANDLE16 hSel)
+DWORD WINAPI PatchCodeHandle16(HANDLE16 hSel)
 {
     FIXME(module,"(%04x): stub.\n",hSel);
     return (DWORD)NULL;
@@ -606,7 +606,7 @@ static VOID NE_GetDLLInitParams( NE_MODULE *pModule,
  *
  * Call the DLL initialization code
  */
-static BOOL32 NE_InitDLL( TDB* pTask, NE_MODULE *pModule )
+static BOOL NE_InitDLL( TDB* pTask, NE_MODULE *pModule )
 {
     SEGTABLEENTRY *pSegTable;
     WORD hInst, ds, heap;
@@ -741,7 +741,7 @@ void NE_InitializeDLLs( HMODULE16 hModule )
  * If lib_only is TRUE, handle the module like a library even if it is a .EXE
  */
 HINSTANCE16 NE_CreateInstance( NE_MODULE *pModule, HINSTANCE16 *prev,
-                               BOOL32 lib_only )
+                               BOOL lib_only )
 {
     SEGTABLEENTRY *pSegment;
     int minsize;
@@ -812,20 +812,20 @@ DWORD WINAPI NE_AllocateSegment( WORD wFlags, WORD wSize, WORD wElem )
     if (	(wFlags & NE_SEGFLAGS_EXECUTEONLY) ||
     		!(wFlags & NE_SEGFLAGS_DATA)
     ) {
-        WORD hSel = GlobalHandleToSel(hMem);
-        WORD access = SelectorAccessRights(hSel,0,0);
+        WORD hSel = GlobalHandleToSel16(hMem);
+        WORD access = SelectorAccessRights16(hSel,0,0);
 
 	access |= 2<<2; /* SEGMENT_CODE */
-	SelectorAccessRights(hSel,1,access);
+	SelectorAccessRights16(hSel,1,access);
     }
-    return MAKELONG( hMem, GlobalHandleToSel(hMem) );
+    return MAKELONG( hMem, GlobalHandleToSel16(hMem) );
 }
 
 
 /***********************************************************************
  *           NE_CreateSegments
  */
-BOOL32 NE_CreateSegments( NE_MODULE *pModule )
+BOOL NE_CreateSegments( NE_MODULE *pModule )
 {
     SEGTABLEENTRY *pSegment;
     int i, minsize;
@@ -857,7 +857,7 @@ BOOL32 NE_CreateSegments( NE_MODULE *pModule )
 /**********************************************************************
  *	    IsSharedSelector    (KERNEL.345)
  */
-BOOL16 WINAPI IsSharedSelector( HANDLE16 selector )
+BOOL16 WINAPI IsSharedSelector16( HANDLE16 selector )
 {
     /* Check whether the selector belongs to a DLL */
     NE_MODULE *pModule = NE_GetPtr( selector );
diff --git a/loader/pe_image.c b/loader/pe_image.c
index accf0388fcf..619fea65ed3 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -63,7 +63,7 @@
 
 #define AdjustPtr(ptr,delta) ((char *)(ptr) + (delta))
 
-void dump_exports( HMODULE32 hModule )
+void dump_exports( HMODULE hModule )
 { 
   char		*Module;
   int		i, j;
@@ -115,10 +115,10 @@ void dump_exports( HMODULE32 hModule )
  * If it is a ordinal:
  *	- use ordinal-pe_export->Base as offset into the functionlist
  */
-FARPROC32 PE_FindExportedFunction( 
+FARPROC PE_FindExportedFunction( 
 	WINE_MODREF *wm,	/* [in] WINE modreference */
 	LPCSTR funcName,	/* [in] function name */
-        BOOL32 snoop )
+        BOOL snoop )
 {
 	u_short				* ordinal;
 	u_long				* function;
@@ -159,8 +159,8 @@ FARPROC32 PE_FindExportedFunction(
                             addr = function[*ordinal];
                             if (!addr) return NULL;
                             if ((addr < rva_start) || (addr >= rva_end))
-				return snoop? SNOOP_GetProcAddress32(wm->module,ename,*ordinal,(FARPROC32)RVA(addr))
-                                            : (FARPROC32)RVA(addr);
+				return snoop? SNOOP_GetProcAddress(wm->module,ename,*ordinal,(FARPROC)RVA(addr))
+                                            : (FARPROC)RVA(addr);
                             forward = (char *)RVA(addr);
                             break;
 			}
@@ -189,13 +189,13 @@ FARPROC32 PE_FindExportedFunction(
 		    	ename = "";
 		}
 		if ((addr < rva_start) || (addr >= rva_end))
-			return snoop? SNOOP_GetProcAddress32(wm->module,ename,(DWORD)funcName-exports->Base,(FARPROC32)RVA(addr))
-                                    : (FARPROC32)RVA(addr);
+			return snoop? SNOOP_GetProcAddress(wm->module,ename,(DWORD)funcName-exports->Base,(FARPROC)RVA(addr))
+                                    : (FARPROC)RVA(addr);
 		forward = (char *)RVA(addr);
 	}
 	if (forward)
         {
-                HMODULE32 hMod;
+                HMODULE hMod;
 		char module[256];
 		char *end = strchr(forward, '.');
 
@@ -203,9 +203,9 @@ FARPROC32 PE_FindExportedFunction(
 		assert(end-forward<256);
 		strncpy(module, forward, (end - forward));
 		module[end-forward] = 0;
-                hMod = MODULE_FindModule32( module );
+                hMod = MODULE_FindModule( module );
 		assert(hMod);
-		return MODULE_GetProcAddress32( hMod, end + 1, snoop );
+		return MODULE_GetProcAddress( hMod, end + 1, snoop );
 	}
 	return NULL;
 }
@@ -255,7 +255,7 @@ DWORD fixup_imports( WINE_MODREF *wm )
      */
  
     for (i = 0, pe_imp = pem->pe_import; pe_imp->Name ; pe_imp++) {
-    	HMODULE32		hImpModule;
+    	HMODULE		hImpModule;
 	IMAGE_IMPORT_BY_NAME	*pe_name;
 	PIMAGE_THUNK_DATA	import_list,thunk_list;
  	char			*name = (char *) RVA(pe_imp->Name);
@@ -264,7 +264,7 @@ DWORD fixup_imports( WINE_MODREF *wm )
 		break;
 
 	/* don't use MODULE_Load, Win32 creates new task differently */
-	hImpModule = MODULE_LoadLibraryEx32A( name, 0, 0 );
+	hImpModule = MODULE_LoadLibraryExA( name, 0, 0 );
 	if (!hImpModule) {
 	    char *p,buffer[2000];
 	    
@@ -273,7 +273,7 @@ DWORD fixup_imports( WINE_MODREF *wm )
 	    if (!(p = strrchr (buffer, '\\')))
 		p = buffer;
 	    strcpy (p + 1, name);
-	    hImpModule = MODULE_LoadLibraryEx32A( buffer, 0, 0 );
+	    hImpModule = MODULE_LoadLibraryExA( buffer, 0, 0 );
 	}
 	if (!hImpModule) {
 	    ERR (module, "Module %s not found\n", name);
@@ -295,24 +295,24 @@ DWORD fixup_imports( WINE_MODREF *wm )
 		    int ordinal = IMAGE_ORDINAL(import_list->u1.Ordinal);
 
 		    TRACE(win32, "--- Ordinal %s,%d\n", name, ordinal);
-		    thunk_list->u1.Function=MODULE_GetProcAddress32(
+		    thunk_list->u1.Function=MODULE_GetProcAddress(
                         hImpModule, (LPCSTR)ordinal, TRUE
 		    );
 		    if (!thunk_list->u1.Function) {
 			ERR(win32,"No implementation for %s.%d, setting to 0xdeadbeef\n",
 				name, ordinal);
-                        thunk_list->u1.Function = (FARPROC32)0xdeadbeef;
+                        thunk_list->u1.Function = (FARPROC)0xdeadbeef;
 		    }
 		} else {		/* import by name */
 		    pe_name = (PIMAGE_IMPORT_BY_NAME)RVA(import_list->u1.AddressOfData);
 		    TRACE(win32, "--- %s %s.%d\n", pe_name->Name, name, pe_name->Hint);
-		    thunk_list->u1.Function=MODULE_GetProcAddress32(
+		    thunk_list->u1.Function=MODULE_GetProcAddress(
                         hImpModule, pe_name->Name, TRUE
 		    );
 		    if (!thunk_list->u1.Function) {
 			ERR(win32,"No implementation for %s.%d(%s), setting to 0xdeadbeef\n",
 				name,pe_name->Hint,pe_name->Name);
-                        thunk_list->u1.Function = (FARPROC32)0xdeadbeef;
+                        thunk_list->u1.Function = (FARPROC)0xdeadbeef;
 		    }
 		}
 		import_list++;
@@ -327,25 +327,25 @@ DWORD fixup_imports( WINE_MODREF *wm )
 		    int ordinal = IMAGE_ORDINAL(thunk_list->u1.Ordinal);
 
 		    TRACE(win32,"--- Ordinal %s.%d\n",name,ordinal);
-		    thunk_list->u1.Function=MODULE_GetProcAddress32(
+		    thunk_list->u1.Function=MODULE_GetProcAddress(
                         hImpModule, (LPCSTR) ordinal, TRUE
 		    );
 		    if (!thunk_list->u1.Function) {
 			ERR(win32, "No implementation for %s.%d, setting to 0xdeadbeef\n",
 				name,ordinal);
-                        thunk_list->u1.Function = (FARPROC32)0xdeadbeef;
+                        thunk_list->u1.Function = (FARPROC)0xdeadbeef;
 		    }
 		} else {
 		    pe_name=(PIMAGE_IMPORT_BY_NAME) RVA(thunk_list->u1.AddressOfData);
 		    TRACE(win32,"--- %s %s.%d\n",
 		   		  pe_name->Name,name,pe_name->Hint);
-		    thunk_list->u1.Function=MODULE_GetProcAddress32(
+		    thunk_list->u1.Function=MODULE_GetProcAddress(
                         hImpModule, pe_name->Name, TRUE
 		    );
 		    if (!thunk_list->u1.Function) {
 		    	ERR(win32, "No implementation for %s.%d, setting to 0xdeadbeef\n",
 				name, pe_name->Hint);
-                        thunk_list->u1.Function = (FARPROC32)0xdeadbeef;
+                        thunk_list->u1.Function = (FARPROC)0xdeadbeef;
 		    }
 		}
 		thunk_list++;
@@ -355,7 +355,7 @@ DWORD fixup_imports( WINE_MODREF *wm )
     return 0;
 }
 
-static int calc_vma_size( HMODULE32 hModule )
+static int calc_vma_size( HMODULE hModule )
 {
     int i,vma_size = 0;
     IMAGE_SECTION_HEADER *pe_seg = PE_SECTIONS(hModule);
@@ -452,11 +452,11 @@ static void do_relocations( unsigned int load_addr, IMAGE_BASE_RELOCATION *r )
  * BUT we have to map the whole image anyway, for Win32 programs sometimes
  * want to access them. (HMODULE32 point to the start of it)
  */
-HMODULE32 PE_LoadImage( LPCSTR name, OFSTRUCT *ofs, LPCSTR *modName )
+HMODULE PE_LoadImage( LPCSTR name, OFSTRUCT *ofs, LPCSTR *modName )
 {
-    HMODULE32	hModule;
-    HFILE32	hFile;
-    HANDLE32	mapping;
+    HMODULE	hModule;
+    HFILE	hFile;
+    HANDLE	mapping;
 
     IMAGE_NT_HEADERS *nt;
     IMAGE_SECTION_HEADER *pe_sec;
@@ -472,8 +472,8 @@ HMODULE32 PE_LoadImage( LPCSTR name, OFSTRUCT *ofs, LPCSTR *modName )
     if (!strchr( p, '.' )) strcat( dllname, ".DLL" ); 
 
     /* Open PE file */
-    hFile = OpenFile32( dllname, ofs, OF_READ | OF_SHARE_DENY_WRITE );
-    if ( hFile == HFILE_ERROR32 )
+    hFile = OpenFile( dllname, ofs, OF_READ | OF_SHARE_DENY_WRITE );
+    if ( hFile == HFILE_ERROR )
     {
         WARN( win32, "OpenFile error %ld\n", GetLastError() );
         return 2;
@@ -484,7 +484,7 @@ HMODULE32 PE_LoadImage( LPCSTR name, OFSTRUCT *ofs, LPCSTR *modName )
     	file_size = bhfi.nFileSizeLow; /* FIXME: 64 bit */
 
     /* Map the PE file somewhere */
-    mapping = CreateFileMapping32A( hFile, NULL, PAGE_READONLY | SEC_COMMIT,
+    mapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY | SEC_COMMIT,
                                     0, 0, NULL );
     CloseHandle( hFile );
     if (!mapping)
@@ -492,7 +492,7 @@ HMODULE32 PE_LoadImage( LPCSTR name, OFSTRUCT *ofs, LPCSTR *modName )
         WARN( win32, "CreateFileMapping error %ld\n", GetLastError() );
         return 0;
     }
-    hModule = (HMODULE32)MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 );
+    hModule = (HMODULE)MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 );
     CloseHandle( mapping );
     if (!hModule)
     {
@@ -638,7 +638,7 @@ HMODULE32 PE_LoadImage( LPCSTR name, OFSTRUCT *ofs, LPCSTR *modName )
 
     /* We don't need the orignal mapping any more */
     UnmapViewOfFile( (LPVOID)hModule );
-    return (HMODULE32)load_addr;
+    return (HMODULE)load_addr;
 
 error:
     UnmapViewOfFile( (LPVOID)hModule );
@@ -658,8 +658,8 @@ error:
  * Note: This routine must always be called in the context of the
  *       process that is to own the module to be created.
  */
-WINE_MODREF *PE_CreateModule( HMODULE32 hModule, 
-                              OFSTRUCT *ofs, DWORD flags, BOOL32 builtin )
+WINE_MODREF *PE_CreateModule( HMODULE hModule, 
+                              OFSTRUCT *ofs, DWORD flags, BOOL builtin )
 {
     DWORD load_addr = (DWORD)hModule;  /* for RVA */
     IMAGE_NT_HEADERS *nt = PE_HEADER(hModule);
@@ -749,9 +749,9 @@ WINE_MODREF *PE_CreateModule( HMODULE32 hModule,
     }
     wm->modname = HEAP_strdupA( GetProcessHeap(), 0, modname );
 
-    result = GetLongPathName32A( ofs->szPathName, NULL, 0 );
+    result = GetLongPathNameA( ofs->szPathName, NULL, 0 );
     wm->longname = (char *)HeapAlloc( GetProcessHeap(), 0, result+1 );
-    GetLongPathName32A( ofs->szPathName, wm->longname, result+1 );
+    GetLongPathNameA( ofs->szPathName, wm->longname, result+1 );
 
     wm->shortname = HEAP_strdupA( GetProcessHeap(), 0, ofs->szPathName );
 
@@ -801,19 +801,19 @@ WINE_MODREF *PE_CreateModule( HMODULE32 hModule,
  * The PE Library Loader frontend. 
  * FIXME: handle the flags.
  */
-HMODULE32 PE_LoadLibraryEx32A (LPCSTR name, 
-                               HFILE32 hFile, DWORD flags)
+HMODULE PE_LoadLibraryExA (LPCSTR name, 
+                               HFILE hFile, DWORD flags)
 {
     LPCSTR	modName = NULL;
     OFSTRUCT	ofs;
-    HMODULE32	hModule32;
+    HMODULE	hModule32;
     HMODULE16	hModule16;
     NE_MODULE	*pModule;
     WINE_MODREF	*wm;
-    BOOL32	builtin;
+    BOOL	builtin;
 
     /* Check for already loaded module */
-    if ((hModule32 = MODULE_FindModule32( name ))) 
+    if ((hModule32 = MODULE_FindModule( name ))) 
         return hModule32;
 
     /* try to load builtin, enabled modules first */
@@ -858,16 +858,16 @@ HMODULE32 PE_LoadLibraryEx32A (LPCSTR name,
  * due to the PROCESS_Create stuff.
  */
 HINSTANCE16 PE_CreateProcess( LPCSTR name, LPCSTR cmd_line,
-                              LPCSTR env, BOOL32 inherit, LPSTARTUPINFO32A startup,
+                              LPCSTR env, BOOL inherit, LPSTARTUPINFOA startup,
                               LPPROCESS_INFORMATION info )
 {
     LPCSTR modName = NULL;
     HMODULE16 hModule16;
-    HMODULE32 hModule32;
+    HMODULE hModule32;
     HINSTANCE16 hInstance;
     NE_MODULE *pModule;
     OFSTRUCT ofs;
-    PDB32 *process;
+    PDB *process;
 
     /* Load file */
     if ((hModule32 = PE_LoadImage( name, &ofs, &modName )) < 32)
@@ -897,7 +897,7 @@ HINSTANCE16 PE_CreateProcess( LPCSTR name, LPCSTR cmd_line,
 /*********************************************************************
  * PE_UnloadImage [internal]
  */
-int PE_UnloadImage( HMODULE32 hModule )
+int PE_UnloadImage( HMODULE hModule )
 {
 	FIXME(win32,"stub.\n");
 	/* free resources, image, unmap */
@@ -934,7 +934,7 @@ void PE_InitDLL(WINE_MODREF *wm, DWORD type, LPVOID lpReserved)
     if ((PE_HEADER(wm->module)->FileHeader.Characteristics & IMAGE_FILE_DLL) &&
         (PE_HEADER(wm->module)->OptionalHeader.AddressOfEntryPoint)
     ) {
-        DLLENTRYPROC32 entry = (void*)RVA_PTR( wm->module,OptionalHeader.AddressOfEntryPoint );
+        DLLENTRYPROC entry = (void*)RVA_PTR( wm->module,OptionalHeader.AddressOfEntryPoint );
         TRACE(relay, "CallTo32(entryproc=%p,module=%08x,type=%ld,res=%p)\n",
                        entry, wm->module, type, lpReserved );
 
@@ -957,7 +957,7 @@ void PE_InitTls(THDB *thdb)
 	DWORD			size,datasize;
 	LPVOID			mem;
 	PIMAGE_TLS_DIRECTORY	pdir;
-	PDB32			*pdb = thdb->process;
+	PDB			*pdb = thdb->process;
         int delta;
 	
 	for (wm = pdb->modref_list;wm;wm=wm->next) {
@@ -997,7 +997,7 @@ void PE_InitTls(THDB *thdb)
  *		DisableThreadLibraryCalls (KERNEL32.74)
  * Don't call DllEntryPoint for DLL_THREAD_{ATTACH,DETACH} if set.
  */
-BOOL32 WINAPI DisableThreadLibraryCalls(HMODULE32 hModule)
+BOOL WINAPI DisableThreadLibraryCalls(HMODULE hModule)
 {
 	WINE_MODREF	*wm;
 
diff --git a/loader/pe_resource.c b/loader/pe_resource.c
index 531b71b5c01..1b4c58ae8fe 100644
--- a/loader/pe_resource.c
+++ b/loader/pe_resource.c
@@ -30,7 +30,7 @@
  * small helper function to get a PE_MODREF from a passed HMODULE32
  */
 static PE_MODREF*
-HMODULE32toPE_MODREF(HMODULE32 hmod) {
+HMODULE32toPE_MODREF(HMODULE hmod) {
 	WINE_MODREF	*wm;
 
 	wm = MODULE32_LookupHMODULE( hmod );
@@ -47,7 +47,7 @@ HMODULE32toPE_MODREF(HMODULE32 hmod) {
  */
 PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY resdirptr,
 					   LPCWSTR name,DWORD root,
-					   BOOL32 allowdefault)
+					   BOOL allowdefault)
 {
     int entrynum;
     PIMAGE_RESOURCE_DIRECTORY_ENTRY entryTable;
@@ -63,7 +63,7 @@ PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY resdirptr,
 	entryTable = (PIMAGE_RESOURCE_DIRECTORY_ENTRY) (
 			(BYTE *) resdirptr + 
                         sizeof(IMAGE_RESOURCE_DIRECTORY));
-	namelen = lstrlen32W(name);
+	namelen = lstrlenW(name);
 	for (entrynum = 0; entrynum < resdirptr->NumberOfNamedEntries; entrynum++)
 	{
 		PIMAGE_RESOURCE_DIR_STRING_U str =
@@ -71,7 +71,7 @@ PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY resdirptr,
 			entryTable[entrynum].u1.s.NameOffset);
 		if(namelen != str->Length)
 			continue;
-		if(lstrncmpi32W(name,str->NameString,str->Length)==0)
+		if(lstrncmpiW(name,str->NameString,str->Length)==0)
 			return (PIMAGE_RESOURCE_DIRECTORY) (
 				root +
 				entryTable[entrynum].u2.s.OffsetToDirectory);
@@ -101,7 +101,7 @@ PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY resdirptr,
  */
 PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA( PIMAGE_RESOURCE_DIRECTORY resdirptr,
 					   LPCSTR name, DWORD root,
-					   BOOL32 allowdefault )
+					   BOOL allowdefault )
 {
     PIMAGE_RESOURCE_DIRECTORY retv;
     LPWSTR nameW = HIWORD(name)? HEAP_strdupAtoW( GetProcessHeap(), 0, name ) 
@@ -117,12 +117,12 @@ PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA( PIMAGE_RESOURCE_DIRECTORY resdirptr,
 /**********************************************************************
  *	    PE_FindResourceEx32W
  */
-HANDLE32 PE_FindResourceEx32W(
+HANDLE PE_FindResourceExW(
 	WINE_MODREF *wm,LPCWSTR name,LPCWSTR type,WORD lang
 ) {
     PIMAGE_RESOURCE_DIRECTORY resdirptr;
     DWORD root;
-    HANDLE32 result;
+    HANDLE result;
     PE_MODREF	*pem = &(wm->binfmt.pe);
 
     if (!pem || !pem->pe_resource)
@@ -134,10 +134,10 @@ HANDLE32 PE_FindResourceEx32W(
 	return 0;
     if ((resdirptr = GetResDirEntryW(resdirptr, name, root, FALSE)) == NULL)
 	return 0;
-    result = (HANDLE32)GetResDirEntryW(resdirptr, (LPCWSTR)(UINT32)lang, root, FALSE);
+    result = (HANDLE)GetResDirEntryW(resdirptr, (LPCWSTR)(UINT)lang, root, FALSE);
 	/* Try LANG_NEUTRAL, too */
     if(!result)
-        return (HANDLE32)GetResDirEntryW(resdirptr, (LPCWSTR)0, root, TRUE);
+        return (HANDLE)GetResDirEntryW(resdirptr, (LPCWSTR)0, root, TRUE);
     return result;
 }
 
@@ -145,18 +145,18 @@ HANDLE32 PE_FindResourceEx32W(
 /**********************************************************************
  *	    PE_LoadResource32
  */
-HANDLE32 PE_LoadResource32( WINE_MODREF *wm, HANDLE32 hRsrc )
+HANDLE PE_LoadResource( WINE_MODREF *wm, HANDLE hRsrc )
 {
     if (!hRsrc || !wm || wm->type!=MODULE32_PE)
     	return 0;
-    return (HANDLE32) (wm->module + ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->OffsetToData);
+    return (HANDLE) (wm->module + ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->OffsetToData);
 }
 
 
 /**********************************************************************
  *	    PE_SizeofResource32
  */
-DWORD PE_SizeofResource32( HINSTANCE32 hModule, HANDLE32 hRsrc )
+DWORD PE_SizeofResource( HINSTANCE hModule, HANDLE hRsrc )
 {
     /* we don't need hModule */
     if (!hRsrc)
@@ -167,14 +167,14 @@ DWORD PE_SizeofResource32( HINSTANCE32 hModule, HANDLE32 hRsrc )
 /**********************************************************************
  *	    PE_EnumResourceTypes32A
  */
-BOOL32
-PE_EnumResourceTypes32A(HMODULE32 hmod,ENUMRESTYPEPROC32A lpfun,LONG lparam) {
+BOOL
+PE_EnumResourceTypesA(HMODULE hmod,ENUMRESTYPEPROCA lpfun,LONG lparam) {
     PE_MODREF	*pem = HMODULE32toPE_MODREF(hmod);
     int		i;
     PIMAGE_RESOURCE_DIRECTORY		resdir;
     PIMAGE_RESOURCE_DIRECTORY_ENTRY	et;
-    BOOL32	ret;
-    HANDLE32	heap = GetProcessHeap();	
+    BOOL	ret;
+    HANDLE	heap = GetProcessHeap();	
 
     if (!pem || !pem->pe_resource)
     	return FALSE;
@@ -201,13 +201,13 @@ PE_EnumResourceTypes32A(HMODULE32 hmod,ENUMRESTYPEPROC32A lpfun,LONG lparam) {
 /**********************************************************************
  *	    PE_EnumResourceTypes32W
  */
-BOOL32
-PE_EnumResourceTypes32W(HMODULE32 hmod,ENUMRESTYPEPROC32W lpfun,LONG lparam) {
+BOOL
+PE_EnumResourceTypesW(HMODULE hmod,ENUMRESTYPEPROCW lpfun,LONG lparam) {
     PE_MODREF	*pem = HMODULE32toPE_MODREF(hmod);
     int		i;
     PIMAGE_RESOURCE_DIRECTORY		resdir;
     PIMAGE_RESOURCE_DIRECTORY_ENTRY	et;
-    BOOL32	ret;
+    BOOL	ret;
 
     if (!pem || !pem->pe_resource)
     	return FALSE;
@@ -232,16 +232,16 @@ PE_EnumResourceTypes32W(HMODULE32 hmod,ENUMRESTYPEPROC32W lpfun,LONG lparam) {
 /**********************************************************************
  *	    PE_EnumResourceNames32A
  */
-BOOL32
-PE_EnumResourceNames32A(
-	HMODULE32 hmod,LPCSTR type,ENUMRESNAMEPROC32A lpfun,LONG lparam
+BOOL
+PE_EnumResourceNamesA(
+	HMODULE hmod,LPCSTR type,ENUMRESNAMEPROCA lpfun,LONG lparam
 ) {
     PE_MODREF	*pem = HMODULE32toPE_MODREF(hmod);
     int		i;
     PIMAGE_RESOURCE_DIRECTORY		resdir;
     PIMAGE_RESOURCE_DIRECTORY_ENTRY	et;
-    BOOL32	ret;
-    HANDLE32	heap = GetProcessHeap();	
+    BOOL	ret;
+    HANDLE	heap = GetProcessHeap();	
     LPWSTR	typeW;
 
     if (!pem || !pem->pe_resource)
@@ -276,15 +276,15 @@ PE_EnumResourceNames32A(
 /**********************************************************************
  *	    PE_EnumResourceNames32W
  */
-BOOL32
-PE_EnumResourceNames32W(
-	HMODULE32 hmod,LPCWSTR type,ENUMRESNAMEPROC32W lpfun,LONG lparam
+BOOL
+PE_EnumResourceNamesW(
+	HMODULE hmod,LPCWSTR type,ENUMRESNAMEPROCW lpfun,LONG lparam
 ) {
     PE_MODREF	*pem = HMODULE32toPE_MODREF(hmod);
     int		i;
     PIMAGE_RESOURCE_DIRECTORY		resdir;
     PIMAGE_RESOURCE_DIRECTORY_ENTRY	et;
-    BOOL32	ret;
+    BOOL	ret;
 
     if (!pem || !pem->pe_resource)
     	return FALSE;
@@ -311,17 +311,17 @@ PE_EnumResourceNames32W(
 /**********************************************************************
  *	    PE_EnumResourceNames32A
  */
-BOOL32
-PE_EnumResourceLanguages32A(
-	HMODULE32 hmod,LPCSTR name,LPCSTR type,ENUMRESLANGPROC32A lpfun,
+BOOL
+PE_EnumResourceLanguagesA(
+	HMODULE hmod,LPCSTR name,LPCSTR type,ENUMRESLANGPROCA lpfun,
 	LONG lparam
 ) {
     PE_MODREF	*pem = HMODULE32toPE_MODREF(hmod);
     int		i;
     PIMAGE_RESOURCE_DIRECTORY		resdir;
     PIMAGE_RESOURCE_DIRECTORY_ENTRY	et;
-    BOOL32	ret;
-    HANDLE32	heap = GetProcessHeap();	
+    BOOL	ret;
+    HANDLE	heap = GetProcessHeap();	
     LPWSTR	nameW,typeW;
 
     if (!pem || !pem->pe_resource)
@@ -360,16 +360,16 @@ PE_EnumResourceLanguages32A(
 /**********************************************************************
  *	    PE_EnumResourceLanguages32W
  */
-BOOL32
-PE_EnumResourceLanguages32W(
-	HMODULE32 hmod,LPCWSTR name,LPCWSTR type,ENUMRESLANGPROC32W lpfun,
+BOOL
+PE_EnumResourceLanguagesW(
+	HMODULE hmod,LPCWSTR name,LPCWSTR type,ENUMRESLANGPROCW lpfun,
 	LONG lparam
 ) {
     PE_MODREF	*pem = HMODULE32toPE_MODREF(hmod);
     int		i;
     PIMAGE_RESOURCE_DIRECTORY		resdir;
     PIMAGE_RESOURCE_DIRECTORY_ENTRY	et;
-    BOOL32	ret;
+    BOOL	ret;
 
     if (!pem || !pem->pe_resource)
     	return FALSE;
diff --git a/loader/resource.c b/loader/resource.c
index 38b2dd734f5..55c0722e89e 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -36,7 +36,7 @@ extern WORD WINE_LanguageId;
 
 typedef struct _HRSRC_ELEM
 {
-    HANDLE32 hRsrc;
+    HANDLE hRsrc;
     WORD     type;
 } HRSRC_ELEM;
 
@@ -50,7 +50,7 @@ typedef struct _HRSRC_MAP
 /**********************************************************************
  *          MapHRsrc32To16
  */
-static HRSRC16 MapHRsrc32To16( NE_MODULE *pModule, HANDLE32 hRsrc32, WORD type )
+static HRSRC16 MapHRsrc32To16( NE_MODULE *pModule, HANDLE hRsrc32, WORD type )
 {
     HRSRC_MAP *map = (HRSRC_MAP *)pModule->hRsrcMap;
     HRSRC_ELEM *newElem;
@@ -99,7 +99,7 @@ static HRSRC16 MapHRsrc32To16( NE_MODULE *pModule, HANDLE32 hRsrc32, WORD type )
 /**********************************************************************
  *          MapHRsrc16To32
  */
-static HANDLE32 MapHRsrc16To32( NE_MODULE *pModule, HRSRC16 hRsrc16 )
+static HANDLE MapHRsrc16To32( NE_MODULE *pModule, HRSRC16 hRsrc16 )
 {
     HRSRC_MAP *map = (HRSRC_MAP *)pModule->hRsrcMap;
     if ( !map || !hRsrc16 || (int)hRsrc16 > map->nUsed ) return 0;
@@ -131,7 +131,7 @@ HRSRC16 WINAPI FindResource16( HMODULE16 hModule, SEGPTR name, SEGPTR type )
 
     if ( pModule->module32 )
     {
-        HANDLE32 hRsrc32 = FindResource32A( pModule->module32, nameStr, typeStr );
+        HANDLE hRsrc32 = FindResourceA( pModule->module32, nameStr, typeStr );
         return MapHRsrc32To16( pModule, hRsrc32, HIWORD(type)? 0 : type );
     }
 
@@ -141,19 +141,19 @@ HRSRC16 WINAPI FindResource16( HMODULE16 hModule, SEGPTR name, SEGPTR type )
 /**********************************************************************
  *	    FindResource32A    (KERNEL32.128)
  */
-HANDLE32 WINAPI FindResource32A( HMODULE32 hModule, LPCSTR name, LPCSTR type)
+HANDLE WINAPI FindResourceA( HMODULE hModule, LPCSTR name, LPCSTR type)
 {
-    return FindResourceEx32A(hModule,type,name,WINE_LanguageId);
+    return FindResourceExA(hModule,type,name,WINE_LanguageId);
 }
 
 /**********************************************************************
  *	    FindResourceEx32A    (KERNEL32.129)
  */
-HANDLE32 WINAPI FindResourceEx32A( HMODULE32 hModule, LPCSTR type, LPCSTR name,
+HANDLE WINAPI FindResourceExA( HMODULE hModule, LPCSTR type, LPCSTR name,
 				   WORD lang
 ) {
     LPWSTR xname,xtype;
-    HANDLE32 ret;
+    HANDLE ret;
 
     if (HIWORD((DWORD)name))
         xname = HEAP_strdupAtoW( GetProcessHeap(), 0, name );
@@ -163,7 +163,7 @@ HANDLE32 WINAPI FindResourceEx32A( HMODULE32 hModule, LPCSTR type, LPCSTR name,
         xtype = HEAP_strdupAtoW( GetProcessHeap(), 0, type);
     else
         xtype = (LPWSTR)type;
-    ret = FindResourceEx32W( hModule, xtype, xname, lang );
+    ret = FindResourceExW( hModule, xtype, xname, lang );
     if (HIWORD((DWORD)name)) HeapFree( GetProcessHeap(), 0, xname );
     if (HIWORD((DWORD)type)) HeapFree( GetProcessHeap(), 0, xtype );
     return ret;
@@ -173,23 +173,23 @@ HANDLE32 WINAPI FindResourceEx32A( HMODULE32 hModule, LPCSTR type, LPCSTR name,
 /**********************************************************************
  *	    FindResourceEx32W    (KERNEL32.130)
  */
-HRSRC32 WINAPI FindResourceEx32W( HMODULE32 hModule, LPCWSTR type,
+HRSRC WINAPI FindResourceExW( HMODULE hModule, LPCWSTR type,
                                   LPCWSTR name, WORD lang )
 {
     WINE_MODREF	*wm = MODULE32_LookupHMODULE( hModule );
-    HRSRC32	hrsrc;
+    HRSRC	hrsrc;
 
     TRACE(resource, "module=%08x(%s) type=%s name=%s\n",
 	  hModule, wm->modname,
 	  debugres_w (type),
 	  debugres_w (name));
 
-    if (!wm) return (HRSRC32)0;
+    if (!wm) return (HRSRC)0;
 
     switch (wm->type) 
     {
     case MODULE32_PE:
-        hrsrc = PE_FindResourceEx32W(wm,name,type,lang);
+        hrsrc = PE_FindResourceExW(wm,name,type,lang);
         break;
 
     case MODULE32_ELF:
@@ -198,7 +198,7 @@ HRSRC32 WINAPI FindResourceEx32W( HMODULE32 hModule, LPCWSTR type,
 	
     default:
         ERR(module,"unknown module type %d\n",wm->type);
-        return (HRSRC32)0;
+        return (HRSRC)0;
     }
 
     if ( !hrsrc )
@@ -212,9 +212,9 @@ HRSRC32 WINAPI FindResourceEx32W( HMODULE32 hModule, LPCWSTR type,
 /**********************************************************************
  *	    FindResource32W    (KERNEL32.131)
  */
-HRSRC32 WINAPI FindResource32W(HINSTANCE32 hModule, LPCWSTR name, LPCWSTR type)
+HRSRC WINAPI FindResourceW(HINSTANCE hModule, LPCWSTR name, LPCWSTR type)
 {
-    return FindResourceEx32W(hModule,type,name,WINE_LanguageId);
+    return FindResourceExW(hModule,type,name,WINE_LanguageId);
 }
 
 /**********************************************************************
@@ -227,11 +227,11 @@ HGLOBAL16 WINAPI LoadResource16( HMODULE16 hModule, HRSRC16 hRsrc )
 
     if ( pModule->module32 )
     {
-        HANDLE32 hRsrc32 = MapHRsrc16To32( pModule, hRsrc );
+        HANDLE hRsrc32 = MapHRsrc16To32( pModule, hRsrc );
         WORD type = MapHRsrc16ToType( pModule, hRsrc );
-        HGLOBAL32 image = LoadResource32( pModule->module32, hRsrc32 );
-        DWORD size = SizeofResource32( pModule->module32, hRsrc32 );
-        LPVOID bits = LockResource32( image );
+        HGLOBAL image = LoadResource( pModule->module32, hRsrc32 );
+        DWORD size = SizeofResource( pModule->module32, hRsrc32 );
+        LPVOID bits = LockResource( image );
 
         return NE_LoadPEResource( pModule, type, bits, size );
     }
@@ -246,9 +246,9 @@ HGLOBAL16 WINAPI LoadResource16( HMODULE16 hModule, HRSRC16 hRsrc )
  * RETURNS
  *	pointer into the mapped resource of the passed module
  */
-HGLOBAL32 WINAPI LoadResource32( 
-	HINSTANCE32 hModule,	/* [in] module handle */
-	HRSRC32 hRsrc )		/* [in] resource handle */
+HGLOBAL WINAPI LoadResource( 
+	HINSTANCE hModule,	/* [in] module handle */
+	HRSRC hRsrc )		/* [in] resource handle */
 {
     WINE_MODREF	*wm = MODULE32_LookupHMODULE( hModule );
 
@@ -263,7 +263,7 @@ HGLOBAL32 WINAPI LoadResource32(
     switch (wm->type) 
     {
     case MODULE32_PE:
-        return PE_LoadResource32(wm,hRsrc);
+        return PE_LoadResource(wm,hRsrc);
 
     case MODULE32_ELF:
         return LIBRES_LoadResource( hModule, hRsrc );
@@ -294,7 +294,7 @@ LPVOID WINAPI LockResource16( HGLOBAL16 handle )
 /**********************************************************************
  *	    LockResource32    (KERNEL32.384)
  */
-LPVOID WINAPI LockResource32( HGLOBAL32 handle )
+LPVOID WINAPI LockResource( HGLOBAL handle )
 {
     return (LPVOID)handle;
 }
@@ -305,7 +305,7 @@ LPVOID WINAPI LockResource32( HGLOBAL32 handle )
  */
 BOOL16 WINAPI FreeResource16( HGLOBAL16 handle )
 {
-    NE_MODULE *pModule = NE_GetPtr( FarGetOwner(handle) );
+    NE_MODULE *pModule = NE_GetPtr( FarGetOwner16(handle) );
     if ( !pModule ) return handle;
 
     if ( pModule->module32 )
@@ -317,7 +317,7 @@ BOOL16 WINAPI FreeResource16( HGLOBAL16 handle )
 /**********************************************************************
  *	    FreeResource32    (KERNEL32.145)
  */
-BOOL32 WINAPI FreeResource32( HGLOBAL32 handle )
+BOOL WINAPI FreeResource( HGLOBAL handle )
 {
     /* no longer used in Win32 */
     return TRUE;
@@ -333,8 +333,8 @@ INT16 WINAPI AccessResource16( HINSTANCE16 hModule, HRSRC16 hRsrc )
 
     if ( pModule->module32 )
     {
-        HANDLE32 hRsrc32 = MapHRsrc16To32( pModule, hRsrc );
-        HFILE32 hFile32 = AccessResource32( pModule->module32, hRsrc32 );
+        HANDLE hRsrc32 = MapHRsrc16To32( pModule, hRsrc );
+        HFILE hFile32 = AccessResource( pModule->module32, hRsrc32 );
         return FILE_AllocDosHandle( hFile32 );
     }
 
@@ -344,7 +344,7 @@ INT16 WINAPI AccessResource16( HINSTANCE16 hModule, HRSRC16 hRsrc )
 /**********************************************************************
  *	    AccessResource32    (KERNEL32.64)
  */
-INT32 WINAPI AccessResource32( HMODULE32 hModule, HRSRC32 hRsrc )
+INT WINAPI AccessResource( HMODULE hModule, HRSRC hRsrc )
 {
     FIXME(resource,"(module=%08x res=%08x),not implemented\n", hModule, hRsrc);
     return 0;
@@ -361,8 +361,8 @@ DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc )
 
     if ( pModule->module32 )
     {
-        HANDLE32 hRsrc32 = MapHRsrc16To32( pModule, hRsrc );
-        return SizeofResource32( hModule, hRsrc32 );
+        HANDLE hRsrc32 = MapHRsrc16To32( pModule, hRsrc );
+        return SizeofResource( hModule, hRsrc32 );
     }
 
     return NE_SizeofResource( pModule, hRsrc );
@@ -371,7 +371,7 @@ DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc )
 /**********************************************************************
  *	    SizeofResource32    (KERNEL32.522)
  */
-DWORD WINAPI SizeofResource32( HINSTANCE32 hModule, HRSRC32 hRsrc )
+DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc )
 {
     WINE_MODREF	*wm = MODULE32_LookupHMODULE( hModule );
 
@@ -381,7 +381,7 @@ DWORD WINAPI SizeofResource32( HINSTANCE32 hModule, HRSRC32 hRsrc )
     switch (wm->type)
     {
     case MODULE32_PE:
-        return PE_SizeofResource32(hModule,hRsrc);
+        return PE_SizeofResource(hModule,hRsrc);
 
     case MODULE32_ELF:
         return LIBRES_SizeofResource( hModule, hRsrc );
@@ -426,10 +426,10 @@ HACCEL16 WINAPI LoadAccelerators16(HINSTANCE16 instance, SEGPTR lpTableName)
  * 04:	WORD	IDval		
  * 06:	WORD	pad		(to DWORD boundary)
  */
-HACCEL32 WINAPI LoadAccelerators32W(HINSTANCE32 instance,LPCWSTR lpTableName)
+HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance,LPCWSTR lpTableName)
 {
-    HRSRC32 hRsrc;
-    HACCEL32 hMem,hRetval=0;
+    HRSRC hRsrc;
+    HACCEL hMem,hRetval=0;
     DWORD size;
 
     if (HIWORD(lpTableName))
@@ -439,12 +439,12 @@ HACCEL32 WINAPI LoadAccelerators32W(HINSTANCE32 instance,LPCWSTR lpTableName)
         TRACE(accel, "%p 0x%04x\n",
                        (LPVOID)instance, LOWORD(lpTableName) );
 
-    if (!(hRsrc = FindResource32W( instance, lpTableName, RT_ACCELERATOR32W )))
+    if (!(hRsrc = FindResourceW( instance, lpTableName, RT_ACCELERATORW )))
     {
       WARN(accel, "couldn't find accelerator table resource\n");
     } else {
-      hMem = LoadResource32( instance, hRsrc );
-      size = SizeofResource32( instance, hRsrc );
+      hMem = LoadResource( instance, hRsrc );
+      size = SizeofResource( instance, hRsrc );
       if(size>=sizeof(PE_ACCEL))
       {
 	LPPE_ACCEL accel_table = (LPPE_ACCEL) hMem;
@@ -465,15 +465,15 @@ HACCEL32 WINAPI LoadAccelerators32W(HINSTANCE32 instance,LPCWSTR lpTableName)
     return hRetval;
 }
 
-HACCEL32 WINAPI LoadAccelerators32A(HINSTANCE32 instance,LPCSTR lpTableName)
+HACCEL WINAPI LoadAcceleratorsA(HINSTANCE instance,LPCSTR lpTableName)
 {
 	LPWSTR	 uni;
-	HACCEL32 result;
+	HACCEL result;
 	if (HIWORD(lpTableName))
 		uni = HEAP_strdupAtoW( GetProcessHeap(), 0, lpTableName );
 	else
 		uni = (LPWSTR)lpTableName;
-	result = LoadAccelerators32W(instance,uni);
+	result = LoadAcceleratorsW(instance,uni);
 	if (HIWORD(uni)) HeapFree( GetProcessHeap(), 0, uni);
 	return result;
 }
@@ -481,9 +481,9 @@ HACCEL32 WINAPI LoadAccelerators32A(HINSTANCE32 instance,LPCSTR lpTableName)
 /**********************************************************************
  *             CopyAcceleratorTable32A   (USER32.58)
  */
-INT32 WINAPI CopyAcceleratorTable32A(HACCEL32 src, LPACCEL32 dst, INT32 entries)
+INT WINAPI CopyAcceleratorTableA(HACCEL src, LPACCEL dst, INT entries)
 {
-  return CopyAcceleratorTable32W(src, dst, entries);
+  return CopyAcceleratorTableW(src, dst, entries);
 }
 
 /**********************************************************************
@@ -491,16 +491,16 @@ INT32 WINAPI CopyAcceleratorTable32A(HACCEL32 src, LPACCEL32 dst, INT32 entries)
  *
  * By mortene@pvv.org 980321
  */
-INT32 WINAPI CopyAcceleratorTable32W(HACCEL32 src, LPACCEL32 dst,
-				     INT32 entries)
+INT WINAPI CopyAcceleratorTableW(HACCEL src, LPACCEL dst,
+				     INT entries)
 {
   int i,xsize;
   LPACCEL16 accel = (LPACCEL16)GlobalLock16(src);
-  BOOL32 done = FALSE;
+  BOOL done = FALSE;
 
   /* Do parameter checking to avoid the explosions and the screaming
      as far as possible. */
-  if((dst && (entries < 1)) || (src == (HACCEL32)NULL) || !accel) {
+  if((dst && (entries < 1)) || (src == (HACCEL)NULL) || !accel) {
     WARN(accel, "Application sent invalid parameters (%p %p %d).\n",
 	 (LPVOID)src, (LPVOID)dst, entries);
     return 0;
@@ -545,9 +545,9 @@ INT32 WINAPI CopyAcceleratorTable32W(HACCEL32 src, LPACCEL32 dst,
  *
  * By mortene@pvv.org 980321
  */
-HACCEL32 WINAPI CreateAcceleratorTable32A(LPACCEL32 lpaccel, INT32 cEntries)
+HACCEL WINAPI CreateAcceleratorTableA(LPACCEL lpaccel, INT cEntries)
 {
-  HACCEL32	hAccel;
+  HACCEL	hAccel;
   LPACCEL16	accel;
   int		i;
 
@@ -557,7 +557,7 @@ HACCEL32 WINAPI CreateAcceleratorTable32A(LPACCEL32 lpaccel, INT32 cEntries)
     WARN(accel, "Application sent invalid parameters (%p %d).\n",
 	 lpaccel, cEntries);
     SetLastError(ERROR_INVALID_PARAMETER);
-    return (HACCEL32)NULL;
+    return (HACCEL)NULL;
   }
   FIXME(accel, "should check that the accelerator descriptions are valid,"
 	" return NULL and SetLastError() if not.\n");
@@ -570,7 +570,7 @@ HACCEL32 WINAPI CreateAcceleratorTable32A(LPACCEL32 lpaccel, INT32 cEntries)
   if(!hAccel) {
     ERR(accel, "Out of memory.\n");
     SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-    return (HACCEL32)NULL;
+    return (HACCEL)NULL;
   }
   accel = GlobalLock16(hAccel);
   for (i=0;i<cEntries;i++) {
@@ -598,7 +598,7 @@ HACCEL32 WINAPI CreateAcceleratorTable32A(LPACCEL32 lpaccel, INT32 cEntries)
  *
  * RETURNS STD
  */
-BOOL32 WINAPI DestroyAcceleratorTable( HACCEL32 handle )
+BOOL WINAPI DestroyAcceleratorTable( HACCEL handle )
 {
     FIXME(accel, "(0x%x): stub\n", handle);
     /* FIXME: GlobalFree16(handle); */
@@ -654,27 +654,27 @@ INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id,
 /**********************************************************************
  *	LoadString32W		(USER32.376)
  */
-INT32 WINAPI LoadString32W( HINSTANCE32 instance, UINT32 resource_id,
-                            LPWSTR buffer, INT32 buflen )
+INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
+                            LPWSTR buffer, INT buflen )
 {
-    HGLOBAL32 hmem;
-    HRSRC32 hrsrc;
+    HGLOBAL hmem;
+    HRSRC hrsrc;
     WCHAR *p;
     int string_num;
     int i;
 
     if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
-	resource_id = (UINT32)(-((INT32)resource_id));
+	resource_id = (UINT)(-((INT)resource_id));
     TRACE(resource, "instance = %04x, id = %04x, buffer = %08x, "
 	   "length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
 
-    hrsrc = FindResource32W( instance, (LPCWSTR)((resource_id>>4)+1),
-                             RT_STRING32W );
+    hrsrc = FindResourceW( instance, (LPCWSTR)((resource_id>>4)+1),
+                             RT_STRINGW );
     if (!hrsrc) return 0;
-    hmem = LoadResource32( instance, hrsrc );
+    hmem = LoadResource( instance, hrsrc );
     if (!hmem) return 0;
     
-    p = LockResource32(hmem);
+    p = LockResource(hmem);
     string_num = resource_id & 0x000f;
     for (i = 0; i < string_num; i++)
 	p += *p + 1;
@@ -704,20 +704,20 @@ INT32 WINAPI LoadString32W( HINSTANCE32 instance, UINT32 resource_id,
 /**********************************************************************
  *	LoadString32A	(USER32.375)
  */
-INT32 WINAPI LoadString32A( HINSTANCE32 instance, UINT32 resource_id,
-                            LPSTR buffer, INT32 buflen )
+INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id,
+                            LPSTR buffer, INT buflen )
 {
-    INT32 retval;
+    INT retval;
     LPWSTR buffer2 = NULL;
     if (buffer && buflen)
 	buffer2 = HeapAlloc( GetProcessHeap(), 0, buflen * 2 );
-    retval = LoadString32W(instance,resource_id,buffer2,buflen);
+    retval = LoadStringW(instance,resource_id,buffer2,buflen);
 
     if (buffer2)
     {
 	if (retval) {
 	    lstrcpynWtoA( buffer, buffer2, buflen );
-	    retval = lstrlen32A( buffer );
+	    retval = lstrlenA( buffer );
 	}
 	else
 	    *buffer = 0;
@@ -751,11 +751,11 @@ INT32 WINAPI LoadString32A( HINSTANCE32 instance, UINT32 resource_id,
 /**********************************************************************
  *	LoadMessage32A		(internal)
  */
-INT32 WINAPI LoadMessage32A( HMODULE32 instance, UINT32 id, WORD lang,
-                      LPSTR buffer, INT32 buflen )
+INT WINAPI LoadMessageA( HMODULE instance, UINT id, WORD lang,
+                      LPSTR buffer, INT buflen )
 {
-    HGLOBAL32	hmem;
-    HRSRC32	hrsrc;
+    HGLOBAL	hmem;
+    HRSRC	hrsrc;
     BYTE	*p;
     int		nrofentries,i,slen;
     struct	_subentry {
@@ -772,12 +772,12 @@ INT32 WINAPI LoadMessage32A( HMODULE32 instance, UINT32 id, WORD lang,
     TRACE(resource, "instance = %08lx, id = %08lx, buffer = %p, length = %ld\n", (DWORD)instance, (DWORD)id, buffer, (DWORD)buflen);
 
     /*FIXME: I am not sure about the '1' ... But I've only seen those entries*/
-    hrsrc = FindResourceEx32W(instance,RT_MESSAGELIST32W,(LPWSTR)1,lang);
+    hrsrc = FindResourceExW(instance,RT_MESSAGELISTW,(LPWSTR)1,lang);
     if (!hrsrc) return 0;
-    hmem = LoadResource32( instance, hrsrc );
+    hmem = LoadResource( instance, hrsrc );
     if (!hmem) return 0;
     
-    p = LockResource32(hmem);
+    p = LockResource(hmem);
     nrofentries = *(DWORD*)p;
     stre = NULL;
     se = (struct _subentry*)(p+4);
@@ -802,7 +802,7 @@ INT32 WINAPI LoadMessage32A( HMODULE32 instance, UINT32 id, WORD lang,
     if (buffer == NULL)
 	return slen; /* different to LoadString */
     if (i>0) {
-	lstrcpyn32A(buffer,stre->str,i);
+	lstrcpynA(buffer,stre->str,i);
 	buffer[i]=0;
     } else {
 	if (buflen>1) {
@@ -818,19 +818,19 @@ INT32 WINAPI LoadMessage32A( HMODULE32 instance, UINT32 id, WORD lang,
 /**********************************************************************
  *	LoadMessage32W	(internal)
  */
-INT32 WINAPI LoadMessage32W( HMODULE32 instance, UINT32 id, WORD lang,
-                      LPWSTR buffer, INT32 buflen )
+INT WINAPI LoadMessageW( HMODULE instance, UINT id, WORD lang,
+                      LPWSTR buffer, INT buflen )
 {
-    INT32 retval;
+    INT retval;
     LPSTR buffer2 = NULL;
     if (buffer && buflen)
 	buffer2 = HeapAlloc( GetProcessHeap(), 0, buflen );
-    retval = LoadMessage32A(instance,id,lang,buffer2,buflen);
+    retval = LoadMessageA(instance,id,lang,buffer2,buflen);
     if (buffer)
     {
 	if (retval) {
 	    lstrcpynAtoW( buffer, buffer2, buflen );
-	    retval = lstrlen32W( buffer );
+	    retval = lstrlenW( buffer );
 	}
 	HeapFree( GetProcessHeap(), 0, buffer2 );
     }
@@ -841,59 +841,59 @@ INT32 WINAPI LoadMessage32W( HMODULE32 instance, UINT32 id, WORD lang,
 /**********************************************************************
  *	EnumResourceTypesA	(KERNEL32.90)
  */
-BOOL32 WINAPI EnumResourceTypes32A( HMODULE32 hmodule,ENUMRESTYPEPROC32A lpfun,
+BOOL WINAPI EnumResourceTypesA( HMODULE hmodule,ENUMRESTYPEPROCA lpfun,
                                     LONG lParam)
 {
 	/* FIXME: move WINE_MODREF stuff here */
-    return PE_EnumResourceTypes32A(hmodule,lpfun,lParam);
+    return PE_EnumResourceTypesA(hmodule,lpfun,lParam);
 }
 
 /**********************************************************************
  *	EnumResourceTypesW	(KERNEL32.91)
  */
-BOOL32 WINAPI EnumResourceTypes32W( HMODULE32 hmodule,ENUMRESTYPEPROC32W lpfun,
+BOOL WINAPI EnumResourceTypesW( HMODULE hmodule,ENUMRESTYPEPROCW lpfun,
                                     LONG lParam)
 {
 	/* FIXME: move WINE_MODREF stuff here */
-    return PE_EnumResourceTypes32W(hmodule,lpfun,lParam);
+    return PE_EnumResourceTypesW(hmodule,lpfun,lParam);
 }
 
 /**********************************************************************
  *	EnumResourceNamesA	(KERNEL32.88)
  */
-BOOL32 WINAPI EnumResourceNames32A( HMODULE32 hmodule, LPCSTR type,
-                                    ENUMRESNAMEPROC32A lpfun, LONG lParam )
+BOOL WINAPI EnumResourceNamesA( HMODULE hmodule, LPCSTR type,
+                                    ENUMRESNAMEPROCA lpfun, LONG lParam )
 {
 	/* FIXME: move WINE_MODREF stuff here */
-    return PE_EnumResourceNames32A(hmodule,type,lpfun,lParam);
+    return PE_EnumResourceNamesA(hmodule,type,lpfun,lParam);
 }
 /**********************************************************************
  *	EnumResourceNamesW	(KERNEL32.89)
  */
-BOOL32 WINAPI EnumResourceNames32W( HMODULE32 hmodule, LPCWSTR type,
-                                    ENUMRESNAMEPROC32W lpfun, LONG lParam )
+BOOL WINAPI EnumResourceNamesW( HMODULE hmodule, LPCWSTR type,
+                                    ENUMRESNAMEPROCW lpfun, LONG lParam )
 {
 	/* FIXME: move WINE_MODREF stuff here */
-    return PE_EnumResourceNames32W(hmodule,type,lpfun,lParam);
+    return PE_EnumResourceNamesW(hmodule,type,lpfun,lParam);
 }
 
 /**********************************************************************
  *	EnumResourceLanguagesA	(KERNEL32.86)
  */
-BOOL32 WINAPI EnumResourceLanguages32A( HMODULE32 hmodule, LPCSTR type,
-                                        LPCSTR name, ENUMRESLANGPROC32A lpfun,
+BOOL WINAPI EnumResourceLanguagesA( HMODULE hmodule, LPCSTR type,
+                                        LPCSTR name, ENUMRESLANGPROCA lpfun,
                                         LONG lParam)
 {
 	/* FIXME: move WINE_MODREF stuff here */
-    return PE_EnumResourceLanguages32A(hmodule,type,name,lpfun,lParam);
+    return PE_EnumResourceLanguagesA(hmodule,type,name,lpfun,lParam);
 }
 /**********************************************************************
  *	EnumResourceLanguagesW	(KERNEL32.87)
  */
-BOOL32 WINAPI EnumResourceLanguages32W( HMODULE32 hmodule, LPCWSTR type,
-                                        LPCWSTR name, ENUMRESLANGPROC32W lpfun,
+BOOL WINAPI EnumResourceLanguagesW( HMODULE hmodule, LPCWSTR type,
+                                        LPCWSTR name, ENUMRESLANGPROCW lpfun,
                                         LONG lParam)
 {
 	/* FIXME: move WINE_MODREF stuff here */
-    return PE_EnumResourceLanguages32W(hmodule,type,name,lpfun,lParam);
+    return PE_EnumResourceLanguagesW(hmodule,type,name,lpfun,lParam);
 }
diff --git a/loader/signal.c b/loader/signal.c
index 8e4d863cb26..2851fb010c1 100644
--- a/loader/signal.c
+++ b/loader/signal.c
@@ -41,7 +41,7 @@
 
 void (*fnWINE_Debugger)(int,SIGCONTEXT*) = NULL;
 void (*ctx_debug_call)(int sig,CONTEXT*ctx)=NULL;
-BOOL32 (*fnINSTR_EmulateInstruction)(SIGCONTEXT*ctx)=NULL;
+BOOL (*fnINSTR_EmulateInstruction)(SIGCONTEXT*ctx)=NULL;
 
 #ifdef __i386__
 
@@ -191,7 +191,7 @@ extern void ASYNC_sigio(int a);
 /**********************************************************************
  *              SIGNAL_MaskAsyncEvents
  */
-void SIGNAL_MaskAsyncEvents( BOOL32 flag )
+void SIGNAL_MaskAsyncEvents( BOOL flag )
 {
   sigprocmask( (flag) ? SIG_BLOCK : SIG_UNBLOCK , &async_signal_set, NULL);
 }
@@ -291,7 +291,7 @@ void SIGNAL_InitHandlers(void)
 /**********************************************************************
  *		SIGNAL_Init
  */
-BOOL32 SIGNAL_Init(void)
+BOOL SIGNAL_Init(void)
 {
 #ifdef HAVE_WORKING_SIGALTSTACK
     struct sigaltstack ss;
diff --git a/loader/task.c b/loader/task.c
index 84d90c95d7c..6f90cd74a9b 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -59,7 +59,7 @@ static UINT16 nTaskCount = 0;
 
 static void TASK_YieldToSystem(TDB*);
 
-extern BOOL32 THREAD_InitDone;
+extern BOOL THREAD_InitDone;
 
 
 /***********************************************************************
@@ -197,7 +197,7 @@ static SEGPTR TASK_AllocThunk( HTASK16 hTask )
  *
  * Free a MakeProcInstance() thunk.
  */
-static BOOL32 TASK_FreeThunk( HTASK16 hTask, SEGPTR thunk )
+static BOOL TASK_FreeThunk( HTASK16 hTask, SEGPTR thunk )
 {
     TDB *pTask;
     THUNKS *pThunk;
@@ -260,7 +260,7 @@ static void TASK_CallToStart(void)
 		AllocConsole();
 
         if (pModule->heap_size)
-            LocalInit( pTask->hInstance, 0, pModule->heap_size );
+            LocalInit16( pTask->hInstance, 0, pModule->heap_size );
 
         MODULE_InitializeDLLs( 0, DLL_PROCESS_ATTACH, (LPVOID)-1 );
         TRACE(relay, "(entryproc=%p)\n", entry );
@@ -278,7 +278,7 @@ static void TASK_CallToStart(void)
 
         while ( thdb->exit_code == 0x103 )
         {
-            WaitEvent( 0 );
+            WaitEvent16( 0 );
             QUEUE_Signal( pTask->hSelf );
         }
 
@@ -308,8 +308,8 @@ static void TASK_CallToStart(void)
         CONTEXT context;
 
         memset( &context, 0, sizeof(context) );
-        CS_reg(&context)  = GlobalHandleToSel(pSegTable[pModule->cs - 1].hSeg);
-        DS_reg(&context)  = GlobalHandleToSel(pSegTable[pModule->dgroup - 1].hSeg);
+        CS_reg(&context)  = GlobalHandleToSel16(pSegTable[pModule->cs - 1].hSeg);
+        DS_reg(&context)  = GlobalHandleToSel16(pSegTable[pModule->dgroup - 1].hSeg);
         ES_reg(&context)  = pTask->hPDB;
         EIP_reg(&context) = pModule->ip;
         EBX_reg(&context) = pModule->stack_size;
@@ -347,7 +347,7 @@ HTASK16 TASK_Create( THDB *thdb, NE_MODULE *pModule, HINSTANCE16 hInstance,
     char name[10];
     STACK16FRAME *frame16;
     STACK32FRAME *frame32;
-    PDB32 *pdb32 = thdb->process;
+    PDB *pdb32 = thdb->process;
     SEGTABLEENTRY *pSegTable = NE_SEG_TABLE( pModule );
 
       /* Allocate the task structure */
@@ -378,7 +378,7 @@ HTASK16 TASK_Create( THDB *thdb, NE_MODULE *pModule, HINSTANCE16 hInstance,
     pTask->thdb          = thdb;
     pTask->curdrive      = DRIVE_GetCurrentDrive() | 0x80;
     strcpy( pTask->curdir, "\\" );
-    lstrcpyn32A( pTask->curdir + 1, DRIVE_GetDosCwd( DRIVE_GetCurrentDrive() ),
+    lstrcpynA( pTask->curdir + 1, DRIVE_GetDosCwd( DRIVE_GetCurrentDrive() ),
                  sizeof(pTask->curdir) - 1 );
 
       /* Create the thunks block */
@@ -387,12 +387,12 @@ HTASK16 TASK_Create( THDB *thdb, NE_MODULE *pModule, HINSTANCE16 hInstance,
 
       /* Copy the module name */
 
-    GetModuleName( pModule->self, name, sizeof(name) );
+    GetModuleName16( pModule->self, name, sizeof(name) );
     strncpy( pTask->module_name, name, sizeof(pTask->module_name) );
 
       /* Allocate a selector for the PDB */
 
-    pTask->hPDB = GLOBAL_CreateBlock( GMEM_FIXED, &pTask->pdb, sizeof(PDB),
+    pTask->hPDB = GLOBAL_CreateBlock( GMEM_FIXED, &pTask->pdb, sizeof(PDB16),
                                     pModule->self, FALSE, FALSE, FALSE, NULL );
 
       /* Fill the PDB */
@@ -405,8 +405,8 @@ HTASK16 TASK_Create( THDB *thdb, NE_MODULE *pModule, HINSTANCE16 hInstance,
     pTask->pdb.savedint23 = INT_GetPMHandler( 0x23 );
     pTask->pdb.savedint24 = INT_GetPMHandler( 0x24 );
     pTask->pdb.fileHandlesPtr =
-        PTR_SEG_OFF_TO_SEGPTR( GlobalHandleToSel(pTask->hPDB),
-                               (int)&((PDB *)0)->fileHandles );
+        PTR_SEG_OFF_TO_SEGPTR( GlobalHandleToSel16(pTask->hPDB),
+                               (int)&((PDB16 *)0)->fileHandles );
     pTask->pdb.hFileHandles = 0;
     memset( pTask->pdb.fileHandles, 0xff, sizeof(pTask->pdb.fileHandles) );
     pTask->pdb.environment    = pdb32->env_db->env_sel;
@@ -417,12 +417,12 @@ HTASK16 TASK_Create( THDB *thdb, NE_MODULE *pModule, HINSTANCE16 hInstance,
     cmd_line = pdb32->env_db->cmd_line;
     while (*cmd_line && (*cmd_line != ' ') && (*cmd_line != '\t')) cmd_line++;
     while ((*cmd_line == ' ') || (*cmd_line == '\t')) cmd_line++;
-    lstrcpyn32A( pTask->pdb.cmdLine+1, cmd_line, sizeof(pTask->pdb.cmdLine)-1);
+    lstrcpynA( pTask->pdb.cmdLine+1, cmd_line, sizeof(pTask->pdb.cmdLine)-1);
     pTask->pdb.cmdLine[0] = strlen( pTask->pdb.cmdLine + 1 );
 
       /* Get the compatibility flags */
 
-    pTask->compat_flags = GetProfileInt32A( "Compatibility", name, 0 );
+    pTask->compat_flags = GetProfileIntA( "Compatibility", name, 0 );
 
       /* Allocate a code segment alias for the TDB */
 
@@ -432,7 +432,7 @@ HTASK16 TASK_Create( THDB *thdb, NE_MODULE *pModule, HINSTANCE16 hInstance,
 
       /* Set the owner of the environment block */
 
-    FarSetOwner( pTask->pdb.environment, pTask->hPDB );
+    FarSetOwner16( pTask->pdb.environment, pTask->hPDB );
 
       /* Default DTA overwrites command-line */
 
@@ -509,7 +509,7 @@ void TASK_StartTask( HTASK16 hTask )
        the main process somehow (NOT YET IMPLEMENTED!) */
 
     if ( THREAD_IsWin16( THREAD_Current() ) )
-        OldYield();
+        OldYield16();
     else
         /* wake-up the scheduler waiting in EVENT_WaitNetEvent */
         EVENT_WakeUp();
@@ -550,7 +550,7 @@ static void TASK_DeleteTask( HTASK16 hTask )
     /* Free all memory used by this task (including the 32-bit stack, */
     /* the environment block and the thunk segments). */
 
-    GlobalFreeAll( hPDB );
+    GlobalFreeAll16( hPDB );
 }
 
 
@@ -657,12 +657,12 @@ void TASK_KillCurrentTask( INT16 exitCode )
  *   
  *       It must not call functions that may yield control.
  */
-BOOL32 TASK_Reschedule(void)
+BOOL TASK_Reschedule(void)
 {
     TDB *pOldTask = NULL, *pNewTask;
     HTASK16 hTask = 0;
     STACK16FRAME *newframe16;
-    BOOL32 pending = FALSE;
+    BOOL pending = FALSE;
 
     /* Get the initial task up and running */
     if (!hCurrentTask && GetCurrentTask())
@@ -851,7 +851,7 @@ void TASK_YieldToSystem(TDB* pTask)
  *
  * Called by the application startup code.
  */
-void WINAPI InitTask( CONTEXT *context )
+void WINAPI InitTask16( CONTEXT *context )
 {
     TDB *pTask;
     NE_MODULE *pModule;
@@ -901,7 +901,7 @@ void WINAPI InitTask( CONTEXT *context )
     /* Initialize the local heap */
     if ( pModule->heap_size )
     {
-        LocalInit( pTask->hInstance, 0, pModule->heap_size );
+        LocalInit16( pTask->hInstance, 0, pModule->heap_size );
     }    
 
     /* Initialize the INSTANCEDATA structure */
@@ -919,7 +919,7 @@ void WINAPI InitTask( CONTEXT *context )
 /***********************************************************************
  *           WaitEvent  (KERNEL.30)
  */
-BOOL16 WINAPI WaitEvent( HTASK16 hTask )
+BOOL16 WINAPI WaitEvent16( HTASK16 hTask )
 {
     TDB *pTask;
 
@@ -949,7 +949,7 @@ BOOL16 WINAPI WaitEvent( HTASK16 hTask )
 /***********************************************************************
  *           PostEvent  (KERNEL.31)
  */
-void WINAPI PostEvent( HTASK16 hTask )
+void WINAPI PostEvent16( HTASK16 hTask )
 {
     TDB *pTask;
 
@@ -969,7 +969,7 @@ void WINAPI PostEvent( HTASK16 hTask )
 /***********************************************************************
  *           SetPriority  (KERNEL.32)
  */
-void WINAPI SetPriority( HTASK16 hTask, INT16 delta )
+void WINAPI SetPriority16( HTASK16 hTask, INT16 delta )
 {
     TDB *pTask;
     INT16 newpriority;
@@ -990,7 +990,7 @@ void WINAPI SetPriority( HTASK16 hTask, INT16 delta )
 /***********************************************************************
  *           LockCurrentTask  (KERNEL.33)
  */
-HTASK16 WINAPI LockCurrentTask( BOOL16 bLock )
+HTASK16 WINAPI LockCurrentTask16( BOOL16 bLock )
 {
     if (bLock) hLockedTask = GetCurrentTask();
     else hLockedTask = 0;
@@ -1001,7 +1001,7 @@ HTASK16 WINAPI LockCurrentTask( BOOL16 bLock )
 /***********************************************************************
  *           IsTaskLocked  (KERNEL.122)
  */
-HTASK16 WINAPI IsTaskLocked(void)
+HTASK16 WINAPI IsTaskLocked16(void)
 {
     return hLockedTask;
 }
@@ -1010,7 +1010,7 @@ HTASK16 WINAPI IsTaskLocked(void)
 /***********************************************************************
  *           OldYield  (KERNEL.117)
  */
-void WINAPI OldYield(void)
+void WINAPI OldYield16(void)
 {
     TDB *pCurTask = (TDB *)GlobalLock16( GetCurrentTask() );
 
@@ -1029,7 +1029,7 @@ void WINAPI OldYield(void)
 /***********************************************************************
  *           DirectedYield  (KERNEL.150)
  */
-void WINAPI DirectedYield( HTASK16 hTask )
+void WINAPI DirectedYield16( HTASK16 hTask )
 {
     TDB *pCurTask = (TDB *)GlobalLock16( GetCurrentTask() );
 
@@ -1042,7 +1042,7 @@ void WINAPI DirectedYield( HTASK16 hTask )
     TRACE(task, "%04x: DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
 
     pCurTask->hYieldTo = hTask;
-    OldYield();
+    OldYield16();
 
     TRACE(task, "%04x: back from DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
 }
@@ -1061,8 +1061,8 @@ void WINAPI Yield16(void)
     }
 
     if (pCurTask) pCurTask->hYieldTo = 0;
-    if (pCurTask && pCurTask->hQueue) Callout.UserYield();
-    else OldYield();
+    if (pCurTask && pCurTask->hQueue) Callout.UserYield16();
+    else OldYield16();
 }
 
 /***********************************************************************
@@ -1126,7 +1126,7 @@ void WINAPI FreeProcInstance16( FARPROC16 func )
 /**********************************************************************
  *	    GetCodeHandle    (KERNEL.93)
  */
-HANDLE16 WINAPI GetCodeHandle( FARPROC16 proc )
+HANDLE16 WINAPI GetCodeHandle16( FARPROC16 proc )
 {
     HANDLE16 handle;
     BYTE *thunk = (BYTE *)PTR_SEG_TO_LIN( proc );
@@ -1146,7 +1146,7 @@ HANDLE16 WINAPI GetCodeHandle( FARPROC16 proc )
 /**********************************************************************
  *	    GetCodeInfo    (KERNEL.104)
  */
-VOID WINAPI GetCodeInfo( FARPROC16 proc, SEGINFO *segInfo )
+VOID WINAPI GetCodeInfo16( FARPROC16 proc, SEGINFO *segInfo )
 {
     BYTE *thunk = (BYTE *)PTR_SEG_TO_LIN( proc );
     NE_MODULE *pModule = NULL;
@@ -1165,7 +1165,7 @@ VOID WINAPI GetCodeInfo( FARPROC16 proc, SEGINFO *segInfo )
 
         if ( pModule )
             for ( segNr = 0; segNr < pModule->seg_count; segNr++, pSeg++ )
-                if ( GlobalHandleToSel(pSeg->hSeg) == selector )
+                if ( GlobalHandleToSel16(pSeg->hSeg) == selector )
                     break;
 
         if ( pModule && segNr >= pModule->seg_count )
@@ -1203,7 +1203,7 @@ BOOL16 WINAPI DefineHandleTable16( WORD wOffset )
 /***********************************************************************
  *           SetTaskQueue  (KERNEL.34)
  */
-HQUEUE16 WINAPI SetTaskQueue( HTASK16 hTask, HQUEUE16 hQueue )
+HQUEUE16 WINAPI SetTaskQueue16( HTASK16 hTask, HQUEUE16 hQueue )
 {
     HQUEUE16 hPrev;
     TDB *pTask;
@@ -1223,7 +1223,7 @@ HQUEUE16 WINAPI SetTaskQueue( HTASK16 hTask, HQUEUE16 hQueue )
 /***********************************************************************
  *           GetTaskQueue  (KERNEL.35)
  */
-HQUEUE16 WINAPI GetTaskQueue( HTASK16 hTask )
+HQUEUE16 WINAPI GetTaskQueue16( HTASK16 hTask )
 {
     TDB *pTask;
 
@@ -1235,7 +1235,7 @@ HQUEUE16 WINAPI GetTaskQueue( HTASK16 hTask )
 /***********************************************************************
  *           SetThreadQueue  (KERNEL.463)
  */
-HQUEUE16 WINAPI SetThreadQueue( DWORD thread, HQUEUE16 hQueue )
+HQUEUE16 WINAPI SetThreadQueue16( DWORD thread, HQUEUE16 hQueue )
 {
     THDB *thdb = thread? THREAD_IdToTHDB( thread ) : THREAD_Current();
     HQUEUE16 oldQueue = thdb? thdb->teb.queue : 0;
@@ -1244,8 +1244,8 @@ HQUEUE16 WINAPI SetThreadQueue( DWORD thread, HQUEUE16 hQueue )
     {
         thdb->teb.queue = hQueue;
 
-        if ( GetTaskQueue( thdb->process->task ) == oldQueue )
-            SetTaskQueue( thdb->process->task, hQueue );
+        if ( GetTaskQueue16( thdb->process->task ) == oldQueue )
+            SetTaskQueue16( thdb->process->task, hQueue );
     }
 
     return oldQueue;
@@ -1254,14 +1254,14 @@ HQUEUE16 WINAPI SetThreadQueue( DWORD thread, HQUEUE16 hQueue )
 /***********************************************************************
  *           GetThreadQueue  (KERNEL.464)
  */
-HQUEUE16 WINAPI GetThreadQueue( DWORD thread )
+HQUEUE16 WINAPI GetThreadQueue16( DWORD thread )
 {
     THDB *thdb = NULL;
     if ( !thread )
         thdb = THREAD_Current();
     else if ( HIWORD(thread) )
         thdb = THREAD_IdToTHDB( thread );
-    else if ( IsTask( (HTASK16)thread ) )
+    else if ( IsTask16( (HTASK16)thread ) )
         thdb = ((TDB *)GlobalLock16( (HANDLE16)thread ))->thdb;
 
     return (HQUEUE16)(thdb? thdb->teb.queue : 0);
@@ -1270,14 +1270,14 @@ HQUEUE16 WINAPI GetThreadQueue( DWORD thread )
 /***********************************************************************
  *           SetFastQueue  (KERNEL.624)
  */
-VOID WINAPI SetFastQueue( DWORD thread, HANDLE32 hQueue )
+VOID WINAPI SetFastQueue16( DWORD thread, HANDLE hQueue )
 {
     THDB *thdb = NULL;
     if ( !thread )
         thdb = THREAD_Current();
     else if ( HIWORD(thread) )
         thdb = THREAD_IdToTHDB( thread );
-    else if ( IsTask( (HTASK16)thread ) )
+    else if ( IsTask16( (HTASK16)thread ) )
         thdb = ((TDB *)GlobalLock16( (HANDLE16)thread ))->thdb;
 
     if ( thdb ) thdb->teb.queue = (HQUEUE16) hQueue;
@@ -1286,24 +1286,24 @@ VOID WINAPI SetFastQueue( DWORD thread, HANDLE32 hQueue )
 /***********************************************************************
  *           GetFastQueue  (KERNEL.625)
  */
-HANDLE32 WINAPI GetFastQueue( void )
+HANDLE WINAPI GetFastQueue16( void )
 {
     THDB *thdb = THREAD_Current();
     if (!thdb) return 0;
 
     if (!thdb->teb.queue)
-        Callout.InitThreadInput( 0, THREAD_IsWin16(thdb)? 4 : 5 );
+        Callout.InitThreadInput16( 0, THREAD_IsWin16(thdb)? 4 : 5 );
 
     if (!thdb->teb.queue)
         FIXME( task, "(): should initialize thread-local queue, expect failure!\n" );
 
-    return (HANDLE32)thdb->teb.queue;
+    return (HANDLE)thdb->teb.queue;
 }
 
 /***********************************************************************
  *           SwitchStackTo   (KERNEL.108)
  */
-void WINAPI SwitchStackTo( WORD seg, WORD ptr, WORD top )
+void WINAPI SwitchStackTo16( WORD seg, WORD ptr, WORD top )
 {
     TDB *pTask;
     STACK16FRAME *oldFrame, *newFrame;
@@ -1348,7 +1348,7 @@ void WINAPI SwitchStackTo( WORD seg, WORD ptr, WORD top )
 /***********************************************************************
  *           SwitchStackBack   (KERNEL.109)
  */
-void WINAPI SwitchStackBack( CONTEXT *context )
+void WINAPI SwitchStackBack16( CONTEXT *context )
 {
     TDB *pTask;
     STACK16FRAME *oldFrame, *newFrame;
@@ -1394,18 +1394,18 @@ void WINAPI SwitchStackBack( CONTEXT *context )
 /***********************************************************************
  *           GetTaskQueueDS  (KERNEL.118)
  */
-void WINAPI GetTaskQueueDS( CONTEXT *context )
+void WINAPI GetTaskQueueDS16( CONTEXT *context )
 {
-    DS_reg(context) = GlobalHandleToSel( GetTaskQueue(0) );
+    DS_reg(context) = GlobalHandleToSel16( GetTaskQueue16(0) );
 }
 
 
 /***********************************************************************
  *           GetTaskQueueES  (KERNEL.119)
  */
-void WINAPI GetTaskQueueES( CONTEXT *context )
+void WINAPI GetTaskQueueES16( CONTEXT *context )
 {
-    ES_reg(context) = GlobalHandleToSel( GetTaskQueue(0) );
+    ES_reg(context) = GlobalHandleToSel16( GetTaskQueue16(0) );
 }
 
 
@@ -1430,7 +1430,7 @@ DWORD WINAPI WIN16_GetCurrentTask(void)
  *
  * UNDOC: returns PSP of KERNEL in high word
  */
-DWORD WINAPI GetCurrentPDB(void)
+DWORD WINAPI GetCurrentPDB16(void)
 {
     TDB *pTask;
 
@@ -1442,7 +1442,7 @@ DWORD WINAPI GetCurrentPDB(void)
 /***********************************************************************
  *           GetInstanceData   (KERNEL.54)
  */
-INT16 WINAPI GetInstanceData( HINSTANCE16 instance, WORD buffer, INT16 len )
+INT16 WINAPI GetInstanceData16( HINSTANCE16 instance, WORD buffer, INT16 len )
 {
     char *ptr = (char *)GlobalLock16( instance );
     if (!ptr || !len) return 0;
@@ -1455,7 +1455,7 @@ INT16 WINAPI GetInstanceData( HINSTANCE16 instance, WORD buffer, INT16 len )
 /***********************************************************************
  *           GetExeVersion   (KERNEL.105)
  */
-WORD WINAPI GetExeVersion(void)
+WORD WINAPI GetExeVersion16(void)
 {
     TDB *pTask;
 
@@ -1483,7 +1483,7 @@ UINT16 WINAPI SetErrorMode16( UINT16 mode )
 /***********************************************************************
  *           SetErrorMode32   (KERNEL32.486)
  */
-UINT32 WINAPI SetErrorMode32( UINT32 mode )
+UINT WINAPI SetErrorMode( UINT mode )
 {
     return SetErrorMode16( (UINT16)mode );
 }
@@ -1492,7 +1492,7 @@ UINT32 WINAPI SetErrorMode32( UINT32 mode )
 /***********************************************************************
  *           GetDOSEnvironment   (KERNEL.131)
  */
-SEGPTR WINAPI GetDOSEnvironment(void)
+SEGPTR WINAPI GetDOSEnvironment16(void)
 {
     TDB *pTask;
 
@@ -1504,7 +1504,7 @@ SEGPTR WINAPI GetDOSEnvironment(void)
 /***********************************************************************
  *           GetNumTasks   (KERNEL.152)
  */
-UINT16 WINAPI GetNumTasks(void)
+UINT16 WINAPI GetNumTasks16(void)
 {
     return nTaskCount;
 }
@@ -1516,7 +1516,7 @@ UINT16 WINAPI GetNumTasks(void)
  * Note: this function apparently returns a DWORD with LOWORD == HIWORD.
  * I don't think we need to bother with this.
  */
-HINSTANCE16 WINAPI GetTaskDS(void)
+HINSTANCE16 WINAPI GetTaskDS16(void)
 {
     TDB *pTask;
 
@@ -1527,7 +1527,7 @@ HINSTANCE16 WINAPI GetTaskDS(void)
 /***********************************************************************
  *           GetDummyModuleHandleDS   (KERNEL.602)
  */
-VOID WINAPI GetDummyModuleHandleDS( CONTEXT *context )
+VOID WINAPI GetDummyModuleHandleDS16( CONTEXT *context )
 {
     TDB *pTask;
     WORD selector;
@@ -1536,7 +1536,7 @@ VOID WINAPI GetDummyModuleHandleDS( CONTEXT *context )
     if (!(pTask = (TDB *)GlobalLock16( GetCurrentTask() ))) return;
     if (!(pTask->flags & TDBF_WIN32)) return;
 
-    selector = GlobalHandleToSel( pTask->hModule );
+    selector = GlobalHandleToSel16( pTask->hModule );
     DS_reg( context ) = selector;
     AX_reg( context ) = selector;
 }
@@ -1544,7 +1544,7 @@ VOID WINAPI GetDummyModuleHandleDS( CONTEXT *context )
 /***********************************************************************
  *           IsTask   (KERNEL.320)
  */
-BOOL16 WINAPI IsTask( HTASK16 hTask )
+BOOL16 WINAPI IsTask16( HTASK16 hTask )
 {
     TDB *pTask;
 
@@ -1575,7 +1575,7 @@ FARPROC16 WINAPI SetTaskSignalProc( HTASK16 hTask, FARPROC16 proc )
 /***********************************************************************
  *           SetSigHandler   (KERNEL.140)
  */
-WORD WINAPI SetSigHandler( FARPROC16 newhandler, FARPROC16* oldhandler,
+WORD WINAPI SetSigHandler16( FARPROC16 newhandler, FARPROC16* oldhandler,
                            UINT16 *oldmode, UINT16 newmode, UINT16 flag )
 {
     FIXME(task,"(%p,%p,%p,%d,%d), unimplemented.\n",
@@ -1603,7 +1603,7 @@ WORD WINAPI SetSigHandler( FARPROC16 newhandler, FARPROC16* oldhandler,
  * Note that GlobalNotify does _not_ return the old NotifyProc
  * -- contrary to LocalNotify !!
  */
-VOID WINAPI GlobalNotify( FARPROC16 proc )
+VOID WINAPI GlobalNotify16( FARPROC16 proc )
 {
     TDB *pTask;
 
@@ -1640,7 +1640,7 @@ static HMODULE16 GetExePtrHelper( HANDLE16 handle, HTASK16 *hTask )
 
       /* Check the owner for module handle */
 
-    owner = FarGetOwner( handle );
+    owner = FarGetOwner16( handle );
     if (!(ptr = GlobalLock16( owner ))) return 0;
     if (((NE_MODULE *)ptr)->magic == IMAGE_OS2_SIGNATURE) return owner;
 
@@ -1682,17 +1682,17 @@ void WINAPI WIN16_GetExePtr( CONTEXT *context )
 /***********************************************************************
  *           TaskFirst   (TOOLHELP.63)
  */
-BOOL16 WINAPI TaskFirst( TASKENTRY *lpte )
+BOOL16 WINAPI TaskFirst16( TASKENTRY *lpte )
 {
     lpte->hNext = hFirstTask;
-    return TaskNext( lpte );
+    return TaskNext16( lpte );
 }
 
 
 /***********************************************************************
  *           TaskNext   (TOOLHELP.64)
  */
-BOOL16 WINAPI TaskNext( TASKENTRY *lpte )
+BOOL16 WINAPI TaskNext16( TASKENTRY *lpte )
 {
     TDB *pTask;
     INSTANCEDATA *pInstData;
@@ -1724,10 +1724,10 @@ BOOL16 WINAPI TaskNext( TASKENTRY *lpte )
 /***********************************************************************
  *           TaskFindHandle   (TOOLHELP.65)
  */
-BOOL16 WINAPI TaskFindHandle( TASKENTRY *lpte, HTASK16 hTask )
+BOOL16 WINAPI TaskFindHandle16( TASKENTRY *lpte, HTASK16 hTask )
 {
     lpte->hNext = hTask;
-    return TaskNext( lpte );
+    return TaskNext16( lpte );
 }
 
 
@@ -1736,14 +1736,14 @@ BOOL16 WINAPI TaskFindHandle( TASKENTRY *lpte, HTASK16 hTask )
  */
 DWORD WINAPI GetAppCompatFlags16( HTASK16 hTask )
 {
-    return GetAppCompatFlags32( hTask );
+    return GetAppCompatFlags( hTask );
 }
 
 
 /***********************************************************************
  *           GetAppCompatFlags32   (USER32.206)
  */
-DWORD WINAPI GetAppCompatFlags32( HTASK32 hTask )
+DWORD WINAPI GetAppCompatFlags( HTASK hTask )
 {
     TDB *pTask;
 
diff --git a/memory/atom.c b/memory/atom.c
index 6c03de1d34c..64e93fe63ac 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -105,7 +105,7 @@ static HANDLE16 ATOM_InitTable(
  *
  * Global table initialisation.
  */
-BOOL32 ATOM_Init( WORD globalTableSel )
+BOOL ATOM_Init( WORD globalTableSel )
 {
     return ATOM_InitTable( globalTableSel, DEFAULT_ATOMTABLE_SIZE ) != 0;
 }
@@ -123,7 +123,7 @@ BOOL32 ATOM_Init( WORD globalTableSel )
  */
 static ATOMTABLE *ATOM_GetTable(
                   WORD selector, /* [in] Segment */
-                  BOOL32 create  /* [in] Create */ )
+                  BOOL create  /* [in] Create */ )
 {
     INSTANCEDATA *ptr = (INSTANCEDATA *)PTR_SEG_OFF_TO_LIN( selector, 0 );
     if (ptr->atomtable)
@@ -170,7 +170,7 @@ static WORD ATOM_Hash(
     return hash % entries;
 }
 
-static BOOL32 ATOM_IsIntAtom(LPCSTR atomstr,WORD *atomid) {
+static BOOL ATOM_IsIntAtom(LPCSTR atomstr,WORD *atomid) {
 	LPSTR 	xend;
 
 	if (!HIWORD(atomstr)) {
@@ -223,7 +223,7 @@ static ATOM ATOM_AddAtom(
     {
 	entryPtr = ATOM_MakePtr( selector, entry );
 	if ((entryPtr->length == len) && 
-	    (!lstrncmpi32A( entryPtr->str, str, len )))
+	    (!lstrncmpiA( entryPtr->str, str, len )))
 	{
 	    entryPtr->refCount++;
         TRACE(atom,"-- existing 0x%x\n", entry);
@@ -317,7 +317,7 @@ static ATOM ATOM_FindAtom(
     {
 	ATOMENTRY * entryPtr = ATOM_MakePtr( selector, entry );
 	if ((entryPtr->length == len) && 
-	    (!lstrncmpi32A( entryPtr->str, str, len )))
+	    (!lstrncmpiA( entryPtr->str, str, len )))
     {    TRACE(atom,"-- found %x\n", entry);
 	    return HANDLETOATOM( entry );
     }
@@ -334,17 +334,17 @@ static ATOM ATOM_FindAtom(
  *	Length of string copied to buffer: Success
  *	0: Failure
  */
-static UINT32 ATOM_GetAtomName(
+static UINT ATOM_GetAtomName(
               WORD selector, /* [in]  Segment */
               ATOM atom,     /* [in]  Atom identifier */
               LPSTR buffer,  /* [out] Pointer to buffer for atom string */
-              INT32 count    /* [in]  Size of buffer */
+              INT count    /* [in]  Size of buffer */
 ) {
     ATOMTABLE * table;
     ATOMENTRY * entryPtr;
     HANDLE16 entry;
     char * strPtr;
-    UINT32 len;
+    UINT len;
     char text[8];
     
     TRACE(atom,"%x, %x\n", selector, atom);
@@ -384,7 +384,7 @@ WORD WINAPI InitAtomTable16( WORD entries )
 /***********************************************************************
  *           GetAtomHandle   (KERNEL.73)
  */
-HANDLE16 WINAPI GetAtomHandle( ATOM atom )
+HANDLE16 WINAPI GetAtomHandle16( ATOM atom )
 {
     if (atom < MIN_STR_ATOM) return 0;
     return ATOMTOHANDLE( atom );
@@ -405,7 +405,7 @@ ATOM WINAPI AddAtom16( SEGPTR str )
         /* If the string is in the same data segment as the atom table, make */
         /* a copy of the string to be sure it doesn't move in linear memory. */
         char buffer[MAX_ATOM_LEN+1];
-        lstrcpyn32A( buffer, (char *)PTR_SEG_TO_LIN(str), sizeof(buffer) );
+        lstrcpynA( buffer, (char *)PTR_SEG_TO_LIN(str), sizeof(buffer) );
         atom = ATOM_AddAtom( ds, buffer );
     }
     else atom = ATOM_AddAtom( ds, (LPCSTR)PTR_SEG_TO_LIN(str) );
@@ -422,10 +422,10 @@ ATOM WINAPI AddAtom16( SEGPTR str )
  *	Atom: Success
  *	0: Failure
  */
-ATOM WINAPI AddAtom32A(
+ATOM WINAPI AddAtomA(
             LPCSTR str /* [in] Pointer to string to add */
 ) {
-    return GlobalAddAtom32A( str );  /* FIXME */
+    return GlobalAddAtomA( str );  /* FIXME */
 }
 
 
@@ -433,9 +433,9 @@ ATOM WINAPI AddAtom32A(
  *           AddAtom32W   (KERNEL32.1)
  * See AddAtom32A
  */
-ATOM WINAPI AddAtom32W( LPCWSTR str )
+ATOM WINAPI AddAtomW( LPCWSTR str )
 {
-    return GlobalAddAtom32W( str );  /* FIXME */
+    return GlobalAddAtomW( str );  /* FIXME */
 }
 
 
@@ -457,7 +457,7 @@ ATOM WINAPI DeleteAtom16( ATOM atom )
  *	0: Success
  *	Atom: Failure
  */
-ATOM WINAPI DeleteAtom32(
+ATOM WINAPI DeleteAtom(
             ATOM atom /* [in] Atom to delete */
 ) {
     return GlobalDeleteAtom( atom );  /* FIXME */
@@ -483,10 +483,10 @@ ATOM WINAPI FindAtom16( SEGPTR str )
  *	Atom: Success
  *	0: Failure
  */
-ATOM WINAPI FindAtom32A(
+ATOM WINAPI FindAtomA(
             LPCSTR str /* [in] Pointer to string to find */
 ) {
-    return GlobalFindAtom32A( str );  /* FIXME */
+    return GlobalFindAtomA( str );  /* FIXME */
 }
 
 
@@ -494,9 +494,9 @@ ATOM WINAPI FindAtom32A(
  *           FindAtom32W   (KERNEL32.118)
  * See FindAtom32A
  */
-ATOM WINAPI FindAtom32W( LPCWSTR str )
+ATOM WINAPI FindAtomW( LPCWSTR str )
 {
-    return GlobalFindAtom32W( str );  /* FIXME */
+    return GlobalFindAtomW( str );  /* FIXME */
 }
 
 
@@ -517,12 +517,12 @@ UINT16 WINAPI GetAtomName16( ATOM atom, LPSTR buffer, INT16 count )
  *	Length of string: Success
  *	0: Failure
  */
-UINT32 WINAPI GetAtomName32A(
+UINT WINAPI GetAtomNameA(
               ATOM atom,    /* [in]  Atom */
               LPSTR buffer, /* [out] Pointer to string for atom string */
-              INT32 count   /* [in]  Size of buffer */
+              INT count   /* [in]  Size of buffer */
 ) {
-    return GlobalGetAtomName32A( atom, buffer, count );  /* FIXME */
+    return GlobalGetAtomNameA( atom, buffer, count );  /* FIXME */
 }
 
 
@@ -530,9 +530,9 @@ UINT32 WINAPI GetAtomName32A(
  *           GetAtomName32W   (KERNEL32.150)
  * See GetAtomName32A
  */
-UINT32 WINAPI GetAtomName32W( ATOM atom, LPWSTR buffer, INT32 count )
+UINT WINAPI GetAtomNameW( ATOM atom, LPWSTR buffer, INT count )
 {
-    return GlobalGetAtomName32W( atom, buffer, count );  /* FIXME */
+    return GlobalGetAtomNameW( atom, buffer, count );  /* FIXME */
 }
 
 
@@ -559,7 +559,7 @@ ATOM WINAPI GlobalAddAtom16( SEGPTR str )
  *	Atom: Success
  *	0: Failure
  */
-ATOM WINAPI GlobalAddAtom32A(
+ATOM WINAPI GlobalAddAtomA(
             LPCSTR str /* [in] Pointer to string to add */
 ) {
     if (!HIWORD(str)) return (ATOM)LOWORD(str);  /* Integer atom */
@@ -571,7 +571,7 @@ ATOM WINAPI GlobalAddAtom32A(
  *           GlobalAddAtom32W   (KERNEL32.314)
  * See GlobalAddAtom32A
  */
-ATOM WINAPI GlobalAddAtom32W( LPCWSTR str )
+ATOM WINAPI GlobalAddAtomW( LPCWSTR str )
 {
     char buffer[MAX_ATOM_LEN+1];
     if (!HIWORD(str)) return (ATOM)LOWORD(str);  /* Integer atom */
@@ -623,7 +623,7 @@ ATOM WINAPI GlobalFindAtom16( SEGPTR str )
  *	Atom: Success
  *	0: Failure
  */
-ATOM WINAPI GlobalFindAtom32A(
+ATOM WINAPI GlobalFindAtomA(
             LPCSTR str /* [in] Pointer to string to search for */
 ) {
     if (!HIWORD(str)) return (ATOM)LOWORD(str);  /* Integer atom */
@@ -635,7 +635,7 @@ ATOM WINAPI GlobalFindAtom32A(
  *           GlobalFindAtom32W   (KERNEL32.319)
  * See GlobalFindAtom32A
  */
-ATOM WINAPI GlobalFindAtom32W( LPCWSTR str )
+ATOM WINAPI GlobalFindAtomW( LPCWSTR str )
 {
     char buffer[MAX_ATOM_LEN+1];
     if (!HIWORD(str)) return (ATOM)LOWORD(str);  /* Integer atom */
@@ -665,10 +665,10 @@ UINT16 WINAPI GlobalGetAtomName16( ATOM atom, LPSTR buffer, INT16 count )
  *	Length of string in characters: Success
  *	0: Failure
  */
-UINT32 WINAPI GlobalGetAtomName32A(
+UINT WINAPI GlobalGetAtomNameA(
               ATOM atom,    /* [in]  Atom identifier */
               LPSTR buffer, /* [out] Pointer to buffer for atom string */
-              INT32 count   /* [in]  Size of buffer */
+              INT count   /* [in]  Size of buffer */
 ) {
     return ATOM_GetAtomName( ATOM_GlobalTable, atom, buffer, count );
 }
@@ -678,10 +678,10 @@ UINT32 WINAPI GlobalGetAtomName32A(
  *           GlobalGetAtomName32W   (KERNEL32.324)
  * See GlobalGetAtomName32A
  */
-UINT32 WINAPI GlobalGetAtomName32W( ATOM atom, LPWSTR buffer, INT32 count )
+UINT WINAPI GlobalGetAtomNameW( ATOM atom, LPWSTR buffer, INT count )
 {
     char tmp[MAX_ATOM_LEN+1];
     ATOM_GetAtomName( ATOM_GlobalTable, atom, tmp, sizeof(tmp) );
     lstrcpynAtoW( buffer, tmp, count );
-    return lstrlen32W( buffer );
+    return lstrlenW( buffer );
 }
diff --git a/memory/environ.c b/memory/environ.c
index ad9db92d46e..51028753f44 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -48,11 +48,11 @@ static const char ENV_program_name[] = "C:\\WINDOWS\\SYSTEM\\KRNL386.EXE";
  * Find a variable in the environment and return a pointer to the value.
  * Helper function for GetEnvironmentVariable and ExpandEnvironmentStrings.
  */
-static LPCSTR ENV_FindVariable( LPCSTR env, LPCSTR name, INT32 len )
+static LPCSTR ENV_FindVariable( LPCSTR env, LPCSTR name, INT len )
 {
     while (*env)
     {
-        if (!lstrncmpi32A( name, env, len ) && (env[len] == '='))
+        if (!lstrncmpiA( name, env, len ) && (env[len] == '='))
             return env + len + 1;
         env += strlen(env) + 1;
     }
@@ -65,7 +65,7 @@ static LPCSTR ENV_FindVariable( LPCSTR env, LPCSTR name, INT32 len )
  *
  * Build the environment for the initial process
  */
-BOOL32 ENV_BuildEnvironment( PDB32 *pdb )
+BOOL ENV_BuildEnvironment( PDB *pdb )
 {
     extern char **environ;
     LPSTR p, *e;
@@ -102,7 +102,7 @@ BOOL32 ENV_BuildEnvironment( PDB32 *pdb )
  * Make a process inherit the environment from its parent or from an
  * explicit environment.
  */
-BOOL32 ENV_InheritEnvironment( PDB32 *pdb, LPCSTR env )
+BOOL ENV_InheritEnvironment( PDB *pdb, LPCSTR env )
 {
     DWORD size;
     LPCSTR src;
@@ -137,7 +137,7 @@ BOOL32 ENV_InheritEnvironment( PDB32 *pdb, LPCSTR env )
     while (*src)
     {
         if (pdb->flags & PDB32_WIN16_PROC)
-            lstrcpyn32A( dst, src, MAX_WIN16_LEN );
+            lstrcpynA( dst, src, MAX_WIN16_LEN );
         else
             strcpy( dst, src );
         src += strlen(src) + 1;
@@ -153,7 +153,7 @@ BOOL32 ENV_InheritEnvironment( PDB32 *pdb, LPCSTR env )
  *
  * Free a process environment.
  */
-void ENV_FreeEnvironment( PDB32 *pdb )
+void ENV_FreeEnvironment( PDB *pdb )
 {
     if (!pdb->env_db) return;
     if (pdb->env_db->env_sel) SELECTOR_FreeBlock( pdb->env_db->env_sel, 1 );
@@ -165,7 +165,7 @@ void ENV_FreeEnvironment( PDB32 *pdb )
 /***********************************************************************
  *           GetCommandLine32A      (KERNEL32.289)
  */
-LPCSTR WINAPI GetCommandLine32A(void)
+LPCSTR WINAPI GetCommandLineA(void)
 {
     return PROCESS_Current()->env_db->cmd_line;
 }
@@ -173,9 +173,9 @@ LPCSTR WINAPI GetCommandLine32A(void)
 /***********************************************************************
  *           GetCommandLine32W      (KERNEL32.290)
  */
-LPCWSTR WINAPI GetCommandLine32W(void)
+LPCWSTR WINAPI GetCommandLineW(void)
 {
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
     EnterCriticalSection( &pdb->env_db->section );
     if (!pdb->env_db->cmd_lineW)
         pdb->env_db->cmd_lineW = HEAP_strdupAtoW( pdb->heap, 0,
@@ -188,9 +188,9 @@ LPCWSTR WINAPI GetCommandLine32W(void)
 /***********************************************************************
  *           GetEnvironmentStrings32A   (KERNEL32.319) (KERNEL32.320)
  */
-LPSTR WINAPI GetEnvironmentStrings32A(void)
+LPSTR WINAPI GetEnvironmentStringsA(void)
 {
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
     return pdb->env_db->environ;
 }
 
@@ -198,11 +198,11 @@ LPSTR WINAPI GetEnvironmentStrings32A(void)
 /***********************************************************************
  *           GetEnvironmentStrings32W   (KERNEL32.321)
  */
-LPWSTR WINAPI GetEnvironmentStrings32W(void)
+LPWSTR WINAPI GetEnvironmentStringsW(void)
 {
-    INT32 size;
+    INT size;
     LPWSTR ret;
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
 
     EnterCriticalSection( &pdb->env_db->section );
     size = HeapSize( pdb->heap, 0, pdb->env_db->environ );
@@ -220,9 +220,9 @@ LPWSTR WINAPI GetEnvironmentStrings32W(void)
 /***********************************************************************
  *           FreeEnvironmentStrings32A   (KERNEL32.268)
  */
-BOOL32 WINAPI FreeEnvironmentStrings32A( LPSTR ptr )
+BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr )
 {
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
     if (ptr != pdb->env_db->environ)
     {
         SetLastError( ERROR_INVALID_PARAMETER );
@@ -235,7 +235,7 @@ BOOL32 WINAPI FreeEnvironmentStrings32A( LPSTR ptr )
 /***********************************************************************
  *           FreeEnvironmentStrings32W   (KERNEL32.269)
  */
-BOOL32 WINAPI FreeEnvironmentStrings32W( LPWSTR ptr )
+BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr )
 {
     return HeapFree( GetProcessHeap(), 0, ptr );
 }
@@ -244,11 +244,11 @@ BOOL32 WINAPI FreeEnvironmentStrings32W( LPWSTR ptr )
 /***********************************************************************
  *           GetEnvironmentVariable32A   (KERNEL32.322)
  */
-DWORD WINAPI GetEnvironmentVariable32A( LPCSTR name, LPSTR value, DWORD size )
+DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size )
 {
     LPCSTR p;
-    INT32 ret = 0;
-    PDB32 *pdb = PROCESS_Current();
+    INT ret = 0;
+    PDB *pdb = PROCESS_Current();
 
     if (!name || !*name)
     {
@@ -276,11 +276,11 @@ DWORD WINAPI GetEnvironmentVariable32A( LPCSTR name, LPSTR value, DWORD size )
 /***********************************************************************
  *           GetEnvironmentVariable32W   (KERNEL32.323)
  */
-DWORD WINAPI GetEnvironmentVariable32W( LPCWSTR nameW, LPWSTR valW, DWORD size)
+DWORD WINAPI GetEnvironmentVariableW( LPCWSTR nameW, LPWSTR valW, DWORD size)
 {
     LPSTR name = HEAP_strdupWtoA( GetProcessHeap(), 0, nameW );
     LPSTR val  = valW ? HeapAlloc( GetProcessHeap(), 0, size ) : NULL;
-    DWORD res  = GetEnvironmentVariable32A( name, val, size );
+    DWORD res  = GetEnvironmentVariableA( name, val, size );
     HeapFree( GetProcessHeap(), 0, name );
     if (val)
     {
@@ -294,12 +294,12 @@ DWORD WINAPI GetEnvironmentVariable32W( LPCWSTR nameW, LPWSTR valW, DWORD size)
 /***********************************************************************
  *           SetEnvironmentVariable32A   (KERNEL32.641)
  */
-BOOL32 WINAPI SetEnvironmentVariable32A( LPCSTR name, LPCSTR value )
+BOOL WINAPI SetEnvironmentVariableA( LPCSTR name, LPCSTR value )
 {
-    INT32 old_size, len, res;
+    INT old_size, len, res;
     LPSTR p, env, new_env;
-    BOOL32 ret = FALSE;
-    PDB32 *pdb = PROCESS_Current();
+    BOOL ret = FALSE;
+    PDB *pdb = PROCESS_Current();
 
     EnterCriticalSection( &pdb->env_db->section );
     env = p = pdb->env_db->environ;
@@ -310,7 +310,7 @@ BOOL32 WINAPI SetEnvironmentVariable32A( LPCSTR name, LPCSTR value )
     len = strlen(name);
     while (*p)
     {
-        if (!lstrncmpi32A( name, p, len ) && (p[len] == '=')) break;
+        if (!lstrncmpiA( name, p, len ) && (p[len] == '=')) break;
         p += strlen(p) + 1;
     }
     if (!value && !*p) goto done;  /* Value to remove doesn't exist */
@@ -352,11 +352,11 @@ done:
 /***********************************************************************
  *           SetEnvironmentVariable32W   (KERNEL32.642)
  */
-BOOL32 WINAPI SetEnvironmentVariable32W( LPCWSTR name, LPCWSTR value )
+BOOL WINAPI SetEnvironmentVariableW( LPCWSTR name, LPCWSTR value )
 {
     LPSTR nameA  = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
     LPSTR valueA = HEAP_strdupWtoA( GetProcessHeap(), 0, value );
-    BOOL32 ret = SetEnvironmentVariable32A( nameA, valueA );
+    BOOL ret = SetEnvironmentVariableA( nameA, valueA );
     HeapFree( GetProcessHeap(), 0, nameA );
     HeapFree( GetProcessHeap(), 0, valueA );
     return ret;
@@ -368,11 +368,11 @@ BOOL32 WINAPI SetEnvironmentVariable32W( LPCWSTR name, LPCWSTR value )
  *
  * Note: overlapping buffers are not supported; this is how it should be.
  */
-DWORD WINAPI ExpandEnvironmentStrings32A( LPCSTR src, LPSTR dst, DWORD count )
+DWORD WINAPI ExpandEnvironmentStringsA( LPCSTR src, LPSTR dst, DWORD count )
 {
     DWORD len, total_size = 1;  /* 1 for terminating '\0' */
     LPCSTR p, var;
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
 
     if (!count) dst = NULL;
     EnterCriticalSection( &pdb->env_db->section );
@@ -435,11 +435,11 @@ DWORD WINAPI ExpandEnvironmentStrings32A( LPCSTR src, LPSTR dst, DWORD count )
 /***********************************************************************
  *           ExpandEnvironmentStrings32W   (KERNEL32.217)
  */
-DWORD WINAPI ExpandEnvironmentStrings32W( LPCWSTR src, LPWSTR dst, DWORD len )
+DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len )
 {
     LPSTR srcA = HEAP_strdupWtoA( GetProcessHeap(), 0, src );
     LPSTR dstA = dst ? HeapAlloc( GetProcessHeap(), 0, len ) : NULL;
-    DWORD ret  = ExpandEnvironmentStrings32A( srcA, dstA, len );
+    DWORD ret  = ExpandEnvironmentStringsA( srcA, dstA, len );
     if (dstA)
     {
         lstrcpyAtoW( dst, dstA );
diff --git a/memory/global.c b/memory/global.c
index cd470c0763d..c64b63e45d3 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -165,7 +165,7 @@ BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle )
     GLOBALARENA *pArena;
 
     if (!handle) return TRUE;
-    sel = GlobalHandleToSel( handle ); 
+    sel = GlobalHandleToSel16( handle ); 
     if (!VALID_HANDLE(sel))
     	return FALSE;
     pArena = GET_ARENA_PTR(sel);
@@ -183,7 +183,7 @@ BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size )
     GLOBALARENA *pArena;
 
     if (!handle) return TRUE;
-    sel = GlobalHandleToSel( handle ); 
+    sel = GlobalHandleToSel16( handle ); 
     if (!VALID_HANDLE(sel))
     	return FALSE;
     pArena = GET_ARENA_PTR(sel);
@@ -194,7 +194,7 @@ BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size )
     pArena->size = size;
 
     SELECTOR_MoveBlock( sel, ptr );
-    SetSelectorLimit( sel, size-1 );
+    SetSelectorLimit16( sel, size-1 );
 
     return TRUE;
 }
@@ -304,7 +304,7 @@ HGLOBAL16 WINAPI GlobalAlloc16(
                  UINT16 flags, /* [in] Object allocation attributes */
                  DWORD size    /* [in] Number of bytes to allocate */
 ) {
-    HANDLE16 owner = GetCurrentPDB();
+    HANDLE16 owner = GetCurrentPDB16();
 
     if (flags & GMEM_DDESHARE)
         owner = GetExePtr(owner);  /* Make it a module handle */
@@ -327,7 +327,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16(
     DWORD oldsize;
     void *ptr;
     GLOBALARENA *pArena, *pNewArena;
-    WORD sel = GlobalHandleToSel( handle );
+    WORD sel = GlobalHandleToSel16( handle );
 
     TRACE(global, "%04x %ld flags=%04x\n",
                     handle, size, flags );
@@ -466,7 +466,7 @@ HGLOBAL16 WINAPI GlobalFree16(
 SEGPTR WINAPI WIN16_GlobalLock16( HGLOBAL16 handle )
 {
     TRACE(global, "(%04x) -> %08lx\n",
-                    handle, MAKELONG( 0, GlobalHandleToSel(handle)) );
+                    handle, MAKELONG( 0, GlobalHandleToSel16(handle)) );
     if (handle)
     {
 	if (handle == (HGLOBAL16)-1) handle = CURRENT_DS;
@@ -482,7 +482,7 @@ SEGPTR WINAPI WIN16_GlobalLock16( HGLOBAL16 handle )
 	}
 	if (!GET_ARENA_PTR(handle)->base) return (SEGPTR)0;
         GET_ARENA_PTR(handle)->lockCount++;
-	return PTR_SEG_OFF_TO_SEGPTR( GlobalHandleToSel(handle), 0 );
+	return PTR_SEG_OFF_TO_SEGPTR( GlobalHandleToSel16(handle), 0 );
 	/* FIXME: put segment value in CX as well */
     }
     return (SEGPTR)0;
@@ -541,7 +541,7 @@ BOOL16 WINAPI GlobalUnlock16(
  * *all* registers, even AX/DX !
  *
  */
-void WINAPI GlobalChangeLockCount( CONTEXT *context )
+void WINAPI GlobalChangeLockCount16( CONTEXT *context )
 {
     LPWORD args = PTR_SEG_OFF_TO_LIN( SS_reg( context ), SP_reg( context ) );
     HGLOBAL16 handle = (HGLOBAL16)args[3];
@@ -589,18 +589,18 @@ DWORD WINAPI GlobalHandle16(
 	WARN(global,"Invalid handle 0x%04x passed to GlobalHandle16!\n",sel);
 	return 0;
     }
-    return MAKELONG( GET_ARENA_PTR(sel)->handle, GlobalHandleToSel(sel) );
+    return MAKELONG( GET_ARENA_PTR(sel)->handle, GlobalHandleToSel16(sel) );
 }
 
 /***********************************************************************
  *           GlobalHandleNoRIP   (KERNEL.159)
  */
-DWORD WINAPI GlobalHandleNoRIP( WORD sel )
+DWORD WINAPI GlobalHandleNoRIP16( WORD sel )
 {
     int i;
     for (i = globalArenaSize-1 ; i>=0 ; i--) {
         if (pGlobalArena[i].size!=0 && pGlobalArena[i].handle == sel)
-		return MAKELONG( GET_ARENA_PTR(sel)->handle, GlobalHandleToSel(sel) );
+		return MAKELONG( GET_ARENA_PTR(sel)->handle, GlobalHandleToSel16(sel) );
     }
     return 0;
 }
@@ -677,7 +677,7 @@ DWORD WINAPI GlobalCompact16( DWORD desired )
 /***********************************************************************
  *           GlobalFreeAll   (KERNEL.26)
  */
-void WINAPI GlobalFreeAll( HGLOBAL16 owner )
+void WINAPI GlobalFreeAll16( HGLOBAL16 owner )
 {
     DWORD i;
     GLOBALARENA *pArena;
@@ -722,7 +722,7 @@ LONG WINAPI SetSwapAreaSize16( WORD size )
 /***********************************************************************
  *           GlobalLRUOldest   (KERNEL.163)
  */
-HGLOBAL16 WINAPI GlobalLRUOldest( HGLOBAL16 handle )
+HGLOBAL16 WINAPI GlobalLRUOldest16( HGLOBAL16 handle )
 {
     TRACE(global, "%04x\n", handle );
     if (handle == (HGLOBAL16)-1) handle = CURRENT_DS;
@@ -733,7 +733,7 @@ HGLOBAL16 WINAPI GlobalLRUOldest( HGLOBAL16 handle )
 /***********************************************************************
  *           GlobalLRUNewest   (KERNEL.164)
  */
-HGLOBAL16 WINAPI GlobalLRUNewest( HGLOBAL16 handle )
+HGLOBAL16 WINAPI GlobalLRUNewest16( HGLOBAL16 handle )
 {
     TRACE(global, "%04x\n", handle );
     if (handle == (HGLOBAL16)-1) handle = CURRENT_DS;
@@ -756,7 +756,7 @@ DWORD WINAPI GetFreeSpace16( UINT16 wFlags )
  * RETURNS
  *	Address (HW=Paragraph segment; LW=Selector)
  */
-DWORD WINAPI GlobalDOSAlloc(
+DWORD WINAPI GlobalDOSAlloc16(
              DWORD size /* [in] Number of bytes to be allocated */
 ) {
    UINT16    uParagraph;
@@ -781,7 +781,7 @@ DWORD WINAPI GlobalDOSAlloc(
  *	NULL: Success
  *	sel: Failure
  */
-WORD WINAPI GlobalDOSFree(
+WORD WINAPI GlobalDOSFree16(
             WORD sel /* [in] Selector */
 ) {
    DWORD   block = GetSelectorBase(sel);
@@ -800,7 +800,7 @@ WORD WINAPI GlobalDOSFree(
 /***********************************************************************
  *           GlobalPageLock   (KERNEL.191)
  */
-WORD WINAPI GlobalPageLock( HGLOBAL16 handle )
+WORD WINAPI GlobalPageLock16( HGLOBAL16 handle )
 {
     TRACE(global, "%04x\n", handle );
     if (!VALID_HANDLE(handle)) {
@@ -814,7 +814,7 @@ WORD WINAPI GlobalPageLock( HGLOBAL16 handle )
 /***********************************************************************
  *           GlobalPageUnlock   (KERNEL.192)
  */
-WORD WINAPI GlobalPageUnlock( HGLOBAL16 handle )
+WORD WINAPI GlobalPageUnlock16( HGLOBAL16 handle )
 {
     TRACE(global, "%04x\n", handle );
     if (!VALID_HANDLE(handle)) {
@@ -837,7 +837,7 @@ WORD WINAPI GlobalFix16( HGLOBAL16 handle )
     }
     GET_ARENA_PTR(handle)->lockCount++;
 
-    return GlobalHandleToSel(handle);
+    return GlobalHandleToSel16(handle);
 }
 
 
@@ -858,7 +858,7 @@ void WINAPI GlobalUnfix16( HGLOBAL16 handle )
 /***********************************************************************
  *           FarSetOwner   (KERNEL.403)
  */
-void WINAPI FarSetOwner( HGLOBAL16 handle, HANDLE16 hOwner )
+void WINAPI FarSetOwner16( HGLOBAL16 handle, HANDLE16 hOwner )
 {
     if (!VALID_HANDLE(handle)) {
 	WARN(global,"Invalid handle 0x%04x passed to FarSetOwner!\n",handle);
@@ -871,7 +871,7 @@ void WINAPI FarSetOwner( HGLOBAL16 handle, HANDLE16 hOwner )
 /***********************************************************************
  *           FarGetOwner   (KERNEL.404)
  */
-HANDLE16 WINAPI FarGetOwner( HGLOBAL16 handle )
+HANDLE16 WINAPI FarGetOwner16( HGLOBAL16 handle )
 {
     if (!VALID_HANDLE(handle)) {
 	WARN(global,"Invalid handle 0x%04x passed to FarGetOwner!\n",handle);
@@ -884,7 +884,7 @@ HANDLE16 WINAPI FarGetOwner( HGLOBAL16 handle )
 /***********************************************************************
  *           GlobalHandleToSel   (TOOLHELP.50)
  */
-WORD WINAPI GlobalHandleToSel( HGLOBAL16 handle )
+WORD WINAPI GlobalHandleToSel16( HGLOBAL16 handle )
 {
     TRACE(toolhelp, "%04x\n", handle );
     if (!handle) return 0;
@@ -907,18 +907,18 @@ WORD WINAPI GlobalHandleToSel( HGLOBAL16 handle )
 /***********************************************************************
  *           GlobalFirst   (TOOLHELP.51)
  */
-BOOL16 WINAPI GlobalFirst( GLOBALENTRY *pGlobal, WORD wFlags )
+BOOL16 WINAPI GlobalFirst16( GLOBALENTRY *pGlobal, WORD wFlags )
 {
     if (wFlags == GLOBAL_LRU) return FALSE;
     pGlobal->dwNext = 0;
-    return GlobalNext( pGlobal, wFlags );
+    return GlobalNext16( pGlobal, wFlags );
 }
 
 
 /***********************************************************************
  *           GlobalNext   (TOOLHELP.52)
  */
-BOOL16 WINAPI GlobalNext( GLOBALENTRY *pGlobal, WORD wFlags)
+BOOL16 WINAPI GlobalNext16( GLOBALENTRY *pGlobal, WORD wFlags)
 {
     GLOBALARENA *pArena;
 
@@ -938,7 +938,7 @@ BOOL16 WINAPI GlobalNext( GLOBALENTRY *pGlobal, WORD wFlags)
     pGlobal->hBlock       = pArena->handle;
     pGlobal->wcLock       = pArena->lockCount;
     pGlobal->wcPageLock   = pArena->pageLockCount;
-    pGlobal->wFlags       = (GetCurrentPDB() == pArena->hOwner);
+    pGlobal->wFlags       = (GetCurrentPDB16() == pArena->hOwner);
     pGlobal->wHeapPresent = FALSE;
     pGlobal->hOwner       = pArena->hOwner;
     pGlobal->wType        = GT_UNKNOWN;
@@ -951,7 +951,7 @@ BOOL16 WINAPI GlobalNext( GLOBALENTRY *pGlobal, WORD wFlags)
 /***********************************************************************
  *           GlobalInfo   (TOOLHELP.53)
  */
-BOOL16 WINAPI GlobalInfo( GLOBALINFO *pInfo )
+BOOL16 WINAPI GlobalInfo16( GLOBALINFO *pInfo )
 {
     int i;
     GLOBALARENA *pArena;
@@ -968,7 +968,7 @@ BOOL16 WINAPI GlobalInfo( GLOBALINFO *pInfo )
 /***********************************************************************
  *           GlobalEntryHandle   (TOOLHELP.54)
  */
-BOOL16 WINAPI GlobalEntryHandle( GLOBALENTRY *pGlobal, HGLOBAL16 hItem )
+BOOL16 WINAPI GlobalEntryHandle16( GLOBALENTRY *pGlobal, HGLOBAL16 hItem )
 {
     GLOBALARENA *pArena = GET_ARENA_PTR(hItem);
 
@@ -977,7 +977,7 @@ BOOL16 WINAPI GlobalEntryHandle( GLOBALENTRY *pGlobal, HGLOBAL16 hItem )
     pGlobal->hBlock       = pArena->handle;
     pGlobal->wcLock       = pArena->lockCount;
     pGlobal->wcPageLock   = pArena->pageLockCount;
-    pGlobal->wFlags       = (GetCurrentPDB() == pArena->hOwner);
+    pGlobal->wFlags       = (GetCurrentPDB16() == pArena->hOwner);
     pGlobal->wHeapPresent = FALSE;
     pGlobal->hOwner       = pArena->hOwner;
     pGlobal->wType        = GT_UNKNOWN;
@@ -990,7 +990,7 @@ BOOL16 WINAPI GlobalEntryHandle( GLOBALENTRY *pGlobal, HGLOBAL16 hItem )
 /***********************************************************************
  *           GlobalEntryModule   (TOOLHELP.55)
  */
-BOOL16 WINAPI GlobalEntryModule( GLOBALENTRY *pGlobal, HMODULE16 hModule,
+BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule,
                                  WORD wSeg )
 {
     return FALSE;
@@ -1000,7 +1000,7 @@ BOOL16 WINAPI GlobalEntryModule( GLOBALENTRY *pGlobal, HMODULE16 hModule,
 /***********************************************************************
  *           MemManInfo   (TOOLHELP.72)
  */
-BOOL16 WINAPI MemManInfo( MEMMANINFO *info )
+BOOL16 WINAPI MemManInfo16( MEMMANINFO *info )
 {
     MEMORYSTATUS status;
 
@@ -1026,10 +1026,10 @@ BOOL16 WINAPI MemManInfo( MEMMANINFO *info )
 /***********************************************************************
  *           GetFreeMemInfo   (KERNEL.316)
  */
-DWORD WINAPI GetFreeMemInfo(void)
+DWORD WINAPI GetFreeMemInfo16(void)
 {
     MEMMANINFO info;
-    MemManInfo( &info );
+    MemManInfo16( &info );
     return MAKELONG( info.dwTotalLinearSpace, info.dwMaxPagesAvailable );
 }
 
@@ -1048,8 +1048,8 @@ DWORD WINAPI GetFreeMemInfo(void)
 #define MAGIC_GLOBAL_USED 0x5342
 #define GLOBAL_LOCK_MAX   0xFF
 #define HANDLE_TO_INTERN(h)  ((PGLOBAL32_INTERN)(((char *)(h))-2))
-#define INTERN_TO_HANDLE(i)  ((HGLOBAL32) &((i)->Pointer))
-#define POINTER_TO_HANDLE(p) (*(((HGLOBAL32 *)(p))-1))
+#define INTERN_TO_HANDLE(i)  ((HGLOBAL) &((i)->Pointer))
+#define POINTER_TO_HANDLE(p) (*(((HGLOBAL *)(p))-1))
 #define ISHANDLE(h)          (((DWORD)(h)&2)!=0)
 #define ISPOINTER(h)         (((DWORD)(h)&2)==0)
 
@@ -1068,8 +1068,8 @@ typedef struct __GLOBAL32_INTERN
  *	Handle: Success
  *	NULL: Failure
  */
-HGLOBAL32 WINAPI GlobalAlloc32(
-                 UINT32 flags, /* [in] Object allocation attributes */
+HGLOBAL WINAPI GlobalAlloc(
+                 UINT flags, /* [in] Object allocation attributes */
                  DWORD size    /* [in] Number of bytes to allocate */
 ) {
    PGLOBAL32_INTERN     pintern;
@@ -1084,7 +1084,7 @@ HGLOBAL32 WINAPI GlobalAlloc32(
    if((flags & GMEM_MOVEABLE)==0) /* POINTER */
    {
       palloc=HeapAlloc(GetProcessHeap(), hpflags, size);
-      return (HGLOBAL32) palloc;
+      return (HGLOBAL) palloc;
    }
    else  /* HANDLE */
    {
@@ -1093,9 +1093,9 @@ HGLOBAL32 WINAPI GlobalAlloc32(
       pintern=HeapAlloc(GetProcessHeap(), 0,  sizeof(GLOBAL32_INTERN));
       if(size)
       {
-	 palloc=HeapAlloc(GetProcessHeap(), hpflags, size+sizeof(HGLOBAL32));
-	 *(HGLOBAL32 *)palloc=INTERN_TO_HANDLE(pintern);
-	 pintern->Pointer=palloc+sizeof(HGLOBAL32);
+	 palloc=HeapAlloc(GetProcessHeap(), hpflags, size+sizeof(HGLOBAL));
+	 *(HGLOBAL *)palloc=INTERN_TO_HANDLE(pintern);
+	 pintern->Pointer=palloc+sizeof(HGLOBAL);
       }
       else
 	 pintern->Pointer=NULL;
@@ -1116,8 +1116,8 @@ HGLOBAL32 WINAPI GlobalAlloc32(
  *	Pointer to first byte of block
  *	NULL: Failure
  */
-LPVOID WINAPI GlobalLock32(
-              HGLOBAL32 hmem /* [in] Handle of global memory object */
+LPVOID WINAPI GlobalLock(
+              HGLOBAL hmem /* [in] Handle of global memory object */
 ) {
    PGLOBAL32_INTERN pintern;
    LPVOID           palloc;
@@ -1150,11 +1150,11 @@ LPVOID WINAPI GlobalLock32(
  *	TRUE: Object is still locked
  *	FALSE: Object is unlocked
  */
-BOOL32 WINAPI GlobalUnlock32(
-              HGLOBAL32 hmem /* [in] Handle of global memory object */
+BOOL WINAPI GlobalUnlock(
+              HGLOBAL hmem /* [in] Handle of global memory object */
 ) {
    PGLOBAL32_INTERN       pintern;
-   BOOL32                 locked;
+   BOOL                 locked;
 
    if(ISPOINTER(hmem))
       return FALSE;
@@ -1191,10 +1191,10 @@ BOOL32 WINAPI GlobalUnlock32(
  *	Handle: Success
  *	NULL: Failure
  */
-HGLOBAL32 WINAPI GlobalHandle32(
+HGLOBAL WINAPI GlobalHandle(
                  LPCVOID pmem /* [in] Pointer to global memory block */
 ) {
-    HGLOBAL32 handle;
+    HGLOBAL handle;
 
     if (!HEAP_IsInsideHeap( GetProcessHeap(), 0, pmem )) goto error;
     handle = POINTER_TO_HANDLE(pmem);
@@ -1205,7 +1205,7 @@ HGLOBAL32 WINAPI GlobalHandle32(
     }
     /* maybe FIXED block */
     if (HeapValidate( GetProcessHeap(), 0, pmem ))
-        return (HGLOBAL32)pmem;  /* valid fixed block */
+        return (HGLOBAL)pmem;  /* valid fixed block */
 
 error:
     SetLastError( ERROR_INVALID_HANDLE );
@@ -1219,13 +1219,13 @@ error:
  *	Handle: Success
  *	NULL: Failure
  */
-HGLOBAL32 WINAPI GlobalReAlloc32(
-                 HGLOBAL32 hmem, /* [in] Handle of global memory object */
+HGLOBAL WINAPI GlobalReAlloc(
+                 HGLOBAL hmem, /* [in] Handle of global memory object */
                  DWORD size,     /* [in] New size of block */
-                 UINT32 flags    /* [in] How to reallocate object */
+                 UINT flags    /* [in] How to reallocate object */
 ) {
    LPVOID               palloc;
-   HGLOBAL32            hnew;
+   HGLOBAL            hnew;
    PGLOBAL32_INTERN     pintern;
 
    hnew = 0;
@@ -1244,11 +1244,11 @@ HGLOBAL32 WINAPI GlobalReAlloc32(
     	     return 0;
          }
 	 size=HeapSize(GetProcessHeap(), 0, (LPVOID) hmem);
-	 hnew=GlobalAlloc32( flags, size);
-	 palloc=GlobalLock32(hnew);
+	 hnew=GlobalAlloc( flags, size);
+	 palloc=GlobalLock(hnew);
 	 memcpy(palloc, (LPVOID) hmem, size);
-	 GlobalUnlock32(hnew);
-	 GlobalFree32(hmem);
+	 GlobalUnlock(hnew);
+	 GlobalFree(hmem);
       }
       else if( ISPOINTER(hmem) &&(flags & GMEM_DISCARDABLE))
       {
@@ -1268,7 +1268,7 @@ HGLOBAL32 WINAPI GlobalReAlloc32(
       if(ISPOINTER(hmem))
       {
 	 /* reallocate fixed memory */
-	 hnew=(HGLOBAL32)HeapReAlloc(GetProcessHeap(), 0, (LPVOID) hmem, size);
+	 hnew=(HGLOBAL)HeapReAlloc(GetProcessHeap(), 0, (LPVOID) hmem, size);
       }
       else
       {
@@ -1283,22 +1283,22 @@ HGLOBAL32 WINAPI GlobalReAlloc32(
 	    if(pintern->Pointer)
 	    {
 	       palloc=HeapReAlloc(GetProcessHeap(), 0,
-				  pintern->Pointer-sizeof(HGLOBAL32),
-				  size+sizeof(HGLOBAL32) );
-	       pintern->Pointer=palloc+sizeof(HGLOBAL32);
+				  pintern->Pointer-sizeof(HGLOBAL),
+				  size+sizeof(HGLOBAL) );
+	       pintern->Pointer=palloc+sizeof(HGLOBAL);
 	    }
 	    else
 	    {
-	       palloc=HeapAlloc(GetProcessHeap(), 0, size+sizeof(HGLOBAL32));
-	       *(HGLOBAL32 *)palloc=hmem;
-	       pintern->Pointer=palloc+sizeof(HGLOBAL32);
+	       palloc=HeapAlloc(GetProcessHeap(), 0, size+sizeof(HGLOBAL));
+	       *(HGLOBAL *)palloc=hmem;
+	       pintern->Pointer=palloc+sizeof(HGLOBAL);
 	    }
 	 }
 	 else
 	 {
 	    if(pintern->Pointer)
 	    {
-	       HeapFree(GetProcessHeap(), 0, pintern->Pointer-sizeof(HGLOBAL32));
+	       HeapFree(GetProcessHeap(), 0, pintern->Pointer-sizeof(HGLOBAL));
 	       pintern->Pointer=NULL;
 	    }
 	 }
@@ -1315,11 +1315,11 @@ HGLOBAL32 WINAPI GlobalReAlloc32(
  *	NULL: Success
  *	Handle: Failure
  */
-HGLOBAL32 WINAPI GlobalFree32(
-                 HGLOBAL32 hmem /* [in] Handle of global memory object */
+HGLOBAL WINAPI GlobalFree(
+                 HGLOBAL hmem /* [in] Handle of global memory object */
 ) {
    PGLOBAL32_INTERN pintern;
-   HGLOBAL32        hreturned = 0;
+   HGLOBAL        hreturned = 0;
    
    if(ISPOINTER(hmem)) /* POINTER */
    {
@@ -1336,7 +1336,7 @@ HGLOBAL32 WINAPI GlobalFree32(
 	    SetLastError(ERROR_INVALID_HANDLE);
 	 if(pintern->Pointer)
 	    if(!HeapFree(GetProcessHeap(), 0, 
-	                 (char *)(pintern->Pointer)-sizeof(HGLOBAL32)))
+	                 (char *)(pintern->Pointer)-sizeof(HGLOBAL)))
 	       hreturned=hmem;
 	 if(!HeapFree(GetProcessHeap(), 0, pintern)) 
 	    hreturned=hmem;
@@ -1353,8 +1353,8 @@ HGLOBAL32 WINAPI GlobalFree32(
  *	Size in bytes of the global memory object
  *	0: Failure
  */
-DWORD WINAPI GlobalSize32(
-             HGLOBAL32 hmem /* [in] Handle of global memory object */
+DWORD WINAPI GlobalSize(
+             HGLOBAL hmem /* [in] Handle of global memory object */
 ) {
    DWORD                retval;
    PGLOBAL32_INTERN     pintern;
@@ -1373,7 +1373,7 @@ DWORD WINAPI GlobalSize32(
         if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */
             return 0;
 	 retval=HeapSize(GetProcessHeap(), 0, 
-	                 (char *)(pintern->Pointer)-sizeof(HGLOBAL32))-4;
+	                 (char *)(pintern->Pointer)-sizeof(HGLOBAL))-4;
       }
       else
       {
@@ -1391,36 +1391,36 @@ DWORD WINAPI GlobalSize32(
 /***********************************************************************
  *           GlobalWire32   (KERNEL32.333)
  */
-LPVOID WINAPI GlobalWire32(HGLOBAL32 hmem)
+LPVOID WINAPI GlobalWire(HGLOBAL hmem)
 {
-   return GlobalLock32( hmem );
+   return GlobalLock( hmem );
 }
 
 
 /***********************************************************************
  *           GlobalUnWire32   (KERNEL32.330)
  */
-BOOL32 WINAPI GlobalUnWire32(HGLOBAL32 hmem)
+BOOL WINAPI GlobalUnWire(HGLOBAL hmem)
 {
-   return GlobalUnlock32( hmem);
+   return GlobalUnlock( hmem);
 }
 
 
 /***********************************************************************
  *           GlobalFix32   (KERNEL32.320)
  */
-VOID WINAPI GlobalFix32(HGLOBAL32 hmem)
+VOID WINAPI GlobalFix(HGLOBAL hmem)
 {
-    GlobalLock32( hmem );
+    GlobalLock( hmem );
 }
 
 
 /***********************************************************************
  *           GlobalUnfix32   (KERNEL32.331)
  */
-VOID WINAPI GlobalUnfix32(HGLOBAL32 hmem)
+VOID WINAPI GlobalUnfix(HGLOBAL hmem)
 {
-   GlobalUnlock32( hmem);
+   GlobalUnlock( hmem);
 }
 
 
@@ -1435,8 +1435,8 @@ VOID WINAPI GlobalUnfix32(HGLOBAL32 hmem)
  *	Value specifying allocation flags and lock count
  *	GMEM_INVALID_HANDLE: Failure
  */
-UINT32 WINAPI GlobalFlags32(
-              HGLOBAL32 hmem /* [in] Handle to global memory object */
+UINT WINAPI GlobalFlags(
+              HGLOBAL hmem /* [in] Handle to global memory object */
 ) {
    DWORD                retval;
    PGLOBAL32_INTERN     pintern;
@@ -1469,7 +1469,7 @@ UINT32 WINAPI GlobalFlags32(
 /***********************************************************************
  *           GlobalCompact32   (KERNEL32.316)
  */
-DWORD WINAPI GlobalCompact32( DWORD minfree )
+DWORD WINAPI GlobalCompact( DWORD minfree )
 {
     return 0;  /* GlobalCompact does nothing in Win32 */
 }
diff --git a/memory/heap.c b/memory/heap.c
index e9f5c7490a1..e4755abd292 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -95,8 +95,8 @@ typedef struct tagHEAP
 #define HEAP_DEF_SIZE        0x110000   /* Default heap size = 1Mb + 64Kb */
 #define HEAP_MIN_BLOCK_SIZE  (8+sizeof(ARENA_FREE))  /* Min. heap block size */
 
-HANDLE32 SystemHeap = 0;
-HANDLE32 SegptrHeap = 0;
+HANDLE SystemHeap = 0;
+HANDLE SegptrHeap = 0;
 CRITICAL_SECTION *HEAP_SystemLock = NULL;
 
 
@@ -186,7 +186,7 @@ void HEAP_Dump( HEAP *heap )
  *	NULL: Failure
  */
 static HEAP *HEAP_GetPtr(
-             HANDLE32 heap /* [in] Handle to the heap */
+             HANDLE heap /* [in] Handle to the heap */
 ) {
     HEAP *heapPtr = (HEAP *)heap;
     if (!heapPtr || (heapPtr->magic != HEAP_MAGIC))
@@ -251,7 +251,7 @@ static SUBHEAP *HEAP_FindSubHeap(
  *
  * Make sure the heap storage is committed up to (not including) ptr.
  */
-static BOOL32 HEAP_Commit( SUBHEAP *subheap, void *ptr )
+static BOOL HEAP_Commit( SUBHEAP *subheap, void *ptr )
 {
     DWORD size = (DWORD)((char *)ptr - (char *)subheap);
     size = (size + 0xfff) & 0xfffff000;  /* Align size on a page boundary */
@@ -277,7 +277,7 @@ static BOOL32 HEAP_Commit( SUBHEAP *subheap, void *ptr )
  *
  * If possible, decommit the heap storage from (including) 'ptr'.
  */
-static BOOL32 HEAP_Decommit( SUBHEAP *subheap, void *ptr )
+static BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr )
 {
     DWORD size = (DWORD)((char *)ptr - (char *)subheap);
     size = (size + 0xfff) & 0xfffff000;  /* Align size on a page boundary */
@@ -397,7 +397,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena )
         if (pPrev) pPrev->next = subheap->next;
         /* Free the memory */
         subheap->magic = 0;
-        if (subheap->selector) FreeSelector( subheap->selector );
+        if (subheap->selector) FreeSelector16( subheap->selector );
         VirtualFree( subheap, 0, MEM_RELEASE );
         return;
     }
@@ -433,7 +433,7 @@ static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, DWORD size)
 /***********************************************************************
  *           HEAP_InitSubHeap
  */
-static BOOL32 HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags,
+static BOOL HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags,
                                 DWORD commitSize, DWORD totalSize )
 {
     SUBHEAP *subheap = (SUBHEAP *)address;
@@ -625,7 +625,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, DWORD size,
  *
  * Check that the pointer is inside the range possible for arenas.
  */
-static BOOL32 HEAP_IsValidArenaPtr( HEAP *heap, void *ptr )
+static BOOL HEAP_IsValidArenaPtr( HEAP *heap, void *ptr )
 {
     int i;
     SUBHEAP *subheap = HEAP_FindSubHeap( heap, ptr );
@@ -641,7 +641,7 @@ static BOOL32 HEAP_IsValidArenaPtr( HEAP *heap, void *ptr )
 /***********************************************************************
  *           HEAP_ValidateFreeArena
  */
-static BOOL32 HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena )
+static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena )
 {
     char *heapEnd = (char *)subheap + subheap->size;
 
@@ -723,7 +723,7 @@ static BOOL32 HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena )
 /***********************************************************************
  *           HEAP_ValidateInUseArena
  */
-static BOOL32 HEAP_ValidateInUseArena( SUBHEAP *subheap, ARENA_INUSE *pArena )
+static BOOL HEAP_ValidateInUseArena( SUBHEAP *subheap, ARENA_INUSE *pArena )
 {
     char *heapEnd = (char *)subheap + subheap->size;
 
@@ -798,7 +798,7 @@ static BOOL32 HEAP_ValidateInUseArena( SUBHEAP *subheap, ARENA_INUSE *pArena )
  *	0: Failure
  */
 int HEAP_IsInsideHeap(
-    HANDLE32 heap, /* [in] Heap */
+    HANDLE heap, /* [in] Heap */
     DWORD flags,   /* [in] Flags */
     LPCVOID ptr    /* [in] Pointer */
 ) {
@@ -825,7 +825,7 @@ int HEAP_IsInsideHeap(
  * Transform a linear pointer into a SEGPTR. The pointer must have been
  * allocated from a HEAP_WINE_SEGPTR heap.
  */
-SEGPTR HEAP_GetSegptr( HANDLE32 heap, DWORD flags, LPCVOID ptr )
+SEGPTR HEAP_GetSegptr( HANDLE heap, DWORD flags, LPCVOID ptr )
 {
     HEAP *heapPtr = HEAP_GetPtr( heap );
     SUBHEAP *subheap;
@@ -867,7 +867,7 @@ SEGPTR HEAP_GetSegptr( HANDLE32 heap, DWORD flags, LPCVOID ptr )
  *	Handle of heap: Success
  *	NULL: Failure
  */
-HANDLE32 WINAPI HeapCreate(
+HANDLE WINAPI HeapCreate(
                 DWORD flags,       /* [in] Heap allocation flag */
                 DWORD initialSize, /* [in] Initial heap size */
                 DWORD maxSize      /* [in] Maximum heap size */
@@ -887,7 +887,7 @@ HANDLE32 WINAPI HeapCreate(
         return 0;
     }
 
-    return (HANDLE32)subheap;
+    return (HANDLE)subheap;
 }
 
 /***********************************************************************
@@ -896,8 +896,8 @@ HANDLE32 WINAPI HeapCreate(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI HeapDestroy(
-              HANDLE32 heap /* [in] Handle of heap */
+BOOL WINAPI HeapDestroy(
+              HANDLE heap /* [in] Handle of heap */
 ) {
     HEAP *heapPtr = HEAP_GetPtr( heap );
     SUBHEAP *subheap;
@@ -910,7 +910,7 @@ BOOL32 WINAPI HeapDestroy(
     while (subheap)
     {
         SUBHEAP *next = subheap->next;
-        if (subheap->selector) FreeSelector( subheap->selector );
+        if (subheap->selector) FreeSelector16( subheap->selector );
         VirtualFree( subheap, 0, MEM_RELEASE );
         subheap = next;
     }
@@ -925,7 +925,7 @@ BOOL32 WINAPI HeapDestroy(
  *	NULL: Failure
  */
 LPVOID WINAPI HeapAlloc(
-              HANDLE32 heap, /* [in] Handle of private heap block */
+              HANDLE heap, /* [in] Handle of private heap block */
               DWORD flags,   /* [in] Heap allocation control flags */
               DWORD size     /* [in] Number of bytes to allocate */
 ) {
@@ -989,8 +989,8 @@ LPVOID WINAPI HeapAlloc(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI HeapFree(
-              HANDLE32 heap, /* [in] Handle of heap */
+BOOL WINAPI HeapFree(
+              HANDLE heap, /* [in] Handle of heap */
               DWORD flags,   /* [in] Heap freeing flags */
               LPVOID ptr     /* [in] Address of memory to free */
 ) {
@@ -1040,7 +1040,7 @@ BOOL32 WINAPI HeapFree(
  *	NULL: Failure
  */
 LPVOID WINAPI HeapReAlloc(
-              HANDLE32 heap, /* [in] Handle of heap block */
+              HANDLE heap, /* [in] Handle of heap block */
               DWORD flags,   /* [in] Heap reallocation flags */
               LPVOID ptr,    /* [in] Address of memory to reallocate */
               DWORD size     /* [in] Number of bytes to reallocate */
@@ -1159,7 +1159,7 @@ LPVOID WINAPI HeapReAlloc(
 /***********************************************************************
  *           HeapCompact   (KERNEL32.335)
  */
-DWORD WINAPI HeapCompact( HANDLE32 heap, DWORD flags )
+DWORD WINAPI HeapCompact( HANDLE heap, DWORD flags )
 {
     return 0;
 }
@@ -1173,8 +1173,8 @@ DWORD WINAPI HeapCompact( HANDLE32 heap, DWORD flags )
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI HeapLock(
-              HANDLE32 heap /* [in] Handle of heap to lock for exclusive access */
+BOOL WINAPI HeapLock(
+              HANDLE heap /* [in] Handle of heap to lock for exclusive access */
 ) {
     HEAP *heapPtr = HEAP_GetPtr( heap );
     if (!heapPtr) return FALSE;
@@ -1191,8 +1191,8 @@ BOOL32 WINAPI HeapLock(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI HeapUnlock(
-              HANDLE32 heap /* [in] Handle to the heap to unlock */
+BOOL WINAPI HeapUnlock(
+              HANDLE heap /* [in] Handle to the heap to unlock */
 ) {
     HEAP *heapPtr = HEAP_GetPtr( heap );
     if (!heapPtr) return FALSE;
@@ -1208,7 +1208,7 @@ BOOL32 WINAPI HeapUnlock(
  *	0xffffffff: Failure
  */
 DWORD WINAPI HeapSize(
-             HANDLE32 heap, /* [in] Handle of heap */
+             HANDLE heap, /* [in] Handle of heap */
              DWORD flags,   /* [in] Heap size control flags */
              LPVOID ptr     /* [in] Address of memory to return size for */
 ) {
@@ -1248,8 +1248,8 @@ DWORD WINAPI HeapSize(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI HeapValidate(
-              HANDLE32 heap, /* [in] Handle to the heap */
+BOOL WINAPI HeapValidate(
+              HANDLE heap, /* [in] Handle to the heap */
               DWORD flags,   /* [in] Bit flags that control access during operation */
               LPCVOID block  /* [in] Optional pointer to memory block to validate */
 ) {
@@ -1309,8 +1309,8 @@ BOOL32 WINAPI HeapValidate(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI HeapWalk(
-              HANDLE32 heap,               /* [in]  Handle to heap to enumerate */
+BOOL WINAPI HeapWalk(
+              HANDLE heap,               /* [in]  Handle to heap to enumerate */
               LPPROCESS_HEAP_ENTRY *entry  /* [out] Pointer to structure of enumeration info */
 ) {
     FIXME(heap, "(%08x): stub.\n", heap );
@@ -1323,7 +1323,7 @@ BOOL32 WINAPI HeapWalk(
  *
  * Same as HeapAlloc(), but die on failure.
  */
-LPVOID HEAP_xalloc( HANDLE32 heap, DWORD flags, DWORD size )
+LPVOID HEAP_xalloc( HANDLE heap, DWORD flags, DWORD size )
 {
     LPVOID p = HeapAlloc( heap, flags, size );
     if (!p)
@@ -1338,7 +1338,7 @@ LPVOID HEAP_xalloc( HANDLE32 heap, DWORD flags, DWORD size )
 /***********************************************************************
  *           HEAP_strdupA
  */
-LPSTR HEAP_strdupA( HANDLE32 heap, DWORD flags, LPCSTR str )
+LPSTR HEAP_strdupA( HANDLE heap, DWORD flags, LPCSTR str )
 {
     LPSTR p = HEAP_xalloc( heap, flags, strlen(str) + 1 );
     strcpy( p, str );
@@ -1349,11 +1349,11 @@ LPSTR HEAP_strdupA( HANDLE32 heap, DWORD flags, LPCSTR str )
 /***********************************************************************
  *           HEAP_strdupW
  */
-LPWSTR HEAP_strdupW( HANDLE32 heap, DWORD flags, LPCWSTR str )
+LPWSTR HEAP_strdupW( HANDLE heap, DWORD flags, LPCWSTR str )
 {
-    INT32 len = lstrlen32W(str) + 1;
+    INT len = lstrlenW(str) + 1;
     LPWSTR p = HEAP_xalloc( heap, flags, len * sizeof(WCHAR) );
-    lstrcpy32W( p, str );
+    lstrcpyW( p, str );
     return p;
 }
 
@@ -1361,7 +1361,7 @@ LPWSTR HEAP_strdupW( HANDLE32 heap, DWORD flags, LPCWSTR str )
 /***********************************************************************
  *           HEAP_strdupAtoW
  */
-LPWSTR HEAP_strdupAtoW( HANDLE32 heap, DWORD flags, LPCSTR str )
+LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str )
 {
     LPWSTR ret;
 
@@ -1375,12 +1375,12 @@ LPWSTR HEAP_strdupAtoW( HANDLE32 heap, DWORD flags, LPCSTR str )
 /***********************************************************************
  *           HEAP_strdupWtoA
  */
-LPSTR HEAP_strdupWtoA( HANDLE32 heap, DWORD flags, LPCWSTR str )
+LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str )
 {
     LPSTR ret;
 
     if (!str) return NULL;
-    ret = HEAP_xalloc( heap, flags, lstrlen32W(str) + 1 );
+    ret = HEAP_xalloc( heap, flags, lstrlenW(str) + 1 );
     lstrcpyWtoA( ret, str );
     return ret;
 }
@@ -1413,7 +1413,7 @@ typedef struct _LOCAL32HEADER
     DWORD    flags;
 
     DWORD    magic;
-    HANDLE32 heap;
+    HANDLE heap;
 
 } LOCAL32HEADER;
 #pragma pack(4)
@@ -1423,7 +1423,7 @@ typedef struct _LOCAL32HEADER
 /***********************************************************************
  *           Local32Init   (KERNEL.208)
  */
-HANDLE32 WINAPI Local32Init( WORD segment, DWORD tableSize,
+HANDLE WINAPI Local32Init16( WORD segment, DWORD tableSize,
                              DWORD heapSize, DWORD flags )
 {
     DWORD totSize, segSize = 0;
@@ -1438,7 +1438,7 @@ HANDLE32 WINAPI Local32Init( WORD segment, DWORD tableSize,
 
     if ( segment )
     {
-        if ( (segSize = GetSelectorLimit( segment )) == 0 )
+        if ( (segSize = GetSelectorLimit16( segment )) == 0 )
             return 0;
         else
             segSize++;
@@ -1479,7 +1479,7 @@ HANDLE32 WINAPI Local32Init( WORD segment, DWORD tableSize,
     header->limit   = HTABLE_PAGESIZE-1;
     header->flags   = 0;
     header->magic   = LOCAL32_MAGIC;
-    header->heap    = (HANDLE32)heap;
+    header->heap    = (HANDLE)heap;
 
     header->freeListFirst[0] = sizeof(LOCAL32HEADER);
     header->freeListLast[0]  = HTABLE_PAGESIZE - 4;
@@ -1532,7 +1532,7 @@ HANDLE32 WINAPI Local32Init( WORD segment, DWORD tableSize,
         HeapFree( SystemHeap, 0, oldBase );
     }
     
-    return (HANDLE32)header;
+    return (HANDLE)header;
 }
 
 /***********************************************************************
@@ -1627,7 +1627,7 @@ static VOID Local32_FromHandle( LOCAL32HEADER *header, INT16 type,
 /***********************************************************************
  *           Local32Alloc   (KERNEL.209)
  */
-DWORD WINAPI Local32Alloc( HANDLE32 heap, DWORD size, INT16 type, DWORD flags )
+DWORD WINAPI Local32Alloc16( HANDLE heap, DWORD size, INT16 type, DWORD flags )
 {
     LOCAL32HEADER *header = (LOCAL32HEADER *)heap;
     LPDWORD handle;
@@ -1705,7 +1705,7 @@ DWORD WINAPI Local32Alloc( HANDLE32 heap, DWORD size, INT16 type, DWORD flags )
 /***********************************************************************
  *           Local32ReAlloc   (KERNEL.210)
  */
-DWORD WINAPI Local32ReAlloc( HANDLE32 heap, DWORD addr, INT16 type,
+DWORD WINAPI Local32ReAlloc16( HANDLE heap, DWORD addr, INT16 type,
                              DWORD size, DWORD flags )
 {
     LOCAL32HEADER *header = (LOCAL32HEADER *)heap;
@@ -1713,7 +1713,7 @@ DWORD WINAPI Local32ReAlloc( HANDLE32 heap, DWORD addr, INT16 type,
     LPBYTE ptr;
 
     if (!addr)
-        return Local32Alloc( heap, size, type, flags );
+        return Local32Alloc16( heap, size, type, flags );
 
     /* Retrieve handle and pointer */
     Local32_ToHandle( header, type, addr, &handle, &ptr );
@@ -1739,7 +1739,7 @@ DWORD WINAPI Local32ReAlloc( HANDLE32 heap, DWORD addr, INT16 type,
 /***********************************************************************
  *           Local32Free   (KERNEL.211)
  */
-BOOL32 WINAPI Local32Free( HANDLE32 heap, DWORD addr, INT16 type )
+BOOL WINAPI Local32Free16( HANDLE heap, DWORD addr, INT16 type )
 {
     LOCAL32HEADER *header = (LOCAL32HEADER *)heap;
     LPDWORD handle;
@@ -1785,7 +1785,7 @@ BOOL32 WINAPI Local32Free( HANDLE32 heap, DWORD addr, INT16 type )
 /***********************************************************************
  *           Local32Translate   (KERNEL.213)
  */
-DWORD WINAPI Local32Translate( HANDLE32 heap, DWORD addr, INT16 type1, INT16 type2 )
+DWORD WINAPI Local32Translate16( HANDLE heap, DWORD addr, INT16 type1, INT16 type2 )
 {
     LOCAL32HEADER *header = (LOCAL32HEADER *)heap;
     LPDWORD handle;
@@ -1801,7 +1801,7 @@ DWORD WINAPI Local32Translate( HANDLE32 heap, DWORD addr, INT16 type1, INT16 typ
 /***********************************************************************
  *           Local32Size   (KERNEL.214)
  */
-DWORD WINAPI Local32Size( HANDLE32 heap, DWORD addr, INT16 type )
+DWORD WINAPI Local32Size16( HANDLE heap, DWORD addr, INT16 type )
 {
     LOCAL32HEADER *header = (LOCAL32HEADER *)heap;
     LPDWORD handle;
@@ -1816,7 +1816,7 @@ DWORD WINAPI Local32Size( HANDLE32 heap, DWORD addr, INT16 type )
 /***********************************************************************
  *           Local32ValidHandle   (KERNEL.215)
  */
-BOOL32 WINAPI Local32ValidHandle( HANDLE32 heap, WORD addr )
+BOOL WINAPI Local32ValidHandle16( HANDLE heap, WORD addr )
 {
     LOCAL32HEADER *header = (LOCAL32HEADER *)heap;
     LPDWORD handle;
@@ -1829,7 +1829,7 @@ BOOL32 WINAPI Local32ValidHandle( HANDLE32 heap, WORD addr )
 /***********************************************************************
  *           Local32GetSegment   (KERNEL.229)
  */
-WORD WINAPI Local32GetSegment( HANDLE32 heap )
+WORD WINAPI Local32GetSegment16( HANDLE heap )
 {
     LOCAL32HEADER *header = (LOCAL32HEADER *)heap;
     return header->segment;
@@ -1840,9 +1840,9 @@ WORD WINAPI Local32GetSegment( HANDLE32 heap )
  */
 static LOCAL32HEADER *Local32_GetHeap( HGLOBAL16 handle )
 {
-    WORD selector = GlobalHandleToSel( handle );
+    WORD selector = GlobalHandleToSel16( handle );
     DWORD base  = GetSelectorBase( selector ); 
-    DWORD limit = GetSelectorLimit( selector ); 
+    DWORD limit = GetSelectorLimit16( selector ); 
 
     /* Hmmm. This is a somewhat stupid heuristic, but Windows 95 does
        it this way ... */
@@ -1862,7 +1862,7 @@ static LOCAL32HEADER *Local32_GetHeap( HGLOBAL16 handle )
 /***********************************************************************
  *           Local32Info   (KERNEL.444)  (TOOLHELP.84)
  */
-BOOL16 WINAPI Local32Info( LOCAL32INFO *pLocal32Info, HGLOBAL16 handle )
+BOOL16 WINAPI Local32Info16( LOCAL32INFO *pLocal32Info, HGLOBAL16 handle )
 {
     SUBHEAP *heapPtr;
     LPBYTE ptr;
@@ -1916,7 +1916,7 @@ BOOL16 WINAPI Local32Info( LOCAL32INFO *pLocal32Info, HGLOBAL16 handle )
 /***********************************************************************
  *           Local32First   (KERNEL.445)  (TOOLHELP.85)
  */
-BOOL16 WINAPI Local32First( LOCAL32ENTRY *pLocal32Entry, HGLOBAL16 handle )
+BOOL16 WINAPI Local32First16( LOCAL32ENTRY *pLocal32Entry, HGLOBAL16 handle )
 {
     FIXME( heap, "(%p, %04X): stub!\n", pLocal32Entry, handle );
     return FALSE;
@@ -1925,7 +1925,7 @@ BOOL16 WINAPI Local32First( LOCAL32ENTRY *pLocal32Entry, HGLOBAL16 handle )
 /***********************************************************************
  *           Local32Next   (KERNEL.446)  (TOOLHELP.86)
  */
-BOOL16 WINAPI Local32Next( LOCAL32ENTRY *pLocal32Entry )
+BOOL16 WINAPI Local32Next16( LOCAL32ENTRY *pLocal32Entry )
 {
     FIXME( heap, "(%p): stub!\n", pLocal32Entry );
     return FALSE;
diff --git a/memory/local.c b/memory/local.c
index d0f15d9c797..02bd1c760e4 100644
--- a/memory/local.c
+++ b/memory/local.c
@@ -318,7 +318,7 @@ static void LOCAL_PrintHeap( HANDLE16 ds )
 /***********************************************************************
  *           LocalInit   (KERNEL.4)
  */
-BOOL16 WINAPI LocalInit( HANDLE16 selector, WORD start, WORD end )
+BOOL16 WINAPI LocalInit16( HANDLE16 selector, WORD start, WORD end )
 {
     char *ptr;
     WORD heapInfoArena, freeArena, lastArena;
@@ -352,7 +352,7 @@ BOOL16 WINAPI LocalInit( HANDLE16 selector, WORD start, WORD end )
 	if ((pModule = NE_GetPtr( selector )))
 	{
 	    SEGTABLEENTRY *pSeg = NE_SEG_TABLE( pModule ) + pModule->dgroup - 1;
-	    if (pModule->dgroup && (GlobalHandleToSel(pSeg->hSeg) == selector))
+	    if (pModule->dgroup && (GlobalHandleToSel16(pSeg->hSeg) == selector))
 	    {
 		/* We can't just use the simple method of using the value
                  * of minsize + stacksize, since there are programs that
@@ -1627,7 +1627,7 @@ UINT16 WINAPI LocalCompact16( UINT16 minfree )
  *   otherwise LogError() gets called.
  *   hMem = handle; wArg = flags
  */
-FARPROC16 WINAPI LocalNotify( FARPROC16 func )
+FARPROC16 WINAPI LocalNotify16( FARPROC16 func )
 {
     LOCALHEAPINFO *pInfo;
     FARPROC16 oldNotify;
@@ -1660,14 +1660,14 @@ UINT16 WINAPI LocalShrink16( HGLOBAL16 handle, UINT16 newsize )
 /***********************************************************************
  *           GetHeapSpaces   (KERNEL.138)
  */
-DWORD WINAPI GetHeapSpaces( HMODULE16 module )
+DWORD WINAPI GetHeapSpaces16( HMODULE16 module )
 {
     NE_MODULE *pModule;
     WORD ds;
 
     if (!(pModule = NE_GetPtr( module ))) return 0;
     ds =
-    GlobalHandleToSel((NE_SEG_TABLE( pModule ) + pModule->dgroup - 1)->hSeg);
+    GlobalHandleToSel16((NE_SEG_TABLE( pModule ) + pModule->dgroup - 1)->hSeg);
     return MAKELONG( LOCAL_CountFree( ds ), LOCAL_HeapSize( ds ) );
 }
 
@@ -1675,7 +1675,7 @@ DWORD WINAPI GetHeapSpaces( HMODULE16 module )
 /***********************************************************************
  *           LocalCountFree   (KERNEL.161)
  */
-WORD WINAPI LocalCountFree(void)
+WORD WINAPI LocalCountFree16(void)
 {
     return LOCAL_CountFree( CURRENT_DS );
 }
@@ -1684,7 +1684,7 @@ WORD WINAPI LocalCountFree(void)
 /***********************************************************************
  *           LocalHeapSize   (KERNEL.162)
  */
-WORD WINAPI LocalHeapSize(void)
+WORD WINAPI LocalHeapSize16(void)
 {
     TRACE(local, "(void)\n" );
     return LOCAL_HeapSize( CURRENT_DS );
@@ -1694,7 +1694,7 @@ WORD WINAPI LocalHeapSize(void)
 /***********************************************************************
  *           LocalHandleDelta   (KERNEL.310)
  */
-WORD WINAPI LocalHandleDelta( WORD delta )
+WORD WINAPI LocalHandleDelta16( WORD delta )
 {
     LOCALHEAPINFO *pInfo;
 
@@ -1713,7 +1713,7 @@ WORD WINAPI LocalHandleDelta( WORD delta )
 /***********************************************************************
  *           LocalInfo   (TOOLHELP.56)
  */
-BOOL16 WINAPI LocalInfo( LOCALINFO *pLocalInfo, HGLOBAL16 handle )
+BOOL16 WINAPI LocalInfo16( LOCALINFO *pLocalInfo, HGLOBAL16 handle )
 {
     LOCALHEAPINFO *pInfo = LOCAL_GetHeap(SELECTOROF(WIN16_GlobalLock16(handle)));
     if (!pInfo) return FALSE;
@@ -1725,9 +1725,9 @@ BOOL16 WINAPI LocalInfo( LOCALINFO *pLocalInfo, HGLOBAL16 handle )
 /***********************************************************************
  *           LocalFirst   (TOOLHELP.57)
  */
-BOOL16 WINAPI LocalFirst( LOCALENTRY *pLocalEntry, HGLOBAL16 handle )
+BOOL16 WINAPI LocalFirst16( LOCALENTRY *pLocalEntry, HGLOBAL16 handle )
 {
-    WORD ds = GlobalHandleToSel( handle );
+    WORD ds = GlobalHandleToSel16( handle );
     char *ptr = PTR_SEG_OFF_TO_LIN( ds, 0 );
     LOCALHEAPINFO *pInfo = LOCAL_GetHeap( ds );
     if (!pInfo) return FALSE;
@@ -1748,9 +1748,9 @@ BOOL16 WINAPI LocalFirst( LOCALENTRY *pLocalEntry, HGLOBAL16 handle )
 /***********************************************************************
  *           LocalNext   (TOOLHELP.58)
  */
-BOOL16 WINAPI LocalNext( LOCALENTRY *pLocalEntry )
+BOOL16 WINAPI LocalNext16( LOCALENTRY *pLocalEntry )
 {
-    WORD ds = GlobalHandleToSel( pLocalEntry->hHeap );
+    WORD ds = GlobalHandleToSel16( pLocalEntry->hHeap );
     char *ptr = PTR_SEG_OFF_TO_LIN( ds, 0 );
     LOCALARENA *pArena;
 
@@ -1778,18 +1778,18 @@ BOOL16 WINAPI LocalNext( LOCALENTRY *pLocalEntry )
  *	Handle: Success
  *	NULL: Failure
  */
-HLOCAL32 WINAPI LocalAlloc32(
-                UINT32 flags, /* [in] Allocation attributes */
+HLOCAL WINAPI LocalAlloc(
+                UINT flags, /* [in] Allocation attributes */
                 DWORD size    /* [in] Number of bytes to allocate */
 ) {
-    return (HLOCAL32)GlobalAlloc32( flags, size );
+    return (HLOCAL)GlobalAlloc( flags, size );
 }
 
 
 /***********************************************************************
  *           LocalCompact32   (KERNEL32.372)
  */
-UINT32 WINAPI LocalCompact32( UINT32 minfree )
+UINT WINAPI LocalCompact( UINT minfree )
 {
     return 0;  /* LocalCompact does nothing in Win32 */
 }
@@ -1801,10 +1801,10 @@ UINT32 WINAPI LocalCompact32( UINT32 minfree )
  *	Value specifying allocation flags and lock count.
  *	LMEM_INVALID_HANDLE: Failure
  */
-UINT32 WINAPI LocalFlags32(
-              HLOCAL32 handle /* [in] Handle of memory object */
+UINT WINAPI LocalFlags(
+              HLOCAL handle /* [in] Handle of memory object */
 ) {
-    return GlobalFlags32( (HGLOBAL32)handle );
+    return GlobalFlags( (HGLOBAL)handle );
 }
 
 
@@ -1814,10 +1814,10 @@ UINT32 WINAPI LocalFlags32(
  *	NULL: Success
  *	Handle: Failure
  */
-HLOCAL32 WINAPI LocalFree32(
-                HLOCAL32 handle /* [in] Handle of memory object */
+HLOCAL WINAPI LocalFree(
+                HLOCAL handle /* [in] Handle of memory object */
 ) {
-    return (HLOCAL32)GlobalFree32( (HGLOBAL32)handle );
+    return (HLOCAL)GlobalFree( (HGLOBAL)handle );
 }
 
 
@@ -1827,10 +1827,10 @@ HLOCAL32 WINAPI LocalFree32(
  *	Handle: Success
  *	NULL: Failure
  */
-HLOCAL32 WINAPI LocalHandle32(
+HLOCAL WINAPI LocalHandle(
                 LPCVOID ptr /* [in] Address of local memory object */
 ) {
-    return (HLOCAL32)GlobalHandle32( ptr );
+    return (HLOCAL)GlobalHandle( ptr );
 }
 
 
@@ -1843,10 +1843,10 @@ HLOCAL32 WINAPI LocalHandle32(
  *	Pointer: Success
  *	NULL: Failure
  */
-LPVOID WINAPI LocalLock32(
-              HLOCAL32 handle /* [in] Address of local memory object */
+LPVOID WINAPI LocalLock(
+              HLOCAL handle /* [in] Address of local memory object */
 ) {
-    return GlobalLock32( (HGLOBAL32)handle );
+    return GlobalLock( (HGLOBAL)handle );
 }
 
 
@@ -1856,19 +1856,19 @@ LPVOID WINAPI LocalLock32(
  *	Handle: Success
  *	NULL: Failure
  */
-HLOCAL32 WINAPI LocalReAlloc32(
-                HLOCAL32 handle, /* [in] Handle of memory object */
+HLOCAL WINAPI LocalReAlloc(
+                HLOCAL handle, /* [in] Handle of memory object */
                 DWORD size,      /* [in] New size of block */
-                UINT32 flags     /* [in] How to reallocate object */
+                UINT flags     /* [in] How to reallocate object */
 ) {
-    return (HLOCAL32)GlobalReAlloc32( (HGLOBAL32)handle, size, flags );
+    return (HLOCAL)GlobalReAlloc( (HGLOBAL)handle, size, flags );
 }
 
 
 /***********************************************************************
  *           LocalShrink32   (KERNEL32.379)
  */
-UINT32 WINAPI LocalShrink32( HGLOBAL32 handle, UINT32 newsize )
+UINT WINAPI LocalShrink( HGLOBAL handle, UINT newsize )
 {
     return 0;  /* LocalShrink does nothing in Win32 */
 }
@@ -1880,10 +1880,10 @@ UINT32 WINAPI LocalShrink32( HGLOBAL32 handle, UINT32 newsize )
  *	Size: Success
  *	0: Failure
  */
-UINT32 WINAPI LocalSize32(
-              HLOCAL32 handle /* [in] Handle of memory object */
+UINT WINAPI LocalSize(
+              HLOCAL handle /* [in] Handle of memory object */
 ) {
-    return GlobalSize32( (HGLOBAL32)handle );
+    return GlobalSize( (HGLOBAL)handle );
 }
 
 
@@ -1893,8 +1893,8 @@ UINT32 WINAPI LocalSize32(
  *	TRUE: Object is still locked
  *	FALSE: Object is unlocked
  */
-BOOL32 WINAPI LocalUnlock32(
-              HLOCAL32 handle /* [in] Handle of memory object */
+BOOL WINAPI LocalUnlock(
+              HLOCAL handle /* [in] Handle of memory object */
 ) {
-    return GlobalUnlock32( (HGLOBAL32)handle );
+    return GlobalUnlock( (HGLOBAL)handle );
 }
diff --git a/memory/selector.c b/memory/selector.c
index d3bbdbb2ff2..250a1ed3369 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -17,7 +17,7 @@
 /***********************************************************************
  *           AllocSelectorArray   (KERNEL.206)
  */
-WORD WINAPI AllocSelectorArray( WORD count )
+WORD WINAPI AllocSelectorArray16( WORD count )
 {
     WORD i, sel, size = 0;
     ldt_entry entry;
@@ -51,12 +51,12 @@ WORD WINAPI AllocSelectorArray( WORD count )
 /***********************************************************************
  *           AllocSelector   (KERNEL.175)
  */
-WORD WINAPI AllocSelector( WORD sel )
+WORD WINAPI AllocSelector16( WORD sel )
 {
     WORD newsel, count, i;
 
     count = sel ? ((GET_SEL_LIMIT(sel) >> 16) + 1) : 1;
-    newsel = AllocSelectorArray( count );
+    newsel = AllocSelectorArray16( count );
     TRACE(selector, "(%04x): returning %04x\n",
                       sel, newsel );
     if (!newsel) return 0;
@@ -74,7 +74,7 @@ WORD WINAPI AllocSelector( WORD sel )
 /***********************************************************************
  *           FreeSelector   (KERNEL.176)
  */
-WORD WINAPI FreeSelector( WORD sel )
+WORD WINAPI FreeSelector16( WORD sel )
 {
     if (IS_SELECTOR_FREE(sel)) return sel;  /* error */
     SELECTOR_FreeBlock( sel, 1 );
@@ -88,8 +88,8 @@ WORD WINAPI FreeSelector( WORD sel )
  * Set the LDT entries for an array of selectors.
  */
 static void SELECTOR_SetEntries( WORD sel, const void *base, DWORD size,
-                                 enum seg_type type, BOOL32 is32bit,
-                                 BOOL32 readonly )
+                                 enum seg_type type, BOOL is32bit,
+                                 BOOL readonly )
 {
     ldt_entry entry;
     WORD i, count;
@@ -123,13 +123,13 @@ static void SELECTOR_SetEntries( WORD sel, const void *base, DWORD size,
  * Allocate selectors for a block of linear memory.
  */
 WORD SELECTOR_AllocBlock( const void *base, DWORD size, enum seg_type type,
-                          BOOL32 is32bit, BOOL32 readonly )
+                          BOOL is32bit, BOOL readonly )
 {
     WORD sel, count;
 
     if (!size) return 0;
     count = (size + 0xffff) / 0x10000;
-    sel = AllocSelectorArray( count );
+    sel = AllocSelectorArray16( count );
     if (sel) SELECTOR_SetEntries( sel, base, size, type, is32bit, readonly );
     return sel;
 }
@@ -199,7 +199,7 @@ void SELECTOR_FreeBlock( WORD sel, WORD count )
  * Change the size of a block of selectors.
  */
 WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size,
-                           enum seg_type type, BOOL32 is32bit, BOOL32 readonly)
+                           enum seg_type type, BOOL is32bit, BOOL readonly)
 {
     WORD i, oldcount, newcount;
 
@@ -218,7 +218,7 @@ WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size,
         if (i < newcount)  /* they are not free */
         {
             SELECTOR_FreeBlock( sel, oldcount );
-            sel = AllocSelectorArray( newcount );
+            sel = AllocSelectorArray16( newcount );
         }
         else  /* mark the selectors as allocated */
         {
@@ -239,7 +239,7 @@ WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size,
 /***********************************************************************
  *           PrestoChangoSelector   (KERNEL.177)
  */
-WORD WINAPI PrestoChangoSelector( WORD selSrc, WORD selDst )
+WORD WINAPI PrestoChangoSelector16( WORD selSrc, WORD selDst )
 {
     ldt_entry entry;
     LDT_GetEntry( SELECTOR_TO_ENTRY( selSrc ), &entry );
@@ -252,12 +252,12 @@ WORD WINAPI PrestoChangoSelector( WORD selSrc, WORD selDst )
 /***********************************************************************
  *           AllocCStoDSAlias   (KERNEL.170)
  */
-WORD WINAPI AllocCStoDSAlias( WORD sel )
+WORD WINAPI AllocCStoDSAlias16( WORD sel )
 {
     WORD newsel;
     ldt_entry entry;
 
-    newsel = AllocSelectorArray( 1 );
+    newsel = AllocSelectorArray16( 1 );
     TRACE(selector, "(%04x): returning %04x\n",
                       sel, newsel );
     if (!newsel) return 0;
@@ -271,12 +271,12 @@ WORD WINAPI AllocCStoDSAlias( WORD sel )
 /***********************************************************************
  *           AllocDStoCSAlias   (KERNEL.171)
  */
-WORD WINAPI AllocDStoCSAlias( WORD sel )
+WORD WINAPI AllocDStoCSAlias16( WORD sel )
 {
     WORD newsel;
     ldt_entry entry;
 
-    newsel = AllocSelectorArray( 1 );
+    newsel = AllocSelectorArray16( 1 );
     TRACE(selector, "(%04x): returning %04x\n",
                       sel, newsel );
     if (!newsel) return 0;
@@ -290,7 +290,7 @@ WORD WINAPI AllocDStoCSAlias( WORD sel )
 /***********************************************************************
  *           LongPtrAdd   (KERNEL.180)
  */
-void WINAPI LongPtrAdd( DWORD ptr, DWORD add )
+void WINAPI LongPtrAdd16( DWORD ptr, DWORD add )
 {
     ldt_entry entry;
     LDT_GetEntry( SELECTOR_TO_ENTRY(SELECTOROF(ptr)), &entry );
@@ -355,7 +355,7 @@ WORD WINAPI SetSelectorBase( WORD sel, DWORD base )
 /***********************************************************************
  *           GetSelectorLimit   (KERNEL.188)
  */
-DWORD WINAPI GetSelectorLimit( WORD sel )
+DWORD WINAPI GetSelectorLimit16( WORD sel )
 {
     return GET_SEL_LIMIT(sel);
 }
@@ -364,7 +364,7 @@ DWORD WINAPI GetSelectorLimit( WORD sel )
 /***********************************************************************
  *           SetSelectorLimit   (KERNEL.189)
  */
-WORD WINAPI SetSelectorLimit( WORD sel, DWORD limit )
+WORD WINAPI SetSelectorLimit16( WORD sel, DWORD limit )
 {
     ldt_entry entry;
     LDT_GetEntry( SELECTOR_TO_ENTRY(sel), &entry );
@@ -379,7 +379,7 @@ WORD WINAPI SetSelectorLimit( WORD sel, DWORD limit )
 /***********************************************************************
  *           SelectorAccessRights   (KERNEL.196)
  */
-WORD WINAPI SelectorAccessRights( WORD sel, WORD op, WORD val )
+WORD WINAPI SelectorAccessRights16( WORD sel, WORD op, WORD val )
 {
     ldt_entry entry;
     LDT_GetEntry( SELECTOR_TO_ENTRY(sel), &entry );
@@ -499,7 +499,7 @@ BOOL16 WINAPI IsBadWritePtr16( SEGPTR ptr, UINT16 size )
 /***********************************************************************
  *           MemoryRead   (TOOLHELP.78)
  */
-DWORD WINAPI MemoryRead( WORD sel, DWORD offset, void *buffer, DWORD count )
+DWORD WINAPI MemoryRead16( WORD sel, DWORD offset, void *buffer, DWORD count )
 {
     if (IS_SELECTOR_FREE(sel)) return 0;
     if (offset > GET_SEL_LIMIT(sel)) return 0;
@@ -513,7 +513,7 @@ DWORD WINAPI MemoryRead( WORD sel, DWORD offset, void *buffer, DWORD count )
 /***********************************************************************
  *           MemoryWrite   (TOOLHELP.79)
  */
-DWORD WINAPI MemoryWrite( WORD sel, DWORD offset, void *buffer, DWORD count )
+DWORD WINAPI MemoryWrite16( WORD sel, DWORD offset, void *buffer, DWORD count )
 {
     if (IS_SELECTOR_FREE(sel)) return 0;
     if (offset > GET_SEL_LIMIT(sel)) return 0;
@@ -593,7 +593,7 @@ void WINAPI UnMapLS( SEGPTR sptr )
  *           GetThreadSelectorEntry   (KERNEL32)
  * FIXME: add #ifdef i386 for non x86
  */
-BOOL32 WINAPI GetThreadSelectorEntry( HANDLE32 hthread, DWORD sel,
+BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel,
                                       LPLDT_ENTRY ldtent)
 {
     ldt_entry	ldtentry;
@@ -701,15 +701,15 @@ REGS_ENTRYPOINT(SUnMapLS_IP_EBP_40) { x_SUnMapLS_IP_EBP_x(context,40); }
 
 REGS_ENTRYPOINT(AllocMappedBuffer)
 {
-    HGLOBAL32 handle = GlobalAlloc32(0, EDI_reg(context) + 8);
-    DWORD *buffer = (DWORD *)GlobalLock32(handle);
+    HGLOBAL handle = GlobalAlloc(0, EDI_reg(context) + 8);
+    DWORD *buffer = (DWORD *)GlobalLock(handle);
     SEGPTR ptr = 0;
 
     if (buffer)
         if (!(ptr = MapLS(buffer + 2)))
         {
-            GlobalUnlock32(handle);
-            GlobalFree32(handle);
+            GlobalUnlock(handle);
+            GlobalFree(handle);
         }
 
     if (!ptr)
@@ -740,8 +740,8 @@ REGS_ENTRYPOINT(FreeMappedBuffer)
 
         UnMapLS(buffer[1]);
 
-        GlobalUnlock32(buffer[0]);
-        GlobalFree32(buffer[0]);
+        GlobalUnlock(buffer[0]);
+        GlobalFree(buffer[0]);
     }
 }
 
@@ -749,7 +749,7 @@ REGS_ENTRYPOINT(FreeMappedBuffer)
  *           WOWGetVDMPointer	(KERNEL32.55)
  * Get linear from segmented pointer. (MSDN lib)
  */
-LPVOID WINAPI WOWGetVDMPointer(DWORD vp,DWORD nrofbytes,BOOL32 protected)
+LPVOID WINAPI WOWGetVDMPointer(DWORD vp,DWORD nrofbytes,BOOL protected)
 {
     /* FIXME: add size check too */
     if (protected)
@@ -770,7 +770,7 @@ LPVOID WINAPI GetVDMPointer32W(DWORD vp,WORD mode)
  *           WOWGetVDMPointerFix (KERNEL32.55)
  * Dito, but fix heapsegment (MSDN lib)
  */
-LPVOID WINAPI WOWGetVDMPointerFix(DWORD vp,DWORD nrofbytes,BOOL32 protected)
+LPVOID WINAPI WOWGetVDMPointerFix(DWORD vp,DWORD nrofbytes,BOOL protected)
 {
     /* FIXME: fix heapsegment */
     return WOWGetVDMPointer(vp,nrofbytes,protected);
@@ -789,7 +789,7 @@ void WINAPI WOWGetVDMPointerUnfix(DWORD vp)
  *
  * rough guesswork, but seems to work (I had no "reasonable" docu)
  */
-LPVOID WINAPI UTSelectorOffsetToLinear(SEGPTR sptr)
+LPVOID WINAPI UTSelectorOffsetToLinear16(SEGPTR sptr)
 {
         return PTR_SEG_TO_LIN(sptr);
 }
@@ -799,7 +799,7 @@ LPVOID WINAPI UTSelectorOffsetToLinear(SEGPTR sptr)
  *
  * FIXME: I don't know if that's the right way to do linear -> segmented
  */
-SEGPTR WINAPI UTLinearToSelectorOffset(LPVOID lptr)
+SEGPTR WINAPI UTLinearToSelectorOffset16(LPVOID lptr)
 {
     return (SEGPTR)lptr;
 }
diff --git a/memory/string.c b/memory/string.c
index 7336494e0b0..700db59ad57 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -54,8 +54,8 @@ static const BYTE STRING_Ansi2Oem[256] =
 #define ANSI_TO_OEM(ch) (STRING_Ansi2Oem[(unsigned char)(ch)])
 
 /* Internaly used by strchr family functions */
-static BOOL32 ChrCmpA( WORD word1, WORD word2);
-static BOOL32 ChrCmpW( WORD word1, WORD word2);
+static BOOL ChrCmpA( WORD word1, WORD word2);
+static BOOL ChrCmpW( WORD word1, WORD word2);
 
 extern LPWSTR __cdecl CRTDLL_wcschr(LPCWSTR str,WCHAR xchar);
 
@@ -63,7 +63,7 @@ extern LPWSTR __cdecl CRTDLL_wcschr(LPCWSTR str,WCHAR xchar);
 /***********************************************************************
  *           hmemcpy   (KERNEL.348)
  */
-void WINAPI hmemcpy( LPVOID dst, LPCVOID src, LONG count )
+void WINAPI hmemcpy16( LPVOID dst, LPCVOID src, LONG count )
 {
     memcpy( dst, src, count );
 }
@@ -74,7 +74,7 @@ void WINAPI hmemcpy( LPVOID dst, LPCVOID src, LONG count )
  */
 SEGPTR WINAPI lstrcat16( SEGPTR dst, LPCSTR src )
 {
-    lstrcat32A( (LPSTR)PTR_SEG_TO_LIN(dst), src );
+    lstrcatA( (LPSTR)PTR_SEG_TO_LIN(dst), src );
     return dst;
 }
 
@@ -82,7 +82,7 @@ SEGPTR WINAPI lstrcat16( SEGPTR dst, LPCSTR src )
 /***********************************************************************
  *           lstrcat32A   (KERNEL32.599)
  */
-LPSTR WINAPI lstrcat32A( LPSTR dst, LPCSTR src )
+LPSTR WINAPI lstrcatA( LPSTR dst, LPCSTR src )
 {
     TRACE(string,"Append %s to %s\n",
 		   debugstr_a (src), debugstr_a (dst));
@@ -95,7 +95,7 @@ LPSTR WINAPI lstrcat32A( LPSTR dst, LPCSTR src )
 /***********************************************************************
  *           lstrcat32W   (KERNEL32.600)
  */
-LPWSTR WINAPI lstrcat32W( LPWSTR dst, LPCWSTR src )
+LPWSTR WINAPI lstrcatW( LPWSTR dst, LPCWSTR src )
 {
     register LPWSTR p = dst;
     TRACE(string,"Append L%s to L%s\n",
@@ -112,7 +112,7 @@ LPWSTR WINAPI lstrcat32W( LPWSTR dst, LPCWSTR src )
  */
 SEGPTR WINAPI lstrcatn16( SEGPTR dst, LPCSTR src, INT16 n )
 {
-    lstrcatn32A( (LPSTR)PTR_SEG_TO_LIN(dst), src, n );
+    lstrcatnA( (LPSTR)PTR_SEG_TO_LIN(dst), src, n );
     return dst;
 }
 
@@ -120,14 +120,14 @@ SEGPTR WINAPI lstrcatn16( SEGPTR dst, LPCSTR src, INT16 n )
 /***********************************************************************
  *           lstrcatn32A   (Not a Windows API)
  */
-LPSTR WINAPI lstrcatn32A( LPSTR dst, LPCSTR src, INT32 n )
+LPSTR WINAPI lstrcatnA( LPSTR dst, LPCSTR src, INT n )
 {
     register LPSTR p = dst;
     TRACE(string,"strcatn add %d chars from %s to %s\n",
 		   n, debugstr_an (src, n), debugstr_a (dst));
     while (*p) p++;
-    if ((n -= (INT32)(p - dst)) <= 0) return dst;
-    lstrcpyn32A( p, src, n );
+    if ((n -= (INT)(p - dst)) <= 0) return dst;
+    lstrcpynA( p, src, n );
     return dst;
 }
 
@@ -135,14 +135,14 @@ LPSTR WINAPI lstrcatn32A( LPSTR dst, LPCSTR src, INT32 n )
 /***********************************************************************
  *           lstrcatn32W   (Not a Windows API)
  */
-LPWSTR WINAPI lstrcatn32W( LPWSTR dst, LPCWSTR src, INT32 n )
+LPWSTR WINAPI lstrcatnW( LPWSTR dst, LPCWSTR src, INT n )
 {
     register LPWSTR p = dst;
     TRACE(string,"strcatn add %d chars from L%s to L%s\n",
 		   n, debugstr_wn (src, n), debugstr_w (dst));
     while (*p) p++;
-    if ((n -= (INT32)(p - dst)) <= 0) return dst;
-    lstrcpyn32W( p, src, n );
+    if ((n -= (INT)(p - dst)) <= 0) return dst;
+    lstrcpynW( p, src, n );
     return dst;
 }
 
@@ -159,9 +159,9 @@ INT16 WINAPI lstrcmp16( LPCSTR str1, LPCSTR str2 )
 /***********************************************************************
  *           lstrcmp32A   (KERNEL.602)
  */
-INT32 WINAPI lstrcmp32A( LPCSTR str1, LPCSTR str2 )
+INT WINAPI lstrcmpA( LPCSTR str1, LPCSTR str2 )
 {
-    return CompareString32A(LOCALE_SYSTEM_DEFAULT,0,str1,-1,str2,-1) - 2 ;
+    return CompareStringA(LOCALE_SYSTEM_DEFAULT,0,str1,-1,str2,-1) - 2 ;
 }
 
 
@@ -170,7 +170,7 @@ INT32 WINAPI lstrcmp32A( LPCSTR str1, LPCSTR str2 )
  * FIXME : should call CompareString32W, when it is implemented.
  *    This implementation is not "word sort", as it should.
  */
-INT32 WINAPI lstrcmp32W( LPCWSTR str1, LPCWSTR str2 )
+INT WINAPI lstrcmpW( LPCWSTR str1, LPCWSTR str2 )
 {
     TRACE(string,"L%s and L%s\n",
 		   debugstr_w (str1), debugstr_w (str2));
@@ -179,7 +179,7 @@ INT32 WINAPI lstrcmp32W( LPCWSTR str1, LPCWSTR str2 )
 	return 0;
     }
     while (*str1 && (*str1 == *str2)) { str1++; str2++; }
-    return (INT32)(*str1 - *str2);
+    return (INT)(*str1 - *str2);
 }
 
 
@@ -188,26 +188,26 @@ INT32 WINAPI lstrcmp32W( LPCWSTR str1, LPCWSTR str2 )
  */
 INT16 WINAPI lstrcmpi16( LPCSTR str1, LPCSTR str2 )
 {
-    return (INT16)lstrcmpi32A( str1, str2 );
+    return (INT16)lstrcmpiA( str1, str2 );
 }
 
 
 /***********************************************************************
  *           lstrcmpi32A   (KERNEL32.605)
  */
-INT32 WINAPI lstrcmpi32A( LPCSTR str1, LPCSTR str2 )
+INT WINAPI lstrcmpiA( LPCSTR str1, LPCSTR str2 )
 {    TRACE(string,"strcmpi %s and %s\n",
 		   debugstr_a (str1), debugstr_a (str2));
-    return CompareString32A(LOCALE_SYSTEM_DEFAULT,NORM_IGNORECASE,str1,-1,str2,-1)-2;
+    return CompareStringA(LOCALE_SYSTEM_DEFAULT,NORM_IGNORECASE,str1,-1,str2,-1)-2;
 }
 
 
 /***********************************************************************
  *           lstrcmpi32W   (KERNEL32.606)
  */
-INT32 WINAPI lstrcmpi32W( LPCWSTR str1, LPCWSTR str2 )
+INT WINAPI lstrcmpiW( LPCWSTR str1, LPCWSTR str2 )
 {
-    INT32 res;
+    INT res;
 
 #if 0
     /* Too much!  (From registry loading.)  */
@@ -237,7 +237,7 @@ INT32 WINAPI lstrcmpi32W( LPCWSTR str1, LPCWSTR str2 )
  */
 SEGPTR WINAPI lstrcpy16( SEGPTR dst, LPCSTR src )
 {
-    lstrcpy32A( (LPSTR)PTR_SEG_TO_LIN(dst), src );
+    lstrcpyA( (LPSTR)PTR_SEG_TO_LIN(dst), src );
     return dst;
 }
 
@@ -245,7 +245,7 @@ SEGPTR WINAPI lstrcpy16( SEGPTR dst, LPCSTR src )
 /***********************************************************************
  *           lstrcpy32A   (KERNEL32.608)
  */
-LPSTR WINAPI lstrcpy32A( LPSTR dst, LPCSTR src )
+LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src )
 {
     TRACE(string,"strcpy %s\n", debugstr_a (src));
     /* In real windows the whole function is protected by an exception handler
@@ -264,7 +264,7 @@ LPSTR WINAPI lstrcpy32A( LPSTR dst, LPCSTR src )
 /***********************************************************************
  *           lstrcpy32W   (KERNEL32.609)
  */
-LPWSTR WINAPI lstrcpy32W( LPWSTR dst, LPCWSTR src )
+LPWSTR WINAPI lstrcpyW( LPWSTR dst, LPCWSTR src )
 {
     register LPWSTR p = dst;
     TRACE(string,"strcpy L%s\n", debugstr_w (src));
@@ -286,7 +286,7 @@ LPWSTR WINAPI lstrcpy32W( LPWSTR dst, LPCWSTR src )
  */
 SEGPTR WINAPI lstrcpyn16( SEGPTR dst, LPCSTR src, INT16 n )
 {
-    lstrcpyn32A( (LPSTR)PTR_SEG_TO_LIN(dst), src, n );
+    lstrcpynA( (LPSTR)PTR_SEG_TO_LIN(dst), src, n );
     return dst;
 }
 
@@ -296,7 +296,7 @@ SEGPTR WINAPI lstrcpyn16( SEGPTR dst, LPCSTR src, INT16 n )
  * Note: this function differs from the UNIX strncpy, it _always_ writes
  * a terminating \0
  */
-LPSTR WINAPI lstrcpyn32A( LPSTR dst, LPCSTR src, INT32 n )
+LPSTR WINAPI lstrcpynA( LPSTR dst, LPCSTR src, INT n )
 {
     LPSTR p = dst;
     TRACE(string,"strcpyn %s for %d chars\n",
@@ -320,7 +320,7 @@ LPSTR WINAPI lstrcpyn32A( LPSTR dst, LPCSTR src, INT32 n )
  * Note: this function differs from the UNIX strncpy, it _always_ writes
  * a terminating \0
  */
-LPWSTR WINAPI lstrcpyn32W( LPWSTR dst, LPCWSTR src, INT32 n )
+LPWSTR WINAPI lstrcpynW( LPWSTR dst, LPCWSTR src, INT n )
 {
     LPWSTR p = dst;
     TRACE(string,"strcpyn L%s for %d chars\n",
@@ -344,14 +344,14 @@ LPWSTR WINAPI lstrcpyn32W( LPWSTR dst, LPCWSTR src, INT32 n )
  */
 INT16 WINAPI lstrlen16( LPCSTR str )
 {
-    return (INT16)lstrlen32A( str );
+    return (INT16)lstrlenA( str );
 }
 
 
 /***********************************************************************
  *           lstrlen32A   (KERNEL32.614)
  */
-INT32 WINAPI lstrlen32A( LPCSTR str )
+INT WINAPI lstrlenA( LPCSTR str )
 {
     /* looks weird, but win3.1 KERNEL got a GeneralProtection handler
      * in lstrlen() ... we check only for NULL pointer reference.
@@ -359,16 +359,16 @@ INT32 WINAPI lstrlen32A( LPCSTR str )
      */
     TRACE(string,"strlen %s\n", debugstr_a (str));
     if (!str) return 0;
-    return (INT32)strlen(str);
+    return (INT)strlen(str);
 }
 
 
 /***********************************************************************
  *           lstrlen32W   (KERNEL32.615)
  */
-INT32 WINAPI lstrlen32W( LPCWSTR str )
+INT WINAPI lstrlenW( LPCWSTR str )
 {
-    INT32 len = 0;
+    INT len = 0;
     TRACE(string,"strlen L%s\n", debugstr_w (str));
     if (!str) return 0;
     while (*str++) len++;
@@ -379,33 +379,33 @@ INT32 WINAPI lstrlen32W( LPCWSTR str )
 /***********************************************************************
  *           lstrncmp32A   (Not a Windows API)
  */
-INT32 WINAPI lstrncmp32A( LPCSTR str1, LPCSTR str2, INT32 n )
+INT WINAPI lstrncmpA( LPCSTR str1, LPCSTR str2, INT n )
 {
     TRACE(string,"strncmp %s and %s for %d chars\n",
 		   debugstr_an (str1, n), debugstr_an (str2, n), n);
-    return (INT32)strncmp( str1, str2, n );
+    return (INT)strncmp( str1, str2, n );
 }
 
 
 /***********************************************************************
  *           lstrncmp32W   (Not a Windows API)
  */
-INT32 WINAPI lstrncmp32W( LPCWSTR str1, LPCWSTR str2, INT32 n )
+INT WINAPI lstrncmpW( LPCWSTR str1, LPCWSTR str2, INT n )
 {
     TRACE(string,"strncmp L%s and L%s for %d chars\n",
 		   debugstr_wn (str1, n), debugstr_wn (str2, n), n);
     if (!n) return 0;
     while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; }
-    return (INT32)(*str1 - *str2);
+    return (INT)(*str1 - *str2);
 }
 
 
 /***********************************************************************
  *           lstrncmpi32A   (Not a Windows API)
  */
-INT32 WINAPI lstrncmpi32A( LPCSTR str1, LPCSTR str2, INT32 n )
+INT WINAPI lstrncmpiA( LPCSTR str1, LPCSTR str2, INT n )
 {
-    INT32 res;
+    INT res;
 
     TRACE(string,"strncmpi %s and %s for %d chars\n",
 		   debugstr_an (str1, n), debugstr_an (str2, n), n);
@@ -420,9 +420,9 @@ INT32 WINAPI lstrncmpi32A( LPCSTR str1, LPCSTR str2, INT32 n )
 /***********************************************************************
  *           lstrncmpi32W   (Not a Windows API)
  */
-INT32 WINAPI lstrncmpi32W( LPCWSTR str1, LPCWSTR str2, INT32 n )
+INT WINAPI lstrncmpiW( LPCWSTR str1, LPCWSTR str2, INT n )
 {
-    INT32 res;
+    INT res;
 
     TRACE(string,"strncmpi L%s and L%s for %d chars\n",
 		   debugstr_wn (str1, n), debugstr_wn (str2, n), n);
@@ -470,7 +470,7 @@ LPSTR WINAPI lstrcpyWtoA( LPSTR dst, LPCWSTR src )
  * Note: this function differs from the UNIX strncpy, it _always_ writes
  * a terminating \0
  */
-LPWSTR WINAPI lstrcpynAtoW( LPWSTR dst, LPCSTR src, INT32 n )
+LPWSTR WINAPI lstrcpynAtoW( LPWSTR dst, LPCSTR src, INT n )
 {
     LPWSTR p = dst;
 
@@ -487,7 +487,7 @@ LPWSTR WINAPI lstrcpynAtoW( LPWSTR dst, LPCSTR src, INT32 n )
  * Note: this function differs from the UNIX strncpy, it _always_ writes
  * a terminating \0
  */
-LPSTR WINAPI lstrcpynWtoA( LPSTR dst, LPCWSTR src, INT32 n )
+LPSTR WINAPI lstrcpynWtoA( LPSTR dst, LPCWSTR src, INT n )
 {
     LPSTR p = dst;
 
@@ -501,21 +501,21 @@ LPSTR WINAPI lstrcpynWtoA( LPSTR dst, LPCWSTR src, INT32 n )
 /***********************************************************************
  *           UnicodeToAnsi   (KERNEL.434)
  */
-INT16 WINAPI UnicodeToAnsi( LPCWSTR src, LPSTR dst, INT16 codepage )
+INT16 WINAPI UnicodeToAnsi16( LPCWSTR src, LPSTR dst, INT16 codepage )
 {
     if ( codepage != -1 )
         FIXME( string, "codepage %d not supported\n", codepage );
 
     lstrcpyWtoA( dst, src );
 
-    return (INT16)lstrlen32A( dst );
+    return (INT16)lstrlenA( dst );
 }
 
 
 /***********************************************************************
  *           Copy   (GDI.250)
  */
-void WINAPI Copy( LPVOID src, LPVOID dst, WORD size )
+void WINAPI Copy16( LPVOID src, LPVOID dst, WORD size )
 {
     memcpy( dst, src, size );
 }
@@ -524,7 +524,7 @@ void WINAPI Copy( LPVOID src, LPVOID dst, WORD size )
 /***********************************************************************
  *           RtlFillMemory   (KERNEL32.441)
  */
-VOID WINAPI RtlFillMemory( LPVOID ptr, UINT32 len, UINT32 fill )
+VOID WINAPI RtlFillMemory( LPVOID ptr, UINT len, UINT fill )
 {
     memset( ptr, fill, len );
 }
@@ -533,7 +533,7 @@ VOID WINAPI RtlFillMemory( LPVOID ptr, UINT32 len, UINT32 fill )
 /***********************************************************************
  *           RtlMoveMemory   (KERNEL32.442)
  */
-VOID WINAPI RtlMoveMemory( LPVOID dst, LPCVOID src, UINT32 len )
+VOID WINAPI RtlMoveMemory( LPVOID dst, LPCVOID src, UINT len )
 {
     memmove( dst, src, len );
 }
@@ -542,7 +542,7 @@ VOID WINAPI RtlMoveMemory( LPVOID dst, LPCVOID src, UINT32 len )
 /***********************************************************************
  *           RtlZeroMemory   (KERNEL32.444)
  */
-VOID WINAPI RtlZeroMemory( LPVOID ptr, UINT32 len )
+VOID WINAPI RtlZeroMemory( LPVOID ptr, UINT len )
 {
     memset( ptr, 0, len );
 }
@@ -553,7 +553,7 @@ VOID WINAPI RtlZeroMemory( LPVOID ptr, UINT32 len )
  */
 INT16 WINAPI AnsiToOem16( LPCSTR s, LPSTR d )
 {
-    CharToOem32A( s, d );
+    CharToOemA( s, d );
     return -1;
 }
 
@@ -563,7 +563,7 @@ INT16 WINAPI AnsiToOem16( LPCSTR s, LPSTR d )
  */
 INT16 WINAPI OemToAnsi16( LPCSTR s, LPSTR d )
 {
-    OemToChar32A( s, d );
+    OemToCharA( s, d );
     return -1;
 }
 
@@ -573,7 +573,7 @@ INT16 WINAPI OemToAnsi16( LPCSTR s, LPSTR d )
  */
 void WINAPI AnsiToOemBuff16( LPCSTR s, LPSTR d, UINT16 len )
 {
-    CharToOemBuff32A( s, d, len ? len : 65536 );
+    CharToOemBuffA( s, d, len ? len : 65536 );
 }
 
 
@@ -582,14 +582,14 @@ void WINAPI AnsiToOemBuff16( LPCSTR s, LPSTR d, UINT16 len )
  */
 void WINAPI OemToAnsiBuff16( LPCSTR s, LPSTR d, UINT16 len )
 {
-    OemToCharBuff32A( s, d, len ? len : 65536 );
+    OemToCharBuffA( s, d, len ? len : 65536 );
 }
 
 
 /***********************************************************************
  *           CharToOem32A   (USER32.37)
  */
-BOOL32 WINAPI CharToOem32A( LPCSTR s, LPSTR d )
+BOOL WINAPI CharToOemA( LPCSTR s, LPSTR d )
 {
     LPSTR oldd = d;
     if (!s || !d) return TRUE;
@@ -603,7 +603,7 @@ BOOL32 WINAPI CharToOem32A( LPCSTR s, LPSTR d )
 /***********************************************************************
  *           CharToOemBuff32A   (USER32.38)
  */
-BOOL32 WINAPI CharToOemBuff32A( LPCSTR s, LPSTR d, DWORD len )
+BOOL WINAPI CharToOemBuffA( LPCSTR s, LPSTR d, DWORD len )
 {
     while (len--) *d++ = ANSI_TO_OEM(*s++);
     return TRUE;
@@ -613,7 +613,7 @@ BOOL32 WINAPI CharToOemBuff32A( LPCSTR s, LPSTR d, DWORD len )
 /***********************************************************************
  *           CharToOemBuff32W   (USER32.39)
  */
-BOOL32 WINAPI CharToOemBuff32W( LPCWSTR s, LPSTR d, DWORD len )
+BOOL WINAPI CharToOemBuffW( LPCWSTR s, LPSTR d, DWORD len )
 {
     while (len--) *d++ = ANSI_TO_OEM(*s++);
     return TRUE;
@@ -623,7 +623,7 @@ BOOL32 WINAPI CharToOemBuff32W( LPCWSTR s, LPSTR d, DWORD len )
 /***********************************************************************
  *           CharToOem32W   (USER32.40)
  */
-BOOL32 WINAPI CharToOem32W( LPCWSTR s, LPSTR d )
+BOOL WINAPI CharToOemW( LPCWSTR s, LPSTR d )
 {
     LPSTR oldd = d;
     if (!s || !d) return TRUE;
@@ -637,7 +637,7 @@ BOOL32 WINAPI CharToOem32W( LPCWSTR s, LPSTR d )
 /***********************************************************************
  *           OemToChar32A   (USER32.402)
  */
-BOOL32 WINAPI OemToChar32A( LPCSTR s, LPSTR d )
+BOOL WINAPI OemToCharA( LPCSTR s, LPSTR d )
 {
     LPSTR oldd = d;
     TRACE(string,"OemToChar %s\n", debugstr_a (s));
@@ -650,7 +650,7 @@ BOOL32 WINAPI OemToChar32A( LPCSTR s, LPSTR d )
 /***********************************************************************
  *           OemToCharBuff32A   (USER32.403)
  */
-BOOL32 WINAPI OemToCharBuff32A( LPCSTR s, LPSTR d, DWORD len )
+BOOL WINAPI OemToCharBuffA( LPCSTR s, LPSTR d, DWORD len )
 {
     TRACE(string,"OemToCharBuff %s\n", debugstr_an (s, len));
     while (len--) *d++ = OEM_TO_ANSI(*s++);
@@ -661,7 +661,7 @@ BOOL32 WINAPI OemToCharBuff32A( LPCSTR s, LPSTR d, DWORD len )
 /***********************************************************************
  *           OemToCharBuff32W   (USER32.404)
  */
-BOOL32 WINAPI OemToCharBuff32W( LPCSTR s, LPWSTR d, DWORD len )
+BOOL WINAPI OemToCharBuffW( LPCSTR s, LPWSTR d, DWORD len )
 {
     TRACE(string,"OemToCharBuff %s\n", debugstr_an (s, len));
     while (len--) *d++ = (WCHAR)OEM_TO_ANSI(*s++);
@@ -672,7 +672,7 @@ BOOL32 WINAPI OemToCharBuff32W( LPCSTR s, LPWSTR d, DWORD len )
 /***********************************************************************
  *           OemToChar32W   (USER32.405)
  */
-BOOL32 WINAPI OemToChar32W( LPCSTR s, LPWSTR d )
+BOOL WINAPI OemToCharW( LPCSTR s, LPWSTR d )
 {
     while ((*d++ = (WCHAR)OEM_TO_ANSI(*s++)));
     return TRUE;
@@ -686,10 +686,10 @@ BOOL32 WINAPI OemToChar32W( LPCSTR s, LPWSTR d )
  *    strlen of the destination string
  */
  
-INT32 WINAPI WideCharToLocal32(
+INT WINAPI WideCharToLocal(
     LPSTR pLocal, 
 		LPWSTR pWide, 
-		INT32 dwChars)
+		INT dwChars)
 { *pLocal = 0;
   TRACE(string,"(%p, %s, %i)\n",	pLocal, debugstr_w(pWide),dwChars);
   WideCharToMultiByte(CP_ACP,0,pWide,-1,pLocal,dwChars,NULL,NULL);
@@ -702,14 +702,14 @@ INT32 WINAPI WideCharToLocal32(
  *  RETURNS
  *    strlen of the destination string
  */
-INT32 WINAPI LocalToWideChar32(
+INT WINAPI LocalToWideChar(
     LPWSTR pWide, 
 		LPSTR pLocal, 
-		INT32 dwChars)
+		INT dwChars)
 { *pWide = 0;
   TRACE(string,"(%p, %s, %i)\n",pWide,	pLocal, dwChars);
 	MultiByteToWideChar(CP_ACP,0,pLocal,-1,pWide,dwChars); 
-  return lstrlen32W(pWide);
+  return lstrlenW(pWide);
 }
 
 
@@ -730,7 +730,7 @@ LPSTR WINAPI lstrrchr( LPCSTR lpStart, LPCSTR lpEnd, WORD wMatch )
 
   if (!lpEnd) lpEnd = lpStart + strlen(lpStart);
 
-  for(; lpStart < lpEnd; lpStart = CharNext32A(lpStart)) 
+  for(; lpStart < lpEnd; lpStart = CharNextA(lpStart)) 
     if (!ChrCmpA( GET_WORD(lpStart), wMatch)) 
       lpGotIt = lpStart;
     
@@ -751,9 +751,9 @@ LPWSTR WINAPI lstrrchrw( LPCWSTR lpStart, LPCWSTR lpEnd, WORD wMatch )
   LPCWSTR lpGotIt = NULL;
 
   TRACE(string,"(%p, %p, %c)\n", lpStart,      lpEnd, wMatch);
-  if (!lpEnd) lpEnd = lpStart + lstrlen32W(lpStart);
+  if (!lpEnd) lpEnd = lpStart + lstrlenW(lpStart);
 
-  for(; lpStart < lpEnd; lpStart = CharNext32W(lpStart)) 
+  for(; lpStart < lpEnd; lpStart = CharNextW(lpStart)) 
     if (!ChrCmpW( GET_WORD(lpStart), wMatch)) 
       lpGotIt = lpStart;
     
@@ -768,14 +768,14 @@ LPWSTR WINAPI lstrrchrw( LPCWSTR lpStart, LPCWSTR lpEnd, WORD wMatch )
  *
  */
 LPWSTR WINAPI strstrw( LPCWSTR lpFirst, LPCWSTR lpSrch) {
-  UINT32 uSrchLen  = (UINT32)lstrlen32W(lpSrch);
+  UINT uSrchLen  = (UINT)lstrlenW(lpSrch);
   WORD wMatchBeg   = *(WORD*)lpSrch;
 
   TRACE(string,"(%p, %p)\n", lpFirst,  lpSrch);
 
   for(; 
     ((lpFirst=CRTDLL_wcschr(lpFirst, wMatchBeg))!=0) && 
-      lstrncmp32W(lpFirst, lpSrch, uSrchLen); 
+      lstrncmpW(lpFirst, lpSrch, uSrchLen); 
     lpFirst++) {
       continue;
   }
@@ -787,9 +787,9 @@ LPWSTR WINAPI strstrw( LPCWSTR lpFirst, LPCWSTR lpSrch) {
  *           ChrCmpA   
  * This fuction returns FALSE if both words match, TRUE otherwise...
  */
-static BOOL32 ChrCmpA( WORD word1, WORD word2) {
+static BOOL ChrCmpA( WORD word1, WORD word2) {
   if (LOBYTE(word1) == LOBYTE(word2)) {
-    if (IsDBCSLeadByte32(LOBYTE(word1))) {
+    if (IsDBCSLeadByte(LOBYTE(word1))) {
       return (word1 != word2);
     }
     return FALSE;
@@ -801,7 +801,7 @@ static BOOL32 ChrCmpA( WORD word1, WORD word2) {
  *           ChrCmpW   
  * This fuction returns FALSE if both words match, TRUE otherwise...
  */
-static BOOL32 ChrCmpW( WORD word1, WORD word2) {
+static BOOL ChrCmpW( WORD word1, WORD word2) {
   return (word1 != word2);
 }
 
diff --git a/memory/virtual.c b/memory/virtual.c
index b95597aa56a..dd6fe316294 100644
--- a/memory/virtual.c
+++ b/memory/virtual.c
@@ -38,11 +38,11 @@ typedef struct _FV
 {
     struct _FV   *next;        /* Next view */
     struct _FV   *prev;        /* Prev view */
-    UINT32        base;        /* Base address */
-    UINT32        size;        /* Size in bytes */
-    UINT32        flags;       /* Allocation flags */
-    UINT32        offset;      /* Offset from start of mapped file */
-    HANDLE32      mapping;     /* Handle to the file mapping */
+    UINT        base;        /* Base address */
+    UINT        size;        /* Size in bytes */
+    UINT        flags;       /* Allocation flags */
+    UINT        offset;      /* Offset from start of mapped file */
+    HANDLE      mapping;     /* Handle to the file mapping */
     HANDLERPROC   handlerProc; /* Fault handler */
     LPVOID        handlerArg;  /* Fault handler argument */
     BYTE          protect;     /* Protection for all pages at allocation time */
@@ -82,16 +82,16 @@ static FILE_VIEW *VIRTUAL_FirstView;
 # define page_shift 12
 # define granularity_mask 0xffff
 #else
-static UINT32 page_shift;
-static UINT32 page_mask;
-static UINT32 granularity_mask;  /* Allocation granularity (usually 64k) */
+static UINT page_shift;
+static UINT page_mask;
+static UINT granularity_mask;  /* Allocation granularity (usually 64k) */
 #endif  /* __i386__ */
 
 #define ROUND_ADDR(addr) \
-   ((UINT32)(addr) & ~page_mask)
+   ((UINT)(addr) & ~page_mask)
 
 #define ROUND_SIZE(addr,size) \
-   (((UINT32)(size) + ((UINT32)(addr) & page_mask) + page_mask) & ~page_mask)
+   (((UINT)(size) + ((UINT)(addr) & page_mask) + page_mask) & ~page_mask)
 
 #define VIRTUAL_DEBUG_DUMP_VIEW(view) \
    if (!TRACE_ON(virtual)); else VIRTUAL_DumpView(view)
@@ -118,8 +118,8 @@ static const char *VIRTUAL_GetProtStr( BYTE prot )
  */
 static void VIRTUAL_DumpView( FILE_VIEW *view )
 {
-    UINT32 i, count;
-    UINT32 addr = view->base;
+    UINT i, count;
+    UINT addr = view->base;
     BYTE prot = view->prot[0];
 
     DUMP( "View: %08x - %08x%s",
@@ -172,7 +172,7 @@ void VIRTUAL_Dump(void)
  *	NULL: Failure
  */
 static FILE_VIEW *VIRTUAL_FindView(
-                  UINT32 addr /* [in] Address */
+                  UINT addr /* [in] Address */
 ) {
     FILE_VIEW *view = VIRTUAL_FirstView;
     while (view)
@@ -190,9 +190,9 @@ static FILE_VIEW *VIRTUAL_FindView(
  *
  * Create a new view and add it in the linked list.
  */
-static FILE_VIEW *VIRTUAL_CreateView( UINT32 base, UINT32 size, UINT32 offset,
-                                      UINT32 flags, BYTE vprot,
-                                      HANDLE32 mapping )
+static FILE_VIEW *VIRTUAL_CreateView( UINT base, UINT size, UINT offset,
+                                      UINT flags, BYTE vprot,
+                                      HANDLE mapping )
 {
     FILE_VIEW *view, *prev;
 
@@ -363,10 +363,10 @@ static BYTE VIRTUAL_GetProt(
  *	TRUE: Success
  *	FALSE: Failure
  */
-static BOOL32 VIRTUAL_SetProt(
+static BOOL VIRTUAL_SetProt(
               FILE_VIEW *view, /* [in] Pointer to view */
-              UINT32 base,     /* [in] Starting address */
-              UINT32 size,     /* [in] Size in bytes */
+              UINT base,     /* [in] Starting address */
+              UINT size,     /* [in] Size in bytes */
               BYTE vprot       /* [in] Protections to use */
 ) {
     TRACE(virtual, "%08x-%08x %s\n",
@@ -391,13 +391,13 @@ static BOOL32 VIRTUAL_SetProt(
  *	TRUE: They do
  *	FALSE: They do not
  */
-static BOOL32 VIRTUAL_CheckFlags(
-              UINT32 base, /* [in] Starting address */
-              UINT32 size, /* [in] Size in bytes */
+static BOOL VIRTUAL_CheckFlags(
+              UINT base, /* [in] Starting address */
+              UINT size, /* [in] Size in bytes */
               BYTE flags   /* [in] Flags to check for */
 ) {
     FILE_VIEW *view;
-    UINT32 page;
+    UINT page;
 
     if (!size) return TRUE;
     if (!(view = VIRTUAL_FindView( base ))) return FALSE;
@@ -412,7 +412,7 @@ static BOOL32 VIRTUAL_CheckFlags(
 /***********************************************************************
  *           VIRTUAL_Init
  */
-BOOL32 VIRTUAL_Init(void)
+BOOL VIRTUAL_Init(void)
 {
 #ifndef __i386__
     DWORD page_size;
@@ -496,11 +496,11 @@ DWORD VIRTUAL_GetGranularity(void)
 /***********************************************************************
  *           VIRTUAL_SetFaultHandler
  */
-BOOL32 VIRTUAL_SetFaultHandler( LPCVOID addr, HANDLERPROC proc, LPVOID arg )
+BOOL VIRTUAL_SetFaultHandler( LPCVOID addr, HANDLERPROC proc, LPVOID arg )
 {
     FILE_VIEW *view;
 
-    if (!(view = VIRTUAL_FindView((UINT32)addr))) return FALSE;
+    if (!(view = VIRTUAL_FindView((UINT)addr))) return FALSE;
     view->handlerProc = proc;
     view->handlerArg  = arg;
     return TRUE;
@@ -509,9 +509,9 @@ BOOL32 VIRTUAL_SetFaultHandler( LPCVOID addr, HANDLERPROC proc, LPVOID arg )
 /***********************************************************************
  *           VIRTUAL_HandleFault
  */
-BOOL32 VIRTUAL_HandleFault( LPCVOID addr )
+BOOL VIRTUAL_HandleFault( LPCVOID addr )
 {
-    FILE_VIEW *view = VIRTUAL_FindView((UINT32)addr);
+    FILE_VIEW *view = VIRTUAL_FindView((UINT)addr);
 
     if (view && view->handlerProc)
         return view->handlerProc(view->handlerArg, addr);
@@ -534,11 +534,11 @@ LPVOID WINAPI VirtualAlloc(
               DWORD protect /* [in] Type of access protection */
 ) {
     FILE_VIEW *view;
-    UINT32 base, ptr, view_size;
+    UINT base, ptr, view_size;
     BYTE vprot;
 
     TRACE(virtual, "%08x %08lx %lx %08lx\n",
-                     (UINT32)addr, size, type, protect );
+                     (UINT)addr, size, type, protect );
 
     /* Round parameters to a page boundary */
 
@@ -550,10 +550,10 @@ LPVOID WINAPI VirtualAlloc(
     if (addr)
     {
         if (type & MEM_RESERVE) /* Round down to 64k boundary */
-            base = ((UINT32)addr + granularity_mask) & ~granularity_mask;
+            base = ((UINT)addr + granularity_mask) & ~granularity_mask;
         else
             base = ROUND_ADDR( addr );
-        size = (((UINT32)addr + size + page_mask) & ~page_mask) - base;
+        size = (((UINT)addr + size + page_mask) & ~page_mask) - base;
         if (base + size < base)  /* Disallow wrap-around */
         {
             SetLastError( ERROR_INVALID_PARAMETER );
@@ -590,9 +590,9 @@ LPVOID WINAPI VirtualAlloc(
     if ((type & MEM_RESERVE) || !base)
     {
         view_size = size + (base ? 0 : granularity_mask + 1);
-        ptr = (UINT32)FILE_dommap( -1, (LPVOID)base, 0, view_size, 0, 0,
+        ptr = (UINT)FILE_dommap( -1, (LPVOID)base, 0, view_size, 0, 0,
                                    VIRTUAL_GetUnixProt( vprot ), MAP_PRIVATE );
-        if (ptr == (UINT32)-1)
+        if (ptr == (UINT)-1)
         {
             SetLastError( ERROR_OUTOFMEMORY );
             return NULL;
@@ -604,7 +604,7 @@ LPVOID WINAPI VirtualAlloc(
 
             if (ptr & granularity_mask)
             {
-                UINT32 extra = granularity_mask + 1 - (ptr & granularity_mask);
+                UINT extra = granularity_mask + 1 - (ptr & granularity_mask);
                 FILE_munmap( (void *)ptr, 0, extra );
                 ptr += extra;
                 view_size -= extra;
@@ -651,16 +651,16 @@ LPVOID WINAPI VirtualAlloc(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI VirtualFree(
+BOOL WINAPI VirtualFree(
               LPVOID addr, /* [in] Address of region of committed pages */
               DWORD size,  /* [in] Size of region */
               DWORD type   /* [in] Type of operation */
 ) {
     FILE_VIEW *view;
-    UINT32 base;
+    UINT base;
 
     TRACE(virtual, "%08x %08lx %lx\n",
-                     (UINT32)addr, size, type );
+                     (UINT)addr, size, type );
 
     /* Fix the parameters */
 
@@ -711,7 +711,7 @@ BOOL32 WINAPI VirtualFree(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI VirtualLock(
+BOOL WINAPI VirtualLock(
               LPVOID addr, /* [in] Address of first byte of range to lock */
               DWORD size   /* [in] Number of bytes in range to lock */
 ) {
@@ -730,7 +730,7 @@ BOOL32 WINAPI VirtualLock(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI VirtualUnlock(
+BOOL WINAPI VirtualUnlock(
               LPVOID addr, /* [in] Address of first byte of range */
               DWORD size   /* [in] Number of bytes in range */
 ) {
@@ -746,18 +746,18 @@ BOOL32 WINAPI VirtualUnlock(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI VirtualProtect(
+BOOL WINAPI VirtualProtect(
               LPVOID addr,     /* [in] Address of region of committed pages */
               DWORD size,      /* [in] Size of region */
               DWORD new_prot,  /* [in] Desired access protection */
               LPDWORD old_prot /* [out] Address of variable to get old protection */
 ) {
     FILE_VIEW *view;
-    UINT32 base, i;
+    UINT base, i;
     BYTE vprot, *p;
 
     TRACE(virtual, "%08x %08lx %08lx\n",
-                     (UINT32)addr, size, new_prot );
+                     (UINT)addr, size, new_prot );
 
     /* Fix the parameters */
 
@@ -798,8 +798,8 @@ BOOL32 WINAPI VirtualProtect(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI VirtualProtectEx(
-              HANDLE32 handle, /* [in]  Handle of process */
+BOOL WINAPI VirtualProtectEx(
+              HANDLE handle, /* [in]  Handle of process */
               LPVOID addr,     /* [in]  Address of region of committed pages */
               DWORD size,      /* [in]  Size of region */
               DWORD new_prot,  /* [in]  Desired access protection */
@@ -825,9 +825,9 @@ DWORD WINAPI VirtualQuery(
              DWORD len                        /* [in]  Size of buffer */
 ) {
     FILE_VIEW *view = VIRTUAL_FirstView;
-    UINT32 base = ROUND_ADDR( addr );
-    UINT32 alloc_base = 0;
-    UINT32 size = 0;
+    UINT base = ROUND_ADDR( addr );
+    UINT alloc_base = 0;
+    UINT size = 0;
 
     /* Find the view containing the address */
 
@@ -889,7 +889,7 @@ DWORD WINAPI VirtualQuery(
  *	Number of bytes returned in information buffer
  */
 DWORD WINAPI VirtualQueryEx(
-             HANDLE32 handle,                 /* [in] Handle of process */
+             HANDLE handle,                 /* [in] Handle of process */
              LPCVOID addr,                    /* [in] Address of region */
              LPMEMORY_BASIC_INFORMATION info, /* [out] Address of info buffer */
              DWORD len                        /* [in] Size of buffer */ )
@@ -908,11 +908,11 @@ DWORD WINAPI VirtualQueryEx(
  *	FALSE: Process has read access to entire block
  *      TRUE: Otherwise
  */
-BOOL32 WINAPI IsBadReadPtr32(
+BOOL WINAPI IsBadReadPtr(
               LPCVOID ptr, /* Address of memory block */
-              UINT32 size  /* Size of block */
+              UINT size  /* Size of block */
 ) {
-    return !VIRTUAL_CheckFlags( (UINT32)ptr, size,
+    return !VIRTUAL_CheckFlags( (UINT)ptr, size,
                                 VPROT_READ | VPROT_COMMITTED );
 }
 
@@ -924,11 +924,11 @@ BOOL32 WINAPI IsBadReadPtr32(
  *	FALSE: Process has write access to entire block
  *      TRUE: Otherwise
  */
-BOOL32 WINAPI IsBadWritePtr32(
+BOOL WINAPI IsBadWritePtr(
               LPVOID ptr, /* [in] Address of memory block */
-              UINT32 size /* [in] Size of block in bytes */
+              UINT size /* [in] Size of block in bytes */
 ) {
-    return !VIRTUAL_CheckFlags( (UINT32)ptr, size,
+    return !VIRTUAL_CheckFlags( (UINT)ptr, size,
                                 VPROT_WRITE | VPROT_COMMITTED );
 }
 
@@ -939,11 +939,11 @@ BOOL32 WINAPI IsBadWritePtr32(
  *	FALSE: Process has read access to entire block
  *      TRUE: Otherwise
  */
-BOOL32 WINAPI IsBadHugeReadPtr32(
+BOOL WINAPI IsBadHugeReadPtr(
               LPCVOID ptr, /* [in] Address of memory block */
-              UINT32 size  /* [in] Size of block */
+              UINT size  /* [in] Size of block */
 ) {
-    return IsBadReadPtr32( ptr, size );
+    return IsBadReadPtr( ptr, size );
 }
 
 
@@ -953,11 +953,11 @@ BOOL32 WINAPI IsBadHugeReadPtr32(
  *	FALSE: Process has write access to entire block
  *      TRUE: Otherwise
  */
-BOOL32 WINAPI IsBadHugeWritePtr32(
+BOOL WINAPI IsBadHugeWritePtr(
               LPVOID ptr, /* [in] Address of memory block */
-              UINT32 size /* [in] Size of block */
+              UINT size /* [in] Size of block */
 ) {
-    return IsBadWritePtr32( ptr, size );
+    return IsBadWritePtr( ptr, size );
 }
 
 
@@ -968,10 +968,10 @@ BOOL32 WINAPI IsBadHugeWritePtr32(
  *	FALSE: Process has read access to specified memory
  *	TRUE: Otherwise
  */
-BOOL32 WINAPI IsBadCodePtr32(
-              FARPROC32 ptr /* [in] Address of function */
+BOOL WINAPI IsBadCodePtr(
+              FARPROC ptr /* [in] Address of function */
 ) {
-    return !VIRTUAL_CheckFlags( (UINT32)ptr, 1, VPROT_EXEC | VPROT_COMMITTED );
+    return !VIRTUAL_CheckFlags( (UINT)ptr, 1, VPROT_EXEC | VPROT_COMMITTED );
 }
 
 
@@ -982,17 +982,17 @@ BOOL32 WINAPI IsBadCodePtr32(
  *	FALSE: Read access to all bytes in string
  *	TRUE: Else
  */
-BOOL32 WINAPI IsBadStringPtr32A(
+BOOL WINAPI IsBadStringPtrA(
               LPCSTR str, /* [in] Address of string */
-              UINT32 max  /* [in] Maximum size of string */
+              UINT max  /* [in] Maximum size of string */
 ) {
     FILE_VIEW *view;
-    UINT32 page, count;
+    UINT page, count;
 
     if (!max) return FALSE;
-    if (!(view = VIRTUAL_FindView( (UINT32)str ))) return TRUE;
-    page  = ((UINT32)str - view->base) >> page_shift;
-    count = page_mask + 1 - ((UINT32)str & page_mask);
+    if (!(view = VIRTUAL_FindView( (UINT)str ))) return TRUE;
+    page  = ((UINT)str - view->base) >> page_shift;
+    count = page_mask + 1 - ((UINT)str & page_mask);
 
     while (max)
     {
@@ -1013,15 +1013,15 @@ BOOL32 WINAPI IsBadStringPtr32A(
  *             IsBadStringPtr32W   (KERNEL32.356)
  * See IsBadStringPtr32A
  */
-BOOL32 WINAPI IsBadStringPtr32W( LPCWSTR str, UINT32 max )
+BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max )
 {
     FILE_VIEW *view;
-    UINT32 page, count;
+    UINT page, count;
 
     if (!max) return FALSE;
-    if (!(view = VIRTUAL_FindView( (UINT32)str ))) return TRUE;
-    page  = ((UINT32)str - view->base) >> page_shift;
-    count = (page_mask + 1 - ((UINT32)str & page_mask)) / sizeof(WCHAR);
+    if (!(view = VIRTUAL_FindView( (UINT)str ))) return TRUE;
+    page  = ((UINT)str - view->base) >> page_shift;
+    count = (page_mask + 1 - ((UINT)str & page_mask)) / sizeof(WCHAR);
 
     while (max)
     {
@@ -1047,8 +1047,8 @@ BOOL32 WINAPI IsBadStringPtr32W( LPCWSTR str, UINT32 max )
  *	0: Mapping object does not exist
  *	NULL: Failure
  */
-HANDLE32 WINAPI CreateFileMapping32A(
-                HFILE32 hFile,   /* [in] Handle of file to map */
+HANDLE WINAPI CreateFileMappingA(
+                HFILE hFile,   /* [in] Handle of file to map */
                 SECURITY_ATTRIBUTES *sa, /* [in] Optional security attributes*/
                 DWORD protect,   /* [in] Protection for mapping object */
                 DWORD size_high, /* [in] High-order 32 bits of object size */
@@ -1058,9 +1058,9 @@ HANDLE32 WINAPI CreateFileMapping32A(
     FILE_MAPPING *mapping = NULL;
     struct create_mapping_request req;
     struct create_mapping_reply reply = { -1 };
-    HANDLE32 handle;
+    HANDLE handle;
     BYTE vprot;
-    BOOL32 inherit = (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle);
+    BOOL inherit = (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle);
 
     /* First search for an object with the same name */
 
@@ -1098,7 +1098,7 @@ HANDLE32 WINAPI CreateFileMapping32A(
     vprot = VIRTUAL_GetProt( protect );
     if (protect & SEC_RESERVE)
     {
-        if (hFile != INVALID_HANDLE_VALUE32)
+        if (hFile != INVALID_HANDLE_VALUE)
         {
             SetLastError( ERROR_INVALID_PARAMETER );
             return 0;
@@ -1109,7 +1109,7 @@ HANDLE32 WINAPI CreateFileMapping32A(
 
     /* Compute the size and extend the file if necessary */
 
-    if (hFile == INVALID_HANDLE_VALUE32)
+    if (hFile == INVALID_HANDLE_VALUE)
     {
 	if (!size_high && !size_low)
 	{
@@ -1120,9 +1120,9 @@ HANDLE32 WINAPI CreateFileMapping32A(
 	{
 	    CHAR	buf[260];
 
-	    GetTempPath32A(260,buf);
-	    GetTempFileName32A(buf,"wine",0,buf);
-	    hFile = CreateFile32A(
+	    GetTempPathA(260,buf);
+	    GetTempFileNameA(buf,"wine",0,buf);
+	    hFile = CreateFileA(
 	    	buf,
 		GENERIC_READ|GENERIC_WRITE,
 	    	FILE_SHARE_READ|FILE_SHARE_WRITE,/* so we can reuse the tmpfn */
@@ -1132,12 +1132,12 @@ HANDLE32 WINAPI CreateFileMapping32A(
 		0
 	    );
 	    /* FIXME: bad hack to avoid lots of leftover tempfiles */
-	    DeleteFile32A(buf); 
-	    if (hFile == INVALID_HANDLE_VALUE32)
+	    DeleteFileA(buf); 
+	    if (hFile == INVALID_HANDLE_VALUE)
 	    	FIXME(virtual,"could not create temp. file for anon shared mapping: reason was 0x%08lx\n",GetLastError());
 	}
     }
-    if (hFile != INVALID_HANDLE_VALUE32) /* We have a file */
+    if (hFile != INVALID_HANDLE_VALUE) /* We have a file */
     {
         BY_HANDLE_FILE_INFORMATION info;
         DWORD access = GENERIC_READ;
@@ -1203,12 +1203,12 @@ error:
  *             CreateFileMapping32W   (KERNEL32.47)
  * See CreateFileMapping32A
  */
-HANDLE32 WINAPI CreateFileMapping32W( HFILE32 hFile, LPSECURITY_ATTRIBUTES attr, 
+HANDLE WINAPI CreateFileMappingW( HFILE hFile, LPSECURITY_ATTRIBUTES attr, 
                                       DWORD protect, DWORD size_high,  
                                       DWORD size_low, LPCWSTR name )
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    HANDLE32 ret = CreateFileMapping32A( hFile, attr, protect,
+    HANDLE ret = CreateFileMappingA( hFile, attr, protect,
                                          size_high, size_low, nameA );
     HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
@@ -1223,12 +1223,12 @@ HANDLE32 WINAPI CreateFileMapping32W( HFILE32 hFile, LPSECURITY_ATTRIBUTES attr,
  *	Handle: Success
  *	NULL: Failure
  */
-HANDLE32 WINAPI OpenFileMapping32A(
+HANDLE WINAPI OpenFileMappingA(
                 DWORD access,   /* [in] Access mode */
-                BOOL32 inherit, /* [in] Inherit flag */
+                BOOL inherit, /* [in] Inherit flag */
                 LPCSTR name )   /* [in] Name of file-mapping object */
 {
-    HANDLE32 handle = 0;
+    HANDLE handle = 0;
     K32OBJ *obj;
     struct open_named_obj_request req;
     struct open_named_obj_reply reply;
@@ -1247,7 +1247,7 @@ HANDLE32 WINAPI OpenFileMapping32A(
         {
             handle = HANDLE_Alloc( PROCESS_Current(), obj, access, inherit, reply.handle );
             K32OBJ_DecCount( obj );
-            if (handle == INVALID_HANDLE_VALUE32)
+            if (handle == INVALID_HANDLE_VALUE)
                 handle = 0; /* must return 0 on failure, not -1 */
         }
         else CLIENT_CloseHandle( reply.handle );
@@ -1261,10 +1261,10 @@ HANDLE32 WINAPI OpenFileMapping32A(
  *             OpenFileMapping32W   (KERNEL32.398)
  * See OpenFileMapping32A
  */
-HANDLE32 WINAPI OpenFileMapping32W( DWORD access, BOOL32 inherit, LPCWSTR name)
+HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name)
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    HANDLE32 ret = OpenFileMapping32A( access, inherit, nameA );
+    HANDLE ret = OpenFileMappingA( access, inherit, nameA );
     HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
 }
@@ -1279,7 +1279,7 @@ HANDLE32 WINAPI OpenFileMapping32W( DWORD access, BOOL32 inherit, LPCWSTR name)
  *	NULL: Failure
  */
 LPVOID WINAPI MapViewOfFile(
-              HANDLE32 mapping,  /* [in] File-mapping object to map */
+              HANDLE mapping,  /* [in] File-mapping object to map */
               DWORD access,      /* [in] Access mode */
               DWORD offset_high, /* [in] High-order 32 bits of file offset */
               DWORD offset_low,  /* [in] Low-order 32 bits of file offset */
@@ -1299,7 +1299,7 @@ LPVOID WINAPI MapViewOfFile(
  *	NULL: Failure
  */
 LPVOID WINAPI MapViewOfFileEx(
-              HANDLE32 handle,   /* [in] File-mapping object to map */
+              HANDLE handle,   /* [in] File-mapping object to map */
               DWORD access,      /* [in] Access mode */
               DWORD offset_high, /* [in] High-order 32 bits of file offset */
               DWORD offset_low,  /* [in] Low-order 32 bits of file offset */
@@ -1307,7 +1307,7 @@ LPVOID WINAPI MapViewOfFileEx(
               LPVOID addr        /* [in] Suggested starting address for mapped view */
 ) {
     FILE_VIEW *view;
-    UINT32 ptr = (UINT32)-1, size = 0;
+    UINT ptr = (UINT)-1, size = 0;
     int flags = MAP_PRIVATE;
     int unix_handle = -1;
     struct get_mapping_info_request req;
@@ -1316,7 +1316,7 @@ LPVOID WINAPI MapViewOfFileEx(
     /* Check parameters */
 
     if ((offset_low & granularity_mask) ||
-        (addr && ((UINT32)addr & granularity_mask)))
+        (addr && ((UINT)addr & granularity_mask)))
     {
         SetLastError( ERROR_INVALID_PARAMETER );
         return NULL;
@@ -1367,11 +1367,11 @@ LPVOID WINAPI MapViewOfFileEx(
     TRACE(virtual, "handle=%x size=%x offset=%lx\n",
                      handle, size, offset_low );
 
-    ptr = (UINT32)FILE_dommap( unix_handle,
+    ptr = (UINT)FILE_dommap( unix_handle,
                                addr, 0, size, 0, offset_low,
                                VIRTUAL_GetUnixProt( info.protect ),
                                flags );
-    if (ptr == (UINT32)-1) {
+    if (ptr == (UINT)-1) {
         /* KB: Q125713, 25-SEP-1995, "Common File Mapping Problems and
 	 * Platform Differences": 
 	 * Windows NT: ERROR_INVALID_PARAMETER
@@ -1396,7 +1396,7 @@ LPVOID WINAPI MapViewOfFileEx(
 
 error:
     if (unix_handle != -1) close( unix_handle );
-    if (ptr != (UINT32)-1) FILE_munmap( (void *)ptr, 0, size );
+    if (ptr != (UINT)-1) FILE_munmap( (void *)ptr, 0, size );
     return NULL;
 }
 
@@ -1409,12 +1409,12 @@ error:
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI FlushViewOfFile(
+BOOL WINAPI FlushViewOfFile(
               LPCVOID base, /* [in] Start address of byte range to flush */
               DWORD cbFlush /* [in] Number of bytes in range */
 ) {
     FILE_VIEW *view;
-    UINT32 addr = ROUND_ADDR( base );
+    UINT addr = ROUND_ADDR( base );
 
     TRACE(virtual, "FlushViewOfFile at %p for %ld bytes\n",
                      base, cbFlush );
@@ -1442,11 +1442,11 @@ BOOL32 WINAPI FlushViewOfFile(
  *	TRUE: Success
  *	FALSE: Failure
  */
-BOOL32 WINAPI UnmapViewOfFile(
+BOOL WINAPI UnmapViewOfFile(
               LPVOID addr /* [in] Address where mapped view begins */
 ) {
     FILE_VIEW *view;
-    UINT32 base = ROUND_ADDR( addr );
+    UINT base = ROUND_ADDR( addr );
     if (!(view = VIRTUAL_FindView( base )) || (base != view->base))
     {
         SetLastError( ERROR_INVALID_PARAMETER );
@@ -1465,14 +1465,14 @@ BOOL32 WINAPI UnmapViewOfFile(
  */
 LPVOID VIRTUAL_MapFileW( LPCWSTR name )
 {
-    HANDLE32 hFile, hMapping;
+    HANDLE hFile, hMapping;
     LPVOID ptr = NULL;
 
-    hFile = CreateFile32W( name, GENERIC_READ, FILE_SHARE_READ, NULL, 
+    hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, 
                            OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
-    if (hFile != INVALID_HANDLE_VALUE32)
+    if (hFile != INVALID_HANDLE_VALUE)
     {
-        hMapping = CreateFileMapping32A( hFile, NULL, PAGE_READONLY, 0, 0, NULL );
+        hMapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY, 0, 0, NULL );
         CloseHandle( hFile );
         if (hMapping)
         {
diff --git a/misc/callback.c b/misc/callback.c
index 83d77e7c954..0d14dd0dfce 100644
--- a/misc/callback.c
+++ b/misc/callback.c
@@ -27,7 +27,7 @@ static LRESULT WINAPI CALLBACK_CallWndProc( WNDPROC16 proc, HWND16 hwnd,
 /**********************************************************************
  *	     CALLBACK_CallRegisterProc
  */
-static LONG WINAPI CALLBACK_CallRegisterProc( CONTEXT *context, INT32 offset)
+static LONG WINAPI CALLBACK_CallRegisterProc( CONTEXT *context, INT offset)
 {
     ERR(relay, "Cannot call a register proc in Winelib\n" );
     assert( FALSE );
@@ -158,7 +158,7 @@ static DWORD WINAPI CALLBACK_CallWOWCallbackProc( FARPROC16 proc, DWORD dw )
  * Can call functions using CDECL or PASCAL calling conventions. The CDECL
  * ones are reversed (not 100% sure about that).
  */
-static BOOL32 WINAPI CALLBACK_CallWOWCallback16Ex( 
+static BOOL WINAPI CALLBACK_CallWOWCallback16Ex( 
 	FARPROC16 proc, DWORD dwFlags, DWORD cbArgs, LPVOID xargs,LPDWORD pdwret
 ) {
     LPDWORD	args = (LPDWORD)xargs;
@@ -239,9 +239,9 @@ static BOOL32 WINAPI CALLBACK_CallWOWCallback16Ex(
 /**********************************************************************
  *	     CALLBACK_CallTaskRescheduleProc
  */
-static BOOL32 WINAPI CALLBACK_CallTaskRescheduleProc( void )
+static BOOL WINAPI CALLBACK_CallTaskRescheduleProc( void )
 {
-    BOOL32 pending;
+    BOOL pending;
 
     SYSLEVEL_EnterWin16Lock();
     pending = TASK_Reschedule();
@@ -299,15 +299,15 @@ const CALLBACKS_TABLE *Callbacks = &CALLBACK_WinelibTable;
 
 CALLOUT_TABLE Callout = 
 {
-    PeekMessage16, PeekMessage32A, PeekMessage32W,
-    GetMessage16, GetMessage32A, GetMessage32W,
-    SendMessage16, SendMessage32A, SendMessage32W,
-    PostMessage16, PostMessage32A, PostMessage32W,
-    PostAppMessage16, PostThreadMessage32A, PostThreadMessage32W,
-    TranslateMessage16, TranslateMessage32,
-    DispatchMessage16, DispatchMessage32A, DispatchMessage32W,
-    RedrawWindow16, RedrawWindow32,
-    InitThreadInput,
-    UserYield
+    PeekMessage16, PeekMessageA, PeekMessageW,
+    GetMessage16, GetMessageA, GetMessageW,
+    SendMessage16, SendMessageA, SendMessageW,
+    PostMessage16, PostMessageA, PostMessageW,
+    PostAppMessage16, PostThreadMessageA, PostThreadMessageW,
+    TranslateMessage16, TranslateMessage,
+    DispatchMessage16, DispatchMessageA, DispatchMessageW,
+    RedrawWindow16, RedrawWindow,
+    InitThreadInput16,
+    UserYield16
 };
 
diff --git a/misc/cdrom.c b/misc/cdrom.c
index 6acddde2df2..1aa6ca0c3c1 100644
--- a/misc/cdrom.c
+++ b/misc/cdrom.c
@@ -105,7 +105,7 @@ UINT16 CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda)
 /**************************************************************************
  * 			CDAUDIO_GetTracksInfo			[internal]
  */
-BOOL32 CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
+BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
 {
 #if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
     int		i, length;
@@ -216,7 +216,7 @@ BOOL32 CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
 /**************************************************************************
  * 				CDAUDIO_GetCDStatus		[internal]
  */
-BOOL32 CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
+BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
 {
 #if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
     int		oldmode = wcda->cdaMode;
diff --git a/misc/comm.c b/misc/comm.c
index cb5c8bc585b..72477bf2fdc 100644
--- a/misc/comm.c
+++ b/misc/comm.c
@@ -214,7 +214,7 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
 	TRACE(comm, "(%s), ptr %p\n", device, lpdcb);
 	commerror = 0;
 
-	if (!lstrncmpi32A(device,"COM",3)) {
+	if (!lstrncmpiA(device,"COM",3)) {
 		port = device[3] - '0';
 	
 
@@ -231,7 +231,7 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
 		memset(lpdcb, 0, sizeof(DCB16)); /* initialize */
 
 		if (!COM[port].fd) {
-		    OpenComm(device, 0, 0);
+		    OpenComm16(device, 0, 0);
 		}
 		lpdcb->Id = COM[port].fd;
 		
@@ -300,15 +300,15 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
 /**************************************************************************
  *         BuildCommDCBA		(KERNEL32.14)
  */
-BOOL32 WINAPI BuildCommDCB32A(LPCSTR device,LPDCB32 lpdcb)
+BOOL WINAPI BuildCommDCBA(LPCSTR device,LPDCB lpdcb)
 {
-	return BuildCommDCBAndTimeouts32A(device,lpdcb,NULL);
+	return BuildCommDCBAndTimeoutsA(device,lpdcb,NULL);
 }
 
 /**************************************************************************
  *         BuildCommDCBAndTimeoutsA	(KERNEL32.15)
  */
-BOOL32 WINAPI BuildCommDCBAndTimeouts32A(LPCSTR device, LPDCB32 lpdcb,
+BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR device, LPDCB lpdcb,
                                          LPCOMMTIMEOUTS lptimeouts)
 {
 	int	port;
@@ -317,7 +317,7 @@ BOOL32 WINAPI BuildCommDCBAndTimeouts32A(LPCSTR device, LPDCB32 lpdcb,
 	TRACE(comm,"(%s,%p,%p)\n",device,lpdcb,lptimeouts);
 	commerror = 0;
 
-	if (!lstrncmpi32A(device,"COM",3)) {
+	if (!lstrncmpiA(device,"COM",3)) {
 		port=device[3]-'0';
 		if (port--==0) {
 			ERR(comm,"BUG! COM0 can't exists!.\n");
@@ -331,9 +331,9 @@ BOOL32 WINAPI BuildCommDCBAndTimeouts32A(LPCSTR device, LPDCB32 lpdcb,
 	} else
 		temp=(LPSTR)device;
 
-	memset(lpdcb, 0, sizeof(DCB32)); /* initialize */
+	memset(lpdcb, 0, sizeof(DCB)); /* initialize */
 
-	lpdcb->DCBlength	= sizeof(DCB32);
+	lpdcb->DCBlength	= sizeof(DCB);
 	if (strchr(temp,',')) {	/* old style */
 		DCB16	dcb16;
 		BOOL16	ret;
@@ -435,15 +435,15 @@ BOOL32 WINAPI BuildCommDCBAndTimeouts32A(LPCSTR device, LPDCB32 lpdcb,
 /**************************************************************************
  *         BuildCommDCBAndTimeoutsW		(KERNEL32.16)
  */
-BOOL32 WINAPI BuildCommDCBAndTimeouts32W( LPCWSTR devid, LPDCB32 lpdcb,
+BOOL WINAPI BuildCommDCBAndTimeoutsW( LPCWSTR devid, LPDCB lpdcb,
                                           LPCOMMTIMEOUTS lptimeouts )
 {
 	LPSTR	devidA;
-	BOOL32	ret;
+	BOOL	ret;
 
 	TRACE(comm,"(%p,%p,%p)\n",devid,lpdcb,lptimeouts);
 	devidA = HEAP_strdupWtoA( GetProcessHeap(), 0, devid );
-	ret=BuildCommDCBAndTimeouts32A(devidA,lpdcb,lptimeouts);
+	ret=BuildCommDCBAndTimeoutsA(devidA,lpdcb,lptimeouts);
         HeapFree( GetProcessHeap(), 0, devidA );
 	return ret;
 }
@@ -451,22 +451,22 @@ BOOL32 WINAPI BuildCommDCBAndTimeouts32W( LPCWSTR devid, LPDCB32 lpdcb,
 /**************************************************************************
  *         BuildCommDCBW		(KERNEL32.17)
  */
-BOOL32 WINAPI BuildCommDCB32W(LPCWSTR devid,LPDCB32 lpdcb)
+BOOL WINAPI BuildCommDCBW(LPCWSTR devid,LPDCB lpdcb)
 {
-	return BuildCommDCBAndTimeouts32W(devid,lpdcb,NULL);
+	return BuildCommDCBAndTimeoutsW(devid,lpdcb,NULL);
 }
 
 /*****************************************************************************
  *	OpenComm		(USER.200)
  */
-INT16 WINAPI OpenComm(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
+INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
 {
 	int port,fd;
 
     	TRACE(comm, "%s, %d, %d\n", device, cbInQueue, cbOutQueue);
 	commerror = 0;
 
-	if (!lstrncmpi32A(device,"COM",3)) {
+	if (!lstrncmpiA(device,"COM",3)) {
 		port = device[3] - '0';
 
 		if (port-- == 0) {
@@ -502,7 +502,7 @@ INT16 WINAPI OpenComm(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
 		}
 	} 
 	else 
-	if (!lstrncmpi32A(device,"LPT",3)) {
+	if (!lstrncmpiA(device,"LPT",3)) {
 		port = device[3] - '0';
 	
 		if (!ValidLPTPort(port)) {
@@ -529,7 +529,7 @@ INT16 WINAPI OpenComm(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
 /*****************************************************************************
  *	CloseComm		(USER.207)
  */
-INT16 WINAPI CloseComm(INT16 fd)
+INT16 WINAPI CloseComm16(INT16 fd)
 {
         int port;
         
@@ -575,7 +575,7 @@ INT16 WINAPI SetCommBreak16(INT16 fd)
 /*****************************************************************************
  *	SetCommBreak		(KERNEL32.449)
  */
-BOOL32 WINAPI SetCommBreak32(INT32 fd)
+BOOL WINAPI SetCommBreak(INT fd)
 {
 
 	struct DosDeviceStruct *ptr;
@@ -612,7 +612,7 @@ INT16 WINAPI ClearCommBreak16(INT16 fd)
 /*****************************************************************************
  *	ClearCommBreak		(KERNEL32.20)
  */
-BOOL32 WINAPI ClearCommBreak32(INT32 fd)
+BOOL WINAPI ClearCommBreak(INT fd)
 {
 	struct DosDeviceStruct *ptr;
 
@@ -705,7 +705,7 @@ LONG WINAPI EscapeCommFunction16(UINT16 fd,UINT16 nFunction)
 /*****************************************************************************
  *	EscapeCommFunction	(KERNEL32.214)
  */
-BOOL32 WINAPI EscapeCommFunction32(INT32 fd,UINT32 nFunction)
+BOOL WINAPI EscapeCommFunction(INT fd,UINT nFunction)
 {
 	struct termios	port;
 	struct DosDeviceStruct *ptr;
@@ -777,7 +777,7 @@ BOOL32 WINAPI EscapeCommFunction32(INT32 fd,UINT32 nFunction)
 /*****************************************************************************
  *	FlushComm	(USER.215)
  */
-INT16 WINAPI FlushComm(INT16 fd,INT16 fnQueue)
+INT16 WINAPI FlushComm16(INT16 fd,INT16 fnQueue)
 {
 	int queue;
 
@@ -803,7 +803,7 @@ INT16 WINAPI FlushComm(INT16 fd,INT16 fnQueue)
 /********************************************************************
  *      PurgeComm        (KERNEL32.557)
  */
-BOOL32 WINAPI PurgeComm( HANDLE32 hFile, DWORD flags) 
+BOOL WINAPI PurgeComm( HANDLE hFile, DWORD flags) 
 {
     FIXME(comm, "(%08x %08lx) unimplemented stub\n",
                  hFile, flags);
@@ -813,7 +813,7 @@ BOOL32 WINAPI PurgeComm( HANDLE32 hFile, DWORD flags)
 /********************************************************************
  *	GetCommError	(USER.203)
  */
-INT16 WINAPI GetCommError(INT16 fd,LPCOMSTAT lpStat)
+INT16 WINAPI GetCommError16(INT16 fd,LPCOMSTAT lpStat)
 {
 	int		temperror;
 	unsigned long	cnt;
@@ -864,7 +864,7 @@ INT16 WINAPI GetCommError(INT16 fd,LPCOMSTAT lpStat)
 /*****************************************************************************
  *	ClearCommError	(KERNEL32.21)
  */
-BOOL32 WINAPI ClearCommError(INT32 fd,LPDWORD errors,LPCOMSTAT lpStat)
+BOOL WINAPI ClearCommError(INT fd,LPDWORD errors,LPCOMSTAT lpStat)
 {
 	int temperror;
 
@@ -878,7 +878,7 @@ BOOL32 WINAPI ClearCommError(INT32 fd,LPDWORD errors,LPCOMSTAT lpStat)
 /*****************************************************************************
  *	SetCommEventMask	(USER.208)
  */
-SEGPTR WINAPI SetCommEventMask(INT16 fd,UINT16 fuEvtMask)
+SEGPTR WINAPI SetCommEventMask16(INT16 fd,UINT16 fuEvtMask)
 {
         unsigned char *stol;
         int act;
@@ -903,7 +903,7 @@ SEGPTR WINAPI SetCommEventMask(INT16 fd,UINT16 fuEvtMask)
 /*****************************************************************************
  *	GetCommEventMask	(USER.209)
  */
-UINT16 WINAPI GetCommEventMask(INT16 fd,UINT16 fnEvtClear)
+UINT16 WINAPI GetCommEventMask16(INT16 fd,UINT16 fnEvtClear)
 {
 	int	events = 0;
 
@@ -944,7 +944,7 @@ UINT16 WINAPI GetCommEventMask(INT16 fd,UINT16 fnEvtClear)
 /*****************************************************************************
  *      SetupComm       (KERNEL32.676)
  */
-BOOL32 WINAPI SetupComm( HANDLE32 hFile, DWORD insize, DWORD outsize)
+BOOL WINAPI SetupComm( HANDLE hFile, DWORD insize, DWORD outsize)
 {
         FIXME(comm, "insize %ld outsize %ld unimplemented stub\n", insize, outsize);
        return FALSE;
@@ -953,7 +953,7 @@ BOOL32 WINAPI SetupComm( HANDLE32 hFile, DWORD insize, DWORD outsize)
 /*****************************************************************************
  *	GetCommMask	(KERNEL32.156)
  */
-BOOL32 WINAPI GetCommMask(HANDLE32 fd,LPDWORD evtmask)
+BOOL WINAPI GetCommMask(HANDLE fd,LPDWORD evtmask)
 {
     	TRACE(comm, "fd %d, mask %p\n", fd, evtmask);
 	*evtmask = eventmask;
@@ -963,7 +963,7 @@ BOOL32 WINAPI GetCommMask(HANDLE32 fd,LPDWORD evtmask)
 /*****************************************************************************
  *	SetCommMask	(KERNEL32.451)
  */
-BOOL32 WINAPI SetCommMask(INT32 fd,DWORD evtmask)
+BOOL WINAPI SetCommMask(INT fd,DWORD evtmask)
 {
     	TRACE(comm, "fd %d, mask %lx\n", fd, evtmask);
 	eventmask = evtmask;
@@ -1189,7 +1189,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
 /*****************************************************************************
  *	SetCommState32	(KERNEL32.452)
  */
-BOOL32 WINAPI SetCommState32(INT32 fd,LPDCB32 lpdcb)
+BOOL WINAPI SetCommState(INT fd,LPDCB lpdcb)
 {
 	struct termios port;
 	struct DosDeviceStruct *ptr;
@@ -1529,7 +1529,7 @@ INT16 WINAPI GetCommState16(INT16 fd, LPDCB16 lpdcb)
 /*****************************************************************************
  *	GetCommState	(KERNEL32.159)
  */
-BOOL32 WINAPI GetCommState32(INT32 fd, LPDCB32 lpdcb)
+BOOL WINAPI GetCommState(INT fd, LPDCB lpdcb)
 {
 	struct termios	port;
 
@@ -1675,7 +1675,7 @@ INT16 WINAPI TransmitCommChar16(INT16 fd,CHAR chTransmit)
 /*****************************************************************************
  *	TransmitCommChar	(KERNEL32.535)
  */
-BOOL32 WINAPI TransmitCommChar32(INT32 fd,CHAR chTransmit)
+BOOL WINAPI TransmitCommChar(INT fd,CHAR chTransmit)
 {
 	struct DosDeviceStruct *ptr;
 
@@ -1701,7 +1701,7 @@ BOOL32 WINAPI TransmitCommChar32(INT32 fd,CHAR chTransmit)
 /*****************************************************************************
  *	UngetCommChar	(USER.212)
  */
-INT16 WINAPI UngetCommChar(INT16 fd,CHAR chUnget)
+INT16 WINAPI UngetCommChar16(INT16 fd,CHAR chUnget)
 {
 	struct DosDeviceStruct *ptr;
 
@@ -1725,7 +1725,7 @@ INT16 WINAPI UngetCommChar(INT16 fd,CHAR chUnget)
 /*****************************************************************************
  *	ReadComm	(USER.204)
  */
-INT16 WINAPI ReadComm(INT16 fd,LPSTR lpvBuf,INT16 cbRead)
+INT16 WINAPI ReadComm16(INT16 fd,LPSTR lpvBuf,INT16 cbRead)
 {
 	int status, length;
 	struct DosDeviceStruct *ptr;
@@ -1770,7 +1770,7 @@ INT16 WINAPI ReadComm(INT16 fd,LPSTR lpvBuf,INT16 cbRead)
 /*****************************************************************************
  *	WriteComm	(USER.205)
  */
-INT16 WINAPI WriteComm(INT16 fd, LPSTR lpvBuf, INT16 cbWrite)
+INT16 WINAPI WriteComm16(INT16 fd, LPSTR lpvBuf, INT16 cbWrite)
 {
 	int length;
 	struct DosDeviceStruct *ptr;
@@ -1803,7 +1803,7 @@ INT16 WINAPI WriteComm(INT16 fd, LPSTR lpvBuf, INT16 cbWrite)
 /*****************************************************************************
  *	GetCommTimeouts		(KERNEL32.160)
  */
-BOOL32 WINAPI GetCommTimeouts(INT32 fd,LPCOMMTIMEOUTS lptimeouts)
+BOOL WINAPI GetCommTimeouts(INT fd,LPCOMMTIMEOUTS lptimeouts)
 {
 	FIXME(comm,"(%x,%p):stub.\n",fd,lptimeouts);
 	return TRUE;
@@ -1812,7 +1812,7 @@ BOOL32 WINAPI GetCommTimeouts(INT32 fd,LPCOMMTIMEOUTS lptimeouts)
 /*****************************************************************************
  *	SetCommTimeouts		(KERNEL32.453)
  */
-BOOL32 WINAPI SetCommTimeouts(INT32 fd,LPCOMMTIMEOUTS lptimeouts) {
+BOOL WINAPI SetCommTimeouts(INT fd,LPCOMMTIMEOUTS lptimeouts) {
 	FIXME(comm,"(%x,%p):stub.\n",fd,lptimeouts);
 	return TRUE;
 }
@@ -1820,7 +1820,7 @@ BOOL32 WINAPI SetCommTimeouts(INT32 fd,LPCOMMTIMEOUTS lptimeouts) {
 /***********************************************************************
  *           EnableCommNotification   (USER.246)
  */
-BOOL16 WINAPI EnableCommNotification( INT16 fd, HWND16 hwnd,
+BOOL16 WINAPI EnableCommNotification16( INT16 fd, HWND16 hwnd,
                                       INT16 cbWriteNotify, INT16 cbOutQueue )
 {
 	FIXME(comm, "(%d, %x, %d, %d):stub.\n", fd, hwnd, cbWriteNotify, cbOutQueue);
@@ -1830,7 +1830,7 @@ BOOL16 WINAPI EnableCommNotification( INT16 fd, HWND16 hwnd,
 /***********************************************************************
  *           GetCommModemStatus   (KERNEL32.285)
  */
-BOOL32 WINAPI GetCommModemStatus(HANDLE32 hFile,LPDWORD lpModemStat )
+BOOL WINAPI GetCommModemStatus(HANDLE hFile,LPDWORD lpModemStat )
 {
 	FIXME(comm, "(%d %p)\n",hFile,lpModemStat );
 	return TRUE;
@@ -1838,7 +1838,7 @@ BOOL32 WINAPI GetCommModemStatus(HANDLE32 hFile,LPDWORD lpModemStat )
 /***********************************************************************
  *           WaitCommEvent   (KERNEL32.719)
  */
-BOOL32 WINAPI WaitCommEvent(HANDLE32 hFile,LPDWORD eventmask ,LPOVERLAPPED overlapped)
+BOOL WINAPI WaitCommEvent(HANDLE hFile,LPDWORD eventmask ,LPOVERLAPPED overlapped)
 {
 	FIXME(comm, "(%d %p %p )\n",hFile, eventmask,overlapped);
 	return TRUE;
diff --git a/misc/commdlg.c b/misc/commdlg.c
index aeb94a4109b..c6054705a0c 100644
--- a/misc/commdlg.c
+++ b/misc/commdlg.c
@@ -37,9 +37,9 @@ static const char defaultfilter[]=" \0\0";
 /***********************************************************************
  * 				FileDlg_Init			[internal]
  */
-static BOOL32 FileDlg_Init(void)
+static BOOL FileDlg_Init(void)
 {
-    static BOOL32 initialized = 0;
+    static BOOL initialized = 0;
     
     if (!initialized) {
 	if (!hFolder) hFolder = LoadBitmap16(0, MAKEINTRESOURCE16(OBM_FOLDER));
@@ -63,10 +63,10 @@ static BOOL32 FileDlg_Init(void)
  */
 BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn )
 {
-    HINSTANCE32 hInst;
-    HANDLE32 hDlgTmpl = 0, hResInfo;
-    BOOL32 bRet = FALSE, win32Format = FALSE;
-    HWND32 hwndDialog;
+    HINSTANCE hInst;
+    HANDLE hDlgTmpl = 0, hResInfo;
+    BOOL bRet = FALSE, win32Format = FALSE;
+    HWND hwndDialog;
     LPOPENFILENAME16 lpofn = (LPOPENFILENAME16)PTR_SEG_TO_LIN(ofn);
     LPCVOID template;
     char defaultopen[]="Open File";
@@ -74,10 +74,10 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn )
 
     if (!lpofn || !FileDlg_Init()) return FALSE;
 
-    if (lpofn->Flags & OFN_WINE32) {
+    if (lpofn->Flags & OFN_WINE) {
 	    if (lpofn->Flags & OFN_ENABLETEMPLATEHANDLE)
 	    {
-		if (!(template = LockResource32( MapHModuleSL(lpofn->hInstance ))))
+		if (!(template = LockResource( MapHModuleSL(lpofn->hInstance ))))
 		{
 		    CommDlgLastError = CDERR_LOADRESFAILURE;
 		    return FALSE;
@@ -85,15 +85,15 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn )
 	    }
 	    else if (lpofn->Flags & OFN_ENABLETEMPLATE)
 	    {
-		if (!(hResInfo = FindResource32A(MapHModuleSL(lpofn->hInstance),
-						PTR_SEG_TO_LIN(lpofn->lpTemplateName), RT_DIALOG32A)))
+		if (!(hResInfo = FindResourceA(MapHModuleSL(lpofn->hInstance),
+						PTR_SEG_TO_LIN(lpofn->lpTemplateName), RT_DIALOGA)))
 		{
 		    CommDlgLastError = CDERR_FINDRESFAILURE;
 		    return FALSE;
 		}
-		if (!(hDlgTmpl = LoadResource32( MapHModuleSL(lpofn->hInstance),
+		if (!(hDlgTmpl = LoadResource( MapHModuleSL(lpofn->hInstance),
 						 hResInfo )) ||
-		    !(template = LockResource32( hDlgTmpl )))
+		    !(template = LockResource( hDlgTmpl )))
 		{
 		    CommDlgLastError = CDERR_LOADRESFAILURE;
 		    return FALSE;
@@ -172,8 +172,8 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn )
       }
 
     if (hDlgTmpl) {
-	    if (lpofn->Flags & OFN_WINE32)
-		    FreeResource32( hDlgTmpl );
+	    if (lpofn->Flags & OFN_WINE)
+		    FreeResource( hDlgTmpl );
 	    else
 		    FreeResource16( hDlgTmpl );
     }
@@ -189,21 +189,21 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn )
  */
 BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn)
 {
-    HINSTANCE32 hInst;
-    HANDLE32 hDlgTmpl = 0;
-    BOOL32 bRet = FALSE, win32Format = FALSE;
+    HINSTANCE hInst;
+    HANDLE hDlgTmpl = 0;
+    BOOL bRet = FALSE, win32Format = FALSE;
     LPOPENFILENAME16 lpofn = (LPOPENFILENAME16)PTR_SEG_TO_LIN(ofn);
     LPCVOID template;
-    HWND32 hwndDialog;
+    HWND hwndDialog;
     char defaultsave[]="Save as";
     char *str =0,*str1=0;
 
     if (!lpofn || !FileDlg_Init()) return FALSE;
 
-    if (lpofn->Flags & OFN_WINE32) {
+    if (lpofn->Flags & OFN_WINE) {
 	    if (lpofn->Flags & OFN_ENABLETEMPLATEHANDLE)
 	    {
-		if (!(template = LockResource32( MapHModuleSL(lpofn->hInstance ))))
+		if (!(template = LockResource( MapHModuleSL(lpofn->hInstance ))))
 		{
 		    CommDlgLastError = CDERR_LOADRESFAILURE;
 		    return FALSE;
@@ -211,17 +211,17 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn)
 	    }
 	    else if (lpofn->Flags & OFN_ENABLETEMPLATE)
 	    {
-		HANDLE32 hResInfo;
-		if (!(hResInfo = FindResource32A(MapHModuleSL(lpofn->hInstance),
+		HANDLE hResInfo;
+		if (!(hResInfo = FindResourceA(MapHModuleSL(lpofn->hInstance),
 						 PTR_SEG_TO_LIN(lpofn->lpTemplateName),
-                                                 RT_DIALOG32A)))
+                                                 RT_DIALOGA)))
 		{
 		    CommDlgLastError = CDERR_FINDRESFAILURE;
 		    return FALSE;
 		}
-		if (!(hDlgTmpl = LoadResource32(MapHModuleSL(lpofn->hInstance),
+		if (!(hDlgTmpl = LoadResource(MapHModuleSL(lpofn->hInstance),
 						hResInfo)) ||
-		    !(template = LockResource32(hDlgTmpl)))
+		    !(template = LockResource(hDlgTmpl)))
 		{
 		    CommDlgLastError = CDERR_LOADRESFAILURE;
 		    return FALSE;
@@ -301,8 +301,8 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn)
       }
     
     if (hDlgTmpl) {
-	    if (lpofn->Flags & OFN_WINE32)
-		    FreeResource32( hDlgTmpl );
+	    if (lpofn->Flags & OFN_WINE)
+		    FreeResource( hDlgTmpl );
 	    else
 		    FreeResource16( hDlgTmpl );
     }
@@ -320,7 +320,7 @@ static void FILEDLG_StripEditControl(HWND16 hwnd)
 {
     char temp[512], *cp;
 
-    GetDlgItemText32A( hwnd, edt1, temp, sizeof(temp) );
+    GetDlgItemTextA( hwnd, edt1, temp, sizeof(temp) );
     cp = strrchr(temp, '\\');
     if (cp != NULL) {
 	strcpy(temp, cp+1);
@@ -335,14 +335,14 @@ static void FILEDLG_StripEditControl(HWND16 hwnd)
 /***********************************************************************
  * 				FILEDLG_ScanDir			[internal]
  */
-static BOOL32 FILEDLG_ScanDir(HWND16 hWnd, LPSTR newPath)
+static BOOL FILEDLG_ScanDir(HWND16 hWnd, LPSTR newPath)
 {
     char 		buffer[512];
 	 char*  		str = buffer;
     int 			drive;
-    HWND32 		hlb;
+    HWND 		hlb;
 
-    lstrcpyn32A(buffer, newPath, sizeof(buffer));
+    lstrcpynA(buffer, newPath, sizeof(buffer));
 
     if (str[0] && (str[1] == ':')) {
         drive = toupper(str[0]) - 'A';
@@ -357,18 +357,18 @@ static BOOL32 FILEDLG_ScanDir(HWND16 hWnd, LPSTR newPath)
 		 return FALSE;
     }
 
-    GetDlgItemText32A(hWnd, edt1, buffer, sizeof(buffer));
-    if ((hlb = GetDlgItem32(hWnd, lst1)) != 0) {
+    GetDlgItemTextA(hWnd, edt1, buffer, sizeof(buffer));
+    if ((hlb = GetDlgItem(hWnd, lst1)) != 0) {
 		 char*	scptr; /* ptr on semi-colon */
 		 char*	filter = buffer;
 
 		 TRACE(commdlg, "Using filter %s\n", filter);
-		 SendMessage32A(hlb, LB_RESETCONTENT32, 0, 0);
+		 SendMessageA(hlb, LB_RESETCONTENT, 0, 0);
 		 while (filter) {
 			 scptr = strchr(filter, ';');
 			 if (scptr)	*scptr = 0;
 			 TRACE(commdlg, "Using file spec %s\n", filter);
-			 if (SendMessage32A(hlb, LB_DIR32, 0, (LPARAM)filter) == LB_ERR)
+			 if (SendMessageA(hlb, LB_DIR, 0, (LPARAM)filter) == LB_ERR)
 				 return FALSE;
 			 if (scptr) *scptr = ';';
 			 filter = (scptr) ? (scptr + 1) : 0;
@@ -376,7 +376,7 @@ static BOOL32 FILEDLG_ScanDir(HWND16 hWnd, LPSTR newPath)
 	 }
 
     strcpy(buffer, "*.*");
-    return DlgDirList32A(hWnd, buffer, lst2, stc1, 0x8010);
+    return DlgDirListA(hWnd, buffer, lst2, stc1, 0x8010);
 }
 
 /***********************************************************************
@@ -413,16 +413,16 @@ static LONG FILEDLG_WMDrawItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam,int s
 {
     LPDRAWITEMSTRUCT16 lpdis = (LPDRAWITEMSTRUCT16)PTR_SEG_TO_LIN(lParam);
     char *str;
-    HBRUSH32 hBrush;
+    HBRUSH hBrush;
     HBITMAP16 hBitmap, hPrevBitmap;
     BITMAP16 bm;
-    HDC32 hMemDC;
+    HDC hMemDC;
 
     if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst1)
     {
         if (!(str = SEGPTR_ALLOC(512))) return FALSE;
-	hBrush = SelectObject32(lpdis->hDC, GetStockObject32(LTGRAY_BRUSH));
-	SelectObject32(lpdis->hDC, hBrush);
+	hBrush = SelectObject(lpdis->hDC, GetStockObject(LTGRAY_BRUSH));
+	SelectObject(lpdis->hDC, hBrush);
 	FillRect16(lpdis->hDC, &lpdis->rcItem, hBrush);
 	SendMessage16(lpdis->hwndItem, LB_GETTEXT16, lpdis->itemID, 
                       (LPARAM)SEGPTR_GET(str));
@@ -430,9 +430,9 @@ static LONG FILEDLG_WMDrawItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam,int s
 	if (savedlg)       /* use _gray_ text in FileSaveDlg */
         {
 	  if (!lpdis->itemState)
-	    SetTextColor32(lpdis->hDC,GetSysColor32(COLOR_GRAYTEXT) );
+	    SetTextColor(lpdis->hDC,GetSysColor(COLOR_GRAYTEXT) );
 	  else  
-	    SetTextColor32(lpdis->hDC,GetSysColor32(COLOR_WINDOWTEXT) );
+	    SetTextColor(lpdis->hDC,GetSysColor(COLOR_WINDOWTEXT) );
 	    /* inversion of gray would be bad readable */	  	  
         }
 
@@ -448,8 +448,8 @@ static LONG FILEDLG_WMDrawItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam,int s
     if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst2)
     {
         if (!(str = SEGPTR_ALLOC(512))) return FALSE;
-	hBrush = SelectObject32(lpdis->hDC, GetStockObject32(LTGRAY_BRUSH));
-	SelectObject32(lpdis->hDC, hBrush);
+	hBrush = SelectObject(lpdis->hDC, GetStockObject(LTGRAY_BRUSH));
+	SelectObject(lpdis->hDC, hBrush);
 	FillRect16(lpdis->hDC, &lpdis->rcItem, hBrush);
 	SendMessage16(lpdis->hwndItem, LB_GETTEXT16, lpdis->itemID, 
                       (LPARAM)SEGPTR_GET(str));
@@ -458,12 +458,12 @@ static LONG FILEDLG_WMDrawItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam,int s
 	GetObject16( hBitmap, sizeof(bm), &bm );
 	TextOut16(lpdis->hDC, lpdis->rcItem.left + bm.bmWidth, 
                   lpdis->rcItem.top, str, strlen(str));
-	hMemDC = CreateCompatibleDC32(lpdis->hDC);
-	hPrevBitmap = SelectObject32(hMemDC, hBitmap);
-	BitBlt32(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
+	hMemDC = CreateCompatibleDC(lpdis->hDC);
+	hPrevBitmap = SelectObject(hMemDC, hBitmap);
+	BitBlt(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
                  bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, SRCCOPY);
-	SelectObject32(hMemDC, hPrevBitmap);
-	DeleteDC32(hMemDC);
+	SelectObject(hMemDC, hPrevBitmap);
+	DeleteDC(hMemDC);
 	if (lpdis->itemState != 0) InvertRect16(lpdis->hDC, &lpdis->rcItem);
         SEGPTR_FREE(str);
 	return TRUE;
@@ -471,8 +471,8 @@ static LONG FILEDLG_WMDrawItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam,int s
     if (lpdis->CtlType == ODT_COMBOBOX && lpdis->CtlID == cmb2)
     {
         if (!(str = SEGPTR_ALLOC(512))) return FALSE;
-	hBrush = SelectObject32(lpdis->hDC, GetStockObject32(LTGRAY_BRUSH));
-	SelectObject32(lpdis->hDC, hBrush);
+	hBrush = SelectObject(lpdis->hDC, GetStockObject(LTGRAY_BRUSH));
+	SelectObject(lpdis->hDC, hBrush);
 	FillRect16(lpdis->hDC, &lpdis->rcItem, hBrush);
 	SendMessage16(lpdis->hwndItem, CB_GETLBTEXT16, lpdis->itemID, 
                       (LPARAM)SEGPTR_GET(str));
@@ -487,12 +487,12 @@ static LONG FILEDLG_WMDrawItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam,int s
 	GetObject16( hBitmap, sizeof(bm), &bm );
 	TextOut16(lpdis->hDC, lpdis->rcItem.left + bm.bmWidth, 
                   lpdis->rcItem.top, str, strlen(str));
-	hMemDC = CreateCompatibleDC32(lpdis->hDC);
-	hPrevBitmap = SelectObject32(hMemDC, hBitmap);
-	BitBlt32( lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
+	hMemDC = CreateCompatibleDC(lpdis->hDC);
+	hPrevBitmap = SelectObject(hMemDC, hBitmap);
+	BitBlt( lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
                   bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, SRCCOPY );
-	SelectObject32(hMemDC, hPrevBitmap);
-	DeleteDC32(hMemDC);
+	SelectObject(hMemDC, hPrevBitmap);
+	DeleteDC(hMemDC);
 	if (lpdis->itemState != 0) InvertRect16(lpdis->hDC, &lpdis->rcItem);
         SEGPTR_FREE(str);
 	return TRUE;
@@ -531,25 +531,25 @@ static int FILEDLG_HookCallChk(LPOPENFILENAME16 lpofn)
  *
  * Adapt the structures back for win32 calls so the callee can read lpCustData
  */
-static BOOL32 FILEDLG_CallWindowProc(LPOPENFILENAME16 lpofn,HWND32 hwnd,
-	UINT32 wMsg,WPARAM32 wParam,LPARAM lParam
+static BOOL FILEDLG_CallWindowProc(LPOPENFILENAME16 lpofn,HWND hwnd,
+	UINT wMsg,WPARAM wParam,LPARAM lParam
 
 ) {
-	BOOL32	        needstruct;
-        BOOL32          result = FALSE;
+	BOOL	        needstruct;
+        BOOL          result = FALSE;
         WINDOWPROCTYPE  ProcType;               /* Type of Hook Function to be called. */
 
         /* TRUE if lParam points to the OPENFILENAME16 Structure */
 	needstruct = (PTR_SEG_TO_LIN(lParam) == lpofn);
 
-        ProcType   = (lpofn->Flags & OFN_WINE32)
+        ProcType   = (lpofn->Flags & OFN_WINE)
                      ? (lpofn->Flags & OFN_UNICODE)             /* 32-Bit call to GetOpenFileName */
                        ? WIN_PROC_32W : WIN_PROC_32A
                      : WIN_PROC_16;                             /* 16-Bit call to GetOpenFileName */
 
-	if (!(lpofn->Flags & OFN_WINE32))
+	if (!(lpofn->Flags & OFN_WINE))
                 /* Call to 16-Bit Hooking function... No Problem at all. */
-		return (BOOL32)CallWindowProc16(
+		return (BOOL)CallWindowProc16(
 			lpofn->lpfnHook,hwnd,(UINT16)wMsg,(WPARAM16)wParam,lParam
 		);
 	/* |OFN_WINE32 */
@@ -558,22 +558,22 @@ static BOOL32 FILEDLG_CallWindowProc(LPOPENFILENAME16 lpofn,HWND32 hwnd,
            /* Parameter lParam points to lpofn... Convert Structure Data... */
        	   if (lpofn->Flags & OFN_UNICODE)
            {
-                OPENFILENAME32W ofnw;
+                OPENFILENAMEW ofnw;
 
                 /* FIXME: probably needs more converted */
                 ofnw.lCustData = lpofn->lCustData;
-                return (BOOL32)CallWindowProc32W(
-                         (WNDPROC32)lpofn->lpfnHook,hwnd,wMsg,wParam,(LPARAM)&ofnw
+                return (BOOL)CallWindowProcW(
+                         (WNDPROC)lpofn->lpfnHook,hwnd,wMsg,wParam,(LPARAM)&ofnw
                 );
            }
            else /* ! |OFN_UNICODE */
            {
-		OPENFILENAME32A ofna;
+		OPENFILENAMEA ofna;
 
 		/* FIXME: probably needs more converted */
 		ofna.lCustData = lpofn->lCustData;
-		return (BOOL32)CallWindowProc32A(
-		        (WNDPROC32)lpofn->lpfnHook,hwnd,wMsg,wParam,(LPARAM)&ofna
+		return (BOOL)CallWindowProcA(
+		        (WNDPROC)lpofn->lpfnHook,hwnd,wMsg,wParam,(LPARAM)&ofna
 		);
            }
 	}
@@ -608,7 +608,7 @@ static LONG FILEDLG_WMInitDialog(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
   LPOPENFILENAME16 lpofn;
   char tmpstr[512];
   LPSTR pstr, old_pstr;
-  SetWindowLong32A(hWnd, DWL_USER, lParam);
+  SetWindowLongA(hWnd, DWL_USER, lParam);
   lpofn = (LPOPENFILENAME16)PTR_SEG_TO_LIN(lParam);
   if (lpofn->lpstrTitle) SetWindowText16( hWnd, lpofn->lpstrTitle );
   /* read custom filter information */
@@ -657,10 +657,10 @@ static LONG FILEDLG_WMInitDialog(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
   tmpstr[511]=0;
   TRACE(commdlg,"nFilterIndex = %ld, SetText of edt1 to '%s'\n", 
   			lpofn->nFilterIndex, tmpstr);
-  SetDlgItemText32A( hWnd, edt1, tmpstr );
+  SetDlgItemTextA( hWnd, edt1, tmpstr );
   /* get drive list */
   *tmpstr = 0;
-  DlgDirListComboBox32A(hWnd, tmpstr, cmb2, 0, 0xC000);
+  DlgDirListComboBoxA(hWnd, tmpstr, cmb2, 0, 0xC000);
   /* read initial directory */
   if (PTR_SEG_TO_LIN(lpofn->lpstrInitialDir) != NULL) 
     {
@@ -682,9 +682,9 @@ static LONG FILEDLG_WMInitDialog(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
     if (DRIVE_IsValid(i))                  n++;
   SendDlgItemMessage16(hWnd, cmb2, CB_SETCURSEL16, n, 0);
   if (!(lpofn->Flags & OFN_SHOWHELP))
-    ShowWindow32(GetDlgItem32(hWnd, pshHelp), SW_HIDE);
+    ShowWindow(GetDlgItem(hWnd, pshHelp), SW_HIDE);
   if (lpofn->Flags & OFN_HIDEREADONLY)
-    ShowWindow32(GetDlgItem32(hWnd, chx1), SW_HIDE); 
+    ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE); 
   if (FILEDLG_HookCallChk(lpofn))
      return (BOOL16)FILEDLG_CallWindowProc(lpofn,hWnd,WM_INITDIALOG,wParam,lParam );
   else  
@@ -694,7 +694,7 @@ static LONG FILEDLG_WMInitDialog(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
 /***********************************************************************
  *                              FILEDLG_WMCommand               [internal]
  */
-BOOL32 in_update=FALSE;
+BOOL in_update=FALSE;
 
 static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam) 
 {
@@ -709,7 +709,7 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
   control = wParam;
   notification = HIWORD(lParam);
     
-  lpofn = (LPOPENFILENAME16)PTR_SEG_TO_LIN(GetWindowLong32A(hWnd, DWL_USER));
+  lpofn = (LPOPENFILENAME16)PTR_SEG_TO_LIN(GetWindowLongA(hWnd, DWL_USER));
   switch (control)
     {
     case lst1: /* file list */
@@ -722,12 +722,12 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
       {
           SendDlgItemMessage16(hWnd, lst1, LB_GETTEXT16, lRet,
                                (LPARAM)SEGPTR_GET(pstr));
-          SetDlgItemText32A( hWnd, edt1, pstr );
+          SetDlgItemTextA( hWnd, edt1, pstr );
           SEGPTR_FREE(pstr);
       }
       if (FILEDLG_HookCallChk(lpofn))
        FILEDLG_CallWindowProc(lpofn,hWnd,
-                  RegisterWindowMessage32A( LBSELCHSTRING ),
+                  RegisterWindowMessageA( LBSELCHSTRING ),
                   control, MAKELONG(lRet,CD_LBSELCHANGE));       
       /* FIXME: for OFN_ALLOWMULTISELECT we need CD_LBSELSUB, CD_SELADD, CD_LBSELNOITEMS */                  
       return TRUE;
@@ -777,13 +777,13 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
 	return TRUE;
       pstr = (LPSTR)SendDlgItemMessage16(hWnd, cmb1, CB_GETITEMDATA16, lRet, 0);
       TRACE(commdlg,"Selected filter : %s\n", pstr);
-      SetDlgItemText32A( hWnd, edt1, pstr );
+      SetDlgItemTextA( hWnd, edt1, pstr );
       FILEDLG_ScanDir(hWnd, tmpstr);
       in_update=TRUE;
     case IDOK:
     almost_ok:
       ofn2=*lpofn; /* for later restoring */
-      GetDlgItemText32A( hWnd, edt1, tmpstr, sizeof(tmpstr) );
+      GetDlgItemTextA( hWnd, edt1, tmpstr, sizeof(tmpstr) );
       pstr = strrchr(tmpstr, '\\');
       if (pstr == NULL)
 	pstr = strrchr(tmpstr, ':');
@@ -801,7 +801,7 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
 	      *tmpstr=0;
 	    }
 	  TRACE(commdlg,"tmpstr=%s, tmpstr2=%s\n", tmpstr, tmpstr2);
-          SetDlgItemText32A( hWnd, edt1, tmpstr2 );
+          SetDlgItemTextA( hWnd, edt1, tmpstr2 );
 	  FILEDLG_ScanDir(hWnd, tmpstr);
 	  return TRUE;
 	}
@@ -814,11 +814,11 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
       if (lRet == LB_ERR) return TRUE;
       lpofn->nFilterIndex = lRet + 1;
       TRACE(commdlg,"lpofn->nFilterIndex=%ld\n", lpofn->nFilterIndex);
-      lstrcpyn32A(tmpstr2, 
+      lstrcpynA(tmpstr2, 
 	     FILEDLG_GetFileType(PTR_SEG_TO_LIN(lpofn->lpstrCustomFilter),
 				 PTR_SEG_TO_LIN(lpofn->lpstrFilter),
 				 lRet), sizeof(tmpstr2));
-      SetDlgItemText32A( hWnd, edt1, tmpstr2 );
+      SetDlgItemTextA( hWnd, edt1, tmpstr2 );
       if (!in_update)
       /* if ScanDir succeeds, we have changed the directory */
       if (FILEDLG_ScanDir(hWnd, tmpstr)) return TRUE;
@@ -828,13 +828,13 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
 	{
 	  /* strip off the pathname */
 	  *pstr = 0;
-          SetDlgItemText32A( hWnd, edt1, pstr + 1 );
-	  lstrcpyn32A(tmpstr2, pstr+1, sizeof(tmpstr2) );
+          SetDlgItemTextA( hWnd, edt1, pstr + 1 );
+	  lstrcpynA(tmpstr2, pstr+1, sizeof(tmpstr2) );
 	  /* Should we MessageBox() if this fails? */
 	  if (!FILEDLG_ScanDir(hWnd, tmpstr)) return TRUE;
 	  strcpy(tmpstr, tmpstr2);
 	}
-      else SetDlgItemText32A( hWnd, edt1, tmpstr );
+      else SetDlgItemTextA( hWnd, edt1, tmpstr );
 #if 0
       ShowWindow16(hWnd, SW_HIDE);   /* this should not be necessary ?! (%%%) */
 #endif
@@ -848,7 +848,7 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
 	   strcat(tmpstr2, "\\");
 	strncat(tmpstr2, tmpstr, 511-strlen(tmpstr2)); tmpstr2[511]=0;
 	if (lpofn->lpstrFile)
-	  lstrcpyn32A(PTR_SEG_TO_LIN(lpofn->lpstrFile), tmpstr2,lpofn->nMaxFile);
+	  lstrcpynA(PTR_SEG_TO_LIN(lpofn->lpstrFile), tmpstr2,lpofn->nMaxFile);
       }
       lpofn->nFileOffset = strrchr(tmpstr2,'\\') - tmpstr2 +1;
       lpofn->nFileExtension = 0;
@@ -863,7 +863,7 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
        {
          if (FILEDLG_HookCallChk(lpofn))
            FILEDLG_CallWindowProc(lpofn,hWnd,
-                                  RegisterWindowMessage32A( LBSELCHSTRING ),
+                                  RegisterWindowMessageA( LBSELCHSTRING ),
                                   control, MAKELONG(lRet,CD_LBSELCHANGE));
 
          in_update = FALSE;
@@ -878,7 +878,7 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
       if (FILEDLG_HookCallChk(lpofn))
       {
        lRet= (BOOL16)FILEDLG_CallWindowProc(lpofn,
-               hWnd, RegisterWindowMessage32A( FILEOKSTRING ), 0, lParam );
+               hWnd, RegisterWindowMessageA( FILEOKSTRING ), 0, lParam );
        if (lRet)       
        {
          *lpofn=ofn2; /* restore old state */
@@ -888,10 +888,10 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
          break;
        }
       }
-      EndDialog32(hWnd, TRUE);
+      EndDialog(hWnd, TRUE);
       return TRUE;
     case IDCANCEL:
-      EndDialog32(hWnd, FALSE);
+      EndDialog(hWnd, FALSE);
       return TRUE;
     }
   return FALSE;
@@ -901,10 +901,10 @@ static LRESULT FILEDLG_WMCommand(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
 /***********************************************************************
  *           FileOpenDlgProc   (COMMDLG.6)
  */
-LRESULT WINAPI FileOpenDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
+LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                LPARAM lParam)
 {  
- LPOPENFILENAME16 lpofn = (LPOPENFILENAME16)PTR_SEG_TO_LIN(GetWindowLong32A(hWnd, DWL_USER));
+ LPOPENFILENAME16 lpofn = (LPOPENFILENAME16)PTR_SEG_TO_LIN(GetWindowLongA(hWnd, DWL_USER));
  
  if (wMsg!=WM_INITDIALOG)
   if (FILEDLG_HookCallChk(lpofn))
@@ -945,10 +945,10 @@ LRESULT WINAPI FileOpenDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 /***********************************************************************
  *           FileSaveDlgProc   (COMMDLG.7)
  */
-LRESULT WINAPI FileSaveDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
+LRESULT WINAPI FileSaveDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                LPARAM lParam)
 {
- LPOPENFILENAME16 lpofn = (LPOPENFILENAME16)PTR_SEG_TO_LIN(GetWindowLong32A(hWnd, DWL_USER));
+ LPOPENFILENAME16 lpofn = (LPOPENFILENAME16)PTR_SEG_TO_LIN(GetWindowLongA(hWnd, DWL_USER));
  
  if (wMsg!=WM_INITDIALOG)
   if (FILEDLG_HookCallChk(lpofn))
@@ -1015,7 +1015,7 @@ HWND16 WINAPI FindText16( SEGPTR find )
 /***********************************************************************
  *           FindText32A   (COMMDLG.6)
  */
-HWND32 WINAPI FindText32A( LPFINDREPLACE32A lpFind )
+HWND WINAPI FindTextA( LPFINDREPLACEA lpFind )
 {
     HANDLE16 hInst;
     LPCVOID ptr;
@@ -1029,13 +1029,13 @@ HWND32 WINAPI FindText32A( LPFINDREPLACE32A lpFind )
     ptr = SYSRES_GetResPtr( SYSRES_DIALOG_FIND_TEXT );
     hInst = WIN_GetWindowInstance( lpFind->hwndOwner );
     return DIALOG_CreateIndirect( hInst, ptr, TRUE, lpFind->hwndOwner,
-                (DLGPROC16)FindTextDlgProc32A, (LPARAM)lpFind, WIN_PROC_32A );
+                (DLGPROC16)FindTextDlgProcA, (LPARAM)lpFind, WIN_PROC_32A );
 }
 
 /***********************************************************************
  *           FindText32W   (COMMDLG.7)
  */
-HWND32 WINAPI FindText32W( LPFINDREPLACE32W lpFind )
+HWND WINAPI FindTextW( LPFINDREPLACEW lpFind )
 {
     HANDLE16 hInst;
     LPCVOID ptr;
@@ -1049,7 +1049,7 @@ HWND32 WINAPI FindText32W( LPFINDREPLACE32W lpFind )
     ptr = SYSRES_GetResPtr( SYSRES_DIALOG_FIND_TEXT );
     hInst = WIN_GetWindowInstance( lpFind->hwndOwner );
     return DIALOG_CreateIndirect( hInst, ptr, TRUE, lpFind->hwndOwner,
-                (DLGPROC16)FindTextDlgProc32W, (LPARAM)lpFind, WIN_PROC_32W );
+                (DLGPROC16)FindTextDlgProcW, (LPARAM)lpFind, WIN_PROC_32W );
 }
 
 /***********************************************************************
@@ -1077,7 +1077,7 @@ HWND16 WINAPI ReplaceText16( SEGPTR find )
 /***********************************************************************
  *           ReplaceText32A   (COMDLG32.19)
  */
-HWND32 WINAPI ReplaceText32A( LPFINDREPLACE32A lpFind )
+HWND WINAPI ReplaceTextA( LPFINDREPLACEA lpFind )
 {
     HANDLE16 hInst;
     LPCVOID ptr;
@@ -1091,13 +1091,13 @@ HWND32 WINAPI ReplaceText32A( LPFINDREPLACE32A lpFind )
     ptr = SYSRES_GetResPtr( SYSRES_DIALOG_REPLACE_TEXT );
     hInst = WIN_GetWindowInstance( lpFind->hwndOwner );
     return DIALOG_CreateIndirect( hInst, ptr, TRUE, lpFind->hwndOwner,
-		(DLGPROC16)ReplaceTextDlgProc32A, (LPARAM)lpFind, WIN_PROC_32A );
+		(DLGPROC16)ReplaceTextDlgProcA, (LPARAM)lpFind, WIN_PROC_32A );
 }
 
 /***********************************************************************
  *           ReplaceText32W   (COMDLG32.20)
  */
-HWND32 WINAPI ReplaceText32W( LPFINDREPLACE32W lpFind )
+HWND WINAPI ReplaceTextW( LPFINDREPLACEW lpFind )
 {
     HANDLE16 hInst;
     LPCVOID ptr;
@@ -1111,50 +1111,50 @@ HWND32 WINAPI ReplaceText32W( LPFINDREPLACE32W lpFind )
     ptr = SYSRES_GetResPtr( SYSRES_DIALOG_REPLACE_TEXT );
     hInst = WIN_GetWindowInstance( lpFind->hwndOwner );
     return DIALOG_CreateIndirect( hInst, ptr, TRUE, lpFind->hwndOwner,
-		(DLGPROC16)ReplaceTextDlgProc32W, (LPARAM)lpFind, WIN_PROC_32W );
+		(DLGPROC16)ReplaceTextDlgProcW, (LPARAM)lpFind, WIN_PROC_32W );
 }
 
 
 /***********************************************************************
  *                              FINDDLG_WMInitDialog            [internal]
  */
-static LRESULT FINDDLG_WMInitDialog(HWND32 hWnd, LPARAM lParam, LPDWORD lpFlags,
-                                    LPSTR lpstrFindWhat, BOOL32 fUnicode)
+static LRESULT FINDDLG_WMInitDialog(HWND hWnd, LPARAM lParam, LPDWORD lpFlags,
+                                    LPSTR lpstrFindWhat, BOOL fUnicode)
 {
-    SetWindowLong32A(hWnd, DWL_USER, lParam);
+    SetWindowLongA(hWnd, DWL_USER, lParam);
     *lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_REPLACEALL | FR_DIALOGTERM);
     /*
      * FIXME : If the initial FindWhat string is empty, we should disable the
      * FindNext (IDOK) button.  Only after typing some text, the button should be
      * enabled.
      */
-    if (fUnicode) SetDlgItemText32W(hWnd, edt1, (LPWSTR)lpstrFindWhat);
-	else SetDlgItemText32A(hWnd, edt1, lpstrFindWhat);
-    CheckRadioButton32(hWnd, rad1, rad2, (*lpFlags & FR_DOWN) ? rad2 : rad1);
+    if (fUnicode) SetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat);
+	else SetDlgItemTextA(hWnd, edt1, lpstrFindWhat);
+    CheckRadioButton(hWnd, rad1, rad2, (*lpFlags & FR_DOWN) ? rad2 : rad1);
     if (*lpFlags & (FR_HIDEUPDOWN | FR_NOUPDOWN)) {
-	EnableWindow32(GetDlgItem32(hWnd, rad1), FALSE);
-	EnableWindow32(GetDlgItem32(hWnd, rad2), FALSE);
+	EnableWindow(GetDlgItem(hWnd, rad1), FALSE);
+	EnableWindow(GetDlgItem(hWnd, rad2), FALSE);
     }
     if (*lpFlags & FR_HIDEUPDOWN) {
-	ShowWindow32(GetDlgItem32(hWnd, rad1), SW_HIDE);
-	ShowWindow32(GetDlgItem32(hWnd, rad2), SW_HIDE);
-	ShowWindow32(GetDlgItem32(hWnd, grp1), SW_HIDE);
+	ShowWindow(GetDlgItem(hWnd, rad1), SW_HIDE);
+	ShowWindow(GetDlgItem(hWnd, rad2), SW_HIDE);
+	ShowWindow(GetDlgItem(hWnd, grp1), SW_HIDE);
     }
-    CheckDlgButton32(hWnd, chx1, (*lpFlags & FR_WHOLEWORD) ? 1 : 0);
+    CheckDlgButton(hWnd, chx1, (*lpFlags & FR_WHOLEWORD) ? 1 : 0);
     if (*lpFlags & (FR_HIDEWHOLEWORD | FR_NOWHOLEWORD))
-	EnableWindow32(GetDlgItem32(hWnd, chx1), FALSE);
+	EnableWindow(GetDlgItem(hWnd, chx1), FALSE);
     if (*lpFlags & FR_HIDEWHOLEWORD)
-	ShowWindow32(GetDlgItem32(hWnd, chx1), SW_HIDE);
-    CheckDlgButton32(hWnd, chx2, (*lpFlags & FR_MATCHCASE) ? 1 : 0);
+	ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE);
+    CheckDlgButton(hWnd, chx2, (*lpFlags & FR_MATCHCASE) ? 1 : 0);
     if (*lpFlags & (FR_HIDEMATCHCASE | FR_NOMATCHCASE))
-	EnableWindow32(GetDlgItem32(hWnd, chx2), FALSE);
+	EnableWindow(GetDlgItem(hWnd, chx2), FALSE);
     if (*lpFlags & FR_HIDEMATCHCASE)
-	ShowWindow32(GetDlgItem32(hWnd, chx2), SW_HIDE);
+	ShowWindow(GetDlgItem(hWnd, chx2), SW_HIDE);
     if (!(*lpFlags & FR_SHOWHELP)) {
-	EnableWindow32(GetDlgItem32(hWnd, pshHelp), FALSE);
-	ShowWindow32(GetDlgItem32(hWnd, pshHelp), SW_HIDE);
+	EnableWindow(GetDlgItem(hWnd, pshHelp), FALSE);
+	ShowWindow(GetDlgItem(hWnd, pshHelp), SW_HIDE);
     }
-    ShowWindow32(hWnd, SW_SHOWNORMAL);
+    ShowWindow(hWnd, SW_SHOWNORMAL);
     return TRUE;
 }    
 
@@ -1162,43 +1162,43 @@ static LRESULT FINDDLG_WMInitDialog(HWND32 hWnd, LPARAM lParam, LPDWORD lpFlags,
 /***********************************************************************
  *                              FINDDLG_WMCommand               [internal]
  */
-static LRESULT FINDDLG_WMCommand(HWND32 hWnd, WPARAM32 wParam, 
-			HWND32 hwndOwner, LPDWORD lpFlags,
+static LRESULT FINDDLG_WMCommand(HWND hWnd, WPARAM wParam, 
+			HWND hwndOwner, LPDWORD lpFlags,
 			LPSTR lpstrFindWhat, WORD wFindWhatLen, 
-			BOOL32 fUnicode)
+			BOOL fUnicode)
 {
-    int uFindReplaceMessage = RegisterWindowMessage32A( FINDMSGSTRING );
-    int uHelpMessage = RegisterWindowMessage32A( HELPMSGSTRING );
+    int uFindReplaceMessage = RegisterWindowMessageA( FINDMSGSTRING );
+    int uHelpMessage = RegisterWindowMessageA( HELPMSGSTRING );
 
     switch (wParam) {
 	case IDOK:
 	    if (fUnicode) 
-	      GetDlgItemText32W(hWnd, edt1, (LPWSTR)lpstrFindWhat, wFindWhatLen/2);
-	      else GetDlgItemText32A(hWnd, edt1, lpstrFindWhat, wFindWhatLen);
-	    if (IsDlgButtonChecked32(hWnd, rad2))
+	      GetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat, wFindWhatLen/2);
+	      else GetDlgItemTextA(hWnd, edt1, lpstrFindWhat, wFindWhatLen);
+	    if (IsDlgButtonChecked(hWnd, rad2))
 		*lpFlags |= FR_DOWN;
 		else *lpFlags &= ~FR_DOWN;
-	    if (IsDlgButtonChecked32(hWnd, chx1))
+	    if (IsDlgButtonChecked(hWnd, chx1))
 		*lpFlags |= FR_WHOLEWORD; 
 		else *lpFlags &= ~FR_WHOLEWORD;
-	    if (IsDlgButtonChecked32(hWnd, chx2))
+	    if (IsDlgButtonChecked(hWnd, chx2))
 		*lpFlags |= FR_MATCHCASE; 
 		else *lpFlags &= ~FR_MATCHCASE;
             *lpFlags &= ~(FR_REPLACE | FR_REPLACEALL | FR_DIALOGTERM);
 	    *lpFlags |= FR_FINDNEXT;
-	    SendMessage32A(hwndOwner, uFindReplaceMessage, 0,
-                          GetWindowLong32A(hWnd, DWL_USER) );
+	    SendMessageA(hwndOwner, uFindReplaceMessage, 0,
+                          GetWindowLongA(hWnd, DWL_USER) );
 	    return TRUE;
 	case IDCANCEL:
             *lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_REPLACEALL);
 	    *lpFlags |= FR_DIALOGTERM;
-	    SendMessage32A(hwndOwner, uFindReplaceMessage, 0,
-                          GetWindowLong32A(hWnd, DWL_USER) );
-	    DestroyWindow32(hWnd);
+	    SendMessageA(hwndOwner, uFindReplaceMessage, 0,
+                          GetWindowLongA(hWnd, DWL_USER) );
+	    DestroyWindow(hWnd);
 	    return TRUE;
 	case pshHelp:
 	    /* FIXME : should lpfr structure be passed as an argument ??? */
-	    SendMessage32A(hwndOwner, uHelpMessage, 0, 0);
+	    SendMessageA(hwndOwner, uHelpMessage, 0, 0);
 	    return TRUE;
     }
     return FALSE;
@@ -1218,7 +1218,7 @@ LRESULT WINAPI FindTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 	    return FINDDLG_WMInitDialog(hWnd, lParam, &(lpfr->Flags),
 		PTR_SEG_TO_LIN(lpfr->lpstrFindWhat), FALSE);
 	case WM_COMMAND:
-	    lpfr=(LPFINDREPLACE16)PTR_SEG_TO_LIN(GetWindowLong32A(hWnd, DWL_USER));
+	    lpfr=(LPFINDREPLACE16)PTR_SEG_TO_LIN(GetWindowLongA(hWnd, DWL_USER));
 	    return FINDDLG_WMCommand(hWnd, wParam, lpfr->hwndOwner,
 		&lpfr->Flags, PTR_SEG_TO_LIN(lpfr->lpstrFindWhat),
 		lpfr->wFindWhatLen, FALSE);
@@ -1229,17 +1229,17 @@ LRESULT WINAPI FindTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 /***********************************************************************
  *           FindTextDlgProc32A
  */
-LRESULT WINAPI FindTextDlgProc32A(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam,
+LRESULT WINAPI FindTextDlgProcA(HWND hWnd, UINT wMsg, WPARAM wParam,
                                  LPARAM lParam)
 {
-    LPFINDREPLACE32A lpfr;
+    LPFINDREPLACEA lpfr;
     switch (wMsg) {
 	case WM_INITDIALOG:
-	    lpfr=(LPFINDREPLACE32A)lParam;
+	    lpfr=(LPFINDREPLACEA)lParam;
 	    return FINDDLG_WMInitDialog(hWnd, lParam, &(lpfr->Flags),
 	      lpfr->lpstrFindWhat, FALSE);
 	case WM_COMMAND:
-	    lpfr=(LPFINDREPLACE32A)GetWindowLong32A(hWnd, DWL_USER);
+	    lpfr=(LPFINDREPLACEA)GetWindowLongA(hWnd, DWL_USER);
 	    return FINDDLG_WMCommand(hWnd, wParam, lpfr->hwndOwner,
 		&lpfr->Flags, lpfr->lpstrFindWhat, lpfr->wFindWhatLen,
 		FALSE);
@@ -1250,17 +1250,17 @@ LRESULT WINAPI FindTextDlgProc32A(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam,
 /***********************************************************************
  *           FindTextDlgProc32W
  */
-LRESULT WINAPI FindTextDlgProc32W(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam,
+LRESULT WINAPI FindTextDlgProcW(HWND hWnd, UINT wMsg, WPARAM wParam,
                                  LPARAM lParam)
 {
-    LPFINDREPLACE32W lpfr;
+    LPFINDREPLACEW lpfr;
     switch (wMsg) {
 	case WM_INITDIALOG:
-	    lpfr=(LPFINDREPLACE32W)lParam;
+	    lpfr=(LPFINDREPLACEW)lParam;
 	    return FINDDLG_WMInitDialog(hWnd, lParam, &(lpfr->Flags),
 	      (LPSTR)lpfr->lpstrFindWhat, TRUE);
 	case WM_COMMAND:
-	    lpfr=(LPFINDREPLACE32W)GetWindowLong32A(hWnd, DWL_USER);
+	    lpfr=(LPFINDREPLACEW)GetWindowLongA(hWnd, DWL_USER);
 	    return FINDDLG_WMCommand(hWnd, wParam, lpfr->hwndOwner,
 		&lpfr->Flags, (LPSTR)lpfr->lpstrFindWhat, lpfr->wFindWhatLen,
 		TRUE);
@@ -1272,11 +1272,11 @@ LRESULT WINAPI FindTextDlgProc32W(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam,
 /***********************************************************************
  *                              REPLACEDLG_WMInitDialog         [internal]
  */
-static LRESULT REPLACEDLG_WMInitDialog(HWND32 hWnd, LPARAM lParam,
+static LRESULT REPLACEDLG_WMInitDialog(HWND hWnd, LPARAM lParam,
 		    LPDWORD lpFlags, LPSTR lpstrFindWhat, 
-		    LPSTR lpstrReplaceWith, BOOL32 fUnicode)
+		    LPSTR lpstrReplaceWith, BOOL fUnicode)
 {
-    SetWindowLong32A(hWnd, DWL_USER, lParam);
+    SetWindowLongA(hWnd, DWL_USER, lParam);
     *lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_REPLACEALL | FR_DIALOGTERM);
     /*
      * FIXME : If the initial FindWhat string is empty, we should disable the FinNext /
@@ -1285,28 +1285,28 @@ static LRESULT REPLACEDLG_WMInitDialog(HWND32 hWnd, LPARAM lParam,
      */
     if (fUnicode)     
     {
-	SetDlgItemText32W(hWnd, edt1, (LPWSTR)lpstrFindWhat);
-	SetDlgItemText32W(hWnd, edt2, (LPWSTR)lpstrReplaceWith);
+	SetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat);
+	SetDlgItemTextW(hWnd, edt2, (LPWSTR)lpstrReplaceWith);
     } else
     {
-	SetDlgItemText32A(hWnd, edt1, lpstrFindWhat);
-	SetDlgItemText32A(hWnd, edt2, lpstrReplaceWith);
+	SetDlgItemTextA(hWnd, edt1, lpstrFindWhat);
+	SetDlgItemTextA(hWnd, edt2, lpstrReplaceWith);
     }
-    CheckDlgButton32(hWnd, chx1, (*lpFlags & FR_WHOLEWORD) ? 1 : 0);
+    CheckDlgButton(hWnd, chx1, (*lpFlags & FR_WHOLEWORD) ? 1 : 0);
     if (*lpFlags & (FR_HIDEWHOLEWORD | FR_NOWHOLEWORD))
-	EnableWindow32(GetDlgItem32(hWnd, chx1), FALSE);
+	EnableWindow(GetDlgItem(hWnd, chx1), FALSE);
     if (*lpFlags & FR_HIDEWHOLEWORD)
-	ShowWindow32(GetDlgItem32(hWnd, chx1), SW_HIDE);
-    CheckDlgButton32(hWnd, chx2, (*lpFlags & FR_MATCHCASE) ? 1 : 0);
+	ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE);
+    CheckDlgButton(hWnd, chx2, (*lpFlags & FR_MATCHCASE) ? 1 : 0);
     if (*lpFlags & (FR_HIDEMATCHCASE | FR_NOMATCHCASE))
-	EnableWindow32(GetDlgItem32(hWnd, chx2), FALSE);
+	EnableWindow(GetDlgItem(hWnd, chx2), FALSE);
     if (*lpFlags & FR_HIDEMATCHCASE)
-	ShowWindow32(GetDlgItem32(hWnd, chx2), SW_HIDE);
+	ShowWindow(GetDlgItem(hWnd, chx2), SW_HIDE);
     if (!(*lpFlags & FR_SHOWHELP)) {
-	EnableWindow32(GetDlgItem32(hWnd, pshHelp), FALSE);
-	ShowWindow32(GetDlgItem32(hWnd, pshHelp), SW_HIDE);
+	EnableWindow(GetDlgItem(hWnd, pshHelp), FALSE);
+	ShowWindow(GetDlgItem(hWnd, pshHelp), SW_HIDE);
     }
-    ShowWindow32(hWnd, SW_SHOWNORMAL);
+    ShowWindow(hWnd, SW_SHOWNORMAL);
     return TRUE;
 }    
 
@@ -1314,89 +1314,89 @@ static LRESULT REPLACEDLG_WMInitDialog(HWND32 hWnd, LPARAM lParam,
 /***********************************************************************
  *                              REPLACEDLG_WMCommand            [internal]
  */
-static LRESULT REPLACEDLG_WMCommand(HWND32 hWnd, WPARAM16 wParam,
-		    HWND32 hwndOwner, LPDWORD lpFlags,
+static LRESULT REPLACEDLG_WMCommand(HWND hWnd, WPARAM16 wParam,
+		    HWND hwndOwner, LPDWORD lpFlags,
 		    LPSTR lpstrFindWhat, WORD wFindWhatLen,
 		    LPSTR lpstrReplaceWith, WORD wReplaceWithLen,
-		    BOOL32 fUnicode)
+		    BOOL fUnicode)
 {
-    int uFindReplaceMessage = RegisterWindowMessage32A( FINDMSGSTRING );
-    int uHelpMessage = RegisterWindowMessage32A( HELPMSGSTRING );
+    int uFindReplaceMessage = RegisterWindowMessageA( FINDMSGSTRING );
+    int uHelpMessage = RegisterWindowMessageA( HELPMSGSTRING );
 
     switch (wParam) {
 	case IDOK:
 	    if (fUnicode)
 	    {
-		GetDlgItemText32W(hWnd, edt1, (LPWSTR)lpstrFindWhat, wFindWhatLen/2);
-		GetDlgItemText32W(hWnd, edt2, (LPWSTR)lpstrReplaceWith, wReplaceWithLen/2);
+		GetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat, wFindWhatLen/2);
+		GetDlgItemTextW(hWnd, edt2, (LPWSTR)lpstrReplaceWith, wReplaceWithLen/2);
 	    }  else
 	    {
-		GetDlgItemText32A(hWnd, edt1, lpstrFindWhat, wFindWhatLen);
-		GetDlgItemText32A(hWnd, edt2, lpstrReplaceWith, wReplaceWithLen);
+		GetDlgItemTextA(hWnd, edt1, lpstrFindWhat, wFindWhatLen);
+		GetDlgItemTextA(hWnd, edt2, lpstrReplaceWith, wReplaceWithLen);
 	    }
-	    if (IsDlgButtonChecked32(hWnd, chx1))
+	    if (IsDlgButtonChecked(hWnd, chx1))
 		*lpFlags |= FR_WHOLEWORD; 
 		else *lpFlags &= ~FR_WHOLEWORD;
-	    if (IsDlgButtonChecked32(hWnd, chx2))
+	    if (IsDlgButtonChecked(hWnd, chx2))
 		*lpFlags |= FR_MATCHCASE; 
 		else *lpFlags &= ~FR_MATCHCASE;
             *lpFlags &= ~(FR_REPLACE | FR_REPLACEALL | FR_DIALOGTERM);
 	    *lpFlags |= FR_FINDNEXT;
-	    SendMessage32A(hwndOwner, uFindReplaceMessage, 0,
-                          GetWindowLong32A(hWnd, DWL_USER) );
+	    SendMessageA(hwndOwner, uFindReplaceMessage, 0,
+                          GetWindowLongA(hWnd, DWL_USER) );
 	    return TRUE;
 	case IDCANCEL:
             *lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_REPLACEALL);
 	    *lpFlags |= FR_DIALOGTERM;
-	    SendMessage32A(hwndOwner, uFindReplaceMessage, 0,
-                          GetWindowLong32A(hWnd, DWL_USER) );
-	    DestroyWindow32(hWnd);
+	    SendMessageA(hwndOwner, uFindReplaceMessage, 0,
+                          GetWindowLongA(hWnd, DWL_USER) );
+	    DestroyWindow(hWnd);
 	    return TRUE;
 	case psh1:
 	    if (fUnicode)
 	    {
-		GetDlgItemText32W(hWnd, edt1, (LPWSTR)lpstrFindWhat, wFindWhatLen/2);
-		GetDlgItemText32W(hWnd, edt2, (LPWSTR)lpstrReplaceWith, wReplaceWithLen/2);
+		GetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat, wFindWhatLen/2);
+		GetDlgItemTextW(hWnd, edt2, (LPWSTR)lpstrReplaceWith, wReplaceWithLen/2);
 	    }  else
 	    {	
-		GetDlgItemText32A(hWnd, edt1, lpstrFindWhat, wFindWhatLen);
-		GetDlgItemText32A(hWnd, edt2, lpstrReplaceWith, wReplaceWithLen);
+		GetDlgItemTextA(hWnd, edt1, lpstrFindWhat, wFindWhatLen);
+		GetDlgItemTextA(hWnd, edt2, lpstrReplaceWith, wReplaceWithLen);
 	    }
-	    if (IsDlgButtonChecked32(hWnd, chx1))
+	    if (IsDlgButtonChecked(hWnd, chx1))
 		*lpFlags |= FR_WHOLEWORD; 
 		else *lpFlags &= ~FR_WHOLEWORD;
-	    if (IsDlgButtonChecked32(hWnd, chx2))
+	    if (IsDlgButtonChecked(hWnd, chx2))
 		*lpFlags |= FR_MATCHCASE; 
 		else *lpFlags &= ~FR_MATCHCASE;
             *lpFlags &= ~(FR_FINDNEXT | FR_REPLACEALL | FR_DIALOGTERM);
 	    *lpFlags |= FR_REPLACE;
-	    SendMessage32A(hwndOwner, uFindReplaceMessage, 0,
-                          GetWindowLong32A(hWnd, DWL_USER) );
+	    SendMessageA(hwndOwner, uFindReplaceMessage, 0,
+                          GetWindowLongA(hWnd, DWL_USER) );
 	    return TRUE;
 	case psh2:
 	    if (fUnicode)
 	    {
-		GetDlgItemText32W(hWnd, edt1, (LPWSTR)lpstrFindWhat, wFindWhatLen/2);
-		GetDlgItemText32W(hWnd, edt2, (LPWSTR)lpstrReplaceWith, wReplaceWithLen/2);
+		GetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat, wFindWhatLen/2);
+		GetDlgItemTextW(hWnd, edt2, (LPWSTR)lpstrReplaceWith, wReplaceWithLen/2);
 	    }  else
 	    {
-		GetDlgItemText32A(hWnd, edt1, lpstrFindWhat, wFindWhatLen);
-		GetDlgItemText32A(hWnd, edt2, lpstrReplaceWith, wReplaceWithLen);
+		GetDlgItemTextA(hWnd, edt1, lpstrFindWhat, wFindWhatLen);
+		GetDlgItemTextA(hWnd, edt2, lpstrReplaceWith, wReplaceWithLen);
 	    }
-	    if (IsDlgButtonChecked32(hWnd, chx1))
+	    if (IsDlgButtonChecked(hWnd, chx1))
 		*lpFlags |= FR_WHOLEWORD; 
 		else *lpFlags &= ~FR_WHOLEWORD;
-	    if (IsDlgButtonChecked32(hWnd, chx2))
+	    if (IsDlgButtonChecked(hWnd, chx2))
 		*lpFlags |= FR_MATCHCASE; 
 		else *lpFlags &= ~FR_MATCHCASE;
             *lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_DIALOGTERM);
 	    *lpFlags |= FR_REPLACEALL;
-	    SendMessage32A(hwndOwner, uFindReplaceMessage, 0,
-                          GetWindowLong32A(hWnd, DWL_USER) );
+	    SendMessageA(hwndOwner, uFindReplaceMessage, 0,
+                          GetWindowLongA(hWnd, DWL_USER) );
 	    return TRUE;
 	case pshHelp:
 	    /* FIXME : should lpfr structure be passed as an argument ??? */
-	    SendMessage32A(hwndOwner, uHelpMessage, 0, 0);
+	    SendMessageA(hwndOwner, uHelpMessage, 0, 0);
 	    return TRUE;
     }
     return FALSE;
@@ -1417,7 +1417,7 @@ LRESULT WINAPI ReplaceTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 		    PTR_SEG_TO_LIN(lpfr->lpstrFindWhat),
 		    PTR_SEG_TO_LIN(lpfr->lpstrReplaceWith), FALSE);
 	case WM_COMMAND:
-	    lpfr=(LPFINDREPLACE16)PTR_SEG_TO_LIN(GetWindowLong32A(hWnd, DWL_USER));
+	    lpfr=(LPFINDREPLACE16)PTR_SEG_TO_LIN(GetWindowLongA(hWnd, DWL_USER));
 	    return REPLACEDLG_WMCommand(hWnd, wParam, lpfr->hwndOwner, 
 		    &lpfr->Flags, PTR_SEG_TO_LIN(lpfr->lpstrFindWhat),
 		    lpfr->wFindWhatLen, PTR_SEG_TO_LIN(lpfr->lpstrReplaceWith),
@@ -1429,17 +1429,17 @@ LRESULT WINAPI ReplaceTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 /***********************************************************************
  *           ReplaceTextDlgProc32A
  */ 
-LRESULT WINAPI ReplaceTextDlgProc32A(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam,
+LRESULT WINAPI ReplaceTextDlgProcA(HWND hWnd, UINT wMsg, WPARAM wParam,
                                     LPARAM lParam)
 {
-    LPFINDREPLACE32A lpfr;
+    LPFINDREPLACEA lpfr;
     switch (wMsg) {
 	case WM_INITDIALOG:
-            lpfr=(LPFINDREPLACE32A)lParam;
+            lpfr=(LPFINDREPLACEA)lParam;
 	    return REPLACEDLG_WMInitDialog(hWnd, lParam, &lpfr->Flags,
 		    lpfr->lpstrFindWhat, lpfr->lpstrReplaceWith, FALSE);
 	case WM_COMMAND:
-	    lpfr=(LPFINDREPLACE32A)GetWindowLong32A(hWnd, DWL_USER);
+	    lpfr=(LPFINDREPLACEA)GetWindowLongA(hWnd, DWL_USER);
 	    return REPLACEDLG_WMCommand(hWnd, wParam, lpfr->hwndOwner, 
 		    &lpfr->Flags, lpfr->lpstrFindWhat, lpfr->wFindWhatLen,
 		    lpfr->lpstrReplaceWith, lpfr->wReplaceWithLen, FALSE);
@@ -1450,18 +1450,18 @@ LRESULT WINAPI ReplaceTextDlgProc32A(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam,
 /***********************************************************************
  *           ReplaceTextDlgProc32W
  */ 
-LRESULT WINAPI ReplaceTextDlgProc32W(HWND32 hWnd, UINT32 wMsg, WPARAM32 wParam,
+LRESULT WINAPI ReplaceTextDlgProcW(HWND hWnd, UINT wMsg, WPARAM wParam,
                                     LPARAM lParam)
 {
-    LPFINDREPLACE32W lpfr;
+    LPFINDREPLACEW lpfr;
     switch (wMsg) {
 	case WM_INITDIALOG:
-            lpfr=(LPFINDREPLACE32W)lParam;
+            lpfr=(LPFINDREPLACEW)lParam;
 	    return REPLACEDLG_WMInitDialog(hWnd, lParam, &lpfr->Flags,
 		    (LPSTR)lpfr->lpstrFindWhat, (LPSTR)lpfr->lpstrReplaceWith,
 		    TRUE);
 	case WM_COMMAND:
-	    lpfr=(LPFINDREPLACE32W)GetWindowLong32A(hWnd, DWL_USER);
+	    lpfr=(LPFINDREPLACEW)GetWindowLongA(hWnd, DWL_USER);
 	    return REPLACEDLG_WMCommand(hWnd, wParam, lpfr->hwndOwner, 
 		    &lpfr->Flags, (LPSTR)lpfr->lpstrFindWhat, lpfr->wFindWhatLen,
 		    (LPSTR)lpfr->lpstrReplaceWith, lpfr->wReplaceWithLen, TRUE);
@@ -1478,7 +1478,7 @@ BOOL16 WINAPI PrintDlg16( SEGPTR printdlg )
     HANDLE16 hInst;
     BOOL16 bRet = FALSE;
     LPCVOID template;
-    HWND32 hwndDialog;
+    HWND hwndDialog;
     LPPRINTDLG16 lpPrint = (LPPRINTDLG16)PTR_SEG_TO_LIN(printdlg);
 
     TRACE(commdlg,"(%p) -- Flags=%08lX\n", lpPrint, lpPrint->Flags );
@@ -1507,7 +1507,7 @@ BOOL16 WINAPI PrintDlg16( SEGPTR printdlg )
 /***********************************************************************
  *           PrintDlg32A   (COMDLG32.17)
  */
-BOOL32 WINAPI PrintDlg32A( LPPRINTDLG32A printdlg )
+BOOL WINAPI PrintDlgA( LPPRINTDLGA printdlg )
 {
     FIXME(commdlg, "(%p): stub\n",printdlg);
     /* Altough returning FALSE is theoricaly the right thing
@@ -1523,7 +1523,7 @@ BOOL32 WINAPI PrintDlg32A( LPPRINTDLG32A printdlg )
 /***********************************************************************
  *           PrintDlg32W   (COMDLG32.18)
  */
-BOOL32 WINAPI PrintDlg32W( LPPRINTDLG32W printdlg )
+BOOL WINAPI PrintDlgW( LPPRINTDLGW printdlg )
 {
     FIXME(commdlg, "empty stub\n" );
     return FALSE;
@@ -1533,7 +1533,7 @@ BOOL32 WINAPI PrintDlg32W( LPPRINTDLG32W printdlg )
 /***********************************************************************
  *           PrintDlgProc   (COMMDLG.21)
  */
-LRESULT WINAPI PrintDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
+LRESULT WINAPI PrintDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                             LPARAM lParam)
 {
   switch (wMsg)
@@ -1546,10 +1546,10 @@ LRESULT WINAPI PrintDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
       switch (wParam)
 	{
 	case IDOK:
-	  EndDialog32(hWnd, TRUE);
+	  EndDialog(hWnd, TRUE);
 	  return(TRUE);
 	case IDCANCEL:
-	  EndDialog32(hWnd, FALSE);
+	  EndDialog(hWnd, FALSE);
 	  return(TRUE);
 	}
       return(FALSE);
@@ -1561,7 +1561,7 @@ LRESULT WINAPI PrintDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 /***********************************************************************
  *           PrintSetupDlgProc   (COMMDLG.22)
  */
-LRESULT WINAPI PrintSetupDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
+LRESULT WINAPI PrintSetupDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                  LPARAM lParam)
 {
   switch (wMsg)
@@ -1573,10 +1573,10 @@ LRESULT WINAPI PrintSetupDlgProc(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
     case WM_COMMAND:
       switch (wParam) {
       case IDOK:
-	EndDialog32(hWnd, TRUE);
+	EndDialog(hWnd, TRUE);
 	return(TRUE);
       case IDCANCEL:
-	EndDialog32(hWnd, FALSE);
+	EndDialog(hWnd, FALSE);
 	return(TRUE);
       }
       return(FALSE);
@@ -1596,7 +1596,7 @@ DWORD WINAPI CommDlgExtendedError(void)
 /***********************************************************************
  *           GetFileTitleA   (COMDLG32.8)
  */
-short WINAPI GetFileTitle32A(LPCSTR lpFile, LPSTR lpTitle, UINT32 cbBuf)
+short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf)
 {
     int i, len;
     TRACE(commdlg,"(%p %p %d); \n", lpFile, lpTitle, cbBuf);
@@ -1632,13 +1632,13 @@ short WINAPI GetFileTitle32A(LPCSTR lpFile, LPSTR lpTitle, UINT32 cbBuf)
 /***********************************************************************
  *           GetFileTitleA   (COMDLG32.8)
  */
-short WINAPI GetFileTitle32W(LPCWSTR lpFile, LPWSTR lpTitle, UINT32 cbBuf)
+short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf)
 {
 	LPSTR file = HEAP_strdupWtoA(GetProcessHeap(),0,lpFile);
 	LPSTR title = HeapAlloc(GetProcessHeap(),0,cbBuf);
 	short	ret;
 
-	ret = GetFileTitle32A(file,title,cbBuf);
+	ret = GetFileTitleA(file,title,cbBuf);
 
 	lstrcpynAtoW(lpTitle,title,cbBuf);
 	HeapFree(GetProcessHeap(),0,file);
@@ -1650,7 +1650,7 @@ short WINAPI GetFileTitle32W(LPCWSTR lpFile, LPWSTR lpTitle, UINT32 cbBuf)
  */
 short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf)
 {
-    return GetFileTitle32A(lpFile,lpTitle,cbBuf);
+    return GetFileTitleA(lpFile,lpTitle,cbBuf);
 }
 
 
@@ -1665,7 +1665,7 @@ BOOL16 WINAPI ChooseColor16(LPCHOOSECOLOR16 lpChCol)
     HANDLE16 hDlgTmpl = 0;
     BOOL16 bRet = FALSE, win32Format = FALSE;
     LPCVOID template;
-    HWND32 hwndDialog;
+    HWND hwndDialog;
 
     TRACE(commdlg,"ChooseColor\n");
     if (!lpChCol) return FALSE;    
@@ -1741,7 +1741,7 @@ struct CCPRIVATE
  UINT16 msetrgb;        /* # of SETRGBSTRING message (today not used)  */
  RECT16 old3angle;    /* last position of l-marker */
  RECT16 oldcross;     /* last position of color/satuation marker */
- BOOL32 updating;     /* to prevent recursive WM_COMMAND/EN_UPDATE procesing */
+ BOOL updating;     /* to prevent recursive WM_COMMAND/EN_UPDATE procesing */
  int h;
  int s;
  int l;               /* for temporary storing of hue,sat,lum */
@@ -1873,7 +1873,7 @@ static int CC_MouseCheckPredefColorArray(HWND16 hDlg,int dlgitem,int rows,int co
  int dx,dy,x,y;
 
  ClientToScreen16(hDlg,&point);
- hwnd=GetDlgItem32(hDlg,dlgitem);
+ hwnd=GetDlgItem(hDlg,dlgitem);
  GetWindowRect16(hwnd,&rect);
  if (PtInRect16(&rect,point))
  {
@@ -1905,7 +1905,7 @@ static int CC_MouseCheckUserColorArray(HWND16 hDlg,int dlgitem,int rows,int cols
  int dx,dy,x,y;
 
  ClientToScreen16(hDlg,&point);
- hwnd=GetDlgItem32(hDlg,dlgitem);
+ hwnd=GetDlgItem(hDlg,dlgitem);
  GetWindowRect16(hwnd,&rect);
  if (PtInRect16(&rect,point))
  {
@@ -1940,13 +1940,13 @@ static int CC_MouseCheckUserColorArray(HWND16 hDlg,int dlgitem,int rows,int cols
  */
 static int CC_MouseCheckColorGraph(HWND16 hDlg,int dlgitem,int *hori,int *vert,LPARAM lParam)
 {
- HWND32 hwnd;
+ HWND hwnd;
  POINT16 point = MAKEPOINT16(lParam);
  RECT16 rect;
  long x,y;
 
  ClientToScreen16(hDlg,&point);
- hwnd=GetDlgItem32(hDlg,dlgitem);
+ hwnd=GetDlgItem(hDlg,dlgitem);
  GetWindowRect16(hwnd,&rect);
  if (PtInRect16(&rect,point))
  {
@@ -1977,7 +1977,7 @@ static int CC_MouseCheckResultWindow(HWND16 hDlg,LPARAM lParam)
  RECT16 rect;
 
  ClientToScreen16(hDlg,&point);
- hwnd=GetDlgItem32(hDlg,0x2c5);
+ hwnd=GetDlgItem(hDlg,0x2c5);
  GetWindowRect16(hwnd,&rect);
  if (PtInRect16(&rect,point))
  {
@@ -1995,7 +1995,7 @@ static int CC_CheckDigitsInEdit(HWND16 hwnd,int maxval)
  int i,k,m,result,value;
  long editpos;
  char buffer[30];
- GetWindowText32A(hwnd,buffer,sizeof(buffer));
+ GetWindowTextA(hwnd,buffer,sizeof(buffer));
  m=strlen(buffer);
  result=0;
 
@@ -2020,7 +2020,7 @@ static int CC_CheckDigitsInEdit(HWND16 hwnd,int maxval)
  if (result)
  {
   editpos=SendMessage16(hwnd,EM_GETSEL16,0,0);
-  SetWindowText32A(hwnd,buffer);
+  SetWindowTextA(hwnd,buffer);
   SendMessage16(hwnd,EM_SETSEL16,0,editpos);
  }
  return value;
@@ -2034,28 +2034,28 @@ static int CC_CheckDigitsInEdit(HWND16 hwnd,int maxval)
 static void CC_PaintSelectedColor(HWND16 hDlg,COLORREF cr)
 {
  RECT16 rect;
- HDC32  hdc;
- HBRUSH32 hBrush;
- HWND32 hwnd=GetDlgItem32(hDlg,0x2c5);
- if (IsWindowVisible32(GetDlgItem32(hDlg,0x2c6)))   /* if full size */
+ HDC  hdc;
+ HBRUSH hBrush;
+ HWND hwnd=GetDlgItem(hDlg,0x2c5);
+ if (IsWindowVisible(GetDlgItem(hDlg,0x2c6)))   /* if full size */
  {
-  hdc=GetDC32(hwnd);
+  hdc=GetDC(hwnd);
   GetClientRect16 (hwnd, &rect) ;
-  hBrush = CreateSolidBrush32(cr);
+  hBrush = CreateSolidBrush(cr);
   if (hBrush)
   {
-   hBrush = SelectObject32 (hdc, hBrush) ;
-   Rectangle32(hdc, rect.left,rect.top,rect.right/2,rect.bottom);
-   DeleteObject32 (SelectObject32 (hdc,hBrush)) ;
-   hBrush=CreateSolidBrush32(GetNearestColor32(hdc,cr));
+   hBrush = SelectObject (hdc, hBrush) ;
+   Rectangle(hdc, rect.left,rect.top,rect.right/2,rect.bottom);
+   DeleteObject (SelectObject (hdc,hBrush)) ;
+   hBrush=CreateSolidBrush(GetNearestColor(hdc,cr));
    if (hBrush)
    {
-    hBrush= SelectObject32 (hdc, hBrush) ;
-    Rectangle32( hdc, rect.right/2-1,rect.top,rect.right,rect.bottom);
-    DeleteObject32( SelectObject32 (hdc, hBrush)) ;
+    hBrush= SelectObject (hdc, hBrush) ;
+    Rectangle( hdc, rect.right/2-1,rect.top,rect.right,rect.bottom);
+    DeleteObject( SelectObject (hdc, hBrush)) ;
    }
   }
-  ReleaseDC32(hwnd,hdc);
+  ReleaseDC(hwnd,hdc);
  }
 }
 
@@ -2064,21 +2064,21 @@ static void CC_PaintSelectedColor(HWND16 hDlg,COLORREF cr)
  */
 static void CC_PaintTriangle(HWND16 hDlg,int y)
 {
- HDC32 hDC;
+ HDC hDC;
  long temp;
  int w=GetDialogBaseUnits();
  POINT16 points[3];
  int height;
  int oben;
  RECT16 rect;
- HWND16 hwnd=GetDlgItem32(hDlg,0x2be);
- struct CCPRIVATE *lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+ HWND16 hwnd=GetDlgItem(hDlg,0x2be);
+ struct CCPRIVATE *lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
 
- if (IsWindowVisible32(GetDlgItem32(hDlg,0x2c6)))   /* if full size */
+ if (IsWindowVisible(GetDlgItem(hDlg,0x2c6)))   /* if full size */
  {
    GetClientRect16(hwnd,&rect);
    height=rect.bottom;
-   hDC=GetDC32(hDlg);
+   hDC=GetDC(hDlg);
 
    points[0].y=rect.top;
    points[0].x=rect.right;           /*  |  /|  */
@@ -2093,13 +2093,13 @@ static void CC_PaintTriangle(HWND16 hDlg,int y)
    points[2].x=points[1].x=points[0].x + w;
 
    if (lpp->old3angle.left)
-    FillRect16(hDC,&lpp->old3angle,GetStockObject32(WHITE_BRUSH));
+    FillRect16(hDC,&lpp->old3angle,GetStockObject(WHITE_BRUSH));
    lpp->old3angle.left  =points[0].x;
    lpp->old3angle.right =points[1].x+1;
    lpp->old3angle.top   =points[2].y-1;
    lpp->old3angle.bottom=points[1].y+1;
    Polygon16(hDC,points,3);
-   ReleaseDC32(hDlg,hDC);
+   ReleaseDC(hDlg,hDC);
  }
 }
 
@@ -2109,25 +2109,25 @@ static void CC_PaintTriangle(HWND16 hDlg,int y)
  */
 static void CC_PaintCross(HWND16 hDlg,int x,int y)
 {
- HDC32 hDC;
+ HDC hDC;
  int w=GetDialogBaseUnits();
- HWND16 hwnd=GetDlgItem32(hDlg,0x2c6);
- struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+ HWND16 hwnd=GetDlgItem(hDlg,0x2c6);
+ struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
  RECT16 rect;
  POINT16 point;
- HPEN32 hPen;
+ HPEN hPen;
 
- if (IsWindowVisible32(GetDlgItem32(hDlg,0x2c6)))   /* if full size */
+ if (IsWindowVisible(GetDlgItem(hDlg,0x2c6)))   /* if full size */
  {
    GetClientRect16(hwnd,&rect);
-   hDC=GetDC32(hwnd);
-   SelectClipRgn32(hDC,CreateRectRgnIndirect16(&rect));
-   hPen=CreatePen32(PS_SOLID,2,0);
-   hPen=SelectObject32(hDC,hPen);
+   hDC=GetDC(hwnd);
+   SelectClipRgn(hDC,CreateRectRgnIndirect16(&rect));
+   hPen=CreatePen(PS_SOLID,2,0);
+   hPen=SelectObject(hDC,hPen);
    point.x=((long)rect.right*(long)x)/(long)MAXHORI;
    point.y=rect.bottom-((long)rect.bottom*(long)y)/(long)MAXVERT;
    if (lpp->oldcross.left!=lpp->oldcross.right)
-     BitBlt32(hDC,lpp->oldcross.left,lpp->oldcross.top,
+     BitBlt(hDC,lpp->oldcross.left,lpp->oldcross.top,
               lpp->oldcross.right-lpp->oldcross.left,
               lpp->oldcross.bottom-lpp->oldcross.top,
               lpp->hdcMem,lpp->oldcross.left,lpp->oldcross.top,SRCCOPY);
@@ -2136,12 +2136,12 @@ static void CC_PaintCross(HWND16 hDlg,int x,int y)
    lpp->oldcross.top   =point.y-w-1;
    lpp->oldcross.bottom=point.y+w+1; 
 
-   MoveTo(hDC,point.x-w,point.y); 
-   LineTo32(hDC,point.x+w,point.y);
-   MoveTo(hDC,point.x,point.y-w); 
-   LineTo32(hDC,point.x,point.y+w);
-   DeleteObject32(SelectObject32(hDC,hPen));
-   ReleaseDC32(hwnd,hDC);
+   MoveTo16(hDC,point.x-w,point.y); 
+   LineTo(hDC,point.x+w,point.y);
+   MoveTo16(hDC,point.x,point.y-w); 
+   LineTo(hDC,point.x,point.y+w);
+   DeleteObject(SelectObject(hDC,hPen));
+   ReleaseDC(hwnd,hDC);
  }
 }
 
@@ -2156,18 +2156,18 @@ static void CC_PaintCross(HWND16 hDlg,int x,int y)
 static void CC_PrepareColorGraph(HWND16 hDlg)    
 {
  int sdif,hdif,xdif,ydif,r,g,b,hue,sat;
- HWND32 hwnd=GetDlgItem32(hDlg,0x2c6);
- struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER);  
- HBRUSH32 hbrush;
- HDC32 hdc ;
+ HWND hwnd=GetDlgItem(hDlg,0x2c6);
+ struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER);  
+ HBRUSH hbrush;
+ HDC hdc ;
  RECT16 rect,client;
  HCURSOR16 hcursor=SetCursor16(LoadCursor16(0,IDC_WAIT16));
 
  GetClientRect16(hwnd,&client);
- hdc=GetDC32(hwnd);
- lpp->hdcMem = CreateCompatibleDC32(hdc);
- lpp->hbmMem = CreateCompatibleBitmap32(hdc,client.right,client.bottom);
- SelectObject32(lpp->hdcMem,lpp->hbmMem);
+ hdc=GetDC(hwnd);
+ lpp->hdcMem = CreateCompatibleDC(hdc);
+ lpp->hbmMem = CreateCompatibleBitmap(hdc,client.right,client.bottom);
+ SelectObject(lpp->hdcMem,lpp->hbmMem);
 
  xdif=client.right /XSTEPS;
  ydif=client.bottom/YSTEPS+1;
@@ -2183,14 +2183,14 @@ static void CC_PrepareColorGraph(HWND16 hDlg)
    r=CC_HSLtoRGB('R',hue,sat,120);
    g=CC_HSLtoRGB('G',hue,sat,120);
    b=CC_HSLtoRGB('B',hue,sat,120);
-   hbrush=CreateSolidBrush32(RGB(r,g,b));
+   hbrush=CreateSolidBrush(RGB(r,g,b));
    FillRect16(lpp->hdcMem,&rect,hbrush);
-   DeleteObject32(hbrush);
+   DeleteObject(hbrush);
    rect.bottom=rect.top;
   }
   rect.left=rect.right;
  }
- ReleaseDC32(hwnd,hdc);
+ ReleaseDC(hwnd,hdc);
  SetCursor16(hcursor);
 }
 
@@ -2199,22 +2199,22 @@ static void CC_PrepareColorGraph(HWND16 hDlg)
  */
 static void CC_PaintColorGraph(HWND16 hDlg)
 {
- HWND32 hwnd=GetDlgItem32(hDlg,0x2c6);
- struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
- HDC32  hDC;
+ HWND hwnd=GetDlgItem(hDlg,0x2c6);
+ struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
+ HDC  hDC;
  RECT16 rect;
- if (IsWindowVisible32(hwnd))   /* if full size */
+ if (IsWindowVisible(hwnd))   /* if full size */
  {
   if (!lpp->hdcMem)
    CC_PrepareColorGraph(hDlg);   /* should not be necessary */
 
-  hDC=GetDC32(hwnd);
+  hDC=GetDC(hwnd);
   GetClientRect16(hwnd,&rect);
   if (lpp->hdcMem)
-      BitBlt32(hDC,0,0,rect.right,rect.bottom,lpp->hdcMem,0,0,SRCCOPY);
+      BitBlt(hDC,0,0,rect.right,rect.bottom,lpp->hdcMem,0,0,SRCCOPY);
   else
     WARN(commdlg,"choose color: hdcMem is not defined\n");
-  ReleaseDC32(hwnd,hDC);
+  ReleaseDC(hwnd,hDC);
  }
 }
 /***********************************************************************
@@ -2222,15 +2222,15 @@ static void CC_PaintColorGraph(HWND16 hDlg)
  */
 static void CC_PaintLumBar(HWND16 hDlg,int hue,int sat)
 {
- HWND32 hwnd=GetDlgItem32(hDlg,0x2be);
+ HWND hwnd=GetDlgItem(hDlg,0x2be);
  RECT16 rect,client;
  int lum,ldif,ydif,r,g,b;
- HBRUSH32 hbrush;
- HDC32 hDC;
+ HBRUSH hbrush;
+ HDC hDC;
 
- if (IsWindowVisible32(hwnd))
+ if (IsWindowVisible(hwnd))
  {
-  hDC=GetDC32(hwnd);
+  hDC=GetDC(hwnd);
   GetClientRect16(hwnd,&client);
   rect=client;
 
@@ -2242,14 +2242,14 @@ static void CC_PaintLumBar(HWND16 hDlg,int hue,int sat)
    r=CC_HSLtoRGB('R',hue,sat,lum);
    g=CC_HSLtoRGB('G',hue,sat,lum);
    b=CC_HSLtoRGB('B',hue,sat,lum);
-   hbrush=CreateSolidBrush32(RGB(r,g,b));
+   hbrush=CreateSolidBrush(RGB(r,g,b));
    FillRect16(hDC,&rect,hbrush);
-   DeleteObject32(hbrush);
+   DeleteObject(hbrush);
    rect.bottom=rect.top;
   }
   GetClientRect16(hwnd,&rect);
-  FrameRect16(hDC,&rect,GetStockObject32(BLACK_BRUSH));
-  ReleaseDC32(hwnd,hDC);
+  FrameRect16(hDC,&rect,GetStockObject(BLACK_BRUSH));
+  ReleaseDC(hwnd,hDC);
  }
 }
 
@@ -2259,19 +2259,19 @@ static void CC_PaintLumBar(HWND16 hDlg,int hue,int sat)
 static void CC_EditSetRGB(HWND16 hDlg,COLORREF cr)
 {
  char buffer[10];
- struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+ struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
  int r=GetRValue(cr);
  int g=GetGValue(cr);
  int b=GetBValue(cr);
- if (IsWindowVisible32(GetDlgItem32(hDlg,0x2c6)))   /* if full size */
+ if (IsWindowVisible(GetDlgItem(hDlg,0x2c6)))   /* if full size */
  {
    lpp->updating=TRUE;
    sprintf(buffer,"%d",r);
-   SetWindowText32A(GetDlgItem32(hDlg,0x2c2),buffer);
+   SetWindowTextA(GetDlgItem(hDlg,0x2c2),buffer);
    sprintf(buffer,"%d",g);
-   SetWindowText32A(GetDlgItem32(hDlg,0x2c3),buffer);
+   SetWindowTextA(GetDlgItem(hDlg,0x2c3),buffer);
    sprintf(buffer,"%d",b);
-   SetWindowText32A(GetDlgItem32(hDlg,0x2c4),buffer);
+   SetWindowTextA(GetDlgItem(hDlg,0x2c4),buffer);
    lpp->updating=FALSE;
  }
 }
@@ -2282,17 +2282,17 @@ static void CC_EditSetRGB(HWND16 hDlg,COLORREF cr)
 static void CC_EditSetHSL(HWND16 hDlg,int h,int s,int l)
 {
  char buffer[10];
- struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+ struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
  lpp->updating=TRUE;
- if (IsWindowVisible32(GetDlgItem32(hDlg,0x2c6)))   /* if full size */
+ if (IsWindowVisible(GetDlgItem(hDlg,0x2c6)))   /* if full size */
  {
    lpp->updating=TRUE;
    sprintf(buffer,"%d",h);
-   SetWindowText32A(GetDlgItem32(hDlg,0x2bf),buffer);
+   SetWindowTextA(GetDlgItem(hDlg,0x2bf),buffer);
    sprintf(buffer,"%d",s);
-   SetWindowText32A(GetDlgItem32(hDlg,0x2c0),buffer);
+   SetWindowTextA(GetDlgItem(hDlg,0x2c0),buffer);
    sprintf(buffer,"%d",l);
-   SetWindowText32A(GetDlgItem32(hDlg,0x2c1),buffer);
+   SetWindowTextA(GetDlgItem(hDlg,0x2c1),buffer);
    lpp->updating=FALSE;
  }
  CC_PaintLumBar(hDlg,h,s);
@@ -2304,24 +2304,24 @@ static void CC_EditSetHSL(HWND16 hDlg,int h,int s,int l)
 static void CC_SwitchToFullSize(HWND16 hDlg,COLORREF result,LPRECT16 lprect)
 {
  int i;
- struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+ struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
  
- EnableWindow32(GetDlgItem32(hDlg,0x2cf),FALSE);
+ EnableWindow(GetDlgItem(hDlg,0x2cf),FALSE);
  CC_PrepareColorGraph(hDlg);
  for (i=0x2bf;i<0x2c5;i++)
-   EnableWindow32(GetDlgItem32(hDlg,i),TRUE);
+   EnableWindow(GetDlgItem(hDlg,i),TRUE);
  for (i=0x2d3;i<0x2d9;i++)
-   EnableWindow32(GetDlgItem32(hDlg,i),TRUE);
- EnableWindow32(GetDlgItem32(hDlg,0x2c9),TRUE);
- EnableWindow32(GetDlgItem32(hDlg,0x2c8),TRUE);
+   EnableWindow(GetDlgItem(hDlg,i),TRUE);
+ EnableWindow(GetDlgItem(hDlg,0x2c9),TRUE);
+ EnableWindow(GetDlgItem(hDlg,0x2c8),TRUE);
 
  if (lprect)
-  SetWindowPos32(hDlg,0,0,0,lprect->right-lprect->left,
+  SetWindowPos(hDlg,0,0,0,lprect->right-lprect->left,
    lprect->bottom-lprect->top, SWP_NOMOVE|SWP_NOZORDER);
 
- ShowWindow32(GetDlgItem32(hDlg,0x2c6),SW_SHOW);
- ShowWindow32(GetDlgItem32(hDlg,0x2be),SW_SHOW);
- ShowWindow32(GetDlgItem32(hDlg,0x2c5),SW_SHOW);
+ ShowWindow(GetDlgItem(hDlg,0x2c6),SW_SHOW);
+ ShowWindow(GetDlgItem(hDlg,0x2be),SW_SHOW);
+ ShowWindow(GetDlgItem(hDlg,0x2c5),SW_SHOW);
 
  CC_EditSetRGB(hDlg,result);
  CC_EditSetHSL(hDlg,lpp->h,lpp->s,lpp->l);
@@ -2332,10 +2332,10 @@ static void CC_SwitchToFullSize(HWND16 hDlg,COLORREF result,LPRECT16 lprect)
  */
 static void CC_PaintPredefColorArray(HWND16 hDlg,int rows,int cols)
 {
- HWND32 hwnd=GetDlgItem32(hDlg,0x2d0);
+ HWND hwnd=GetDlgItem(hDlg,0x2d0);
  RECT16 rect;
- HDC32  hdc;
- HBRUSH32 hBrush;
+ HDC  hdc;
+ HBRUSH hBrush;
  int dx,dy,i,j,k;
 
  GetClientRect16(hwnd,&rect);
@@ -2343,27 +2343,27 @@ static void CC_PaintPredefColorArray(HWND16 hDlg,int rows,int cols)
  dy=rect.bottom/rows;
  k=rect.left;
 
- hdc=GetDC32(hwnd);
+ hdc=GetDC(hwnd);
  GetClientRect16 (hwnd, &rect) ;
 
  for (j=0;j<rows;j++)
  {
   for (i=0;i<cols;i++)
   {
-   hBrush = CreateSolidBrush32(predefcolors[j][i]);
+   hBrush = CreateSolidBrush(predefcolors[j][i]);
    if (hBrush)
    {
-    hBrush = SelectObject32 (hdc, hBrush) ;
-    Rectangle32(hdc, rect.left, rect.top,
+    hBrush = SelectObject (hdc, hBrush) ;
+    Rectangle(hdc, rect.left, rect.top,
                 rect.left+dx-DISTANCE, rect.top+dy-DISTANCE);
     rect.left=rect.left+dx;
-    DeleteObject32( SelectObject32 (hdc, hBrush)) ;
+    DeleteObject( SelectObject (hdc, hBrush)) ;
    }
   }
   rect.top=rect.top+dy;
   rect.left=k;
  }
- ReleaseDC32(hwnd,hdc);
+ ReleaseDC(hwnd,hdc);
  /* FIXME: draw_a_focus_rect */
 }
 /***********************************************************************
@@ -2371,10 +2371,10 @@ static void CC_PaintPredefColorArray(HWND16 hDlg,int rows,int cols)
  */
 static void CC_PaintUserColorArray(HWND16 hDlg,int rows,int cols,COLORREF* lpcr)
 {
- HWND32 hwnd=GetDlgItem32(hDlg,0x2d1);
+ HWND hwnd=GetDlgItem(hDlg,0x2d1);
  RECT16 rect;
- HDC32  hdc;
- HBRUSH32 hBrush;
+ HDC  hdc;
+ HBRUSH hBrush;
  int dx,dy,i,j,k;
 
  GetClientRect16(hwnd,&rect);
@@ -2383,27 +2383,27 @@ static void CC_PaintUserColorArray(HWND16 hDlg,int rows,int cols,COLORREF* lpcr)
  dy=rect.bottom/rows;
  k=rect.left;
 
- hdc=GetDC32(hwnd);
+ hdc=GetDC(hwnd);
  if (hdc)
  {
   for (j=0;j<rows;j++)
   {
    for (i=0;i<cols;i++)
    {
-    hBrush = CreateSolidBrush32(lpcr[i+j*cols]);
+    hBrush = CreateSolidBrush(lpcr[i+j*cols]);
     if (hBrush)
     {
-     hBrush = SelectObject32 (hdc, hBrush) ;
-     Rectangle32( hdc, rect.left, rect.top,
+     hBrush = SelectObject (hdc, hBrush) ;
+     Rectangle( hdc, rect.left, rect.top,
                   rect.left+dx-DISTANCE, rect.top+dy-DISTANCE);
      rect.left=rect.left+dx;
-     DeleteObject32( SelectObject32 (hdc, hBrush)) ;
+     DeleteObject( SelectObject (hdc, hBrush)) ;
     }
    }
    rect.top=rect.top+dy;
    rect.left=k;
   }
-  ReleaseDC32(hwnd,hdc);
+  ReleaseDC(hwnd,hdc);
  }
  /* FIXME: draw_a_focus_rect */
 }
@@ -2413,7 +2413,7 @@ static void CC_PaintUserColorArray(HWND16 hDlg,int rows,int cols,COLORREF* lpcr)
 /***********************************************************************
  *                             CC_HookCallChk                 [internal]
  */
-static BOOL32 CC_HookCallChk(LPCHOOSECOLOR16 lpcc)
+static BOOL CC_HookCallChk(LPCHOOSECOLOR16 lpcc)
 {
  if (lpcc)
   if(lpcc->Flags & CC_ENABLEHOOK)
@@ -2440,14 +2440,14 @@ static LONG CC_WMInitDialog(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
 
    if (lpp->lpcc->lStructSize != sizeof(CHOOSECOLOR16))
    {
-      EndDialog32 (hDlg, 0) ;
+      EndDialog (hDlg, 0) ;
       return FALSE;
    }
-   SetWindowLong32A(hDlg, DWL_USER, (LONG)lpp); 
+   SetWindowLongA(hDlg, DWL_USER, (LONG)lpp); 
 
    if (!(lpp->lpcc->Flags & CC_SHOWHELP))
-      ShowWindow32(GetDlgItem32(hDlg,0x40e),SW_HIDE);
-   lpp->msetrgb=RegisterWindowMessage32A( SETRGBSTRING );
+      ShowWindow(GetDlgItem(hDlg,0x40e),SW_HIDE);
+   lpp->msetrgb=RegisterWindowMessageA( SETRGBSTRING );
 
 #if 0
    cpos=MAKELONG(5,7); /* init */
@@ -2468,29 +2468,29 @@ static LONG CC_WMInitDialog(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
    GetWindowRect16(hDlg,&lpp->fullsize);
    if (lpp->lpcc->Flags & CC_FULLOPEN || lpp->lpcc->Flags & CC_PREVENTFULLOPEN)
    {
-      hwnd=GetDlgItem32(hDlg,0x2cf);
-      EnableWindow32(hwnd,FALSE);
+      hwnd=GetDlgItem(hDlg,0x2cf);
+      EnableWindow(hwnd,FALSE);
    }
    if (!(lpp->lpcc->Flags & CC_FULLOPEN) || lpp->lpcc->Flags & CC_PREVENTFULLOPEN)
    {
       rect=lpp->fullsize;
       res=rect.bottom-rect.top;
-      hwnd=GetDlgItem32(hDlg,0x2c6); /* cut at left border */
+      hwnd=GetDlgItem(hDlg,0x2c6); /* cut at left border */
       point.x=point.y=0;
       ClientToScreen16(hwnd,&point);
       ScreenToClient16(hDlg,&point);
       GetClientRect16(hDlg,&rect);
-      point.x+=GetSystemMetrics32(SM_CXDLGFRAME);
-      SetWindowPos32(hDlg,0,0,0,point.x,res,SWP_NOMOVE|SWP_NOZORDER);
+      point.x+=GetSystemMetrics(SM_CXDLGFRAME);
+      SetWindowPos(hDlg,0,0,0,point.x,res,SWP_NOMOVE|SWP_NOZORDER);
 
-      ShowWindow32(GetDlgItem32(hDlg,0x2c6),SW_HIDE);
-      ShowWindow32(GetDlgItem32(hDlg,0x2c5),SW_HIDE);
+      ShowWindow(GetDlgItem(hDlg,0x2c6),SW_HIDE);
+      ShowWindow(GetDlgItem(hDlg,0x2c5),SW_HIDE);
    }
    else
       CC_SwitchToFullSize(hDlg,lpp->lpcc->rgbResult,NULL);
    res=TRUE;
    for (i=0x2bf;i<0x2c5;i++)
-     SendMessage16(GetDlgItem32(hDlg,i),EM_LIMITTEXT16,3,0);      /* max 3 digits:  xyz  */
+     SendMessage16(GetDlgItem(hDlg,i),EM_LIMITTEXT16,3,0);      /* max 3 digits:  xyz  */
    if (CC_HookCallChk(lpp->lpcc))
       res=CallWindowProc16(lpp->lpcc->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
 
@@ -2506,12 +2506,12 @@ static LONG CC_WMInitDialog(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
    lpp->l=CC_RGBtoHSL('L',r,g,b);
 
    /* Doing it the long way becaus CC_EditSetRGB/HSL doesn'nt seem to work */
-   SetDlgItemInt32(hDlg, 703, lpp->h, TRUE);
-   SetDlgItemInt32(hDlg, 704, lpp->s, TRUE);
-   SetDlgItemInt32(hDlg, 705, lpp->l, TRUE);
-   SetDlgItemInt32(hDlg, 706, r, TRUE);
-   SetDlgItemInt32(hDlg, 707, g, TRUE);
-   SetDlgItemInt32(hDlg, 708, b, TRUE);
+   SetDlgItemInt(hDlg, 703, lpp->h, TRUE);
+   SetDlgItemInt(hDlg, 704, lpp->s, TRUE);
+   SetDlgItemInt(hDlg, 705, lpp->l, TRUE);
+   SetDlgItemInt(hDlg, 706, r, TRUE);
+   SetDlgItemInt(hDlg, 707, g, TRUE);
+   SetDlgItemInt(hDlg, 708, b, TRUE);
 
    CC_PaintCross(hDlg,lpp->h,lpp->s);
    CC_PaintTriangle(hDlg,lpp->l);
@@ -2526,9 +2526,9 @@ static LRESULT CC_WMCommand(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
 {
     int r,g,b,i,xx;
     UINT16 cokmsg;
-    HDC32 hdc;
+    HDC hdc;
     COLORREF *cr;
-    struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+    struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
     TRACE(commdlg,"CC_WMCommand wParam=%x lParam=%lx\n",wParam,lParam);
     switch (wParam)
     {
@@ -2591,8 +2591,8 @@ static LRESULT CC_WMCommand(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
 	       
           case 0x2cf:
                CC_SwitchToFullSize(hDlg,lpp->lpcc->rgbResult,&lpp->fullsize);
-	       InvalidateRect32( hDlg, NULL, TRUE );
-	       SetFocus32(GetDlgItem32(hDlg,0x2bf));
+	       InvalidateRect( hDlg, NULL, TRUE );
+	       SetFocus(GetDlgItem(hDlg,0x2bf));
 	       break;
 
           case 0x2c8:    /* add colors ... column by column */
@@ -2604,9 +2604,9 @@ static LRESULT CC_WMCommand(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
 	       break;
 
           case 0x2c9:              /* resulting color */
-	       hdc=GetDC32(hDlg);
-	       lpp->lpcc->rgbResult=GetNearestColor32(hdc,lpp->lpcc->rgbResult);
-	       ReleaseDC32(hDlg,hdc);
+	       hdc=GetDC(hDlg);
+	       lpp->lpcc->rgbResult=GetNearestColor(hdc,lpp->lpcc->rgbResult);
+	       ReleaseDC(hDlg,hdc);
 	       CC_EditSetRGB(hDlg,lpp->lpcc->rgbResult);
 	       CC_PaintSelectedColor(hDlg,lpp->lpcc->rgbResult);
 	       r=GetRValue(lpp->lpcc->rgbResult);
@@ -2621,7 +2621,7 @@ static LRESULT CC_WMCommand(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
 	       break;
 
 	  case 0x40e:           /* Help! */ /* The Beatles, 1965  ;-) */
-	       i=RegisterWindowMessage32A( HELPMSGSTRING );
+	       i=RegisterWindowMessageA( HELPMSGSTRING );
 	       if (lpp->lpcc->hwndOwner)
 		   SendMessage16(lpp->lpcc->hwndOwner,i,0,(LPARAM)lpp->lpcc);
 	       if (CC_HookCallChk(lpp->lpcc))
@@ -2630,16 +2630,16 @@ static LRESULT CC_WMCommand(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
 	       break;
 
           case IDOK :
-		cokmsg=RegisterWindowMessage32A( COLOROKSTRING );
+		cokmsg=RegisterWindowMessageA( COLOROKSTRING );
 		if (lpp->lpcc->hwndOwner)
 			if (SendMessage16(lpp->lpcc->hwndOwner,cokmsg,0,(LPARAM)lpp->lpcc))
 			   break;    /* do NOT close */
 
-		EndDialog32 (hDlg, 1) ;
+		EndDialog (hDlg, 1) ;
 		return TRUE ;
 	
 	  case IDCANCEL :
-		EndDialog32 (hDlg, 0) ;
+		EndDialog (hDlg, 0) ;
 		return TRUE ;
 
        }
@@ -2651,12 +2651,12 @@ static LRESULT CC_WMCommand(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
  */
 static LRESULT CC_WMPaint(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam) 
 {
-    HDC32 hdc;
-    PAINTSTRUCT32 ps;
-    struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+    HDC hdc;
+    PAINTSTRUCT ps;
+    struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
 
-    hdc=BeginPaint32(hDlg,&ps);
-    EndPaint32(hDlg,&ps);
+    hdc=BeginPaint(hDlg,&ps);
+    EndPaint(hDlg,&ps);
     /* we have to paint dialog children except text and buttons */
  
     CC_PaintPredefColorArray(hDlg,6,8);
@@ -2668,11 +2668,11 @@ static LRESULT CC_WMPaint(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
     CC_PaintSelectedColor(hDlg,lpp->lpcc->rgbResult);
 
     /* special necessary for Wine */
-    ValidateRect32(GetDlgItem32(hDlg,0x2d0),NULL);
-    ValidateRect32(GetDlgItem32(hDlg,0x2d1),NULL);
-    ValidateRect32(GetDlgItem32(hDlg,0x2c6),NULL);
-    ValidateRect32(GetDlgItem32(hDlg,0x2be),NULL);
-    ValidateRect32(GetDlgItem32(hDlg,0x2c5),NULL);
+    ValidateRect(GetDlgItem(hDlg,0x2d0),NULL);
+    ValidateRect(GetDlgItem(hDlg,0x2d1),NULL);
+    ValidateRect(GetDlgItem(hDlg,0x2c6),NULL);
+    ValidateRect(GetDlgItem(hDlg,0x2be),NULL);
+    ValidateRect(GetDlgItem(hDlg,0x2c5),NULL);
     /* hope we can remove it later -->FIXME */
  return TRUE;
 }
@@ -2683,7 +2683,7 @@ static LRESULT CC_WMPaint(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
  */
 static LRESULT CC_WMLButtonDown(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam) 
 {
-   struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+   struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
    int r,g,b,i;
    i=0;
    if (CC_MouseCheckPredefColorArray(hDlg,0x2d0,6,8,lParam,&lpp->lpcc->rgbResult))
@@ -2729,11 +2729,11 @@ static LRESULT CC_WMLButtonDown(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
 /***********************************************************************
  *           ColorDlgProc   (COMMDLG.8)
  */
-LRESULT WINAPI ColorDlgProc(HWND16 hDlg, UINT16 message,
+LRESULT WINAPI ColorDlgProc16(HWND16 hDlg, UINT16 message,
                             WPARAM16 wParam, LONG lParam)
 {
  int res;
- struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+ struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLongA(hDlg, DWL_USER); 
  if (message!=WM_INITDIALOG)
  {
   if (!lpp)
@@ -2755,10 +2755,10 @@ LRESULT WINAPI ColorDlgProc(HWND16 hDlg, UINT16 message,
 	  case WM_INITDIALOG:
 	                return CC_WMInitDialog(hDlg,wParam,lParam);
 	  case WM_NCDESTROY:
-	                DeleteDC32(lpp->hdcMem); 
-	                DeleteObject32(lpp->hbmMem); 
+	                DeleteDC(lpp->hdcMem); 
+	                DeleteObject(lpp->hbmMem); 
 	                free(lpp);
-	                SetWindowLong32A(hDlg, DWL_USER, 0L); /* we don't need it anymore */
+	                SetWindowLongA(hDlg, DWL_USER, 0L); /* we don't need it anymore */
 	                break;
 	  case WM_COMMAND:
 	                if (CC_WMCommand(hDlg, wParam, lParam))
@@ -2784,9 +2784,9 @@ LRESULT WINAPI ColorDlgProc(HWND16 hDlg, UINT16 message,
      return FALSE ;
 }
 
-static void CFn_CHOOSEFONT16to32A(LPCHOOSEFONT16 chf16, LPCHOOSEFONT32A chf32a)
+static void CFn_CHOOSEFONT16to32A(LPCHOOSEFONT16 chf16, LPCHOOSEFONTA chf32a)
 {
-  chf32a->lStructSize=sizeof(CHOOSEFONT32A);
+  chf32a->lStructSize=sizeof(CHOOSEFONTA);
   chf32a->hwndOwner=chf16->hwndOwner;
   chf32a->hDC=chf16->hDC;
   chf32a->iPointSize=chf16->iPointSize;
@@ -2813,9 +2813,9 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
     HANDLE16 hDlgTmpl = 0;
     BOOL16 bRet = FALSE, win32Format = FALSE;
     LPCVOID template;
-    HWND32 hwndDialog;
-    CHOOSEFONT32A cf32a;
-    LOGFONT32A lf32a;
+    HWND hwndDialog;
+    CHOOSEFONTA cf32a;
+    LOGFONTA lf32a;
     SEGPTR lpTemplateName;
     
     cf32a.lpLogFont=&lf32a;
@@ -2877,16 +2877,16 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
 /***********************************************************************
  *           ChooseFont32A   (COMDLG32.3)
  */
-BOOL32 WINAPI ChooseFont32A(LPCHOOSEFONT32A lpChFont)
+BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont)
 {
-  BOOL32 bRet=FALSE;
-  HWND32 hwndDialog;
-  HINSTANCE32 hInst=WIN_GetWindowInstance( lpChFont->hwndOwner );
+  BOOL bRet=FALSE;
+  HWND hwndDialog;
+  HINSTANCE hInst=WIN_GetWindowInstance( lpChFont->hwndOwner );
   LPCVOID template = SYSRES_GetResPtr( SYSRES_DIALOG_CHOOSE_FONT );
   if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS | CF_ENABLETEMPLATE |
     CF_ENABLETEMPLATEHANDLE)) FIXME(commdlg, ": unimplemented flag (ignored)\n");
   hwndDialog = DIALOG_CreateIndirect(hInst, template, TRUE, lpChFont->hwndOwner,
-            (DLGPROC16)FormatCharDlgProc32A, (LPARAM)lpChFont, WIN_PROC_32A );
+            (DLGPROC16)FormatCharDlgProcA, (LPARAM)lpChFont, WIN_PROC_32A );
   if (hwndDialog) bRet = DIALOG_DoDialogBox(hwndDialog, lpChFont->hwndOwner);  
   return bRet;
 }
@@ -2894,28 +2894,28 @@ BOOL32 WINAPI ChooseFont32A(LPCHOOSEFONT32A lpChFont)
 /***********************************************************************
  *           ChooseFont32W   (COMDLG32.4)
  */
-BOOL32 WINAPI ChooseFont32W(LPCHOOSEFONT32W lpChFont)
+BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont)
 {
-  BOOL32 bRet=FALSE;
-  HWND32 hwndDialog;
-  HINSTANCE32 hInst=WIN_GetWindowInstance( lpChFont->hwndOwner );
-  CHOOSEFONT32A cf32a;
-  LOGFONT32A lf32a;
+  BOOL bRet=FALSE;
+  HWND hwndDialog;
+  HINSTANCE hInst=WIN_GetWindowInstance( lpChFont->hwndOwner );
+  CHOOSEFONTA cf32a;
+  LOGFONTA lf32a;
   LPCVOID template = SYSRES_GetResPtr( SYSRES_DIALOG_CHOOSE_FONT );
   if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS | CF_ENABLETEMPLATE |
     CF_ENABLETEMPLATEHANDLE)) FIXME(commdlg, ": unimplemented flag (ignored)\n");
   memcpy(&cf32a, lpChFont, sizeof(cf32a));
-  memcpy(&lf32a, lpChFont->lpLogFont, sizeof(LOGFONT32A));
+  memcpy(&lf32a, lpChFont->lpLogFont, sizeof(LOGFONTA));
   lstrcpynWtoA(lf32a.lfFaceName, lpChFont->lpLogFont->lfFaceName, LF_FACESIZE);
   cf32a.lpLogFont=&lf32a;
   cf32a.lpszStyle=HEAP_strdupWtoA(GetProcessHeap(), 0, lpChFont->lpszStyle);
   lpChFont->lpTemplateName=(LPWSTR)&cf32a;
   hwndDialog=DIALOG_CreateIndirect(hInst, template, TRUE, lpChFont->hwndOwner,
-            (DLGPROC16)FormatCharDlgProc32W, (LPARAM)lpChFont, WIN_PROC_32W );
+            (DLGPROC16)FormatCharDlgProcW, (LPARAM)lpChFont, WIN_PROC_32W );
   if (hwndDialog)bRet=DIALOG_DoDialogBox(hwndDialog, lpChFont->hwndOwner);  
   HeapFree(GetProcessHeap(), 0, cf32a.lpszStyle);
   lpChFont->lpTemplateName=(LPWSTR)cf32a.lpTemplateName;
-  memcpy(lpChFont->lpLogFont, &lf32a, sizeof(CHOOSEFONT32A));
+  memcpy(lpChFont->lpLogFont, &lf32a, sizeof(CHOOSEFONTA));
   lstrcpynAtoW(lpChFont->lpLogFont->lfFaceName, lf32a.lfFaceName, LF_FACESIZE);
   return bRet;
 }
@@ -2935,7 +2935,7 @@ static const COLORREF textcolors[TEXT_COLORS]=
 /***********************************************************************
  *                          CFn_HookCallChk                 [internal]
  */
-static BOOL32 CFn_HookCallChk(LPCHOOSEFONT16 lpcf)
+static BOOL CFn_HookCallChk(LPCHOOSEFONT16 lpcf)
 {
  if (lpcf)
   if(lpcf->Flags & CF_ENABLEHOOK)
@@ -2947,7 +2947,7 @@ static BOOL32 CFn_HookCallChk(LPCHOOSEFONT16 lpcf)
 /***********************************************************************
  *                          CFn_HookCallChk32                 [internal]
  */
-static BOOL32 CFn_HookCallChk32(LPCHOOSEFONT32A lpcf)
+static BOOL CFn_HookCallChk32(LPCHOOSEFONTA lpcf)
 {
  if (lpcf)
   if(lpcf->Flags & CF_ENABLEHOOK)
@@ -2960,8 +2960,8 @@ static BOOL32 CFn_HookCallChk32(LPCHOOSEFONT32A lpcf)
 /*************************************************************************
  *              AddFontFamily                               [internal]
  */
-static INT32 AddFontFamily(LPLOGFONT32A lplf, UINT32 nFontType, 
-                           LPCHOOSEFONT32A lpcf, HWND32 hwnd)
+static INT AddFontFamily(LPLOGFONTA lplf, UINT nFontType, 
+                           LPCHOOSEFONTA lpcf, HWND hwnd)
 {
   int i;
   WORD w;
@@ -2978,11 +2978,11 @@ static INT32 AddFontFamily(LPLOGFONT32A lplf, UINT32 nFontType,
    if (!(nFontType & TRUETYPE_FONTTYPE))
      return 1;   
 
-  i=SendMessage32A(hwnd, CB_ADDSTRING32, 0, (LPARAM)lplf->lfFaceName);
+  i=SendMessageA(hwnd, CB_ADDSTRING, 0, (LPARAM)lplf->lfFaceName);
   if (i!=CB_ERR)
   {
     w=(lplf->lfCharSet << 8) | lplf->lfPitchAndFamily;
-    SendMessage32A(hwnd, CB_SETITEMDATA32, i, MAKELONG(nFontType,w));
+    SendMessageA(hwnd, CB_SETITEMDATA, i, MAKELONG(nFontType,w));
     return 1 ;        /* store some important font information */
   }
   else
@@ -2991,16 +2991,16 @@ static INT32 AddFontFamily(LPLOGFONT32A lplf, UINT32 nFontType,
 
 typedef struct
 {
-  HWND32 hWnd1;
-  HWND32 hWnd2;
-  LPCHOOSEFONT32A lpcf32a;
+  HWND hWnd1;
+  HWND hWnd2;
+  LPCHOOSEFONTA lpcf32a;
 } CFn_ENUMSTRUCT, *LPCFn_ENUMSTRUCT;
 
 /*************************************************************************
  *              FontFamilyEnumProc32                           [internal]
  */
-INT32 WINAPI FontFamilyEnumProc32(LPENUMLOGFONT32A lpEnumLogFont, 
-	  LPNEWTEXTMETRIC32A metrics, UINT32 nFontType, LPARAM lParam)
+INT WINAPI FontFamilyEnumProc(LPENUMLOGFONTA lpEnumLogFont, 
+	  LPNEWTEXTMETRICA metrics, UINT nFontType, LPARAM lParam)
 {
   LPCFn_ENUMSTRUCT e;
   e=(LPCFn_ENUMSTRUCT)lParam;
@@ -3015,11 +3015,11 @@ INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics,
 {
   HWND16 hwnd=LOWORD(lParam);
   HWND16 hDlg=GetParent16(hwnd);
-  LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLong32A(hDlg, DWL_USER); 
+  LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER); 
   LOGFONT16 *lplf = (LOGFONT16 *)PTR_SEG_TO_LIN( logfont );
-  LOGFONT32A lf32a;
+  LOGFONTA lf32a;
   FONT_LogFont16To32A(lplf, &lf32a);
-  return AddFontFamily(&lf32a, nFontType, (LPCHOOSEFONT32A)lpcf->lpTemplateName,
+  return AddFontFamily(&lf32a, nFontType, (LPCHOOSEFONTA)lpcf->lpTemplateName,
                        hwnd);
 }
 
@@ -3028,7 +3028,7 @@ INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics,
  *
  * Fill font style information into combobox  (without using font.c directly)
  */
-static int SetFontStylesToCombo2(HWND32 hwnd, HDC32 hdc, LPLOGFONT32A lplf)
+static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, LPLOGFONTA lplf)
 {
    #define FSTYLES 4
    struct FONTSTYLE
@@ -3046,11 +3046,11 @@ static int SetFontStylesToCombo2(HWND32 hwnd, HDC32 hdc, LPLOGFONT32A lplf)
    {
      lplf->lfItalic=fontstyles[i].italic;
      lplf->lfWeight=fontstyles[i].weight;
-     hf=CreateFontIndirect32A(lplf);
-     hf=SelectObject32(hdc,hf);
+     hf=CreateFontIndirectA(lplf);
+     hf=SelectObject(hdc,hf);
      GetTextMetrics16(hdc,&tm);
-     hf=SelectObject32(hdc,hf);
-     DeleteObject32(hf);
+     hf=SelectObject(hdc,hf);
+     DeleteObject(hf);
 
      if (tm.tmWeight==fontstyles[i].weight &&
          tm.tmItalic==fontstyles[i].italic)    /* font successful created ? */
@@ -3070,7 +3070,7 @@ static int SetFontStylesToCombo2(HWND32 hwnd, HDC32 hdc, LPLOGFONT32A lplf)
 /*************************************************************************
  *              AddFontSizeToCombo3                           [internal]
  */
-static int AddFontSizeToCombo3(HWND32 hwnd, UINT32 h, LPCHOOSEFONT32A lpcf)
+static int AddFontSizeToCombo3(HWND hwnd, UINT h, LPCHOOSEFONTA lpcf)
 {
     int j;
     char buffer[20];
@@ -3079,11 +3079,11 @@ static int AddFontSizeToCombo3(HWND32 hwnd, UINT32 h, LPCHOOSEFONT32A lpcf)
         ((lpcf->Flags & CF_LIMITSIZE) && (h >= lpcf->nSizeMin) && (h <= lpcf->nSizeMax)))
     {
         sprintf(buffer, "%2d", h);
-	j=SendMessage32A(hwnd, CB_FINDSTRINGEXACT32, -1, (LPARAM)buffer);
+	j=SendMessageA(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer);
 	if (j==CB_ERR)
 	{
-    	    j=SendMessage32A(hwnd, CB_ADDSTRING32, 0, (LPARAM)buffer);	
-    	    if (j!=CB_ERR) j = SendMessage32A(hwnd, CB_SETITEMDATA32, j, h); 
+    	    j=SendMessageA(hwnd, CB_ADDSTRING, 0, (LPARAM)buffer);	
+    	    if (j!=CB_ERR) j = SendMessageA(hwnd, CB_SETITEMDATA, j, h); 
     	    if (j==CB_ERR) return 1;
 	}
     }
@@ -3093,7 +3093,7 @@ static int AddFontSizeToCombo3(HWND32 hwnd, UINT32 h, LPCHOOSEFONT32A lpcf)
 /*************************************************************************
  *              SetFontSizesToCombo3                           [internal]
  */
-static int SetFontSizesToCombo3(HWND32 hwnd, LPCHOOSEFONT32A lpcf)
+static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTA lpcf)
 {
   static const int sizes[]={8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72,0};
   int i;
@@ -3106,8 +3106,8 @@ static int SetFontSizesToCombo3(HWND32 hwnd, LPCHOOSEFONT32A lpcf)
 /***********************************************************************
  *                 AddFontStyle                          [internal]
  */
-INT32 AddFontStyle(LPLOGFONT32A lplf, UINT32 nFontType, 
-    LPCHOOSEFONT32A lpcf, HWND32 hcmb2, HWND32 hcmb3, HWND32 hDlg)
+INT AddFontStyle(LPLOGFONTA lplf, UINT nFontType, 
+    LPCHOOSEFONTA lpcf, HWND hcmb2, HWND hcmb3, HWND hDlg)
 {
   int i;
   
@@ -3124,12 +3124,12 @@ INT32 AddFontStyle(LPLOGFONT32A lplf, UINT32 nFontType,
     if (AddFontSizeToCombo3(hcmb3, lplf->lfHeight, lpcf)) return 0;
   } else if (SetFontSizesToCombo3(hcmb3, lpcf)) return 0;
 
-  if (!SendMessage32A(hcmb2, CB_GETCOUNT32, 0, 0))
+  if (!SendMessageA(hcmb2, CB_GETCOUNT, 0, 0))
   {
-       HDC32 hdc= (lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC32(hDlg);
+       HDC hdc= (lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
        i=SetFontStylesToCombo2(hcmb2,hdc,lplf);
        if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
-         ReleaseDC32(hDlg,hdc);
+         ReleaseDC(hDlg,hdc);
        if (i)
         return 0;
   }
@@ -3146,24 +3146,24 @@ INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics,
   HWND16 hcmb2=LOWORD(lParam);
   HWND16 hcmb3=HIWORD(lParam);
   HWND16 hDlg=GetParent16(hcmb3);
-  LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLong32A(hDlg, DWL_USER); 
+  LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER); 
   LOGFONT16 *lplf = (LOGFONT16 *)PTR_SEG_TO_LIN(logfont);
-  LOGFONT32A lf32a;
+  LOGFONTA lf32a;
   FONT_LogFont16To32A(lplf, &lf32a);
-  return AddFontStyle(&lf32a, nFontType, (LPCHOOSEFONT32A)lpcf->lpTemplateName,
+  return AddFontStyle(&lf32a, nFontType, (LPCHOOSEFONTA)lpcf->lpTemplateName,
                       hcmb2, hcmb3, hDlg);
 }
 
 /***********************************************************************
  *                 FontStyleEnumProc32                     [internal]
  */
-INT32 WINAPI FontStyleEnumProc32( LPENUMLOGFONT32A lpFont, 
-          LPNEWTEXTMETRIC32A metrics, UINT32 nFontType, LPARAM lParam )
+INT WINAPI FontStyleEnumProc( LPENUMLOGFONTA lpFont, 
+          LPNEWTEXTMETRICA metrics, UINT nFontType, LPARAM lParam )
 {
   LPCFn_ENUMSTRUCT s=(LPCFn_ENUMSTRUCT)lParam;
-  HWND32 hcmb2=s->hWnd1;
-  HWND32 hcmb3=s->hWnd2;
-  HWND32 hDlg=GetParent32(hcmb3);
+  HWND hcmb2=s->hWnd1;
+  HWND hcmb3=s->hWnd2;
+  HWND hDlg=GetParent(hcmb3);
   return AddFontStyle(&lpFont->elfLogFont, nFontType, s->lpcf32a, hcmb2,
                       hcmb3, hDlg);
 }
@@ -3171,36 +3171,36 @@ INT32 WINAPI FontStyleEnumProc32( LPENUMLOGFONT32A lpFont,
 /***********************************************************************
  *           CFn_WMInitDialog                            [internal]
  */
-LRESULT CFn_WMInitDialog(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam,
-                         LPCHOOSEFONT32A lpcf)
+LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
+                         LPCHOOSEFONTA lpcf)
 {
-  HDC32 hdc;
+  HDC hdc;
   int i,j,res,init=0;
   long l;
-  LPLOGFONT32A lpxx;
-  HCURSOR32 hcursor=SetCursor32(LoadCursor32A(0,IDC_WAIT32A));
+  LPLOGFONTA lpxx;
+  HCURSOR hcursor=SetCursor(LoadCursorA(0,IDC_WAITA));
 
-  SetWindowLong32A(hDlg, DWL_USER, lParam); 
+  SetWindowLongA(hDlg, DWL_USER, lParam); 
   lpxx=lpcf->lpLogFont;
   TRACE(commdlg,"WM_INITDIALOG lParam=%08lX\n", lParam);
 
-  if (lpcf->lStructSize != sizeof(CHOOSEFONT32A))
+  if (lpcf->lStructSize != sizeof(CHOOSEFONTA))
   {
     ERR(commdlg,"structure size failure !!!\n");
-    EndDialog32 (hDlg, 0); 
+    EndDialog (hDlg, 0); 
     return FALSE;
   }
   if (!hBitmapTT)
-    hBitmapTT = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_TRTYPE));
+    hBitmapTT = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_TRTYPE));
 
   /* This font will be deleted by WM_COMMAND */
-  SendDlgItemMessage32A(hDlg,stc6,WM_SETFONT,
-     CreateFont32A(0, 0, 1, 1, 400, 0, 0, 0, 0, 0, 0, 0, 0, NULL),FALSE);
+  SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,
+     CreateFontA(0, 0, 1, 1, 400, 0, 0, 0, 0, 0, 0, 0, 0, NULL),FALSE);
 			 
-  if (!(lpcf->Flags & CF_SHOWHELP) || !IsWindow32(lpcf->hwndOwner))
-    ShowWindow32(GetDlgItem32(hDlg,pshHelp),SW_HIDE);
+  if (!(lpcf->Flags & CF_SHOWHELP) || !IsWindow(lpcf->hwndOwner))
+    ShowWindow(GetDlgItem(hDlg,pshHelp),SW_HIDE);
   if (!(lpcf->Flags & CF_APPLY))
-    ShowWindow32(GetDlgItem32(hDlg,psh3),SW_HIDE);
+    ShowWindow(GetDlgItem(hDlg,psh3),SW_HIDE);
   if (lpcf->Flags & CF_EFFECTS)
   {
     for (res=1,i=0;res && i<TEXT_COLORS;i++)
@@ -3208,83 +3208,83 @@ LRESULT CFn_WMInitDialog(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam,
       /* FIXME: load color name from resource:  res=LoadString(...,i+....,buffer,.....); */
       char name[20];
       strcpy( name, "[color name]" );
-      j=SendDlgItemMessage32A(hDlg, cmb4, CB_ADDSTRING32, 0, (LPARAM)name);
-      SendDlgItemMessage32A(hDlg, cmb4, CB_SETITEMDATA16, j, textcolors[j]);
+      j=SendDlgItemMessageA(hDlg, cmb4, CB_ADDSTRING, 0, (LPARAM)name);
+      SendDlgItemMessageA(hDlg, cmb4, CB_SETITEMDATA16, j, textcolors[j]);
       /* look for a fitting value in color combobox */
       if (textcolors[j]==lpcf->rgbColors)
-        SendDlgItemMessage32A(hDlg,cmb4, CB_SETCURSEL32,j,0);
+        SendDlgItemMessageA(hDlg,cmb4, CB_SETCURSEL,j,0);
     }
   }
   else
   {
-    ShowWindow32(GetDlgItem32(hDlg,cmb4),SW_HIDE);
-    ShowWindow32(GetDlgItem32(hDlg,chx1),SW_HIDE);
-    ShowWindow32(GetDlgItem32(hDlg,chx2),SW_HIDE);
-    ShowWindow32(GetDlgItem32(hDlg,grp1),SW_HIDE);
-    ShowWindow32(GetDlgItem32(hDlg,stc4),SW_HIDE);
+    ShowWindow(GetDlgItem(hDlg,cmb4),SW_HIDE);
+    ShowWindow(GetDlgItem(hDlg,chx1),SW_HIDE);
+    ShowWindow(GetDlgItem(hDlg,chx2),SW_HIDE);
+    ShowWindow(GetDlgItem(hDlg,grp1),SW_HIDE);
+    ShowWindow(GetDlgItem(hDlg,stc4),SW_HIDE);
   }
-  hdc= (lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC32(hDlg);
+  hdc= (lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
   if (hdc)
   {
     CFn_ENUMSTRUCT s;
-    s.hWnd1=GetDlgItem32(hDlg,cmb1);
+    s.hWnd1=GetDlgItem(hDlg,cmb1);
     s.lpcf32a=lpcf;
-    if (!EnumFontFamilies32A(hdc, NULL, FontFamilyEnumProc32, (LPARAM)&s))
+    if (!EnumFontFamiliesA(hdc, NULL, FontFamilyEnumProc, (LPARAM)&s))
       TRACE(commdlg,"EnumFontFamilies returns 0\n");
     if (lpcf->Flags & CF_INITTOLOGFONTSTRUCT)
     {
       /* look for fitting font name in combobox1 */
-      j=SendDlgItemMessage32A(hDlg,cmb1,CB_FINDSTRING32,-1,(LONG)lpxx->lfFaceName);
+      j=SendDlgItemMessageA(hDlg,cmb1,CB_FINDSTRING,-1,(LONG)lpxx->lfFaceName);
       if (j!=CB_ERR)
       {
-        SendDlgItemMessage32A(hDlg, cmb1, CB_SETCURSEL32, j, 0);
-	SendMessage32A(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE),
-                       GetDlgItem32(hDlg,cmb1));
+        SendDlgItemMessageA(hDlg, cmb1, CB_SETCURSEL, j, 0);
+	SendMessageA(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE),
+                       GetDlgItem(hDlg,cmb1));
         init=1;
         /* look for fitting font style in combobox2 */
         l=MAKELONG(lpxx->lfWeight > FW_MEDIUM ? FW_BOLD:FW_NORMAL,lpxx->lfItalic !=0);
         for (i=0;i<TEXT_EXTRAS;i++)
         {
-          if (l==SendDlgItemMessage32A(hDlg, cmb2, CB_GETITEMDATA32, i, 0))
-            SendDlgItemMessage32A(hDlg, cmb2, CB_SETCURSEL32, i, 0);
+          if (l==SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0))
+            SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0);
         }
       
         /* look for fitting font size in combobox3 */
-        j=SendDlgItemMessage32A(hDlg, cmb3, CB_GETCOUNT32, 0, 0);
+        j=SendDlgItemMessageA(hDlg, cmb3, CB_GETCOUNT, 0, 0);
         for (i=0;i<j;i++)
         {
-          if (lpxx->lfHeight==(int)SendDlgItemMessage32A(hDlg,cmb3, CB_GETITEMDATA32,i,0))
-            SendDlgItemMessage32A(hDlg,cmb3,CB_SETCURSEL32,i,0);
+          if (lpxx->lfHeight==(int)SendDlgItemMessageA(hDlg,cmb3, CB_GETITEMDATA,i,0))
+            SendDlgItemMessageA(hDlg,cmb3,CB_SETCURSEL,i,0);
         }
       }
     }
     if (!init)
     {
-      SendDlgItemMessage32A(hDlg,cmb1,CB_SETCURSEL32,0,0);
-      SendMessage32A(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE),
-                       GetDlgItem32(hDlg,cmb1));
+      SendDlgItemMessageA(hDlg,cmb1,CB_SETCURSEL,0,0);
+      SendMessageA(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE),
+                       GetDlgItem(hDlg,cmb1));
     }    
     if (lpcf->Flags & CF_USESTYLE && lpcf->lpszStyle)
     {
-      j=SendDlgItemMessage32A(hDlg,cmb2,CB_FINDSTRING32,-1,(LONG)lpcf->lpszStyle);
+      j=SendDlgItemMessageA(hDlg,cmb2,CB_FINDSTRING,-1,(LONG)lpcf->lpszStyle);
       if (j!=CB_ERR)
       {
-        j=SendDlgItemMessage32A(hDlg,cmb2,CB_SETCURSEL32,j,0);
-        SendMessage32A(hDlg,WM_COMMAND,cmb2,
-                       MAKELONG(GetDlgItem32(hDlg,cmb2),CBN_SELCHANGE));
+        j=SendDlgItemMessageA(hDlg,cmb2,CB_SETCURSEL,j,0);
+        SendMessageA(hDlg,WM_COMMAND,cmb2,
+                       MAKELONG(GetDlgItem(hDlg,cmb2),CBN_SELCHANGE));
       }
     }
   }
   else
   {
     WARN(commdlg,"HDC failure !!!\n");
-    EndDialog32 (hDlg, 0); 
+    EndDialog (hDlg, 0); 
     return FALSE;
   }
 
   if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
-    ReleaseDC32(hDlg,hdc);
-  SetCursor32(hcursor);   
+    ReleaseDC(hDlg,hdc);
+  SetCursor(hcursor);   
   return TRUE;
 }
 
@@ -3292,13 +3292,13 @@ LRESULT CFn_WMInitDialog(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam,
 /***********************************************************************
  *           CFn_WMMeasureItem                           [internal]
  */
-LRESULT CFn_WMMeasureItem(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam)
+LRESULT CFn_WMMeasureItem(HWND hDlg, WPARAM wParam, LPARAM lParam)
 {
-  BITMAP32 bm;
-  LPMEASUREITEMSTRUCT32 lpmi=(LPMEASUREITEMSTRUCT32)lParam;
+  BITMAP bm;
+  LPMEASUREITEMSTRUCT lpmi=(LPMEASUREITEMSTRUCT)lParam;
   if (!hBitmapTT)
-    hBitmapTT = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_TRTYPE));
-  GetObject32A( hBitmapTT, sizeof(bm), &bm );
+    hBitmapTT = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_TRTYPE));
+  GetObjectA( hBitmapTT, sizeof(bm), &bm );
   lpmi->itemHeight=bm.bmHeight;
   /* FIXME: use MAX of bm.bmHeight and tm.tmHeight .*/
   return 0;
@@ -3308,37 +3308,37 @@ LRESULT CFn_WMMeasureItem(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam)
 /***********************************************************************
  *           CFn_WMDrawItem                              [internal]
  */
-LRESULT CFn_WMDrawItem(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam)
+LRESULT CFn_WMDrawItem(HWND hDlg, WPARAM wParam, LPARAM lParam)
 {
-  HBRUSH32 hBrush;
+  HBRUSH hBrush;
   char buffer[40];
-  BITMAP32 bm;
+  BITMAP bm;
   COLORREF cr, oldText=0, oldBk=0;
-  RECT32 rect;
+  RECT rect;
 #if 0  
-  HDC32 hMemDC;
+  HDC hMemDC;
   int nFontType;
-  HBITMAP32 hBitmap; /* for later TT usage */
+  HBITMAP hBitmap; /* for later TT usage */
 #endif  
-  LPDRAWITEMSTRUCT32 lpdi = (LPDRAWITEMSTRUCT32)lParam;
+  LPDRAWITEMSTRUCT lpdi = (LPDRAWITEMSTRUCT)lParam;
 
   if (lpdi->itemID == 0xFFFF) 			/* got no items */
-    DrawFocusRect32(lpdi->hDC, &lpdi->rcItem);
+    DrawFocusRect(lpdi->hDC, &lpdi->rcItem);
   else
   {
    if (lpdi->CtlType == ODT_COMBOBOX)
    {
      if (lpdi->itemState ==ODS_SELECTED)
      {
-       hBrush=GetSysColorBrush32(COLOR_HIGHLIGHT);
-       oldText=SetTextColor32(lpdi->hDC, GetSysColor32(COLOR_HIGHLIGHTTEXT));
-       oldBk=SetBkColor32(lpdi->hDC, GetSysColor32(COLOR_HIGHLIGHT));
+       hBrush=GetSysColorBrush(COLOR_HIGHLIGHT);
+       oldText=SetTextColor(lpdi->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+       oldBk=SetBkColor(lpdi->hDC, GetSysColor(COLOR_HIGHLIGHT));
      }  else
      {
-       hBrush = SelectObject32(lpdi->hDC, GetStockObject32(LTGRAY_BRUSH));
-       SelectObject32(lpdi->hDC, hBrush);
+       hBrush = SelectObject(lpdi->hDC, GetStockObject(LTGRAY_BRUSH));
+       SelectObject(lpdi->hDC, hBrush);
      }
-     FillRect32(lpdi->hDC, &lpdi->rcItem, hBrush);
+     FillRect(lpdi->hDC, &lpdi->rcItem, hBrush);
    }
    else
      return TRUE;	/* this should never happen */
@@ -3347,50 +3347,50 @@ LRESULT CFn_WMDrawItem(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam)
    switch (lpdi->CtlID)
    {
     case cmb1:	/* TRACE(commdlg,"WM_Drawitem cmb1\n"); */
-		SendMessage32A(lpdi->hwndItem, CB_GETLBTEXT32, lpdi->itemID,
+		SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
 			       (LPARAM)buffer);	          
-		GetObject32A( hBitmapTT, sizeof(bm), &bm );
-		TextOut32A(lpdi->hDC, lpdi->rcItem.left + bm.bmWidth + 10,
-                           lpdi->rcItem.top, buffer, lstrlen32A(buffer));
+		GetObjectA( hBitmapTT, sizeof(bm), &bm );
+		TextOutA(lpdi->hDC, lpdi->rcItem.left + bm.bmWidth + 10,
+                           lpdi->rcItem.top, buffer, lstrlenA(buffer));
 #if 0
-		nFontType = SendMessage32A(lpdi->hwndItem, CB_GETITEMDATA32, lpdi->itemID,0L);
+		nFontType = SendMessageA(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L);
 		  /* FIXME: draw bitmap if truetype usage */
 		if (nFontType&TRUETYPE_FONTTYPE)
 		{
-		  hMemDC = CreateCompatibleDC32(lpdi->hDC);
-		  hBitmap = SelectObject32(hMemDC, hBitmapTT);
-		  BitBlt32(lpdi->hDC, lpdi->rcItem.left, lpdi->rcItem.top,
+		  hMemDC = CreateCompatibleDC(lpdi->hDC);
+		  hBitmap = SelectObject(hMemDC, hBitmapTT);
+		  BitBlt(lpdi->hDC, lpdi->rcItem.left, lpdi->rcItem.top,
                            bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, SRCCOPY);
-		  SelectObject32(hMemDC, hBitmap);
-		  DeleteDC32(hMemDC);
+		  SelectObject(hMemDC, hBitmap);
+		  DeleteDC(hMemDC);
 		}
 #endif
 		break;
     case cmb2:
     case cmb3:	/* TRACE(commdlg,"WM_DRAWITEN cmb2,cmb3\n"); */
-		SendMessage32A(lpdi->hwndItem, CB_GETLBTEXT32, lpdi->itemID,
+		SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
 		               (LPARAM)buffer);
-		TextOut32A(lpdi->hDC, lpdi->rcItem.left,
-                           lpdi->rcItem.top, buffer, lstrlen32A(buffer));
+		TextOutA(lpdi->hDC, lpdi->rcItem.left,
+                           lpdi->rcItem.top, buffer, lstrlenA(buffer));
 		break;
 
     case cmb4:	/* TRACE(commdlg,"WM_DRAWITEM cmb4 (=COLOR)\n"); */
-		SendMessage32A(lpdi->hwndItem, CB_GETLBTEXT32, lpdi->itemID,
+		SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
     		               (LPARAM)buffer);
-		TextOut32A(lpdi->hDC, lpdi->rcItem.left +  25+5,
-                           lpdi->rcItem.top, buffer, lstrlen32A(buffer));
-		cr = SendMessage32A(lpdi->hwndItem, CB_GETITEMDATA32, lpdi->itemID,0L);
-		hBrush = CreateSolidBrush32(cr);
+		TextOutA(lpdi->hDC, lpdi->rcItem.left +  25+5,
+                           lpdi->rcItem.top, buffer, lstrlenA(buffer));
+		cr = SendMessageA(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L);
+		hBrush = CreateSolidBrush(cr);
 		if (hBrush)
 		{
-		  hBrush = SelectObject32 (lpdi->hDC, hBrush) ;
+		  hBrush = SelectObject (lpdi->hDC, hBrush) ;
 		  rect.right=rect.left+25;
 		  rect.top++;
 		  rect.left+=5;
 		  rect.bottom--;
-		  Rectangle32( lpdi->hDC, rect.left, rect.top,
+		  Rectangle( lpdi->hDC, rect.left, rect.top,
                                rect.right, rect.bottom );
-		  DeleteObject32( SelectObject32 (lpdi->hDC, hBrush)) ;
+		  DeleteObject( SelectObject (lpdi->hDC, hBrush)) ;
 		}
 		rect=lpdi->rcItem;
 		rect.left+=25+5;
@@ -3400,8 +3400,8 @@ LRESULT CFn_WMDrawItem(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam)
    }
    if (lpdi->itemState == ODS_SELECTED)
    {
-     SetTextColor32(lpdi->hDC, oldText);
-     SetBkColor32(lpdi->hDC, oldBk);
+     SetTextColor(lpdi->hDC, oldText);
+     SetBkColor(lpdi->hDC, oldBk);
    }
  }
  return TRUE;
@@ -3410,14 +3410,14 @@ LRESULT CFn_WMDrawItem(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam)
 /***********************************************************************
  *           CFn_WMCtlColor                              [internal]
  */
-LRESULT CFn_WMCtlColorStatic(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam,
-                             LPCHOOSEFONT32A lpcf)
+LRESULT CFn_WMCtlColorStatic(HWND hDlg, WPARAM wParam, LPARAM lParam,
+                             LPCHOOSEFONTA lpcf)
 {
   if (lpcf->Flags & CF_EFFECTS)
-   if (GetDlgCtrlID32(lParam)==stc6)
+   if (GetDlgCtrlID(lParam)==stc6)
    {
-     SetTextColor32((HDC32)wParam, lpcf->rgbColors);
-     return GetStockObject32(WHITE_BRUSH);
+     SetTextColor((HDC)wParam, lpcf->rgbColors);
+     return GetStockObject(WHITE_BRUSH);
    }
   return 0;
 }
@@ -3425,47 +3425,47 @@ LRESULT CFn_WMCtlColorStatic(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam,
 /***********************************************************************
  *           CFn_WMCommand                               [internal]
  */
-LRESULT CFn_WMCommand(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam,
-                      LPCHOOSEFONT32A lpcf)
+LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
+                      LPCHOOSEFONTA lpcf)
 {
-  HFONT32 hFont;
+  HFONT hFont;
   int i,j;
   long l;
-  HDC32 hdc;
-  LPLOGFONT32A lpxx=lpcf->lpLogFont;
+  HDC hdc;
+  LPLOGFONTA lpxx=lpcf->lpLogFont;
   
   TRACE(commdlg,"WM_COMMAND wParam=%08lX lParam=%08lX\n", (LONG)wParam, lParam);
   switch (LOWORD(wParam))
   {
 	case cmb1:if (HIWORD(wParam)==CBN_SELCHANGE)
 		  {
-		    hdc=(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC32(hDlg);
+		    hdc=(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
 		    if (hdc)
 		    {
-                      SendDlgItemMessage32A(hDlg, cmb2, CB_RESETCONTENT16, 0, 0); 
-		      SendDlgItemMessage32A(hDlg, cmb3, CB_RESETCONTENT16, 0, 0);
-		      i=SendDlgItemMessage32A(hDlg, cmb1, CB_GETCURSEL16, 0, 0);
+                      SendDlgItemMessageA(hDlg, cmb2, CB_RESETCONTENT16, 0, 0); 
+		      SendDlgItemMessageA(hDlg, cmb3, CB_RESETCONTENT16, 0, 0);
+		      i=SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL16, 0, 0);
 		      if (i!=CB_ERR)
 		      {
-		        HCURSOR32 hcursor=SetCursor32(LoadCursor32A(0,IDC_WAIT32A));
+		        HCURSOR hcursor=SetCursor(LoadCursorA(0,IDC_WAITA));
 			CFn_ENUMSTRUCT s;
                         char str[256];
-                        SendDlgItemMessage32A(hDlg, cmb1, CB_GETLBTEXT32, i,
+                        SendDlgItemMessageA(hDlg, cmb1, CB_GETLBTEXT, i,
                                               (LPARAM)str);
 	                TRACE(commdlg,"WM_COMMAND/cmb1 =>%s\n",str);
-			s.hWnd1=GetDlgItem32(hDlg, cmb2);
-			s.hWnd2=GetDlgItem32(hDlg, cmb3);
+			s.hWnd1=GetDlgItem(hDlg, cmb2);
+			s.hWnd2=GetDlgItem(hDlg, cmb3);
 			s.lpcf32a=lpcf;
-       		        EnumFontFamilies32A(hdc, str, FontStyleEnumProc32, (LPARAM)&s);
-		        SetCursor32(hcursor);
+       		        EnumFontFamiliesA(hdc, str, FontStyleEnumProc, (LPARAM)&s);
+		        SetCursor(hcursor);
 		      }
 		      if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
- 		        ReleaseDC32(hDlg,hdc);
+ 		        ReleaseDC(hDlg,hdc);
  		    }
  		    else
                     {
                       WARN(commdlg,"HDC failure !!!\n");
-                      EndDialog32 (hDlg, 0); 
+                      EndDialog (hDlg, 0); 
                       return TRUE;
                     }
 	          }
@@ -3476,14 +3476,14 @@ LRESULT CFn_WMCommand(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam,
 	          {
                     char str[256];
                     TRACE(commdlg,"WM_COMMAND/cmb2,3 =%08lX\n", lParam);
-		    i=SendDlgItemMessage32A(hDlg,cmb1,CB_GETCURSEL32,0,0);
+		    i=SendDlgItemMessageA(hDlg,cmb1,CB_GETCURSEL,0,0);
 		    if (i==CB_ERR)
-                      i=GetDlgItemText32A( hDlg, cmb1, str, 256 );
+                      i=GetDlgItemTextA( hDlg, cmb1, str, 256 );
                     else
                     {
-		      SendDlgItemMessage32A(hDlg,cmb1,CB_GETLBTEXT32,i,
+		      SendDlgItemMessageA(hDlg,cmb1,CB_GETLBTEXT,i,
 		                            (LPARAM)str);
-		      l=SendDlgItemMessage32A(hDlg,cmb1,CB_GETITEMDATA32,i,0);
+		      l=SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA,i,0);
 		      j=HIWORD(l);
 		      lpcf->nFontType = LOWORD(l);
 		      /* FIXME:   lpcf->nFontType |= ....  SIMULATED_FONTTYPE and so */
@@ -3493,50 +3493,50 @@ LRESULT CFn_WMCommand(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam,
 		      lpxx->lfCharSet=j>>8;
                     }
                     strcpy(lpxx->lfFaceName,str);
-		    i=SendDlgItemMessage32A(hDlg, cmb2, CB_GETCURSEL32, 0, 0);
+		    i=SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
 		    if (i!=CB_ERR)
 		    {
-		      l=SendDlgItemMessage32A(hDlg, cmb2, CB_GETITEMDATA32, i, 0);
+		      l=SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0);
 		      if (0!=(lpxx->lfItalic=HIWORD(l)))
 		        lpcf->nFontType |= ITALIC_FONTTYPE;
 		      if ((lpxx->lfWeight=LOWORD(l)) > FW_MEDIUM)
 		        lpcf->nFontType |= BOLD_FONTTYPE;
 		    }
-		    i=SendDlgItemMessage32A(hDlg, cmb3, CB_GETCURSEL32, 0, 0);
+		    i=SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
 		    if (i!=CB_ERR)
-		      lpxx->lfHeight=-LOWORD(SendDlgItemMessage32A(hDlg, cmb3, CB_GETITEMDATA32, i, 0));
+		      lpxx->lfHeight=-LOWORD(SendDlgItemMessageA(hDlg, cmb3, CB_GETITEMDATA, i, 0));
 		    else
 		      lpxx->lfHeight=0;
-		    lpxx->lfStrikeOut=IsDlgButtonChecked32(hDlg,chx1);
-		    lpxx->lfUnderline=IsDlgButtonChecked32(hDlg,chx2);
+		    lpxx->lfStrikeOut=IsDlgButtonChecked(hDlg,chx1);
+		    lpxx->lfUnderline=IsDlgButtonChecked(hDlg,chx2);
 		    lpxx->lfWidth=lpxx->lfOrientation=lpxx->lfEscapement=0;
 		    lpxx->lfOutPrecision=OUT_DEFAULT_PRECIS;
 		    lpxx->lfClipPrecision=CLIP_DEFAULT_PRECIS;
 		    lpxx->lfQuality=DEFAULT_QUALITY;
                     lpcf->iPointSize= -10*lpxx->lfHeight;
 
-		    hFont=CreateFontIndirect32A(lpxx);
+		    hFont=CreateFontIndirectA(lpxx);
 		    if (hFont)
 		    {
-		      HFONT32 oldFont=SendDlgItemMessage32A(hDlg, stc6, 
+		      HFONT oldFont=SendDlgItemMessageA(hDlg, stc6, 
 		          WM_GETFONT, 0, 0);
-		      SendDlgItemMessage32A(hDlg,stc6,WM_SETFONT,hFont,TRUE);
-		      DeleteObject32(oldFont);
+		      SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,hFont,TRUE);
+		      DeleteObject(oldFont);
 		    }
                   }
                   break;
 
-	case cmb4:i=SendDlgItemMessage32A(hDlg, cmb4, CB_GETCURSEL32, 0, 0);
+	case cmb4:i=SendDlgItemMessageA(hDlg, cmb4, CB_GETCURSEL, 0, 0);
 		  if (i!=CB_ERR)
 		  {
 		   lpcf->rgbColors=textcolors[i];
-		   InvalidateRect32( GetDlgItem32(hDlg,stc6), NULL, 0 );
+		   InvalidateRect( GetDlgItem(hDlg,stc6), NULL, 0 );
 		  }
 		  break;
 	
-	case psh15:i=RegisterWindowMessage32A( HELPMSGSTRING );
+	case psh15:i=RegisterWindowMessageA( HELPMSGSTRING );
 		  if (lpcf->hwndOwner)
-		    SendMessage32A(lpcf->hwndOwner, i, 0, (LPARAM)GetWindowLong32A(hDlg, DWL_USER));
+		    SendMessageA(lpcf->hwndOwner, i, 0, (LPARAM)GetWindowLongA(hDlg, DWL_USER));
 /*		  if (CFn_HookCallChk(lpcf))
 		    CallWindowProc16(lpcf->lpfnHook,hDlg,WM_COMMAND,psh15,(LPARAM)lpcf);*/
 		  break;
@@ -3545,24 +3545,24 @@ LRESULT CFn_WMCommand(HWND32 hDlg, WPARAM32 wParam, LPARAM lParam,
                      ( (lpcf->Flags & CF_LIMITSIZE) && 
                       (-lpxx->lfHeight >= lpcf->nSizeMin) && 
                       (-lpxx->lfHeight <= lpcf->nSizeMax)))
-	             EndDialog32(hDlg, TRUE);
+	             EndDialog(hDlg, TRUE);
 	          else
 	          {
                    char buffer[80];
 	           sprintf(buffer,"Select a font size between %d and %d points.",
                            lpcf->nSizeMin,lpcf->nSizeMax);
-	           MessageBox32A(hDlg, buffer, NULL, MB_OK);
+	           MessageBoxA(hDlg, buffer, NULL, MB_OK);
 	          } 
 		  return(TRUE);
-	case IDCANCEL:EndDialog32(hDlg, FALSE);
+	case IDCANCEL:EndDialog(hDlg, FALSE);
 		  return(TRUE);
 	}
       return(FALSE);
 }
 
-static LRESULT CFn_WMDestroy(HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
+static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  DeleteObject32(SendDlgItemMessage32A(hwnd, stc6, WM_GETFONT, 0, 0));
+  DeleteObject(SendDlgItemMessageA(hwnd, stc6, WM_GETFONT, 0, 0));
   return TRUE;
 }
 
@@ -3577,13 +3577,13 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
                                    LPARAM lParam)
 {
   LPCHOOSEFONT16 lpcf;
-  LPCHOOSEFONT32A lpcf32a;
-  UINT32 uMsg32;
-  WPARAM32 wParam32;
+  LPCHOOSEFONTA lpcf32a;
+  UINT uMsg32;
+  WPARAM wParam32;
   LRESULT res=0;  
   if (message!=WM_INITDIALOG)
   {
-   lpcf=(LPCHOOSEFONT16)GetWindowLong32A(hDlg, DWL_USER);   
+   lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);   
    if (!lpcf)
       return FALSE;
    if (CFn_HookCallChk(lpcf))
@@ -3594,7 +3594,7 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
   else
   {
     lpcf=(LPCHOOSEFONT16)lParam;
-    lpcf32a=(LPCHOOSEFONT32A)lpcf->lpTemplateName;
+    lpcf32a=(LPCHOOSEFONTA)lpcf->lpTemplateName;
     if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf32a)) 
     {
       TRACE(commdlg, "CFn_WMInitDialog returned FALSE\n");
@@ -3604,7 +3604,7 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
       return CallWindowProc16(lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
   }
   WINPROC_MapMsg16To32A(message, wParam, &uMsg32, &wParam32, &lParam);
-  lpcf32a=(LPCHOOSEFONT32A)lpcf->lpTemplateName;
+  lpcf32a=(LPCHOOSEFONTA)lpcf->lpTemplateName;
   switch (uMsg32)
     {
       case WM_MEASUREITEM:
@@ -3635,31 +3635,31 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
 /***********************************************************************
  *           FormatCharDlgProc32A   [internal]
  */
-LRESULT WINAPI FormatCharDlgProc32A(HWND32 hDlg, UINT32 uMsg, WPARAM32 wParam,
+LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
                                     LPARAM lParam)
 {
-  LPCHOOSEFONT32A lpcf;
+  LPCHOOSEFONTA lpcf;
   LRESULT res=FALSE;
   if (uMsg!=WM_INITDIALOG)
   {
-   lpcf=(LPCHOOSEFONT32A)GetWindowLong32A(hDlg, DWL_USER);   
+   lpcf=(LPCHOOSEFONTA)GetWindowLongA(hDlg, DWL_USER);   
    if (!lpcf)
      return FALSE;
    if (CFn_HookCallChk32(lpcf))
-     res=CallWindowProc32A(lpcf->lpfnHook, hDlg, uMsg, wParam, lParam);
+     res=CallWindowProcA(lpcf->lpfnHook, hDlg, uMsg, wParam, lParam);
    if (res)
      return res;
   }
   else
   {
-    lpcf=(LPCHOOSEFONT32A)lParam;
+    lpcf=(LPCHOOSEFONTA)lParam;
     if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf)) 
     {
       TRACE(commdlg, "CFn_WMInitDialog returned FALSE\n");
       return FALSE;
     }  
     if (CFn_HookCallChk32(lpcf))
-      return CallWindowProc32A(lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
+      return CallWindowProcA(lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
   }
   switch (uMsg)
     {
@@ -3685,35 +3685,35 @@ LRESULT WINAPI FormatCharDlgProc32A(HWND32 hDlg, UINT32 uMsg, WPARAM32 wParam,
 /***********************************************************************
  *           FormatCharDlgProc32W   [internal]
  */
-LRESULT WINAPI FormatCharDlgProc32W(HWND32 hDlg, UINT32 uMsg, WPARAM32 wParam,
+LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
                                     LPARAM lParam)
 {
-  LPCHOOSEFONT32W lpcf32w;
-  LPCHOOSEFONT32A lpcf32a;
+  LPCHOOSEFONTW lpcf32w;
+  LPCHOOSEFONTA lpcf32a;
   LRESULT res=FALSE;
   if (uMsg!=WM_INITDIALOG)
   {
-   lpcf32w=(LPCHOOSEFONT32W)GetWindowLong32A(hDlg, DWL_USER);   
+   lpcf32w=(LPCHOOSEFONTW)GetWindowLongA(hDlg, DWL_USER);   
    if (!lpcf32w)
      return FALSE;
-   if (CFn_HookCallChk32((LPCHOOSEFONT32A)lpcf32w))
-     res=CallWindowProc32W(lpcf32w->lpfnHook, hDlg, uMsg, wParam, lParam);
+   if (CFn_HookCallChk32((LPCHOOSEFONTA)lpcf32w))
+     res=CallWindowProcW(lpcf32w->lpfnHook, hDlg, uMsg, wParam, lParam);
    if (res)
      return res;
   }
   else
   {
-    lpcf32w=(LPCHOOSEFONT32W)lParam;
-    lpcf32a=(LPCHOOSEFONT32A)lpcf32w->lpTemplateName;
+    lpcf32w=(LPCHOOSEFONTW)lParam;
+    lpcf32a=(LPCHOOSEFONTA)lpcf32w->lpTemplateName;
     if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf32a)) 
     {
       TRACE(commdlg, "CFn_WMInitDialog returned FALSE\n");
       return FALSE;
     }  
-    if (CFn_HookCallChk32((LPCHOOSEFONT32A)lpcf32w))
-      return CallWindowProc32W(lpcf32w->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
+    if (CFn_HookCallChk32((LPCHOOSEFONTA)lpcf32w))
+      return CallWindowProcW(lpcf32w->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam);
   }
-  lpcf32a=(LPCHOOSEFONT32A)lpcf32w->lpTemplateName;
+  lpcf32a=(LPCHOOSEFONTA)lpcf32w->lpTemplateName;
   switch (uMsg)
     {
       case WM_MEASUREITEM:
@@ -3736,8 +3736,8 @@ LRESULT WINAPI FormatCharDlgProc32W(HWND32 hDlg, UINT32 uMsg, WPARAM32 wParam,
 }
 
 
-static BOOL32 Commdlg_GetFileName32A( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
-                                      LPOPENFILENAME32A ofn )
+static BOOL Commdlg_GetFileNameA( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
+                                      LPOPENFILENAMEA ofn )
 {
 	BOOL16 ret;
 	LPOPENFILENAME16 ofn16 = SEGPTR_ALLOC(sizeof(OPENFILENAME16));
@@ -3782,7 +3782,7 @@ static BOOL32 Commdlg_GetFileName32A( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
 	    ofn16->lpstrInitialDir = SEGPTR_GET(SEGPTR_STRDUP(ofn->lpstrInitialDir));
 	if (ofn->lpstrTitle)
 	    ofn16->lpstrTitle = SEGPTR_GET(SEGPTR_STRDUP(ofn->lpstrTitle));
-	ofn16->Flags = ofn->Flags|OFN_WINE32;
+	ofn16->Flags = ofn->Flags|OFN_WINE;
 	ofn16->nFileOffset = ofn->nFileOffset;
 	ofn16->nFileExtension = ofn->nFileExtension;
 	if (ofn->lpstrDefExt)
@@ -3825,8 +3825,8 @@ static BOOL32 Commdlg_GetFileName32A( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
 	return ret;
 }
 
-static BOOL32 Commdlg_GetFileName32W( BOOL16 (CALLBACK *dofunction)(SEGPTR x), 
-                                      LPOPENFILENAME32W ofn )
+static BOOL Commdlg_GetFileNameW( BOOL16 (CALLBACK *dofunction)(SEGPTR x), 
+                                      LPOPENFILENAMEW ofn )
 {
 	BOOL16 ret;
 	LPOPENFILENAME16 ofn16 = SEGPTR_ALLOC(sizeof(OPENFILENAME16));
@@ -3843,15 +3843,15 @@ static BOOL32 Commdlg_GetFileName32W( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
 		/* filter is a list...  title\0ext\0......\0\0 */
 		s = (LPWSTR)ofn->lpstrFilter;
 		while (*s)
-			s = s+lstrlen32W(s)+1;
+			s = s+lstrlenW(s)+1;
 		s++;
 		n = s - ofn->lpstrFilter; /* already divides by 2. ptr magic */
 		x = y = (LPSTR)SEGPTR_ALLOC(n);
 		s = (LPWSTR)ofn->lpstrFilter;
 		while (*s) {
 			lstrcpyWtoA(x,s);
-			x+=lstrlen32A(x)+1;
-			s+=lstrlen32W(s)+1;
+			x+=lstrlenA(x)+1;
+			s+=lstrlenW(s)+1;
 		}
 		*x=0;
 		ofn16->lpstrFilter = SEGPTR_GET(y);
@@ -3864,15 +3864,15 @@ static BOOL32 Commdlg_GetFileName32W( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
 		/* filter is a list...  title\0ext\0......\0\0 */
 		s = (LPWSTR)ofn->lpstrCustomFilter;
 		while (*s)
-			s = s+lstrlen32W(s)+1;
+			s = s+lstrlenW(s)+1;
 		s++;
 		n = s - ofn->lpstrCustomFilter;
 		x = y = (LPSTR)SEGPTR_ALLOC(n);
 		s = (LPWSTR)ofn->lpstrCustomFilter;
 		while (*s) {
 			lstrcpyWtoA(x,s);
-			x+=lstrlen32A(x)+1;
-			s+=lstrlen32W(s)+1;
+			x+=lstrlenA(x)+1;
+			s+=lstrlenW(s)+1;
 		}
 		*x=0;
 		ofn16->lpstrCustomFilter = SEGPTR_GET(y);
@@ -3889,7 +3889,7 @@ static BOOL32 Commdlg_GetFileName32W( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
 		ofn16->lpstrInitialDir = SEGPTR_GET(SEGPTR_STRDUP_WtoA(ofn->lpstrInitialDir));
 	if (ofn->lpstrTitle)
 		ofn16->lpstrTitle = SEGPTR_GET(SEGPTR_STRDUP_WtoA(ofn->lpstrTitle));
-	ofn16->Flags = ofn->Flags|OFN_WINE32|OFN_UNICODE;
+	ofn16->Flags = ofn->Flags|OFN_WINE|OFN_UNICODE;
 	ofn16->nFileOffset = ofn->nFileOffset;
 	ofn16->nFileExtension = ofn->nFileExtension;
 	if (ofn->lpstrDefExt)
@@ -3931,43 +3931,43 @@ static BOOL32 Commdlg_GetFileName32W( BOOL16 (CALLBACK *dofunction)(SEGPTR x),
 /***********************************************************************
  *            GetOpenFileName32A  (COMDLG32.10)
  */
-BOOL32 WINAPI GetOpenFileName32A( LPOPENFILENAME32A ofn )
+BOOL WINAPI GetOpenFileNameA( LPOPENFILENAMEA ofn )
 {
    BOOL16 (CALLBACK * dofunction)(SEGPTR ofn16) = GetOpenFileName16;
-   return Commdlg_GetFileName32A(dofunction,ofn);
+   return Commdlg_GetFileNameA(dofunction,ofn);
 }
 
 /***********************************************************************
  *            GetOpenFileName32W (COMDLG32.11)
  */
-BOOL32 WINAPI GetOpenFileName32W( LPOPENFILENAME32W ofn )
+BOOL WINAPI GetOpenFileNameW( LPOPENFILENAMEW ofn )
 {
    BOOL16 (CALLBACK * dofunction)(SEGPTR ofn16) = GetOpenFileName16;
-   return Commdlg_GetFileName32W(dofunction,ofn);
+   return Commdlg_GetFileNameW(dofunction,ofn);
 }
 
 /***********************************************************************
  *            GetSaveFileName32A  (COMDLG32.12)
  */
-BOOL32 WINAPI GetSaveFileName32A( LPOPENFILENAME32A ofn )
+BOOL WINAPI GetSaveFileNameA( LPOPENFILENAMEA ofn )
 {
    BOOL16 (CALLBACK * dofunction)(SEGPTR ofn16) = GetSaveFileName16;
-   return Commdlg_GetFileName32A(dofunction,ofn);
+   return Commdlg_GetFileNameA(dofunction,ofn);
 }
 
 /***********************************************************************
  *            GetSaveFileName32W  (COMDLG32.13)
  */
-BOOL32 WINAPI GetSaveFileName32W( LPOPENFILENAME32W ofn )
+BOOL WINAPI GetSaveFileNameW( LPOPENFILENAMEW ofn )
 {
    BOOL16 (CALLBACK * dofunction)(SEGPTR ofn16) = GetSaveFileName16;
-   return Commdlg_GetFileName32W(dofunction,ofn);
+   return Commdlg_GetFileNameW(dofunction,ofn);
 }
 
 /***********************************************************************
  *            ChooseColorA  (COMDLG32.1)
  */
-BOOL32 WINAPI ChooseColor32A(LPCHOOSECOLOR32A lpChCol )
+BOOL WINAPI ChooseColorA(LPCHOOSECOLORA lpChCol )
 
 {
   BOOL16 ret;
@@ -3999,13 +3999,13 @@ BOOL32 WINAPI ChooseColor32A(LPCHOOSECOLOR32A lpChCol )
   memcpy(lpChCol->lpCustColors,ccref,64);
   SEGPTR_FREE(ccref);
   SEGPTR_FREE(lpcc16);
-  return (BOOL32)ret;
+  return (BOOL)ret;
 }
 
 /***********************************************************************
  *            ChooseColorW  (COMDLG32.2)
  */
-BOOL32 WINAPI ChooseColor32W(LPCHOOSECOLOR32W lpChCol )
+BOOL WINAPI ChooseColorW(LPCHOOSECOLORW lpChCol )
 
 {
   BOOL16 ret;
@@ -4037,13 +4037,13 @@ BOOL32 WINAPI ChooseColor32W(LPCHOOSECOLOR32W lpChCol )
   memcpy(lpChCol->lpCustColors,ccref,64);
   SEGPTR_FREE(ccref);
   SEGPTR_FREE(lpcc16);
-  return (BOOL32)ret;
+  return (BOOL)ret;
 }
 
 /***********************************************************************
  *            PageSetupDlgA  (COMDLG32.15)
  */
-BOOL32 WINAPI PageSetupDlg32A(LPPAGESETUPDLG32A setupdlg) {
+BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
 	FIXME(commdlg,"(%p), stub!\n",setupdlg);
 	return FALSE;
 }
diff --git a/misc/cpu.c b/misc/cpu.c
index 2aebd16992e..2077f065c97 100644
--- a/misc/cpu.c
+++ b/misc/cpu.c
@@ -100,7 +100,7 @@ VOID WINAPI GetSystemInfo(
 			*s='\0';
 
 		/* 2.1 method */
-		if (!lstrncmpi32A(line, "cpu family",strlen("cpu family"))) {
+		if (!lstrncmpiA(line, "cpu family",strlen("cpu family"))) {
 			if (isdigit (value[0])) {
 				switch (value[0] - '0') {
 				case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386;
@@ -122,11 +122,11 @@ VOID WINAPI GetSystemInfo(
 			/* set the CPU type of the current processor */
 			sprintf(buf,"CPU %ld",cachedsi.dwProcessorType);
 			if (xhkey)
-				RegSetValueEx32A(xhkey,"Identifier",0,REG_SZ,buf,strlen(buf));
+				RegSetValueExA(xhkey,"Identifier",0,REG_SZ,buf,strlen(buf));
 			continue;
 		}
 		/* old 2.0 method */
-		if (!lstrncmpi32A(line, "cpu",strlen("cpu"))) {
+		if (!lstrncmpiA(line, "cpu",strlen("cpu"))) {
 			if (	isdigit (value[0]) && value[1] == '8' && 
 				value[2] == '6' && value[3] == 0
 			) {
@@ -150,22 +150,22 @@ VOID WINAPI GetSystemInfo(
 			/* set the CPU type of the current processor */
 			sprintf(buf,"CPU %ld",cachedsi.dwProcessorType);
 			if (xhkey)
-				RegSetValueEx32A(xhkey,"Identifier",0,REG_SZ,buf,strlen(buf));
+				RegSetValueExA(xhkey,"Identifier",0,REG_SZ,buf,strlen(buf));
 			continue;
 		}
-		if (!lstrncmpi32A(line,"fdiv_bug",strlen("fdiv_bug"))) {
-			if (!lstrncmpi32A(value,"yes",3))
+		if (!lstrncmpiA(line,"fdiv_bug",strlen("fdiv_bug"))) {
+			if (!lstrncmpiA(value,"yes",3))
 				PF[PF_FLOATING_POINT_PRECISION_ERRATA] = TRUE;
 
 			continue;
 		}
-		if (!lstrncmpi32A(line,"fpu",strlen("fpu"))) {
-			if (!lstrncmpi32A(value,"no",2))
+		if (!lstrncmpiA(line,"fpu",strlen("fpu"))) {
+			if (!lstrncmpiA(value,"no",2))
 				PF[PF_FLOATING_POINT_EMULATED] = TRUE;
 
 			continue;
 		}
-		if (!lstrncmpi32A(line,"processor",strlen("processor"))) {
+		if (!lstrncmpiA(line,"processor",strlen("processor"))) {
 			/* processor number counts up...*/
 			int	x;
 
@@ -181,13 +181,13 @@ VOID WINAPI GetSystemInfo(
 				RegCloseKey(xhkey);
 			RegCreateKey16(hkey,buf,&xhkey);
 		}
-		if (!lstrncmpi32A(line,"stepping",strlen("stepping"))) {
+		if (!lstrncmpiA(line,"stepping",strlen("stepping"))) {
 			int	x;
 
 			if (sscanf(value,"%d",&x))
 				cachedsi.wProcessorRevision = x;
 		}
-		if (!lstrncmpi32A(line,"flags",strlen("flags"))) {
+		if (!lstrncmpiA(line,"flags",strlen("flags"))) {
 			if (strstr(value,"cx8"))
 				PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE;
 			if (strstr(value,"mmx"))
@@ -202,7 +202,7 @@ VOID WINAPI GetSystemInfo(
 	/* FIXME: how do we do this on other systems? */
 
 	RegCreateKey16(hkey,"0",&xhkey);
-	RegSetValueEx32A(xhkey,"Identifier",0,REG_SZ,"CPU 386",strlen("CPU 386"));
+	RegSetValueExA(xhkey,"Identifier",0,REG_SZ,"CPU 386",strlen("CPU 386"));
 #endif  /* !linux */
 	if (xhkey)
 		RegCloseKey(xhkey);
@@ -217,7 +217,7 @@ VOID WINAPI GetSystemInfo(
  *	TRUE if processorfeature present
  *	FALSE otherwise
  */
-BOOL32 WINAPI IsProcessorFeaturePresent (
+BOOL WINAPI IsProcessorFeaturePresent (
 	DWORD feature	/* [in] feature number, see PF_ defines */
 ) {
   SYSTEM_INFO si;
diff --git a/misc/crtdll.c b/misc/crtdll.c
index 7c1a5948080..459ecbf528d 100644
--- a/misc/crtdll.c
+++ b/misc/crtdll.c
@@ -53,28 +53,28 @@ AJ 990101:
 
 static DOS_FULL_NAME CRTDLL_tmpname;
 
-UINT32 CRTDLL_argc_dll;         /* CRTDLL.23 */
+UINT CRTDLL_argc_dll;         /* CRTDLL.23 */
 LPSTR *CRTDLL_argv_dll;         /* CRTDLL.24 */
 LPSTR  CRTDLL_acmdln_dll;       /* CRTDLL.38 */
-UINT32 CRTDLL_basemajor_dll;    /* CRTDLL.42 */
-UINT32 CRTDLL_baseminor_dll;    /* CRTDLL.43 */
-UINT32 CRTDLL_baseversion_dll;  /* CRTDLL.44 */
-UINT32 CRTDLL_commode_dll;      /* CRTDLL.59 */
+UINT CRTDLL_basemajor_dll;    /* CRTDLL.42 */
+UINT CRTDLL_baseminor_dll;    /* CRTDLL.43 */
+UINT CRTDLL_baseversion_dll;  /* CRTDLL.44 */
+UINT CRTDLL_commode_dll;      /* CRTDLL.59 */
 LPSTR  CRTDLL_environ_dll;      /* CRTDLL.75 */
-UINT32 CRTDLL_fmode_dll;        /* CRTDLL.104 */
-UINT32 CRTDLL_osmajor_dll;      /* CRTDLL.241 */
-UINT32 CRTDLL_osminor_dll;      /* CRTDLL.242 */
-UINT32 CRTDLL_osmode_dll;       /* CRTDLL.243 */
-UINT32 CRTDLL_osver_dll;        /* CRTDLL.244 */
-UINT32 CRTDLL_osversion_dll;    /* CRTDLL.245 */
-UINT32 CRTDLL_winmajor_dll;     /* CRTDLL.329 */
-UINT32 CRTDLL_winminor_dll;     /* CRTDLL.330 */
-UINT32 CRTDLL_winver_dll;       /* CRTDLL.331 */
+UINT CRTDLL_fmode_dll;        /* CRTDLL.104 */
+UINT CRTDLL_osmajor_dll;      /* CRTDLL.241 */
+UINT CRTDLL_osminor_dll;      /* CRTDLL.242 */
+UINT CRTDLL_osmode_dll;       /* CRTDLL.243 */
+UINT CRTDLL_osver_dll;        /* CRTDLL.244 */
+UINT CRTDLL_osversion_dll;    /* CRTDLL.245 */
+UINT CRTDLL_winmajor_dll;     /* CRTDLL.329 */
+UINT CRTDLL_winminor_dll;     /* CRTDLL.330 */
+UINT CRTDLL_winver_dll;       /* CRTDLL.331 */
 
 /* FIXME: structure layout is obviously not correct */
 typedef struct
 {
-    HANDLE32 handle;
+    HANDLE handle;
     int      pad[7];
 } CRTDLL_FILE;
 
@@ -103,10 +103,10 @@ DWORD __cdecl CRTDLL__GetMainArgs(LPDWORD argc,LPSTR **argv,
 		argc,argv,environ,flag
 	);
 	CRTDLL_acmdln_dll = cmdline = HEAP_strdupA( GetProcessHeap(), 0,
-                                                    GetCommandLine32A() );
+                                                    GetCommandLineA() );
  	TRACE(crtdll,"got '%s'\n", cmdline);
 
-	version	= GetVersion32();
+	version	= GetVersion();
 	CRTDLL_osver_dll       = version >> 16;
 	CRTDLL_winminor_dll    = version & 0xFF;
 	CRTDLL_winmajor_dll    = (version>>8) & 0xFF;
@@ -148,7 +148,7 @@ DWORD __cdecl CRTDLL__GetMainArgs(LPDWORD argc,LPSTR **argv,
 
 	TRACE(crtdll,"found %d arguments\n",
 		CRTDLL_argc_dll);
-	CRTDLL_environ_dll = *environ = GetEnvironmentStrings32A();
+	CRTDLL_environ_dll = *environ = GetEnvironmentStringsA();
 	return 0;
 }
 
@@ -183,7 +183,7 @@ DWORD __cdecl CRTDLL__findfirst(LPCSTR fname,  struct find_t * x2)
  * BUGS
  *   Unimplemented
  */
-INT32 __cdecl CRTDLL__findnext(DWORD hand, struct find_t * x2)
+INT __cdecl CRTDLL__findnext(DWORD hand, struct find_t * x2)
 {
   FIXME(crtdll, ":(%ld,%p): stub\n",hand,x2);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -222,7 +222,7 @@ DWORD __cdecl CRTDLL__initterm(_INITTERMFUN *start,_INITTERMFUN *end)
 /*********************************************************************
  *                  _fdopen     (CRTDLL.91)
  */
-CRTDLL_FILE * __cdecl CRTDLL__fdopen(INT32 handle, LPCSTR mode)
+CRTDLL_FILE * __cdecl CRTDLL__fdopen(INT handle, LPCSTR mode)
 {
     CRTDLL_FILE *file;
 
@@ -272,7 +272,7 @@ void __cdecl CRTDLL__local_unwind2( PEXCEPTION_FRAME endframe, DWORD nr )
  * BUGS
  *   Unimplemented
  */
-INT32 __cdecl CRTDLL__read(INT32 fd, LPVOID buf, UINT32 count)
+INT __cdecl CRTDLL__read(INT fd, LPVOID buf, UINT count)
 {
   FIXME(crtdll,":(%d,%p,%d): stub\n",fd,buf,count);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -285,7 +285,7 @@ INT32 __cdecl CRTDLL__read(INT32 fd, LPVOID buf, UINT32 count)
 CRTDLL_FILE * __cdecl CRTDLL_fopen(LPCSTR path, LPCSTR mode)
 {
   CRTDLL_FILE *file = NULL;
-  HFILE32 handle;
+  HFILE handle;
 #if 0
   DOS_FULL_NAME full_name;
   
@@ -324,9 +324,9 @@ CRTDLL_FILE * __cdecl CRTDLL_fopen(LPCSTR path, LPCSTR mode)
   }
   /* FIXME: should handle text/binary mode */
 
-  if ((handle = CreateFile32A( path, access, FILE_SHARE_READ | FILE_SHARE_WRITE,
+  if ((handle = CreateFileA( path, access, FILE_SHARE_READ | FILE_SHARE_WRITE,
                                NULL, creation, FILE_ATTRIBUTE_NORMAL,
-                               -1 )) != INVALID_HANDLE_VALUE32)
+                               -1 )) != INVALID_HANDLE_VALUE)
   {
       file = HeapAlloc( GetProcessHeap(), 0, sizeof(*file) );
       file->handle = handle;
@@ -339,7 +339,7 @@ CRTDLL_FILE * __cdecl CRTDLL_fopen(LPCSTR path, LPCSTR mode)
 /*********************************************************************
  *                  fread     (CRTDLL.377)
  */
-DWORD __cdecl CRTDLL_fread(LPVOID ptr, INT32 size, INT32 nmemb, CRTDLL_FILE *file)
+DWORD __cdecl CRTDLL_fread(LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file)
 {
 #if 0
   int i=0;
@@ -393,11 +393,11 @@ DWORD __cdecl CRTDLL_freopen(LPCSTR path, LPCSTR mode, LPVOID stream)
 /*********************************************************************
  *                  fscanf     (CRTDLL.381)
  */
-INT32 __cdecl CRTDLL_fscanf( CRTDLL_FILE *stream, LPSTR format, ... )
+INT __cdecl CRTDLL_fscanf( CRTDLL_FILE *stream, LPSTR format, ... )
 {
 #if 0
     va_list valist;
-    INT32 res;
+    INT res;
 
     va_start( valist, format );
 #ifdef HAVE_VFSCANF
@@ -413,7 +413,7 @@ INT32 __cdecl CRTDLL_fscanf( CRTDLL_FILE *stream, LPSTR format, ... )
 /*********************************************************************
  *                  fseek     (CRTDLL.382)
  */
-LONG __cdecl CRTDLL_fseek( CRTDLL_FILE *file, LONG offset, INT32 whence)
+LONG __cdecl CRTDLL_fseek( CRTDLL_FILE *file, LONG offset, INT whence)
 {
   TRACE(crtdll, "file %p to 0x%08lx pos %s\n",
         file,offset,(whence==SEEK_SET)?"SEEK_SET":
@@ -428,7 +428,7 @@ LONG __cdecl CRTDLL_fseek( CRTDLL_FILE *file, LONG offset, INT32 whence)
 /*********************************************************************
  *                  fsetpos     (CRTDLL.383)
  */
-INT32 __cdecl CRTDLL_fsetpos( CRTDLL_FILE *file, INT32 *pos )
+INT __cdecl CRTDLL_fsetpos( CRTDLL_FILE *file, INT *pos )
 {
     TRACE(crtdll, "file %p pos %d\n", file, *pos );
     return CRTDLL_fseek(file, *pos, SEEK_SET);
@@ -445,7 +445,7 @@ LONG __cdecl CRTDLL_ftell( CRTDLL_FILE *file )
 /*********************************************************************
  *                  fwrite     (CRTDLL.386)
  */
-DWORD __cdecl CRTDLL_fwrite( LPVOID ptr, INT32 size, INT32 nmemb, CRTDLL_FILE *file )
+DWORD __cdecl CRTDLL_fwrite( LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file )
 {
     DWORD ret;
 
@@ -459,7 +459,7 @@ DWORD __cdecl CRTDLL_fwrite( LPVOID ptr, INT32 size, INT32 nmemb, CRTDLL_FILE *f
 /*********************************************************************
  *                  setbuf     (CRTDLL.452)
  */
-INT32 __cdecl CRTDLL_setbuf(CRTDLL_FILE *file, LPSTR buf)
+INT __cdecl CRTDLL_setbuf(CRTDLL_FILE *file, LPSTR buf)
 {
   TRACE(crtdll, "(file %p buf %p)\n", file, buf);
   /* this doesn't work:"void value not ignored as it ought to be" 
@@ -472,9 +472,9 @@ INT32 __cdecl CRTDLL_setbuf(CRTDLL_FILE *file, LPSTR buf)
 /*********************************************************************
  *                  _open_osfhandle         (CRTDLL.240)
  */
-HFILE32 __cdecl CRTDLL__open_osfhandle(LONG osfhandle, INT32 flags)
+HFILE __cdecl CRTDLL__open_osfhandle(LONG osfhandle, INT flags)
 {
-HFILE32 handle;
+HFILE handle;
  
 	switch (osfhandle) {
 	case STD_INPUT_HANDLE :
@@ -510,7 +510,7 @@ void __cdecl CRTDLL_srand(DWORD seed)
 /*********************************************************************
  *                  vfprintf       (CRTDLL.373)
  */
-INT32 __cdecl CRTDLL_vfprintf( CRTDLL_FILE *file, LPSTR format, va_list args )
+INT __cdecl CRTDLL_vfprintf( CRTDLL_FILE *file, LPSTR format, va_list args )
 {
     char buffer[1024];  /* FIXME... */
 
@@ -521,10 +521,10 @@ INT32 __cdecl CRTDLL_vfprintf( CRTDLL_FILE *file, LPSTR format, va_list args )
 /*********************************************************************
  *                  fprintf       (CRTDLL.373)
  */
-INT32 __cdecl CRTDLL_fprintf( CRTDLL_FILE *file, LPSTR format, ... )
+INT __cdecl CRTDLL_fprintf( CRTDLL_FILE *file, LPSTR format, ... )
 {
     va_list valist;
-    INT32 res;
+    INT res;
 
     va_start( valist, format );
     res = CRTDLL_vfprintf( file, format, valist );
@@ -566,7 +566,7 @@ clock_t __cdecl CRTDLL_clock(void)
 /*********************************************************************
  *                  _isatty       (CRTDLL.137)
  */
-BOOL32 __cdecl CRTDLL__isatty(DWORD x)
+BOOL __cdecl CRTDLL__isatty(DWORD x)
 {
 	TRACE(crtdll,"(%ld)\n",x);
 	return TRUE;
@@ -575,16 +575,16 @@ BOOL32 __cdecl CRTDLL__isatty(DWORD x)
 /*********************************************************************
  *                  _write        (CRTDLL.332)
  */
-INT32 __cdecl CRTDLL__write(INT32 fd,LPCVOID buf,UINT32 count)
+INT __cdecl CRTDLL__write(INT fd,LPCVOID buf,UINT count)
 {
-        INT32 len=0;
+        INT len=0;
 
 	if (fd == -1)
 	  len = -1;
 	else if (fd<=2)
-	  len = (UINT32)write(fd,buf,(LONG)count);
+	  len = (UINT)write(fd,buf,(LONG)count);
 	else
-	  len = _lwrite32(fd,buf,count);
+	  len = _lwrite(fd,buf,count);
 	TRACE(crtdll,"%d/%d byte to dfh %d from %p,\n",
 		       len,count,fd,buf);
 	return len;
@@ -603,7 +603,7 @@ INT32 __cdecl CRTDLL__write(INT32 fd,LPCVOID buf,UINT32 count)
  * atexit-processing comes to mind -- MW.
  *
  */
-void __cdecl CRTDLL__cexit(INT32 ret)
+void __cdecl CRTDLL__cexit(INT ret)
 {
         TRACE(crtdll,"(%d)\n",ret);
 	ExitProcess(ret);
@@ -623,7 +623,7 @@ void __cdecl CRTDLL_exit(DWORD ret)
 /*********************************************************************
  *                  _abnormal_termination          (CRTDLL.36)
  */
-INT32 __cdecl CRTDLL__abnormal_termination(void)
+INT __cdecl CRTDLL__abnormal_termination(void)
 {
         TRACE(crtdll,"(void)\n");
 	return 0;
@@ -633,9 +633,9 @@ INT32 __cdecl CRTDLL__abnormal_termination(void)
 /*********************************************************************
  *                  _access          (CRTDLL.37)
  */
-INT32 __cdecl CRTDLL__access(LPCSTR filename, INT32 mode)
+INT __cdecl CRTDLL__access(LPCSTR filename, INT mode)
 {
-    DWORD attr = GetFileAttributes32A(filename);
+    DWORD attr = GetFileAttributesA(filename);
 
     if (attr == -1)
     {
@@ -659,7 +659,7 @@ INT32 __cdecl CRTDLL__access(LPCSTR filename, INT32 mode)
 /*********************************************************************
  *                  fflush        (CRTDLL.365)
  */
-INT32 __cdecl CRTDLL_fflush( CRTDLL_FILE *file )
+INT __cdecl CRTDLL_fflush( CRTDLL_FILE *file )
 {
     return FlushFileBuffers( file->handle ) ? 0 : -1;
 }
@@ -668,7 +668,7 @@ INT32 __cdecl CRTDLL_fflush( CRTDLL_FILE *file )
 /*********************************************************************
  *                  rand          (CRTDLL.446)
  */
-INT32 __cdecl CRTDLL_rand()
+INT __cdecl CRTDLL_rand()
 {
     return rand();
 }
@@ -677,7 +677,7 @@ INT32 __cdecl CRTDLL_rand()
 /*********************************************************************
  *                  putchar       (CRTDLL.442)
  */
-void __cdecl CRTDLL_putchar( INT32 x )
+void __cdecl CRTDLL_putchar( INT x )
 {
     putchar(x);
 }
@@ -686,7 +686,7 @@ void __cdecl CRTDLL_putchar( INT32 x )
 /*********************************************************************
  *                  fputc       (CRTDLL.374)
  */
-INT32 __cdecl CRTDLL_fputc( INT32 c, CRTDLL_FILE *file )
+INT __cdecl CRTDLL_fputc( INT c, CRTDLL_FILE *file )
 {
     char ch = (char)c;
     DWORD res;
@@ -699,7 +699,7 @@ INT32 __cdecl CRTDLL_fputc( INT32 c, CRTDLL_FILE *file )
 /*********************************************************************
  *                  fputs       (CRTDLL.375)
  */
-INT32 __cdecl CRTDLL_fputs( LPCSTR s, CRTDLL_FILE *file )
+INT __cdecl CRTDLL_fputs( LPCSTR s, CRTDLL_FILE *file )
 {
     DWORD res;
     TRACE(crtdll, "%s to file %p\n",s,file);
@@ -711,7 +711,7 @@ INT32 __cdecl CRTDLL_fputs( LPCSTR s, CRTDLL_FILE *file )
 /*********************************************************************
  *                  puts       (CRTDLL.443)
  */
-INT32 __cdecl CRTDLL_puts(LPCSTR s)
+INT __cdecl CRTDLL_puts(LPCSTR s)
 {
     TRACE(crtdll, "%s \n",s);
     return puts(s);
@@ -721,7 +721,7 @@ INT32 __cdecl CRTDLL_puts(LPCSTR s)
 /*********************************************************************
  *                  putc       (CRTDLL.441)
  */
-INT32 __cdecl CRTDLL_putc( INT32 c, CRTDLL_FILE *file )
+INT __cdecl CRTDLL_putc( INT c, CRTDLL_FILE *file )
 {
     return CRTDLL_fputc( c, file );
 }
@@ -729,7 +729,7 @@ INT32 __cdecl CRTDLL_putc( INT32 c, CRTDLL_FILE *file )
 /*********************************************************************
  *                  fgetc       (CRTDLL.366)
  */
-INT32 __cdecl CRTDLL_fgetc( CRTDLL_FILE *file )
+INT __cdecl CRTDLL_fgetc( CRTDLL_FILE *file )
 {
     DWORD res;
     char ch;
@@ -741,7 +741,7 @@ INT32 __cdecl CRTDLL_fgetc( CRTDLL_FILE *file )
 /*********************************************************************
  *                  getc       (CRTDLL.388)
  */
-INT32 __cdecl CRTDLL_getc( CRTDLL_FILE *file )
+INT __cdecl CRTDLL_getc( CRTDLL_FILE *file )
 {
     return CRTDLL_fgetc( file );
 }
@@ -750,7 +750,7 @@ INT32 __cdecl CRTDLL_getc( CRTDLL_FILE *file )
 /*********************************************************************
  *                  fgets       (CRTDLL.368)
  */
-CHAR* __cdecl CRTDLL_fgets( LPSTR s, INT32 size, CRTDLL_FILE *file )
+CHAR* __cdecl CRTDLL_fgets( LPSTR s, INT size, CRTDLL_FILE *file )
 {
     int    cc;
     LPSTR  buf_start = s;
@@ -798,7 +798,7 @@ LPSTR __cdecl CRTDLL_gets(LPSTR buf)
 /*********************************************************************
  *                  _rotl          (CRTDLL.259)
  */
-UINT32 __cdecl CRTDLL__rotl(UINT32 x,INT32 shift)
+UINT __cdecl CRTDLL__rotl(UINT x,INT shift)
 {
    unsigned int ret = (x >> shift)|( x >>((sizeof(x))-shift));
 
@@ -810,7 +810,7 @@ UINT32 __cdecl CRTDLL__rotl(UINT32 x,INT32 shift)
 /*********************************************************************
  *                  _lrotl          (CRTDLL.176)
  */
-DWORD __cdecl CRTDLL__lrotl(DWORD x,INT32 shift)
+DWORD __cdecl CRTDLL__lrotl(DWORD x,INT shift)
 {
    unsigned long ret = (x >> shift)|( x >>((sizeof(x))-shift));
 
@@ -853,17 +853,17 @@ unsigned char * __cdecl CRTDLL__mbsinc(unsigned char *x)
 /*********************************************************************
  *                  vsprintf      (CRTDLL.500)
  */
-INT32 __cdecl CRTDLL_vsprintf( LPSTR buffer, LPCSTR spec, va_list args )
+INT __cdecl CRTDLL_vsprintf( LPSTR buffer, LPCSTR spec, va_list args )
 {
-    return wvsprintf32A( buffer, spec, args );
+    return wvsprintfA( buffer, spec, args );
 }
 
 /*********************************************************************
  *                  vswprintf      (CRTDLL.501)
  */
-INT32 __cdecl CRTDLL_vswprintf( LPWSTR buffer, LPCWSTR spec, va_list args )
+INT __cdecl CRTDLL_vswprintf( LPWSTR buffer, LPCWSTR spec, va_list args )
 {
-    return wvsprintf32W( buffer, spec, args );
+    return wvsprintfW( buffer, spec, args );
 }
 
 /*********************************************************************
@@ -888,18 +888,18 @@ unsigned char* __cdecl CRTDLL__mbscat(unsigned char *x,unsigned char *y)
 /*********************************************************************
  *                  _strcmpi   (CRTDLL.282) (CRTDLL.287)
  */
-INT32 __cdecl CRTDLL__strcmpi( LPCSTR s1, LPCSTR s2 )
+INT __cdecl CRTDLL__strcmpi( LPCSTR s1, LPCSTR s2 )
 {
-    return lstrcmpi32A( s1, s2 );
+    return lstrcmpiA( s1, s2 );
 }
 
 
 /*********************************************************************
  *                  _strnicmp   (CRTDLL.293)
  */
-INT32 __cdecl CRTDLL__strnicmp( LPCSTR s1, LPCSTR s2, INT32 n )
+INT __cdecl CRTDLL__strnicmp( LPCSTR s1, LPCSTR s2, INT n )
 {
-    return lstrncmpi32A( s1, s2, n );
+    return lstrncmpiA( s1, s2, n );
 }
 
 
@@ -926,7 +926,7 @@ LPSTR __cdecl CRTDLL__strlwr(LPSTR x)
 /*********************************************************************
  *                  system       (CRTDLL.485)
  */
-INT32 __cdecl CRTDLL_system(LPSTR x)
+INT __cdecl CRTDLL_system(LPSTR x)
 {
 #define SYSBUF_LENGTH 1500
   char buffer[SYSBUF_LENGTH];
@@ -1099,7 +1099,7 @@ LPWSTR __cdecl CRTDLL__wcsdup(LPCWSTR ptr)
 /*********************************************************************
  *                  fclose           (CRTDLL.362)
  */
-INT32 __cdecl CRTDLL_fclose( CRTDLL_FILE *file )
+INT __cdecl CRTDLL_fclose( CRTDLL_FILE *file )
 {
     TRACE(crtdll,"%p\n", file );
     if (!CloseHandle( file->handle )) return -1;
@@ -1110,7 +1110,7 @@ INT32 __cdecl CRTDLL_fclose( CRTDLL_FILE *file )
 /*********************************************************************
  *                  _unlink           (CRTDLL.315)
  */
-INT32 __cdecl CRTDLL__unlink(LPCSTR pathname)
+INT __cdecl CRTDLL__unlink(LPCSTR pathname)
 {
     int ret=0;
     DOS_FULL_NAME full_name;
@@ -1132,9 +1132,9 @@ INT32 __cdecl CRTDLL__unlink(LPCSTR pathname)
 /*********************************************************************
  *                  rename           (CRTDLL.449)
  */
-INT32 __cdecl CRTDLL_rename(LPCSTR oldpath,LPCSTR newpath)
+INT __cdecl CRTDLL_rename(LPCSTR oldpath,LPCSTR newpath)
 {
-    BOOL32 ok = MoveFileEx32A( oldpath, newpath, MOVEFILE_REPLACE_EXISTING );
+    BOOL ok = MoveFileExA( oldpath, newpath, MOVEFILE_REPLACE_EXISTING );
     return ok ? 0 : -1;
 }
 
@@ -1151,11 +1151,11 @@ struct win_stat
     INT16  win_st_nlink;
     INT16  win_st_uid;
     INT16  win_st_gid;
-    UINT32 win_st_rdev;
-    INT32  win_st_size;
-    INT32  win_st_atime;
-    INT32  win_st_mtime;
-    INT32  win_st_ctime;
+    UINT win_st_rdev;
+    INT  win_st_size;
+    INT  win_st_atime;
+    INT  win_st_mtime;
+    INT  win_st_ctime;
 };
 
 int __cdecl CRTDLL__stat(const char * filename, struct win_stat * buf)
@@ -1193,10 +1193,10 @@ int __cdecl CRTDLL__stat(const char * filename, struct win_stat * buf)
 /*********************************************************************
  *                  _open           (CRTDLL.239)
  */
-HFILE32 __cdecl CRTDLL__open(LPCSTR path,INT32 flags)
+HFILE __cdecl CRTDLL__open(LPCSTR path,INT flags)
 {
     DWORD access = 0, creation = 0;
-    HFILE32 ret;
+    HFILE ret;
     
     /* FIXME:
        the flags in lcc's header differ from the ones in Linux, e.g.
@@ -1234,7 +1234,7 @@ HFILE32 __cdecl CRTDLL__open(LPCSTR path,INT32 flags)
       TRACE(crtdll,"CRTDLL_open file unsupported flags 0x%04x\n",flags);
     /* End Fixme */
 
-    ret = CreateFile32A( path, access, FILE_SHARE_READ | FILE_SHARE_WRITE,
+    ret = CreateFileA( path, access, FILE_SHARE_READ | FILE_SHARE_WRITE,
                          NULL, creation, FILE_ATTRIBUTE_NORMAL, -1 );
     TRACE(crtdll,"CRTDLL_open file %s mode 0x%04x got handle %d\n", path,flags,ret);
     return ret;
@@ -1243,9 +1243,9 @@ HFILE32 __cdecl CRTDLL__open(LPCSTR path,INT32 flags)
 /*********************************************************************
  *                  _close           (CRTDLL.57)
  */
-INT32 __cdecl CRTDLL__close(HFILE32 fd)
+INT __cdecl CRTDLL__close(HFILE fd)
 {
-    int ret=_lclose32(fd);
+    int ret=_lclose(fd);
 
     TRACE(crtdll,"(%d)\n",fd);
     if(ret)
@@ -1257,7 +1257,7 @@ INT32 __cdecl CRTDLL__close(HFILE32 fd)
 /*********************************************************************
  *                  feof           (CRTDLL.363)
  */
-INT32 __cdecl CRTDLL_feof( CRTDLL_FILE *file )
+INT __cdecl CRTDLL_feof( CRTDLL_FILE *file )
 {
     FIXME(crtdll,"stub\n" );
     return 0;
@@ -1266,7 +1266,7 @@ INT32 __cdecl CRTDLL_feof( CRTDLL_FILE *file )
 /*********************************************************************
  *                  setlocale           (CRTDLL.453)
  */
-LPSTR __cdecl CRTDLL_setlocale(INT32 category,LPCSTR locale)
+LPSTR __cdecl CRTDLL_setlocale(INT category,LPCSTR locale)
 {
 	LPSTR categorystr;
 
@@ -1288,7 +1288,7 @@ LPSTR __cdecl CRTDLL_setlocale(INT32 category,LPCSTR locale)
  */
 LPWSTR __cdecl CRTDLL_wcscat( LPWSTR s1, LPCWSTR s2 )
 {
-    return lstrcat32W( s1, s2 );
+    return lstrcatW( s1, s2 );
 }
 
 /*********************************************************************
@@ -1309,9 +1309,9 @@ LPWSTR __cdecl CRTDLL_wcschr(LPCWSTR str,WCHAR xchar)
 /*********************************************************************
  *                  wcscmp           (CRTDLL.505)
  */
-INT32 __cdecl CRTDLL_wcscmp( LPCWSTR s1, LPCWSTR s2 )
+INT __cdecl CRTDLL_wcscmp( LPCWSTR s1, LPCWSTR s2 )
 {
-    return lstrcmp32W( s1, s2 );
+    return lstrcmpW( s1, s2 );
 }
 
 /*********************************************************************
@@ -1319,13 +1319,13 @@ INT32 __cdecl CRTDLL_wcscmp( LPCWSTR s1, LPCWSTR s2 )
  */
 LPWSTR __cdecl CRTDLL_wcscpy( LPWSTR s1, LPCWSTR s2 )
 {
-    return lstrcpy32W( s1, s2 );
+    return lstrcpyW( s1, s2 );
 }
 
 /*********************************************************************
  *                  wcscspn           (CRTDLL.508)
  */
-INT32 __cdecl CRTDLL_wcscspn(LPWSTR str,LPWSTR reject)
+INT __cdecl CRTDLL_wcscspn(LPWSTR str,LPWSTR reject)
 {
 	LPWSTR	s,t;
 
@@ -1342,39 +1342,39 @@ INT32 __cdecl CRTDLL_wcscspn(LPWSTR str,LPWSTR reject)
 /*********************************************************************
  *                  wcslen           (CRTDLL.510)
  */
-INT32 __cdecl CRTDLL_wcslen( LPCWSTR s )
+INT __cdecl CRTDLL_wcslen( LPCWSTR s )
 {
-    return lstrlen32W( s );
+    return lstrlenW( s );
 }
 
 /*********************************************************************
  *                  wcsncat           (CRTDLL.511)
  */
-LPWSTR __cdecl CRTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, INT32 n )
+LPWSTR __cdecl CRTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, INT n )
 {
-    return lstrcatn32W( s1, s2, n );
+    return lstrcatnW( s1, s2, n );
 }
 
 /*********************************************************************
  *                  wcsncmp           (CRTDLL.512)
  */
-INT32 __cdecl CRTDLL_wcsncmp( LPCWSTR s1, LPCWSTR s2, INT32 n )
+INT __cdecl CRTDLL_wcsncmp( LPCWSTR s1, LPCWSTR s2, INT n )
 {
-    return lstrncmp32W( s1, s2, n );
+    return lstrncmpW( s1, s2, n );
 }
 
 /*********************************************************************
  *                  wcsncpy           (CRTDLL.513)
  */
-LPWSTR __cdecl CRTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, INT32 n )
+LPWSTR __cdecl CRTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, INT n )
 {
-    return lstrcpyn32W( s1, s2, n );
+    return lstrcpynW( s1, s2, n );
 }
 
 /*********************************************************************
  *                  wcsspn           (CRTDLL.516)
  */
-INT32 __cdecl CRTDLL_wcsspn(LPWSTR str,LPWSTR accept)
+INT __cdecl CRTDLL_wcsspn(LPWSTR str,LPWSTR accept)
 {
 	LPWSTR	s,t;
 
@@ -1393,7 +1393,7 @@ INT32 __cdecl CRTDLL_wcsspn(LPWSTR str,LPWSTR accept)
  */
 DWORD __cdecl CRTDLL__wcsicmp( LPCWSTR s1, LPCWSTR s2 )
 {
-    return lstrcmpi32W( s1, s2 );
+    return lstrcmpiW( s1, s2 );
 }
 
 /*********************************************************************
@@ -1402,15 +1402,15 @@ DWORD __cdecl CRTDLL__wcsicmp( LPCWSTR s1, LPCWSTR s2 )
 DWORD __cdecl CRTDLL__wcsicoll(LPCWSTR a1,LPCWSTR a2)
 {
     /* FIXME: handle collates */
-    return lstrcmpi32W(a1,a2);
+    return lstrcmpiW(a1,a2);
 }
 
 /*********************************************************************
  *                  _wcsnicmp           (CRTDLL.324)
  */
-DWORD __cdecl CRTDLL__wcsnicmp( LPCWSTR s1, LPCWSTR s2, INT32 len )
+DWORD __cdecl CRTDLL__wcsnicmp( LPCWSTR s1, LPCWSTR s2, INT len )
 {
-    return lstrncmpi32W( s1, s2, len );
+    return lstrncmpiW( s1, s2, len );
 }
 
 /*********************************************************************
@@ -1419,7 +1419,7 @@ DWORD __cdecl CRTDLL__wcsnicmp( LPCWSTR s1, LPCWSTR s2, INT32 len )
 DWORD __cdecl CRTDLL_wcscoll(LPWSTR a1,LPWSTR a2)
 {
     /* FIXME: handle collates */
-    return lstrcmp32W(a1,a2);
+    return lstrcmpW(a1,a2);
 }
 
 /*********************************************************************
@@ -1462,7 +1462,7 @@ LPWSTR __cdecl CRTDLL_wcsstr(LPWSTR s,LPWSTR b)
 /*********************************************************************
  *                  wcstombs   (CRTDLL.521)
  */
-INT32 __cdecl CRTDLL_wcstombs( LPSTR dst, LPCWSTR src, INT32 len )
+INT __cdecl CRTDLL_wcstombs( LPSTR dst, LPCWSTR src, INT len )
 {
     lstrcpynWtoA( dst, src, len );
     return strlen(dst);  /* FIXME: is this right? */
@@ -1475,7 +1475,7 @@ LPWSTR __cdecl CRTDLL_wcsrchr(LPWSTR str,WCHAR xchar)
 {
 	LPWSTR	s;
 
-	s=str+lstrlen32W(str);
+	s=str+lstrlenW(str);
 	do {
 		if (*s==xchar)
 			return s;
@@ -1491,7 +1491,7 @@ LPWSTR __cdecl CRTDLL_wcsrchr(LPWSTR str,WCHAR xchar)
  * We allways translate when we read with fgets, we never do with fread
  *
  */
-INT32 __cdecl CRTDLL__setmode( INT32 fh,INT32 mode)
+INT __cdecl CRTDLL__setmode( INT fh,INT mode)
 {
 	/* FIXME */
 #define O_TEXT     0x4000
@@ -1514,7 +1514,7 @@ VOID __cdecl CRTDLL__fpreset(void)
 /*********************************************************************
  *                  atexit           (CRTDLL.345)
  */
-INT32 __cdecl CRTDLL_atexit(LPVOID x)
+INT __cdecl CRTDLL_atexit(LPVOID x)
 {
 	FIXME(crtdll,"(%p), STUB.\n",x);
 	return 0; /* successful */
@@ -1524,7 +1524,7 @@ INT32 __cdecl CRTDLL_atexit(LPVOID x)
  *                  mblen          (CRTDLL.428)
  * FIXME: check multibyte support
  */
-WCHAR  __cdecl CRTDLL_mblen(CHAR *mb,INT32 size)
+WCHAR  __cdecl CRTDLL_mblen(CHAR *mb,INT size)
 {
 
     int ret=1;
@@ -1545,7 +1545,7 @@ WCHAR  __cdecl CRTDLL_mblen(CHAR *mb,INT32 size)
  *                  mbstowcs           (CRTDLL.429)
  * FIXME: check multibyte support
  */
-INT32 __cdecl CRTDLL_mbstowcs(LPWSTR wcs, LPCSTR mbs, INT32 size)
+INT __cdecl CRTDLL_mbstowcs(LPWSTR wcs, LPCSTR mbs, INT size)
 {
 
 /* Slightly modified lstrcpynAtoW functions from memory/strings.c
@@ -1572,7 +1572,7 @@ INT32 __cdecl CRTDLL_mbstowcs(LPWSTR wcs, LPCSTR mbs, INT32 size)
  *                  mbtowc           (CRTDLL.430)
  * FIXME: check multibyte support
  */
-WCHAR __cdecl CRTDLL_mbtowc(WCHAR* wc,CHAR* mb,INT32 size) 
+WCHAR __cdecl CRTDLL_mbtowc(WCHAR* wc,CHAR* mb,INT size) 
 {
    int ret;
 
@@ -1599,7 +1599,7 @@ WCHAR __cdecl CRTDLL_mbtowc(WCHAR* wc,CHAR* mb,INT32 size)
 /*********************************************************************
  *                  _isctype           (CRTDLL.138)
  */
-BOOL32 __cdecl CRTDLL__isctype(CHAR x,CHAR type)
+BOOL __cdecl CRTDLL__isctype(CHAR x,CHAR type)
 {
 	if ((type & CRTDLL_SPACE) && isspace(x))
 		return TRUE;
@@ -1625,7 +1625,7 @@ BOOL32 __cdecl CRTDLL__isctype(CHAR x,CHAR type)
  *  newdir      [I] drive to change to, A=1
  *
  */
-BOOL32 __cdecl CRTDLL__chdrive(INT32 newdrive)
+BOOL __cdecl CRTDLL__chdrive(INT newdrive)
 {
 	/* FIXME: generates errnos */
 	return DRIVE_SetCurrentDrive(newdrive-1);
@@ -1634,9 +1634,9 @@ BOOL32 __cdecl CRTDLL__chdrive(INT32 newdrive)
 /*********************************************************************
  *                  _chdir           (CRTDLL.51)
  */
-INT32 __cdecl CRTDLL__chdir(LPCSTR newdir)
+INT __cdecl CRTDLL__chdir(LPCSTR newdir)
 {
-	if (!SetCurrentDirectory32A(newdir))
+	if (!SetCurrentDirectoryA(newdir))
 		return 1;
 	return 0;
 }
@@ -1644,7 +1644,7 @@ INT32 __cdecl CRTDLL__chdir(LPCSTR newdir)
 /*********************************************************************
  *                  _fullpath           (CRTDLL.114)
  */
-LPSTR __cdecl CRTDLL__fullpath(LPSTR buf, LPCSTR name, INT32 size)
+LPSTR __cdecl CRTDLL__fullpath(LPSTR buf, LPCSTR name, INT size)
 {
   DOS_FULL_NAME full_name;
 
@@ -1654,7 +1654,7 @@ LPSTR __cdecl CRTDLL__fullpath(LPSTR buf, LPCSTR name, INT32 size)
       if(!(buf = CRTDLL_malloc(size))) return NULL;
   }
   if (!DOSFS_GetFullName( name, FALSE, &full_name )) return NULL;
-  lstrcpyn32A(buf,full_name.short_name,size);
+  lstrcpynA(buf,full_name.short_name,size);
   TRACE(crtdll,"CRTDLL_fullpath got %s\n",buf);
   return buf;
 }
@@ -1722,7 +1722,7 @@ VOID __cdecl CRTDLL__splitpath(LPCSTR path, LPSTR drive, LPSTR directory, LPSTR
 /*********************************************************************
  *                  _getcwd           (CRTDLL.120)
  */
-CHAR* __cdecl CRTDLL__getcwd(LPSTR buf, INT32 size)
+CHAR* __cdecl CRTDLL__getcwd(LPSTR buf, INT size)
 {
   char test[1];
   int len;
@@ -1730,7 +1730,7 @@ CHAR* __cdecl CRTDLL__getcwd(LPSTR buf, INT32 size)
   len = size;
   if (!buf) {
     if (size < 0) /* allocate as big as nescessary */
-      len =GetCurrentDirectory32A(1,test) + 1;
+      len =GetCurrentDirectoryA(1,test) + 1;
     if(!(buf = CRTDLL_malloc(len)))
     {
 	/* set error to OutOfRange */
@@ -1738,7 +1738,7 @@ CHAR* __cdecl CRTDLL__getcwd(LPSTR buf, INT32 size)
     }
   }
   size = len;
-  if(!(len =GetCurrentDirectory32A(len,buf)))
+  if(!(len =GetCurrentDirectoryA(len,buf)))
     {
       return NULL;
     }
@@ -1755,7 +1755,7 @@ CHAR* __cdecl CRTDLL__getcwd(LPSTR buf, INT32 size)
 /*********************************************************************
  *                  _getdcwd           (CRTDLL.121)
  */
-CHAR* __cdecl CRTDLL__getdcwd(INT32 drive,LPSTR buf, INT32 size)
+CHAR* __cdecl CRTDLL__getdcwd(INT drive,LPSTR buf, INT size)
 {
   char test[1];
   int len;
@@ -1764,7 +1764,7 @@ CHAR* __cdecl CRTDLL__getdcwd(INT32 drive,LPSTR buf, INT32 size)
   len = size;
   if (!buf) {
     if (size < 0) /* allocate as big as nescessary */
-      len =GetCurrentDirectory32A(1,test) + 1;
+      len =GetCurrentDirectoryA(1,test) + 1;
     if(!(buf = CRTDLL_malloc(len)))
     {
 	/* set error to OutOfRange */
@@ -1772,7 +1772,7 @@ CHAR* __cdecl CRTDLL__getdcwd(INT32 drive,LPSTR buf, INT32 size)
     }
   }
   size = len;
-  if(!(len =GetCurrentDirectory32A(len,buf)))
+  if(!(len =GetCurrentDirectoryA(len,buf)))
     {
       return NULL;
     }
@@ -1791,7 +1791,7 @@ CHAR* __cdecl CRTDLL__getdcwd(INT32 drive,LPSTR buf, INT32 size)
  *
  *  Return current drive, 1 for A, 2 for B
  */
-INT32 __cdecl CRTDLL__getdrive(VOID)
+INT __cdecl CRTDLL__getdrive(VOID)
 {
     return DRIVE_GetCurrentDrive() + 1;
 }
@@ -1799,9 +1799,9 @@ INT32 __cdecl CRTDLL__getdrive(VOID)
 /*********************************************************************
  *                  _mkdir           (CRTDLL.234)
  */
-INT32 __cdecl CRTDLL__mkdir(LPCSTR newdir)
+INT __cdecl CRTDLL__mkdir(LPCSTR newdir)
 {
-	if (!CreateDirectory32A(newdir,NULL))
+	if (!CreateDirectoryA(newdir,NULL))
 		return -1;
 	return 0;
 }
@@ -1809,9 +1809,9 @@ INT32 __cdecl CRTDLL__mkdir(LPCSTR newdir)
 /*********************************************************************
  *                  remove           (CRTDLL.448)
  */
-INT32 __cdecl CRTDLL_remove(LPCSTR file)
+INT __cdecl CRTDLL_remove(LPCSTR file)
 {
-	if (!DeleteFile32A(file))
+	if (!DeleteFileA(file))
 		return -1;
 	return 0;
 }
@@ -1820,7 +1820,7 @@ INT32 __cdecl CRTDLL_remove(LPCSTR file)
  *                  _errno           (CRTDLL.52)
  * Yes, this is a function.
  */
-LPINT32 __cdecl CRTDLL__errno()
+LPINT __cdecl CRTDLL__errno()
 {
 	static	int crtdllerrno;
 	
@@ -1897,25 +1897,25 @@ LPSTR __cdecl CRTDLL_tmpnam(LPSTR s)
 /*********************************************************************
  *                  _itoa           (CRTDLL.165)
  */
-LPSTR  __cdecl CRTDLL__itoa(INT32 x,LPSTR buf,INT32 buflen)
+LPSTR  __cdecl CRTDLL__itoa(INT x,LPSTR buf,INT buflen)
 {
-    wsnprintf32A(buf,buflen,"%d",x);
+    wsnprintfA(buf,buflen,"%d",x);
     return buf;
 }
 
 /*********************************************************************
  *                  _ltoa           (CRTDLL.180)
  */
-LPSTR  __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT32 radix)
+LPSTR  __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT radix)
 {
     switch(radix) {
         case  2: FIXME(crtdll, "binary format not implemented !\n");
                  break;
-        case  8: wsnprintf32A(buf,0x80,"%o",x);
+        case  8: wsnprintfA(buf,0x80,"%o",x);
                  break;
-        case 10: wsnprintf32A(buf,0x80,"%d",x);
+        case 10: wsnprintfA(buf,0x80,"%d",x);
                  break;
-        case 16: wsnprintf32A(buf,0x80,"%x",x);
+        case 16: wsnprintfA(buf,0x80,"%x",x);
                  break;
         default: FIXME(crtdll, "radix %d not implemented !\n", radix);
     }
@@ -1925,16 +1925,16 @@ LPSTR  __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT32 radix)
 /*********************************************************************
  *                  _ultoa           (CRTDLL.311)
  */
-LPSTR  __cdecl CRTDLL__ultoa(long x,LPSTR buf,INT32 radix)
+LPSTR  __cdecl CRTDLL__ultoa(long x,LPSTR buf,INT radix)
 {
     switch(radix) {
         case  2: FIXME(crtdll, "binary format not implemented !\n");
                  break;
-        case  8: wsnprintf32A(buf,0x80,"%lo",x);
+        case  8: wsnprintfA(buf,0x80,"%lo",x);
                  break;
-        case 10: wsnprintf32A(buf,0x80,"%ld",x);
+        case 10: wsnprintfA(buf,0x80,"%ld",x);
                  break;
-        case 16: wsnprintf32A(buf,0x80,"%lx",x);
+        case 16: wsnprintfA(buf,0x80,"%lx",x);
                  break;
         default: FIXME(crtdll, "radix %d not implemented !\n", radix);
     }
@@ -1971,7 +1971,7 @@ VOID __cdecl CRTDLL__sleep(unsigned long timeout)
  */
 LPSTR __cdecl CRTDLL_getenv(const char *name) 
 {
-     LPSTR environ = GetEnvironmentStrings32A();
+     LPSTR environ = GetEnvironmentStringsA();
      LPSTR pp,pos = NULL;
      unsigned int length;
   
@@ -1989,7 +1989,7 @@ LPSTR __cdecl CRTDLL_getenv(const char *name)
 	 pp = pos+1;
 	 TRACE(crtdll,"got %s\n",pp);
        }
-     FreeEnvironmentStrings32A( environ );
+     FreeEnvironmentStringsA( environ );
      return pp;
 }
 
@@ -2009,7 +2009,7 @@ LPSTR __cdecl CRTDLL__mbsrchr(LPSTR s,CHAR x) {
  *	1:if second ''    ''      ''          ''   first   ''
  *      0:if both are equal.
  */
-INT32 __cdecl CRTDLL__memicmp(
+INT __cdecl CRTDLL__memicmp(
 	LPCSTR s1,	/* [in] first string */
 	LPCSTR s2,	/* [in] second string */
 	DWORD len	/* [in] length to compare */
@@ -2060,9 +2060,9 @@ LPWSTR CRTDLL_wcstok(LPWSTR s,LPCWSTR delim) {
  *                  wcstol           (CRTDLL.520)
  * Like strtol, but for wide character strings.
  */
-INT32 CRTDLL_wcstol(LPWSTR s,LPWSTR *end,INT32 base) {
+INT CRTDLL_wcstol(LPWSTR s,LPWSTR *end,INT base) {
 	LPSTR	sA = HEAP_strdupWtoA(GetProcessHeap(),0,s),endA;
-	INT32	ret = strtol(sA,&endA,base);
+	INT	ret = strtol(sA,&endA,base);
 
 	HeapFree(GetProcessHeap(),0,sA);
 	if (end) *end = s+(endA-sA); /* pointer magic checked. */
diff --git a/misc/ddeml.c b/misc/ddeml.c
index 8efab81437a..6ab81ccda3b 100644
--- a/misc/ddeml.c
+++ b/misc/ddeml.c
@@ -33,8 +33,8 @@ static const char	inst_string[]= "DDEMaxInstance";
 static LPCWSTR 		DDEInstanceAccess = (LPCWSTR)&inst_string;
 static const char	handle_string[] = "DDEHandleAccess";
 static LPCWSTR      	DDEHandleAccess = (LPCWSTR)&handle_string;
-static HANDLE32	     	inst_count_mutex = 0;
-static HANDLE32	     	handle_mutex = 0;
+static HANDLE	     	inst_count_mutex = 0;
+static HANDLE	     	handle_mutex = 0;
        DDE_HANDLE_ENTRY *this_instance;
        SECURITY_ATTRIBUTES *s_att= NULL;
        DWORD 	     	err_no = 0;
@@ -151,7 +151,7 @@ static void FreeAndRemoveHSZNodes( DWORD idInst )
      */
     while( pHSZNodes != NULL )
     {
-        DdeFreeStringHandle32( idInst, pHSZNodes->hsz );
+        DdeFreeStringHandle( idInst, pHSZNodes->hsz );
     }
 }
 
@@ -208,7 +208,7 @@ static void InsertHSZNode( DWORD idInst, HSZ hsz )
  *  1.0      Jan 1999  Keith Matthews        Initial version
  *
  */
- DWORD Release_reserved_mutex (HANDLE32 mutex, LPTSTR mutex_name, BOOL32 release_handle_m, BOOL32 release_this_i )
+ DWORD Release_reserved_mutex (HANDLE mutex, LPTSTR mutex_name, BOOL release_handle_m, BOOL release_this_i )
 {
 	ReleaseMutex(mutex);
         if ( (err_no=GetLastError()) != 0 )
@@ -252,7 +252,7 @@ DWORD IncrementInstanceId()
 		s_attrib.bInheritHandle = TRUE;
 		s_attrib.lpSecurityDescriptor = NULL;
 		s_attrib.nLength = sizeof(s_attrib);
-		inst_count_mutex = CreateMutex32W(&s_attrib,1,DDEInstanceAccess); // 1st time through
+		inst_count_mutex = CreateMutexW(&s_attrib,1,DDEInstanceAccess); // 1st time through
 	} else {
 		WaitForSingleObject(inst_count_mutex,1000); // subsequent calls
 		/*  FIXME  - needs refinement with popup for timeout, also is timeout interval OK */
@@ -275,7 +275,7 @@ DWORD IncrementInstanceId()
 UINT16 WINAPI DdeInitialize16( LPDWORD pidInst, PFNCALLBACK16 pfnCallback,
                                DWORD afCmd, DWORD ulRes)
 {
-    return (UINT16)DdeInitialize32A(pidInst,(PFNCALLBACK32)pfnCallback,
+    return (UINT16)DdeInitializeA(pidInst,(PFNCALLBACK)pfnCallback,
                                     afCmd, ulRes);
 }
 
@@ -283,10 +283,10 @@ UINT16 WINAPI DdeInitialize16( LPDWORD pidInst, PFNCALLBACK16 pfnCallback,
 /******************************************************************************
  *            DdeInitialize32A   (USER32.106)
  */
-UINT32 WINAPI DdeInitialize32A( LPDWORD pidInst, PFNCALLBACK32 pfnCallback,
+UINT WINAPI DdeInitializeA( LPDWORD pidInst, PFNCALLBACK pfnCallback,
                                 DWORD afCmd, DWORD ulRes )
 {
-    return DdeInitialize32W(pidInst,pfnCallback,afCmd,ulRes);
+    return DdeInitializeW(pidInst,pfnCallback,afCmd,ulRes);
 }
 
 
@@ -314,7 +314,7 @@ UINT32 WINAPI DdeInitialize32A( LPDWORD pidInst, PFNCALLBACK32 pfnCallback,
  *  1.1      Jan 1999  Keith Matthews        Initial (near-)complete version
  *
  */
-UINT32 WINAPI DdeInitialize32W( LPDWORD pidInst, PFNCALLBACK32 pfnCallback,
+UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback,
                                 DWORD afCmd, DWORD ulRes )
 {
     DDE_HANDLE_ENTRY *reference_inst;
@@ -382,7 +382,7 @@ UINT32 WINAPI DdeInitialize32W( LPDWORD pidInst, PFNCALLBACK32 pfnCallback,
 	s_att->bInheritHandle = TRUE;
 	s_att->lpSecurityDescriptor = NULL;
 	s_att->nLength = sizeof(s_att);
-	handle_mutex = CreateMutex32W(s_att,1,DDEHandleAccess);
+	handle_mutex = CreateMutexW(s_att,1,DDEHandleAccess);
 	if ( (err_no=GetLastError()) == ERROR_INVALID_HANDLE )
 	{
 		ERR(ddeml,"CreateMutex failed - handle list  %li\n",err_no);
@@ -541,7 +541,7 @@ UINT32 WINAPI DdeInitialize32W( LPDWORD pidInst, PFNCALLBACK32 pfnCallback,
  */
 BOOL16 WINAPI DdeUninitialize16( DWORD idInst )
 {
-    return (BOOL16)DdeUninitialize32( idInst );
+    return (BOOL16)DdeUninitialize( idInst );
 }
 
 
@@ -555,7 +555,7 @@ BOOL16 WINAPI DdeUninitialize16( DWORD idInst )
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI DdeUninitialize32( DWORD idInst )
+BOOL WINAPI DdeUninitialize( DWORD idInst )
 {
 
     FIXME(ddeml, "(%ld): stub\n", idInst);
@@ -575,8 +575,8 @@ BOOL32 WINAPI DdeUninitialize32( DWORD idInst )
 HCONVLIST WINAPI DdeConnectList16( DWORD idInst, HSZ hszService, HSZ hszTopic,
                  HCONVLIST hConvList, LPCONVCONTEXT16 pCC )
 {
-    return DdeConnectList32(idInst, hszService, hszTopic, hConvList, 
-                            (LPCONVCONTEXT32)pCC);
+    return DdeConnectList(idInst, hszService, hszTopic, hConvList, 
+                            (LPCONVCONTEXT)pCC);
 }
 
 
@@ -594,8 +594,8 @@ HCONVLIST WINAPI DdeConnectList16( DWORD idInst, HSZ hszService, HSZ hszTopic,
  *    Success: Handle to new conversation list
  *    Failure: 0
  */
-HCONVLIST WINAPI DdeConnectList32( DWORD idInst, HSZ hszService, HSZ hszTopic,
-                 HCONVLIST hConvList, LPCONVCONTEXT32 pCC )
+HCONVLIST WINAPI DdeConnectList( DWORD idInst, HSZ hszService, HSZ hszTopic,
+                 HCONVLIST hConvList, LPCONVCONTEXT pCC )
 {
     FIXME(ddeml, "(%ld,%ld,%ld,%ld,%p): stub\n", idInst, hszService, hszTopic,
           hConvList,pCC);
@@ -608,14 +608,14 @@ HCONVLIST WINAPI DdeConnectList32( DWORD idInst, HSZ hszService, HSZ hszTopic,
  */
 HCONV WINAPI DdeQueryNextServer16( HCONVLIST hConvList, HCONV hConvPrev )
 {
-    return DdeQueryNextServer32(hConvList, hConvPrev);
+    return DdeQueryNextServer(hConvList, hConvPrev);
 }
 
 
 /*****************************************************************
  * DdeQueryNextServer32 [USER32.112]
  */
-HCONV WINAPI DdeQueryNextServer32( HCONVLIST hConvList, HCONV hConvPrev )
+HCONV WINAPI DdeQueryNextServer( HCONVLIST hConvList, HCONV hConvPrev )
 {
     FIXME(ddeml, "(%ld,%ld): stub\n",hConvList,hConvPrev);
     return 0;
@@ -624,7 +624,7 @@ HCONV WINAPI DdeQueryNextServer32( HCONVLIST hConvList, HCONV hConvPrev )
 /*****************************************************************
  * DdeQueryString32A [USER32.113]
  */
-DWORD WINAPI DdeQueryString32A(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT32 iCodePage)
+DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT iCodePage)
 {
     DWORD ret = 0;
     CHAR pString[MAX_BUFFER_LEN];
@@ -648,7 +648,7 @@ DWORD WINAPI DdeQueryString32A(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, I
             cchMax = MAX_BUFFER_LEN;
 }
 
-        ret = GlobalGetAtomName32A( hsz, (LPSTR)psz, cchMax );
+        ret = GlobalGetAtomNameA( hsz, (LPSTR)psz, cchMax );
     }
     
     return ret;
@@ -657,7 +657,7 @@ DWORD WINAPI DdeQueryString32A(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, I
 /*****************************************************************
  * DdeQueryString32W [USER32.114]
  */
-DWORD WINAPI DdeQueryString32W(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, INT32 iCodePage)
+DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, INT iCodePage)
 {
     DWORD ret = 0;
     WCHAR pString[MAX_BUFFER_LEN];
@@ -685,7 +685,7 @@ DWORD WINAPI DdeQueryString32W(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax,
              */
             factor = (int) sizeof(WCHAR)/sizeof(BYTE);
         }
-        ret = GlobalGetAtomName32W( hsz, (LPWSTR)psz, cchMax ) * factor;
+        ret = GlobalGetAtomNameW( hsz, (LPWSTR)psz, cchMax ) * factor;
     }
     return ret;
 }
@@ -696,7 +696,7 @@ DWORD WINAPI DdeQueryString32W(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax,
  */
 BOOL16 WINAPI DdeDisconnectList16( HCONVLIST hConvList )
 {
-    return (BOOL16)DdeDisconnectList32(hConvList);
+    return (BOOL16)DdeDisconnectList(hConvList);
 }
 
 
@@ -707,7 +707,7 @@ BOOL16 WINAPI DdeDisconnectList16( HCONVLIST hConvList )
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI DdeDisconnectList32(
+BOOL WINAPI DdeDisconnectList(
     HCONVLIST hConvList) /* [in] Handle to conversation list */
 {
     FIXME(ddeml, "(%ld): stub\n", hConvList);
@@ -729,8 +729,8 @@ HCONV WINAPI DdeConnect16( DWORD idInst, HSZ hszService, HSZ hszTopic,
 /*****************************************************************
  *            DdeConnect32   (USER32.92)
  */
-HCONV WINAPI DdeConnect32( DWORD idInst, HSZ hszService, HSZ hszTopic,
-                           LPCONVCONTEXT32 pCC )
+HCONV WINAPI DdeConnect( DWORD idInst, HSZ hszService, HSZ hszTopic,
+                           LPCONVCONTEXT pCC )
 {
     FIXME(ddeml, "(0x%lx,%ld,%ld,%p): stub\n",idInst,hszService,hszTopic,
           pCC);
@@ -743,13 +743,13 @@ HCONV WINAPI DdeConnect32( DWORD idInst, HSZ hszService, HSZ hszTopic,
  */
 BOOL16 WINAPI DdeDisconnect16( HCONV hConv )
 {
-    return (BOOL16)DdeDisconnect32( hConv );
+    return (BOOL16)DdeDisconnect( hConv );
 }
 
 /*****************************************************************
  *            DdeSetUserHandle (DDEML.10)
  */
-BOOL16 WINAPI DdeSetUserHandle( HCONV hConv, DWORD id, DWORD hUser )
+BOOL16 WINAPI DdeSetUserHandle16( HCONV hConv, DWORD id, DWORD hUser )
 {
     FIXME( ddeml, "(%ld,%ld,%ld): stub\n",hConv,id, hUser );
     return 0;
@@ -762,7 +762,7 @@ HDDEDATA WINAPI DdeCreateDataHandle16( DWORD idInst, LPBYTE pSrc, DWORD cb,
                                      DWORD cbOff, HSZ hszItem, UINT16 wFmt, 
                                      UINT16 afCmd )
 {
-    return DdeCreateDataHandle32(idInst,
+    return DdeCreateDataHandle(idInst,
                                 pSrc,
                                 cb,
                                 cbOff,
@@ -774,9 +774,9 @@ HDDEDATA WINAPI DdeCreateDataHandle16( DWORD idInst, LPBYTE pSrc, DWORD cb,
 /*****************************************************************
  *            DdeCreateDataHandle32 (USER32.94)
  */
-HDDEDATA WINAPI DdeCreateDataHandle32( DWORD idInst, LPBYTE pSrc, DWORD cb, 
-                                       DWORD cbOff, HSZ hszItem, UINT32 wFmt, 
-                                       UINT32 afCmd )
+HDDEDATA WINAPI DdeCreateDataHandle( DWORD idInst, LPBYTE pSrc, DWORD cb, 
+                                       DWORD cbOff, HSZ hszItem, UINT wFmt, 
+                                       UINT afCmd )
 {
     FIXME( ddeml,
           "(%ld,%p,%ld,%ld,0x%lx,%d,%d): stub\n",
@@ -794,7 +794,7 @@ HDDEDATA WINAPI DdeCreateDataHandle32( DWORD idInst, LPBYTE pSrc, DWORD cb,
 /*****************************************************************
  *            DdeDisconnect32   (USER32.97)
  */
-BOOL32 WINAPI DdeDisconnect32( HCONV hConv )
+BOOL WINAPI DdeDisconnect( HCONV hConv )
 {
     FIXME( ddeml, "empty stub\n" );
     return 0;
@@ -816,7 +816,7 @@ HCONV WINAPI DdeReconnect( HCONV hConv )
  */
 HSZ WINAPI DdeCreateStringHandle16( DWORD idInst, LPCSTR str, INT16 codepage )
 {
-    return DdeCreateStringHandle32A( idInst, str, codepage );
+    return DdeCreateStringHandleA( idInst, str, codepage );
 }
 
 
@@ -827,14 +827,14 @@ HSZ WINAPI DdeCreateStringHandle16( DWORD idInst, LPCSTR str, INT16 codepage )
  *    Success: String handle
  *    Failure: 0
  */
-HSZ WINAPI DdeCreateStringHandle32A( DWORD idInst, LPCSTR psz, INT32 codepage )
+HSZ WINAPI DdeCreateStringHandleA( DWORD idInst, LPCSTR psz, INT codepage )
 {
   HSZ hsz = 0;
   TRACE(ddeml, "(%ld,%s,%d): stub\n",idInst,debugstr_a(psz),codepage);
   
   if (codepage==CP_WINANSI)
   {
-      hsz = GlobalAddAtom32A (psz);
+      hsz = GlobalAddAtomA (psz);
       /* Save the handle so we know to clean it when
        * uninitialize is called.
        */
@@ -852,10 +852,10 @@ HSZ WINAPI DdeCreateStringHandle32A( DWORD idInst, LPCSTR psz, INT32 codepage )
  *    Success: String handle
  *    Failure: 0
  */
-HSZ WINAPI DdeCreateStringHandle32W(
+HSZ WINAPI DdeCreateStringHandleW(
     DWORD idInst,   /* [in] Instance identifier */
     LPCWSTR psz,    /* [in] Pointer to string */
-    INT32 codepage) /* [in] Code page identifier */
+    INT codepage) /* [in] Code page identifier */
 {
   HSZ hsz = 0;
 
@@ -863,7 +863,7 @@ HSZ WINAPI DdeCreateStringHandle32W(
 
   if (codepage==CP_WINUNICODE)
   {
-      hsz = GlobalAddAtom32W (psz);
+      hsz = GlobalAddAtomW (psz);
       /* Save the handle so we know to clean it when
        * uninitialize is called.
        */
@@ -879,7 +879,7 @@ HSZ WINAPI DdeCreateStringHandle32W(
  */
 BOOL16 WINAPI DdeFreeStringHandle16( DWORD idInst, HSZ hsz )
 {
-    return (BOOL32)DdeFreeStringHandle32( idInst, hsz );
+    return (BOOL)DdeFreeStringHandle( idInst, hsz );
 }
 
 
@@ -888,7 +888,7 @@ BOOL16 WINAPI DdeFreeStringHandle16( DWORD idInst, HSZ hsz )
  * RETURNS: success: nonzero
  *          fail:    zero
  */
-BOOL32 WINAPI DdeFreeStringHandle32( DWORD idInst, HSZ hsz )
+BOOL WINAPI DdeFreeStringHandle( DWORD idInst, HSZ hsz )
 {
     TRACE( ddeml, "(%ld,%ld): stub\n",idInst, hsz );
     /* Remove the node associated with this HSZ.
@@ -905,14 +905,14 @@ BOOL32 WINAPI DdeFreeStringHandle32( DWORD idInst, HSZ hsz )
  */
 BOOL16 WINAPI DdeFreeDataHandle16( HDDEDATA hData )
 {
-    return (BOOL32)DdeFreeDataHandle32( hData );
+    return (BOOL)DdeFreeDataHandle( hData );
 }
 
 
 /*****************************************************************
  *            DdeFreeDataHandle32   (USER32.100)
  */
-BOOL32 WINAPI DdeFreeDataHandle32( HDDEDATA hData )
+BOOL WINAPI DdeFreeDataHandle( HDDEDATA hData )
 {
     FIXME( ddeml, "empty stub\n" );
     return TRUE;
@@ -926,14 +926,14 @@ BOOL32 WINAPI DdeFreeDataHandle32( HDDEDATA hData )
  */
 BOOL16 WINAPI DdeKeepStringHandle16( DWORD idInst, HSZ hsz )
 {
-    return (BOOL32)DdeKeepStringHandle32( idInst, hsz );
+    return (BOOL)DdeKeepStringHandle( idInst, hsz );
 }
 
 
 /*****************************************************************
  *            DdeKeepStringHandle32  (USER32.108)
  */
-BOOL32 WINAPI DdeKeepStringHandle32( DWORD idInst, HSZ hsz )
+BOOL WINAPI DdeKeepStringHandle( DWORD idInst, HSZ hsz )
 {
     FIXME( ddeml, "empty stub\n" );
     return TRUE;
@@ -948,7 +948,7 @@ HDDEDATA WINAPI DdeClientTransaction16( LPVOID pData, DWORD cbData,
                                         UINT16 wType, DWORD dwTimeout,
                                         LPDWORD pdwResult )
 {
-    return DdeClientTransaction32( (LPBYTE)pData, cbData, hConv, hszItem,
+    return DdeClientTransaction( (LPBYTE)pData, cbData, hConv, hszItem,
                                    wFmt, wType, dwTimeout, pdwResult );
 }
 
@@ -956,9 +956,9 @@ HDDEDATA WINAPI DdeClientTransaction16( LPVOID pData, DWORD cbData,
 /*****************************************************************
  *            DdeClientTransaction32  (USER32.90)
  */
-HDDEDATA WINAPI DdeClientTransaction32( LPBYTE pData, DWORD cbData,
-                                        HCONV hConv, HSZ hszItem, UINT32 wFmt,
-                                        UINT32 wType, DWORD dwTimeout,
+HDDEDATA WINAPI DdeClientTransaction( LPBYTE pData, DWORD cbData,
+                                        HCONV hConv, HSZ hszItem, UINT wFmt,
+                                        UINT wType, DWORD dwTimeout,
                                         LPDWORD pdwResult )
 {
     FIXME( ddeml, "empty stub\n" );
@@ -968,7 +968,7 @@ HDDEDATA WINAPI DdeClientTransaction32( LPBYTE pData, DWORD cbData,
 /*****************************************************************
  *            DdeAbandonTransaction (DDEML.12)
  */
-BOOL16 WINAPI DdeAbandonTransaction( DWORD idInst, HCONV hConv, 
+BOOL16 WINAPI DdeAbandonTransaction16( DWORD idInst, HCONV hConv, 
                                      DWORD idTransaction )
 {
     FIXME( ddeml, "empty stub\n" );
@@ -981,7 +981,7 @@ BOOL16 WINAPI DdeAbandonTransaction( DWORD idInst, HCONV hConv,
  */
 BOOL16 WINAPI DdePostAdvise16( DWORD idInst, HSZ hszTopic, HSZ hszItem )
 {
-    return (BOOL16)DdePostAdvise32(idInst, hszTopic, hszItem);
+    return (BOOL16)DdePostAdvise(idInst, hszTopic, hszItem);
 }
 
 
@@ -992,7 +992,7 @@ BOOL16 WINAPI DdePostAdvise16( DWORD idInst, HSZ hszTopic, HSZ hszItem )
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI DdePostAdvise32(
+BOOL WINAPI DdePostAdvise(
     DWORD idInst, /* [in] Instance identifier */
     HSZ hszTopic, /* [in] Handle to topic name string */
     HSZ hszItem)  /* [in] Handle to item name string */
@@ -1005,7 +1005,7 @@ BOOL32 WINAPI DdePostAdvise32(
 /*****************************************************************
  *            DdeAddData (DDEML.15)
  */
-HDDEDATA WINAPI DdeAddData( HDDEDATA hData, LPBYTE pSrc, DWORD cb,
+HDDEDATA WINAPI DdeAddData16( HDDEDATA hData, LPBYTE pSrc, DWORD cb,
                             DWORD cbOff )
 {
     FIXME( ddeml, "empty stub\n" );
@@ -1019,7 +1019,7 @@ HDDEDATA WINAPI DdeAddData( HDDEDATA hData, LPBYTE pSrc, DWORD cb,
  * RETURNS
  *    Size of memory object associated with handle
  */
-DWORD WINAPI DdeGetData32(
+DWORD WINAPI DdeGetData(
     HDDEDATA hData, /* [in] Handle to DDE object */
     LPBYTE pDst,    /* [in] Pointer to destination buffer */
     DWORD cbMax,    /* [in] Amount of data to copy */
@@ -1039,7 +1039,7 @@ DWORD WINAPI DdeGetData16(
     DWORD cbMax, 
     DWORD cbOff)
 {
-    return DdeGetData32(hData, pDst, cbMax, cbOff);
+    return DdeGetData(hData, pDst, cbMax, cbOff);
 }
 
 
@@ -1048,13 +1048,13 @@ DWORD WINAPI DdeGetData16(
  */
 LPBYTE WINAPI DdeAccessData16( HDDEDATA hData, LPDWORD pcbDataSize )
 {
-     return DdeAccessData32(hData, pcbDataSize);
+     return DdeAccessData(hData, pcbDataSize);
 }
 
 /*****************************************************************
  *            DdeAccessData32 (USER32.88)
  */
-LPBYTE WINAPI DdeAccessData32( HDDEDATA hData, LPDWORD pcbDataSize )
+LPBYTE WINAPI DdeAccessData( HDDEDATA hData, LPDWORD pcbDataSize )
 {
      FIXME( ddeml, "(%ld,%p): stub\n", hData, pcbDataSize);
      return 0;
@@ -1065,13 +1065,13 @@ LPBYTE WINAPI DdeAccessData32( HDDEDATA hData, LPDWORD pcbDataSize )
  */
 BOOL16 WINAPI DdeUnaccessData16( HDDEDATA hData )
 {
-     return DdeUnaccessData32(hData);
+     return DdeUnaccessData(hData);
 }
 
 /*****************************************************************
  *            DdeUnaccessData32 (USER32.118)
  */
-BOOL32 WINAPI DdeUnaccessData32( HDDEDATA hData )
+BOOL WINAPI DdeUnaccessData( HDDEDATA hData )
 {
      FIXME( ddeml, "(0x%lx): stub\n", hData);
 
@@ -1083,13 +1083,13 @@ BOOL32 WINAPI DdeUnaccessData32( HDDEDATA hData )
  */
 BOOL16 WINAPI DdeEnableCallback16( DWORD idInst, HCONV hConv, UINT16 wCmd )
 {
-     return DdeEnableCallback32(idInst, hConv, wCmd);
+     return DdeEnableCallback(idInst, hConv, wCmd);
 }
 
 /*****************************************************************
  *            DdeEnableCallback32 (USER32.99)
  */
-BOOL32 WINAPI DdeEnableCallback32( DWORD idInst, HCONV hConv, UINT32 wCmd )
+BOOL WINAPI DdeEnableCallback( DWORD idInst, HCONV hConv, UINT wCmd )
 {
      FIXME( ddeml, "(%ld, 0x%lx, %d) stub\n", idInst, hConv, wCmd);
 
@@ -1102,7 +1102,7 @@ BOOL32 WINAPI DdeEnableCallback32( DWORD idInst, HCONV hConv, UINT32 wCmd )
 HDDEDATA WINAPI DdeNameService16( DWORD idInst, HSZ hsz1, HSZ hsz2,
                                   UINT16 afCmd )
 {
-    return DdeNameService32( idInst, hsz1, hsz2, afCmd );
+    return DdeNameService( idInst, hsz1, hsz2, afCmd );
 }
 
 
@@ -1119,8 +1119,8 @@ HDDEDATA WINAPI DdeNameService16( DWORD idInst, HSZ hsz1, HSZ hsz2,
  *    Success: Non-zero
  *    Failure: 0
  */
-HDDEDATA WINAPI DdeNameService32( DWORD idInst, HSZ hsz1, HSZ hsz2,
-                UINT32 afCmd )
+HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2,
+                UINT afCmd )
 {
     FIXME(ddeml, "(%ld,%ld,%ld,%d): stub\n",idInst,hsz1,hsz2,afCmd);
     return 1;
@@ -1132,7 +1132,7 @@ HDDEDATA WINAPI DdeNameService32( DWORD idInst, HSZ hsz1, HSZ hsz2,
  */
 UINT16 WINAPI DdeGetLastError16( DWORD idInst )
 {
-    return (UINT16)DdeGetLastError32( idInst );
+    return (UINT16)DdeGetLastError( idInst );
 }
 
 
@@ -1145,7 +1145,7 @@ UINT16 WINAPI DdeGetLastError16( DWORD idInst )
  * RETURNS
  *    Last error code
  */
-UINT32 WINAPI DdeGetLastError32( DWORD idInst )
+UINT WINAPI DdeGetLastError( DWORD idInst )
 {
     FIXME(ddeml, "(%ld): stub\n",idInst);
     return 0;
@@ -1157,7 +1157,7 @@ UINT32 WINAPI DdeGetLastError32( DWORD idInst )
  */
 int WINAPI DdeCmpStringHandles16( HSZ hsz1, HSZ hsz2 )
 {
-     return DdeCmpStringHandles32(hsz1, hsz2);
+     return DdeCmpStringHandles(hsz1, hsz2);
 }
 
 /*****************************************************************
@@ -1171,7 +1171,7 @@ int WINAPI DdeCmpStringHandles16( HSZ hsz1, HSZ hsz2 )
  * 0  The values of hsz 1 and 2 are the same or both zero.
  * 1  The value of hsz2 is zero of less than hsz1
  */
-int WINAPI DdeCmpStringHandles32( HSZ hsz1, HSZ hsz2 )
+int WINAPI DdeCmpStringHandles( HSZ hsz1, HSZ hsz2 )
 {
     CHAR psz1[MAX_BUFFER_LEN];
     CHAR psz2[MAX_BUFFER_LEN];
@@ -1180,8 +1180,8 @@ int WINAPI DdeCmpStringHandles32( HSZ hsz1, HSZ hsz2 )
 
     TRACE( ddeml, "handle 1, handle 2\n" );
 
-    ret1 = GlobalGetAtomName32A( hsz1, psz1, MAX_BUFFER_LEN );
-    ret2 = GlobalGetAtomName32A( hsz2, psz2, MAX_BUFFER_LEN );
+    ret1 = GlobalGetAtomNameA( hsz1, psz1, MAX_BUFFER_LEN );
+    ret2 = GlobalGetAtomNameA( hsz2, psz2, MAX_BUFFER_LEN );
     /* Make sure we found both strings.
      */
     if( ret1 == 0 && ret2 == 0 )
@@ -1232,7 +1232,7 @@ int WINAPI DdeCmpStringHandles32( HSZ hsz1, HSZ hsz2 )
  *   success: nonzero
  *   failure: zero
  */
-UINT32 WINAPI PackDDElParam(UINT32 msg, UINT32 uiLo, UINT32 uiHi)
+UINT WINAPI PackDDElParam(UINT msg, UINT uiLo, UINT uiHi)
 {
     FIXME(ddeml, "stub.\n");
     return 0;
@@ -1246,8 +1246,8 @@ UINT32 WINAPI PackDDElParam(UINT32 msg, UINT32 uiLo, UINT32 uiHi)
  *   success: nonzero
  *   failure: zero
  */
-UINT32 WINAPI UnpackDDElParam(UINT32 msg, UINT32 lParam,
-                              UINT32 *uiLo, UINT32 *uiHi)
+UINT WINAPI UnpackDDElParam(UINT msg, UINT lParam,
+                              UINT *uiLo, UINT *uiHi)
 {
     FIXME(ddeml, "stub.\n");
     return 0;
@@ -1261,7 +1261,7 @@ UINT32 WINAPI UnpackDDElParam(UINT32 msg, UINT32 lParam,
  *   success: nonzero
  *   failure: zero
  */
-UINT32 WINAPI FreeDDElParam(UINT32 msg, UINT32 lParam)
+UINT WINAPI FreeDDElParam(UINT msg, UINT lParam)
 {
     FIXME(ddeml, "stub.\n");
     return 0;
@@ -1271,8 +1271,8 @@ UINT32 WINAPI FreeDDElParam(UINT32 msg, UINT32 lParam)
  *            ReuseDDElParam (USER32.446)
  *
  */
-UINT32 WINAPI ReuseDDElParam(UINT32 lParam, UINT32 msgIn, UINT32 msgOut,
-                             UINT32 uiLi, UINT32 uiHi)
+UINT WINAPI ReuseDDElParam(UINT lParam, UINT msgIn, UINT msgOut,
+                             UINT uiLi, UINT uiHi)
 {
     FIXME(ddeml, "stub.\n");
     return 0;
diff --git a/misc/error.c b/misc/error.c
index d8ef9a6e3f3..f30b34ea7dd 100644
--- a/misc/error.c
+++ b/misc/error.c
@@ -138,7 +138,7 @@ static const char *GetParamErrorString(UINT16 uErr) {
 /***********************************************************************
 *	LogError (KERNEL.324)
 */
-VOID WINAPI LogError(UINT16 uErr, LPVOID lpvInfo)
+VOID WINAPI LogError16(UINT16 uErr, LPVOID lpvInfo)
 {
 	MSG("(%s, %p)\n", GetErrorString(uErr), lpvInfo);
 }
@@ -147,7 +147,7 @@ VOID WINAPI LogError(UINT16 uErr, LPVOID lpvInfo)
 /***********************************************************************
 *	LogParamError (KERNEL.325)
 */
-void WINAPI LogParamError(UINT16 uErr, FARPROC16 lpfn, LPVOID lpvParam)
+void WINAPI LogParamError16(UINT16 uErr, FARPROC16 lpfn, LPVOID lpvParam)
 {
 	/* FIXME: is it possible to get the module name/function
 	 * from the lpfn param?
@@ -166,7 +166,7 @@ void WINAPI HandleParamError( CONTEXT *context )
         LPVOID lpvParam = (LPVOID)MAKELONG( AX_reg( context ), 
                                             CX_reg( context ) );
 	
-	LogParamError( uErr, lpfn, lpvParam );
+	LogParamError16( uErr, lpfn, lpvParam );
 
 	if (!(uErr & ERR_WARNING))
 	{
diff --git a/misc/imm.c b/misc/imm.c
index d2d3d2d923d..52a0651a2fa 100644
--- a/misc/imm.c
+++ b/misc/imm.c
@@ -15,18 +15,18 @@
 /***********************************************************************
  *           ImmAssociateContext32 (IMM32.1)
  */
-HIMC32 WINAPI ImmAssociateContext32(HWND32 hWnd, HIMC32 hIMC)
+HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
 {
   FIXME(imm, "(0x%08x, 0x%08x): stub\n",hWnd,hIMC);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return (HIMC32)NULL;
+  return (HIMC)NULL;
 }
 
 /***********************************************************************
  *           ImmConfigureIME32A (IMM32.2)
  */
-BOOL32 WINAPI ImmConfigureIME32A(
-  HKL32 hKL, HWND32 hWnd, DWORD dwMode, LPVOID lpData)
+BOOL WINAPI ImmConfigureIMEA(
+  HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
 {
   FIXME(imm, "(0x%08x, 0x%08x, %ld, %p): stub\n",
     hKL, hWnd, dwMode, lpData
@@ -38,8 +38,8 @@ BOOL32 WINAPI ImmConfigureIME32A(
 /***********************************************************************
  *           ImmConfigureIME32W (IMM32.3)
  */
-BOOL32 WINAPI ImmConfigureIME32W(
-  HKL32 hKL, HWND32 hWnd, DWORD dwMode, LPVOID lpData)
+BOOL WINAPI ImmConfigureIMEW(
+  HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
 {
   FIXME(imm, "(0x%08x, 0x%08x, %ld, %p): stub\n",
     hKL, hWnd, dwMode, lpData
@@ -51,17 +51,17 @@ BOOL32 WINAPI ImmConfigureIME32W(
 /***********************************************************************
  *           ImmCreateContext32 (IMM32.4)
  */
-HIMC32 WINAPI ImmCreateContext32()
+HIMC WINAPI ImmCreateContext()
 {
   FIXME(imm, "(): stub\n");
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return (HIMC32)NULL;
+  return (HIMC)NULL;
 }
 
 /***********************************************************************
  *           ImmDestroyContext32 (IMM32.7)
  */
-BOOL32 WINAPI ImmDestroyContext32(HIMC32 hIMC)
+BOOL WINAPI ImmDestroyContext(HIMC hIMC)
 {
   FIXME(imm, "(0x%08x): stub\n",hIMC);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -71,8 +71,8 @@ BOOL32 WINAPI ImmDestroyContext32(HIMC32 hIMC)
 /***********************************************************************
  *           ImmEnumRegisterWord32A (IMM32.10)
  */
-UINT32 WINAPI ImmEnumRegisterWord32A(
-  HKL32 hKL, REGISTERWORDENUMPROCA lpfnEnumProc,
+UINT WINAPI ImmEnumRegisterWordA(
+  HKL hKL, REGISTERWORDENUMPROCA lpfnEnumProc,
   LPCSTR lpszReading, DWORD dwStyle,
   LPCSTR lpszRegister, LPVOID lpData)
 {
@@ -88,8 +88,8 @@ UINT32 WINAPI ImmEnumRegisterWord32A(
 /***********************************************************************
  *           ImmEnumRegisterWord32W (IMM32.11)
  */
-UINT32 WINAPI ImmEnumRegisterWord32W(
-  HKL32 hKL, REGISTERWORDENUMPROCW lpfnEnumProc,
+UINT WINAPI ImmEnumRegisterWordW(
+  HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc,
   LPCWSTR lpszReading, DWORD dwStyle,
   LPCWSTR lpszRegister, LPVOID lpData)
 {
@@ -105,9 +105,9 @@ UINT32 WINAPI ImmEnumRegisterWord32W(
 /***********************************************************************
  *           ImmEscape32A (IMM32.12)
  */
-LRESULT WINAPI ImmEscape32A(
-  HKL32 hKL, HIMC32 hIMC, 
-  UINT32 uEscape, LPVOID lpData)
+LRESULT WINAPI ImmEscapeA(
+  HKL hKL, HIMC hIMC, 
+  UINT uEscape, LPVOID lpData)
 {
   FIXME(imm, "(0x%08x, 0x%08x, %d, %p): stub\n",
     hKL, hIMC, uEscape, lpData
@@ -119,9 +119,9 @@ LRESULT WINAPI ImmEscape32A(
 /***********************************************************************
  *           ImmEscape32W (IMM32.13)
  */
-LRESULT WINAPI ImmEscape32W(
-  HKL32 hKL, HIMC32 hIMC,
-  UINT32 uEscape, LPVOID lpData)
+LRESULT WINAPI ImmEscapeW(
+  HKL hKL, HIMC hIMC,
+  UINT uEscape, LPVOID lpData)
 {
   FIXME(imm, "(0x%08x, 0x%08x, %d, %p): stub\n",
     hKL, hIMC, uEscape, lpData
@@ -133,8 +133,8 @@ LRESULT WINAPI ImmEscape32W(
 /***********************************************************************
  *           ImmGetCandidateList32A (IMM32.15)
  */
-DWORD WINAPI ImmGetCandidateList32A(
-  HIMC32 hIMC, DWORD deIndex, 
+DWORD WINAPI ImmGetCandidateListA(
+  HIMC hIMC, DWORD deIndex, 
   LPCANDIDATELIST lpCandList, DWORD dwBufLen)
 {
   FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n",
@@ -148,8 +148,8 @@ DWORD WINAPI ImmGetCandidateList32A(
 /***********************************************************************
  *           ImmGetCandidateListCount32A (IMM32.16)
  */
-DWORD WINAPI ImmGetCandidateListCount32A(
-  HIMC32 hIMC, LPDWORD lpdwListCount)
+DWORD WINAPI ImmGetCandidateListCountA(
+  HIMC hIMC, LPDWORD lpdwListCount)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpdwListCount);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -159,8 +159,8 @@ DWORD WINAPI ImmGetCandidateListCount32A(
 /***********************************************************************
  *           ImmGetCandidateListCount32W (IMM32.17)
  */
-DWORD WINAPI ImmGetCandidateListCount32W(
-  HIMC32 hIMC, LPDWORD lpdwListCount)
+DWORD WINAPI ImmGetCandidateListCountW(
+  HIMC hIMC, LPDWORD lpdwListCount)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpdwListCount);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -170,8 +170,8 @@ DWORD WINAPI ImmGetCandidateListCount32W(
 /***********************************************************************
  *           ImmGetCandidateList32W (IMM32.18)
  */
-DWORD WINAPI ImmGetCandidateList32W(
-  HIMC32 hIMC, DWORD deIndex, 
+DWORD WINAPI ImmGetCandidateListW(
+  HIMC hIMC, DWORD deIndex, 
   LPCANDIDATELIST lpCandList, DWORD dwBufLen)
 {
   FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n",
@@ -185,8 +185,8 @@ DWORD WINAPI ImmGetCandidateList32W(
 /***********************************************************************
  *           ImmGetCandidateWindow32 (IMM32.19)
  */
-BOOL32 WINAPI ImmGetCandidateWindow32(
-  HIMC32 hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate)
+BOOL WINAPI ImmGetCandidateWindow(
+  HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate)
 {
   FIXME(imm, "(0x%08x, %ld, %p): stub\n", hIMC, dwBufLen, lpCandidate);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -196,7 +196,7 @@ BOOL32 WINAPI ImmGetCandidateWindow32(
 /***********************************************************************
  *           ImmGetCompositionFont32A (IMM32.20)
  */
-BOOL32 WINAPI ImmGetCompositionFont32A(HIMC32 hIMC, LPLOGFONT32A lplf)
+BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -206,7 +206,7 @@ BOOL32 WINAPI ImmGetCompositionFont32A(HIMC32 hIMC, LPLOGFONT32A lplf)
 /***********************************************************************
  *           ImmGetCompositionFont32W (IMM32.21)
  */
-BOOL32 WINAPI ImmGetCompositionFont32W(HIMC32 hIMC, LPLOGFONT32W lplf)
+BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -216,8 +216,8 @@ BOOL32 WINAPI ImmGetCompositionFont32W(HIMC32 hIMC, LPLOGFONT32W lplf)
 /***********************************************************************
  *           ImmGetCompositionString32A (IMM32.22)
  */
-LONG WINAPI ImmGetCompositionString32A(
-  HIMC32 hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen)
+LONG WINAPI ImmGetCompositionStringA(
+  HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen)
 {
   FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n",
     hIMC, dwIndex, lpBuf, dwBufLen
@@ -237,8 +237,8 @@ LONG WINAPI ImmGetCompositionString32A(
 /***********************************************************************
  *           ImmGetCompositionString32W (IMM32.23)
  */
-LONG WINAPI ImmGetCompositionString32W(
-  HIMC32 hIMC, DWORD dwIndex, 
+LONG WINAPI ImmGetCompositionStringW(
+  HIMC hIMC, DWORD dwIndex, 
   LPVOID lpBuf, DWORD dwBufLen)
 {
   FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n",
@@ -259,7 +259,7 @@ LONG WINAPI ImmGetCompositionString32W(
 /***********************************************************************
  *           ImmGetCompositionWindow32 (IMM32.24)
  */
-BOOL32 WINAPI ImmGetCompositionWindow32(HIMC32 hIMC, LPCOMPOSITIONFORM lpCompForm)
+BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCompForm);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -269,20 +269,20 @@ BOOL32 WINAPI ImmGetCompositionWindow32(HIMC32 hIMC, LPCOMPOSITIONFORM lpCompFor
 /***********************************************************************
  *           ImmGetContext32 (IMM32.25)
  */
-HIMC32 WINAPI ImmGetContext32(HWND32 hWnd)
+HIMC WINAPI ImmGetContext(HWND hWnd)
 {
   FIXME(imm, "(0x%08x): stub\n", hWnd);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return (HIMC32)NULL;
+  return (HIMC)NULL;
 }
 
 /***********************************************************************
  *           ImmGetConversionList32A (IMM32.26)
  */
-DWORD WINAPI ImmGetConversionList32A(
-  HKL32 hKL, HIMC32 hIMC,
+DWORD WINAPI ImmGetConversionListA(
+  HKL hKL, HIMC hIMC,
   LPCSTR pSrc, LPCANDIDATELIST lpDst,
-  DWORD dwBufLen, UINT32 uFlag)
+  DWORD dwBufLen, UINT uFlag)
 {
   FIXME(imm, "(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n",
     hKL, hIMC, debugstr_a(pSrc), lpDst, dwBufLen, uFlag
@@ -294,10 +294,10 @@ DWORD WINAPI ImmGetConversionList32A(
 /***********************************************************************
  *           ImmGetConversionList32W (IMM32.27)
  */
-DWORD WINAPI ImmGetConversionList32W(
-  HKL32 hKL, HIMC32 hIMC,
+DWORD WINAPI ImmGetConversionListW(
+  HKL hKL, HIMC hIMC,
   LPCWSTR pSrc, LPCANDIDATELIST lpDst,
-  DWORD dwBufLen, UINT32 uFlag)
+  DWORD dwBufLen, UINT uFlag)
 {
   FIXME(imm, "(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n",
     hKL, hIMC, debugstr_w(pSrc), lpDst, dwBufLen, uFlag
@@ -309,8 +309,8 @@ DWORD WINAPI ImmGetConversionList32W(
 /***********************************************************************
  *           ImmGetConversionStatus32 (IMM32.28)
  */
-BOOL32 WINAPI ImmGetConversionStatus32(
-  HIMC32 hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence)
+BOOL WINAPI ImmGetConversionStatus(
+  HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence)
 {
   FIXME(imm, "(0x%08x, %p, %p): stub\n",
     hIMC, lpfdwConversion, lpfdwSentence
@@ -322,18 +322,18 @@ BOOL32 WINAPI ImmGetConversionStatus32(
 /***********************************************************************
  *           ImmGetDefaultIMEWnd32 (IMM32.29)
  */
-HWND32 WINAPI ImmGetDefaultIMEWnd32(HWND32 hWnd)
+HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd)
 {
   FIXME(imm, "(0x%08x): stub\n", hWnd);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return (HWND32)NULL;
+  return (HWND)NULL;
 }
 
 /***********************************************************************
  *           ImmGetDescription32A (IMM32.30)
  */
-UINT32 WINAPI ImmGetDescription32A(
-  HKL32 hKL, LPSTR lpszDescription, UINT32 uBufLen)
+UINT WINAPI ImmGetDescriptionA(
+  HKL hKL, LPSTR lpszDescription, UINT uBufLen)
 {
   FIXME(imm, "(0x%08x, %s, %d): stub\n",
     hKL, debugstr_a(lpszDescription), uBufLen
@@ -345,7 +345,7 @@ UINT32 WINAPI ImmGetDescription32A(
 /***********************************************************************
  *           ImmGetDescription32W (IMM32.31)
  */
-UINT32 WINAPI ImmGetDescription32W(HKL32 hKL, LPWSTR lpszDescription, UINT32 uBufLen)
+UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen)
 {
   FIXME(imm, "(0x%08x, %s, %d): stub\n",
     hKL, debugstr_w(lpszDescription), uBufLen
@@ -357,8 +357,8 @@ UINT32 WINAPI ImmGetDescription32W(HKL32 hKL, LPWSTR lpszDescription, UINT32 uBu
 /***********************************************************************
  *           ImmGetGuideLine32A (IMM32.32)
  */
-DWORD WINAPI ImmGetGuideLine32A(
-  HIMC32 hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen)
+DWORD WINAPI ImmGetGuideLineA(
+  HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen)
 {
   FIXME(imm, "(0x%08x, %ld, %s, %ld): stub\n",
     hIMC, dwIndex, debugstr_a(lpBuf), dwBufLen
@@ -370,7 +370,7 @@ DWORD WINAPI ImmGetGuideLine32A(
 /***********************************************************************
  *           ImmGetGuideLine32W (IMM32.33)
  */
-DWORD WINAPI ImmGetGuideLine32W(HIMC32 hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen)
+DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen)
 {
   FIXME(imm, "(0x%08x, %ld, %s, %ld): stub\n",
     hIMC, dwIndex, debugstr_w(lpBuf), dwBufLen
@@ -382,8 +382,8 @@ DWORD WINAPI ImmGetGuideLine32W(HIMC32 hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD
 /***********************************************************************
  *           ImmGetIMEFileName32A (IMM32.38)
  */
-UINT32 WINAPI ImmGetIMEFileName32A(
-  HKL32 hKL, LPSTR lpszFileName, UINT32 uBufLen)
+UINT WINAPI ImmGetIMEFileNameA(
+  HKL hKL, LPSTR lpszFileName, UINT uBufLen)
 {
   FIXME(imm, "(0x%08x, %s, %d): stub\n",
     hKL, debugstr_a(lpszFileName), uBufLen
@@ -395,8 +395,8 @@ UINT32 WINAPI ImmGetIMEFileName32A(
 /***********************************************************************
  *           ImmGetIMEFileName32W (IMM32.39)
  */
-UINT32 WINAPI ImmGetIMEFileName32W(
-  HKL32 hKL, LPWSTR lpszFileName, UINT32 uBufLen)
+UINT WINAPI ImmGetIMEFileNameW(
+  HKL hKL, LPWSTR lpszFileName, UINT uBufLen)
 {
   FIXME(imm, "(0x%08x, %s, %d): stub\n",
     hKL, debugstr_w(lpszFileName), uBufLen
@@ -408,7 +408,7 @@ UINT32 WINAPI ImmGetIMEFileName32W(
 /***********************************************************************
  *           ImmGetOpenStatus32 (IMM32.40)
  */
-BOOL32 WINAPI ImmGetOpenStatus32(HIMC32 hIMC)
+BOOL WINAPI ImmGetOpenStatus(HIMC hIMC)
 {
   FIXME(imm, "(0x%08x): stub\n", hIMC);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -418,7 +418,7 @@ BOOL32 WINAPI ImmGetOpenStatus32(HIMC32 hIMC)
 /***********************************************************************
  *           ImmGetProperty32 (IMM32.41)
  */
-DWORD WINAPI ImmGetProperty32(HKL32 hKL, DWORD fdwIndex)
+DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex)
 {
   FIXME(imm, "(0x%08x, %ld): stub\n", hKL, fdwIndex);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -428,8 +428,8 @@ DWORD WINAPI ImmGetProperty32(HKL32 hKL, DWORD fdwIndex)
 /***********************************************************************
  *           ImmGetRegisterWordStyle32A (IMM32.42)
  */
-UINT32 WINAPI ImmGetRegisterWordStyle32A(
-  HKL32 hKL, UINT32 nItem, LPSTYLEBUFA lpStyleBuf)
+UINT WINAPI ImmGetRegisterWordStyleA(
+  HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf)
 {
   FIXME(imm, "(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -439,8 +439,8 @@ UINT32 WINAPI ImmGetRegisterWordStyle32A(
 /***********************************************************************
  *           ImmGetRegisterWordStyle32W (IMM32.43)
  */
-UINT32 WINAPI ImmGetRegisterWordStyle32W(
-  HKL32 hKL, UINT32 nItem, LPSTYLEBUFW lpStyleBuf)
+UINT WINAPI ImmGetRegisterWordStyleW(
+  HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf)
 {
   FIXME(imm, "(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -450,7 +450,7 @@ UINT32 WINAPI ImmGetRegisterWordStyle32W(
 /***********************************************************************
  *           ImmGetStatusWindowPos32 (IMM32.44)
  */
-BOOL32 WINAPI ImmGetStatusWindowPos32(HIMC32 hIMC, LPPOINT32 lpptPos)
+BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpptPos);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -460,7 +460,7 @@ BOOL32 WINAPI ImmGetStatusWindowPos32(HIMC32 hIMC, LPPOINT32 lpptPos)
 /***********************************************************************
  *           ImmGetVirtualKey32 (IMM32.45)
  */
-UINT32 WINAPI ImmGetVirtualKey32(HWND32 hWnd)
+UINT WINAPI ImmGetVirtualKey(HWND hWnd)
 {
   FIXME(imm, "(0x%08x): stub\n", hWnd);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -478,33 +478,33 @@ UINT32 WINAPI ImmGetVirtualKey32(HWND32 hWnd)
 /***********************************************************************
  *           ImmInstallIME32A (IMM32.46)
  */
-HKL32 WINAPI ImmInstallIME32A(
+HKL WINAPI ImmInstallIMEA(
   LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText)
 {
   FIXME(imm, "(%s, %s): stub\n",
     debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText)
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return (HKL32)NULL;
+  return (HKL)NULL;
 }
 
 /***********************************************************************
  *           ImmInstallIME32W (IMM32.47)
  */
-HKL32 WINAPI ImmInstallIME32W(
+HKL WINAPI ImmInstallIMEW(
   LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText)
 {
   FIXME(imm, "(%s, %s): stub\n",
     debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText)
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return (HKL32)NULL;
+  return (HKL)NULL;
 }
 
 /***********************************************************************
  *           ImmIsIME32 (IMM32.48)
  */
-BOOL32 WINAPI ImmIsIME32(HKL32 hKL)
+BOOL WINAPI ImmIsIME(HKL hKL)
 {
   FIXME(imm, "(0x%08x): stub\n", hKL);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -514,8 +514,8 @@ BOOL32 WINAPI ImmIsIME32(HKL32 hKL)
 /***********************************************************************
  *           ImmIsUIMessage32A (IMM32.49)
  */
-BOOL32 WINAPI ImmIsUIMessage32A(
-  HWND32 hWndIME, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
+BOOL WINAPI ImmIsUIMessageA(
+  HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   FIXME(imm, "(0x%08x, %d, %d, %ld): stub\n",
     hWndIME, msg, wParam, lParam
@@ -527,8 +527,8 @@ BOOL32 WINAPI ImmIsUIMessage32A(
 /***********************************************************************
  *           ImmIsUIMessage32W (IMM32.50)
  */
-BOOL32 WINAPI ImmIsUIMessage32W(
-  HWND32 hWndIME, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
+BOOL WINAPI ImmIsUIMessageW(
+  HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   FIXME(imm, "(0x%08x, %d, %d, %ld): stub\n",
     hWndIME, msg, wParam, lParam
@@ -540,8 +540,8 @@ BOOL32 WINAPI ImmIsUIMessage32W(
 /***********************************************************************
  *           ImmNotifyIME32 (IMM32.53)
  */
-BOOL32 WINAPI ImmNotifyIME32(
-  HIMC32 hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
+BOOL WINAPI ImmNotifyIME(
+  HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
 {
   FIXME(imm, "(0x%08x, %ld, %ld, %ld): stub\n",
     hIMC, dwAction, dwIndex, dwValue
@@ -553,8 +553,8 @@ BOOL32 WINAPI ImmNotifyIME32(
 /***********************************************************************
  *           ImmRegisterWord32A (IMM32.55)
  */
-BOOL32 WINAPI ImmRegisterWord32A(
-  HKL32 hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister)
+BOOL WINAPI ImmRegisterWordA(
+  HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister)
 {
   FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n",
     hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister)
@@ -566,8 +566,8 @@ BOOL32 WINAPI ImmRegisterWord32A(
 /***********************************************************************
  *           ImmRegisterWord32W (IMM32.56)
  */
-BOOL32 WINAPI ImmRegisterWord32W(
-  HKL32 hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister)
+BOOL WINAPI ImmRegisterWordW(
+  HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister)
 {
   FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n",
     hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister)
@@ -579,7 +579,7 @@ BOOL32 WINAPI ImmRegisterWord32W(
 /***********************************************************************
  *           ImmReleaseContext32 (IMM32.57)
  */
-BOOL32 WINAPI ImmReleaseContext32(HWND32 hWnd, HIMC32 hIMC)
+BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC)
 {
   FIXME(imm, "(0x%08x, 0x%08x): stub\n", hWnd, hIMC);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -589,8 +589,8 @@ BOOL32 WINAPI ImmReleaseContext32(HWND32 hWnd, HIMC32 hIMC)
 /***********************************************************************
  *           ImmSetCandidateWindow32 (IMM32.58)
  */
-BOOL32 WINAPI ImmSetCandidateWindow32(
-  HIMC32 hIMC, LPCANDIDATEFORM lpCandidate)
+BOOL WINAPI ImmSetCandidateWindow(
+  HIMC hIMC, LPCANDIDATEFORM lpCandidate)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCandidate);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -600,7 +600,7 @@ BOOL32 WINAPI ImmSetCandidateWindow32(
 /***********************************************************************
  *           ImmSetCompositionFont32A (IMM32.59)
  */
-BOOL32 WINAPI ImmSetCompositionFont32A(HIMC32 hIMC, LPLOGFONT32A lplf)
+BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -610,7 +610,7 @@ BOOL32 WINAPI ImmSetCompositionFont32A(HIMC32 hIMC, LPLOGFONT32A lplf)
 /***********************************************************************
  *           ImmSetCompositionFont32W (IMM32.60)
  */
-BOOL32 WINAPI ImmSetCompositionFont32W(HIMC32 hIMC, LPLOGFONT32W lplf)
+BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -620,8 +620,8 @@ BOOL32 WINAPI ImmSetCompositionFont32W(HIMC32 hIMC, LPLOGFONT32W lplf)
 /***********************************************************************
  *           ImmSetCompositionString32A (IMM32.61)
  */
-BOOL32 WINAPI ImmSetCompositionString32A(
-  HIMC32 hIMC, DWORD dwIndex, 
+BOOL WINAPI ImmSetCompositionStringA(
+  HIMC hIMC, DWORD dwIndex, 
   LPCVOID lpComp, DWORD dwCompLen, 
   LPCVOID lpRead, DWORD dwReadLen)
 {
@@ -635,8 +635,8 @@ BOOL32 WINAPI ImmSetCompositionString32A(
 /***********************************************************************
  *           ImmSetCompositionString32W (IMM32.62)
  */
-BOOL32 WINAPI ImmSetCompositionString32W(
-	HIMC32 hIMC, DWORD dwIndex,
+BOOL WINAPI ImmSetCompositionStringW(
+	HIMC hIMC, DWORD dwIndex,
 	LPCVOID lpComp, DWORD dwCompLen,
 	LPCVOID lpRead, DWORD dwReadLen)
 {
@@ -650,8 +650,8 @@ BOOL32 WINAPI ImmSetCompositionString32W(
 /***********************************************************************
  *           ImmSetCompositionWindow32 (IMM32.63)
  */
-BOOL32 WINAPI ImmSetCompositionWindow32(
-  HIMC32 hIMC, LPCOMPOSITIONFORM lpCompForm)
+BOOL WINAPI ImmSetCompositionWindow(
+  HIMC hIMC, LPCOMPOSITIONFORM lpCompForm)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCompForm);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -661,8 +661,8 @@ BOOL32 WINAPI ImmSetCompositionWindow32(
 /***********************************************************************
  *           ImmSetConversionStatus32 (IMM32.64)
  */
-BOOL32 WINAPI ImmSetConversionStatus32(
-  HIMC32 hIMC, DWORD fdwConversion, DWORD fdwSentence)
+BOOL WINAPI ImmSetConversionStatus(
+  HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence)
 {
   FIXME(imm, "(0x%08x, %ld, %ld): stub\n",
     hIMC, fdwConversion, fdwSentence
@@ -674,7 +674,7 @@ BOOL32 WINAPI ImmSetConversionStatus32(
 /***********************************************************************
  *           ImmSetOpenStatus32 (IMM32.66)
  */
-BOOL32 WINAPI ImmSetOpenStatus32(HIMC32 hIMC, BOOL32 fOpen)
+BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen)
 {
   FIXME(imm, "(0x%08x, %d): stub\n", hIMC, fOpen);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -684,7 +684,7 @@ BOOL32 WINAPI ImmSetOpenStatus32(HIMC32 hIMC, BOOL32 fOpen)
 /***********************************************************************
  *           ImmSetStatusWindowPos32 (IMM32.67)
  */
-BOOL32 WINAPI ImmSetStatusWindowPos32(HIMC32 hIMC, LPPOINT32 lpptPos)
+BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos)
 {
   FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpptPos);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -694,7 +694,7 @@ BOOL32 WINAPI ImmSetStatusWindowPos32(HIMC32 hIMC, LPPOINT32 lpptPos)
 /***********************************************************************
  *           ImmSimulateHotKey32 (IMM32.69)
  */
-BOOL32 WINAPI ImmSimulateHotKey32(HWND32 hWnd, DWORD dwHotKeyID)
+BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID)
 {
   FIXME(imm, "(0x%08x, %ld): stub\n", hWnd, dwHotKeyID);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -704,8 +704,8 @@ BOOL32 WINAPI ImmSimulateHotKey32(HWND32 hWnd, DWORD dwHotKeyID)
 /***********************************************************************
  *           ImmUnregisterWord32A (IMM32.72)
  */
-BOOL32 WINAPI ImmUnregisterWord32A(
-  HKL32 hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister)
+BOOL WINAPI ImmUnregisterWordA(
+  HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister)
 {
   FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n",
     hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszUnregister)
@@ -720,8 +720,8 @@ BOOL32 WINAPI ImmUnregisterWord32A(
  *     I haven't been able to find the ordinal for this function,
  *     This means it can't be called from outside the DLL.
  */
-BOOL32 WINAPI ImmUnregisterWord32W(
-  HKL32 hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister)
+BOOL WINAPI ImmUnregisterWordW(
+  HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister)
 {
   FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n",
     hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister)
diff --git a/misc/lstr.c b/misc/lstr.c
index 3d8980c45da..048bb6bed37 100644
--- a/misc/lstr.c
+++ b/misc/lstr.c
@@ -118,7 +118,7 @@ SEGPTR WINAPI AnsiUpper16( SEGPTR strOrChar )
  */
 UINT16 WINAPI AnsiUpperBuff16( LPSTR str, UINT16 len )
 {
-    UINT32 count = len ? len : 65536;
+    UINT count = len ? len : 65536;
     for (; count; count--, str++) *str = toupper(*str);
     return len;
 }
@@ -147,7 +147,7 @@ SEGPTR WINAPI AnsiLower16( SEGPTR strOrChar )
  */
 UINT16 WINAPI AnsiLowerBuff16( LPSTR str, UINT16 len )
 {
-    UINT32 count = len ? len : 65536;
+    UINT count = len ? len : 65536;
     for (; count; count--, str++) *str = tolower(*str);
     return len;
 }
@@ -177,7 +177,7 @@ SEGPTR WINAPI AnsiPrev16( SEGPTR start, SEGPTR current )
 void WINAPI OutputDebugString16( LPCSTR str )
 {
     char module[10];
-    if (!GetModuleName( GetCurrentTask(), module, sizeof(module) ))
+    if (!GetModuleName16( GetCurrentTask(), module, sizeof(module) ))
         strcpy( module, "???" );
 
     DUMP( "%s says %s\n", module, debugstr_a(str) );
@@ -187,7 +187,7 @@ void WINAPI OutputDebugString16( LPCSTR str )
 /***********************************************************************
  *           OutputDebugString32A   (KERNEL32
  */
-void WINAPI OutputDebugString32A( LPCSTR str )
+void WINAPI OutputDebugStringA( LPCSTR str )
 {
     OutputDebugString16( str );
 }
@@ -197,10 +197,10 @@ void WINAPI OutputDebugString32A( LPCSTR str )
 /***********************************************************************
  *           OutputDebugString32W   (KERNEL32
  */
-void WINAPI OutputDebugString32W( LPCWSTR str )
+void WINAPI OutputDebugStringW( LPCWSTR str )
 {
     LPSTR p = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-    OutputDebugString32A( p );
+    OutputDebugStringA( p );
     HeapFree( GetProcessHeap(), 0, p );
 }
 
@@ -209,10 +209,10 @@ void WINAPI OutputDebugString32W( LPCWSTR str )
 /***********************************************************************
  *           CharNext32A   (USER32.29)
  */
-LPSTR WINAPI CharNext32A( LPCSTR ptr )
+LPSTR WINAPI CharNextA( LPCSTR ptr )
 {
     if (!*ptr) return (LPSTR)ptr;
-    if (IsDBCSLeadByte32( *ptr )) return (LPSTR)(ptr + 2);
+    if (IsDBCSLeadByte( *ptr )) return (LPSTR)(ptr + 2);
     return (LPSTR)(ptr + 1);
 }
 
@@ -220,7 +220,7 @@ LPSTR WINAPI CharNext32A( LPCSTR ptr )
 /***********************************************************************
  *           CharNextEx32A   (USER32.30)
  */
-LPSTR WINAPI CharNextEx32A( WORD codepage, LPCSTR ptr, DWORD flags )
+LPSTR WINAPI CharNextExA( WORD codepage, LPCSTR ptr, DWORD flags )
 {
     if (!*ptr) return (LPSTR)ptr;
     if (IsDBCSLeadByteEx( codepage, *ptr )) return (LPSTR)(ptr + 2);
@@ -231,7 +231,7 @@ LPSTR WINAPI CharNextEx32A( WORD codepage, LPCSTR ptr, DWORD flags )
 /***********************************************************************
  *           CharNextExW   (USER32.31)
  */
-LPWSTR WINAPI CharNextEx32W(WORD codepage,LPCWSTR x,DWORD flags)
+LPWSTR WINAPI CharNextExW(WORD codepage,LPCWSTR x,DWORD flags)
 {
     /* FIXME: add DBCS / codepage stuff */
     if (*x) return (LPWSTR)(x+1);
@@ -241,7 +241,7 @@ LPWSTR WINAPI CharNextEx32W(WORD codepage,LPCWSTR x,DWORD flags)
 /***********************************************************************
  *           CharNextW   (USER32.32)
  */
-LPWSTR WINAPI CharNext32W(LPCWSTR x)
+LPWSTR WINAPI CharNextW(LPCWSTR x)
 {
     if (*x) return (LPWSTR)(x+1);
     else return (LPWSTR)x;
@@ -250,11 +250,11 @@ LPWSTR WINAPI CharNext32W(LPCWSTR x)
 /***********************************************************************
  *           CharPrev32A   (USER32.33)
  */
-LPSTR WINAPI CharPrev32A( LPCSTR start, LPCSTR ptr )
+LPSTR WINAPI CharPrevA( LPCSTR start, LPCSTR ptr )
 {
     while (*start && (start < ptr))
     {
-        LPCSTR next = CharNext32A( start );
+        LPCSTR next = CharNextA( start );
         if (next >= ptr) break;
         start = next;
     }
@@ -265,11 +265,11 @@ LPSTR WINAPI CharPrev32A( LPCSTR start, LPCSTR ptr )
 /***********************************************************************
  *           CharPrevEx32A   (USER32.34)
  */
-LPSTR WINAPI CharPrevEx32A( WORD codepage, LPCSTR start, LPCSTR ptr, DWORD flags )
+LPSTR WINAPI CharPrevExA( WORD codepage, LPCSTR start, LPCSTR ptr, DWORD flags )
 {
     while (*start && (start < ptr))
     {
-        LPCSTR next = CharNextEx32A( codepage, start, flags );
+        LPCSTR next = CharNextExA( codepage, start, flags );
         if (next > ptr) break;
         start = next;
     }
@@ -280,7 +280,7 @@ LPSTR WINAPI CharPrevEx32A( WORD codepage, LPCSTR start, LPCSTR ptr, DWORD flags
 /***********************************************************************
  *           CharPrevExW   (USER32.35)
  */
-LPWSTR WINAPI CharPrevEx32W(WORD codepage,LPCWSTR start,LPCWSTR x,DWORD flags)
+LPWSTR WINAPI CharPrevExW(WORD codepage,LPCWSTR start,LPCWSTR x,DWORD flags)
 {
     /* FIXME: add DBCS / codepage stuff */
     if (x>start) return (LPWSTR)(x-1);
@@ -290,7 +290,7 @@ LPWSTR WINAPI CharPrevEx32W(WORD codepage,LPCWSTR start,LPCWSTR x,DWORD flags)
 /***********************************************************************
  *           CharPrevW   (USER32.36)
  */
-LPWSTR WINAPI CharPrev32W(LPCWSTR start,LPCWSTR x)
+LPWSTR WINAPI CharPrevW(LPCWSTR start,LPCWSTR x)
 {
     if (x>start) return (LPWSTR)(x-1);
     else return (LPWSTR)x;
@@ -300,7 +300,7 @@ LPWSTR WINAPI CharPrev32W(LPCWSTR start,LPCWSTR x)
  *           CharLowerA   (USER32.25)
  * FIXME: handle current locale
  */
-LPSTR WINAPI CharLower32A(LPSTR x)
+LPSTR WINAPI CharLowerA(LPSTR x)
 {
     LPSTR	s;
 
@@ -321,7 +321,7 @@ LPSTR WINAPI CharLower32A(LPSTR x)
  *           CharLowerBuffA   (USER32.26)
  * FIXME: handle current locale
  */
-DWORD WINAPI CharLowerBuff32A(LPSTR x,DWORD buflen)
+DWORD WINAPI CharLowerBuffA(LPSTR x,DWORD buflen)
 {
     DWORD done=0;
 
@@ -339,7 +339,7 @@ DWORD WINAPI CharLowerBuff32A(LPSTR x,DWORD buflen)
  *           CharLowerBuffW   (USER32.27)
  * FIXME: handle current locale
  */
-DWORD WINAPI CharLowerBuff32W(LPWSTR x,DWORD buflen)
+DWORD WINAPI CharLowerBuffW(LPWSTR x,DWORD buflen)
 {
     DWORD done=0;
 
@@ -357,7 +357,7 @@ DWORD WINAPI CharLowerBuff32W(LPWSTR x,DWORD buflen)
  *           CharLowerW   (USER32.28)
  * FIXME: handle current locale
  */
-LPWSTR WINAPI CharLower32W(LPWSTR x)
+LPWSTR WINAPI CharLowerW(LPWSTR x)
 {
     if (HIWORD(x))
     {
@@ -369,14 +369,14 @@ LPWSTR WINAPI CharLower32W(LPWSTR x)
         }
         return x;
     }
-    else return (LPWSTR)((UINT32)towlower(LOWORD(x)));
+    else return (LPWSTR)((UINT)towlower(LOWORD(x)));
 }
 
 /***********************************************************************
  *           CharUpper32A   (USER32.41)
  * FIXME: handle current locale
  */
-LPSTR WINAPI CharUpper32A(LPSTR x)
+LPSTR WINAPI CharUpperA(LPSTR x)
 {
     if (HIWORD(x))
     {
@@ -395,7 +395,7 @@ LPSTR WINAPI CharUpper32A(LPSTR x)
  *           CharUpperBuffA   (USER32.42)
  * FIXME: handle current locale
  */
-DWORD WINAPI CharUpperBuff32A(LPSTR x,DWORD buflen)
+DWORD WINAPI CharUpperBuffA(LPSTR x,DWORD buflen)
 {
     DWORD done=0;
 
@@ -413,7 +413,7 @@ DWORD WINAPI CharUpperBuff32A(LPSTR x,DWORD buflen)
  *           CharUpperBuffW   (USER32.43)
  * FIXME: handle current locale
  */
-DWORD WINAPI CharUpperBuff32W(LPWSTR x,DWORD buflen)
+DWORD WINAPI CharUpperBuffW(LPWSTR x,DWORD buflen)
 {
     DWORD done=0;
 
@@ -431,7 +431,7 @@ DWORD WINAPI CharUpperBuff32W(LPWSTR x,DWORD buflen)
  *           CharUpperW   (USER32.44)
  * FIXME: handle current locale
  */
-LPWSTR WINAPI CharUpper32W(LPWSTR x)
+LPWSTR WINAPI CharUpperW(LPWSTR x)
 {
     if (HIWORD(x))
     {
@@ -443,14 +443,14 @@ LPWSTR WINAPI CharUpper32W(LPWSTR x)
         }
         return x;
     }
-    else return (LPWSTR)((UINT32)towupper(LOWORD(x)));
+    else return (LPWSTR)((UINT)towupper(LOWORD(x)));
 }
 
 /***********************************************************************
  *           IsCharAlphaA   (USER32.331)
  * FIXME: handle current locale
  */
-BOOL32 WINAPI IsCharAlpha32A(CHAR x)
+BOOL WINAPI IsCharAlphaA(CHAR x)
 {
     return (OLE2NLS_CT_CType3_LUT[(unsigned char)x] & C3_ALPHA);
 }
@@ -459,16 +459,16 @@ BOOL32 WINAPI IsCharAlpha32A(CHAR x)
  *           IsCharAlphaNumericA   (USER32.332)
  * FIXME: handle current locale
  */
-BOOL32 WINAPI IsCharAlphaNumeric32A(CHAR x)
+BOOL WINAPI IsCharAlphaNumericA(CHAR x)
 {
-    return IsCharAlpha32A(x) || isdigit(x) ;
+    return IsCharAlphaA(x) || isdigit(x) ;
 }
 
 /***********************************************************************
  *           IsCharAlphaNumericW   (USER32.333)
  * FIXME: handle current locale
  */
-BOOL32 WINAPI IsCharAlphaNumeric32W(WCHAR x)
+BOOL WINAPI IsCharAlphaNumericW(WCHAR x)
 {
     return iswalnum(x);
 }
@@ -477,7 +477,7 @@ BOOL32 WINAPI IsCharAlphaNumeric32W(WCHAR x)
  *           IsCharAlphaW   (USER32.334)
  * FIXME: handle current locale
  */
-BOOL32 WINAPI IsCharAlpha32W(WCHAR x)
+BOOL WINAPI IsCharAlphaW(WCHAR x)
 {
     return iswalpha(x);
 }
@@ -486,7 +486,7 @@ BOOL32 WINAPI IsCharAlpha32W(WCHAR x)
  *           IsCharLower32A   (USER32.335)
  * FIXME: handle current locale
  */
-BOOL32 WINAPI IsCharLower32A(CHAR x)
+BOOL WINAPI IsCharLowerA(CHAR x)
 {
     return islower(x);
 }
@@ -495,7 +495,7 @@ BOOL32 WINAPI IsCharLower32A(CHAR x)
  *           IsCharLower32W   (USER32.336)
  * FIXME: handle current locale
  */
-BOOL32 WINAPI IsCharLower32W(WCHAR x)
+BOOL WINAPI IsCharLowerW(WCHAR x)
 {
     return iswlower(x);
 }
@@ -504,7 +504,7 @@ BOOL32 WINAPI IsCharLower32W(WCHAR x)
  *           IsCharUpper32A   (USER32.337)
  * FIXME: handle current locale
  */
-BOOL32 WINAPI IsCharUpper32A(CHAR x)
+BOOL WINAPI IsCharUpperA(CHAR x)
 {
     return isupper(x);
 }
@@ -513,7 +513,7 @@ BOOL32 WINAPI IsCharUpper32A(CHAR x)
  *           IsCharUpper32W   (USER32.338)
  * FIXME: handle current locale
  */
-BOOL32 WINAPI IsCharUpper32W(WCHAR x)
+BOOL WINAPI IsCharUpperW(WCHAR x)
 {
     return iswupper(x);
 }
@@ -530,14 +530,14 @@ DWORD WINAPI FormatMessage16(
     WORD   nSize,
     LPDWORD args /* va_list *args */
 ) {
-    return FormatMessage32A(dwFlags, lpSource, (DWORD)dwMessageId, (DWORD)dwLanguageId, lpBuffer, (DWORD)nSize, args);
+    return FormatMessageA(dwFlags, lpSource, (DWORD)dwMessageId, (DWORD)dwLanguageId, lpBuffer, (DWORD)nSize, args);
 }
 
 /***********************************************************************
  *           FormatMessage32A   (KERNEL32.138)
  * FIXME: missing wrap,FROM_SYSTEM message-loading,
  */
-DWORD WINAPI FormatMessage32A(
+DWORD WINAPI FormatMessageA(
 	DWORD	dwFlags,
 	LPCVOID	lpSource,
 	DWORD	dwMessageId,
@@ -566,13 +566,13 @@ DWORD WINAPI FormatMessage32A(
 		sprintf(from,"Systemmessage, messageid = 0x%08lx\n",dwMessageId);
 	}
 	if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) {
-		INT32	bufsize;
+		INT	bufsize;
 
 		dwMessageId &= 0xFFFF;
-		bufsize=LoadMessage32A((HMODULE32)lpSource,dwMessageId,dwLanguageId,NULL,100);
+		bufsize=LoadMessageA((HMODULE)lpSource,dwMessageId,dwLanguageId,NULL,100);
 		if (bufsize) {
 			from = HeapAlloc( GetProcessHeap(), 0, bufsize + 1 );
-			LoadMessage32A((HMODULE32)lpSource,dwMessageId,dwLanguageId,from,bufsize+1);
+			LoadMessageA((HMODULE)lpSource,dwMessageId,dwLanguageId,from,bufsize+1);
 		}
 	}
 	target	= HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100);
@@ -647,7 +647,7 @@ DWORD WINAPI FormatMessage32A(
 							sprintfbuf=HeapAlloc(GetProcessHeap(),0,100);
 
 						/* CMF - This makes a BIG assumption about va_list */
-						wvsprintf32A(sprintfbuf, fmtstr, (va_list) argliststart);
+						wvsprintfA(sprintfbuf, fmtstr, (va_list) argliststart);
 						x=sprintfbuf;
 						while (*x) {
 							ADD_TO_T(*x++);
@@ -694,7 +694,7 @@ DWORD WINAPI FormatMessage32A(
     TRACE(resource,"-- %s\n",debugstr_a(target));
 	if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) {
 		/* nSize is the MINIMUM size */
-		*((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc32(GMEM_ZEROINIT,talloced);
+		*((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(GMEM_ZEROINIT,talloced);
 		memcpy(*(LPSTR*)lpBuffer,target,talloced);
 	} else
 		strncpy(lpBuffer,target,nSize);
@@ -713,7 +713,7 @@ DWORD WINAPI FormatMessage32A(
 /***********************************************************************
  *           FormatMessage32W   (KERNEL32.138)
  */
-DWORD WINAPI FormatMessage32W(
+DWORD WINAPI FormatMessageW(
 	DWORD	dwFlags,
 	LPCVOID	lpSource,
 	DWORD	dwMessageId,
@@ -743,14 +743,14 @@ DWORD WINAPI FormatMessage32W(
 		sprintf(from,"Systemmessage, messageid = 0x%08lx\n",dwMessageId);
 	}
 	if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) {
-		INT32	bufsize;
+		INT	bufsize;
 
 		dwMessageId &= 0xFFFF;
-		bufsize=LoadMessage32A((HMODULE32)lpSource,dwMessageId,dwLanguageId,NULL,100);
+		bufsize=LoadMessageA((HMODULE)lpSource,dwMessageId,dwLanguageId,NULL,100);
 		if (bufsize)
                 {
                     from = HeapAlloc( GetProcessHeap(), 0, bufsize + 1 );
-                    LoadMessage32A((HMODULE32)lpSource,dwMessageId,dwLanguageId,from,bufsize+1);
+                    LoadMessageA((HMODULE)lpSource,dwMessageId,dwLanguageId,from,bufsize+1);
 		}
 	}
 	target	= HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 );
@@ -825,7 +825,7 @@ DWORD WINAPI FormatMessage32W(
 						/* possible invalid pointers */
 						xarr[1]=*(argliststart+1);
 						xarr[2]=*(argliststart+2);
-						sprintfbuf=HeapAlloc(GetProcessHeap(),0,lstrlen32W((LPWSTR)argliststart[0])*2+1);
+						sprintfbuf=HeapAlloc(GetProcessHeap(),0,lstrlenW((LPWSTR)argliststart[0])*2+1);
 
 						/* CMF - This makes a BIG assumption about va_list */
 						vsprintf(sprintfbuf, fmtstr, (va_list) xarr);
@@ -833,7 +833,7 @@ DWORD WINAPI FormatMessage32W(
 						sprintfbuf=HeapAlloc(GetProcessHeap(),0,100);
 
 						/* CMF - This makes a BIG assumption about va_list */
-						wvsprintf32A(sprintfbuf, fmtstr, (va_list) argliststart);
+						wvsprintfA(sprintfbuf, fmtstr, (va_list) argliststart);
 					}
 					x=sprintfbuf;
 					while (*x) {
@@ -871,15 +871,15 @@ DWORD WINAPI FormatMessage32W(
 		target = (char*)HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize);
 	if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) {
 		/* nSize is the MINIMUM size */
-		*((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc32(GMEM_ZEROINIT,talloced*2+2);
+		*((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(GMEM_ZEROINIT,talloced*2+2);
 		lstrcpynAtoW(*(LPWSTR*)lpBuffer,target,talloced);
 	} else
 		lstrcpynAtoW(lpBuffer,target,nSize);
 	HeapFree(GetProcessHeap(),0,target);
 	if (from) HeapFree(GetProcessHeap(),0,from);
 	return (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? 
-			lstrlen32W(*(LPWSTR*)lpBuffer):
-			lstrlen32W(lpBuffer);
+			lstrlenW(*(LPWSTR*)lpBuffer):
+			lstrlenW(lpBuffer);
 #else
 	return 0;
 #endif /* __i386__ */
diff --git a/misc/lzexpand.c b/misc/lzexpand.c
index dfa3b0e6c5c..86606186e4f 100644
--- a/misc/lzexpand.c
+++ b/misc/lzexpand.c
@@ -34,7 +34,7 @@ struct lzfileheader {
 static BYTE LZMagic[8]={'S','Z','D','D',0x88,0xf0,0x27,0x33};
 
 struct lzstate {
-	HFILE32	realfd;		/* the real filedescriptor */
+	HFILE	realfd;		/* the real filedescriptor */
 	CHAR	lastchar;	/* the last char of the filename */
 
 	DWORD	reallength;	/* the decompressed length of the file */
@@ -42,7 +42,7 @@ struct lzstate {
 	DWORD	realwanted;	/* the position the user wants to read from */
 
 	BYTE	table[0x1000];	/* the rotating LZ table */
-	UINT32	curtabent;	/* CURrent TABle ENTry */
+	UINT	curtabent;	/* CURrent TABle ENTry */
 
 	BYTE	stringlen;	/* length and position of current string */ 
 	DWORD	stringpos;	/* from stringtable */
@@ -71,9 +71,9 @@ _lzget(struct lzstate *lzs,BYTE *b) {
 		*b		= lzs->get[lzs->getcur++];
 		return		1;
 	} else {
-		int ret = _lread32(lzs->realfd,lzs->get,GETLEN);
-		if (ret==HFILE_ERROR32)
-			return HFILE_ERROR32;
+		int ret = _lread(lzs->realfd,lzs->get,GETLEN);
+		if (ret==HFILE_ERROR)
+			return HFILE_ERROR;
 		if (ret==0)
 			return 0;
 		lzs->getlen	= ret;
@@ -88,17 +88,17 @@ _lzget(struct lzstate *lzs,BYTE *b) {
  * return UNKNOWNALG for unknown algorithm
  * returns lzfileheader in *head
  */
-static INT32 read_header(HFILE32 fd,struct lzfileheader *head)
+static INT read_header(HFILE fd,struct lzfileheader *head)
 {
 	BYTE	buf[14];
 
-	if (_llseek32(fd,0,SEEK_SET)==-1)
+	if (_llseek(fd,0,SEEK_SET)==-1)
 		return LZERROR_BADINHANDLE;
 
 	/* We can't directly read the lzfileheader struct due to 
 	 * structure element alignment
 	 */
-	if (_lread32(fd,buf,14)<14)
+	if (_lread(fd,buf,14)<14)
 		return 0;
 	memcpy(head->magic,buf,8);
 	memcpy(&(head->compressiontype),buf+8,1);
@@ -127,7 +127,7 @@ INT16 WINAPI LZStart16(void)
 /***********************************************************************
  *           LZStart32   (LZ32.6)
  */
-INT32 WINAPI LZStart32(void)
+INT WINAPI LZStart(void)
 {
     TRACE(file,"(void)\n");
     return 1;
@@ -139,9 +139,9 @@ INT32 WINAPI LZStart32(void)
  */
 HFILE16 WINAPI LZInit16( HFILE16 hfSrc )
 {
-    HFILE32 ret = LZInit32( FILE_GetHandle32(hfSrc) );
+    HFILE ret = LZInit( FILE_GetHandle(hfSrc) );
     if (IS_LZ_HANDLE(ret)) return ret;
-    if ((INT32)ret <= 0) return ret;
+    if ((INT)ret <= 0) return ret;
     return hfSrc;
 }
 
@@ -157,7 +157,7 @@ HFILE16 WINAPI LZInit16( HFILE16 hfSrc )
  * since _llseek uses the same types as libc.lseek, we just use the macros of 
  *  libc
  */
-HFILE32 WINAPI LZInit32( HFILE32 hfSrc )
+HFILE WINAPI LZInit( HFILE hfSrc )
 {
 
 	struct	lzfileheader	head;
@@ -168,7 +168,7 @@ HFILE32 WINAPI LZInit32( HFILE32 hfSrc )
 	TRACE(file,"(%d)\n",hfSrc);
 	ret=read_header(hfSrc,&head);
 	if (ret<=0) {
-		_llseek32(hfSrc,0,SEEK_SET);
+		_llseek(hfSrc,0,SEEK_SET);
 		return ret?ret:hfSrc;
 	}
         for (i = 0; i < MAX_LZSTATES; i++) if (!lzstates[i]) break;
@@ -206,7 +206,7 @@ void WINAPI LZDone(void)
  */
 INT16 WINAPI GetExpandedName16( LPCSTR in, LPSTR out )
 {
-    return (INT16)GetExpandedName32A( in, out );
+    return (INT16)GetExpandedNameA( in, out );
 }
 
 
@@ -221,24 +221,24 @@ INT16 WINAPI GetExpandedName16( LPCSTR in, LPSTR out )
  * "FILE.BL_" (with lastchar 'a') is being translated to "FILE.BLA"
  */
 
-INT32 WINAPI GetExpandedName32A( LPCSTR in, LPSTR out )
+INT WINAPI GetExpandedNameA( LPCSTR in, LPSTR out )
 {
 	struct lzfileheader	head;
-	HFILE32		fd;
+	HFILE		fd;
 	OFSTRUCT	ofs;
-	INT32		fnislowercased,ret,len;
+	INT		fnislowercased,ret,len;
 	LPSTR		s,t;
 
 	TRACE(file,"(%s)\n",in);
-	fd=OpenFile32(in,&ofs,OF_READ);
-	if (fd==HFILE_ERROR32)
-		return (INT32)(INT16)LZERROR_BADINHANDLE;
+	fd=OpenFile(in,&ofs,OF_READ);
+	if (fd==HFILE_ERROR)
+		return (INT)(INT16)LZERROR_BADINHANDLE;
 	strcpy(out,in);
 	ret=read_header(fd,&head);
 	if (ret<=0) {
 		/* not a LZ compressed file, so the expanded name is the same
 		 * as the input name */
-		_lclose32(fd);
+		_lclose(fd);
 		return 1;
 	}
 
@@ -252,7 +252,7 @@ INT32 WINAPI GetExpandedName32A( LPCSTR in, LPSTR out )
 	if (!*s) {
 		/* FIXME: hmm. shouldn't happen? */
 		WARN(file,"Specified a directory or what? (%s)\n",in);
-		_lclose32(fd);
+		_lclose(fd);
 		return 1;
 	}
 	/* see if we should use lowercase or uppercase on the last char */
@@ -283,7 +283,7 @@ INT32 WINAPI GetExpandedName32A( LPCSTR in, LPSTR out )
 				t[len]=head.lastchar;
 		}
 	} /* else no modification necessary */
-	_lclose32(fd);
+	_lclose(fd);
 	return 1;
 }
 
@@ -291,12 +291,12 @@ INT32 WINAPI GetExpandedName32A( LPCSTR in, LPSTR out )
 /***********************************************************************
  *           GetExpandedName32W   (LZ32.11)
  */
-INT32 WINAPI GetExpandedName32W( LPCWSTR in, LPWSTR out )
+INT WINAPI GetExpandedNameW( LPCWSTR in, LPWSTR out )
 {
 	char	*xin,*xout;
-	INT32	ret;
+	INT	ret;
 
-	xout	= HeapAlloc( GetProcessHeap(), 0, lstrlen32W(in)+3 );
+	xout	= HeapAlloc( GetProcessHeap(), 0, lstrlenW(in)+3 );
 	xin	= HEAP_strdupWtoA( GetProcessHeap(), 0, in );
 	ret	= GetExpandedName16(xin,xout);
 	if (ret>0) lstrcpyAtoW(out,xout);
@@ -311,7 +311,7 @@ INT32 WINAPI GetExpandedName32W( LPCWSTR in, LPWSTR out )
  */
 INT16 WINAPI LZRead16( HFILE16 fd, LPVOID buf, UINT16 toread )
 {
-    if (IS_LZ_HANDLE(fd)) return LZRead32( fd, buf, toread );
+    if (IS_LZ_HANDLE(fd)) return LZRead( fd, buf, toread );
     return _lread16( fd, buf, toread );
 }
 
@@ -319,7 +319,7 @@ INT16 WINAPI LZRead16( HFILE16 fd, LPVOID buf, UINT16 toread )
 /***********************************************************************
  *           LZRead32   (LZ32.4)
  */
-INT32 WINAPI LZRead32( HFILE32 fd, LPVOID vbuf, UINT32 toread )
+INT WINAPI LZRead( HFILE fd, LPVOID vbuf, UINT toread )
 {
 	int	howmuch;
 	BYTE	b,*buf;
@@ -328,7 +328,7 @@ INT32 WINAPI LZRead32( HFILE32 fd, LPVOID vbuf, UINT32 toread )
 	buf=(LPBYTE)vbuf;
 	TRACE(file,"(%d,%p,%d)\n",fd,buf,toread);
 	howmuch=toread;
-	if (!(lzs = GET_LZ_STATE(fd))) return _lread32(fd,buf,toread);
+	if (!(lzs = GET_LZ_STATE(fd))) return _lread(fd,buf,toread);
 
 /* The decompressor itself is in a define, cause we need it twice
  * in this function. (the decompressed byte will be in b)
@@ -383,7 +383,7 @@ INT32 WINAPI LZRead32( HFILE32 fd, LPVOID vbuf, UINT32 toread )
 		 */
 		if (lzs->realcurrent>lzs->realwanted) {
 			/* flush decompressor state */
-			_llseek32(lzs->realfd,14,SEEK_SET);
+			_llseek(lzs->realfd,14,SEEK_SET);
 			GET_FLUSH(lzs);
 			lzs->realcurrent= 0;
 			lzs->bytetype	= 0;
@@ -412,7 +412,7 @@ INT32 WINAPI LZRead32( HFILE32 fd, LPVOID vbuf, UINT32 toread )
  */
 LONG WINAPI LZSeek16( HFILE16 fd, LONG off, INT16 type )
 {
-    if (IS_LZ_HANDLE(fd)) return LZSeek32( fd, off, type );
+    if (IS_LZ_HANDLE(fd)) return LZSeek( fd, off, type );
     return _llseek16( fd, off, type );
 }
 
@@ -420,14 +420,14 @@ LONG WINAPI LZSeek16( HFILE16 fd, LONG off, INT16 type )
 /***********************************************************************
  *           LZSeek32   (LZ32.3)
  */
-LONG WINAPI LZSeek32( HFILE32 fd, LONG off, INT32 type )
+LONG WINAPI LZSeek( HFILE fd, LONG off, INT type )
 {
 	struct	lzstate	*lzs;
 	LONG	newwanted;
 
 	TRACE(file,"(%d,%ld,%d)\n",fd,off,type);
 	/* not compressed? just use normal _llseek() */
-        if (!(lzs = GET_LZ_STATE(fd))) return _llseek32(fd,off,type);
+        if (!(lzs = GET_LZ_STATE(fd))) return _llseek(fd,off,type);
 	newwanted = lzs->realwanted;
 	switch (type) {
 	case 1:	/* SEEK_CUR */
@@ -456,19 +456,19 @@ LONG WINAPI LZSeek32( HFILE32 fd, LONG off, INT32 type )
 LONG WINAPI LZCopy16( HFILE16 src, HFILE16 dest )
 {
     /* already a LZ handle? */
-    if (IS_LZ_HANDLE(src)) return LZCopy32( src, FILE_GetHandle32(dest) );
+    if (IS_LZ_HANDLE(src)) return LZCopy( src, FILE_GetHandle(dest) );
 
     /* no, try to open one */
     src = LZInit16(src);
     if ((INT16)src <= 0) return 0;
     if (IS_LZ_HANDLE(src))
     {
-        LONG ret = LZCopy32( src, FILE_GetHandle32(dest) );
-        LZClose32( src );
+        LONG ret = LZCopy( src, FILE_GetHandle(dest) );
+        LZClose( src );
         return ret;
     }
     /* it was not a compressed file */
-    return LZCopy32( FILE_GetHandle32(src), FILE_GetHandle32(dest) );
+    return LZCopy( FILE_GetHandle(src), FILE_GetHandle(dest) );
 }
 
 
@@ -479,27 +479,27 @@ LONG WINAPI LZCopy16( HFILE16 src, HFILE16 dest )
  * if src is a LZ compressed file, it will be uncompressed.
  * will return the number of bytes written to dest or errors.
  */
-LONG WINAPI LZCopy32( HFILE32 src, HFILE32 dest )
+LONG WINAPI LZCopy( HFILE src, HFILE dest )
 {
 	int	usedlzinit=0,ret,wret;
 	LONG	len;
-	HFILE32	oldsrc = src;
+	HFILE	oldsrc = src;
 #define BUFLEN	1000
 	BYTE	buf[BUFLEN];
-	UINT32	WINAPI (*xread)(HFILE32,LPVOID,UINT32);
+	UINT	WINAPI (*xread)(HFILE,LPVOID,UINT);
 
 	TRACE(file,"(%d,%d)\n",src,dest);
 	if (!IS_LZ_HANDLE(src)) {
-		src = LZInit32(src);
-                if ((INT32)src <= 0) return 0;
+		src = LZInit(src);
+                if ((INT)src <= 0) return 0;
 		if (src != oldsrc) usedlzinit=1;
 	}
 
 	/* not compressed? just copy */
         if (!IS_LZ_HANDLE(src))
-		xread=_lread32;
+		xread=_lread;
 	else	/* Note: Ignore warning, just mismatched INT/UINT */
-		xread=LZRead32; 
+		xread=LZRead; 
 	len=0;
 	while (1) {
 		ret=xread(src,buf,BUFLEN);
@@ -511,12 +511,12 @@ LONG WINAPI LZCopy32( HFILE32 src, HFILE32 dest )
 			return ret;
 		}
 		len    += ret;
-		wret	= _lwrite32(dest,buf,ret);
+		wret	= _lwrite(dest,buf,ret);
 		if (wret!=ret)
 			return LZERROR_WRITE;
 	}
 	if (usedlzinit)
-		LZClose32(src);
+		LZClose(src);
 	return len;
 #undef BUFLEN
 }
@@ -545,9 +545,9 @@ static LPSTR LZEXPAND_MangleName( LPCSTR fn )
  */
 HFILE16 WINAPI LZOpenFile16( LPCSTR fn, LPOFSTRUCT ofs, UINT16 mode )
 {
-    HFILE32 hfret = LZOpenFile32A( fn, ofs, mode );
+    HFILE hfret = LZOpenFileA( fn, ofs, mode );
     /* return errors and LZ handles unmodified */
-    if ((INT32)hfret <= 0) return hfret;
+    if ((INT)hfret <= 0) return hfret;
     if (IS_LZ_HANDLE(hfret)) return hfret;
     /* but allocate a dos handle for 'normal' files */
     return FILE_AllocDosHandle(hfret);
@@ -559,25 +559,25 @@ HFILE16 WINAPI LZOpenFile16( LPCSTR fn, LPOFSTRUCT ofs, UINT16 mode )
  *
  * Opens a file. If not compressed, open it as a normal file.
  */
-HFILE32 WINAPI LZOpenFile32A( LPCSTR fn, LPOFSTRUCT ofs, UINT32 mode )
+HFILE WINAPI LZOpenFileA( LPCSTR fn, LPOFSTRUCT ofs, UINT mode )
 {
-	HFILE32	fd,cfd;
+	HFILE	fd,cfd;
 
 	TRACE(file,"(%s,%p,%d)\n",fn,ofs,mode);
 	/* 0x70 represents all OF_SHARE_* flags, ignore them for the check */
-	fd=OpenFile32(fn,ofs,mode);
-	if (fd==HFILE_ERROR32)
+	fd=OpenFile(fn,ofs,mode);
+	if (fd==HFILE_ERROR)
         {
             LPSTR mfn = LZEXPAND_MangleName(fn);
-            fd = OpenFile32(mfn,ofs,mode);
+            fd = OpenFile(mfn,ofs,mode);
             HeapFree( GetProcessHeap(), 0, mfn );
 	}
 	if ((mode&~0x70)!=OF_READ)
 		return fd;
-	if (fd==HFILE_ERROR32)
-		return HFILE_ERROR32;
-	cfd=LZInit32(fd);
-	if ((INT32)cfd <= 0) return fd;
+	if (fd==HFILE_ERROR)
+		return HFILE_ERROR;
+	cfd=LZInit(fd);
+	if ((INT)cfd <= 0) return fd;
 	return cfd;
 }
 
@@ -585,19 +585,19 @@ HFILE32 WINAPI LZOpenFile32A( LPCSTR fn, LPOFSTRUCT ofs, UINT32 mode )
 /***********************************************************************
  *           LZOpenFile32W   (LZ32.10)
  */
-HFILE32 WINAPI LZOpenFile32W( LPCWSTR fn, LPOFSTRUCT ofs, UINT32 mode )
+HFILE WINAPI LZOpenFileW( LPCWSTR fn, LPOFSTRUCT ofs, UINT mode )
 {
 	LPSTR	xfn;
 	LPWSTR	yfn;
-	HFILE32	ret;
+	HFILE	ret;
 
 	xfn	= HEAP_strdupWtoA( GetProcessHeap(), 0, fn);
 	ret	= LZOpenFile16(xfn,ofs,mode);
 	HeapFree( GetProcessHeap(), 0, xfn );
-	if (ret!=HFILE_ERROR32) {
+	if (ret!=HFILE_ERROR) {
 		/* ofs->szPathName is an array with the OFSTRUCT */
                 yfn = HEAP_strdupAtoW( GetProcessHeap(), 0, ofs->szPathName );
-		memcpy(ofs->szPathName,yfn,lstrlen32W(yfn)*2+2);
+		memcpy(ofs->szPathName,yfn,lstrlenW(yfn)*2+2);
                 HeapFree( GetProcessHeap(), 0, yfn );
 	}
 	return	ret;
@@ -609,7 +609,7 @@ HFILE32 WINAPI LZOpenFile32W( LPCWSTR fn, LPOFSTRUCT ofs, UINT32 mode )
  */
 void WINAPI LZClose16( HFILE16 fd )
 {
-    if (IS_LZ_HANDLE(fd)) LZClose32( fd );
+    if (IS_LZ_HANDLE(fd)) LZClose( fd );
     else _lclose16( fd );
 }
 
@@ -617,12 +617,12 @@ void WINAPI LZClose16( HFILE16 fd )
 /***********************************************************************
  *           LZClose32   (LZ32.5)
  */
-void WINAPI LZClose32( HFILE32 fd )
+void WINAPI LZClose( HFILE fd )
 {
 	struct lzstate *lzs;
 
 	TRACE(file,"(%d)\n",fd);
-        if (!(lzs = GET_LZ_STATE(fd))) _lclose32(fd);
+        if (!(lzs = GET_LZ_STATE(fd))) _lclose(fd);
         else
         {
             if (lzs->get) HeapFree( GetProcessHeap(), 0, lzs->get );
@@ -648,8 +648,8 @@ LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest )
  * Copy src to dest (including uncompressing src).
  * NOTE: Yes. This is exactly the same function as LZCopy.
  */
-LONG WINAPI CopyLZFile32( HFILE32 src, HFILE32 dest )
+LONG WINAPI CopyLZFile( HFILE src, HFILE dest )
 {
     TRACE(file,"(%d,%d)\n",src,dest);
-    return LZCopy32(src,dest);
+    return LZCopy(src,dest);
 }
diff --git a/misc/main.c b/misc/main.c
index 66003bac376..809f3664474 100644
--- a/misc/main.c
+++ b/misc/main.c
@@ -165,7 +165,7 @@ static char *MAIN_GetProgramName( int argc, char *argv[] )
  *  RETURNS
  *    TRUE if parsing was successful
  */
-BOOL32 MAIN_ParseDebugOptions(char *options)
+BOOL MAIN_ParseDebugOptions(char *options)
 {
   /* defined in relay32/relay386.c */
   extern char **debug_relay_includelist;
@@ -187,7 +187,7 @@ BOOL32 MAIN_ParseDebugOptions(char *options)
       int j;
 
       for(j=0; j<DEBUG_CLASS_COUNT; j++)
-	if(!lstrncmpi32A(options, debug_cl_name[j], strlen(debug_cl_name[j])))
+	if(!lstrncmpiA(options, debug_cl_name[j], strlen(debug_cl_name[j])))
 	  break;
       if(j==DEBUG_CLASS_COUNT)
 	goto error;
@@ -204,7 +204,7 @@ BOOL32 MAIN_ParseDebugOptions(char *options)
     else
       l=strlen(options);
 
-    if (!lstrncmpi32A(options+1,"all",l-1))
+    if (!lstrncmpiA(options+1,"all",l-1))
       {
 	int i, j;
 	for (i=0; i<DEBUG_CHANNEL_COUNT; i++)
@@ -212,14 +212,14 @@ BOOL32 MAIN_ParseDebugOptions(char *options)
 	    if(cls == -1 || cls == j)
 	      debug_msg_enabled[i][j]=(*options=='+');
       }
-    else if (!lstrncmpi32A(options+1, "relay=", 6) ||
-	     !lstrncmpi32A(options+1, "snoop=", 6))
+    else if (!lstrncmpiA(options+1, "relay=", 6) ||
+	     !lstrncmpiA(options+1, "snoop=", 6))
       {
 	int i, j;
 	char *s, *s2, ***output, c;
 
 	for (i=0; i<DEBUG_CHANNEL_COUNT; i++)
-	  if (debug_ch_name && (!lstrncmpi32A(debug_ch_name[i],options+1,5))){
+	  if (debug_ch_name && (!lstrncmpiA(debug_ch_name[i],options+1,5))){
 	    for(j=0; j<DEBUG_CLASS_COUNT; j++)
 	      if(cls == -1 || cls == j)
 		debug_msg_enabled[i][j]=TRUE;
@@ -259,7 +259,7 @@ BOOL32 MAIN_ParseDebugOptions(char *options)
       {
 	int i, j;
 	for (i=0; i<DEBUG_CHANNEL_COUNT; i++)
-	  if (debug_ch_name && (!lstrncmpi32A(options+1,debug_ch_name[i],l-1))){
+	  if (debug_ch_name && (!lstrncmpiA(options+1,debug_ch_name[i],l-1))){
 	    for(j=0; j<DEBUG_CLASS_COUNT; j++)
 	      if(cls == -1 || cls == j)
 		debug_msg_enabled[i][j]=(*options=='+');
@@ -672,7 +672,7 @@ void MAIN_ParseLanguageOption( char *arg )
     Options.language = LANG_Xx;  /* First (dummy) language */
     for (;p->name;p++)
     {
-        if (!lstrcmpi32A( p->name, arg ))
+        if (!lstrcmpiA( p->name, arg ))
         {
 	    WINE_LanguageId = p->langid;
 	    return;
@@ -693,8 +693,8 @@ void MAIN_ParseLanguageOption( char *arg )
  */
 void MAIN_ParseModeOption( char *arg )
 {
-    if (!lstrcmpi32A("enhanced", arg)) Options.mode = MODE_ENHANCED;
-    else if (!lstrcmpi32A("standard", arg)) Options.mode = MODE_STANDARD;
+    if (!lstrcmpiA("enhanced", arg)) Options.mode = MODE_ENHANCED;
+    else if (!lstrcmpiA("standard", arg)) Options.mode = MODE_STANDARD;
     else
     {
         MSG( "Invalid mode '%s' specified.\n", arg);
@@ -768,7 +768,7 @@ static void called_at_exit(void)
  *
  * Wine initialisation and command-line parsing
  */
-BOOL32 MAIN_WineInit( int *argc, char *argv[] )
+BOOL MAIN_WineInit( int *argc, char *argv[] )
 {    
     struct timeval tv;
 
@@ -822,14 +822,14 @@ BOOL32 MAIN_WineInit( int *argc, char *argv[] )
  */
 void WINAPI MessageBeep16( UINT16 i )
 {
-    MessageBeep32( i );
+    MessageBeep( i );
 }
 
 
 /***********************************************************************
  *           MessageBeep32   (USER32.390)
  */
-BOOL32 WINAPI MessageBeep32( UINT32 i )
+BOOL WINAPI MessageBeep( UINT i )
 {
     TSXBell( display, 0 );
     return TRUE;
@@ -839,7 +839,7 @@ BOOL32 WINAPI MessageBeep32( UINT32 i )
 /***********************************************************************
  *           Beep   (KERNEL32.11)
  */
-BOOL32 WINAPI Beep( DWORD dwFreq, DWORD dwDur )
+BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDur )
 {
     /* dwFreq and dwDur are ignored by Win95 */
     TSXBell(display, 0);
@@ -850,7 +850,7 @@ BOOL32 WINAPI Beep( DWORD dwFreq, DWORD dwDur )
 /***********************************************************************
  *	GetTimerResolution (USER.14)
  */
-LONG WINAPI GetTimerResolution(void)
+LONG WINAPI GetTimerResolution16(void)
 {
 	return (1000);
 }
@@ -858,8 +858,8 @@ LONG WINAPI GetTimerResolution(void)
 /***********************************************************************
  *	SystemParametersInfo32A   (USER32.540)
  */
-BOOL32 WINAPI SystemParametersInfo32A( UINT32 uAction, UINT32 uParam,
-                                       LPVOID lpvParam, UINT32 fuWinIni )
+BOOL WINAPI SystemParametersInfoA( UINT uAction, UINT uParam,
+                                       LPVOID lpvParam, UINT fuWinIni )
 {
 	int timeout;
 	int temp;
@@ -869,63 +869,63 @@ BOOL32 WINAPI SystemParametersInfo32A( UINT32 uAction, UINT32 uParam,
 	case SPI_GETBEEP:
 		TSXGetKeyboardControl(display, &keyboard_state);
 		if (keyboard_state.bell_percent == 0)
-			*(BOOL32 *) lpvParam = FALSE;
+			*(BOOL *) lpvParam = FALSE;
 		else
-			*(BOOL32 *) lpvParam = TRUE;
+			*(BOOL *) lpvParam = TRUE;
 		break;
 
 	case SPI_GETBORDER:
-		*(INT32 *)lpvParam = GetSystemMetrics32( SM_CXFRAME );
+		*(INT *)lpvParam = GetSystemMetrics( SM_CXFRAME );
 		break;
 
 	case SPI_GETDRAGFULLWINDOWS:
-		*(BOOL32 *) lpvParam = FALSE;
+		*(BOOL *) lpvParam = FALSE;
 		break;
 
 	case SPI_SETDRAGFULLWINDOWS:
 		break;
 
 	case SPI_GETFASTTASKSWITCH:
-		if ( GetProfileInt32A( "windows", "CoolSwitch", 1 ) == 1 )
-			*(BOOL32 *) lpvParam = TRUE;
+		if ( GetProfileIntA( "windows", "CoolSwitch", 1 ) == 1 )
+			*(BOOL *) lpvParam = TRUE;
 		else
-			*(BOOL32 *) lpvParam = FALSE;
+			*(BOOL *) lpvParam = FALSE;
 		break;
 		
 	case SPI_GETGRIDGRANULARITY:
-		*(INT32*)lpvParam=GetProfileInt32A("desktop","GridGranularity",1);
+		*(INT*)lpvParam=GetProfileIntA("desktop","GridGranularity",1);
 		break;
 
 	case SPI_GETICONTITLEWRAP:
-		*(BOOL32*)lpvParam=GetProfileInt32A("desktop","IconTitleWrap",TRUE);
+		*(BOOL*)lpvParam=GetProfileIntA("desktop","IconTitleWrap",TRUE);
 		break;
 
 	case SPI_GETKEYBOARDDELAY:
-		*(INT32*)lpvParam=GetProfileInt32A("keyboard","KeyboardDelay",1);
+		*(INT*)lpvParam=GetProfileIntA("keyboard","KeyboardDelay",1);
 		break;
 
 	case SPI_GETKEYBOARDSPEED:
-		*(DWORD*)lpvParam=GetProfileInt32A("keyboard","KeyboardSpeed",30);
+		*(DWORD*)lpvParam=GetProfileIntA("keyboard","KeyboardSpeed",30);
 		break;
 
 	case SPI_GETMENUDROPALIGNMENT:
-		*(BOOL32*)lpvParam=GetSystemMetrics32(SM_MENUDROPALIGNMENT); /* XXX check this */
+		*(BOOL*)lpvParam=GetSystemMetrics(SM_MENUDROPALIGNMENT); /* XXX check this */
 		break;
 
 	case SPI_GETSCREENSAVEACTIVE:
-		if ( GetProfileInt32A( "windows", "ScreenSaveActive", 1 ) == 1 )
-			*(BOOL32*)lpvParam = TRUE;
+		if ( GetProfileIntA( "windows", "ScreenSaveActive", 1 ) == 1 )
+			*(BOOL*)lpvParam = TRUE;
 		else
-			*(BOOL32*)lpvParam = FALSE;
+			*(BOOL*)lpvParam = FALSE;
 		break;
 
 	case SPI_GETSCREENSAVETIMEOUT:
 #ifndef X_DISPLAY_MISSING
 	        TSXGetScreenSaver(display, &timeout, &temp,&temp,&temp);
 #else /* X_DISPLAY_MISSING */
-		timeout = GetProfileInt32A( "windows", "ScreenSaveTimeout", 300 );
+		timeout = GetProfileIntA( "windows", "ScreenSaveTimeout", 300 );
 #endif /* X_DISPLAY_MISSING */
-		*(INT32 *) lpvParam = timeout * 1000;
+		*(INT *) lpvParam = timeout * 1000;
 		break;
 
 	case SPI_ICONHORIZONTALSPACING:
@@ -933,7 +933,7 @@ BOOL32 WINAPI SystemParametersInfo32A( UINT32 uAction, UINT32 uParam,
 		if (lpvParam == NULL)
 			/*SetSystemMetrics( SM_CXICONSPACING, uParam )*/ ;
 		else
-			*(INT32*)lpvParam=GetSystemMetrics32(SM_CXICONSPACING);
+			*(INT*)lpvParam=GetSystemMetrics(SM_CXICONSPACING);
 		break;
 
 	case SPI_ICONVERTICALSPACING:
@@ -941,17 +941,17 @@ BOOL32 WINAPI SystemParametersInfo32A( UINT32 uAction, UINT32 uParam,
 		if (lpvParam == NULL)
 			/*SetSystemMetrics( SM_CYICONSPACING, uParam )*/ ;
 		else
-			*(INT32*)lpvParam=GetSystemMetrics32(SM_CYICONSPACING);
+			*(INT*)lpvParam=GetSystemMetrics(SM_CYICONSPACING);
 		break;
 
 	case SPI_GETICONTITLELOGFONT: {
-		LPLOGFONT32A lpLogFont = (LPLOGFONT32A)lpvParam;
+		LPLOGFONTA lpLogFont = (LPLOGFONTA)lpvParam;
 
 		/* from now on we always have an alias for MS Sans Serif */
 
-		GetProfileString32A("Desktop", "IconTitleFaceName", "MS Sans Serif", 
+		GetProfileStringA("Desktop", "IconTitleFaceName", "MS Sans Serif", 
 			lpLogFont->lfFaceName, LF_FACESIZE );
-		lpLogFont->lfHeight = -GetProfileInt32A("Desktop","IconTitleSize", 8);
+		lpLogFont->lfHeight = -GetProfileIntA("Desktop","IconTitleSize", 8);
 		lpLogFont->lfWidth = 0;
 		lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
 		lpLogFont->lfWeight = FW_NORMAL;
@@ -965,29 +965,29 @@ BOOL32 WINAPI SystemParametersInfo32A( UINT32 uAction, UINT32 uParam,
 		break;
 	}
 	case SPI_GETWORKAREA:
-		SetRect32( (RECT32 *)lpvParam, 0, 0,
-			GetSystemMetrics32( SM_CXSCREEN ),
-			GetSystemMetrics32( SM_CYSCREEN )
+		SetRect( (RECT *)lpvParam, 0, 0,
+			GetSystemMetrics( SM_CXSCREEN ),
+			GetSystemMetrics( SM_CYSCREEN )
 		);
 		break;
 	case SPI_GETNONCLIENTMETRICS: 
 
-#define lpnm ((LPNONCLIENTMETRICS32A)lpvParam)
+#define lpnm ((LPNONCLIENTMETRICSA)lpvParam)
 		
-		if( lpnm->cbSize == sizeof(NONCLIENTMETRICS32A) )
+		if( lpnm->cbSize == sizeof(NONCLIENTMETRICSA) )
 		{
 		    /* FIXME: initialize geometry entries */
 
-		    SystemParametersInfo32A(SPI_GETICONTITLELOGFONT, 0,
+		    SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0,
 							(LPVOID)&(lpnm->lfCaptionFont),0);
 		    lpnm->lfCaptionFont.lfWeight = FW_BOLD;
-		    SystemParametersInfo32A(SPI_GETICONTITLELOGFONT, 0,
+		    SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0,
 							(LPVOID)&(lpnm->lfSmCaptionFont),0);
-		    SystemParametersInfo32A(SPI_GETICONTITLELOGFONT, 0,
+		    SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0,
 							(LPVOID)&(lpnm->lfMenuFont),0);
-		    SystemParametersInfo32A(SPI_GETICONTITLELOGFONT, 0,
+		    SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0,
 							(LPVOID)&(lpnm->lfStatusFont),0);
-		    SystemParametersInfo32A(SPI_GETICONTITLELOGFONT, 0,
+		    SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0,
 							(LPVOID)&(lpnm->lfMessageFont),0);
 		}
 #undef lpnm
@@ -1015,11 +1015,11 @@ BOOL32 WINAPI SystemParametersInfo32A( UINT32 uAction, UINT32 uParam,
 
         case SPI_GETHIGHCONTRAST:
         {
-                LPHIGHCONTRAST32A lpHighContrastA = (LPHIGHCONTRAST32A)lpvParam;
+                LPHIGHCONTRASTA lpHighContrastA = (LPHIGHCONTRASTA)lpvParam;
 
                 FIXME(system,"SPI_GETHIGHCONTRAST not fully implemented\n");
 
-                if ( lpHighContrastA->cbSize == sizeof( HIGHCONTRAST32A ) )
+                if ( lpHighContrastA->cbSize == sizeof( HIGHCONTRASTA ) )
                 {
                         /* Indicate that there is no high contrast available */
                         lpHighContrastA->dwFlags = 0;
@@ -1067,31 +1067,31 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 			break;
 
 		case SPI_GETFASTTASKSWITCH:
-		    if ( GetProfileInt32A( "windows", "CoolSwitch", 1 ) == 1 )
+		    if ( GetProfileIntA( "windows", "CoolSwitch", 1 ) == 1 )
 			  *(BOOL16 *) lpvParam = TRUE;
 			else
 			  *(BOOL16 *) lpvParam = FALSE;
 			break;
 
 		case SPI_GETGRIDGRANULARITY:
-                    *(INT16 *) lpvParam = GetProfileInt32A( "desktop", 
+                    *(INT16 *) lpvParam = GetProfileIntA( "desktop", 
                                                           "GridGranularity",
                                                           1 );
                     break;
 
                 case SPI_GETICONTITLEWRAP:
-                    *(BOOL16 *) lpvParam = GetProfileInt32A( "desktop",
+                    *(BOOL16 *) lpvParam = GetProfileIntA( "desktop",
                                                            "IconTitleWrap",
                                                            TRUE );
                     break;
 
                 case SPI_GETKEYBOARDDELAY:
-                    *(INT16 *) lpvParam = GetProfileInt32A( "keyboard",
+                    *(INT16 *) lpvParam = GetProfileIntA( "keyboard",
                                                           "KeyboardDelay", 1 );
                     break;
 
                 case SPI_GETKEYBOARDSPEED:
-                    *(WORD *) lpvParam = GetProfileInt32A( "keyboard",
+                    *(WORD *) lpvParam = GetProfileIntA( "keyboard",
                                                            "KeyboardSpeed",
                                                            30 );
                     break;
@@ -1101,7 +1101,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 			break;
 
 		case SPI_GETSCREENSAVEACTIVE:
-                    if ( GetProfileInt32A( "windows", "ScreenSaveActive", 1 ) == 1 )
+                    if ( GetProfileIntA( "windows", "ScreenSaveActive", 1 ) == 1 )
                         *(BOOL16 *) lpvParam = TRUE;
                     else
                         *(BOOL16 *) lpvParam = FALSE;
@@ -1111,7 +1111,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 #ifndef X_DISPLAY_MISSING
 			TSXGetScreenSaver(display, &timeout, &temp,&temp,&temp);
 #else /* X_DISPLAY_MISSING */
-			timeout = GetProfileInt32A( "windows", "ScreenSaveTimeout", 300 );
+			timeout = GetProfileIntA( "windows", "ScreenSaveTimeout", 300 );
 #endif /* X_DISPLAY_MISSING */
 			*(INT16 *) lpvParam = timeout;
 			break;
@@ -1154,12 +1154,12 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 			break;
 
 		case SPI_SETDESKWALLPAPER:
-			return (SetDeskWallPaper32((LPSTR) lpvParam));
+			return (SetDeskWallPaper((LPSTR) lpvParam));
 			break;
 
 		case SPI_SETDESKPATTERN:
 			if ((INT16)uParam == -1) {
-				GetProfileString32A("Desktop", "Pattern", 
+				GetProfileStringA("Desktop", "Pattern", 
 						"170 85 170 85 170 85 170 85", 
 						buffer, sizeof(buffer) );
 				return (DESKTOP_SetPattern((LPSTR) buffer));
@@ -1171,9 +1171,9 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 	        {
                     LPLOGFONT16 lpLogFont = (LPLOGFONT16)lpvParam;
 
-		    GetProfileString32A("Desktop", "IconTitleFaceName", "MS Sans Serif", 
+		    GetProfileStringA("Desktop", "IconTitleFaceName", "MS Sans Serif", 
 					lpLogFont->lfFaceName, LF_FACESIZE );
-                    lpLogFont->lfHeight = -GetProfileInt32A("Desktop","IconTitleSize", 8);
+                    lpLogFont->lfHeight = -GetProfileIntA("Desktop","IconTitleSize", 8);
                     lpLogFont->lfWidth = 0;
                     lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
                     lpLogFont->lfWeight = FW_NORMAL;
@@ -1205,7 +1205,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 							(LPVOID)&(lpnm->lfMessageFont),0);
 		    }
 		    else /* winfile 95 sets sbSize to 340 */
-		        SystemParametersInfo32A( uAction, uParam, lpvParam, fuWinIni );
+		        SystemParametersInfoA( uAction, uParam, lpvParam, fuWinIni );
 #undef lpnm
 		    break;
 
@@ -1236,8 +1236,8 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 /***********************************************************************
  *	SystemParametersInfo32W   (USER32.541)
  */
-BOOL32 WINAPI SystemParametersInfo32W( UINT32 uAction, UINT32 uParam,
-                                       LPVOID lpvParam, UINT32 fuWinIni )
+BOOL WINAPI SystemParametersInfoW( UINT uAction, UINT uParam,
+                                       LPVOID lpvParam, UINT fuWinIni )
 {
     char buffer[256];
 
@@ -1247,14 +1247,14 @@ BOOL32 WINAPI SystemParametersInfo32W( UINT32 uAction, UINT32 uParam,
         if (lpvParam)
         {
             lstrcpynWtoA(buffer,(LPWSTR)lpvParam,sizeof(buffer));
-            return SetDeskWallPaper32(buffer);
+            return SetDeskWallPaper(buffer);
         }
-        return SetDeskWallPaper32(NULL);
+        return SetDeskWallPaper(NULL);
 
     case SPI_SETDESKPATTERN:
-        if ((INT32) uParam == -1)
+        if ((INT) uParam == -1)
         {
-            GetProfileString32A("Desktop", "Pattern", 
+            GetProfileStringA("Desktop", "Pattern", 
                                 "170 85 170 85 170 85 170 85", 
                                 buffer, sizeof(buffer) );
             return (DESKTOP_SetPattern((LPSTR) buffer));
@@ -1268,8 +1268,8 @@ BOOL32 WINAPI SystemParametersInfo32W( UINT32 uAction, UINT32 uParam,
 
     case SPI_GETICONTITLELOGFONT:
         {
-            LPLOGFONT32W lpLogFont = (LPLOGFONT32W)lpvParam;
- 	    GetProfileString32A("Desktop", "IconTitleFaceName", "MS Sans Serif", 
+            LPLOGFONTW lpLogFont = (LPLOGFONTW)lpvParam;
+ 	    GetProfileStringA("Desktop", "IconTitleFaceName", "MS Sans Serif", 
 			 buffer, sizeof(buffer) );
 	    lstrcpynAtoW(lpLogFont->lfFaceName, buffer ,LF_FACESIZE);
             lpLogFont->lfHeight = 10;
@@ -1285,24 +1285,24 @@ BOOL32 WINAPI SystemParametersInfo32W( UINT32 uAction, UINT32 uParam,
         break;
     case SPI_GETNONCLIENTMETRICS: {
 	/* FIXME: implement correctly */
-	LPNONCLIENTMETRICS32W	lpnm=(LPNONCLIENTMETRICS32W)lpvParam;
+	LPNONCLIENTMETRICSW	lpnm=(LPNONCLIENTMETRICSW)lpvParam;
 
-	SystemParametersInfo32W(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfCaptionFont),0);
+	SystemParametersInfoW(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfCaptionFont),0);
 	lpnm->lfCaptionFont.lfWeight = FW_BOLD;
-	SystemParametersInfo32W(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfSmCaptionFont),0);
-	SystemParametersInfo32W(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfMenuFont),0);
-	SystemParametersInfo32W(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfStatusFont),0);
-	SystemParametersInfo32W(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfMessageFont),0);
+	SystemParametersInfoW(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfSmCaptionFont),0);
+	SystemParametersInfoW(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfMenuFont),0);
+	SystemParametersInfoW(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfStatusFont),0);
+	SystemParametersInfoW(SPI_GETICONTITLELOGFONT,0,(LPVOID)&(lpnm->lfMessageFont),0);
 	break;
     }
 
     case SPI_GETHIGHCONTRAST:
     {
-       LPHIGHCONTRAST32W lpHighContrastW = (LPHIGHCONTRAST32W)lpvParam;
+       LPHIGHCONTRASTW lpHighContrastW = (LPHIGHCONTRASTW)lpvParam;
 
        FIXME(system,"SPI_GETHIGHCONTRAST not fully implemented\n");
 
-       if ( lpHighContrastW->cbSize == sizeof( HIGHCONTRAST32W ) )
+       if ( lpHighContrastW->cbSize == sizeof( HIGHCONTRASTW ) )
        {
           /* Indicate that there is no high contrast available */
           lpHighContrastW->dwFlags = 0;
@@ -1317,7 +1317,7 @@ BOOL32 WINAPI SystemParametersInfo32W( UINT32 uAction, UINT32 uParam,
     }
 
     default:
-        return SystemParametersInfo32A(uAction,uParam,lpvParam,fuWinIni);
+        return SystemParametersInfoA(uAction,uParam,lpvParam,fuWinIni);
 	
     }
     return TRUE;
@@ -1327,7 +1327,7 @@ BOOL32 WINAPI SystemParametersInfo32W( UINT32 uAction, UINT32 uParam,
 /***********************************************************************
 *	FileCDR (KERNEL.130)
 */
-FARPROC16 WINAPI FileCDR(FARPROC16 x)
+FARPROC16 WINAPI FileCDR16(FARPROC16 x)
 {
 	FIXME(file,"(0x%8x): stub\n", (int) x);
 	return (FARPROC16)TRUE;
diff --git a/misc/network.c b/misc/network.c
index af8a1a648d2..591b33be8ec 100644
--- a/misc/network.c
+++ b/misc/network.c
@@ -29,14 +29,14 @@
 UINT16 WINAPI WNetAddConnection16(LPCSTR lpNetPath, LPCSTR lpPassWord,
                                 LPCSTR lpLocalName)
 {	
-   return WNetAddConnection32A(lpNetPath, lpPassWord, lpLocalName);
+   return WNetAddConnectionA(lpNetPath, lpPassWord, lpLocalName);
 }
 
 /*********************************************************************
  *  WNetAddConnection32 [MPR.50] 
  */
 
-UINT32 WINAPI WNetAddConnection32A(LPCSTR NetPath, LPCSTR PassWord,
+UINT WINAPI WNetAddConnectionA(LPCSTR NetPath, LPCSTR PassWord,
 			    LPCSTR LocalName)
 {
    FIXME(wnet, "('%s', %p, '%s'): stub\n",
@@ -46,7 +46,7 @@ UINT32 WINAPI WNetAddConnection32A(LPCSTR NetPath, LPCSTR PassWord,
 
 /* [MPR.51] */
 
-UINT32 WINAPI WNetAddConnection32W(LPCWSTR NetPath, 
+UINT WINAPI WNetAddConnectionW(LPCWSTR NetPath, 
 			    LPCWSTR PassWord,
 			    LPCWSTR LocalName)
 {
@@ -59,8 +59,8 @@ UINT32 WINAPI WNetAddConnection32W(LPCWSTR NetPath,
  * WNetAddConnection2_32A [MPR.46] 
  */
 
-UINT32 WINAPI
-WNetAddConnection2_32A(LPNETRESOURCE32A netresource, /* [in] */
+UINT WINAPI
+WNetAddConnection2A(LPNETRESOURCEA netresource, /* [in] */
 		       LPCSTR password,        /* [in] */     
 		       LPCSTR username,        /* [in] */
 		       DWORD flags             /* [in] */  )
@@ -75,8 +75,8 @@ WNetAddConnection2_32A(LPNETRESOURCE32A netresource, /* [in] */
  * WNetAddConnection2W [MPR.47]
  */
 
-UINT32 WINAPI
-WNetAddConnection2_32W(LPNETRESOURCE32W netresource, /* [in] */
+UINT WINAPI
+WNetAddConnection2W(LPNETRESOURCEW netresource, /* [in] */
 		       LPCWSTR password,        /* [in] */     
 		       LPCWSTR username,        /* [in] */
 		       DWORD flags              /* [in] */  )
@@ -90,14 +90,14 @@ WNetAddConnection2_32W(LPNETRESOURCE32W netresource, /* [in] */
  * WNetAddConnection3_32A [MPR.48]
  */
 
-UINT32 WINAPI WNetAddConnection3_32A(HWND32 owner,
-		      LPNETRESOURCE32A netresource,
+UINT WINAPI WNetAddConnection3A(HWND owner,
+		      LPNETRESOURCEA netresource,
 		      LPCSTR password,
 		      LPCSTR username,
 		      DWORD flags)
 {
    TRACE(wnet, "owner = 0x%x\n", owner);
-   return WNetAddConnection2_32A(netresource, 
+   return WNetAddConnection2A(netresource, 
 				 password, username, flags);
 }
 
@@ -105,21 +105,21 @@ UINT32 WINAPI WNetAddConnection3_32A(HWND32 owner,
  * WNetAddConnection3W [MPR.49]
  */
 
-UINT32 WINAPI WNetAddConnection3_32W(HWND32 owner,
-			      LPNETRESOURCE32W netresource,
+UINT WINAPI WNetAddConnection3W(HWND owner,
+			      LPNETRESOURCEW netresource,
 			      LPCWSTR username,
 			      LPCWSTR password,
 			      DWORD flags)
 {
    TRACE(wnet,"owner = 0x%x\n", owner);
-   return WNetAddConnection2_32W(netresource, username, password,
+   return WNetAddConnection2W(netresource, username, password,
 				 flags); 
 } 
 
 /*******************************************************************
  * WNetConnectionDialog1_32A [MPR.59]
  */
-UINT32 WINAPI WNetConnectionDialog1_32A (LPCONNECTDLGSTRUCT32A lpConnDlgStruct)
+UINT WINAPI WNetConnectionDialog1A (LPCONNECTDLGSTRUCTA lpConnDlgStruct)
 { FIXME(wnet,"%p stub\n", lpConnDlgStruct);   
   SetLastError(WN_NO_NETWORK);
   return ERROR_NO_NETWORK;
@@ -127,7 +127,7 @@ UINT32 WINAPI WNetConnectionDialog1_32A (LPCONNECTDLGSTRUCT32A lpConnDlgStruct)
 /*******************************************************************
  * WNetConnectionDialog1_32W [MPR.60]
  */ 
-UINT32 WINAPI WNetConnectionDialog1_32W (LPCONNECTDLGSTRUCT32W lpConnDlgStruct)
+UINT WINAPI WNetConnectionDialog1W (LPCONNECTDLGSTRUCTW lpConnDlgStruct)
 { FIXME(wnet,"%p stub\n", lpConnDlgStruct);
   SetLastError(WN_NO_NETWORK);
   return ERROR_NO_NETWORK;
@@ -136,7 +136,7 @@ UINT32 WINAPI WNetConnectionDialog1_32W (LPCONNECTDLGSTRUCT32W lpConnDlgStruct)
 /*******************************************************************
  * WNetConnectionDialog_32 [MPR.61]
  */ 
-UINT32 WINAPI WNetConnectionDialog_32(HWND32 owner, DWORD flags  )
+UINT WINAPI WNetConnectionDialog(HWND owner, DWORD flags  )
 { FIXME(wnet,"owner = 0x%x, flags=0x%lx stub\n", owner,flags);
   SetLastError(WN_NO_NETWORK);
   return ERROR_NO_NETWORK;
@@ -146,7 +146,7 @@ UINT32 WINAPI WNetConnectionDialog_32(HWND32 owner, DWORD flags  )
 /*******************************************************************
  * WNetEnumCachedPasswords32 [MPR.61]
  */
-UINT32 WINAPI WNetEnumCachedPasswords32(LPSTR sometext, DWORD count1,
+UINT WINAPI WNetEnumCachedPasswords(LPSTR sometext, DWORD count1,
 		DWORD res_nr, DWORD *enumPasswordProc)
 {
     return ERROR_NO_NETWORK;
@@ -155,7 +155,7 @@ UINT32 WINAPI WNetEnumCachedPasswords32(LPSTR sometext, DWORD count1,
 /********************************************************************
  *   WNetCancelConnection	[USER.518]  undirects a local device
  */
-UINT16 WINAPI WNetCancelConnection(LPCSTR lpName, BOOL16 bForce)
+UINT16 WINAPI WNetCancelConnection16(LPCSTR lpName, BOOL16 bForce)
 {
     FIXME(wnet, "('%s', %04X): stub\n", lpName, bForce);
     return WN_NO_NETWORK;
@@ -165,7 +165,7 @@ UINT16 WINAPI WNetCancelConnection(LPCSTR lpName, BOOL16 bForce)
 /**************************************************************************
  *              WNetErrorText16       [USER.499]
  */
-int WINAPI WNetErrorText(WORD nError,LPSTR lpszText,WORD cbText)
+int WINAPI WNetErrorText16(WORD nError,LPSTR lpszText,WORD cbText)
 {
         FIXME(wnet, "(%x,%p,%x): stub\n",nError,lpszText,cbText);
 	return FALSE;
@@ -174,7 +174,7 @@ int WINAPI WNetErrorText(WORD nError,LPSTR lpszText,WORD cbText)
 /**************************************************************************
  *              WNetOpenJob16       [USER.501]
  */
-int WINAPI WNetOpenJob(LPSTR szQueue,LPSTR szJobTitle,WORD nCopies,LPWORD pfh)
+int WINAPI WNetOpenJob16(LPSTR szQueue,LPSTR szJobTitle,WORD nCopies,LPWORD pfh)
 {
 	FIXME(wnet, "('%s','%s',%x,%p): stub\n",
 	      szQueue,szJobTitle,nCopies,pfh);
@@ -184,7 +184,7 @@ int WINAPI WNetOpenJob(LPSTR szQueue,LPSTR szJobTitle,WORD nCopies,LPWORD pfh)
 /**************************************************************************
  *              WNetCloseJob       [USER.502]
  */
-int WINAPI WNetCloseJob(WORD fh,LPWORD pidJob,LPSTR szQueue)
+int WINAPI WNetCloseJob16(WORD fh,LPWORD pidJob,LPSTR szQueue)
 {
 	FIXME(wnet, "(%x,%p,'%s'): stub\n",fh,pidJob,szQueue);
 	return WN_NET_ERROR;
@@ -193,7 +193,7 @@ int WINAPI WNetCloseJob(WORD fh,LPWORD pidJob,LPSTR szQueue)
 /**************************************************************************
  *              WNetAbortJob       [USER.503]
  */
-int WINAPI WNetAbortJob(LPSTR szQueue,WORD wJobId)
+int WINAPI WNetAbortJob16(LPSTR szQueue,WORD wJobId)
 {
 	FIXME(wnet, "('%s',%x): stub\n",szQueue,wJobId);
 	return WN_NET_ERROR;
@@ -202,7 +202,7 @@ int WINAPI WNetAbortJob(LPSTR szQueue,WORD wJobId)
 /**************************************************************************
  *              WNetHoldJob       [USER.504]
  */
-int WINAPI WNetHoldJob(LPSTR szQueue,WORD wJobId)
+int WINAPI WNetHoldJob16(LPSTR szQueue,WORD wJobId)
 {
 	FIXME(wnet, "('%s',%x): stub\n",szQueue,wJobId);
 	return WN_NET_ERROR;
@@ -211,7 +211,7 @@ int WINAPI WNetHoldJob(LPSTR szQueue,WORD wJobId)
 /**************************************************************************
  *              WNetReleaseJob       [USER.505]
  */
-int WINAPI WNetReleaseJob(LPSTR szQueue,WORD wJobId)
+int WINAPI WNetReleaseJob16(LPSTR szQueue,WORD wJobId)
 {
 	FIXME(wnet, "('%s',%x): stub\n",szQueue,wJobId);
 	return WN_NET_ERROR;
@@ -220,7 +220,7 @@ int WINAPI WNetReleaseJob(LPSTR szQueue,WORD wJobId)
 /**************************************************************************
  *              WNetCancelJob       [USER.506]
  */
-int WINAPI WNetCancelJob(LPSTR szQueue,WORD wJobId)
+int WINAPI WNetCancelJob16(LPSTR szQueue,WORD wJobId)
 {
 	FIXME(wnet, "('%s',%x): stub\n",szQueue,wJobId);
 	return WN_NET_ERROR;
@@ -229,7 +229,7 @@ int WINAPI WNetCancelJob(LPSTR szQueue,WORD wJobId)
 /**************************************************************************
  *              WNetSetJobCopies       [USER.507]
  */
-int WINAPI WNetSetJobCopies(LPSTR szQueue,WORD wJobId,WORD nCopies)
+int WINAPI WNetSetJobCopies16(LPSTR szQueue,WORD wJobId,WORD nCopies)
 {
 	FIXME(wnet, "('%s',%x,%x): stub\n",szQueue,wJobId,nCopies);
 	return WN_NET_ERROR;
@@ -238,7 +238,7 @@ int WINAPI WNetSetJobCopies(LPSTR szQueue,WORD wJobId,WORD nCopies)
 /**************************************************************************
  *              WNetWatchQueue       [USER.508]
  */
-int WINAPI WNetWatchQueue(HWND16 hWnd,LPSTR szLocal,LPSTR szUser,WORD nQueue)
+int WINAPI WNetWatchQueue16(HWND16 hWnd,LPSTR szLocal,LPSTR szUser,WORD nQueue)
 {
 	FIXME(wnet, "(%04x,'%s','%s',%x): stub\n",hWnd,szLocal,szUser,nQueue);
 	return WN_NET_ERROR;
@@ -247,7 +247,7 @@ int WINAPI WNetWatchQueue(HWND16 hWnd,LPSTR szLocal,LPSTR szUser,WORD nQueue)
 /**************************************************************************
  *              WNetUnwatchQueue       [USER.509]
  */
-int WINAPI WNetUnwatchQueue(LPSTR szQueue)
+int WINAPI WNetUnwatchQueue16(LPSTR szQueue)
 {
 	FIXME(wnet, "('%s'): stub\n", szQueue);
 	return WN_NET_ERROR;
@@ -256,7 +256,7 @@ int WINAPI WNetUnwatchQueue(LPSTR szQueue)
 /**************************************************************************
  *              WNetLockQueueData       [USER.510]
  */
-int WINAPI WNetLockQueueData(LPSTR szQueue,LPSTR szUser,void *lplpQueueStruct)
+int WINAPI WNetLockQueueData16(LPSTR szQueue,LPSTR szUser,void *lplpQueueStruct)
 {
 	FIXME(wnet, "('%s','%s',%p): stub\n",szQueue,szUser,lplpQueueStruct);
 	return WN_NET_ERROR;
@@ -265,7 +265,7 @@ int WINAPI WNetLockQueueData(LPSTR szQueue,LPSTR szUser,void *lplpQueueStruct)
 /**************************************************************************
  *              WNetUnlockQueueData       [USER.511]
  */
-int WINAPI WNetUnlockQueueData(LPSTR szQueue)
+int WINAPI WNetUnlockQueueData16(LPSTR szQueue)
 {
 	FIXME(wnet, "('%s'): stub\n",szQueue);
 	return WN_NET_ERROR;
@@ -314,7 +314,7 @@ int WINAPI WNetGetConnection16(LPCSTR lpLocalName,
  *				WNetGetConnectionA	[MPR.70]
  */
 DWORD WINAPI
-WNetGetConnection32A(LPCSTR localname,LPSTR remotename,LPDWORD buflen)
+WNetGetConnectionA(LPCSTR localname,LPSTR remotename,LPDWORD buflen)
 {
 	UINT16	x;
 	DWORD	ret = WNetGetConnection16(localname,remotename,&x);
@@ -326,7 +326,7 @@ WNetGetConnection32A(LPCSTR localname,LPSTR remotename,LPDWORD buflen)
  *				WNetGetConnectionW	[MPR.72]
  */
 DWORD WINAPI
-WNetGetConnection32W(LPCWSTR localnameW,LPWSTR remotenameW,LPDWORD buflen)
+WNetGetConnectionW(LPCWSTR localnameW,LPWSTR remotenameW,LPDWORD buflen)
 {
 	UINT16	x;
 	CHAR	buf[200];	
@@ -334,7 +334,7 @@ WNetGetConnection32W(LPCWSTR localnameW,LPWSTR remotenameW,LPDWORD buflen)
 	DWORD	ret = WNetGetConnection16(lnA,buf,&x);
 
 	lstrcpyAtoW(remotenameW,buf);
-	*buflen=lstrlen32W(remotenameW);
+	*buflen=lstrlenW(remotenameW);
 	HeapFree(GetProcessHeap(),0,lnA);
 	return ret;
 }
@@ -342,7 +342,7 @@ WNetGetConnection32W(LPCWSTR localnameW,LPWSTR remotenameW,LPDWORD buflen)
 /**************************************************************************
  *				WNetGetCaps		[USER.513]
  */
-int WINAPI WNetGetCaps(WORD capability)
+int WINAPI WNetGetCaps16(WORD capability)
 {
 	switch (capability) {
 		case WNNC_SPEC_VERSION:
@@ -415,7 +415,7 @@ int WINAPI WNetGetCaps(WORD capability)
 /**************************************************************************
  *              WNetDeviceMode       [USER.514]
  */
-int WINAPI WNetDeviceMode(HWND16 hWndOwner)
+int WINAPI WNetDeviceMode16(HWND16 hWndOwner)
 {
 	FIXME(wnet, "(%04x): stub\n",hWndOwner);
 	return WN_NO_NETWORK;
@@ -424,7 +424,7 @@ int WINAPI WNetDeviceMode(HWND16 hWndOwner)
 /**************************************************************************
  *              WNetBrowseDialog       [USER.515]
  */
-int WINAPI WNetBrowseDialog(HWND16 hParent,WORD nType,LPSTR szPath)
+int WINAPI WNetBrowseDialog16(HWND16 hParent,WORD nType,LPSTR szPath)
 {
 	FIXME(wnet, "(%04x,%x,'%s'): stub\n",hParent,nType,szPath);
 	return WN_NO_NETWORK;
@@ -433,7 +433,7 @@ int WINAPI WNetBrowseDialog(HWND16 hParent,WORD nType,LPSTR szPath)
 /**************************************************************************
  *				WNetGetUser			[USER.516]
  */
-UINT16 WINAPI WNetGetUser(LPSTR lpLocalName, LPSTR lpUserName, DWORD *lpSize)
+UINT16 WINAPI WNetGetUser16(LPSTR lpLocalName, LPSTR lpUserName, DWORD *lpSize)
 {
 	FIXME(wnet, "(%p, %p, %p): stub\n", lpLocalName, lpUserName, lpSize);
 	return WN_NO_NETWORK;
@@ -443,7 +443,7 @@ UINT16 WINAPI WNetGetUser(LPSTR lpLocalName, LPSTR lpUserName, DWORD *lpSize)
  *				WNetGetUser			[MPR.86]
  * FIXME: we should not return ourselves, but the owner of the drive lpLocalName
  */
-DWORD WINAPI WNetGetUser32A(LPCSTR lpLocalName, LPSTR lpUserName, DWORD *lpSize)
+DWORD WINAPI WNetGetUserA(LPCSTR lpLocalName, LPSTR lpUserName, DWORD *lpSize)
 {
 	struct passwd	*pwd = getpwuid(getuid());
 
@@ -467,7 +467,7 @@ DWORD WINAPI WNetGetUser32A(LPCSTR lpLocalName, LPSTR lpUserName, DWORD *lpSize)
 /**************************************************************************
  *              WNetGetError       [USER.519]
  */
-int WINAPI WNetGetError(LPWORD nError)
+int WINAPI WNetGetError16(LPWORD nError)
 {
 	FIXME(wnet, "(%p): stub\n",nError);
 	return WN_NO_NETWORK;
@@ -476,7 +476,7 @@ int WINAPI WNetGetError(LPWORD nError)
 /**************************************************************************
  *              WNetGetErrorText       [USER.520]
  */
-int WINAPI WNetGetErrorText(WORD nError, LPSTR lpBuffer, LPWORD nBufferSize)
+int WINAPI WNetGetErrorText16(WORD nError, LPSTR lpBuffer, LPWORD nBufferSize)
 {
 	FIXME(wnet, "(%x,%p,%p): stub\n",nError,lpBuffer,nBufferSize);
 	return WN_NET_ERROR;
@@ -485,7 +485,7 @@ int WINAPI WNetGetErrorText(WORD nError, LPSTR lpBuffer, LPWORD nBufferSize)
 /**************************************************************************
  *              WNetRestoreConnection       [USER.523]
  */
-int WINAPI WNetRestoreConnection(HWND16 hwndOwner,LPSTR lpszDevice)
+int WINAPI WNetRestoreConnection16(HWND16 hwndOwner,LPSTR lpszDevice)
 {
 	FIXME(wnet, "(%04x,'%s'): stub\n",hwndOwner,lpszDevice);
 	return WN_NO_NETWORK;
@@ -494,7 +494,7 @@ int WINAPI WNetRestoreConnection(HWND16 hwndOwner,LPSTR lpszDevice)
 /**************************************************************************
  *              WNetWriteJob       [USER.524]
  */
-int WINAPI WNetWriteJob(HANDLE16 hJob,void *lpData,LPWORD lpcbData)
+int WINAPI WNetWriteJob16(HANDLE16 hJob,void *lpData,LPWORD lpcbData)
 {
 	FIXME(wnet, "(%04x,%p,%p): stub\n",hJob,lpData,lpcbData);
 	return WN_NO_NETWORK;
@@ -512,7 +512,7 @@ UINT16 WINAPI WNetConnectDialog(HWND16 hWndParent, WORD iType)
 /**************************************************************************
  *              WNetDisconnectDialog       [USER.526]
  */
-int WINAPI WNetDisconnectDialog(HWND16 hwndOwner, WORD iType)
+int WINAPI WNetDisconnectDialog16(HWND16 hwndOwner, WORD iType)
 {
 	FIXME(wnet, "(%04x,%x): stub\n",hwndOwner,iType);
 	return WN_NO_NETWORK;
@@ -521,7 +521,7 @@ int WINAPI WNetDisconnectDialog(HWND16 hwndOwner, WORD iType)
 /**************************************************************************
  *              WnetConnectionDialog     [USER.527]
  */
-UINT16 WINAPI WNetConnectionDialog(HWND16 hWndParent, WORD iType)
+UINT16 WINAPI WNetConnectionDialog16(HWND16 hWndParent, WORD iType)
 {
 	FIXME(wnet, "(%04x, %4X): stub\n", hWndParent, iType);
 	return WN_SUCCESS;
@@ -532,7 +532,7 @@ UINT16 WINAPI WNetConnectionDialog(HWND16 hWndParent, WORD iType)
 /**************************************************************************
  *              WNetViewQueueDialog       [USER.528]
  */
-int WINAPI WNetViewQueueDialog(HWND16 hwndOwner,LPSTR lpszQueue)
+int WINAPI WNetViewQueueDialog16(HWND16 hwndOwner,LPSTR lpszQueue)
 {
 	FIXME(wnet, "(%04x,'%s'): stub\n",hwndOwner,lpszQueue);
 	return WN_NO_NETWORK;
@@ -541,7 +541,7 @@ int WINAPI WNetViewQueueDialog(HWND16 hwndOwner,LPSTR lpszQueue)
 /**************************************************************************
  *              WNetPropertyDialog       [USER.529]
  */
-int WINAPI WNetPropertyDialog(HWND16 hwndParent,WORD iButton,
+int WINAPI WNetPropertyDialog16(HWND16 hwndParent,WORD iButton,
                               WORD nPropSel,LPSTR lpszName,WORD nType)
 {
 	FIXME(wnet, "(%04x,%x,%x,'%s',%x): stub\n",
@@ -559,10 +559,10 @@ int WINAPI WNetPropertyDialog(HWND16 hwndParent,WORD iButton,
  */
 int WINAPI WNetGetDirectoryType16(LPSTR lpName, LPINT16 lpType)
 {
-        UINT32 type = GetDriveType32A(lpName);
+        UINT type = GetDriveTypeA(lpName);
 
 	if (type == DRIVE_DOESNOTEXIST)
-	  type = GetDriveType32A(NULL);
+	  type = GetDriveTypeA(NULL);
 	*lpType = (type==DRIVE_REMOTE)?WNDT_NETWORK:WNDT_NORMAL;
 	TRACE(wnet,"%s is %s\n",lpName,(*lpType==WNDT_NETWORK)?
 	      "WNDT_NETWORK":"WNDT_NORMAL");
@@ -573,7 +573,7 @@ int WINAPI WNetGetDirectoryType16(LPSTR lpName, LPINT16 lpType)
  *              WNetGetDirectoryTypeA     [MPR.109]
  */
 
-UINT32 WINAPI WNetGetDirectoryType32A(LPSTR lpName,void *lpType)
+UINT WINAPI WNetGetDirectoryTypeA(LPSTR lpName,void *lpType)
 {
    return WNetGetDirectoryType16(lpName, lpType);
 }
@@ -581,7 +581,7 @@ UINT32 WINAPI WNetGetDirectoryType32A(LPSTR lpName,void *lpType)
 /**************************************************************************
  *              WNetDirectoryNotify       [USER.531]
  */
-int WINAPI WNetDirectoryNotify(HWND16 hwndOwner,void *lpDir,WORD wOper)
+int WINAPI WNetDirectoryNotify16(HWND16 hwndOwner,void *lpDir,WORD wOper)
 {
 	FIXME(wnet, "(%04x,%p,%x): stub\n",hwndOwner,lpDir,wOper);
 	return WN_NO_NETWORK;
@@ -590,7 +590,7 @@ int WINAPI WNetDirectoryNotify(HWND16 hwndOwner,void *lpDir,WORD wOper)
 /**************************************************************************
  *              WNetGetPropertyText       [USER.532]
  */
-int WINAPI WNetGetPropertyText(WORD iButton, WORD nPropSel, LPSTR lpszName,
+int WINAPI WNetGetPropertyText16(WORD iButton, WORD nPropSel, LPSTR lpszName,
                           LPSTR lpszButtonName, WORD cbButtonName, WORD nType)
 {
 	FIXME(wnet, "(%04x,%04x,'%s','%s',%04x): stub\n",
@@ -633,8 +633,8 @@ UINT16 WINAPI WNetOpenEnum16(DWORD dwScope, DWORD dwType,
 /**************************************************************************
  *				WNetOpenEnumA		[MPR.92]
  */
-UINT32 WINAPI WNetOpenEnum32A(DWORD dwScope, DWORD dwType, DWORD dwUsage,
-                              LPNETRESOURCE32A lpNet, HANDLE32 *lphEnum)
+UINT WINAPI WNetOpenEnumA(DWORD dwScope, DWORD dwType, DWORD dwUsage,
+                              LPNETRESOURCEA lpNet, HANDLE *lphEnum)
 {
 	FIXME(wnet, "(%08lX, %08lX, %08lX, %p, %p): stub\n",
 	      dwScope, dwType, dwUsage, lpNet, lphEnum);
@@ -645,8 +645,8 @@ UINT32 WINAPI WNetOpenEnum32A(DWORD dwScope, DWORD dwType, DWORD dwUsage,
 /**************************************************************************
  *                             WNetOpenEnumW           [MPR.93]
  */
-UINT32 WINAPI WNetOpenEnum32W(DWORD dwScope, DWORD dwType, DWORD dwUsage,
-                              LPNETRESOURCE32A lpNet, HANDLE32 *lphEnum)
+UINT WINAPI WNetOpenEnumW(DWORD dwScope, DWORD dwType, DWORD dwUsage,
+                              LPNETRESOURCEA lpNet, HANDLE *lphEnum)
 {
        FIXME(wnet, "(%08lX, %08lX, %08lX, %p, %p): stub\n",
              dwScope, dwType, dwUsage, lpNet, lphEnum);
@@ -659,8 +659,8 @@ UINT32 WINAPI WNetOpenEnum32W(DWORD dwScope, DWORD dwType, DWORD dwUsage,
  * */
 
 DWORD WINAPI 
-WNetGetResourceInformation32A(
-	LPNETRESOURCE32A netres,LPVOID buf,LPDWORD buflen,LPSTR systemstr
+WNetGetResourceInformationA(
+	LPNETRESOURCEA netres,LPVOID buf,LPDWORD buflen,LPSTR systemstr
 ) {
 	FIXME(wnet,"(%p,%p,%p,%p): stub!\n",netres,buf,buflen,systemstr);
   SetLastError(WN_NO_NETWORK);
@@ -719,8 +719,8 @@ DWORD WINAPI WNetGetCachedPassword(
  *             ERROR_BAD_NET_NAME, ERROR_INVALID_PARAMETER, 
  *             ERROR_NO_NETWORK, ERROR_EXTENDED_ERROR
  */
-DWORD WINAPI MultinetGetConnectionPerformance32A(
-	LPNETRESOURCE32A lpNetResource,
+DWORD WINAPI MultinetGetConnectionPerformanceA(
+	LPNETRESOURCEA lpNetResource,
 	LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct
 ) {
 	FIXME(mpr,"(%p,%p): stub\n",lpNetResource,lpNetConnectInfoStruct);
@@ -742,7 +742,7 @@ DWORD WINAPI _MPR_22(DWORD x)
  *  MultinetGetErrorTextA [MPR.28]
  */
 
-UINT32 WINAPI MultinetGetErrorText32A (DWORD x, DWORD y, DWORD z)
+UINT WINAPI MultinetGetErrorTextA (DWORD x, DWORD y, DWORD z)
 {	FIXME(mpr,"(%lx,%lx,%lx): stub\n",x,y,z);
   return 0;
 }
@@ -750,7 +750,7 @@ UINT32 WINAPI MultinetGetErrorText32A (DWORD x, DWORD y, DWORD z)
 /*****************************************************************
  *  MultinetGetErrorTextW [MPR.29]
  */
-UINT32 WINAPI MultinetGetErrorText32W (DWORD x, DWORD y, DWORD z)
+UINT WINAPI MultinetGetErrorTextW (DWORD x, DWORD y, DWORD z)
 {	FIXME(mpr,"(%lx,%lx,%lx): stub\n",x,y,z);
   return 0;
 }
@@ -758,7 +758,7 @@ UINT32 WINAPI MultinetGetErrorText32W (DWORD x, DWORD y, DWORD z)
 /*****************************************************************
  *  NPSGetProviderHandle [MPR.33]
  */
-DWORD WINAPI NPSGetProviderHandle32A(DWORD x) {
+DWORD WINAPI NPSGetProviderHandleA(DWORD x) {
 	FIXME(mpr,"(0x%08lx),stub!\n",x);
 	return 0;
 }
@@ -766,10 +766,10 @@ DWORD WINAPI NPSGetProviderHandle32A(DWORD x) {
 /*****************************************************************
  *  WNetCancelConnection232A [MPR.53]
  */
-DWORD WINAPI WNetCancelConnection232A(
+DWORD WINAPI WNetCancelConnection2A(
   LPCSTR lpName, 
   DWORD dwFlags, 
-  BOOL32 fForce) {
+  BOOL fForce) {
 
   FIXME(wnet,": stub\n");
   return WN_SUCCESS;
@@ -778,10 +778,10 @@ DWORD WINAPI WNetCancelConnection232A(
 /*****************************************************************
  *  WNetCancelConnection232W [MPR.54]
  */
-DWORD WINAPI WNetCancelConnection232W(
+DWORD WINAPI WNetCancelConnection2W(
   LPCWSTR lpName, 
   DWORD dwFlags, 
-  BOOL32 fForce) {
+  BOOL fForce) {
 
   FIXME(wnet,": stub\n");
   return WN_SUCCESS;
@@ -790,10 +790,10 @@ DWORD WINAPI WNetCancelConnection232W(
 /*****************************************************************
  *  WNetCancelConnection32A [MPR.55]
  */
-DWORD WINAPI WNetCancelConnection32A(
+DWORD WINAPI WNetCancelConnectionA(
   LPCSTR lpName, 
   DWORD dwFlags, 
-  BOOL32 fForce) {
+  BOOL fForce) {
 
   FIXME(wnet,": stub\n");
   return WN_SUCCESS;
@@ -802,10 +802,10 @@ DWORD WINAPI WNetCancelConnection32A(
 /*****************************************************************
  *  WNetCancelConnection32W [MPR.56]
  */
-DWORD WINAPI WNetCancelConnection32W(
+DWORD WINAPI WNetCancelConnectionW(
   LPCWSTR lpName, 
   DWORD dwFlags, 
-  BOOL32 fForce) {
+  BOOL fForce) {
 
   FIXME(wnet,": stub\n");
   return WN_SUCCESS;
@@ -814,7 +814,7 @@ DWORD WINAPI WNetCancelConnection32W(
 /*****************************************************************
  *  WNetGetUser32W [MPR.87]
  */
-DWORD WINAPI WNetGetUser32W(
+DWORD WINAPI WNetGetUserW(
   LPCWSTR  lpName,
   LPWSTR   lpUserName,
   LPDWORD  lpnLength) {
diff --git a/misc/printdrv.c b/misc/printdrv.c
index 857e3126c1b..55e428693ea 100644
--- a/misc/printdrv.c
+++ b/misc/printdrv.c
@@ -55,7 +55,7 @@ INT16 WINAPI EndPage16( HDC16 hdc )
  *                  StartDoc32A  [GDI32.347]
  *
  */
-INT32 WINAPI StartDoc32A(HDC32 hdc ,const DOCINFO32A* doc)
+INT WINAPI StartDocA(HDC hdc ,const DOCINFOA* doc)
 {
   FIXME(gdi,"stub\n");
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED); 
@@ -66,7 +66,7 @@ INT32 WINAPI StartDoc32A(HDC32 hdc ,const DOCINFO32A* doc)
  *                  StartDoc32W [GDI32.348]
  * 
  */
-INT32 WINAPI StartDoc32W(HDC32 hdc, const DOCINFO32W* doc) {
+INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) {
   FIXME(gdi,"stub\n");
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED); 
   return 0; /* failure*/
@@ -76,7 +76,7 @@ INT32 WINAPI StartDoc32W(HDC32 hdc, const DOCINFO32W* doc) {
  *                  StartPage32  [GDI32.349]
  *
  */
-INT32 WINAPI StartPage32(HDC32 hdc)
+INT WINAPI StartPage(HDC hdc)
 {
   FIXME(gdi,"stub\n");
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED); 
@@ -87,7 +87,7 @@ INT32 WINAPI StartPage32(HDC32 hdc)
  *                  EndPage32  [GDI32.77]
  *
  */
-INT32 WINAPI EndPage32(HDC32 hdc)
+INT WINAPI EndPage(HDC hdc)
 {
   FIXME(gdi,"stub\n");
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED); 
@@ -107,7 +107,7 @@ INT16 WINAPI EndDoc16(HDC16 hdc)
  *                  EndDoc32  [GDI32.76]
  *
  */
-INT32 WINAPI EndDoc32(HDC32 hdc)
+INT WINAPI EndDoc(HDC hdc)
 {
   FIXME(gdi,"stub\n");
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED); 
@@ -125,7 +125,7 @@ INT16 WINAPI AbortDoc16(HDC16 hdc)
 /******************************************************************************
  *                 AbortDoc32  [GDI32.0]
  */
-INT32 WINAPI AbortDoc32(HDC32 hdc)
+INT WINAPI AbortDoc(HDC hdc)
 {
     FIXME(gdi, "(%d): stub\n", hdc);
     return 1;
@@ -143,21 +143,21 @@ LPBYTE lpPrinterData, int cbData, int what)
     HKEY hkey;
     DWORD dwType, cbQueryData;
 
-    if (!(RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey))) {
+    if (!(RegOpenKeyA(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey))) {
         if (what == INT_PD_DEFAULT_DEVMODE) { /* "Default DevMode" */
-            if (!(RegQueryValueEx32A(hkey, DefaultDevMode, 0, &dwType, 0, &cbQueryData))) {
+            if (!(RegQueryValueExA(hkey, DefaultDevMode, 0, &dwType, 0, &cbQueryData))) {
                 if (!lpPrinterData)
 		    res = cbQueryData;
 		else if ((cbQueryData) && (cbQueryData <= cbData)) {
 		    cbQueryData = cbData;
-		    if (RegQueryValueEx32A(hkey, DefaultDevMode, 0,
+		    if (RegQueryValueExA(hkey, DefaultDevMode, 0,
 				&dwType, lpPrinterData, &cbQueryData))
 		        res = cbQueryData;
 		}
 	    }
 	} else { /* "Printer Driver" */
 	    cbQueryData = 32;
-	    RegQueryValueEx32A(hkey, "Printer Driver", 0,
+	    RegQueryValueExA(hkey, "Printer Driver", 0,
 			&dwType, lpPrinterData, &cbQueryData);
 	    res = cbQueryData;
 	}
@@ -170,7 +170,7 @@ LPBYTE lpPrinterData, int cbData, int what)
  *                DrvGetPrinterData     [GDI.282]
  *
  */
-DWORD WINAPI DrvGetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
+DWORD WINAPI DrvGetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
                                LPDWORD lpType, LPBYTE lpPrinterData,
                                int cbData, LPDWORD lpNeeded)
 {
@@ -226,16 +226,16 @@ DWORD WINAPI DrvGetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
     }
     else
     {
-	if ((res = RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey)))
+	if ((res = RegOpenKeyA(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey)))
 	    goto failed;
         cbPrinterAttr = 4;
-        if ((res = RegQueryValueEx32A(hkey, "Attributes", 0,
+        if ((res = RegQueryValueExA(hkey, "Attributes", 0,
                         &dwType, (LPBYTE)&PrinterAttr, &cbPrinterAttr)))
 	    goto failed;
-	if ((res = RegOpenKey32A(hkey, PrinterDriverData, &hkey2)))
+	if ((res = RegOpenKeyA(hkey, PrinterDriverData, &hkey2)))
 	    goto failed;
         *lpNeeded = cbData;
-        res = RegQueryValueEx32A(hkey2, lpProfile, 0,
+        res = RegQueryValueExA(hkey2, lpProfile, 0,
                 lpType, lpPrinterData, lpNeeded);
         if ((res != ERROR_CANTREAD) &&
          ((PrinterAttr &
@@ -248,7 +248,7 @@ DWORD WINAPI DrvGetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
 	else
         {
 	    SetData = -1;
-	    RegSetValueEx32A(hkey2, lpProfile, 0, REG_DWORD, (LPBYTE)&SetData, 4); /* no result returned */
+	    RegSetValueExA(hkey2, lpProfile, 0, REG_DWORD, (LPBYTE)&SetData, 4); /* no result returned */
 	}
     }
 	
@@ -264,7 +264,7 @@ failed:
  *                 DrvSetPrinterData     [GDI.281]
  *
  */
-DWORD WINAPI DrvSetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
+DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
                                DWORD lpType, LPBYTE lpPrinterData,
                                DWORD dwSize)
 {
@@ -294,9 +294,9 @@ DWORD WINAPI DrvSetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
 
     if (((DWORD)lpProfile == INT_PD_DEFAULT_DEVMODE) || (HIWORD(lpProfile) &&
     (!strcmp(lpProfile, DefaultDevMode)))) {
-	if ( RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey) 
+	if ( RegOpenKeyA(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey) 
 	     != ERROR_SUCCESS ||
-	     RegSetValueEx32A(hkey, DefaultDevMode, 0, REG_BINARY, 
+	     RegSetValueExA(hkey, DefaultDevMode, 0, REG_BINARY, 
 			      lpPrinterData, dwSize) != ERROR_SUCCESS )
 	        res = ERROR_INVALID_PRINTER_NAME;
     }
@@ -304,13 +304,13 @@ DWORD WINAPI DrvSetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
     {
 	strcat(RegStr_Printer, "\\");
 
-	if( (res = RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey)) ==
+	if( (res = RegOpenKeyA(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey)) ==
 	    ERROR_SUCCESS ) {
 
 	    if (!lpPrinterData) 
-	        res = RegDeleteValue32A(hkey, lpProfile);
+	        res = RegDeleteValueA(hkey, lpProfile);
 	    else
-                res = RegSetValueEx32A(hkey, lpProfile, 0, lpType,
+                res = RegSetValueExA(hkey, lpProfile, 0, lpType,
 				       lpPrinterData, dwSize);
 	}
     }
@@ -325,8 +325,8 @@ DWORD WINAPI DrvSetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
  *              DeviceCapabilities32A    [WINSPOOL.151]
  *
  */
-INT32 WINAPI DeviceCapabilities32A(LPCSTR printer,LPCSTR target,WORD z,
-                                   LPSTR a,LPDEVMODE32A b)
+INT WINAPI DeviceCapabilitiesA(LPCSTR printer,LPCSTR target,WORD z,
+                                   LPSTR a,LPDEVMODEA b)
 {
     FIXME(print,"(%s,%s,%d,%p,%p):stub.\n",printer,target,z,a,b);
     return 1;   	
@@ -336,9 +336,9 @@ INT32 WINAPI DeviceCapabilities32A(LPCSTR printer,LPCSTR target,WORD z,
 /*****************************************************************************
  *          DeviceCapabilities32W 
  */
-INT32 WINAPI DeviceCapabilities32W(LPCWSTR pDevice, LPCWSTR pPort,
+INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort,
                                    WORD fwCapability, LPWSTR pOutput,
-                                   const DEVMODE32W *pDevMode)
+                                   const DEVMODEW *pDevMode)
 {
     FIXME(print,"(%p,%p,%d,%p,%p): stub\n",
           pDevice, pPort, fwCapability, pOutput, pDevMode);
@@ -349,9 +349,9 @@ INT32 WINAPI DeviceCapabilities32W(LPCWSTR pDevice, LPCWSTR pPort,
  *              DocumentProperties32A   [WINSPOOL.155]
  *
  */
-LONG WINAPI DocumentProperties32A(HWND32 hWnd,HANDLE32 hPrinter,
-                                LPSTR pDeviceName, LPDEVMODE32A pDevModeOutput,
-                                  LPDEVMODE32A pDevModeInput,DWORD fMode )
+LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter,
+                                LPSTR pDeviceName, LPDEVMODEA pDevModeOutput,
+                                  LPDEVMODEA pDevModeInput,DWORD fMode )
 {
     FIXME(print,"(%d,%d,%s,%p,%p,%ld):stub.\n",
 	hWnd,hPrinter,pDeviceName,pDevModeOutput,pDevModeInput,fMode
@@ -363,10 +363,10 @@ LONG WINAPI DocumentProperties32A(HWND32 hWnd,HANDLE32 hPrinter,
 /*****************************************************************************
  *          DocumentProperties32W 
  */
-LONG WINAPI DocumentProperties32W(HWND32 hWnd, HANDLE32 hPrinter,
+LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
                                   LPWSTR pDeviceName,
-                                  LPDEVMODE32W pDevModeOutput,
-                                  LPDEVMODE32W pDevModeInput, DWORD fMode)
+                                  LPDEVMODEW pDevModeOutput,
+                                  LPDEVMODEW pDevModeInput, DWORD fMode)
 {
     FIXME(print,"(%d,%d,%s,%p,%p,%ld): stub\n",
           hWnd,hPrinter,debugstr_w(pDeviceName),pDevModeOutput,pDevModeInput,
@@ -379,8 +379,8 @@ LONG WINAPI DocumentProperties32W(HWND32 hWnd, HANDLE32 hPrinter,
  *              OpenPrinter32A        [WINSPOOL.196]
  *
  */
-BOOL32 WINAPI OpenPrinter32A(LPSTR lpPrinterName,HANDLE32 *phPrinter,
-			     LPPRINTER_DEFAULTS32A pDefault)
+BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter,
+			     LPPRINTER_DEFAULTSA pDefault)
 {
     FIXME(print,"(%s,%p,%p):stub\n",debugstr_a(lpPrinterName), phPrinter,
           pDefault);
@@ -392,8 +392,8 @@ BOOL32 WINAPI OpenPrinter32A(LPSTR lpPrinterName,HANDLE32 *phPrinter,
  *              OpenPrinter32W        [WINSPOOL.197]
  *
  */
-BOOL32 WINAPI OpenPrinter32W(LPWSTR lpPrinterName,HANDLE32 *phPrinter,
-			     LPPRINTER_DEFAULTS32W pDefault)
+BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter,
+			     LPPRINTER_DEFAULTSW pDefault)
 {
     FIXME(print,"(%s,%p,%p):stub\n",debugstr_w(lpPrinterName), phPrinter,
           pDefault);
@@ -405,7 +405,7 @@ BOOL32 WINAPI OpenPrinter32W(LPWSTR lpPrinterName,HANDLE32 *phPrinter,
  *              EnumPrinters32A        [WINSPOOL.174]
  *
  */
-BOOL32  WINAPI EnumPrinters32A(DWORD dwType, LPSTR lpszName,
+BOOL  WINAPI EnumPrintersA(DWORD dwType, LPSTR lpszName,
 			       DWORD dwLevel, LPBYTE lpbPrinters,
 			       DWORD cbBuf, LPDWORD lpdwNeeded,
 			       LPDWORD lpdwReturned)
@@ -420,7 +420,7 @@ BOOL32  WINAPI EnumPrinters32A(DWORD dwType, LPSTR lpszName,
  *              EnumPrinters32W        [WINSPOOL.175]
  *
  */
-BOOL32  WINAPI EnumPrinters32W(DWORD dwType, LPWSTR lpszName,
+BOOL  WINAPI EnumPrintersW(DWORD dwType, LPWSTR lpszName,
 			       DWORD dwLevel, LPBYTE lpbPrinters,
 			       DWORD cbBuf, LPDWORD lpdwNeeded,
 			       LPDWORD lpdwReturned)
@@ -435,7 +435,7 @@ BOOL32  WINAPI EnumPrinters32W(DWORD dwType, LPWSTR lpszName,
  *              AddMonitor32A        [WINSPOOL.107]
  *
  */
-BOOL32 WINAPI AddMonitor32A(LPCSTR pName, DWORD Level, LPBYTE pMonitors)
+BOOL WINAPI AddMonitorA(LPCSTR pName, DWORD Level, LPBYTE pMonitors)
 {
     FIXME(print, "(%s,%lx,%p):stub!\n", pName, Level, pMonitors);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -446,8 +446,8 @@ BOOL32 WINAPI AddMonitor32A(LPCSTR pName, DWORD Level, LPBYTE pMonitors)
  *              DeletePrinterDriver32A        [WINSPOOL.146]
  *
  */
-BOOL32 WINAPI
-DeletePrinterDriver32A (LPSTR pName, LPSTR pEnvironment, LPSTR pDriverName)
+BOOL WINAPI
+DeletePrinterDriverA (LPSTR pName, LPSTR pEnvironment, LPSTR pDriverName)
 {
     FIXME(print,"(%s,%s,%s):stub\n",debugstr_a(pName),debugstr_a(pEnvironment),
           debugstr_a(pDriverName));
@@ -460,8 +460,8 @@ DeletePrinterDriver32A (LPSTR pName, LPSTR pEnvironment, LPSTR pDriverName)
  *              DeleteMonitor32A        [WINSPOOL.135]
  *
  */
-BOOL32 WINAPI
-DeleteMonitor32A (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName)
+BOOL WINAPI
+DeleteMonitorA (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName)
 {
     FIXME(print,"(%s,%s,%s):stub\n",debugstr_a(pName),debugstr_a(pEnvironment),
           debugstr_a(pMonitorName));
@@ -474,8 +474,8 @@ DeleteMonitor32A (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName)
  *              DeletePort32A        [WINSPOOL.137]
  *
  */
-BOOL32 WINAPI
-DeletePort32A (LPSTR pName, HWND32 hWnd, LPSTR pPortName)
+BOOL WINAPI
+DeletePortA (LPSTR pName, HWND hWnd, LPSTR pPortName)
 {
     FIXME(print,"(%s,0x%08x,%s):stub\n",debugstr_a(pName),hWnd,
           debugstr_a(pPortName));
@@ -486,9 +486,9 @@ DeletePort32A (LPSTR pName, HWND32 hWnd, LPSTR pPortName)
 /******************************************************************************
  *    SetPrinter32W  [WINSPOOL.214]
  */
-BOOL32 WINAPI
-SetPrinter32W(
-  HANDLE32  hPrinter,
+BOOL WINAPI
+SetPrinterW(
+  HANDLE  hPrinter,
   DWORD     Level,
   LPBYTE    pPrinter,
   DWORD     Command) {
@@ -501,9 +501,9 @@ SetPrinter32W(
 /******************************************************************************
  *    WritePrinter32  [WINSPOOL.223]
  */
-BOOL32 WINAPI
-WritePrinter32( 
-  HANDLE32  hPrinter,
+BOOL WINAPI
+WritePrinter( 
+  HANDLE  hPrinter,
   LPVOID  pBuf,
   DWORD   cbBuf,
   LPDWORD pcWritten) {
@@ -516,7 +516,7 @@ WritePrinter32(
 /*****************************************************************************
  *          AddForm32A  [WINSPOOL.103]
  */
-BOOL32 WINAPI AddForm32A(HANDLE32 hPrinter, DWORD Level, LPBYTE pForm)
+BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm)
 {
     FIXME(print, "(%d,%ld,%p): stub\n", hPrinter, Level, pForm);
     return 1;
@@ -525,7 +525,7 @@ BOOL32 WINAPI AddForm32A(HANDLE32 hPrinter, DWORD Level, LPBYTE pForm)
 /*****************************************************************************
  *          AddForm32W  [WINSPOOL.104]
  */
-BOOL32 WINAPI AddForm32W(HANDLE32 hPrinter, DWORD Level, LPBYTE pForm)
+BOOL WINAPI AddFormW(HANDLE hPrinter, DWORD Level, LPBYTE pForm)
 {
     FIXME(print, "(%d,%ld,%p): stub\n", hPrinter, Level, pForm);
     return 1;
@@ -534,7 +534,7 @@ BOOL32 WINAPI AddForm32W(HANDLE32 hPrinter, DWORD Level, LPBYTE pForm)
 /*****************************************************************************
  *          AddJob32A  [WINSPOOL.105]
  */
-BOOL32 WINAPI AddJob32A(HANDLE32 hPrinter, DWORD Level, LPBYTE pData,
+BOOL WINAPI AddJobA(HANDLE hPrinter, DWORD Level, LPBYTE pData,
                         DWORD cbBuf, LPDWORD pcbNeeded)
 {
     FIXME(print, "(%d,%ld,%p,%ld,%p): stub\n", hPrinter, Level, pData, cbBuf,
@@ -545,7 +545,7 @@ BOOL32 WINAPI AddJob32A(HANDLE32 hPrinter, DWORD Level, LPBYTE pData,
 /*****************************************************************************
  *          AddJob32W  [WINSPOOL.106]
  */
-BOOL32 WINAPI AddJob32W(HANDLE32 hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf,
+BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf,
                         LPDWORD pcbNeeded)
 {
     FIXME(print, "(%d,%ld,%p,%ld,%p): stub\n", hPrinter, Level, pData, cbBuf,
@@ -556,7 +556,7 @@ BOOL32 WINAPI AddJob32W(HANDLE32 hPrinter, DWORD Level, LPBYTE pData, DWORD cbBu
 /*****************************************************************************
  *          AddPrinter32A  [WINSPOOL.117]
  */
-HANDLE32 WINAPI AddPrinter32A(LPSTR pName, DWORD Level, LPBYTE pPrinter)
+HANDLE WINAPI AddPrinterA(LPSTR pName, DWORD Level, LPBYTE pPrinter)
 {
     FIXME(print, "(%s,%ld,%p): stub\n", pName, Level, pPrinter);
     return 0;
@@ -565,7 +565,7 @@ HANDLE32 WINAPI AddPrinter32A(LPSTR pName, DWORD Level, LPBYTE pPrinter)
 /*****************************************************************************
  *          AddPrinter32W  [WINSPOOL.122]
  */
-HANDLE32 WINAPI AddPrinter32W(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
+HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
 {
     FIXME(print, "(%p,%ld,%p): stub\n", pName, Level, pPrinter);
     return 0;
@@ -575,7 +575,7 @@ HANDLE32 WINAPI AddPrinter32W(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
 /*****************************************************************************
  *          ClosePrinter32  [WINSPOOL.126]
  */
-BOOL32 WINAPI ClosePrinter32(HANDLE32 hPrinter)
+BOOL WINAPI ClosePrinter(HANDLE hPrinter)
 {
     FIXME(print, "(%d): stub\n", hPrinter);
     return 1;
@@ -584,7 +584,7 @@ BOOL32 WINAPI ClosePrinter32(HANDLE32 hPrinter)
 /*****************************************************************************
  *          DeleteForm32A  [WINSPOOL.133]
  */
-BOOL32 WINAPI DeleteForm32A(HANDLE32 hPrinter, LPSTR pFormName)
+BOOL WINAPI DeleteFormA(HANDLE hPrinter, LPSTR pFormName)
 {
     FIXME(print, "(%d,%s): stub\n", hPrinter, pFormName);
     return 1;
@@ -593,7 +593,7 @@ BOOL32 WINAPI DeleteForm32A(HANDLE32 hPrinter, LPSTR pFormName)
 /*****************************************************************************
  *          DeleteForm32W  [WINSPOOL.134]
  */
-BOOL32 WINAPI DeleteForm32W(HANDLE32 hPrinter, LPWSTR pFormName)
+BOOL WINAPI DeleteFormW(HANDLE hPrinter, LPWSTR pFormName)
 {
     FIXME(print, "(%d,%s): stub\n", hPrinter, debugstr_w(pFormName));
     return 1;
@@ -602,7 +602,7 @@ BOOL32 WINAPI DeleteForm32W(HANDLE32 hPrinter, LPWSTR pFormName)
 /*****************************************************************************
  *          DeletePrinter32  [WINSPOOL.143]
  */
-BOOL32 WINAPI DeletePrinter32(HANDLE32 hPrinter)
+BOOL WINAPI DeletePrinter(HANDLE hPrinter)
 {
     FIXME(print, "(%d): stub\n", hPrinter);
     return 1;
@@ -611,7 +611,7 @@ BOOL32 WINAPI DeletePrinter32(HANDLE32 hPrinter)
 /*****************************************************************************
  *          SetPrinter32A  [WINSPOOL.211]
  */
-BOOL32 WINAPI SetPrinter32A(HANDLE32 hPrinter, DWORD Level, LPBYTE pPrinter,
+BOOL WINAPI SetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
                            DWORD Command)
 {
     FIXME(print, "(%d,%ld,%p,%ld): stub\n",hPrinter,Level,pPrinter,Command);
@@ -621,7 +621,7 @@ BOOL32 WINAPI SetPrinter32A(HANDLE32 hPrinter, DWORD Level, LPBYTE pPrinter,
 /*****************************************************************************
  *          SetJob32A  [WINSPOOL.209]
  */
-BOOL32 WINAPI SetJob32A(HANDLE32 hPrinter, DWORD JobId, DWORD Level,
+BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
                        LPBYTE pJob, DWORD Command)
 {
     FIXME(print, "(%d,%ld,%ld,%p,%ld): stub\n",hPrinter,JobId,Level,pJob,
@@ -632,7 +632,7 @@ BOOL32 WINAPI SetJob32A(HANDLE32 hPrinter, DWORD JobId, DWORD Level,
 /*****************************************************************************
  *          SetJob32W  [WINSPOOL.210]
  */
-BOOL32 WINAPI SetJob32W(HANDLE32 hPrinter, DWORD JobId, DWORD Level,
+BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level,
                        LPBYTE pJob, DWORD Command)
 {
     FIXME(print, "(%d,%ld,%ld,%p,%ld): stub\n",hPrinter,JobId,Level,pJob,
@@ -643,7 +643,7 @@ BOOL32 WINAPI SetJob32W(HANDLE32 hPrinter, DWORD JobId, DWORD Level,
 /*****************************************************************************
  *          GetForm32A  [WINSPOOL.181]
  */
-BOOL32 WINAPI GetForm32A(HANDLE32 hPrinter, LPSTR pFormName, DWORD Level,
+BOOL WINAPI GetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level,
                  LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded)
 {
     FIXME(print, "(%d,%s,%ld,%p,%ld,%p): stub\n",hPrinter,pFormName,
@@ -654,7 +654,7 @@ BOOL32 WINAPI GetForm32A(HANDLE32 hPrinter, LPSTR pFormName, DWORD Level,
 /*****************************************************************************
  *          GetForm32W  [WINSPOOL.182]
  */
-BOOL32 WINAPI GetForm32W(HANDLE32 hPrinter, LPWSTR pFormName, DWORD Level,
+BOOL WINAPI GetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level,
                  LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded)
 {
     FIXME(print, "(%d,%s,%ld,%p,%ld,%p): stub\n",hPrinter,
@@ -665,7 +665,7 @@ BOOL32 WINAPI GetForm32W(HANDLE32 hPrinter, LPWSTR pFormName, DWORD Level,
 /*****************************************************************************
  *          SetForm32A  [WINSPOOL.207]
  */
-BOOL32 WINAPI SetForm32A(HANDLE32 hPrinter, LPSTR pFormName, DWORD Level,
+BOOL WINAPI SetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level,
                         LPBYTE pForm)
 {
     FIXME(print, "(%d,%s,%ld,%p): stub\n",hPrinter,pFormName,Level,pForm);
@@ -675,7 +675,7 @@ BOOL32 WINAPI SetForm32A(HANDLE32 hPrinter, LPSTR pFormName, DWORD Level,
 /*****************************************************************************
  *          SetForm32W  [WINSPOOL.208]
  */
-BOOL32 WINAPI SetForm32W(HANDLE32 hPrinter, LPWSTR pFormName, DWORD Level,
+BOOL WINAPI SetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level,
                         LPBYTE pForm)
 {
     FIXME(print, "(%d,%p,%ld,%p): stub\n",hPrinter,pFormName,Level,pForm);
@@ -685,7 +685,7 @@ BOOL32 WINAPI SetForm32W(HANDLE32 hPrinter, LPWSTR pFormName, DWORD Level,
 /*****************************************************************************
  *          ReadPrinter32  [WINSPOOL.202]
  */
-BOOL32 WINAPI ReadPrinter32(HANDLE32 hPrinter, LPVOID pBuf, DWORD cbBuf,
+BOOL WINAPI ReadPrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf,
                            LPDWORD pNoBytesRead)
 {
     FIXME(print, "(%d,%p,%ld,%p): stub\n",hPrinter,pBuf,cbBuf,pNoBytesRead);
@@ -695,7 +695,7 @@ BOOL32 WINAPI ReadPrinter32(HANDLE32 hPrinter, LPVOID pBuf, DWORD cbBuf,
 /*****************************************************************************
  *          ResetPrinter32A  [WINSPOOL.203]
  */
-BOOL32 WINAPI ResetPrinter32A(HANDLE32 hPrinter, LPPRINTER_DEFAULTS32A pDefault)
+BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault)
 {
     FIXME(print, "(%d, %p): stub\n", hPrinter, pDefault);
     return FALSE;
@@ -704,7 +704,7 @@ BOOL32 WINAPI ResetPrinter32A(HANDLE32 hPrinter, LPPRINTER_DEFAULTS32A pDefault)
 /*****************************************************************************
  *          ResetPrinter32W  [WINSPOOL.204]
  */
-BOOL32 WINAPI ResetPrinter32W(HANDLE32 hPrinter, LPPRINTER_DEFAULTS32W pDefault)
+BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault)
 {
     FIXME(print, "(%d, %p): stub\n", hPrinter, pDefault);
     return FALSE;
@@ -713,7 +713,7 @@ BOOL32 WINAPI ResetPrinter32W(HANDLE32 hPrinter, LPPRINTER_DEFAULTS32W pDefault)
 /*****************************************************************************
  *          GetPrinter32A  [WINSPOOL.187]
  */
-BOOL32 WINAPI GetPrinter32A(HANDLE32 hPrinter, DWORD Level, LPBYTE pPrinter,
+BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
                     DWORD cbBuf, LPDWORD pcbNeeded)
 {
     FIXME(print, "(%d,%ld,%p,%ld,%p): stub\n", hPrinter, Level, pPrinter, 
@@ -724,7 +724,7 @@ BOOL32 WINAPI GetPrinter32A(HANDLE32 hPrinter, DWORD Level, LPBYTE pPrinter,
 /*****************************************************************************
  *          GetPrinter32W  [WINSPOOL.194]
  */
-BOOL32 WINAPI GetPrinter32W(HANDLE32 hPrinter, DWORD Level, LPBYTE pPrinter,
+BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
                     DWORD cbBuf, LPDWORD pcbNeeded)
 {
     FIXME(print, "(%d,%ld,%p,%ld,%p): stub\n", hPrinter, Level, pPrinter,
@@ -735,7 +735,7 @@ BOOL32 WINAPI GetPrinter32W(HANDLE32 hPrinter, DWORD Level, LPBYTE pPrinter,
 /*****************************************************************************
  *          GetPrinterDriver32A  [WINSPOOL.190]
  */
-BOOL32 WINAPI GetPrinterDriver32A(HANDLE32 hPrinter, LPSTR pEnvironment,
+BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment,
                                  DWORD Level, LPBYTE pDriverInfo,
                                  DWORD cbBuf, LPDWORD pcbNeeded)
 {
@@ -747,7 +747,7 @@ BOOL32 WINAPI GetPrinterDriver32A(HANDLE32 hPrinter, LPSTR pEnvironment,
 /*****************************************************************************
  *          GetPrinterDriver32W  [WINSPOOL.193]
  */
-BOOL32 WINAPI GetPrinterDriver32W(HANDLE32 hPrinter, LPWSTR pEnvironment,
+BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment,
                                   DWORD Level, LPBYTE pDriverInfo, 
                                   DWORD cbBuf, LPDWORD pcbNeeded)
 {
@@ -758,7 +758,7 @@ BOOL32 WINAPI GetPrinterDriver32W(HANDLE32 hPrinter, LPWSTR pEnvironment,
 /*****************************************************************************
  *          AddPrinterDriver32A  [WINSPOOL.120]
  */
-BOOL32 WINAPI AddPrinterDriver32A(LPSTR printerName,DWORD level, 
+BOOL WINAPI AddPrinterDriverA(LPSTR printerName,DWORD level, 
 				   LPBYTE pDriverInfo)
 {
     FIXME(print, "(%s,%ld,%p): stub\n",printerName,level,pDriverInfo);
@@ -767,7 +767,7 @@ BOOL32 WINAPI AddPrinterDriver32A(LPSTR printerName,DWORD level,
 /*****************************************************************************
  *          AddPrinterDriver32W  [WINSPOOL.121]
  */
-BOOL32 WINAPI AddPrinterDriver32W(LPWSTR printerName,DWORD level, 
+BOOL WINAPI AddPrinterDriverW(LPWSTR printerName,DWORD level, 
 				   LPBYTE pDriverInfo)
 {
     FIXME(print, "(%s,%ld,%p): stub\n",debugstr_w(printerName),
diff --git a/misc/registry.c b/misc/registry.c
index 1ea4d15185c..3a28e8dd8e0 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -132,7 +132,7 @@ static LPWSTR strdupW(LPCWSTR a) {
 	int	len;
 
     if(a) {
-	len=sizeof(WCHAR)*(lstrlen32W(a)+1);
+	len=sizeof(WCHAR)*(lstrlenW(a)+1);
 	b=(LPWSTR)xmalloc(len);
 	memcpy(b,a,len);
 	return b;
@@ -153,7 +153,7 @@ LPWSTR strcvtA2W(LPCSTR src, int nchars)
  * we need to convert A to W with '\0' in strings (MULTI_SZ) 
  */
 
-static LPWSTR  lmemcpynAtoW( LPWSTR dst, LPCSTR src, INT32 n )
+static LPWSTR  lmemcpynAtoW( LPWSTR dst, LPCSTR src, INT n )
 {	LPWSTR p = dst;
 
 	TRACE(reg,"\"%s\" %i\n",src, n);
@@ -162,7 +162,7 @@ static LPWSTR  lmemcpynAtoW( LPWSTR dst, LPCSTR src, INT32 n )
 
 	return dst;
 }
-static LPSTR lmemcpynWtoA( LPSTR dst, LPCWSTR src, INT32 n )
+static LPSTR lmemcpynWtoA( LPSTR dst, LPCWSTR src, INT n )
 {	LPSTR p = dst;
 
 	TRACE(string,"L\"%s\" %i\n",debugstr_w(src), n);
@@ -188,7 +188,7 @@ static void debug_print_value (LPBYTE lpbData, DWORD type, DWORD len)
 		  LPCWSTR ptr = (LPCWSTR)lpbData;
 		  for (i=0;ptr[0];i++)
 		  { TRACE(reg, " MULTI_SZ(%i=%s)\n", i, debugstr_w(ptr));
-		    ptr += lstrlen32W(ptr)+1;
+		    ptr += lstrlenW(ptr)+1;
 		  }
 		}
 		break;
@@ -219,7 +219,7 @@ static void debug_print_value (LPBYTE lpbData, DWORD type, DWORD len)
  * is_standard_hkey [Internal]
  * Determines if a hkey is a standard key
  */
-static BOOL32 is_standard_hkey( HKEY hkey )
+static BOOL is_standard_hkey( HKEY hkey )
 {
     switch(hkey) {
         case 0x00000000:
@@ -482,7 +482,7 @@ static void REGISTRY_Init(void) {
         /* This was an Open, but since it is called before the real registries
            are loaded, it was changed to a Create - MTB 980507*/
 	RegCreateKey16(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System",&hkey);
-	RegSetValueEx32A(hkey,"Identifier",0,REG_SZ,"SystemType WINE",strlen("SystemType WINE"));
+	RegSetValueExA(hkey,"Identifier",0,REG_SZ,"SystemType WINE",strlen("SystemType WINE"));
 	RegCloseKey(hkey);
 
 	/* \\SOFTWARE\\Microsoft\\Window NT\\CurrentVersion
@@ -647,7 +647,7 @@ static int _savesubreg( FILE *F, LPKEYSTRUCT lpkey, int all )
 /******************************************************************************
  * _savereg [Internal]
  */
-static BOOL32 _savereg( LPKEYSTRUCT lpkey, char *fn, int all )
+static BOOL _savereg( LPKEYSTRUCT lpkey, char *fn, int all )
 {
 	FILE	*F;
 
@@ -689,7 +689,7 @@ void SHELL_SaveRegistry( void )
 		DWORD len,junk,type;
 
 		len=4;
-		if (	(ERROR_SUCCESS!=RegQueryValueEx32A(
+		if (	(ERROR_SUCCESS!=RegQueryValueExA(
 				hkey,
 				VAL_SAVEUPDATED,
 				&junk,
@@ -701,7 +701,7 @@ void SHELL_SaveRegistry( void )
 			strcpy(buf,"yes");
 		RegCloseKey(hkey);
 	}
-	if (lstrcmpi32A(buf,"yes"))
+	if (lstrcmpiA(buf,"yes"))
 		all=1;
 	pwd=getpwuid(getuid());
 	if (pwd!=NULL && pwd->pw_dir!=NULL)
@@ -762,7 +762,7 @@ static LPKEYSTRUCT _find_or_add_key( LPKEYSTRUCT lpkey, LPWSTR keyname )
 	lpxkey	= *lplpkey;
 	while (lpxkey) {
 		if (	(lpxkey->keyname[0]==keyname[0]) && 
-			!lstrcmpi32W(lpxkey->keyname,keyname)
+			!lstrcmpiW(lpxkey->keyname,keyname)
 		)
 			break;
 		lplpkey	= &(lpxkey->next);
@@ -800,7 +800,7 @@ static void _find_or_add_value( LPKEYSTRUCT lpkey, LPWSTR name, DWORD type,
 		} else {
 			if (	val->name!=NULL && 
 				val->name[0]==name[0] &&
-				!lstrcmpi32W(val->name,name)
+				!lstrcmpiW(val->name,name)
 			)
 				break;
 		}
@@ -1010,7 +1010,7 @@ static int _wine_loadsubkey( FILE *F, LPKEYSTRUCT lpkey, int level, char **buf,
 				if (type == REG_SZ || type == REG_EXPAND_SZ) {
 					s=_wine_read_USTRING(s,(LPWSTR*)&data);
 					if (data)
-						len = lstrlen32W((LPWSTR)data)*2+2;
+						len = lstrlenW((LPWSTR)data)*2+2;
 					else	
 						len = 0;
 				} else {
@@ -1431,7 +1431,7 @@ static void _w95_walkrgkn( LPKEYSTRUCT prevkey, char *off,
  */
 static void _w95_loadreg( char* fn, LPKEYSTRUCT lpkey )
 {
-	HFILE32		hfd;
+	HFILE		hfd;
 	char		magic[5];
 	unsigned long	where,version,rgdbsection,end;
 	struct          _w95_info info;
@@ -1439,23 +1439,23 @@ static void _w95_loadreg( char* fn, LPKEYSTRUCT lpkey )
 	BY_HANDLE_FILE_INFORMATION hfdinfo;
 
 	TRACE(reg,"Loading Win95 registry database '%s'\n",fn);
-	hfd=OpenFile32(fn,&ofs,OF_READ);
-	if (hfd==HFILE_ERROR32)
+	hfd=OpenFile(fn,&ofs,OF_READ);
+	if (hfd==HFILE_ERROR)
 		return;
 	magic[4]=0;
-	if (4!=_lread32(hfd,magic,4))
+	if (4!=_lread(hfd,magic,4))
 		return;
 	if (strcmp(magic,"CREG")) {
 		WARN(reg,"%s is not a w95 registry.\n",fn);
 		return;
 	}
-	if (4!=_lread32(hfd,&version,4))
+	if (4!=_lread(hfd,&version,4))
 		return;
-	if (4!=_lread32(hfd,&rgdbsection,4))
+	if (4!=_lread(hfd,&rgdbsection,4))
 		return;
-	if (-1==_llseek32(hfd,0x20,SEEK_SET))
+	if (-1==_llseek(hfd,0x20,SEEK_SET))
 		return;
-	if (4!=_lread32(hfd,magic,4))
+	if (4!=_lread(hfd,magic,4))
 		return;
 	if (strcmp(magic,"RGKN")) {
 		WARN(reg, "second IFF header not RGKN, but %s\n", magic);
@@ -1463,14 +1463,14 @@ static void _w95_loadreg( char* fn, LPKEYSTRUCT lpkey )
 	}
 
 	/* STEP 1: Keylink structures */
-	if (-1==_llseek32(hfd,0x40,SEEK_SET))
+	if (-1==_llseek(hfd,0x40,SEEK_SET))
 		return;
 	where	= 0x40;
 	end	= rgdbsection;
 
 	info.rgknsize = end - where;
 	info.rgknbuffer = (char*)xmalloc(info.rgknsize);
-	if (info.rgknsize != _lread32(hfd,info.rgknbuffer,info.rgknsize))
+	if (info.rgknsize != _lread(hfd,info.rgknbuffer,info.rgknsize))
 		return;
 
 	if (!GetFileInformationByHandle(hfd,&hfdinfo))
@@ -1479,15 +1479,15 @@ static void _w95_loadreg( char* fn, LPKEYSTRUCT lpkey )
 	end = hfdinfo.nFileSizeLow;
 	info.lastmodified = DOSFS_FileTimeToUnixTime(&hfdinfo.ftLastWriteTime,NULL);
 
-	if (-1==_llseek32(hfd,rgdbsection,SEEK_SET))
+	if (-1==_llseek(hfd,rgdbsection,SEEK_SET))
 		return;
 
 	info.rgdbbuffer = (char*)xmalloc(end-rgdbsection);
 	info.rgdbsize = end - rgdbsection;
 
-	if (info.rgdbsize !=_lread32(hfd,info.rgdbbuffer,info.rgdbsize))
+	if (info.rgdbsize !=_lread(hfd,info.rgdbbuffer,info.rgdbsize))
 		return;
-	_lclose32(hfd);
+	_lclose(hfd);
 
 	_w95_walkrgkn(lpkey, NULL, &info);
 
@@ -1604,7 +1604,7 @@ __w31_dumptree(	unsigned short idx,
 			/* all toplevel entries AND the entries in the 
 			 * toplevel subdirectory belong to \SOFTWARE\Classes
 			 */
-			if (!level && !lstrcmp32A(tail,".classes")) {
+			if (!level && !lstrcmpA(tail,".classes")) {
 				__w31_dumptree(dir->child_idx,txt,tab,head,lpkey,lastmodified,level+1);
 				idx=dir->sibling_idx;
 				continue;
@@ -1620,7 +1620,7 @@ __w31_dumptree(	unsigned short idx,
 					memcpy(tail,&txt[val->string_off],val->length);
 					tail[val->length]='\0';
 					value=strdupA2W(tail);
-					_find_or_add_value(xlpkey,NULL,REG_SZ,(LPBYTE)value,lstrlen32W(value)*2+2,lastmodified);
+					_find_or_add_value(xlpkey,NULL,REG_SZ,(LPBYTE)value,lstrlenW(value)*2+2,lastmodified);
 				}
 			}
 		} else {
@@ -1636,7 +1636,7 @@ __w31_dumptree(	unsigned short idx,
  * _w31_loadreg [Internal]
  */
 void _w31_loadreg(void) {
-	HFILE32			hf;
+	HFILE			hf;
 	struct _w31_header	head;
 	struct _w31_tabent	*tab;
 	unsigned char		*txt;
@@ -1648,46 +1648,46 @@ void _w31_loadreg(void) {
 
 	TRACE(reg,"(void)\n");
 
-	hf = OpenFile32("reg.dat",&ofs,OF_READ);
-	if (hf==HFILE_ERROR32)
+	hf = OpenFile("reg.dat",&ofs,OF_READ);
+	if (hf==HFILE_ERROR)
 		return;
 
 	/* read & dump header */
-	if (sizeof(head)!=_lread32(hf,&head,sizeof(head))) {
+	if (sizeof(head)!=_lread(hf,&head,sizeof(head))) {
 		ERR(reg, "reg.dat is too short.\n");
-		_lclose32(hf);
+		_lclose(hf);
 		return;
 	}
 	if (memcmp(head.cookie, "SHCC3.10", sizeof(head.cookie))!=0) {
 		ERR(reg, "reg.dat has bad signature.\n");
-		_lclose32(hf);
+		_lclose(hf);
 		return;
 	}
 
 	len = head.tabcnt * sizeof(struct _w31_tabent);
 	/* read and dump index table */
 	tab = xmalloc(len);
-	if (len!=_lread32(hf,tab,len)) {
+	if (len!=_lread(hf,tab,len)) {
 		ERR(reg,"couldn't read %d bytes.\n",len); 
 		free(tab);
-		_lclose32(hf);
+		_lclose(hf);
 		return;
 	}
 
 	/* read text */
 	txt = xmalloc(head.textsize);
-	if (-1==_llseek32(hf,head.textoff,SEEK_SET)) {
+	if (-1==_llseek(hf,head.textoff,SEEK_SET)) {
 		ERR(reg,"couldn't seek to textblock.\n"); 
 		free(tab);
 		free(txt);
-		_lclose32(hf);
+		_lclose(hf);
 		return;
 	}
-	if (head.textsize!=_lread32(hf,txt,head.textsize)) {
+	if (head.textsize!=_lread(hf,txt,head.textsize)) {
 		ERR(reg,"textblock too short (%d instead of %ld).\n",len,head.textsize); 
 		free(tab);
 		free(txt);
-		_lclose32(hf);
+		_lclose(hf);
 		return;
 	}
 
@@ -1695,7 +1695,7 @@ void _w31_loadreg(void) {
 		ERR(reg,"GetFileInformationByHandle failed?.\n"); 
 		free(tab);
 		free(txt);
-		_lclose32(hf);
+		_lclose(hf);
 		return;
 	}
 	lastmodified = DOSFS_FileTimeToUnixTime(&hfinfo.ftLastWriteTime,NULL);
@@ -1703,7 +1703,7 @@ void _w31_loadreg(void) {
 	__w31_dumptree(tab[0].w1,txt,tab,&head,lpkey,lastmodified,0);
 	free(tab);
 	free(txt);
-	_lclose32(hf);
+	_lclose(hf);
 	return;
 }
 
@@ -1764,7 +1764,7 @@ void SHELL_LoadRegistry( void )
 		char	data[5];
 
 		len=4;
-		if ((	RegQueryValueEx32A(
+		if ((	RegQueryValueExA(
 				hkey,
 				VAL_SAVEUPDATED,
 				&junk,
@@ -1774,7 +1774,7 @@ void SHELL_LoadRegistry( void )
 			)!=ERROR_SUCCESS) ||
 			type != REG_SZ
 		)
-			RegSetValueEx32A(hkey,VAL_SAVEUPDATED,0,REG_SZ,"yes",4);
+			RegSetValueExA(hkey,VAL_SAVEUPDATED,0,REG_SZ,"yes",4);
 		RegCloseKey(hkey);
 	}
 }
@@ -1810,7 +1810,7 @@ void SHELL_LoadRegistry( void )
  *    Success: ERROR_SUCCESS
  *    Failure: Error code
  */
-DWORD WINAPI RegOpenKeyEx32W( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwReserved,
+DWORD WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwReserved,
                               REGSAM samDesired, LPHKEY retkey )
 {
 	LPKEYSTRUCT	lpNextKey,lpxkey;
@@ -1846,7 +1846,7 @@ DWORD WINAPI RegOpenKeyEx32W( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwReserved,
     while (wps[i]) {
         lpxkey=lpNextKey->nextsub;
         while (lpxkey) {
-            if (!lstrcmpi32W(wps[i],lpxkey->keyname)) {
+            if (!lstrcmpiW(wps[i],lpxkey->keyname)) {
                 break;
             }
             lpxkey=lpxkey->next;
@@ -1873,7 +1873,7 @@ DWORD WINAPI RegOpenKeyEx32W( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwReserved,
 /******************************************************************************
  * RegOpenKeyEx32A [ADVAPI32.149]
  */
-DWORD WINAPI RegOpenKeyEx32A( HKEY hkey, LPCSTR lpszSubKey, DWORD dwReserved,
+DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR lpszSubKey, DWORD dwReserved,
                               REGSAM samDesired, LPHKEY retkey )
 {
     LPWSTR lpszSubKeyW = strdupA2W(lpszSubKey);
@@ -1881,7 +1881,7 @@ DWORD WINAPI RegOpenKeyEx32A( HKEY hkey, LPCSTR lpszSubKey, DWORD dwReserved,
 
     TRACE(reg,"(%x,%s,%ld,%lx,%p)\n",hkey,debugstr_a(lpszSubKey),dwReserved,
           samDesired,retkey);
-    ret = RegOpenKeyEx32W( hkey, lpszSubKeyW, dwReserved, samDesired, retkey );
+    ret = RegOpenKeyExW( hkey, lpszSubKeyW, dwReserved, samDesired, retkey );
     free(lpszSubKeyW);
     return ret;
 }
@@ -1899,22 +1899,22 @@ DWORD WINAPI RegOpenKeyEx32A( HKEY hkey, LPCSTR lpszSubKey, DWORD dwReserved,
  *    Success: ERROR_SUCCESS
  *    Failure: Error code
  */
-DWORD WINAPI RegOpenKey32W( HKEY hkey, LPCWSTR lpszSubKey, LPHKEY retkey )
+DWORD WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR lpszSubKey, LPHKEY retkey )
 {
     TRACE(reg,"(%x,%s,%p)\n",hkey,debugstr_w(lpszSubKey),retkey);
-    return RegOpenKeyEx32W( hkey, lpszSubKey, 0, KEY_ALL_ACCESS, retkey );
+    return RegOpenKeyExW( hkey, lpszSubKey, 0, KEY_ALL_ACCESS, retkey );
 }
 
 
 /******************************************************************************
  * RegOpenKey32A [ADVAPI32.148]
  */
-DWORD WINAPI RegOpenKey32A( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
+DWORD WINAPI RegOpenKeyA( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
 {
     DWORD ret;
     LPWSTR lpszSubKeyW = strdupA2W(lpszSubKey);
     TRACE(reg,"(%x,%s,%p)\n",hkey,debugstr_a(lpszSubKey),retkey);
-    ret =  RegOpenKey32W( hkey, lpszSubKeyW, retkey );
+    ret =  RegOpenKeyW( hkey, lpszSubKeyW, retkey );
     free(lpszSubKeyW);
     return ret;
 }
@@ -1926,7 +1926,7 @@ DWORD WINAPI RegOpenKey32A( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
 DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
 {
     TRACE(reg,"(%x,%s,%p)\n",hkey,debugstr_a(lpszSubKey),retkey);
-    return RegOpenKey32A( hkey, lpszSubKey, retkey );
+    return RegOpenKeyA( hkey, lpszSubKey, retkey );
 }
 
 
@@ -1959,7 +1959,7 @@ DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
  *    retkey       [O] Address of buffer for opened handle
  *    lpDispos     [O] Receives REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY
  */
-DWORD WINAPI RegCreateKeyEx32W( HKEY hkey, LPCWSTR lpszSubKey, 
+DWORD WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR lpszSubKey, 
                                 DWORD dwReserved, LPWSTR lpszClass, 
                                 DWORD fdwOptions, REGSAM samDesired,
                                 LPSECURITY_ATTRIBUTES lpSecAttribs, 
@@ -2015,7 +2015,7 @@ DWORD WINAPI RegCreateKeyEx32W( HKEY hkey, LPCWSTR lpszSubKey,
 	while (wps[i]) {
 		lpxkey=lpNextKey->nextsub;
 		while (lpxkey) {
-			if (!lstrcmpi32W(wps[i],lpxkey->keyname))
+			if (!lstrcmpiW(wps[i],lpxkey->keyname))
 				break;
 			lpxkey=lpxkey->next;
 		}
@@ -2086,7 +2086,7 @@ DWORD WINAPI RegCreateKeyEx32W( HKEY hkey, LPCWSTR lpszSubKey,
 /******************************************************************************
  * RegCreateKeyEx32A [ADVAPI32.130]
  */
-DWORD WINAPI RegCreateKeyEx32A( HKEY hkey, LPCSTR lpszSubKey, DWORD dwReserved,
+DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR lpszSubKey, DWORD dwReserved,
                                 LPSTR lpszClass, DWORD fdwOptions, 
                                 REGSAM samDesired, 
                                 LPSECURITY_ATTRIBUTES lpSecAttribs, 
@@ -2102,7 +2102,7 @@ DWORD WINAPI RegCreateKeyEx32A( HKEY hkey, LPCSTR lpszSubKey, DWORD dwReserved,
     lpszSubKeyW = lpszSubKey?strdupA2W(lpszSubKey):NULL;
     lpszClassW = lpszClass?strdupA2W(lpszClass):NULL;
 
-    ret = RegCreateKeyEx32W( hkey, lpszSubKeyW, dwReserved, lpszClassW, 
+    ret = RegCreateKeyExW( hkey, lpszSubKeyW, dwReserved, lpszClassW, 
                              fdwOptions, samDesired, lpSecAttribs, retkey, 
                              lpDispos );
 
@@ -2116,7 +2116,7 @@ DWORD WINAPI RegCreateKeyEx32A( HKEY hkey, LPCSTR lpszSubKey, DWORD dwReserved,
 /******************************************************************************
  * RegCreateKey32W [ADVAPI32.132]
  */
-DWORD WINAPI RegCreateKey32W( HKEY hkey, LPCWSTR lpszSubKey, LPHKEY retkey )
+DWORD WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpszSubKey, LPHKEY retkey )
 {
     DWORD junk;
     LPKEYSTRUCT	lpNextKey;
@@ -2129,7 +2129,7 @@ DWORD WINAPI RegCreateKey32W( HKEY hkey, LPCWSTR lpszSubKey, LPHKEY retkey )
     if (!lpNextKey)
         return ERROR_BADKEY;
 
-    return RegCreateKeyEx32W( hkey, lpszSubKey, 0, NULL, 
+    return RegCreateKeyExW( hkey, lpszSubKey, 0, NULL, 
                               REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL,
                               retkey, &junk);
 }
@@ -2138,14 +2138,14 @@ DWORD WINAPI RegCreateKey32W( HKEY hkey, LPCWSTR lpszSubKey, LPHKEY retkey )
 /******************************************************************************
  * RegCreateKey32A [ADVAPI32.129]
  */
-DWORD WINAPI RegCreateKey32A( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
+DWORD WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
 {
     DWORD ret;
     LPWSTR lpszSubKeyW;
 
     TRACE(reg,"(%x,%s,%p)\n",hkey,debugstr_a(lpszSubKey),retkey);
     lpszSubKeyW = lpszSubKey?strdupA2W(lpszSubKey):NULL;
-    ret = RegCreateKey32W( hkey, lpszSubKeyW, retkey );
+    ret = RegCreateKeyW( hkey, lpszSubKeyW, retkey );
     if(lpszSubKeyW) free(lpszSubKeyW);
     return ret;
 }
@@ -2157,7 +2157,7 @@ DWORD WINAPI RegCreateKey32A( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
 DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
 {
     TRACE(reg,"(%x,%s,%p)\n",hkey,debugstr_a(lpszSubKey),retkey);
-    return RegCreateKey32A( hkey, lpszSubKey, retkey );
+    return RegCreateKeyA( hkey, lpszSubKey, retkey );
 }
 
 
@@ -2193,7 +2193,7 @@ DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
  *    ERROR_MORE_DATA: !!! if the specified buffer is not big enough to hold the data
  * 		       buffer is left untouched. The MS-documentation is wrong (js) !!!
  */
-DWORD WINAPI RegQueryValueEx32W( HKEY hkey, LPWSTR lpValueName,
+DWORD WINAPI RegQueryValueExW( HKEY hkey, LPWSTR lpValueName,
                                  LPDWORD lpdwReserved, LPDWORD lpdwType,
                                  LPBYTE lpbData, LPDWORD lpcbData )
 {
@@ -2225,7 +2225,7 @@ DWORD WINAPI RegQueryValueEx32W( HKEY hkey, LPWSTR lpValueName,
 	else 
 	{ /* Search for the key name */
 	  for (i=0;i<lpkey->nrofvalues;i++)
-	    if ( lpkey->values[i].name && !lstrcmpi32W(lpValueName,lpkey->values[i].name))
+	    if ( lpkey->values[i].name && !lstrcmpiW(lpValueName,lpkey->values[i].name))
 	      break;
 	}
 
@@ -2272,7 +2272,7 @@ DWORD WINAPI RegQueryValueEx32W( HKEY hkey, LPWSTR lpValueName,
 /******************************************************************************
  * RegQueryValue32W [ADVAPI32.159]
  */
-DWORD WINAPI RegQueryValue32W( HKEY hkey, LPCWSTR lpszSubKey, LPWSTR lpszData,
+DWORD WINAPI RegQueryValueW( HKEY hkey, LPCWSTR lpszSubKey, LPWSTR lpszData,
                                LPLONG lpcbData )
 {
 	HKEY	xhkey;
@@ -2283,7 +2283,7 @@ DWORD WINAPI RegQueryValue32W( HKEY hkey, LPCWSTR lpszSubKey, LPWSTR lpszData,
 
     /* Only open subkey, if we really do descend */
     if (lpszSubKey && *lpszSubKey) {
-        ret = RegOpenKey32W( hkey, lpszSubKey, &xhkey );
+        ret = RegOpenKeyW( hkey, lpszSubKey, &xhkey );
         if (ret != ERROR_SUCCESS) {
             WARN(reg, "Could not open %s\n", debugstr_w(lpszSubKey));
             return ret;
@@ -2292,7 +2292,7 @@ DWORD WINAPI RegQueryValue32W( HKEY hkey, LPCWSTR lpszSubKey, LPWSTR lpszData,
         xhkey = hkey;
 
     lpdwType = REG_SZ;
-    ret = RegQueryValueEx32W( xhkey, NULL, NULL, &lpdwType, (LPBYTE)lpszData,
+    ret = RegQueryValueExW( xhkey, NULL, NULL, &lpdwType, (LPBYTE)lpszData,
                               lpcbData );
     if (xhkey != hkey)
         RegCloseKey(xhkey);
@@ -2308,7 +2308,7 @@ DWORD WINAPI RegQueryValue32W( HKEY hkey, LPCWSTR lpszSubKey, LPWSTR lpszData,
  *
  * FIXME: check returnvalue (len) for an empty key
  */
-DWORD WINAPI RegQueryValueEx32A( HKEY hkey, LPSTR lpszValueName,
+DWORD WINAPI RegQueryValueExA( HKEY hkey, LPSTR lpszValueName,
                                  LPDWORD lpdwReserved, LPDWORD lpdwType,
                                  LPBYTE lpbData, LPDWORD lpcbData )
 {
@@ -2326,7 +2326,7 @@ DWORD WINAPI RegQueryValueEx32A( HKEY hkey, LPSTR lpszValueName,
 	lpszValueNameW = lpszValueName ? strdupA2W(lpszValueName) : NULL;	
 	
 	/* get just the type first */
-	ret = RegQueryValueEx32W( hkey, lpszValueNameW, lpdwReserved, &mytype, NULL, NULL );
+	ret = RegQueryValueExW( hkey, lpszValueNameW, lpdwReserved, &mytype, NULL, NULL );
 	
 	if ( ret != ERROR_SUCCESS )			/* failed ?? */
 	{ if(lpszValueNameW) free(lpszValueNameW);
@@ -2340,7 +2340,7 @@ DWORD WINAPI RegQueryValueEx32A( HKEY hkey, LPSTR lpszValueName,
 	      mybuf = (LPBYTE)xmalloc( mylen );
 	    }
 
-	    ret = RegQueryValueEx32W( hkey, lpszValueNameW, lpdwReserved, lpdwType, mybuf, &mylen );
+	    ret = RegQueryValueExW( hkey, lpszValueNameW, lpdwReserved, lpdwType, mybuf, &mylen );
 
 	    if (ret == ERROR_SUCCESS )
 	    { if ( lpbData )
@@ -2351,7 +2351,7 @@ DWORD WINAPI RegQueryValueEx32A( HKEY hkey, LPSTR lpszValueName,
 	    *lpcbData = mylen/2;			/* size is in byte! */
 	  }
 	  else						/* no strings, call it straight */
-	  { ret = RegQueryValueEx32W( hkey, lpszValueNameW, lpdwReserved, lpdwType, lpbData, lpcbData );
+	  { ret = RegQueryValueExW( hkey, lpszValueNameW, lpdwReserved, lpdwType, lpbData, lpcbData );
 	  }
 	}
 	
@@ -2376,7 +2376,7 @@ DWORD WINAPI RegQueryValueEx16( HKEY hkey, LPSTR lpszValueName,
 {
     TRACE(reg,"(%x,%s,%p,%p,%p,%ld)\n",hkey,debugstr_a(lpszValueName),
           lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0);
-    return RegQueryValueEx32A( hkey, lpszValueName, lpdwReserved, lpdwType,
+    return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType,
                                lpbData, lpcbData );
 }
 
@@ -2384,7 +2384,7 @@ DWORD WINAPI RegQueryValueEx16( HKEY hkey, LPSTR lpszValueName,
 /******************************************************************************
  * RegQueryValue32A [ADVAPI32.156]
  */
-DWORD WINAPI RegQueryValue32A( HKEY hkey, LPCSTR lpszSubKey, LPSTR lpszData,
+DWORD WINAPI RegQueryValueA( HKEY hkey, LPCSTR lpszSubKey, LPSTR lpszData,
                                LPLONG lpcbData )
 {
     HKEY xhkey;
@@ -2401,7 +2401,7 @@ DWORD WINAPI RegQueryValue32A( HKEY hkey, LPCSTR lpszSubKey, LPSTR lpszData,
         xhkey = hkey;
 
     dwType = REG_SZ;
-    ret = RegQueryValueEx32A( xhkey, NULL,NULL, &dwType, (LPBYTE)lpszData,
+    ret = RegQueryValueExA( xhkey, NULL,NULL, &dwType, (LPBYTE)lpszData,
                               lpcbData );
     if( xhkey != hkey )
         RegCloseKey( xhkey );
@@ -2428,7 +2428,7 @@ DWORD WINAPI RegQueryValue16( HKEY hkey, LPSTR lpszSubKey, LPSTR lpszData,
 
     if (lpcbData)
         *lpcbData &= 0xFFFF;
-    return RegQueryValue32A(hkey,lpszSubKey,lpszData,lpcbData);
+    return RegQueryValueA(hkey,lpszSubKey,lpszData,lpcbData);
 }
 
 
@@ -2460,7 +2460,7 @@ DWORD WINAPI RegQueryValue16( HKEY hkey, LPSTR lpszSubKey, LPSTR lpszData,
  * NOTES
  *   win95 does not care about cbData for REG_SZ and finds out the len by itself (js) 
  */
-DWORD WINAPI RegSetValueEx32W( HKEY hkey, LPWSTR lpszValueName, 
+DWORD WINAPI RegSetValueExW( HKEY hkey, LPWSTR lpszValueName, 
                                DWORD dwReserved, DWORD dwType, LPBYTE lpbData,
                                DWORD cbData)
 {
@@ -2487,7 +2487,7 @@ DWORD WINAPI RegSetValueEx32W( HKEY hkey, LPWSTR lpszValueName,
 	} else {
 		for (i=0;i<lpkey->nrofvalues;i++)
 			if (	lpkey->values[i].name &&
-				!lstrcmpi32W(lpszValueName,lpkey->values[i].name)
+				!lstrcmpiW(lpszValueName,lpkey->values[i].name)
 			)
 				break;
 	}
@@ -2507,7 +2507,7 @@ DWORD WINAPI RegSetValueEx32W( HKEY hkey, LPWSTR lpszValueName,
 	}
 
 	if (dwType == REG_SZ)
-	  cbData = 2 * (lstrlen32W ((LPCWSTR)lpbData) + 1);
+	  cbData = 2 * (lstrlenW ((LPCWSTR)lpbData) + 1);
 	  
 	lpkey->values[i].len	= cbData;
 	lpkey->values[i].type	= dwType;
@@ -2526,7 +2526,7 @@ DWORD WINAPI RegSetValueEx32W( HKEY hkey, LPWSTR lpszValueName,
  * NOTES
  *   win95 does not care about cbData for REG_SZ and finds out the len by itself (js) 
  */
-DWORD WINAPI RegSetValueEx32A( HKEY hkey, LPSTR lpszValueName,
+DWORD WINAPI RegSetValueExA( HKEY hkey, LPSTR lpszValueName,
                                DWORD dwReserved, DWORD dwType, LPBYTE lpbData,
                                DWORD cbData )
 {
@@ -2556,7 +2556,7 @@ DWORD WINAPI RegSetValueEx32A( HKEY hkey, LPSTR lpszValueName,
 	else
 	  lpszValueNameW = NULL;
 
-	ret=RegSetValueEx32W(hkey,lpszValueNameW,dwReserved,dwType,buf,cbData);
+	ret=RegSetValueExW(hkey,lpszValueNameW,dwReserved,dwType,buf,cbData);
 
 	if (lpszValueNameW)
 	  free(lpszValueNameW);
@@ -2576,7 +2576,7 @@ DWORD WINAPI RegSetValueEx16( HKEY hkey, LPSTR lpszValueName, DWORD dwReserved,
 {
     TRACE(reg,"(%x,%s,%ld,%ld,%p,%ld)\n",hkey,debugstr_a(lpszValueName),
           dwReserved,dwType,lpbData,cbData);
-    return RegSetValueEx32A( hkey, lpszValueName, dwReserved, dwType, lpbData,
+    return RegSetValueExA( hkey, lpszValueName, dwReserved, dwType, lpbData,
                              cbData );
 }
 
@@ -2584,7 +2584,7 @@ DWORD WINAPI RegSetValueEx16( HKEY hkey, LPSTR lpszValueName, DWORD dwReserved,
 /******************************************************************************
  * RegSetValue32W	[ADVAPI32.171]
  */
-DWORD WINAPI RegSetValue32W( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwType,
+DWORD WINAPI RegSetValueW( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwType,
                              LPCWSTR lpszData, DWORD cbData )
 {
 	HKEY	xhkey;
@@ -2594,7 +2594,7 @@ DWORD WINAPI RegSetValue32W( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwType,
 		hkey,debugstr_w(lpszSubKey),dwType,debugstr_w(lpszData),cbData
 	);
 	if (lpszSubKey && *lpszSubKey) {
-		ret=RegCreateKey32W(hkey,lpszSubKey,&xhkey);
+		ret=RegCreateKeyW(hkey,lpszSubKey,&xhkey);
 		if (ret!=ERROR_SUCCESS)
 			return ret;
 	} else
@@ -2603,13 +2603,13 @@ DWORD WINAPI RegSetValue32W( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwType,
 		TRACE(reg,"dwType=%ld - Changing to REG_SZ\n",dwType);
 		dwType=REG_SZ;
 	}
-	if (cbData!=2*lstrlen32W(lpszData)+2) {
+	if (cbData!=2*lstrlenW(lpszData)+2) {
 		TRACE(reg,"Len=%ld != strlen(%s)+1=%d!\n",
-			cbData,debugstr_w(lpszData),2*lstrlen32W(lpszData)+2
+			cbData,debugstr_w(lpszData),2*lstrlenW(lpszData)+2
 		);
-		cbData=2*lstrlen32W(lpszData)+2;
+		cbData=2*lstrlenW(lpszData)+2;
 	}
-	ret=RegSetValueEx32W(xhkey,NULL,0,dwType,(LPBYTE)lpszData,cbData);
+	ret=RegSetValueExW(xhkey,NULL,0,dwType,(LPBYTE)lpszData,cbData);
 	if (hkey!=xhkey)
 		RegCloseKey(xhkey);
 	return ret;
@@ -2620,7 +2620,7 @@ DWORD WINAPI RegSetValue32W( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwType,
  * RegSetValue32A [ADVAPI32.168]
  *
  */
-DWORD WINAPI RegSetValue32A( HKEY hkey, LPCSTR lpszSubKey, DWORD dwType,
+DWORD WINAPI RegSetValueA( HKEY hkey, LPCSTR lpszSubKey, DWORD dwType,
                              LPCSTR lpszData, DWORD cbData )
 {
 	DWORD	ret;
@@ -2640,7 +2640,7 @@ DWORD WINAPI RegSetValue32A( HKEY hkey, LPCSTR lpszSubKey, DWORD dwType,
 	}
 	if (cbData!=strlen(lpszData)+1)
 		cbData=strlen(lpszData)+1;
-	ret=RegSetValueEx32A(xhkey,NULL,0,dwType,(LPBYTE)lpszData,cbData);
+	ret=RegSetValueExA(xhkey,NULL,0,dwType,(LPBYTE)lpszData,cbData);
 	if (xhkey!=hkey)
 		RegCloseKey(xhkey);
 	return ret;
@@ -2655,7 +2655,7 @@ DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR lpszSubKey, DWORD	dwType,
 {
     TRACE(reg,"(%x,%s,%ld,%s,%ld)\n",hkey,debugstr_a(lpszSubKey),dwType,
           debugstr_a(lpszData),cbData);
-    return RegSetValue32A(hkey,lpszSubKey,dwType,lpszData,cbData);
+    return RegSetValueA(hkey,lpszSubKey,dwType,lpszData,cbData);
 }
 
 
@@ -2681,7 +2681,7 @@ DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR lpszSubKey, DWORD	dwType,
  *    lpcchClass   [O] Size of class buffer
  *    ft           [O] Time key last written to
  */
-DWORD WINAPI RegEnumKeyEx32W( HKEY hkey, DWORD iSubkey, LPWSTR lpszName,
+DWORD WINAPI RegEnumKeyExW( HKEY hkey, DWORD iSubkey, LPWSTR lpszName,
                               LPDWORD lpcchName, LPDWORD lpdwReserved,
                               LPWSTR lpszClass, LPDWORD lpcchClass, 
                               FILETIME *ft )
@@ -2707,12 +2707,12 @@ DWORD WINAPI RegEnumKeyEx32W( HKEY hkey, DWORD iSubkey, LPWSTR lpszName,
 
 	if (iSubkey || !lpxkey)
 		return ERROR_NO_MORE_ITEMS;
-	if (lstrlen32W(lpxkey->keyname)+1>*lpcchName)
+	if (lstrlenW(lpxkey->keyname)+1>*lpcchName)
 		return ERROR_MORE_DATA;
-	memcpy(lpszName,lpxkey->keyname,lstrlen32W(lpxkey->keyname)*2+2);
+	memcpy(lpszName,lpxkey->keyname,lstrlenW(lpxkey->keyname)*2+2);
 
         if (*lpcchName)
-            *lpcchName = lstrlen32W(lpszName);
+            *lpcchName = lstrlenW(lpszName);
 
 	if (lpszClass) {
 		/* FIXME: what should we write into it? */
@@ -2726,20 +2726,20 @@ DWORD WINAPI RegEnumKeyEx32W( HKEY hkey, DWORD iSubkey, LPWSTR lpszName,
 /******************************************************************************
  * RegEnumKey32W [ADVAPI32.140]
  */
-DWORD WINAPI RegEnumKey32W( HKEY hkey, DWORD iSubkey, LPWSTR lpszName, 
+DWORD WINAPI RegEnumKeyW( HKEY hkey, DWORD iSubkey, LPWSTR lpszName, 
                             DWORD lpcchName )
 {
     FILETIME	ft;
 
     TRACE(reg,"(%x,%ld,%p,%ld)\n",hkey,iSubkey,lpszName,lpcchName);
-    return RegEnumKeyEx32W(hkey,iSubkey,lpszName,&lpcchName,NULL,NULL,NULL,&ft);
+    return RegEnumKeyExW(hkey,iSubkey,lpszName,&lpcchName,NULL,NULL,NULL,&ft);
 }
 
 
 /******************************************************************************
  * RegEnumKeyEx32A [ADVAPI32.138]
  */
-DWORD WINAPI RegEnumKeyEx32A( HKEY hkey, DWORD iSubkey, LPSTR lpszName,
+DWORD WINAPI RegEnumKeyExA( HKEY hkey, DWORD iSubkey, LPSTR lpszName,
                               LPDWORD lpcchName, LPDWORD lpdwReserved, 
                               LPSTR lpszClass, LPDWORD lpcchClass, 
                               FILETIME *ft )
@@ -2765,7 +2765,7 @@ DWORD WINAPI RegEnumKeyEx32A( HKEY hkey, DWORD iSubkey, LPSTR lpszName,
 		lpszClassW	=0;
 		lpcchClassW=0;
 	}
-	ret=RegEnumKeyEx32W(
+	ret=RegEnumKeyExW(
 		hkey,
 		iSubkey,
 		lpszNameW,
@@ -2794,13 +2794,13 @@ DWORD WINAPI RegEnumKeyEx32A( HKEY hkey, DWORD iSubkey, LPSTR lpszName,
 /******************************************************************************
  * RegEnumKey32A [ADVAPI32.137]
  */
-DWORD WINAPI RegEnumKey32A( HKEY hkey, DWORD iSubkey, LPSTR lpszName,
+DWORD WINAPI RegEnumKeyA( HKEY hkey, DWORD iSubkey, LPSTR lpszName,
                             DWORD lpcchName )
 {
     FILETIME	ft;
 
     TRACE(reg,"(%x,%ld,%p,%ld)\n",hkey,iSubkey,lpszName,lpcchName);
-    return RegEnumKeyEx32A( hkey, iSubkey, lpszName, &lpcchName, NULL, NULL, 
+    return RegEnumKeyExA( hkey, iSubkey, lpszName, &lpcchName, NULL, NULL, 
                             NULL, &ft );
 }
 
@@ -2812,7 +2812,7 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD iSubkey, LPSTR lpszName,
                            DWORD lpcchName )
 {
     TRACE(reg,"(%x,%ld,%p,%ld)\n",hkey,iSubkey,lpszName,lpcchName);
-    return RegEnumKey32A( hkey, iSubkey, lpszName, lpcchName);
+    return RegEnumKeyA( hkey, iSubkey, lpszName, lpcchName);
 }
 
 
@@ -2840,7 +2840,7 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD iSubkey, LPSTR lpszName,
  * Note:  wide character functions that take and/or return "character counts"
  *  use TCHAR (that is unsigned short or char) not byte counts.
  */
-DWORD WINAPI RegEnumValue32W( HKEY hkey, DWORD iValue, LPWSTR lpszValue,
+DWORD WINAPI RegEnumValueW( HKEY hkey, DWORD iValue, LPWSTR lpszValue,
                               LPDWORD lpcchValue, LPDWORD lpdReserved,
                               LPDWORD lpdwType, LPBYTE lpbData, 
                               LPDWORD lpcbData )
@@ -2865,12 +2865,12 @@ DWORD WINAPI RegEnumValue32W( HKEY hkey, DWORD iValue, LPWSTR lpszValue,
 	val = &(lpkey->values[iValue]);
 
 	if (val->name) {
-	        if (lstrlen32W(val->name)+1>*lpcchValue) {
-			*lpcchValue = lstrlen32W(val->name)+1;
+	        if (lstrlenW(val->name)+1>*lpcchValue) {
+			*lpcchValue = lstrlenW(val->name)+1;
 			return ERROR_MORE_DATA;
 		}
-		memcpy(lpszValue,val->name,2 * (lstrlen32W(val->name)+1) );
-		*lpcchValue=lstrlen32W(val->name);
+		memcpy(lpszValue,val->name,2 * (lstrlenW(val->name)+1) );
+		*lpcchValue=lstrlenW(val->name);
 	} else {
 		*lpszValue	= 0;
 		*lpcchValue	= 0;
@@ -2895,7 +2895,7 @@ DWORD WINAPI RegEnumValue32W( HKEY hkey, DWORD iValue, LPWSTR lpszValue,
 /******************************************************************************
  * RegEnumValue32A [ADVAPI32.141]
  */
-DWORD WINAPI RegEnumValue32A( HKEY hkey, DWORD iValue, LPSTR lpszValue,
+DWORD WINAPI RegEnumValueA( HKEY hkey, DWORD iValue, LPSTR lpszValue,
                               LPDWORD lpcchValue, LPDWORD lpdReserved,
                               LPDWORD lpdwType, LPBYTE lpbData, 
                               LPDWORD lpcbData )
@@ -2915,7 +2915,7 @@ DWORD WINAPI RegEnumValue32A( HKEY hkey, DWORD iValue, LPSTR lpszValue,
 	} else
 		lpbDataW = NULL;
 
-	ret = RegEnumValue32W( hkey, iValue, lpszValueW, lpcchValue, 
+	ret = RegEnumValueW( hkey, iValue, lpszValueW, lpcchValue, 
 				lpdReserved, &dwType, lpbDataW, &lpcbDataW );
 
 	if (lpdwType)
@@ -2951,7 +2951,7 @@ DWORD WINAPI RegEnumValue16( HKEY hkey, DWORD iValue, LPSTR lpszValue,
 {
     TRACE(reg,"(%x,%ld,%p,%p,%p,%p,%p,%p)\n",hkey,iValue,lpszValue,lpcchValue,
           lpdReserved,lpdwType,lpbData,lpcbData);
-    return RegEnumValue32A( hkey, iValue, lpszValue, lpcchValue, lpdReserved, 
+    return RegEnumValueA( hkey, iValue, lpszValue, lpcchValue, lpdReserved, 
                             lpdwType, lpbData, lpcbData );
 }
 
@@ -2999,7 +2999,7 @@ DWORD WINAPI RegCloseKey( HKEY hkey )
  *    Success: ERROR_SUCCESS
  *    Failure: Error code
  */
-DWORD WINAPI RegDeleteKey32W( HKEY hkey, LPWSTR lpszSubKey )
+DWORD WINAPI RegDeleteKeyW( HKEY hkey, LPWSTR lpszSubKey )
 {
 	LPKEYSTRUCT	*lplpPrevKey,lpNextKey,lpxkey;
 	LPWSTR		*wps;
@@ -3024,7 +3024,7 @@ DWORD WINAPI RegDeleteKey32W( HKEY hkey, LPWSTR lpszSubKey )
 		while (lpxkey) {
 			TRACE(reg, "  Scanning [%s]\n",
 				     debugstr_w(lpxkey->keyname));
-			if (!lstrcmpi32W(wps[i],lpxkey->keyname))
+			if (!lstrcmpiW(wps[i],lpxkey->keyname))
 				break;
 			lpxkey=lpxkey->next;
 		}
@@ -3042,7 +3042,7 @@ DWORD WINAPI RegDeleteKey32W( HKEY hkey, LPWSTR lpszSubKey )
 	while (lpxkey) {
 		TRACE(reg, "  Scanning [%s]\n",
 			     debugstr_w(lpxkey->keyname));
-		if (!lstrcmpi32W(wps[i],lpxkey->keyname))
+		if (!lstrcmpiW(wps[i],lpxkey->keyname))
 			break;
 		lplpPrevKey	= &(lpxkey->next);
 		lpxkey		= lpxkey->next;
@@ -3075,14 +3075,14 @@ DWORD WINAPI RegDeleteKey32W( HKEY hkey, LPWSTR lpszSubKey )
 /******************************************************************************
  * RegDeleteKey32A [ADVAPI32.133]
  */
-DWORD WINAPI RegDeleteKey32A( HKEY hkey, LPCSTR lpszSubKey )
+DWORD WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR lpszSubKey )
 {
     LPWSTR lpszSubKeyW;
     DWORD  ret;
 
     TRACE(reg,"(%x,%s)\n",hkey,debugstr_a(lpszSubKey));
     lpszSubKeyW = lpszSubKey?strdupA2W(lpszSubKey):NULL;
-    ret = RegDeleteKey32W( hkey, lpszSubKeyW );
+    ret = RegDeleteKeyW( hkey, lpszSubKeyW );
     if(lpszSubKeyW) free(lpszSubKeyW);
     return ret;
 }
@@ -3094,7 +3094,7 @@ DWORD WINAPI RegDeleteKey32A( HKEY hkey, LPCSTR lpszSubKey )
 DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR lpszSubKey )
 {
     TRACE(reg,"(%x,%s)\n",hkey,debugstr_a(lpszSubKey));
-    return RegDeleteKey32A( hkey, lpszSubKey );
+    return RegDeleteKeyA( hkey, lpszSubKey );
 }
 
 
@@ -3115,7 +3115,7 @@ DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR lpszSubKey )
  *
  * RETURNS
  */
-DWORD WINAPI RegDeleteValue32W( HKEY hkey, LPWSTR lpszValue )
+DWORD WINAPI RegDeleteValueW( HKEY hkey, LPWSTR lpszValue )
 {
 	DWORD		i;
 	LPKEYSTRUCT	lpkey;
@@ -3130,7 +3130,7 @@ DWORD WINAPI RegDeleteValue32W( HKEY hkey, LPWSTR lpszValue )
 	if (lpszValue) {
 		for (i=0;i<lpkey->nrofvalues;i++)
 			if (	lpkey->values[i].name &&
-				!lstrcmpi32W(lpkey->values[i].name,lpszValue)
+				!lstrcmpiW(lpkey->values[i].name,lpszValue)
 			)
 				break;
 	} else {
@@ -3162,14 +3162,14 @@ DWORD WINAPI RegDeleteValue32W( HKEY hkey, LPWSTR lpszValue )
 /******************************************************************************
  * RegDeleteValue32A [ADVAPI32.135]
  */
-DWORD WINAPI RegDeleteValue32A( HKEY hkey, LPSTR lpszValue )
+DWORD WINAPI RegDeleteValueA( HKEY hkey, LPSTR lpszValue )
 {
     LPWSTR lpszValueW;
     DWORD  ret;
 
     TRACE(reg, "(%x,%s)\n",hkey,debugstr_a(lpszValue));
     lpszValueW = lpszValue?strdupA2W(lpszValue):NULL;
-    ret = RegDeleteValue32W( hkey, lpszValueW );
+    ret = RegDeleteValueW( hkey, lpszValueW );
     if(lpszValueW) free(lpszValueW);
     return ret;
 }
@@ -3181,7 +3181,7 @@ DWORD WINAPI RegDeleteValue32A( HKEY hkey, LPSTR lpszValue )
 DWORD WINAPI RegDeleteValue16( HKEY hkey, LPSTR lpszValue )
 {
     TRACE(reg,"(%x,%s)\n", hkey,debugstr_a(lpszValue));
-    return RegDeleteValue32A( hkey, lpszValue );
+    return RegDeleteValueA( hkey, lpszValue );
 }
 
 
@@ -3199,7 +3199,7 @@ DWORD WINAPI RegDeleteValue16( HKEY hkey, LPSTR lpszValue )
 DWORD WINAPI RegFlushKey( HKEY hkey )
 {
     LPKEYSTRUCT	lpkey;
-    BOOL32 ret;
+    BOOL ret;
 
     TRACE(reg, "(%x)\n", hkey);
 
@@ -3243,7 +3243,7 @@ DWORD WINAPI RegFlushKey( HKEY hkey )
  * - both allow lpszClass to be NULL and lpcchClass to be NULL 
  * (it's hard to test validity, so test !NULL instead)
  */
-DWORD WINAPI RegQueryInfoKey32W( HKEY hkey, LPWSTR lpszClass, 
+DWORD WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR lpszClass, 
                                  LPDWORD lpcchClass, LPDWORD lpdwReserved,
                                  LPDWORD lpcSubKeys, LPDWORD lpcchMaxSubkey,
                                  LPDWORD lpcchMaxClass, LPDWORD lpcValues,
@@ -3266,7 +3266,7 @@ DWORD WINAPI RegQueryInfoKey32W( HKEY hkey, LPWSTR lpszClass,
 		/* either lpcchClass is valid or this is win95 and lpcchClass
 		   could be invalid */
 		if (lpkey->class) {
-		        DWORD classLen = lstrlen32W(lpkey->class);
+		        DWORD classLen = lstrlenW(lpkey->class);
 
 			if (lpcchClass && classLen+1>*lpcchClass) {
 				*lpcchClass=classLen+1;
@@ -3282,23 +3282,23 @@ DWORD WINAPI RegQueryInfoKey32W( HKEY hkey, LPWSTR lpszClass,
 		}
 	} else {
 		if (lpcchClass)
-			*lpcchClass	= lstrlen32W(lpkey->class);
+			*lpcchClass	= lstrlenW(lpkey->class);
 	}
 	lpxkey=lpkey->nextsub;
 	nrofkeys=maxsubkey=maxclass=maxvname=maxvdata=0;
 	while (lpxkey) {
 		nrofkeys++;
-		if (lstrlen32W(lpxkey->keyname)>maxsubkey)
-			maxsubkey=lstrlen32W(lpxkey->keyname);
-		if (lpxkey->class && lstrlen32W(lpxkey->class)>maxclass)
-			maxclass=lstrlen32W(lpxkey->class);
+		if (lstrlenW(lpxkey->keyname)>maxsubkey)
+			maxsubkey=lstrlenW(lpxkey->keyname);
+		if (lpxkey->class && lstrlenW(lpxkey->class)>maxclass)
+			maxclass=lstrlenW(lpxkey->class);
 		lpxkey=lpxkey->next;
 	}
 	for (i=0;i<lpkey->nrofvalues;i++) {
 		LPKEYVALUE	val=lpkey->values+i;
 
-		if (val->name && lstrlen32W(val->name)>maxvname)
-			maxvname=lstrlen32W(val->name);
+		if (val->name && lstrlenW(val->name)>maxvname)
+			maxvname=lstrlenW(val->name);
 		if (val->len>maxvdata)
 			maxvdata=val->len;
 	}
@@ -3323,7 +3323,7 @@ DWORD WINAPI RegQueryInfoKey32W( HKEY hkey, LPWSTR lpszClass,
 /******************************************************************************
  * RegQueryInfoKey32A [ADVAPI32.152]
  */
-DWORD WINAPI RegQueryInfoKey32A( HKEY hkey, LPSTR lpszClass, LPDWORD lpcchClass,
+DWORD WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR lpszClass, LPDWORD lpcchClass,
                                  LPDWORD lpdwReserved, LPDWORD lpcSubKeys,
                                  LPDWORD lpcchMaxSubkey, LPDWORD lpcchMaxClass,
                                  LPDWORD lpcValues, LPDWORD lpcchMaxValueName,
@@ -3346,7 +3346,7 @@ DWORD WINAPI RegQueryInfoKey32A( HKEY hkey, LPSTR lpszClass, LPDWORD lpcchClass,
 
 	} else
 		lpszClassW  = NULL;
-	ret=RegQueryInfoKey32W(
+	ret=RegQueryInfoKeyW(
 		hkey,
 		lpszClassW,
 		lpcchClass,
@@ -3376,7 +3376,7 @@ DWORD WINAPI RegQueryInfoKey32A( HKEY hkey, LPSTR lpszClass, LPDWORD lpcchClass,
  *    hHey          [I] Predefined registry handle
  *    phkResult     [I] Address of buffer for remote registry handle
  */
-LONG WINAPI RegConnectRegistry32W( LPCWSTR lpMachineName, HKEY hKey, 
+LONG WINAPI RegConnectRegistryW( LPCWSTR lpMachineName, HKEY hKey, 
                                    LPHKEY phkResult )
 {
     TRACE(reg,"(%s,%x,%p): stub\n",debugstr_w(lpMachineName),hKey,phkResult);
@@ -3394,11 +3394,11 @@ LONG WINAPI RegConnectRegistry32W( LPCWSTR lpMachineName, HKEY hKey,
 /******************************************************************************
  * RegConnectRegistry32A [ADVAPI32.127]
  */
-LONG WINAPI RegConnectRegistry32A( LPCSTR machine, HKEY hkey, LPHKEY reskey )
+LONG WINAPI RegConnectRegistryA( LPCSTR machine, HKEY hkey, LPHKEY reskey )
 {
     DWORD ret;
     LPWSTR machineW = strdupA2W(machine);
-    ret = RegConnectRegistry32W( machineW, hkey, reskey );
+    ret = RegConnectRegistryW( machineW, hkey, reskey );
     free(machineW);
     return ret;
 }
@@ -3452,7 +3452,7 @@ LONG WINAPI RegGetKeySecurity( HKEY hkey,
  *    lpszSubKey [I] Address of name of subkey
  *    lpszFile   [I] Address of filename for registry information
  */
-LONG WINAPI RegLoadKey32W( HKEY hkey, LPCWSTR lpszSubKey, LPCWSTR lpszFile )
+LONG WINAPI RegLoadKeyW( HKEY hkey, LPCWSTR lpszSubKey, LPCWSTR lpszFile )
 {
     LPKEYSTRUCT	lpkey;
     TRACE(reg,"(%x,%s,%s)\n",hkey,debugstr_w(lpszSubKey),debugstr_w(lpszFile));
@@ -3475,12 +3475,12 @@ LONG WINAPI RegLoadKey32W( HKEY hkey, LPCWSTR lpszSubKey, LPCWSTR lpszFile )
 /******************************************************************************
  * RegLoadKey32A [ADVAPI32.???]
  */
-LONG WINAPI RegLoadKey32A( HKEY hkey, LPCSTR lpszSubKey, LPCSTR lpszFile )
+LONG WINAPI RegLoadKeyA( HKEY hkey, LPCSTR lpszSubKey, LPCSTR lpszFile )
 {
     LONG ret;
     LPWSTR lpszSubKeyW = strdupA2W(lpszSubKey);
     LPWSTR lpszFileW = strdupA2W(lpszFile);
-    ret = RegLoadKey32W( hkey, lpszSubKeyW, lpszFileW );
+    ret = RegLoadKeyW( hkey, lpszSubKeyW, lpszFileW );
     if(lpszFileW) free(lpszFileW);
     if(lpszSubKeyW) free(lpszSubKeyW);
     return ret;
@@ -3497,9 +3497,9 @@ LONG WINAPI RegLoadKey32A( HKEY hkey, LPCSTR lpszSubKey, LPCSTR lpszFile )
  *    hEvent          [I] Handle of signaled event
  *    fAsync          [I] Flag for asynchronous reporting
  */
-LONG WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL32 fWatchSubTree, 
-                                     DWORD fdwNotifyFilter, HANDLE32 hEvent,
-                                     BOOL32 fAsync )
+LONG WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree, 
+                                     DWORD fdwNotifyFilter, HANDLE hEvent,
+                                     BOOL fAsync )
 {
     LPKEYSTRUCT	lpkey;
     TRACE(reg,"(%x,%i,%ld,%x,%i)\n",hkey,fWatchSubTree,fdwNotifyFilter,
@@ -3523,7 +3523,7 @@ LONG WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL32 fWatchSubTree,
  *    hkey     [I] Handle of open key
  *    lpSubKey [I] Address of name of subkey to unload
  */
-LONG WINAPI RegUnLoadKey32W( HKEY hkey, LPCWSTR lpSubKey )
+LONG WINAPI RegUnLoadKeyW( HKEY hkey, LPCWSTR lpSubKey )
 {
     FIXME(reg,"(%x,%s): stub\n",hkey, debugstr_w(lpSubKey));
     return ERROR_SUCCESS;
@@ -3533,11 +3533,11 @@ LONG WINAPI RegUnLoadKey32W( HKEY hkey, LPCWSTR lpSubKey )
 /******************************************************************************
  * RegUnLoadKey32A [ADVAPI32.172]
  */
-LONG WINAPI RegUnLoadKey32A( HKEY hkey, LPCSTR lpSubKey )
+LONG WINAPI RegUnLoadKeyA( HKEY hkey, LPCSTR lpSubKey )
 {
     LONG ret;
     LPWSTR lpSubKeyW = strdupA2W(lpSubKey);
-    ret = RegUnLoadKey32W( hkey, lpSubKeyW );
+    ret = RegUnLoadKeyW( hkey, lpSubKeyW );
     if(lpSubKeyW) free(lpSubKeyW);
     return ret;
 }
@@ -3588,7 +3588,7 @@ LONG WINAPI RegSetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInfo,
  *    lpFile [I] Address of filename to save to
  *    sa     [I] Address of security structure
  */
-LONG WINAPI RegSaveKey32W( HKEY hkey, LPCWSTR lpFile, 
+LONG WINAPI RegSaveKeyW( HKEY hkey, LPCWSTR lpFile, 
                            LPSECURITY_ATTRIBUTES sa )
 {
     LPKEYSTRUCT	lpkey;
@@ -3612,12 +3612,12 @@ LONG WINAPI RegSaveKey32W( HKEY hkey, LPCWSTR lpFile,
 /******************************************************************************
  * RegSaveKey32A [ADVAPI32.165]
  */
-LONG WINAPI RegSaveKey32A( HKEY hkey, LPCSTR lpFile, 
+LONG WINAPI RegSaveKeyA( HKEY hkey, LPCSTR lpFile, 
                            LPSECURITY_ATTRIBUTES sa )
 {
     LONG ret;
     LPWSTR lpFileW = strdupA2W(lpFile);
-    ret = RegSaveKey32W( hkey, lpFileW, sa );
+    ret = RegSaveKeyW( hkey, lpFileW, sa );
     free(lpFileW);
     return ret;
 }
@@ -3631,7 +3631,7 @@ LONG WINAPI RegSaveKey32A( HKEY hkey, LPCSTR lpFile,
  *    lpFile  [I] Address of filename containing saved tree
  *    dwFlags [I] Optional flags
  */
-LONG WINAPI RegRestoreKey32W( HKEY hkey, LPCWSTR lpFile, DWORD dwFlags )
+LONG WINAPI RegRestoreKeyW( HKEY hkey, LPCWSTR lpFile, DWORD dwFlags )
 {
     LPKEYSTRUCT	lpkey;
 
@@ -3656,11 +3656,11 @@ LONG WINAPI RegRestoreKey32W( HKEY hkey, LPCWSTR lpFile, DWORD dwFlags )
 /******************************************************************************
  * RegRestoreKey32A [ADVAPI32.163]
  */
-LONG WINAPI RegRestoreKey32A( HKEY hkey, LPCSTR lpFile, DWORD dwFlags )
+LONG WINAPI RegRestoreKeyA( HKEY hkey, LPCSTR lpFile, DWORD dwFlags )
 {
     LONG ret;
     LPWSTR lpFileW = strdupA2W(lpFile);
-    ret = RegRestoreKey32W( hkey, lpFileW, dwFlags );
+    ret = RegRestoreKeyW( hkey, lpFileW, dwFlags );
     if(lpFileW) free(lpFileW);
     return ret;
 }
@@ -3675,7 +3675,7 @@ LONG WINAPI RegRestoreKey32A( HKEY hkey, LPCSTR lpFile, DWORD dwFlags )
  *    lpNewFile [I] Address of filename for file with new data
  *    lpOldFile [I] Address of filename for backup file
  */
-LONG WINAPI RegReplaceKey32W( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewFile,
+LONG WINAPI RegReplaceKeyW( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewFile,
                               LPCWSTR lpOldFile )
 {
     LPKEYSTRUCT	lpkey;
@@ -3697,14 +3697,14 @@ LONG WINAPI RegReplaceKey32W( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewFile,
 /******************************************************************************
  * RegReplaceKey32A [ADVAPI32.161]
  */
-LONG WINAPI RegReplaceKey32A( HKEY hkey, LPCSTR lpSubKey, LPCSTR lpNewFile,
+LONG WINAPI RegReplaceKeyA( HKEY hkey, LPCSTR lpSubKey, LPCSTR lpNewFile,
                               LPCSTR lpOldFile )
 {
     LONG ret;
     LPWSTR lpSubKeyW = strdupA2W(lpSubKey);
     LPWSTR lpNewFileW = strdupA2W(lpNewFile);
     LPWSTR lpOldFileW = strdupA2W(lpOldFile);
-    ret = RegReplaceKey32W( hkey, lpSubKeyW, lpNewFileW, lpOldFileW );
+    ret = RegReplaceKeyW( hkey, lpSubKeyW, lpNewFileW, lpOldFileW );
     free(lpOldFileW);
     free(lpNewFileW);
     free(lpSubKeyW);
diff --git a/misc/shell.c b/misc/shell.c
index 3134efe0f06..933f348b44d 100644
--- a/misc/shell.c
+++ b/misc/shell.c
@@ -65,7 +65,7 @@ static UINT16	uMsgShellActivate = 0;
 /*************************************************************************
  *				DragAcceptFiles32		[SHELL32.54]
  */
-void WINAPI DragAcceptFiles32(HWND32 hWnd, BOOL32 b)
+void WINAPI DragAcceptFiles(HWND hWnd, BOOL b)
 {
   WND* wnd = WIN_FindWndPtr(hWnd);
   
@@ -79,17 +79,17 @@ void WINAPI DragAcceptFiles32(HWND32 hWnd, BOOL32 b)
  */
 void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b)
 {
-  DragAcceptFiles32(hWnd, b);
+  DragAcceptFiles(hWnd, b);
 }
 
 /*************************************************************************
  *				SHELL_DragQueryFile	[internal]
  * 
  */
-static UINT32 SHELL_DragQueryFile(LPSTR lpDrop, LPWSTR lpwDrop, UINT32 lFile, 
-				  LPSTR lpszFile, LPWSTR lpszwFile, UINT32 lLength)
+static UINT SHELL_DragQueryFile(LPSTR lpDrop, LPWSTR lpwDrop, UINT lFile, 
+				  LPSTR lpszFile, LPWSTR lpszwFile, UINT lLength)
 {
-    UINT32 i;
+    UINT i;
 
     i = 0;
     if (lpDrop) {
@@ -107,19 +107,19 @@ static UINT32 SHELL_DragQueryFile(LPSTR lpDrop, LPWSTR lpwDrop, UINT32 lFile,
       }
     }
     
-    if (lpDrop)  i = lstrlen32A(lpDrop);
-    if (lpwDrop) i = lstrlen32W(lpwDrop);
+    if (lpDrop)  i = lstrlenA(lpDrop);
+    if (lpwDrop) i = lstrlenW(lpwDrop);
     i++;
     if (!lpszFile && !lpszwFile) {
       return i;   /* needed buffer size */
     }
     i = (lLength > i) ? i : lLength;
     if (lpszFile) {
-      if (lpDrop) lstrcpyn32A (lpszFile,  lpDrop,  i);
+      if (lpDrop) lstrcpynA (lpszFile,  lpDrop,  i);
       else        lstrcpynWtoA(lpszFile,  lpwDrop, i);
     } else {
       if (lpDrop) lstrcpynAtoW(lpszwFile, lpDrop,  i);
-      else        lstrcpyn32W (lpszwFile, lpwDrop, i);
+      else        lstrcpynW (lpszwFile, lpwDrop, i);
     }
     return i;
 }
@@ -127,47 +127,47 @@ static UINT32 SHELL_DragQueryFile(LPSTR lpDrop, LPWSTR lpwDrop, UINT32 lFile,
 /*************************************************************************
  *				DragQueryFile32A	[SHELL32.81] [shell32.82]
  */
-UINT32 WINAPI DragQueryFile32A(HDROP32 hDrop, UINT32 lFile, LPSTR lpszFile,
-			      UINT32 lLength)
+UINT WINAPI DragQueryFileA(HDROP hDrop, UINT lFile, LPSTR lpszFile,
+			      UINT lLength)
 { /* hDrop is a global memory block allocated with GMEM_SHARE 
      * with DROPFILESTRUCT as a header and filenames following
      * it, zero length filename is in the end */       
     
-    LPDROPFILESTRUCT32 lpDropFileStruct;
+    LPDROPFILESTRUCT lpDropFileStruct;
     LPSTR lpCurrent;
-    UINT32 i;
+    UINT i;
     
     TRACE(shell,"(%08x, %x, %p, %u)\n",	hDrop,lFile,lpszFile,lLength);
     
-    lpDropFileStruct = (LPDROPFILESTRUCT32) GlobalLock32(hDrop); 
+    lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop); 
     if(!lpDropFileStruct)
       return 0;
 
     lpCurrent = (LPSTR) lpDropFileStruct + lpDropFileStruct->lSize;
     i = SHELL_DragQueryFile(lpCurrent, NULL, lFile, lpszFile, NULL, lLength);
-    GlobalUnlock32(hDrop);
+    GlobalUnlock(hDrop);
     return i;
 }
 
 /*************************************************************************
  *				DragQueryFile32W	[shell32.133]
  */
-UINT32 WINAPI DragQueryFile32W(HDROP32 hDrop, UINT32 lFile, LPWSTR lpszwFile,
-			      UINT32 lLength)
+UINT WINAPI DragQueryFileW(HDROP hDrop, UINT lFile, LPWSTR lpszwFile,
+			      UINT lLength)
 {
-    LPDROPFILESTRUCT32 lpDropFileStruct;
+    LPDROPFILESTRUCT lpDropFileStruct;
     LPWSTR lpwCurrent;
-    UINT32 i;
+    UINT i;
     
     TRACE(shell,"(%08x, %x, %p, %u)\n",	hDrop,lFile,lpszwFile,lLength);
     
-    lpDropFileStruct = (LPDROPFILESTRUCT32) GlobalLock32(hDrop); 
+    lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop); 
     if(!lpDropFileStruct)
       return 0;
 
     lpwCurrent = (LPWSTR) lpDropFileStruct + lpDropFileStruct->lSize;
     i = SHELL_DragQueryFile(NULL, lpwCurrent, lFile, NULL, lpszwFile,lLength);
-    GlobalUnlock32(hDrop);
+    GlobalUnlock(hDrop);
     return i;
 }
 /*************************************************************************
@@ -202,9 +202,9 @@ UINT16 WINAPI DragQueryFile16(HDROP16 hDrop, WORD wFile, LPSTR lpszFile,
 /*************************************************************************
  *				DragFinish32		[SHELL32.80]
  */
-void WINAPI DragFinish32(HDROP32 h)
+void WINAPI DragFinish(HDROP h)
 { TRACE(shell,"\n");
-    GlobalFree32((HGLOBAL32)h);
+    GlobalFree((HGLOBAL)h);
 }
 
 /*************************************************************************
@@ -219,17 +219,17 @@ void WINAPI DragFinish16(HDROP16 h)
 /*************************************************************************
  *				DragQueryPoint32		[SHELL32.135]
  */
-BOOL32 WINAPI DragQueryPoint32(HDROP32 hDrop, POINT32 *p)
+BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p)
 {
-  LPDROPFILESTRUCT32 lpDropFileStruct;  
-  BOOL32             bRet;
+  LPDROPFILESTRUCT lpDropFileStruct;  
+  BOOL             bRet;
   TRACE(shell,"\n");
-  lpDropFileStruct = (LPDROPFILESTRUCT32) GlobalLock32(hDrop);
+  lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop);
   
-  memcpy(p,&lpDropFileStruct->ptMousePos,sizeof(POINT32));
+  memcpy(p,&lpDropFileStruct->ptMousePos,sizeof(POINT));
   bRet = lpDropFileStruct->fInNonClientArea;
   
-  GlobalUnlock32(hDrop);
+  GlobalUnlock(hDrop);
   return bRet;
 }
 
@@ -255,7 +255,7 @@ BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p)
  *
  * Utility for code sharing between FindExecutable and ShellExecute
  */
-HINSTANCE32 SHELL_FindExecutable( LPCSTR lpFile, 
+HINSTANCE SHELL_FindExecutable( LPCSTR lpFile, 
                                          LPCSTR lpOperation,
                                          LPSTR lpResult)
 { char *extension = NULL; /* pointer to file extension */
@@ -265,7 +265,7 @@ HINSTANCE32 SHELL_FindExecutable( LPCSTR lpFile,
     char command[256];      /* command from registry */
     LONG commandlen=256;    /* This is the most DOS can handle :) */
     char buffer[256];       /* Used to GetProfileString */
-    HINSTANCE32 retval=31;  /* default - 'No association was found' */
+    HINSTANCE retval=31;  /* default - 'No association was found' */
     char *tok;              /* token pointer */
     int i;                  /* random counter */
     char xlpFile[256];      /* result of SearchPath */
@@ -281,7 +281,7 @@ HINSTANCE32 SHELL_FindExecutable( LPCSTR lpFile,
         return 2; /* File not found. Close enough, I guess. */
     }
 
-    if (SearchPath32A( NULL, lpFile,".exe",sizeof(xlpFile),xlpFile,NULL))
+    if (SearchPathA( NULL, lpFile,".exe",sizeof(xlpFile),xlpFile,NULL))
   { TRACE(shell, "SearchPath32A returned non-zero\n");
         lpFile = xlpFile;
     }
@@ -298,8 +298,8 @@ HINSTANCE32 SHELL_FindExecutable( LPCSTR lpFile,
     }
 
     /* Make local copy & lowercase it for reg & 'programs=' lookup */
-    lstrcpyn32A( tmpext, extension, 5 );
-    CharLower32A( tmpext );
+    lstrcpynA( tmpext, extension, 5 );
+    CharLowerA( tmpext );
   TRACE(shell, "%s file\n", tmpext);
     
     /* Three places to check: */
@@ -313,7 +313,7 @@ HINSTANCE32 SHELL_FindExecutable( LPCSTR lpFile,
     /* See if it's a program - if GetProfileString fails, we skip this
      * section. Actually, if GetProfileString fails, we've probably
      * got a lot more to worry about than running a program... */
-    if ( GetProfileString32A("windows", "programs", "exe pif bat com",
+    if ( GetProfileStringA("windows", "programs", "exe pif bat com",
 						  buffer, sizeof(buffer)) > 0 )
   { for (i=0;i<strlen(buffer); i++) buffer[i]=tolower(buffer[i]);
 
@@ -373,7 +373,7 @@ HINSTANCE32 SHELL_FindExecutable( LPCSTR lpFile,
     {
 	/* Toss the leading dot */
 	extension++;
-	if ( GetProfileString32A( "extensions", extension, "", command,
+	if ( GetProfileStringA( "extensions", extension, "", command,
                                   sizeof(command)) > 0)
 	  {
 		if (strlen(command)!=0)
@@ -419,8 +419,8 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation,
       lpOperation="open";
 
     if (lpDirectory)
-    { GetCurrentDirectory32A( sizeof(old_dir), old_dir );
-        SetCurrentDirectory32A( lpDirectory );
+    { GetCurrentDirectoryA( sizeof(old_dir), old_dir );
+        SetCurrentDirectoryA( lpDirectory );
     }
 
     retval = SHELL_FindExecutable( lpFile, lpOperation, cmd );
@@ -432,10 +432,10 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation,
         }
 
       TRACE(shell,"starting %s\n",cmd);
-        retval = WinExec32( cmd, iShowCmd );
+        retval = WinExec( cmd, iShowCmd );
     }
     if (lpDirectory)
-      SetCurrentDirectory32A( old_dir );
+      SetCurrentDirectoryA( old_dir );
     return retval;
 }
 
@@ -444,7 +444,7 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation,
  */
 HINSTANCE16 WINAPI FindExecutable16( LPCSTR lpFile, LPCSTR lpDirectory,
                                      LPSTR lpResult )
-{ return (HINSTANCE16)FindExecutable32A( lpFile, lpDirectory, lpResult );
+{ return (HINSTANCE16)FindExecutableA( lpFile, lpDirectory, lpResult );
 }
 
 
@@ -453,7 +453,7 @@ HINSTANCE16 WINAPI FindExecutable16( LPCSTR lpFile, LPCSTR lpDirectory,
  */
 BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam,
                                LPARAM lParam )
-{ return AboutDlgProc32( hWnd, msg, wParam, lParam );
+{ return AboutDlgProc( hWnd, msg, wParam, lParam );
 }
 
 
@@ -462,13 +462,13 @@ BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam,
  */
 BOOL16 WINAPI ShellAbout16( HWND16 hWnd, LPCSTR szApp, LPCSTR szOtherStuff,
                             HICON16 hIcon )
-{ return ShellAbout32A( hWnd, szApp, szOtherStuff, hIcon );
+{ return ShellAboutA( hWnd, szApp, szOtherStuff, hIcon );
 }
 
 /*************************************************************************
  *				SHELL_GetResourceTable
  */
-static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
+static DWORD SHELL_GetResourceTable(HFILE hFile,LPBYTE *retptr)
 {	IMAGE_DOS_HEADER	mz_header;
 	char			magic[4];
 	int			size;
@@ -476,8 +476,8 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 	TRACE(shell,"\n");  
 
 	*retptr = NULL;
-	_llseek32( hFile, 0, SEEK_SET );
-	if ((_lread32(hFile,&mz_header,sizeof(mz_header)) != sizeof(mz_header)) || (mz_header.e_magic != IMAGE_DOS_SIGNATURE))
+	_llseek( hFile, 0, SEEK_SET );
+	if ((_lread(hFile,&mz_header,sizeof(mz_header)) != sizeof(mz_header)) || (mz_header.e_magic != IMAGE_DOS_SIGNATURE))
 	{ /* .ICO file ? */
           if (mz_header.e_cblp == 1) 
 	  { /* ICONHEADER.idType, must be 1 */
@@ -487,12 +487,12 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 	  else
 	    return 0; /* failed */
 	}
-	_llseek32( hFile, mz_header.e_lfanew, SEEK_SET );
+	_llseek( hFile, mz_header.e_lfanew, SEEK_SET );
 
-	if (_lread32( hFile, magic, sizeof(magic) ) != sizeof(magic))
+	if (_lread( hFile, magic, sizeof(magic) ) != sizeof(magic))
 	  return 0;
 
-	_llseek32( hFile, mz_header.e_lfanew, SEEK_SET);
+	_llseek( hFile, mz_header.e_lfanew, SEEK_SET);
 
 	if (*(DWORD*)magic  == IMAGE_NT_SIGNATURE)
 	  return IMAGE_NT_SIGNATURE;
@@ -501,7 +501,7 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 	{ IMAGE_OS2_HEADER	ne_header;
 	  LPBYTE		pTypeInfo = (LPBYTE)-1;
 
-	  if (_lread32(hFile,&ne_header,sizeof(ne_header))!=sizeof(ne_header))
+	  if (_lread(hFile,&ne_header,sizeof(ne_header))!=sizeof(ne_header))
 	    return 0;
 
 	  if (ne_header.ne_magic != IMAGE_OS2_SIGNATURE)
@@ -512,8 +512,8 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 	  if( size > sizeof(NE_TYPEINFO) )
 	  { pTypeInfo = (BYTE*)HeapAlloc( GetProcessHeap(), 0, size);
 	    if( pTypeInfo ) 
-	    { _llseek32(hFile, mz_header.e_lfanew+ne_header.resource_tab_offset, SEEK_SET);
-	      if( _lread32( hFile, (char*)pTypeInfo, size) != size )
+	    { _llseek(hFile, mz_header.e_lfanew+ne_header.resource_tab_offset, SEEK_SET);
+	      if( _lread( hFile, (char*)pTypeInfo, size) != size )
 	      { HeapFree( GetProcessHeap(), 0, pTypeInfo); 
 		pTypeInfo = NULL;
 	      }
@@ -528,15 +528,15 @@ static DWORD SHELL_GetResourceTable(HFILE32 hFile,LPBYTE *retptr)
 /*************************************************************************
  *			SHELL_LoadResource
  */
-static HGLOBAL16 SHELL_LoadResource(HINSTANCE16 hInst, HFILE32 hFile, NE_NAMEINFO* pNInfo, WORD sizeShift)
+static HGLOBAL16 SHELL_LoadResource(HINSTANCE16 hInst, HFILE hFile, NE_NAMEINFO* pNInfo, WORD sizeShift)
 {	BYTE*  ptr;
-	HGLOBAL16 handle = DirectResAlloc( hInst, 0x10, (DWORD)pNInfo->length << sizeShift);
+	HGLOBAL16 handle = DirectResAlloc16( hInst, 0x10, (DWORD)pNInfo->length << sizeShift);
 
 	TRACE(shell,"\n");
 
 	if( (ptr = (BYTE*)GlobalLock16( handle )) )
-	{ _llseek32( hFile, (DWORD)pNInfo->offset << sizeShift, SEEK_SET);
-	  _lread32( hFile, (char*)ptr, pNInfo->length << sizeShift);
+	{ _llseek( hFile, (DWORD)pNInfo->offset << sizeShift, SEEK_SET);
+	  _lread( hFile, (char*)ptr, pNInfo->length << sizeShift);
 	  return handle;
 	}
 	return 0;
@@ -545,13 +545,13 @@ static HGLOBAL16 SHELL_LoadResource(HINSTANCE16 hInst, HFILE32 hFile, NE_NAMEINF
 /*************************************************************************
  *                      ICO_LoadIcon
  */
-static HGLOBAL16 ICO_LoadIcon(HINSTANCE16 hInst, HFILE32 hFile, LPicoICONDIRENTRY lpiIDE)
+static HGLOBAL16 ICO_LoadIcon(HINSTANCE16 hInst, HFILE hFile, LPicoICONDIRENTRY lpiIDE)
 {	BYTE*  ptr;
-	HGLOBAL16 handle = DirectResAlloc( hInst, 0x10, lpiIDE->dwBytesInRes);
+	HGLOBAL16 handle = DirectResAlloc16( hInst, 0x10, lpiIDE->dwBytesInRes);
 	TRACE(shell,"\n");
 	if( (ptr = (BYTE*)GlobalLock16( handle )) )
-	{ _llseek32( hFile, lpiIDE->dwImageOffset, SEEK_SET);
-	  _lread32( hFile, (char*)ptr, lpiIDE->dwBytesInRes);
+	{ _llseek( hFile, lpiIDE->dwImageOffset, SEEK_SET);
+	  _lread( hFile, (char*)ptr, lpiIDE->dwBytesInRes);
 	  return handle;
 	}
 	return 0;
@@ -562,14 +562,14 @@ static HGLOBAL16 ICO_LoadIcon(HINSTANCE16 hInst, HFILE32 hFile, LPicoICONDIRENTR
  *
  *  Read .ico file and build phony ICONDIR struct for GetIconID
  */
-static HGLOBAL16 ICO_GetIconDirectory(HINSTANCE16 hInst, HFILE32 hFile, LPicoICONDIR* lplpiID ) 
+static HGLOBAL16 ICO_GetIconDirectory(HINSTANCE16 hInst, HFILE hFile, LPicoICONDIR* lplpiID ) 
 { WORD    id[3];  /* idReserved, idType, idCount */
   LPicoICONDIR	lpiID;
   int		i;
  
   TRACE(shell,"\n"); 
-  _llseek32( hFile, 0, SEEK_SET );
-  if( _lread32(hFile,(char*)id,sizeof(id)) != sizeof(id) ) return 0;
+  _llseek( hFile, 0, SEEK_SET );
+  if( _lread(hFile,(char*)id,sizeof(id)) != sizeof(id) ) return 0;
 
   /* check .ICO header 
    *
@@ -582,8 +582,8 @@ static HGLOBAL16 ICO_GetIconDirectory(HINSTANCE16 hInst, HFILE32 hFile, LPicoICO
 
   lpiID = (LPicoICONDIR)HeapAlloc( GetProcessHeap(), 0, i);
 
-  if( _lread32(hFile,(char*)lpiID->idEntries,i) == i )
-  { HGLOBAL16 handle = DirectResAlloc( hInst, 0x10,
+  if( _lread(hFile,(char*)lpiID->idEntries,i) == i )
+  { HGLOBAL16 handle = DirectResAlloc16( hInst, 0x10,
                                      id[2]*sizeof(ICONDIRENTRY) + sizeof(id) );
      if( handle ) 
     { CURSORICONDIR*     lpID = (CURSORICONDIR*)GlobalLock16( handle );
@@ -610,22 +610,22 @@ static HGLOBAL16 ICO_GetIconDirectory(HINSTANCE16 hInst, HFILE32 hFile, LPicoICO
  *
  * This abortion is called directly by Progman
  */
-HGLOBAL16 WINAPI InternalExtractIcon(HINSTANCE16 hInstance,
+HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance,
                                      LPCSTR lpszExeFileName, UINT16 nIconIndex, WORD n )
 {	HGLOBAL16	hRet = 0;
 	HGLOBAL16*	RetPtr = NULL;
 	LPBYTE		pData;
 	OFSTRUCT	ofs;
 	DWORD		sig;
-	HFILE32		hFile = OpenFile32( lpszExeFileName, &ofs, OF_READ );
+	HFILE		hFile = OpenFile( lpszExeFileName, &ofs, OF_READ );
 	UINT16		iconDirCount = 0,iconCount = 0;
 	LPBYTE		peimage;
-	HANDLE32	fmapping;
+	HANDLE	fmapping;
 	
 	TRACE(shell,"(%04x,file %s,start %d,extract %d\n", 
 		       hInstance, lpszExeFileName, nIconIndex, n);
 
-	if( hFile == HFILE_ERROR32 || !n )
+	if( hFile == HFILE_ERROR || !n )
 	  return 0;
 
 	hRet = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, sizeof(HICON16)*n);
@@ -678,7 +678,7 @@ HGLOBAL16 WINAPI InternalExtractIcon(HINSTANCE16 hInstance,
 
 	        if( lpiID == NULL )
 	          hIcon = SHELL_LoadResource( hInstance, hFile, pIconDir + i, *(WORD*)pData );
-	        RetPtr[i-nIconIndex] = GetIconID( hIcon, 3 );
+	        RetPtr[i-nIconIndex] = GetIconID16( hIcon, 3 );
 	        GlobalFree16(hIcon); 
               }
 
@@ -695,8 +695,8 @@ HGLOBAL16 WINAPI InternalExtractIcon(HINSTANCE16 hInstance,
 	          }
 	        }
 	        if( hIcon )
-	        { RetPtr[icon-nIconIndex] = LoadIconHandler( hIcon, TRUE ); 
-	          FarSetOwner( RetPtr[icon-nIconIndex], GetExePtr(hInstance) );
+	        { RetPtr[icon-nIconIndex] = LoadIconHandler16( hIcon, TRUE ); 
+	          FarSetOwner16( RetPtr[icon-nIconIndex], GetExePtr(hInstance) );
 	        }
 	        else
 	        { RetPtr[icon-nIconIndex] = 0;
@@ -721,7 +721,7 @@ HGLOBAL16 WINAPI InternalExtractIcon(HINSTANCE16 hInstance,
 	  PIMAGE_RESOURCE_DIRECTORY_ENTRY	xresent;
 	  CURSORICONDIR		**cids;
 	
-	  fmapping = CreateFileMapping32A(hFile,NULL,PAGE_READONLY|SEC_COMMIT,0,0,NULL);
+	  fmapping = CreateFileMappingA(hFile,NULL,PAGE_READONLY|SEC_COMMIT,0,0,NULL);
 	  if (fmapping == 0) 
 	  { /* FIXME, INVALID_HANDLE_VALUE? */
 	    WARN(shell,"failed to create filemap.\n");
@@ -760,7 +760,7 @@ HGLOBAL16 WINAPI InternalExtractIcon(HINSTANCE16 hInstance,
 	    goto end_4;	/* failure */
 	  }
 
-	  icongroupresdir = GetResDirEntryW(rootresdir,RT_GROUP_ICON32W, (DWORD)rootresdir,FALSE);
+	  icongroupresdir = GetResDirEntryW(rootresdir,RT_GROUP_ICONW, (DWORD)rootresdir,FALSE);
 
 	  if (!icongroupresdir) 
 	  { WARN(shell,"No Icongroupresourcedirectory!\n");
@@ -822,10 +822,10 @@ HGLOBAL16 WINAPI InternalExtractIcon(HINSTANCE16 hInstance,
 	    /* found */
 	    cid = (CURSORICONDIR*)igdata;
 	    cids[i] = cid;
-	    RetPtr[i] = LookupIconIdFromDirectoryEx32(igdata,TRUE,SYSMETRICS_CXICON,SYSMETRICS_CYICON,0);
+	    RetPtr[i] = LookupIconIdFromDirectoryEx(igdata,TRUE,SYSMETRICS_CXICON,SYSMETRICS_CYICON,0);
 	  }
 
-	  iconresdir=GetResDirEntryW(rootresdir,RT_ICON32W,(DWORD)rootresdir,FALSE);
+	  iconresdir=GetResDirEntryW(rootresdir,RT_ICONW,(DWORD)rootresdir,FALSE);
 
 	  if (!iconresdir) 
 	  { WARN(shell,"No Iconresourcedirectory!\n");
@@ -852,7 +852,7 @@ HGLOBAL16 WINAPI InternalExtractIcon(HINSTANCE16 hInstance,
 	      RetPtr[i]=0;
 	      continue;
 	    }
-	    RetPtr[i] = CreateIconFromResourceEx32(idata,idataent->Size,TRUE,0x00030000,SYSMETRICS_CXICON,SYSMETRICS_CYICON,0);
+	    RetPtr[i] = CreateIconFromResourceEx(idata,idataent->Size,TRUE,0x00030000,SYSMETRICS_CXICON,SYSMETRICS_CYICON,0);
 	  }
 	  goto end_3;	/* sucess */
 	}
@@ -862,7 +862,7 @@ HGLOBAL16 WINAPI InternalExtractIcon(HINSTANCE16 hInstance,
 end_4:	hRet = 0;	/* failure */
 end_3:	UnmapViewOfFile(peimage);	/* success */
 end_2:	CloseHandle(fmapping);
-end_1:	_lclose32( hFile);
+end_1:	_lclose( hFile);
 	return hRet;
 }
 
@@ -872,7 +872,7 @@ end_1:	_lclose32( hFile);
 HICON16 WINAPI ExtractIcon16( HINSTANCE16 hInstance, LPCSTR lpszExeFileName,
 	UINT16 nIconIndex )
 {   TRACE(shell,"\n");
-    return ExtractIcon32A( hInstance, lpszExeFileName, nIconIndex );
+    return ExtractIconA( hInstance, lpszExeFileName, nIconIndex );
 }
 
 /*************************************************************************
@@ -882,19 +882,19 @@ HICON16 WINAPI ExtractIconEx16(
 	LPCSTR lpszFile, INT16 nIconIndex, HICON16 *phiconLarge,
 	HICON16 *phiconSmall, UINT16 nIcons
 ) {
-    HICON32	*ilarge,*ismall;
+    HICON	*ilarge,*ismall;
     UINT16	ret;
     int		i;
 
     if (phiconLarge)
-    	ilarge = (HICON32*)HeapAlloc(GetProcessHeap(),0,nIcons*sizeof(HICON32));
+    	ilarge = (HICON*)HeapAlloc(GetProcessHeap(),0,nIcons*sizeof(HICON));
     else
     	ilarge = NULL;
     if (phiconSmall)
-    	ismall = (HICON32*)HeapAlloc(GetProcessHeap(),0,nIcons*sizeof(HICON32));
+    	ismall = (HICON*)HeapAlloc(GetProcessHeap(),0,nIcons*sizeof(HICON));
     else
     	ismall = NULL;
-    ret = ExtractIconEx32A(lpszFile,nIconIndex,ilarge,ismall,nIcons);
+    ret = ExtractIconExA(lpszFile,nIconIndex,ilarge,ismall,nIcons);
     if (ilarge) {
     	for (i=0;i<nIcons;i++)
 	    phiconLarge[i]=ilarge[i];
@@ -914,7 +914,7 @@ HICON16 WINAPI ExtractIconEx16(
  * Return icon for given file (either from file itself or from associated
  * executable) and patch parameters if needed.
  */
-HICON32 WINAPI ExtractAssociatedIcon32A(HINSTANCE32 hInst, LPSTR lpIconPath, LPWORD lpiIcon)
+HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lpiIcon)
 {	TRACE(shell,"\n");
 	return ExtractAssociatedIcon16(hInst,lpIconPath,lpiIcon);
 }
@@ -963,7 +963,7 @@ LPSTR SHELL_FindString(LPSTR lpEnv, LPCSTR entry)
 
   l = strlen(entry); 
   for( ; *lpEnv ; lpEnv+=strlen(lpEnv)+1 )
-  { if( lstrncmpi32A(lpEnv, entry, l) ) 
+  { if( lstrncmpiA(lpEnv, entry, l) ) 
       continue;
 	if( !*(lpEnv+l) )
 	    return (lpEnv + l); 		/* empty entry */
@@ -973,12 +973,12 @@ LPSTR SHELL_FindString(LPSTR lpEnv, LPCSTR entry)
     return NULL;
 }
 
-SEGPTR WINAPI FindEnvironmentString(LPSTR str)
+SEGPTR WINAPI FindEnvironmentString16(LPSTR str)
 { SEGPTR  spEnv;
   LPSTR lpEnv,lpString;
   TRACE(shell,"\n");
     
-  spEnv = GetDOSEnvironment();
+  spEnv = GetDOSEnvironment16();
 
   lpEnv = (LPSTR)PTR_SEG_TO_LIN(spEnv);
   lpString = (spEnv)?SHELL_FindString(lpEnv, str):NULL; 
@@ -994,14 +994,14 @@ SEGPTR WINAPI FindEnvironmentString(LPSTR str)
  * Replace %KEYWORD% in the str with the value of variable KEYWORD
  * from "DOS" environment.
  */
-DWORD WINAPI DoEnvironmentSubst(LPSTR str,WORD length)
+DWORD WINAPI DoEnvironmentSubst16(LPSTR str,WORD length)
 {
-  LPSTR   lpEnv = (LPSTR)PTR_SEG_TO_LIN(GetDOSEnvironment());
+  LPSTR   lpEnv = (LPSTR)PTR_SEG_TO_LIN(GetDOSEnvironment16());
   LPSTR   lpBuffer = (LPSTR)HeapAlloc( GetProcessHeap(), 0, length);
   LPSTR   lpstr = str;
   LPSTR   lpbstr = lpBuffer;
 
-  CharToOem32A(str,str);
+  CharToOemA(str,str);
 
   TRACE(shell,"accept %s\n", str);
 
@@ -1053,7 +1053,7 @@ DWORD WINAPI DoEnvironmentSubst(LPSTR str,WORD length)
 
   TRACE(shell,"-- return %s\n", str);
 
-  OemToChar32A(str,str);
+  OemToCharA(str,str);
   HeapFree( GetProcessHeap(), 0, lpBuffer);
 
   /*  Return str length in the LOWORD
@@ -1066,7 +1066,7 @@ DWORD WINAPI DoEnvironmentSubst(LPSTR str,WORD length)
  *				ShellHookProc		[SHELL.103]
  * System-wide WH_SHELL hook.
  */
-LRESULT WINAPI ShellHookProc(INT16 code, WPARAM16 wParam, LPARAM lParam)
+LRESULT WINAPI ShellHookProc16(INT16 code, WPARAM16 wParam, LPARAM lParam)
 {
     TRACE(shell,"%i, %04x, %08x\n", code, wParam, 
 						      (unsigned)lParam );
@@ -1087,18 +1087,18 @@ LRESULT WINAPI ShellHookProc(INT16 code, WPARAM16 wParam, LPARAM lParam)
 /*************************************************************************
  *				RegisterShellHook	[SHELL.102]
  */
-BOOL32 WINAPI RegisterShellHook(HWND16 hWnd, UINT16 uAction)
+BOOL WINAPI RegisterShellHook16(HWND16 hWnd, UINT16 uAction)
 { TRACE(shell,"%04x [%u]\n", hWnd, uAction );
 
     switch( uAction )
   { case 2:  /* register hWnd as a shell window */
 	     if( !SHELL_hHook )
       { HMODULE16 hShell = GetModuleHandle16( "SHELL" );
-        SHELL_hHook = SetWindowsHookEx16( WH_SHELL, ShellHookProc, hShell, 0 );
+        SHELL_hHook = SetWindowsHookEx16( WH_SHELL, ShellHookProc16, hShell, 0 );
 		if( SHELL_hHook )
-        { uMsgWndCreated = RegisterWindowMessage32A( lpstrMsgWndCreated );
-		    uMsgWndDestroyed = RegisterWindowMessage32A( lpstrMsgWndDestroyed );
-		    uMsgShellActivate = RegisterWindowMessage32A( lpstrMsgShellActivate );
+        { uMsgWndCreated = RegisterWindowMessageA( lpstrMsgWndCreated );
+		    uMsgWndDestroyed = RegisterWindowMessageA( lpstrMsgWndDestroyed );
+		    uMsgShellActivate = RegisterWindowMessageA( lpstrMsgShellActivate );
 		} 
         else 
           WARN(shell,"-- unable to install ShellHookProc()!\n");
diff --git a/misc/sound.c b/misc/sound.c
index be5ed72d586..f4f4e9fd0c9 100644
--- a/misc/sound.c
+++ b/misc/sound.c
@@ -12,12 +12,12 @@ INT16 WINAPI OpenSound16(void)
   return -1;
 }
 
-void WINAPI OpenSound32(void)
+void WINAPI OpenSound(void)
 {
   FIXME(sound, "(void): stub\n");
 }
 
-void WINAPI CloseSound(void)
+void WINAPI CloseSound16(void)
 {
   FIXME(sound, "(void): stub\n");
 }
@@ -28,7 +28,7 @@ INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes)
   return 0;
 }
 
-DWORD WINAPI SetVoiceQueueSize32(DWORD nVoice, DWORD nBytes)
+DWORD WINAPI SetVoiceQueueSize(DWORD nVoice, DWORD nBytes)
 {
   FIXME(sound, "(%ld,%ld): stub\n",nVoice,nBytes);
   return 0;
@@ -41,7 +41,7 @@ INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength,
   return 0;
 }
 
-DWORD WINAPI SetVoiceNote32(DWORD nVoice, DWORD nValue, DWORD nLength,
+DWORD WINAPI SetVoiceNote(DWORD nVoice, DWORD nValue, DWORD nLength,
                             DWORD nCdots)
 {
   FIXME(sound, "(%ld,%ld,%ld,%ld): stub\n",nVoice,nValue,nLength,nCdots);
@@ -56,7 +56,7 @@ INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
   return 0;
 }
 
-DWORD WINAPI SetVoiceAccent32(DWORD nVoice, DWORD nTempo, DWORD nVolume,
+DWORD WINAPI SetVoiceAccent(DWORD nVoice, DWORD nTempo, DWORD nVolume,
                               DWORD nMode, DWORD nPitch)
 {
   FIXME(sound, "(%ld,%ld,%ld,%ld,%ld): stub\n", nVoice, nTempo, 
@@ -70,7 +70,7 @@ INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat)
   return 0;
 }
 
-DWORD WINAPI SetVoiceEnvelope32(DWORD nVoice, DWORD nShape, DWORD nRepeat)
+DWORD WINAPI SetVoiceEnvelope(DWORD nVoice, DWORD nShape, DWORD nRepeat)
 {
   FIXME(sound, "(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat);
   return 0;
@@ -82,7 +82,7 @@ INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration)
   return 0;
 }
 
-DWORD WINAPI SetSoundNoise32(DWORD nSource, DWORD nDuration)
+DWORD WINAPI SetSoundNoise(DWORD nSource, DWORD nDuration)
 {
   FIXME(sound, "(%ld,%ld): stub\n",nSource,nDuration);
   return 0;
@@ -94,7 +94,7 @@ INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration)
   return 0;
 }
 
-DWORD WINAPI SetVoiceSound32(DWORD nVoice, DWORD lFrequency, DWORD nDuration)
+DWORD WINAPI SetVoiceSound(DWORD nVoice, DWORD lFrequency, DWORD nDuration)
 {
   FIXME(sound, "(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration);
   return 0;
@@ -116,7 +116,7 @@ INT16 WINAPI WaitSoundState16(INT16 x)
     return 0;
 }
 
-DWORD WINAPI WaitSoundState32(DWORD x)
+DWORD WINAPI WaitSoundState(DWORD x)
 {
     FIXME(sound, "(%ld): stub\n", x);
     return 0;
@@ -128,7 +128,7 @@ INT16 WINAPI SyncAllVoices16(void)
     return 0;
 }
 
-DWORD WINAPI SyncAllVoices32(void)
+DWORD WINAPI SyncAllVoices(void)
 {
     FIXME(sound, "(void): stub\n");
     return 0;
@@ -140,7 +140,7 @@ INT16 WINAPI CountVoiceNotes16(INT16 x)
     return 0;
 }
 
-DWORD WINAPI CountVoiceNotes32(DWORD x)
+DWORD WINAPI CountVoiceNotes(DWORD x)
 {
     FIXME(sound, "(%ld): stub\n", x);
     return 0;
@@ -152,7 +152,7 @@ LPINT16 WINAPI GetThresholdEvent16(void)
     return NULL;
 }
 
-LPDWORD WINAPI GetThresholdEvent32(void)
+LPDWORD WINAPI GetThresholdEvent(void)
 {
     FIXME(sound, "(void): stub\n");
     return NULL;
@@ -164,7 +164,7 @@ INT16 WINAPI GetThresholdStatus16(void)
     return 0;
 }
 
-DWORD WINAPI GetThresholdStatus32(void)
+DWORD WINAPI GetThresholdStatus(void)
 {
     FIXME(sound, "(void): stub\n");
     return 0;
@@ -176,13 +176,13 @@ INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b)
     return 0;
 }
 
-DWORD WINAPI SetVoiceThreshold32(DWORD a, DWORD b)
+DWORD WINAPI SetVoiceThreshold(DWORD a, DWORD b)
 {
     FIXME(sound, "(%ld,%ld): stub\n", a, b);
     return 0;
 }
 
-void WINAPI DoBeep(void)
+void WINAPI DoBeep16(void)
 {
     FIXME(sound, "(void): stub!\n");
 }
diff --git a/misc/spooler.c b/misc/spooler.c
index 71e0153dfd5..a595f1c8122 100644
--- a/misc/spooler.c
+++ b/misc/spooler.c
@@ -30,7 +30,7 @@
  * TRUE if no AbortProc avail or AbortProc wants to continue printing.
  * FALSE if AbortProc wants to abort printing.
  */
-BOOL16 WINAPI QueryAbort(HDC16 hdc, INT16 reserved)
+BOOL16 WINAPI QueryAbort16(HDC16 hdc, INT16 reserved)
 {
     DC *dc = DC_GetDCPtr( hdc );
 
@@ -52,7 +52,7 @@ INT16 WINAPI SetAbortProc16(HDC16 hdc, SEGPTR abrtprc)
  *           SetAbortProc32   (GDI32.301)
  *
  */
-INT32 WINAPI SetAbortProc32(HDC32 hdc, ABORTPROC32 abrtprc)
+INT WINAPI SetAbortProc(HDC hdc, ABORTPROC abrtprc)
 {
     FIXME(print, "stub\n");
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -81,7 +81,7 @@ static struct hpq *hpqueue;
  *           CreatePQ   (GDI.230)
  *
  */
-HPQ WINAPI CreatePQ(int size) 
+HPQ WINAPI CreatePQ16(int size) 
 {
 #if 0
     HGLOBAL16 hpq = 0;
@@ -109,7 +109,7 @@ HPQ WINAPI CreatePQ(int size)
  *           DeletePQ   (GDI.235)
  *
  */
-int WINAPI DeletePQ(HPQ hPQ) 
+int WINAPI DeletePQ16(HPQ hPQ) 
 {
     return GlobalFree16((HGLOBAL16)hPQ);
 }
@@ -118,7 +118,7 @@ int WINAPI DeletePQ(HPQ hPQ)
  *           ExtractPQ   (GDI.232)
  *
  */
-int WINAPI ExtractPQ(HPQ hPQ) 
+int WINAPI ExtractPQ16(HPQ hPQ) 
 { 
     struct hpq *queue, *prev, *current, *currentPrev;
     int key = 0, tag = -1;
@@ -160,7 +160,7 @@ int WINAPI ExtractPQ(HPQ hPQ)
  *           InsertPQ   (GDI.233)
  *
  */
-int WINAPI InsertPQ(HPQ hPQ, int tag, int key) 
+int WINAPI InsertPQ16(HPQ hPQ, int tag, int key) 
 {
     struct hpq *queueItem = xmalloc(sizeof(struct hpq));
     queueItem->next = hpqueue;
@@ -176,7 +176,7 @@ int WINAPI InsertPQ(HPQ hPQ, int tag, int key)
  *           MinPQ   (GDI.231)
  *
  */
-int WINAPI MinPQ(HPQ hPQ) 
+int WINAPI MinPQ16(HPQ hPQ) 
 {
     FIXME(print, "(%x): stub\n", hPQ); 
     return 0;
@@ -186,7 +186,7 @@ int WINAPI MinPQ(HPQ hPQ)
  *           SizePQ   (GDI.234)
  *
  */
-int WINAPI SizePQ(HPQ hPQ, int sizechange) 
+int WINAPI SizePQ16(HPQ hPQ, int sizechange) 
 {  
     FIXME(print, "(%x %d): stub\n", hPQ, sizechange); 
     return -1; 
@@ -303,7 +303,7 @@ static int FreePrintJob(HANDLE16 hJob)
  *           OpenJob   (GDI.240)
  *
  */
-HANDLE16 WINAPI OpenJob(LPSTR lpOutput, LPSTR lpTitle, HDC16 hDC)
+HANDLE16 WINAPI OpenJob16(LPSTR lpOutput, LPSTR lpTitle, HDC16 hDC)
 {
     HANDLE16 hHandle = (HANDLE16)SP_ERROR;
     PPRINTJOB pPrintJob;
@@ -342,7 +342,7 @@ HANDLE16 WINAPI OpenJob(LPSTR lpOutput, LPSTR lpTitle, HDC16 hDC)
  *           CloseJob   (GDI.243)
  *
  */
-int WINAPI CloseJob(HANDLE16 hJob)
+int WINAPI CloseJob16(HANDLE16 hJob)
 {
     int nRet = SP_ERROR;
     PPRINTJOB pPrintJob = NULL;
@@ -364,7 +364,7 @@ int WINAPI CloseJob(HANDLE16 hJob)
  *           WriteSpool   (GDI.241)
  *
  */
-int WINAPI WriteSpool(HANDLE16 hJob, LPSTR lpData, WORD cch)
+int WINAPI WriteSpool16(HANDLE16 hJob, LPSTR lpData, WORD cch)
 {
     int nRet = SP_ERROR;
     PPRINTJOB pPrintJob = NULL;
@@ -381,9 +381,9 @@ int WINAPI WriteSpool(HANDLE16 hJob, LPSTR lpData, WORD cch)
 	if (pPrintJob->hDC == 0) {
 	    TRACE(print, "hDC == 0 so no QueryAbort\n");
 	}
-        else if (!(QueryAbort(pPrintJob->hDC, (nRet == SP_OUTOFDISK) ? nRet : 0 )))
+        else if (!(QueryAbort16(pPrintJob->hDC, (nRet == SP_OUTOFDISK) ? nRet : 0 )))
 	{
-	    CloseJob(hJob); /* printing aborted */
+	    CloseJob16(hJob); /* printing aborted */
 	    nRet = SP_APPABORT;
 	}
     }
@@ -394,7 +394,7 @@ int WINAPI WriteSpool(HANDLE16 hJob, LPSTR lpData, WORD cch)
  *           WriteDialog   (GDI.242)
  *
  */
-int WINAPI WriteDialog(HANDLE16 hJob, LPSTR lpMsg, WORD cchMsg)
+int WINAPI WriteDialog16(HANDLE16 hJob, LPSTR lpMsg, WORD cchMsg)
 {
     int nRet = 0;
 
@@ -409,7 +409,7 @@ int WINAPI WriteDialog(HANDLE16 hJob, LPSTR lpMsg, WORD cchMsg)
  *           DeleteJob  (GDI.244)
  *
  */
-int WINAPI DeleteJob(HANDLE16 hJob, WORD wNotUsed)
+int WINAPI DeleteJob16(HANDLE16 hJob, WORD wNotUsed)
 {
     int nRet;
 
@@ -429,7 +429,7 @@ int WINAPI DeleteJob(HANDLE16 hJob, WORD wNotUsed)
  *           StartSpoolPage   (GDI.246)
  *
  */
-int WINAPI StartSpoolPage(HANDLE16 hJob)
+int WINAPI StartSpoolPage16(HANDLE16 hJob)
 {
     FIXME(print, "StartSpoolPage GDI.246 unimplemented\n");
     return 1;
@@ -441,7 +441,7 @@ int WINAPI StartSpoolPage(HANDLE16 hJob)
  *           EndSpoolPage   (GDI.247)
  *
  */
-int WINAPI EndSpoolPage(HANDLE16 hJob)
+int WINAPI EndSpoolPage16(HANDLE16 hJob)
 {
     FIXME(print, "EndSpoolPage GDI.247 unimplemented\n");
     return 1;
@@ -452,7 +452,7 @@ int WINAPI EndSpoolPage(HANDLE16 hJob)
  *           GetSpoolJob   (GDI.245)
  *
  */
-DWORD WINAPI GetSpoolJob(int nOption, LONG param)
+DWORD WINAPI GetSpoolJob16(int nOption, LONG param)
 {
     DWORD retval = 0;
     TRACE(print, "In GetSpoolJob param 0x%lx noption %d\n",param, nOption);
diff --git a/misc/spy.c b/misc/spy.c
index 44ccd590235..7acac97af18 100644
--- a/misc/spy.c
+++ b/misc/spy.c
@@ -605,7 +605,7 @@ static int SPY_IndentLevel  = 0;
 /***********************************************************************
  *           SPY_GetMsgName
  */
-const char *SPY_GetMsgName( UINT32 msg )
+const char *SPY_GetMsgName( UINT msg )
 {
     static char msg_buffer[20];
 
@@ -621,14 +621,14 @@ const char *SPY_GetMsgName( UINT32 msg )
 /***********************************************************************
  *           SPY_GetWndName
  */
-const char *SPY_GetWndName( HWND32 hwnd )
+const char *SPY_GetWndName( HWND hwnd )
 {
     static char wnd_buffer[16];
 
     WND* pWnd = WIN_FindWndPtr( hwnd );
     if( pWnd )
     {
-	INT32 n = sizeof(wnd_buffer) - 6;
+	INT n = sizeof(wnd_buffer) - 6;
 	LPSTR p = wnd_buffer;
 	LPSTR src;
 	
@@ -642,11 +642,11 @@ const char *SPY_GetWndName( HWND32 hwnd )
 	}
 	else /* get class name */
 	{
-	    INT32 len;
+	    INT len;
 
 	    *(p++)='{';
-	    GlobalGetAtomName32A( pWnd->class->atomName, p, n + 1);
-	    src = p += (len = lstrlen32A(p));
+	    GlobalGetAtomNameA( pWnd->class->atomName, p, n + 1);
+	    src = p += (len = lstrlenA(p));
 	    if( len >= n ) src = wnd_buffer;	/* something nonzero */
 	    postfix = '}';
 	}
@@ -654,15 +654,15 @@ const char *SPY_GetWndName( HWND32 hwnd )
 	*(p++) = postfix;
 	*(p++) = '\0';
     }
-    else lstrcpy32A( wnd_buffer, "\"NULL\"" );
+    else lstrcpyA( wnd_buffer, "\"NULL\"" );
     return wnd_buffer;
 }
 
 /***********************************************************************
  *           SPY_EnterMessage
  */
-void SPY_EnterMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg,
-                       WPARAM32 wParam, LPARAM lParam )
+void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
+                       WPARAM wParam, LPARAM lParam )
 {
     LPCSTR pname;
 
@@ -678,7 +678,7 @@ void SPY_EnterMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg,
                         wParam, lParam);
         break;
 
-    case SPY_DISPATCHMESSAGE32:
+    case SPY_DISPATCHMESSAGE:
 	pname = SPY_GetWndName(hWnd);
         TRACE(message,"%*s(%08x) %-16s message [%04x] %s dispatched  wp=%08x lp=%08lx\n",
                         SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
@@ -686,7 +686,7 @@ void SPY_EnterMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg,
         break;
 
     case SPY_SENDMESSAGE16:
-    case SPY_SENDMESSAGE32:
+    case SPY_SENDMESSAGE:
         {
             char taskName[30];
             HTASK16 hTask = GetWindowTask16(hWnd);
@@ -696,7 +696,7 @@ void SPY_EnterMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg,
             else
             {
                 sprintf( taskName, "task %04x ???", hTask );
-                GetModuleName( hTask, taskName + 10, sizeof(taskName) - 10 );
+                GetModuleName16( hTask, taskName + 10, sizeof(taskName) - 10 );
             }
 	    pname = SPY_GetWndName(hWnd);
 
@@ -718,7 +718,7 @@ void SPY_EnterMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg,
                         msg, wParam, lParam );
         break;
 
-    case SPY_DEFWNDPROC32:
+    case SPY_DEFWNDPROC:
 	if( SPY_ExcludeDWP ) return;
         TRACE(message, "%*s(%08x)  DefWindowProc32: %s [%04x]  wp=%08x lp=%08lx\n",
                         SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ),
@@ -732,12 +732,12 @@ void SPY_EnterMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg,
 /***********************************************************************
  *           SPY_ExitMessage
  */
-void SPY_ExitMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg, LRESULT lReturn )
+void SPY_ExitMessage( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn )
 {
     LPCSTR pname;
 
     if (!TRACE_ON(message) || SPY_EXCLUDE(msg) ||
-	(SPY_ExcludeDWP && (iFlag == SPY_RESULT_DEFWND16 || iFlag == SPY_RESULT_DEFWND32)) )
+	(SPY_ExcludeDWP && (iFlag == SPY_RESULT_DEFWND16 || iFlag == SPY_RESULT_DEFWND)) )
 	return;
 
     if (SPY_IndentLevel) SPY_IndentLevel -= SPY_INDENT_UNIT;
@@ -749,7 +749,7 @@ void SPY_ExitMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg, LRESULT lReturn )
 			SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn );
 	break;
 
-    case SPY_RESULT_DEFWND32:
+    case SPY_RESULT_DEFWND:
 	TRACE(message," %*s(%08x)  DefWindowProc32: %s [%04x] returned %08lx\n",
 			SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn );
 	break;
@@ -761,7 +761,7 @@ void SPY_ExitMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg, LRESULT lReturn )
                         SPY_GetMsgName( msg ), lReturn );
         break;
 
-    case SPY_RESULT_OK32:
+    case SPY_RESULT_OK:
 	pname = SPY_GetWndName(hWnd);
         TRACE(message," %*s(%08x) %-16s message [%04x] %s returned %08lx\n",
                         SPY_IndentLevel, "", hWnd, pname, msg,
@@ -775,7 +775,7 @@ void SPY_ExitMessage( INT32 iFlag, HWND32 hWnd, UINT32 msg, LRESULT lReturn )
                         SPY_GetMsgName( msg ) );
         break;
 
-    case SPY_RESULT_INVALIDHWND32:
+    case SPY_RESULT_INVALIDHWND:
 	pname = SPY_GetWndName(hWnd);
         WARN(message, " %*s(%08x) %-16s message [%04x] %s HAS INVALID HWND\n",
                         SPY_IndentLevel, "", hWnd, pname, msg,
diff --git a/misc/system.c b/misc/system.c
index 227a0f4da6c..bb061befa31 100644
--- a/misc/system.c
+++ b/misc/system.c
@@ -22,8 +22,8 @@
 typedef struct
 {
     SYSTEMTIMERPROC callback;  /* NULL if not in use */
-    INT32     rate;
-    INT32     ticks;
+    INT     rate;
+    INT     ticks;
 } SYSTEM_TIMER;
 
 #define NB_SYS_TIMERS   8
@@ -31,7 +31,7 @@ typedef struct
 
 static SYSTEM_TIMER SYS_Timers[NB_SYS_TIMERS];
 static int SYS_NbTimers = 0;
-static BOOL32 SYS_TimersDisabled = FALSE;
+static BOOL SYS_TimersDisabled = FALSE;
 
 
 /***********************************************************************
@@ -60,7 +60,7 @@ static HANDLER_DEF(SYSTEM_TimerTick)
  */
 static void SYSTEM_StartTicks(void)
 {
-    static BOOL32 handler_installed = FALSE;
+    static BOOL handler_installed = FALSE;
 
     if (!handler_installed)
     {
@@ -104,7 +104,7 @@ static void SYSTEM_StopTicks(void)
  * Note: the function always takes 2 WORD arguments, contrary to what
  *       "Undocumented Windows" says.
   */
-DWORD WINAPI InquireSystem( WORD code, WORD arg )
+DWORD WINAPI InquireSystem16( WORD code, WORD arg )
 {
     WORD drivetype;
 
@@ -135,7 +135,7 @@ WORD WINAPI CreateSystemTimer( WORD rate, SYSTEMTIMERPROC callback )
     for (i = 0; i < NB_SYS_TIMERS; i++)
         if (!SYS_Timers[i].callback)  /* Found one */
         {
-            SYS_Timers[i].rate = (UINT32)rate * 1000;
+            SYS_Timers[i].rate = (UINT)rate * 1000;
             if (SYS_Timers[i].rate < SYS_TIMER_RATE)
                 SYS_Timers[i].rate = SYS_TIMER_RATE;
             SYS_Timers[i].ticks = SYS_Timers[i].rate;
@@ -165,7 +165,7 @@ WORD WINAPI SYSTEM_KillSystemTimer( WORD timer )
 /***********************************************************************
  *           EnableSystemTimers   (SYSTEM.4)
  */
-void WINAPI EnableSystemTimers(void)
+void WINAPI EnableSystemTimers16(void)
 {
     SYS_TimersDisabled = FALSE;
     if (SYS_NbTimers) SYSTEM_StartTicks();
@@ -175,7 +175,7 @@ void WINAPI EnableSystemTimers(void)
 /***********************************************************************
  *           DisableSystemTimers   (SYSTEM.5)
  */
-void WINAPI DisableSystemTimers(void)
+void WINAPI DisableSystemTimers16(void)
 {
     SYS_TimersDisabled = TRUE;
     if (SYS_NbTimers) SYSTEM_StopTicks();
diff --git a/misc/tapi32.c b/misc/tapi32.c
index 8d40e3caff7..331518d0329 100644
--- a/misc/tapi32.c
+++ b/misc/tapi32.c
@@ -10,9 +10,9 @@
 #include "wintypes.h"
 #include "debug.h"
 
-UINT32 WINAPI lineInitialize(
+UINT WINAPI lineInitialize(
   LPVOID lphLineApp, /* FIXME */
-  HINSTANCE32 hInstance,
+  HINSTANCE hInstance,
   LPVOID lpfnCallback, /* FIXME */
   LPCSTR lpszAppName,
   LPDWORD lpdwNumDevs)
@@ -21,14 +21,14 @@ UINT32 WINAPI lineInitialize(
     return 0;
 }
 
-UINT32 WINAPI lineShutdown( HANDLE32 hLineApp ) /* FIXME */
+UINT WINAPI lineShutdown( HANDLE hLineApp ) /* FIXME */
 {
     FIXME(comm, "stub.\n");
     return 0;
 }
 
-UINT32 WINAPI lineNegotiateAPIVersion(
-  HANDLE32 hLineApp, /* FIXME */
+UINT WINAPI lineNegotiateAPIVersion(
+  HANDLE hLineApp, /* FIXME */
   DWORD dwDeviceID,
   DWORD dwAPILowVersion,
   DWORD dwAPIHighVersion,
@@ -45,8 +45,8 @@ UINT32 WINAPI lineNegotiateAPIVersion(
  * lineRedirect32 [TAPI32.53]
  * 
  */
-LONG WINAPI lineRedirect32(
-  HANDLE32* hCall,
+LONG WINAPI lineRedirect(
+  HANDLE* hCall,
   LPCSTR lpszDestAddress,
   DWORD  dwCountryCode) {
 
@@ -59,7 +59,7 @@ LONG WINAPI lineRedirect32(
  * tapiRequestMakeCall32 [TAPI32.113]
  * 
  */
-LONG WINAPI tapiRequestMakeCall32(
+LONG WINAPI tapiRequestMakeCall(
   LPCSTR lpszDestAddress,
   LPCSTR lpszAppName,
   LPCSTR lpszCalledParty,
diff --git a/misc/toolhelp.c b/misc/toolhelp.c
index 93178be6cf6..a04764c0e0e 100644
--- a/misc/toolhelp.c
+++ b/misc/toolhelp.c
@@ -42,7 +42,7 @@ static int nrofnotifys = 0;
 
 static FARPROC16 HookNotify = NULL;
 
-BOOL16 WINAPI NotifyRegister( HTASK16 htask, FARPROC16 lpfnCallback,
+BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback,
                               WORD wFlags )
 {
     int	i;
@@ -69,7 +69,7 @@ BOOL16 WINAPI NotifyRegister( HTASK16 htask, FARPROC16 lpfnCallback,
     return TRUE;
 }
 
-BOOL16 WINAPI NotifyUnregister( HTASK16 htask )
+BOOL16 WINAPI NotifyUnregister16( HTASK16 htask )
 {
     int	i;
     
@@ -87,17 +87,17 @@ BOOL16 WINAPI NotifyUnregister( HTASK16 htask )
     return TRUE;
 }
 
-BOOL16 WINAPI StackTraceCSIPFirst(STACKTRACEENTRY *ste, WORD wSS, WORD wCS, WORD wIP, WORD wBP)
+BOOL16 WINAPI StackTraceCSIPFirst16(STACKTRACEENTRY *ste, WORD wSS, WORD wCS, WORD wIP, WORD wBP)
 {
     return TRUE;
 }
 
-BOOL16 WINAPI StackTraceFirst(STACKTRACEENTRY *ste, HTASK16 Task)
+BOOL16 WINAPI StackTraceFirst16(STACKTRACEENTRY *ste, HTASK16 Task)
 {
     return TRUE;
 }
 
-BOOL16 WINAPI StackTraceNext(STACKTRACEENTRY *ste)
+BOOL16 WINAPI StackTraceNext16(STACKTRACEENTRY *ste)
 {
     return TRUE;
 }
@@ -106,7 +106,7 @@ BOOL16 WINAPI StackTraceNext(STACKTRACEENTRY *ste)
  *           ToolHelpHook                             (KERNEL.341)
  *	see "Undocumented Windows"
  */
-FARPROC16 WINAPI ToolHelpHook(FARPROC16 lpfnNotifyHandler)
+FARPROC16 WINAPI ToolHelpHook16(FARPROC16 lpfnNotifyHandler)
 {
 FARPROC16 tmp;
 	tmp = HookNotify;
@@ -119,7 +119,7 @@ FARPROC16 tmp;
 /***********************************************************************
  *           CreateToolHelp32Snapshot			(KERNEL32.179)
  */
-HANDLE32 WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process ) 
+HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process ) 
 {
     SNAPSHOT_OBJECT *snapshot;
     struct create_snapshot_request req;
@@ -131,11 +131,11 @@ HANDLE32 WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process )
     if (!(flags & TH32CS_SNAPPROCESS))
     {
         SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-        return INVALID_HANDLE_VALUE32;
+        return INVALID_HANDLE_VALUE;
     }
     /* Now do the snapshot */
     if (!(snapshot = HeapAlloc( SystemHeap, 0, sizeof(*snapshot) )))
-        return INVALID_HANDLE_VALUE32;
+        return INVALID_HANDLE_VALUE;
     snapshot->header.type = K32OBJ_TOOLHELP_SNAPSHOT;
     snapshot->header.refcount = 1;
 
@@ -145,7 +145,7 @@ HANDLE32 WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process )
     if (CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL ))
     {
         HeapFree( SystemHeap, 0, snapshot );
-        return INVALID_HANDLE_VALUE32;
+        return INVALID_HANDLE_VALUE;
     }
     return HANDLE_Alloc( PROCESS_Current(), &snapshot->header, 0, req.inherit, reply.handle );
 }
@@ -156,12 +156,12 @@ HANDLE32 WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process )
  *
  * Implementation of Process32First/Next
  */
-static BOOL32 TOOLHELP_Process32Next( HANDLE32 handle, LPPROCESSENTRY32 lppe, BOOL32 first )
+static BOOL TOOLHELP_Process32Next( HANDLE handle, LPPROCESSENTRY lppe, BOOL first )
 {
     struct next_process_request req;
     struct next_process_reply reply;
 
-    if (lppe->dwSize < sizeof (PROCESSENTRY32))
+    if (lppe->dwSize < sizeof (PROCESSENTRY))
     {
         SetLastError( ERROR_INSUFFICIENT_BUFFER );
         ERR (toolhelp, "Result buffer too small\n");
@@ -191,7 +191,7 @@ static BOOL32 TOOLHELP_Process32Next( HANDLE32 handle, LPPROCESSENTRY32 lppe, BO
  *
  * Return info about the first process in a toolhelp32 snapshot
  */
-BOOL32 WINAPI Process32First(HANDLE32 hSnapshot, LPPROCESSENTRY32 lppe)
+BOOL WINAPI Process32First(HANDLE hSnapshot, LPPROCESSENTRY lppe)
 {
     return TOOLHELP_Process32Next( hSnapshot, lppe, TRUE );
 }
@@ -201,7 +201,7 @@ BOOL32 WINAPI Process32First(HANDLE32 hSnapshot, LPPROCESSENTRY32 lppe)
  *
  * Return info about the "next" process in a toolhelp32 snapshot
  */
-BOOL32 WINAPI Process32Next(HANDLE32 hSnapshot, LPPROCESSENTRY32 lppe)
+BOOL WINAPI Process32Next(HANDLE hSnapshot, LPPROCESSENTRY lppe)
 {
     return TOOLHELP_Process32Next( hSnapshot, lppe, FALSE );
 }
diff --git a/misc/version.c b/misc/version.c
index 1d23ba9b63b..c471d167707 100644
--- a/misc/version.c
+++ b/misc/version.c
@@ -22,7 +22,7 @@ typedef struct
 {
     LONG             getVersion16; 
     LONG             getVersion32;
-    OSVERSIONINFO32A getVersionEx;
+    OSVERSIONINFOA getVersionEx;
 } VERSION_DATA;
 
 
@@ -34,7 +34,7 @@ static VERSION_DATA VersionData[NB_WINDOWS_VERSIONS] =
 	MAKELONG( 0x0a03, 0x0616 ), /* DOS 6.22 */
 	MAKELONG( 0x0a03, 0x8000 ),
 	{
-            sizeof(OSVERSIONINFO32A), 3, 10, 0,
+            sizeof(OSVERSIONINFOA), 3, 10, 0,
             VER_PLATFORM_WIN32s, "Win32s 1.3" 
 	}
     },
@@ -43,7 +43,7 @@ static VERSION_DATA VersionData[NB_WINDOWS_VERSIONS] =
         0x07005F03,
         0xC0000004,
 	{
-            sizeof(OSVERSIONINFO32A), 4, 0, 0x40003B6,
+            sizeof(OSVERSIONINFOA), 4, 0, 0x40003B6,
             VER_PLATFORM_WIN32_WINDOWS, "Win95"
 	}
     },
@@ -52,7 +52,7 @@ static VERSION_DATA VersionData[NB_WINDOWS_VERSIONS] =
         0x05000A03,
         0x04213303,
         {
-            sizeof(OSVERSIONINFO32A), 3, 51, 0x421,
+            sizeof(OSVERSIONINFOA), 3, 51, 0x421,
             VER_PLATFORM_WIN32_NT, "Service Pack 2"
 	}
     },
@@ -61,7 +61,7 @@ static VERSION_DATA VersionData[NB_WINDOWS_VERSIONS] =
         0x05000A03,
         0x05650004,
         {
-            sizeof(OSVERSIONINFO32A), 4, 0, 0x565,
+            sizeof(OSVERSIONINFOA), 4, 0, 0x565,
             VER_PLATFORM_WIN32_NT, "Service Pack 3"
         }
     }
@@ -76,7 +76,7 @@ static const char *WinVersionNames[NB_WINDOWS_VERSIONS] =
 };
 
 /* the current version has not been autodetected but forced via cmdline */
-static BOOL32 versionForced = FALSE;
+static BOOL versionForced = FALSE;
 static WINDOWS_VERSION defaultWinVersion = WIN31;
 
 
@@ -195,7 +195,7 @@ LONG WINAPI GetVersion16(void)
 /***********************************************************************
  *         GetVersion32   (KERNEL32.427)
  */
-LONG WINAPI GetVersion32(void)
+LONG WINAPI GetVersion(void)
 {
     WINDOWS_VERSION ver = VERSION_GetVersion();
     return VersionData[ver].getVersion32;
@@ -225,10 +225,10 @@ BOOL16 WINAPI GetVersionEx16(OSVERSIONINFO16 *v)
 /***********************************************************************
  *         GetVersionEx32A   (KERNEL32.428)
  */
-BOOL32 WINAPI GetVersionEx32A(OSVERSIONINFO32A *v)
+BOOL WINAPI GetVersionExA(OSVERSIONINFOA *v)
 {
     WINDOWS_VERSION ver = VERSION_GetVersion();
-    if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFO32A))
+    if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA))
     {
         WARN(ver,"wrong OSVERSIONINFO size from app");
         return FALSE;
@@ -245,11 +245,11 @@ BOOL32 WINAPI GetVersionEx32A(OSVERSIONINFO32A *v)
 /***********************************************************************
  *         GetVersionEx32W   (KERNEL32.429)
  */
-BOOL32 WINAPI GetVersionEx32W(OSVERSIONINFO32W *v)
+BOOL WINAPI GetVersionExW(OSVERSIONINFOW *v)
 {
     WINDOWS_VERSION ver = VERSION_GetVersion();
 
-    if (v->dwOSVersionInfoSize!=sizeof(OSVERSIONINFO32W))
+    if (v->dwOSVersionInfoSize!=sizeof(OSVERSIONINFOW))
     {
         WARN(ver,"wrong OSVERSIONINFO size from app");
         return FALSE;
@@ -266,12 +266,12 @@ BOOL32 WINAPI GetVersionEx32W(OSVERSIONINFO32W *v)
 /***********************************************************************
  *	    GetWinFlags   (KERNEL.132)
  */
-DWORD WINAPI GetWinFlags(void)
+DWORD WINAPI GetWinFlags16(void)
 {
   static const long cpuflags[5] =
     { WF_CPU086, WF_CPU186, WF_CPU286, WF_CPU386, WF_CPU486 };
   SYSTEM_INFO si;
-  OSVERSIONINFO32A ovi;
+  OSVERSIONINFOA ovi;
   DWORD result;
 
   GetSystemInfo(&si);
@@ -295,7 +295,7 @@ DWORD WINAPI GetWinFlags(void)
   }
   if (si.wProcessorLevel >= 4) result |= WF_HASCPUID;
   ovi.dwOSVersionInfoSize = sizeof(ovi);
-  GetVersionEx32A(&ovi);
+  GetVersionExA(&ovi);
   if (ovi.dwPlatformId == VER_PLATFORM_WIN32_NT)
       result |= WF_WIN32WOW; /* undocumented WF_WINNT */
   return result;
@@ -305,7 +305,7 @@ DWORD WINAPI GetWinFlags(void)
 /***********************************************************************
  *	    GetWinDebugInfo   (KERNEL.355)
  */
-BOOL16 WINAPI GetWinDebugInfo(WINDEBUGINFO *lpwdi, UINT16 flags)
+BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO *lpwdi, UINT16 flags)
 {
     FIXME(ver, "(%8lx,%d): stub returning 0\n",
 	  (unsigned long)lpwdi, flags);
@@ -319,7 +319,7 @@ BOOL16 WINAPI GetWinDebugInfo(WINDEBUGINFO *lpwdi, UINT16 flags)
 /***********************************************************************
  *	    SetWinDebugInfo   (KERNEL.356)
  */
-BOOL16 WINAPI SetWinDebugInfo(WINDEBUGINFO *lpwdi)
+BOOL16 WINAPI SetWinDebugInfo16(WINDEBUGINFO *lpwdi)
 {
     FIXME(ver, "(%8lx): stub returning 0\n", (unsigned long)lpwdi);
     /* 0 means not in debugging mode/version */
@@ -345,7 +345,7 @@ void WINAPI DebugFillBuffer(LPSTR lpBuffer, WORD wBytes)
  *
  * returns TRUE if Win called with "/b" (bootlog.txt)
  */
-BOOL16 WINAPI DiagQuery()
+BOOL16 WINAPI DiagQuery16()
 {
 	/* perhaps implement a Wine "/b" command line flag sometime ? */
 	return FALSE;
@@ -356,7 +356,7 @@ BOOL16 WINAPI DiagQuery()
  *
  * writes a debug string into <windir>\bootlog.txt
  */
-void WINAPI DiagOutput(LPCSTR str)
+void WINAPI DiagOutput16(LPCSTR str)
 {
         /* FIXME */
 	DPRINTF("DIAGOUTPUT:%s\n", debugstr_a(str));
@@ -365,7 +365,7 @@ void WINAPI DiagOutput(LPCSTR str)
 /***********************************************************************
  *           OaBuildVersion           [OLEAUT32.170]
  */
-UINT32 WINAPI OaBuildVersion()
+UINT WINAPI OaBuildVersion()
 {
     WINDOWS_VERSION ver = VERSION_GetVersion();
 
@@ -392,7 +392,7 @@ UINT32 WINAPI OaBuildVersion()
  *   some functions getting sometimes LPSTR sometimes LPWSTR...
  *
  */
-BOOL32 VERSION_OsIsUnicode(void)
+BOOL VERSION_OsIsUnicode(void)
 {
     switch(VERSION_GetVersion())
     {
diff --git a/misc/w32scomb.c b/misc/w32scomb.c
index 0bd2910bc01..024769ec76c 100644
--- a/misc/w32scomb.c
+++ b/misc/w32scomb.c
@@ -22,8 +22,8 @@
  * A 16:16 segmented pointer to the function is returned.
  * Written without any docu.
  */
-SEGPTR WINAPI Get16DLLAddress(HMODULE32 handle, LPSTR func_name) {
-	HANDLE32 ThunkHeap = HeapCreate(HEAP_WINE_SEGPTR | HEAP_WINE_CODESEG, 0, 64);
+SEGPTR WINAPI Get16DLLAddress(HMODULE handle, LPSTR func_name) {
+	HANDLE ThunkHeap = HeapCreate(HEAP_WINE_SEGPTR | HEAP_WINE_CODESEG, 0, 64);
         LPBYTE x;
 	LPVOID tmpheap = HeapAlloc(ThunkHeap, 0, 32);
 	SEGPTR thunk = HEAP_GetSegptr(ThunkHeap, 0, tmpheap);
@@ -35,7 +35,7 @@ SEGPTR WINAPI Get16DLLAddress(HMODULE32 handle, LPSTR func_name) {
 
         x=PTR_SEG_TO_LIN(thunk);
         *x++=0xba; *(DWORD*)x=proc_16;x+=4;             /* movl proc_16, $edx */
-        *x++=0xea; *(DWORD*)x=(DWORD)GetProcAddress32(GetModuleHandle32A("KERNEL32"),"QT_Thunk");x+=4;     /* jmpl QT_Thunk */
+        *x++=0xea; *(DWORD*)x=(DWORD)GetProcAddress(GetModuleHandleA("KERNEL32"),"QT_Thunk");x+=4;     /* jmpl QT_Thunk */
 	GET_CS(cs); *(WORD*)x=(WORD)cs;
         return thunk;
 }
diff --git a/misc/w32skrnl.c b/misc/w32skrnl.c
index 2ef3b2b4744..8aff679ddb4 100644
--- a/misc/w32skrnl.c
+++ b/misc/w32skrnl.c
@@ -13,7 +13,7 @@ LPSTR WINAPI GetWin32sDirectory(void)
     static char sysdir[0x80];
     LPSTR text;
 
-    GetEnvironmentVariable32A("winsysdir", sysdir, 0x80);
+    GetEnvironmentVariableA("winsysdir", sysdir, 0x80);
     if (!sysdir) return NULL;
     strcat(sysdir, "\\WIN32S");
     text = HeapAlloc(GetProcessHeap(), 0, strlen(sysdir)+1);
diff --git a/misc/w32sys.c b/misc/w32sys.c
index 74280f9ddf2..0220d2e6489 100644
--- a/misc/w32sys.c
+++ b/misc/w32sys.c
@@ -13,7 +13,7 @@
  * RETURNS
  *  0 on success, 1 on failure
  */
-WORD WINAPI GetWin32sInfo(
+WORD WINAPI GetWin32sInfo16(
 	LPWIN32SINFO lpInfo	/* [out] Win32S special information */
 ) {
     lpInfo->bMajor = 1;
@@ -30,7 +30,7 @@ WORD WINAPI GetWin32sInfo(
  * RETURNS
  *	dunno what.
  */
-WORD WINAPI GetPEResourceTable(
+WORD WINAPI GetPEResourceTable16(
 	HFILE16 hf		/* [in] filedescriptor to opened executeable */
 ) {
 	return 0;
diff --git a/misc/win32s16.c b/misc/win32s16.c
index 9bc895ae668..3c055d9c087 100644
--- a/misc/win32s16.c
+++ b/misc/win32s16.c
@@ -10,7 +10,7 @@
 #include "wintypes.h"
 #include "debug.h"
 
-void WINAPI BootTask()
+void WINAPI BootTask16()
 {
 	MSG("BootTask(): should only be used by WIN32S.EXE.\n");
 }
@@ -20,7 +20,7 @@ void WINAPI BootTask()
  *
  * Written without any docu.
  */
-SEGPTR WINAPI StackLinearToSegmented(WORD w1, WORD w2)
+SEGPTR WINAPI StackLinearToSegmented16(WORD w1, WORD w2)
 {
 	FIXME(dll,"(%d,%d):stub.\n",w1,w2);
 	return (SEGPTR)NULL;
diff --git a/misc/windebug.c b/misc/windebug.c
index bf5f2f94700..26826cab076 100644
--- a/misc/windebug.c
+++ b/misc/windebug.c
@@ -14,7 +14,7 @@
  *           WinNotify       (WINDEBUG.3)
  *  written without _any_ docu
  */
-void WINAPI WinNotify(CONTEXT *context)
+void WINAPI WinNotify16(CONTEXT *context)
 {
 	FIXME(dll, "(AX=%04x):stub.\n", AX_reg(context));
 	switch (AX_reg(context))
diff --git a/misc/winsock.c b/misc/winsock.c
index 948f617578e..c75900ae95b 100644
--- a/misc/winsock.c
+++ b/misc/winsock.c
@@ -69,7 +69,7 @@
 
 /* ----------------------------------- internal data */
 
-static HANDLE32 	_WSHeap = 0;
+static HANDLE 	_WSHeap = 0;
 static unsigned char*	_ws_stub = NULL;
 static LPWSINFO         _wsi_list = NULL;
 
@@ -87,7 +87,7 @@ static LPWSINFO         _wsi_list = NULL;
 	( ((unsigned)(pws) > (unsigned)(pwsi)) && \
 	  ((unsigned)(pws) < ((unsigned)(pwsi) + sizeof(WSINFO))) )
 
-static INT32         _ws_sock_ops[] =
+static INT         _ws_sock_ops[] =
        { WS_SO_DEBUG, WS_SO_REUSEADDR, WS_SO_KEEPALIVE, WS_SO_DONTROUTE,
          WS_SO_BROADCAST, WS_SO_LINGER, WS_SO_OOBINLINE, WS_SO_SNDBUF,
          WS_SO_RCVBUF, WS_SO_ERROR, WS_SO_TYPE, WS_SO_DONTLINGER, 0 };
@@ -104,7 +104,7 @@ static char* _check_buffer(LPWSINFO pwsi, int size);
  *
  * Converts socket flags from Windows format.
  */
-static void convert_sockopt(INT32 *level, INT32 *optname)
+static void convert_sockopt(INT *level, INT *optname)
 {
   int i;
   switch (*level)
@@ -175,7 +175,7 @@ static int wsi_strtolo(LPWSINFO pwsi, const char* name, const char* opt)
     return 0;
 }
 
-static fd_set* fd_set_import( fd_set* fds, LPWSINFO pwsi, void* wsfds, int* highfd, BOOL32 b32 )
+static fd_set* fd_set_import( fd_set* fds, LPWSINFO pwsi, void* wsfds, int* highfd, BOOL b32 )
 {
     /* translate Winsock fd set into local fd set */
 
@@ -216,7 +216,7 @@ __inline__ static int sock_error_p(int s)
     return optval != 0;
 }
 
-static int fd_set_export( LPWSINFO pwsi, fd_set* fds, fd_set* exceptfds, void* wsfds, BOOL32 b32 )
+static int fd_set_export( LPWSINFO pwsi, fd_set* fds, fd_set* exceptfds, void* wsfds, BOOL b32 )
 {
     int num_err = 0;
 
@@ -372,7 +372,7 @@ INT16 WINAPI WSAStartup16(UINT16 wVersionRequested, LPWSADATA lpWSAData)
 /***********************************************************************
  *      WSAStartup32()			(WSOCK32.115)
  */
-INT32 WINAPI WSAStartup32(UINT32 wVersionRequested, LPWSADATA lpWSAData)
+INT WINAPI WSAStartup(UINT wVersionRequested, LPWSADATA lpWSAData)
 {
     return WSAStartup16( wVersionRequested, lpWSAData );
 }
@@ -389,7 +389,7 @@ void WINSOCK_Shutdown()
     WINSOCK_cancel_task_aops( 0, __ws_memfree );
 }
 
-INT32 WINSOCK_DeleteTaskWSI( TDB* pTask, LPWSINFO pwsi )
+INT WINSOCK_DeleteTaskWSI( TDB* pTask, LPWSINFO pwsi )
 {
     /* WSACleanup() backend, called on task termination as well.
      * Real DLL would have registered its own signal handler with
@@ -431,7 +431,7 @@ INT32 WINSOCK_DeleteTaskWSI( TDB* pTask, LPWSINFO pwsi )
 	    if( pwsi->sock[i].psop )
 	    {
 		n++;
-		WSAAsyncSelect32( (SOCKET16)WS_PTR2HANDLE(pwsi->sock + i), 0, 0, 0 );
+		WSAAsyncSelect( (SOCKET16)WS_PTR2HANDLE(pwsi->sock + i), 0, 0, 0 );
 	    }
             close(pwsi->sock[i].fd); j++; 
         }
@@ -450,7 +450,7 @@ INT32 WINSOCK_DeleteTaskWSI( TDB* pTask, LPWSINFO pwsi )
     return 0;
 }
 
-INT32 WINAPI WSACleanup(void)
+INT WINAPI WSACleanup(void)
 {
     HTASK16	hTask = GetCurrentTask();
 
@@ -471,7 +471,7 @@ INT32 WINAPI WSACleanup(void)
 /***********************************************************************
  *      WSAGetLastError()		(WSOCK32.111)(WINSOCK.111)
  */
-INT32 WINAPI WSAGetLastError(void)
+INT WINAPI WSAGetLastError(void)
 {
     LPWSINFO pwsi = wsi_find(GetCurrentTask());
     INT16    ret = (pwsi) ? pwsi->err : WSANOTINITIALISED;
@@ -484,7 +484,7 @@ INT32 WINAPI WSAGetLastError(void)
 /***********************************************************************
  *      WSASetLastError32()		(WSOCK32.112)
  */
-void WINAPI WSASetLastError32(INT32 iError)
+void WINAPI WSASetLastError(INT iError)
 {
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
 
@@ -497,7 +497,7 @@ void WINAPI WSASetLastError32(INT32 iError)
  */
 void WINAPI WSASetLastError16(INT16 iError)
 {
-    WSASetLastError32(iError);
+    WSASetLastError(iError);
 }
 
 int _check_ws(LPWSINFO pwsi, ws_socket* pws)
@@ -552,8 +552,8 @@ struct ws_protoent* _check_buffer_pe(LPWSINFO pwsi, int size)
 /***********************************************************************
  *		accept()		(WSOCK32.1)
  */
-SOCKET32 WINAPI WINSOCK_accept32(SOCKET32 s, struct sockaddr *addr,
-                                 INT32 *addrlen32)
+SOCKET WINAPI WINSOCK_accept(SOCKET s, struct sockaddr *addr,
+                                 INT *addrlen32)
 {
     ws_socket*               pws  = (ws_socket*)WS_HANDLE2PTR((SOCKET16)s);
     LPWSINFO                 pwsi = wsi_find(GetCurrentTask());
@@ -574,13 +574,13 @@ SOCKET32 WINAPI WINSOCK_accept32(SOCKET32 s, struct sockaddr *addr,
 	    ws_socket*	pnew = wsi_alloc_socket(pwsi, sock); 
 	    if( pnew )
 	    {
-		s = (SOCKET32)WS_PTR2HANDLE(pnew);
+		s = (SOCKET)WS_PTR2HANDLE(pnew);
 		if( pws->psop && pws->flags & WS_FD_ACCEPT )
 		{
 		    EVENT_AddIO( pws->fd, EVENT_IO_READ );	/* reenabler */
 
 		    /* async select the accept()'ed socket */
-		    WSAAsyncSelect32( s, pws->psop->hWnd, pws->psop->uMsg,
+		    WSAAsyncSelect( s, pws->psop->hWnd, pws->psop->uMsg,
 				      pws->flags & ~WS_FD_ACCEPT );
 		}
 #ifdef HAVE_IPX
@@ -616,7 +616,7 @@ SOCKET32 WINAPI WINSOCK_accept32(SOCKET32 s, struct sockaddr *addr,
 	free(addr);
     }
 #endif
-    return INVALID_SOCKET32;
+    return INVALID_SOCKET;
 }
 
 /***********************************************************************
@@ -625,8 +625,8 @@ SOCKET32 WINAPI WINSOCK_accept32(SOCKET32 s, struct sockaddr *addr,
 SOCKET16 WINAPI WINSOCK_accept16(SOCKET16 s, struct sockaddr* addr,
                                  INT16* addrlen16 )
 {
-    INT32 addrlen32 = addrlen16 ? *addrlen16 : 0;
-    SOCKET32 retSocket = WINSOCK_accept32( s, addr, &addrlen32 );
+    INT addrlen32 = addrlen16 ? *addrlen16 : 0;
+    SOCKET retSocket = WINSOCK_accept( s, addr, &addrlen32 );
     if( addrlen16 ) *addrlen16 = (INT16)addrlen32;
     return (SOCKET16)retSocket;
 }
@@ -634,7 +634,7 @@ SOCKET16 WINAPI WINSOCK_accept16(SOCKET16 s, struct sockaddr* addr,
 /***********************************************************************
  *		bind()			(WSOCK32.2)
  */
-INT32 WINAPI WINSOCK_bind32(SOCKET32 s, struct sockaddr *name, INT32 namelen)
+INT WINAPI WINSOCK_bind(SOCKET s, struct sockaddr *name, INT namelen)
 {
     ws_socket*               pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO                 pwsi = wsi_find(GetCurrentTask());
@@ -711,13 +711,13 @@ INT32 WINAPI WINSOCK_bind32(SOCKET32 s, struct sockaddr *name, INT32 namelen)
  */
 INT16 WINAPI WINSOCK_bind16(SOCKET16 s, struct sockaddr *name, INT16 namelen)
 {
-  return (INT16)WINSOCK_bind32( s, name, namelen );
+  return (INT16)WINSOCK_bind( s, name, namelen );
 }
 
 /***********************************************************************
  *		closesocket()		(WSOCK32.3)
  */
-INT32 WINAPI WINSOCK_closesocket32(SOCKET32 s)
+INT WINAPI WINSOCK_closesocket(SOCKET s)
 {
     ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -728,7 +728,7 @@ INT32 WINAPI WINSOCK_closesocket32(SOCKET32 s)
     { 
 	int	fd = pws->fd;
 
-	if( pws->psop ) WSAAsyncSelect32( s, 0, 0, 0 );
+	if( pws->psop ) WSAAsyncSelect( s, 0, 0, 0 );
 
 	pws->fd = -1;
 	pws->flags = (unsigned)pwsi->last_free;
@@ -746,13 +746,13 @@ INT32 WINAPI WINSOCK_closesocket32(SOCKET32 s)
  */
 INT16 WINAPI WINSOCK_closesocket16(SOCKET16 s)
 {
-    return (INT16)WINSOCK_closesocket32(s);
+    return (INT16)WINSOCK_closesocket(s);
 }
 
 /***********************************************************************
  *		connect()		(WSOCK32.4)
  */
-INT32 WINAPI WINSOCK_connect32(SOCKET32 s, struct sockaddr *name, INT32 namelen)
+INT WINAPI WINSOCK_connect(SOCKET s, struct sockaddr *name, INT namelen)
 {
   ws_socket*               pws  = (ws_socket*)WS_HANDLE2PTR(s);
   LPWSINFO                 pwsi = wsi_find(GetCurrentTask());
@@ -829,14 +829,14 @@ INT32 WINAPI WINSOCK_connect32(SOCKET32 s, struct sockaddr *name, INT32 namelen)
  */
 INT16 WINAPI WINSOCK_connect16(SOCKET16 s, struct sockaddr *name, INT16 namelen)
 {
-  return (INT16)WINSOCK_connect32( s, name, namelen );
+  return (INT16)WINSOCK_connect( s, name, namelen );
 }
 
 /***********************************************************************
  *		getpeername()		(WSOCK32.5)
  */
-INT32 WINAPI WINSOCK_getpeername32(SOCKET32 s, struct sockaddr *name,
-                                   INT32 *namelen)
+INT WINAPI WINSOCK_getpeername(SOCKET s, struct sockaddr *name,
+                                   INT *namelen)
 {
     ws_socket*               pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO                 pwsi = wsi_find(GetCurrentTask());
@@ -887,8 +887,8 @@ INT32 WINAPI WINSOCK_getpeername32(SOCKET32 s, struct sockaddr *name,
 INT16 WINAPI WINSOCK_getpeername16(SOCKET16 s, struct sockaddr *name,
                                    INT16 *namelen16)
 {
-    INT32 namelen32 = *namelen16;
-    INT32 retVal = WINSOCK_getpeername32( s, name, &namelen32 );
+    INT namelen32 = *namelen16;
+    INT retVal = WINSOCK_getpeername( s, name, &namelen32 );
 
 #if DEBUG_SOCKADDR
     dump_sockaddr(name);
@@ -901,8 +901,8 @@ INT16 WINAPI WINSOCK_getpeername16(SOCKET16 s, struct sockaddr *name,
 /***********************************************************************
  *		getsockname()		(WSOCK32.6)
  */
-INT32 WINAPI WINSOCK_getsockname32(SOCKET32 s, struct sockaddr *name,
-                                   INT32 *namelen)
+INT WINAPI WINSOCK_getsockname(SOCKET s, struct sockaddr *name,
+                                   INT *namelen)
 {
     ws_socket*               pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO                 pwsi = wsi_find(GetCurrentTask());
@@ -953,12 +953,12 @@ INT32 WINAPI WINSOCK_getsockname32(SOCKET32 s, struct sockaddr *name,
 INT16 WINAPI WINSOCK_getsockname16(SOCKET16 s, struct sockaddr *name,
                                    INT16 *namelen16)
 {
-    INT32 retVal;
+    INT retVal;
 
     if( namelen16 )
     {
-        INT32 namelen32 = *namelen16;
-        retVal = WINSOCK_getsockname32( s, name, &namelen32 );
+        INT namelen32 = *namelen16;
+        retVal = WINSOCK_getsockname( s, name, &namelen32 );
        *namelen16 = namelen32;
 
 #if DEBUG_SOCKADDR
@@ -974,8 +974,8 @@ INT16 WINAPI WINSOCK_getsockname16(SOCKET16 s, struct sockaddr *name,
 /***********************************************************************
  *		getsockopt()		(WSOCK32.7)
  */
-INT32 WINAPI WINSOCK_getsockopt32(SOCKET32 s, INT32 level, 
-                                  INT32 optname, char *optval, INT32 *optlen)
+INT WINAPI WINSOCK_getsockopt(SOCKET s, INT level, 
+                                  INT optname, char *optval, INT *optlen)
 {
     ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -998,11 +998,11 @@ INT32 WINAPI WINSOCK_getsockopt32(SOCKET32 s, INT32 level,
 INT16 WINAPI WINSOCK_getsockopt16(SOCKET16 s, INT16 level,
                                   INT16 optname, char *optval, INT16 *optlen)
 {
-    INT32 optlen32;
-    INT32 *p = &optlen32;
-    INT32 retVal;
+    INT optlen32;
+    INT *p = &optlen32;
+    INT retVal;
     if( optlen ) optlen32 = *optlen; else p = NULL;
-    retVal = WINSOCK_getsockopt32( s, (UINT16)level, optname, optval, p );
+    retVal = WINSOCK_getsockopt( s, (UINT16)level, optname, optval, p );
     if( optlen ) *optlen = optlen32;
     return (INT16)retVal;
 }
@@ -1031,7 +1031,7 @@ u_short WINAPI WINSOCK_ntohs(u_short netshort)  { return( ntohs(netshort) ); }
 /***********************************************************************
  *		inet_ntoa()		(WINSOCK.11)(WSOCK32.11)
  */
-char* WINAPI WINSOCK_inet_ntoa32(struct in_addr in)
+char* WINAPI WINSOCK_inet_ntoa(struct in_addr in)
 {
   /* use "buffer for dummies" here because some applications have 
    * propensity to decode addresses in ws_hostent structure without 
@@ -1061,14 +1061,14 @@ char* WINAPI WINSOCK_inet_ntoa32(struct in_addr in)
 
 SEGPTR WINAPI WINSOCK_inet_ntoa16(struct in_addr in)
 {
-  char* retVal = WINSOCK_inet_ntoa32(in);
+  char* retVal = WINSOCK_inet_ntoa(in);
   return retVal ? SEGPTR_GET(retVal) : (SEGPTR)NULL;
 }
 
 /***********************************************************************
  *		ioctlsocket()		(WSOCK32.12)
  */
-INT32 WINAPI WINSOCK_ioctlsocket32(SOCKET32 s, UINT32 cmd, UINT32 *argp)
+INT WINAPI WINSOCK_ioctlsocket(SOCKET s, UINT cmd, UINT *argp)
 {
   ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
   LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -1117,16 +1117,16 @@ INT32 WINAPI WINSOCK_ioctlsocket32(SOCKET32 s, UINT32 cmd, UINT32 *argp)
 /***********************************************************************
  *              ioctlsocket()           (WINSOCK.12)
  */
-INT16 WINAPI WINSOCK_ioctlsocket16(SOCKET16 s, UINT32 cmd, UINT32 *argp)
+INT16 WINAPI WINSOCK_ioctlsocket16(SOCKET16 s, UINT cmd, UINT *argp)
 {
-    return (INT16)WINSOCK_ioctlsocket32( s, cmd, argp );
+    return (INT16)WINSOCK_ioctlsocket( s, cmd, argp );
 }
 
 
 /***********************************************************************
  *		listen()		(WSOCK32.13)
  */
-INT32 WINAPI WINSOCK_listen32(SOCKET32 s, INT32 backlog)
+INT WINAPI WINSOCK_listen(SOCKET s, INT backlog)
 {
     ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -1157,14 +1157,14 @@ INT32 WINAPI WINSOCK_listen32(SOCKET32 s, INT32 backlog)
  */
 INT16 WINAPI WINSOCK_listen16(SOCKET16 s, INT16 backlog)
 {
-    return (INT16)WINSOCK_listen32( s, backlog );
+    return (INT16)WINSOCK_listen( s, backlog );
 }
 
 
 /***********************************************************************
  *		recv()			(WSOCK32.16)
  */
-INT32 WINAPI WINSOCK_recv32(SOCKET32 s, char *buf, INT32 len, INT32 flags)
+INT WINAPI WINSOCK_recv(SOCKET s, char *buf, INT len, INT flags)
 {
     ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -1174,7 +1174,7 @@ INT32 WINAPI WINSOCK_recv32(SOCKET32 s, char *buf, INT32 len, INT32 flags)
 		    len, flags);
     if( _check_ws(pwsi, pws) )
     {
-	INT32 length;
+	INT length;
 	if ((length = recv(pws->fd, buf, len, flags)) >= 0) 
 	{ 
 	    TRACE(winsock, " -> %i bytes\n", length);
@@ -1196,15 +1196,15 @@ INT32 WINAPI WINSOCK_recv32(SOCKET32 s, char *buf, INT32 len, INT32 flags)
  */
 INT16 WINAPI WINSOCK_recv16(SOCKET16 s, char *buf, INT16 len, INT16 flags)
 {
-    return (INT16)WINSOCK_recv32( s, buf, len, flags );
+    return (INT16)WINSOCK_recv( s, buf, len, flags );
 }
 
 
 /***********************************************************************
  *		recvfrom()		(WSOCK32.17)
  */
-INT32 WINAPI WINSOCK_recvfrom32(SOCKET32 s, char *buf, INT32 len, INT32 flags, 
-                                struct sockaddr *from, INT32 *fromlen32)
+INT WINAPI WINSOCK_recvfrom(SOCKET s, char *buf, INT len, INT flags, 
+                                struct sockaddr *from, INT *fromlen32)
 {
     ws_socket*               pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO                 pwsi = wsi_find(GetCurrentTask());
@@ -1272,12 +1272,12 @@ INT32 WINAPI WINSOCK_recvfrom32(SOCKET32 s, char *buf, INT32 len, INT32 flags,
 INT16 WINAPI WINSOCK_recvfrom16(SOCKET16 s, char *buf, INT16 len, INT16 flags,
                                 struct sockaddr *from, INT16 *fromlen16)
 {
-    INT32 fromlen32;
-    INT32 *p = &fromlen32;
-    INT32 retVal;
+    INT fromlen32;
+    INT *p = &fromlen32;
+    INT retVal;
 
     if( fromlen16 ) fromlen32 = *fromlen16; else p = NULL;
-    retVal = WINSOCK_recvfrom32( s, buf, len, flags, from, p );
+    retVal = WINSOCK_recvfrom( s, buf, len, flags, from, p );
     if( fromlen16 ) *fromlen16 = fromlen32;
     return (INT16)retVal;
 }
@@ -1285,7 +1285,7 @@ INT16 WINAPI WINSOCK_recvfrom16(SOCKET16 s, char *buf, INT16 len, INT16 flags,
 /***********************************************************************
  *		select()		(WINSOCK.18)(WSOCK32.18)
  */
-static INT32 __ws_select( BOOL32 b32, void *ws_readfds, void *ws_writefds, void *ws_exceptfds,
+static INT __ws_select( BOOL b32, void *ws_readfds, void *ws_writefds, void *ws_exceptfds,
 			  struct timeval *timeout )
 {
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -1352,19 +1352,19 @@ INT16 WINAPI WINSOCK_select16(INT16 nfds, ws_fd_set16 *ws_readfds,
     return (INT16)__ws_select( FALSE, ws_readfds, ws_writefds, ws_exceptfds, timeout );
 }
 
-INT32 WINAPI WINSOCK_select32(INT32 nfds, ws_fd_set32 *ws_readfds,
+INT WINAPI WINSOCK_select(INT nfds, ws_fd_set32 *ws_readfds,
                               ws_fd_set32 *ws_writefds, ws_fd_set32 *ws_exceptfds,
                               struct timeval *timeout)
 {
     /* struct timeval is the same for both 32- and 16-bit code */
-    return (INT32)__ws_select( TRUE, ws_readfds, ws_writefds, ws_exceptfds, timeout );
+    return (INT)__ws_select( TRUE, ws_readfds, ws_writefds, ws_exceptfds, timeout );
 }
 
 
 /***********************************************************************
  *		send()			(WSOCK32.19)
  */
-INT32 WINAPI WINSOCK_send32(SOCKET32 s, char *buf, INT32 len, INT32 flags)
+INT WINAPI WINSOCK_send(SOCKET s, char *buf, INT len, INT flags)
 {
     ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -1393,14 +1393,14 @@ INT32 WINAPI WINSOCK_send32(SOCKET32 s, char *buf, INT32 len, INT32 flags)
  */
 INT16 WINAPI WINSOCK_send16(SOCKET16 s, char *buf, INT16 len, INT16 flags)
 {
-    return WINSOCK_send32( s, buf, len, flags );
+    return WINSOCK_send( s, buf, len, flags );
 }
 
 /***********************************************************************
  *		sendto()		(WSOCK32.20)
  */
-INT32 WINAPI WINSOCK_sendto32(SOCKET32 s, char *buf, INT32 len, INT32 flags,
-                              struct sockaddr *to, INT32 tolen)
+INT WINAPI WINSOCK_sendto(SOCKET s, char *buf, INT len, INT flags,
+                              struct sockaddr *to, INT tolen)
 {
     ws_socket*               pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO                 pwsi = wsi_find(GetCurrentTask());
@@ -1412,7 +1412,7 @@ INT32 WINAPI WINSOCK_sendto32(SOCKET32 s, char *buf, INT32 len, INT32 flags,
                           (unsigned)pwsi, s, (unsigned) buf, len, flags);
     if( _check_ws(pwsi, pws) )
     {
-	INT32	length;
+	INT	length;
 
 	if (to && ((struct ws_sockaddr_ipx *)to)->sipx_family == WS_AF_PUP)
 	    ((struct ws_sockaddr_ipx *)to)->sipx_family = AF_UNSPEC;
@@ -1461,14 +1461,14 @@ INT32 WINAPI WINSOCK_sendto32(SOCKET32 s, char *buf, INT32 len, INT32 flags,
 INT16 WINAPI WINSOCK_sendto16(SOCKET16 s, char *buf, INT16 len, INT16 flags,
                               struct sockaddr *to, INT16 tolen)
 {
-    return (INT16)WINSOCK_sendto32( s, buf, len, flags, to, tolen );
+    return (INT16)WINSOCK_sendto( s, buf, len, flags, to, tolen );
 }
 
 /***********************************************************************
  *		setsockopt()		(WSOCK32.21)
  */
-INT32 WINAPI WINSOCK_setsockopt32(SOCKET16 s, INT32 level, INT32 optname, 
-                                  char *optval, INT32 optlen)
+INT WINAPI WINSOCK_setsockopt(SOCKET16 s, INT level, INT optname, 
+                                  char *optval, INT optlen)
 {
     ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -1503,14 +1503,14 @@ INT16 WINAPI WINSOCK_setsockopt16(SOCKET16 s, INT16 level, INT16 optname,
                                   char *optval, INT16 optlen)
 {
     if( !optval ) return SOCKET_ERROR;
-    return (INT16)WINSOCK_setsockopt32( s, (UINT16)level, optname, optval, optlen );
+    return (INT16)WINSOCK_setsockopt( s, (UINT16)level, optname, optval, optlen );
 }
 
 
 /***********************************************************************
  *		shutdown()		(WSOCK32.22)
  */
-INT32 WINAPI WINSOCK_shutdown32(SOCKET32 s, INT32 how)
+INT WINAPI WINSOCK_shutdown(SOCKET s, INT how)
 {
     ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -1545,7 +1545,7 @@ INT32 WINAPI WINSOCK_shutdown32(SOCKET32 s, INT32 how)
 			how = SHUT_RDWR;
 #endif
 		default:
-			WSAAsyncSelect32( s, 0, 0, 0 );
+			WSAAsyncSelect( s, 0, 0, 0 );
 			break;
 	    }
 
@@ -1569,14 +1569,14 @@ INT32 WINAPI WINSOCK_shutdown32(SOCKET32 s, INT32 how)
  */
 INT16 WINAPI WINSOCK_shutdown16(SOCKET16 s, INT16 how)
 {
-    return (INT16)WINSOCK_shutdown32( s, how );
+    return (INT16)WINSOCK_shutdown( s, how );
 }
 
 
 /***********************************************************************
  *		socket()		(WSOCK32.23)
  */
-SOCKET32 WINAPI WINSOCK_socket32(INT32 af, INT32 type, INT32 protocol)
+SOCKET WINAPI WINSOCK_socket(INT af, INT type, INT protocol)
 {
   LPWSINFO      pwsi = wsi_find(GetCurrentTask());
 
@@ -1596,7 +1596,7 @@ SOCKET32 WINAPI WINSOCK_socket32(INT32 af, INT32 type, INT32 protocol)
 	case AF_INET:
 	case AF_UNSPEC: break;
 	default:        pwsi->err = WSAEAFNOSUPPORT; 
-			return INVALID_SOCKET32;
+			return INVALID_SOCKET;
     }
 
     /* check the socket type */
@@ -1606,12 +1606,12 @@ SOCKET32 WINAPI WINSOCK_socket32(INT32 af, INT32 type, INT32 protocol)
 	case SOCK_DGRAM:
 	case SOCK_RAW:  break;
 	default:        pwsi->err = WSAESOCKTNOSUPPORT; 
-			return INVALID_SOCKET32;
+			return INVALID_SOCKET;
     }
 
     /* check the protocol type */
     if ( protocol < 0 )  /* don't support negative values */
-    { pwsi->err = WSAEPROTONOSUPPORT; return INVALID_SOCKET32; }
+    { pwsi->err = WSAEPROTONOSUPPORT; return INVALID_SOCKET; }
 
     if ( af == AF_UNSPEC)  /* did they not specify the address family? */
         switch(protocol) 
@@ -1620,7 +1620,7 @@ SOCKET32 WINAPI WINSOCK_socket32(INT32 af, INT32 type, INT32 protocol)
              if (type == SOCK_STREAM) { af = AF_INET; break; }
           case IPPROTO_UDP:
              if (type == SOCK_DGRAM)  { af = AF_INET; break; }
-          default: pwsi->err = WSAEPROTOTYPE; return INVALID_SOCKET32;
+          default: pwsi->err = WSAEPROTOTYPE; return INVALID_SOCKET;
         }
 
     if ((sock = socket(af, type, protocol)) >= 0) 
@@ -1637,7 +1637,7 @@ SOCKET32 WINAPI WINSOCK_socket32(INT32 af, INT32 type, INT32 protocol)
 	
         close(sock);
         pwsi->err = WSAENOBUFS;
-        return INVALID_SOCKET32;
+        return INVALID_SOCKET;
     }
 
     if (errno == EPERM) /* raw socket denied */
@@ -1648,7 +1648,7 @@ SOCKET32 WINAPI WINSOCK_socket32(INT32 af, INT32 type, INT32 protocol)
   }
  
   WARN(winsock, "\t\tfailed!\n");
-  return INVALID_SOCKET32;
+  return INVALID_SOCKET;
 }
 
 /***********************************************************************
@@ -1656,7 +1656,7 @@ SOCKET32 WINAPI WINSOCK_socket32(INT32 af, INT32 type, INT32 protocol)
  */
 SOCKET16 WINAPI WINSOCK_socket16(INT16 af, INT16 type, INT16 protocol)
 {
-    return (SOCKET16)WINSOCK_socket32( af, type, protocol );
+    return (SOCKET16)WINSOCK_socket( af, type, protocol );
 }
     
 
@@ -1700,8 +1700,8 @@ SEGPTR WINAPI WINSOCK_gethostbyaddr16(const char *addr, INT16 len, INT16 type)
     return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
 }
 
-struct WIN_hostent* WINAPI WINSOCK_gethostbyaddr32(const char *addr, INT32 len,
-                                                INT32 type)
+struct WIN_hostent* WINAPI WINSOCK_gethostbyaddr(const char *addr, INT len,
+                                                INT type)
 {
     TRACE(winsock, "ptr %08x, len %d, type %d\n",
                              (unsigned) addr, len, type);
@@ -1735,7 +1735,7 @@ SEGPTR WINAPI WINSOCK_gethostbyname16(const char *name)
     return (retval)? SEGPTR_GET(retval) : ((SEGPTR)NULL) ;
 }
 
-struct WIN_hostent* WINAPI WINSOCK_gethostbyname32(const char* name)
+struct WIN_hostent* WINAPI WINSOCK_gethostbyname(const char* name)
 {
     TRACE(winsock, "%s\n", (name)?name:NULL_STRING);
     return __ws_gethostbyname( name, WS_DUP_LINEAR );
@@ -1769,7 +1769,7 @@ SEGPTR WINAPI WINSOCK_getprotobyname16(const char *name)
     return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
 }
 
-struct WIN_protoent* WINAPI WINSOCK_getprotobyname32(const char* name)
+struct WIN_protoent* WINAPI WINSOCK_getprotobyname(const char* name)
 {
     TRACE(winsock, "%s\n", (name)?name:NULL_STRING);
     return __ws_getprotobyname(name, WS_DUP_LINEAR);
@@ -1803,7 +1803,7 @@ SEGPTR WINAPI WINSOCK_getprotobynumber16(INT16 number)
     return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
 }
 
-struct WIN_protoent* WINAPI WINSOCK_getprotobynumber32(INT32 number)
+struct WIN_protoent* WINAPI WINSOCK_getprotobynumber(INT number)
 {
     TRACE(winsock, "%i\n", number);
     return __ws_getprotobynumber(number, WS_DUP_LINEAR);
@@ -1842,7 +1842,7 @@ SEGPTR WINAPI WINSOCK_getservbyname16(const char *name, const char *proto)
     return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
 }
 
-struct WIN_servent* WINAPI WINSOCK_getservbyname32(const char *name, const char *proto)
+struct WIN_servent* WINAPI WINSOCK_getservbyname(const char *name, const char *proto)
 {
     TRACE(winsock, "'%s', '%s'\n",
                             (name)?name:NULL_STRING, (proto)?proto:NULL_STRING);
@@ -1882,7 +1882,7 @@ SEGPTR WINAPI WINSOCK_getservbyport16(INT16 port, const char *proto)
     return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL);
 }
 
-struct WIN_servent* WINAPI WINSOCK_getservbyport32(INT32 port, const char *proto)
+struct WIN_servent* WINAPI WINSOCK_getservbyport(INT port, const char *proto)
 {
     TRACE(winsock, "%i, '%s'\n",
                             (int)port, (proto)?proto:NULL_STRING);
@@ -1893,7 +1893,7 @@ struct WIN_servent* WINAPI WINSOCK_getservbyport32(INT32 port, const char *proto
 /***********************************************************************
  *              gethostname()           (WSOCK32.57)
  */
-INT32 WINAPI WINSOCK_gethostname32(char *name, INT32 namelen)
+INT WINAPI WINSOCK_gethostname(char *name, INT namelen)
 {
     LPWSINFO              pwsi = wsi_find(GetCurrentTask());
 
@@ -1912,7 +1912,7 @@ INT32 WINAPI WINSOCK_gethostname32(char *name, INT32 namelen)
  */
 INT16 WINAPI WINSOCK_gethostname16(char *name, INT16 namelen)
 {
-    return (INT16)WINSOCK_gethostname32(name, namelen);
+    return (INT16)WINSOCK_gethostname(name, namelen);
 }
 
 
@@ -1941,8 +1941,8 @@ HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 uMsg, LPCSTR addr,
 /***********************************************************************
  *       WSAAsyncGetHostByAddr()        (WSOCK32.102)
  */
-HANDLE32 WINAPI WSAAsyncGetHostByAddr32(HWND32 hWnd, UINT32 uMsg, LPCSTR addr,
-                               INT32 len, INT32 type, LPSTR sbuf, INT32 buflen)
+HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr,
+                               INT len, INT type, LPSTR sbuf, INT buflen)
 {
   LPWSINFO              pwsi = wsi_find(GetCurrentTask());
 
@@ -1976,8 +1976,8 @@ buffer %i\n", (unsigned)pwsi, hWnd, uMsg, (name)?name:NULL_STRING, (int)buflen )
 /***********************************************************************
  *       WSAAsyncGetHostByName32()	(WSOCK32.103)
  */
-HANDLE32 WINAPI WSAAsyncGetHostByName32(HWND32 hWnd, UINT32 uMsg, LPCSTR name, 
-					LPSTR sbuf, INT32 buflen)
+HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, 
+					LPSTR sbuf, INT buflen)
 {
   LPWSINFO              pwsi = wsi_find(GetCurrentTask());
   TRACE(winsock, "(%08x): hwnd %04x, msg %08x, host %s, buffer %i\n", 
@@ -2010,8 +2010,8 @@ HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
 /***********************************************************************
  *       WSAAsyncGetProtoByName()       (WSOCK32.105)
  */
-HANDLE32 WINAPI WSAAsyncGetProtoByName32(HWND32 hWnd, UINT32 uMsg, LPCSTR name,
-                                         LPSTR sbuf, INT32 buflen)
+HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name,
+                                         LPSTR sbuf, INT buflen)
 {
   LPWSINFO              pwsi = wsi_find(GetCurrentTask());
 
@@ -2045,8 +2045,8 @@ HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd, UINT16 uMsg, INT16 numbe
 /***********************************************************************
  *       WSAAsyncGetProtoByNumber()     (WSOCK32.104)
  */
-HANDLE32 WINAPI WSAAsyncGetProtoByNumber32(HWND32 hWnd, UINT32 uMsg, INT32 number,
-                                           LPSTR sbuf, INT32 buflen)
+HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number,
+                                           LPSTR sbuf, INT buflen)
 {
   LPWSINFO              pwsi = wsi_find(GetCurrentTask());
 
@@ -2086,8 +2086,8 @@ HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
 /***********************************************************************
  *       WSAAsyncGetServByName()        (WSOCK32.107)
  */
-HANDLE32 WINAPI WSAAsyncGetServByName32(HWND32 hWnd, UINT32 uMsg, LPCSTR name,
-                                        LPCSTR proto, LPSTR sbuf, INT32 buflen)
+HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name,
+                                        LPCSTR proto, LPSTR sbuf, INT buflen)
 {
   LPWSINFO              pwsi = wsi_find(GetCurrentTask());
 
@@ -2131,8 +2131,8 @@ HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 uMsg, INT16 port,
 /***********************************************************************
  *       WSAAsyncGetServByPort()        (WSOCK32.106)
  */
-HANDLE32 WINAPI WSAAsyncGetServByPort32(HWND32 hWnd, UINT32 uMsg, INT32 port,
-                                        LPCSTR proto, LPSTR sbuf, INT32 buflen)
+HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port,
+                                        LPCSTR proto, LPSTR sbuf, INT buflen)
 {
   LPWSINFO              pwsi = wsi_find(GetCurrentTask());
 
@@ -2154,9 +2154,9 @@ HANDLE32 WINAPI WSAAsyncGetServByPort32(HWND32 hWnd, UINT32 uMsg, INT32 port,
 /***********************************************************************
  *       WSACancelAsyncRequest()	(WINSOCK.108)(WSOCK32.109)
  */
-INT32 WINAPI WSACancelAsyncRequest32(HANDLE32 hAsyncTaskHandle)
+INT WINAPI WSACancelAsyncRequest(HANDLE hAsyncTaskHandle)
 {
-    INT32		retVal = SOCKET_ERROR;
+    INT		retVal = SOCKET_ERROR;
     LPWSINFO		pwsi = wsi_find(GetCurrentTask());
     ws_async_op*	p_aop = (ws_async_op*)WS_HANDLE2PTR(hAsyncTaskHandle);
 
@@ -2179,7 +2179,7 @@ INT32 WINAPI WSACancelAsyncRequest32(HANDLE32 hAsyncTaskHandle)
 
 INT16 WINAPI WSACancelAsyncRequest16(HANDLE16 hAsyncTaskHandle)
 {
-    return (HANDLE16)WSACancelAsyncRequest32((HANDLE32)hAsyncTaskHandle);
+    return (HANDLE16)WSACancelAsyncRequest((HANDLE)hAsyncTaskHandle);
 }
 
 /***********************************************************************
@@ -2188,7 +2188,7 @@ INT16 WINAPI WSACancelAsyncRequest16(HANDLE16 hAsyncTaskHandle)
 
 static ws_select_op* __ws_select_list = NULL;
 
-BOOL32 WINSOCK_HandleIO( int* max_fd, int num_pending, 
+BOOL WINSOCK_HandleIO( int* max_fd, int num_pending, 
 			 fd_set pending_set[3], fd_set event_set[3] )
 {
     /* This function is called by the event dispatcher
@@ -2196,7 +2196,7 @@ BOOL32 WINSOCK_HandleIO( int* max_fd, int num_pending,
      * the event_set[] containing all fd that are being watched */
 
     ws_select_op*	psop = __ws_select_list;
-    BOOL32		bPost = FALSE;
+    BOOL		bPost = FALSE;
     DWORD		dwEvent, dwErrBytes;
     int			num_posted;
 
@@ -2291,7 +2291,7 @@ BOOL32 WINSOCK_HandleIO( int* max_fd, int num_pending,
 		    /* this will be reenabled when send() or sendto() fail with
 		     * WSAEWOULDBLOCK */
 
-		    if( PostMessage32A( psop->hWnd, psop->uMsg, (WPARAM32)WS_PTR2HANDLE(psop->pws), 
+		    if( PostMessageA( psop->hWnd, psop->uMsg, (WPARAM)WS_PTR2HANDLE(psop->pws), 
 			              (LPARAM)WSAMAKESELECTREPLY( WS_FD_WRITE, 0 ) ) )
 		    {
 			TRACE(winsock, "\t    hwnd %04x - %04x, %08x\n",
@@ -2358,8 +2358,8 @@ BOOL32 WINSOCK_HandleIO( int* max_fd, int num_pending,
 	    {
 		TRACE(winsock, "\t    hwnd %04x - %04x, %08x\n", 
 				psop->hWnd, psop->uMsg, (unsigned)dwEvent );
-		PostMessage32A( psop->hWnd, psop->uMsg, 
-			      (WPARAM32)WS_PTR2HANDLE(psop->pws), (LPARAM)dwEvent );
+		PostMessageA( psop->hWnd, psop->uMsg, 
+			      (WPARAM)WS_PTR2HANDLE(psop->pws), (LPARAM)dwEvent );
 		bPost = FALSE;
 		num_posted++;
 	    }
@@ -2371,7 +2371,7 @@ BOOL32 WINSOCK_HandleIO( int* max_fd, int num_pending,
     return ( num_posted ) ? TRUE : FALSE;
 }
 
-INT32 WINAPI WSAAsyncSelect32(SOCKET32 s, HWND32 hWnd, UINT32 uMsg, UINT32 lEvent)
+INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent)
 {
     ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -2448,9 +2448,9 @@ INT32 WINAPI WSAAsyncSelect32(SOCKET32 s, HWND32 hWnd, UINT32 uMsg, UINT32 lEven
     return SOCKET_ERROR; 
 }
 
-INT16 WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, UINT32 lEvent)
+INT16 WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, UINT lEvent)
 {
-    return (INT16)WSAAsyncSelect32( s, hWnd, wMsg, lEvent );
+    return (INT16)WSAAsyncSelect( s, hWnd, wMsg, lEvent );
 }
 
 
@@ -2471,7 +2471,7 @@ INT16 WINAPI __WSAFDIsSet16(SOCKET16 s, ws_fd_set16 *set)
 /***********************************************************************
  *      __WSAFDIsSet()			(WSOCK32.151)
  */
-INT32 WINAPI __WSAFDIsSet32(SOCKET32 s, ws_fd_set32 *set)
+INT WINAPI __WSAFDIsSet(SOCKET s, ws_fd_set32 *set)
 {
   int i = set->fd_count;
 
@@ -2485,7 +2485,7 @@ INT32 WINAPI __WSAFDIsSet32(SOCKET32 s, ws_fd_set32 *set)
 /***********************************************************************
  *      WSAIsBlocking()			(WINSOCK.114)(WSOCK32.114)
  */
-BOOL32 WINAPI WSAIsBlocking(void)
+BOOL WINAPI WSAIsBlocking(void)
 {
   /* By default WinSock should set all its sockets to non-blocking mode
    * and poll in PeekMessage loop when processing "blocking" ones. This 
@@ -2502,7 +2502,7 @@ BOOL32 WINAPI WSAIsBlocking(void)
 /***********************************************************************
  *      WSACancelBlockingCall()		(WINSOCK.113)(WSOCK32.113)
  */
-INT32 WINAPI WSACancelBlockingCall(void)
+INT WINAPI WSACancelBlockingCall(void)
 {
   LPWSINFO              pwsi = wsi_find(GetCurrentTask());
 
@@ -2527,7 +2527,7 @@ FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc)
   { 
       prev = (FARPROC16)pwsi->blocking_hook; 
       pwsi->blocking_hook = (DWORD)lpBlockFunc; 
-      pwsi->flags &= ~WSI_BLOCKINGHOOK32;
+      pwsi->flags &= ~WSI_BLOCKINGHOOK;
       return prev; 
   }
   return 0;
@@ -2537,17 +2537,17 @@ FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc)
 /***********************************************************************
  *      WSASetBlockingHook32()
  */
-FARPROC32 WINAPI WSASetBlockingHook32(FARPROC32 lpBlockFunc)
+FARPROC WINAPI WSASetBlockingHook(FARPROC lpBlockFunc)
 {
-  FARPROC32             prev;
+  FARPROC             prev;
   LPWSINFO              pwsi = wsi_find(GetCurrentTask());
 
   TRACE(winsock, "(%08x): hook %08x\n",
 	       (unsigned)pwsi, (unsigned) lpBlockFunc);
   if( pwsi ) {
-      prev = (FARPROC32)pwsi->blocking_hook;
+      prev = (FARPROC)pwsi->blocking_hook;
       pwsi->blocking_hook = (DWORD)lpBlockFunc;
-      pwsi->flags |= WSI_BLOCKINGHOOK32;
+      pwsi->flags |= WSI_BLOCKINGHOOK;
       return prev;
   }
   return NULL;
@@ -2570,7 +2570,7 @@ INT16 WINAPI WSAUnhookBlockingHook16(void)
 /***********************************************************************
  *      WSAUnhookBlockingHook32()
  */
-INT32 WINAPI WSAUnhookBlockingHook32(void)
+INT WINAPI WSAUnhookBlockingHook(void)
 {
     LPWSINFO              pwsi = wsi_find(GetCurrentTask());
 
@@ -2578,7 +2578,7 @@ INT32 WINAPI WSAUnhookBlockingHook32(void)
     if( pwsi )
     {
 	pwsi->blocking_hook = 0;
-	pwsi->flags &= ~WSI_BLOCKINGHOOK32;
+	pwsi->flags &= ~WSI_BLOCKINGHOOK;
 	return 0;
     }
     return SOCKET_ERROR;
diff --git a/misc/winsock_dns.c b/misc/winsock_dns.c
index 4e5aa6af856..906faa2cd73 100644
--- a/misc/winsock_dns.c
+++ b/misc/winsock_dns.c
@@ -267,7 +267,7 @@ static int aop_control(ws_async_op* p_aop, int flag )
                      return AOP_CONTROL_REMOVE;
             }
 	}
-        else lLength =  ((UINT32)LOWORD(lLength)) | ((unsigned)WSAENOBUFS << 16);
+        else lLength =  ((UINT)LOWORD(lLength)) | ((unsigned)WSAENOBUFS << 16);
     } /* failure */
 
      /* was a __WS_ASYNC_DEBUG statement */
@@ -277,14 +277,14 @@ static int aop_control(ws_async_op* p_aop, int flag )
 
     /* FIXME: update num_async_rq */
     EVENT_DeleteIO( p_aop->fd[0], EVENT_IO_READ );
-    PostMessage32A( p_aop->hWnd, p_aop->uMsg, __ws_gethandle(p_aop), (LPARAM)lLength );
+    PostMessageA( p_aop->hWnd, p_aop->uMsg, __ws_gethandle(p_aop), (LPARAM)lLength );
     
     return AOP_CONTROL_REMOVE;  /* one-shot request */
 }
 
 
-HANDLE16 __WSAsyncDBQuery(LPWSINFO pwsi, HWND32 hWnd, UINT32 uMsg, INT32 type, 
-    LPCSTR init, INT32 len, LPCSTR proto, void* sbuf, INT32 buflen, UINT32 flag)
+HANDLE16 __WSAsyncDBQuery(LPWSINFO pwsi, HWND hWnd, UINT uMsg, INT type, 
+    LPCSTR init, INT len, LPCSTR proto, void* sbuf, INT buflen, UINT flag)
 {
     /* queue 'flag' request and fork off its handler */
 
@@ -332,7 +332,7 @@ HANDLE16 __WSAsyncDBQuery(LPWSINFO pwsi, HWND32 hWnd, UINT32 uMsg, INT32 type,
 	    }
 	    else
 	    {
-	    	extern BOOL32 THREAD_InitDone;
+	    	extern BOOL THREAD_InitDone;
 
 	        THREAD_InitDone = FALSE;
 		/* child process */
diff --git a/misc/wsprintf.c b/misc/wsprintf.c
index 67779015b9b..bba6946cf3a 100644
--- a/misc/wsprintf.c
+++ b/misc/wsprintf.c
@@ -35,9 +35,9 @@ typedef enum
 
 typedef struct
 {
-    UINT32         flags;
-    UINT32         width;
-    UINT32         precision;
+    UINT         flags;
+    UINT         width;
+    UINT         precision;
     WPRINTF_TYPE   type;
 } WPRINTF_FORMAT;
 
@@ -53,7 +53,7 @@ static const WCHAR null_stringW[] = { '(', 'n', 'u', 'l', 'l', ')', 0 };
  *
  * Return value is the length of the format specification in characters.
  */
-static INT32 WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res )
+static INT WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res )
 {
     LPCSTR p = format;
 
@@ -114,7 +114,7 @@ static INT32 WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res )
         p--;  /* print format as normal char */
         break;
     }
-    return (INT32)(p - format) + 1;
+    return (INT)(p - format) + 1;
 }
 
 
@@ -127,7 +127,7 @@ static INT32 WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res )
  *
  * Return value is the length of the format specification in characters.
  */
-static INT32 WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res )
+static INT WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res )
 {
     LPCWSTR p = format;
 
@@ -186,17 +186,17 @@ static INT32 WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res )
         p--;  /* print format as normal char */
         break;
     }
-    return (INT32)(p - format) + 1;
+    return (INT)(p - format) + 1;
 }
 
 
 /***********************************************************************
  *           WPRINTF_GetLen
  */
-static UINT32 WPRINTF_GetLen( WPRINTF_FORMAT *format, LPCVOID arg,
-                              LPSTR number, UINT32 maxlen )
+static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, LPCVOID arg,
+                              LPSTR number, UINT maxlen )
 {
-    UINT32 len;
+    UINT len;
 
     if (format->flags & WPRINTF_LEFTALIGN) format->flags &= ~WPRINTF_ZEROPAD;
     if (format->width > maxlen) format->width = maxlen;
@@ -218,15 +218,15 @@ static UINT32 WPRINTF_GetLen( WPRINTF_FORMAT *format, LPCVOID arg,
         if (len > maxlen) len = maxlen;
         return (format->precision = len);
     case WPR_SIGNED:
-        len = sprintf( number, "%d", *(INT32 *)arg );
+        len = sprintf( number, "%d", *(INT *)arg );
         break;
     case WPR_UNSIGNED:
-        len = sprintf( number, "%u", *(UINT32 *)arg );
+        len = sprintf( number, "%u", *(UINT *)arg );
         break;
     case WPR_HEXA:
         len = sprintf( number,
                         (format->flags & WPRINTF_UPPER_HEX) ? "%X" : "%x",
-                        *(UINT32 *)arg );
+                        *(UINT *)arg );
         if (format->flags & WPRINTF_PREFIX_HEX) len += 2;
         break;
     default:
@@ -258,7 +258,7 @@ static LPVOID WPRINTF_ExtractVAPtr( WPRINTF_FORMAT *format, va_list* args )
         case WPR_HEXA:
         case WPR_SIGNED:
         case WPR_UNSIGNED:
-            return (LPVOID)va_arg( *args, INT32 ); 
+            return (LPVOID)va_arg( *args, INT ); 
         default:
             return NULL;
     }
@@ -272,7 +272,7 @@ INT16 WINAPI wvsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec,
 {
     WPRINTF_FORMAT format;
     LPSTR p = buffer;
-    UINT32 i, len;
+    UINT i, len;
     CHAR number[20];
     DWORD cur_arg;
 
@@ -297,14 +297,14 @@ INT16 WINAPI wvsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec,
         case WPR_SIGNED:
             if (!(format.flags & WPRINTF_LONG))
             {
-                cur_arg = (DWORD)(INT32)VA_ARG16( args, INT16 );
+                cur_arg = (DWORD)(INT)VA_ARG16( args, INT16 );
                 break;
             }
             /* fall through */
         case WPR_HEXA:
         case WPR_UNSIGNED:
             if (format.flags & WPRINTF_LONG)
-                cur_arg = (DWORD)VA_ARG16( args, UINT32 );
+                cur_arg = (DWORD)VA_ARG16( args, UINT );
             else
                 cur_arg = (DWORD)VA_ARG16( args, UINT16 );
             break;
@@ -354,19 +354,19 @@ INT16 WINAPI wvsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec,
         maxlen -= len;
     }
     *p = 0;
-    return (maxlen > 1) ? (INT32)(p - buffer) : -1;
+    return (maxlen > 1) ? (INT)(p - buffer) : -1;
 }
 
 
 /***********************************************************************
  *           wvsnprintf32A   (Not a Windows API)
  */
-INT32 WINAPI wvsnprintf32A( LPSTR buffer, UINT32 maxlen, LPCSTR spec,
+INT WINAPI wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec,
                             va_list args )
 {
     WPRINTF_FORMAT format;
     LPSTR p = buffer;
-    UINT32 i, len;
+    UINT i, len;
     CHAR number[20];
     LPVOID argPtr = NULL;
 
@@ -431,19 +431,19 @@ INT32 WINAPI wvsnprintf32A( LPSTR buffer, UINT32 maxlen, LPCSTR spec,
     }
     *p = 0;
     TRACE(string,"%s\n",buffer);
-    return (maxlen > 1) ? (INT32)(p - buffer) : -1;
+    return (maxlen > 1) ? (INT)(p - buffer) : -1;
 }
 
 
 /***********************************************************************
  *           wvsnprintf32W   (Not a Windows API)
  */
-INT32 WINAPI wvsnprintf32W( LPWSTR buffer, UINT32 maxlen, LPCWSTR spec,
+INT WINAPI wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec,
                             va_list args )
 {
     WPRINTF_FORMAT format;
     LPWSTR p = buffer;
-    UINT32 i, len;
+    UINT i, len;
     CHAR number[20];
 
     while (*spec && (maxlen > 1))
@@ -493,7 +493,7 @@ INT32 WINAPI wvsnprintf32W( LPWSTR buffer, UINT32 maxlen, LPCWSTR spec,
         case WPR_UNSIGNED:
             for (i = len; i < format.precision; i++, maxlen--) *p++ = '0';
             for (i = 0; i < len; i++) *p++ = (WCHAR)number[i];
-            (void)va_arg( args, INT32 ); /* Go to the next arg */
+            (void)va_arg( args, INT ); /* Go to the next arg */
             break;
         case WPR_UNKNOWN:
             continue;
@@ -504,7 +504,7 @@ INT32 WINAPI wvsnprintf32W( LPWSTR buffer, UINT32 maxlen, LPCWSTR spec,
         maxlen -= len;
     }
     *p = 0;
-    return (maxlen > 1) ? (INT32)(p - buffer) : -1;
+    return (maxlen > 1) ? (INT)(p - buffer) : -1;
 }
 
 
@@ -521,20 +521,20 @@ INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, LPCVOID args )
 /***********************************************************************
  *           wvsprintf32A   (USER32.587)
  */
-INT32 WINAPI wvsprintf32A( LPSTR buffer, LPCSTR spec, va_list args )
+INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args )
 {
     TRACE(string,"for %p got:\n",buffer);
-    return wvsnprintf32A( buffer, 0xffffffff, spec, args );
+    return wvsnprintfA( buffer, 0xffffffff, spec, args );
 }
 
 
 /***********************************************************************
  *           wvsprintf32W   (USER32.588)
  */
-INT32 WINAPI wvsprintf32W( LPWSTR buffer, LPCWSTR spec, va_list args )
+INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args )
 {
     TRACE(string,"for %p got:\n",buffer);
-    return wvsnprintf32W( buffer, 0xffffffff, spec, args );
+    return wvsnprintfW( buffer, 0xffffffff, spec, args );
 }
 
 
@@ -550,7 +550,7 @@ INT16 WINAPIV wsprintf16( LPSTR buffer, LPCSTR spec, ... )
     TRACE(string,"for %p got:\n",buffer);
     va_start( valist, spec );
     /* Note: we call the 32-bit version, because the args are 32-bit */
-    res = (INT16)wvsnprintf32A( buffer, 0xffffffff, spec, valist );
+    res = (INT16)wvsnprintfA( buffer, 0xffffffff, spec, valist );
     va_end( valist );
     return res;
 }
@@ -576,14 +576,14 @@ INT16 WINAPIV WIN16_wsprintf16(void)
 /***********************************************************************
  *           wsprintf32A   (USER32.585)
  */
-INT32 WINAPIV wsprintf32A( LPSTR buffer, LPCSTR spec, ... )
+INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... )
 {
     va_list valist;
-    INT32 res;
+    INT res;
 
     TRACE(string,"for %p got:\n",buffer);
     va_start( valist, spec );
-    res = wvsnprintf32A( buffer, 0xffffffff, spec, valist );
+    res = wvsnprintfA( buffer, 0xffffffff, spec, valist );
     va_end( valist );
     return res;
 }
@@ -592,14 +592,14 @@ INT32 WINAPIV wsprintf32A( LPSTR buffer, LPCSTR spec, ... )
 /***********************************************************************
  *           wsprintf32W   (USER32.586)
  */
-INT32 WINAPIV wsprintf32W( LPWSTR buffer, LPCWSTR spec, ... )
+INT WINAPIV wsprintfW( LPWSTR buffer, LPCWSTR spec, ... )
 {
     va_list valist;
-    INT32 res;
+    INT res;
 
     TRACE(string,"wsprintf32W for %p\n",buffer);
     va_start( valist, spec );
-    res = wvsnprintf32W( buffer, 0xffffffff, spec, valist );
+    res = wvsnprintfW( buffer, 0xffffffff, spec, valist );
     va_end( valist );
     return res;
 }
@@ -623,13 +623,13 @@ INT16 WINAPIV wsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec, ... )
 /***********************************************************************
  *           wsnprintf32A   (Not a Windows API)
  */
-INT32 WINAPIV wsnprintf32A( LPSTR buffer, UINT32 maxlen, LPCSTR spec, ... )
+INT WINAPIV wsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, ... )
 {
     va_list valist;
-    INT32 res;
+    INT res;
 
     va_start( valist, spec );
-    res = wvsnprintf32A( buffer, maxlen, spec, valist );
+    res = wvsnprintfA( buffer, maxlen, spec, valist );
     va_end( valist );
     return res;
 }
@@ -638,13 +638,13 @@ INT32 WINAPIV wsnprintf32A( LPSTR buffer, UINT32 maxlen, LPCSTR spec, ... )
 /***********************************************************************
  *           wsnprintf32W   (Not a Windows API)
  */
-INT32 WINAPIV wsnprintf32W( LPWSTR buffer, UINT32 maxlen, LPCWSTR spec, ... )
+INT WINAPIV wsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, ... )
 {
     va_list valist;
-    INT32 res;
+    INT res;
 
     va_start( valist, spec );
-    res = wvsnprintf32W( buffer, maxlen, spec, valist );
+    res = wvsnprintfW( buffer, maxlen, spec, valist );
     va_end( valist );
     return res;
 }
diff --git a/miscemu/instr.c b/miscemu/instr.c
index e2090d8c0f7..01f817c465e 100644
--- a/miscemu/instr.c
+++ b/miscemu/instr.c
@@ -49,7 +49,7 @@ extern DWORD CallFrom16_Start,CallFrom16_End;
  *
  * See Undocumented Windows, Chapter 5, __0040.
  */
-static BOOL32 INSTR_ReplaceSelector( SIGCONTEXT *context, WORD *sel )
+static BOOL INSTR_ReplaceSelector( SIGCONTEXT *context, WORD *sel )
 {
     if (IS_SELECTOR_SYSTEM(CS_sig(context)) &&
         (EIP_sig(context) >= (DWORD)&CallFrom16_Start) &&
@@ -234,7 +234,7 @@ static BYTE *INSTR_GetOperandAddr( SIGCONTEXT *context, BYTE *instr,
  *
  * Emulate the LDS (and LES,LFS,etc.) instruction.
  */
-static BOOL32 INSTR_EmulateLDS( SIGCONTEXT *context, BYTE *instr, int long_op,
+static BOOL INSTR_EmulateLDS( SIGCONTEXT *context, BYTE *instr, int long_op,
                                 int long_addr, int segprefix, int *len )
 {
     WORD seg;
@@ -317,7 +317,7 @@ static BOOL32 INSTR_EmulateLDS( SIGCONTEXT *context, BYTE *instr, int long_op,
  *
  * Emulate a priviledged instruction. Returns TRUE if emulation successful.
  */
-BOOL32 INSTR_EmulateInstruction( SIGCONTEXT *context )
+BOOL INSTR_EmulateInstruction( SIGCONTEXT *context )
 {
     int prefix, segprefix, prefixlen, len, repX, long_op, long_addr;
     SEGPTR gpHandler;
@@ -767,7 +767,7 @@ BOOL32 INSTR_EmulateInstruction( SIGCONTEXT *context )
 
 
     /* Check for Win16 __GP handler */
-    gpHandler = HasGPHandler( PTR_SEG_OFF_TO_SEGPTR( CS_sig(context),
+    gpHandler = HasGPHandler16( PTR_SEG_OFF_TO_SEGPTR( CS_sig(context),
                                                      EIP_sig(context) ) );
     if (gpHandler)
     {
diff --git a/miscemu/main.c b/miscemu/main.c
index 05cd7144b45..29b03e5a538 100644
--- a/miscemu/main.c
+++ b/miscemu/main.c
@@ -24,7 +24,7 @@ static char **MAIN_argv;
 /***********************************************************************
  *           Emulator initialisation
  */
-BOOL32 MAIN_EmulatorInit(void)
+BOOL MAIN_EmulatorInit(void)
 {
     /* Main initialization */
     if (!MAIN_MainInit()) return FALSE;
@@ -46,13 +46,13 @@ void MAIN_EmulatorRun( void )
 {
     extern void THUNK_InitCallout( void );
     char startProg[256], defProg[256];
-    HINSTANCE32 handle;
+    HINSTANCE handle;
     int i, tasks = 0;
-    MSG32 msg;
+    MSG msg;
 
     /* Load system DLLs into the initial process (and initialize them) */
-    if (   !LoadLibrary16("GDI.EXE" ) || !LoadLibrary32A("GDI32.DLL" )
-        || !LoadLibrary16("USER.EXE") || !LoadLibrary32A("USER32.DLL"))
+    if (   !LoadLibrary16("GDI.EXE" ) || !LoadLibraryA("GDI32.DLL" )
+        || !LoadLibrary16("USER.EXE") || !LoadLibraryA("USER32.DLL"))
         ExitProcess( 1 );
 
     /* Get pointers to USER routines called by KERNEL */
@@ -81,7 +81,7 @@ void MAIN_EmulatorRun( void )
     /* Load and run executables given on command line */
     for (i = 1; i < MAIN_argc; i++)
     {
-        if ((handle = WinExec32( MAIN_argv[i], SW_SHOWNORMAL )) < 32)
+        if ((handle = WinExec( MAIN_argv[i], SW_SHOWNORMAL )) < 32)
         {
             MSG("wine: can't exec '%s': ", MAIN_argv[i]);
             switch (handle)
@@ -103,10 +103,10 @@ void MAIN_EmulatorRun( void )
 
     /* Start message loop for desktop window */
 
-    while ( GetNumTasks() > 1 && Callout.GetMessage32A( &msg, 0, 0, 0 ) )
+    while ( GetNumTasks16() > 1 && Callout.GetMessageA( &msg, 0, 0, 0 ) )
     {
-        Callout.TranslateMessage32( &msg );
-        Callout.DispatchMessage32A( &msg );
+        Callout.TranslateMessage( &msg );
+        Callout.DispatchMessageA( &msg );
     }
 
     ExitProcess( 0 );
@@ -162,7 +162,7 @@ int main( int argc, char *argv[] )
 
     /* Load kernel modules */
     if (!LoadLibrary16(  "KERNEL" )) return 1;
-    if (!LoadLibrary32A( "KERNEL32" )) return 1;
+    if (!LoadLibraryA( "KERNEL32" )) return 1;
 
     /* Create initial task */
     if ( !(pModule = NE_GetPtr( GetModuleHandle16( "KERNEL32" ) )) ) return 1;
diff --git a/msdos/dosmem.c b/msdos/dosmem.c
index fea99ee5c4e..1e71decc244 100644
--- a/msdos/dosmem.c
+++ b/msdos/dosmem.c
@@ -277,7 +277,7 @@ static void DOSMEM_InitCollateTable()
 	unsigned char	*tbl;
 	int		i;
 
-	x = GlobalDOSAlloc(258);
+	x = GlobalDOSAlloc16(258);
 	DOSMEM_CollateTable = MAKELONG(0,(x>>16));
 	tbl = DOSMEM_MapRealToLinear(DOSMEM_CollateTable);
 	*(WORD*)tbl	= 0x100;
@@ -327,7 +327,7 @@ static void DOSMEM_InitErrorTable()
         /* interface (a farcall returned with INT 24 (AX = 0x122e, DL = */
         /* 0x08) which lets us have a smaller memory footprint anyway. */
  
- 	x = GlobalDOSAlloc(SIZE_TO_ALLOCATE);  
+ 	x = GlobalDOSAlloc16(SIZE_TO_ALLOCATE);  
 
 	DOSMEM_ErrorCall = MAKELONG(0,(x>>16));
         DOSMEM_ErrorBuffer = DOSMEM_ErrorCall + code;
@@ -373,7 +373,7 @@ static void DOSMEM_InitMemory(HMODULE16 hModule)
  * Create the dos memory segments, and store them into the KERNEL
  * exported values.
  */
-BOOL32 DOSMEM_Init(HMODULE16 hModule)
+BOOL DOSMEM_Init(HMODULE16 hModule)
 {
     if (!hModule)
     {
@@ -428,9 +428,9 @@ void DOSMEM_Tick( WORD timer )
  *
  * Carve a chunk of the DOS memory block (without selector).
  */
-LPVOID DOSMEM_GetBlock(HMODULE16 hModule, UINT32 size, UINT16* pseg)
+LPVOID DOSMEM_GetBlock(HMODULE16 hModule, UINT size, UINT16* pseg)
 {
-   UINT32  	 blocksize;
+   UINT  	 blocksize;
    char         *block = NULL;
    dosmem_info  *info_block = DOSMEM_InfoBlock(hModule);
    dosmem_entry *dm;
@@ -446,7 +446,7 @@ LPVOID DOSMEM_GetBlock(HMODULE16 hModule, UINT32 size, UINT16* pseg)
 #ifdef __DOSMEM_DEBUG__
        if( (dm->size & DM_BLOCK_DEBUG) != DM_BLOCK_DEBUG )
        {
-	    WARN(dosmem,"MCB overrun! [prev = 0x%08x]\n", 4 + (UINT32)prev);
+	    WARN(dosmem,"MCB overrun! [prev = 0x%08x]\n", 4 + (UINT)prev);
 	    return NULL;
        }
        prev = dm;
@@ -501,7 +501,7 @@ LPVOID DOSMEM_GetBlock(HMODULE16 hModule, UINT32 size, UINT16* pseg)
 /***********************************************************************
  *           DOSMEM_FreeBlock
  */
-BOOL32 DOSMEM_FreeBlock(HMODULE16 hModule, void* ptr)
+BOOL DOSMEM_FreeBlock(HMODULE16 hModule, void* ptr)
 {
    dosmem_info  *info_block = DOSMEM_InfoBlock(hModule);
 
@@ -530,7 +530,7 @@ BOOL32 DOSMEM_FreeBlock(HMODULE16 hModule, void* ptr)
 /***********************************************************************
  *           DOSMEM_ResizeBlock
  */
-LPVOID DOSMEM_ResizeBlock(HMODULE16 hModule, void* ptr, UINT32 size, UINT16* pseg)
+LPVOID DOSMEM_ResizeBlock(HMODULE16 hModule, void* ptr, UINT size, UINT16* pseg)
 {
    char         *block = NULL;
    dosmem_info  *info_block = DOSMEM_InfoBlock(hModule);
@@ -547,7 +547,7 @@ LPVOID DOSMEM_ResizeBlock(HMODULE16 hModule, void* ptr, UINT32 size, UINT16* pse
 	 )
        {
 	     dosmem_entry  *next = NEXT_BLOCK(dm);
-	     UINT32 blocksize, orgsize = dm->size & DM_BLOCK_MASK;
+	     UINT blocksize, orgsize = dm->size & DM_BLOCK_MASK;
 
 	     while( next->size & DM_BLOCK_FREE ) /* collapse free blocks */
 	     {
@@ -593,9 +593,9 @@ LPVOID DOSMEM_ResizeBlock(HMODULE16 hModule, void* ptr, UINT32 size, UINT16* pse
 /***********************************************************************
  *           DOSMEM_Available
  */
-UINT32 DOSMEM_Available(HMODULE16 hModule)
+UINT DOSMEM_Available(HMODULE16 hModule)
 {
-   UINT32  	 blocksize, available = 0;
+   UINT  	 blocksize, available = 0;
    dosmem_entry *dm;
    
    dm = DOSMEM_RootBlock(hModule);
@@ -605,7 +605,7 @@ UINT32 DOSMEM_Available(HMODULE16 hModule)
 #ifdef __DOSMEM_DEBUG__
        if( (dm->size & DM_BLOCK_DEBUG) != DM_BLOCK_DEBUG )
        {
-	    WARN(dosmem,"MCB overrun! [prev = 0x%08x]\n", 4 + (UINT32)prev);
+	    WARN(dosmem,"MCB overrun! [prev = 0x%08x]\n", 4 + (UINT)prev);
 	    return NULL;
        }
        prev = dm;
@@ -636,12 +636,12 @@ UINT32 DOSMEM_Available(HMODULE16 hModule)
  *
  * Linear address to the DOS address space.
  */
-UINT32 DOSMEM_MapLinearToDos(LPVOID ptr)
+UINT DOSMEM_MapLinearToDos(LPVOID ptr)
 {
     if (((char*)ptr >= DOSMEM_MemoryBase(0)) &&
         ((char*)ptr < DOSMEM_MemoryBase(0) + 0x100000))
-	  return (UINT32)ptr - (UINT32)DOSMEM_MemoryBase(0);
-    return (UINT32)ptr;
+	  return (UINT)ptr - (UINT)DOSMEM_MemoryBase(0);
+    return (UINT)ptr;
 }
 
 
@@ -650,9 +650,9 @@ UINT32 DOSMEM_MapLinearToDos(LPVOID ptr)
  *
  * DOS linear address to the linear address space.
  */
-LPVOID DOSMEM_MapDosToLinear(UINT32 ptr)
+LPVOID DOSMEM_MapDosToLinear(UINT ptr)
 {
-    if (ptr < 0x100000) return (LPVOID)(ptr + (UINT32)DOSMEM_MemoryBase(0));
+    if (ptr < 0x100000) return (LPVOID)(ptr + (UINT)DOSMEM_MemoryBase(0));
     return (LPVOID)ptr;
 }
 
diff --git a/msdos/dpmi.c b/msdos/dpmi.c
index f2f01c39147..afe6e6ba190 100644
--- a/msdos/dpmi.c
+++ b/msdos/dpmi.c
@@ -662,7 +662,7 @@ void WINAPI INT_Int31Handler( CONTEXT *context )
     {
     case 0x0000:  /* Allocate LDT descriptors */
     	TRACE(int31,"allocate LDT descriptors (%d)\n",CX_reg(context));
-        if (!(AX_reg(context) = AllocSelectorArray( CX_reg(context) )))
+        if (!(AX_reg(context) = AllocSelectorArray16( CX_reg(context) )))
         {
     	    TRACE(int31,"failed\n");
             AX_reg(context) = 0x8011;  /* descriptor unavailable */
@@ -673,7 +673,7 @@ void WINAPI INT_Int31Handler( CONTEXT *context )
 
     case 0x0001:  /* Free LDT descriptor */
     	TRACE(int31,"free LDT descriptor (0x%04x)\n",BX_reg(context));
-        if (FreeSelector( BX_reg(context) ))
+        if (FreeSelector16( BX_reg(context) ))
         {
             AX_reg(context) = 0x8022;  /* invalid selector */
             SET_CFLAG(context);
@@ -777,17 +777,17 @@ void WINAPI INT_Int31Handler( CONTEXT *context )
             }
         }
 #endif
-        SetSelectorLimit( BX_reg(context), dw );
+        SetSelectorLimit16( BX_reg(context), dw );
         break;
 
     case 0x0009:  /* Set selector access rights */
     	TRACE(int31,"set selector access rights(0x%04x,0x%04x)\n",BX_reg(context),CX_reg(context));
-        SelectorAccessRights( BX_reg(context), 1, CX_reg(context) );
+        SelectorAccessRights16( BX_reg(context), 1, CX_reg(context) );
         break;
 
     case 0x000a:  /* Allocate selector alias */
     	TRACE(int31,"allocate selector alias (0x%04x)\n",BX_reg(context));
-        if (!(AX_reg(context) = AllocCStoDSAlias( BX_reg(context) )))
+        if (!(AX_reg(context) = AllocCStoDSAlias16( BX_reg(context) )))
         {
             AX_reg(context) = 0x8011;  /* descriptor unavailable */
             SET_CFLAG(context);
@@ -826,7 +826,7 @@ void WINAPI INT_Int31Handler( CONTEXT *context )
         break;
     case 0x0100:  /* Allocate DOS memory block */
         TRACE(int31,"allocate DOS memory block (0x%x paragraphs)\n",BX_reg(context));
-        dw = GlobalDOSAlloc((DWORD)BX_reg(context)<<4);
+        dw = GlobalDOSAlloc16((DWORD)BX_reg(context)<<4);
         if (dw) {
             AX_reg(context) = HIWORD(dw);
             DX_reg(context) = LOWORD(dw);
@@ -838,7 +838,7 @@ void WINAPI INT_Int31Handler( CONTEXT *context )
         break;
     case 0x0101:  /* Free DOS memory block */
         TRACE(int31,"free DOS memory block (0x%04x)\n",DX_reg(context));
-        dw = GlobalDOSFree(DX_reg(context));
+        dw = GlobalDOSFree16(DX_reg(context));
         if (!dw) {
             AX_reg(context) = 0x0009; /* memory block address invalid */
             SET_CFLAG(context);
@@ -906,7 +906,7 @@ void WINAPI INT_Int31Handler( CONTEXT *context )
             MEMMANINFO mmi;
 
             mmi.dwSize = sizeof(mmi);
-            MemManInfo(&mmi);
+            MemManInfo16(&mmi);
             ptr = (BYTE *)PTR_SEG_OFF_TO_LIN(ES_reg(context),DI_reg(context));
             /* the layout is just the same as MEMMANINFO, but without
              * the dwSize entry.
diff --git a/msdos/int21.c b/msdos/int21.c
index 84219c9a4c0..6f7c9b1e0c2 100644
--- a/msdos/int21.c
+++ b/msdos/int21.c
@@ -88,7 +88,7 @@ WORD sharing_pause = 1;        /* pause between retries */
 
 extern char TempDirectory[];
 
-static BOOL32 INT21_CreateHeap(void)
+static BOOL INT21_CreateHeap(void)
 {
     if (!(DosHeapHandle = GlobalAlloc16(GMEM_FIXED,sizeof(struct DosHeap))))
     {
@@ -159,7 +159,7 @@ static int INT21_GetFreeDiskSpace( CONTEXT *context )
     char root[] = "A:\\";
 
     *root += DOS_GET_DRIVE( DL_reg(context) );
-    if (!GetDiskFreeSpace32A( root, &cluster_sectors, &sector_bytes,
+    if (!GetDiskFreeSpaceA( root, &cluster_sectors, &sector_bytes,
                               &free_clusters, &total_clusters )) return 0;
     AX_reg(context) = cluster_sectors;
     BX_reg(context) = free_clusters;
@@ -231,7 +231,7 @@ static void ioctlGetDeviceInfo( CONTEXT *context )
     RESET_CFLAG(context);
 
     /* DOS device ? */
-    if ((dev = DOSFS_GetDeviceByHandle( FILE_GetHandle32(BX_reg(context)) )))
+    if ((dev = DOSFS_GetDeviceByHandle( FILE_GetHandle(BX_reg(context)) )))
     {
         DX_reg(context) = dev->flags;
         return;
@@ -250,7 +250,7 @@ static void ioctlGetDeviceInfo( CONTEXT *context )
      */
 }
 
-static BOOL32 ioctlGenericBlkDevReq( CONTEXT *context )
+static BOOL ioctlGenericBlkDevReq( CONTEXT *context )
 {
 	BYTE *dataptr = CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context));
 	int drive = DOS_GET_DRIVE( BL_reg(context) );
@@ -304,7 +304,7 @@ static BOOL32 ioctlGenericBlkDevReq( CONTEXT *context )
 				WORD sect   = *(WORD *)dataptr+5;
 				WORD nrsect = *(WORD *)dataptr+7;
 				BYTE *data  =  (BYTE *)dataptr+9;
-				int (*raw_func)(BYTE, DWORD, DWORD, BYTE *, BOOL32);
+				int (*raw_func)(BYTE, DWORD, DWORD, BYTE *, BOOL);
 
 				raw_func = (CL_reg(context) == 0x41) ?
 								DRIVE_RawWrite : DRIVE_RawRead;
@@ -324,7 +324,7 @@ static BOOL32 ioctlGenericBlkDevReq( CONTEXT *context )
 				DWORD	serial;
 
 				strcpy(path,"x:\\");path[0]=drive+'A';
-				GetVolumeInformation32A(
+				GetVolumeInformationA(
 					path,label,12,&serial,NULL,NULL,fsname,9
 				);
 				*(WORD*)dataptr		= 0;
@@ -422,7 +422,7 @@ char *INT21_DriveName(int drive)
       }
     return drivestring;
 }
-static BOOL32 INT21_CreateFile( CONTEXT *context )
+static BOOL INT21_CreateFile( CONTEXT *context )
 {
     AX_reg(context) = _lcreat16( CTX_SEG_OFF_TO_LIN(context, DS_reg(context),
                                           EDX_reg(context) ), CX_reg(context) );
@@ -441,9 +441,9 @@ static void OpenExistingFile( CONTEXT *context )
     }
 }
 
-static BOOL32 INT21_ExtendedOpenCreateFile(CONTEXT *context )
+static BOOL INT21_ExtendedOpenCreateFile(CONTEXT *context )
 {
-  BOOL32 bExtendedError = FALSE;
+  BOOL bExtendedError = FALSE;
   BYTE action = DL_reg(context);
 
   /* Shuffle arguments to call OpenExistingFile */
@@ -535,7 +535,7 @@ static BOOL32 INT21_ExtendedOpenCreateFile(CONTEXT *context )
 }
 
 
-static BOOL32 INT21_ChangeDir( CONTEXT *context )
+static BOOL INT21_ChangeDir( CONTEXT *context )
 {
     int drive;
     char *dirname = CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context));
@@ -593,7 +593,7 @@ static int INT21_FindFirst( CONTEXT *context )
 static int INT21_FindNext( CONTEXT *context )
 {
     FINDFILE_DTA *dta = (FINDFILE_DTA *)GetCurrentDTA(context);
-    WIN32_FIND_DATA32A entry;
+    WIN32_FIND_DATAA entry;
     int count;
 
     if (!dta->unixPath) return 0;
@@ -628,7 +628,7 @@ static int INT21_FindNext( CONTEXT *context )
 }
 
 
-static BOOL32 INT21_CreateTempFile( CONTEXT *context )
+static BOOL INT21_CreateTempFile( CONTEXT *context )
 {
     static int counter = 0;
     char *name = CTX_SEG_OFF_TO_LIN(context,  DS_reg(context), EDX_reg(context) );
@@ -653,7 +653,7 @@ static BOOL32 INT21_CreateTempFile( CONTEXT *context )
 }
 
 
-static BOOL32 INT21_GetCurrentDirectory( CONTEXT *context ) 
+static BOOL INT21_GetCurrentDirectory( CONTEXT *context ) 
 {
     int drive = DOS_GET_DRIVE( DL_reg(context) );
     char *ptr = (char *)CTX_SEG_OFF_TO_LIN(context,  DS_reg(context), ESI_reg(context) );
@@ -663,7 +663,7 @@ static BOOL32 INT21_GetCurrentDirectory( CONTEXT *context )
         SetLastError( ERROR_INVALID_DRIVE );
         return FALSE;
     }
-    lstrcpyn32A( ptr, DRIVE_GetDosCwd(drive), 64 );
+    lstrcpynA( ptr, DRIVE_GetDosCwd(drive), 64 );
     AX_reg(context) = 0x0100;			     /* success return code */
     return TRUE;
 }
@@ -751,7 +751,7 @@ static int INT21_FindNextFCB( CONTEXT *context )
     BYTE *fcb = (BYTE *)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context));
     FINDFILE_FCB *pFCB;
     DOS_DIRENTRY_LAYOUT *pResult = (DOS_DIRENTRY_LAYOUT *)GetCurrentDTA(context);
-    WIN32_FIND_DATA32A entry;
+    WIN32_FIND_DATAA entry;
     BYTE attr;
     int count;
 
@@ -837,7 +837,7 @@ static void fLock( CONTEXT * context )
 		BX_reg(context),
 		MAKELONG(DX_reg(context),CX_reg(context)),
 		MAKELONG(DI_reg(context),SI_reg(context))) ;
-          if (!LockFile(FILE_GetHandle32(BX_reg(context)),
+          if (!LockFile(FILE_GetHandle(BX_reg(context)),
                         MAKELONG(DX_reg(context),CX_reg(context)), 0,
                         MAKELONG(DI_reg(context),SI_reg(context)), 0)) {
 	    AX_reg(context) = GetLastError();
@@ -850,7 +850,7 @@ static void fLock( CONTEXT * context )
 		BX_reg(context),
 		MAKELONG(DX_reg(context),CX_reg(context)),
 		MAKELONG(DI_reg(context),SI_reg(context))) ;
-          if (!UnlockFile(FILE_GetHandle32(BX_reg(context)),
+          if (!UnlockFile(FILE_GetHandle(BX_reg(context)),
                           MAKELONG(DX_reg(context),CX_reg(context)), 0,
                           MAKELONG(DI_reg(context),SI_reg(context)), 0)) {
 	    AX_reg(context) = GetLastError();
@@ -864,7 +864,7 @@ static void fLock( CONTEXT * context )
      }
 } 
 
-static BOOL32
+static BOOL
 INT21_networkfunc (CONTEXT *context)
 {
      switch (AL_reg(context)) {
@@ -920,7 +920,7 @@ static WORD INT21_GetCurrentPSP()
         return pModule->lpDosTask->psp_seg;
     else
 #endif
-        return GetCurrentPDB();
+        return GetCurrentPDB16();
 }
 
 
@@ -1100,7 +1100,7 @@ static void INT21_GetExtendedError( CONTEXT *context )
  */
 void WINAPI DOS3Call( CONTEXT *context )
 {
-    BOOL32	bSetDOSExtendedError = FALSE;
+    BOOL	bSetDOSExtendedError = FALSE;
 
 
     TRACE(int21, "AX=%04x BX=%04x CX=%04x DX=%04x "
@@ -1539,7 +1539,7 @@ void WINAPI DOS3Call( CONTEXT *context )
     case 0x41: /* "UNLINK" - DELETE FILE */
         TRACE(int21,"UNLINK%s\n",
 	      (LPCSTR)CTX_SEG_OFF_TO_LIN(context,  DS_reg(context), EDX_reg(context)));
-        bSetDOSExtendedError = (!DeleteFile32A( CTX_SEG_OFF_TO_LIN(context,  DS_reg(context),
+        bSetDOSExtendedError = (!DeleteFileA( CTX_SEG_OFF_TO_LIN(context,  DS_reg(context),
                                                              EDX_reg(context) )));
         break;
 
@@ -1567,7 +1567,7 @@ void WINAPI DOS3Call( CONTEXT *context )
         case 0x00:
             TRACE(int21,"GET FILE ATTRIBUTES for %s\n", 
 		  (LPCSTR)CTX_SEG_OFF_TO_LIN(context,  DS_reg(context), EDX_reg(context)));
-            AX_reg(context) = (WORD)GetFileAttributes32A(
+            AX_reg(context) = (WORD)GetFileAttributesA(
                                           CTX_SEG_OFF_TO_LIN(context, DS_reg(context),
                                                              EDX_reg(context)));
             if (AX_reg(context) == 0xffff) bSetDOSExtendedError = TRUE;
@@ -1578,7 +1578,7 @@ void WINAPI DOS3Call( CONTEXT *context )
             TRACE(int21,"SET FILE ATTRIBUTES 0x%02x for %s\n", CX_reg(context),
 		  (LPCSTR)CTX_SEG_OFF_TO_LIN(context,  DS_reg(context), EDX_reg(context)));
             bSetDOSExtendedError = 
-		(!SetFileAttributes32A( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), 
+		(!SetFileAttributesA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), 
 							   EDX_reg(context)),
                                        			   CX_reg(context) ));
             break;
@@ -1599,7 +1599,7 @@ void WINAPI DOS3Call( CONTEXT *context )
             break;
         case 0x02:{
             const DOS_DEVICE *dev;
-            if ((dev = DOSFS_GetDeviceByHandle( FILE_GetHandle32(BX_reg(context)) )) &&
+            if ((dev = DOSFS_GetDeviceByHandle( FILE_GetHandle(BX_reg(context)) )) &&
                 !strcasecmp( dev->name, "SCSIMGR$" ))
             {
                 ASPI_DOS_HandleInt(context);
@@ -1716,10 +1716,10 @@ void WINAPI DOS3Call( CONTEXT *context )
 
     case 0x45: /* "DUP" - DUPLICATE FILE HANDLE */
         {
-            HANDLE32 handle;
+            HANDLE handle;
             TRACE(int21,"DUP - DUPLICATE FILE HANDLE %d\n",BX_reg(context));
             if ((bSetDOSExtendedError = !DuplicateHandle( GetCurrentProcess(),
-                                                          FILE_GetHandle32(BX_reg(context)),
+                                                          FILE_GetHandle(BX_reg(context)),
                                                           GetCurrentProcess(), &handle,
                                                           0, TRUE, DUPLICATE_SAME_ACCESS )))
                 AX_reg(context) = HFILE_ERROR16;
@@ -1752,7 +1752,7 @@ void WINAPI DOS3Call( CONTEXT *context )
 	      }
 	    else
 	      {
-		mem = (LPVOID)GlobalDOSAlloc(BX_reg(context)<<4);
+		mem = (LPVOID)GlobalDOSAlloc16(BX_reg(context)<<4);
 		if (mem)
 		  AX_reg(context) = (DWORD)mem&0xffff;
 	      }
@@ -1768,12 +1768,12 @@ void WINAPI DOS3Call( CONTEXT *context )
     case 0x49: /* FREE MEMORY */
         TRACE(int21,"FREE MEMORY segment %04lX\n", ES_reg(context));
         {
-	  BOOL32 ret;
+	  BOOL ret;
 	  if (ISV86(context))
 	    ret= DOSMEM_FreeBlock(0,DOSMEM_MapDosToLinear(ES_reg(context)<<4));
 	  else
 	    {
-	      ret = !GlobalDOSFree(ES_reg(context));
+	      ret = !GlobalDOSFree16(ES_reg(context));
 	      /* If we don't reset ES_reg, we will fail in the relay code */
 	      ES_reg(context)=ret;
 	    }
@@ -1870,7 +1870,7 @@ void WINAPI DOS3Call( CONTEXT *context )
 	      (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)),
 	      (LPCSTR)CTX_SEG_OFF_TO_LIN(context, ES_reg(context),EDI_reg(context)));
         bSetDOSExtendedError = 
-		(!MoveFile32A( CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)),
+		(!MoveFileA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)),
 			       CTX_SEG_OFF_TO_LIN(context, ES_reg(context),EDI_reg(context))));
         break;
 
@@ -1882,7 +1882,7 @@ void WINAPI DOS3Call( CONTEXT *context )
                 FILETIME filetime;
                 TRACE(int21,"GET FILE DATE AND TIME for handle %d\n",
 		      BX_reg(context));
-                if (!GetFileTime( FILE_GetHandle32(BX_reg(context)), NULL, NULL, &filetime ))
+                if (!GetFileTime( FILE_GetHandle(BX_reg(context)), NULL, NULL, &filetime ))
 		     bSetDOSExtendedError = TRUE;
                 else FileTimeToDosDateTime( &filetime, &DX_reg(context),
                                             &CX_reg(context) );
@@ -1897,7 +1897,7 @@ void WINAPI DOS3Call( CONTEXT *context )
                 DosDateTimeToFileTime( DX_reg(context), CX_reg(context),
                                        &filetime );
                 bSetDOSExtendedError = 
-			(!SetFileTime( FILE_GetHandle32(BX_reg(context)),
+			(!SetFileTime( FILE_GetHandle(BX_reg(context)),
                                       NULL, NULL, &filetime ));
             }
             break;
@@ -1980,7 +1980,7 @@ void WINAPI DOS3Call( CONTEXT *context )
         TRACE(int21,"TRUENAME %s\n",
 	      (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),ESI_reg(context)));
         {
-            if (!GetFullPathName32A( CTX_SEG_OFF_TO_LIN(context, DS_reg(context),
+            if (!GetFullPathNameA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context),
                                                         ESI_reg(context)), 128,
                                      CTX_SEG_OFF_TO_LIN(context, ES_reg(context),
                                                         EDI_reg(context)),NULL))
@@ -2056,7 +2056,7 @@ void WINAPI DOS3Call( CONTEXT *context )
     case 0x68: /* "FFLUSH" - COMMIT FILE */
     case 0x6a: /* COMMIT FILE */
         TRACE(int21,"FFLUSH/COMMIT handle %d\n",BX_reg(context));
-        bSetDOSExtendedError = (!FlushFileBuffers( FILE_GetHandle32(BX_reg(context)) ));
+        bSetDOSExtendedError = (!FlushFileBuffers( FILE_GetHandle(BX_reg(context)) ));
         break;		
 	
     case 0x69: /* DISK SERIAL NUMBER */
@@ -2085,7 +2085,7 @@ void WINAPI DOS3Call( CONTEXT *context )
         break;
 	
     case 0x71: /* MS-DOS 7 (Windows95) - LONG FILENAME FUNCTIONS */
-	if ((GetVersion32()&0xC0000004)!=0xC0000004) {
+	if ((GetVersion()&0xC0000004)!=0xC0000004) {
 	    /* not supported on anything but Win95 */
 	    TRACE(int21,"LONG FILENAME functions supported only by win95\n");
 	    SET_CFLAG(context);
@@ -2096,14 +2096,14 @@ void WINAPI DOS3Call( CONTEXT *context )
         case 0x39:  /* Create directory */
 	    TRACE(int21,"LONG FILENAME - MAKE DIRECTORY %s\n",
 		  (LPCSTR)CTX_SEG_OFF_TO_LIN(context,  DS_reg(context),EDX_reg(context)));
-            bSetDOSExtendedError = (!CreateDirectory32A( 
+            bSetDOSExtendedError = (!CreateDirectoryA( 
 					CTX_SEG_OFF_TO_LIN(context,  DS_reg(context),
                                                   EDX_reg(context) ), NULL));
             break;
         case 0x3a:  /* Remove directory */
 	    TRACE(int21,"LONG FILENAME - REMOVE DIRECTORY %s\n",
 		  (LPCSTR)CTX_SEG_OFF_TO_LIN(context,  DS_reg(context),EDX_reg(context)));
-            bSetDOSExtendedError = (!RemoveDirectory32A( 
+            bSetDOSExtendedError = (!RemoveDirectoryA( 
 					CTX_SEG_OFF_TO_LIN(context,  DS_reg(context),
                                                         EDX_reg(context) )));
             break;
@@ -2114,14 +2114,14 @@ void WINAPI DOS3Call( CONTEXT *context )
         {
         case 0x00: /* Get file attributes */
             TRACE(int21,"\tretrieve attributes\n");
-            CX_reg(context) = (WORD)GetFileAttributes32A(
+            CX_reg(context) = (WORD)GetFileAttributesA(
                                           CTX_SEG_OFF_TO_LIN(context, DS_reg(context),
                                                              EDX_reg(context)));
             if (CX_reg(context) == 0xffff) bSetDOSExtendedError = TRUE;
             break;
         case 0x01:
             TRACE(int21,"\tset attributes 0x%04x\n",CX_reg(context));
-            bSetDOSExtendedError = (!SetFileAttributes32A( 
+            bSetDOSExtendedError = (!SetFileAttributesA( 
 				  	CTX_SEG_OFF_TO_LIN(context, DS_reg(context),
                                                            EDX_reg(context)),
                                         CX_reg(context)  ) );
@@ -2146,7 +2146,7 @@ void WINAPI DOS3Call( CONTEXT *context )
             /* FIXME: use attributes in CX */
             if ((AX_reg(context) = FindFirstFile16(
                    CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)),
-                   (WIN32_FIND_DATA32A *)CTX_SEG_OFF_TO_LIN(context, ES_reg(context),
+                   (WIN32_FIND_DATAA *)CTX_SEG_OFF_TO_LIN(context, ES_reg(context),
                                                             EDI_reg(context))))
 		== INVALID_HANDLE_VALUE16)
 		bSetDOSExtendedError = TRUE;
@@ -2155,7 +2155,7 @@ void WINAPI DOS3Call( CONTEXT *context )
 	    TRACE(int21,"LONG FILENAME - FIND NEXT MATCHING FILE for handle %d\n",
 		  BX_reg(context));
             if (!FindNextFile16( BX_reg(context),
-                    (WIN32_FIND_DATA32A *)CTX_SEG_OFF_TO_LIN(context, ES_reg(context),
+                    (WIN32_FIND_DATAA *)CTX_SEG_OFF_TO_LIN(context, ES_reg(context),
                                                              EDI_reg(context))))
 		bSetDOSExtendedError = TRUE;
             break;
@@ -2172,7 +2172,7 @@ void WINAPI DOS3Call( CONTEXT *context )
 	  switch(CL_reg(context))
 	  {
 	    case 0x01:  /*Get short filename or path */
-	      if (!GetShortPathName32A
+	      if (!GetShortPathNameA
 		  ( CTX_SEG_OFF_TO_LIN(context, DS_reg(context),
 				       ESI_reg(context)),
 		    CTX_SEG_OFF_TO_LIN(context, ES_reg(context),
@@ -2181,7 +2181,7 @@ void WINAPI DOS3Call( CONTEXT *context )
 	      else AX_reg(context) = 0;
 	      break;
 	    case 0x02:  /*Get canonical long filename or path */
-	      if (!GetFullPathName32A
+	      if (!GetFullPathNameA
 		  ( CTX_SEG_OFF_TO_LIN(context, DS_reg(context),
 				       ESI_reg(context)), 128,
 		    CTX_SEG_OFF_TO_LIN(context, ES_reg(context),
@@ -2207,7 +2207,7 @@ void WINAPI DOS3Call( CONTEXT *context )
         case 0x3b:  /* Change directory */
             TRACE(int21,"LONG FILENAME - CHANGE DIRECTORY %s\n",
 		 (LPCSTR)CTX_SEG_OFF_TO_LIN(context,  DS_reg(context), EDX_reg(context))); 
-	    if (!SetCurrentDirectory32A(CTX_SEG_OFF_TO_LIN(context, 
+	    if (!SetCurrentDirectoryA(CTX_SEG_OFF_TO_LIN(context, 
 	    					DS_reg(context),
 				        	EDX_reg(context)
 					))
@@ -2219,7 +2219,7 @@ void WINAPI DOS3Call( CONTEXT *context )
         case 0x41:  /* Delete file */
             TRACE(int21,"LONG FILENAME - DELETE FILE %s\n",
 		 (LPCSTR)CTX_SEG_OFF_TO_LIN(context,  DS_reg(context), EDX_reg(context))); 
-	    if (!DeleteFile32A(CTX_SEG_OFF_TO_LIN(context, 
+	    if (!DeleteFileA(CTX_SEG_OFF_TO_LIN(context, 
 	    				DS_reg(context),
 					EDX_reg(context))
 	    )) {
@@ -2277,9 +2277,9 @@ void WINAPI DOS3Call( CONTEXT *context )
                  EFL_reg(context));
 }
 
-FARPROC16 WINAPI GetSetKernelDOSProc(FARPROC16 DosProc)
+FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc)
 {
-	FIXME(int21, "(DosProc=0x%08x): stub\n", (UINT32)DosProc);
+	FIXME(int21, "(DosProc=0x%08x): stub\n", (UINT)DosProc);
 	return NULL;
 }
 
diff --git a/msdos/int2f.c b/msdos/int2f.c
index 2740cf2114e..12dcd865672 100644
--- a/msdos/int2f.c
+++ b/msdos/int2f.c
@@ -255,7 +255,7 @@ static void do_int2f_16( CONTEXT *context )
     switch(AL_reg(context))
     {
     case 0x00:  /* Windows enhanced mode installation check */
-        AX_reg(context) = (GetWinFlags() & WF_ENHANCED) ?
+        AX_reg(context) = (GetWinFlags16() & WF_ENHANCED) ?
                                                   LOWORD(GetVersion16()) : 0;
         break;
 	
@@ -263,7 +263,7 @@ static void do_int2f_16( CONTEXT *context )
         AX_reg(context) = 0;
         BX_reg(context) = (LOWORD(GetVersion16()) << 8) |
                           (LOWORD(GetVersion16()) >> 8);
-        CX_reg(context) = (GetWinFlags() & WF_ENHANCED) ? 3 : 2;
+        CX_reg(context) = (GetWinFlags16() & WF_ENHANCED) ? 3 : 2;
         break;
 
     case 0x0b:  /* Identify Windows-aware TSRs */
diff --git a/msdos/int5c.c b/msdos/int5c.c
index 0a328081068..3498f1c6bd8 100644
--- a/msdos/int5c.c
+++ b/msdos/int5c.c
@@ -14,7 +14,7 @@
  *
  * Also handler for interrupt 5c. 
  */
-void WINAPI NetBIOSCall( CONTEXT *context )
+void WINAPI NetBIOSCall16( CONTEXT *context )
 {
     BYTE* ptr;
     ptr = (BYTE*) PTR_SEG_OFF_TO_LIN(ES_reg(context),BX_reg(context));
diff --git a/msdos/vxd.c b/msdos/vxd.c
index db81220e135..29dd3f8f925 100644
--- a/msdos/vxd.c
+++ b/msdos/vxd.c
@@ -689,9 +689,9 @@ void VXD_Win32s( CONTEXT *context )
         IMAGE_NT_HEADERS *nt_header = PE_HEADER(module->baseAddr);
         IMAGE_SECTION_HEADER *pe_seg = PE_SECTIONS(module->baseAddr);
 
-        HFILE32 image = _lopen32(module->pathName, OF_READ);
-        BOOL32 error = (image == INVALID_HANDLE_VALUE32);
-        UINT32 i;
+        HFILE image = _lopen(module->pathName, OF_READ);
+        BOOL error = (image == INVALID_HANDLE_VALUE);
+        UINT i;
 
         TRACE(vxd, "MapModule: Loading %s\n", module->pathName);
 
@@ -708,12 +708,12 @@ void VXD_Win32s( CONTEXT *context )
                            "Section %d at %08lx from %08lx len %08lx\n", 
                            i, (DWORD)addr, off, len);
 
-                if (   _llseek32(image, off, SEEK_SET) != off
-                    || _lread32(image, addr, len) != len)
+                if (   _llseek(image, off, SEEK_SET) != off
+                    || _lread(image, addr, len) != len)
                     error = TRUE;
             }
         
-        _lclose32(image);
+        _lclose(image);
 
         if (error)
             ERR(vxd, "MapModule: Unable to load %s\n", module->pathName);
@@ -1005,38 +1005,38 @@ void VXD_Win32s( CONTEXT *context )
          */
     {
         DWORD *stack    = (DWORD *)   W32S_APP2WINE(EDX_reg(context), W32S_OFFSET);
-        HANDLE32 *retv  = (HANDLE32 *)W32S_APP2WINE(stack[0], W32S_OFFSET);
+        HANDLE *retv  = (HANDLE *)W32S_APP2WINE(stack[0], W32S_OFFSET);
         DWORD  flags1   = stack[1];
         DWORD  atom     = stack[2];
         LARGE_INTEGER *size = (LARGE_INTEGER *)W32S_APP2WINE(stack[3], W32S_OFFSET);
         DWORD  protect  = stack[4];
         DWORD  flags2   = stack[5];
-        HFILE32 hFile   = FILE_GetHandle32(stack[6]);
+        HFILE hFile   = FILE_GetHandle(stack[6]);
         DWORD  psp      = stack[7];
 
-        HANDLE32 result = INVALID_HANDLE_VALUE32;
+        HANDLE result = INVALID_HANDLE_VALUE;
         char name[128];
 
         TRACE(vxd, "NtCreateSection(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n",
                    (DWORD)retv, flags1, atom, (DWORD)size, protect, flags2,
                    (DWORD)hFile, psp);
 
-        if (!atom || GlobalGetAtomName32A(atom, name, sizeof(name)))
+        if (!atom || GlobalGetAtomNameA(atom, name, sizeof(name)))
         {
             TRACE(vxd, "NtCreateSection: name=%s\n", atom? name : NULL);
 
-            result = CreateFileMapping32A(hFile, NULL, protect, 
+            result = CreateFileMappingA(hFile, NULL, protect, 
                                           size? size->HighPart : 0, 
                                           size? size->LowPart  : 0, 
                                           atom? name : NULL);
         }
 
-        if (result == INVALID_HANDLE_VALUE32)
+        if (result == INVALID_HANDLE_VALUE)
             WARN(vxd, "NtCreateSection: failed!\n");
         else
             TRACE(vxd, "NtCreateSection: returned %lx\n", (DWORD)result);
 
-        if (result != INVALID_HANDLE_VALUE32)
+        if (result != INVALID_HANDLE_VALUE)
             *retv            = result,
             EAX_reg(context) = STATUS_SUCCESS;
         else
@@ -1058,29 +1058,29 @@ void VXD_Win32s( CONTEXT *context )
          */
     {
         DWORD *stack    = (DWORD *)W32S_APP2WINE(EDX_reg(context), W32S_OFFSET);
-        HANDLE32 *retv  = (HANDLE32 *)W32S_APP2WINE(stack[0], W32S_OFFSET);
+        HANDLE *retv  = (HANDLE *)W32S_APP2WINE(stack[0], W32S_OFFSET);
         DWORD  protect  = stack[1];
         DWORD  atom     = stack[2];
 
-        HANDLE32 result = INVALID_HANDLE_VALUE32;
+        HANDLE result = INVALID_HANDLE_VALUE;
         char name[128];
 
         TRACE(vxd, "NtOpenSection(%lx, %lx, %lx)\n", 
                    (DWORD)retv, protect, atom);
 
-        if (atom && GlobalGetAtomName32A(atom, name, sizeof(name)))
+        if (atom && GlobalGetAtomNameA(atom, name, sizeof(name)))
         {
             TRACE(vxd, "NtOpenSection: name=%s\n", name);
 
-            result = OpenFileMapping32A(protect, FALSE, name);
+            result = OpenFileMappingA(protect, FALSE, name);
         }
 
-        if (result == INVALID_HANDLE_VALUE32)
+        if (result == INVALID_HANDLE_VALUE)
             WARN(vxd, "NtOpenSection: failed!\n");
         else
             TRACE(vxd, "NtOpenSection: returned %lx\n", (DWORD)result);
 
-        if (result != INVALID_HANDLE_VALUE32)
+        if (result != INVALID_HANDLE_VALUE)
             *retv            = result,
             EAX_reg(context) = STATUS_SUCCESS;
         else
@@ -1101,7 +1101,7 @@ void VXD_Win32s( CONTEXT *context )
          */
     {
         DWORD *stack    = (DWORD *)W32S_APP2WINE(EDX_reg(context), W32S_OFFSET);
-        HANDLE32 handle = stack[0];
+        HANDLE handle = stack[0];
         DWORD *id       = (DWORD *)W32S_APP2WINE(stack[1], W32S_OFFSET);
 
         TRACE(vxd, "NtCloseSection(%lx, %lx)\n", (DWORD)handle, (DWORD)id);
@@ -1124,8 +1124,8 @@ void VXD_Win32s( CONTEXT *context )
          */
     {
         DWORD *stack    = (DWORD *)W32S_APP2WINE(EDX_reg(context), W32S_OFFSET);
-        HANDLE32 handle = stack[0];
-        HANDLE32 new_handle;
+        HANDLE handle = stack[0];
+        HANDLE new_handle;
 
         TRACE(vxd, "NtDupSection(%lx)\n", (DWORD)handle);
  
@@ -1156,7 +1156,7 @@ void VXD_Win32s( CONTEXT *context )
          */
     {
         DWORD *  stack          = (DWORD *)W32S_APP2WINE(EDX_reg(context), W32S_OFFSET);
-        HANDLE32 SectionHandle  = stack[0];
+        HANDLE SectionHandle  = stack[0];
         DWORD    ProcessHandle  = stack[1]; /* ignored */
         DWORD *  BaseAddress    = (DWORD *)W32S_APP2WINE(stack[2], W32S_OFFSET);
         DWORD    ZeroBits       = stack[3];
@@ -1317,7 +1317,7 @@ void VXD_Win32s( CONTEXT *context )
             EDX_reg(context) = 0x80;
         else
         {
-            PDB *psp = PTR_SEG_OFF_TO_LIN(BX_reg(context), 0);
+            PDB16 *psp = PTR_SEG_OFF_TO_LIN(BX_reg(context), 0);
             psp->nbFiles = 32;
             psp->fileHandlesPtr = MAKELONG(HIWORD(EBX_reg(context)), 0x5c);
             memset((LPBYTE)psp + 0x5c, '\xFF', 32);
@@ -1561,7 +1561,7 @@ void VXD_Win32s( CONTEXT *context )
          */
     {
         DWORD *ptr = (DWORD *)W32S_APP2WINE(ECX_reg(context), W32S_OFFSET);
-        BOOL32 set = EDX_reg(context);
+        BOOL set = EDX_reg(context);
         
         TRACE(vxd, "FWorkingSetSize(%lx, %lx)\n", (DWORD)ptr, (DWORD)set);
 
diff --git a/msdos/xms.c b/msdos/xms.c
index 8e7cbde63eb..17802fa17a8 100644
--- a/msdos/xms.c
+++ b/msdos/xms.c
@@ -53,7 +53,7 @@ void WINAPI XMS_Handler( CONTEXT *context )
 
         TRACE(int31, "query free extended memory\n");
 	mmi.dwSize = sizeof(mmi);
-	MemManInfo(&mmi);
+	MemManInfo16(&mmi);
         AX_reg(context) = mmi.dwLargestFreeBlock >> 10;
 	    DX_reg(context) = (mmi.dwFreePages * VIRTUAL_GetPageSize()) >> 10;
         TRACE(int31, "returning largest %dK, total %dK\n", AX_reg(context), DX_reg(context));
diff --git a/multimedia/audio.c b/multimedia/audio.c
index 994d2f5481a..8078ed409ee 100644
--- a/multimedia/audio.c
+++ b/multimedia/audio.c
@@ -83,7 +83,7 @@ static DWORD WAVE_NotifyClient(UINT16 wDevID, WORD wMsg,
 	if (wDevID > MAX_WAVEOUTDRV) return MCIERR_INTERNAL;
 	
 	if (WOutDev[wDevID].wFlags != DCB_NULL && 
-	    !DriverCallback(
+	    !DriverCallback16(
 								  WOutDev[wDevID].waveDesc.dwCallBack, 
 								  WOutDev[wDevID].wFlags, 
 								  WOutDev[wDevID].waveDesc.hWave, 
@@ -102,7 +102,7 @@ static DWORD WAVE_NotifyClient(UINT16 wDevID, WORD wMsg,
 	if (wDevID > MAX_WAVEINDRV) return MCIERR_INTERNAL;
 	
 	if (WInDev[wDevID].wFlags != DCB_NULL && 
-	    !DriverCallback(
+	    !DriverCallback16(
 			    WInDev[wDevID].waveDesc.dwCallBack, 
 			    WInDev[wDevID].wFlags, 
 			    WInDev[wDevID].waveDesc.hWave, 
@@ -1079,7 +1079,7 @@ LONG WAVE_DriverProc16(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg,
 /**************************************************************************
  * 				WAVE_DriverProc32		[sample driver]
  */
-LONG WAVE_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG WAVE_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 		       DWORD dwParam1, DWORD dwParam2)
 {
     TRACE(wave,"(%08lX, %04X, %08lX, %08lX, %08lX)\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2);
@@ -1096,7 +1096,7 @@ LONG WAVE_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
     case DRV_REMOVE:		return DRVCNF_RESTART;
     default:
 	FIXME(wave, "is probably wrong msg=0x%04lx\n", wMsg);
-	return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MMSYSERR_NOTENABLED;
 }
@@ -1135,7 +1135,7 @@ LONG WAVE_DriverProc16(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg,
 /**************************************************************************
  * 				WAVE_DriverProc32		[sample driver]
  */
-LONG WAVE_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG WAVE_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 		       DWORD dwParam1, DWORD dwParam2)
 {
     return MMSYSERR_NOTENABLED;
diff --git a/multimedia/dplay.c b/multimedia/dplay.c
index ad14fab2236..2a825f696f6 100644
--- a/multimedia/dplay.c
+++ b/multimedia/dplay.c
@@ -826,7 +826,7 @@ static HRESULT WINAPI IDirectPlayLobbyA_RunApplication
   DWORD dwFlags,
   LPDWORD lpdwAppID,
   LPDPLCONNECTION lpConn,
-  HANDLE32 hReceiveEvent )
+  HANDLE hReceiveEvent )
 {
   FIXME( dplay, ":stub\n");
   return DPERR_OUTOFMEMORY;
@@ -837,7 +837,7 @@ static HRESULT WINAPI IDirectPlayLobby2A_RunApplication
   DWORD dwFlags,
   LPDWORD lpdwAppID,
   LPDPLCONNECTION lpConn,
-  HANDLE32 hReceiveEvent )
+  HANDLE hReceiveEvent )
 {
   return IDirectPlayLobbyA_RunApplication( (LPDIRECTPLAYLOBBYA)this, dwFlags,
                                            lpdwAppID, lpConn, hReceiveEvent );
@@ -848,7 +848,7 @@ static HRESULT WINAPI IDirectPlayLobbyW_RunApplication
   DWORD dwFlags,
   LPDWORD lpdwAppID,
   LPDPLCONNECTION lpConn,
-  HANDLE32 hReceiveEvent )
+  HANDLE hReceiveEvent )
 {
   FIXME( dplay, ":stub\n");
   return DPERR_OUTOFMEMORY;
@@ -859,7 +859,7 @@ static HRESULT WINAPI IDirectPlayLobby2W_RunApplication
   DWORD dwFlags,
   LPDWORD lpdwAppID,
   LPDPLCONNECTION lpConn,
-  HANDLE32 hReceiveEvent )
+  HANDLE hReceiveEvent )
 {
   return IDirectPlayLobbyW_RunApplication( (LPDIRECTPLAYLOBBY)this, dwFlags,
                                            lpdwAppID, lpConn, hReceiveEvent );
@@ -1052,7 +1052,7 @@ static HRESULT WINAPI IDirectPlayLobbyA_SetLobbyMessageEvent
 ( LPDIRECTPLAYLOBBYA this,
   DWORD dwFlags,
   DWORD dwAppID,
-  HANDLE32 hReceiveEvent )
+  HANDLE hReceiveEvent )
 {
   FIXME( dplay, ":stub\n");
   return DPERR_OUTOFMEMORY;
@@ -1062,7 +1062,7 @@ static HRESULT WINAPI IDirectPlayLobby2A_SetLobbyMessageEvent
 ( LPDIRECTPLAYLOBBY2A this,
   DWORD dwFlags,
   DWORD dwAppID,
-  HANDLE32 hReceiveEvent )
+  HANDLE hReceiveEvent )
 {
   return IDirectPlayLobbyA_SetLobbyMessageEvent( (LPDIRECTPLAYLOBBYA)this, dwFlags,
                                                  dwAppID, hReceiveEvent ); 
@@ -1072,7 +1072,7 @@ static HRESULT WINAPI IDirectPlayLobbyW_SetLobbyMessageEvent
 ( LPDIRECTPLAYLOBBY this,
   DWORD dwFlags,
   DWORD dwAppID,
-  HANDLE32 hReceiveEvent )
+  HANDLE hReceiveEvent )
 {
   FIXME( dplay, ":stub\n");
   return DPERR_OUTOFMEMORY;
@@ -1082,7 +1082,7 @@ static HRESULT WINAPI IDirectPlayLobby2W_SetLobbyMessageEvent
 ( LPDIRECTPLAYLOBBY2 this,
   DWORD dwFlags,
   DWORD dwAppID,
-  HANDLE32 hReceiveEvent )
+  HANDLE hReceiveEvent )
 {
   return IDirectPlayLobbyW_SetLobbyMessageEvent( (LPDIRECTPLAYLOBBY)this, dwFlags,
                                                  dwAppID, hReceiveEvent ); 
@@ -1317,7 +1317,7 @@ HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA lpEnumCallback,
   }
 
   /* Need to loop over the service providers in the registry */
-  if( RegOpenKeyEx32A( HKEY_LOCAL_MACHINE, searchSubKey,
+  if( RegOpenKeyExA( HKEY_LOCAL_MACHINE, searchSubKey,
                        0, KEY_ENUMERATE_SUB_KEYS, &hkResult ) != ERROR_SUCCESS )
   {
     /* Hmmm. Does this mean that there are no service providers? */ 
@@ -1327,7 +1327,7 @@ HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA lpEnumCallback,
 
   /* Traverse all the service providers we have available */
   for( dwIndex=0;
-       RegEnumKey32A( hkResult, dwIndex, subKeyName, sizeOfSubKeyName ) !=
+       RegEnumKeyA( hkResult, dwIndex, subKeyName, sizeOfSubKeyName ) !=
          ERROR_NO_MORE_ITEMS;
        ++dwIndex )
   {
@@ -1341,7 +1341,7 @@ HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA lpEnumCallback,
     TRACE( dplay, " this time through: %s\n", subKeyName );
 
     /* Get a handle for this particular service provider */
-    if( RegOpenKeyEx32A( hkResult, subKeyName, 0, KEY_QUERY_VALUE,
+    if( RegOpenKeyExA( hkResult, subKeyName, 0, KEY_QUERY_VALUE,
                          &hkServiceProvider ) != ERROR_SUCCESS )
     {
       ERR( dplay, ": what the heck is going on?\n" );
@@ -1351,7 +1351,7 @@ HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA lpEnumCallback,
     /* Get the GUID, Device major number and device minor number 
      * from the registry. 
      */
-    if( RegQueryValueEx32A( hkServiceProvider, guidDataSubKey,
+    if( RegQueryValueExA( hkServiceProvider, guidDataSubKey,
                             NULL, &returnTypeGUID, returnBuffer,
                             &sizeOfReturnBuffer ) != ERROR_SUCCESS )
     {
@@ -1361,12 +1361,12 @@ HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA lpEnumCallback,
 
     /* FIXME: Check return types to ensure we're interpreting data right */
     lpWGUIDString = HEAP_strdupAtoW( GetProcessHeap(), 0, returnBuffer );
-    CLSIDFromString32( (LPCOLESTR32)lpWGUIDString, &serviceProviderGUID ); 
+    CLSIDFromString( (LPCOLESTR)lpWGUIDString, &serviceProviderGUID ); 
     HeapFree( GetProcessHeap(), 0, lpWGUIDString );
 
     sizeOfReturnBuffer = 50;
  
-    if( RegQueryValueEx32A( hkServiceProvider, majVerDataSubKey,
+    if( RegQueryValueExA( hkServiceProvider, majVerDataSubKey,
                             NULL, &returnTypeReserved1, returnBuffer,
                             &sizeOfReturnBuffer ) != ERROR_SUCCESS )
     {
@@ -1701,14 +1701,14 @@ HRESULT WINAPI DirectPlay3W_CreateGroup
 }
 
 HRESULT WINAPI DirectPlay3A_CreatePlayer
-          ( LPDIRECTPLAY3A this, LPDPID a, LPDPNAME b, HANDLE32 c, LPVOID d, DWORD e, DWORD f )
+          ( LPDIRECTPLAY3A this, LPDPID a, LPDPNAME b, HANDLE c, LPVOID d, DWORD e, DWORD f )
 {
   FIXME( dplay,"(%p)->(%p,%p,%d,%p,0x%08lx,0x%08lx): stub", this, a, b, c, d, e, f );
   return DP_OK;
 }
 
 HRESULT WINAPI DirectPlay3W_CreatePlayer
-          ( LPDIRECTPLAY3 this, LPDPID a, LPDPNAME b, HANDLE32 c, LPVOID d, DWORD e, DWORD f )
+          ( LPDIRECTPLAY3 this, LPDPID a, LPDPNAME b, HANDLE c, LPVOID d, DWORD e, DWORD f )
 {
   FIXME( dplay,"(%p)->(%p,%p,%d,%p,0x%08lx,0x%08lx): stub", this, a, b, c, d, e, f );
   return DP_OK;
diff --git a/multimedia/dsound.c b/multimedia/dsound.c
index f3148d66398..baa7ce46540 100644
--- a/multimedia/dsound.c
+++ b/multimedia/dsound.c
@@ -95,8 +95,8 @@ static void DSOUND_CloseAudio(void);
 
 #endif
 
-HRESULT WINAPI DirectSoundEnumerate32A(
-	LPDSENUMCALLBACK32A enumcb,
+HRESULT WINAPI DirectSoundEnumerateA(
+	LPDSENUMCALLBACKA enumcb,
 	LPVOID context)
 {
 	TRACE(dsound, "enumcb = %p, context = %p\n", enumcb, context);
@@ -1147,7 +1147,7 @@ static struct tagLPDIRECTSOUNDBUFFER_VTABLE dsbvt = {
  */
 
 static HRESULT WINAPI IDirectSound_SetCooperativeLevel(
-	LPDIRECTSOUND this,HWND32 hwnd,DWORD level
+	LPDIRECTSOUND this,HWND hwnd,DWORD level
 ) {
 	FIXME(dsound,"(%p,%08lx,%ld):stub\n",this,(DWORD)hwnd,level);
 	return 0;
@@ -1586,7 +1586,7 @@ static inline BYTE cvtS16toU8(INT16 word)
 /* We should be able to optimize these two inline functions */
 /* so that we aren't doing 8->16->8 conversions when it is */
 /* not necessary. But this is still a WIP. Optimize later. */
-static inline void get_fields(const IDirectSoundBuffer *dsb, BYTE *buf, INT32 *fl, INT32 *fr)
+static inline void get_fields(const IDirectSoundBuffer *dsb, BYTE *buf, INT *fl, INT *fr)
 {
 	INT16	*bufs = (INT16 *) buf;
 
@@ -1619,7 +1619,7 @@ static inline void get_fields(const IDirectSoundBuffer *dsb, BYTE *buf, INT32 *f
 	return;
 }
 
-static inline void set_fields(BYTE *buf, INT32 fl, INT32 fr)
+static inline void set_fields(BYTE *buf, INT fl, INT fr)
 {
 	INT16 *bufs = (INT16 *) buf;
 
@@ -1649,12 +1649,12 @@ static inline void set_fields(BYTE *buf, INT32 fl, INT32 fr)
 }
 
 /* Now with PerfectPitch (tm) technology */
-static INT32 DSOUND_MixerNorm(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
+static INT DSOUND_MixerNorm(IDirectSoundBuffer *dsb, BYTE *buf, INT len)
 {
-	INT32	i, size, ipos, ilen, fieldL, fieldR;
+	INT	i, size, ipos, ilen, fieldL, fieldR;
 	BYTE	*ibp, *obp;
-	INT32	iAdvance = dsb->wfx.nBlockAlign;
-	INT32	oAdvance = primarybuf->wfx.nBlockAlign;
+	INT	iAdvance = dsb->wfx.nBlockAlign;
+	INT	oAdvance = primarybuf->wfx.nBlockAlign;
 
 	ibp = dsb->buffer + dsb->playpos;
 	obp = buf;
@@ -1717,9 +1717,9 @@ static INT32 DSOUND_MixerNorm(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
 	return ilen;
 }
 
-static void DSOUND_MixerVol(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
+static void DSOUND_MixerVol(IDirectSoundBuffer *dsb, BYTE *buf, INT len)
 {
-	INT32	i, inc = primarybuf->wfx.wBitsPerSample >> 3;
+	INT	i, inc = primarybuf->wfx.wBitsPerSample >> 3;
 	BYTE	*bpc = buf;
 	INT16	*bps = (INT16 *) buf;
 	
@@ -1735,7 +1735,7 @@ static void DSOUND_MixerVol(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
 	/* this method. Oh well, tough patooties. */
 
 	for (i = 0; i < len; i += inc) {
-		INT32	val;
+		INT	val;
 
 		switch (inc) {
 
@@ -1762,7 +1762,7 @@ static void DSOUND_MixerVol(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
 }
 
 #ifdef USE_DSOUND3D
-static void DSOUND_Mixer3D(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
+static void DSOUND_Mixer3D(IDirectSoundBuffer *dsb, BYTE *buf, INT len)
 {
 	BYTE	*ibp, *obp;
 	DWORD	buflen, playpos;
@@ -1791,16 +1791,16 @@ static void DSOUND_Mixer3D(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
 
 static DWORD DSOUND_MixInBuffer(IDirectSoundBuffer *dsb)
 {
-	INT32	i, len, ilen, temp, field;
-	INT32	advance = primarybuf->wfx.wBitsPerSample >> 3;
+	INT	i, len, ilen, temp, field;
+	INT	advance = primarybuf->wfx.wBitsPerSample >> 3;
 	BYTE	*buf, *ibuf, *obuf;
 	INT16	*ibufs, *obufs;
 
 	len = DSOUND_FRAGLEN;			/* The most we will use */
 	if (!(dsb->playflags & DSBPLAY_LOOPING)) {
-		temp = MulDiv32(primarybuf->wfx.nAvgBytesPerSec, dsb->buflen,
+		temp = MulDiv(primarybuf->wfx.nAvgBytesPerSec, dsb->buflen,
 			dsb->nAvgBytesPerSec) -
-		       MulDiv32(primarybuf->wfx.nAvgBytesPerSec, dsb->playpos,
+		       MulDiv(primarybuf->wfx.nAvgBytesPerSec, dsb->playpos,
 			dsb->nAvgBytesPerSec);
 		len = (len > temp) ? temp : len;
 	}
@@ -1882,7 +1882,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBuffer *dsb)
 
 static DWORD WINAPI DSOUND_MixPrimary(void)
 {
-	INT32			i, len, maxlen = 0;
+	INT			i, len, maxlen = 0;
 	IDirectSoundBuffer	*dsb;
 
 	for (i = dsound->nrofbuffers - 1; i >= 0; i--) {
@@ -2128,7 +2128,7 @@ HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND *ppDS,IUnknown *pU
 	(*ppDS)->wfx.wBitsPerSample	= 8;
 
 	if (!dsound) {
-		HANDLE32	hnd;
+		HANDLE	hnd;
 		DWORD		xid;
 
 		dsound = (*ppDS);
@@ -2150,7 +2150,7 @@ HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND *ppDS,IUnknown *pU
 	}
 	return DS_OK;
 #else
-	MessageBox32A(0,"DirectSound needs the Open Sound System Driver, which has not been found by ./configure.","WINE DirectSound",MB_OK|MB_ICONSTOP);
+	MessageBoxA(0,"DirectSound needs the Open Sound System Driver, which has not been found by ./configure.","WINE DirectSound",MB_OK|MB_ICONSTOP);
 	return DSERR_NODRIVER;
 #endif
 }
@@ -2205,7 +2205,7 @@ static HRESULT WINAPI DSCF_CreateInstance(
 	return E_NOINTERFACE;
 }
 
-static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL32 dolock) {
+static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
 	ICOM_THIS(IClassFactoryImpl,iface);
 	FIXME(dsound,"(%p)->(%d),stub!\n",This,dolock);
 	return S_OK;
diff --git a/multimedia/init.c b/multimedia/init.c
index 02541826e64..92f7769c4e8 100644
--- a/multimedia/init.c
+++ b/multimedia/init.c
@@ -67,7 +67,7 @@ int unixToWindowsDeviceType(int type)
  * Initializes the MIDI devices information variables
  *
  */
-BOOL32 MULTIMEDIA_MidiInit(void)
+BOOL MULTIMEDIA_MidiInit(void)
 {
 #if defined(HAVE_OSS) && !defined(__NetBSD__) && !defined(__OpenBSD__)
     int 		i, status, numsynthdevs = 255, nummididevs = 255;
@@ -255,7 +255,7 @@ extern	int	mciInstalledCount;
 extern	int	mciInstalledListLen;
 extern	LPSTR	lpmciInstallNames;
 
-BOOL32 MULTIMEDIA_MciInit(void)
+BOOL MULTIMEDIA_MciInit(void)
 {
     int		len;
     LPSTR	ptr;
@@ -265,7 +265,7 @@ BOOL32 MULTIMEDIA_MciInit(void)
     mciInstalledListLen = 0;
     ptr = lpmciInstallNames = xmalloc(2048);
     /* FIXME: should do also some registry diving here */
-    GetPrivateProfileString32A("mci", NULL, "", lpmciInstallNames, 2000, SysFile);
+    GetPrivateProfileStringA("mci", NULL, "", lpmciInstallNames, 2000, SysFile);
     while (strlen(ptr) > 0) {
 	TRACE(mci, "---> '%s' \n", ptr);
 	len = strlen(ptr) + 1;
@@ -282,7 +282,7 @@ BOOL32 MULTIMEDIA_MciInit(void)
  * Initializes the multimedia information variables
  *
  */
-BOOL32 MULTIMEDIA_Init(void)
+BOOL MULTIMEDIA_Init(void)
 {
     return MULTIMEDIA_MidiInit() && MULTIMEDIA_MciInit();
 }
diff --git a/multimedia/joystick.c b/multimedia/joystick.c
index fb6c758d15f..930ec120fc3 100644
--- a/multimedia/joystick.c
+++ b/multimedia/joystick.c
@@ -103,17 +103,17 @@ void joySendMessages(void)
                         js.x = js.x*37;
                         js.y = js.y*37;
                         if ((joyCapData[joy].wXpos != js.x) || (joyCapData[joy].wYpos != js.y)) {
-                                SendMessage32A(CaptureWnd[joy], MM_JOY1MOVE + joy, js.buttons, MAKELONG(js.x, js.y));
+                                SendMessageA(CaptureWnd[joy], MM_JOY1MOVE + joy, js.buttons, MAKELONG(js.x, js.y));
                                 joyCapData[joy].wXpos = js.x;
                                 joyCapData[joy].wYpos = js.y;
                         }
                         if (joyCapData[joy].wButtons != js.buttons) {
 				unsigned int ButtonChanged = (WORD)(joyCapData[joy].wButtons ^ js.buttons)<<8;
                                 if (joyCapData[joy].wButtons < js.buttons)
-                                SendMessage32A(CaptureWnd[joy], MM_JOY1BUTTONDOWN + joy, ButtonChanged, MAKELONG(js.x, js.y));
+                                SendMessageA(CaptureWnd[joy], MM_JOY1BUTTONDOWN + joy, ButtonChanged, MAKELONG(js.x, js.y));
 				else
                                 if (joyCapData[joy].wButtons > js.buttons)
-                                SendMessage32A(CaptureWnd[joy], MM_JOY1BUTTONUP
+                                SendMessageA(CaptureWnd[joy], MM_JOY1BUTTONUP
 + joy, ButtonChanged, MAKELONG(js.x, js.y));
                                 joyCapData[joy].wButtons = js.buttons;
                         }
@@ -125,7 +125,7 @@ void joySendMessages(void)
 /**************************************************************************
  * 				JoyGetNumDevs		[MMSYSTEM.101]
  */
-UINT32 WINAPI joyGetNumDevs32(void)
+UINT WINAPI joyGetNumDevs(void)
 {
 	return joyGetNumDevs16();
 }
@@ -154,7 +154,7 @@ UINT16 WINAPI joyGetNumDevs16(void)
 /**************************************************************************
  * 				JoyGetDevCaps		[WINMM.27]
  */
-MMRESULT32 WINAPI joyGetDevCaps32A(UINT32 wID, LPJOYCAPS32A lpCaps,UINT32 wSize)
+MMRESULT WINAPI joyGetDevCapsA(UINT wID, LPJOYCAPSA lpCaps,UINT wSize)
 {
 	JOYCAPS16	jc16;
 	MMRESULT16	ret = joyGetDevCaps16(wID,&jc16,sizeof(jc16));
@@ -190,7 +190,7 @@ MMRESULT32 WINAPI joyGetDevCaps32A(UINT32 wID, LPJOYCAPS32A lpCaps,UINT32 wSize)
 /**************************************************************************
  * 				JoyGetDevCaps		[WINMM.28]
  */
-MMRESULT32 WINAPI joyGetDevCaps32W(UINT32 wID, LPJOYCAPS32W lpCaps,UINT32 wSize)
+MMRESULT WINAPI joyGetDevCapsW(UINT wID, LPJOYCAPSW lpCaps,UINT wSize)
 {
 	JOYCAPS16	jc16;
 	MMRESULT16	ret = joyGetDevCaps16(wID,&jc16,sizeof(jc16));
@@ -267,7 +267,7 @@ MMRESULT16 WINAPI joyGetDevCaps16(UINT16 wID, LPJOYCAPS16 lpCaps, UINT16 wSize)
 /**************************************************************************
  *                              JoyGetPosEx             [WINMM.31]
  */
-MMRESULT32 WINAPI joyGetPosEx(UINT32 wID, LPJOYINFOEX lpInfo)
+MMRESULT WINAPI joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo)
 {
 	/* FIXME: implement it */
 	return MMSYSERR_NODRIVER;
@@ -276,7 +276,7 @@ MMRESULT32 WINAPI joyGetPosEx(UINT32 wID, LPJOYINFOEX lpInfo)
 /**************************************************************************
  * 				JoyGetPos	       	[WINMM.30]
  */
-MMRESULT32 WINAPI joyGetPos32(UINT32 wID, LPJOYINFO32 lpInfo)
+MMRESULT WINAPI joyGetPos(UINT wID, LPJOYINFO lpInfo)
 {
 	JOYINFO16	ji;
 	MMRESULT16	ret = joyGetPos16(wID,&ji);
@@ -316,7 +316,7 @@ MMRESULT16 WINAPI joyGetPos16(UINT16 wID, LPJOYINFO16 lpInfo)
 /**************************************************************************
  * 				JoyGetThreshold		[WINMM.32]
  */
-MMRESULT32 WINAPI joyGetThreshold32(UINT32 wID, LPUINT32 lpThreshold)
+MMRESULT WINAPI joyGetThreshold(UINT wID, LPUINT lpThreshold)
 {
 	UINT16		thresh;
 	MMRESULT16	ret = joyGetThreshold16(wID,&thresh);
@@ -339,7 +339,7 @@ MMRESULT16 WINAPI joyGetThreshold16(UINT16 wID, LPUINT16 lpThreshold)
 /**************************************************************************
  * 				JoyReleaseCapture	[WINMM.33]
  */
-MMRESULT32 WINAPI joyReleaseCapture32(UINT32 wID)
+MMRESULT WINAPI joyReleaseCapture(UINT wID)
 {
 	return joyReleaseCapture16(wID);
 }
@@ -360,7 +360,7 @@ MMRESULT16 WINAPI joyReleaseCapture16(UINT16 wID)
 /**************************************************************************
  * 				JoySetCapture		[MMSYSTEM.106]
  */
-MMRESULT32 WINAPI joySetCapture32(HWND32 hWnd,UINT32 wID,UINT32 wPeriod,BOOL32 bChanged)
+MMRESULT WINAPI joySetCapture(HWND hWnd,UINT wID,UINT wPeriod,BOOL bChanged)
 {
 	return joySetCapture16(hWnd,wID,wPeriod,bChanged);
 }
@@ -387,7 +387,7 @@ MMRESULT16 WINAPI joySetCapture16(HWND16 hWnd,UINT16 wID,UINT16 wPeriod,BOOL16 b
 /**************************************************************************
  * 				JoySetThreshold		[WINMM.35]
  */
-MMRESULT32 WINAPI joySetThreshold32(UINT32 wID, UINT32 wThreshold)
+MMRESULT WINAPI joySetThreshold(UINT wID, UINT wThreshold)
 {
 	return joySetThreshold16(wID,wThreshold);
 }
diff --git a/multimedia/mcianim.c b/multimedia/mcianim.c
index d0421c81cf5..435423fbac5 100644
--- a/multimedia/mcianim.c
+++ b/multimedia/mcianim.c
@@ -28,7 +28,7 @@ typedef struct {
 	BOOL16  	fShareable;         /* TRUE if first open was shareable */
 	WORD    	wNotifyDeviceID;    /* MCI device ID with a pending notification */
 	HANDLE16 	hCallback;          /* Callback handle for pending notification */
-	MCI_OPEN_PARMS32A 	openParms;
+	MCI_OPEN_PARMSA 	openParms;
 	DWORD		dwTimeFormat;
 	int		mode;
 	UINT16		nCurTrack;
@@ -58,7 +58,7 @@ static WINE_MCIANIM*  ANIM_mciGetOpenDrv(UINT16 wDevID)
 /**************************************************************************
  * 				ANIM_mciOpen			[internal]
  */
-static DWORD ANIM_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpOpenParms)
+static DWORD ANIM_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpOpenParms)
 {
     DWORD		dwDeviceID;
     WINE_MCIANIM*	wma;
@@ -96,7 +96,7 @@ static DWORD ANIM_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpOp
 	}
 	FIXME(mcianim, "element is not opened\n");
     }
-    memcpy(&wma->openParms, lpOpenParms, sizeof(MCI_OPEN_PARMS32A));
+    memcpy(&wma->openParms, lpOpenParms, sizeof(MCI_OPEN_PARMSA));
     wma->wNotifyDeviceID = dwDeviceID;
     wma->mode = 0;
     wma->dwTimeFormat = MCI_FORMAT_TMSF;
@@ -585,7 +585,7 @@ static DWORD ANIM_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
 /**************************************************************************
  * 				ANIM_DriverProc32		[sample driver]
  */
-LONG MCIANIM_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG MCIANIM_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 		       DWORD dwParam1, DWORD dwParam2)
 {
     switch(wMsg) {
@@ -596,11 +596,11 @@ LONG MCIANIM_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
     case DRV_ENABLE:		return 1;
     case DRV_DISABLE:		return 1;
     case DRV_QUERYCONFIGURE:	return 1;
-    case DRV_CONFIGURE:		MessageBox32A(0, "Sample MultiMedia Linux Driver !", "MMLinux Driver", MB_OK); return 1;
+    case DRV_CONFIGURE:		MessageBoxA(0, "Sample MultiMedia Linux Driver !", "MMLinux Driver", MB_OK); return 1;
     case DRV_INSTALL:		return DRVCNF_RESTART;
     case DRV_REMOVE:		return DRVCNF_RESTART;
 
-    case MCI_OPEN_DRIVER:	return ANIM_mciOpen(dwDevID, dwParam1, (LPMCI_OPEN_PARMS32A)dwParam2); 
+    case MCI_OPEN_DRIVER:	return ANIM_mciOpen(dwDevID, dwParam1, (LPMCI_OPEN_PARMSA)dwParam2); 
     case MCI_CLOSE_DRIVER:	return ANIM_mciClose(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
     case MCI_GETDEVCAPS:	return ANIM_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2);
     case MCI_INFO:		return ANIM_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMS16)dwParam2);
@@ -635,7 +635,7 @@ LONG MCIANIM_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
 	break;
     default:			
 	TRACE(mcianim, "Sending msg=%s to default driver proc\n", MCI_CommandToString(wMsg));
-	return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;
 }
diff --git a/multimedia/mciavi.c b/multimedia/mciavi.c
index 0fc0231c25b..aaaab4b17aa 100644
--- a/multimedia/mciavi.c
+++ b/multimedia/mciavi.c
@@ -18,8 +18,8 @@ typedef struct {
     BOOL16  		fShareable;         	/* TRUE if first open was shareable 	     */
     WORD		wNotifyDeviceID;    	/* MCI device ID with a pending notification */
     HANDLE16 		hCallback;         	/* Callback handle for pending notification  */
-    HMMIO32		hFile;	            	/* mmio file handle open as Element          */
-    MCI_OPEN_PARMS32A 	openParms;
+    HMMIO		hFile;	            	/* mmio file handle open as Element          */
+    MCI_OPEN_PARMSA 	openParms;
     DWORD		dwTimeFormat;
 } WINE_MCIAVI;
 
@@ -44,7 +44,7 @@ static WINE_MCIAVI*  AVI_mciGetOpenDev(UINT16 wDevID)
 
 static	DWORD	AVI_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms);
 
-static	DWORD	AVI_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpParms)
+static	DWORD	AVI_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpParms)
 {
     WINE_MCIAVI*	wma;
 
@@ -203,7 +203,7 @@ static	DWORD	AVI_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags,  LPMCI_GETDEVCAPS_P
     return 0;
 }
 
-static	DWORD	AVI_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS32A lpParms)
+static	DWORD	AVI_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMSA lpParms)
 {
     DWORD		ret = 0;
     LPSTR		str = 0;
@@ -271,10 +271,10 @@ LONG MCIAVI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
     case DRV_ENABLE:		return 1;
     case DRV_DISABLE:		return 1;
     case DRV_QUERYCONFIGURE:	return 1;
-    case DRV_CONFIGURE:		MessageBox32A(0, "Sample AVI Wine Driver !", "MM-Wine Driver", MB_OK); return 1;
+    case DRV_CONFIGURE:		MessageBoxA(0, "Sample AVI Wine Driver !", "MM-Wine Driver", MB_OK); return 1;
     case DRV_INSTALL:		return DRVCNF_RESTART;
     case DRV_REMOVE:		return DRVCNF_RESTART;
-    case MCI_OPEN_DRIVER:	return AVI_mciOpen      (dwDevID, dwParam1, (LPMCI_OPEN_PARMS32A)   dwParam2);
+    case MCI_OPEN_DRIVER:	return AVI_mciOpen      (dwDevID, dwParam1, (LPMCI_OPEN_PARMSA)   dwParam2);
     case MCI_CLOSE_DRIVER:	return AVI_mciClose     (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)   dwParam2);
     case MCI_PLAY:		return AVI_mciPlay      (dwDevID, dwParam1, (LPMCI_PLAY_PARMS)      dwParam2);
     case MCI_RECORD:		return AVI_mciRecord    (dwDevID, dwParam1, (LPMCI_RECORD_PARMS)    dwParam2);
@@ -284,7 +284,7 @@ LONG MCIAVI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
     case MCI_RESUME:		return AVI_mciResume    (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)   dwParam2);
     case MCI_STATUS:		return AVI_mciStatus    (dwDevID, dwParam1, (LPMCI_STATUS_PARMS)    dwParam2);
     case MCI_GETDEVCAPS:	return AVI_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2);
-    case MCI_INFO:		return AVI_mciInfo      (dwDevID, dwParam1, (LPMCI_INFO_PARMS32A)   dwParam2);
+    case MCI_INFO:		return AVI_mciInfo      (dwDevID, dwParam1, (LPMCI_INFO_PARMSA)   dwParam2);
     case MCI_SEEK:		return AVI_mciSeek      (dwDevID, dwParam1, (LPMCI_SEEK_PARMS)      dwParam2);
     case MCI_LOAD:		
     case MCI_SAVE:		
@@ -310,7 +310,7 @@ LONG MCIAVI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
 	break;
     default:			
 	TRACE(mciavi, "Sending msg=%s to default driver proc\n", MCI_CommandToString(wMsg));
-	return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;
 }
diff --git a/multimedia/mcicda.c b/multimedia/mcicda.c
index 37eccb42b7f..acae7c6d7e9 100644
--- a/multimedia/mcicda.c
+++ b/multimedia/mcicda.c
@@ -167,7 +167,7 @@ static DWORD CDAUDIO_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS l
 /**************************************************************************
  * 				CDAUDIO_mciOpen			[internal]
  */
-static DWORD CDAUDIO_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpOpenParms)
+static DWORD CDAUDIO_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpOpenParms)
 {
     DWORD		dwDeviceID;
     WINE_MCICDAUDIO* 	wmcda;
@@ -669,7 +669,7 @@ static DWORD CDAUDIO_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParm
 /**************************************************************************
  * 			MCICDAUDIO_DriverProc32		[sample driver]
  */
-LONG MCICDAUDIO_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG MCICDAUDIO_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 			     DWORD dwParam1, DWORD dwParam2)
 {
     switch(wMsg) {
@@ -680,11 +680,11 @@ LONG MCICDAUDIO_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
     case DRV_ENABLE:		return 1;	
     case DRV_DISABLE:		return 1;
     case DRV_QUERYCONFIGURE:	return 1;
-    case DRV_CONFIGURE:		MessageBox32A(0, "Sample Multimedia Linux Driver !", "MMLinux Driver", MB_OK); return 1;
+    case DRV_CONFIGURE:		MessageBoxA(0, "Sample Multimedia Linux Driver !", "MMLinux Driver", MB_OK); return 1;
     case DRV_INSTALL:		return DRVCNF_RESTART;
     case DRV_REMOVE:		return DRVCNF_RESTART;
 	
-    case MCI_OPEN_DRIVER:	return CDAUDIO_mciOpen(dwDevID, dwParam1, (LPMCI_OPEN_PARMS32A)dwParam2);
+    case MCI_OPEN_DRIVER:	return CDAUDIO_mciOpen(dwDevID, dwParam1, (LPMCI_OPEN_PARMSA)dwParam2);
     case MCI_CLOSE_DRIVER:	return CDAUDIO_mciClose(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
     case MCI_GETDEVCAPS:	return CDAUDIO_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2);
     case MCI_INFO:		return CDAUDIO_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMS16)dwParam2);
@@ -722,7 +722,7 @@ LONG MCICDAUDIO_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
 	break;
     default:
 	TRACE(cdaudio, "Sending msg=%s to default driver proc\n", MCI_CommandToString(wMsg));
-	return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;
 }
diff --git a/multimedia/mcimidi.c b/multimedia/mcimidi.c
index 46909a9499e..b73f1335c0e 100644
--- a/multimedia/mcimidi.c
+++ b/multimedia/mcimidi.c
@@ -48,8 +48,8 @@ typedef struct {
     int			nUseCount;          	/* Incremented for each shared open          */
     WORD		wNotifyDeviceID;    	/* MCI device ID with a pending notification */
     HANDLE16 		hCallback;         	/* Callback handle for pending notification  */
-    HMMIO32		hFile;	            	/* mmio file handle open as Element          */
-    MCI_OPEN_PARMS32A 	openParms;
+    HMMIO		hFile;	            	/* mmio file handle open as Element          */
+    MCI_OPEN_PARMSA 	openParms;
     HLOCAL16		hMidiHdr;
     WORD		dwStatus;		/* one from MCI_MODE_xxxx */
     DWORD		dwMciTimeFormat;	/* One of the supported MCI_FORMAT_xxxx */	       
@@ -92,7 +92,7 @@ static DWORD MIDI_mciReadByte(WINE_MCIMIDI* wmm, BYTE *lpbyt)
     DWORD	ret = 0;
     
     if (lpbyt == NULL || 
-	mmioRead32(wmm->hFile, (HPSTR)lpbyt, (long)sizeof(BYTE)) != (long)sizeof(BYTE)) {
+	mmioRead(wmm->hFile, (HPSTR)lpbyt, (long)sizeof(BYTE)) != (long)sizeof(BYTE)) {
 	WARN(mcimidi, "Error reading wmm=%p\n", wmm);
 	ret = MCIERR_INTERNAL;
     }
@@ -172,7 +172,7 @@ static DWORD	MIDI_mciReadNextEvent(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt)
     DWORD	evtLength;
     DWORD	tmp;
     
-    if (mmioSeek32(wmm->hFile, mmt->dwIndex, SEEK_SET) != mmt->dwIndex) {
+    if (mmioSeek(wmm->hFile, mmt->dwIndex, SEEK_SET) != mmt->dwIndex) {
 	WARN(mcimidi, "Can't seek at %08lX \n", mmt->dwIndex);
 	return MCIERR_INTERNAL;
     }
@@ -240,7 +240,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt)
     DWORD		toberead;
     FOURCC		fourcc;
     
-    if (mmioRead32(wmm->hFile, (HPSTR)&fourcc, (long)sizeof(FOURCC)) != 
+    if (mmioRead(wmm->hFile, (HPSTR)&fourcc, (long)sizeof(FOURCC)) != 
 	(long)sizeof(FOURCC)) {
 	return MCIERR_INTERNAL;
     }
@@ -253,7 +253,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt)
     if (MIDI_mciReadLong(wmm, &toberead) != 0) {
 	return MCIERR_INTERNAL;
     }
-    mmt->dwFirst = mmioSeek32(wmm->hFile, 0, SEEK_CUR); /* >= 0 */
+    mmt->dwFirst = mmioSeek(wmm->hFile, 0, SEEK_CUR); /* >= 0 */
     mmt->dwLast = mmt->dwFirst + toberead;
     
     /* compute # of pulses in this track */
@@ -273,11 +273,11 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt)
     mmt->dwIndex = mmt->dwFirst;
     mmt->dwEventPulse = 0;
     
-    if (mmioSeek32(wmm->hFile, 0, SEEK_CUR) != mmt->dwLast) {
+    if (mmioSeek(wmm->hFile, 0, SEEK_CUR) != mmt->dwLast) {
 	WARN(mcimidi, "Ouch, out of sync seek=%lu track=%lu\n", 
-	     mmioSeek32(wmm->hFile, 0, SEEK_CUR), mmt->dwLast);
+	     mmioSeek(wmm->hFile, 0, SEEK_CUR), mmt->dwLast);
 	/* position at end of this track, to be ready to read next track */
-	mmioSeek32(wmm->hFile, mmt->dwLast, SEEK_SET);
+	mmioSeek(wmm->hFile, mmt->dwLast, SEEK_SET);
     }
     
     return 0;
@@ -294,11 +294,11 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset)
     
     TRACE(mcimidi, "(%p, %08lX);\n", wmm, dwOffset);
     
-    if (mmioSeek32(wmm->hFile, dwOffset, SEEK_SET) != dwOffset) {
+    if (mmioSeek(wmm->hFile, dwOffset, SEEK_SET) != dwOffset) {
 	WARN(mcimidi, "Can't seek at %08lX begin of 'MThd' \n", dwOffset);
 	return MCIERR_INTERNAL;
     }
-    if (mmioRead32(wmm->hFile, (HPSTR)&fourcc,
+    if (mmioRead(wmm->hFile, (HPSTR)&fourcc,
 		   (long) sizeof(FOURCC)) != (long) sizeof(FOURCC))
 	return MCIERR_INTERNAL;
     
@@ -386,7 +386,7 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset)
     toberead -= 3 * sizeof(WORD); 
     if (toberead > 0) {
 	TRACE(mcimidi, "Size of MThd > 6, skipping %ld extra bytes\n", toberead);
-	mmioSeek32(wmm->hFile, toberead, SEEK_CUR);
+	mmioSeek(wmm->hFile, toberead, SEEK_CUR);
     }
     
     for (nt = 0; nt < wmm->nTracks; nt++) {
@@ -540,7 +540,7 @@ static	DWORD	MIDI_GetMThdLengthMS(WINE_MCIMIDI* wmm)
 /**************************************************************************
  * 				MIDI_mciOpen			[internal]	
  */
-static DWORD MIDI_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpParms)
+static DWORD MIDI_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpParms)
 {
     MIDIOPENDESC 	midiOpenDesc;
     DWORD		dwRet = 0;
@@ -580,7 +580,7 @@ static DWORD MIDI_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpPa
 	
 	TRACE(mcimidi, "MCI_OPEN_ELEMENT '%s' !\n", lpstrElementName);
 	if (lpstrElementName && strlen(lpstrElementName) > 0) {
-	    wmm->hFile = mmioOpen32A(lpstrElementName, NULL, 
+	    wmm->hFile = mmioOpenA(lpstrElementName, NULL, 
 				     MMIO_ALLOCBUF | MMIO_READWRITE | MMIO_EXCLUSIVE);
 	    if (wmm->hFile == 0) {
 		WARN(mcimidi, "Can't find file='%s' !\n", lpstrElementName);
@@ -593,7 +593,7 @@ static DWORD MIDI_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpPa
     }
     TRACE(mcimidi, "hFile=%u\n", wmm->hFile);
     
-    memcpy(&wmm->openParms, lpParms, sizeof(MCI_OPEN_PARMS32A));
+    memcpy(&wmm->openParms, lpParms, sizeof(MCI_OPEN_PARMSA));
     
     wmm->wNotifyDeviceID = dwDeviceID;
     wmm->dwStatus = MCI_MODE_NOT_READY;	/* while loading file contents */
@@ -636,12 +636,12 @@ static DWORD MIDI_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpPa
     if (dwRet != 0) {
 	wmm->nUseCount--;
 	if (wmm->hFile != 0)
-	    mmioClose32(wmm->hFile, 0);
+	    mmioClose(wmm->hFile, 0);
 	wmm->hFile = 0;
     } else {
 	wmm->dwPositionMS = 0;
 	wmm->dwStatus = MCI_MODE_STOP;
-	wmm->hMidiHdr = USER_HEAP_ALLOC(sizeof(MIDIHDR));
+	wmm->hMidiHdr = USER_HEAP_ALLOC(sizeof(MIDIHDR16));
 	
 	dwRet = modMessage(wDevID, MODM_OPEN, 0, (DWORD)&midiOpenDesc, CALLBACK_NULL);
 	/*	dwRet = midMessage(wDevID, MIDM_OPEN, 0, (DWORD)&midiOpenDesc, CALLBACK_NULL);*/
@@ -691,7 +691,7 @@ static DWORD MIDI_mciClose(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP
     wmm->nUseCount--;
     if (wmm->nUseCount == 0) {
 	if (wmm->hFile != 0) {
-	    mmioClose32(wmm->hFile, 0);
+	    mmioClose(wmm->hFile, 0);
 	    wmm->hFile = 0;
 	    TRACE(mcimidi, "hFile closed !\n");
 	}
@@ -767,7 +767,7 @@ static DWORD MIDI_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
     
     if (!(dwFlags & MCI_WAIT)) {	
 	/** FIXME: I'm not 100% sure that wNotifyDeviceID is the right value in all cases ??? */
-	return MCI_SendCommandAsync32(wmm->wNotifyDeviceID, MCI_PLAY, dwFlags, (DWORD)lpParms, sizeof(LPMCI_PLAY_PARMS));
+	return MCI_SendCommandAsync(wmm->wNotifyDeviceID, MCI_PLAY, dwFlags, (DWORD)lpParms, sizeof(LPMCI_PLAY_PARMS));
     }
     
     if (lpParms && (dwFlags & MCI_FROM)) {
@@ -850,7 +850,7 @@ static DWORD MIDI_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
 	    break;
 	case 0xFF:
 	    /* position after meta data header */
-	    mmioSeek32(wmm->hFile, mmt->dwIndex + HIWORD(mmt->dwEventData), SEEK_SET);
+	    mmioSeek(wmm->hFile, mmt->dwIndex + HIWORD(mmt->dwEventData), SEEK_SET);
 	    switch (HIBYTE(LOWORD(mmt->dwEventData))) {
 	    case 0x00: /* 16-bit sequence number */
 		if (TRACE_ON(midi)) {
@@ -878,7 +878,7 @@ static DWORD MIDI_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
 			WARN(mcimidi, "Buffer for text is too small (%d bytes, when %u are needed)\n", sizeof(buf) - 1, len);
 			len = sizeof(buf) - 1;
 		    }
-		    if (mmioRead32(wmm->hFile, (HPSTR)buf, len) == len) {
+		    if (mmioRead(wmm->hFile, (HPSTR)buf, len) == len) {
 			buf[len] = 0;	/* end string in case */
 			TRACE(mcimidi, "%s => \"%s\"\n", (idx < 8 ) ? info[idx] : "", buf);
 		    } else {
@@ -1026,7 +1026,7 @@ static DWORD MIDI_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
 static DWORD MIDI_mciRecord(UINT16 wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpParms)
 {
     int			start, end;
-    LPMIDIHDR		lpMidiHdr;
+    LPMIDIHDR16		lpMidiHdr;
     DWORD		dwRet;
     WINE_MCIMIDI*	wmm = MIDI_mciGetOpenDev(wDevID);
     
@@ -1053,7 +1053,7 @@ static DWORD MIDI_mciRecord(UINT16 wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpP
     lpMidiHdr->dwBufferLength = 1024;
     lpMidiHdr->dwUser = 0L;
     lpMidiHdr->dwFlags = 0L;
-    dwRet = midMessage(wDevID, MIDM_PREPARE, 0, (DWORD)lpMidiHdr, sizeof(MIDIHDR));
+    dwRet = midMessage(wDevID, MIDM_PREPARE, 0, (DWORD)lpMidiHdr, sizeof(MIDIHDR16));
     TRACE(mcimidi, "After MIDM_PREPARE \n");
     wmm->dwStatus = MCI_MODE_RECORD;
     while (wmm->dwStatus != MCI_MODE_STOP) {
@@ -1066,7 +1066,7 @@ static DWORD MIDI_mciRecord(UINT16 wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpP
 	if (lpMidiHdr->dwBytesRecorded == 0) break;
     }
     TRACE(mcimidi, "Before MIDM_UNPREPARE \n");
-    dwRet = midMessage(wDevID, MIDM_UNPREPARE, 0, (DWORD)lpMidiHdr, sizeof(MIDIHDR));
+    dwRet = midMessage(wDevID, MIDM_UNPREPARE, 0, (DWORD)lpMidiHdr, sizeof(MIDIHDR16));
     TRACE(mcimidi, "After MIDM_UNPREPARE \n");
     if (lpMidiHdr->lpData != NULL) {
 	free(lpMidiHdr->lpData);
@@ -1383,7 +1383,7 @@ static DWORD MIDI_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags,
 /**************************************************************************
  * 				MIDI_mciInfo			[internal]
  */
-static DWORD MIDI_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS32A lpParms)
+static DWORD MIDI_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMSA lpParms)
 {
     DWORD		ret = 0;
     LPSTR		str = 0;
@@ -1473,7 +1473,7 @@ static DWORD MIDI_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms
 /**************************************************************************
  * 				MCIMIDI_DriverProc32	[sample driver]
  */
-LONG MCIMIDI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG MCIMIDI_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 				 DWORD dwParam1, DWORD dwParam2)
 {
     switch (wMsg) {
@@ -1484,11 +1484,11 @@ LONG MCIMIDI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
     case DRV_ENABLE:		return 1;
     case DRV_DISABLE:		return 1;
     case DRV_QUERYCONFIGURE:	return 1;
-    case DRV_CONFIGURE:		MessageBox32A(0, "Sample Midi Linux Driver !", "MMLinux Driver", MB_OK); return 1;
+    case DRV_CONFIGURE:		MessageBoxA(0, "Sample Midi Linux Driver !", "MMLinux Driver", MB_OK); return 1;
     case DRV_INSTALL:		return DRVCNF_RESTART;
     case DRV_REMOVE:		return DRVCNF_RESTART;
 #ifdef SNDCTL_MIDI_INFO
-    case MCI_OPEN_DRIVER:	return MIDI_mciOpen      (dwDevID, dwParam1, (LPMCI_OPEN_PARMS32A)   dwParam2);
+    case MCI_OPEN_DRIVER:	return MIDI_mciOpen      (dwDevID, dwParam1, (LPMCI_OPEN_PARMSA)   dwParam2);
     case MCI_CLOSE_DRIVER:	return MIDI_mciClose     (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)   dwParam2);
     case MCI_PLAY:		return MIDI_mciPlay      (dwDevID, dwParam1, (LPMCI_PLAY_PARMS)      dwParam2);
     case MCI_RECORD:		return MIDI_mciRecord    (dwDevID, dwParam1, (LPMCI_RECORD_PARMS)    dwParam2);
@@ -1498,7 +1498,7 @@ LONG MCIMIDI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
     case MCI_RESUME:		return MIDI_mciResume    (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)   dwParam2);
     case MCI_STATUS:		return MIDI_mciStatus    (dwDevID, dwParam1, (LPMCI_STATUS_PARMS)    dwParam2);
     case MCI_GETDEVCAPS:	return MIDI_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2);
-    case MCI_INFO:		return MIDI_mciInfo      (dwDevID, dwParam1, (LPMCI_INFO_PARMS32A)   dwParam2);
+    case MCI_INFO:		return MIDI_mciInfo      (dwDevID, dwParam1, (LPMCI_INFO_PARMSA)   dwParam2);
     case MCI_SEEK:		return MIDI_mciSeek      (dwDevID, dwParam1, (LPMCI_SEEK_PARMS)      dwParam2);
 #else
     case MCI_OPEN_DRIVER:
@@ -1538,7 +1538,7 @@ LONG MCIMIDI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
 	break;
     default:			
 	TRACE(mcimidi, "Sending msg=%s to default driver proc\n", MCI_CommandToString(wMsg));
-	return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;
 }
diff --git a/multimedia/mcistring.c b/multimedia/mcistring.c
index 7fcdbf92cfc..4d6c1b7d147 100644
--- a/multimedia/mcistring.c
+++ b/multimedia/mcistring.c
@@ -37,7 +37,7 @@ extern struct WINE_MCIDRIVER mciDrv[MAXMCIDRIVERS];
 /* The reason why I just don't lowercase the keywords array in 
  * mciSendString is left as an exercise to the reader.
  */
-#define STRCMP(x,y) lstrcmpi32A(x,y)
+#define STRCMP(x,y) lstrcmpiA(x,y)
 
 /* standard function parameters for all functions */
 #define _MCISTR_PROTO_ 				       		\
@@ -52,7 +52,7 @@ extern struct WINE_MCIDRIVER mciDrv[MAXMCIDRIVERS];
 do {								\
     TRACE(mci, "->returns '%s'\n", s);				\
     if (lpstrReturnString) {					\
-	lstrcpyn32A(lpstrReturnString, s, uReturnLength);	\
+	lstrcpynA(lpstrReturnString, s, uReturnLength);	\
 	TRACE(mci, "-->'%s'\n", lpstrReturnString);		\
     }								\
 } while(0)
@@ -375,7 +375,7 @@ MCISTR_Open(_MCISTR_PROTO_)
 	      keywords[i]);
 	i++;
     }
-    res = mciSendCommand32A(0, MCI_OPEN, dwFlags, (DWORD)pU);
+    res = mciSendCommandA(0, MCI_OPEN, dwFlags, (DWORD)pU);
 
     free(pU->openParams.lpstrElementName);
     free(pU->openParams.lpstrDeviceType);
@@ -397,7 +397,7 @@ _MCISTR_determine_timeformat(LPCSTR dev,WORD wDevID,WORD uDevTyp,int *timef)
     if (!statusParams) return 0;
     statusParams->dwItem	= MCI_STATUS_TIME_FORMAT;
     statusParams->dwReturn	= 0;
-    res = mciSendCommand32A(wDevID, MCI_STATUS, dwFlags, (DWORD)statusParams);
+    res = mciSendCommandA(wDevID, MCI_STATUS, dwFlags, (DWORD)statusParams);
 
     if (res==0) *timef = statusParams->dwReturn;
     free(statusParams);
@@ -568,7 +568,7 @@ MCISTR_Status(_MCISTR_PROTO_) {
     if (!statusParams->dwItem) 
 	return MCIERR_MISSING_STRING_ARGUMENT;
     
-    res = mciSendCommand32A(wDevID, MCI_STATUS, dwFlags, (DWORD)statusParams);
+    res = mciSendCommandA(wDevID, MCI_STATUS, dwFlags, (DWORD)statusParams);
 
     if (res==0)
 	_MCISTR_convreturn(type,statusParams->dwReturn,lpstrReturnString,uReturnLength,uDevTyp,timef);
@@ -774,7 +774,7 @@ MCISTR_Set(_MCISTR_PROTO_) {
     }
     if (!dwFlags)
 	return MCIERR_MISSING_STRING_ARGUMENT;
-    res = mciSendCommand32A(wDevID, MCI_SET, dwFlags, (DWORD)pU);
+    res = mciSendCommandA(wDevID, MCI_SET, dwFlags, (DWORD)pU);
     free(pU);
     return res;
 }
@@ -806,7 +806,7 @@ MCISTR_Break(_MCISTR_PROTO_)
 	    continue;
 	}
     }
-    res = mciSendCommand32A(wDevID, MCI_BREAK, dwFlags, (DWORD)breakParams);
+    res = mciSendCommandA(wDevID, MCI_BREAK, dwFlags, (DWORD)breakParams);
     free(breakParams);
     return res;
 }
@@ -925,7 +925,7 @@ MCISTR_Capability(_MCISTR_PROTO_) {
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_GETDEVCAPS, dwFlags, (DWORD)gdcParams);
+    res = mciSendCommandA(wDevID, MCI_GETDEVCAPS, dwFlags, (DWORD)gdcParams);
 
     /* no timeformat needed */
     if (res==0)
@@ -944,7 +944,7 @@ MCISTR_Resume(_MCISTR_PROTO_)
     MCI_GENERIC_PARMS *genParams = xmalloc(sizeof(MCI_GENERIC_PARMS));
     int	res;
     genParams->dwCallback = hwndCallback;
-    res = mciSendCommand32A(wDevID, MCI_RESUME, dwFlags, (DWORD)genParams);
+    res = mciSendCommandA(wDevID, MCI_RESUME, dwFlags, (DWORD)genParams);
     free(genParams);
     return res;
 }
@@ -956,7 +956,7 @@ MCISTR_Pause(_MCISTR_PROTO_)
     MCI_GENERIC_PARMS *genParams = xmalloc(sizeof(MCI_GENERIC_PARMS));
     int res;
     genParams->dwCallback = hwndCallback;
-    res = mciSendCommand32A(wDevID, MCI_PAUSE, dwFlags, (DWORD)genParams);
+    res = mciSendCommandA(wDevID, MCI_PAUSE, dwFlags, (DWORD)genParams);
     free(genParams);
     return res;
 }
@@ -968,7 +968,7 @@ MCISTR_Stop(_MCISTR_PROTO_)
     MCI_GENERIC_PARMS *genParams = xmalloc(sizeof(MCI_GENERIC_PARMS));
     int res;
     genParams->dwCallback = hwndCallback;
-    res = mciSendCommand32A(wDevID, MCI_STOP, dwFlags, (DWORD)genParams);
+    res = mciSendCommandA(wDevID, MCI_STOP, dwFlags, (DWORD)genParams);
     free(genParams);
     return res;
 }
@@ -1043,7 +1043,7 @@ MCISTR_Record(_MCISTR_PROTO_) {
 	FLAG1("overwrite",MCI_RECORD_OVERWRITE);
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_RECORD, dwFlags, (DWORD)recordParams);
+    res = mciSendCommandA(wDevID, MCI_RECORD, dwFlags, (DWORD)recordParams);
     free(recordParams);
     return res;
 }
@@ -1156,7 +1156,7 @@ MCISTR_Play(_MCISTR_PROTO_) {
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_PLAY, dwFlags, (DWORD)pU);
+    res = mciSendCommandA(wDevID, MCI_PLAY, dwFlags, (DWORD)pU);
     free(pU);
     return res;
 }
@@ -1229,7 +1229,7 @@ MCISTR_Seek(_MCISTR_PROTO_) {
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_SEEK, dwFlags, (DWORD)seekParams);
+    res = mciSendCommandA(wDevID, MCI_SEEK, dwFlags, (DWORD)seekParams);
     free(seekParams);
     return res;
 }
@@ -1241,7 +1241,7 @@ MCISTR_Close(_MCISTR_PROTO_)
     MCI_GENERIC_PARMS*	closeParams = xmalloc(sizeof(MCI_GENERIC_PARMS));
     int res;
     
-    res = mciSendCommand32A(wDevID, MCI_CLOSE, dwFlags, (DWORD)closeParams);
+    res = mciSendCommandA(wDevID, MCI_CLOSE, dwFlags, (DWORD)closeParams);
     free(closeParams);
     return res;
 }
@@ -1282,7 +1282,7 @@ MCISTR_Info(_MCISTR_PROTO_)
     /* MCI driver will fill in lpstrReturn, dwRetSize.
      * FIXME: I don't know if this is correct behaviour
      */
-    res = mciSendCommand32A(wDevID, MCI_INFO, dwFlags, (DWORD)infoParams);
+    res = mciSendCommandA(wDevID, MCI_INFO, dwFlags, (DWORD)infoParams);
     if (res==0)
 	_MCI_STR(infoParams->lpstrReturn);
     free(infoParams);
@@ -1371,7 +1371,7 @@ MCISTR_Load(_MCISTR_PROTO_) {
     }
     pU->loadParams.lpfilename=s;
     dwFlags |= MCI_LOAD_FILE;
-    res = mciSendCommand32A(wDevID, MCI_LOAD, dwFlags, (DWORD)pU);
+    res = mciSendCommandA(wDevID, MCI_LOAD, dwFlags, (DWORD)pU);
     free(s);
     free(pU);
     return res;
@@ -1418,7 +1418,7 @@ MCISTR_Save(_MCISTR_PROTO_) {
     }
     pU->saveParams.lpfilename=s;
     dwFlags |= MCI_LOAD_FILE;
-    res = mciSendCommand32A(wDevID, MCI_SAVE, dwFlags, (DWORD)pU);
+    res = mciSendCommandA(wDevID, MCI_SAVE, dwFlags, (DWORD)pU);
     free(s);
     free(pU);
     return res;
@@ -1440,7 +1440,7 @@ MCISTR_Cue(_MCISTR_PROTO_) {
 	    break;
 	}
     }
-    res = mciSendCommand32A(wDevID, MCI_CUE, dwFlags, (DWORD)cueParams);
+    res = mciSendCommandA(wDevID, MCI_CUE, dwFlags, (DWORD)cueParams);
     free(cueParams);
     return res;
 }
@@ -1508,7 +1508,7 @@ MCISTR_Delete(_MCISTR_PROTO_) {
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_DELETE, dwFlags, (DWORD)deleteParams);
+    res = mciSendCommandA(wDevID, MCI_DELETE, dwFlags, (DWORD)deleteParams);
     free(deleteParams);
     return res;
 }
@@ -1537,7 +1537,7 @@ MCISTR_Escape(_MCISTR_PROTO_)
     }
     escapeParams->lpstrCommand = s;
     dwFlags |= MCI_VD_ESCAPE_STRING;
-    res = mciSendCommand32A(wDevID, MCI_ESCAPE, dwFlags, (DWORD)escapeParams);
+    res = mciSendCommandA(wDevID, MCI_ESCAPE, dwFlags, (DWORD)escapeParams);
     free(s);
     free(escapeParams);
     return res;
@@ -1566,7 +1566,7 @@ MCISTR_Unfreeze(_MCISTR_PROTO_)
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_UNFREEZE, dwFlags, (DWORD)unfreezeParams);
+    res = mciSendCommandA(wDevID, MCI_UNFREEZE, dwFlags, (DWORD)unfreezeParams);
     free(unfreezeParams);
     return res;
 }
@@ -1593,7 +1593,7 @@ MCISTR_Freeze(_MCISTR_PROTO_)
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_FREEZE, dwFlags, (DWORD)freezeParams);
+    res = mciSendCommandA(wDevID, MCI_FREEZE, dwFlags, (DWORD)freezeParams);
     free(freezeParams);
     return res;
 }
@@ -1653,7 +1653,7 @@ MCISTR_Put(_MCISTR_PROTO_) {
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_PUT, dwFlags, (DWORD)pU);
+    res = mciSendCommandA(wDevID, MCI_PUT, dwFlags, (DWORD)pU);
     free(pU);
     return res;
 }
@@ -1677,7 +1677,7 @@ MCISTR_Realize(_MCISTR_PROTO_)
 	FLAG1("normal",MCI_ANIM_REALIZE_NORM);
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_REALIZE, dwFlags, (DWORD)realizeParams);
+    res = mciSendCommandA(wDevID, MCI_REALIZE, dwFlags, (DWORD)realizeParams);
     free(realizeParams);
     return res;
 }
@@ -1700,7 +1700,7 @@ MCISTR_Spin(_MCISTR_PROTO_)
 	FLAG1("down",MCI_VD_SPIN_UP);
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_SPIN, dwFlags, (DWORD)spinParams);
+    res = mciSendCommandA(wDevID, MCI_SPIN, dwFlags, (DWORD)spinParams);
     free(spinParams);
     return res;
 }
@@ -1742,7 +1742,7 @@ MCISTR_Step(_MCISTR_PROTO_) {
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_STEP, dwFlags, (DWORD)pU);
+    res = mciSendCommandA(wDevID, MCI_STEP, dwFlags, (DWORD)pU);
     free(pU);
     return res;
 }
@@ -1776,7 +1776,7 @@ MCISTR_Update(_MCISTR_PROTO_) {
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_UPDATE, dwFlags, (DWORD)updateParams);
+    res = mciSendCommandA(wDevID, MCI_UPDATE, dwFlags, (DWORD)updateParams);
     free(updateParams);
     return res;
 }
@@ -1815,7 +1815,7 @@ MCISTR_Where(_MCISTR_PROTO_) {
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_WHERE, dwFlags, (DWORD)pU);
+    res = mciSendCommandA(wDevID, MCI_WHERE, dwFlags, (DWORD)pU);
     if (res==0) {
 	char	buf[100];
 	switch (uDevTyp) {
@@ -1998,7 +1998,7 @@ MCISTR_Window(_MCISTR_PROTO_) {
 	}
 	i++;
     }
-    res = mciSendCommand32A(wDevID, MCI_WINDOW, dwFlags, (DWORD)pU);
+    res = mciSendCommandA(wDevID, MCI_WINDOW, dwFlags, (DWORD)pU);
     if (s) free(s);
     free(pU);
     return res;
@@ -2071,7 +2071,7 @@ DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrReturnString,
     *dev++='\0';
     args=strchr(dev,' ');
     if (args!=NULL) *args++='\0';
-    CharUpper32A(dev);
+    CharUpperA(dev);
     if (args!=NULL) {
 	char	*s;
 	i=1;/* nrofkeywords = nrofspaces+1 */
@@ -2161,8 +2161,8 @@ DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrReturnString,
 /**************************************************************************
  * 				mciSendString32A	[MMSYSTEM.702][WINMM.51]
  */
-DWORD WINAPI mciSendString32A(LPCSTR lpstrCommand, LPSTR lpstrReturnString, 
-			      UINT32 uReturnLength, HWND32 hwndCallback)
+DWORD WINAPI mciSendStringA(LPCSTR lpstrCommand, LPSTR lpstrReturnString, 
+			      UINT uReturnLength, HWND hwndCallback)
 {
     return mciSendString16(lpstrCommand, lpstrReturnString, uReturnLength, hwndCallback);
 }
@@ -2170,11 +2170,11 @@ DWORD WINAPI mciSendString32A(LPCSTR lpstrCommand, LPSTR lpstrReturnString,
 /**************************************************************************
  * 				mciSendString32W	[WINMM.52]
  */
-DWORD WINAPI mciSendString32W(LPCWSTR lpwstrCommand, LPSTR lpstrReturnString, 
-			      UINT32 uReturnLength, HWND32 hwndCallback)
+DWORD WINAPI mciSendStringW(LPCWSTR lpwstrCommand, LPSTR lpstrReturnString, 
+			      UINT uReturnLength, HWND hwndCallback)
 {
     LPSTR 	lpstrCommand;
-    UINT32	ret;
+    UINT	ret;
 
     /* FIXME: is there something to do with lpstrReturnString ? */
     lpstrCommand = HEAP_strdupWtoA(GetProcessHeap(), 0, lpwstrCommand);
diff --git a/multimedia/mciwave.c b/multimedia/mciwave.c
index 2e282ce16a5..436a254a803 100644
--- a/multimedia/mciwave.c
+++ b/multimedia/mciwave.c
@@ -33,8 +33,8 @@ typedef struct {
     BOOL16			fShareable;	/* TRUE if first open was shareable */
     WORD			wNotifyDeviceID;/* MCI device ID with a pending notification */
     HANDLE16			hCallback;	/* Callback handle for pending notification */
-    HMMIO32			hFile;		/* mmio file handle open as Element */
-    MCI_WAVE_OPEN_PARMS32A 	openParms;
+    HMMIO			hFile;		/* mmio file handle open as Element */
+    MCI_WAVE_OPEN_PARMSA 	openParms;
     WAVEOPENDESC 		waveDesc;
     PCMWAVEFORMAT		WaveFormat;
     WAVEHDR			WaveHdr;
@@ -115,7 +115,7 @@ static	DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, MMCKINFO* pckMainRIFF)
 	return MCIERR_INVALID_FILE;
     TRACE(mciwave, "Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX \n",
 	  (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize);
-    if (mmioRead32(wmw->hFile, (HPSTR)&wmw->WaveFormat,
+    if (mmioRead(wmw->hFile, (HPSTR)&wmw->WaveFormat,
 		   (long)sizeof(PCMWAVEFORMAT)) != (long)sizeof(PCMWAVEFORMAT))
 	return MCIERR_INVALID_FILE;
 
@@ -133,14 +133,14 @@ static	DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, MMCKINFO* pckMainRIFF)
     TRACE(mciwave, "nChannels=%d nSamplesPerSec=%ld\n",
 	  wmw->WaveFormat.wf.nChannels, wmw->WaveFormat.wf.nSamplesPerSec);
     wmw->dwLength = mmckInfo.cksize;
-    wmw->dwFileOffset = mmioSeek32(wmw->hFile, 0, SEEK_CUR); /* >= 0 */
+    wmw->dwFileOffset = mmioSeek(wmw->hFile, 0, SEEK_CUR); /* >= 0 */
     return 0;
 }
 
 /**************************************************************************
  * 			WAVE_mciOpen	                        [internal]
  */
-static DWORD WAVE_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMS32A lpOpenParms)
+static DWORD WAVE_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMSA lpOpenParms)
 {
     DWORD		dwRet = 0;
     DWORD		dwDeviceID;
@@ -184,7 +184,7 @@ static DWORD WAVE_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMS32A
 	    /*FIXME : what should be done id wmw->hFile is already != 0, or the driver is playin' */
 	    TRACE(mciwave,"MCI_OPEN_ELEMENT '%s' !\n", lpstrElementName);
 	    if (lpstrElementName && (strlen(lpstrElementName) > 0)) {
-		wmw->hFile = mmioOpen32A((LPSTR)lpstrElementName, NULL, 
+		wmw->hFile = mmioOpenA((LPSTR)lpstrElementName, NULL, 
 					 MMIO_ALLOCBUF | MMIO_READWRITE | MMIO_EXCLUSIVE);
 		if (wmw->hFile == 0) {
 		    WARN(mciwave, "can't find file='%s' !\n", lpstrElementName);
@@ -197,7 +197,7 @@ static DWORD WAVE_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMS32A
     }
     TRACE(mciwave,"hFile=%u\n", wmw->hFile);
 
-    memcpy(&wmw->openParms, lpOpenParms, sizeof(MCI_WAVE_OPEN_PARMS32A));
+    memcpy(&wmw->openParms, lpOpenParms, sizeof(MCI_WAVE_OPEN_PARMSA));
     wmw->wNotifyDeviceID = dwDeviceID;
     wmw->dwStatus = MCI_MODE_NOT_READY;	/* while loading file contents */
     
@@ -235,7 +235,7 @@ static DWORD WAVE_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMS32A
     } else {
 	wmw->nUseCount--;
 	if (wmw->hFile != 0)
-	    mmioClose32(wmw->hFile, 0);
+	    mmioClose(wmw->hFile, 0);
 	wmw->hFile = 0;
     }
     return 0;
@@ -266,7 +266,7 @@ static DWORD WAVE_mciCue(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpPar
 
     /* always close elements ? */    
     if (wmw->hFile != 0) {
-	mmioClose32(wmw->hFile, 0);
+	mmioClose(wmw->hFile, 0);
 	wmw->hFile = 0;
     }
     
@@ -340,7 +340,7 @@ static DWORD WAVE_mciClose(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP
     if (wmw->nUseCount == 0) {
 	DWORD	mmRet;
 	if (wmw->hFile != 0) {
-	    mmioClose32(wmw->hFile, 0);
+	    mmioClose(wmw->hFile, 0);
 	    wmw->hFile = 0;
 	}
 	mmRet = (wmw->fInput) ? widMessage(wDevID, WIDM_CLOSE, 0, 0L, 0L) :
@@ -385,7 +385,7 @@ static DWORD WAVE_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
     }
 
     if (!(dwFlags & MCI_WAIT)) {
-	return MCI_SendCommandAsync32(wmw->wNotifyDeviceID, MCI_PLAY, dwFlags, 
+	return MCI_SendCommandAsync(wmw->wNotifyDeviceID, MCI_PLAY, dwFlags, 
 				      (DWORD)lpParms, sizeof(MCI_PLAY_PARMS));
     }
 
@@ -400,7 +400,7 @@ static DWORD WAVE_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
     TRACE(mciwave, "Playing from byte=%lu to byte=%lu\n", wmw->dwPosition, end);
 
     /* go back to begining of chunk */
-    mmioSeek32(wmw->hFile, wmw->dwFileOffset, SEEK_SET); /* >= 0 */
+    mmioSeek(wmw->hFile, wmw->dwFileOffset, SEEK_SET); /* >= 0 */
 
     /* at 22050 bytes per sec => 30 ms by block */
     bufsize = 10240;
@@ -415,7 +415,7 @@ static DWORD WAVE_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
 	wmw->WaveHdr.dwFlags = 0L;
 	wmw->WaveHdr.dwLoops = 0L;
 	dwRet = wodMessage(wDevID, WODM_PREPARE, 0, (DWORD)&wmw->WaveHdr, sizeof(WAVEHDR));
-	count = mmioRead32(wmw->hFile, wmw->WaveHdr.lpData, bufsize);
+	count = mmioRead(wmw->hFile, wmw->WaveHdr.lpData, bufsize);
 	TRACE(mciwave,"mmioRead bufsize=%ld count=%ld\n", bufsize, count);
 	if (count < 1) break;
 	wmw->WaveHdr.dwBufferLength = count;
@@ -883,7 +883,7 @@ static DWORD WAVE_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS16 lpPar
 	if (strlen(str) + 1 > lpParms->dwRetSize) {
 	    ret = MCIERR_PARAM_OVERFLOW;
 	} else {
-	    lstrcpyn32A(lpParms->lpstrReturn, str, lpParms->dwRetSize);
+	    lstrcpynA(lpParms->lpstrReturn, str, lpParms->dwRetSize);
 	}
     } else {
 	lpParms->lpstrReturn[0] = 0;
@@ -895,7 +895,7 @@ static DWORD WAVE_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS16 lpPar
 /**************************************************************************
  * 				WAVE_DriverProc32		[sample driver]
  */
-LONG MCIWAVE_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG MCIWAVE_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 			  DWORD dwParam1, DWORD dwParam2)
 {
     TRACE(mciwave,"(%08lX, %04X, %08lX, %08lX, %08lX)\n", 
@@ -909,10 +909,10 @@ LONG MCIWAVE_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
     case DRV_ENABLE:		return 1;
     case DRV_DISABLE:		return 1;
     case DRV_QUERYCONFIGURE:	return 1;
-    case DRV_CONFIGURE:		MessageBox32A(0, "Sample MultiMedia Linux Driver !", "MMLinux Driver", MB_OK);	return 1;
+    case DRV_CONFIGURE:		MessageBoxA(0, "Sample MultiMedia Linux Driver !", "MMLinux Driver", MB_OK);	return 1;
     case DRV_INSTALL:		return DRVCNF_RESTART;
     case DRV_REMOVE:		return DRVCNF_RESTART;
-    case MCI_OPEN_DRIVER:	return WAVE_mciOpen      (dwDevID, dwParam1, (LPMCI_WAVE_OPEN_PARMS32A)dwParam2);
+    case MCI_OPEN_DRIVER:	return WAVE_mciOpen      (dwDevID, dwParam1, (LPMCI_WAVE_OPEN_PARMSA)dwParam2);
     case MCI_CLOSE_DRIVER:	return WAVE_mciClose     (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)     dwParam2);
     case MCI_CUE:		return WAVE_mciCue       (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)     dwParam2);
     case MCI_PLAY:		return WAVE_mciPlay      (dwDevID, dwParam1, (LPMCI_PLAY_PARMS)        dwParam2);
@@ -949,7 +949,7 @@ LONG MCIWAVE_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
 	break;
     default:
 	FIXME(mciwave, "is probably wrong msg=%s\n", MCI_CommandToString(wMsg));
-	return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;
 }
diff --git a/multimedia/midi.c b/multimedia/midi.c
index 8a7846f1925..9fa0164fd29 100644
--- a/multimedia/midi.c
+++ b/multimedia/midi.c
@@ -38,7 +38,7 @@ typedef struct {
     DWORD		bufsize;
     LPMIDIOPENDESC	midiDesc;
     WORD		wFlags;
-    LPMIDIHDR 		lpQueueHdr;
+    LPMIDIHDR16 		lpQueueHdr;
     DWORD		dwTotalPlayed;
 #ifdef HAVE_OSS
     unsigned char	incoming[3];
@@ -56,7 +56,7 @@ typedef struct {
     DWORD		bufsize;
     LPMIDIOPENDESC	midiDesc;
     WORD		wFlags;
-    LPMIDIHDR 		lpQueueHdr;
+    LPMIDIHDR16 		lpQueueHdr;
     DWORD		dwTotalPlayed;
 #ifdef HAVE_OSS
     void*		lpExtra;	 	/* according to port type (MIDI, FM...), extra data when needed */
@@ -81,7 +81,7 @@ int 	MIDM_NUMDEVS = 0;
 #ifdef HAVE_OSS
 static	int		midiSeqFD = -1;
 static	int		numOpenMidiSeq = 0;
-static	UINT32		midiInTimerID = 0;
+static	UINT		midiInTimerID = 0;
 static	int		numStartedMidiIn = 0;
 #endif /* HAVE_OSS */
 
@@ -150,7 +150,7 @@ static DWORD MIDI_NotifyClient(UINT16 wDevID, WORD wMsg,
 	return MCIERR_INTERNAL;
     }
     
-    return DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2) ?
+    return DriverCallback16(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2) ?
 	0 : MCIERR_INTERNAL;
 }
 
@@ -232,7 +232,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime)
     }
     
     if (MidiInDev[wDevID].state & 2) { /* system exclusive */
-	LPMIDIHDR	ptr = MidiInDev[wDevID].lpQueueHdr;
+	LPMIDIHDR16	ptr = MidiInDev[wDevID].lpQueueHdr;
 	WORD 			sbfb = FALSE;
 	
 	if (ptr) {
@@ -249,7 +249,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime)
 	    ptr = MidiInDev[wDevID].lpQueueHdr;
 	    ptr->dwFlags &= ~MHDR_INQUEUE;
 	    ptr->dwFlags |= MHDR_DONE;
-	    MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)ptr->lpNext;
+	    MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR16)ptr->lpNext;
 	    if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)ptr, dwTime) != MMSYSERR_NOERROR) {
 		WARN(midi, "Couldn't notify client\n");
 	    }
@@ -323,7 +323,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime)
     }
 }
 
-static VOID WINAPI midTimeCallback(HWND32 hwnd, UINT32 msg, UINT32 id, DWORD dwTime)
+static VOID WINAPI midTimeCallback(HWND hwnd, UINT msg, UINT id, DWORD dwTime)
 {
     unsigned	char		buffer[256];
     int				len, idx;
@@ -429,7 +429,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
     }
     
     if (numStartedMidiIn++ == 0) {
-	midiInTimerID = SetTimer32(0, 0, 250, midTimeCallback);
+	midiInTimerID = SetTimer(0, 0, 250, midTimeCallback);
 	if (!midiInTimerID) {
 	    numStartedMidiIn = 0;
 	    WARN(midi, "Couldn't start timer for midi-in\n");
@@ -510,7 +510,7 @@ static DWORD midClose(WORD wDevID)
     }
     if (--numStartedMidiIn == 0) {
 	TRACE(midi, "Stopping timer for midi-in\n");
-	if (!KillTimer32(0, midiInTimerID)) {
+	if (!KillTimer(0, midiInTimerID)) {
 	    WARN(midi, "Couldn't stop timer for midi-in\n");
 	}			
 	midiInTimerID = 0;
@@ -536,12 +536,12 @@ static DWORD midClose(WORD wDevID)
 /**************************************************************************
  * 				midAddBuffer			[internal]
  */
-static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
+static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR16 lpMidiHdr, DWORD dwSize)
 {
     TRACE(midi, "(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
     
     if (lpMidiHdr == NULL)	return MMSYSERR_INVALPARAM;
-    if (sizeof(MIDIHDR) != dwSize) return MMSYSERR_INVALPARAM;
+    if (sizeof(MIDIHDR16) != dwSize) return MMSYSERR_INVALPARAM;
     if (lpMidiHdr->dwBufferLength == 0) return MMSYSERR_INVALPARAM;
     if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING;
     if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED;
@@ -549,11 +549,11 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
     if (MidiInDev[wDevID].lpQueueHdr == 0) {
 	MidiInDev[wDevID].lpQueueHdr = lpMidiHdr;
     } else {
-	LPMIDIHDR	ptr;
+	LPMIDIHDR16	ptr;
 	
 	for (ptr = MidiInDev[wDevID].lpQueueHdr; 
 	     ptr->lpNext != 0; 
-	     ptr = (LPMIDIHDR)ptr->lpNext);
+	     ptr = (LPMIDIHDR16)ptr->lpNext);
 	ptr->lpNext = (struct midihdr_tag*)lpMidiHdr;
     }
     return MMSYSERR_NOERROR;
@@ -562,11 +562,11 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
 /**************************************************************************
  * 				midPrepare			[internal]
  */
-static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
+static DWORD midPrepare(WORD wDevID, LPMIDIHDR16 lpMidiHdr, DWORD dwSize)
 {
     TRACE(midi, "(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
     
-    if (dwSize != sizeof(MIDIHDR) || lpMidiHdr == 0 || 
+    if (dwSize != sizeof(MIDIHDR16) || lpMidiHdr == 0 || 
 	lpMidiHdr->lpData == 0 || lpMidiHdr->dwFlags != 0 || 
 	lpMidiHdr->dwBufferLength >= 0x10000ul)
 	return MMSYSERR_INVALPARAM;
@@ -581,11 +581,11 @@ static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
 /**************************************************************************
  * 				midUnprepare			[internal]
  */
-static DWORD midUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
+static DWORD midUnprepare(WORD wDevID, LPMIDIHDR16 lpMidiHdr, DWORD dwSize)
 {
     TRACE(midi, "(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
     
-    if (dwSize != sizeof(MIDIHDR) || lpMidiHdr == 0 || 
+    if (dwSize != sizeof(MIDIHDR16) || lpMidiHdr == 0 || 
 	lpMidiHdr->lpData == 0 || lpMidiHdr->dwBufferLength >= 0x10000ul)
 	return MMSYSERR_INVALPARAM;
     
@@ -613,7 +613,7 @@ static DWORD midReset(WORD wDevID)
 			      (DWORD)MidiInDev[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) {
 	    WARN(midi, "Couldn't notify client\n");
 	}
-	MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)MidiInDev[wDevID].lpQueueHdr->lpNext;
+	MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR16)MidiInDev[wDevID].lpQueueHdr->lpNext;
     }
     
     return MMSYSERR_NOERROR;
@@ -1282,7 +1282,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam)
 /**************************************************************************
  *		modLongData					[internal]
  */
-static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
+static DWORD modLongData(WORD wDevID, LPMIDIHDR16 lpMidiHdr, DWORD dwSize)
 {
     int		count;
     
@@ -1380,7 +1380,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
 /**************************************************************************
  * 			modPrepare				[internal]
  */
-static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
+static DWORD modPrepare(WORD wDevID, LPMIDIHDR16 lpMidiHdr, DWORD dwSize)
 {
     TRACE(midi, "(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
     
@@ -1395,7 +1395,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
 	return MMSYSERR_NOTENABLED;
     }
 #endif /* HAVE_OSS */
-    if (dwSize != sizeof(MIDIHDR) || lpMidiHdr == 0 || 
+    if (dwSize != sizeof(MIDIHDR16) || lpMidiHdr == 0 || 
 	lpMidiHdr->lpData == 0 || lpMidiHdr->dwFlags != 0 || 
 	lpMidiHdr->dwBufferLength >= 0x10000ul)
 	return MMSYSERR_INVALPARAM;
@@ -1409,7 +1409,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
 /**************************************************************************
  * 				modUnprepare			[internal]
  */
-static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
+static DWORD modUnprepare(WORD wDevID, LPMIDIHDR16 lpMidiHdr, DWORD dwSize)
 {
     TRACE(midi, "(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
 
@@ -1424,7 +1424,7 @@ static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
 	return MMSYSERR_NOTENABLED;
     }
 #endif /* HAVE_OSS */
-    if (dwSize != sizeof(MIDIHDR) || lpMidiHdr == 0)
+    if (dwSize != sizeof(MIDIHDR16) || lpMidiHdr == 0)
 	return MMSYSERR_INVALPARAM;
     if (lpMidiHdr->dwFlags & MHDR_INQUEUE)
 	return MIDIERR_STILLPLAYING;
@@ -1465,11 +1465,11 @@ DWORD WINAPI midMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
     case MIDM_CLOSE:
 	return midClose(wDevID);
     case MIDM_ADDBUFFER:
-	return midAddBuffer(wDevID,(LPMIDIHDR)dwParam1, dwParam2);
+	return midAddBuffer(wDevID,(LPMIDIHDR16)dwParam1, dwParam2);
     case MIDM_PREPARE:
-	return midPrepare(wDevID,(LPMIDIHDR)dwParam1, dwParam2);
+	return midPrepare(wDevID,(LPMIDIHDR16)dwParam1, dwParam2);
     case MIDM_UNPREPARE:
-	return midUnprepare(wDevID,(LPMIDIHDR)dwParam1, dwParam2);
+	return midUnprepare(wDevID,(LPMIDIHDR16)dwParam1, dwParam2);
     case MIDM_GETDEVCAPS:
 	return midGetDevCaps(wDevID,(LPMIDIINCAPS16)dwParam1,dwParam2);
     case MIDM_GETNUMDEVS:
@@ -1505,11 +1505,11 @@ DWORD WINAPI modMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
     case MODM_DATA:
 	return modData(wDevID, dwParam1);
     case MODM_LONGDATA:
-	return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
+	return modLongData(wDevID, (LPMIDIHDR16)dwParam1, dwParam2);
     case MODM_PREPARE:
-	return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
+	return modPrepare(wDevID, (LPMIDIHDR16)dwParam1, dwParam2);
     case MODM_UNPREPARE:
-	return modUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
+	return modUnprepare(wDevID, (LPMIDIHDR16)dwParam1, dwParam2);
     case MODM_GETDEVCAPS:
 	return modGetDevCaps(wDevID,(LPMIDIOUTCAPS16)dwParam1,dwParam2);
     case MODM_GETNUMDEVS:
@@ -1530,7 +1530,7 @@ DWORD WINAPI modMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
 /**************************************************************************
  * 				MIDI_DriverProc32	[sample driver]
  */
-LONG MIDI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
+LONG MIDI_DriverProc(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, 
 		       DWORD dwParam1, DWORD dwParam2)
 {
     switch (wMsg) {
@@ -1541,7 +1541,7 @@ LONG MIDI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
     case DRV_ENABLE:		return 1;
     case DRV_DISABLE:		return 1;
     case DRV_QUERYCONFIGURE:	return 1;
-    case DRV_CONFIGURE:		MessageBox32A(0, "Sample Midi Linux Driver !", "MMLinux Driver", MB_OK); return 1;
+    case DRV_CONFIGURE:		MessageBoxA(0, "Sample Midi Linux Driver !", "MMLinux Driver", MB_OK); return 1;
     case DRV_INSTALL:		return DRVCNF_RESTART;
     case DRV_REMOVE:		return DRVCNF_RESTART;
     default:			
@@ -1564,12 +1564,12 @@ LONG MIDI_DriverProc16(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg,
     case DRV_ENABLE:		return 1;
     case DRV_DISABLE:		return 1;
     case DRV_QUERYCONFIGURE:	return 1;
-    case DRV_CONFIGURE:		MessageBox32A(0, "Sample Midi Linux Driver !", "MMLinux Driver", MB_OK); return 1;
+    case DRV_CONFIGURE:		MessageBoxA(0, "Sample Midi Linux Driver !", "MMLinux Driver", MB_OK); return 1;
     case DRV_INSTALL:		return DRVCNF_RESTART;
     case DRV_REMOVE:		return DRVCNF_RESTART;
     default:			
 	TRACE(midi, "Sending msg=%u to default driver proc\n", wMsg);
-	return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
 }
 
diff --git a/multimedia/mmio.c b/multimedia/mmio.c
index 57bcbc2ed30..882f6108f3d 100644
--- a/multimedia/mmio.c
+++ b/multimedia/mmio.c
@@ -45,12 +45,12 @@ static LRESULT mmioDosIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
 			/* if filename NULL, assume open file handle in adwInfo[0] */
 			if (!szFileName) {
 				if (lParam2) lpmmioinfo->adwInfo[0] =
-					FILE_GetHandle32(lpmmioinfo->adwInfo[0]);
+					FILE_GetHandle(lpmmioinfo->adwInfo[0]);
 				return 0;
 			}
 
 			lpmmioinfo->adwInfo[0] =
-				(DWORD) OpenFile32(szFileName, &ofs, lpmmioinfo->dwFlags);
+				(DWORD) OpenFile(szFileName, &ofs, lpmmioinfo->dwFlags);
 			if (lpmmioinfo->adwInfo[0] == -1)
 				return MMIOERR_CANNOTOPEN;
 
@@ -69,7 +69,7 @@ static LRESULT mmioDosIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
 			if (uFlags & MMIO_FHOPEN)
 				return 0;
 
-			_lclose32((HFILE32)lpmmioinfo->adwInfo[0]);
+			_lclose((HFILE)lpmmioinfo->adwInfo[0]);
 			return 0;
 
 		}
@@ -87,7 +87,7 @@ static LRESULT mmioDosIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
 			LONG cch = (LONG) lParam2;
 			LONG count;
 
-			count = _lread32((HFILE32)lpmmioinfo->adwInfo[0], pch, cch);
+			count = _lread((HFILE)lpmmioinfo->adwInfo[0], pch, cch);
 			if (count != -1)
 				lpmmioinfo->lDiskOffset += count;
 
@@ -110,7 +110,7 @@ static LRESULT mmioDosIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
 			LONG cch = (LONG) lParam2;
 			LONG count;
 
-			count = _hwrite32((HFILE32)lpmmioinfo->adwInfo[0], pch, cch);
+			count = _hwrite((HFILE)lpmmioinfo->adwInfo[0], pch, cch);
 			if (count != -1)
 				lpmmioinfo->lDiskOffset += count;
 
@@ -129,7 +129,7 @@ static LRESULT mmioDosIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
             LONG Whence = (LONG) lParam2; 
             LONG pos;
 
-            pos = _llseek32((HFILE32)lpmmioinfo->adwInfo[0], Offset, Whence);
+            pos = _llseek((HFILE)lpmmioinfo->adwInfo[0], Offset, Whence);
             if (pos != -1)
                 lpmmioinfo->lDiskOffset = pos;
 
@@ -318,11 +318,11 @@ static HMMIO16 MMIO_Open(LPSTR szFileName, MMIOINFO16 * lpmmioinfo,
 /**************************************************************************
  * 				mmioOpenW       		[WINMM.123]
  */
-HMMIO32 WINAPI mmioOpen32W(LPWSTR szFileName, MMIOINFO32 * lpmmioinfo,
+HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO * lpmmioinfo,
                           DWORD dwOpenFlags)
 {
 	LPSTR	szFn = HEAP_strdupWtoA(GetProcessHeap(),0,szFileName);
-	HMMIO32 ret = MMIO_Open(szFn,(LPMMIOINFO16)lpmmioinfo,dwOpenFlags,FALSE);
+	HMMIO ret = MMIO_Open(szFn,(LPMMIOINFO16)lpmmioinfo,dwOpenFlags,FALSE);
 
 	HeapFree(GetProcessHeap(),0,szFn);
 	return ret;
@@ -331,7 +331,7 @@ HMMIO32 WINAPI mmioOpen32W(LPWSTR szFileName, MMIOINFO32 * lpmmioinfo,
 /**************************************************************************
  * 				mmioOpenA       		[WINMM.122]
  */
-HMMIO32 WINAPI mmioOpen32A(LPSTR szFileName, MMIOINFO32 * lpmmioinfo,
+HMMIO WINAPI mmioOpenA(LPSTR szFileName, MMIOINFO * lpmmioinfo,
                           DWORD dwOpenFlags)
 {
 	return MMIO_Open(szFileName,(LPMMIOINFO16)lpmmioinfo,dwOpenFlags,FALSE);
@@ -350,10 +350,10 @@ HMMIO16 WINAPI mmioOpen16(LPSTR szFileName, MMIOINFO16 * lpmmioinfo,
 /**************************************************************************
  * 				mmioClose      		[WINMM.114]
  */
-MMRESULT32 WINAPI mmioClose32(HMMIO32 hmmio, UINT32 uFlags)
+MMRESULT WINAPI mmioClose(HMMIO hmmio, UINT uFlags)
 {
 	LPMMIOINFO16 lpmminfo;
-	MMRESULT32 result;
+	MMRESULT result;
 
 	TRACE(mmio, "(%04X, %04X);\n", hmmio, uFlags);
 
@@ -362,7 +362,7 @@ MMRESULT32 WINAPI mmioClose32(HMMIO32 hmmio, UINT32 uFlags)
 		return 0;
 
 	/* flush the file - if error reported, ignore */
-	if (mmioFlush32(hmmio, MMIO_EMPTYBUF) != 0)
+	if (mmioFlush(hmmio, MMIO_EMPTYBUF) != 0)
 		lpmminfo->dwFlags &= ~MMIO_DIRTY;
 
 	result = mmioSendMessage(hmmio,MMIOM_CLOSE,(LPARAM)uFlags,(LPARAM)0);
@@ -381,7 +381,7 @@ MMRESULT32 WINAPI mmioClose32(HMMIO32 hmmio, UINT32 uFlags)
  */
 MMRESULT16 WINAPI mmioClose16(HMMIO16 hmmio, UINT16 uFlags)
 {
-	return mmioClose32(hmmio,uFlags);
+	return mmioClose(hmmio,uFlags);
 }
 
 
@@ -389,7 +389,7 @@ MMRESULT16 WINAPI mmioClose16(HMMIO16 hmmio, UINT16 uFlags)
 /**************************************************************************
  * 				mmioRead	       	[WINMM.124]
  */
-LONG WINAPI mmioRead32(HMMIO32 hmmio, HPSTR pch, LONG cch)
+LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch)
 {
 	LONG count;
 	LPMMIOINFO16 lpmminfo;
@@ -412,7 +412,7 @@ LONG WINAPI mmioRead32(HMMIO32 hmmio, HPSTR pch, LONG cch)
 
 	if (cch&&(lpmminfo->fccIOProc!=FOURCC_MEM)) {
 		if (lpmminfo->cchBuffer) {
-			mmioFlush32(hmmio, MMIO_EMPTYBUF);
+			mmioFlush(hmmio, MMIO_EMPTYBUF);
 
 			while (cch) {
 				LONG size;
@@ -447,13 +447,13 @@ LONG WINAPI mmioRead32(HMMIO32 hmmio, HPSTR pch, LONG cch)
  */
 LONG WINAPI mmioRead16(HMMIO16 hmmio, HPSTR pch, LONG cch)
 {
-	return mmioRead32(hmmio,pch,cch);
+	return mmioRead(hmmio,pch,cch);
 }
 
 /**************************************************************************
  * 				mmioWrite      		[WINMM.133]
  */
-LONG WINAPI mmioWrite32(HMMIO32 hmmio, HPCSTR pch, LONG cch)
+LONG WINAPI mmioWrite(HMMIO hmmio, HPCSTR pch, LONG cch)
 {
 	LONG count;
 	LPMMIOINFO16 lpmminfo;
@@ -484,7 +484,7 @@ LONG WINAPI mmioWrite32(HMMIO32 hmmio, HPCSTR pch, LONG cch)
 			}
 
 			if (lpmminfo->pchNext == lpmminfo->pchEndWrite
-				&& mmioFlush32(hmmio, MMIO_EMPTYBUF)) break;
+				&& mmioFlush(hmmio, MMIO_EMPTYBUF)) break;
 		}
 	} else {
 		count = mmioSendMessage(hmmio, MMIOM_WRITE, (LPARAM) pch, (LPARAM) cch);
@@ -501,13 +501,13 @@ LONG WINAPI mmioWrite32(HMMIO32 hmmio, HPCSTR pch, LONG cch)
  */
 LONG WINAPI mmioWrite16(HMMIO16 hmmio, HPCSTR pch, LONG cch)
 {
-	return mmioWrite32(hmmio,pch,cch);
+	return mmioWrite(hmmio,pch,cch);
 }
 
 /**************************************************************************
  * 				mmioSeek       		[MMSYSTEM.1214]
  */
-LONG WINAPI mmioSeek32(HMMIO32 hmmio, LONG lOffset, INT32 iOrigin)
+LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin)
 {
 	int offset;
 	LPMMIOINFO16 lpmminfo;
@@ -529,7 +529,7 @@ LONG WINAPI mmioSeek32(HMMIO32 hmmio, LONG lOffset, INT32 iOrigin)
 		return lpmminfo->lBufOffset + offset;
 	}
 
-	if ((lpmminfo->fccIOProc==FOURCC_MEM)||mmioFlush32(hmmio, MMIO_EMPTYBUF)) {
+	if ((lpmminfo->fccIOProc==FOURCC_MEM)||mmioFlush(hmmio, MMIO_EMPTYBUF)) {
 		GlobalUnlock16(hmmio);
 		return -1;
 	}
@@ -546,7 +546,7 @@ LONG WINAPI mmioSeek32(HMMIO32 hmmio, LONG lOffset, INT32 iOrigin)
  */
 LONG WINAPI mmioSeek16(HMMIO16 hmmio, LONG lOffset, INT16 iOrigin)
 {
-	return mmioSeek32(hmmio,lOffset,iOrigin);
+	return mmioSeek(hmmio,lOffset,iOrigin);
 }
 
 /**************************************************************************
@@ -566,7 +566,7 @@ UINT16 WINAPI mmioGetInfo16(HMMIO16 hmmio, MMIOINFO16 * lpmmioinfo, UINT16 uFlag
 /**************************************************************************
  * 				mmioGetInfo	       	[WINMM.118]
  */
-UINT32 WINAPI mmioGetInfo32(HMMIO32 hmmio, MMIOINFO32*lpmmioinfo, UINT32 uFlags)
+UINT WINAPI mmioGetInfo(HMMIO hmmio, MMIOINFO*lpmmioinfo, UINT uFlags)
 {
 	MMIOINFO16	mmioinfo;
 	LPMMIOINFO16	lpmminfo=&mmioinfo;
@@ -578,7 +578,7 @@ UINT32 WINAPI mmioGetInfo32(HMMIO32 hmmio, MMIOINFO32*lpmmioinfo, UINT32 uFlags)
 		return 0;
 	lpmmioinfo->dwFlags	= lpmminfo->dwFlags;
 	lpmmioinfo->fccIOProc	= lpmminfo->fccIOProc;
-	lpmmioinfo->pIOProc	= (LPMMIOPROC32)lpmminfo->pIOProc;
+	lpmmioinfo->pIOProc	= (LPMMIOPROC)lpmminfo->pIOProc;
 	lpmmioinfo->wErrorRet	= lpmminfo->wErrorRet;
 	lpmmioinfo->htask	= lpmminfo->htask;
 	lpmmioinfo->cchBuffer	= lpmminfo->cchBuffer;
@@ -613,7 +613,7 @@ UINT16 WINAPI mmioSetInfo16(HMMIO16 hmmio, const MMIOINFO16 * lpmmioinfo, UINT16
 /**************************************************************************
  * 				mmioSetInfo    		[WINMM.130]
  */
-UINT32 WINAPI mmioSetInfo32(HMMIO32 hmmio, const MMIOINFO32 * lpmmioinfo, UINT32 uFlags)
+UINT WINAPI mmioSetInfo(HMMIO hmmio, const MMIOINFO * lpmmioinfo, UINT uFlags)
 {
 	LPMMIOINFO16	lpmminfo;
 	TRACE(mmio, "mmioSetInfo\n");
@@ -628,12 +628,12 @@ UINT32 WINAPI mmioSetInfo32(HMMIO32 hmmio, const MMIOINFO32 * lpmmioinfo, UINT32
 /**************************************************************************
 * 				mmioSetBuffer		[WINMM.129]
 */
-UINT32 WINAPI mmioSetBuffer32(HMMIO32 hmmio, LPSTR pchBuffer, 
-										LONG cchBuffer, UINT32 uFlags)
+UINT WINAPI mmioSetBuffer(HMMIO hmmio, LPSTR pchBuffer, 
+										LONG cchBuffer, UINT uFlags)
 {
 	LPMMIOINFO16	lpmminfo;
 
-	if (mmioFlush32(hmmio, MMIO_EMPTYBUF) != 0)
+	if (mmioFlush(hmmio, MMIO_EMPTYBUF) != 0)
 		return MMIOERR_CANNOTWRITE;
 
 	TRACE(mmio, "(hmmio=%04x, pchBuf=%p, cchBuf=%ld, uFlags=%#08x)\n",
@@ -687,13 +687,13 @@ UINT32 WINAPI mmioSetBuffer32(HMMIO32 hmmio, LPSTR pchBuffer,
 UINT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, LPSTR pchBuffer, 
 										LONG cchBuffer, UINT16 uFlags)
 {
-	return mmioSetBuffer32(hmmio, pchBuffer, cchBuffer, uFlags);
+	return mmioSetBuffer(hmmio, pchBuffer, cchBuffer, uFlags);
 }
 
 /**************************************************************************
  * 				mmioFlush      		[WINMM.117]
  */
-UINT32 WINAPI mmioFlush32(HMMIO32 hmmio, UINT32 uFlags)
+UINT WINAPI mmioFlush(HMMIO hmmio, UINT uFlags)
 {
 	LPMMIOINFO16	lpmminfo;
 	TRACE(mmio, "(%04X, %04X)\n", hmmio, uFlags);
@@ -735,13 +735,13 @@ UINT32 WINAPI mmioFlush32(HMMIO32 hmmio, UINT32 uFlags)
  */
 UINT16 WINAPI mmioFlush16(HMMIO16 hmmio, UINT16 uFlags)
 {
-	return mmioFlush32(hmmio,uFlags);
+	return mmioFlush(hmmio,uFlags);
 }
 
 /**************************************************************************
  * 				mmioAdvance    		[MMSYSTEM.1219]
  */
-UINT32 WINAPI mmioAdvance32(HMMIO32 hmmio,MMIOINFO32*lpmmioinfo,UINT32 uFlags)
+UINT WINAPI mmioAdvance(HMMIO hmmio,MMIOINFO*lpmmioinfo,UINT uFlags)
 {
 	LPMMIOINFO16	lpmminfo;
 	TRACE(mmio, "mmioAdvance\n");
@@ -752,7 +752,7 @@ UINT32 WINAPI mmioAdvance32(HMMIO32 hmmio,MMIOINFO32*lpmmioinfo,UINT32 uFlags)
 		return MMIOERR_UNBUFFERED;
 	}
 	lpmminfo->pchNext = lpmmioinfo->pchNext;
-	if (mmioFlush32(hmmio, MMIO_EMPTYBUF)) {
+	if (mmioFlush(hmmio, MMIO_EMPTYBUF)) {
 		GlobalUnlock16(hmmio);
 		return MMIOERR_CANNOTWRITE;
 	}
@@ -786,7 +786,7 @@ UINT16 WINAPI mmioAdvance16(HMMIO16 hmmio,MMIOINFO16*lpmmioinfo,UINT16 uFlags)
 		return MMIOERR_UNBUFFERED;
 	}
 	lpmminfo->pchNext = lpmmioinfo->pchNext;
-	if (mmioFlush32(hmmio, MMIO_EMPTYBUF)) {
+	if (mmioFlush(hmmio, MMIO_EMPTYBUF)) {
 		GlobalUnlock16(hmmio);
 		return MMIOERR_CANNOTWRITE;
 	}
@@ -809,7 +809,7 @@ UINT16 WINAPI mmioAdvance16(HMMIO16 hmmio,MMIOINFO16*lpmmioinfo,UINT16 uFlags)
 /**************************************************************************
  * 				mmioStringToFOURCCA	[WINMM.131]
  */
-FOURCC WINAPI mmioStringToFOURCC32A(LPCSTR sz, UINT32 uFlags)
+FOURCC WINAPI mmioStringToFOURCCA(LPCSTR sz, UINT uFlags)
 {
 	return mmioStringToFOURCC16(sz,uFlags);
 }
@@ -817,10 +817,10 @@ FOURCC WINAPI mmioStringToFOURCC32A(LPCSTR sz, UINT32 uFlags)
 /**************************************************************************
  * 				mmioStringToFOURCCW	[WINMM.132]
  */
-FOURCC WINAPI mmioStringToFOURCC32W(LPCWSTR sz, UINT32 uFlags)
+FOURCC WINAPI mmioStringToFOURCCW(LPCWSTR sz, UINT uFlags)
 {
 	LPSTR	szA = HEAP_strdupWtoA(GetProcessHeap(),0,sz);
-	FOURCC	ret = mmioStringToFOURCC32A(szA,uFlags);
+	FOURCC	ret = mmioStringToFOURCCA(szA,uFlags);
 
 	HeapFree(GetProcessHeap(),0,szA);
 	return ret;
@@ -868,8 +868,8 @@ LPMMIOPROC16 WINAPI mmioInstallIOProc16(FOURCC fccIOProc,
 /**************************************************************************
  * 				mmioInstallIOProc32A   [WINMM.120]
  */
-LPMMIOPROC32 WINAPI mmioInstallIOProc32A(FOURCC fccIOProc, 
-                                         LPMMIOPROC32 pIOProc, DWORD dwFlags)
+LPMMIOPROC WINAPI mmioInstallIOProcA(FOURCC fccIOProc, 
+                                         LPMMIOPROC pIOProc, DWORD dwFlags)
 {
 	FIXME(mmio, "(%c%c%c%c,%p,0x%08lx) -- empty stub \n",
                      (char)((fccIOProc&0xff000000)>>24),
@@ -937,12 +937,12 @@ UINT16 WINAPI mmioDescend(HMMIO16 hmmio, MMCKINFO * lpck,
 
 	if (lpck == NULL)
 	    return 0;
-	dwOldPos = mmioSeek32(hmmio, 0, SEEK_CUR);
+	dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR);
 	TRACE(mmio, "dwOldPos=%ld\n", dwOldPos);
 
 	if (lpckParent != NULL) {
 		TRACE(mmio, "seek inside parent at %ld !\n", lpckParent->dwDataOffset);
-		dwOldPos = mmioSeek32(hmmio,lpckParent->dwDataOffset,SEEK_SET);
+		dwOldPos = mmioSeek(hmmio,lpckParent->dwDataOffset,SEEK_SET);
 	}
 
 	/* The SDK docu says 'ckid' is used for all cases. Real World
@@ -970,15 +970,15 @@ UINT16 WINAPI mmioDescend(HMMIO16 hmmio, MMCKINFO * lpck,
 		while (TRUE) {
 		        LONG ix;
 
-			ix = mmioRead32(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD));
+			ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD));
 			if (ix < 2*sizeof(DWORD)) {
-				mmioSeek32(hmmio, dwOldPos, SEEK_SET);
+				mmioSeek(hmmio, dwOldPos, SEEK_SET);
 				WARN(mmio, "return ChunkNotFound\n");
 				return MMIOERR_CHUNKNOTFOUND;
 			}
 			lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD);
 			if (ix < lpck->dwDataOffset - dwOldPos) {
-				mmioSeek32(hmmio, dwOldPos, SEEK_SET);
+				mmioSeek(hmmio, dwOldPos, SEEK_SET);
 				WARN(mmio, "return ChunkNotFound\n");
 				return MMIOERR_CHUNKNOTFOUND;
 			}
@@ -996,7 +996,7 @@ UINT16 WINAPI mmioDescend(HMMIO16 hmmio, MMCKINFO * lpck,
 				break;
 
 			dwOldPos = lpck->dwDataOffset + lpck->cksize;
-			mmioSeek32(hmmio, dwOldPos, SEEK_SET);
+			mmioSeek(hmmio, dwOldPos, SEEK_SET);
 		}
 		/* If we were looking for RIFF/LIST chunks, the final dataptr
 		 * is after the chunkid. If we were just looking for the chunk
@@ -1006,8 +1006,8 @@ UINT16 WINAPI mmioDescend(HMMIO16 hmmio, MMCKINFO * lpck,
 			lpck->dwDataOffset+=sizeof(DWORD);
 	} else {
 		/* FIXME: unverified, does it do this? */
-		if (mmioRead32(hmmio, (LPSTR)lpck, sizeof(MMCKINFO)) < sizeof(MMCKINFO)) {
-			mmioSeek32(hmmio, dwOldPos, SEEK_SET);
+		if (mmioRead(hmmio, (LPSTR)lpck, sizeof(MMCKINFO)) < sizeof(MMCKINFO)) {
+			mmioSeek(hmmio, dwOldPos, SEEK_SET);
 			WARN(mmio, "return ChunkNotFound 2nd\n");
 			return MMIOERR_CHUNKNOTFOUND;
 		}
@@ -1015,7 +1015,7 @@ UINT16 WINAPI mmioDescend(HMMIO16 hmmio, MMCKINFO * lpck,
 		if (lpck->ckid == FOURCC_RIFF || lpck->ckid == FOURCC_LIST) 
 			lpck->dwDataOffset += sizeof(DWORD);
 	}
-	mmioSeek32(hmmio, lpck->dwDataOffset, SEEK_SET);
+	mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET);
 	memcpy(ckid,&(lpck->ckid),4);
 	TRACE(mmio, "lpck->ckid=%s lpck->cksize=%ld !\n", ckid, lpck->cksize);
 	memcpy(fcc,&(lpck->fccType),4);
@@ -1026,7 +1026,7 @@ UINT16 WINAPI mmioDescend(HMMIO16 hmmio, MMCKINFO * lpck,
 /**************************************************************************
  * 				mmioAscend     		[WINMM.113]
  */
-UINT32 WINAPI mmioAscend32(HMMIO32 hmmio, MMCKINFO * lpck, UINT32 uFlags)
+UINT WINAPI mmioAscend(HMMIO hmmio, MMCKINFO * lpck, UINT uFlags)
 {
 	TRACE(mmio, "(%04X, %p, %04X);\n", 
 				hmmio, lpck, uFlags);
@@ -1034,7 +1034,7 @@ UINT32 WINAPI mmioAscend32(HMMIO32 hmmio, MMCKINFO * lpck, UINT32 uFlags)
 		DWORD	dwOldPos, dwNewSize, dwSizePos;
 
 		TRACE(mmio, "chunk is marked MMIO_DIRTY, correcting chunk size\n");
-		dwOldPos = mmioSeek32(hmmio, 0, SEEK_CUR);
+		dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR);
 		TRACE(mmio, "dwOldPos=%ld\n", dwOldPos);
 		dwNewSize = dwOldPos - lpck->dwDataOffset;
 		if (dwNewSize != lpck->cksize) {
@@ -1046,11 +1046,11 @@ UINT32 WINAPI mmioAscend32(HMMIO32 hmmio, MMCKINFO * lpck, UINT32 uFlags)
 				dwSizePos -= sizeof(DWORD);
 			TRACE(mmio, "dwSizePos=%ld\n", dwSizePos);
 
-			mmioSeek32(hmmio, dwSizePos, SEEK_SET);
-			mmioWrite32(hmmio, (LPSTR)&dwNewSize, sizeof(DWORD));
+			mmioSeek(hmmio, dwSizePos, SEEK_SET);
+			mmioWrite(hmmio, (LPSTR)&dwNewSize, sizeof(DWORD));
 		}
 	}
-	mmioSeek32(hmmio,lpck->dwDataOffset+lpck->cksize,SEEK_SET);
+	mmioSeek(hmmio,lpck->dwDataOffset+lpck->cksize,SEEK_SET);
 
 	return 0;
 }
@@ -1060,7 +1060,7 @@ UINT32 WINAPI mmioAscend32(HMMIO32 hmmio, MMCKINFO * lpck, UINT32 uFlags)
  */
 UINT16 WINAPI mmioAscend16(HMMIO16 hmmio, MMCKINFO * lpck, UINT16 uFlags)
 {
-	return mmioAscend32(hmmio,lpck,uFlags);
+	return mmioAscend(hmmio,lpck,uFlags);
 }
 
 /**************************************************************************
@@ -1074,7 +1074,7 @@ UINT16 WINAPI mmioCreateChunk16(HMMIO16 hmmio, MMCKINFO * lpck, UINT16 uFlags)
 	TRACE(mmio, "(%04X, %p, %04X);\n", 
 				hmmio, lpck, uFlags);
 
-	dwOldPos = mmioSeek32(hmmio, 0, SEEK_CUR);
+	dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR);
 	TRACE(mmio, "dwOldPos=%ld\n", dwOldPos);
 
 	if (uFlags == MMIO_CREATELIST)
@@ -1089,11 +1089,11 @@ UINT16 WINAPI mmioCreateChunk16(HMMIO16 hmmio, MMCKINFO * lpck, UINT16 uFlags)
 		lpck->dwDataOffset += sizeof(DWORD);
 	lpck->dwFlags = MMIO_DIRTY;
 
-	ix = mmioWrite32(hmmio, (LPSTR)lpck, lpck->dwDataOffset - dwOldPos);
+	ix = mmioWrite(hmmio, (LPSTR)lpck, lpck->dwDataOffset - dwOldPos);
 	TRACE(mmio, "after _lwrite32 ix = %ld req = %ld, errno = %d\n",ix,lpck->dwDataOffset - dwOldPos,errno);
 	if (ix < lpck->dwDataOffset - dwOldPos) {
 
-		mmioSeek32(hmmio, dwOldPos, SEEK_SET);
+		mmioSeek(hmmio, dwOldPos, SEEK_SET);
 		WARN(mmio, "return CannotWrite\n");
 		return MMIOERR_CANNOTWRITE;
 	}
@@ -1104,7 +1104,7 @@ UINT16 WINAPI mmioCreateChunk16(HMMIO16 hmmio, MMCKINFO * lpck, UINT16 uFlags)
 /**************************************************************************
  * 					mmioCreateChunk					[WINMM.115]
  */
-UINT32 WINAPI mmioCreateChunk32(HMMIO32 hmmio, MMCKINFO * lpck, UINT32 uFlags)
+UINT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO * lpck, UINT uFlags)
 {
 	return mmioCreateChunk16(hmmio, lpck, uFlags);
 }
@@ -1154,8 +1154,8 @@ UINT16 WINAPI mmioRename16(LPCSTR szFileName, LPCSTR szNewFileName,
 /**************************************************************************
  * 				mmioRenameA     			[WINMM.125]
  */
-UINT32 WINAPI mmioRename32A(LPCSTR szFileName, LPCSTR szNewFileName,
-                         MMIOINFO32* lpmmioinfo, DWORD dwRenameFlags)
+UINT WINAPI mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName,
+                         MMIOINFO* lpmmioinfo, DWORD dwRenameFlags)
 {
 	FIXME(mmio, "This may fail\n");
 	return mmioRename16(szFileName, szNewFileName, (MMIOINFO16*)lpmmioinfo, dwRenameFlags);
@@ -1164,12 +1164,12 @@ UINT32 WINAPI mmioRename32A(LPCSTR szFileName, LPCSTR szNewFileName,
 /**************************************************************************
  * 				mmioRenameW     			[WINMM.126]
  */
-UINT32 WINAPI mmioRename32W(LPCWSTR szFileName, LPCWSTR szNewFileName,
-									 MMIOINFO32* lpmmioinfo, DWORD dwRenameFlags)
+UINT WINAPI mmioRenameW(LPCWSTR szFileName, LPCWSTR szNewFileName,
+									 MMIOINFO* lpmmioinfo, DWORD dwRenameFlags)
 {
 	LPSTR		szFn = HEAP_strdupWtoA(GetProcessHeap(), 0, szFileName);
 	LPSTR		sznFn = HEAP_strdupWtoA(GetProcessHeap(), 0, szNewFileName);
-	UINT32	ret = mmioRename32A(szFn, sznFn, lpmmioinfo, dwRenameFlags);
+	UINT	ret = mmioRenameA(szFn, sznFn, lpmmioinfo, dwRenameFlags);
 
 	HeapFree(GetProcessHeap(),0,szFn);
 	HeapFree(GetProcessHeap(),0,sznFn);
diff --git a/multimedia/mmsystem.c b/multimedia/mmsystem.c
index 00a27646e8f..7106493ec33 100644
--- a/multimedia/mmsystem.c
+++ b/multimedia/mmsystem.c
@@ -65,15 +65,15 @@ LONG   WINAPI DrvDefDriverProc(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg,
 /**************************************************************************
  * 				MCI_GetProc32			[internal]
  */
-MCIPROC32	MCI_GetProc32(UINT16 uDevType)
+MCIPROC	MCI_GetProc(UINT16 uDevType)
 {
-    MCIPROC32	proc = 0;
+    MCIPROC	proc = 0;
 
     switch (uDevType) {
-    case MCI_DEVTYPE_CD_AUDIO:		proc = MCICDAUDIO_DriverProc32;	break;
-    case MCI_DEVTYPE_WAVEFORM_AUDIO:	proc = MCIWAVE_DriverProc32;	break;
-    case MCI_DEVTYPE_SEQUENCER:		proc = MCIMIDI_DriverProc32;	break;
-    case MCI_DEVTYPE_ANIMATION: 	proc = MCIANIM_DriverProc32;	break;
+    case MCI_DEVTYPE_CD_AUDIO:		proc = MCICDAUDIO_DriverProc;	break;
+    case MCI_DEVTYPE_WAVEFORM_AUDIO:	proc = MCIWAVE_DriverProc;	break;
+    case MCI_DEVTYPE_SEQUENCER:		proc = MCIMIDI_DriverProc;	break;
+    case MCI_DEVTYPE_ANIMATION: 	proc = MCIANIM_DriverProc;	break;
     case MCI_DEVTYPE_DIGITAL_VIDEO:	proc = MCIAVI_DriverProc32;	break;
     default:	TRACE(mci, "Unknown device type %u\n", uDevType);
     }
@@ -87,15 +87,15 @@ WORD		MCI_GetDevType(LPCSTR str)
 {
     WORD 	uDevTyp = 0;
 
-    if (lstrcmpi32A(str, "CDAUDIO") == 0) {
+    if (lstrcmpiA(str, "CDAUDIO") == 0) {
 	uDevTyp = MCI_DEVTYPE_CD_AUDIO;
-    } else if (lstrcmpi32A(str, "WAVEAUDIO") == 0) {
+    } else if (lstrcmpiA(str, "WAVEAUDIO") == 0) {
 	uDevTyp = MCI_DEVTYPE_WAVEFORM_AUDIO;
-    } else if (lstrcmpi32A(str, "SEQUENCER") == 0)	{
+    } else if (lstrcmpiA(str, "SEQUENCER") == 0)	{
 	uDevTyp = MCI_DEVTYPE_SEQUENCER;
-    } else if (lstrcmpi32A(str, "ANIMATION1") == 0) {
+    } else if (lstrcmpiA(str, "ANIMATION1") == 0) {
 	uDevTyp = MCI_DEVTYPE_ANIMATION;
-    } else if (lstrcmpi32A(str, "AVIVIDEO") == 0) {
+    } else if (lstrcmpiA(str, "AVIVIDEO") == 0) {
 	uDevTyp = MCI_DEVTYPE_DIGITAL_VIDEO;
     }
     TRACE(mci, "str = %s => %u\n", str, uDevTyp);
@@ -148,7 +148,7 @@ UINT16 MCI_NextDevID(UINT16 wDevID)
 /**************************************************************************
  * 				MCI_DevIDValid	[internal]
  */
-BOOL32 MCI_DevIDValid(UINT16 wDevID) 
+BOOL MCI_DevIDValid(UINT16 wDevID) 
 {
     return wDevID >= MCI_MAGIC && wDevID < (MCI_MAGIC + MAXMCIDRIVERS);
 }
@@ -163,14 +163,14 @@ int WINAPI MMSYSTEM_WEP(HINSTANCE16 hInstance, WORD wDataSeg,
     return(TRUE);
 }
 
-static void MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, LPMMTIME32 mmt32) 
+static void MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, LPMMTIME mmt32) 
 {
     mmt16->wType = mmt32->wType;
     /* layout of rest is the same for 32/16 */
     memcpy(&(mmt32->u), &(mmt16->u), sizeof(mmt16->u));
 }
 
-static void MMSYSTEM_MMTIME16to32(LPMMTIME32 mmt32, LPMMTIME16 mmt16) 
+static void MMSYSTEM_MMTIME16to32(LPMMTIME mmt32, LPMMTIME16 mmt16) 
 {
     mmt32->wType = mmt16->wType;
     /* layout of rest is the same for 32/16,
@@ -179,16 +179,16 @@ static void MMSYSTEM_MMTIME16to32(LPMMTIME32 mmt32, LPMMTIME16 mmt16)
     memcpy(&(mmt16->u), &(mmt32->u), sizeof(mmt16->u));
 }
 
-static HANDLE32		PlaySound_hThread = 0;
-static HANDLE32		PlaySound_hPlayEvent = 0;
-static HANDLE32		PlaySound_hReadyEvent = 0;
-static HANDLE32		PlaySound_hMiddleEvent = 0;
-static BOOL32		PlaySound_Result = FALSE;
+static HANDLE		PlaySound_hThread = 0;
+static HANDLE		PlaySound_hPlayEvent = 0;
+static HANDLE		PlaySound_hReadyEvent = 0;
+static HANDLE		PlaySound_hMiddleEvent = 0;
+static BOOL		PlaySound_Result = FALSE;
 static int		PlaySound_Stop = FALSE;
 static int		PlaySound_Playing = FALSE;
 
 static LPCSTR		PlaySound_pszSound = NULL;
-static HMODULE32	PlaySound_hmod = 0;
+static HMODULE	PlaySound_hmod = 0;
 static DWORD		PlaySound_fdwSound = 0;
 static int		PlaySound_Loop = FALSE;
 static int		PlaySound_SearchMode = 0; /* 1 - sndPlaySound search order
@@ -200,17 +200,17 @@ static HMMIO16	get_mmioFromFile(LPCSTR lpszName)
 		      MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
 }
 
-static HMMIO16 get_mmioFromProfile(UINT32 uFlags, LPCSTR lpszName) 
+static HMMIO16 get_mmioFromProfile(UINT uFlags, LPCSTR lpszName) 
 {
     char	str[128];
     LPSTR	ptr;
     HMMIO16  	hmmio;
     
     TRACE(mmsys, "searching in SystemSound List !\n");
-    GetProfileString32A("Sounds", (LPSTR)lpszName, "", str, sizeof(str));
+    GetProfileStringA("Sounds", (LPSTR)lpszName, "", str, sizeof(str));
     if (strlen(str) == 0) {
 	if (uFlags & SND_NODEFAULT) return 0;
-	GetProfileString32A("Sounds", "Default", "", str, sizeof(str));
+	GetProfileStringA("Sounds", "Default", "", str, sizeof(str));
 	if (strlen(str) == 0) return 0;
     }
     if ((ptr = (LPSTR)strchr(str, ',')) != NULL) *ptr = '\0';
@@ -222,7 +222,7 @@ static HMMIO16 get_mmioFromProfile(UINT32 uFlags, LPCSTR lpszName)
     return hmmio;
 }
 
-static BOOL16 WINAPI proc_PlaySound(LPCSTR lpszSoundName, UINT32 uFlags)
+static BOOL16 WINAPI proc_PlaySound(LPCSTR lpszSoundName, UINT uFlags)
 {
     BOOL16		bRet = FALSE;
     HMMIO16		hmmio;
@@ -283,7 +283,7 @@ static BOOL16 WINAPI proc_PlaySound(LPCSTR lpszSoundName, UINT32 uFlags)
 		    TRACE(mmsys, "Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX \n",
 			  (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize);
 		    
-		    if (mmioRead32(hmmio, (HPSTR)&pcmWaveFormat,
+		    if (mmioRead(hmmio, (HPSTR)&pcmWaveFormat,
 				   (long) sizeof(PCMWAVEFORMAT)) == (long) sizeof(PCMWAVEFORMAT)) {
 			TRACE(mmsys, "wFormatTag=%04X !\n", pcmWaveFormat.wf.wFormatTag);
 			TRACE(mmsys, "nChannels=%d \n", pcmWaveFormat.wf.nChannels);
@@ -309,7 +309,7 @@ static BOOL16 WINAPI proc_PlaySound(LPCSTR lpszSoundName, UINT32 uFlags)
 			    if (dwRet == MMSYSERR_NOERROR) {
 				WAVEHDR		waveHdr;
 				HGLOBAL16	hData;
-				INT32		count, bufsize, left = mmckInfo.cksize;
+				INT		count, bufsize, left = mmckInfo.cksize;
 				
 				bufsize = 64000;
 				hData = GlobalAlloc16(GMEM_MOVEABLE, bufsize);
@@ -328,7 +328,7 @@ static BOOL16 WINAPI proc_PlaySound(LPCSTR lpszSoundName, UINT32 uFlags)
 					    break;
 					}
 					if (bufsize > left) bufsize = left;
-					count = mmioRead32(hmmio, waveHdr.lpData,bufsize);
+					count = mmioRead(hmmio, waveHdr.lpData,bufsize);
 					if (count < 1) break;
 					left -= count;
 					waveHdr.dwBufferLength = count;
@@ -352,7 +352,7 @@ static BOOL16 WINAPI proc_PlaySound(LPCSTR lpszSoundName, UINT32 uFlags)
 	    }
 	} while (PlaySound_Loop);
     
-    if (hmmio != 0) mmioClose32(hmmio, 0);
+    if (hmmio != 0) mmioClose(hmmio, 0);
     return bRet;
 }
 
@@ -363,7 +363,7 @@ static DWORD WINAPI PlaySound_Thread(LPVOID arg)
     for (;;) {
 	PlaySound_Playing = FALSE;
 	SetEvent(PlaySound_hReadyEvent);
-	res = WaitForSingleObject(PlaySound_hPlayEvent, INFINITE32);
+	res = WaitForSingleObject(PlaySound_hPlayEvent, INFINITE);
 	ResetEvent(PlaySound_hReadyEvent);
 	SetEvent(PlaySound_hMiddleEvent);
 	if (res == WAIT_FAILED) ExitThread(2);
@@ -371,26 +371,26 @@ static DWORD WINAPI PlaySound_Thread(LPVOID arg)
 	PlaySound_Playing = TRUE;
 	
 	if ((PlaySound_fdwSound & SND_RESOURCE) == SND_RESOURCE) {
-	    HRSRC32   hRES;
-	    HGLOBAL32 hGLOB;
+	    HRSRC   hRES;
+	    HGLOBAL hGLOB;
 	    void      *ptr;
 
-	    if ((hRES = FindResource32A(PlaySound_hmod, PlaySound_pszSound, "WAVE")) == 0) {
+	    if ((hRES = FindResourceA(PlaySound_hmod, PlaySound_pszSound, "WAVE")) == 0) {
 		PlaySound_Result = FALSE;
 		continue;
 	    }
-	    if ((hGLOB = LoadResource32(PlaySound_hmod, hRES)) == 0) {
+	    if ((hGLOB = LoadResource(PlaySound_hmod, hRES)) == 0) {
 		PlaySound_Result = FALSE;
 		continue;
 	    }
-	    if ((ptr = LockResource32(hGLOB)) == NULL) {
-		FreeResource32(hGLOB);
+	    if ((ptr = LockResource(hGLOB)) == NULL) {
+		FreeResource(hGLOB);
 		PlaySound_Result = FALSE;
 		continue;
 	    }
 	    PlaySound_Result = proc_PlaySound(ptr, 
 					      ((UINT16)PlaySound_fdwSound ^ SND_RESOURCE) | SND_MEMORY);
-	    FreeResource32(hGLOB);
+	    FreeResource(hGLOB);
 	    continue;
 	}
 	PlaySound_Result=proc_PlaySound(PlaySound_pszSound, (UINT16)PlaySound_fdwSound);
@@ -400,7 +400,7 @@ static DWORD WINAPI PlaySound_Thread(LPVOID arg)
 /**************************************************************************
  * 				PlaySoundA		[WINMM.1]
  */
-BOOL32 WINAPI PlaySound32A(LPCSTR pszSound, HMODULE32 hmod, DWORD fdwSound)
+BOOL WINAPI PlaySoundA(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound)
 {
     static LPSTR StrDup = NULL;
     
@@ -409,11 +409,11 @@ BOOL32 WINAPI PlaySound32A(LPCSTR pszSound, HMODULE32 hmod, DWORD fdwSound)
     
     if (PlaySound_hThread == 0) { /* This is the first time they called us */
 	DWORD	id;
-	if ((PlaySound_hReadyEvent = CreateEvent32A(NULL, TRUE, FALSE, NULL)) == 0)
+	if ((PlaySound_hReadyEvent = CreateEventA(NULL, TRUE, FALSE, NULL)) == 0)
 	    return FALSE;
-	if ((PlaySound_hMiddleEvent = CreateEvent32A(NULL, FALSE, FALSE, NULL)) == 0)
+	if ((PlaySound_hMiddleEvent = CreateEventA(NULL, FALSE, FALSE, NULL)) == 0)
 	    return FALSE;
-	if ((PlaySound_hPlayEvent = CreateEvent32A(NULL, FALSE, FALSE, NULL)) == 0)
+	if ((PlaySound_hPlayEvent = CreateEventA(NULL, FALSE, FALSE, NULL)) == 0)
 	    return FALSE;
 	if ((PlaySound_hThread = CreateThread(NULL, 0, PlaySound_Thread, 0, 0, &id)) == 0) 
 	    return FALSE;
@@ -442,9 +442,9 @@ BOOL32 WINAPI PlaySound32A(LPCSTR pszSound, HMODULE32 hmod, DWORD fdwSound)
 	PlaySound_fdwSound = fdwSound;
 	PlaySound_Result = FALSE;
 	SetEvent(PlaySound_hPlayEvent);
-	if (WaitForSingleObject(PlaySound_hMiddleEvent, INFINITE32) != WAIT_OBJECT_0) 
+	if (WaitForSingleObject(PlaySound_hMiddleEvent, INFINITE) != WAIT_OBJECT_0) 
 	    return FALSE;
-	if (WaitForSingleObject(PlaySound_hReadyEvent, INFINITE32) != WAIT_OBJECT_0) 
+	if (WaitForSingleObject(PlaySound_hReadyEvent, INFINITE) != WAIT_OBJECT_0) 
 	    return FALSE;
 	return PlaySound_Result;
     } else {
@@ -471,18 +471,18 @@ BOOL32 WINAPI PlaySound32A(LPCSTR pszSound, HMODULE32 hmod, DWORD fdwSound)
 /**************************************************************************
  * 				PlaySoundW		[WINMM.18]
  */
-BOOL32 WINAPI PlaySound32W(LPCWSTR pszSound, HMODULE32 hmod, DWORD fdwSound)
+BOOL WINAPI PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound)
 {
     LPSTR 	pszSoundA;
-    BOOL32	bSound;
+    BOOL	bSound;
     
     if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) && 
 				      !((DWORD)pszSound >> 16)) || !pszSound)) {
 	pszSoundA = HEAP_strdupWtoA(GetProcessHeap(), 0,pszSound);
-	bSound = PlaySound32A(pszSoundA, hmod, fdwSound);
+	bSound = PlaySoundA(pszSoundA, hmod, fdwSound);
 	HeapFree(GetProcessHeap(), 0,pszSoundA);
     } else  
-	bSound = PlaySound32A((LPCSTR)pszSound, hmod, fdwSound);
+	bSound = PlaySoundA((LPCSTR)pszSound, hmod, fdwSound);
     
     return bSound;
 }
@@ -493,7 +493,7 @@ BOOL32 WINAPI PlaySound32W(LPCWSTR pszSound, HMODULE32 hmod, DWORD fdwSound)
 BOOL16 WINAPI sndPlaySound(LPCSTR lpszSoundName, UINT16 uFlags)
 {
     PlaySound_SearchMode = 1;
-    return PlaySound32A(lpszSoundName, 0, uFlags);
+    return PlaySoundA(lpszSoundName, 0, uFlags);
 }
 
 /**************************************************************************
@@ -502,13 +502,13 @@ BOOL16 WINAPI sndPlaySound(LPCSTR lpszSoundName, UINT16 uFlags)
 BOOL16 WINAPI sndPlaySound32W(LPCWSTR lpszSoundName, UINT16 uFlags)
 {
     PlaySound_SearchMode = 1;
-    return PlaySound32W(lpszSoundName, 0, uFlags);
+    return PlaySoundW(lpszSoundName, 0, uFlags);
 }
 
 /**************************************************************************
  * 				mmsystemGetVersion	[WINMM.134]
  */
-UINT32 WINAPI mmsystemGetVersion32()
+UINT WINAPI mmsystemGetVersion()
 {
     return mmsystemGetVersion16();
 }
@@ -526,7 +526,7 @@ UINT16 WINAPI mmsystemGetVersion16()
 /**************************************************************************
  * 				DriverProc	[MMSYSTEM.6]
  */
-LRESULT WINAPI DriverProc(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg, 
+LRESULT WINAPI DriverProc16(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg, 
                           DWORD dwParam1, DWORD dwParam2)
 {
     return DrvDefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
@@ -535,7 +535,7 @@ LRESULT WINAPI DriverProc(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg,
 /**************************************************************************
  * 				DriverCallback	[MMSYSTEM.31]
  */
-BOOL16 WINAPI DriverCallback(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev, 
+BOOL16 WINAPI DriverCallback16(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev, 
                              WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2)
 {
     TRACE(mmsys, "(%08lX, %04X, %04X, %04X, %08lX, %08lX, %08lX); !\n",
@@ -548,10 +548,10 @@ BOOL16 WINAPI DriverCallback(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev,
     case DCB_WINDOW:
 	TRACE(mmsys, "CALLBACK_WINDOW = %04lX handle = %04X!\n",
 	      dwCallBack, hDev);
-	if (!IsWindow32(dwCallBack) || USER_HEAP_LIN_ADDR(hDev) == NULL)
+	if (!IsWindow(dwCallBack) || USER_HEAP_LIN_ADDR(hDev) == NULL)
 	    return FALSE;
 	
-	PostMessage32A((HWND16)dwCallBack, wMsg, hDev, dwParam1);
+	PostMessageA((HWND16)dwCallBack, wMsg, hDev, dwParam1);
 	break;
     case DCB_TASK:
 	TRACE(mmsys, "CALLBACK_TASK !\n");
@@ -564,7 +564,7 @@ BOOL16 WINAPI DriverCallback(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev,
 	break;
     case DCB_FUNC32:
 	TRACE(mmsys, "CALLBACK_FUNCTION !\n");
-	((LPDRVCALLBACK32)dwCallBack)(hDev, wMsg, dwUser,
+	((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser,
 				       dwParam1, dwParam2 );
 	break;
     default:
@@ -581,7 +581,7 @@ BOOL16 WINAPI DriverCallback(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev,
  * find out the real mixer ID depending on hmix (depends on dwFlags)
  * FIXME: also fix dwInstance passing to mixMessage 
  */
-static UINT32 _get_mixerID_from_handle(HMIXEROBJ32 hmix, DWORD dwFlags) 
+static UINT _get_mixerID_from_handle(HMIXEROBJ hmix, DWORD dwFlags) 
 {
     /* FIXME: Check dwFlags for MIXER_OBJECTF_xxxx entries and modify hmix 
      * accordingly. For now we always use mixerdevice 0. 
@@ -592,7 +592,7 @@ static UINT32 _get_mixerID_from_handle(HMIXEROBJ32 hmix, DWORD dwFlags)
 /**************************************************************************
  * 				mixerGetNumDevs		[WINMM.108]
  */
-UINT32 WINAPI mixerGetNumDevs32() 
+UINT WINAPI mixerGetNumDevs() 
 {
     return mixerGetNumDevs16();
 }
@@ -611,10 +611,10 @@ UINT16 WINAPI mixerGetNumDevs16()
 /**************************************************************************
  * 				mixerGetDevCapsW		[WINMM.102]
  */
-UINT32 WINAPI mixerGetDevCaps32W(UINT32 devid, LPMIXERCAPS32W mixcaps,UINT32 size) 
+UINT WINAPI mixerGetDevCapsW(UINT devid, LPMIXERCAPSW mixcaps,UINT size) 
 {
     MIXERCAPS16	mic16;
-    UINT32	ret = mixerGetDevCaps16(devid, &mic16, sizeof(mic16));
+    UINT	ret = mixerGetDevCaps16(devid, &mic16, sizeof(mic16));
     
     mixcaps->wMid = mic16.wMid;
     mixcaps->wPid = mic16.wPid;
@@ -628,10 +628,10 @@ UINT32 WINAPI mixerGetDevCaps32W(UINT32 devid, LPMIXERCAPS32W mixcaps,UINT32 siz
 /**************************************************************************
  * 				mixerGetDevCaps		[WINMM.101]
  */
-UINT32 WINAPI mixerGetDevCaps32A(UINT32 devid, LPMIXERCAPS32A mixcaps,UINT32 size) 
+UINT WINAPI mixerGetDevCapsA(UINT devid, LPMIXERCAPSA mixcaps,UINT size) 
 {
     MIXERCAPS16	mic16;
-    UINT32	ret = mixerGetDevCaps16(devid, &mic16, sizeof(mic16));
+    UINT	ret = mixerGetDevCaps16(devid, &mic16, sizeof(mic16));
     
     mixcaps->wMid = mic16.wMid;
     mixcaps->wPid = mic16.wPid;
@@ -654,11 +654,11 @@ UINT16 WINAPI mixerGetDevCaps16(UINT16 devid, LPMIXERCAPS16 mixcaps,UINT16 size)
 /**************************************************************************
  * 				mixerOpen		[WINMM.110]
  */
-UINT32 WINAPI mixerOpen32(LPHMIXER32 lphmix,UINT32 uDeviceID, DWORD dwCallback,
+UINT WINAPI mixerOpen(LPHMIXER lphmix,UINT uDeviceID, DWORD dwCallback,
 			  DWORD dwInstance, DWORD fdwOpen) 
 {
     HMIXER16	hmix16;
-    UINT32	ret;
+    UINT	ret;
     
     FIXME(mmsys,"(%p,%d,%08lx,%08lx,%08lx): semi stub?\n",
 	  lphmix,uDeviceID, dwCallback, dwInstance, fdwOpen);
@@ -675,7 +675,7 @@ UINT16 WINAPI mixerOpen16(LPHMIXER16 lphmix,UINT16 uDeviceID, DWORD dwCallback,
 {
     HMIXER16		hmix;
     LPMIXEROPENDESC	lpmod;
-    BOOL32		mapperflag = (uDeviceID==0);
+    BOOL		mapperflag = (uDeviceID==0);
     DWORD		dwRet=0;
     
     TRACE(mmsys,"(%p,%d,%08lx,%08lx,%08lx)\n",
@@ -701,7 +701,7 @@ UINT16 WINAPI mixerOpen16(LPHMIXER16 lphmix,UINT16 uDeviceID, DWORD dwCallback,
 /**************************************************************************
  * 				mixerClose		[WINMM.98]
  */
-UINT32 WINAPI mixerClose32(HMIXER32 hmix) 
+UINT WINAPI mixerClose(HMIXER hmix) 
 {
     return mixerClose16(hmix);
 }
@@ -721,10 +721,10 @@ UINT16 WINAPI mixerClose16(HMIXER16 hmix)
 /**************************************************************************
  * 				mixerGetID		[WINMM.103]
  */
-UINT32 WINAPI mixerGetID32(HMIXEROBJ32 hmix, LPUINT32 lpid, DWORD fdwID) 
+UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) 
 {
     UINT16	xid;    
-    UINT32	ret = mixerGetID16(hmix, &xid, fdwID);
+    UINT	ret = mixerGetID16(hmix, &xid, fdwID);
 
     if (lpid) *lpid = xid;
     return ret;
@@ -744,7 +744,7 @@ UINT16 WINAPI mixerGetID16(HMIXEROBJ16 hmix,LPUINT16 lpid,DWORD fdwID)
 /**************************************************************************
  * 				mixerGetControlDetailsA	[WINMM.99]
  */
-UINT32 WINAPI mixerGetControlDetails32A(HMIXEROBJ32 hmix,LPMIXERCONTROLDETAILS32 lpmcd,DWORD fdwDetails) 
+UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix,LPMIXERCONTROLDETAILS lpmcd,DWORD fdwDetails) 
 {
     FIXME(mmsys,"(%04x,%p,%08lx): stub!\n",hmix,lpmcd,fdwDetails);
     return MMSYSERR_NOTENABLED;
@@ -753,7 +753,7 @@ UINT32 WINAPI mixerGetControlDetails32A(HMIXEROBJ32 hmix,LPMIXERCONTROLDETAILS32
 /**************************************************************************
  * 				mixerGetControlDetailsW	[WINMM.100]
  */
-UINT32 WINAPI mixerGetControlDetails32W(HMIXEROBJ32 hmix,LPMIXERCONTROLDETAILS32 lpmcd,DWORD fdwDetails) 
+UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix,LPMIXERCONTROLDETAILS lpmcd,DWORD fdwDetails) 
 {
     FIXME(mmsys,"(%04x,%p,%08lx): stub!\n",	hmix,lpmcd,fdwDetails);
     return MMSYSERR_NOTENABLED;
@@ -771,7 +771,7 @@ UINT16 WINAPI mixerGetControlDetails16(HMIXEROBJ16 hmix,LPMIXERCONTROLDETAILS16
 /**************************************************************************
  * 				mixerGetLineControlsA	[WINMM.104]
  */
-UINT32 WINAPI mixerGetLineControls32A(HMIXEROBJ32 hmix,LPMIXERLINECONTROLS32A lpmlc,DWORD fdwControls) 
+UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix,LPMIXERLINECONTROLSA lpmlc,DWORD fdwControls) 
 {
     FIXME(mmsys,"(%04x,%p,%08lx): stub!\n",hmix,lpmlc,fdwControls);
     return MMSYSERR_NOTENABLED;
@@ -780,7 +780,7 @@ UINT32 WINAPI mixerGetLineControls32A(HMIXEROBJ32 hmix,LPMIXERLINECONTROLS32A lp
 /**************************************************************************
  * 				mixerGetLineControlsW	[WINMM.105]
  */
-UINT32 WINAPI mixerGetLineControls32W(HMIXEROBJ32 hmix,LPMIXERLINECONTROLS32W lpmlc,DWORD fdwControls) 
+UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix,LPMIXERLINECONTROLSW lpmlc,DWORD fdwControls) 
 {
     FIXME(mmsys,"(%04x,%p,%08lx): stub!\n",hmix,lpmlc,fdwControls);
     return MMSYSERR_NOTENABLED;
@@ -798,10 +798,10 @@ UINT16 WINAPI mixerGetLineControls16(HMIXEROBJ16 hmix,LPMIXERLINECONTROLS16 lpml
 /**************************************************************************
  * 				mixerGetLineInfoA	[WINMM.106]
  */
-UINT32 WINAPI mixerGetLineInfo32A(HMIXEROBJ32 hmix,LPMIXERLINE32A lpml,DWORD fdwInfo) 
+UINT WINAPI mixerGetLineInfoA(HMIXEROBJ hmix,LPMIXERLINEA lpml,DWORD fdwInfo) 
 {
     MIXERLINE16		ml16;
-    UINT32		ret;
+    UINT		ret;
     
     ml16.dwDestination = lpml->dwDestination;
     FIXME(mmsys,"(%04x,%p,%08lx): stub!\n",hmix,lpml,fdwInfo);
@@ -829,10 +829,10 @@ UINT32 WINAPI mixerGetLineInfo32A(HMIXEROBJ32 hmix,LPMIXERLINE32A lpml,DWORD fdw
 /**************************************************************************
  * 				mixerGetLineInfoW	[WINMM.107]
  */
-UINT32 WINAPI mixerGetLineInfo32W(HMIXEROBJ32 hmix, LPMIXERLINE32W lpml, DWORD fdwInfo) 
+UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpml, DWORD fdwInfo) 
 {
     MIXERLINE16		ml16;
-    UINT32		ret;
+    UINT		ret;
     
     TRACE(mmsys,"(%04x,%p,%08lx)\n", hmix, lpml, fdwInfo);
 
@@ -885,7 +885,7 @@ UINT16 WINAPI mixerGetLineInfo16(HMIXEROBJ16 hmix, LPMIXERLINE16 lpml, DWORD fdw
 /**************************************************************************
  * 				mixerSetControlDetails	[WINMM.111]
  */
-UINT32 WINAPI mixerSetControlDetails32(HMIXEROBJ32 hmix, LPMIXERCONTROLDETAILS32 lpmcd, DWORD fdwDetails) 
+UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, DWORD fdwDetails) 
 {
     FIXME(mmsys,"(%04x,%p,%08lx): stub!\n", hmix, lpmcd, fdwDetails);
     return MMSYSERR_NOTENABLED;
@@ -903,7 +903,7 @@ UINT16 WINAPI mixerSetControlDetails16(HMIXEROBJ16 hmix, LPMIXERCONTROLDETAILS16
 /**************************************************************************
  * 				mixerMessage		[WINMM.109]
  */
-UINT32 WINAPI mixerMessage32(HMIXER32 hmix,UINT32 uMsg, DWORD dwParam1, DWORD dwParam2) 
+UINT WINAPI mixerMessage(HMIXER hmix,UINT uMsg, DWORD dwParam1, DWORD dwParam2) 
 {
     LPMIXEROPENDESC	lpmod;
     UINT16		uDeviceID;
@@ -936,7 +936,7 @@ UINT16 WINAPI mixerMessage16(HMIXER16 hmix,UINT16 uMsg, DWORD dwParam1, DWORD dw
 /**************************************************************************
  * 				auxGetNumDevs		[WINMM.22]
  */
-UINT32 WINAPI auxGetNumDevs32()
+UINT WINAPI auxGetNumDevs()
 {
     return auxGetNumDevs16();
 }
@@ -957,10 +957,10 @@ UINT16 WINAPI auxGetNumDevs16()
 /**************************************************************************
  * 				auxGetDevCaps		[WINMM.20]
  */
-UINT32 WINAPI auxGetDevCaps32W(UINT32 uDeviceID, LPAUXCAPS32W lpCaps,UINT32 uSize)
+UINT WINAPI auxGetDevCapsW(UINT uDeviceID, LPAUXCAPSW lpCaps,UINT uSize)
 {
     AUXCAPS16	ac16;
-    UINT32	ret = auxGetDevCaps16(uDeviceID, &ac16, sizeof(ac16));
+    UINT	ret = auxGetDevCaps16(uDeviceID, &ac16, sizeof(ac16));
     
     lpCaps->wMid = ac16.wMid;
     lpCaps->wPid = ac16.wPid;
@@ -974,10 +974,10 @@ UINT32 WINAPI auxGetDevCaps32W(UINT32 uDeviceID, LPAUXCAPS32W lpCaps,UINT32 uSiz
 /**************************************************************************
  * 				auxGetDevCaps		[WINMM.21]
  */
-UINT32 WINAPI auxGetDevCaps32A(UINT32 uDeviceID, LPAUXCAPS32A lpCaps,UINT32 uSize)
+UINT WINAPI auxGetDevCapsA(UINT uDeviceID, LPAUXCAPSA lpCaps,UINT uSize)
 {
     AUXCAPS16	ac16;
-    UINT32	ret = auxGetDevCaps16(uDeviceID, &ac16, sizeof(ac16));
+    UINT	ret = auxGetDevCaps16(uDeviceID, &ac16, sizeof(ac16));
     
     lpCaps->wMid = ac16.wMid;
     lpCaps->wPid = ac16.wPid;
@@ -1002,7 +1002,7 @@ UINT16 WINAPI auxGetDevCaps16(UINT16 uDeviceID, LPAUXCAPS16 lpCaps, UINT16 uSize
 /**************************************************************************
  * 				auxGetVolume		[WINM.23]
  */
-UINT32 WINAPI auxGetVolume32(UINT32 uDeviceID, DWORD * lpdwVolume)
+UINT WINAPI auxGetVolume(UINT uDeviceID, DWORD * lpdwVolume)
 {
     return auxGetVolume16(uDeviceID, lpdwVolume);
 }
@@ -1020,7 +1020,7 @@ UINT16 WINAPI auxGetVolume16(UINT16 uDeviceID, DWORD * lpdwVolume)
 /**************************************************************************
  * 				auxSetVolume		[WINMM.25]
  */
-UINT32 WINAPI auxSetVolume32(UINT32 uDeviceID, DWORD dwVolume)
+UINT WINAPI auxSetVolume(UINT uDeviceID, DWORD dwVolume)
 {
     return auxSetVolume16(uDeviceID, dwVolume);
 }
@@ -1038,7 +1038,7 @@ UINT16 WINAPI auxSetVolume16(UINT16 uDeviceID, DWORD dwVolume)
 /**************************************************************************
  * 				auxOutMessage		[MMSYSTEM.354]
  */
-DWORD WINAPI auxOutMessage32(UINT32 uDeviceID,UINT32 uMessage, DWORD dw1, DWORD dw2)
+DWORD WINAPI auxOutMessage(UINT uDeviceID,UINT uMessage, DWORD dw1, DWORD dw2)
 {
     switch (uMessage) {
     case AUXDM_GETNUMDEVS:
@@ -1047,7 +1047,7 @@ DWORD WINAPI auxOutMessage32(UINT32 uDeviceID,UINT32 uMessage, DWORD dw1, DWORD
 	/* no argument conversion needed */
 	break;
     case AUXDM_GETDEVCAPS:
-	return auxGetDevCaps32A(uDeviceID, (LPAUXCAPS32A)dw1, dw2);
+	return auxGetDevCapsA(uDeviceID, (LPAUXCAPSA)dw1, dw2);
     default:
 	ERR(mmsys,"(%04x,%04x,%08lx,%08lx): unhandled message\n",
 	    uDeviceID,uMessage, dw1, dw2);
@@ -1083,10 +1083,10 @@ DWORD WINAPI auxOutMessage16(UINT16 uDeviceID, UINT16 uMessage, DWORD dw1, DWORD
 /**************************************************************************
  * 				mciGetErrorStringW		[WINMM.46]
  */
-BOOL32 WINAPI mciGetErrorString32W(DWORD wError, LPWSTR lpstrBuffer,UINT32 uLength)
+BOOL WINAPI mciGetErrorStringW(DWORD wError, LPWSTR lpstrBuffer,UINT uLength)
 {
     LPSTR	bufstr = HeapAlloc(GetProcessHeap(), 0,uLength);
-    BOOL32	ret = mciGetErrorString32A(wError,bufstr,uLength);
+    BOOL	ret = mciGetErrorStringA(wError,bufstr,uLength);
     
     lstrcpyAtoW(lpstrBuffer,bufstr);
     HeapFree(GetProcessHeap(), 0,bufstr);
@@ -1096,7 +1096,7 @@ BOOL32 WINAPI mciGetErrorString32W(DWORD wError, LPWSTR lpstrBuffer,UINT32 uLeng
 /**************************************************************************
  * 				mciGetErrorStringA		[WINMM.45]
  */
-BOOL32 WINAPI mciGetErrorString32A(DWORD wError, LPSTR lpstrBuffer,UINT32 uLength)
+BOOL WINAPI mciGetErrorStringA(DWORD wError, LPSTR lpstrBuffer,UINT uLength)
 {
     return mciGetErrorString16(wError, lpstrBuffer,uLength);
 }
@@ -1378,7 +1378,7 @@ BOOL16 WINAPI mciGetErrorString16(DWORD wError, LPSTR lpstrBuffer,UINT16 uLength
 	msgptr = "Unknown MCI Error !\n";
 	break;
     }
-    lstrcpyn32A(lpstrBuffer, msgptr, uLength);
+    lstrcpynA(lpstrBuffer, msgptr, uLength);
     TRACE(mmsys, "msg = %s;\n", msgptr);
     return TRUE;
 }
@@ -1390,28 +1390,28 @@ BOOL16 WINAPI mciDriverNotify16(HWND16 hWndCallBack, UINT16 wDevID, UINT16 wStat
 {
     TRACE(mmsys, "(%04X, %04x, %04X)\n", hWndCallBack, wDevID, wStatus);
 
-    if (!IsWindow32(hWndCallBack)) {
+    if (!IsWindow(hWndCallBack)) {
 	WARN(mmsys, "bad hWnd for call back\n");
 	return FALSE;
     }
     TRACE(mmsys, "before PostMessage\n");
-    PostMessage32A(hWndCallBack, MM_MCINOTIFY, wStatus, wDevID);
+    PostMessageA(hWndCallBack, MM_MCINOTIFY, wStatus, wDevID);
     return TRUE;
 }
 
 /**************************************************************************
  *			mciDriverNotify32			[WINMM.36]
  */
-BOOL32 WINAPI mciDriverNotify32(HWND32 hWndCallBack, UINT32 wDevID, UINT32 wStatus)
+BOOL WINAPI mciDriverNotify(HWND hWndCallBack, UINT wDevID, UINT wStatus)
 {
     FIXME(mmsys, "(%08X, %04x, %04X)\n", hWndCallBack, wDevID, wStatus);
 
-    if (!IsWindow32(hWndCallBack)) {
+    if (!IsWindow(hWndCallBack)) {
 	WARN(mmsys, "bad hWnd for call back\n");
 	return FALSE;
     }
     TRACE(mmsys, "before PostMessage\n");
-    PostMessage32A(hWndCallBack, MM_MCINOTIFY, wStatus, wDevID);
+    PostMessageA(hWndCallBack, MM_MCINOTIFY, wStatus, wDevID);
     return TRUE;
 }
 
@@ -1420,13 +1420,13 @@ BOOL32 WINAPI mciDriverNotify32(HWND32 hWndCallBack, UINT32 wDevID, UINT32 wStat
  */
 DWORD WINAPI mciGetDriverData16(HDRVR16 hdrv) 
 {
-    return mciGetDriverData32(hdrv);
+    return mciGetDriverData(hdrv);
 }
 
 /**************************************************************************
  * 			mciGetDriverData			[WINMM.44]
  */
-DWORD WINAPI mciGetDriverData32(HDRVR32 hdrv) 
+DWORD WINAPI mciGetDriverData(HDRVR hdrv) 
 {
     TRACE(mmsys,"(%04x)\n", hdrv);
     if (!MCI_DevIDValid(hdrv) || MCI_GetDrv(hdrv)->modp.wType == 0) {
@@ -1441,13 +1441,13 @@ DWORD WINAPI mciGetDriverData32(HDRVR32 hdrv)
  */
 BOOL16 WINAPI mciSetDriverData16(HDRVR16 hdrv, DWORD data) 
 {
-    return mciSetDriverData32(hdrv, data);
+    return mciSetDriverData(hdrv, data);
 }
 
 /**************************************************************************
  * 			mciSetDriverData			[WINMM.53]
  */
-BOOL32 WINAPI mciSetDriverData32(HDRVR32 hdrv, DWORD data) 
+BOOL WINAPI mciSetDriverData(HDRVR hdrv, DWORD data) 
 {
     TRACE(mmsys,"(%04x,%08lx)\n", hdrv, data);
     if (!MCI_DevIDValid(hdrv) || MCI_GetDrv(hdrv)->modp.wType == 0) {
@@ -1474,7 +1474,7 @@ UINT16 WINAPI mciLoadCommandResource16(HANDLE16 hinst, LPCSTR resname,UINT16 typ
     static UINT16   mcidevtype = 0;
     
     FIXME(mmsys,"(%04x,%s,%d): stub!\n", hinst, resname, type);
-    if (!lstrcmpi32A(resname,"core")) {
+    if (!lstrcmpiA(resname,"core")) {
 	FIXME(mmsys, "(...,\"core\",...), have to use internal tables... (not there yet)\n");
 	return 0;
     }
@@ -1483,7 +1483,7 @@ UINT16 WINAPI mciLoadCommandResource16(HANDLE16 hinst, LPCSTR resname,UINT16 typ
      */
     strcpy(buf,resname);
     strcat(buf,".mci");
-    if (OpenFile32(buf, &ofs,OF_EXIST) != HFILE_ERROR32) {
+    if (OpenFile(buf, &ofs,OF_EXIST) != HFILE_ERROR) {
 	xhinst = LoadLibrary16(buf);
 	if (xhinst >32)
 	    hinst = xhinst;
@@ -1524,7 +1524,7 @@ BOOL16 WINAPI mciFreeCommandResource16(UINT16 uTable)
 /**************************************************************************
  *                    	mciFreeCommandResource			[WINMM.39]
  */
-BOOL32 WINAPI mciFreeCommandResource32(UINT32 uTable)
+BOOL WINAPI mciFreeCommandResource(UINT uTable)
  {
     FIXME(mci, "(%08x) stub\n", uTable);
     return 0;
@@ -1533,7 +1533,7 @@ BOOL32 WINAPI mciFreeCommandResource32(UINT32 uTable)
 /**************************************************************************
  *                    	mciLoadCommandResource  		[WINMM.48]
  */
-UINT32 WINAPI mciLoadCommandResource32(HANDLE32 hinst, LPCWSTR resname,UINT32 type)
+UINT WINAPI mciLoadCommandResource(HANDLE hinst, LPCWSTR resname,UINT type)
 {
     FIXME(mmsys,"(%04x,%s,%d): stub!\n", hinst, debugstr_w(resname), type);
 }
@@ -1585,14 +1585,14 @@ const char* MCI_CommandToString(UINT16 wMsg)
 /**************************************************************************
  * 			MCI_SendCommand32			[internal]
  */
-DWORD MCI_SendCommand32(UINT32 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2)
+DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2)
 {
     DWORD		dwRet = MCIERR_DEVICE_NOT_INSTALLED;
     
     if (!MCI_DevIDValid(wDevID)) {
 	dwRet = MCIERR_INVALID_DEVICE_ID;
     } else {
-	MCIPROC32		proc = MCI_GetProc32(MCI_GetDrv(wDevID)->modp.wType);
+	MCIPROC		proc = MCI_GetProc(MCI_GetDrv(wDevID)->modp.wType);
 	
 	if (proc) {
 	    dwRet = (*proc)(MCI_GetDrv(wDevID)->modp.wDeviceID, 
@@ -1614,7 +1614,7 @@ DWORD MCI_SendCommand32(UINT32 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwPara
 /**************************************************************************
  * 			MCI_Open				[internal]
  */
-static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMS32A lpParms)
+static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSA lpParms)
 {
     char		str[128];
     UINT16		uDevTyp = 0;
@@ -1647,8 +1647,8 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMS32A lpParms)
 	s = lpParms->lpstrElementName;
 	t = strrchr(s, '.');
 	if (t) {
-	    GetProfileString32A("mci extensions", t+1, "*", str, sizeof(str));
-	    CharUpper32A(str);
+	    GetProfileStringA("mci extensions", t+1, "*", str, sizeof(str));
+	    CharUpperA(str);
 	    uDevTyp = MCI_GetDevType(str);
 	    if (uDevTyp == 0) {
 		if (strcmp(str,"*") == 0) {
@@ -1664,7 +1664,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMS32A lpParms)
 			
 			hmod = GetDriverModuleHandle(hdrv);
 			MCI_GetDrv(wDevID)->hDrv = hdrv;
-			MCI_GetDrv(wDevID)->driverProc = GetProcAddress32(hmod,oouch SEGPTR_GET(SEGPTR_STRDUP("DRIVERPROC")));
+			MCI_GetDrv(wDevID)->driverProc = GetProcAddress(hmod,oouch SEGPTR_GET(SEGPTR_STRDUP("DRIVERPROC")));
 			uDevTyp = MCI_DEVTYPE_OTHER;
 		    } else {
 			FIXME(mmsys, "[mci extensions] entry %s for %s not supported.\n", str, t);
@@ -1673,7 +1673,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMS32A lpParms)
 		}
 #endif
 	    }
-	} else if (GetDriveType32A(s) == DRIVE_CDROM) {
+	} else if (GetDriveTypeA(s) == DRIVE_CDROM) {
 	    /* FIXME: this will not work if several CDROM drives are installed on the machine */
 	    uDevTyp = MCI_DEVTYPE_CD_AUDIO;
 	} else {
@@ -1699,7 +1699,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMS32A lpParms)
 	    /* FIXME is there any memory leak here ? */
 	    MCI_GetOpenDrv(wDevID)->lpstrDeviceType = strdup(lpParms->lpstrDeviceType);
 	    strcpy(str, lpParms->lpstrDeviceType);
-	    CharUpper32A(str);
+	    CharUpperA(str);
 	    uDevTyp = MCI_GetDevType(str);
 	    if (uDevTyp == 0) {
 #if testing32
@@ -1712,7 +1712,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMS32A lpParms)
 		    
 		    hmod = GetDriverModuleHandle(hdrv);
 		    MCI_GetDrv(wDevID)->hDrv = hdrv;
-		    MCI_GetDrv(wDevID)->driverProc = GetProcAddress32(hmod,oouch SEGPTR_GET(SEGPTR_STRDUP("DriverProc")));
+		    MCI_GetDrv(wDevID)->driverProc = GetProcAddress(hmod,oouch SEGPTR_GET(SEGPTR_STRDUP("DriverProc")));
 		    uDevTyp = MCI_DEVTYPE_OTHER;
 		} else
 #endif
@@ -1726,7 +1726,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMS32A lpParms)
     lpParms->wDeviceID = wDevID;
     TRACE(mmsys, "mcidev=%d, uDevTyp=%04X wDeviceID=%04X !\n", 
 	  wDevID, uDevTyp, lpParms->wDeviceID);
-    dwRet = MCI_SendCommand32(wDevID, MCI_OPEN_DRIVER, dwParam, (DWORD)lpParms);
+    dwRet = MCI_SendCommand(wDevID, MCI_OPEN_DRIVER, dwParam, (DWORD)lpParms);
     
     if (dwRet == 0) {
 	/* only handled devices fall through */
@@ -1755,7 +1755,7 @@ static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms
 	return MCIERR_CANNOT_USE_ALL;
     }
 
-    dwRet = MCI_SendCommand32(wDevID, MCI_CLOSE_DRIVER, dwParam, (DWORD)lpParms);
+    dwRet = MCI_SendCommand(wDevID, MCI_CLOSE_DRIVER, dwParam, (DWORD)lpParms);
     MCI_GetDrv(wDevID)->modp.wType = 0;
     
     if (dwParam&MCI_NOTIFY)
@@ -1774,7 +1774,7 @@ DWORD	MCI_WriteString(LPSTR lpDstStr, DWORD dstSize, LPCSTR lpSrcStr)
     DWORD	ret;
 
     if (dstSize <= strlen(lpSrcStr)) {
-	lstrcpyn32A(lpDstStr, lpSrcStr, dstSize - 1);
+	lstrcpynA(lpDstStr, lpSrcStr, dstSize - 1);
 	ret = MCIERR_PARAM_OVERFLOW;
     } else {
 	strcpy(lpDstStr, lpSrcStr);
@@ -1786,7 +1786,7 @@ DWORD	MCI_WriteString(LPSTR lpDstStr, DWORD dstSize, LPCSTR lpSrcStr)
 /**************************************************************************
  * 			MCI_Sysinfo				[internal]
  */
-static DWORD MCI_SysInfo(UINT32 uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMS32A lpParms)
+static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSA lpParms)
 {
     DWORD	ret = MCIERR_INVALID_DEVICE_ID;
 
@@ -1862,27 +1862,27 @@ static DWORD MCI_SysInfo(UINT32 uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMS32A lp
     return ret;
 }
 
-struct SCA32 {
-    UINT32 	wDevID;
-    UINT32 	wMsg;
+struct SCA {
+    UINT 	wDevID;
+    UINT 	wMsg;
     DWORD 	dwParam1;
     DWORD 	dwParam2;
-    BOOL32	allocatedCopy;
+    BOOL	allocatedCopy;
 };
 
-DWORD WINAPI mciSendCommand32A(UINT32 wDevID, UINT32 wMsg, DWORD dwParam1, DWORD dwParam2);
+DWORD WINAPI mciSendCommandA(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2);
 
 /**************************************************************************
  * 				MCI_SCAStarter32			[internal]
  */
-static DWORD WINAPI MCI_SCAStarter32(LPVOID arg)
+static DWORD WINAPI MCI_SCAStarter(LPVOID arg)
 {
-    struct SCA32*	sca = (struct SCA32*)arg;
+    struct SCA*	sca = (struct SCA*)arg;
     DWORD		ret;
 
     TRACE(mci, "In thread before async command (%08x,%s,%08lx,%08lx)\n",
 	  sca->wDevID, MCI_CommandToString(sca->wMsg), sca->dwParam1, sca->dwParam2);
-    ret = mciSendCommand32A(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2);
+    ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2);
     TRACE(mci, "In thread after async command (%08x,%s,%08lx,%08lx)\n",
 	  sca->wDevID, MCI_CommandToString(sca->wMsg), sca->dwParam1, sca->dwParam2);
     if (sca->allocatedCopy)
@@ -1897,9 +1897,9 @@ static DWORD WINAPI MCI_SCAStarter32(LPVOID arg)
 /**************************************************************************
  * 				MCI_SendCommandAsync32		[internal]
  */
-DWORD MCI_SendCommandAsync32(UINT32 wDevID, UINT32 wMsg, DWORD dwParam1, DWORD dwParam2, UINT32 size)
+DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2, UINT size)
 {
-    struct SCA32*	sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA32));
+    struct SCA*	sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA));
 
     if (sca == 0)
 	return MCIERR_OUT_OF_MEMORY;
@@ -1924,9 +1924,9 @@ DWORD MCI_SendCommandAsync32(UINT32 wDevID, UINT32 wMsg, DWORD dwParam1, DWORD d
 	sca->allocatedCopy = FALSE;
     }
 
-    if (CreateThread(NULL, 0, MCI_SCAStarter32, sca, 0, NULL) == 0) {
+    if (CreateThread(NULL, 0, MCI_SCAStarter, sca, 0, NULL) == 0) {
 	WARN(mci, "Couldn't allocate thread for async command handling, sending synchonously\n");
-	return MCI_SCAStarter32(&sca);
+	return MCI_SCAStarter(&sca);
     }
     return 0;
 }
@@ -1979,7 +1979,7 @@ int	MCI_MapMsg16To32A(WORD uDevType, WORD wMsg, DWORD* lParam)
 	return 0;
     case MCI_BREAK:
 	{
-            LPMCI_BREAK_PARMS32		mbp32 = HeapAlloc(SystemHeap, 0, sizeof(MCI_BREAK_PARMS32));
+            LPMCI_BREAK_PARMS		mbp32 = HeapAlloc(SystemHeap, 0, sizeof(MCI_BREAK_PARMS));
 	    LPMCI_BREAK_PARMS16		mbp16 = PTR_SEG_TO_LIN(*lParam);
 
 	    if (mbp32) {
@@ -1994,7 +1994,7 @@ int	MCI_MapMsg16To32A(WORD uDevType, WORD wMsg, DWORD* lParam)
 	return 1;
     case MCI_ESCAPE:
 	{
-            LPMCI_VD_ESCAPE_PARMS32A	mvep32a = HeapAlloc(SystemHeap, 0, sizeof(MCI_VD_ESCAPE_PARMS32A));
+            LPMCI_VD_ESCAPE_PARMSA	mvep32a = HeapAlloc(SystemHeap, 0, sizeof(MCI_VD_ESCAPE_PARMSA));
 	    LPMCI_VD_ESCAPE_PARMS16	mvep16  = PTR_SEG_TO_LIN(*lParam);
 
 	    if (mvep32a) {
@@ -2008,7 +2008,7 @@ int	MCI_MapMsg16To32A(WORD uDevType, WORD wMsg, DWORD* lParam)
 	return 1;
     case MCI_INFO:
 	{
-            LPMCI_INFO_PARMS32A	mip32a = HeapAlloc(SystemHeap, 0, sizeof(MCI_INFO_PARMS32A));
+            LPMCI_INFO_PARMSA	mip32a = HeapAlloc(SystemHeap, 0, sizeof(MCI_INFO_PARMSA));
 	    LPMCI_INFO_PARMS16	mip16  = PTR_SEG_TO_LIN(*lParam);
 
 	    /* FIXME this is wrong if device is of type 
@@ -2027,12 +2027,12 @@ int	MCI_MapMsg16To32A(WORD uDevType, WORD wMsg, DWORD* lParam)
     case MCI_OPEN:
     case MCI_OPEN_DRIVER:	
 	{
-            LPMCI_OPEN_PARMS32A	mop32a = HeapAlloc(SystemHeap, 0, sizeof(LPMCI_OPEN_PARMS16) + sizeof(MCI_OPEN_PARMS32A) + 2 * sizeof(DWORD));
+            LPMCI_OPEN_PARMSA	mop32a = HeapAlloc(SystemHeap, 0, sizeof(LPMCI_OPEN_PARMS16) + sizeof(MCI_OPEN_PARMSA) + 2 * sizeof(DWORD));
 	    LPMCI_OPEN_PARMS16	mop16  = PTR_SEG_TO_LIN(*lParam);
 
 	    if (mop32a) {
 		*(LPMCI_OPEN_PARMS16*)(mop32a) = mop16;
-		mop32a = (LPMCI_OPEN_PARMS32A)((char*)mop32a + sizeof(LPMCI_OPEN_PARMS16));
+		mop32a = (LPMCI_OPEN_PARMSA)((char*)mop32a + sizeof(LPMCI_OPEN_PARMS16));
 		mop32a->dwCallback       = mop16->dwCallback;
 		mop32a->wDeviceID        = mop16->wDeviceID;
 		mop32a->lpstrDeviceType  = PTR_SEG_TO_LIN(mop16->lpstrDeviceType);
@@ -2056,7 +2056,7 @@ int	MCI_MapMsg16To32A(WORD uDevType, WORD wMsg, DWORD* lParam)
 	return 1;
     case MCI_SYSINFO:
 	{
-            LPMCI_SYSINFO_PARMS32A	msip32a = HeapAlloc(SystemHeap, 0, sizeof(MCI_SYSINFO_PARMS32A));
+            LPMCI_SYSINFO_PARMSA	msip32a = HeapAlloc(SystemHeap, 0, sizeof(MCI_SYSINFO_PARMSA));
 	    LPMCI_SYSINFO_PARMS16	msip16  = PTR_SEG_TO_LIN(*lParam);
 
 	    if (msip32a) {
@@ -2142,7 +2142,7 @@ int	MCI_UnMapMsg16To32A(WORD uDevTyp, WORD wMsg, DWORD lParam)
     case MCI_OPEN:
     case MCI_OPEN_DRIVER:	
 	if (lParam) {
-            LPMCI_OPEN_PARMS32A	mop32a = (MCI_OPEN_PARMS32A*)lParam;
+            LPMCI_OPEN_PARMSA	mop32a = (MCI_OPEN_PARMSA*)lParam;
 	    LPMCI_OPEN_PARMS16	mop16  = *(LPMCI_OPEN_PARMS16*)((char*)mop32a - sizeof(LPMCI_OPEN_PARMS16*));
 	    
 	    mop16->wDeviceID = mop32a->wDeviceID;
@@ -2173,31 +2173,31 @@ int	MCI_UnMapMsg16To32A(WORD uDevTyp, WORD wMsg, DWORD lParam)
 /**************************************************************************
  * 				mciSendCommandA			[WINMM.49]
  */
-DWORD WINAPI mciSendCommand32A(UINT32 wDevID, UINT32 wMsg, DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI mciSendCommandA(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2)
 {
     TRACE(mci, "(%08x,%s,%08lx,%08lx)\n", wDevID, MCI_CommandToString(wMsg), dwParam1, dwParam2);
 
     switch (wMsg) {
     case MCI_OPEN:
-	return MCI_Open(dwParam1, (LPMCI_OPEN_PARMS32A)dwParam2);
+	return MCI_Open(dwParam1, (LPMCI_OPEN_PARMSA)dwParam2);
     case MCI_CLOSE:
 	return MCI_Close(wDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
     case MCI_SYSINFO:
-	return MCI_SysInfo(wDevID, dwParam1, (LPMCI_SYSINFO_PARMS32A)dwParam2);
+	return MCI_SysInfo(wDevID, dwParam1, (LPMCI_SYSINFO_PARMSA)dwParam2);
     default:
 	if (wDevID == MCI_ALL_DEVICE_ID) {
 	    FIXME(mci, "unhandled MCI_ALL_DEVICE_ID\n");
 	    return MCIERR_CANNOT_USE_ALL;
 	}
 	
-	return MCI_SendCommand32(wDevID, wMsg, dwParam1, dwParam2);
+	return MCI_SendCommand(wDevID, wMsg, dwParam1, dwParam2);
     }
 }
 
 /**************************************************************************
  * 				mciSendCommandW			[WINMM.50]
  */
-DWORD WINAPI mciSendCommand32W(UINT32 wDevID, UINT32 wMsg, DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI mciSendCommandW(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2)
 {
     return 0x1; /* !ok */
 }
@@ -2215,7 +2215,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD
     switch (wMsg) {
     case MCI_OPEN:
 	if (MCI_MapMsg16To32A(MCI_GetDrv(wDevID)->modp.wType, wMsg, &dwParam2) >= 0) {
-	    dwRet = MCI_Open(dwParam1, (LPMCI_OPEN_PARMS32A)dwParam2);
+	    dwRet = MCI_Open(dwParam1, (LPMCI_OPEN_PARMSA)dwParam2);
 	    MCI_UnMapMsg16To32A(MCI_GetDrv(wDevID)->modp.wType, wMsg, dwParam2);
 	}
 	break;
@@ -2232,7 +2232,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD
 	break;
     case MCI_SYSINFO:
 	if (MCI_MapMsg16To32A(0, wDevID, &dwParam2) >= 0) {
-	    dwRet = MCI_SysInfo(wDevID, dwParam1, (LPMCI_SYSINFO_PARMS32A)dwParam2);
+	    dwRet = MCI_SysInfo(wDevID, dwParam1, (LPMCI_SYSINFO_PARMSA)dwParam2);
 	    MCI_UnMapMsg16To32A(0, wDevID, dwParam2);
 	}
 	break;
@@ -2254,7 +2254,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD
 		TRACE(mci, "Problem mapping msg=%s from 16 to 32a\n", MCI_CommandToString(wMsg));
 	    case 0:
 	    case 1:
-		dwRet = MCI_SendCommand32(wDevID, wMsg, dwParam1, dwParam2);
+		dwRet = MCI_SendCommand(wDevID, wMsg, dwParam1, dwParam2);
 		if (res)
 		    MCI_UnMapMsg16To32A(MCI_GetDrv(wDevID)->modp.wType, wMsg, dwParam2);
 		break;
@@ -2275,7 +2275,7 @@ UINT16 WINAPI mciGetDeviceID16(LPCSTR lpstrName)
     if (!lpstrName)
 	return 0;
     
-    if (!lstrcmpi32A(lpstrName, "ALL"))
+    if (!lstrcmpiA(lpstrName, "ALL"))
 	return MCI_ALL_DEVICE_ID;
     
     for (wDevID = MCI_FirstDevID(); MCI_DevIDValid(wDevID); wDevID = MCI_NextDevID(wDevID)) {
@@ -2300,7 +2300,7 @@ UINT16 WINAPI mciGetDeviceID16(LPCSTR lpstrName)
 /**************************************************************************
  * 				mciGetDeviceIDA    		[WINMM.41]
  */
-UINT32 WINAPI mciGetDeviceID32A(LPCSTR lpstrName)
+UINT WINAPI mciGetDeviceIDA(LPCSTR lpstrName)
 {
     return mciGetDeviceID16(lpstrName);
 }
@@ -2308,10 +2308,10 @@ UINT32 WINAPI mciGetDeviceID32A(LPCSTR lpstrName)
 /**************************************************************************
  * 				mciGetDeviceIDW		       	[WINMM.43]
  */
-UINT32 WINAPI mciGetDeviceID32W(LPCWSTR lpwstrName)
+UINT WINAPI mciGetDeviceIDW(LPCWSTR lpwstrName)
 {
     LPSTR 	lpstrName;
-    UINT32	ret;
+    UINT	ret;
 
     lpstrName = HEAP_strdupWtoA(GetProcessHeap(), 0, lpwstrName);
     ret = mciGetDeviceID16(lpstrName);
@@ -2332,7 +2332,7 @@ BOOL16 WINAPI mciSetYieldProc16(UINT16 uDeviceID,
 /**************************************************************************
  * 				mciSetYieldProc			[WINMM.54]
  */
-BOOL32 WINAPI mciSetYieldProc32(UINT32 uDeviceID, 
+BOOL WINAPI mciSetYieldProc(UINT uDeviceID, 
 				YIELDPROC fpYieldProc, DWORD dwYieldData)
 {
     FIXME(mci, "(%u, %p, %08lx) stub\n", uDeviceID, fpYieldProc, dwYieldData);
@@ -2351,7 +2351,7 @@ UINT16 WINAPI mciGetDeviceIDFromElementID16(DWORD dwElementID, LPCSTR lpstrType)
 /**************************************************************************
  * 				mciGetDeviceIDFromElementIDW	[WINMM.42]
  */
-UINT32 WINAPI mciGetDeviceIDFromElementID32W(DWORD dwElementID, LPCWSTR lpstrType)
+UINT WINAPI mciGetDeviceIDFromElementIDW(DWORD dwElementID, LPCWSTR lpstrType)
 {
     /* FIXME: that's rather strange, there is no 
      * mciGetDeviceIDFromElementID32A in winmm.spec
@@ -2372,7 +2372,7 @@ YIELDPROC WINAPI mciGetYieldProc16(UINT16 uDeviceID, DWORD* lpdwYieldData)
 /**************************************************************************
  * 				mciGetYieldProc			[WINMM.47]
  */
-YIELDPROC WINAPI mciGetYieldProc32(UINT32 uDeviceID, DWORD* lpdwYieldData)
+YIELDPROC WINAPI mciGetYieldProc(UINT uDeviceID, DWORD* lpdwYieldData)
 {
     FIXME(mci, "(%u, %p) stub\n", uDeviceID, lpdwYieldData);
     return NULL;
@@ -2390,7 +2390,7 @@ HTASK16 WINAPI mciGetCreatorTask16(UINT16 uDeviceID)
 /**************************************************************************
  * 				mciGetCreatorTask		[WINMM.40]
  */
-HTASK32 WINAPI mciGetCreatorTask32(UINT32 uDeviceID)
+HTASK WINAPI mciGetCreatorTask(UINT uDeviceID)
 {
     FIXME(mci, "(%u) stub\n", uDeviceID);
     return 0;
@@ -2408,7 +2408,7 @@ UINT16 WINAPI mciDriverYield16(HANDLE16 hnd)
 /**************************************************************************
  * 			mciDriverYield				[WINMM.37]
  */
-UINT32 WINAPI mciDriverYield32(HANDLE32 hnd) 
+UINT WINAPI mciDriverYield(HANDLE hnd) 
 {
     FIXME(mmsys,"(%04x): stub!\n", hnd);
     return 0;
@@ -2417,7 +2417,7 @@ UINT32 WINAPI mciDriverYield32(HANDLE32 hnd)
 /**************************************************************************
  * 				midiOutGetNumDevs	[WINMM.80]
  */
-UINT32 WINAPI midiOutGetNumDevs32(void)
+UINT WINAPI midiOutGetNumDevs(void)
 {
     return midiOutGetNumDevs16();
 }
@@ -2436,10 +2436,10 @@ UINT16 WINAPI midiOutGetNumDevs16(void)
 /**************************************************************************
  * 				midiOutGetDevCapsW	[WINMM.76]
  */
-UINT32 WINAPI midiOutGetDevCaps32W(UINT32 uDeviceID, LPMIDIOUTCAPS32W lpCaps, UINT32 uSize)
+UINT WINAPI midiOutGetDevCapsW(UINT uDeviceID, LPMIDIOUTCAPSW lpCaps, UINT uSize)
 {
     MIDIOUTCAPS16	moc16;
-    UINT32		ret;
+    UINT		ret;
     
     ret = midiOutGetDevCaps16(uDeviceID, &moc16, sizeof(moc16));
     lpCaps->wMid		= moc16.wMid;
@@ -2457,10 +2457,10 @@ UINT32 WINAPI midiOutGetDevCaps32W(UINT32 uDeviceID, LPMIDIOUTCAPS32W lpCaps, UI
 /**************************************************************************
  * 				midiOutGetDevCapsA	[WINMM.75]
  */
-UINT32 WINAPI midiOutGetDevCaps32A(UINT32 uDeviceID, LPMIDIOUTCAPS32A lpCaps, UINT32 uSize)
+UINT WINAPI midiOutGetDevCapsA(UINT uDeviceID, LPMIDIOUTCAPSA lpCaps, UINT uSize)
 {
     MIDIOUTCAPS16	moc16;
-    UINT32		ret;
+    UINT		ret;
     
     ret = midiOutGetDevCaps16(uDeviceID, &moc16, sizeof(moc16));
     lpCaps->wMid		= moc16.wMid;
@@ -2487,7 +2487,7 @@ UINT16 WINAPI midiOutGetDevCaps16(UINT16 uDeviceID, LPMIDIOUTCAPS16 lpCaps, UINT
 /**************************************************************************
  * 				midiOutGetErrorTextA 	[WINMM.77]
  */
-UINT32 WINAPI midiOutGetErrorText32A(UINT32 uError, LPSTR lpText, UINT32 uSize)
+UINT WINAPI midiOutGetErrorTextA(UINT uError, LPSTR lpText, UINT uSize)
 {
     TRACE(mmsys, "midiOutGetErrorText\n");
     return midiGetErrorText(uError, lpText, uSize);
@@ -2496,10 +2496,10 @@ UINT32 WINAPI midiOutGetErrorText32A(UINT32 uError, LPSTR lpText, UINT32 uSize)
 /**************************************************************************
  * 				midiOutGetErrorTextW 	[WINMM.78]
  */
-UINT32 WINAPI midiOutGetErrorText32W(UINT32 uError, LPWSTR lpText, UINT32 uSize)
+UINT WINAPI midiOutGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
 {
     LPSTR	xstr = HeapAlloc(GetProcessHeap(), 0,uSize);
-    UINT32	ret;
+    UINT	ret;
     
     TRACE(mmsys, "midiOutGetErrorText\n");
     ret = midiGetErrorText(uError, xstr, uSize);
@@ -2558,18 +2558,18 @@ UINT16 WINAPI midiGetErrorText(UINT16 uError, LPSTR lpText, UINT16 uSize)
 	msgptr = "Unknown MIDI Error !\n";
 	break;
     }
-    lstrcpyn32A(lpText, msgptr, uSize);
+    lstrcpynA(lpText, msgptr, uSize);
     return TRUE;
 }
 
 /**************************************************************************
  * 				midiOutOpen    		[WINM.84]
  */
-UINT32 WINAPI midiOutOpen32(HMIDIOUT32 * lphMidiOut, UINT32 uDeviceID,
+UINT WINAPI midiOutOpen(HMIDIOUT * lphMidiOut, UINT uDeviceID,
                             DWORD dwCallback, DWORD dwInstance, DWORD dwFlags)
 {
     HMIDIOUT16	hmo16;
-    UINT32	ret;
+    UINT	ret;
     
     ret = midiOutOpen16(&hmo16,uDeviceID, dwCallback, dwInstance,
 			CALLBACK32CONV(dwFlags));
@@ -2586,7 +2586,7 @@ UINT16 WINAPI midiOutOpen16(HMIDIOUT16 * lphMidiOut, UINT16 uDeviceID,
     HMIDI16			hMidiOut;
     LPMIDIOPENDESC		lpDesc;
     DWORD			dwRet = 0;
-    BOOL32			bMapperFlg = FALSE;
+    BOOL			bMapperFlg = FALSE;
     
     if (lphMidiOut != NULL) *lphMidiOut = 0;
     TRACE(mmsys, "(%p, %d, %08lX, %08lX, %08lX);\n", 
@@ -2621,7 +2621,7 @@ UINT16 WINAPI midiOutOpen16(HMIDIOUT16 * lphMidiOut, UINT16 uDeviceID,
 /**************************************************************************
  * 				midiOutClose		[WINMM.74]
  */
-UINT32 WINAPI midiOutClose32(HMIDIOUT32 hMidiOut)
+UINT WINAPI midiOutClose(HMIDIOUT hMidiOut)
 {
     return midiOutClose16(hMidiOut);
 }
@@ -2643,8 +2643,8 @@ UINT16 WINAPI midiOutClose16(HMIDIOUT16 hMidiOut)
 /**************************************************************************
  * 				midiOutPrepareHeader	[WINMM.85]
  */
-UINT32 WINAPI midiOutPrepareHeader32(HMIDIOUT32 hMidiOut,
-                                     MIDIHDR * lpMidiOutHdr, UINT32 uSize)
+UINT WINAPI midiOutPrepareHeader(HMIDIOUT hMidiOut,
+                                     MIDIHDR16 * lpMidiOutHdr, UINT uSize)
 {
     LPMIDIOPENDESC	lpDesc;
 
@@ -2661,7 +2661,7 @@ UINT32 WINAPI midiOutPrepareHeader32(HMIDIOUT32 hMidiOut,
  * 				midiOutPrepareHeader	[MMSYSTEM.206]
  */
 UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16 hMidiOut,
-                                     MIDIHDR * lpMidiOutHdr, UINT16 uSize)
+                                     MIDIHDR16 * lpMidiOutHdr, UINT16 uSize)
 {
     LPMIDIOPENDESC	lpDesc;
 
@@ -2677,8 +2677,8 @@ UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16 hMidiOut,
 /**************************************************************************
  * 				midiOutUnprepareHeader	[WINMM.89]
  */
-UINT32 WINAPI midiOutUnprepareHeader32(HMIDIOUT32 hMidiOut,
-                                       MIDIHDR * lpMidiOutHdr, UINT32 uSize)
+UINT WINAPI midiOutUnprepareHeader(HMIDIOUT hMidiOut,
+                                       MIDIHDR16 * lpMidiOutHdr, UINT uSize)
 {
     return midiOutUnprepareHeader16(hMidiOut, lpMidiOutHdr,uSize);
 }
@@ -2687,7 +2687,7 @@ UINT32 WINAPI midiOutUnprepareHeader32(HMIDIOUT32 hMidiOut,
  * 				midiOutUnprepareHeader	[MMSYSTEM.207]
  */
 UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16 hMidiOut,
-				       MIDIHDR * lpMidiOutHdr, UINT16 uSize)
+				       MIDIHDR16 * lpMidiOutHdr, UINT16 uSize)
 {
     LPMIDIOPENDESC	lpDesc;
 
@@ -2702,7 +2702,7 @@ UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16 hMidiOut,
 /**************************************************************************
  * 				midiOutShortMsg		[WINMM.88]
  */
-UINT32 WINAPI midiOutShortMsg32(HMIDIOUT32 hMidiOut, DWORD dwMsg)
+UINT WINAPI midiOutShortMsg(HMIDIOUT hMidiOut, DWORD dwMsg)
 {
     return midiOutShortMsg16(hMidiOut, dwMsg);
 }
@@ -2724,8 +2724,8 @@ UINT16 WINAPI midiOutShortMsg16(HMIDIOUT16 hMidiOut, DWORD dwMsg)
 /**************************************************************************
  * 				midiOutLongMsg		[WINMM.82]
  */
-UINT32 WINAPI midiOutLongMsg32(HMIDIOUT32 hMidiOut,
-                               MIDIHDR * lpMidiOutHdr, UINT32 uSize)
+UINT WINAPI midiOutLongMsg(HMIDIOUT hMidiOut,
+                               MIDIHDR16 * lpMidiOutHdr, UINT uSize)
 {
     return midiOutLongMsg16(hMidiOut, lpMidiOutHdr,uSize);
 }
@@ -2734,7 +2734,7 @@ UINT32 WINAPI midiOutLongMsg32(HMIDIOUT32 hMidiOut,
  * 				midiOutLongMsg		[MMSYSTEM.209]
  */
 UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16 hMidiOut,
-                               MIDIHDR * lpMidiOutHdr, UINT16 uSize)
+                               MIDIHDR16 * lpMidiOutHdr, UINT16 uSize)
 {
     LPMIDIOPENDESC	lpDesc;
 
@@ -2749,7 +2749,7 @@ UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16 hMidiOut,
 /**************************************************************************
  * 				midiOutReset		[WINMM.86]
  */
-UINT32 WINAPI midiOutReset32(HMIDIOUT32 hMidiOut)
+UINT WINAPI midiOutReset(HMIDIOUT hMidiOut)
 {
     return midiOutReset16(hMidiOut);
 }
@@ -2771,7 +2771,7 @@ UINT16 WINAPI midiOutReset16(HMIDIOUT16 hMidiOut)
 /**************************************************************************
  * 				midiOutGetVolume	[WINM.81]
  */
-UINT32 WINAPI midiOutGetVolume32(UINT32 uDeviceID, DWORD * lpdwVolume)
+UINT WINAPI midiOutGetVolume(UINT uDeviceID, DWORD * lpdwVolume)
 {
     return midiOutGetVolume16(uDeviceID, lpdwVolume);
 }
@@ -2788,7 +2788,7 @@ UINT16 WINAPI midiOutGetVolume16(UINT16 uDeviceID, DWORD * lpdwVolume)
 /**************************************************************************
  * 				midiOutSetVolume	[WINMM.87]
  */
-UINT32 WINAPI midiOutSetVolume32(UINT32 uDeviceID, DWORD dwVolume)
+UINT WINAPI midiOutSetVolume(UINT uDeviceID, DWORD dwVolume)
 {
     return midiOutSetVolume16(uDeviceID, dwVolume);
 }
@@ -2805,8 +2805,8 @@ UINT16 WINAPI midiOutSetVolume16(UINT16 uDeviceID, DWORD dwVolume)
 /**************************************************************************
  * 				midiOutCachePatches		[WINMM.73]
  */
-UINT32 WINAPI midiOutCachePatches32(HMIDIOUT32 hMidiOut, UINT32 uBank,
-                                    WORD * lpwPatchArray, UINT32 uFlags)
+UINT WINAPI midiOutCachePatches(HMIDIOUT hMidiOut, UINT uBank,
+                                    WORD * lpwPatchArray, UINT uFlags)
 {
     return midiOutCachePatches16(hMidiOut,uBank, lpwPatchArray,uFlags);
 }
@@ -2825,8 +2825,8 @@ UINT16 WINAPI midiOutCachePatches16(HMIDIOUT16 hMidiOut, UINT16 uBank,
 /**************************************************************************
  * 				midiOutCacheDrumPatches	[WINMM.72]
  */
-UINT32 WINAPI midiOutCacheDrumPatches32(HMIDIOUT32 hMidiOut, UINT32 uPatch,
-                                        WORD * lpwKeyArray, UINT32 uFlags)
+UINT WINAPI midiOutCacheDrumPatches(HMIDIOUT hMidiOut, UINT uPatch,
+                                        WORD * lpwKeyArray, UINT uFlags)
 {
     return midiOutCacheDrumPatches16(hMidiOut,uPatch, lpwKeyArray,uFlags);
 }
@@ -2844,10 +2844,10 @@ UINT16 WINAPI midiOutCacheDrumPatches16(HMIDIOUT16 hMidiOut, UINT16 uPatch,
 /**************************************************************************
  * 				midiOutGetID		[WINMM.79]
  */
-UINT32 WINAPI midiOutGetID32(HMIDIOUT32 hMidiOut, UINT32 * lpuDeviceID)
+UINT WINAPI midiOutGetID(HMIDIOUT hMidiOut, UINT * lpuDeviceID)
 {
     UINT16	xid;
-    UINT32	ret;
+    UINT	ret;
     
     ret = midiOutGetID16(hMidiOut, &xid);
     *lpuDeviceID = xid;
@@ -2866,7 +2866,7 @@ UINT16 WINAPI midiOutGetID16(HMIDIOUT16 hMidiOut, UINT16 * lpuDeviceID)
 /**************************************************************************
  * 				midiOutMessage		[WINMM.83]
  */
-DWORD WINAPI midiOutMessage32(HMIDIOUT32 hMidiOut, UINT32 uMessage, 
+DWORD WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT uMessage, 
                               DWORD dwParam1, DWORD dwParam2)
 {
     LPMIDIOPENDESC	lpDesc;
@@ -2880,7 +2880,7 @@ DWORD WINAPI midiOutMessage32(HMIDIOUT32 hMidiOut, UINT32 uMessage,
 	FIXME(mmsys,"can't handle MODM_OPEN!\n");
 	return 0;
     case MODM_GETDEVCAPS:
-	return midiOutGetDevCaps32A(hMidiOut, (LPMIDIOUTCAPS32A)dwParam1, dwParam2);
+	return midiOutGetDevCapsA(hMidiOut, (LPMIDIOUTCAPSA)dwParam1, dwParam2);
     case MODM_GETNUMDEVS:
     case MODM_RESET:
     case MODM_CLOSE:
@@ -2924,11 +2924,11 @@ DWORD WINAPI midiOutMessage16(HMIDIOUT16 hMidiOut, UINT16 uMessage,
     case MODM_GETVOLUME:
 	return midiOutGetVolume16(hMidiOut, (LPDWORD)PTR_SEG_TO_LIN(dwParam1));
     case MODM_LONGDATA:
-	return midiOutLongMsg16(hMidiOut, (LPMIDIHDR)PTR_SEG_TO_LIN(dwParam1), dwParam2);
+	return midiOutLongMsg16(hMidiOut, (LPMIDIHDR16)PTR_SEG_TO_LIN(dwParam1), dwParam2);
     case MODM_PREPARE:
-	return midiOutPrepareHeader16(hMidiOut, (LPMIDIHDR)PTR_SEG_TO_LIN(dwParam1), dwParam2);
+	return midiOutPrepareHeader16(hMidiOut, (LPMIDIHDR16)PTR_SEG_TO_LIN(dwParam1), dwParam2);
     case MODM_UNPREPARE:
-	return midiOutUnprepareHeader16(hMidiOut, (LPMIDIHDR)PTR_SEG_TO_LIN(dwParam1), dwParam2);
+	return midiOutUnprepareHeader16(hMidiOut, (LPMIDIHDR16)PTR_SEG_TO_LIN(dwParam1), dwParam2);
     default:
 	ERR(mmsys,"(%04x,%04x,%08lx,%08lx): unhandled message\n",
 	    hMidiOut,uMessage, dwParam1, dwParam2);
@@ -2940,7 +2940,7 @@ DWORD WINAPI midiOutMessage16(HMIDIOUT16 hMidiOut, UINT16 uMessage,
 /**************************************************************************
  * 				midiInGetNumDevs	[WINMM.64]
  */
-UINT32 WINAPI midiInGetNumDevs32(void)
+UINT WINAPI midiInGetNumDevs(void)
 {
     return midiInGetNumDevs16();
 }
@@ -2960,11 +2960,11 @@ UINT16 WINAPI midiInGetNumDevs16(void)
 /**************************************************************************
  * 				midiInGetDevCaps	[WINMM.60]
  */
-UINT32 WINAPI midiInGetDevCaps32W(UINT32 uDeviceID,
-                                  LPMIDIINCAPS32W lpCaps, UINT32 uSize)
+UINT WINAPI midiInGetDevCapsW(UINT uDeviceID,
+                                  LPMIDIINCAPSW lpCaps, UINT uSize)
 {
     MIDIINCAPS16	mic16;
-    UINT32		ret = midiInGetDevCaps16(uDeviceID, &mic16,uSize);
+    UINT		ret = midiInGetDevCaps16(uDeviceID, &mic16,uSize);
     
     lpCaps->wMid = mic16.wMid;
     lpCaps->wPid = mic16.wPid;
@@ -2977,11 +2977,11 @@ UINT32 WINAPI midiInGetDevCaps32W(UINT32 uDeviceID,
 /**************************************************************************
  * 				midiInGetDevCaps	[WINMM.59]
  */
-UINT32 WINAPI midiInGetDevCaps32A(UINT32 uDeviceID,
-                                  LPMIDIINCAPS32A lpCaps, UINT32 uSize)
+UINT WINAPI midiInGetDevCapsA(UINT uDeviceID,
+                                  LPMIDIINCAPSA lpCaps, UINT uSize)
 {
     MIDIINCAPS16	mic16;
-    UINT32		ret = midiInGetDevCaps16(uDeviceID, &mic16,uSize);
+    UINT		ret = midiInGetDevCaps16(uDeviceID, &mic16,uSize);
     
     lpCaps->wMid = mic16.wMid;
     lpCaps->wPid = mic16.wPid;
@@ -3004,10 +3004,10 @@ UINT16 WINAPI midiInGetDevCaps16(UINT16 uDeviceID,
 /**************************************************************************
  * 				midiInGetErrorText 		[WINMM.62]
  */
-UINT32 WINAPI midiInGetErrorText32W(UINT32 uError, LPWSTR lpText, UINT32 uSize)
+UINT WINAPI midiInGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
 {
     LPSTR	xstr = HeapAlloc(GetProcessHeap(), 0,uSize);
-    UINT32	ret = midiInGetErrorText16(uError,xstr,uSize);
+    UINT	ret = midiInGetErrorText16(uError,xstr,uSize);
     lstrcpyAtoW(lpText,xstr);
     HeapFree(GetProcessHeap(), 0,xstr);
     return ret;
@@ -3016,7 +3016,7 @@ UINT32 WINAPI midiInGetErrorText32W(UINT32 uError, LPWSTR lpText, UINT32 uSize)
 /**************************************************************************
  * 				midiInGetErrorText 		[WINMM.61]
  */
-UINT32 WINAPI midiInGetErrorText32A(UINT32 uError, LPSTR lpText, UINT32 uSize)
+UINT WINAPI midiInGetErrorTextA(UINT uError, LPSTR lpText, UINT uSize)
 {
     return midiInGetErrorText16(uError, lpText,uSize);
 }
@@ -3033,11 +3033,11 @@ UINT16 WINAPI midiInGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize)
 /**************************************************************************
  * 				midiInOpen		[WINMM.66]
  */
-UINT32 WINAPI midiInOpen32(HMIDIIN32 * lphMidiIn, UINT32 uDeviceID,
+UINT WINAPI midiInOpen(HMIDIIN * lphMidiIn, UINT uDeviceID,
                            DWORD dwCallback, DWORD dwInstance, DWORD dwFlags)
 {
     HMIDIIN16	xhmid16;
-    UINT32 		ret = midiInOpen16(&xhmid16,uDeviceID, dwCallback, dwInstance,
+    UINT 		ret = midiInOpen16(&xhmid16,uDeviceID, dwCallback, dwInstance,
 					   CALLBACK32CONV(dwFlags));
     if (lphMidiIn) 
 	*lphMidiIn = xhmid16;
@@ -3053,7 +3053,7 @@ UINT16 WINAPI midiInOpen16(HMIDIIN16 * lphMidiIn, UINT16 uDeviceID,
     HMIDI16			hMidiIn;
     LPMIDIOPENDESC		lpDesc;
     DWORD			dwRet = 0;
-    BOOL32			bMapperFlg = FALSE;
+    BOOL			bMapperFlg = FALSE;
     
     if (lphMidiIn != NULL) 
 	*lphMidiIn = 0;
@@ -3091,7 +3091,7 @@ UINT16 WINAPI midiInOpen16(HMIDIIN16 * lphMidiIn, UINT16 uDeviceID,
 /**************************************************************************
  * 				midiInClose		[WINMM.58]
  */
-UINT32 WINAPI midiInClose32(HMIDIIN32 hMidiIn)
+UINT WINAPI midiInClose(HMIDIIN hMidiIn)
 {
     return midiInClose16(hMidiIn);
 }
@@ -3111,8 +3111,8 @@ UINT16 WINAPI midiInClose16(HMIDIIN16 hMidiIn)
 /**************************************************************************
  * 				midiInPrepareHeader	[WINMM.67]
  */
-UINT32 WINAPI midiInPrepareHeader32(HMIDIIN32 hMidiIn,
-                                    MIDIHDR * lpMidiInHdr, UINT32 uSize)
+UINT WINAPI midiInPrepareHeader(HMIDIIN hMidiIn,
+                                    MIDIHDR16 * lpMidiInHdr, UINT uSize)
 {
     LPMIDIOPENDESC	lpDesc;
     
@@ -3129,7 +3129,7 @@ UINT32 WINAPI midiInPrepareHeader32(HMIDIIN32 hMidiIn,
  * 				midiInPrepareHeader	[MMSYSTEM.306]
  */
 UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16 hMidiIn,
-                                    MIDIHDR * lpMidiInHdr, UINT16 uSize)
+                                    MIDIHDR16 * lpMidiInHdr, UINT16 uSize)
 {
     LPMIDIOPENDESC	lpDesc;
     
@@ -3145,8 +3145,8 @@ UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16 hMidiIn,
 /**************************************************************************
  * 				midiInUnprepareHeader	[WINMM.71]
  */
-UINT32 WINAPI midiInUnprepareHeader32(HMIDIIN32 hMidiIn,
-                                      MIDIHDR * lpMidiInHdr, UINT32 uSize)
+UINT WINAPI midiInUnprepareHeader(HMIDIIN hMidiIn,
+                                      MIDIHDR16 * lpMidiInHdr, UINT uSize)
 {
     return midiInUnprepareHeader16(hMidiIn, lpMidiInHdr,uSize);
 }
@@ -3155,7 +3155,7 @@ UINT32 WINAPI midiInUnprepareHeader32(HMIDIIN32 hMidiIn,
  * 				midiInUnprepareHeader	[MMSYSTEM.307]
  */
 UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16 hMidiIn,
-                                      MIDIHDR * lpMidiInHdr, UINT16 uSize)
+                                      MIDIHDR16 * lpMidiInHdr, UINT16 uSize)
 {
     LPMIDIOPENDESC	lpDesc;
     TRACE(mmsys, "(%04X, %p, %d)\n", 
@@ -3169,8 +3169,8 @@ UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16 hMidiIn,
 /**************************************************************************
  * 				midiInAddBuffer		[WINMM.57]
  */
-UINT32 WINAPI midiInAddBuffer32(HMIDIIN32 hMidiIn,
-                                MIDIHDR * lpMidiInHdr, UINT32 uSize)
+UINT WINAPI midiInAddBuffer(HMIDIIN hMidiIn,
+                                MIDIHDR16 * lpMidiInHdr, UINT uSize)
 {
     return midiInAddBuffer16(hMidiIn, lpMidiInHdr,uSize);
 }
@@ -3179,7 +3179,7 @@ UINT32 WINAPI midiInAddBuffer32(HMIDIIN32 hMidiIn,
  * 				midiInAddBuffer		[MMSYSTEM.308]
  */
 UINT16 WINAPI midiInAddBuffer16(HMIDIIN16 hMidiIn,
-                                MIDIHDR * lpMidiInHdr, UINT16 uSize)
+                                MIDIHDR16 * lpMidiInHdr, UINT16 uSize)
 {
     TRACE(mmsys, "midiInAddBuffer\n");
     return 0;
@@ -3188,7 +3188,7 @@ UINT16 WINAPI midiInAddBuffer16(HMIDIIN16 hMidiIn,
 /**************************************************************************
  * 				midiInStart			[WINMM.69]
  */
-UINT32 WINAPI midiInStart32(HMIDIIN32 hMidiIn)
+UINT WINAPI midiInStart(HMIDIIN hMidiIn)
 {
     return midiInStart16(hMidiIn);
 }
@@ -3210,7 +3210,7 @@ UINT16 WINAPI midiInStart16(HMIDIIN16 hMidiIn)
 /**************************************************************************
  * 				midiInStop			[WINMM.70]
  */
-UINT32 WINAPI midiInStop32(HMIDIIN32 hMidiIn)
+UINT WINAPI midiInStop(HMIDIIN hMidiIn)
 {
     return midiInStop16(hMidiIn);
 }
@@ -3232,7 +3232,7 @@ UINT16 WINAPI midiInStop16(HMIDIIN16 hMidiIn)
 /**************************************************************************
  * 				midiInReset			[WINMM.68]
  */
-UINT32 WINAPI midiInReset32(HMIDIIN32 hMidiIn)
+UINT WINAPI midiInReset(HMIDIIN hMidiIn)
 {
     return midiInReset16(hMidiIn);
 }
@@ -3254,7 +3254,7 @@ UINT16 WINAPI midiInReset16(HMIDIIN16 hMidiIn)
 /**************************************************************************
  * 				midiInGetID			[WINMM.63]
  */
-UINT32 WINAPI midiInGetID32(HMIDIIN32 hMidiIn, UINT32* lpuDeviceID)
+UINT WINAPI midiInGetID(HMIDIIN hMidiIn, UINT* lpuDeviceID)
 {
     LPMIDIOPENDESC	lpDesc;
     
@@ -3290,7 +3290,7 @@ UINT16 WINAPI midiInGetID16(HMIDIIN16 hMidiIn, UINT16* lpuDeviceID)
 /**************************************************************************
  * 				midiInMessage		[WINMM.65]
  */
-DWORD WINAPI midiInMessage32(HMIDIIN32 hMidiIn, UINT32 uMessage, 
+DWORD WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage, 
                              DWORD dwParam1, DWORD dwParam2)
 {
     LPMIDIOPENDESC	lpDesc;
@@ -3306,7 +3306,7 @@ DWORD WINAPI midiInMessage32(HMIDIIN32 hMidiIn, UINT32 uMessage,
 	FIXME(mmsys,"can't handle MIDM_OPEN!\n");
 	return 0;
     case MIDM_GETDEVCAPS:
-	return midiInGetDevCaps32A(hMidiIn, (LPMIDIINCAPS32A)dwParam1, dwParam2);
+	return midiInGetDevCapsA(hMidiIn, (LPMIDIINCAPSA)dwParam1, dwParam2);
     case MIDM_GETNUMDEVS:
     case MIDM_RESET:
     case MIDM_STOP:
@@ -3315,11 +3315,11 @@ DWORD WINAPI midiInMessage32(HMIDIIN32 hMidiIn, UINT32 uMessage,
 	/* no argument conversion needed */
 	break;
     case MIDM_PREPARE:
-	return midiInPrepareHeader32(hMidiIn, (LPMIDIHDR)dwParam1, dwParam2);
+	return midiInPrepareHeader(hMidiIn, (LPMIDIHDR16)dwParam1, dwParam2);
     case MIDM_UNPREPARE:
-	return midiInUnprepareHeader32(hMidiIn, (LPMIDIHDR)dwParam1, dwParam2);
+	return midiInUnprepareHeader(hMidiIn, (LPMIDIHDR16)dwParam1, dwParam2);
     case MIDM_ADDBUFFER:
-	return midiInAddBuffer32(hMidiIn, (LPMIDIHDR)dwParam1, dwParam2);
+	return midiInAddBuffer(hMidiIn, (LPMIDIHDR16)dwParam1, dwParam2);
     default:
 	ERR(mmsys,"(%04x,%04x,%08lx,%08lx): unhandled message\n",
 	    hMidiIn,uMessage, dwParam1, dwParam2);
@@ -3354,11 +3354,11 @@ DWORD WINAPI midiInMessage16(HMIDIIN16 hMidiIn, UINT16 uMessage,
 	/* no argument conversion needed */
 	break;
     case MIDM_PREPARE:
-	return midiInPrepareHeader16(hMidiIn, (LPMIDIHDR)PTR_SEG_TO_LIN(dwParam1), dwParam2);
+	return midiInPrepareHeader16(hMidiIn, (LPMIDIHDR16)PTR_SEG_TO_LIN(dwParam1), dwParam2);
     case MIDM_UNPREPARE:
-	return midiInUnprepareHeader16(hMidiIn, (LPMIDIHDR)PTR_SEG_TO_LIN(dwParam1), dwParam2);
+	return midiInUnprepareHeader16(hMidiIn, (LPMIDIHDR16)PTR_SEG_TO_LIN(dwParam1), dwParam2);
     case MIDM_ADDBUFFER:
-	return midiInAddBuffer16(hMidiIn, (LPMIDIHDR)PTR_SEG_TO_LIN(dwParam1), dwParam2);
+	return midiInAddBuffer16(hMidiIn, (LPMIDIHDR16)PTR_SEG_TO_LIN(dwParam1), dwParam2);
     default:
 	ERR(mmsys,"(%04x,%04x,%08lx,%08lx): unhandled message\n",
 	    hMidiIn,uMessage, dwParam1, dwParam2);
@@ -3371,13 +3371,13 @@ DWORD WINAPI midiInMessage16(HMIDIIN16 hMidiIn, UINT16 uMessage,
 
 typedef struct {
     DWORD		dwMagic;
-    HMIDIOUT32		hDevice;
+    HMIDIOUT		hDevice;
     /*     thread ID */
     DWORD		dwTempo;
     DWORD		dwTimeDiv;
     DWORD		dwMS;
     DWORD		dwStatus; 
-    LPMIDIHDR_WIN32	lpMidiHdr;
+    LPMIDIHDR	lpMidiHdr;
 } WINE_MIDIStream;
 
 /**************************************************************************
@@ -3411,7 +3411,7 @@ static	void	MMSYSTEM_MidiStreamPlayer(WINE_MIDIStream* ms)
 	    case MEVT_NOP:
 		break;
 	    case MEVT_SHORTMSG:
-		midiOutShortMsg32(ms->hDevice, MEVT_EVENTPARM(me->dwEvent));
+		midiOutShortMsg(ms->hDevice, MEVT_EVENTPARM(me->dwEvent));
 		break;
 	    case MEVT_TEMPO:
 		ms->dwTempo = MEVT_EVENTPARM(me->dwEvent);
@@ -3426,7 +3426,7 @@ static	void	MMSYSTEM_MidiStreamPlayer(WINE_MIDIStream* ms)
 	    if (ms->lpMidiHdr->dwOffset >= ms->lpMidiHdr->dwBufferLength) {
 		ms->lpMidiHdr->dwFlags |= MHDR_DONE;
 		ms->lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
-		ms->lpMidiHdr = (LPMIDIHDR_WIN32)ms->lpMidiHdr->lpNext; 
+		ms->lpMidiHdr = (LPMIDIHDR)ms->lpMidiHdr->lpNext; 
 		WARN(mmsys, "Should generate callback when done with MIDIHDR...\n");
 	    }
 	    FIXME(mmsys, "Should accordingly update ms->dwMS with me->dwDeltaTime\n");
@@ -3437,7 +3437,7 @@ static	void	MMSYSTEM_MidiStreamPlayer(WINE_MIDIStream* ms)
 /**************************************************************************
  * 				midiStreamClose			[WINMM.90]
  */
-MMRESULT32 WINAPI midiStreamClose32(HMIDISTRM32 hms)
+MMRESULT WINAPI midiStreamClose(HMIDISTRM hms)
 {
     WINE_MIDIStream*	ms;
 
@@ -3455,7 +3455,7 @@ MMRESULT32 WINAPI midiStreamClose32(HMIDISTRM32 hms)
 /**************************************************************************
  * 				midiStreamOpen			[WINMM.91]
  */
-MMRESULT32 WINAPI midiStreamOpen32(HMIDISTRM32* phms, LPUINT32 lpuDeviceID, 
+MMRESULT WINAPI midiStreamOpen(HMIDISTRM* phms, LPUINT lpuDeviceID, 
 				   DWORD cMidi, DWORD dwCallback, 
 				   DWORD dwInstance, DWORD fdwOpen) 
 {
@@ -3468,7 +3468,7 @@ MMRESULT32 WINAPI midiStreamOpen32(HMIDISTRM32* phms, LPUINT32 lpuDeviceID,
 	return MMSYSERR_INVALPARAM;
     
     ms = malloc(sizeof(WINE_MIDIStream));
-    *phms = (HMIDISTRM32)ms;
+    *phms = (HMIDISTRM)ms;
     ms->dwMagic = MIDI_STREAM_MAGIC;
     ms->dwTempo = 50000;	/* FIXME */
     ms->dwTimeDiv = 1;		/* FIXME */
@@ -3478,13 +3478,13 @@ MMRESULT32 WINAPI midiStreamOpen32(HMIDISTRM32* phms, LPUINT32 lpuDeviceID,
     /* FIXME is this correct ? */
     *lpuDeviceID = 0;
     /* FIXME is this correct ? */
-    return midiOutOpen32(&(ms->hDevice), *lpuDeviceID, dwCallback, dwInstance, fdwOpen);
+    return midiOutOpen(&(ms->hDevice), *lpuDeviceID, dwCallback, dwInstance, fdwOpen);
 }
 
 /**************************************************************************
  * 				midiStreamOut			[WINMM.92]
  */
-MMRESULT32 WINAPI midiStreamOut32(HMIDISTRM32 hms, LPMIDIHDR lpMidiHdr, UINT32 cbMidiHdr) 
+MMRESULT WINAPI midiStreamOut(HMIDISTRM hms, LPMIDIHDR16 lpMidiHdr, UINT cbMidiHdr) 
 {
     FIXME(midi, "(%08x, %p, %u) stub!\n", hms, lpMidiHdr, cbMidiHdr);
     return MMSYSERR_NOTSUPPORTED;
@@ -3493,7 +3493,7 @@ MMRESULT32 WINAPI midiStreamOut32(HMIDISTRM32 hms, LPMIDIHDR lpMidiHdr, UINT32 c
 /**************************************************************************
  * 				midiStreamPause			[WINMM.93]
  */
-MMRESULT32 WINAPI midiStreamPause32(HMIDISTRM32 hms) 
+MMRESULT WINAPI midiStreamPause(HMIDISTRM hms) 
 {
     WINE_MIDIStream*	ms;
 
@@ -3510,7 +3510,7 @@ MMRESULT32 WINAPI midiStreamPause32(HMIDISTRM32 hms)
 /**************************************************************************
  * 				midiStreamPosition		[WINMM.94]
  */
-MMRESULT32 WINAPI midiStreamPosition32(HMIDISTRM32 hms, LPMMTIME32 lpMMT, UINT32 cbmmt) 
+MMRESULT WINAPI midiStreamPosition(HMIDISTRM hms, LPMMTIME lpMMT, UINT cbmmt) 
 {
     WINE_MIDIStream*	ms;
     DWORD		ret = MMSYSERR_NOERROR;
@@ -3521,7 +3521,7 @@ MMRESULT32 WINAPI midiStreamPosition32(HMIDISTRM32 hms, LPMMTIME32 lpMMT, UINT32
 
     if (!ms || ms->dwMagic != MIDI_STREAM_MAGIC) {
 	ret = MMSYSERR_INVALHANDLE;
-    } else if (lpMMT == NULL || cbmmt != sizeof(MMTIME32)) {
+    } else if (lpMMT == NULL || cbmmt != sizeof(MMTIME)) {
 	ret = MMSYSERR_INVALPARAM;
     } else {
 	switch (lpMMT->wType) {
@@ -3539,10 +3539,10 @@ MMRESULT32 WINAPI midiStreamPosition32(HMIDISTRM32 hms, LPMMTIME32 lpMMT, UINT32
 /**************************************************************************
  * 				midiStreamProperty		[WINMM.95]
  */
-MMRESULT32 WINAPI midiStreamProperty32(HMIDISTRM32 hms, LPBYTE lpPropData, DWORD dwProperty) 
+MMRESULT WINAPI midiStreamProperty(HMIDISTRM hms, LPBYTE lpPropData, DWORD dwProperty) 
 {
     WINE_MIDIStream*	ms = (WINE_MIDIStream*)hms;
-    MMRESULT32		ret = MMSYSERR_NOERROR;
+    MMRESULT		ret = MMSYSERR_NOERROR;
 
     TRACE(midi, "(%08x, %p, %lx)\n", hms, lpPropData, dwProperty);
 
@@ -3580,7 +3580,7 @@ MMRESULT32 WINAPI midiStreamProperty32(HMIDISTRM32 hms, LPBYTE lpPropData, DWORD
 /**************************************************************************
  * 				midiStreamRestart		[WINMM.96]
  */
-MMRESULT32 WINAPI midiStreamRestart32(HMIDISTRM32 hms) 
+MMRESULT WINAPI midiStreamRestart(HMIDISTRM hms) 
 {
     WINE_MIDIStream*	ms;
 
@@ -3597,7 +3597,7 @@ MMRESULT32 WINAPI midiStreamRestart32(HMIDISTRM32 hms)
 /**************************************************************************
  * 				midiStreamStop			[WINMM.97]
  */
-MMRESULT32 WINAPI midiStreamStop32(HMIDISTRM32 hms) 
+MMRESULT WINAPI midiStreamStop(HMIDISTRM hms) 
 {
     FIXME(midi, "(%08x stub!)\n", hms);
 	return MMSYSERR_NOTSUPPORTED;
@@ -3608,7 +3608,7 @@ MMRESULT32 WINAPI midiStreamStop32(HMIDISTRM32 hms)
  */
 MMRESULT16 WINAPI midiStreamClose16(HMIDISTRM16 hms)
 {
-    return midiStreamClose32(hms);
+    return midiStreamClose(hms);
 }
 
 /**************************************************************************
@@ -3618,14 +3618,14 @@ MMRESULT16 WINAPI midiStreamOpen16(HMIDISTRM16* phms, LPUINT16 devid,
 				   DWORD cMidi, DWORD dwCallback, 
 				   DWORD dwInstance, DWORD fdwOpen) 
 {
-    HMIDISTRM32	hms32;
-    MMRESULT32 	ret;
-    UINT32	devid32;
+    HMIDISTRM	hms32;
+    MMRESULT 	ret;
+    UINT	devid32;
 
     if (!phms || !devid)
 	return MMSYSERR_INVALPARAM;
     devid32 = *devid;
-    ret = midiStreamOpen32(&hms32, &devid32, cMidi, dwCallback, dwInstance, fdwOpen);
+    ret = midiStreamOpen(&hms32, &devid32, cMidi, dwCallback, dwInstance, fdwOpen);
     *phms = hms32;
     *devid = devid32;
     return ret;
@@ -3634,9 +3634,9 @@ MMRESULT16 WINAPI midiStreamOpen16(HMIDISTRM16* phms, LPUINT16 devid,
 /**************************************************************************
  * 				midiStreamOut			[MMSYSTEM.254]
  */
-MMRESULT16 WINAPI midiStreamOut16(HMIDISTRM16 hms, LPMIDIHDR lpMidiHdr, UINT16 cbMidiHdr) 
+MMRESULT16 WINAPI midiStreamOut16(HMIDISTRM16 hms, LPMIDIHDR16 lpMidiHdr, UINT16 cbMidiHdr) 
 {
-    return midiStreamOut32(hms, lpMidiHdr, cbMidiHdr);
+    return midiStreamOut(hms, lpMidiHdr, cbMidiHdr);
 }
 
 /**************************************************************************
@@ -3644,7 +3644,7 @@ MMRESULT16 WINAPI midiStreamOut16(HMIDISTRM16 hms, LPMIDIHDR lpMidiHdr, UINT16 c
  */
 MMRESULT16 WINAPI midiStreamPause16(HMIDISTRM16 hms) 
 {
-    return midiStreamPause32(hms);
+    return midiStreamPause(hms);
 }
 
 /**************************************************************************
@@ -3652,13 +3652,13 @@ MMRESULT16 WINAPI midiStreamPause16(HMIDISTRM16 hms)
  */
 MMRESULT16 WINAPI midiStreamPosition16(HMIDISTRM16 hms, LPMMTIME16 lpmmt, UINT16 cbmmt) 
 {
-    MMTIME32	mmt32;
-    MMRESULT32	ret;
+    MMTIME	mmt32;
+    MMRESULT	ret;
 
     if (!lpmmt)
 	return MMSYSERR_INVALPARAM;
     MMSYSTEM_MMTIME16to32(&mmt32, lpmmt);
-    ret = midiStreamPosition32(hms, &mmt32, cbmmt);
+    ret = midiStreamPosition(hms, &mmt32, cbmmt);
     MMSYSTEM_MMTIME32to16(lpmmt, &mmt32);
     return ret;
 }
@@ -3668,7 +3668,7 @@ MMRESULT16 WINAPI midiStreamPosition16(HMIDISTRM16 hms, LPMMTIME16 lpmmt, UINT16
  */
 MMRESULT16 WINAPI midiStreamProperty16(HMIDISTRM16 hms, LPBYTE lpPropData, DWORD dwProperty) 
 {
-    return midiStreamProperty32(hms, lpPropData, dwProperty);
+    return midiStreamProperty(hms, lpPropData, dwProperty);
 }
 
 /**************************************************************************
@@ -3676,7 +3676,7 @@ MMRESULT16 WINAPI midiStreamProperty16(HMIDISTRM16 hms, LPBYTE lpPropData, DWORD
  */
 MMRESULT16 WINAPI midiStreamRestart16(HMIDISTRM16 hms) 
 {
-    return midiStreamRestart32(hms);
+    return midiStreamRestart(hms);
 }
 
 /**************************************************************************
@@ -3684,13 +3684,13 @@ MMRESULT16 WINAPI midiStreamRestart16(HMIDISTRM16 hms)
  */
 MMRESULT16 WINAPI midiStreamStop16(HMIDISTRM16 hms) 
 {
-    return midiStreamStop32(hms);
+    return midiStreamStop(hms);
 }
 
 /**************************************************************************
  * 				waveOutGetNumDevs		[MMSYSTEM.401]
  */
-UINT32 WINAPI waveOutGetNumDevs32() {
+UINT WINAPI waveOutGetNumDevs() {
     return waveOutGetNumDevs16();
 }
 
@@ -3722,8 +3722,8 @@ UINT16 WINAPI waveOutGetDevCaps16(UINT16 uDeviceID, WAVEOUTCAPS16 * lpCaps,
 /**************************************************************************
  * 				waveOutGetDevCapsA		[WINMM.162]
  */
-UINT32 WINAPI waveOutGetDevCaps32A(UINT32 uDeviceID, LPWAVEOUTCAPS32A lpCaps,
-				   UINT32 uSize)
+UINT WINAPI waveOutGetDevCapsA(UINT uDeviceID, LPWAVEOUTCAPSA lpCaps,
+				   UINT uSize)
 {
     WAVEOUTCAPS16	woc16;
     UINT16 ret = waveOutGetDevCaps16(uDeviceID, &woc16, sizeof(woc16));
@@ -3741,11 +3741,11 @@ UINT32 WINAPI waveOutGetDevCaps32A(UINT32 uDeviceID, LPWAVEOUTCAPS32A lpCaps,
 /**************************************************************************
  * 				waveOutGetDevCapsW		[WINMM.163]
  */
-UINT32 WINAPI waveOutGetDevCaps32W(UINT32 uDeviceID, LPWAVEOUTCAPS32W lpCaps,
-				   UINT32 uSize)
+UINT WINAPI waveOutGetDevCapsW(UINT uDeviceID, LPWAVEOUTCAPSW lpCaps,
+				   UINT uSize)
 {
     WAVEOUTCAPS16	woc16;
-    UINT32 ret = waveOutGetDevCaps16(uDeviceID, &woc16, sizeof(woc16));
+    UINT ret = waveOutGetDevCaps16(uDeviceID, &woc16, sizeof(woc16));
     
     lpCaps->wMid = woc16.wMid;
     lpCaps->wPid = woc16.wPid;
@@ -3769,7 +3769,7 @@ UINT16 WINAPI waveOutGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize)
 /**************************************************************************
  * 				waveOutGetErrorTextA 	[WINMM.164]
  */
-UINT32 WINAPI waveOutGetErrorText32A(UINT32 uError, LPSTR lpText, UINT32 uSize)
+UINT WINAPI waveOutGetErrorTextA(UINT uError, LPSTR lpText, UINT uSize)
 {
     return(waveOutGetErrorText16(uError, lpText, uSize));
 }
@@ -3777,10 +3777,10 @@ UINT32 WINAPI waveOutGetErrorText32A(UINT32 uError, LPSTR lpText, UINT32 uSize)
 /**************************************************************************
  * 				waveOutGetErrorTextW 	[WINMM.165]
  */
-UINT32 WINAPI waveOutGetErrorText32W(UINT32 uError, LPWSTR lpText, UINT32 uSize)
+UINT WINAPI waveOutGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
 {
     LPSTR	xstr = HeapAlloc(GetProcessHeap(), 0,uSize);
-    UINT32	ret = waveOutGetErrorText32A(uError, xstr, uSize);
+    UINT	ret = waveOutGetErrorTextA(uError, xstr, uSize);
     
     lstrcpyAtoW(lpText,xstr);
     HeapFree(GetProcessHeap(), 0,xstr);
@@ -3850,7 +3850,7 @@ static UINT16 waveGetErrorText(UINT16 uError, LPSTR lpText, UINT16 uSize)
 	msgptr = "Unknown MMSYSTEM Error !\n";
 	break;
     }
-    lstrcpyn32A(lpText, msgptr, uSize);
+    lstrcpynA(lpText, msgptr, uSize);
     return TRUE;
 }
 
@@ -3858,12 +3858,12 @@ static UINT16 waveGetErrorText(UINT16 uError, LPSTR lpText, UINT16 uSize)
  *			waveOutOpen			[WINMM.173]
  * All the args/structs have the same layout as the win16 equivalents
  */
-UINT32 WINAPI waveOutOpen32(HWAVEOUT32 * lphWaveOut, UINT32 uDeviceID,
+UINT WINAPI waveOutOpen(HWAVEOUT * lphWaveOut, UINT uDeviceID,
                             const LPWAVEFORMATEX lpFormat, DWORD dwCallback,
                             DWORD dwInstance, DWORD dwFlags)
 {
     HWAVEOUT16	hwo16;
-    UINT32	ret = waveOutOpen16(&hwo16,uDeviceID, lpFormat, dwCallback, dwInstance,
+    UINT	ret = waveOutOpen16(&hwo16,uDeviceID, lpFormat, dwCallback, dwInstance,
 				    CALLBACK32CONV(dwFlags));
 
     if (lphWaveOut) *lphWaveOut=hwo16;
@@ -3880,7 +3880,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16 * lphWaveOut, UINT16 uDeviceID,
     HWAVEOUT16	hWaveOut;
     LPWAVEOPENDESC	lpDesc;
     DWORD		dwRet = 0;
-    BOOL32		bMapperFlg = FALSE;
+    BOOL		bMapperFlg = FALSE;
     
     TRACE(mmsys, "(%p, %d, %p, %08lX, %08lX, %08lX);\n", 
 	  lphWaveOut, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags);
@@ -3914,7 +3914,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16 * lphWaveOut, UINT16 uDeviceID,
     lpDesc->uDeviceID = uDeviceID;  /* save physical Device ID */
     if (dwFlags & WAVE_FORMAT_QUERY) {
 	TRACE(mmsys, "End of WAVE_FORMAT_QUERY !\n");
-	dwRet = waveOutClose32(hWaveOut);
+	dwRet = waveOutClose(hWaveOut);
     }
     return dwRet;
 }
@@ -3922,7 +3922,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16 * lphWaveOut, UINT16 uDeviceID,
 /**************************************************************************
  * 				waveOutClose		[WINMM.161]
  */
-UINT32 WINAPI waveOutClose32(HWAVEOUT32 hWaveOut)
+UINT WINAPI waveOutClose(HWAVEOUT hWaveOut)
 {
     return waveOutClose16(hWaveOut);
 }
@@ -3944,8 +3944,8 @@ UINT16 WINAPI waveOutClose16(HWAVEOUT16 hWaveOut)
 /**************************************************************************
  * 				waveOutPrepareHeader	[WINMM.175]
  */
-UINT32 WINAPI waveOutPrepareHeader32(HWAVEOUT32 hWaveOut,
-				     WAVEHDR* lpWaveOutHdr, UINT32 uSize)
+UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut,
+				     WAVEHDR* lpWaveOutHdr, UINT uSize)
 {
     LPWAVEOPENDESC	lpDesc;
     
@@ -3982,8 +3982,8 @@ UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16 hWaveOut,
 /**************************************************************************
  * 				waveOutUnprepareHeader	[WINMM.181]
  */
-UINT32 WINAPI waveOutUnprepareHeader32(HWAVEOUT32 hWaveOut,
-                                       WAVEHDR* lpWaveOutHdr, UINT32 uSize)
+UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut,
+                                       WAVEHDR* lpWaveOutHdr, UINT uSize)
 {
     LPWAVEOPENDESC	lpDesc;
     
@@ -4020,8 +4020,8 @@ UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16 hWaveOut,
 /**************************************************************************
  * 				waveOutWrite		[MMSYSTEM.408]
  */
-UINT32 WINAPI waveOutWrite32(HWAVEOUT32 hWaveOut, WAVEHDR* lpWaveOutHdr,
-                             UINT32 uSize)
+UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR* lpWaveOutHdr,
+                             UINT uSize)
 {
     LPWAVEOPENDESC	lpDesc;
 
@@ -4056,7 +4056,7 @@ UINT16 WINAPI waveOutWrite16(HWAVEOUT16 hWaveOut, WAVEHDR * lpWaveOutHdr,
 /**************************************************************************
  * 				waveOutPause		[WINMM.174]
  */
-UINT32 WINAPI waveOutPause32(HWAVEOUT32 hWaveOut)
+UINT WINAPI waveOutPause(HWAVEOUT hWaveOut)
 {
     return waveOutPause16(hWaveOut);
 }
@@ -4078,7 +4078,7 @@ UINT16 WINAPI waveOutPause16(HWAVEOUT16 hWaveOut)
 /**************************************************************************
  * 				waveOutRestart		[WINMM.177]
  */
-UINT32 WINAPI waveOutRestart32(HWAVEOUT32 hWaveOut)
+UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut)
 {
     return waveOutRestart16(hWaveOut);
 }
@@ -4100,7 +4100,7 @@ UINT16 WINAPI waveOutRestart16(HWAVEOUT16 hWaveOut)
 /**************************************************************************
  * 				waveOutReset		[WINMM.176]
  */
-UINT32 WINAPI waveOutReset32(HWAVEOUT32 hWaveOut)
+UINT WINAPI waveOutReset(HWAVEOUT hWaveOut)
 {
     return waveOutReset16(hWaveOut);
 }
@@ -4122,11 +4122,11 @@ UINT16 WINAPI waveOutReset16(HWAVEOUT16 hWaveOut)
 /**************************************************************************
  * 				waveOutGetPosition	[WINMM.170]
  */
-UINT32 WINAPI waveOutGetPosition32(HWAVEOUT32 hWaveOut, LPMMTIME32 lpTime,
-                                   UINT32 uSize)
+UINT WINAPI waveOutGetPosition(HWAVEOUT hWaveOut, LPMMTIME lpTime,
+                                   UINT uSize)
 {
     MMTIME16	mmt16;
-    UINT32 ret;
+    UINT ret;
     
     mmt16.wType = lpTime->wType;
     ret = waveOutGetPosition16(hWaveOut, &mmt16, sizeof(mmt16));
@@ -4149,7 +4149,7 @@ UINT16 WINAPI waveOutGetPosition16(HWAVEOUT16 hWaveOut, LPMMTIME16 lpTime,
 }
 
 #define WAVEOUT_SHORTCUT_1(xx,XX,atype) \
-	UINT32 WINAPI waveOut##xx##32(HWAVEOUT32 hWaveOut, atype x)	\
+	UINT WINAPI waveOut##xx(HWAVEOUT hWaveOut, atype x)	\
 {									\
 	return waveOut##xx##16(hWaveOut,x);				\
 }									\
@@ -4169,7 +4169,7 @@ WAVEOUT_SHORTCUT_1(GetPlaybackRate,GETPLAYBACKRATE, DWORD*)
 WAVEOUT_SHORTCUT_1(SetPlaybackRate,SETPLAYBACKRATE, DWORD)
     
 #define WAVEOUT_SHORTCUT_2(xx,XX,atype) \
-	UINT32 WINAPI waveOut##xx##32(UINT32 devid, atype x)		\
+	UINT WINAPI waveOut##xx(UINT devid, atype x)		\
 {									\
 	return waveOut##xx##16(devid,x);				\
 }									\
@@ -4185,7 +4185,7 @@ WAVEOUT_SHORTCUT_2(SetVolume,SETVOLUME, DWORD)
 /**************************************************************************
  * 				waveOutBreakLoop 	[MMSYSTEM.419]
  */
-UINT32 WINAPI waveOutBreakLoop32(HWAVEOUT32 hWaveOut)
+UINT WINAPI waveOutBreakLoop(HWAVEOUT hWaveOut)
 {
     return waveOutBreakLoop16(hWaveOut);
 }
@@ -4202,7 +4202,7 @@ UINT16 WINAPI waveOutBreakLoop16(HWAVEOUT16 hWaveOut)
 /**************************************************************************
  * 				waveOutGetID	 	[MMSYSTEM.420]
  */
-UINT32 WINAPI waveOutGetID32(HWAVEOUT32 hWaveOut, UINT32 * lpuDeviceID)
+UINT WINAPI waveOutGetID(HWAVEOUT hWaveOut, UINT * lpuDeviceID)
 {
     LPWAVEOPENDESC	lpDesc;
 
@@ -4234,7 +4234,7 @@ UINT16 WINAPI waveOutGetID16(HWAVEOUT16 hWaveOut, UINT16 * lpuDeviceID)
 /**************************************************************************
  * 				waveOutMessage 		[MMSYSTEM.421]
  */
-DWORD WINAPI waveOutMessage32(HWAVEOUT32 hWaveOut, UINT32 uMessage, 
+DWORD WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, 
                               DWORD dwParam1, DWORD dwParam2)
 {
     LPWAVEOPENDESC	lpDesc;
@@ -4259,10 +4259,10 @@ DWORD WINAPI waveOutMessage32(HWAVEOUT32 hWaveOut, UINT32 uMessage,
 	/* no argument conversion needed */
 	break;
     case WODM_WRITE:
-	return waveOutWrite32(hWaveOut, (LPWAVEHDR)dwParam1, dwParam2);
+	return waveOutWrite(hWaveOut, (LPWAVEHDR)dwParam1, dwParam2);
     case WODM_GETDEVCAPS:
 	/* FIXME: UNICODE/ANSI? */
-	return waveOutGetDevCaps32A(hWaveOut, (LPWAVEOUTCAPS32A)dwParam1, dwParam2);
+	return waveOutGetDevCapsA(hWaveOut, (LPWAVEOUTCAPSA)dwParam1, dwParam2);
     case WODM_OPEN:
 	FIXME(mmsys,"can't handle WODM_OPEN, please report.\n");
 	break;
@@ -4324,7 +4324,7 @@ DWORD WINAPI waveOutMessage16(HWAVEOUT16 hWaveOut, UINT16 uMessage,
 /**************************************************************************
  * 				waveInGetNumDevs 		[WINMM.151]
  */
-UINT32 WINAPI waveInGetNumDevs32()
+UINT WINAPI waveInGetNumDevs()
 {
     return waveInGetNumDevs16();
 }
@@ -4345,10 +4345,10 @@ UINT16 WINAPI waveInGetNumDevs16()
 /**************************************************************************
  * 				waveInGetDevCapsA 		[WINMM.147]
  */
-UINT32 WINAPI waveInGetDevCaps32W(UINT32 uDeviceID, LPWAVEINCAPS32W lpCaps, UINT32 uSize)
+UINT WINAPI waveInGetDevCapsW(UINT uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSize)
 {
     WAVEINCAPS16	wic16;
-    UINT32		ret = waveInGetDevCaps16(uDeviceID, &wic16,uSize);
+    UINT		ret = waveInGetDevCaps16(uDeviceID, &wic16,uSize);
     
     lpCaps->wMid = wic16.wMid;
     lpCaps->wPid = wic16.wPid;
@@ -4363,10 +4363,10 @@ UINT32 WINAPI waveInGetDevCaps32W(UINT32 uDeviceID, LPWAVEINCAPS32W lpCaps, UINT
 /**************************************************************************
  * 				waveInGetDevCapsA 		[WINMM.146]
  */
-UINT32 WINAPI waveInGetDevCaps32A(UINT32 uDeviceID, LPWAVEINCAPS32A lpCaps, UINT32 uSize)
+UINT WINAPI waveInGetDevCapsA(UINT uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSize)
 {
     WAVEINCAPS16	wic16;
-    UINT32		ret = waveInGetDevCaps16(uDeviceID, &wic16,uSize);
+    UINT		ret = waveInGetDevCaps16(uDeviceID, &wic16,uSize);
     
     lpCaps->wMid = wic16.wMid;
     lpCaps->wPid = wic16.wPid;
@@ -4390,7 +4390,7 @@ UINT16 WINAPI waveInGetDevCaps16(UINT16 uDeviceID, LPWAVEINCAPS16 lpCaps, UINT16
 /**************************************************************************
  * 				waveInGetErrorTextA 	[WINMM.148]
  */
-UINT32 WINAPI waveInGetErrorText32A(UINT32 uError, LPSTR lpText, UINT32 uSize)
+UINT WINAPI waveInGetErrorTextA(UINT uError, LPSTR lpText, UINT uSize)
 {
     TRACE(mmsys, "waveInGetErrorText\n");
     return(waveGetErrorText(uError, lpText, uSize));
@@ -4399,10 +4399,10 @@ UINT32 WINAPI waveInGetErrorText32A(UINT32 uError, LPSTR lpText, UINT32 uSize)
 /**************************************************************************
  * 				waveInGetErrorTextW 	[WINMM.149]
  */
-UINT32 WINAPI waveInGetErrorText32W(UINT32 uError, LPWSTR lpText, UINT32 uSize)
+UINT WINAPI waveInGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
 {
     LPSTR txt = HeapAlloc(GetProcessHeap(), 0,uSize);
-    UINT32	ret = waveGetErrorText(uError, txt, uSize);
+    UINT	ret = waveGetErrorText(uError, txt, uSize);
     
     lstrcpyAtoW(lpText, txt);
     HeapFree(GetProcessHeap(), 0, txt);
@@ -4421,12 +4421,12 @@ UINT16 WINAPI waveInGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize)
 /**************************************************************************
  * 				waveInOpen			[WINMM.154]
  */
-UINT32 WINAPI waveInOpen32(HWAVEIN32 * lphWaveIn, UINT32 uDeviceID,
+UINT WINAPI waveInOpen(HWAVEIN * lphWaveIn, UINT uDeviceID,
                            const LPWAVEFORMAT lpFormat, DWORD dwCallback,
                            DWORD dwInstance, DWORD dwFlags)
 {
     HWAVEIN16	hwin16;
-    UINT32	ret = waveInOpen16(&hwin16,uDeviceID, lpFormat, dwCallback, dwInstance,
+    UINT	ret = waveInOpen16(&hwin16,uDeviceID, lpFormat, dwCallback, dwInstance,
 				 CALLBACK32CONV(dwFlags));
     if (lphWaveIn) *lphWaveIn = hwin16;
     return ret;
@@ -4442,7 +4442,7 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16 * lphWaveIn, UINT16 uDeviceID,
     HWAVEIN16 hWaveIn;
     LPWAVEOPENDESC	lpDesc;
     DWORD	dwRet = 0;
-    BOOL32	bMapperFlg = FALSE;
+    BOOL	bMapperFlg = FALSE;
 
     TRACE(mmsys, "(%p, %d, %p, %08lX, %08lX, %08lX);\n", 
 	  lphWaveIn, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags);
@@ -4481,7 +4481,7 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16 * lphWaveIn, UINT16 uDeviceID,
 /**************************************************************************
  * 				waveInClose			[WINMM.145]
  */
-UINT32 WINAPI waveInClose32(HWAVEIN32 hWaveIn)
+UINT WINAPI waveInClose(HWAVEIN hWaveIn)
 {
     return waveInClose16(hWaveIn);
 }
@@ -4502,8 +4502,8 @@ UINT16 WINAPI waveInClose16(HWAVEIN16 hWaveIn)
 /**************************************************************************
  * 				waveInPrepareHeader		[WINMM.155]
  */
-UINT32 WINAPI waveInPrepareHeader32(HWAVEIN32 hWaveIn,
-				    WAVEHDR * lpWaveInHdr, UINT32 uSize)
+UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn,
+				    WAVEHDR * lpWaveInHdr, UINT uSize)
 {
     LPWAVEOPENDESC	lpDesc;
     
@@ -4552,8 +4552,8 @@ UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16 hWaveIn,
 /**************************************************************************
  * 				waveInUnprepareHeader	[WINMM.159]
  */
-UINT32 WINAPI waveInUnprepareHeader32(HWAVEIN32 hWaveIn,
-                                      WAVEHDR * lpWaveInHdr, UINT32 uSize)
+UINT WINAPI waveInUnprepareHeader(HWAVEIN hWaveIn,
+                                      WAVEHDR * lpWaveInHdr, UINT uSize)
 {
     LPWAVEOPENDESC	lpDesc;
     
@@ -4592,8 +4592,8 @@ UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16 hWaveIn,
 /**************************************************************************
  * 				waveInAddBuffer		[WINMM.144]
  */
-UINT32 WINAPI waveInAddBuffer32(HWAVEIN32 hWaveIn,
-                                WAVEHDR * lpWaveInHdr, UINT32 uSize)
+UINT WINAPI waveInAddBuffer(HWAVEIN hWaveIn,
+                                WAVEHDR * lpWaveInHdr, UINT uSize)
 {
     LPWAVEOPENDESC	lpDesc;
     
@@ -4637,7 +4637,7 @@ UINT16 WINAPI waveInAddBuffer16(HWAVEIN16 hWaveIn,
 /**************************************************************************
  * 				waveInStart			[WINMM.157]
  */
-UINT32 WINAPI waveInStart32(HWAVEIN32 hWaveIn)
+UINT WINAPI waveInStart(HWAVEIN hWaveIn)
 {
     return waveInStart16(hWaveIn);
 }
@@ -4658,7 +4658,7 @@ UINT16 WINAPI waveInStart16(HWAVEIN16 hWaveIn)
 /**************************************************************************
  * 				waveInStop			[WINMM.158]
  */
-UINT32 WINAPI waveInStop32(HWAVEIN32 hWaveIn)
+UINT WINAPI waveInStop(HWAVEIN hWaveIn)
 {
     return waveInStop16(hWaveIn);
 }
@@ -4679,7 +4679,7 @@ UINT16 WINAPI waveInStop16(HWAVEIN16 hWaveIn)
 /**************************************************************************
  * 				waveInReset			[WINMM.156]
  */
-UINT32 WINAPI waveInReset32(HWAVEIN32 hWaveIn)
+UINT WINAPI waveInReset(HWAVEIN hWaveIn)
 {
     return waveInReset16(hWaveIn);
 }
@@ -4700,11 +4700,11 @@ UINT16 WINAPI waveInReset16(HWAVEIN16 hWaveIn)
 /**************************************************************************
  * 				waveInGetPosition	[WINMM.152]
  */
-UINT32 WINAPI waveInGetPosition32(HWAVEIN32 hWaveIn, LPMMTIME32 lpTime,
-                                  UINT32 uSize)
+UINT WINAPI waveInGetPosition(HWAVEIN hWaveIn, LPMMTIME lpTime,
+                                  UINT uSize)
 {
     MMTIME16	mmt16;
-    UINT32 	ret;
+    UINT 	ret;
     
     mmt16.wType = lpTime->wType;
     ret = waveInGetPosition16(hWaveIn, &mmt16,uSize);
@@ -4731,7 +4731,7 @@ UINT16 WINAPI waveInGetPosition16(HWAVEIN16 hWaveIn, LPMMTIME16 lpTime,
 /**************************************************************************
  * 				waveInGetID			[WINMM.150]
  */
-UINT32 WINAPI waveInGetID32(HWAVEIN32 hWaveIn, UINT32 * lpuDeviceID)
+UINT WINAPI waveInGetID(HWAVEIN hWaveIn, UINT * lpuDeviceID)
 {
     LPWAVEOPENDESC	lpDesc;
     
@@ -4761,7 +4761,7 @@ UINT16 WINAPI waveInGetID16(HWAVEIN16 hWaveIn, UINT16 * lpuDeviceID)
 /**************************************************************************
  * 				waveInMessage 		[WINMM.153]
  */
-DWORD WINAPI waveInMessage32(HWAVEIN32 hWaveIn, UINT32 uMessage,
+DWORD WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage,
                              DWORD dwParam1, DWORD dwParam2)
 {
     LPWAVEOPENDESC	lpDesc;
@@ -4788,7 +4788,7 @@ DWORD WINAPI waveInMessage32(HWAVEIN32 hWaveIn, UINT32 uMessage,
 	break;
     case WIDM_GETDEVCAPS:
 	/*FIXME: ANSI/UNICODE */
-	return waveInGetDevCaps32A(hWaveIn, (LPWAVEINCAPS32A)dwParam1, dwParam2);
+	return waveInGetDevCapsA(hWaveIn, (LPWAVEINCAPSA)dwParam1, dwParam2);
     default:
 	ERR(mmsys,"(%04x,%04x,%08lx,%08lx): unhandled message\n",
 	    hWaveIn,uMessage, dwParam1, dwParam2);
@@ -4894,8 +4894,8 @@ LRESULT WINAPI DrvDefDriverProc(DWORD dwDriverID, HDRVR16 hDriv, WORD wMsg,
 /**************************************************************************
  * 				DefDriverProc32  [WINMM.5]
  */
-LRESULT WINAPI DefDriverProc32(DWORD dwDriverIdentifier, HDRVR32 hdrvr,
-                               UINT32 Msg, LPARAM lParam1, LPARAM lParam2)
+LRESULT WINAPI DefDriverProc(DWORD dwDriverIdentifier, HDRVR hdrvr,
+                               UINT Msg, LPARAM lParam1, LPARAM lParam2)
 {
     switch (Msg) {
     case DRV_LOAD:
@@ -4947,7 +4947,7 @@ HINSTANCE16 WINAPI mmTaskCreate16(LPWORD lphnd,HINSTANCE16 *hMmTask, DWORD x2)
     DWORD showCmd = 0x40002;
     LPSTR cmdline;
     WORD sel1, sel2;
-    LOADPARAMS *lp;
+    LOADPARAMS16 *lp;
     HINSTANCE16 ret, handle;
     
     TRACE(mmsys,"(%p,%p,%08lx);\n", lphnd, hMmTask,x2);
@@ -4961,7 +4961,7 @@ HINSTANCE16 WINAPI mmTaskCreate16(LPWORD lphnd,HINSTANCE16 *hMmTask, DWORD x2)
     sel2 = SELECTOR_AllocBlock(&showCmd, sizeof(showCmd),
 			       SEGMENT_DATA, FALSE, FALSE);
     
-    lp = (LOADPARAMS *)HeapAlloc(GetProcessHeap(), 0, sizeof(LOADPARAMS));
+    lp = (LOADPARAMS16 *)HeapAlloc(GetProcessHeap(), 0, sizeof(LOADPARAMS16));
     lp->hEnvironment = 0;
     lp->cmdLine = PTR_SEG_OFF_TO_SEGPTR(sel1, 0);
     lp->showCmd = PTR_SEG_OFF_TO_SEGPTR(sel2, 0);
@@ -4997,5 +4997,5 @@ HINSTANCE16 WINAPI mmTaskCreate16(LPWORD lphnd,HINSTANCE16 *hMmTask, DWORD x2)
 LRESULT WINAPI mmTaskSignal16(HTASK16 ht) 
 {
     TRACE(mmsys,"(%04x);\n", ht);
-    return PostAppMessage32A(ht, WM_USER, 0, 0);
+    return PostAppMessageA(ht, WM_USER, 0, 0);
 }
diff --git a/multimedia/msvideo.c b/multimedia/msvideo.c
index 37f0c965294..f95ef266022 100644
--- a/multimedia/msvideo.c
+++ b/multimedia/msvideo.c
@@ -28,30 +28,30 @@ VideoForWindowsVersion(void) {
  * Get information about an installable compressor. Return TRUE if there
  * is one.
  */
-BOOL32 WINAPI
-ICInfo32(
+BOOL WINAPI
+ICInfo(
 	DWORD fccType,		/* [in] type of compressor ('vidc') */
 	DWORD fccHandler,	/* [in] <n>th compressor */
-	ICINFO32 *lpicinfo	/* [out] information about compressor */
+	ICINFO *lpicinfo	/* [out] information about compressor */
 ) {
 	char	type[5],buf[2000];
 
 	memcpy(type,&fccType,4);type[4]=0;
 	TRACE(msvideo,"(%s,%ld,%p).\n",type,fccHandler,lpicinfo);
 	/* does OpenDriver/CloseDriver */
-	lpicinfo->dwSize = sizeof(ICINFO32);
+	lpicinfo->dwSize = sizeof(ICINFO);
 	lpicinfo->fccType = fccType;
 	lpicinfo->dwFlags = 0;
-	if (GetPrivateProfileString32A("drivers32",NULL,NULL,buf,2000,"system.ini")) {
+	if (GetPrivateProfileStringA("drivers32",NULL,NULL,buf,2000,"system.ini")) {
 		char *s = buf;
 		while (*s) {
-			if (!lstrncmpi32A(type,s,4)) {
+			if (!lstrncmpiA(type,s,4)) {
 				if(!fccHandler--) {
-					lpicinfo->fccHandler = mmioStringToFOURCC32A(s+5,0);
+					lpicinfo->fccHandler = mmioStringToFOURCCA(s+5,0);
 					return TRUE;
 				}
 			}
-			s=s+lstrlen32A(s)+1; /* either next char or \0 */
+			s=s+lstrlenA(s)+1; /* either next char or \0 */
 		}
 	}
 	return FALSE;
@@ -61,11 +61,11 @@ ICInfo32(
  *		ICOpen				[MSVFW32.37]
  * Opens an installable compressor. Return special handle.
  */
-HIC32 WINAPI
-ICOpen32(DWORD fccType,DWORD fccHandler,UINT32 wMode) {
+HIC WINAPI
+ICOpen(DWORD fccType,DWORD fccHandler,UINT wMode) {
 	char		type[5],handler[5],codecname[20];
 	ICOPEN		icopen;
-	HDRVR32		hdrv;
+	HDRVR		hdrv;
 	WINE_HIC	*whic;
 
 	memcpy(type,&fccType,4);type[4]=0;
@@ -81,41 +81,41 @@ ICOpen32(DWORD fccType,DWORD fccHandler,UINT32 wMode) {
 	icopen.dwSize		= sizeof(ICOPEN);
 	icopen.dwFlags		= wMode;
 	/* FIXME: do we need to fill out the rest too? */
-	hdrv=OpenDriver32A(codecname,"drivers32",(LPARAM)&icopen);
+	hdrv=OpenDriverA(codecname,"drivers32",(LPARAM)&icopen);
 	if (!hdrv) {
 	    if (!strcasecmp(type,"vids")) {
 		sprintf(codecname,"vidc.%s",handler);
 		fccType = mmioFOURCC('v','i','d','c');
 	    }
-	    hdrv=OpenDriver32A(codecname,"drivers32",(LPARAM)&icopen);
+	    hdrv=OpenDriverA(codecname,"drivers32",(LPARAM)&icopen);
 	    return 0;
 	}
 	whic = HeapAlloc(GetProcessHeap(),0,sizeof(WINE_HIC));
 	whic->hdrv	= hdrv;
 #if 0
-	whic->driverproc= GetProcAddress32(GetDriverModuleHandle32(hdrv),"DriverProc");
+	whic->driverproc= GetProcAddress(GetDriverModuleHandle(hdrv),"DriverProc");
 	whic->private	= whic->driverproc(0,hdrv,DRV_OPEN,0,&icopen);
 #endif
-	return (HIC32)whic;
+	return (HIC)whic;
 }
 
 LRESULT WINAPI
-ICGetInfo32(HIC32 hic,ICINFO32 *picinfo,DWORD cb) {
+ICGetInfo(HIC hic,ICINFO *picinfo,DWORD cb) {
 	LRESULT		ret;
 
 	TRACE(msvideo,"(0x%08lx,%p,%ld)\n",(DWORD)hic,picinfo,cb);
-	ret = ICSendMessage32(hic,ICM_GETINFO,(DWORD)picinfo,cb);
+	ret = ICSendMessage(hic,ICM_GETINFO,(DWORD)picinfo,cb);
 	TRACE(msvideo,"	-> 0x%08lx\n",ret);
 	return ret;
 }
 
-HIC32  VFWAPI
-ICLocate32(
+HIC  VFWAPI
+ICLocate(
 	DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn,
 	LPBITMAPINFOHEADER lpbiOut, WORD wMode
 ) {
 	char	type[5],handler[5];
-	HIC32	hic;
+	HIC	hic;
 	DWORD	querymsg;
 
 	switch (wMode) {
@@ -136,11 +136,11 @@ ICLocate32(
 	}
 
 	/* Easy case: handler/type match, we just fire a query and return */
-	hic = ICOpen32(fccType,fccHandler,wMode);
+	hic = ICOpen(fccType,fccHandler,wMode);
 	if (hic) {
-		if (!ICSendMessage32(hic,querymsg,(DWORD)lpbiIn,(DWORD)lpbiOut))
+		if (!ICSendMessage(hic,querymsg,(DWORD)lpbiIn,(DWORD)lpbiOut))
 			return hic;
-		ICClose32(hic);
+		ICClose(hic);
 	}
 	type[4]='\0';memcpy(type,&fccType,4);
 	handler[4]='\0';memcpy(handler,&fccHandler,4);
@@ -149,8 +149,8 @@ ICLocate32(
 }
 
 DWORD VFWAPIV
-ICCompress32(
-	HIC32 hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiOutput,LPVOID lpData,
+ICCompress(
+	HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiOutput,LPVOID lpData,
 	LPBITMAPINFOHEADER lpbiInput,LPVOID lpBits,LPDWORD lpckid,
 	LPDWORD lpdwFlags,LONG lFrameNum,DWORD dwFrameSize,DWORD dwQuality,
 	LPBITMAPINFOHEADER lpbiPrev,LPVOID lpPrev
@@ -171,11 +171,11 @@ ICCompress32(
 	iccmp.dwQuality		= dwQuality;
 	iccmp.lpbiPrev		= lpbiPrev;
 	iccmp.lpPrev		= lpPrev;
-	return ICSendMessage32(hic,ICM_COMPRESS,(LPARAM)&iccmp,sizeof(iccmp));
+	return ICSendMessage(hic,ICM_COMPRESS,(LPARAM)&iccmp,sizeof(iccmp));
 }
 
 DWORD VFWAPIV 
-ICDecompress32(HIC32 hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,LPVOID lpData,LPBITMAPINFOHEADER  lpbi,LPVOID lpBits) {
+ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,LPVOID lpData,LPBITMAPINFOHEADER  lpbi,LPVOID lpBits) {
 	ICDECOMPRESS	icd;
 
 	icd.dwFlags	= dwFlags;
@@ -187,11 +187,11 @@ ICDecompress32(HIC32 hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,LPVOID lpDa
 	/* 
 	icd.ckid	= ??? ckid from AVI file? how do we get it? ;
 	 */
-	return ICSendMessage32(hic,ICM_DECOMPRESS,(LPARAM)&icd,sizeof(icd));
+	return ICSendMessage(hic,ICM_DECOMPRESS,(LPARAM)&icd,sizeof(icd));
 }
 
 LRESULT VFWAPI
-ICSendMessage32(HIC32 hic,UINT32 msg,DWORD lParam1,DWORD lParam2) {
+ICSendMessage(HIC hic,UINT msg,DWORD lParam1,DWORD lParam2) {
 	LRESULT		ret;
 	WINE_HIC	*whic = (WINE_HIC*)hic;
 
@@ -241,57 +241,57 @@ ICSendMessage32(HIC32 hic,UINT32 msg,DWORD lParam1,DWORD lParam2) {
 	default:
 		FIXME(msvideo,"(0x%08lx,0x%08lx,0x%08lx,0x%08lx)\n",(DWORD)hic,(DWORD)msg,lParam1,lParam2);
 	}
-	ret = SendDriverMessage32(whic->hdrv,msg,lParam1,lParam2);
+	ret = SendDriverMessage(whic->hdrv,msg,lParam1,lParam2);
 /*	ret = whic->driverproc(whic->private,whic->hdrv,msg,lParam1,lParam2);*/
 	TRACE(msvideo,"	-> 0x%08lx\n",ret);
 	return ret;
 }
 
-DWORD	VFWAPIV	ICDrawBegin32(
-        HIC32			hic,
+DWORD	VFWAPIV	ICDrawBegin(
+        HIC			hic,
         DWORD			dwFlags,/* flags */
-        HPALETTE32		hpal,	/* palette to draw with */
-        HWND32			hwnd,	/* window to draw to */
-        HDC32			hdc,	/* HDC to draw to */
-        INT32			xDst,	/* destination rectangle */
-        INT32			yDst,
-        INT32			dxDst,
-        INT32			dyDst,
+        HPALETTE		hpal,	/* palette to draw with */
+        HWND			hwnd,	/* window to draw to */
+        HDC			hdc,	/* HDC to draw to */
+        INT			xDst,	/* destination rectangle */
+        INT			yDst,
+        INT			dxDst,
+        INT			dyDst,
         LPBITMAPINFOHEADER	lpbi,	/* format of frame to draw */
-        INT32			xSrc,	/* source rectangle */
-        INT32			ySrc,
-        INT32			dxSrc,
-        INT32			dySrc,
+        INT			xSrc,	/* source rectangle */
+        INT			ySrc,
+        INT			dxSrc,
+        INT			dySrc,
         DWORD			dwRate,	/* frames/second = (dwRate/dwScale) */
         DWORD			dwScale) {
 		return 0;
 }
 
-LRESULT WINAPI ICClose32(HIC32 hic) {
+LRESULT WINAPI ICClose(HIC hic) {
 	WINE_HIC	*whic = (WINE_HIC*)hic;
 	TRACE(msvideo,"(%d).\n",hic);
 	/* FIXME: correct? */
-	CloseDriver32(whic->hdrv,0,0);
+	CloseDriver(whic->hdrv,0,0);
 	HeapFree(GetProcessHeap(),0,whic);
 	return 0;
 }
 
-HANDLE32 /* HDRAWDIB */ WINAPI
-DrawDibOpen32( void ) {
+HANDLE /* HDRAWDIB */ WINAPI
+DrawDibOpen( void ) {
 	FIXME(msvideo,"stub!\n");
 	return 0;
 }
-HWND32 VFWAPIV MCIWndCreate32 (HWND32 hwndParent, HINSTANCE32 hInstance,
+HWND VFWAPIV MCIWndCreate (HWND hwndParent, HINSTANCE hInstance,
                       DWORD dwStyle,LPVOID szFile)
 {	FIXME(msvideo,"%x %x %lx %p\n",hwndParent, hInstance, dwStyle, szFile);
 	return 0;
 }
-HWND32 VFWAPIV MCIWndCreate32A(HWND32 hwndParent, HINSTANCE32 hInstance,
+HWND VFWAPIV MCIWndCreateA(HWND hwndParent, HINSTANCE hInstance,
                       DWORD dwStyle,LPCSTR szFile)
 {	FIXME(msvideo,"%x %x %lx %s\n",hwndParent, hInstance, dwStyle, szFile);
 	return 0;
 }
-HWND32 VFWAPIV MCIWndCreate32W(HWND32 hwndParent, HINSTANCE32 hInstance,
+HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,
                       DWORD dwStyle,LPCWSTR szFile)
 {	FIXME(msvideo,"%x %x %lx %s\n",hwndParent, hInstance, dwStyle, debugstr_w(szFile));
 	return 0;
diff --git a/multimedia/time.c b/multimedia/time.c
index dab91b11809..addd5c47963 100644
--- a/multimedia/time.c
+++ b/multimedia/time.c
@@ -23,15 +23,15 @@ static MMTIME16 mmSysTimeMS;
 static MMTIME16 mmSysTimeSMPTE;
 
 typedef struct tagTIMERENTRY {
-    UINT32			wDelay;
-    UINT32			wResol;
+    UINT			wDelay;
+    UINT			wResol;
     FARPROC16 			lpFunc;
-    HINSTANCE32			hInstance;
+    HINSTANCE			hInstance;
     DWORD			dwUser;
-    UINT32			wFlags;
-    UINT32			wTimerID;
-    UINT32			wCurTime;
-    UINT32			isWin32;
+    UINT			wFlags;
+    UINT			wTimerID;
+    UINT			wCurTime;
+    UINT			isWin32;
     struct tagTIMERENTRY*	Next;
 } TIMERENTRY, *LPTIMERENTRY;
 
@@ -39,7 +39,7 @@ static LPTIMERENTRY lpTimerList = NULL;
 
 #ifdef USE_FAKE_MM_TIMERS
 static DWORD dwLastCBTick = 0;
-static BOOL32 bUseFakeTimers = FALSE;
+static BOOL bUseFakeTimers = FALSE;
 static WORD wInCallBackLoop = 0;
 #endif
 
@@ -78,10 +78,10 @@ static	void	TIME_TriggerCallBack(LPTIMERENTRY lpTimer, DWORD dwCurrent)
 						lpTimer->dwUser,0,0);
 		break;
 	case TIME_CALLBACK_EVENT_SET:
-		SetEvent((HANDLE32)lpTimer->lpFunc);
+		SetEvent((HANDLE)lpTimer->lpFunc);
 		break;
 	case TIME_CALLBACK_EVENT_PULSE:
-		PulseEvent((HANDLE32)lpTimer->lpFunc);
+		PulseEvent((HANDLE)lpTimer->lpFunc);
 		break;
 	default:
 		FIXME(mmtime,"Unknown callback type 0x%04x for mmtime callback (%p),ignored.\n",lpTimer->wFlags,lpTimer->lpFunc);
@@ -90,14 +90,14 @@ static	void	TIME_TriggerCallBack(LPTIMERENTRY lpTimer, DWORD dwCurrent)
 	TRACE(mmtime, "after CallBack16 !\n");
     }
     if (lpTimer->wFlags & TIME_ONESHOT)
-	timeKillEvent32(lpTimer->wTimerID);
+	timeKillEvent(lpTimer->wTimerID);
 }
 
 /**************************************************************************
  *           TIME_MMSysTimeCallback
  */
-static VOID WINAPI TIME_MMSysTimeCallback( HWND32 hwnd, UINT32 msg,
-                                    UINT32 id, DWORD dwTime )
+static VOID WINAPI TIME_MMSysTimeCallback( HWND hwnd, UINT msg,
+                                    UINT id, DWORD dwTime )
 {
     LPTIMERENTRY lpTimer;
     
@@ -127,7 +127,7 @@ static VOID WINAPI TIME_MMSysTimeCallback( HWND32 hwnd, UINT32 msg,
  */
 static void StartMMTime()
 {
-    static BOOL32 	mmTimeStarted = FALSE;
+    static BOOL 	mmTimeStarted = FALSE;
     
     if (!mmTimeStarted) {
 	mmTimeStarted = TRUE;
@@ -140,7 +140,7 @@ static void StartMMTime()
 	mmSysTimeSMPTE.u.smpte.frame = 0;
 	mmSysTimeSMPTE.u.smpte.fps = 0;
 	mmSysTimeSMPTE.u.smpte.dummy = 0;
-	SetTimer32( 0, 0, MMSYSTIME_MININTERVAL, TIME_MMSysTimeCallback );
+	SetTimer( 0, 0, MMSYSTIME_MININTERVAL, TIME_MMSysTimeCallback );
 #ifdef USE_FAKE_MM_TIMERS
 	bUseFakeTimers = PROFILE_GetWineIniBool("options", "MMFakeTimers", TRUE);
 	TRACE(mmtime, "FakeTimer=%c\n", bUseFakeTimers ? 'Y' : 'N');
@@ -153,7 +153,7 @@ static void StartMMTime()
 /**************************************************************************
  * 				timeGetSystemTime	[WINMM.140]
  */
-MMRESULT32 WINAPI timeGetSystemTime32(LPMMTIME32 lpTime, UINT32 wSize)
+MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize)
 {
     TRACE(mmsys, "(%p, %u);\n", lpTime, wSize);
     StartMMTime();
@@ -174,9 +174,9 @@ MMRESULT16 WINAPI timeGetSystemTime16(LPMMTIME16 lpTime, UINT16 wSize)
     return 0;
 }
 
-static	WORD	timeSetEventInternal(UINT32 wDelay,UINT32 wResol,
+static	WORD	timeSetEventInternal(UINT wDelay,UINT wResol,
 				     FARPROC16 lpFunc,DWORD dwUser,
-				     UINT32 wFlags, UINT16 isWin32)
+				     UINT wFlags, UINT16 isWin32)
 {
     WORD 		wNewID = 0;
     LPTIMERENTRY	lpNewTimer;
@@ -201,7 +201,7 @@ static	WORD	timeSetEventInternal(UINT32 wDelay,UINT32 wResol,
     lpNewTimer->wResol = wResol;
     lpNewTimer->lpFunc = lpFunc;
     lpNewTimer->isWin32 = isWin32;
-    lpNewTimer->hInstance = GetTaskDS();
+    lpNewTimer->hInstance = GetTaskDS16();
     TRACE(mmtime, "hInstance=%04X !\n", lpNewTimer->hInstance);
     TRACE(mmtime, "lpFunc=0x%08lx !\n", (DWORD)lpFunc );
     lpNewTimer->dwUser = dwUser;
@@ -212,9 +212,9 @@ static	WORD	timeSetEventInternal(UINT32 wDelay,UINT32 wResol,
 /**************************************************************************
  * 				timeSetEvent		[MMSYSTEM.602]
  */
-MMRESULT32 WINAPI timeSetEvent32(UINT32 wDelay,UINT32 wResol,
-				 LPTIMECALLBACK32 lpFunc,DWORD dwUser,
-				 UINT32 wFlags)
+MMRESULT WINAPI timeSetEvent(UINT wDelay,UINT wResol,
+				 LPTIMECALLBACK lpFunc,DWORD dwUser,
+				 UINT wFlags)
 {
     return timeSetEventInternal(wDelay, wResol, (FARPROC16)lpFunc, 
 				dwUser, wFlags, 1);
@@ -234,7 +234,7 @@ MMRESULT16 WINAPI timeSetEvent16(UINT16 wDelay, UINT16 wResol,
 /**************************************************************************
  * 				timeKillEvent		[WINMM.142]
  */
-MMRESULT32 WINAPI timeKillEvent32(UINT32 wID)
+MMRESULT WINAPI timeKillEvent(UINT wID)
 {
     LPTIMERENTRY*	lpTimer;
     
@@ -255,13 +255,13 @@ MMRESULT32 WINAPI timeKillEvent32(UINT32 wID)
  */
 MMRESULT16 WINAPI timeKillEvent16(UINT16 wID)
 {
-    return timeKillEvent32(wID);
+    return timeKillEvent(wID);
 }
 
 /**************************************************************************
  * 				timeGetDevCaps		[WINMM.139]
  */
-MMRESULT32 WINAPI timeGetDevCaps32(LPTIMECAPS32 lpCaps,UINT32 wSize)
+MMRESULT WINAPI timeGetDevCaps(LPTIMECAPS lpCaps,UINT wSize)
 {
     TRACE(mmtime, "(%p, %u) !\n", lpCaps, wSize);
     StartMMTime();
@@ -285,7 +285,7 @@ MMRESULT16 WINAPI timeGetDevCaps16(LPTIMECAPS16 lpCaps, UINT16 wSize)
 /**************************************************************************
  * 				timeBeginPeriod		[WINMM.137]
  */
-MMRESULT32 WINAPI timeBeginPeriod32(UINT32 wPeriod)
+MMRESULT WINAPI timeBeginPeriod(UINT wPeriod)
 {
     TRACE(mmtime, "(%u) !\n", wPeriod);
     StartMMTime();
@@ -308,7 +308,7 @@ MMRESULT16 WINAPI timeBeginPeriod16(UINT16 wPeriod)
 /**************************************************************************
  * 				timeEndPeriod		[WINMM.138]
  */
-MMRESULT32 WINAPI timeEndPeriod32(UINT32 wPeriod)
+MMRESULT WINAPI timeEndPeriod(UINT wPeriod)
 {
     TRACE(mmtime, "(%u) !\n", wPeriod);
     StartMMTime();
diff --git a/objects/bitmap.c b/objects/bitmap.c
index 9e09fccc6a1..05094eba679 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -25,9 +25,9 @@
  *
  * Return number of bytes to pad a scanline of 16-bit aligned Windows DDB data.
  */
-INT32 BITMAP_GetPadding( int bmWidth, int bpp )
+INT BITMAP_GetPadding( int bmWidth, int bpp )
 {
-    INT32 pad;
+    INT pad;
 
     switch (bpp) 
     {
@@ -67,7 +67,7 @@ INT32 BITMAP_GetPadding( int bmWidth, int bpp )
  * Return number of bytes taken by a scanline of 16-bit aligned Windows DDB
  * data.
  */
-INT32 BITMAP_GetWidthBytes( INT32 bmWidth, INT32 bpp )
+INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp )
 {
     switch(bpp)
     {
@@ -120,7 +120,7 @@ HBITMAP16 WINAPI CreateUserDiscardableBitmap16( WORD dummy,
 HBITMAP16 WINAPI CreateBitmap16( INT16 width, INT16 height, UINT16 planes,
                                  UINT16 bpp, LPCVOID bits )
 {
-    return CreateBitmap32( width, height, planes, bpp, bits );
+    return CreateBitmap( width, height, planes, bpp, bits );
 }
 
 
@@ -138,11 +138,11 @@ HBITMAP16 WINAPI CreateBitmap16( INT16 width, INT16 height, UINT16 planes,
  *    Success: Handle to bitmap
  *    Failure: 0
  */
-HBITMAP32 WINAPI CreateBitmap32( INT32 width, INT32 height, UINT32 planes,
-                                 UINT32 bpp, LPCVOID bits )
+HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes,
+                                 UINT bpp, LPCVOID bits )
 {
     BITMAPOBJ *bmp;
-    HBITMAP32 hbitmap;
+    HBITMAP hbitmap;
 
     planes = (BYTE)planes;
     bpp    = (BYTE)bpp;
@@ -180,7 +180,7 @@ HBITMAP32 WINAPI CreateBitmap32( INT32 width, INT32 height, UINT32 planes,
     bmp->dib = NULL;
 
     if (bits) /* Set bitmap bits */
-	SetBitmapBits32( hbitmap, height * bmp->bitmap.bmWidthBytes,
+	SetBitmapBits( hbitmap, height * bmp->bitmap.bmWidthBytes,
                          bits );
     GDI_HEAP_UNLOCK( hbitmap );
     return hbitmap;
@@ -192,7 +192,7 @@ HBITMAP32 WINAPI CreateBitmap32( INT32 width, INT32 height, UINT32 planes,
  */
 HBITMAP16 WINAPI CreateCompatibleBitmap16(HDC16 hdc, INT16 width, INT16 height)
 {
-    return CreateCompatibleBitmap32( hdc, width, height );
+    return CreateCompatibleBitmap( hdc, width, height );
 }
 
 
@@ -208,9 +208,9 @@ HBITMAP16 WINAPI CreateCompatibleBitmap16(HDC16 hdc, INT16 width, INT16 height)
  *    Success: Handle to bitmap
  *    Failure: 0
  */
-HBITMAP32 WINAPI CreateCompatibleBitmap32( HDC32 hdc, INT32 width, INT32 height)
+HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
 {
-    HBITMAP32 hbmpRet = 0;
+    HBITMAP hbmpRet = 0;
     DC *dc;
 
     TRACE(bitmap, "(%04x,%d,%d) = \n", hdc, width, height );
@@ -219,7 +219,7 @@ HBITMAP32 WINAPI CreateCompatibleBitmap32( HDC32 hdc, INT32 width, INT32 height)
 	FIXME(bitmap,"got bad width %d or height %d, please look for reason\n",
 	      width, height );
     } else {
-        hbmpRet = CreateBitmap32( width, height, 1, dc->w.bitsPerPixel, NULL );
+        hbmpRet = CreateBitmap( width, height, 1, dc->w.bitsPerPixel, NULL );
 	if(dc->funcs->pCreateBitmap)
 	    dc->funcs->pCreateBitmap( hbmpRet );
     }
@@ -246,10 +246,10 @@ HBITMAP16 WINAPI CreateBitmapIndirect16( const BITMAP16 * bmp )
  *    Success: Handle to bitmap
  *    Failure: NULL
  */
-HBITMAP32 WINAPI CreateBitmapIndirect32(
-    const BITMAP32 * bmp) /* [in] Pointer to the bitmap data */
+HBITMAP WINAPI CreateBitmapIndirect(
+    const BITMAP * bmp) /* [in] Pointer to the bitmap data */
 {
-    return CreateBitmap32( bmp->bmWidth, bmp->bmHeight, bmp->bmPlanes,
+    return CreateBitmap( bmp->bmWidth, bmp->bmHeight, bmp->bmPlanes,
                            bmp->bmBitsPixel, bmp->bmBits );
 }
 
@@ -259,7 +259,7 @@ HBITMAP32 WINAPI CreateBitmapIndirect32(
  */
 LONG WINAPI GetBitmapBits16( HBITMAP16 hbitmap, LONG count, LPVOID buffer )
 {
-    return GetBitmapBits32( hbitmap, count, buffer );
+    return GetBitmapBits( hbitmap, count, buffer );
 }
 
 
@@ -270,8 +270,8 @@ LONG WINAPI GetBitmapBits16( HBITMAP16 hbitmap, LONG count, LPVOID buffer )
  *    Success: Number of bytes copied
  *    Failure: 0
  */
-LONG WINAPI GetBitmapBits32(
-    HBITMAP32 hbitmap, /* [in]  Handle to bitmap */
+LONG WINAPI GetBitmapBits(
+    HBITMAP hbitmap, /* [in]  Handle to bitmap */
     LONG count,        /* [in]  Number of bytes to copy */
     LPVOID bits)       /* [out] Pointer to buffer to receive bits */
 {
@@ -334,7 +334,7 @@ LONG WINAPI GetBitmapBits32(
  */
 LONG WINAPI SetBitmapBits16( HBITMAP16 hbitmap, LONG count, LPCVOID buffer )
 {
-    return SetBitmapBits32( hbitmap, count, buffer );
+    return SetBitmapBits( hbitmap, count, buffer );
 }
 
 
@@ -345,8 +345,8 @@ LONG WINAPI SetBitmapBits16( HBITMAP16 hbitmap, LONG count, LPCVOID buffer )
  *    Success: Number of bytes used in setting the bitmap bits
  *    Failure: 0
  */
-LONG WINAPI SetBitmapBits32(
-    HBITMAP32 hbitmap, /* [in] Handle to bitmap */
+LONG WINAPI SetBitmapBits(
+    HBITMAP hbitmap, /* [in] Handle to bitmap */
     LONG count,        /* [in] Number of bytes in bitmap array */
     LPCVOID bits)      /* [in] Address of array with bitmap bits */
 {
@@ -429,15 +429,15 @@ HANDLE16 WINAPI LoadImage16( HINSTANCE16 hinst, LPCSTR name, UINT16 type,
  * FIXME: implementation lacks some features, see LR_ defines in windows.h
  */
 
-HANDLE32 WINAPI LoadImage32A( HINSTANCE32 hinst, LPCSTR name, UINT32 type,
-                              INT32 desiredx, INT32 desiredy, UINT32 loadflags)
+HANDLE WINAPI LoadImageA( HINSTANCE hinst, LPCSTR name, UINT type,
+                              INT desiredx, INT desiredy, UINT loadflags)
 {
-    HANDLE32 res;
+    HANDLE res;
     LPWSTR u_name;
 
     if (HIWORD(name)) u_name = HEAP_strdupAtoW(GetProcessHeap(), 0, name);
     else u_name=(LPWSTR)name;
-    res = LoadImage32W(hinst, u_name, type, desiredx, desiredy, loadflags);
+    res = LoadImageW(hinst, u_name, type, desiredx, desiredy, loadflags);
     if (HIWORD(name)) HeapFree(GetProcessHeap(), 0, u_name);
     return res;
 }
@@ -460,8 +460,8 @@ HANDLE32 WINAPI LoadImage32A( HINSTANCE32 hinst, LPCSTR name, UINT32 type,
  *
  * FIXME: Implementation lacks some features, see LR_ defines in windows.h
  */
-HANDLE32 WINAPI LoadImage32W( HINSTANCE32 hinst, LPCWSTR name, UINT32 type,
-                INT32 desiredx, INT32 desiredy, UINT32 loadflags )
+HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type,
+                INT desiredx, INT desiredy, UINT loadflags )
 {
     if (HIWORD(name)) {
         TRACE(resource,"(0x%04x,%p,%d,%d,%d,0x%08x)\n",
@@ -482,20 +482,20 @@ HANDLE32 WINAPI LoadImage32W( HINSTANCE32 hinst, LPCWSTR name, UINT32 type,
     if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED;
     switch (type) {
     case IMAGE_BITMAP:
-        return BITMAP_LoadBitmap32W(hinst, name, loadflags);
+        return BITMAP_LoadBitmapW(hinst, name, loadflags);
 
     case IMAGE_ICON:
         {
-	HDC32 hdc = GetDC32(0);
-	UINT32 palEnts = GetSystemPaletteEntries32(hdc, 0, 0, NULL);
-	ReleaseDC32(0, hdc);
+	HDC hdc = GetDC(0);
+	UINT palEnts = GetSystemPaletteEntries(hdc, 0, 0, NULL);
+	ReleaseDC(0, hdc);
 
-	return CURSORICON_Load32(hinst, name, desiredx, desiredy,
+	return CURSORICON_Load(hinst, name, desiredx, desiredy,
 				 MIN(16, palEnts), FALSE, loadflags);
 	}
 
     case IMAGE_CURSOR:
-        return CURSORICON_Load32(hinst, name, desiredx, desiredy,
+        return CURSORICON_Load(hinst, name, desiredx, desiredy,
 				 1, TRUE, loadflags);
     }
     return 0;
@@ -506,23 +506,23 @@ HANDLE32 WINAPI LoadImage32W( HINSTANCE32 hinst, LPCWSTR name, UINT32 type,
  *		BITMAP_CopyBitmap
  *
  */
-HBITMAP32 BITMAP_CopyBitmap(HBITMAP32 hbitmap)
+HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap)
 {
     BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
-    HBITMAP32 res = 0;
-    BITMAP32 bm;
+    HBITMAP res = 0;
+    BITMAP bm;
 
     if(!bmp) return 0;
 
     bm = bmp->bitmap;
     bm.bmBits = NULL;
-    res = CreateBitmapIndirect32(&bm);
+    res = CreateBitmapIndirect(&bm);
 
     if(res) {
         char *buf = HeapAlloc( GetProcessHeap(), 0, bm.bmWidthBytes *
 			       bm.bmHeight );
-        GetBitmapBits32 (hbitmap, bm.bmWidthBytes * bm.bmHeight, buf);
-	SetBitmapBits32 (res, bm.bmWidthBytes * bm.bmHeight, buf);
+        GetBitmapBits (hbitmap, bm.bmWidthBytes * bm.bmHeight, buf);
+	SetBitmapBits (res, bm.bmWidthBytes * bm.bmHeight, buf);
 	HeapFree( GetProcessHeap(), 0, buf );
     }
 
@@ -537,8 +537,8 @@ HBITMAP32 BITMAP_CopyBitmap(HBITMAP32 hbitmap)
 HICON16 WINAPI CopyImage16( HANDLE16 hnd, UINT16 type, INT16 desiredx,
                              INT16 desiredy, UINT16 flags )
 {
-    return (HICON16)CopyImage32((HANDLE32)hnd, (UINT32)type, (INT32)desiredx,
-                                (INT32)desiredy, (UINT32)flags);
+    return (HICON16)CopyImage((HANDLE)hnd, (UINT)type, (INT)desiredx,
+                                (INT)desiredy, (UINT)flags);
 }
 
 /******************************************************************************
@@ -558,17 +558,17 @@ HICON16 WINAPI CopyImage16( HANDLE16 hnd, UINT16 type, INT16 desiredx,
  * FIXME: implementation still lacks nearly all features, see LR_*
  * defines in windows.h
  */
-HICON32 WINAPI CopyImage32( HANDLE32 hnd, UINT32 type, INT32 desiredx,
-                             INT32 desiredy, UINT32 flags )
+HICON WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
+                             INT desiredy, UINT flags )
 {
     switch (type)
     {
 	case IMAGE_BITMAP:
 		return BITMAP_CopyBitmap(hnd);
 	case IMAGE_ICON:
-		return CopyIcon32(hnd);
+		return CopyIcon(hnd);
 	case IMAGE_CURSOR:
-		return CopyCursor32(hnd);
+		return CopyCursor(hnd);
     }
     return 0;
 }
@@ -581,8 +581,8 @@ HICON32 WINAPI CopyImage32( HANDLE32 hnd, UINT32 type, INT32 desiredx,
  */
 HBITMAP16 WINAPI LoadBitmap16( HINSTANCE16 instance, SEGPTR name )
 {
-    HBITMAP32 hbitmap = 0;
-    HDC32 hdc;
+    HBITMAP hbitmap = 0;
+    HDC hdc;
     HRSRC16 hRsrc;
     HGLOBAL16 handle;
     BITMAPINFO *info;
@@ -599,17 +599,17 @@ HBITMAP16 WINAPI LoadBitmap16( HINSTANCE16 instance, SEGPTR name )
 
     if (!instance)  /* OEM bitmap */
     {
-        HDC32 hdc;
+        HDC hdc;
 	DC *dc;
 
         if (HIWORD((int)name)) return 0;
-	hdc = CreateDC32A( "DISPLAY", NULL, NULL, NULL );
+	hdc = CreateDCA( "DISPLAY", NULL, NULL, NULL );
 	dc = DC_GetDCPtr( hdc );
 	if(dc->funcs->pLoadOEMResource)
 	  hbitmap = dc->funcs->pLoadOEMResource( LOWORD((int)name),
 						 OEM_BITMAP );
 	GDI_HEAP_UNLOCK( hdc );
-	DeleteDC32( hdc );
+	DeleteDC( hdc );
 	return hbitmap;
     }
 
@@ -617,12 +617,12 @@ HBITMAP16 WINAPI LoadBitmap16( HINSTANCE16 instance, SEGPTR name )
     if (!(handle = LoadResource16( instance, hRsrc ))) return 0;
 
     info = (BITMAPINFO *)LockResource16( handle );
-    if ((hdc = GetDC32(0)) != 0)
+    if ((hdc = GetDC(0)) != 0)
     {
         char *bits = (char *)info + DIB_BitmapInfoSize( info, DIB_RGB_COLORS );
-        hbitmap = CreateDIBitmap32( hdc, &info->bmiHeader, CBM_INIT,
+        hbitmap = CreateDIBitmap( hdc, &info->bmiHeader, CBM_INIT,
                                     bits, info, DIB_RGB_COLORS );
-        ReleaseDC32( 0, hdc );
+        ReleaseDC( 0, hdc );
     }
     FreeResource16( handle );
     return hbitmap;
@@ -632,39 +632,39 @@ HBITMAP16 WINAPI LoadBitmap16( HINSTANCE16 instance, SEGPTR name )
 /**********************************************************************
  *       BITMAP_LoadBitmap32W
  */
-HBITMAP32 BITMAP_LoadBitmap32W(HINSTANCE32 instance,LPCWSTR name, 
-			       UINT32 loadflags)
+HBITMAP BITMAP_LoadBitmapW(HINSTANCE instance,LPCWSTR name, 
+			       UINT loadflags)
 {
-    HBITMAP32 hbitmap = 0;
-    HDC32 hdc;
-    HRSRC32 hRsrc;
-    HGLOBAL32 handle;
+    HBITMAP hbitmap = 0;
+    HDC hdc;
+    HRSRC hRsrc;
+    HGLOBAL handle;
     char *ptr = NULL;
     BITMAPINFO *info, *fix_info=NULL;
-    HGLOBAL32 hFix;
+    HGLOBAL hFix;
     int size;
 
     if (!(loadflags & LR_LOADFROMFILE)) {
       if (!instance)  /* OEM bitmap */
       {
-          HDC32 hdc;
+          HDC hdc;
 	  DC *dc;
 
 	  if (HIWORD((int)name)) return 0;
-	  hdc = CreateDC32A( "DISPLAY", NULL, NULL, NULL );
+	  hdc = CreateDCA( "DISPLAY", NULL, NULL, NULL );
 	  dc = DC_GetDCPtr( hdc );
 	  if(dc->funcs->pLoadOEMResource)
 	      hbitmap = dc->funcs->pLoadOEMResource( LOWORD((int)name), 
 						     OEM_BITMAP );
 	  GDI_HEAP_UNLOCK( hdc );
-	  DeleteDC32( hdc );
+	  DeleteDC( hdc );
 	  return hbitmap;
       }
 
-      if (!(hRsrc = FindResource32W( instance, name, RT_BITMAP32W ))) return 0;
-      if (!(handle = LoadResource32( instance, hRsrc ))) return 0;
+      if (!(hRsrc = FindResourceW( instance, name, RT_BITMAPW ))) return 0;
+      if (!(handle = LoadResource( instance, hRsrc ))) return 0;
 
-      if ((info = (BITMAPINFO *)LockResource32( handle )) == NULL) return 0;
+      if ((info = (BITMAPINFO *)LockResource( handle )) == NULL) return 0;
     }
     else
     {
@@ -672,25 +672,25 @@ HBITMAP32 BITMAP_LoadBitmap32W(HINSTANCE32 instance,LPCWSTR name,
         info = (BITMAPINFO *)(ptr + sizeof(BITMAPFILEHEADER));
     }
     size = DIB_BitmapInfoSize(info, DIB_RGB_COLORS);
-    if ((hFix = GlobalAlloc32(0, size))) fix_info=GlobalLock32(hFix);
+    if ((hFix = GlobalAlloc(0, size))) fix_info=GlobalLock(hFix);
     if (fix_info) {
       BYTE pix;
 
       memcpy(fix_info, info, size);
       pix = *((LPBYTE)info+DIB_BitmapInfoSize(info, DIB_RGB_COLORS));
       DIB_FixColorsToLoadflags(fix_info, loadflags, pix);
-      if ((hdc = GetDC32(0)) != 0) {
+      if ((hdc = GetDC(0)) != 0) {
 	if (loadflags & LR_CREATEDIBSECTION)
-	  hbitmap = CreateDIBSection32(hdc, fix_info, DIB_RGB_COLORS, NULL, 0, 0);
+	  hbitmap = CreateDIBSection(hdc, fix_info, DIB_RGB_COLORS, NULL, 0, 0);
         else {
           char *bits = (char *)info + size;;
-          hbitmap = CreateDIBitmap32( hdc, &fix_info->bmiHeader, CBM_INIT,
+          hbitmap = CreateDIBitmap( hdc, &fix_info->bmiHeader, CBM_INIT,
                                       bits, fix_info, DIB_RGB_COLORS );
 	}
-        ReleaseDC32( 0, hdc );
+        ReleaseDC( 0, hdc );
       }
-      GlobalUnlock32(hFix);
-      GlobalFree32(hFix);
+      GlobalUnlock(hFix);
+      GlobalFree(hFix);
     }
     if (loadflags & LR_LOADFROMFILE) UnmapViewOfFile( ptr );
     return hbitmap;
@@ -704,25 +704,25 @@ HBITMAP32 BITMAP_LoadBitmap32W(HINSTANCE32 instance,LPCWSTR name,
  *    Success: Handle to specified bitmap
  *    Failure: NULL
  */
-HBITMAP32 WINAPI LoadBitmap32W(
-    HINSTANCE32 instance, /* [in] Handle to application instance */
+HBITMAP WINAPI LoadBitmapW(
+    HINSTANCE instance, /* [in] Handle to application instance */
     LPCWSTR name)         /* [in] Address of bitmap resource name */
 {
-    return BITMAP_LoadBitmap32W(instance, name, 0);
+    return BITMAP_LoadBitmapW(instance, name, 0);
 }
 
 
 /**********************************************************************
  *	    LoadBitmap32A   (USER32.357)
  */
-HBITMAP32 WINAPI LoadBitmap32A( HINSTANCE32 instance, LPCSTR name )
+HBITMAP WINAPI LoadBitmapA( HINSTANCE instance, LPCSTR name )
 {
-    HBITMAP32 res;
-    if (!HIWORD(name)) res = LoadBitmap32W( instance, (LPWSTR)name );
+    HBITMAP res;
+    if (!HIWORD(name)) res = LoadBitmapW( instance, (LPWSTR)name );
     else
     {
         LPWSTR uni = HEAP_strdupAtoW( GetProcessHeap(), 0, name );
-        res = LoadBitmap32W( instance, uni );
+        res = LoadBitmapW( instance, uni );
         HeapFree( GetProcessHeap(), 0, uni );
     }
     return res;
@@ -732,7 +732,7 @@ HBITMAP32 WINAPI LoadBitmap32A( HINSTANCE32 instance, LPCSTR name )
 /***********************************************************************
  *           BITMAP_DeleteObject
  */
-BOOL32 BITMAP_DeleteObject( HBITMAP16 hbitmap, BITMAPOBJ * bmp )
+BOOL BITMAP_DeleteObject( HBITMAP16 hbitmap, BITMAPOBJ * bmp )
 {
     if( bmp->DDBitmap ) {
         if( bmp->DDBitmap->funcs->pDeleteObject )
@@ -757,7 +757,7 @@ INT16 BITMAP_GetObject16( BITMAPOBJ * bmp, INT16 count, LPVOID buffer )
     {
         if ( count <= sizeof(BITMAP16) )
         {
-            BITMAP32 *bmp32 = &bmp->dib->dibSection.dsBm;
+            BITMAP *bmp32 = &bmp->dib->dibSection.dsBm;
 	    BITMAP16 bmp16;
 	    bmp16.bmType       = bmp32->bmType;
 	    bmp16.bmWidth      = bmp32->bmWidth;
@@ -795,13 +795,13 @@ INT16 BITMAP_GetObject16( BITMAPOBJ * bmp, INT16 count, LPVOID buffer )
 /***********************************************************************
  *           BITMAP_GetObject32
  */
-INT32 BITMAP_GetObject32( BITMAPOBJ * bmp, INT32 count, LPVOID buffer )
+INT BITMAP_GetObject( BITMAPOBJ * bmp, INT count, LPVOID buffer )
 {
     if (bmp->dib)
     {
 	if (count < sizeof(DIBSECTION))
 	{
-	    if (count > sizeof(BITMAP32)) count = sizeof(BITMAP32);
+	    if (count > sizeof(BITMAP)) count = sizeof(BITMAP);
 	}
 	else
 	{
@@ -813,7 +813,7 @@ INT32 BITMAP_GetObject32( BITMAPOBJ * bmp, INT32 count, LPVOID buffer )
     }
     else
     {
-	if (count > sizeof(BITMAP32)) count = sizeof(BITMAP32);
+	if (count > sizeof(BITMAP)) count = sizeof(BITMAP);
 	memcpy( buffer, &bmp->bitmap, count );
 	return count;
     }
@@ -837,12 +837,12 @@ HBITMAP16 WINAPI CreateDiscardableBitmap16( HDC16 hdc, INT16 width,
  *    Success: Handle to bitmap
  *    Failure: NULL
  */
-HBITMAP32 WINAPI CreateDiscardableBitmap32(
-    HDC32 hdc,    /* [in] Handle to device context */
-    INT32 width,  /* [in] Bitmap width */
-    INT32 height) /* [in] Bitmap height */
+HBITMAP WINAPI CreateDiscardableBitmap(
+    HDC hdc,    /* [in] Handle to device context */
+    INT width,  /* [in] Bitmap width */
+    INT height) /* [in] Bitmap height */
 {
-    return CreateCompatibleBitmap32( hdc, width, height );
+    return CreateCompatibleBitmap( hdc, width, height );
 }
 
 
@@ -869,9 +869,9 @@ BOOL16 WINAPI GetBitmapDimensionEx16( HBITMAP16 hbitmap, LPSIZE16 size )
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI GetBitmapDimensionEx32(
-    HBITMAP32 hbitmap, /* [in]  Handle to bitmap */
-    LPSIZE32 size)     /* [out] Address of struct receiving dimensions */
+BOOL WINAPI GetBitmapDimensionEx(
+    HBITMAP hbitmap, /* [in]  Handle to bitmap */
+    LPSIZE size)     /* [out] Address of struct receiving dimensions */
 {
     BITMAPOBJ * bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
     if (!bmp) return FALSE;
@@ -884,7 +884,7 @@ BOOL32 WINAPI GetBitmapDimensionEx32(
 /***********************************************************************
  *           GetBitmapDimension    (GDI.162)
  */
-DWORD WINAPI GetBitmapDimension( HBITMAP16 hbitmap )
+DWORD WINAPI GetBitmapDimension16( HBITMAP16 hbitmap )
 {
     SIZE16 size;
     if (!GetBitmapDimensionEx16( hbitmap, &size )) return 0;
@@ -915,11 +915,11 @@ BOOL16 WINAPI SetBitmapDimensionEx16( HBITMAP16 hbitmap, INT16 x, INT16 y,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetBitmapDimensionEx32(
-    HBITMAP32 hbitmap, /* [in]  Handle to bitmap */
-    INT32 x,           /* [in]  Bitmap width */
-    INT32 y,           /* [in]  Bitmap height */
-    LPSIZE32 prevSize) /* [out] Address of structure for orig dims */
+BOOL WINAPI SetBitmapDimensionEx(
+    HBITMAP hbitmap, /* [in]  Handle to bitmap */
+    INT x,           /* [in]  Bitmap width */
+    INT y,           /* [in]  Bitmap height */
+    LPSIZE prevSize) /* [out] Address of structure for orig dims */
 {
     BITMAPOBJ * bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
     if (!bmp) return FALSE;
@@ -934,7 +934,7 @@ BOOL32 WINAPI SetBitmapDimensionEx32(
 /***********************************************************************
  *           SetBitmapDimension    (GDI.163)
  */
-DWORD WINAPI SetBitmapDimension( HBITMAP16 hbitmap, INT16 x, INT16 y )
+DWORD WINAPI SetBitmapDimension16( HBITMAP16 hbitmap, INT16 x, INT16 y )
 {
     SIZE16 size;
     if (!SetBitmapDimensionEx16( hbitmap, x, y, &size )) return 0;
diff --git a/objects/brush.c b/objects/brush.c
index f460f2b9bef..cb2fa909855 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -32,10 +32,10 @@ HBRUSH16 WINAPI CreateBrushIndirect16( const LOGBRUSH16 * brush )
 /***********************************************************************
  *           CreateBrushIndirect32    (GDI32.27)
  */
-HBRUSH32 WINAPI CreateBrushIndirect32( const LOGBRUSH32 * brush )
+HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush )
 {
     BRUSHOBJ * brushPtr;
-    HBRUSH32 hbrush = GDI_AllocObject( sizeof(BRUSHOBJ), BRUSH_MAGIC );
+    HBRUSH hbrush = GDI_AllocObject( sizeof(BRUSHOBJ), BRUSH_MAGIC );
     if (!hbrush) return 0;
     brushPtr = (BRUSHOBJ *) GDI_HEAP_LOCK( hbrush );
     brushPtr->logbrush.lbStyle = brush->lbStyle;
@@ -52,22 +52,22 @@ HBRUSH32 WINAPI CreateBrushIndirect32( const LOGBRUSH32 * brush )
  */
 HBRUSH16 WINAPI CreateHatchBrush16( INT16 style, COLORREF color )
 {
-    LOGBRUSH32 logbrush = { BS_HATCHED, color, style };
+    LOGBRUSH logbrush = { BS_HATCHED, color, style };
     TRACE(gdi, "%d %06lx\n", style, color );
     if ((style < 0) || (style >= NB_HATCH_STYLES)) return 0;
-    return CreateBrushIndirect32( &logbrush );
+    return CreateBrushIndirect( &logbrush );
 }
 
 
 /***********************************************************************
  *           CreateHatchBrush32    (GDI32.48)
  */
-HBRUSH32 WINAPI CreateHatchBrush32( INT32 style, COLORREF color )
+HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color )
 {
-    LOGBRUSH32 logbrush = { BS_HATCHED, color, style };
+    LOGBRUSH logbrush = { BS_HATCHED, color, style };
     TRACE(gdi, "%d %06lx\n", style, color );
     if ((style < 0) || (style >= NB_HATCH_STYLES)) return 0;
-    return CreateBrushIndirect32( &logbrush );
+    return CreateBrushIndirect( &logbrush );
 }
 
 
@@ -76,23 +76,23 @@ HBRUSH32 WINAPI CreateHatchBrush32( INT32 style, COLORREF color )
  */
 HBRUSH16 WINAPI CreatePatternBrush16( HBITMAP16 hbitmap )
 {
-    return (HBRUSH16)CreatePatternBrush32( hbitmap );
+    return (HBRUSH16)CreatePatternBrush( hbitmap );
 }
 
 
 /***********************************************************************
  *           CreatePatternBrush32    (GDI32.54)
  */
-HBRUSH32 WINAPI CreatePatternBrush32( HBITMAP32 hbitmap )
+HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap )
 {
-    LOGBRUSH32 logbrush = { BS_PATTERN, 0, 0 };
+    LOGBRUSH logbrush = { BS_PATTERN, 0, 0 };
     TRACE(gdi, "%04x\n", hbitmap );
 
-    logbrush.lbHatch = (INT32)BITMAP_CopyBitmap( hbitmap );
+    logbrush.lbHatch = (INT)BITMAP_CopyBitmap( hbitmap );
     if(!logbrush.lbHatch)
         return 0;
     else
-        return CreateBrushIndirect32( &logbrush );
+        return CreateBrushIndirect( &logbrush );
 }
 
 
@@ -101,9 +101,9 @@ HBRUSH32 WINAPI CreatePatternBrush32( HBITMAP32 hbitmap )
  */
 HBRUSH16 WINAPI CreateDIBPatternBrush16( HGLOBAL16 hbitmap, UINT16 coloruse )
 {
-    LOGBRUSH32 logbrush = { BS_DIBPATTERN, coloruse, 0 };
+    LOGBRUSH logbrush = { BS_DIBPATTERN, coloruse, 0 };
     BITMAPINFO *info, *newInfo;
-    INT32 size;
+    INT size;
     
     TRACE(gdi, "%04x\n", hbitmap );
 
@@ -128,7 +128,7 @@ HBRUSH16 WINAPI CreateDIBPatternBrush16( HGLOBAL16 hbitmap, UINT16 coloruse )
     memcpy( newInfo, info, size );
     GlobalUnlock16( (HGLOBAL16)logbrush.lbHatch );
     GlobalUnlock16( hbitmap );
-    return CreateBrushIndirect32( &logbrush );
+    return CreateBrushIndirect( &logbrush );
 }
 
 
@@ -146,20 +146,20 @@ HBRUSH16 WINAPI CreateDIBPatternBrush16( HGLOBAL16 hbitmap, UINT16 coloruse )
  * BUGS
  *	
  */
-HBRUSH32 WINAPI CreateDIBPatternBrush32( 
-		HGLOBAL32 hbitmap, 		/* Global object containg BITMAPINFO structure */
-		UINT32 coloruse 		/* Specifies color format, if provided */
+HBRUSH WINAPI CreateDIBPatternBrush( 
+		HGLOBAL hbitmap, 		/* Global object containg BITMAPINFO structure */
+		UINT coloruse 		/* Specifies color format, if provided */
 )
 {
-    LOGBRUSH32 logbrush = { BS_DIBPATTERN, coloruse, 0 };
+    LOGBRUSH logbrush = { BS_DIBPATTERN, coloruse, 0 };
     BITMAPINFO *info, *newInfo;
-    INT32 size;
+    INT size;
     
     TRACE(gdi, "%04x\n", hbitmap );
 
       /* Make a copy of the bitmap */
 
-    if (!(info = (BITMAPINFO *)GlobalLock32( hbitmap ))) return 0;
+    if (!(info = (BITMAPINFO *)GlobalLock( hbitmap ))) return 0;
 
     if (info->bmiHeader.biCompression)
         size = info->bmiHeader.biSizeImage;
@@ -169,7 +169,7 @@ HBRUSH32 WINAPI CreateDIBPatternBrush32(
 	       info->bmiHeader.biHeight;
     size += DIB_BitmapInfoSize( info, coloruse );
 
-    if (!(logbrush.lbHatch = (INT32)GlobalAlloc16( GMEM_MOVEABLE, size )))
+    if (!(logbrush.lbHatch = (INT)GlobalAlloc16( GMEM_MOVEABLE, size )))
     {
 	GlobalUnlock16( hbitmap );
 	return 0;
@@ -177,8 +177,8 @@ HBRUSH32 WINAPI CreateDIBPatternBrush32(
     newInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)logbrush.lbHatch );
     memcpy( newInfo, info, size );
     GlobalUnlock16( (HGLOBAL16)logbrush.lbHatch );
-    GlobalUnlock32( hbitmap );
-    return CreateBrushIndirect32( &logbrush );
+    GlobalUnlock( hbitmap );
+    return CreateBrushIndirect( &logbrush );
 }
 
 
@@ -194,15 +194,15 @@ HBRUSH32 WINAPI CreateDIBPatternBrush32(
  * BUGS
  *	
  */
-HBRUSH32 WINAPI CreateDIBPatternBrushPt(
+HBRUSH WINAPI CreateDIBPatternBrushPt(
 		const void* data,		/* Pointer to a BITMAPINFO structure followed by more data */ 
-		UINT32 coloruse 		/* Specifies color format, if provided */
+		UINT coloruse 		/* Specifies color format, if provided */
 )
 {
     BITMAPINFO *info=(BITMAPINFO*)data;
-    LOGBRUSH32 logbrush = { BS_DIBPATTERN, coloruse, 0 };
+    LOGBRUSH logbrush = { BS_DIBPATTERN, coloruse, 0 };
     BITMAPINFO  *newInfo;
-    INT32 size;
+    INT size;
     
     TRACE(gdi, "%p\n", info );
 
@@ -217,14 +217,14 @@ HBRUSH32 WINAPI CreateDIBPatternBrushPt(
 	       info->bmiHeader.biHeight;
     size += DIB_BitmapInfoSize( info, coloruse );
 
-    if (!(logbrush.lbHatch = (INT32)GlobalAlloc16( GMEM_MOVEABLE, size )))
+    if (!(logbrush.lbHatch = (INT)GlobalAlloc16( GMEM_MOVEABLE, size )))
     {
 	return 0;
     }
     newInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)logbrush.lbHatch );
     memcpy( newInfo, info, size );
     GlobalUnlock16( (HGLOBAL16)logbrush.lbHatch );
-    return CreateBrushIndirect32( &logbrush );
+    return CreateBrushIndirect( &logbrush );
 }
 
 
@@ -233,27 +233,27 @@ HBRUSH32 WINAPI CreateDIBPatternBrushPt(
  */
 HBRUSH16 WINAPI CreateSolidBrush16( COLORREF color )
 {
-    LOGBRUSH32 logbrush = { BS_SOLID, color, 0 };
+    LOGBRUSH logbrush = { BS_SOLID, color, 0 };
     TRACE(gdi, "%06lx\n", color );
-    return CreateBrushIndirect32( &logbrush );
+    return CreateBrushIndirect( &logbrush );
 }
 
 
 /***********************************************************************
  *           CreateSolidBrush32    (GDI32.64)
  */
-HBRUSH32 WINAPI CreateSolidBrush32( COLORREF color )
+HBRUSH WINAPI CreateSolidBrush( COLORREF color )
 {
-    LOGBRUSH32 logbrush = { BS_SOLID, color, 0 };
+    LOGBRUSH logbrush = { BS_SOLID, color, 0 };
     TRACE(gdi, "%06lx\n", color );
-    return CreateBrushIndirect32( &logbrush );
+    return CreateBrushIndirect( &logbrush );
 }
 
 
 /***********************************************************************
  *           SetBrushOrg    (GDI.148)
  */
-DWORD WINAPI SetBrushOrg( HDC16 hdc, INT16 x, INT16 y )
+DWORD WINAPI SetBrushOrg16( HDC16 hdc, INT16 x, INT16 y )
 {
     DWORD retval;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
@@ -268,7 +268,7 @@ DWORD WINAPI SetBrushOrg( HDC16 hdc, INT16 x, INT16 y )
 /***********************************************************************
  *           SetBrushOrgEx    (GDI32.308)
  */
-BOOL32 WINAPI SetBrushOrgEx( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 oldorg )
+BOOL WINAPI SetBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
 
@@ -287,7 +287,7 @@ BOOL32 WINAPI SetBrushOrgEx( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 oldorg )
  *           FixBrushOrgEx    (GDI32.102)
  * SDK says discontinued, but in Win95 GDI32 this is the same as SetBrushOrgEx
  */
-BOOL32 WINAPI FixBrushOrgEx( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 oldorg )
+BOOL WINAPI FixBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg )
 {
     return SetBrushOrgEx(hdc,x,y,oldorg);
 }
@@ -296,12 +296,12 @@ BOOL32 WINAPI FixBrushOrgEx( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 oldorg )
 /***********************************************************************
  *           BRUSH_DeleteObject
  */
-BOOL32 BRUSH_DeleteObject( HBRUSH16 hbrush, BRUSHOBJ * brush )
+BOOL BRUSH_DeleteObject( HBRUSH16 hbrush, BRUSHOBJ * brush )
 {
     switch(brush->logbrush.lbStyle)
     {
       case BS_PATTERN:
-	  DeleteObject32( (HGDIOBJ32)brush->logbrush.lbHatch );
+	  DeleteObject( (HGDIOBJ)brush->logbrush.lbHatch );
 	  break;
       case BS_DIBPATTERN:
 	  GlobalFree16( (HGLOBAL16)brush->logbrush.lbHatch );
@@ -330,7 +330,7 @@ INT16 BRUSH_GetObject16( BRUSHOBJ * brush, INT16 count, LPSTR buffer )
 /***********************************************************************
  *           BRUSH_GetObject32
  */
-INT32 BRUSH_GetObject32( BRUSHOBJ * brush, INT32 count, LPSTR buffer )
+INT BRUSH_GetObject( BRUSHOBJ * brush, INT count, LPSTR buffer )
 {
     if (count > sizeof(brush->logbrush)) count = sizeof(brush->logbrush);
     memcpy( buffer, &brush->logbrush, count );
diff --git a/objects/clipping.c b/objects/clipping.c
index ddac1d58c38..99316cfdeb1 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -25,7 +25,7 @@
  */
 void CLIPPING_UpdateGCRegion( DC * dc )
 {
-    if (!dc->w.hGCClipRgn) dc->w.hGCClipRgn = CreateRectRgn32( 0, 0, 0, 0 );
+    if (!dc->w.hGCClipRgn) dc->w.hGCClipRgn = CreateRectRgn( 0, 0, 0, 0 );
 
     if (!dc->w.hVisRgn)
     {
@@ -40,9 +40,9 @@ void CLIPPING_UpdateGCRegion( DC * dc )
     }
 
     if (!dc->w.hClipRgn)
-        CombineRgn32( dc->w.hGCClipRgn, dc->w.hVisRgn, 0, RGN_COPY );
+        CombineRgn( dc->w.hGCClipRgn, dc->w.hVisRgn, 0, RGN_COPY );
     else
-        CombineRgn32(dc->w.hGCClipRgn, dc->w.hClipRgn, dc->w.hVisRgn, RGN_AND);
+        CombineRgn(dc->w.hGCClipRgn, dc->w.hClipRgn, dc->w.hVisRgn, RGN_AND);
     if (dc->funcs->pSetDeviceClipping) dc->funcs->pSetDeviceClipping( dc );
 }
 
@@ -52,14 +52,14 @@ void CLIPPING_UpdateGCRegion( DC * dc )
  */
 INT16 WINAPI SelectClipRgn16( HDC16 hdc, HRGN16 hrgn )
 {
-    return (INT16)SelectClipRgn32( hdc, hrgn );
+    return (INT16)SelectClipRgn( hdc, hrgn );
 }
 
 
 /***********************************************************************
  *           SelectClipRgn32    (GDI32.297)
  */
-INT32 WINAPI SelectClipRgn32( HDC32 hdc, HRGN32 hrgn )
+INT WINAPI SelectClipRgn( HDC hdc, HRGN hrgn )
 {
     return ExtSelectClipRgn( hdc, hrgn, RGN_COPY );
 }
@@ -67,9 +67,9 @@ INT32 WINAPI SelectClipRgn32( HDC32 hdc, HRGN32 hrgn )
 /******************************************************************************
  *		ExtSelectClipRgn	[GDI32.97]
  */
-INT32 WINAPI ExtSelectClipRgn( HDC32 hdc, HRGN32 hrgn, INT32 fnMode )
+INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
 {
-    INT32 retval;
+    INT retval;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return ERROR;
 
@@ -93,17 +93,17 @@ INT32 WINAPI ExtSelectClipRgn( HDC32 hdc, HRGN32 hrgn, INT32 fnMode )
     {
         if (!dc->w.hClipRgn)
         {
-            RECT32 rect;
-            GetRgnBox32( dc->w.hVisRgn, &rect );
-            dc->w.hClipRgn = CreateRectRgnIndirect32( &rect );
+            RECT rect;
+            GetRgnBox( dc->w.hVisRgn, &rect );
+            dc->w.hClipRgn = CreateRectRgnIndirect( &rect );
         }
 
-        OffsetRgn32( dc->w.hClipRgn, -dc->w.DCOrgX, -dc->w.DCOrgY );
+        OffsetRgn( dc->w.hClipRgn, -dc->w.DCOrgX, -dc->w.DCOrgY );
         if(fnMode == RGN_COPY)
-            retval = CombineRgn32( dc->w.hClipRgn, hrgn, 0, fnMode );
+            retval = CombineRgn( dc->w.hClipRgn, hrgn, 0, fnMode );
         else
-            retval = CombineRgn32( dc->w.hClipRgn, dc->w.hClipRgn, hrgn, fnMode);
-        OffsetRgn32( dc->w.hClipRgn, dc->w.DCOrgX, dc->w.DCOrgY );
+            retval = CombineRgn( dc->w.hClipRgn, dc->w.hClipRgn, hrgn, fnMode);
+        OffsetRgn( dc->w.hClipRgn, dc->w.DCOrgX, dc->w.DCOrgY );
     }
 
 
@@ -115,7 +115,7 @@ INT32 WINAPI ExtSelectClipRgn( HDC32 hdc, HRGN32 hrgn, INT32 fnMode )
 /***********************************************************************
  *           SelectVisRgn    (GDI.105)
  */
-INT16 WINAPI SelectVisRgn( HDC16 hdc, HRGN16 hrgn )
+INT16 WINAPI SelectVisRgn16( HDC16 hdc, HRGN16 hrgn )
 {
     int retval;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
@@ -137,14 +137,14 @@ INT16 WINAPI SelectVisRgn( HDC16 hdc, HRGN16 hrgn )
  */
 INT16 WINAPI OffsetClipRgn16( HDC16 hdc, INT16 x, INT16 y )
 {
-    return (INT16)OffsetClipRgn32( hdc, x, y );
+    return (INT16)OffsetClipRgn( hdc, x, y );
 }
 
 
 /***********************************************************************
  *           OffsetClipRgn32    (GDI32.255)
  */
-INT32 WINAPI OffsetClipRgn32( HDC32 hdc, INT32 x, INT32 y )
+INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) 
@@ -160,7 +160,7 @@ INT32 WINAPI OffsetClipRgn32( HDC32 hdc, INT32 x, INT32 y )
 
     if (dc->w.hClipRgn)
     {
-	INT32 ret = OffsetRgn32( dc->w.hClipRgn, XLPTODP(dc,x), YLPTODP(dc,y));
+	INT ret = OffsetRgn( dc->w.hClipRgn, XLPTODP(dc,x), YLPTODP(dc,y));
 	CLIPPING_UpdateGCRegion( dc );
 	GDI_HEAP_UNLOCK( hdc );
 	return ret;
@@ -173,13 +173,13 @@ INT32 WINAPI OffsetClipRgn32( HDC32 hdc, INT32 x, INT32 y )
 /***********************************************************************
  *           OffsetVisRgn    (GDI.102)
  */
-INT16 WINAPI OffsetVisRgn( HDC16 hdc, INT16 x, INT16 y )
+INT16 WINAPI OffsetVisRgn16( HDC16 hdc, INT16 x, INT16 y )
 {
     INT16 retval;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return ERROR;    
     TRACE(clipping, "%04x %d,%d\n", hdc, x, y );
-    retval = OffsetRgn32( dc->w.hVisRgn, x, y );
+    retval = OffsetRgn( dc->w.hVisRgn, x, y );
     CLIPPING_UpdateGCRegion( dc );
     GDI_HEAP_UNLOCK( hdc );
     return retval;
@@ -193,18 +193,18 @@ INT16 WINAPI OffsetVisRgn( HDC16 hdc, INT16 x, INT16 y )
  * elsewhere (like ExtTextOut()) to skip redundant metafile update and
  * coordinate conversion.
  */
-INT32 CLIPPING_IntersectClipRect( DC * dc, INT32 left, INT32 top,
-                                  INT32 right, INT32 bottom, UINT32 flags )
+INT CLIPPING_IntersectClipRect( DC * dc, INT left, INT top,
+                                  INT right, INT bottom, UINT flags )
 {
-    HRGN32 newRgn;
-    INT32 ret;
+    HRGN newRgn;
+    INT ret;
 
     left   += dc->w.DCOrgX;
     right  += dc->w.DCOrgX;
     top    += dc->w.DCOrgY;
     bottom += dc->w.DCOrgY;
 
-    if (!(newRgn = CreateRectRgn32( left, top, right, bottom ))) return ERROR;
+    if (!(newRgn = CreateRectRgn( left, top, right, bottom ))) return ERROR;
     if (!dc->w.hClipRgn)
     {
        if( flags & CLIP_INTERSECT )
@@ -215,21 +215,21 @@ INT32 CLIPPING_IntersectClipRect( DC * dc, INT32 left, INT32 top,
        }
        else if( flags & CLIP_EXCLUDE )
        {
-           dc->w.hClipRgn = CreateRectRgn32( 0, 0, 0, 0 );
-     	   CombineRgn32( dc->w.hClipRgn, dc->w.hVisRgn, 0, RGN_COPY );
+           dc->w.hClipRgn = CreateRectRgn( 0, 0, 0, 0 );
+     	   CombineRgn( dc->w.hClipRgn, dc->w.hVisRgn, 0, RGN_COPY );
        }
        else WARN(clipping,"No hClipRgn and flags are %x\n",flags);
     }
 
-    ret = CombineRgn32( newRgn, dc->w.hClipRgn, newRgn, 
+    ret = CombineRgn( newRgn, dc->w.hClipRgn, newRgn, 
                         (flags & CLIP_EXCLUDE) ? RGN_DIFF : RGN_AND );
     if (ret != ERROR)
     {
-        if (!(flags & CLIP_KEEPRGN)) DeleteObject32( dc->w.hClipRgn );
+        if (!(flags & CLIP_KEEPRGN)) DeleteObject( dc->w.hClipRgn );
         dc->w.hClipRgn = newRgn;    
         CLIPPING_UpdateGCRegion( dc );
     }
-    else DeleteObject32( newRgn );
+    else DeleteObject( newRgn );
     return ret;
 }
 
@@ -240,17 +240,17 @@ INT32 CLIPPING_IntersectClipRect( DC * dc, INT32 left, INT32 top,
 INT16 WINAPI ExcludeClipRect16( HDC16 hdc, INT16 left, INT16 top,
                                 INT16 right, INT16 bottom )
 {
-    return (INT16)ExcludeClipRect32( hdc, left, top, right, bottom );
+    return (INT16)ExcludeClipRect( hdc, left, top, right, bottom );
 }
 
 
 /***********************************************************************
  *           ExcludeClipRect32    (GDI32.92)
  */
-INT32 WINAPI ExcludeClipRect32( HDC32 hdc, INT32 left, INT32 top,
-                                INT32 right, INT32 bottom )
+INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top,
+                                INT right, INT bottom )
 {
-    INT32 ret;
+    INT ret;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) 
     {
@@ -280,17 +280,17 @@ INT32 WINAPI ExcludeClipRect32( HDC32 hdc, INT32 left, INT32 top,
 INT16 WINAPI IntersectClipRect16( HDC16 hdc, INT16 left, INT16 top,
                                   INT16 right, INT16 bottom )
 {
-    return (INT16)IntersectClipRect32( hdc, left, top, right, bottom );
+    return (INT16)IntersectClipRect( hdc, left, top, right, bottom );
 }
 
 
 /***********************************************************************
  *           IntersectClipRect32    (GDI32.245)
  */
-INT32 WINAPI IntersectClipRect32( HDC32 hdc, INT32 left, INT32 top,
-                                  INT32 right, INT32 bottom )
+INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top,
+                                  INT right, INT bottom )
 {
-    INT32 ret;
+    INT ret;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) 
     {
@@ -321,39 +321,39 @@ INT32 WINAPI IntersectClipRect32( HDC32 hdc, INT32 left, INT32 top,
  * elsewhere (like ExtTextOut()) to skip redundant metafile update and
  * coordinate conversion.
  */
-INT32 CLIPPING_IntersectVisRect( DC * dc, INT32 left, INT32 top,
-                                 INT32 right, INT32 bottom,
-                                 BOOL32 exclude )
+INT CLIPPING_IntersectVisRect( DC * dc, INT left, INT top,
+                                 INT right, INT bottom,
+                                 BOOL exclude )
 {
-    HRGN32 tempRgn, newRgn;
-    INT32 ret;
+    HRGN tempRgn, newRgn;
+    INT ret;
 
     left   += dc->w.DCOrgX;
     right  += dc->w.DCOrgX;
     top    += dc->w.DCOrgY;
     bottom += dc->w.DCOrgY;
 
-    if (!(newRgn = CreateRectRgn32( 0, 0, 0, 0 ))) return ERROR;
-    if (!(tempRgn = CreateRectRgn32( left, top, right, bottom )))
+    if (!(newRgn = CreateRectRgn( 0, 0, 0, 0 ))) return ERROR;
+    if (!(tempRgn = CreateRectRgn( left, top, right, bottom )))
     {
-        DeleteObject32( newRgn );
+        DeleteObject( newRgn );
         return ERROR;
     }
-    ret = CombineRgn32( newRgn, dc->w.hVisRgn, tempRgn,
+    ret = CombineRgn( newRgn, dc->w.hVisRgn, tempRgn,
                         exclude ? RGN_DIFF : RGN_AND );
-    DeleteObject32( tempRgn );
+    DeleteObject( tempRgn );
 
     if (ret != ERROR)
     {
         RGNOBJ *newObj  = (RGNOBJ*)GDI_GetObjPtr( newRgn, REGION_MAGIC);
         RGNOBJ *prevObj = (RGNOBJ*)GDI_GetObjPtr( dc->w.hVisRgn, REGION_MAGIC);
         if (newObj && prevObj) newObj->header.hNext = prevObj->header.hNext;
-        DeleteObject32( dc->w.hVisRgn );
+        DeleteObject( dc->w.hVisRgn );
         dc->w.hVisRgn = newRgn;    
         CLIPPING_UpdateGCRegion( dc );
 	GDI_HEAP_UNLOCK( newRgn );
     }
-    else DeleteObject32( newRgn );
+    else DeleteObject( newRgn );
     return ret;
 }
 
@@ -361,7 +361,7 @@ INT32 CLIPPING_IntersectVisRect( DC * dc, INT32 left, INT32 top,
 /***********************************************************************
  *           ExcludeVisRect    (GDI.73)
  */
-INT16 WINAPI ExcludeVisRect( HDC16 hdc, INT16 left, INT16 top,
+INT16 WINAPI ExcludeVisRect16( HDC16 hdc, INT16 left, INT16 top,
                              INT16 right, INT16 bottom )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
@@ -382,7 +382,7 @@ INT16 WINAPI ExcludeVisRect( HDC16 hdc, INT16 left, INT16 top,
 /***********************************************************************
  *           IntersectVisRect    (GDI.98)
  */
-INT16 WINAPI IntersectVisRect( HDC16 hdc, INT16 left, INT16 top,
+INT16 WINAPI IntersectVisRect16( HDC16 hdc, INT16 left, INT16 top,
                                INT16 right, INT16 bottom )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
@@ -405,14 +405,14 @@ INT16 WINAPI IntersectVisRect( HDC16 hdc, INT16 left, INT16 top,
  */
 BOOL16 WINAPI PtVisible16( HDC16 hdc, INT16 x, INT16 y )
 {
-    return PtVisible32( hdc, x, y );
+    return PtVisible( hdc, x, y );
 }
 
 
 /***********************************************************************
  *           PtVisible32    (GDI32.279)
  */
-BOOL32 WINAPI PtVisible32( HDC32 hdc, INT32 x, INT32 y )
+BOOL WINAPI PtVisible( HDC hdc, INT x, INT y )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return ERROR;    
@@ -423,7 +423,7 @@ BOOL32 WINAPI PtVisible32( HDC32 hdc, INT32 x, INT32 y )
     if( dc->w.flags & DC_DIRTY ) UPDATE_DIRTY_DC(dc);
     dc->w.flags &= ~DC_DIRTY;
 
-    return PtInRegion32( dc->w.hGCClipRgn, XLPTODP(dc,x) + dc->w.DCOrgX, 
+    return PtInRegion( dc->w.hGCClipRgn, XLPTODP(dc,x) + dc->w.DCOrgX, 
                                            YLPTODP(dc,y) + dc->w.DCOrgY );
 }
 
@@ -450,7 +450,7 @@ BOOL16 WINAPI RectVisible16( HDC16 hdc, const RECT16* rect )
 /***********************************************************************
  *           RectVisible32    (GDI32.282)
  */
-BOOL32 WINAPI RectVisible32( HDC32 hdc, const RECT32* rect )
+BOOL WINAPI RectVisible( HDC hdc, const RECT* rect )
 {
     RECT16 rect16;
     CONV_RECT32TO16( rect, &rect16 );
@@ -478,14 +478,14 @@ INT16 WINAPI GetClipBox16( HDC16 hdc, LPRECT16 rect )
 /***********************************************************************
  *           GetClipBox32    (GDI32.162)
  */
-INT32 WINAPI GetClipBox32( HDC32 hdc, LPRECT32 rect )
+INT WINAPI GetClipBox( HDC hdc, LPRECT rect )
 {
-    INT32 ret;
+    INT ret;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return ERROR;    
-    ret = GetRgnBox32( dc->w.hGCClipRgn, rect );
-    OffsetRect32( rect, -dc->w.DCOrgX, -dc->w.DCOrgY );
-    DPtoLP32( hdc, (LPPOINT32)rect, 2 );
+    ret = GetRgnBox( dc->w.hGCClipRgn, rect );
+    OffsetRect( rect, -dc->w.DCOrgX, -dc->w.DCOrgY );
+    DPtoLP( hdc, (LPPOINT)rect, 2 );
     return ret;
 }
 
@@ -493,7 +493,7 @@ INT32 WINAPI GetClipBox32( HDC32 hdc, LPRECT32 rect )
 /***********************************************************************
  *           GetClipRgn32  (GDI32.163)
  */
-INT32 WINAPI GetClipRgn32( HDC32 hdc, HRGN32 hRgn )
+INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if( dc && hRgn )
@@ -503,9 +503,9 @@ INT32 WINAPI GetClipRgn32( HDC32 hdc, HRGN32 hRgn )
 	/* this assumes that dc->w.hClipRgn is in coordinates
 	   relative to the device (not DC origin) */
 
-	if( CombineRgn32(hRgn, dc->w.hClipRgn, 0, RGN_COPY) != ERROR )
+	if( CombineRgn(hRgn, dc->w.hClipRgn, 0, RGN_COPY) != ERROR )
         {
-            OffsetRgn32( hRgn, -dc->w.DCOrgX, -dc->w.DCOrgY );
+            OffsetRgn( hRgn, -dc->w.DCOrgX, -dc->w.DCOrgY );
 	    return 1;
         }
       }
@@ -517,9 +517,9 @@ INT32 WINAPI GetClipRgn32( HDC32 hdc, HRGN32 hRgn )
 /***********************************************************************
  *           SaveVisRgn    (GDI.129)
  */
-HRGN16 WINAPI SaveVisRgn( HDC16 hdc )
+HRGN16 WINAPI SaveVisRgn16( HDC16 hdc )
 {
-    HRGN32 copy;
+    HRGN copy;
     RGNOBJ *obj, *copyObj;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return 0;
@@ -537,13 +537,13 @@ HRGN16 WINAPI SaveVisRgn( HDC16 hdc )
         GDI_HEAP_UNLOCK( hdc );
 	return 0;
     }
-    if (!(copy = CreateRectRgn32( 0, 0, 0, 0 )))
+    if (!(copy = CreateRectRgn( 0, 0, 0, 0 )))
     {
         GDI_HEAP_UNLOCK( dc->w.hVisRgn );
         GDI_HEAP_UNLOCK( hdc );
         return 0;
     }  
-    CombineRgn32( copy, dc->w.hVisRgn, 0, RGN_COPY );
+    CombineRgn( copy, dc->w.hVisRgn, 0, RGN_COPY );
     if (!(copyObj = (RGNOBJ *) GDI_GetObjPtr( copy, REGION_MAGIC )))
     {
         GDI_HEAP_UNLOCK( dc->w.hVisRgn );
@@ -562,9 +562,9 @@ HRGN16 WINAPI SaveVisRgn( HDC16 hdc )
 /***********************************************************************
  *           RestoreVisRgn    (GDI.130)
  */
-INT16 WINAPI RestoreVisRgn( HDC16 hdc )
+INT16 WINAPI RestoreVisRgn16( HDC16 hdc )
 {
-    HRGN32 saved;
+    HRGN saved;
     RGNOBJ *obj, *savedObj;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     INT16 ret;
@@ -593,7 +593,7 @@ INT16 WINAPI RestoreVisRgn( HDC16 hdc )
         GDI_HEAP_UNLOCK( hdc );
         return ERROR;
     }
-    DeleteObject32( dc->w.hVisRgn );
+    DeleteObject( dc->w.hVisRgn );
     dc->w.hVisRgn = saved;
     CLIPPING_UpdateGCRegion( dc );
     GDI_HEAP_UNLOCK( hdc );
diff --git a/objects/color.c b/objects/color.c
index 956c88d7a76..9658f91588c 100644
--- a/objects/color.c
+++ b/objects/color.c
@@ -41,9 +41,9 @@ typedef struct
     Colormap    colorMap;
     UINT16      size;
     UINT16      flags;
-    INT32	monoPlane;	 /* bit plane different for white and black pixels */
+    INT	monoPlane;	 /* bit plane different for white and black pixels */
 
-    INT32	(*mapColor)( DC*, COLORREF );
+    INT	(*mapColor)( DC*, COLORREF );
 } CSPACE;
 
 static CSPACE cSpace = {0, 0, 0};
@@ -128,7 +128,7 @@ Colormap X11DRV_COLOR_GetColormap(void)
     return cSpace.colorMap;
 }
 
-BOOL32 COLOR_GetMonoPlane(INT32* plane)
+BOOL COLOR_GetMonoPlane(INT* plane)
 {
     *plane = cSpace.monoPlane;
     return (cSpace.flags & COLOR_WHITESET) ? TRUE : FALSE;
@@ -149,7 +149,7 @@ const PALETTEENTRY* COLOR_GetSystemPaletteTemplate(void)
     return __sysPalTemplate;
 }
 
-COLORREF COLOR_GetSystemPaletteEntry(UINT32 i)
+COLORREF COLOR_GetSystemPaletteEntry(UINT i)
 {
  return *(COLORREF*)(COLOR_sysPal + i) & 0x00ffffff;
 }
@@ -173,7 +173,7 @@ void COLOR_FormatSystemPalette(void)
   COLOR_freeList[j] = 0;
 }
 
-BOOL32 COLOR_CheckSysColor(COLORREF c)
+BOOL COLOR_CheckSysColor(COLORREF c)
 {
   int i;
   for( i = 0; i < NB_RESERVED_COLORS; i++ )
@@ -280,7 +280,7 @@ static void COLOR_FillDefaultColors(void)
  *
  * Allocate colorcells and initialize mapping tables.
  */
-static BOOL32 COLOR_BuildPrivateMap(CSPACE* cs)
+static BOOL COLOR_BuildPrivateMap(CSPACE* cs)
 {
     /* Private colormap - identity mapping */
 
@@ -332,7 +332,7 @@ static BOOL32 COLOR_BuildPrivateMap(CSPACE* cs)
     return FALSE;
 }
 
-static BOOL32 COLOR_BuildSharedMap(CSPACE* cs)
+static BOOL COLOR_BuildSharedMap(CSPACE* cs)
 {
    XColor		color;
    unsigned long        sysPixel[NB_RESERVED_COLORS];
@@ -571,7 +571,7 @@ static void COLOR_Computeshifts(unsigned long maskbits, int *shift, int *max)
  *
  * Initialize color management.
  */
-BOOL32 COLOR_Init(void)
+BOOL COLOR_Init(void)
 {
     int	mask, white, black;
 
@@ -690,7 +690,7 @@ void COLOR_Cleanup(void)
  *
  * Check whether 'color' can be represented with a solid color.
  */
-BOOL32 COLOR_IsSolid( COLORREF color )
+BOOL COLOR_IsSolid( COLORREF color )
 {
     int i;
     const PALETTEENTRY *pEntry = COLOR_sysPal;
@@ -714,7 +714,7 @@ BOOL32 COLOR_IsSolid( COLORREF color )
  *	     COLOR_PaletteLookupPixel
  */
 int COLOR_PaletteLookupPixel( PALETTEENTRY* palPalEntry, int size,
-                              int* mapping, COLORREF col, BOOL32 skipReserved )
+                              int* mapping, COLORREF col, BOOL skipReserved )
 {
     int i, best = 0, diff = 0x7fffffff;
     int r,g,b;
@@ -1000,7 +1000,7 @@ int COLOR_ToPhysical( DC *dc, COLORREF color )
  * Set the color-mapping table for selected palette. 
  * Return number of entries which mapping has changed.
  */
-int COLOR_SetMapping( PALETTEOBJ* palPtr, UINT32 uStart, UINT32 uNum, BOOL32 mapOnly )
+int COLOR_SetMapping( PALETTEOBJ* palPtr, UINT uStart, UINT uNum, BOOL mapOnly )
 {
     char flag;
     int  prevMapping = (palPtr->mapping) ? 1 : 0;
diff --git a/objects/cursoricon.c b/objects/cursoricon.c
index 96e62f32adc..7e2e89ca235 100644
--- a/objects/cursoricon.c
+++ b/objects/cursoricon.c
@@ -49,9 +49,9 @@
 #include "message.h"
 #include "winerror.h"
 
-static HCURSOR32 hActiveCursor = 0;  /* Active cursor */
-static INT32 CURSOR_ShowCount = 0;   /* Cursor display count */
-static RECT32 CURSOR_ClipRect;       /* Cursor clipping rect */
+static HCURSOR hActiveCursor = 0;  /* Active cursor */
+static INT CURSOR_ShowCount = 0;   /* Cursor display count */
+static RECT CURSOR_ClipRect;       /* Cursor clipping rect */
 
 /**********************************************************************
  *	    CURSORICON_FindBestIcon
@@ -217,7 +217,7 @@ static CURSORDIRENTRY *CURSORICON_FindBestCursor( CURSORICONDIR *dir,
  *		directly from corresponding DIB sections
  * Note: wResId is index to array of pointer returned in ptrs (origin is 1)
  */
-BOOL32 CURSORICON_SimulateLoadingFromResourceW( LPWSTR filename, BOOL32 fCursor,
+BOOL CURSORICON_SimulateLoadingFromResourceW( LPWSTR filename, BOOL fCursor,
                                                 CURSORICONDIR **res, LPBYTE **ptr)
 {
     LPBYTE   _free;
@@ -305,9 +305,9 @@ fail:
  * Load the icon/cursor directory for a given resource name and find the
  * best matching entry.
  */
-static BOOL32 CURSORICON_LoadDirEntry16( HINSTANCE32 hInstance, SEGPTR name,
-                                         INT32 width, INT32 height, INT32 colors, 
-					 BOOL32 fCursor, CURSORICONDIRENTRY *dirEntry )
+static BOOL CURSORICON_LoadDirEntry16( HINSTANCE hInstance, SEGPTR name,
+                                         INT width, INT height, INT colors, 
+					 BOOL fCursor, CURSORICONDIRENTRY *dirEntry )
 {
     HRSRC16 hRsrc;
     HGLOBAL16 hMem;
@@ -339,20 +339,20 @@ static BOOL32 CURSORICON_LoadDirEntry16( HINSTANCE32 hInstance, SEGPTR name,
  * Load the icon/cursor directory for a given resource name and find the
  * best matching entry.
  */
-static BOOL32 CURSORICON_LoadDirEntry32( HINSTANCE32 hInstance, LPCWSTR name,
-                                         INT32 width, INT32 height, INT32 colors,
-                                         BOOL32 fCursor, CURSORICONDIRENTRY *dirEntry )
+static BOOL CURSORICON_LoadDirEntry( HINSTANCE hInstance, LPCWSTR name,
+                                         INT width, INT height, INT colors,
+                                         BOOL fCursor, CURSORICONDIRENTRY *dirEntry )
 {
-    HANDLE32 hRsrc;
-    HANDLE32 hMem;
+    HANDLE hRsrc;
+    HANDLE hMem;
     CURSORICONDIR *dir;
     CURSORICONDIRENTRY *entry = NULL;
 
-    if (!(hRsrc = FindResource32W( hInstance, name,
-                            fCursor ? RT_GROUP_CURSOR32W : RT_GROUP_ICON32W )))
+    if (!(hRsrc = FindResourceW( hInstance, name,
+                            fCursor ? RT_GROUP_CURSORW : RT_GROUP_ICONW )))
         return FALSE;
-    if (!(hMem = LoadResource32( hInstance, hRsrc ))) return FALSE;
-    if ((dir = (CURSORICONDIR*)LockResource32( hMem )))
+    if (!(hMem = LoadResource( hInstance, hRsrc ))) return FALSE;
+    if ((dir = (CURSORICONDIR*)LockResource( hMem )))
     {
         if (fCursor)
             entry = (CURSORICONDIRENTRY *)CURSORICON_FindBestCursor( dir,
@@ -362,7 +362,7 @@ static BOOL32 CURSORICON_LoadDirEntry32( HINSTANCE32 hInstance, LPCWSTR name,
                                                        width, height, colors );
         if (entry) *dirEntry = *entry;
     }
-    FreeResource32( hMem );
+    FreeResource( hMem );
     return (entry != NULL);
 }
 
@@ -376,17 +376,17 @@ static BOOL32 CURSORICON_LoadDirEntry32( HINSTANCE32 hInstance, LPCWSTR name,
  *        with cbSize parameter as well.
  */
 static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16 hObj, LPBYTE bits,
-	 					UINT32 cbSize, BOOL32 bIcon, DWORD dwVersion, 
-						INT32 width, INT32 height, UINT32 loadflags )
+	 					UINT cbSize, BOOL bIcon, DWORD dwVersion, 
+						INT width, INT height, UINT loadflags )
 {
     int sizeAnd, sizeXor;
-    HBITMAP32 hAndBits = 0, hXorBits = 0; /* error condition for later */
+    HBITMAP hAndBits = 0, hXorBits = 0; /* error condition for later */
     BITMAPOBJ *bmpXor, *bmpAnd;
     POINT16 hotspot = { 0 ,0 };
     BITMAPINFO *bmi;
-    HDC32 hdc;
-    BOOL32 DoStretch;
-    INT32 size;
+    HDC hdc;
+    BOOL DoStretch;
+    INT size;
 
     TRACE(cursor,"%08x (%u bytes), ver %08x, %ix%i %s %s\n",
                         (unsigned)bits, cbSize, (unsigned)dwVersion, width, height,
@@ -422,7 +422,7 @@ static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16
           return 0;
     }
 
-    if( (hdc = GetDC32( 0 )) )
+    if( (hdc = GetDC( 0 )) )
     {
 	BITMAPINFO* pInfo;
 
@@ -446,22 +446,22 @@ static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16
 	    /* Create the XOR bitmap */
 
 	    if (DoStretch) {
-	      if ((hXorBits = CreateCompatibleBitmap32(hdc, width, height))) {
-		HBITMAP32 hOld;
-		HDC32 hMem = CreateCompatibleDC32(hdc);
-		BOOL32 res;
+	      if ((hXorBits = CreateCompatibleBitmap(hdc, width, height))) {
+		HBITMAP hOld;
+		HDC hMem = CreateCompatibleDC(hdc);
+		BOOL res;
 
 		if (hMem) {
-		  hOld = SelectObject32(hMem, hXorBits);
-	          res = StretchDIBits32(hMem, 0, 0, width, height, 0, 0,
+		  hOld = SelectObject(hMem, hXorBits);
+	          res = StretchDIBits(hMem, 0, 0, width, height, 0, 0,
 		    bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight/2,
 		    (char*)bmi + size, pInfo, DIB_RGB_COLORS, SRCCOPY);
-		  SelectObject32(hMem, hOld);
-		  DeleteDC32(hMem);
+		  SelectObject(hMem, hOld);
+		  DeleteDC(hMem);
 	        } else res = FALSE;
-		if (!res) { DeleteObject32(hXorBits); hXorBits = 0; }
+		if (!res) { DeleteObject(hXorBits); hXorBits = 0; }
 	      }
-	    } else hXorBits = CreateDIBitmap32( hdc, &pInfo->bmiHeader,
+	    } else hXorBits = CreateDIBitmap( hdc, &pInfo->bmiHeader,
 		CBM_INIT, (char*)bmi + size, pInfo, DIB_RGB_COLORS );
 	    if( hXorBits )
 	    {
@@ -490,29 +490,29 @@ static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16
 	        /* Create the AND bitmap */
 
 	    if (DoStretch) {
-	      if ((hAndBits = CreateBitmap32(width, height, 1, 1, NULL))) {
-		HBITMAP32 hOld;
-		HDC32 hMem = CreateCompatibleDC32(hdc);
-		BOOL32 res;
+	      if ((hAndBits = CreateBitmap(width, height, 1, 1, NULL))) {
+		HBITMAP hOld;
+		HDC hMem = CreateCompatibleDC(hdc);
+		BOOL res;
 
 		if (hMem) {
-		  hOld = SelectObject32(hMem, hAndBits);
-	          res = StretchDIBits32(hMem, 0, 0, width, height, 0, 0,
+		  hOld = SelectObject(hMem, hAndBits);
+	          res = StretchDIBits(hMem, 0, 0, width, height, 0, 0,
 		    pInfo->bmiHeader.biWidth, pInfo->bmiHeader.biHeight,
 		    bits, pInfo, DIB_RGB_COLORS, SRCCOPY);
-		  SelectObject32(hMem, hOld);
-		  DeleteDC32(hMem);
+		  SelectObject(hMem, hOld);
+		  DeleteDC(hMem);
 	        } else res = FALSE;
-		if (!res) { DeleteObject32(hAndBits); hAndBits = 0; }
+		if (!res) { DeleteObject(hAndBits); hAndBits = 0; }
 	      }
-	    } else hAndBits = CreateDIBitmap32( hdc, &pInfo->bmiHeader,
+	    } else hAndBits = CreateDIBitmap( hdc, &pInfo->bmiHeader,
 	      CBM_INIT, bits, pInfo, DIB_RGB_COLORS );
 
-		if( !hAndBits ) DeleteObject32( hXorBits );
+		if( !hAndBits ) DeleteObject( hXorBits );
 	    }
 	    HeapFree( GetProcessHeap(), 0, pInfo ); 
 	}
-	ReleaseDC32( 0, hdc );
+	ReleaseDC( 0, hdc );
     }
 
     if( !hXorBits || !hAndBits ) 
@@ -536,7 +536,7 @@ static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16
 	CURSORICONINFO *info;
 
 	/* Make it owned by the module */
-	if (hInstance) FarSetOwner( hObj, GetExePtr(hInstance) );
+	if (hInstance) FarSetOwner16( hObj, GetExePtr(hInstance) );
 
 	info = (CURSORICONINFO *)GlobalLock16( hObj );
 	info->ptHotSpot.x   = hotspot.x;
@@ -549,13 +549,13 @@ static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16
 
 	/* Transfer the bitmap bits to the CURSORICONINFO structure */
 
-	GetBitmapBits32( hAndBits, sizeAnd, (char *)(info + 1) );
-	GetBitmapBits32( hXorBits, sizeXor, (char *)(info + 1) + sizeAnd );
+	GetBitmapBits( hAndBits, sizeAnd, (char *)(info + 1) );
+	GetBitmapBits( hXorBits, sizeXor, (char *)(info + 1) + sizeAnd );
 	GlobalUnlock16( hObj );
     }
 
-    DeleteObject32( hXorBits );
-    DeleteObject32( hAndBits );
+    DeleteObject( hXorBits );
+    DeleteObject( hAndBits );
     return hObj;
 }
 
@@ -568,7 +568,7 @@ static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16
 HICON16 WINAPI CreateIconFromResourceEx16( LPBYTE bits, UINT16 cbSize, BOOL16 bIcon,
                                     DWORD dwVersion, INT16 width, INT16 height, UINT16 cFlag )
 {
-    return CreateIconFromResourceEx32(bits, cbSize, bIcon, dwVersion, 
+    return CreateIconFromResourceEx(bits, cbSize, bIcon, dwVersion, 
       width, height, cFlag);
 }
 
@@ -576,20 +576,20 @@ HICON16 WINAPI CreateIconFromResourceEx16( LPBYTE bits, UINT16 cbSize, BOOL16 bI
 /**********************************************************************
  *          CreateIconFromResource          (USER32.76)
  */
-HICON32 WINAPI CreateIconFromResource32( LPBYTE bits, UINT32 cbSize,
-                                           BOOL32 bIcon, DWORD dwVersion)
+HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize,
+                                           BOOL bIcon, DWORD dwVersion)
 {
-    return CreateIconFromResourceEx32( bits, cbSize, bIcon, dwVersion, 0,0,0);
+    return CreateIconFromResourceEx( bits, cbSize, bIcon, dwVersion, 0,0,0);
 }
 
 
 /**********************************************************************
  *          CreateIconFromResourceEx32          (USER32.77)
  */
-HICON32 WINAPI CreateIconFromResourceEx32( LPBYTE bits, UINT32 cbSize,
-                                           BOOL32 bIcon, DWORD dwVersion,
-                                           INT32 width, INT32 height,
-                                           UINT32 cFlag )
+HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize,
+                                           BOOL bIcon, DWORD dwVersion,
+                                           INT width, INT height,
+                                           UINT cFlag )
 {
     TDB* pTask = (TDB*)GlobalLock16( GetCurrentTask() );
     if( pTask )
@@ -605,8 +605,8 @@ HICON32 WINAPI CreateIconFromResourceEx32( LPBYTE bits, UINT32 cbSize,
  * Load a cursor or icon from a 16-bit resource.
  */
 static HGLOBAL16 CURSORICON_Load16( HINSTANCE16 hInstance, SEGPTR name,
-                                    INT32 width, INT32 height, INT32 colors,
-                                    BOOL32 fCursor, UINT32 loadflags)
+                                    INT width, INT height, INT colors,
+                                    BOOL fCursor, UINT loadflags)
 {
     HGLOBAL16 handle = 0;
     HRSRC16 hRsrc;
@@ -614,7 +614,7 @@ static HGLOBAL16 CURSORICON_Load16( HINSTANCE16 hInstance, SEGPTR name,
 
     if (!hInstance)  /* OEM cursor/icon */
     {
-        HDC32 hdc;
+        HDC hdc;
 	DC *dc;
 
         if (HIWORD(name))  /* Check for '#xxx' name */
@@ -623,13 +623,13 @@ static HGLOBAL16 CURSORICON_Load16( HINSTANCE16 hInstance, SEGPTR name,
             if (ptr[0] != '#') return 0;
             if (!(name = (SEGPTR)atoi( ptr + 1 ))) return 0;
         }
-	hdc = CreateDC32A( "DISPLAY", NULL, NULL, NULL );
+	hdc = CreateDCA( "DISPLAY", NULL, NULL, NULL );
 	dc = DC_GetDCPtr( hdc );
 	if(dc->funcs->pLoadOEMResource)
 	    handle = dc->funcs->pLoadOEMResource( LOWORD(name), fCursor ?
 						  OEM_CURSOR : OEM_ICON);
 	GDI_HEAP_UNLOCK( hdc );
-	DeleteDC32( hdc );
+	DeleteDC( hdc );
 	return handle;
     }
 
@@ -659,12 +659,12 @@ static HGLOBAL16 CURSORICON_Load16( HINSTANCE16 hInstance, SEGPTR name,
  *
  * Load a cursor or icon from a 32-bit resource.
  */
-HGLOBAL32 CURSORICON_Load32( HINSTANCE32 hInstance, LPCWSTR name,
+HGLOBAL CURSORICON_Load( HINSTANCE hInstance, LPCWSTR name,
                              int width, int height, int colors,
-                             BOOL32 fCursor, UINT32 loadflags )
+                             BOOL fCursor, UINT loadflags )
 {
-    HANDLE32 handle = 0, h = 0;
-    HANDLE32 hRsrc;
+    HANDLE handle = 0, h = 0;
+    HANDLE hRsrc;
     CURSORICONDIRENTRY dirEntry;
     LPBYTE bits;
 
@@ -673,7 +673,7 @@ HGLOBAL32 CURSORICON_Load32( HINSTANCE32 hInstance, LPCWSTR name,
         if (!hInstance)  /* OEM cursor/icon */
         {
             WORD resid;
-	    HDC32 hdc;
+	    HDC hdc;
 	    DC *dc;
 
             if(HIWORD(name))
@@ -691,31 +691,31 @@ HGLOBAL32 CURSORICON_Load32( HINSTANCE32 hInstance, LPCWSTR name,
                 }
             }
             else resid = LOWORD(name);
-	    hdc = CreateDC32A( "DISPLAY", NULL, NULL, NULL );
+	    hdc = CreateDCA( "DISPLAY", NULL, NULL, NULL );
 	    dc = DC_GetDCPtr( hdc );
 	    if(dc->funcs->pLoadOEMResource)
 	        handle = dc->funcs->pLoadOEMResource( resid, fCursor ?
 						      OEM_CURSOR : OEM_ICON );
 	    GDI_HEAP_UNLOCK( hdc );
-	    DeleteDC32(  hdc );
+	    DeleteDC(  hdc );
             return handle;
         }
 
         /* Find the best entry in the directory */
  
-        if (!CURSORICON_LoadDirEntry32( hInstance, name, width, height,
+        if (!CURSORICON_LoadDirEntry( hInstance, name, width, height,
                                         colors, fCursor, &dirEntry ) )  return 0;
         /* Load the resource */
 
-        if (!(hRsrc = FindResource32W(hInstance,MAKEINTRESOURCE32W(dirEntry.icon.wResId),
-                                      fCursor ? RT_CURSOR32W : RT_ICON32W ))) return 0;
-        if (!(handle = LoadResource32( hInstance, hRsrc ))) return 0;
+        if (!(hRsrc = FindResourceW(hInstance,MAKEINTRESOURCEW(dirEntry.icon.wResId),
+                                      fCursor ? RT_CURSORW : RT_ICONW ))) return 0;
+        if (!(handle = LoadResource( hInstance, hRsrc ))) return 0;
         /* Hack to keep LoadCursor/Icon32() from spawning multiple
          * copies of the same object.
          */
 #define pRsrcEntry ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)
         if( pRsrcEntry->ResourceHandle ) return pRsrcEntry->ResourceHandle;
-        bits = (LPBYTE)LockResource32( handle );
+        bits = (LPBYTE)LockResource( handle );
         h = CURSORICON_CreateFromResource( 0, 0, bits, dirEntry.icon.dwBytesInRes, 
                                            !fCursor, 0x00030000, width, height, loadflags);
         pRsrcEntry->ResourceHandle = h;
@@ -756,7 +756,7 @@ static HGLOBAL16 CURSORICON_Copy( HINSTANCE16 hInstance, HGLOBAL16 handle )
     if (!(hInstance = GetExePtr( hInstance ))) return 0;
     size = GlobalSize16( handle );
     hNew = GlobalAlloc16( GMEM_MOVEABLE, size );
-    FarSetOwner( hNew, hInstance );
+    FarSetOwner16( hNew, hInstance );
     ptrNew = (char *)GlobalLock16( hNew );
     memcpy( ptrNew, ptrOld, size );
     GlobalUnlock16( handle );
@@ -770,7 +770,7 @@ static HGLOBAL16 CURSORICON_Copy( HINSTANCE16 hInstance, HGLOBAL16 handle )
  * Converts bitmap to mono and truncates if icon is too large (should
  * probably do StretchBlt() instead).
  */
-HCURSOR16 CURSORICON_IconToCursor(HICON16 hIcon, BOOL32 bSemiTransparent)
+HCURSOR16 CURSORICON_IconToCursor(HICON16 hIcon, BOOL bSemiTransparent)
 {
  HCURSOR16       hRet = 0;
  CURSORICONINFO *pIcon = NULL;
@@ -842,7 +842,7 @@ HCURSOR16 CURSORICON_IconToCursor(HICON16 hIcon, BOOL32 bSemiTransparent)
               pxbPtr += 4;
            }
 
-           hRet = CreateCursorIconIndirect( pTask->hInstance , &cI, pAndBits, pXorBits);
+           hRet = CreateCursorIconIndirect16( pTask->hInstance , &cI, pAndBits, pXorBits);
 
            if( !hRet ) /* fall back on default drag cursor */
                 hRet = CURSORICON_Copy( pTask->hInstance ,
@@ -876,9 +876,9 @@ HCURSOR16 WINAPI LoadCursor16( HINSTANCE16 hInstance, SEGPTR name )
  */
 HICON16 WINAPI LoadIcon16( HINSTANCE16 hInstance, SEGPTR name )
 {
-    HDC32 hdc = GetDC32(0);
-    UINT32 palEnts = GetSystemPaletteEntries32(hdc, 0, 0, NULL);
-    ReleaseDC32(0, hdc);
+    HDC hdc = GetDC(0);
+    UINT palEnts = GetSystemPaletteEntries(hdc, 0, 0, NULL);
+    ReleaseDC(0, hdc);
 
     if (HIWORD(name))
         TRACE(icon, "%04x '%s'\n",
@@ -905,23 +905,23 @@ HCURSOR16 WINAPI CreateCursor16( HINSTANCE16 hInstance,
 
     TRACE(cursor, "%dx%d spot=%d,%d xor=%p and=%p\n",
                     nWidth, nHeight, xHotSpot, yHotSpot, lpXORbits, lpANDbits);
-    return CreateCursorIconIndirect( hInstance, &info, lpANDbits, lpXORbits );
+    return CreateCursorIconIndirect16( hInstance, &info, lpANDbits, lpXORbits );
 }
 
 
 /***********************************************************************
  *           CreateCursor32    (USER32.67)
  */
-HCURSOR32 WINAPI CreateCursor32( HINSTANCE32 hInstance,
-                                 INT32 xHotSpot, INT32 yHotSpot,
-                                 INT32 nWidth, INT32 nHeight,
+HCURSOR WINAPI CreateCursor( HINSTANCE hInstance,
+                                 INT xHotSpot, INT yHotSpot,
+                                 INT nWidth, INT nHeight,
                                  LPCVOID lpANDbits, LPCVOID lpXORbits )
 {
     CURSORICONINFO info = { { xHotSpot, yHotSpot }, nWidth, nHeight, 0, 1, 1 };
 
     TRACE(cursor, "%dx%d spot=%d,%d xor=%p and=%p\n",
                     nWidth, nHeight, xHotSpot, yHotSpot, lpXORbits, lpANDbits);
-    return CreateCursorIconIndirect( 0, &info, lpANDbits, lpXORbits );
+    return CreateCursorIconIndirect16( 0, &info, lpANDbits, lpXORbits );
 }
 
 
@@ -936,29 +936,29 @@ HICON16 WINAPI CreateIcon16( HINSTANCE16 hInstance, INT16 nWidth,
 
     TRACE(icon, "%dx%dx%d, xor=%p, and=%p\n",
                   nWidth, nHeight, bPlanes * bBitsPixel, lpXORbits, lpANDbits);
-    return CreateCursorIconIndirect( hInstance, &info, lpANDbits, lpXORbits );
+    return CreateCursorIconIndirect16( hInstance, &info, lpANDbits, lpXORbits );
 }
 
 
 /***********************************************************************
  *           CreateIcon32    (USER32.75)
  */
-HICON32 WINAPI CreateIcon32( HINSTANCE32 hInstance, INT32 nWidth,
-                             INT32 nHeight, BYTE bPlanes, BYTE bBitsPixel,
+HICON WINAPI CreateIcon( HINSTANCE hInstance, INT nWidth,
+                             INT nHeight, BYTE bPlanes, BYTE bBitsPixel,
                              LPCVOID lpANDbits, LPCVOID lpXORbits )
 {
     CURSORICONINFO info = { { 0, 0 }, nWidth, nHeight, 0, bPlanes, bBitsPixel};
 
     TRACE(icon, "%dx%dx%d, xor=%p, and=%p\n",
                   nWidth, nHeight, bPlanes * bBitsPixel, lpXORbits, lpANDbits);
-    return CreateCursorIconIndirect( 0, &info, lpANDbits, lpXORbits );
+    return CreateCursorIconIndirect16( 0, &info, lpANDbits, lpXORbits );
 }
 
 
 /***********************************************************************
  *           CreateCursorIconIndirect    (USER.408)
  */
-HGLOBAL16 WINAPI CreateCursorIconIndirect( HINSTANCE16 hInstance,
+HGLOBAL16 WINAPI CreateCursorIconIndirect16( HINSTANCE16 hInstance,
                                            CURSORICONINFO *info,
                                            LPCVOID lpANDbits,
                                            LPCVOID lpXORbits )
@@ -975,7 +975,7 @@ HGLOBAL16 WINAPI CreateCursorIconIndirect( HINSTANCE16 hInstance,
     if (!(handle = GlobalAlloc16( GMEM_MOVEABLE,
                                   sizeof(CURSORICONINFO) + sizeXor + sizeAnd)))
         return 0;
-    if (hInstance) FarSetOwner( handle, hInstance );
+    if (hInstance) FarSetOwner16( handle, hInstance );
     ptr = (char *)GlobalLock16( handle );
     memcpy( ptr, info, sizeof(*info) );
     memcpy( ptr + sizeof(CURSORICONINFO), lpANDbits, sizeAnd );
@@ -998,7 +998,7 @@ HICON16 WINAPI CopyIcon16( HINSTANCE16 hInstance, HICON16 hIcon )
 /***********************************************************************
  *           CopyIcon32    (USER32.60)
  */
-HICON32 WINAPI CopyIcon32( HICON32 hIcon )
+HICON WINAPI CopyIcon( HICON hIcon )
 {
   HTASK16 hTask = GetCurrentTask ();
   TDB* pTask = (TDB *) GlobalLock16 (hTask);
@@ -1031,7 +1031,7 @@ BOOL16 WINAPI DestroyIcon16( HICON16 hIcon )
 /***********************************************************************
  *           DestroyIcon32    (USER32.133)
  */
-BOOL32 WINAPI DestroyIcon32( HICON32 hIcon )
+BOOL WINAPI DestroyIcon( HICON hIcon )
 {
     TRACE(icon, "%04x\n", hIcon );
     /* FIXME: should check for OEM/global heap icon here */
@@ -1068,7 +1068,7 @@ BOOL16 WINAPI DestroyCursor16( HCURSOR16 hCursor )
 /***********************************************************************
  *           DestroyCursor32    (USER32.132)
  */
-BOOL32 WINAPI DestroyCursor32( HCURSOR32 hCursor )
+BOOL WINAPI DestroyCursor( HCURSOR hCursor )
 {
     TRACE(cursor, "%04x\n", hCursor );
     /* FIXME: should check for OEM/global heap cursor here */
@@ -1083,44 +1083,44 @@ BOOL32 WINAPI DestroyCursor32( HCURSOR32 hCursor )
  */
 BOOL16 WINAPI DrawIcon16( HDC16 hdc, INT16 x, INT16 y, HICON16 hIcon )
 {
-    return DrawIcon32( hdc, x, y, hIcon );
+    return DrawIcon( hdc, x, y, hIcon );
 }
 
 
 /***********************************************************************
  *           DrawIcon32    (USER32.159)
  */
-BOOL32 WINAPI DrawIcon32( HDC32 hdc, INT32 x, INT32 y, HICON32 hIcon )
+BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon )
 {
     CURSORICONINFO *ptr;
-    HDC32 hMemDC;
-    HBITMAP32 hXorBits, hAndBits;
+    HDC hMemDC;
+    HBITMAP hXorBits, hAndBits;
     COLORREF oldFg, oldBg;
 
     if (!(ptr = (CURSORICONINFO *)GlobalLock16( hIcon ))) return FALSE;
-    if (!(hMemDC = CreateCompatibleDC32( hdc ))) return FALSE;
-    hAndBits = CreateBitmap32( ptr->nWidth, ptr->nHeight, 1, 1,
+    if (!(hMemDC = CreateCompatibleDC( hdc ))) return FALSE;
+    hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1,
                                (char *)(ptr+1) );
-    hXorBits = CreateBitmap32( ptr->nWidth, ptr->nHeight, ptr->bPlanes,
+    hXorBits = CreateBitmap( ptr->nWidth, ptr->nHeight, ptr->bPlanes,
                                ptr->bBitsPerPixel, (char *)(ptr + 1)
                         + ptr->nHeight * BITMAP_GetWidthBytes(ptr->nWidth,1) );
-    oldFg = SetTextColor32( hdc, RGB(0,0,0) );
-    oldBg = SetBkColor32( hdc, RGB(255,255,255) );
+    oldFg = SetTextColor( hdc, RGB(0,0,0) );
+    oldBg = SetBkColor( hdc, RGB(255,255,255) );
 
     if (hXorBits && hAndBits)
     {
-        HBITMAP32 hBitTemp = SelectObject32( hMemDC, hAndBits );
-        BitBlt32( hdc, x, y, ptr->nWidth, ptr->nHeight, hMemDC, 0, 0, SRCAND );
-        SelectObject32( hMemDC, hXorBits );
-        BitBlt32(hdc, x, y, ptr->nWidth, ptr->nHeight, hMemDC, 0, 0,SRCINVERT);
-        SelectObject32( hMemDC, hBitTemp );
+        HBITMAP hBitTemp = SelectObject( hMemDC, hAndBits );
+        BitBlt( hdc, x, y, ptr->nWidth, ptr->nHeight, hMemDC, 0, 0, SRCAND );
+        SelectObject( hMemDC, hXorBits );
+        BitBlt(hdc, x, y, ptr->nWidth, ptr->nHeight, hMemDC, 0, 0,SRCINVERT);
+        SelectObject( hMemDC, hBitTemp );
     }
-    DeleteDC32( hMemDC );
-    if (hXorBits) DeleteObject32( hXorBits );
-    if (hAndBits) DeleteObject32( hAndBits );
+    DeleteDC( hMemDC );
+    if (hXorBits) DeleteObject( hXorBits );
+    if (hAndBits) DeleteObject( hAndBits );
     GlobalUnlock16( hIcon );
-    SetTextColor32( hdc, oldFg );
-    SetBkColor32( hdc, oldBg );
+    SetTextColor( hdc, oldFg );
+    SetBkColor( hdc, oldBg );
     return TRUE;
 }
 
@@ -1128,7 +1128,7 @@ BOOL32 WINAPI DrawIcon32( HDC32 hdc, INT32 x, INT32 y, HICON32 hIcon )
 /***********************************************************************
  *           DumpIcon    (USER.459)
  */
-DWORD WINAPI DumpIcon( SEGPTR pInfo, WORD *lpLen,
+DWORD WINAPI DumpIcon16( SEGPTR pInfo, WORD *lpLen,
                        SEGPTR *lpXorBits, SEGPTR *lpAndBits )
 {
     CURSORICONINFO *info = PTR_SEG_TO_LIN( pInfo );
@@ -1149,7 +1149,7 @@ DWORD WINAPI DumpIcon( SEGPTR pInfo, WORD *lpLen,
  */
 HCURSOR16 WINAPI SetCursor16( HCURSOR16 hCursor )
 {
-    return (HCURSOR16)SetCursor32( hCursor );
+    return (HCURSOR16)SetCursor( hCursor );
 }
 
 
@@ -1158,10 +1158,10 @@ HCURSOR16 WINAPI SetCursor16( HCURSOR16 hCursor )
  * RETURNS:
  *	A handle to the previous cursor shape.
  */
-HCURSOR32 WINAPI SetCursor32(
-	         HCURSOR32 hCursor /* Handle of cursor to show */
+HCURSOR WINAPI SetCursor(
+	         HCURSOR hCursor /* Handle of cursor to show */
 ) {
-    HCURSOR32 hOldCursor;
+    HCURSOR hOldCursor;
 
     if (hCursor == hActiveCursor) return hActiveCursor;  /* No change */
     TRACE(cursor, "%04x\n", hCursor );
@@ -1182,14 +1182,14 @@ HCURSOR32 WINAPI SetCursor32(
  */
 void WINAPI SetCursorPos16( INT16 x, INT16 y )
 {
-    SetCursorPos32( x, y );
+    SetCursorPos( x, y );
 }
 
 
 /***********************************************************************
  *           SetCursorPos32    (USER32.474)
  */
-BOOL32 WINAPI SetCursorPos32( INT32 x, INT32 y )
+BOOL WINAPI SetCursorPos( INT x, INT y )
 {
     DISPLAY_MoveCursor( x, y );
     return TRUE;
@@ -1201,14 +1201,14 @@ BOOL32 WINAPI SetCursorPos32( INT32 x, INT32 y )
  */
 INT16 WINAPI ShowCursor16( BOOL16 bShow )
 {
-    return ShowCursor32( bShow );
+    return ShowCursor( bShow );
 }
 
 
 /***********************************************************************
  *           ShowCursor32    (USER32.530)
  */
-INT32 WINAPI ShowCursor32( BOOL32 bShow )
+INT WINAPI ShowCursor( BOOL bShow )
 {
     TRACE(cursor, "%d, count=%d\n",
                     bShow, CURSOR_ShowCount );
@@ -1242,7 +1242,7 @@ HCURSOR16 WINAPI GetCursor16(void)
 /***********************************************************************
  *           GetCursor32    (USER32.227)
  */
-HCURSOR32 WINAPI GetCursor32(void)
+HCURSOR WINAPI GetCursor(void)
 {
     return hActiveCursor;
 }
@@ -1253,7 +1253,7 @@ HCURSOR32 WINAPI GetCursor32(void)
  */
 BOOL16 WINAPI ClipCursor16( const RECT16 *rect )
 {
-    if (!rect) SetRectEmpty32( &CURSOR_ClipRect );
+    if (!rect) SetRectEmpty( &CURSOR_ClipRect );
     else CONV_RECT16TO32( rect, &CURSOR_ClipRect );
     return TRUE;
 }
@@ -1262,10 +1262,10 @@ BOOL16 WINAPI ClipCursor16( const RECT16 *rect )
 /***********************************************************************
  *           ClipCursor32    (USER32.53)
  */
-BOOL32 WINAPI ClipCursor32( const RECT32 *rect )
+BOOL WINAPI ClipCursor( const RECT *rect )
 {
-    if (!rect) SetRectEmpty32( &CURSOR_ClipRect );
-    else CopyRect32( &CURSOR_ClipRect, rect );
+    if (!rect) SetRectEmpty( &CURSOR_ClipRect );
+    else CopyRect( &CURSOR_ClipRect, rect );
     return TRUE;
 }
 
@@ -1305,9 +1305,9 @@ BOOL16 WINAPI GetCursorPos16( POINT16 *pt )
 /***********************************************************************
  *           GetCursorPos32    (USER32.229)
  */
-BOOL32 WINAPI GetCursorPos32( POINT32 *pt )
+BOOL WINAPI GetCursorPos( POINT *pt )
 {
-    BOOL32 ret;
+    BOOL ret;
 
     POINT16 pt16;
     ret = GetCursorPos16( &pt16 );
@@ -1328,11 +1328,11 @@ void WINAPI GetClipCursor16( RECT16 *rect )
 /***********************************************************************
  *           GetClipCursor32    (USER32.221)
  */
-BOOL32 WINAPI GetClipCursor32( RECT32 *rect )
+BOOL WINAPI GetClipCursor( RECT *rect )
 {
     if (rect) 
     {
-       CopyRect32( rect, &CURSOR_ClipRect );
+       CopyRect( rect, &CURSOR_ClipRect );
        return TRUE;
     }
     return FALSE;
@@ -1350,10 +1350,10 @@ INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE xdir, BOOL16 bIcon,
     UINT16 retVal = 0;
     if( dir && !dir->idReserved && (dir->idType & 3) )
     {
-        HDC32 hdc = GetDC32(0);
-	UINT32 palEnts = GetSystemPaletteEntries32(hdc, 0, 0, NULL);
+        HDC hdc = GetDC(0);
+	UINT palEnts = GetSystemPaletteEntries(hdc, 0, 0, NULL);
 	int colors = (cFlag & LR_MONOCHROME) ? 2 : palEnts;
-	ReleaseDC32(0, hdc);
+	ReleaseDC(0, hdc);
 
 	if( bIcon )
 	{
@@ -1375,8 +1375,8 @@ INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE xdir, BOOL16 bIcon,
 /**********************************************************************
  *          LookupIconIdFromDirectoryEx32       (USER32.380)
  */
-INT32 WINAPI LookupIconIdFromDirectoryEx32( LPBYTE dir, BOOL32 bIcon,
-             INT32 width, INT32 height, UINT32 cFlag )
+INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE dir, BOOL bIcon,
+             INT width, INT height, UINT cFlag )
 {
     return LookupIconIdFromDirectoryEx16( dir, bIcon, width, height, cFlag );
 }
@@ -1394,9 +1394,9 @@ INT16 WINAPI LookupIconIdFromDirectory16( LPBYTE dir, BOOL16 bIcon )
 /**********************************************************************
  *          LookupIconIdFromDirectory		(USER32.379)
  */
-INT32 WINAPI LookupIconIdFromDirectory32( LPBYTE dir, BOOL32 bIcon )
+INT WINAPI LookupIconIdFromDirectory( LPBYTE dir, BOOL bIcon )
 {
-    return LookupIconIdFromDirectoryEx32( dir, bIcon, 
+    return LookupIconIdFromDirectoryEx( dir, bIcon, 
 	   bIcon ? SYSMETRICS_CXICON : SYSMETRICS_CXCURSOR,
 	   bIcon ? SYSMETRICS_CYICON : SYSMETRICS_CYCURSOR, bIcon ? 0 : LR_MONOCHROME );
 }
@@ -1404,7 +1404,7 @@ INT32 WINAPI LookupIconIdFromDirectory32( LPBYTE dir, BOOL32 bIcon )
 /**********************************************************************
  *	    GetIconID    (USER.455)
  */
-WORD WINAPI GetIconID( HGLOBAL16 hResource, DWORD resType )
+WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType )
 {
     LPBYTE lpDir = (LPBYTE)GlobalLock16(hResource);
 
@@ -1430,7 +1430,7 @@ WORD WINAPI GetIconID( HGLOBAL16 hResource, DWORD resType )
  *
  * Supposed to load resources of Windows 2.x applications.
  */
-HGLOBAL16 WINAPI LoadCursorIconHandler( HGLOBAL16 hResource, HMODULE16 hModule, HRSRC16 hRsrc )
+HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule, HRSRC16 hRsrc )
 {
     FIXME(cursor,"(%04x,%04x,%04x): old 2.x resources are not supported!\n", 
 	  hResource, hModule, hRsrc);
@@ -1443,7 +1443,7 @@ HGLOBAL16 WINAPI LoadCursorIconHandler( HGLOBAL16 hResource, HMODULE16 hModule,
  * RT_ICON resource loader, installed by USER_SignalProc when module
  * is initialized.
  */
-HGLOBAL16 WINAPI LoadDIBIconHandler( HGLOBAL16 hMemObj, HMODULE16 hModule, HRSRC16 hRsrc )
+HGLOBAL16 WINAPI LoadDIBIconHandler16( HGLOBAL16 hMemObj, HMODULE16 hModule, HRSRC16 hRsrc )
 {
     /* If hResource is zero we must allocate a new memory block, if it's
      * non-zero but GlobalLock() returns NULL then it was discarded and
@@ -1467,7 +1467,7 @@ HGLOBAL16 WINAPI LoadDIBIconHandler( HGLOBAL16 hMemObj, HMODULE16 hModule, HRSRC
  *
  * RT_CURSOR resource loader. Same as above.
  */
-HGLOBAL16 WINAPI LoadDIBCursorHandler( HGLOBAL16 hMemObj, HMODULE16 hModule, HRSRC16 hRsrc )
+HGLOBAL16 WINAPI LoadDIBCursorHandler16( HGLOBAL16 hMemObj, HMODULE16 hModule, HRSRC16 hRsrc )
 {
     hMemObj = USER_CallDefaultRsrcHandler( hMemObj, hModule, hRsrc );
     if( hMemObj )
@@ -1483,7 +1483,7 @@ HGLOBAL16 WINAPI LoadDIBCursorHandler( HGLOBAL16 hMemObj, HMODULE16 hModule, HRS
 /**********************************************************************
  *	    LoadIconHandler    (USER.456)
  */
-HICON16 WINAPI LoadIconHandler( HGLOBAL16 hResource, BOOL16 bNew )
+HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew )
 {
     LPBYTE bits = (LPBYTE)LockResource16( hResource );
 
@@ -1496,24 +1496,24 @@ HICON16 WINAPI LoadIconHandler( HGLOBAL16 hResource, BOOL16 bNew )
 /***********************************************************************
  *           LoadCursorW                (USER32.362)
  */
-HCURSOR32 WINAPI LoadCursor32W(HINSTANCE32 hInstance, LPCWSTR name)
+HCURSOR WINAPI LoadCursorW(HINSTANCE hInstance, LPCWSTR name)
 {
-    return CURSORICON_Load32( hInstance, name,
+    return CURSORICON_Load( hInstance, name,
                               SYSMETRICS_CXCURSOR, SYSMETRICS_CYCURSOR, 1, TRUE, 0);
 }
 
 /***********************************************************************
  *           LoadCursorA                (USER32.359)
  */
-HCURSOR32 WINAPI LoadCursor32A(HINSTANCE32 hInstance, LPCSTR name)
+HCURSOR WINAPI LoadCursorA(HINSTANCE hInstance, LPCSTR name)
 {
-        HCURSOR32 res=0;
+        HCURSOR res=0;
         if(!HIWORD(name))
-                return LoadCursor32W(hInstance,(LPCWSTR)name);
+                return LoadCursorW(hInstance,(LPCWSTR)name);
         else
         {
             LPWSTR uni = HEAP_strdupAtoW( GetProcessHeap(), 0, name );
-            res = LoadCursor32W(hInstance, uni);
+            res = LoadCursorW(hInstance, uni);
             HeapFree( GetProcessHeap(), 0, uni);
         }
         return res;
@@ -1521,20 +1521,20 @@ HCURSOR32 WINAPI LoadCursor32A(HINSTANCE32 hInstance, LPCSTR name)
 /***********************************************************************
 *            LoadCursorFromFile32W    (USER32.361)
 */
-HCURSOR32 WINAPI LoadCursorFromFile32W (LPCWSTR name)
+HCURSOR WINAPI LoadCursorFromFileW (LPCWSTR name)
 {
-    return LoadImage32W(0, name, IMAGE_CURSOR, SYSMETRICS_CXCURSOR,
+    return LoadImageW(0, name, IMAGE_CURSOR, SYSMETRICS_CXCURSOR,
       SYSMETRICS_CYCURSOR, LR_LOADFROMFILE);
 }
 
 /***********************************************************************
 *            LoadCursorFromFile32A    (USER32.360)
 */
-HCURSOR32 WINAPI LoadCursorFromFile32A (LPCSTR name)
+HCURSOR WINAPI LoadCursorFromFileA (LPCSTR name)
 {
-    HCURSOR32 hcur;
+    HCURSOR hcur;
     LPWSTR u_name = HEAP_strdupAtoW( GetProcessHeap(), 0, name );
-    hcur = LoadCursorFromFile32W(u_name);
+    hcur = LoadCursorFromFileW(u_name);
     HeapFree( GetProcessHeap(), 0, u_name );
     return hcur;
 }
@@ -1542,13 +1542,13 @@ HCURSOR32 WINAPI LoadCursorFromFile32A (LPCSTR name)
 /***********************************************************************
  *           LoadIconW          (USER32.364)
  */
-HICON32 WINAPI LoadIcon32W(HINSTANCE32 hInstance, LPCWSTR name)
+HICON WINAPI LoadIconW(HINSTANCE hInstance, LPCWSTR name)
 {
-    HDC32 hdc = GetDC32(0);
-    UINT32 palEnts = GetSystemPaletteEntries32(hdc, 0, 0, NULL);
-    ReleaseDC32(0, hdc);
+    HDC hdc = GetDC(0);
+    UINT palEnts = GetSystemPaletteEntries(hdc, 0, 0, NULL);
+    ReleaseDC(0, hdc);
 
-    return CURSORICON_Load32( hInstance, name,
+    return CURSORICON_Load( hInstance, name,
                               SYSMETRICS_CXICON, SYSMETRICS_CYICON,
                               MIN( 16, palEnts ), FALSE, 0);
 }
@@ -1556,16 +1556,16 @@ HICON32 WINAPI LoadIcon32W(HINSTANCE32 hInstance, LPCWSTR name)
 /***********************************************************************
  *           LoadIconA          (USER32.363)
  */
-HICON32 WINAPI LoadIcon32A(HINSTANCE32 hInstance, LPCSTR name)
+HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name)
 {
-    HICON32 res=0;
+    HICON res=0;
 
     if( !HIWORD(name) )
-	return LoadIcon32W(hInstance, (LPCWSTR)name);
+	return LoadIconW(hInstance, (LPCWSTR)name);
     else
     {
 	LPWSTR uni = HEAP_strdupAtoW( GetProcessHeap(), 0, name );
-	res = LoadIcon32W( hInstance, uni );
+	res = LoadIconW( hInstance, uni );
 	HeapFree( GetProcessHeap(), 0, uni );
     }
     return res;
@@ -1576,8 +1576,8 @@ HICON32 WINAPI LoadIcon32A(HINSTANCE32 hInstance, LPCSTR name)
  */
 BOOL16 WINAPI GetIconInfo16(HICON16 hIcon,LPICONINFO16 iconinfo)
 {
-    ICONINFO32	ii32;
-    BOOL16	ret = GetIconInfo32((HICON32)hIcon, &ii32);
+    ICONINFO	ii32;
+    BOOL16	ret = GetIconInfo((HICON)hIcon, &ii32);
 
     iconinfo->fIcon = ii32.fIcon;
     iconinfo->xHotspot = ii32.xHotspot;
@@ -1590,7 +1590,7 @@ BOOL16 WINAPI GetIconInfo16(HICON16 hIcon,LPICONINFO16 iconinfo)
 /**********************************************************************
  *          GetIconInfo32		(USER32.242)
  */
-BOOL32 WINAPI GetIconInfo32(HICON32 hIcon,LPICONINFO32 iconinfo) {
+BOOL WINAPI GetIconInfo(HICON hIcon,LPICONINFO iconinfo) {
     CURSORICONINFO	*ciconinfo;
 
     ciconinfo = GlobalLock16(hIcon);
@@ -1600,12 +1600,12 @@ BOOL32 WINAPI GetIconInfo32(HICON32 hIcon,LPICONINFO32 iconinfo) {
     iconinfo->yHotspot = ciconinfo->ptHotSpot.y;
     iconinfo->fIcon    = TRUE; /* hmm */
 
-    iconinfo->hbmColor = CreateBitmap32 ( ciconinfo->nWidth, ciconinfo->nHeight,
+    iconinfo->hbmColor = CreateBitmap ( ciconinfo->nWidth, ciconinfo->nHeight,
                                 ciconinfo->bPlanes, ciconinfo->bBitsPerPixel,
                                 (char *)(ciconinfo + 1)
                                 + ciconinfo->nHeight *
                                 BITMAP_GetWidthBytes (ciconinfo->nWidth,1) );
-    iconinfo->hbmMask = CreateBitmap32 ( ciconinfo->nWidth, ciconinfo->nHeight,
+    iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, ciconinfo->nHeight,
                                 1, 1, (char *)(ciconinfo + 1));
 
     GlobalUnlock16(hIcon);
@@ -1616,9 +1616,9 @@ BOOL32 WINAPI GetIconInfo32(HICON32 hIcon,LPICONINFO32 iconinfo) {
 /**********************************************************************
  *          CreateIconIndirect		(USER32.78)
  */
-HICON32 WINAPI CreateIconIndirect(LPICONINFO32 iconinfo) {
+HICON WINAPI CreateIconIndirect(LPICONINFO iconinfo) {
     BITMAPOBJ *bmpXor,*bmpAnd;
-    HICON32 hObj;
+    HICON hObj;
     int	sizeXor,sizeAnd;
 
     bmpXor = (BITMAPOBJ *) GDI_GetObjPtr( iconinfo->hbmColor, BITMAP_MAGIC );
@@ -1644,8 +1644,8 @@ HICON32 WINAPI CreateIconIndirect(LPICONINFO32 iconinfo) {
 
 	/* Transfer the bitmap bits to the CURSORICONINFO structure */
 
-	GetBitmapBits32( iconinfo->hbmMask ,sizeAnd,(char*)(info + 1) );
-	GetBitmapBits32( iconinfo->hbmColor,sizeXor,(char*)(info + 1) +sizeAnd);
+	GetBitmapBits( iconinfo->hbmMask ,sizeAnd,(char*)(info + 1) );
+	GetBitmapBits( iconinfo->hbmColor,sizeXor,(char*)(info + 1) +sizeAnd);
 	GlobalUnlock16( hObj );
     }
     return hObj;
@@ -1660,7 +1660,7 @@ BOOL16 WINAPI DrawIconEx16 (HDC16 hdc, INT16 xLeft, INT16 yTop, HICON16 hIcon,
 			    INT16 cxWidth, INT16 cyWidth, UINT16 istep,
 			    HBRUSH16 hbr, UINT16 flags)
 {
-    return DrawIconEx32(hdc, xLeft, yTop, hIcon, cxWidth, cyWidth,
+    return DrawIconEx(hdc, xLeft, yTop, hIcon, cxWidth, cyWidth,
                         istep, hbr, flags);
 }
 
@@ -1686,14 +1686,14 @@ BOOL16 WINAPI DrawIconEx16 (HDC16 hdc, INT16 xLeft, INT16 yTop, HICON16 hIcon,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI DrawIconEx32( HDC32 hdc, INT32 x0, INT32 y0, HICON32 hIcon,
-                            INT32 cxWidth, INT32 cyWidth, UINT32 istep, 
-                            HBRUSH32 hbr, UINT32 flags )
+BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon,
+                            INT cxWidth, INT cyWidth, UINT istep, 
+                            HBRUSH hbr, UINT flags )
 {
     CURSORICONINFO *ptr = (CURSORICONINFO *)GlobalLock16 (hIcon);
-    HDC32 hDC_off = 0, hMemDC = CreateCompatibleDC32 (hdc);
-    BOOL32 result = FALSE, DoOffscreen = FALSE;
-    HBITMAP32 hB_off = 0, hOld = 0;
+    HDC hDC_off = 0, hMemDC = CreateCompatibleDC (hdc);
+    BOOL result = FALSE, DoOffscreen = FALSE;
+    HBITMAP hB_off = 0, hOld = 0;
 
     if (!ptr) return FALSE;
 
@@ -1706,14 +1706,14 @@ BOOL32 WINAPI DrawIconEx32( HDC32 hdc, INT32 x0, INT32 y0, HICON32 hIcon,
     if (cxWidth == 0)
     {
       if (flags & DI_DEFAULTSIZE)
-	cxWidth = GetSystemMetrics32 (SM_CXICON);
+	cxWidth = GetSystemMetrics (SM_CXICON);
       else
 	cxWidth = ptr->nWidth;
     }
     if (cyWidth == 0)
     {
       if (flags & DI_DEFAULTSIZE)
-        cyWidth = GetSystemMetrics32 (SM_CYICON);
+        cyWidth = GetSystemMetrics (SM_CYICON);
       else
 	cyWidth = ptr->nHeight;
     }
@@ -1730,73 +1730,73 @@ BOOL32 WINAPI DrawIconEx32( HDC32 hdc, INT32 x0, INT32 y0, HICON32 hIcon,
 	}
     }
     if (DoOffscreen) {
-      RECT32 r = {0, 0, cxWidth, cxWidth};
+      RECT r = {0, 0, cxWidth, cxWidth};
 
-      hDC_off = CreateCompatibleDC32(hdc);
-      hB_off = CreateCompatibleBitmap32(hdc, cxWidth, cyWidth);
+      hDC_off = CreateCompatibleDC(hdc);
+      hB_off = CreateCompatibleBitmap(hdc, cxWidth, cyWidth);
       if (hDC_off && hB_off) {
-	hOld = SelectObject32(hDC_off, hB_off);
-	FillRect32(hDC_off, &r, hbr);
+	hOld = SelectObject(hDC_off, hB_off);
+	FillRect(hDC_off, &r, hbr);
       }
     };
 
     if (hMemDC && (!DoOffscreen || (hDC_off && hB_off)))
     {
-	HBITMAP32 hXorBits, hAndBits;
+	HBITMAP hXorBits, hAndBits;
 	COLORREF  oldFg, oldBg;
-	INT32     nStretchMode;
+	INT     nStretchMode;
 
-	nStretchMode = SetStretchBltMode32 (hdc, STRETCH_DELETESCANS);
+	nStretchMode = SetStretchBltMode (hdc, STRETCH_DELETESCANS);
 
-	hXorBits = CreateBitmap32 ( ptr->nWidth, ptr->nHeight,
+	hXorBits = CreateBitmap ( ptr->nWidth, ptr->nHeight,
 				    ptr->bPlanes, ptr->bBitsPerPixel,
 				    (char *)(ptr + 1)
 				    + ptr->nHeight *
 				    BITMAP_GetWidthBytes(ptr->nWidth,1) );
-	hAndBits = CreateBitmap32 ( ptr->nWidth, ptr->nHeight,
+	hAndBits = CreateBitmap ( ptr->nWidth, ptr->nHeight,
 				    1, 1, (char *)(ptr+1) );
-	oldFg = SetTextColor32( hdc, RGB(0,0,0) );
-	oldBg = SetBkColor32( hdc, RGB(255,255,255) );
+	oldFg = SetTextColor( hdc, RGB(0,0,0) );
+	oldBg = SetBkColor( hdc, RGB(255,255,255) );
 
 	if (hXorBits && hAndBits)
 	{
-	    HBITMAP32 hBitTemp = SelectObject32( hMemDC, hAndBits );
+	    HBITMAP hBitTemp = SelectObject( hMemDC, hAndBits );
 	    if (flags & DI_MASK)
             {
 	      if (DoOffscreen) 
-		StretchBlt32 (hDC_off, 0, 0, cxWidth, cyWidth,
+		StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth,
 			      hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCAND);
 	      else 
-	        StretchBlt32 (hdc, x0, y0, cxWidth, cyWidth,
+	        StretchBlt (hdc, x0, y0, cxWidth, cyWidth,
 			      hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCAND);
             }
-	    SelectObject32( hMemDC, hXorBits );
+	    SelectObject( hMemDC, hXorBits );
 	    if (flags & DI_IMAGE)
             {
 	      if (DoOffscreen) 
-		StretchBlt32 (hDC_off, 0, 0, cxWidth, cyWidth,
+		StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth,
 			  hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT);
 	      else
-		StretchBlt32 (hdc, x0, y0, cxWidth, cyWidth,
+		StretchBlt (hdc, x0, y0, cxWidth, cyWidth,
 			      hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT);
             }
-	    SelectObject32( hMemDC, hBitTemp );
+	    SelectObject( hMemDC, hBitTemp );
 	    result = TRUE;
 	}
 
-	SetTextColor32( hdc, oldFg );
-	SetBkColor32( hdc, oldBg );
-	if (hXorBits) DeleteObject32( hXorBits );
-	if (hAndBits) DeleteObject32( hAndBits );
-	SetStretchBltMode32 (hdc, nStretchMode);
+	SetTextColor( hdc, oldFg );
+	SetBkColor( hdc, oldBg );
+	if (hXorBits) DeleteObject( hXorBits );
+	if (hAndBits) DeleteObject( hAndBits );
+	SetStretchBltMode (hdc, nStretchMode);
 	if (DoOffscreen) {
-	  BitBlt32(hdc, x0, y0, cxWidth, cyWidth, hDC_off, 0, 0, SRCCOPY);
-	  SelectObject32(hDC_off, hOld);
+	  BitBlt(hdc, x0, y0, cxWidth, cyWidth, hDC_off, 0, 0, SRCCOPY);
+	  SelectObject(hDC_off, hOld);
 	}
     }
-    if (hMemDC) DeleteDC32( hMemDC );
-    if (hDC_off) DeleteDC32(hDC_off);
-    if (hB_off) DeleteObject32(hB_off);
+    if (hMemDC) DeleteDC( hMemDC );
+    if (hDC_off) DeleteDC(hDC_off);
+    if (hB_off) DeleteObject(hB_off);
     GlobalUnlock16( hIcon );
     return result;
 }
diff --git a/objects/dc.c b/objects/dc.c
index 0141c0db999..54b20010212 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -112,7 +112,7 @@ DC *DC_AllocDC( const DC_FUNCTIONS *funcs )
 /***********************************************************************
  *           DC_GetDCPtr
  */
-DC *DC_GetDCPtr( HDC32 hdc )
+DC *DC_GetDCPtr( HDC hdc )
 {
     GDIOBJHDR *ptr = (GDIOBJHDR *)GDI_HEAP_LOCK( hdc );
     if (!ptr) return NULL;
@@ -130,12 +130,12 @@ DC *DC_GetDCPtr( HDC32 hdc )
  */
 void DC_InitDC( DC* dc )
 {
-    RealizeDefaultPalette( dc->hSelf );
-    SetTextColor32( dc->hSelf, dc->w.textColor );
-    SetBkColor32( dc->hSelf, dc->w.backgroundColor );
-    SelectObject32( dc->hSelf, dc->w.hPen );
-    SelectObject32( dc->hSelf, dc->w.hBrush );
-    SelectObject32( dc->hSelf, dc->w.hFont );
+    RealizeDefaultPalette16( dc->hSelf );
+    SetTextColor( dc->hSelf, dc->w.textColor );
+    SetBkColor( dc->hSelf, dc->w.backgroundColor );
+    SelectObject( dc->hSelf, dc->w.hPen );
+    SelectObject( dc->hSelf, dc->w.hBrush );
+    SelectObject( dc->hSelf, dc->w.hFont );
     CLIPPING_UpdateGCRegion( dc );
 }
 
@@ -147,7 +147,7 @@ void DC_InitDC( DC* dc )
  * xformDest. Returns TRUE if successful or FALSE if the xformSrc matrix
  * is singular.
  */
-static BOOL32 DC_InvertXform( const XFORM *xformSrc, XFORM *xformDest )
+static BOOL DC_InvertXform( const XFORM *xformSrc, XFORM *xformDest )
 {
     FLOAT determinant;
     
@@ -209,7 +209,7 @@ void DC_UpdateXforms( DC *dc )
 /***********************************************************************
  *           GetDCState    (GDI.179)
  */
-HDC16 WINAPI GetDCState( HDC16 hdc )
+HDC16 WINAPI GetDCState16( HDC16 hdc )
 {
     DC * newdc, * dc;
     HGDIOBJ16 handle;
@@ -273,7 +273,7 @@ HDC16 WINAPI GetDCState( HDC16 hdc )
     newdc->vportExtX          = dc->vportExtX;
     newdc->vportExtY          = dc->vportExtY;
 
-    newdc->hSelf = (HDC32)handle;
+    newdc->hSelf = (HDC)handle;
     newdc->saveLevel = 0;
 
     PATH_InitGdiPath( &newdc->w.path );
@@ -283,8 +283,8 @@ HDC16 WINAPI GetDCState( HDC16 hdc )
     newdc->w.hGCClipRgn = newdc->w.hVisRgn = 0;
     if (dc->w.hClipRgn)
     {
-	newdc->w.hClipRgn = CreateRectRgn32( 0, 0, 0, 0 );
-	CombineRgn32( newdc->w.hClipRgn, dc->w.hClipRgn, 0, RGN_COPY );
+	newdc->w.hClipRgn = CreateRectRgn( 0, 0, 0, 0 );
+	CombineRgn( newdc->w.hClipRgn, dc->w.hClipRgn, 0, RGN_COPY );
     }
     else
 	newdc->w.hClipRgn = 0;
@@ -297,7 +297,7 @@ HDC16 WINAPI GetDCState( HDC16 hdc )
 /***********************************************************************
  *           SetDCState    (GDI.180)
  */
-void WINAPI SetDCState( HDC16 hdc, HDC16 hdcs )
+void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs )
 {
     DC *dc, *dcs;
     
@@ -363,8 +363,8 @@ void WINAPI SetDCState( HDC16 hdc, HDC16 hdcs )
 
     if (dcs->w.hClipRgn)
     {
-        if (!dc->w.hClipRgn) dc->w.hClipRgn = CreateRectRgn32( 0, 0, 0, 0 );
-        CombineRgn32( dc->w.hClipRgn, dcs->w.hClipRgn, 0, RGN_COPY );
+        if (!dc->w.hClipRgn) dc->w.hClipRgn = CreateRectRgn( 0, 0, 0, 0 );
+        CombineRgn( dc->w.hClipRgn, dcs->w.hClipRgn, 0, RGN_COPY );
     }
     else
     {
@@ -373,13 +373,13 @@ void WINAPI SetDCState( HDC16 hdc, HDC16 hdcs )
     }
     CLIPPING_UpdateGCRegion( dc );
 
-    SelectObject32( hdc, dcs->w.hBitmap );
-    SelectObject32( hdc, dcs->w.hBrush );
-    SelectObject32( hdc, dcs->w.hFont );
-    SelectObject32( hdc, dcs->w.hPen );
-    SetBkColor32( hdc, dcs->w.backgroundColor);
-    SetTextColor32( hdc, dcs->w.textColor);
-    GDISelectPalette( hdc, dcs->w.hPalette, FALSE );
+    SelectObject( hdc, dcs->w.hBitmap );
+    SelectObject( hdc, dcs->w.hBrush );
+    SelectObject( hdc, dcs->w.hFont );
+    SelectObject( hdc, dcs->w.hPen );
+    SetBkColor( hdc, dcs->w.backgroundColor);
+    SetTextColor( hdc, dcs->w.textColor);
+    GDISelectPalette16( hdc, dcs->w.hPalette, FALSE );
     GDI_HEAP_UNLOCK( hdc );
     GDI_HEAP_UNLOCK( hdcs );
 }
@@ -390,18 +390,18 @@ void WINAPI SetDCState( HDC16 hdc, HDC16 hdcs )
  */
 INT16 WINAPI SaveDC16( HDC16 hdc )
 {
-    return (INT16)SaveDC32( hdc );
+    return (INT16)SaveDC( hdc );
 }
 
 
 /***********************************************************************
  *           SaveDC32    (GDI32.292)
  */
-INT32 WINAPI SaveDC32( HDC32 hdc )
+INT WINAPI SaveDC( HDC hdc )
 {
-    HDC32 hdcs;
+    HDC hdcs;
     DC * dc, * dcs;
-    INT32 ret;
+    INT ret;
 
     dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) 
@@ -412,7 +412,7 @@ INT32 WINAPI SaveDC32( HDC32 hdc )
 	GDI_HEAP_UNLOCK( hdc );
 	return 1;  /* ?? */
     }
-    if (!(hdcs = GetDCState( hdc )))
+    if (!(hdcs = GetDCState16( hdc )))
     {
       GDI_HEAP_UNLOCK( hdc );
       return 0;
@@ -429,7 +429,7 @@ INT32 WINAPI SaveDC32( HDC32 hdc )
     {
         GDI_HEAP_UNLOCK( hdc );
 	GDI_HEAP_UNLOCK( hdcs );
-	DeleteDC32( hdcs );
+	DeleteDC( hdcs );
 	return 0;
     }
     
@@ -448,17 +448,17 @@ INT32 WINAPI SaveDC32( HDC32 hdc )
  */
 BOOL16 WINAPI RestoreDC16( HDC16 hdc, INT16 level )
 {
-    return RestoreDC32( hdc, level );
+    return RestoreDC( hdc, level );
 }
 
 
 /***********************************************************************
  *           RestoreDC32    (GDI32.290)
  */
-BOOL32 WINAPI RestoreDC32( HDC32 hdc, INT32 level )
+BOOL WINAPI RestoreDC( HDC hdc, INT level )
 {
     DC * dc, * dcs;
-    BOOL32 success;
+    BOOL success;
 
     TRACE(dc, "%04x %d\n", hdc, level );
     dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
@@ -494,13 +494,13 @@ BOOL32 WINAPI RestoreDC32( HDC32 hdc, INT32 level )
 	dc->header.hNext = dcs->header.hNext;
 	if (--dc->saveLevel < level)
 	{
-	    SetDCState( hdc, hdcs );
+	    SetDCState16( hdc, hdcs );
             if (!PATH_AssignGdiPath( &dc->w.path, &dcs->w.path ))
 		/* FIXME: This might not be quite right, since we're
 		 * returning FALSE but still destroying the saved DC state */
 	        success=FALSE;
 	}
-	DeleteDC32( hdcs );
+	DeleteDC( hdcs );
     }
     GDI_HEAP_UNLOCK( hdc );
     return success;
@@ -540,8 +540,8 @@ HDC16 WINAPI CreateDC16( LPCSTR driver, LPCSTR device, LPCSTR output,
 /***********************************************************************
  *           CreateDC32A    (GDI32.)
  */
-HDC32 WINAPI CreateDC32A( LPCSTR driver, LPCSTR device, LPCSTR output,
-                          const DEVMODE32A *initData )
+HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output,
+                          const DEVMODEA *initData )
 {
     return CreateDC16( driver, device, output, (const DEVMODE16 *)initData );
 }
@@ -550,13 +550,13 @@ HDC32 WINAPI CreateDC32A( LPCSTR driver, LPCSTR device, LPCSTR output,
 /***********************************************************************
  *           CreateDC32W    (GDI32.)
  */
-HDC32 WINAPI CreateDC32W( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
-                          const DEVMODE32W *initData )
+HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
+                          const DEVMODEW *initData )
 { 
     LPSTR driverA = HEAP_strdupWtoA( GetProcessHeap(), 0, driver );
     LPSTR deviceA = HEAP_strdupWtoA( GetProcessHeap(), 0, device );
     LPSTR outputA = HEAP_strdupWtoA( GetProcessHeap(), 0, output );
-    HDC32 res = CreateDC16( driverA, deviceA, outputA,
+    HDC res = CreateDC16( driverA, deviceA, outputA,
                             (const DEVMODE16 *)initData /*FIXME*/ );
     HeapFree( GetProcessHeap(), 0, driverA );
     HeapFree( GetProcessHeap(), 0, deviceA );
@@ -579,22 +579,22 @@ HDC16 WINAPI CreateIC16( LPCSTR driver, LPCSTR device, LPCSTR output,
 /***********************************************************************
  *           CreateIC32A    (GDI32.49)
  */
-HDC32 WINAPI CreateIC32A( LPCSTR driver, LPCSTR device, LPCSTR output,
-                          const DEVMODE32A* initData )
+HDC WINAPI CreateICA( LPCSTR driver, LPCSTR device, LPCSTR output,
+                          const DEVMODEA* initData )
 {
       /* Nothing special yet for ICs */
-    return CreateDC32A( driver, device, output, initData );
+    return CreateDCA( driver, device, output, initData );
 }
 
 
 /***********************************************************************
  *           CreateIC32W    (GDI32.50)
  */
-HDC32 WINAPI CreateIC32W( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
-                          const DEVMODE32W* initData )
+HDC WINAPI CreateICW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
+                          const DEVMODEW* initData )
 {
       /* Nothing special yet for ICs */
-    return CreateDC32W( driver, device, output, initData );
+    return CreateDCW( driver, device, output, initData );
 }
 
 
@@ -603,17 +603,17 @@ HDC32 WINAPI CreateIC32W( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
  */
 HDC16 WINAPI CreateCompatibleDC16( HDC16 hdc )
 {
-    return (HDC16)CreateCompatibleDC32( hdc );
+    return (HDC16)CreateCompatibleDC( hdc );
 }
 
 
 /***********************************************************************
  *           CreateCompatibleDC32   (GDI32.31)
  */
-HDC32 WINAPI CreateCompatibleDC32( HDC32 hdc )
+HDC WINAPI CreateCompatibleDC( HDC hdc )
 {
     DC *dc, *origDC;
-    HBITMAP32 hbitmap;
+    HBITMAP hbitmap;
     const DC_FUNCTIONS *funcs;
 
     if ((origDC = (DC *)GDI_GetObjPtr( hdc, DC_MAGIC ))) funcs = origDC->funcs;
@@ -626,7 +626,7 @@ HDC32 WINAPI CreateCompatibleDC32( HDC32 hdc )
                hdc, dc->hSelf );
 
       /* Create default bitmap */
-    if (!(hbitmap = CreateBitmap32( 1, 1, 1, 1, NULL )))
+    if (!(hbitmap = CreateBitmap( 1, 1, 1, 1, NULL )))
     {
 	GDI_HEAP_FREE( dc->hSelf );
 	return 0;
@@ -640,7 +640,7 @@ HDC32 WINAPI CreateCompatibleDC32( HDC32 hdc )
         !dc->funcs->pCreateDC( dc, NULL, NULL, NULL, NULL ))
     {
         WARN(dc, "creation aborted by device\n");
-        DeleteObject32( hbitmap );
+        DeleteObject( hbitmap );
         GDI_HEAP_FREE( dc->hSelf );
         return 0;
     }
@@ -656,14 +656,14 @@ HDC32 WINAPI CreateCompatibleDC32( HDC32 hdc )
  */
 BOOL16 WINAPI DeleteDC16( HDC16 hdc )
 {
-    return DeleteDC32( hdc );
+    return DeleteDC( hdc );
 }
 
 
 /***********************************************************************
  *           DeleteDC32    (GDI32.67)
  */
-BOOL32 WINAPI DeleteDC32( HDC32 hdc )
+BOOL WINAPI DeleteDC( HDC hdc )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return FALSE;
@@ -677,21 +677,21 @@ BOOL32 WINAPI DeleteDC32( HDC32 hdc )
 	if (!(dcs = (DC *) GDI_GetObjPtr( hdcs, DC_MAGIC ))) break;
 	dc->header.hNext = dcs->header.hNext;
 	dc->saveLevel--;
-	DeleteDC32( hdcs );
+	DeleteDC( hdcs );
     }
     
     if (!(dc->w.flags & DC_SAVED))
     {
-	SelectObject32( hdc, STOCK_BLACK_PEN );
-	SelectObject32( hdc, STOCK_WHITE_BRUSH );
-	SelectObject32( hdc, STOCK_SYSTEM_FONT );
-        if (dc->w.flags & DC_MEMORY) DeleteObject32( dc->w.hFirstBitmap );
+	SelectObject( hdc, STOCK_BLACK_PEN );
+	SelectObject( hdc, STOCK_WHITE_BRUSH );
+	SelectObject( hdc, STOCK_SYSTEM_FONT );
+        if (dc->w.flags & DC_MEMORY) DeleteObject( dc->w.hFirstBitmap );
         if (dc->funcs->pDeleteDC) dc->funcs->pDeleteDC(dc);
     }
 
-    if (dc->w.hClipRgn) DeleteObject32( dc->w.hClipRgn );
-    if (dc->w.hVisRgn) DeleteObject32( dc->w.hVisRgn );
-    if (dc->w.hGCClipRgn) DeleteObject32( dc->w.hGCClipRgn );
+    if (dc->w.hClipRgn) DeleteObject( dc->w.hClipRgn );
+    if (dc->w.hVisRgn) DeleteObject( dc->w.hVisRgn );
+    if (dc->w.hGCClipRgn) DeleteObject( dc->w.hGCClipRgn );
     
     PATH_DestroyGdiPath(&dc->w.path);
     
@@ -712,7 +712,7 @@ HDC16 WINAPI ResetDC16( HDC16 hdc, const DEVMODE16 *devmode )
 /***********************************************************************
  *           ResetDC32A    (GDI32.287)
  */
-HDC32 WINAPI ResetDC32A( HDC32 hdc, const DEVMODE32A *devmode )
+HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode )
 {
     FIXME(dc, "stub\n" );
     return hdc;
@@ -722,7 +722,7 @@ HDC32 WINAPI ResetDC32A( HDC32 hdc, const DEVMODE32A *devmode )
 /***********************************************************************
  *           ResetDC32W    (GDI32.288)
  */
-HDC32 WINAPI ResetDC32W( HDC32 hdc, const DEVMODE32W *devmode )
+HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode )
 {
     FIXME(dc, "stub\n" );
     return hdc;
@@ -734,17 +734,17 @@ HDC32 WINAPI ResetDC32W( HDC32 hdc, const DEVMODE32W *devmode )
  */
 INT16 WINAPI GetDeviceCaps16( HDC16 hdc, INT16 cap )
 {
-    return GetDeviceCaps32( hdc, cap );
+    return GetDeviceCaps( hdc, cap );
 }
 
 
 /***********************************************************************
  *           GetDeviceCaps32    (GDI32.171)
  */
-INT32 WINAPI GetDeviceCaps32( HDC32 hdc, INT32 cap )
+INT WINAPI GetDeviceCaps( HDC hdc, INT cap )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
-    INT32 ret;
+    INT ret;
 
     if (!dc) return 0;
 
@@ -767,14 +767,14 @@ INT32 WINAPI GetDeviceCaps32( HDC32 hdc, INT32 cap )
  */
 COLORREF WINAPI SetBkColor16( HDC16 hdc, COLORREF color )
 {
-    return SetBkColor32( hdc, color );
+    return SetBkColor( hdc, color );
 }
 
 
 /***********************************************************************
  *           SetBkColor32    (GDI32.305)
  */
-COLORREF WINAPI SetBkColor32( HDC32 hdc, COLORREF color )
+COLORREF WINAPI SetBkColor( HDC hdc, COLORREF color )
 {
     COLORREF oldColor;
     DC * dc = DC_GetDCPtr( hdc );
@@ -796,14 +796,14 @@ COLORREF WINAPI SetBkColor32( HDC32 hdc, COLORREF color )
  */
 COLORREF WINAPI SetTextColor16( HDC16 hdc, COLORREF color )
 {
-    return SetTextColor32( hdc, color );
+    return SetTextColor( hdc, color );
 }
 
 
 /***********************************************************************
  *           SetTextColor32    (GDI32.338)
  */
-COLORREF WINAPI SetTextColor32( HDC32 hdc, COLORREF color )
+COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color )
 {
     COLORREF oldColor;
     DC * dc = DC_GetDCPtr( hdc );
@@ -825,16 +825,16 @@ COLORREF WINAPI SetTextColor32( HDC32 hdc, COLORREF color )
  */
 UINT16 WINAPI SetTextAlign16( HDC16 hdc, UINT16 textAlign )
 {
-    return SetTextAlign32( hdc, textAlign );
+    return SetTextAlign( hdc, textAlign );
 }
 
 
 /***********************************************************************
  *           SetTextAlign32    (GDI32.336)
  */
-UINT32 WINAPI SetTextAlign32( HDC32 hdc, UINT32 textAlign )
+UINT WINAPI SetTextAlign( HDC hdc, UINT textAlign )
 {
-    UINT32 prevAlign;
+    UINT prevAlign;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc)
     {
@@ -853,7 +853,7 @@ UINT32 WINAPI SetTextAlign32( HDC32 hdc, UINT32 textAlign )
 /***********************************************************************
  *           GetDCOrgEx  (GDI32.168)
  */
-BOOL32 WINAPI GetDCOrgEx( HDC32 hDC, LPPOINT32 lpp )
+BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp )
 {
     DC * dc;
     X11DRV_PDEVICE *physDev;
@@ -880,9 +880,9 @@ BOOL32 WINAPI GetDCOrgEx( HDC32 hDC, LPPOINT32 lpp )
 /***********************************************************************
  *           GetDCOrg    (GDI.79)
  */
-DWORD WINAPI GetDCOrg( HDC16 hdc )
+DWORD WINAPI GetDCOrg16( HDC16 hdc )
 {
-    POINT32	pt;
+    POINT	pt;
     if( GetDCOrgEx( hdc, &pt) )
   	return MAKELONG( (WORD)pt.x, (WORD)pt.y );    
     return 0;
@@ -892,7 +892,7 @@ DWORD WINAPI GetDCOrg( HDC16 hdc )
 /***********************************************************************
  *           SetDCOrg    (GDI.117)
  */
-DWORD WINAPI SetDCOrg( HDC16 hdc, INT16 x, INT16 y )
+DWORD WINAPI SetDCOrg16( HDC16 hdc, INT16 x, INT16 y )
 {
     DWORD prevOrg;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
@@ -908,7 +908,7 @@ DWORD WINAPI SetDCOrg( HDC16 hdc, INT16 x, INT16 y )
 /***********************************************************************
  *           GetGraphicsMode    (GDI32.188)
  */
-INT32 WINAPI GetGraphicsMode( HDC32 hdc )
+INT WINAPI GetGraphicsMode( HDC hdc )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return 0;
@@ -919,9 +919,9 @@ INT32 WINAPI GetGraphicsMode( HDC32 hdc )
 /***********************************************************************
  *           SetGraphicsMode    (GDI32.317)
  */
-INT32 WINAPI SetGraphicsMode( HDC32 hdc, INT32 mode )
+INT WINAPI SetGraphicsMode( HDC hdc, INT mode )
 {
-    INT32 ret;
+    INT ret;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
 
     /* One would think that setting the graphics mode to GM_COMPATIBLE
@@ -943,14 +943,14 @@ INT32 WINAPI SetGraphicsMode( HDC32 hdc, INT32 mode )
  */
 INT16 WINAPI GetArcDirection16( HDC16 hdc )
 {
-    return GetArcDirection32( (HDC32)hdc );
+    return GetArcDirection( (HDC)hdc );
 }
 
 
 /***********************************************************************
  *           GetArcDirection32    (GDI32.141)
  */
-INT32 WINAPI GetArcDirection32( HDC32 hdc )
+INT WINAPI GetArcDirection( HDC hdc )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     
@@ -966,17 +966,17 @@ INT32 WINAPI GetArcDirection32( HDC32 hdc )
  */
 INT16 WINAPI SetArcDirection16( HDC16 hdc, INT16 nDirection )
 {
-    return SetArcDirection32( (HDC32)hdc, (INT32)nDirection );
+    return SetArcDirection( (HDC)hdc, (INT)nDirection );
 }
 
 
 /***********************************************************************
  *           SetArcDirection32    (GDI32.302)
  */
-INT32 WINAPI SetArcDirection32( HDC32 hdc, INT32 nDirection )
+INT WINAPI SetArcDirection( HDC hdc, INT nDirection )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
-    INT32 nOldDirection;
+    INT nOldDirection;
     
     if (!dc)
         return 0;
@@ -997,7 +997,7 @@ INT32 WINAPI SetArcDirection32( HDC32 hdc, INT32 nDirection )
 /***********************************************************************
  *           GetWorldTransform    (GDI32.244)
  */
-BOOL32 WINAPI GetWorldTransform( HDC32 hdc, LPXFORM xform )
+BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     
@@ -1015,7 +1015,7 @@ BOOL32 WINAPI GetWorldTransform( HDC32 hdc, LPXFORM xform )
 /***********************************************************************
  *           SetWorldTransform    (GDI32.346)
  */
-BOOL32 WINAPI SetWorldTransform( HDC32 hdc, const XFORM *xform )
+BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     
@@ -1062,7 +1062,7 @@ BOOL32 WINAPI SetWorldTransform( HDC32 hdc, const XFORM *xform )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI ModifyWorldTransform( HDC32 hdc, const XFORM *xform,
+BOOL WINAPI ModifyWorldTransform( HDC hdc, const XFORM *xform,
     DWORD iMode )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
@@ -1122,7 +1122,7 @@ BOOL32 WINAPI ModifyWorldTransform( HDC32 hdc, const XFORM *xform,
  *
  * RETURNS STD
  */
-BOOL32 WINAPI CombineTransform( LPXFORM xformResult, const XFORM *xform1,
+BOOL WINAPI CombineTransform( LPXFORM xformResult, const XFORM *xform1,
     const XFORM *xform2 )
 {
     XFORM xformTemp;
@@ -1163,7 +1163,7 @@ BOOL16 WINAPI SetDCHook( HDC16 hdc, FARPROC16 hookProc, DWORD dwHookData )
     DC *dc = (DC *)GDI_GetObjPtr( hdc, DC_MAGIC );
 
     TRACE(dc, "hookProc %08x, default is %08x\n",
-                (UINT32)hookProc, (UINT32)DCHook );
+                (UINT)hookProc, (UINT)DCHook16 );
 
     if (!dc) return FALSE;
     dc->hookProc = hookProc;
@@ -1189,7 +1189,7 @@ DWORD WINAPI GetDCHook( HDC16 hdc, FARPROC16 *phookProc )
 /***********************************************************************
  *           SetHookFlags       (GDI.192)
  */
-WORD WINAPI SetHookFlags(HDC16 hDC, WORD flags)
+WORD WINAPI SetHookFlags16(HDC16 hDC, WORD flags)
 {
     DC* dc = (DC*)GDI_GetObjPtr( hDC, DC_MAGIC );
 
@@ -1215,7 +1215,7 @@ WORD WINAPI SetHookFlags(HDC16 hDC, WORD flags)
 /***********************************************************************
  *           SetICMMode    (GDI32.318)
  */
-INT32 WINAPI SetICMMode(HDC32 hdc, INT32 iEnableICM)
+INT WINAPI SetICMMode(HDC hdc, INT iEnableICM)
 {
 /*FIXME  Asuming that ICM is always off, and cannot be turned on */
     if (iEnableICM == ICM_OFF) return ICM_OFF;
@@ -1228,7 +1228,7 @@ INT32 WINAPI SetICMMode(HDC32 hdc, INT32 iEnableICM)
 /***********************************************************************
  *           GetColorSpace    (GDI32.165)
  */
-HCOLORSPACE32 WINAPI GetColorSpace(HDC32 hdc)
+HCOLORSPACE WINAPI GetColorSpace(HDC hdc)
 {
 /*FIXME    Need to to whatever GetColorSpace actually does */
     return 0;
@@ -1245,7 +1245,7 @@ UINT16 WINAPI GetBoundsRect16(HDC16 hdc, LPRECT16 rect, UINT16 flags)
 /***********************************************************************
  *           GetBoundsRect32    (GDI32.147)
  */
-UINT32 WINAPI GetBoundsRect32(HDC32 hdc, LPRECT32 rect, UINT32 flags)
+UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags)
 {
     FIXME(dc, "(): stub\n");
     return DCB_RESET;   /* bounding rectangle always empty */
@@ -1265,7 +1265,7 @@ UINT16 WINAPI SetBoundsRect16(HDC16 hdc, const RECT16* rect, UINT16 flags)
 /***********************************************************************
  *           SetBoundsRect32    (GDI32.307)
  */
-UINT32 WINAPI SetBoundsRect32(HDC32 hdc, const RECT32* rect, UINT32 flags)
+UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags)
 {
     FIXME(dc, "(): stub\n");
     return DCB_DISABLE;   /* bounding rectangle always empty */
@@ -1278,7 +1278,7 @@ UINT32 WINAPI SetBoundsRect32(HDC32 hdc, const RECT32* rect, UINT32 flags)
  * We don't have to do anything here,
  * just let console support handle everything
  */
-void WINAPI Death(HDC16 hDC)
+void WINAPI Death16(HDC16 hDC)
 {
     MSG("Death(%04x) called. Application enters text mode...\n", hDC);
 }
@@ -1288,7 +1288,7 @@ void WINAPI Death(HDC16 hDC)
  *
  * Restores GDI functionality
  */
-void WINAPI Resurrection(HDC16 hDC,
+void WINAPI Resurrection16(HDC16 hDC,
                            WORD w1, WORD w2, WORD w3, WORD w4, WORD w5, WORD w6)
 {
     MSG("Resurrection(%04x, %04x, %04x, %04x, %04x, %04x, %04x) called. Application left text mode.\n", hDC, w1, w2, w3, w4, w5, w6);
diff --git a/objects/dcvalues.c b/objects/dcvalues.c
index d4b7f5f5106..b1c60760259 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -18,7 +18,7 @@ func_type WINAPI func_name( HDC16 hdc ) \
 }
 
 #define DC_GET_VAL_32( func_type, func_name, dc_field ) \
-func_type WINAPI func_name( HDC32 hdc ) \
+func_type WINAPI func_name( HDC hdc ) \
 { \
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ); \
     if (!dc) return 0; \
@@ -47,12 +47,12 @@ BOOL16 WINAPI func_name##16( HDC16 hdc, LP##type##16 pt ) \
     return TRUE; \
 } \
  \
-BOOL32 WINAPI func_name##32( HDC32 hdc, LP##type##32 pt ) \
+BOOL WINAPI func_name( HDC hdc, LP##type pt ) \
 { \
     DC * dc = (DC *) GDI_GetObjPtr( (HDC16)hdc, DC_MAGIC ); \
     if (!dc) return FALSE; \
-    ((LPPOINT32)pt)->x = dc->ret_x; \
-    ((LPPOINT32)pt)->y = dc->ret_y; \
+    ((LPPOINT)pt)->x = dc->ret_x; \
+    ((LPPOINT)pt)->y = dc->ret_y; \
     return TRUE; \
 }
 
@@ -74,9 +74,9 @@ INT16 WINAPI func_name( HDC16 hdc, INT16 mode ) \
 }
 
 #define DC_SET_MODE_32( func_name, dc_field, min_val, max_val, meta_func ) \
-INT32 WINAPI func_name( HDC32 hdc, INT32 mode ) \
+INT WINAPI func_name( HDC hdc, INT mode ) \
 { \
-    INT32 prevMode; \
+    INT prevMode; \
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ); \
     if ((mode < min_val) || (mode > max_val)) return 0; \
     if (!dc) { \
@@ -93,51 +93,51 @@ INT32 WINAPI func_name( HDC32 hdc, INT32 mode ) \
 
 DC_SET_MODE_16( SetBkMode16, w.backgroundMode, TRANSPARENT,     /* GDI.2     */
                 OPAQUE, META_SETBKMODE )
-DC_SET_MODE_32( SetBkMode32, w.backgroundMode, TRANSPARENT,     /* GDI32.306 */
+DC_SET_MODE_32( SetBkMode, w.backgroundMode, TRANSPARENT,     /* GDI32.306 */
                 OPAQUE, META_SETBKMODE )
 DC_SET_MODE_16( SetROP216, w.ROPmode, R2_BLACK, R2_WHITE,       /* GDI.4     */
                 META_SETROP2 )
-DC_SET_MODE_32( SetROP232, w.ROPmode, R2_BLACK, R2_WHITE,       /* GDI32.331 */
+DC_SET_MODE_32( SetROP2, w.ROPmode, R2_BLACK, R2_WHITE,       /* GDI32.331 */
                 META_SETROP2 )
 DC_SET_MODE_16( SetRelAbs16, w.relAbsMode, ABSOLUTE, RELATIVE,  /* GDI.5     */
                 META_SETRELABS )
-DC_SET_MODE_32( SetRelAbs32, w.relAbsMode, ABSOLUTE, RELATIVE,  /* GDI32.333 */
+DC_SET_MODE_32( SetRelAbs, w.relAbsMode, ABSOLUTE, RELATIVE,  /* GDI32.333 */
                 META_SETRELABS )
 DC_SET_MODE_16( SetPolyFillMode16, w.polyFillMode,              /* GDI.6     */
                 ALTERNATE, WINDING, META_SETPOLYFILLMODE )
-DC_SET_MODE_32( SetPolyFillMode32, w.polyFillMode,              /* GDI32.330 */
+DC_SET_MODE_32( SetPolyFillMode, w.polyFillMode,              /* GDI32.330 */
                 ALTERNATE, WINDING, META_SETPOLYFILLMODE )
 DC_SET_MODE_16( SetStretchBltMode16, w.stretchBltMode,          /* GDI.7     */
                 BLACKONWHITE, COLORONCOLOR, META_SETSTRETCHBLTMODE )
-DC_SET_MODE_32( SetStretchBltMode32, w.stretchBltMode,          /* GDI32.334 */
+DC_SET_MODE_32( SetStretchBltMode, w.stretchBltMode,          /* GDI32.334 */
                 BLACKONWHITE, COLORONCOLOR, META_SETSTRETCHBLTMODE )
 DC_GET_VAL_16( COLORREF, GetBkColor16, w.backgroundColor )      /* GDI.75    */
-DC_GET_VAL_32( COLORREF, GetBkColor32, w.backgroundColor )      /* GDI32.145 */
+DC_GET_VAL_32( COLORREF, GetBkColor, w.backgroundColor )      /* GDI32.145 */
 DC_GET_VAL_16( INT16, GetBkMode16, w.backgroundMode )           /* GDI.76    */
-DC_GET_VAL_32( INT32, GetBkMode32, w.backgroundMode )           /* GDI32.146 */
-DC_GET_X_Y( DWORD, GetCurrentPosition, w.CursPosX, w.CursPosY ) /* GDI.78    */
+DC_GET_VAL_32( INT, GetBkMode, w.backgroundMode )           /* GDI32.146 */
+DC_GET_X_Y( DWORD, GetCurrentPosition16, w.CursPosX, w.CursPosY ) /* GDI.78    */
 DC_GET_VAL_16( INT16, GetMapMode16, w.MapMode )                 /* GDI.81    */
-DC_GET_VAL_32( INT32, GetMapMode32, w.MapMode )                 /* GDI32.196 */
+DC_GET_VAL_32( INT, GetMapMode, w.MapMode )                 /* GDI32.196 */
 DC_GET_VAL_16( INT16, GetPolyFillMode16, w.polyFillMode )       /* GDI.84    */
-DC_GET_VAL_32( INT32, GetPolyFillMode32, w.polyFillMode )       /* GDI32.213 */
+DC_GET_VAL_32( INT, GetPolyFillMode, w.polyFillMode )       /* GDI32.213 */
 DC_GET_VAL_16( INT16, GetROP216, w.ROPmode )                    /* GDI.85    */
-DC_GET_VAL_32( INT32, GetROP232, w.ROPmode )                    /* GDI32.214 */
+DC_GET_VAL_32( INT, GetROP2, w.ROPmode )                    /* GDI32.214 */
 DC_GET_VAL_16( INT16, GetRelAbs16, w.relAbsMode )               /* GDI.86    */
-DC_GET_VAL_32( INT32, GetRelAbs32, w.relAbsMode )               /* GDI32.218 */
+DC_GET_VAL_32( INT, GetRelAbs, w.relAbsMode )               /* GDI32.218 */
 DC_GET_VAL_16( INT16, GetStretchBltMode16, w.stretchBltMode )   /* GDI.88    */
-DC_GET_VAL_32( INT32, GetStretchBltMode32, w.stretchBltMode )   /* GDI32.221 */
+DC_GET_VAL_32( INT, GetStretchBltMode, w.stretchBltMode )   /* GDI32.221 */
 DC_GET_VAL_16( COLORREF, GetTextColor16, w.textColor )          /* GDI.90    */
-DC_GET_VAL_32( COLORREF, GetTextColor32, w.textColor )          /* GDI32.227 */
-DC_GET_X_Y( DWORD, GetViewportExt, vportExtX, vportExtY )       /* GDI.94    */
-DC_GET_X_Y( DWORD, GetViewportOrg, vportOrgX, vportOrgY )       /* GDI.95    */
-DC_GET_X_Y( DWORD, GetWindowExt, wndExtX, wndExtY )             /* GDI.96    */
-DC_GET_X_Y( DWORD, GetWindowOrg, wndOrgX, wndOrgY )             /* GDI.97    */
-DC_GET_VAL_16( HRGN16, InquireVisRgn, w.hVisRgn )               /* GDI.131   */
+DC_GET_VAL_32( COLORREF, GetTextColor, w.textColor )          /* GDI32.227 */
+DC_GET_X_Y( DWORD, GetViewportExt16, vportExtX, vportExtY )       /* GDI.94    */
+DC_GET_X_Y( DWORD, GetViewportOrg16, vportOrgX, vportOrgY )       /* GDI.95    */
+DC_GET_X_Y( DWORD, GetWindowExt16, wndExtX, wndExtY )             /* GDI.96    */
+DC_GET_X_Y( DWORD, GetWindowOrg16, wndOrgX, wndOrgY )             /* GDI.97    */
+DC_GET_VAL_16( HRGN16, InquireVisRgn16, w.hVisRgn )               /* GDI.131   */
 DC_GET_VAL_16( HRGN16, GetClipRgn16, w.hClipRgn )               /* GDI.173   */
-DC_GET_X_Y( DWORD, GetBrushOrg, w.brushOrgX, w.brushOrgY )      /* GDI.149   */
+DC_GET_X_Y( DWORD, GetBrushOrg16, w.brushOrgX, w.brushOrgY )      /* GDI.149   */
 DC_GET_VAL_16( UINT16, GetTextAlign16, w.textAlign )            /* GDI.345   */
-DC_GET_VAL_32( UINT32, GetTextAlign32, w.textAlign )            /* GDI32.224 */
-DC_GET_VAL_16( HFONT16, GetCurLogFont, w.hFont )                /* GDI.411   */
+DC_GET_VAL_32( UINT, GetTextAlign, w.textAlign )            /* GDI32.224 */
+DC_GET_VAL_16( HFONT16, GetCurLogFont16, w.hFont )                /* GDI.411   */
 DC_GET_VAL_EX( GetBrushOrgEx, w.brushOrgX, w.brushOrgY, POINT ) /* GDI.469 GDI32.148 */
 DC_GET_VAL_EX( GetCurrentPositionEx, w.CursPosX, w.CursPosY,    /* GDI.470 GDI32.167 */
                POINT )
diff --git a/objects/dib.c b/objects/dib.c
index 8c43fe70abc..b3e93460f72 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -117,7 +117,7 @@ INT16 WINAPI StretchDIBits16(HDC16 hdc, INT16 xDst, INT16 yDst, INT16 widthDst,
                        INT16 heightSrc, const VOID *bits,
                        const BITMAPINFO *info, UINT16 wUsage, DWORD dwRop )
 {
-    return (INT16)StretchDIBits32( hdc, xDst, yDst, widthDst, heightDst,
+    return (INT16)StretchDIBits( hdc, xDst, yDst, widthDst, heightDst,
                                    xSrc, ySrc, widthSrc, heightSrc, bits,
                                    info, wUsage, dwRop );
 }
@@ -126,10 +126,10 @@ INT16 WINAPI StretchDIBits16(HDC16 hdc, INT16 xDst, INT16 yDst, INT16 widthDst,
 /***********************************************************************
  *           StretchDIBits32   (GDI32.351)
  */
-INT32 WINAPI StretchDIBits32(HDC32 hdc, INT32 xDst, INT32 yDst, INT32 widthDst,
-                       INT32 heightDst, INT32 xSrc, INT32 ySrc, INT32 widthSrc,
-                       INT32 heightSrc, const void *bits,
-                       const BITMAPINFO *info, UINT32 wUsage, DWORD dwRop )
+INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst,
+                       INT heightDst, INT xSrc, INT ySrc, INT widthSrc,
+                       INT heightSrc, const void *bits,
+                       const BITMAPINFO *info, UINT wUsage, DWORD dwRop )
 {
     DC *dc = DC_GetDCPtr( hdc );
     if(!dc) return FALSE;
@@ -140,20 +140,20 @@ INT32 WINAPI StretchDIBits32(HDC32 hdc, INT32 xDst, INT32 yDst, INT32 widthDst,
 					    heightSrc, bits, info, wUsage,
 					    dwRop);
     else { /* use StretchBlt32 */
-        HBITMAP32 hBitmap, hOldBitmap;
-	HDC32 hdcMem;
+        HBITMAP hBitmap, hOldBitmap;
+	HDC hdcMem;
     
-	hBitmap = CreateDIBitmap32( hdc, &info->bmiHeader, CBM_INIT,
+	hBitmap = CreateDIBitmap( hdc, &info->bmiHeader, CBM_INIT,
 				    bits, info, wUsage );
-	hdcMem = CreateCompatibleDC32( hdc );
-	hOldBitmap = SelectObject32( hdcMem, hBitmap );
+	hdcMem = CreateCompatibleDC( hdc );
+	hOldBitmap = SelectObject( hdcMem, hBitmap );
         /* Origin for DIBitmap is bottom left ! */
-        StretchBlt32( hdc, xDst, yDst, widthDst, heightDst,
+        StretchBlt( hdc, xDst, yDst, widthDst, heightDst,
                       hdcMem, xSrc, info->bmiHeader.biHeight - heightSrc - ySrc, 
                       widthSrc, heightSrc, dwRop );
-	SelectObject32( hdcMem, hOldBitmap );
-	DeleteDC32( hdcMem );
-	DeleteObject32( hBitmap );
+	SelectObject( hdcMem, hOldBitmap );
+	DeleteDC( hdcMem );
+	DeleteObject( hBitmap );
 	return heightSrc;
     }
 }
@@ -166,7 +166,7 @@ INT16 WINAPI SetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan,
                           UINT16 lines, LPCVOID bits, const BITMAPINFO *info,
                           UINT16 coloruse )
 {
-    return SetDIBits32( hdc, hbitmap, startscan, lines, bits, info, coloruse );
+    return SetDIBits( hdc, hbitmap, startscan, lines, bits, info, coloruse );
 }
 
 
@@ -186,14 +186,14 @@ INT16 WINAPI SetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan,
  *    Success: Number of scan lines copied
  *    Failure: 0
  */
-INT32 WINAPI SetDIBits32( HDC32 hdc, HBITMAP32 hbitmap, UINT32 startscan,
-                          UINT32 lines, LPCVOID bits, const BITMAPINFO *info,
-                          UINT32 coloruse )
+INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan,
+                          UINT lines, LPCVOID bits, const BITMAPINFO *info,
+                          UINT coloruse )
 {
     DIB_SETIMAGEBITS_DESCR descr;
     BITMAPOBJ * bmp;
     int height, tmpheight;
-    INT32 result;
+    INT result;
 
       /* Check parameters */
 
@@ -279,7 +279,7 @@ INT16 WINAPI SetDIBitsToDevice16(HDC16 hdc, INT16 xDest, INT16 yDest, INT16 cx,
                            UINT16 lines, LPCVOID bits, const BITMAPINFO *info,
                            UINT16 coloruse )
 {
-    return SetDIBitsToDevice32( hdc, xDest, yDest, cx, cy, xSrc, ySrc,
+    return SetDIBitsToDevice( hdc, xDest, yDest, cx, cy, xSrc, ySrc,
                                 startscan, lines, bits, info, coloruse );
 }
 
@@ -287,12 +287,12 @@ INT16 WINAPI SetDIBitsToDevice16(HDC16 hdc, INT16 xDest, INT16 yDest, INT16 cx,
 /***********************************************************************
  *           SetDIBitsToDevice32   (GDI32.313)
  */
-INT32 WINAPI SetDIBitsToDevice32(HDC32 hdc, INT32 xDest, INT32 yDest, DWORD cx,
-                           DWORD cy, INT32 xSrc, INT32 ySrc, UINT32 startscan,
-                           UINT32 lines, LPCVOID bits, const BITMAPINFO *info,
-                           UINT32 coloruse )
+INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx,
+                           DWORD cy, INT xSrc, INT ySrc, UINT startscan,
+                           UINT lines, LPCVOID bits, const BITMAPINFO *info,
+                           UINT coloruse )
 {
-    INT32 ret;
+    INT ret;
     DC *dc;
 
     if (!(dc = DC_GetDCPtr( hdc ))) return 0;
@@ -316,13 +316,13 @@ INT32 WINAPI SetDIBitsToDevice32(HDC32 hdc, INT32 xDest, INT32 yDest, DWORD cx,
 UINT16 WINAPI SetDIBColorTable16( HDC16 hdc, UINT16 startpos, UINT16 entries,
 				  RGBQUAD *colors )
 {
-    return SetDIBColorTable32( hdc, startpos, entries, colors );
+    return SetDIBColorTable( hdc, startpos, entries, colors );
 }
 
 /***********************************************************************
  *           SetDIBColorTable32    (GDI32.311)
  */
-UINT32 WINAPI SetDIBColorTable32( HDC32 hdc, UINT32 startpos, UINT32 entries,
+UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries,
 				  RGBQUAD *colors )
 {
     DC * dc;
@@ -368,13 +368,13 @@ UINT32 WINAPI SetDIBColorTable32( HDC32 hdc, UINT32 startpos, UINT32 entries,
 UINT16 WINAPI GetDIBColorTable16( HDC16 hdc, UINT16 startpos, UINT16 entries,
 				  RGBQUAD *colors )
 {
-    return GetDIBColorTable32( hdc, startpos, entries, colors );
+    return GetDIBColorTable( hdc, startpos, entries, colors );
 }
 
 /***********************************************************************
  *           GetDIBColorTable32    (GDI32.169)
  */
-UINT32 WINAPI GetDIBColorTable32( HDC32 hdc, UINT32 startpos, UINT32 entries,
+UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries,
 				  RGBQUAD *colors )
 {
     DC * dc;
@@ -422,7 +422,7 @@ INT16 WINAPI GetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan,
                           UINT16 lines, LPVOID bits, BITMAPINFO * info,
                           UINT16 coloruse )
 {
-    return GetDIBits32( hdc, hbitmap, startscan, lines, bits, info, coloruse );
+    return GetDIBits( hdc, hbitmap, startscan, lines, bits, info, coloruse );
 }
 
 
@@ -435,14 +435,14 @@ INT16 WINAPI GetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan,
  *
  * http://www.microsoft.com/msdn/sdk/platforms/doc/sdk/win32/func/src/f30_14.htm
  */
-INT32 WINAPI GetDIBits32(
-    HDC32 hdc,         /* [in]  Handle to device context */
-    HBITMAP32 hbitmap, /* [in]  Handle to bitmap */
-    UINT32 startscan,  /* [in]  First scan line to set in dest bitmap */
-    UINT32 lines,      /* [in]  Number of scan lines to copy */
+INT WINAPI GetDIBits(
+    HDC hdc,         /* [in]  Handle to device context */
+    HBITMAP hbitmap, /* [in]  Handle to bitmap */
+    UINT startscan,  /* [in]  First scan line to set in dest bitmap */
+    UINT lines,      /* [in]  Number of scan lines to copy */
     LPVOID bits,       /* [out] Address of array for bitmap bits */
     BITMAPINFO * info, /* [out] Address of structure with bitmap data */
-    UINT32 coloruse)   /* [in]  RGB or palette index */
+    UINT coloruse)   /* [in]  RGB or palette index */
 {
     DC * dc;
     BITMAPOBJ * bmp;
@@ -636,19 +636,19 @@ HBITMAP16 WINAPI CreateDIBitmap16( HDC16 hdc, const BITMAPINFOHEADER * header,
                             DWORD init, LPCVOID bits, const BITMAPINFO * data,
                             UINT16 coloruse )
 {
-    return CreateDIBitmap32( hdc, header, init, bits, data, coloruse );
+    return CreateDIBitmap( hdc, header, init, bits, data, coloruse );
 }
 
 
 /***********************************************************************
  *           CreateDIBitmap32    (GDI32.37)
  */
-HBITMAP32 WINAPI CreateDIBitmap32( HDC32 hdc, const BITMAPINFOHEADER *header,
+HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header,
                             DWORD init, LPCVOID bits, const BITMAPINFO *data,
-                            UINT32 coloruse )
+                            UINT coloruse )
 {
-    HBITMAP32 handle;
-    BOOL32 fColor;
+    HBITMAP handle;
+    BOOL fColor;
     DWORD width;
     int height;
     WORD bpp;
@@ -701,12 +701,12 @@ HBITMAP32 WINAPI CreateDIBitmap32( HDC32 hdc, const BITMAPINFOHEADER *header,
 
     /* Now create the bitmap */
 
-    handle = fColor ? CreateBitmap32( width, height, 1, MONITOR_GetDepth(&MONITOR_PrimaryMonitor), NULL ) :
-                      CreateBitmap32( width, height, 1, 1, NULL );
+    handle = fColor ? CreateBitmap( width, height, 1, MONITOR_GetDepth(&MONITOR_PrimaryMonitor), NULL ) :
+                      CreateBitmap( width, height, 1, 1, NULL );
     if (!handle) return 0;
 
     if (init == CBM_INIT)
-        SetDIBits32( hdc, handle, 0, height, bits, data, coloruse );
+        SetDIBits( hdc, handle, 0, height, bits, data, coloruse );
     return handle;
 }
 
@@ -717,9 +717,9 @@ HBITMAP32 WINAPI CreateDIBitmap32( HDC32 hdc, const BITMAPINFOHEADER *header,
 static void DIB_DoProtectDIBSection( BITMAPOBJ *bmp, DWORD new_prot )
 {
     DIBSECTION *dib = &bmp->dib->dibSection;
-    INT32 effHeight = dib->dsBm.bmHeight >= 0? dib->dsBm.bmHeight
+    INT effHeight = dib->dsBm.bmHeight >= 0? dib->dsBm.bmHeight
                                              : -dib->dsBm.bmHeight;
-    INT32 totalSize = dib->dsBmih.biSizeImage? dib->dsBmih.biSizeImage
+    INT totalSize = dib->dsBmih.biSizeImage? dib->dsBmih.biSizeImage
                          : dib->dsBm.bmWidthBytes * effHeight;
     DWORD old_prot;
 
@@ -731,7 +731,7 @@ static void DIB_DoProtectDIBSection( BITMAPOBJ *bmp, DWORD new_prot )
 /***********************************************************************
  *           DIB_DoUpdateDIBSection
  */
-static void DIB_DoUpdateDIBSection( BITMAPOBJ *bmp, BOOL32 toDIB )
+static void DIB_DoUpdateDIBSection( BITMAPOBJ *bmp, BOOL toDIB )
 {
     DIBSECTIONOBJ *dib = bmp->dib;
     DIB_SETIMAGEBITS_DESCR descr;
@@ -776,12 +776,12 @@ static void DIB_DoUpdateDIBSection( BITMAPOBJ *bmp, BOOL32 toDIB )
 /***********************************************************************
  *           DIB_FaultHandler
  */
-static BOOL32 DIB_FaultHandler( LPVOID res, LPCVOID addr )
+static BOOL DIB_FaultHandler( LPVOID res, LPCVOID addr )
 {
-    BOOL32 handled = FALSE;
+    BOOL handled = FALSE;
     BITMAPOBJ *bmp;
 
-    bmp = (BITMAPOBJ *)GDI_GetObjPtr( (HBITMAP32)res, BITMAP_MAGIC );
+    bmp = (BITMAPOBJ *)GDI_GetObjPtr( (HBITMAP)res, BITMAP_MAGIC );
     if (!bmp) return FALSE;
 
     if (bmp->dib)
@@ -814,14 +814,14 @@ static BOOL32 DIB_FaultHandler( LPVOID res, LPCVOID addr )
             break;
         }
 
-    GDI_HEAP_UNLOCK( (HBITMAP32)res );
+    GDI_HEAP_UNLOCK( (HBITMAP)res );
     return handled;
 }
 
 /***********************************************************************
  *           DIB_UpdateDIBSection
  */
-void DIB_UpdateDIBSection( DC *dc, BOOL32 toDIB )
+void DIB_UpdateDIBSection( DC *dc, BOOL toDIB )
 {
     BITMAPOBJ *bmp;
 
@@ -906,10 +906,10 @@ void DIB_UpdateDIBSection( DC *dc, BOOL32 toDIB )
  *           CreateDIBSection16    (GDI.489)
  */
 HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, BITMAPINFO *bmi, UINT16 usage,
-				     SEGPTR *bits, HANDLE32 section,
+				     SEGPTR *bits, HANDLE section,
 				     DWORD offset)
 {
-    HBITMAP32 res = CreateDIBSection32(hdc, bmi, usage, NULL, section,
+    HBITMAP res = CreateDIBSection(hdc, bmi, usage, NULL, section,
 				       offset);
 
     if ( res )
@@ -918,9 +918,9 @@ HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, BITMAPINFO *bmi, UINT16 usage,
 	if ( bmp && bmp->dib )
 	{
 	    DIBSECTION *dib = &bmp->dib->dibSection;
-	    INT32 height = dib->dsBm.bmHeight >= 0 ?
+	    INT height = dib->dsBm.bmHeight >= 0 ?
 		dib->dsBm.bmHeight : -dib->dsBm.bmHeight;
-	    INT32 size = dib->dsBmih.biSizeImage ?
+	    INT size = dib->dsBmih.biSizeImage ?
 		dib->dsBmih.biSizeImage : dib->dsBm.bmWidthBytes * height;
 	    if ( dib->dsBm.bmBits )
 	    {
@@ -944,11 +944,11 @@ HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, BITMAPINFO *bmi, UINT16 usage,
 /***********************************************************************
  *           CreateDIBSection32    (GDI32.36)
  */
-HBITMAP32 WINAPI CreateDIBSection32 (HDC32 hdc, BITMAPINFO *bmi, UINT32 usage,
-				     LPVOID *bits,HANDLE32 section,
+HBITMAP WINAPI CreateDIBSection (HDC hdc, BITMAPINFO *bmi, UINT usage,
+				     LPVOID *bits,HANDLE section,
 				     DWORD offset)
 {
-    HBITMAP32 res = 0;
+    HBITMAP res = 0;
     BITMAPOBJ *bmp = NULL;
     DIBSECTIONOBJ *dib = NULL;
     int *colorMap = NULL;
@@ -956,8 +956,8 @@ HBITMAP32 WINAPI CreateDIBSection32 (HDC32 hdc, BITMAPINFO *bmi, UINT32 usage,
 
     /* Fill BITMAP32 structure with DIB data */
     BITMAPINFOHEADER *bi = &bmi->bmiHeader;
-    INT32 effHeight, totalSize;
-    BITMAP32 bm;
+    INT effHeight, totalSize;
+    BITMAP bm;
 
     TRACE(bitmap, "format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n",
 	  bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount,
@@ -1015,7 +1015,7 @@ HBITMAP32 WINAPI CreateDIBSection32 (HDC32 hdc, BITMAPINFO *bmi, UINT32 usage,
     /* Create Device Dependent Bitmap and add DIB pointer */
     if (dib) 
     {
-       res = CreateDIBitmap32(hdc, bi, 0, NULL, bmi, usage);
+       res = CreateDIBitmap(hdc, bi, 0, NULL, bmi, usage);
        if (res)
        {
            bmp = (BITMAPOBJ *) GDI_GetObjPtr(res, BITMAP_MAGIC);
@@ -1049,7 +1049,7 @@ HBITMAP32 WINAPI CreateDIBSection32 (HDC32 hdc, BITMAPINFO *bmi, UINT32 usage,
         if (dib && dib->image) { XDestroyImage(dib->image); dib->image = NULL; }
 	if (colorMap) { HeapFree(GetProcessHeap(), 0, colorMap); colorMap = NULL; }
 	if (dib) { HeapFree(GetProcessHeap(), 0, dib); dib = NULL; }
-	if (res) { DeleteObject32(res); res = 0; }
+	if (res) { DeleteObject(res); res = 0; }
     }
 
     /* Install fault handler, if possible */
@@ -1108,7 +1108,7 @@ void DIB_DeleteDIBSection( BITMAPOBJ *bmp )
  * Change color table entries when LR_LOADTRANSPARENT or LR_LOADMAP3DCOLORS
  * are in loadflags
  */
-void DIB_FixColorsToLoadflags(BITMAPINFO * bmi, UINT32 loadflags, BYTE pix)
+void DIB_FixColorsToLoadflags(BITMAPINFO * bmi, UINT loadflags, BYTE pix)
 {
   int colors;
   COLORREF c_W, c_S, c_F, c_L, c_C;
@@ -1125,10 +1125,10 @@ void DIB_FixColorsToLoadflags(BITMAPINFO * bmi, UINT32 loadflags, BYTE pix)
   colors = bmi->bmiHeader.biClrUsed;
   if (!colors && (bmi->bmiHeader.biBitCount <= 8))
     colors = 1 << bmi->bmiHeader.biBitCount;
-  c_W = GetSysColor32(COLOR_WINDOW);
-  c_S = GetSysColor32(COLOR_3DSHADOW);
-  c_F = GetSysColor32(COLOR_3DFACE);
-  c_L = GetSysColor32(COLOR_3DLIGHT);
+  c_W = GetSysColor(COLOR_WINDOW);
+  c_S = GetSysColor(COLOR_3DSHADOW);
+  c_F = GetSysColor(COLOR_3DFACE);
+  c_L = GetSysColor(COLOR_3DLIGHT);
   if (loadflags & LR_LOADTRANSPARENT) {
     switch (bmi->bmiHeader.biBitCount) {
       case 1: pix = pix >> 7; break;
diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index dcf42c55414..2451d5cdd12 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -17,17 +17,17 @@
  *
  *
  */
-HENHMETAFILE32 WINAPI GetEnhMetaFile32A( 
+HENHMETAFILE WINAPI GetEnhMetaFileA( 
 	     LPCSTR lpszMetaFile  /* filename of enhanced metafile */
     )
 {
-  HENHMETAFILE32 hmf = 0;
+  HENHMETAFILE hmf = 0;
   ENHMETAHEADER h;
   BYTE *p;
   DWORD read;
-  HFILE32 hf = CreateFile32A(lpszMetaFile, GENERIC_READ, 0, 0, 
+  HFILE hf = CreateFileA(lpszMetaFile, GENERIC_READ, 0, 0, 
 			     OPEN_EXISTING, 0, 0);
-  if (hf == INVALID_HANDLE_VALUE32) {
+  if (hf == INVALID_HANDLE_VALUE) {
     FIXME(metafile,"could not open %s\n",lpszMetaFile);
     return 0;
   }
@@ -53,28 +53,28 @@ HENHMETAFILE32 WINAPI GetEnhMetaFile32A(
   }
   SetFilePointer(hf, 0, NULL, FILE_BEGIN); 
   /*  hmf = CreateFileMapping32A( hf, NULL, NULL, NULL, NULL, "temp"); */
-  hmf = GlobalAlloc32(GPTR, h.nBytes);
-  p = GlobalLock32(hmf);
+  hmf = GlobalAlloc(GPTR, h.nBytes);
+  p = GlobalLock(hmf);
   if (!ReadFile(hf, p, h.nBytes, &read, NULL)) {
     FIXME(metafile,"%s could not be read.\n",lpszMetaFile);
-    GlobalFree32(hmf);
+    GlobalFree(hmf);
     CloseHandle(hf);
     return 0;
   }
   if (read!=h.nBytes) {
     FIXME(metafile,"%s is not long enough (%ld expected, %ld got).\n",lpszMetaFile,h.nBytes,read);
-    GlobalFree32(hmf);
+    GlobalFree(hmf);
     CloseHandle(hf);
     return 0;
   }
-  GlobalUnlock32(hmf);
+  GlobalUnlock(hmf);
   return hmf;
 }
 
 /*****************************************************************************
  *          GetEnhMetaFile32W  (GDI32.180)
  */
-HENHMETAFILE32 WINAPI GetEnhMetaFile32W(
+HENHMETAFILE WINAPI GetEnhMetaFileW(
              LPCWSTR lpszMetaFile)  /* filename of enhanced metafile */ 
 {
   FIXME(metafile, "(%p): stub\n", lpszMetaFile);
@@ -88,16 +88,16 @@ HENHMETAFILE32 WINAPI GetEnhMetaFile32W(
  *  Otherwise, copy up to _bufsize_ bytes of enhanced metafile header into 
  *  _buf.
  */
-UINT32 WINAPI GetEnhMetaFileHeader( 
-       HENHMETAFILE32 hmf, /* enhanced metafile */
-       UINT32 bufsize,     /* size of buffer */
+UINT WINAPI GetEnhMetaFileHeader( 
+       HENHMETAFILE hmf, /* enhanced metafile */
+       UINT bufsize,     /* size of buffer */
        LPENHMETAHEADER buf /* buffer */ 
     )
 {
-  LPENHMETAHEADER p = GlobalLock32(hmf);
+  LPENHMETAHEADER p = GlobalLock(hmf);
   if (!buf) return sizeof(ENHMETAHEADER);
   memmove(buf, p, MIN(sizeof(ENHMETAHEADER), bufsize));
-  GlobalUnlock32(hmf);
+  GlobalUnlock(hmf);
   return MIN(sizeof(ENHMETAHEADER), bufsize);
 }
 
@@ -105,14 +105,14 @@ UINT32 WINAPI GetEnhMetaFileHeader(
 /*****************************************************************************
  *          GetEnhMetaFileDescription32A  (GDI32.176)
  */
-UINT32 WINAPI GetEnhMetaFileDescription32A( 
-       HENHMETAFILE32 hmf, /* enhanced metafile */
-       UINT32 size, /* size of buf */ 
+UINT WINAPI GetEnhMetaFileDescriptionA( 
+       HENHMETAFILE hmf, /* enhanced metafile */
+       UINT size, /* size of buf */ 
        LPSTR buf /* buffer to receive description */
     )
 {
-  LPENHMETAHEADER p = GlobalLock32(hmf);
-  INT32 first  = lstrlen32W( (void *)p+p->offDescription);
+  LPENHMETAHEADER p = GlobalLock(hmf);
+  INT first  = lstrlenW( (void *)p+p->offDescription);
 
   if (!buf || !size) return p->nDescription;
 
@@ -121,7 +121,7 @@ UINT32 WINAPI GetEnhMetaFileDescription32A(
   lstrcpynWtoA(buf, (void *)p+p->offDescription+2*(first+1), size-first-1);
 
   /*  memmove(buf, (void *)p+p->offDescription, MIN(size,p->nDescription)); */
-  GlobalUnlock32(hmf);
+  GlobalUnlock(hmf);
   return MIN(size,p->nDescription);
 }
 
@@ -134,18 +134,18 @@ UINT32 WINAPI GetEnhMetaFileDescription32A(
  *  If _buf_ is NULL, returns size of _buf_ required. Otherwise, returns
  *  number of characters copied.
  */
-UINT32 WINAPI GetEnhMetaFileDescription32W( 
-       HENHMETAFILE32 hmf, /* enhanced metafile */
-       UINT32 size, /* size of buf */ 
+UINT WINAPI GetEnhMetaFileDescriptionW( 
+       HENHMETAFILE hmf, /* enhanced metafile */
+       UINT size, /* size of buf */ 
        LPWSTR buf /* buffer to receive description */
     )
 {
-  LPENHMETAHEADER p = GlobalLock32(hmf);
+  LPENHMETAHEADER p = GlobalLock(hmf);
 
   if (!buf || !size) return p->nDescription;
 
   memmove(buf, (void *)p+p->offDescription, MIN(size,p->nDescription));
-  GlobalUnlock32(hmf);
+  GlobalUnlock(hmf);
   return MIN(size,p->nDescription);
 }
 
@@ -154,12 +154,12 @@ UINT32 WINAPI GetEnhMetaFileDescription32W(
  *
  *  Creates an enhanced metafile by copying _bufsize_ bytes from _buf_.
  */
-HENHMETAFILE32 WINAPI SetEnhMetaFileBits(UINT32 bufsize, const BYTE *buf)
+HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT bufsize, const BYTE *buf)
 {
-  HENHMETAFILE32 hmf = GlobalAlloc32(GPTR, bufsize);
-  LPENHMETAHEADER h = GlobalLock32(hmf);
+  HENHMETAFILE hmf = GlobalAlloc(GPTR, bufsize);
+  LPENHMETAHEADER h = GlobalLock(hmf);
   memmove(h, buf, bufsize);
-  GlobalUnlock32(hmf);
+  GlobalUnlock(hmf);
   return hmf;
 }
 
@@ -167,9 +167,9 @@ HENHMETAFILE32 WINAPI SetEnhMetaFileBits(UINT32 bufsize, const BYTE *buf)
  *  GetEnhMetaFileBits (GDI32.175)
  *
  */
-UINT32 WINAPI GetEnhMetaFileBits(
-    HENHMETAFILE32 hmf, 
-    UINT32 bufsize, 
+UINT WINAPI GetEnhMetaFileBits(
+    HENHMETAFILE hmf, 
+    UINT bufsize, 
     LPBYTE buf  
 ) {
   return 0;
@@ -185,11 +185,11 @@ UINT32 WINAPI GetEnhMetaFileBits(
  *  BUGS
  *    Many unimplemented records.
  */
-BOOL32 WINAPI PlayEnhMetaFileRecord( 
-     HDC32 hdc, /* device context in which to render EMF record */
-     LPHANDLETABLE32 handletable, /* array of handles to be used in rendering record */
+BOOL WINAPI PlayEnhMetaFileRecord( 
+     HDC hdc, /* device context in which to render EMF record */
+     LPHANDLETABLE handletable, /* array of handles to be used in rendering record */
      const ENHMETARECORD *mr, /* EMF record to render */
-     UINT32 handles  /* size of handle array */
+     UINT handles  /* size of handle array */
      ) 
 {
   int type;
@@ -216,166 +216,166 @@ BOOL32 WINAPI PlayEnhMetaFileRecord(
     case EMR_SETMAPMODE:
       {
 	DWORD mode = mr->dParm[0];
-	SetMapMode32(hdc, mode);
+	SetMapMode(hdc, mode);
 	break;
       }
     case EMR_SETBKMODE:
       {
 	DWORD mode = mr->dParm[0];
-	SetBkMode32(hdc, mode);
+	SetBkMode(hdc, mode);
 	break;
       }
     case EMR_SETBKCOLOR:
       {
 	DWORD mode = mr->dParm[0];
-	SetBkColor32(hdc, mode);
+	SetBkColor(hdc, mode);
 	break;
       }
     case EMR_SETPOLYFILLMODE:
       {
 	DWORD mode = mr->dParm[0];
-	SetPolyFillMode32(hdc, mode);
+	SetPolyFillMode(hdc, mode);
 	break;
       }
     case EMR_SETROP2:
       {
 	DWORD mode = mr->dParm[0];
-	SetROP232(hdc, mode);
+	SetROP2(hdc, mode);
 	break;
       }
     case EMR_SETSTRETCHBLTMODE:
       {
 	DWORD mode = mr->dParm[0];
-	SetStretchBltMode32(hdc, mode);
+	SetStretchBltMode(hdc, mode);
 	break;
       }
     case EMR_SETTEXTALIGN:
       {
 	DWORD align = mr->dParm[0];
-	SetTextAlign32(hdc, align);
+	SetTextAlign(hdc, align);
 	break;
       }
     case EMR_SETTEXTCOLOR:
       {
 	DWORD color = mr->dParm[0];
-	SetTextColor32(hdc, color);
+	SetTextColor(hdc, color);
 	break;
       }
     case EMR_SAVEDC:
       {
-	SaveDC32(hdc);
+	SaveDC(hdc);
 	break;
       }
     case EMR_RESTOREDC:
       {
-	RestoreDC32(hdc, mr->dParm[0]);
+	RestoreDC(hdc, mr->dParm[0]);
 	break;
       }
     case EMR_INTERSECTCLIPRECT:
       {
-	INT32 left = mr->dParm[0], top = mr->dParm[1], right = mr->dParm[2],
+	INT left = mr->dParm[0], top = mr->dParm[1], right = mr->dParm[2],
 	      bottom = mr->dParm[3];
-	IntersectClipRect32(hdc, left, top, right, bottom);
+	IntersectClipRect(hdc, left, top, right, bottom);
 	break;
       }
     case EMR_SELECTOBJECT:
       {
 	DWORD obj = mr->dParm[0];
-	SelectObject32(hdc, (handletable->objectHandle)[obj]);
+	SelectObject(hdc, (handletable->objectHandle)[obj]);
 	break;
       }
     case EMR_DELETEOBJECT:
       {
 	DWORD obj = mr->dParm[0];
-	DeleteObject32( (handletable->objectHandle)[obj]);
+	DeleteObject( (handletable->objectHandle)[obj]);
 	(handletable->objectHandle)[obj] = 0;
 	break;
       }
     case EMR_SETWINDOWORGEX:
       {
 	DWORD x = mr->dParm[0], y = mr->dParm[1];
-	SetWindowOrgEx32(hdc, x, y, NULL);
+	SetWindowOrgEx(hdc, x, y, NULL);
 	break;
       }
     case EMR_SETWINDOWEXTEX:
       {
 	DWORD x = mr->dParm[0], y = mr->dParm[1];
-	SetWindowExtEx32(hdc, x, y, NULL);
+	SetWindowExtEx(hdc, x, y, NULL);
 	break;
       }
     case EMR_SETVIEWPORTORGEX:
       {
 	DWORD x = mr->dParm[0], y = mr->dParm[1];
-	SetViewportOrgEx32(hdc, x, y, NULL);
+	SetViewportOrgEx(hdc, x, y, NULL);
 	break;
       }
     case EMR_SETVIEWPORTEXTEX:
       {
 	DWORD x = mr->dParm[0], y = mr->dParm[1];
-	SetViewportExtEx32(hdc, x, y, NULL);
+	SetViewportExtEx(hdc, x, y, NULL);
 	break;
       }
     case EMR_CREATEPEN:
       {
 	DWORD obj = mr->dParm[0];
 	(handletable->objectHandle)[obj] = 
-	  CreatePenIndirect32((LOGPEN32 *) &(mr->dParm[1]));
+	  CreatePenIndirect((LOGPEN *) &(mr->dParm[1]));
 	break;
       }
     case EMR_EXTCREATEPEN:
       {
 	DWORD obj = mr->dParm[0];
 	DWORD style = mr->dParm[1], brush = mr->dParm[2];
-	LOGBRUSH32 *b = (LOGBRUSH32 *) &mr->dParm[3];
+	LOGBRUSH *b = (LOGBRUSH *) &mr->dParm[3];
 	FIXME(metafile, "Some ExtCreatePen args not handled\n");
 	(handletable->objectHandle)[obj] = 
-	  ExtCreatePen32(style, brush, b, 0, NULL);
+	  ExtCreatePen(style, brush, b, 0, NULL);
 	break;
       }
     case EMR_CREATEBRUSHINDIRECT:
       {
 	DWORD obj = mr->dParm[0];
 	(handletable->objectHandle)[obj] = 
-	  CreateBrushIndirect32((LOGBRUSH32 *) &(mr->dParm[1]));
+	  CreateBrushIndirect((LOGBRUSH *) &(mr->dParm[1]));
 	break;
       }
     case EMR_EXTCREATEFONTINDIRECTW:
 	{
 	DWORD obj = mr->dParm[0];
 	(handletable->objectHandle)[obj] = 
-	  CreateFontIndirect32W((LOGFONT32W *) &(mr->dParm[1]));
+	  CreateFontIndirectW((LOGFONTW *) &(mr->dParm[1]));
 	break;
 	}
     case EMR_MOVETOEX:
       {
 	DWORD x = mr->dParm[0], y = mr->dParm[1];
-	MoveToEx32(hdc, x, y, NULL);
+	MoveToEx(hdc, x, y, NULL);
 	break;
       }
     case EMR_LINETO:
       {
 	DWORD x = mr->dParm[0], y = mr->dParm[1];
-        LineTo32(hdc, x, y);
+        LineTo(hdc, x, y);
 	break;
       }
     case EMR_RECTANGLE:
       {
-	INT32 left = mr->dParm[0], top = mr->dParm[1], right = mr->dParm[2],
+	INT left = mr->dParm[0], top = mr->dParm[1], right = mr->dParm[2],
 	      bottom = mr->dParm[3];
-	Rectangle32(hdc, left, top, right, bottom);
+	Rectangle(hdc, left, top, right, bottom);
 	break;
       }
     case EMR_ELLIPSE:
       {
-	INT32 left = mr->dParm[0], top = mr->dParm[1], right = mr->dParm[2],
+	INT left = mr->dParm[0], top = mr->dParm[1], right = mr->dParm[2],
 	      bottom = mr->dParm[3];
-	Ellipse32(hdc, left, top, right, bottom);
+	Ellipse(hdc, left, top, right, bottom);
 	break;
       }
     case EMR_POLYGON16:
       {
 	/* 0-3 : a bounding rectangle? */
-	INT32 count = mr->dParm[4];
+	INT count = mr->dParm[4];
 	FIXME(metafile, "Some Polygon16 args not handled\n");
 	Polygon16(hdc, (POINT16 *)&mr->dParm[5], count);
 	break;
@@ -383,7 +383,7 @@ BOOL32 WINAPI PlayEnhMetaFileRecord(
     case EMR_POLYLINE16:
       {
 	/* 0-3 : a bounding rectangle? */
-	INT32 count = mr->dParm[4];
+	INT count = mr->dParm[4];
 	FIXME(metafile, "Some Polyline16 args not handled\n");
 	Polyline16(hdc, (POINT16 *)&mr->dParm[5], count);
 	break;
@@ -392,7 +392,7 @@ BOOL32 WINAPI PlayEnhMetaFileRecord(
 #if 0
     case EMR_POLYPOLYGON16:
       {
-	INT32 polygons = mr->dParm[z];
+	INT polygons = mr->dParm[z];
 	LPPOINT16 pts = (LPPOINT16) &mr->dParm[x];
 	LPINT16 counts = (LPINT16) &mr->dParm[y];
 	PolyPolygon16(hdc, pts, counts, polygons);
@@ -414,7 +414,7 @@ BOOL32 WINAPI PlayEnhMetaFileRecord(
 	LONG cxDest = mr->dParm[16];
 	LONG cyDest = mr->dParm[17];
 
-	StretchDIBits32(hdc,xDest,yDest,cxDest,cyDest,
+	StretchDIBits(hdc,xDest,yDest,cxDest,cyDest,
 			    xSrc,ySrc,cxSrc,cySrc,
 			    ((char *)mr)+offBitsSrc,
 			    (const BITMAPINFO *)(((char *)mr)+offBmiSrc),
@@ -432,7 +432,7 @@ BOOL32 WINAPI PlayEnhMetaFileRecord(
 	LPWSTR str = (LPWSTR)& mr->dParm[17];
 	/* trailing info: dx array? */
 	FIXME(metafile, "Many ExtTextOut args not handled\n");
-	ExtTextOut32W(hdc, x, y, flags, /* lpRect */ NULL, 
+	ExtTextOutW(hdc, x, y, flags, /* lpRect */ NULL, 
 		      str, count, /* lpDx */ NULL); 
 	break;
       }
@@ -463,26 +463,26 @@ BOOL32 WINAPI PlayEnhMetaFileRecord(
  * BUGS
  *   Ignores rect.
  */
-BOOL32 WINAPI EnumEnhMetaFile32( 
-     HDC32 hdc, /* device context to pass to _EnhMetaFunc_ */
-     HENHMETAFILE32 hmf, /* EMF to walk */
-     ENHMFENUMPROC32 callback, /* callback function */ 
+BOOL WINAPI EnumEnhMetaFile( 
+     HDC hdc, /* device context to pass to _EnhMetaFunc_ */
+     HENHMETAFILE hmf, /* EMF to walk */
+     ENHMFENUMPROC callback, /* callback function */ 
      LPVOID data, /* optional data for callback function */
-     const RECT32 *rect  /* bounding rectangle for rendered metafile */
+     const RECT *rect  /* bounding rectangle for rendered metafile */
     )
 {
-  BOOL32 ret = TRUE;
-  LPENHMETARECORD p = GlobalLock32(hmf);
-  INT32 count = ((LPENHMETAHEADER) p)->nHandles;
-  HANDLETABLE32 *ht = (HANDLETABLE32 *)GlobalAlloc32(GPTR, sizeof(HANDLETABLE32)*count);
+  BOOL ret = TRUE;
+  LPENHMETARECORD p = GlobalLock(hmf);
+  INT count = ((LPENHMETAHEADER) p)->nHandles;
+  HANDLETABLE *ht = (HANDLETABLE *)GlobalAlloc(GPTR, sizeof(HANDLETABLE)*count);
   ht->objectHandle[0] = hmf;
   while (ret) {
     ret = (*callback)(hdc, ht, p, count, data); 
     if (p->iType == EMR_EOF) break;
     p = (void *) p + p->nSize;
   }
-  GlobalFree32((HGLOBAL32)ht);
-  GlobalUnlock32(hmf);
+  GlobalFree((HGLOBAL)ht);
+  GlobalUnlock(hmf);
   return ret;
 }
 
@@ -497,18 +497,18 @@ BOOL32 WINAPI EnumEnhMetaFile32(
  *    Almost entirely unimplemented
  *
  */
-BOOL32 WINAPI PlayEnhMetaFile( 
-       HDC32 hdc, /* DC to render into */
-       HENHMETAFILE32 hmf, /* metafile to render */
-       const RECT32 *lpRect  /* rectangle to place metafile inside */
+BOOL WINAPI PlayEnhMetaFile( 
+       HDC hdc, /* DC to render into */
+       HENHMETAFILE hmf, /* metafile to render */
+       const RECT *lpRect  /* rectangle to place metafile inside */
       )
 {
-  LPENHMETARECORD p = GlobalLock32(hmf);
-  INT32 count = ((LPENHMETAHEADER) p)->nHandles;
-  HANDLETABLE32 *ht = (HANDLETABLE32 *)GlobalAlloc32(GPTR, 
-				    sizeof(HANDLETABLE32)*count);
-  BOOL32 ret = FALSE;
-  INT32 savedMode = 0;
+  LPENHMETARECORD p = GlobalLock(hmf);
+  INT count = ((LPENHMETAHEADER) p)->nHandles;
+  HANDLETABLE *ht = (HANDLETABLE *)GlobalAlloc(GPTR, 
+				    sizeof(HANDLETABLE)*count);
+  BOOL ret = FALSE;
+  INT savedMode = 0;
   if (lpRect) {
     LPENHMETAHEADER h = (LPENHMETAHEADER) p;
     FLOAT xscale = (h->rclBounds.right-h->rclBounds.left)/(lpRect->right-lpRect->left);
@@ -529,7 +529,7 @@ BOOL32 WINAPI PlayEnhMetaFile(
     if (p->iType == EMR_EOF) break;
     p = (void *) p + p->nSize; /* casted so that arithmetic is in bytes */
   }
-  GlobalUnlock32(hmf);
+  GlobalUnlock(hmf);
   if (savedMode) SetGraphicsMode(hdc, savedMode);
   ret = TRUE; /* FIXME: calculate a more accurate return value */
   return ret;
@@ -540,8 +540,8 @@ BOOL32 WINAPI PlayEnhMetaFile(
  *
  *  Deletes an enhanced metafile and frees the associated storage.
  */
-BOOL32 WINAPI DeleteEnhMetaFile(HENHMETAFILE32 hmf) {
-  return !GlobalFree32(hmf);
+BOOL WINAPI DeleteEnhMetaFile(HENHMETAFILE hmf) {
+  return !GlobalFree(hmf);
 }
 
 /*****************************************************************************
@@ -549,18 +549,18 @@ BOOL32 WINAPI DeleteEnhMetaFile(HENHMETAFILE32 hmf) {
  *
  *   
  */
-HENHMETAFILE32 WINAPI CopyEnhMetaFile32A(
-    HENHMETAFILE32 hmf, 
+HENHMETAFILE WINAPI CopyEnhMetaFileA(
+    HENHMETAFILE hmf, 
     LPCSTR file)
 {
   if (!file) {
-    LPENHMETAHEADER h = GlobalLock32(hmf);
-    HENHMETAFILE32 hmf2 = GlobalAlloc32(GPTR, h->nBytes);
-    LPENHMETAHEADER h2 = GlobalLock32(hmf2);
+    LPENHMETAHEADER h = GlobalLock(hmf);
+    HENHMETAFILE hmf2 = GlobalAlloc(GPTR, h->nBytes);
+    LPENHMETAHEADER h2 = GlobalLock(hmf2);
     if (!h2) return 0;
     memmove(h2, h, h->nBytes);
-    GlobalUnlock32(hmf2);
-    GlobalUnlock32(hmf);
+    GlobalUnlock(hmf2);
+    GlobalUnlock(hmf);
     return hmf2;
   } else {
     FIXME(metafile, "write to file not implemented\n");
@@ -574,22 +574,22 @@ HENHMETAFILE32 WINAPI CopyEnhMetaFile32A(
  *  Copy the palette and report size  
  */
 
-UINT32 WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE32 hemf,
-					     UINT32 cEntries,
+UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE hemf,
+					     UINT cEntries,
 					     LPPALETTEENTRY lppe)
 {
-  LPENHMETAHEADER h = GlobalLock32(hemf);
+  LPENHMETAHEADER h = GlobalLock(hemf);
 
   if ( h == NULL ){
-    GlobalUnlock32(hemf);
+    GlobalUnlock(hemf);
     return(0);
   } else {
     if ((lppe)&&(cEntries>0)){
       FIXME(metafile,"Stub\n");
-      GlobalUnlock32(hemf);
+      GlobalUnlock(hemf);
       return(GDI_ERROR);
     } else{
-      GlobalUnlock32(hemf);
+      GlobalUnlock(hemf);
       return(0);
     }
   }
@@ -603,10 +603,10 @@ UINT32 WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE32 hemf,
  *         Translate from old style to new style.
  */
 
-HENHMETAFILE32 WINAPI SetWinMetaFileBits(UINT32 cbBuffer,
+HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer,
 					   CONST BYTE *lpbBuffer,
-					   HDC32 hdcRef,
-					   CONST METAFILEPICT32 *lpmfp
+					   HDC hdcRef,
+					   CONST METAFILEPICT *lpmfp
 					   ) 
 {
    FIXME(metafile,"Stub\n");
diff --git a/objects/font.c b/objects/font.c
index c4dfc53f39c..da151b26d5b 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -31,12 +31,12 @@ typedef struct
 
 typedef struct
 {
-  LPLOGFONT32W          lpLogFontParam;
-  FONTENUMPROC32W       lpEnumFunc;
+  LPLOGFONTW          lpLogFontParam;
+  FONTENUMPROCW       lpEnumFunc;
   LPARAM                lpData;
 
-  LPNEWTEXTMETRICEX32W  lpTextMetric;
-  LPENUMLOGFONTEX32W    lpLogFont;
+  LPNEWTEXTMETRICEXW  lpTextMetric;
+  LPENUMLOGFONTEXW    lpLogFont;
   DWORD                 dwFlags;
 } fontEnum32;
  
@@ -88,50 +88,50 @@ static CHARSETINFO FONT_tci[MAXTCIINDEX] = {
 /***********************************************************************
  *              LOGFONT conversion functions.
  */
-static void __logfont32to16( INT16* plf16, const INT32* plf32 )
+static void __logfont32to16( INT16* plf16, const INT* plf32 )
 {
     int  i;
     for( i = 0; i < 5; i++ ) *plf16++ = *plf32++;
-   *((INT32*)plf16)++ = *plf32++;
-   *((INT32*)plf16)   = *plf32;
+   *((INT*)plf16)++ = *plf32++;
+   *((INT*)plf16)   = *plf32;
 }
 
-static void __logfont16to32( INT32* plf32, const INT16* plf16 )
+static void __logfont16to32( INT* plf32, const INT16* plf16 )
 {
     int i;
     for( i = 0; i < 5; i++ ) *plf32++ = *plf16++;
-   *plf32++ = *((INT32*)plf16)++;
-   *plf32   = *((INT32*)plf16);
+   *plf32++ = *((INT*)plf16)++;
+   *plf32   = *((INT*)plf16);
 }
 
-void FONT_LogFont32ATo16( const LOGFONT32A* font32, LPLOGFONT16 font16 )
+void FONT_LogFont32ATo16( const LOGFONTA* font32, LPLOGFONT16 font16 )
 {
-  __logfont32to16( (INT16*)font16, (const INT32*)font32 );
-    lstrcpyn32A( font16->lfFaceName, font32->lfFaceName, LF_FACESIZE );
+  __logfont32to16( (INT16*)font16, (const INT*)font32 );
+    lstrcpynA( font16->lfFaceName, font32->lfFaceName, LF_FACESIZE );
 }
 
-void FONT_LogFont32WTo16( const LOGFONT32W* font32, LPLOGFONT16 font16 )
+void FONT_LogFont32WTo16( const LOGFONTW* font32, LPLOGFONT16 font16 )
 {
-  __logfont32to16( (INT16*)font16, (const INT32*)font32 );
+  __logfont32to16( (INT16*)font16, (const INT*)font32 );
     lstrcpynWtoA( font16->lfFaceName, font32->lfFaceName, LF_FACESIZE );
 }
 
-void FONT_LogFont16To32A( const LPLOGFONT16 font16, LPLOGFONT32A font32 )
+void FONT_LogFont16To32A( const LPLOGFONT16 font16, LPLOGFONTA font32 )
 {
-  __logfont16to32( (INT32*)font32, (const INT16*)font16 );
-    lstrcpyn32A( font32->lfFaceName, font16->lfFaceName, LF_FACESIZE );
+  __logfont16to32( (INT*)font32, (const INT16*)font16 );
+    lstrcpynA( font32->lfFaceName, font16->lfFaceName, LF_FACESIZE );
 }
 
-void FONT_LogFont16To32W( const LPLOGFONT16 font16, LPLOGFONT32W font32 )
+void FONT_LogFont16To32W( const LPLOGFONT16 font16, LPLOGFONTW font32 )
 {
-  __logfont16to32( (INT32*)font32, (const INT16*)font16 );
+  __logfont16to32( (INT*)font32, (const INT16*)font16 );
     lstrcpynAtoW( font32->lfFaceName, font16->lfFaceName, LF_FACESIZE );
 }
 
 /***********************************************************************
  *              TEXTMETRIC conversion functions.
  */
-void FONT_TextMetric32Ato16(const LPTEXTMETRIC32A ptm32, LPTEXTMETRIC16 ptm16 )
+void FONT_TextMetric32Ato16(const LPTEXTMETRICA ptm32, LPTEXTMETRIC16 ptm16 )
 {
     ptm16->tmHeight = ptm32->tmHeight;
     ptm16->tmAscent = ptm32->tmAscent;
@@ -155,7 +155,7 @@ void FONT_TextMetric32Ato16(const LPTEXTMETRIC32A ptm32, LPTEXTMETRIC16 ptm16 )
     ptm16->tmCharSet = ptm32->tmCharSet;
 }
 
-void FONT_TextMetric32Wto16(const LPTEXTMETRIC32W ptm32, LPTEXTMETRIC16 ptm16 )
+void FONT_TextMetric32Wto16(const LPTEXTMETRICW ptm32, LPTEXTMETRIC16 ptm16 )
 {
     ptm16->tmHeight = ptm32->tmHeight;
     ptm16->tmAscent = ptm32->tmAscent;
@@ -179,7 +179,7 @@ void FONT_TextMetric32Wto16(const LPTEXTMETRIC32W ptm32, LPTEXTMETRIC16 ptm16 )
     ptm16->tmCharSet = ptm32->tmCharSet;
 }
 
-void FONT_TextMetric16to32A(const LPTEXTMETRIC16 ptm16, LPTEXTMETRIC32A ptm32 )
+void FONT_TextMetric16to32A(const LPTEXTMETRIC16 ptm16, LPTEXTMETRICA ptm32 )
 {
     ptm32->tmHeight = ptm16->tmHeight;
     ptm32->tmAscent = ptm16->tmAscent;
@@ -203,7 +203,7 @@ void FONT_TextMetric16to32A(const LPTEXTMETRIC16 ptm16, LPTEXTMETRIC32A ptm32 )
     ptm32->tmCharSet = ptm16->tmCharSet;
 }
 
-void FONT_TextMetric16to32W(const LPTEXTMETRIC16 ptm16, LPTEXTMETRIC32W ptm32 )
+void FONT_TextMetric16to32W(const LPTEXTMETRIC16 ptm16, LPTEXTMETRICW ptm32 )
 {
     ptm32->tmHeight = ptm16->tmHeight;
     ptm32->tmAscent = ptm16->tmAscent;
@@ -227,7 +227,7 @@ void FONT_TextMetric16to32W(const LPTEXTMETRIC16 ptm16, LPTEXTMETRIC32W ptm32 )
     ptm32->tmCharSet = ptm16->tmCharSet;
 }
 
-void FONT_TextMetric32Ato32W(const LPTEXTMETRIC32A ptm32A, LPTEXTMETRIC32W ptm32W )
+void FONT_TextMetric32Ato32W(const LPTEXTMETRICA ptm32A, LPTEXTMETRICW ptm32W )
 {
     ptm32W->tmHeight = ptm32A->tmHeight;
     ptm32W->tmAscent = ptm32A->tmAscent;
@@ -293,7 +293,7 @@ HFONT16 WINAPI CreateFontIndirect16( const LOGFONT16 *font )
 /***********************************************************************
  *           CreateFontIndirect32A   (GDI32.44)
  */
-HFONT32 WINAPI CreateFontIndirect32A( const LOGFONT32A *font )
+HFONT WINAPI CreateFontIndirectA( const LOGFONTA *font )
 {
     LOGFONT16 font16;
 
@@ -304,7 +304,7 @@ HFONT32 WINAPI CreateFontIndirect32A( const LOGFONT32A *font )
 /***********************************************************************
  *           CreateFontIndirect32W   (GDI32.45)
  */
-HFONT32 WINAPI CreateFontIndirect32W( const LOGFONT32W *font )
+HFONT WINAPI CreateFontIndirectW( const LOGFONTW *font )
 {
     LOGFONT16 font16;
 
@@ -327,7 +327,7 @@ HFONT16 WINAPI CreateFont16(INT16 height, INT16 width, INT16 esc, INT16 orient,
     TRACE(font,"('%s',%d,%d)\n",
 		 (name ? name : "(null)") , height, width);
     if (name) 
-	lstrcpyn32A(logfont.lfFaceName,name,sizeof(logfont.lfFaceName));
+	lstrcpynA(logfont.lfFaceName,name,sizeof(logfont.lfFaceName));
     else 
 	logfont.lfFaceName[0] = '\0';
     return CreateFontIndirect16( &logfont );
@@ -336,13 +336,13 @@ HFONT16 WINAPI CreateFont16(INT16 height, INT16 width, INT16 esc, INT16 orient,
 /*************************************************************************
  *           CreateFont32A    (GDI32.43)
  */
-HFONT32 WINAPI CreateFont32A( INT32 height, INT32 width, INT32 esc,
-                              INT32 orient, INT32 weight, DWORD italic,
+HFONT WINAPI CreateFontA( INT height, INT width, INT esc,
+                              INT orient, INT weight, DWORD italic,
                               DWORD underline, DWORD strikeout, DWORD charset,
                               DWORD outpres, DWORD clippres, DWORD quality,
                               DWORD pitch, LPCSTR name )
 {
-    return (HFONT32)CreateFont16( height, width, esc, orient, weight, italic,
+    return (HFONT)CreateFont16( height, width, esc, orient, weight, italic,
                                   underline, strikeout, charset, outpres,
                                   clippres, quality, pitch, name );
 }
@@ -350,14 +350,14 @@ HFONT32 WINAPI CreateFont32A( INT32 height, INT32 width, INT32 esc,
 /*************************************************************************
  *           CreateFont32W    (GDI32.46)
  */
-HFONT32 WINAPI CreateFont32W( INT32 height, INT32 width, INT32 esc,
-                              INT32 orient, INT32 weight, DWORD italic,
+HFONT WINAPI CreateFontW( INT height, INT width, INT esc,
+                              INT orient, INT weight, DWORD italic,
                               DWORD underline, DWORD strikeout, DWORD charset,
                               DWORD outpres, DWORD clippres, DWORD quality,
                               DWORD pitch, LPCWSTR name )
 {
     LPSTR namea = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    HFONT32 ret = (HFONT32)CreateFont16( height, width, esc, orient, weight,
+    HFONT ret = (HFONT)CreateFont16( height, width, esc, orient, weight,
                                          italic, underline, strikeout, charset,
                                          outpres, clippres, quality, pitch,
                                          namea );
@@ -379,9 +379,9 @@ INT16 FONT_GetObject16( FONTOBJ * font, INT16 count, LPSTR buffer )
 /***********************************************************************
  *           FONT_GetObject32A
  */
-INT32 FONT_GetObject32A( FONTOBJ *font, INT32 count, LPSTR buffer )
+INT FONT_GetObjectA( FONTOBJ *font, INT count, LPSTR buffer )
 {
-    LOGFONT32A fnt32;
+    LOGFONTA fnt32;
 
     FONT_LogFont16To32A( &font->logfont, &fnt32 );
 
@@ -392,9 +392,9 @@ INT32 FONT_GetObject32A( FONTOBJ *font, INT32 count, LPSTR buffer )
 /***********************************************************************
  *           FONT_GetObject32W
  */
-INT32 FONT_GetObject32W( FONTOBJ *font, INT32 count, LPSTR buffer )
+INT FONT_GetObjectW( FONTOBJ *font, INT count, LPSTR buffer )
 {
-    LOGFONT32W fnt32;
+    LOGFONTW fnt32;
 
     FONT_LogFont16To32W( &font->logfont, &fnt32 );
 
@@ -410,7 +410,7 @@ INT32 FONT_GetObject32W( FONTOBJ *font, INT32 count, LPSTR buffer )
  * Called by the device driver layer to pass font info
  * down to the application.
  */
-static INT32 FONT_EnumInstance16( LPENUMLOGFONT16 plf, 
+static INT FONT_EnumInstance16( LPENUMLOGFONT16 plf, 
 				  LPNEWTEXTMETRIC16 ptm, UINT16 fType, LPARAM lp )
 {
 #define pfe ((fontEnum16*)lp)
@@ -429,7 +429,7 @@ static INT32 FONT_EnumInstance16( LPENUMLOGFONT16 plf,
 /***********************************************************************
  *              FONT_EnumInstance32
  */
-static INT32 FONT_EnumInstance32( LPENUMLOGFONT16 plf,
+static INT FONT_EnumInstance( LPENUMLOGFONT16 plf,
 				  LPNEWTEXTMETRIC16 ptm, UINT16 fType, LPARAM lp )
 {
     /* lfCharSet is at the same offset in both LOGFONT32A and LOGFONT32W */
@@ -442,17 +442,17 @@ static INT32 FONT_EnumInstance32( LPENUMLOGFONT16 plf,
 
 	if( pfe->dwFlags & ENUM_UNICODE )
 	{
-	    FONT_LogFont16To32W( &plf->elfLogFont, (LPLOGFONT32W)(pfe->lpLogFont) );
-	    FONT_TextMetric16to32W( (LPTEXTMETRIC16)ptm, (LPTEXTMETRIC32W)(pfe->lpTextMetric) );
+	    FONT_LogFont16To32W( &plf->elfLogFont, (LPLOGFONTW)(pfe->lpLogFont) );
+	    FONT_TextMetric16to32W( (LPTEXTMETRIC16)ptm, (LPTEXTMETRICW)(pfe->lpTextMetric) );
 	}
 	else
 	{
-	    FONT_LogFont16To32A( &plf->elfLogFont, (LPLOGFONT32A)pfe->lpLogFont );
-	    FONT_TextMetric16to32A( (LPTEXTMETRIC16)ptm, (LPTEXTMETRIC32A)pfe->lpTextMetric );
+	    FONT_LogFont16To32A( &plf->elfLogFont, (LPLOGFONTA)pfe->lpLogFont );
+	    FONT_TextMetric16to32A( (LPTEXTMETRIC16)ptm, (LPTEXTMETRICA)pfe->lpTextMetric );
 	}
 
-        return pfe->lpEnumFunc( (LPENUMLOGFONT32W)pfe->lpLogFont, 
-				(LPNEWTEXTMETRIC32W)pfe->lpTextMetric, fType, pfe->lpData );
+        return pfe->lpEnumFunc( (LPENUMLOGFONTW)pfe->lpLogFont, 
+				(LPNEWTEXTMETRICW)pfe->lpTextMetric, fType, pfe->lpData );
     }
 #undef pfe
     return 1;
@@ -492,7 +492,7 @@ INT16 WINAPI EnumFontFamiliesEx16( HDC16 hDC, LPLOGFONT16 plf,
 /***********************************************************************
  *		FONT_EnumFontFamiliesEx32
  */
-static INT32 FONT_EnumFontFamiliesEx32( HDC32 hDC, LPLOGFONT32W plf, FONTENUMPROC32W efproc, 
+static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efproc, 
 					           LPARAM lParam, DWORD dwUnicode)
 {
     DC*		dc = (DC*) GDI_GetObjPtr( hDC, DC_MAGIC );
@@ -500,8 +500,8 @@ static INT32 FONT_EnumFontFamiliesEx32( HDC32 hDC, LPLOGFONT32W plf, FONTENUMPRO
     if( dc && dc->funcs->pEnumDeviceFonts )
     {
 	LOGFONT16		lf16;
-	NEWTEXTMETRICEX32W 	tm32w;
-	ENUMLOGFONTEX32W	lf32w;
+	NEWTEXTMETRICEXW 	tm32w;
+	ENUMLOGFONTEXW	lf32w;
 	fontEnum32		fe32 = { plf, efproc, lParam, &tm32w, &lf32w, dwUnicode }; 
 
 	/* the only difference between LOGFONT32A and LOGFONT32W is in the lfFaceName */
@@ -511,12 +511,12 @@ static INT32 FONT_EnumFontFamiliesEx32( HDC32 hDC, LPLOGFONT32W plf, FONTENUMPRO
 	    if( dwUnicode )
 		lstrcpynWtoA( lf16.lfFaceName, plf->lfFaceName, LF_FACESIZE );
 	    else
-		lstrcpyn32A( lf16.lfFaceName, (LPCSTR)plf->lfFaceName, LF_FACESIZE );
+		lstrcpynA( lf16.lfFaceName, (LPCSTR)plf->lfFaceName, LF_FACESIZE );
 	}
 	else lf16.lfFaceName[0] = '\0';
 	lf16.lfCharSet = plf->lfCharSet;
 
-	return dc->funcs->pEnumDeviceFonts( dc, &lf16, FONT_EnumInstance32, (LPARAM)&fe32 );
+	return dc->funcs->pEnumDeviceFonts( dc, &lf16, FONT_EnumInstance, (LPARAM)&fe32 );
     }
     return 0;
 }
@@ -524,23 +524,23 @@ static INT32 FONT_EnumFontFamiliesEx32( HDC32 hDC, LPLOGFONT32W plf, FONTENUMPRO
 /***********************************************************************
  *              EnumFontFamiliesEx32W	(GDI32.82)
  */
-INT32 WINAPI EnumFontFamiliesEx32W( HDC32 hDC, LPLOGFONT32W plf,
-                                    FONTENUMPROCEX32W efproc, 
+INT WINAPI EnumFontFamiliesExW( HDC hDC, LPLOGFONTW plf,
+                                    FONTENUMPROCEXW efproc, 
                                     LPARAM lParam, DWORD dwFlags )
 {
-    return  FONT_EnumFontFamiliesEx32( hDC, plf, (FONTENUMPROC32W)efproc, 
+    return  FONT_EnumFontFamiliesEx( hDC, plf, (FONTENUMPROCW)efproc, 
 						  lParam, ENUM_UNICODE );
 }
 
 /***********************************************************************
  *              EnumFontFamiliesEx32A	(GDI32.81)
  */
-INT32 WINAPI EnumFontFamiliesEx32A( HDC32 hDC, LPLOGFONT32A plf,
-                                    FONTENUMPROCEX32A efproc, 
+INT WINAPI EnumFontFamiliesExA( HDC hDC, LPLOGFONTA plf,
+                                    FONTENUMPROCEXA efproc, 
                                     LPARAM lParam, DWORD dwFlags)
 {
-    return  FONT_EnumFontFamiliesEx32( hDC, (LPLOGFONT32W)plf, 
-				      (FONTENUMPROC32W)efproc, lParam, 0);
+    return  FONT_EnumFontFamiliesEx( hDC, (LPLOGFONTW)plf, 
+				      (FONTENUMPROCW)efproc, lParam, 0);
 }
 
 /***********************************************************************
@@ -552,7 +552,7 @@ INT16 WINAPI EnumFontFamilies16( HDC16 hDC, LPCSTR lpFamily,
     LOGFONT16	lf;
 
     lf.lfCharSet = DEFAULT_CHARSET;
-    if( lpFamily ) lstrcpyn32A( lf.lfFaceName, lpFamily, LF_FACESIZE );
+    if( lpFamily ) lstrcpynA( lf.lfFaceName, lpFamily, LF_FACESIZE );
     else lf.lfFaceName[0] = '\0';
 
     return EnumFontFamiliesEx16( hDC, &lf, (FONTENUMPROCEX16)efproc, lpData, 0 );
@@ -561,32 +561,32 @@ INT16 WINAPI EnumFontFamilies16( HDC16 hDC, LPCSTR lpFamily,
 /***********************************************************************
  *              EnumFontFamilies32A	(GDI32.80)
  */
-INT32 WINAPI EnumFontFamilies32A( HDC32 hDC, LPCSTR lpFamily,
-                                  FONTENUMPROC32A efproc, LPARAM lpData )
+INT WINAPI EnumFontFamiliesA( HDC hDC, LPCSTR lpFamily,
+                                  FONTENUMPROCA efproc, LPARAM lpData )
 {
-    LOGFONT32A	lf;
+    LOGFONTA	lf;
 
     lf.lfCharSet = DEFAULT_CHARSET;
-    if( lpFamily ) lstrcpyn32A( lf.lfFaceName, lpFamily, LF_FACESIZE );
+    if( lpFamily ) lstrcpynA( lf.lfFaceName, lpFamily, LF_FACESIZE );
     else lf.lfFaceName[0] = lf.lfFaceName[1] = '\0';
 
-    return FONT_EnumFontFamiliesEx32( hDC, (LPLOGFONT32W)&lf, 
-					   (FONTENUMPROC32W)efproc, lpData, 0 );
+    return FONT_EnumFontFamiliesEx( hDC, (LPLOGFONTW)&lf, 
+					   (FONTENUMPROCW)efproc, lpData, 0 );
 }
 
 /***********************************************************************
  *              EnumFontFamilies32W	(GDI32.83)
  */
-INT32 WINAPI EnumFontFamilies32W( HDC32 hDC, LPCWSTR lpFamily,
-                                  FONTENUMPROC32W efproc, LPARAM lpData )
+INT WINAPI EnumFontFamiliesW( HDC hDC, LPCWSTR lpFamily,
+                                  FONTENUMPROCW efproc, LPARAM lpData )
 {
-    LOGFONT32W  lf;
+    LOGFONTW  lf;
 
     lf.lfCharSet = DEFAULT_CHARSET;
-    if( lpFamily ) lstrcpyn32W( lf.lfFaceName, lpFamily, LF_FACESIZE );
+    if( lpFamily ) lstrcpynW( lf.lfFaceName, lpFamily, LF_FACESIZE );
     else lf.lfFaceName[0] = 0;
 
-    return FONT_EnumFontFamiliesEx32( hDC, &lf, efproc, lpData, ENUM_UNICODE );
+    return FONT_EnumFontFamiliesEx( hDC, &lf, efproc, lpData, ENUM_UNICODE );
 }
 
 /***********************************************************************
@@ -601,19 +601,19 @@ INT16 WINAPI EnumFonts16( HDC16 hDC, LPCSTR lpName, FONTENUMPROC16 efproc,
 /***********************************************************************
  *              EnumFonts32A		(GDI32.84)
  */
-INT32 WINAPI EnumFonts32A( HDC32 hDC, LPCSTR lpName, FONTENUMPROC32A efproc,
+INT WINAPI EnumFontsA( HDC hDC, LPCSTR lpName, FONTENUMPROCA efproc,
                            LPARAM lpData )
 {
-    return EnumFontFamilies32A( hDC, lpName, efproc, lpData );
+    return EnumFontFamiliesA( hDC, lpName, efproc, lpData );
 }
 
 /***********************************************************************
  *              EnumFonts32W		(GDI32.85)
  */
-INT32 WINAPI EnumFonts32W( HDC32 hDC, LPCWSTR lpName, FONTENUMPROC32W efproc,
+INT WINAPI EnumFontsW( HDC hDC, LPCWSTR lpName, FONTENUMPROCW efproc,
                            LPARAM lpData )
 {
-    return EnumFontFamilies32W( hDC, lpName, efproc, lpData );
+    return EnumFontFamiliesW( hDC, lpName, efproc, lpData );
 }
 
 
@@ -632,7 +632,7 @@ INT16 WINAPI GetTextCharacterExtra16( HDC16 hdc )
 /***********************************************************************
  *           GetTextCharacterExtra32    (GDI32.225)
  */
-INT32 WINAPI GetTextCharacterExtra32( HDC32 hdc )
+INT WINAPI GetTextCharacterExtra( HDC hdc )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return 0;
@@ -646,16 +646,16 @@ INT32 WINAPI GetTextCharacterExtra32( HDC32 hdc )
  */
 INT16 WINAPI SetTextCharacterExtra16( HDC16 hdc, INT16 extra )
 {
-    return (INT16)SetTextCharacterExtra32( hdc, extra );
+    return (INT16)SetTextCharacterExtra( hdc, extra );
 }
 
 
 /***********************************************************************
  *           SetTextCharacterExtra32    (GDI32.337)
  */
-INT32 WINAPI SetTextCharacterExtra32( HDC32 hdc, INT32 extra )
+INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra )
 {
-    INT32 prev;
+    INT prev;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return 0;
     extra = (extra * dc->vportExtX + dc->wndExtX / 2) / dc->wndExtX;
@@ -670,14 +670,14 @@ INT32 WINAPI SetTextCharacterExtra32( HDC32 hdc, INT32 extra )
  */
 INT16 WINAPI SetTextJustification16( HDC16 hdc, INT16 extra, INT16 breaks )
 {
-    return SetTextJustification32( hdc, extra, breaks );
+    return SetTextJustification( hdc, extra, breaks );
 }
 
 
 /***********************************************************************
  *           SetTextJustification32    (GDI32.339)
  */
-BOOL32 WINAPI SetTextJustification32( HDC32 hdc, INT32 extra, INT32 breaks )
+BOOL WINAPI SetTextJustification( HDC hdc, INT extra, INT breaks )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return 0;
@@ -705,13 +705,13 @@ BOOL32 WINAPI SetTextJustification32( HDC32 hdc, INT32 extra, INT32 breaks )
  */
 INT16 WINAPI GetTextFace16( HDC16 hdc, INT16 count, LPSTR name )
 {
-        return GetTextFace32A(hdc,count,name);
+        return GetTextFaceA(hdc,count,name);
 }
 
 /***********************************************************************
  *           GetTextFace32A    (GDI32.234)
  */
-INT32 WINAPI GetTextFace32A( HDC32 hdc, INT32 count, LPSTR name )
+INT WINAPI GetTextFaceA( HDC hdc, INT count, LPSTR name )
 {
     FONTOBJ *font;
 
@@ -720,7 +720,7 @@ INT32 WINAPI GetTextFace32A( HDC32 hdc, INT32 count, LPSTR name )
     if (!(font = (FONTOBJ *) GDI_GetObjPtr( dc->w.hFont, FONT_MAGIC )))
         return 0;
     if (name) 
-        lstrcpyn32A( name, font->logfont.lfFaceName, count );
+        lstrcpynA( name, font->logfont.lfFaceName, count );
     GDI_HEAP_UNLOCK( dc->w.hFont );
     if (name)
         return strlen(name);
@@ -731,10 +731,10 @@ INT32 WINAPI GetTextFace32A( HDC32 hdc, INT32 count, LPSTR name )
 /***********************************************************************
  *           GetTextFace32W    (GDI32.235)
  */
-INT32 WINAPI GetTextFace32W( HDC32 hdc, INT32 count, LPWSTR name )
+INT WINAPI GetTextFaceW( HDC hdc, INT count, LPWSTR name )
 {
     LPSTR nameA = HeapAlloc( GetProcessHeap(), 0, count );
-    INT32 res = GetTextFace32A(hdc,count,nameA);
+    INT res = GetTextFaceA(hdc,count,nameA);
     lstrcpyAtoW( name, nameA );
     HeapFree( GetProcessHeap(), 0, nameA );
     return res;
@@ -744,7 +744,7 @@ INT32 WINAPI GetTextFace32W( HDC32 hdc, INT32 count, LPWSTR name )
 /***********************************************************************
  *           GetTextExtent    (GDI.91)
  */
-DWORD WINAPI GetTextExtent( HDC16 hdc, LPCSTR str, INT16 count )
+DWORD WINAPI GetTextExtent16( HDC16 hdc, LPCSTR str, INT16 count )
 {
     SIZE16 size;
     if (!GetTextExtentPoint16( hdc, str, count, &size )) return 0;
@@ -762,8 +762,8 @@ DWORD WINAPI GetTextExtent( HDC16 hdc, LPCSTR str, INT16 count )
 BOOL16 WINAPI GetTextExtentPoint16( HDC16 hdc, LPCSTR str, INT16 count,
                                     LPSIZE16 size )
 {
-    SIZE32 size32;
-    BOOL32 ret = GetTextExtentPoint32A( hdc, str, count, &size32 );
+    SIZE size32;
+    BOOL ret = GetTextExtentPoint32A( hdc, str, count, &size32 );
     CONV_SIZE32TO16( &size32, size );
     return (BOOL16)ret;
 }
@@ -772,8 +772,8 @@ BOOL16 WINAPI GetTextExtentPoint16( HDC16 hdc, LPCSTR str, INT16 count,
 /***********************************************************************
  *           GetTextExtentPoint32A    (GDI32.230)
  */
-BOOL32 WINAPI GetTextExtentPoint32A( HDC32 hdc, LPCSTR str, INT32 count,
-                                     LPSIZE32 size )
+BOOL WINAPI GetTextExtentPoint32A( HDC hdc, LPCSTR str, INT count,
+                                     LPSIZE size )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc)
@@ -802,14 +802,14 @@ BOOL32 WINAPI GetTextExtentPoint32A( HDC32 hdc, LPCSTR str, INT32 count,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI GetTextExtentPoint32W(
-    HDC32 hdc,     /* [in]  Handle of device context */
+BOOL WINAPI GetTextExtentPoint32W(
+    HDC hdc,     /* [in]  Handle of device context */
     LPCWSTR str,   /* [in]  Address of text string */
-    INT32 count,   /* [in]  Number of characters in string */
-    LPSIZE32 size) /* [out] Address of structure for string size */
+    INT count,   /* [in]  Number of characters in string */
+    LPSIZE size) /* [out] Address of structure for string size */
 {
     LPSTR p = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-    BOOL32 ret = GetTextExtentPoint32A( hdc, p, count, size );
+    BOOL ret = GetTextExtentPoint32A( hdc, p, count, size );
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
 }
@@ -818,8 +818,8 @@ BOOL32 WINAPI GetTextExtentPoint32W(
 /***********************************************************************
  *           GetTextExtentPoint32ABuggy    (GDI32.232)
  */
-BOOL32 WINAPI GetTextExtentPoint32ABuggy( HDC32 hdc, LPCSTR str, INT32 count,
-                                          LPSIZE32 size )
+BOOL WINAPI GetTextExtentPointA( HDC hdc, LPCSTR str, INT count,
+                                          LPSIZE size )
 {
     TRACE(font, "not bug compatible.\n");
     return GetTextExtentPoint32A( hdc, str, count, size );
@@ -828,8 +828,8 @@ BOOL32 WINAPI GetTextExtentPoint32ABuggy( HDC32 hdc, LPCSTR str, INT32 count,
 /***********************************************************************
  *           GetTextExtentPoint32WBuggy    (GDI32.233)
  */
-BOOL32 WINAPI GetTextExtentPoint32WBuggy( HDC32 hdc, LPCWSTR str, INT32 count,
-                                          LPSIZE32 size )
+BOOL WINAPI GetTextExtentPointW( HDC hdc, LPCWSTR str, INT count,
+                                          LPSIZE size )
 {
     TRACE(font, "not bug compatible.\n");
     return GetTextExtentPoint32W( hdc, str, count, size );
@@ -839,12 +839,12 @@ BOOL32 WINAPI GetTextExtentPoint32WBuggy( HDC32 hdc, LPCWSTR str, INT32 count,
 /***********************************************************************
  *           GetTextExtentExPoint32A    (GDI32.228)
  */
-BOOL32 WINAPI GetTextExtentExPoint32A( HDC32 hdc, LPCSTR str, INT32 count,
-                                       INT32 maxExt, LPINT32 lpnFit,
-                                       LPINT32 alpDx, LPSIZE32 size )
+BOOL WINAPI GetTextExtentExPointA( HDC hdc, LPCSTR str, INT count,
+                                       INT maxExt, LPINT lpnFit,
+                                       LPINT alpDx, LPSIZE size )
 {
     int index, nFit, extent;
-    SIZE32 tSize;
+    SIZE tSize;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
 
     if (!dc)
@@ -881,12 +881,12 @@ BOOL32 WINAPI GetTextExtentExPoint32A( HDC32 hdc, LPCSTR str, INT32 count,
  *           GetTextExtentExPoint32W    (GDI32.229)
  */
 
-BOOL32 WINAPI GetTextExtentExPoint32W( HDC32 hdc, LPCWSTR str, INT32 count,
-                                       INT32 maxExt, LPINT32 lpnFit,
-                                       LPINT32 alpDx, LPSIZE32 size )
+BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count,
+                                       INT maxExt, LPINT lpnFit,
+                                       LPINT alpDx, LPSIZE size )
 {
     LPSTR p = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-    BOOL32 ret = GetTextExtentExPoint32A( hdc, p, count, maxExt,
+    BOOL ret = GetTextExtentExPointA( hdc, p, count, maxExt,
                                         lpnFit, alpDx, size);
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
@@ -897,9 +897,9 @@ BOOL32 WINAPI GetTextExtentExPoint32W( HDC32 hdc, LPCWSTR str, INT32 count,
  */
 BOOL16 WINAPI GetTextMetrics16( HDC16 hdc, TEXTMETRIC16 *metrics )
 {
-    TEXTMETRIC32A tm32;
+    TEXTMETRICA tm32;
 
-    if (!GetTextMetrics32A( (HDC32)hdc, &tm32 )) return FALSE;
+    if (!GetTextMetricsA( (HDC)hdc, &tm32 )) return FALSE;
     FONT_TextMetric32Ato16( &tm32, metrics );
     return TRUE;
 }
@@ -908,7 +908,7 @@ BOOL16 WINAPI GetTextMetrics16( HDC16 hdc, TEXTMETRIC16 *metrics )
 /***********************************************************************
  *           GetTextMetrics32A    (GDI32.236)
  */
-BOOL32 WINAPI GetTextMetrics32A( HDC32 hdc, TEXTMETRIC32A *metrics )
+BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics )
 {
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc)
@@ -967,10 +967,10 @@ BOOL32 WINAPI GetTextMetrics32A( HDC32 hdc, TEXTMETRIC32A *metrics )
 /***********************************************************************
  *           GetTextMetrics32W    (GDI32.237)
  */
-BOOL32 WINAPI GetTextMetrics32W( HDC32 hdc, TEXTMETRIC32W *metrics )
+BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics )
 {
-    TEXTMETRIC32A tm;
-    if (!GetTextMetrics32A( (HDC16)hdc, &tm )) return FALSE;
+    TEXTMETRICA tm;
+    if (!GetTextMetricsA( (HDC16)hdc, &tm )) return FALSE;
     FONT_TextMetric32Ato32W( &tm, metrics );
     return TRUE;
 }
@@ -1004,23 +1004,23 @@ UINT16 WINAPI GetOutlineTextMetrics16(
  *    Success: Non-zero or size of required buffer
  *    Failure: 0
  */
-UINT32 WINAPI GetOutlineTextMetrics32A(
-    HDC32 hdc,    /* [in]  Handle of device context */
-    UINT32 cbData, /* [in]  Size of metric data array */
-    LPOUTLINETEXTMETRIC32A lpOTM)  /* [out] Address of metric data array */
+UINT WINAPI GetOutlineTextMetricsA(
+    HDC hdc,    /* [in]  Handle of device context */
+    UINT cbData, /* [in]  Size of metric data array */
+    LPOUTLINETEXTMETRICA lpOTM)  /* [out] Address of metric data array */
 {
 
 
-    UINT32 rtn = FALSE;
-    LPTEXTMETRIC32A lptxtMetr;
+    UINT rtn = FALSE;
+    LPTEXTMETRICA lptxtMetr;
 
 
 
     if (lpOTM == 0)
     {
         
-        lpOTM = (LPOUTLINETEXTMETRIC32A)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(OUTLINETEXTMETRIC32A));
-        rtn = sizeof(OUTLINETEXTMETRIC32A);
+        lpOTM = (LPOUTLINETEXTMETRICA)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(OUTLINETEXTMETRICA));
+        rtn = sizeof(OUTLINETEXTMETRICA);
         cbData = rtn;
     } else
     {
@@ -1030,14 +1030,14 @@ UINT32 WINAPI GetOutlineTextMetrics32A(
 
     lpOTM->otmSize = cbData;
 
-    lptxtMetr =HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(TEXTMETRIC32A));
+    lptxtMetr =HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(TEXTMETRICA));
     
-    if (!GetTextMetrics32A(hdc,lptxtMetr))
+    if (!GetTextMetricsA(hdc,lptxtMetr))
     {
         return 0;
     } else
     {
-       memcpy(&(lpOTM->otmTextMetrics),lptxtMetr,sizeof(TEXTMETRIC32A));
+       memcpy(&(lpOTM->otmTextMetrics),lptxtMetr,sizeof(TEXTMETRICA));
     };
 
     HeapFree(GetProcessHeap(),HEAP_ZERO_MEMORY,lptxtMetr);
@@ -1069,10 +1069,10 @@ UINT32 WINAPI GetOutlineTextMetrics32A(
 /***********************************************************************
  *           GetOutlineTextMetrics32W [GDI32.208]
  */
-UINT32 WINAPI GetOutlineTextMetrics32W(
-    HDC32 hdc,    /* [in]  Handle of device context */
-    UINT32 cbData, /* [in]  Size of metric data array */
-    LPOUTLINETEXTMETRIC32W lpOTM)  /* [out] Address of metric data array */
+UINT WINAPI GetOutlineTextMetricsW(
+    HDC hdc,    /* [in]  Handle of device context */
+    UINT cbData, /* [in]  Size of metric data array */
+    LPOUTLINETEXTMETRICW lpOTM)  /* [out] Address of metric data array */
 {
     FIXME(font, "(%d,%d,%p): stub\n", hdc, cbData, lpOTM);
     return 0; 
@@ -1084,15 +1084,15 @@ UINT32 WINAPI GetOutlineTextMetrics32W(
 BOOL16 WINAPI GetCharWidth16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
                               LPINT16 buffer )
 {
-    BOOL32	retVal = FALSE;
+    BOOL	retVal = FALSE;
 
     if( firstChar != lastChar )
     {
-	LPINT32	buf32 = (LPINT32)HeapAlloc(GetProcessHeap(), 0,
-				 sizeof(INT32)*(1 + (lastChar - firstChar)));
+	LPINT	buf32 = (LPINT)HeapAlloc(GetProcessHeap(), 0,
+				 sizeof(INT)*(1 + (lastChar - firstChar)));
 	if( buf32 )
 	{
-	    LPINT32	obuf32 = buf32;
+	    LPINT	obuf32 = buf32;
 	    int		i;
 
             retVal = GetCharWidth32A(hdc, firstChar, lastChar, buf32);
@@ -1106,7 +1106,7 @@ BOOL16 WINAPI GetCharWidth16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
     }
     else /* happens quite often to warrant a special treatment */
     {
-	INT32 chWidth;
+	INT chWidth;
 	retVal = GetCharWidth32A(hdc, firstChar, lastChar, &chWidth );
        *buffer = chWidth;
     }
@@ -1117,10 +1117,10 @@ BOOL16 WINAPI GetCharWidth16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
 /***********************************************************************
  *           GetCharWidth32A    (GDI32.155)
  */
-BOOL32 WINAPI GetCharWidth32A( HDC32 hdc, UINT32 firstChar, UINT32 lastChar,
-                               LPINT32 buffer )
+BOOL WINAPI GetCharWidth32A( HDC hdc, UINT firstChar, UINT lastChar,
+                               LPINT buffer )
 {
-    UINT32 i, extra;
+    UINT i, extra;
     DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc)
     {
@@ -1145,8 +1145,8 @@ BOOL32 WINAPI GetCharWidth32A( HDC32 hdc, UINT32 firstChar, UINT32 lastChar,
 /***********************************************************************
  *           GetCharWidth32W    (GDI32.158)
  */
-BOOL32 WINAPI GetCharWidth32W( HDC32 hdc, UINT32 firstChar, UINT32 lastChar,
-                               LPINT32 buffer )
+BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar,
+                               LPINT buffer )
 {
     return GetCharWidth32A( hdc, firstChar, lastChar, buffer );
 }
@@ -1160,14 +1160,14 @@ BOOL32 WINAPI GetCharWidth32W( HDC32 hdc, UINT32 firstChar, UINT32 lastChar,
  */
 DWORD WINAPI SetMapperFlags16( HDC16 hDC, DWORD dwFlag )
 {
-    return SetMapperFlags32( hDC, dwFlag );
+    return SetMapperFlags( hDC, dwFlag );
 }
 
 
 /***********************************************************************
  *           SetMapperFlags32    (GDI32.322)
  */
-DWORD WINAPI SetMapperFlags32( HDC32 hDC, DWORD dwFlag )
+DWORD WINAPI SetMapperFlags( HDC hDC, DWORD dwFlag )
 {
     FIXME(font, "(0x%04x, 0x%08lx): stub - harmless\n", hDC, dwFlag);
     return 0;
@@ -1186,7 +1186,7 @@ BOOL16 WINAPI GetAspectRatioFilterEx16( HDC16 hdc, LPSIZE16 pAspectRatio )
 /***********************************************************************
  *          GetAspectRatioFilterEx32  (GDI32.142)
  */
-BOOL32 WINAPI GetAspectRatioFilterEx32( HDC32 hdc, LPSIZE32 pAspectRatio )
+BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio )
 {
   FIXME(font, "(%04x, %p): -- Empty Stub !\n",
         hdc, pAspectRatio);
@@ -1199,8 +1199,8 @@ BOOL32 WINAPI GetAspectRatioFilterEx32( HDC32 hdc, LPSIZE32 pAspectRatio )
 BOOL16 WINAPI GetCharABCWidths16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
                                   LPABC16 abc )
 {
-    ABC32 abc32;
-    if (!GetCharABCWidths32A( hdc, firstChar, lastChar, &abc32 )) return FALSE;
+    ABC abc32;
+    if (!GetCharABCWidthsA( hdc, firstChar, lastChar, &abc32 )) return FALSE;
     abc->abcA = abc32.abcA;
     abc->abcB = abc32.abcB;
     abc->abcC = abc32.abcC;
@@ -1211,10 +1211,10 @@ BOOL16 WINAPI GetCharABCWidths16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
 /***********************************************************************
  *           GetCharABCWidths32A   (GDI32.149)
  */
-BOOL32 WINAPI GetCharABCWidths32A(HDC32 hdc, UINT32 firstChar, UINT32 lastChar,
-                                  LPABC32 abc )
+BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar,
+                                  LPABC abc )
 {
-    return GetCharABCWidths32W( hdc, firstChar, lastChar, abc );
+    return GetCharABCWidthsW( hdc, firstChar, lastChar, abc );
 }
 
 
@@ -1234,8 +1234,8 @@ BOOL32 WINAPI GetCharABCWidths32A(HDC32 hdc, UINT32 firstChar, UINT32 lastChar,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI GetCharABCWidths32W( HDC32 hdc, UINT32 firstChar, UINT32 lastChar,
-                                   LPABC32 abc )
+BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar,
+                                   LPABC abc )
 {
     /* No TrueType fonts in Wine so far */
     FIXME(font, "(%04x,%04x,%04x,%p): stub\n", hdc, firstChar, lastChar, abc);
@@ -1259,8 +1259,8 @@ DWORD WINAPI GetGlyphOutline16( HDC16 hdc, UINT16 uChar, UINT16 fuFormat,
 /***********************************************************************
  *           GetGlyphOutline32A    (GDI32.186)
  */
-DWORD WINAPI GetGlyphOutline32A( HDC32 hdc, UINT32 uChar, UINT32 fuFormat,
-                                 LPGLYPHMETRICS32 lpgm, DWORD cbBuffer,
+DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat,
+                                 LPGLYPHMETRICS lpgm, DWORD cbBuffer,
                                  LPVOID lpBuffer, const MAT2 *lpmat2 )
 {
     FIXME(font,"(%04x, '%c', %04x, %p, %ld, %p, %p): stub\n",
@@ -1271,8 +1271,8 @@ DWORD WINAPI GetGlyphOutline32A( HDC32 hdc, UINT32 uChar, UINT32 fuFormat,
 /***********************************************************************
  *           GetGlyphOutline32W    (GDI32.187)
  */
-DWORD WINAPI GetGlyphOutline32W( HDC32 hdc, UINT32 uChar, UINT32 fuFormat,
-                                 LPGLYPHMETRICS32 lpgm, DWORD cbBuffer,
+DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat,
+                                 LPGLYPHMETRICS lpgm, DWORD cbBuffer,
                                  LPVOID lpBuffer, const MAT2 *lpmat2 )
 {
     FIXME(font,"(%04x, '%c', %04x, %p, %ld, %p, %p): stub\n",
@@ -1287,14 +1287,14 @@ BOOL16 WINAPI CreateScalableFontResource16( UINT16 fHidden,
                                             LPCSTR lpszResourceFile,
                                             LPCSTR fontFile, LPCSTR path )
 {
-    return CreateScalableFontResource32A( fHidden, lpszResourceFile,
+    return CreateScalableFontResourceA( fHidden, lpszResourceFile,
                                           fontFile, path );
 }
 
 /***********************************************************************
  *           CreateScalableFontResource32A   (GDI32.62)
  */
-BOOL32 WINAPI CreateScalableFontResource32A( DWORD fHidden,
+BOOL WINAPI CreateScalableFontResourceA( DWORD fHidden,
                                              LPCSTR lpszResourceFile,
                                              LPCSTR lpszFontFile,
                                              LPCSTR lpszCurrentPath )
@@ -1311,7 +1311,7 @@ BOOL32 WINAPI CreateScalableFontResource32A( DWORD fHidden,
 /***********************************************************************
  *           CreateScalableFontResource32W   (GDI32.63)
  */
-BOOL32 WINAPI CreateScalableFontResource32W( DWORD fHidden,
+BOOL WINAPI CreateScalableFontResourceW( DWORD fHidden,
                                              LPCWSTR lpszResourceFile,
                                              LPCWSTR lpszFontFile,
                                              LPCWSTR lpszCurrentPath )
@@ -1327,14 +1327,14 @@ BOOL32 WINAPI CreateScalableFontResource32W( DWORD fHidden,
  */
 BOOL16 WINAPI GetRasterizerCaps16( LPRASTERIZER_STATUS lprs, UINT16 cbNumBytes)
 {
-    return GetRasterizerCaps32( lprs, cbNumBytes );
+    return GetRasterizerCaps( lprs, cbNumBytes );
 }
 
 
 /*************************************************************************
  *             GetRasterizerCaps32   (GDI32.216)
  */
-BOOL32 WINAPI GetRasterizerCaps32( LPRASTERIZER_STATUS lprs, UINT32 cbNumBytes)
+BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes)
 {
   lprs->nSize = sizeof(RASTERIZER_STATUS);
   lprs->wFlags = TT_AVAILABLE|TT_ENABLED;
@@ -1363,8 +1363,8 @@ INT16 WINAPI GetKerningPairs16( HDC16 hDC, INT16 cPairs,
 /*************************************************************************
  *             GetKerningPairs32A   (GDI32.192)
  */
-DWORD WINAPI GetKerningPairs32A( HDC32 hDC, DWORD cPairs,
-                                 LPKERNINGPAIR32 lpKerningPairs )
+DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs,
+                                 LPKERNINGPAIR lpKerningPairs )
 {
     int i;
     FIXME(font,"(%x,%ld,%p): almost empty stub!\n",
@@ -1378,10 +1378,10 @@ DWORD WINAPI GetKerningPairs32A( HDC32 hDC, DWORD cPairs,
 /*************************************************************************
  *             GetKerningPairs32W   (GDI32.193)
  */
-DWORD WINAPI GetKerningPairs32W( HDC32 hDC, DWORD cPairs,
-                                 LPKERNINGPAIR32 lpKerningPairs )
+DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs,
+                                 LPKERNINGPAIR lpKerningPairs )
 {
-    return GetKerningPairs32A( hDC, cPairs, lpKerningPairs );
+    return GetKerningPairsA( hDC, cPairs, lpKerningPairs );
 }
 
 /*************************************************************************
@@ -1399,7 +1399,7 @@ DWORD WINAPI GetKerningPairs32W( HDC32 hDC, DWORD cPairs,
  *   TRUE on success, FALSE on failure.
  *
  */
-BOOL32 WINAPI TranslateCharsetInfo(
+BOOL WINAPI TranslateCharsetInfo(
   LPDWORD lpSrc, /*
        if flags == TCI_SRCFONTSIG: pointer to fsCsb of a FONTSIGNATURE
        if flags == TCI_SRCCHARSET: a character set value
@@ -1414,10 +1414,10 @@ BOOL32 WINAPI TranslateCharsetInfo(
 	while (!(*lpSrc>>index & 0x0001) && index<MAXTCIINDEX) index++;
       break;
     case TCI_SRCCODEPAGE:
-      while ((UINT32) (lpSrc) != FONT_tci[index].ciACP && index < MAXTCIINDEX) index++;
+      while ((UINT) (lpSrc) != FONT_tci[index].ciACP && index < MAXTCIINDEX) index++;
       break;
     case TCI_SRCCHARSET:
-      while ((UINT32) (lpSrc) != FONT_tci[index].ciCharset && index < MAXTCIINDEX) index++;
+      while ((UINT) (lpSrc) != FONT_tci[index].ciCharset && index < MAXTCIINDEX) index++;
       break;
     default:
       return FALSE;
@@ -1430,7 +1430,7 @@ BOOL32 WINAPI TranslateCharsetInfo(
 /*************************************************************************
  *             GetFontLanguageInfo   (GDI32.182)
  */
-DWORD WINAPI GetFontLanguageInfo32(HDC32 hdc) {
+DWORD WINAPI GetFontLanguageInfo(HDC hdc) {
 	/* return value 0 is correct for most cases anyway */
         FIXME(font,"(%x):stub!\n", hdc);
 	return 0;
@@ -1461,7 +1461,7 @@ DWORD WINAPI GetFontLanguageInfo16(HDC16 hdc) {
  *
  * Unimplemented
  */
-DWORD WINAPI GetFontData32(HDC32 hdc, DWORD table, DWORD offset, 
+DWORD WINAPI GetFontData(HDC hdc, DWORD table, DWORD offset, 
     LPVOID buffer, DWORD length)
 {
     FIXME(font, "(%x,%ld,%ld,%p,%ld): stub\n", 
@@ -1474,8 +1474,8 @@ DWORD WINAPI GetFontData32(HDC32 hdc, DWORD table, DWORD offset,
  * GetCharacterPlacement32A [GDI32.160]
  */
 DWORD WINAPI
-GetCharacterPlacement32A(HDC32 hdc, LPCSTR lpString, INT32 uCount,
-			 INT32 nMaxExtent, GCP_RESULTS32A *lpResults,
+GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount,
+			 INT nMaxExtent, GCP_RESULTSA *lpResults,
 			 DWORD dwFlags)
 {
     /* return value 0 is correct for most cases anyway */
@@ -1487,8 +1487,8 @@ GetCharacterPlacement32A(HDC32 hdc, LPCSTR lpString, INT32 uCount,
  * GetCharacterPlacement32W [GDI32.161]
  */
 DWORD WINAPI
-GetCharacterPlacement32W(HDC32 hdc, LPCWSTR lpString, INT32 uCount,
-			 INT32 nMaxExtent, GCP_RESULTS32W *lpResults,
+GetCharacterPlacementW(HDC hdc, LPCWSTR lpString, INT uCount,
+			 INT nMaxExtent, GCP_RESULTSW *lpResults,
 			 DWORD dwFlags)
 {
     /* return value 0 is correct for most cases anyway */
@@ -1499,7 +1499,7 @@ GetCharacterPlacement32W(HDC32 hdc, LPCWSTR lpString, INT32 uCount,
 /*************************************************************************
  *      GetCharABCWidthsFloat32A [GDI32.150]
  */
-BOOL32 WINAPI GetCharABCWidthsFloat32A(HDC32 hdc, UINT32 iFirstChar, UINT32 iLastChar,
+BOOL WINAPI GetCharABCWidthsFloatA(HDC hdc, UINT iFirstChar, UINT iLastChar,
 		                        LPABCFLOAT lpABCF)
 {
        FIXME(gdi, "GetCharABCWidthsFloatA, stub\n");
@@ -1509,8 +1509,8 @@ BOOL32 WINAPI GetCharABCWidthsFloat32A(HDC32 hdc, UINT32 iFirstChar, UINT32 iLas
 /*************************************************************************
  *      GetCharABCWidthsFloat32W [GDI32.151]
  */
-BOOL32 WINAPI GetCharABCWidthsFloat32W(HDC32 hdc, UINT32 iFirstChar,
-		                        UINT32 iLastChar, LPABCFLOAT lpABCF)
+BOOL WINAPI GetCharABCWidthsFloatW(HDC hdc, UINT iFirstChar,
+		                        UINT iLastChar, LPABCFLOAT lpABCF)
 {
        FIXME(gdi, "GetCharABCWidthsFloatW, stub\n");
        return 0;
@@ -1519,8 +1519,8 @@ BOOL32 WINAPI GetCharABCWidthsFloat32W(HDC32 hdc, UINT32 iFirstChar,
 /*************************************************************************
  *      GetCharWidthFloat32A [GDI32.156]
  */
-BOOL32 WINAPI GetCharWidthFloat32A(HDC32 hdc, UINT32 iFirstChar,
-		                    UINT32 iLastChar, PFLOAT pxBuffer)
+BOOL WINAPI GetCharWidthFloatA(HDC hdc, UINT iFirstChar,
+		                    UINT iLastChar, PFLOAT pxBuffer)
 {
        FIXME(gdi, "GetCharWidthFloatA, stub\n");
        return 0;
@@ -1529,8 +1529,8 @@ BOOL32 WINAPI GetCharWidthFloat32A(HDC32 hdc, UINT32 iFirstChar,
 /*************************************************************************
  *      GetCharWidthFloat32W [GDI32.157]
  */
-BOOL32 WINAPI GetCharWidthFloat32W(HDC32 hdc, UINT32 iFirstChar,
-		                    UINT32 iLastChar, PFLOAT pxBuffer)
+BOOL WINAPI GetCharWidthFloatW(HDC hdc, UINT iFirstChar,
+		                    UINT iLastChar, PFLOAT pxBuffer)
 {
        FIXME(gdi, "GetCharWidthFloatW, stub\n");
        return 0;
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index 199280a5e44..0996f85b712 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -230,7 +230,7 @@ static void  ReadFontInformation(
  *
  * GDI initialization.
  */
-BOOL32 GDI_Init(void)
+BOOL GDI_Init(void)
 {
     /* Kill some warnings.  */
     (void)align_OEMFixedFont;
@@ -297,7 +297,7 @@ HGDIOBJ16 GDI_AllocObject( WORD size, WORD magic )
 /***********************************************************************
  *           GDI_FreeObject
  */
-BOOL32 GDI_FreeObject( HGDIOBJ16 handle )
+BOOL GDI_FreeObject( HGDIOBJ16 handle )
 {
     GDIOBJHDR * object;
 
@@ -346,14 +346,14 @@ GDIOBJHDR * GDI_GetObjPtr( HGDIOBJ16 handle, WORD magic )
  */
 BOOL16 WINAPI DeleteObject16( HGDIOBJ16 obj )
 {
-    return DeleteObject32( obj );
+    return DeleteObject( obj );
 }
 
 
 /***********************************************************************
  *           DeleteObject32    (GDI32.70)
  */
-BOOL32 WINAPI DeleteObject32( HGDIOBJ32 obj )
+BOOL WINAPI DeleteObject( HGDIOBJ obj )
 {
       /* Check if object is valid */
 
@@ -375,7 +375,7 @@ BOOL32 WINAPI DeleteObject32( HGDIOBJ32 obj )
       case PALETTE_MAGIC: return PALETTE_DeleteObject(obj,(PALETTEOBJ*)header);
       case BITMAP_MAGIC:  return BITMAP_DeleteObject( obj, (BITMAPOBJ*)header);
       case REGION_MAGIC:  return REGION_DeleteObject( obj, (RGNOBJ*)header );
-      case DC_MAGIC:      return DeleteDC32(obj);
+      case DC_MAGIC:      return DeleteDC(obj);
       case 0 :
         WARN(gdi, "Already deleted\n");
         break;
@@ -390,14 +390,14 @@ BOOL32 WINAPI DeleteObject32( HGDIOBJ32 obj )
  */
 HGDIOBJ16 WINAPI GetStockObject16( INT16 obj )
 {
-    return (HGDIOBJ16)GetStockObject32( obj );
+    return (HGDIOBJ16)GetStockObject( obj );
 }
 
 
 /***********************************************************************
  *           GetStockObject32    (GDI32.220)
  */
-HGDIOBJ32 WINAPI GetStockObject32( INT32 obj )
+HGDIOBJ WINAPI GetStockObject( INT obj )
 {
     if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0;
     if (!StockObjects[obj]) return 0;
@@ -449,10 +449,10 @@ INT16 WINAPI GetObject16( HANDLE16 handle, INT16 count, LPVOID buffer )
 /***********************************************************************
  *           GetObject32A    (GDI32.204)
  */
-INT32 WINAPI GetObject32A( HANDLE32 handle, INT32 count, LPVOID buffer )
+INT WINAPI GetObjectA( HANDLE handle, INT count, LPVOID buffer )
 {
     GDIOBJHDR * ptr = NULL;
-    INT32 result = 0;
+    INT result = 0;
     TRACE(gdi, "%08x %d %p\n", handle, count, buffer );
     if (!count) return 0;
 
@@ -465,16 +465,16 @@ INT32 WINAPI GetObject32A( HANDLE32 handle, INT32 count, LPVOID buffer )
     switch(ptr->wMagic)
     {
       case PEN_MAGIC:
-	  result = PEN_GetObject32( (PENOBJ *)ptr, count, buffer );
+	  result = PEN_GetObject( (PENOBJ *)ptr, count, buffer );
 	  break;
       case BRUSH_MAGIC: 
-	  result = BRUSH_GetObject32( (BRUSHOBJ *)ptr, count, buffer );
+	  result = BRUSH_GetObject( (BRUSHOBJ *)ptr, count, buffer );
 	  break;
       case BITMAP_MAGIC: 
-	  result = BITMAP_GetObject32( (BITMAPOBJ *)ptr, count, buffer );
+	  result = BITMAP_GetObject( (BITMAPOBJ *)ptr, count, buffer );
 	  break;
       case FONT_MAGIC:
-	  result = FONT_GetObject32A( (FONTOBJ *)ptr, count, buffer );
+	  result = FONT_GetObjectA( (FONTOBJ *)ptr, count, buffer );
 	  break;
       case PALETTE_MAGIC:
 	  result = PALETTE_GetObject( (PALETTEOBJ *)ptr, count, buffer );
@@ -490,10 +490,10 @@ INT32 WINAPI GetObject32A( HANDLE32 handle, INT32 count, LPVOID buffer )
 /***********************************************************************
  *           GetObject32W    (GDI32.206)
  */
-INT32 WINAPI GetObject32W( HANDLE32 handle, INT32 count, LPVOID buffer )
+INT WINAPI GetObjectW( HANDLE handle, INT count, LPVOID buffer )
 {
     GDIOBJHDR * ptr = NULL;
-    INT32 result = 0;
+    INT result = 0;
     TRACE(gdi, "%08x %d %p\n", handle, count, buffer );
     if (!count) return 0;
 
@@ -506,16 +506,16 @@ INT32 WINAPI GetObject32W( HANDLE32 handle, INT32 count, LPVOID buffer )
     switch(ptr->wMagic)
     {
       case PEN_MAGIC:
-	  result = PEN_GetObject32( (PENOBJ *)ptr, count, buffer );
+	  result = PEN_GetObject( (PENOBJ *)ptr, count, buffer );
 	  break;
       case BRUSH_MAGIC: 
-	  result = BRUSH_GetObject32( (BRUSHOBJ *)ptr, count, buffer );
+	  result = BRUSH_GetObject( (BRUSHOBJ *)ptr, count, buffer );
 	  break;
       case BITMAP_MAGIC: 
-	  result = BITMAP_GetObject32( (BITMAPOBJ *)ptr, count, buffer );
+	  result = BITMAP_GetObject( (BITMAPOBJ *)ptr, count, buffer );
 	  break;
       case FONT_MAGIC:
-	  result = FONT_GetObject32W( (FONTOBJ *)ptr, count, buffer );
+	  result = FONT_GetObjectW( (FONTOBJ *)ptr, count, buffer );
 	  break;
       case PALETTE_MAGIC:
 	  result = PALETTE_GetObject( (PALETTEOBJ *)ptr, count, buffer );
@@ -532,10 +532,10 @@ INT32 WINAPI GetObject32W( HANDLE32 handle, INT32 count, LPVOID buffer )
 /***********************************************************************
  *           GetObjectType    (GDI32.205)
  */
-DWORD WINAPI GetObjectType( HANDLE32 handle )
+DWORD WINAPI GetObjectType( HANDLE handle )
 {
     GDIOBJHDR * ptr = NULL;
-    INT32 result = 0;
+    INT result = 0;
     TRACE(gdi, "%08x\n", handle );
 
     if ((handle >= FIRST_STOCK_HANDLE) && (handle <= LAST_STOCK_HANDLE))
@@ -589,7 +589,7 @@ DWORD WINAPI GetObjectType( HANDLE32 handle )
 /***********************************************************************
  *           GetCurrentObject    	(GDI32.166)
  */
-HANDLE32 WINAPI GetCurrentObject(HDC32 hdc,UINT32 type)
+HANDLE WINAPI GetCurrentObject(HDC hdc,UINT type)
 {
     DC * dc = DC_GetDCPtr( hdc );
 
@@ -614,14 +614,14 @@ HANDLE32 WINAPI GetCurrentObject(HDC32 hdc,UINT32 type)
  */
 HGDIOBJ16 WINAPI SelectObject16( HDC16 hdc, HGDIOBJ16 handle )
 {
-    return (HGDIOBJ16)SelectObject32( hdc, handle );
+    return (HGDIOBJ16)SelectObject( hdc, handle );
 }
 
 
 /***********************************************************************
  *           SelectObject32    (GDI32.299)
  */
-HGDIOBJ32 WINAPI SelectObject32( HDC32 hdc, HGDIOBJ32 handle )
+HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ handle )
 {
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc || !dc->funcs->pSelectObject) return 0;
@@ -635,16 +635,16 @@ HGDIOBJ32 WINAPI SelectObject32( HDC32 hdc, HGDIOBJ32 handle )
  */
 BOOL16 WINAPI UnrealizeObject16( HGDIOBJ16 obj )
 {
-    return UnrealizeObject32( obj );
+    return UnrealizeObject( obj );
 }
 
 
 /***********************************************************************
  *           UnrealizeObject    (GDI32.358)
  */
-BOOL32 WINAPI UnrealizeObject32( HGDIOBJ32 obj )
+BOOL WINAPI UnrealizeObject( HGDIOBJ obj )
 {
-    BOOL32 result = TRUE;
+    BOOL result = TRUE;
   /* Check if object is valid */
 
     GDIOBJHDR * header = (GDIOBJHDR *) GDI_HEAP_LOCK( obj );
@@ -751,8 +751,8 @@ INT16 WINAPI EnumObjects16( HDC16 hdc, INT16 nObjType,
 /***********************************************************************
  *           EnumObjects32    (GDI32.89)
  */
-INT32 WINAPI EnumObjects32( HDC32 hdc, INT32 nObjType,
-                            GOBJENUMPROC32 lpEnumFunc, LPARAM lParam )
+INT WINAPI EnumObjects( HDC hdc, INT nObjType,
+                            GOBJENUMPROC lpEnumFunc, LPARAM lParam )
 {
     /* Solid colors to enumerate */
     static const COLORREF solid_colors[] =
@@ -766,9 +766,9 @@ INT32 WINAPI EnumObjects32( HDC32 hdc, INT32 nObjType,
       RGB(0x80,0x80,0x80), RGB(0xc0,0xc0,0xc0)
     };
     
-    INT32 i, retval = 0;
-    LOGPEN32 pen;
-    LOGBRUSH32 brush;
+    INT i, retval = 0;
+    LOGPEN pen;
+    LOGBRUSH brush;
 
     TRACE(gdi, "%04x %d %08lx %08lx\n",
                  hdc, nObjType, (DWORD)lpEnumFunc, lParam );
@@ -829,7 +829,7 @@ INT32 WINAPI EnumObjects32( HDC32 hdc, INT32 nObjType,
  * 
  * returns type of object if valid (W95 system programming secrets p. 264-5)
  */
-BOOL16 WINAPI IsGDIObject( HGDIOBJ16 handle )
+BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle )
 {
     UINT16 magic = 0;
 
@@ -896,7 +896,7 @@ void WINAPI SetObjectOwner16( HGDIOBJ16 handle, HANDLE16 owner )
 /***********************************************************************
  *           SetObjectOwner32    (GDI32.386)
  */
-void WINAPI SetObjectOwner32( HGDIOBJ32 handle, HANDLE32 owner )
+void WINAPI SetObjectOwner( HGDIOBJ handle, HANDLE owner )
 {
     /* Nothing to do */
 }
@@ -904,7 +904,7 @@ void WINAPI SetObjectOwner32( HGDIOBJ32 handle, HANDLE32 owner )
 /***********************************************************************
  *           MakeObjectPrivate    (GDI.463)
  */
-void WINAPI MakeObjectPrivate( HGDIOBJ16 handle, BOOL16 private )
+void WINAPI MakeObjectPrivate16( HGDIOBJ16 handle, BOOL16 private )
 {
     /* FIXME */
 }
@@ -913,7 +913,7 @@ void WINAPI MakeObjectPrivate( HGDIOBJ16 handle, BOOL16 private )
 /***********************************************************************
  *           GdiFlush    (GDI32.128)
  */
-BOOL32 WINAPI GdiFlush(void)
+BOOL WINAPI GdiFlush(void)
 {
     return TRUE;  /* FIXME */
 }
@@ -940,7 +940,7 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit )
 /***********************************************************************
  *           GdiSeeGdiDo   (GDI.452)
  */
-DWORD WINAPI GdiSeeGdiDo( WORD wReqType, WORD wParam1, WORD wParam2,
+DWORD WINAPI GdiSeeGdiDo16( WORD wReqType, WORD wParam1, WORD wParam2,
                           WORD wParam3 )
 {
     switch (wReqType)
@@ -962,7 +962,7 @@ DWORD WINAPI GdiSeeGdiDo( WORD wReqType, WORD wParam1, WORD wParam2,
 /***********************************************************************
  *           GdiFreeResources   (GDI.609)
  */
-WORD WINAPI GdiFreeResources( DWORD reserve )
+WORD WINAPI GdiFreeResources16( DWORD reserve )
 {
    return (WORD)( (int)LOCAL_CountFree( GDI_HeapSel ) * 100 /
                   (int)LOCAL_HeapSize( GDI_HeapSel ) );
@@ -973,7 +973,7 @@ WORD WINAPI GdiFreeResources( DWORD reserve )
  */
 INT16 WINAPI MulDiv16( INT16 foo, INT16 bar, INT16 baz )
 {
-    INT32 ret;
+    INT ret;
     if (!baz) return -32768;
     ret = (foo * bar) / baz;
     if ((ret > 32767) || (ret < -32767)) return -32768;
@@ -987,10 +987,10 @@ INT16 WINAPI MulDiv16( INT16 foo, INT16 bar, INT16 baz )
  *	Result of multiplication and division
  *	-1: Overflow occurred or Divisor was 0
  */
-INT32 WINAPI MulDiv32(
-	     INT32 nMultiplicand, 
-	     INT32 nMultiplier,
-	     INT32 nDivisor
+INT WINAPI MulDiv(
+	     INT nMultiplicand, 
+	     INT nMultiplier,
+	     INT nDivisor
 ) {
 #if (SIZEOF_LONG_LONG >= 8)
     long long ret;
@@ -1008,7 +1008,7 @@ INT32 WINAPI MulDiv32(
  *
  *
  */
-BOOL32 WINAPI GetColorAdjustment(HDC32 hdc, LPCOLORADJUSTMENT lpca)
+BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca)
 {
         FIXME(gdi, "GetColorAdjustment, stub\n");
         return 0;
@@ -1019,7 +1019,7 @@ BOOL32 WINAPI GetColorAdjustment(HDC32 hdc, LPCOLORADJUSTMENT lpca)
  *
  *
  */
-BOOL32 WINAPI GetMiterLimit(HDC32 hdc, PFLOAT peLimit)
+BOOL WINAPI GetMiterLimit(HDC hdc, PFLOAT peLimit)
 {
         FIXME(gdi, "GetMiterLimit, stub\n");
         return 0;
@@ -1030,7 +1030,7 @@ BOOL32 WINAPI GetMiterLimit(HDC32 hdc, PFLOAT peLimit)
  *
  *
  */
-BOOL32 WINAPI SetMiterLimit(HDC32 hdc, FLOAT eNewLimit, PFLOAT peOldLimit)
+BOOL WINAPI SetMiterLimit(HDC hdc, FLOAT eNewLimit, PFLOAT peOldLimit)
 {
         FIXME(gdi, "SetMiterLimit, stub\n");
         return 0;
@@ -1041,7 +1041,7 @@ BOOL32 WINAPI SetMiterLimit(HDC32 hdc, FLOAT eNewLimit, PFLOAT peOldLimit)
  *
  *
  */
-BOOL32 WINAPI GdiComment(HDC32 hdc, UINT32 cbSize, const BYTE *lpData)
+BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData)
 {
         FIXME(gdi, "GdiComment, stub\n");
         return 0;
@@ -1051,7 +1051,7 @@ BOOL32 WINAPI GdiComment(HDC32 hdc, UINT32 cbSize, const BYTE *lpData)
  *
  *
  */
-BOOL32 WINAPI SetColorAdjustment32(HDC32 hdc, const COLORADJUSTMENT* lpca)
+BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca)
 {
         FIXME(gdi, "SetColorAdjustment, stub\n");
         return 0;
diff --git a/objects/linedda.c b/objects/linedda.c
index eb76e45b09c..e3de9446c21 100644
--- a/objects/linedda.c
+++ b/objects/linedda.c
@@ -14,22 +14,22 @@
 void WINAPI LineDDA16( INT16 nXStart, INT16 nYStart, INT16 nXEnd, INT16 nYEnd,
                        LINEDDAPROC16 callback, LPARAM lParam )
 {
-    LineDDA32( nXStart, nYStart, nXEnd, nYEnd,
-               (LINEDDAPROC32)callback, lParam );
+    LineDDA( nXStart, nYStart, nXEnd, nYEnd,
+               (LINEDDAPROC)callback, lParam );
 }
 
 
 /**********************************************************************
  *           LineDDA32   (GDI32.248)
  */
-BOOL32 WINAPI LineDDA32(INT32 nXStart, INT32 nYStart, INT32 nXEnd, INT32 nYEnd,
-                        LINEDDAPROC32 callback, LPARAM lParam )
+BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd,
+                        LINEDDAPROC callback, LPARAM lParam )
 {
-    INT32 xadd = 1, yadd = 1;
-    INT32 err,erradd;
-    INT32 cnt;
-    INT32 dx = nXEnd - nXStart;
-    INT32 dy = nYEnd - nYStart;
+    INT xadd = 1, yadd = 1;
+    INT err,erradd;
+    INT cnt;
+    INT dx = nXEnd - nXStart;
+    INT dy = nYEnd - nYStart;
 
     if (dx < 0)  {
       dx = -dx; xadd = -1;
diff --git a/objects/metafile.c b/objects/metafile.c
index 27f7b2b3f7c..c40d01e34eb 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -58,7 +58,7 @@ static int MF_AddHandleDC( DC *dc )
  */
 HMETAFILE16 WINAPI GetMetaFile16( LPCSTR lpFilename )
 {
-    return GetMetaFile32A( lpFilename );
+    return GetMetaFileA( lpFilename );
 }
 
 
@@ -67,14 +67,14 @@ HMETAFILE16 WINAPI GetMetaFile16( LPCSTR lpFilename )
  *
  *  Read a metafile from a file. Returns handle to a disk-based metafile.
  */
-HMETAFILE32 WINAPI GetMetaFile32A( 
+HMETAFILE WINAPI GetMetaFileA( 
 				  LPCSTR lpFilename 
 		      /* pointer to string containing filename to read */
 )
 {
   HMETAFILE16 hmf;
   METAHEADER *mh;
-  HFILE32 hFile;
+  HFILE hFile;
   DWORD size;
   
   TRACE(metafile,"%s\n", lpFilename);
@@ -91,15 +91,15 @@ HMETAFILE32 WINAPI GetMetaFile32A(
     return 0;
   }
   
-  if ((hFile = _lopen32(lpFilename, OF_READ)) == HFILE_ERROR32)
+  if ((hFile = _lopen(lpFilename, OF_READ)) == HFILE_ERROR)
   {
     GlobalFree16(hmf);
     return 0;
   }
   
-  if (_lread32(hFile, (char *)mh, MFHEADERSIZE) == HFILE_ERROR32)
+  if (_lread(hFile, (char *)mh, MFHEADERSIZE) == HFILE_ERROR)
   {
-    _lclose32( hFile );
+    _lclose( hFile );
     GlobalFree16(hmf);
     return 0;
   }
@@ -111,20 +111,20 @@ HMETAFILE32 WINAPI GetMetaFile32A(
   
   if (!mh)
   {
-    _lclose32( hFile );
+    _lclose( hFile );
     GlobalFree16(hmf);
     return 0;
   }
   
-  if (_lread32(hFile, (char*)mh + mh->mtHeaderSize * 2, 
-	        size - mh->mtHeaderSize * 2) == HFILE_ERROR32)
+  if (_lread(hFile, (char*)mh + mh->mtHeaderSize * 2, 
+	        size - mh->mtHeaderSize * 2) == HFILE_ERROR)
   {
-    _lclose32( hFile );
+    _lclose( hFile );
     GlobalFree16(hmf);
     return 0;
   }
   
-  _lclose32(hFile);
+  _lclose(hFile);
 
   if (mh->mtType != 1)
   {
@@ -141,10 +141,10 @@ HMETAFILE32 WINAPI GetMetaFile32A(
 /******************************************************************
  *         GetMetaFile32W   (GDI32.199)
  */
-HMETAFILE32 WINAPI GetMetaFile32W( LPCWSTR lpFilename )
+HMETAFILE WINAPI GetMetaFileW( LPCWSTR lpFilename )
 {
     LPSTR p = HEAP_strdupWtoA( GetProcessHeap(), 0, lpFilename );
-    HMETAFILE32 ret = GetMetaFile32A( p );
+    HMETAFILE ret = GetMetaFileA( p );
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
 }
@@ -156,7 +156,7 @@ HMETAFILE32 WINAPI GetMetaFile32W( LPCWSTR lpFilename )
 
 HMETAFILE16 WINAPI CopyMetaFile16( HMETAFILE16 hSrcMetaFile, LPCSTR lpFilename )
 {
-    return CopyMetaFile32A( hSrcMetaFile, lpFilename );
+    return CopyMetaFileA( hSrcMetaFile, lpFilename );
 }
 
 
@@ -175,14 +175,14 @@ HMETAFILE16 WINAPI CopyMetaFile16( HMETAFILE16 hSrcMetaFile, LPCSTR lpFilename )
  *
  *  Copying to disk returns NULL even if successful.
  */
-HMETAFILE32 WINAPI CopyMetaFile32A(
-		   HMETAFILE32 hSrcMetaFile, /* handle of metafile to copy */
+HMETAFILE WINAPI CopyMetaFileA(
+		   HMETAFILE hSrcMetaFile, /* handle of metafile to copy */
 		   LPCSTR lpFilename /* filename if copying to a file */
 ) {
     HMETAFILE16 handle = 0;
     METAHEADER *mh;
     METAHEADER *mh2;
-    HFILE32 hFile;
+    HFILE hFile;
     
     TRACE(metafile,"(%08x,%s)\n", hSrcMetaFile, lpFilename);
     
@@ -194,12 +194,12 @@ HMETAFILE32 WINAPI CopyMetaFile32A(
     if (lpFilename)          /* disk based metafile */
         {
         int i,j;
-	hFile = _lcreat32(lpFilename, 0);
+	hFile = _lcreat(lpFilename, 0);
 	j=mh->mtType;
 	mh->mtType=1;        /* disk file version stores 1 here */
-	i=_lwrite32(hFile, (char *)mh, mh->mtSize * 2) ;
+	i=_lwrite(hFile, (char *)mh, mh->mtSize * 2) ;
 	mh->mtType=j;        /* restore old value  [0 or 1] */	
-        _lclose32(hFile);
+        _lclose(hFile);
 	if (i == -1)
 	    return 0;
         /* FIXME: return value */
@@ -220,11 +220,11 @@ HMETAFILE32 WINAPI CopyMetaFile32A(
 /******************************************************************
  *         CopyMetaFile32W   (GDI32.24)
  */
-HMETAFILE32 WINAPI CopyMetaFile32W( HMETAFILE32 hSrcMetaFile,
+HMETAFILE WINAPI CopyMetaFileW( HMETAFILE hSrcMetaFile,
                                     LPCWSTR lpFilename )
 {
     LPSTR p = HEAP_strdupWtoA( GetProcessHeap(), 0, lpFilename );
-    HMETAFILE32 ret = CopyMetaFile32A( hSrcMetaFile, p );
+    HMETAFILE ret = CopyMetaFileA( hSrcMetaFile, p );
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
 }
@@ -245,7 +245,7 @@ HMETAFILE32 WINAPI CopyMetaFile32W( HMETAFILE32 hSrcMetaFile,
  *  for details.
  */
 
-BOOL16 WINAPI IsValidMetaFile(HMETAFILE16 hmf)
+BOOL16 WINAPI IsValidMetaFile16(HMETAFILE16 hmf)
 {
     BOOL16 resu=FALSE;
     METAHEADER *mh = (METAHEADER *)GlobalLock16(hmf);
@@ -267,7 +267,7 @@ BOOL16 WINAPI IsValidMetaFile(HMETAFILE16 hmf)
  */
 BOOL16 WINAPI PlayMetaFile16( HDC16 hdc, HMETAFILE16 hmf )
 {
-    return PlayMetaFile32( hdc, hmf );
+    return PlayMetaFile( hdc, hmf );
 }
 
 /******************************************************************
@@ -276,9 +276,9 @@ BOOL16 WINAPI PlayMetaFile16( HDC16 hdc, HMETAFILE16 hmf )
  *  Renders the metafile specified by hmf in the DC specified by
  *  hdc. Returns FALSE on failure, TRUE on success.
  */
-BOOL32 WINAPI PlayMetaFile32( 
-			     HDC32 hdc, /* handle of DC to render in */
-			     HMETAFILE32 hmf /* handle of metafile to render */
+BOOL WINAPI PlayMetaFile( 
+			     HDC hdc, /* handle of DC to render in */
+			     HMETAFILE hmf /* handle of metafile to render */
 )
 {
     METAHEADER *mh = (METAHEADER *)GlobalLock16(hmf);
@@ -287,9 +287,9 @@ BOOL32 WINAPI PlayMetaFile32(
     HGLOBAL16 hHT;
     int offset = 0;
     WORD i;
-    HPEN32 hPen;
-    HBRUSH32 hBrush;
-    HFONT32 hFont;
+    HPEN hPen;
+    HBRUSH hBrush;
+    HFONT hFont;
     DC *dc;
     
     TRACE(metafile,"(%04x %04x)\n",hdc,hmf);
@@ -323,14 +323,14 @@ BOOL32 WINAPI PlayMetaFile32(
 	PlayMetaFileRecord16( hdc, ht, mr, mh->mtNoObjects );
     }
 
-    SelectObject32(hdc, hBrush);
-    SelectObject32(hdc, hPen);
-    SelectObject32(hdc, hFont);
+    SelectObject(hdc, hBrush);
+    SelectObject(hdc, hPen);
+    SelectObject(hdc, hFont);
 
     /* free objects in handle table */
     for(i = 0; i < mh->mtNoObjects; i++)
       if(*(ht->objectHandle + i) != 0)
-        DeleteObject32(*(ht->objectHandle + i));
+        DeleteObject(*(ht->objectHandle + i));
     
     /* free handle table */
     GlobalFree16(hHT);
@@ -367,9 +367,9 @@ BOOL16 WINAPI EnumMetaFile16(
     SEGPTR spht;
     int offset = 0;
     WORD i, seg;
-    HPEN32 hPen;
-    HBRUSH32 hBrush;
-    HFONT32 hFont;
+    HPEN hPen;
+    HBRUSH hBrush;
+    HFONT hFont;
     DC *dc;
     BOOL16 result = TRUE;
     
@@ -388,7 +388,7 @@ BOOL16 WINAPI EnumMetaFile16(
 		     sizeof(HANDLETABLE16) * mh->mtNoObjects);
     spht = WIN16_GlobalLock16(hHT);
    
-    seg = GlobalHandleToSel(hmf);
+    seg = GlobalHandleToSel16(hmf);
     offset = mh->mtHeaderSize * 2;
     
     /* loop through metafile records */
@@ -408,16 +408,16 @@ BOOL16 WINAPI EnumMetaFile16(
 	offset += (mr->rdSize * 2);
     }
 
-    SelectObject32(hdc, hBrush);
-    SelectObject32(hdc, hPen);
-    SelectObject32(hdc, hFont);
+    SelectObject(hdc, hBrush);
+    SelectObject(hdc, hPen);
+    SelectObject(hdc, hFont);
 
     ht = (HANDLETABLE16 *)GlobalLock16(hHT);
 
     /* free objects in handle table */
     for(i = 0; i < mh->mtNoObjects; i++)
       if(*(ht->objectHandle + i) != 0)
-        DeleteObject32(*(ht->objectHandle + i));
+        DeleteObject(*(ht->objectHandle + i));
 
     /* free handle table */
     GlobalFree16(hHT);
@@ -425,21 +425,21 @@ BOOL16 WINAPI EnumMetaFile16(
     return result;
 }
 
-BOOL32 WINAPI EnumMetaFile32( 
-			     HDC32 hdc, 
-			     HMETAFILE32 hmf,
-			     MFENUMPROC32 lpEnumFunc, 
+BOOL WINAPI EnumMetaFile( 
+			     HDC hdc, 
+			     HMETAFILE hmf,
+			     MFENUMPROC lpEnumFunc, 
 			     LPARAM lpData 
 ) {
     METAHEADER *mh = (METAHEADER *)GlobalLock16(hmf);
     METARECORD *mr;
-    HANDLETABLE32 *ht;
-    BOOL32 result = TRUE;
+    HANDLETABLE *ht;
+    BOOL result = TRUE;
     int i, offset = 0;
     DC *dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
-    HPEN32 hPen;
-    HBRUSH32 hBrush;
-    HFONT32 hFont;
+    HPEN hPen;
+    HBRUSH hBrush;
+    HFONT hFont;
 
     TRACE(metafile,"(%08x,%08x,%p,%p)\n",
 		     hdc, hmf, lpEnumFunc, (void*)lpData);
@@ -453,8 +453,8 @@ BOOL32 WINAPI EnumMetaFile32(
     GDI_HEAP_UNLOCK(hdc);
 
 
-    ht = (HANDLETABLE32 *) GlobalAlloc32(GPTR, 
-			    sizeof(HANDLETABLE32) * mh->mtNoObjects);
+    ht = (HANDLETABLE *) GlobalAlloc(GPTR, 
+			    sizeof(HANDLETABLE) * mh->mtNoObjects);
     
     /* loop through metafile records */
     offset = mh->mtHeaderSize * 2;
@@ -472,22 +472,22 @@ BOOL32 WINAPI EnumMetaFile32(
     }
 
     /* restore pen, brush and font */
-    SelectObject32(hdc, hBrush);
-    SelectObject32(hdc, hPen);
-    SelectObject32(hdc, hFont);
+    SelectObject(hdc, hBrush);
+    SelectObject(hdc, hPen);
+    SelectObject(hdc, hFont);
 
     /* free objects in handle table */
     for(i = 0; i < mh->mtNoObjects; i++)
       if(*(ht->objectHandle + i) != 0)
-        DeleteObject32(*(ht->objectHandle + i));
+        DeleteObject(*(ht->objectHandle + i));
 
     /* free handle table */
-    GlobalFree32((HGLOBAL32)ht);
+    GlobalFree((HGLOBAL)ht);
     GlobalUnlock16(hmf);
     return result;
 }
 
-static BOOL32 MF_Meta_CreateRegion( METARECORD *mr, HRGN32 hrgn );
+static BOOL MF_Meta_CreateRegion( METARECORD *mr, HRGN hrgn );
 
 /******************************************************************
  *             PlayMetaFileRecord16   (GDI.176)
@@ -524,7 +524,7 @@ void WINAPI PlayMetaFileRecord16(
       break;
 
     case META_DELETEOBJECT:
-      DeleteObject32(*(ht->objectHandle + *(mr->rdParm)));
+      DeleteObject(*(ht->objectHandle + *(mr->rdParm)));
       *(ht->objectHandle + *(mr->rdParm)) = 0;
       break;
 
@@ -561,45 +561,45 @@ void WINAPI PlayMetaFileRecord16(
 	break;
 
     case META_SETWINDOWORG:
-	SetWindowOrg(hdc, *(mr->rdParm + 1), *(mr->rdParm));
+	SetWindowOrg16(hdc, *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
     case META_SETWINDOWEXT:
-	SetWindowExt(hdc, *(mr->rdParm + 1), *(mr->rdParm));
+	SetWindowExt16(hdc, *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
     case META_SETVIEWPORTORG:
-	SetViewportOrg(hdc, *(mr->rdParm + 1), *(mr->rdParm));
+	SetViewportOrg16(hdc, *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
     case META_SETVIEWPORTEXT:
-	SetViewportExt(hdc, *(mr->rdParm + 1), *(mr->rdParm));
+	SetViewportExt16(hdc, *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
     case META_OFFSETWINDOWORG:
-	OffsetWindowOrg(hdc, *(mr->rdParm + 1), *(mr->rdParm));
+	OffsetWindowOrg16(hdc, *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
     case META_SCALEWINDOWEXT:
-	ScaleWindowExt(hdc, *(mr->rdParm + 3), *(mr->rdParm + 2),
+	ScaleWindowExt16(hdc, *(mr->rdParm + 3), *(mr->rdParm + 2),
 		       *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
     case META_OFFSETVIEWPORTORG:
-	OffsetViewportOrg(hdc, *(mr->rdParm + 1), *(mr->rdParm));
+	OffsetViewportOrg16(hdc, *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
     case META_SCALEVIEWPORTEXT:
-	ScaleViewportExt(hdc, *(mr->rdParm + 3), *(mr->rdParm + 2),
+	ScaleViewportExt16(hdc, *(mr->rdParm + 3), *(mr->rdParm + 2),
 			 *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
     case META_LINETO:
-	LineTo32(hdc, (INT16)*(mr->rdParm + 1), (INT16)*(mr->rdParm));
+	LineTo(hdc, (INT16)*(mr->rdParm + 1), (INT16)*(mr->rdParm));
 	break;
 
     case META_MOVETO:
-	MoveTo(hdc, *(mr->rdParm + 1), *(mr->rdParm));
+	MoveTo16(hdc, *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
     case META_EXCLUDECLIPRECT:
@@ -613,36 +613,36 @@ void WINAPI PlayMetaFileRecord16(
 	break;
 
     case META_ARC:
-	Arc32(hdc, (INT16)*(mr->rdParm + 7), (INT16)*(mr->rdParm + 6),
+	Arc(hdc, (INT16)*(mr->rdParm + 7), (INT16)*(mr->rdParm + 6),
 	      (INT16)*(mr->rdParm + 5), (INT16)*(mr->rdParm + 4),
 	      (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
              (INT16)*(mr->rdParm + 1), (INT16)*(mr->rdParm));
 	break;
 
     case META_ELLIPSE:
-	Ellipse32(hdc, (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
+	Ellipse(hdc, (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
                   (INT16)*(mr->rdParm + 1), (INT16)*(mr->rdParm));
 	break;
 
     case META_FLOODFILL:
-	FloodFill32(hdc, (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
+	FloodFill(hdc, (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
                     MAKELONG(*(mr->rdParm), *(mr->rdParm + 1)));
 	break;
 
     case META_PIE:
-	Pie32(hdc, (INT16)*(mr->rdParm + 7), (INT16)*(mr->rdParm + 6),
+	Pie(hdc, (INT16)*(mr->rdParm + 7), (INT16)*(mr->rdParm + 6),
 	      (INT16)*(mr->rdParm + 5), (INT16)*(mr->rdParm + 4),
 	      (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
              (INT16)*(mr->rdParm + 1), (INT16)*(mr->rdParm));
 	break;
 
     case META_RECTANGLE:
-	Rectangle32(hdc, (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
+	Rectangle(hdc, (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
                     (INT16)*(mr->rdParm + 1), (INT16)*(mr->rdParm));
 	break;
 
     case META_ROUNDRECT:
-	RoundRect32(hdc, (INT16)*(mr->rdParm + 5), (INT16)*(mr->rdParm + 4),
+	RoundRect(hdc, (INT16)*(mr->rdParm + 5), (INT16)*(mr->rdParm + 4),
                     (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
                     (INT16)*(mr->rdParm + 1), (INT16)*(mr->rdParm));
 	break;
@@ -654,11 +654,11 @@ void WINAPI PlayMetaFileRecord16(
 	break;
 
     case META_SAVEDC:
-	SaveDC32(hdc);
+	SaveDC(hdc);
 	break;
 
     case META_SETPIXEL:
-	SetPixel32(hdc, (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
+	SetPixel(hdc, (INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
                    MAKELONG(*(mr->rdParm), *(mr->rdParm + 1)));
 	break;
 
@@ -687,15 +687,15 @@ void WINAPI PlayMetaFileRecord16(
 	break;
 
     case META_RESTOREDC:
-	RestoreDC32(hdc, (INT16)*(mr->rdParm));
+	RestoreDC(hdc, (INT16)*(mr->rdParm));
 	break;
 
     case META_SELECTOBJECT:
-	SelectObject32(hdc, *(ht->objectHandle + *(mr->rdParm)));
+	SelectObject(hdc, *(ht->objectHandle + *(mr->rdParm)));
 	break;
 
     case META_CHORD:
-	Chord32(hdc, (INT16)*(mr->rdParm + 7), (INT16)*(mr->rdParm + 6),
+	Chord(hdc, (INT16)*(mr->rdParm + 7), (INT16)*(mr->rdParm + 6),
 		(INT16)*(mr->rdParm+5), (INT16)*(mr->rdParm + 4),
 		(INT16)*(mr->rdParm + 3), (INT16)*(mr->rdParm + 2),
                (INT16)*(mr->rdParm + 1), (INT16)*(mr->rdParm));
@@ -707,7 +707,7 @@ void WINAPI PlayMetaFileRecord16(
 	case BS_PATTERN:
 	    infohdr = (BITMAPINFOHEADER *)(mr->rdParm + 2);
 	    MF_AddHandle(ht, nHandles,
-			 CreatePatternBrush32(CreateBitmap32(infohdr->biWidth, 
+			 CreatePatternBrush(CreateBitmap(infohdr->biWidth, 
 				      infohdr->biHeight, 
 				      infohdr->biPlanes, 
 				      infohdr->biBitCount,
@@ -722,7 +722,7 @@ void WINAPI PlayMetaFileRecord16(
 	    memcpy(ptr, mr->rdParm + 2, s1);
 	    GlobalUnlock16(hndl);
 	    MF_AddHandle(ht, nHandles,
-			 CreateDIBPatternBrush32(hndl, *(mr->rdParm + 1)));
+			 CreateDIBPatternBrush(hndl, *(mr->rdParm + 1)));
 	    GlobalFree16(hndl);
 	}
 	break;
@@ -834,42 +834,42 @@ void WINAPI PlayMetaFileRecord16(
     case META_STRETCHBLT:
       {
        HDC16 hdcSrc=CreateCompatibleDC16(hdc);
-       HBITMAP32 hbitmap=CreateBitmap32(mr->rdParm[10], /*Width */
+       HBITMAP hbitmap=CreateBitmap(mr->rdParm[10], /*Width */
                                         mr->rdParm[11], /*Height*/
                                         mr->rdParm[13], /*Planes*/
                                         mr->rdParm[14], /*BitsPixel*/
                                         (LPSTR)&mr->rdParm[15]);  /*bits*/
-       SelectObject32(hdcSrc,hbitmap);
+       SelectObject(hdcSrc,hbitmap);
        StretchBlt16(hdc,mr->rdParm[9],mr->rdParm[8],
                     mr->rdParm[7],mr->rdParm[6],
 		    hdcSrc,mr->rdParm[5],mr->rdParm[4],
 		    mr->rdParm[3],mr->rdParm[2],
 		    MAKELONG(mr->rdParm[0],mr->rdParm[1]));
-       DeleteDC32(hdcSrc);		    
+       DeleteDC(hdcSrc);		    
       }
       break;
 
     case META_BITBLT:            /* <-- not yet debugged */
       {
        HDC16 hdcSrc=CreateCompatibleDC16(hdc);
-       HBITMAP32 hbitmap=CreateBitmap32(mr->rdParm[7]/*Width */,
+       HBITMAP hbitmap=CreateBitmap(mr->rdParm[7]/*Width */,
                                         mr->rdParm[8]/*Height*/,
                                         mr->rdParm[10]/*Planes*/,
                                         mr->rdParm[11]/*BitsPixel*/,
                                         (LPSTR)&mr->rdParm[12]/*bits*/);
-       SelectObject32(hdcSrc,hbitmap);
-       BitBlt32(hdc,(INT16)mr->rdParm[6],(INT16)mr->rdParm[5],
+       SelectObject(hdcSrc,hbitmap);
+       BitBlt(hdc,(INT16)mr->rdParm[6],(INT16)mr->rdParm[5],
                 (INT16)mr->rdParm[4],(INT16)mr->rdParm[3],
                 hdcSrc, (INT16)mr->rdParm[2],(INT16)mr->rdParm[1],
                 MAKELONG(0,mr->rdParm[0]));
-       DeleteDC32(hdcSrc);		    
+       DeleteDC(hdcSrc);		    
       }
       break;
 
        /* --- Begin of new metafile operations. April, 1997 (ak) ----*/
     case META_CREATEREGION:
       {
-	HRGN32 hrgn = CreateRectRgn32(0,0,0,0);
+	HRGN hrgn = CreateRectRgn(0,0,0,0);
  
 	MF_Meta_CreateRegion(mr, hrgn);
 	MF_AddHandle(ht, nHandles, hrgn);
@@ -890,7 +890,7 @@ void WINAPI PlayMetaFileRecord16(
         break;
 
      case META_SELECTCLIPREGION:
-       	SelectClipRgn32(hdc, *(ht->objectHandle + *(mr->rdParm)));
+       	SelectClipRgn(hdc, *(ht->objectHandle + *(mr->rdParm)));
 	break;
 
      case META_DIBCREATEPATTERNBRUSH:
@@ -921,7 +921,7 @@ void WINAPI PlayMetaFileRecord16(
 	    break;
 
      case META_SETTEXTJUSTIFICATION:
-       	SetTextJustification32(hdc, *(mr->rdParm + 1), *(mr->rdParm));
+       	SetTextJustification(hdc, *(mr->rdParm + 1), *(mr->rdParm));
 	break;
 
 #define META_UNIMP(x) case x: FIXME(metafile, "PlayMetaFileRecord:record type "#x" not implemented.\n");break;
@@ -950,14 +950,14 @@ void WINAPI PlayMetaFileRecord16(
 }
 
 
-BOOL32 WINAPI PlayMetaFileRecord32( 
-     HDC32 hdc, 
-     HANDLETABLE32 *handletable, 
+BOOL WINAPI PlayMetaFileRecord( 
+     HDC hdc, 
+     HANDLETABLE *handletable, 
      METARECORD *metarecord, 
-     UINT32 handles  
+     UINT handles  
     )
 {
-  HANDLETABLE16 * ht = (void *)GlobalAlloc32(GPTR, 
+  HANDLETABLE16 * ht = (void *)GlobalAlloc(GPTR, 
                                handles*sizeof(HANDLETABLE16));
   int i = 0;
   TRACE(metafile, "(%08x,%p,%p,%d)\n", hdc, handletable, metarecord, handles); 
@@ -966,7 +966,7 @@ BOOL32 WINAPI PlayMetaFileRecord32(
   PlayMetaFileRecord16(hdc, ht, metarecord, handles);
   for (i=0; i<handles; i++) 
     handletable->objectHandle[i] = ht->objectHandle[i];
-  GlobalFree32((HGLOBAL32)ht);
+  GlobalFree((HGLOBAL)ht);
   return TRUE;
 }
 
@@ -977,7 +977,7 @@ BOOL32 WINAPI PlayMetaFileRecord32(
  *
  */
 
-HGLOBAL16 WINAPI GetMetaFileBits(
+HGLOBAL16 WINAPI GetMetaFileBits16(
 				 HMETAFILE16 hmf /* metafile handle */
 				 )
 {
@@ -993,7 +993,7 @@ HGLOBAL16 WINAPI GetMetaFileBits(
  * problems will occur when it is used. Validity of the memory is not
  * checked. The function is essentially just the identity function.
  */
-HMETAFILE16 WINAPI SetMetaFileBits( 
+HMETAFILE16 WINAPI SetMetaFileBits16( 
 				   HGLOBAL16 hMem 
 			/* handle to a memory region holding a metafile */
 )
@@ -1013,9 +1013,9 @@ HMETAFILE16 WINAPI SetMetaFileBits(
  * RETURNS
  *  Handle to a metafile on success, NULL on failure..
  */
-HMETAFILE16 WINAPI SetMetaFileBitsBetter( HMETAFILE16 hMeta )
+HMETAFILE16 WINAPI SetMetaFileBitsBetter16( HMETAFILE16 hMeta )
 {
-   if( IsValidMetaFile( hMeta ) )
+   if( IsValidMetaFile16( hMeta ) )
        return (HMETAFILE16)GlobalReAlloc16( hMeta, 0, 
 			   GMEM_SHARE | GMEM_NODISCARD | GMEM_MODIFY);
    return (HMETAFILE16)0;
@@ -1027,12 +1027,12 @@ HMETAFILE16 WINAPI SetMetaFileBitsBetter( HMETAFILE16 hMeta )
  *  Create a metafile from raw data. No checking of the data is performed.
  *  Use _GetMetaFileBitsEx_ to get raw data from a metafile.
  */
-HMETAFILE32 WINAPI SetMetaFileBitsEx( 
-     UINT32 size, /* size of metafile, in bytes */
+HMETAFILE WINAPI SetMetaFileBitsEx( 
+     UINT size, /* size of metafile, in bytes */
      const BYTE *lpData /* pointer to metafile data */  
     )
 {
-  HMETAFILE32 hmf = GlobalAlloc16(GHND, size);
+  HMETAFILE hmf = GlobalAlloc16(GHND, size);
   BYTE *p = GlobalLock16(hmf) ;
   TRACE(metafile, "(%d,%p) returning %08x\n", size, lpData, hmf);
   if (!hmf || !p) return 0;
@@ -1048,13 +1048,13 @@ HMETAFILE32 WINAPI SetMetaFileBitsEx(
  *  If _buf_ is zero, returns size of buffer required. Otherwise,
  *  returns number of bytes copied.
  */
-UINT32 WINAPI GetMetaFileBitsEx( 
-     HMETAFILE32 hmf, /* metafile */
-     UINT32 nSize, /* size of buf */ 
+UINT WINAPI GetMetaFileBitsEx( 
+     HMETAFILE hmf, /* metafile */
+     UINT nSize, /* size of buf */ 
      LPVOID buf   /* buffer to receive raw metafile data */  
 ) {
   METAHEADER *h = GlobalLock16(hmf);
-  UINT32 mfSize;
+  UINT mfSize;
 
   TRACE(metafile, "(%08x,%d,%p)\n", hmf, nSize, buf);
   if (!h) return 0;  /* FIXME: error code */
@@ -1073,9 +1073,9 @@ UINT32 WINAPI GetMetaFileBitsEx(
 /******************************************************************
  *         GetWinMetaFileBits [GDI32.241]
  */
-UINT32 WINAPI GetWinMetaFileBits(HENHMETAFILE32 hemf,
-                                UINT32 cbBuffer, LPBYTE lpbBuffer,
-                                INT32 fnMapMode, HDC32 hdcRef)
+UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf,
+                                UINT cbBuffer, LPBYTE lpbBuffer,
+                                INT fnMapMode, HDC hdcRef)
 {
   FIXME(metafile, "(%d,%d,%p,%d,%d): stub\n",
         hemf, cbBuffer, lpbBuffer, fnMapMode, hdcRef);
@@ -1114,43 +1114,43 @@ UINT32 WINAPI GetWinMetaFileBits(HENHMETAFILE32 hemf,
  *
  */
 
-static BOOL32 MF_Meta_CreateRegion( METARECORD *mr, HRGN32 hrgn )
+static BOOL MF_Meta_CreateRegion( METARECORD *mr, HRGN hrgn )
 {
     WORD band, pair;
     WORD *start, *end;
     INT16 y0, y1;
-    HRGN32 hrgn2 = CreateRectRgn32( 0, 0, 0, 0 );
+    HRGN hrgn2 = CreateRectRgn( 0, 0, 0, 0 );
 
     for(band  = 0, start = &(mr->rdParm[11]); band < mr->rdParm[5];
  					        band++, start = end + 1) {
         if(*start / 2 != (*start + 1) / 2) {
  	    WARN(metafile, "Delimiter not even.\n");
-	    DeleteObject32( hrgn2 );
+	    DeleteObject( hrgn2 );
  	    return FALSE;
         }
 
 	end = start + *start + 3;
 	if(end > (WORD *)mr + mr->rdSize) {
 	    WARN(metafile, "End points outside record.\n");
-	    DeleteObject32( hrgn2 );
+	    DeleteObject( hrgn2 );
 	    return FALSE;
         }
 
 	if(*start != *end) {
 	    WARN(metafile, "Mismatched delimiters.\n");
-	    DeleteObject32( hrgn2 );
+	    DeleteObject( hrgn2 );
 	    return FALSE;
 	}
 
 	y0 = *(INT16 *)(start + 1);
 	y1 = *(INT16 *)(start + 2);
 	for(pair = 0; pair < *start / 2; pair++) {
-	    SetRectRgn32( hrgn2, *(INT16 *)(start + 3 + 2*pair), y0,
+	    SetRectRgn( hrgn2, *(INT16 *)(start + 3 + 2*pair), y0,
 				 *(INT16 *)(start + 4 + 2*pair), y1 );
-	    CombineRgn32(hrgn, hrgn, hrgn2, RGN_OR);
+	    CombineRgn(hrgn, hrgn, hrgn2, RGN_OR);
         }
     }
-    DeleteObject32( hrgn2 );
+    DeleteObject( hrgn2 );
     return TRUE;
  }
  
@@ -1161,7 +1161,7 @@ static BOOL32 MF_Meta_CreateRegion( METARECORD *mr, HRGN32 hrgn )
  * Warning: this function can change the metafile handle.
  */
 
-static BOOL32 MF_WriteRecord( DC *dc, METARECORD *mr, DWORD rlen)
+static BOOL MF_WriteRecord( DC *dc, METARECORD *mr, DWORD rlen)
 {
     DWORD len;
     METAHEADER *mh;
@@ -1178,7 +1178,7 @@ static BOOL32 MF_WriteRecord( DC *dc, METARECORD *mr, DWORD rlen)
         break;
     case METAFILE_DISK:
         TRACE(metafile,"Writing record to disk\n");
-	if (_lwrite32(physDev->mh->mtNoParameters, (char *)mr, rlen) == -1)
+	if (_lwrite(physDev->mh->mtNoParameters, (char *)mr, rlen) == -1)
 	    return FALSE;
         break;
     default:
@@ -1196,7 +1196,7 @@ static BOOL32 MF_WriteRecord( DC *dc, METARECORD *mr, DWORD rlen)
  *         MF_MetaParam0
  */
 
-BOOL32 MF_MetaParam0(DC *dc, short func)
+BOOL MF_MetaParam0(DC *dc, short func)
 {
     char buffer[8];
     METARECORD *mr = (METARECORD *)&buffer;
@@ -1210,7 +1210,7 @@ BOOL32 MF_MetaParam0(DC *dc, short func)
 /******************************************************************
  *         MF_MetaParam1
  */
-BOOL32 MF_MetaParam1(DC *dc, short func, short param1)
+BOOL MF_MetaParam1(DC *dc, short func, short param1)
 {
     char buffer[8];
     METARECORD *mr = (METARECORD *)&buffer;
@@ -1225,7 +1225,7 @@ BOOL32 MF_MetaParam1(DC *dc, short func, short param1)
 /******************************************************************
  *         MF_MetaParam2
  */
-BOOL32 MF_MetaParam2(DC *dc, short func, short param1, short param2)
+BOOL MF_MetaParam2(DC *dc, short func, short param1, short param2)
 {
     char buffer[10];
     METARECORD *mr = (METARECORD *)&buffer;
@@ -1242,7 +1242,7 @@ BOOL32 MF_MetaParam2(DC *dc, short func, short param1, short param2)
  *         MF_MetaParam4
  */
 
-BOOL32 MF_MetaParam4(DC *dc, short func, short param1, short param2, 
+BOOL MF_MetaParam4(DC *dc, short func, short param1, short param2, 
 		   short param3, short param4)
 {
     char buffer[14];
@@ -1262,7 +1262,7 @@ BOOL32 MF_MetaParam4(DC *dc, short func, short param1, short param2,
  *         MF_MetaParam6
  */
 
-BOOL32 MF_MetaParam6(DC *dc, short func, short param1, short param2, 
+BOOL MF_MetaParam6(DC *dc, short func, short param1, short param2, 
 		   short param3, short param4, short param5, short param6)
 {
     char buffer[18];
@@ -1283,7 +1283,7 @@ BOOL32 MF_MetaParam6(DC *dc, short func, short param1, short param2,
 /******************************************************************
  *         MF_MetaParam8
  */
-BOOL32 MF_MetaParam8(DC *dc, short func, short param1, short param2, 
+BOOL MF_MetaParam8(DC *dc, short func, short param1, short param2, 
 		   short param3, short param4, short param5,
 		   short param6, short param7, short param8)
 {
@@ -1308,7 +1308,7 @@ BOOL32 MF_MetaParam8(DC *dc, short func, short param1, short param2,
  *         MF_CreateBrushIndirect
  */
 
-BOOL32 MF_CreateBrushIndirect(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush)
+BOOL MF_CreateBrushIndirect(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush)
 {
     int index;
     char buffer[sizeof(METARECORD) - 2 + sizeof(*logbrush)];
@@ -1332,7 +1332,7 @@ BOOL32 MF_CreateBrushIndirect(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush)
  *         MF_CreatePatternBrush
  */
 
-BOOL32 MF_CreatePatternBrush(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush)
+BOOL MF_CreatePatternBrush(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush)
 {
     DWORD len, bmSize, biSize;
     HGLOBAL16 hmr;
@@ -1417,7 +1417,7 @@ BOOL32 MF_CreatePatternBrush(DC *dc, HBRUSH16 hBrush, LOGBRUSH16 *logbrush)
  *         MF_CreatePenIndirect
  */
 
-BOOL32 MF_CreatePenIndirect(DC *dc, HPEN16 hPen, LOGPEN16 *logpen)
+BOOL MF_CreatePenIndirect(DC *dc, HPEN16 hPen, LOGPEN16 *logpen)
 {
     int index;
     char buffer[sizeof(METARECORD) - 2 + sizeof(*logpen)];
@@ -1441,7 +1441,7 @@ BOOL32 MF_CreatePenIndirect(DC *dc, HPEN16 hPen, LOGPEN16 *logpen)
  *         MF_CreateFontIndirect
  */
 
-BOOL32 MF_CreateFontIndirect(DC *dc, HFONT16 hFont, LOGFONT16 *logfont)
+BOOL MF_CreateFontIndirect(DC *dc, HFONT16 hFont, LOGFONT16 *logfont)
 {
     int index;
     char buffer[sizeof(METARECORD) - 2 + sizeof(LOGFONT16)];
@@ -1464,9 +1464,9 @@ BOOL32 MF_CreateFontIndirect(DC *dc, HFONT16 hFont, LOGFONT16 *logfont)
 /******************************************************************
  *         MF_TextOut
  */
-BOOL32 MF_TextOut(DC *dc, short x, short y, LPCSTR str, short count)
+BOOL MF_TextOut(DC *dc, short x, short y, LPCSTR str, short count)
 {
-    BOOL32 ret;
+    BOOL ret;
     DWORD len;
     HGLOBAL16 hmr;
     METARECORD *mr;
@@ -1491,10 +1491,10 @@ BOOL32 MF_TextOut(DC *dc, short x, short y, LPCSTR str, short count)
 /******************************************************************
  *         MF_ExtTextOut
  */
-BOOL32 MF_ExtTextOut(DC*dc, short x, short y, UINT16 flags, const RECT16 *rect,
+BOOL MF_ExtTextOut(DC*dc, short x, short y, UINT16 flags, const RECT16 *rect,
                      LPCSTR str, short count, const INT16 *lpDx)
 {
-    BOOL32 ret;
+    BOOL ret;
     DWORD len;
     HGLOBAL16 hmr;
     METARECORD *mr;
@@ -1531,9 +1531,9 @@ BOOL32 MF_ExtTextOut(DC*dc, short x, short y, UINT16 flags, const RECT16 *rect,
 /******************************************************************
  *         MF_MetaPoly - implements Polygon and Polyline
  */
-BOOL32 MF_MetaPoly(DC *dc, short func, LPPOINT16 pt, short count)
+BOOL MF_MetaPoly(DC *dc, short func, LPPOINT16 pt, short count)
 {
-    BOOL32 ret;
+    BOOL ret;
     DWORD len;
     HGLOBAL16 hmr;
     METARECORD *mr;
@@ -1557,10 +1557,10 @@ BOOL32 MF_MetaPoly(DC *dc, short func, LPPOINT16 pt, short count)
 /******************************************************************
  *         MF_BitBlt
  */
-BOOL32 MF_BitBlt(DC *dcDest, short xDest, short yDest, short width,
+BOOL MF_BitBlt(DC *dcDest, short xDest, short yDest, short width,
                  short height, DC *dcSrc, short xSrc, short ySrc, DWORD rop)
 {
-    BOOL32 ret;
+    BOOL ret;
     DWORD len;
     HGLOBAL16 hmr;
     METARECORD *mr;
@@ -1578,7 +1578,7 @@ BOOL32 MF_BitBlt(DC *dcDest, short xDest, short yDest, short width,
     *(mr->rdParm +10) = BM.bmPlanes;
     *(mr->rdParm +11) = BM.bmBitsPixel;
     TRACE(metafile,"MF_StretchBlt->len = %ld  rop=%lx  \n",len,rop);
-    if (GetBitmapBits32(dcSrc->w.hBitmap,BM.bmWidthBytes * BM.bmHeight,
+    if (GetBitmapBits(dcSrc->w.hBitmap,BM.bmWidthBytes * BM.bmHeight,
                         mr->rdParm +12))
     {
       mr->rdSize = len / sizeof(INT16);
@@ -1606,11 +1606,11 @@ BOOL32 MF_BitBlt(DC *dcDest, short xDest, short yDest, short width,
  */
 #define STRETCH_VIA_DIB
 #undef  STRETCH_VIA_DIB
-BOOL32 MF_StretchBlt(DC *dcDest, short xDest, short yDest, short widthDest,
+BOOL MF_StretchBlt(DC *dcDest, short xDest, short yDest, short widthDest,
                      short heightDest, DC *dcSrc, short xSrc, short ySrc, 
                      short widthSrc, short heightSrc, DWORD rop)
 {
-    BOOL32 ret;
+    BOOL ret;
     DWORD len;
     HGLOBAL16 hmr;
     METARECORD *mr;
@@ -1638,13 +1638,13 @@ BOOL32 MF_StretchBlt(DC *dcDest, short xDest, short yDest, short widthDest,
     lpBMI->biClrUsed   = nBPP != 24 ? 1 << nBPP : 0;
     lpBMI->biSizeImage = ((lpBMI->biWidth * nBPP + 31) / 32) * 4 * lpBMI->biHeight;
     lpBMI->biCompression = BI_RGB;
-    lpBMI->biXPelsPerMeter = MulDiv32(GetDeviceCaps(dcSrc->hSelf,LOGPIXELSX),3937,100);
-    lpBMI->biYPelsPerMeter = MulDiv32(GetDeviceCaps(dcSrc->hSelf,LOGPIXELSY),3937,100);
+    lpBMI->biXPelsPerMeter = MulDiv(GetDeviceCaps(dcSrc->hSelf,LOGPIXELSX),3937,100);
+    lpBMI->biYPelsPerMeter = MulDiv(GetDeviceCaps(dcSrc->hSelf,LOGPIXELSY),3937,100);
     lpBMI->biClrImportant  = 0;                          /* 1 meter  = 39.37 inch */
 
     TRACE(metafile,"MF_StretchBltViaDIB->len = %ld  rop=%lx  PixYPM=%ld Caps=%d\n",
                len,rop,lpBMI->biYPelsPerMeter,GetDeviceCaps(hdcSrc,LOGPIXELSY));
-    if (GetDIBits(hdcSrc,dcSrc->w.hBitmap,0,(UINT32)lpBMI->biHeight,
+    if (GetDIBits(hdcSrc,dcSrc->w.hBitmap,0,(UINT)lpBMI->biHeight,
                   (LPSTR)lpBMI + DIB_BitmapInfoSize( (BITMAPINFO *)lpBMI,
                                                      DIB_RGB_COLORS ),
                   (LPBITMAPINFO)lpBMI, DIB_RGB_COLORS))
@@ -1660,7 +1660,7 @@ BOOL32 MF_StretchBlt(DC *dcDest, short xDest, short yDest, short widthDest,
     *(mr->rdParm +13) = BM.bmPlanes;
     *(mr->rdParm +14) = BM.bmBitsPixel;
     TRACE(metafile,"MF_StretchBlt->len = %ld  rop=%lx  \n",len,rop);
-    if (GetBitmapBits32( dcSrc->w.hBitmap, BM.bmWidthBytes * BM.bmHeight,
+    if (GetBitmapBits( dcSrc->w.hBitmap, BM.bmWidthBytes * BM.bmHeight,
                          mr->rdParm +15))
 #endif    
     {
@@ -1687,22 +1687,22 @@ BOOL32 MF_StretchBlt(DC *dcDest, short xDest, short yDest, short widthDest,
 /******************************************************************
  *         MF_CreateRegion
  */
-INT16 MF_CreateRegion(DC *dc, HRGN32 hrgn)
+INT16 MF_CreateRegion(DC *dc, HRGN hrgn)
 {
     DWORD len;
     METARECORD *mr;
     RGNDATA *rgndata;
-    RECT32 *pCurRect, *pEndRect;
+    RECT *pCurRect, *pEndRect;
     WORD Bands = 0, MaxBands = 0;
     WORD *Param, *StartBand;
-    BOOL32 ret;
+    BOOL ret;
 
-    len = GetRegionData32( hrgn, 0, NULL );
+    len = GetRegionData( hrgn, 0, NULL );
     if( !(rgndata = HeapAlloc( SystemHeap, 0, len )) ) {
         WARN(metafile, "MF_CreateRegion: can't alloc rgndata buffer\n");
 	return -1;
     }
-    GetRegionData32( hrgn, len, rgndata );
+    GetRegionData( hrgn, len, rgndata );
 
     /* Overestimate of length:
      * Assume every rect is a separate band -> 6 WORDs per rect
@@ -1719,8 +1719,8 @@ INT16 MF_CreateRegion(DC *dc, HRGN32 hrgn)
     Param = mr->rdParm + 11;
     StartBand = NULL;
 
-    pEndRect = (RECT32 *)rgndata->Buffer + rgndata->rdh.nCount;
-    for(pCurRect = (RECT32 *)rgndata->Buffer; pCurRect < pEndRect; pCurRect++)
+    pEndRect = (RECT *)rgndata->Buffer + rgndata->rdh.nCount;
+    for(pCurRect = (RECT *)rgndata->Buffer; pCurRect < pEndRect; pCurRect++)
     {
         if( StartBand && pCurRect->top == *(StartBand + 1) )
         {
diff --git a/objects/palette.c b/objects/palette.c
index 3a57d7595a9..27afd1d1b25 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -17,10 +17,10 @@
 #include "debug.h"
 #include "wine/winuser16.h"
 
-FARPROC32 pfnSelectPalette = NULL;
-FARPROC32 pfnRealizePalette = NULL;
+FARPROC pfnSelectPalette = NULL;
+FARPROC pfnRealizePalette = NULL;
 
-static UINT32 SystemPaletteUse = SYSPAL_STATIC;  /* currently not considered */
+static UINT SystemPaletteUse = SYSPAL_STATIC;  /* currently not considered */
 
 static HPALETTE16 hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */
 static HPALETTE16 hLastRealizedPalette = 0; /* UnrealizeObject() needs it */
@@ -85,7 +85,7 @@ void PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, int size)
  */
 HPALETTE16 WINAPI CreatePalette16( const LOGPALETTE* palette )
 {
-    return CreatePalette32( palette );
+    return CreatePalette( palette );
 }
 
 
@@ -96,11 +96,11 @@ HPALETTE16 WINAPI CreatePalette16( const LOGPALETTE* palette )
  *    Success: Handle to logical palette
  *    Failure: NULL
  */
-HPALETTE32 WINAPI CreatePalette32(
+HPALETTE WINAPI CreatePalette(
     const LOGPALETTE* palette) /* [in] Pointer to logical color palette */
 {
     PALETTEOBJ * palettePtr;
-    HPALETTE32 hpalette;
+    HPALETTE hpalette;
     int size;
     
     if (!palette) return 0;
@@ -133,7 +133,7 @@ HPALETTE32 WINAPI CreatePalette32(
 HPALETTE16 WINAPI CreateHalftonePalette16(
     HDC16 hdc) /* [in] Handle to device context */
 {
-    return CreateHalftonePalette32(hdc);
+    return CreateHalftonePalette(hdc);
 	}
 
 	
@@ -146,8 +146,8 @@ HPALETTE16 WINAPI CreateHalftonePalette16(
  *
  * FIXME: not truly tested
  */
-HPALETTE32 WINAPI CreateHalftonePalette32(
-    HDC32 hdc) /* [in] Handle to device context */
+HPALETTE WINAPI CreateHalftonePalette(
+    HDC hdc) /* [in] Handle to device context */
 {
     int i, r, g, b;
     struct {
@@ -158,8 +158,8 @@ HPALETTE32 WINAPI CreateHalftonePalette32(
 	0x300, 256
     };
 
-    GetSystemPaletteEntries32(hdc, 0, 256, Palette.aEntries);
-    return CreatePalette32((LOGPALETTE *)&Palette);
+    GetSystemPaletteEntries(hdc, 0, 256, Palette.aEntries);
+    return CreatePalette((LOGPALETTE *)&Palette);
 
     for (r = 0; r < 6; r++) {
 	for (g = 0; g < 6; g++) {
@@ -179,7 +179,7 @@ HPALETTE32 WINAPI CreateHalftonePalette32(
 	Palette.aEntries[i].peBlue = v;
 	}
 	
-    return CreatePalette32((LOGPALETTE *)&Palette);
+    return CreatePalette((LOGPALETTE *)&Palette);
 }
 
 
@@ -189,7 +189,7 @@ HPALETTE32 WINAPI CreateHalftonePalette32(
 UINT16 WINAPI GetPaletteEntries16( HPALETTE16 hpalette, UINT16 start,
                                    UINT16 count, LPPALETTEENTRY entries )
 {
-    return GetPaletteEntries32( hpalette, start, count, entries );
+    return GetPaletteEntries( hpalette, start, count, entries );
 }
 
 
@@ -200,14 +200,14 @@ UINT16 WINAPI GetPaletteEntries16( HPALETTE16 hpalette, UINT16 start,
  *    Success: Number of entries from logical palette
  *    Failure: 0
  */
-UINT32 WINAPI GetPaletteEntries32(
-    HPALETTE32 hpalette,    /* [in]  Handle of logical palette */
-    UINT32 start,           /* [in]  First entry to receive */
-    UINT32 count,           /* [in]  Number of entries to receive */
+UINT WINAPI GetPaletteEntries(
+    HPALETTE hpalette,    /* [in]  Handle of logical palette */
+    UINT start,           /* [in]  First entry to receive */
+    UINT count,           /* [in]  Number of entries to receive */
     LPPALETTEENTRY entries) /* [out] Address of array receiving entries */
 {
     PALETTEOBJ * palPtr;
-    INT32 numEntries;
+    INT numEntries;
 
     TRACE(palette,"hpal = %04x, count=%i\n", hpalette, count );
         
@@ -241,7 +241,7 @@ UINT32 WINAPI GetPaletteEntries32(
 UINT16 WINAPI SetPaletteEntries16( HPALETTE16 hpalette, UINT16 start,
                                    UINT16 count, LPPALETTEENTRY entries )
 {
-    return SetPaletteEntries32( hpalette, start, count, entries );
+    return SetPaletteEntries( hpalette, start, count, entries );
 }
 
 
@@ -252,14 +252,14 @@ UINT16 WINAPI SetPaletteEntries16( HPALETTE16 hpalette, UINT16 start,
  *    Success: Number of entries that were set
  *    Failure: 0
  */
-UINT32 WINAPI SetPaletteEntries32(
-    HPALETTE32 hpalette,    /* [in] Handle of logical palette */
-    UINT32 start,           /* [in] Index of first entry to set */
-    UINT32 count,           /* [in] Number of entries to set */
+UINT WINAPI SetPaletteEntries(
+    HPALETTE hpalette,    /* [in] Handle of logical palette */
+    UINT start,           /* [in] Index of first entry to set */
+    UINT count,           /* [in] Number of entries to set */
     LPPALETTEENTRY entries) /* [in] Address of array of structures */
 {
     PALETTEOBJ * palPtr;
-    INT32 numEntries;
+    INT numEntries;
 
     TRACE(palette,"hpal=%04x,start=%i,count=%i\n",hpalette,start,count );
 
@@ -289,7 +289,7 @@ UINT32 WINAPI SetPaletteEntries32(
  */
 BOOL16 WINAPI ResizePalette16( HPALETTE16 hPal, UINT16 cEntries )
 {
-    return ResizePalette32( hPal, cEntries );
+    return ResizePalette( hPal, cEntries );
 }
 
 
@@ -300,12 +300,12 @@ BOOL16 WINAPI ResizePalette16( HPALETTE16 hPal, UINT16 cEntries )
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI ResizePalette32(
-    HPALETTE32 hPal, /* [in] Handle of logical palette */
-    UINT32 cEntries) /* [in] Number of entries in logical palette */
+BOOL WINAPI ResizePalette(
+    HPALETTE hPal, /* [in] Handle of logical palette */
+    UINT cEntries) /* [in] Number of entries in logical palette */
 {
     PALETTEOBJ * palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC );
-    UINT32	 cPrevEnt, prevVer;
+    UINT	 cPrevEnt, prevVer;
     int		 prevsize, size = sizeof(LOGPALETTE) + (cEntries - 1) * sizeof(PALETTEENTRY);
     int*	 mapping = NULL;
 
@@ -349,7 +349,7 @@ BOOL32 WINAPI ResizePalette32(
 void WINAPI AnimatePalette16( HPALETTE16 hPal, UINT16 StartIndex,
                               UINT16 NumEntries, const PALETTEENTRY* PaletteColors)
 {
-    AnimatePalette32( hPal, StartIndex, NumEntries, PaletteColors );
+    AnimatePalette( hPal, StartIndex, NumEntries, PaletteColors );
 }
 
 
@@ -363,10 +363,10 @@ void WINAPI AnimatePalette16( HPALETTE16 hPal, UINT16 StartIndex,
  * FIXME
  *    Should use existing mapping when animating a primary palette
  */
-BOOL32 WINAPI AnimatePalette32(
-    HPALETTE32 hPal,              /* [in] Handle to logical palette */
-    UINT32 StartIndex,            /* [in] First entry in palette */
-    UINT32 NumEntries,            /* [in] Count of entries in palette */
+BOOL WINAPI AnimatePalette(
+    HPALETTE hPal,              /* [in] Handle to logical palette */
+    UINT StartIndex,            /* [in] First entry in palette */
+    UINT NumEntries,            /* [in] Count of entries in palette */
     const PALETTEENTRY* PaletteColors) /* [in] Pointer to first replacement */
 {
     TRACE(palette, "%04x (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries);
@@ -378,7 +378,7 @@ BOOL32 WINAPI AnimatePalette32(
 
 	if( (StartIndex + NumEntries) <= palPtr->logpalette.palNumEntries )
 	{
-	    UINT32 u;
+	    UINT u;
 	    for( u = 0; u < NumEntries; u++ )
 		palPtr->logpalette.palPalEntry[u + StartIndex] = PaletteColors[u];
 	    COLOR_SetMapping(palPtr, StartIndex, NumEntries,
@@ -396,7 +396,7 @@ BOOL32 WINAPI AnimatePalette32(
  */
 UINT16 WINAPI SetSystemPaletteUse16( HDC16 hdc, UINT16 use )
 {
-    return SetSystemPaletteUse32( hdc, use );
+    return SetSystemPaletteUse( hdc, use );
 }
 
 
@@ -407,11 +407,11 @@ UINT16 WINAPI SetSystemPaletteUse16( HDC16 hdc, UINT16 use )
  *    Success: Previous system palette
  *    Failure: SYSPAL_ERROR
  */
-UINT32 WINAPI SetSystemPaletteUse32(
-    HDC32 hdc,  /* [in] Handle of device context */
-    UINT32 use) /* [in] Palette-usage flag */
+UINT WINAPI SetSystemPaletteUse(
+    HDC hdc,  /* [in] Handle of device context */
+    UINT use) /* [in] Palette-usage flag */
 {
-    UINT32 old = SystemPaletteUse;
+    UINT old = SystemPaletteUse;
     FIXME(palette,"(%04x,%04x): stub\n", hdc, use );
     SystemPaletteUse = use;
     return old;
@@ -433,8 +433,8 @@ UINT16 WINAPI GetSystemPaletteUse16( HDC16 hdc )
  * RETURNS
  *    Current state of system palette
  */
-UINT32 WINAPI GetSystemPaletteUse32(
-    HDC32 hdc) /* [in] Handle of device context */
+UINT WINAPI GetSystemPaletteUse(
+    HDC hdc) /* [in] Handle of device context */
 {
     return SystemPaletteUse;
 }
@@ -446,7 +446,7 @@ UINT32 WINAPI GetSystemPaletteUse32(
 UINT16 WINAPI GetSystemPaletteEntries16( HDC16 hdc, UINT16 start, UINT16 count,
                                          LPPALETTEENTRY entries )
 {
-    return GetSystemPaletteEntries32( hdc, start, count, entries );
+    return GetSystemPaletteEntries( hdc, start, count, entries );
 }
 
 
@@ -457,13 +457,13 @@ UINT16 WINAPI GetSystemPaletteEntries16( HDC16 hdc, UINT16 start, UINT16 count,
  *    Success: Number of entries retrieved from palette
  *    Failure: 0
  */
-UINT32 WINAPI GetSystemPaletteEntries32(
-    HDC32 hdc,              /* [in]  Handle of device context */
-    UINT32 start,           /* [in]  Index of first entry to be retrieved */
-    UINT32 count,           /* [in]  Number of entries to be retrieved */
+UINT WINAPI GetSystemPaletteEntries(
+    HDC hdc,              /* [in]  Handle of device context */
+    UINT start,           /* [in]  Index of first entry to be retrieved */
+    UINT count,           /* [in]  Number of entries to be retrieved */
     LPPALETTEENTRY entries) /* [out] Array receiving system-palette entries */
 {
-    UINT32 i;
+    UINT i;
     DC *dc;
 
     TRACE(palette, "hdc=%04x,start=%i,count=%i\n", hdc,start,count);
@@ -494,7 +494,7 @@ UINT32 WINAPI GetSystemPaletteEntries32(
  */
 UINT16 WINAPI GetNearestPaletteIndex16( HPALETTE16 hpalette, COLORREF color )
 {
-    return GetNearestPaletteIndex32( hpalette, color );
+    return GetNearestPaletteIndex( hpalette, color );
 }
 
 
@@ -508,12 +508,12 @@ UINT16 WINAPI GetNearestPaletteIndex16( HPALETTE16 hpalette, COLORREF color )
  *    Success: Index of entry in logical palette
  *    Failure: CLR_INVALID
  */
-UINT32 WINAPI GetNearestPaletteIndex32(
-    HPALETTE32 hpalette, /* [in] Handle of logical color palette */
+UINT WINAPI GetNearestPaletteIndex(
+    HPALETTE hpalette, /* [in] Handle of logical color palette */
     COLORREF color)      /* [in] Color to be matched */
 {
     PALETTEOBJ*	palObj = (PALETTEOBJ*)GDI_GetObjPtr( hpalette, PALETTE_MAGIC );
-    UINT32 index  = 0;
+    UINT index  = 0;
 
     if( palObj )
         index = COLOR_PaletteLookupPixel( palObj->logpalette.palPalEntry, 
@@ -531,7 +531,7 @@ UINT32 WINAPI GetNearestPaletteIndex32(
  */
 COLORREF WINAPI GetNearestColor16( HDC16 hdc, COLORREF color )
 {
-    return GetNearestColor32( hdc, color );
+    return GetNearestColor( hdc, color );
 }
 
 
@@ -545,8 +545,8 @@ COLORREF WINAPI GetNearestColor16( HDC16 hdc, COLORREF color )
  *    Success: Color from system palette that corresponds to given color
  *    Failure: CLR_INVALID
  */
-COLORREF WINAPI GetNearestColor32(
-    HDC32 hdc,      /* [in] Handle of device context */
+COLORREF WINAPI GetNearestColor(
+    HDC hdc,      /* [in] Handle of device context */
     COLORREF color) /* [in] Color to be matched */
 {
     COLORREF 	 nearest = 0xFADECAFE;
@@ -585,7 +585,7 @@ int PALETTE_GetObject( PALETTEOBJ * palette, int count, LPSTR buffer )
 /***********************************************************************
  *           PALETTE_UnrealizeObject
  */
-BOOL32 PALETTE_UnrealizeObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
+BOOL PALETTE_UnrealizeObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
 {
     if (palette->mapping)
     {
@@ -600,7 +600,7 @@ BOOL32 PALETTE_UnrealizeObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
 /***********************************************************************
  *           PALETTE_DeleteObject
  */
-BOOL32 PALETTE_DeleteObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
+BOOL PALETTE_DeleteObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
 {
     free( palette->mapping );
     if (hLastRealizedPalette == hpalette) hLastRealizedPalette = 0;
@@ -611,7 +611,7 @@ BOOL32 PALETTE_DeleteObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
 /***********************************************************************
  *           GDISelectPalette    (GDI.361)
  */
-HPALETTE16 WINAPI GDISelectPalette( HDC16 hdc, HPALETTE16 hpal, WORD wBkg)
+HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpal, WORD wBkg)
 {
     HPALETTE16 prev;
     DC *dc;
@@ -635,7 +635,7 @@ HPALETTE16 WINAPI GDISelectPalette( HDC16 hdc, HPALETTE16 hpal, WORD wBkg)
 /***********************************************************************
  *           GDIRealizePalette    (GDI.362)
  */
-UINT16 WINAPI GDIRealizePalette( HDC16 hdc )
+UINT16 WINAPI GDIRealizePalette16( HDC16 hdc )
 {
     PALETTEOBJ* palPtr;
     int realized = 0;
@@ -651,7 +651,7 @@ UINT16 WINAPI GDIRealizePalette( HDC16 hdc )
     if( dc &&  dc->w.hPalette != hLastRealizedPalette )
     {
 	if( dc->w.hPalette == STOCK_DEFAULT_PALETTE )
-            return RealizeDefaultPalette( hdc );
+            return RealizeDefaultPalette16( hdc );
 
         palPtr = (PALETTEOBJ *) GDI_GetObjPtr( dc->w.hPalette, PALETTE_MAGIC );
 
@@ -678,7 +678,7 @@ UINT16 WINAPI GDIRealizePalette( HDC16 hdc )
 /***********************************************************************
  *           RealizeDefaultPalette    (GDI.365)
  */
-UINT16 WINAPI RealizeDefaultPalette( HDC16 hdc )
+UINT16 WINAPI RealizeDefaultPalette16( HDC16 hdc )
 {
     DC          *dc;
     PALETTEOBJ*  palPtr;
@@ -721,7 +721,7 @@ UINT16 WINAPI RealizeDefaultPalette( HDC16 hdc )
 /***********************************************************************
  *           IsDCCurrentPalette   (GDI.412)
  */
-BOOL16 WINAPI IsDCCurrentPalette(HDC16 hDC)
+BOOL16 WINAPI IsDCCurrentPalette16(HDC16 hDC)
 {
     DC* dc = (DC *)GDI_GetObjPtr( hDC, DC_MAGIC );
     if (dc) 
@@ -739,7 +739,7 @@ BOOL16 WINAPI IsDCCurrentPalette(HDC16 hDC)
 HPALETTE16 WINAPI SelectPalette16( HDC16 hDC, HPALETTE16 hPal,
                                    BOOL16 bForceBackground )
 {
-    return SelectPalette32( hDC, hPal, bForceBackground );
+    return SelectPalette( hDC, hPal, bForceBackground );
 }
 
 
@@ -750,10 +750,10 @@ HPALETTE16 WINAPI SelectPalette16( HDC16 hDC, HPALETTE16 hPal,
  *    Success: Previous logical palette
  *    Failure: NULL
  */
-HPALETTE32 WINAPI SelectPalette32(
-    HDC32 hDC,               /* [in] Handle of device context */
-    HPALETTE32 hPal,         /* [in] Handle of logical color palette */
-    BOOL32 bForceBackground) /* [in] Foreground/background mode */
+HPALETTE WINAPI SelectPalette(
+    HDC hDC,               /* [in] Handle of device context */
+    HPALETTE hPal,         /* [in] Handle of logical color palette */
+    BOOL bForceBackground) /* [in] Foreground/background mode */
 {
     WORD	wBkgPalette = 1;
     PALETTEOBJ* lpt = (PALETTEOBJ*) GDI_GetObjPtr( hPal, PALETTE_MAGIC );
@@ -766,8 +766,8 @@ HPALETTE32 WINAPI SelectPalette32(
 
     if( hPal != STOCK_DEFAULT_PALETTE )
     {
-	HWND32 hWnd = WindowFromDC32( hDC );
-	HWND32 hActive = GetActiveWindow32();
+	HWND hWnd = WindowFromDC( hDC );
+	HWND hActive = GetActiveWindow();
 	
 	/* set primary palette if it's related to current active */
 
@@ -775,7 +775,7 @@ HPALETTE32 WINAPI SelectPalette32(
             !bForceBackground )
 	    wBkgPalette = 0;
     }
-    return GDISelectPalette( hDC, hPal, wBkgPalette);
+    return GDISelectPalette16( hDC, hPal, wBkgPalette);
 }
 
 
@@ -784,7 +784,7 @@ HPALETTE32 WINAPI SelectPalette32(
  */
 UINT16 WINAPI RealizePalette16( HDC16 hDC )
 {
-    return RealizePalette32( hDC );
+    return RealizePalette( hDC );
 }
 
 
@@ -795,20 +795,20 @@ UINT16 WINAPI RealizePalette16( HDC16 hDC )
  *    Success: Number of entries in logical palette
  *    Failure: GDI_ERROR
  */
-UINT32 WINAPI RealizePalette32(
-    HDC32 hDC) /* [in] Handle of device context */
+UINT WINAPI RealizePalette(
+    HDC hDC) /* [in] Handle of device context */
 {
-    UINT32 realized = GDIRealizePalette( hDC );
+    UINT realized = GDIRealizePalette16( hDC );
 
     /* do not send anything if no colors were changed */
 
-    if( IsDCCurrentPalette( hDC ) && realized && 
+    if( IsDCCurrentPalette16( hDC ) && realized && 
         !(COLOR_GetSystemPaletteFlags() & COLOR_VIRTUAL) )
     {
 	/* Send palette change notification */
 
-	HWND32 hWnd;
- 	if( (hWnd = WindowFromDC32( hDC )) )
+	HWND hWnd;
+ 	if( (hWnd = WindowFromDC( hDC )) )
             SendMessage16( HWND_BROADCAST, WM_PALETTECHANGED, hWnd, 0L);
     }
     return realized;
@@ -820,13 +820,13 @@ UINT32 WINAPI RealizePalette32(
  */
 INT16 WINAPI UpdateColors16( HDC16 hDC )
 {
-    HWND32 hWnd = WindowFromDC32( hDC );
+    HWND hWnd = WindowFromDC( hDC );
 
     /* Docs say that we have to remap current drawable pixel by pixel
      * but it would take forever given the speed of XGet/PutPixel.
      */
     if (hWnd && !(COLOR_GetSystemPaletteFlags() & COLOR_VIRTUAL) ) 
-	InvalidateRect32( hWnd, NULL, FALSE );
+	InvalidateRect( hWnd, NULL, FALSE );
     return 0x666;
 }
 
@@ -838,8 +838,8 @@ INT16 WINAPI UpdateColors16( HDC16 hDC )
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI UpdateColors32(
-    HDC32 hDC) /* [in] Handle of device context */
+BOOL WINAPI UpdateColors(
+    HDC hDC) /* [in] Handle of device context */
 {
     UpdateColors16( hDC );
     return TRUE;
diff --git a/objects/pen.c b/objects/pen.c
index a4825ad8600..21578f157b3 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -14,20 +14,20 @@
  */
 HPEN16 WINAPI CreatePen16( INT16 style, INT16 width, COLORREF color )
 {
-    LOGPEN32 logpen = { style, { width, 0 }, color };
+    LOGPEN logpen = { style, { width, 0 }, color };
     TRACE(gdi, "%d %d %06lx\n", style, width, color );
-    return CreatePenIndirect32( &logpen );
+    return CreatePenIndirect( &logpen );
 }
 
 
 /***********************************************************************
  *           CreatePen32    (GDI32.55)
  */
-HPEN32 WINAPI CreatePen32( INT32 style, INT32 width, COLORREF color )
+HPEN WINAPI CreatePen( INT style, INT width, COLORREF color )
 {
-    LOGPEN32 logpen = { style, { width, 0 }, color };
+    LOGPEN logpen = { style, { width, 0 }, color };
     TRACE(gdi, "%d %d %06lx\n", style, width, color );
-    return CreatePenIndirect32( &logpen );
+    return CreatePenIndirect( &logpen );
 }
 
 
@@ -54,10 +54,10 @@ HPEN16 WINAPI CreatePenIndirect16( const LOGPEN16 * pen )
 /***********************************************************************
  *           CreatePenIndirect32    (GDI32.56)
  */
-HPEN32 WINAPI CreatePenIndirect32( const LOGPEN32 * pen )
+HPEN WINAPI CreatePenIndirect( const LOGPEN * pen )
 {
     PENOBJ * penPtr;
-    HPEN32 hpen;
+    HPEN hpen;
 
     if (pen->lopnStyle > PS_INSIDEFRAME) return 0;
     hpen = GDI_AllocObject( sizeof(PENOBJ), PEN_MAGIC );
@@ -76,11 +76,11 @@ HPEN32 WINAPI CreatePenIndirect32( const LOGPEN32 * pen )
  * FIXME: PS_USERSTYLE not handled
  */
 
-HPEN32 WINAPI ExtCreatePen32( DWORD style, DWORD width,
-                              const LOGBRUSH32 * brush, DWORD style_count,
+HPEN WINAPI ExtCreatePen( DWORD style, DWORD width,
+                              const LOGBRUSH * brush, DWORD style_count,
                               const DWORD *style_bits )
 {
-    LOGPEN32 logpen;
+    LOGPEN logpen;
 
     if ((style & PS_STYLE_MASK) == PS_USERSTYLE)
 	FIXME(gdi, "PS_USERSTYLE not handled\n");
@@ -92,7 +92,7 @@ HPEN32 WINAPI ExtCreatePen32( DWORD style, DWORD width,
     logpen.lopnWidth.x = (style & PS_GEOMETRIC) ? width : 1;
     logpen.lopnWidth.y = 0;
     logpen.lopnColor = brush->lbColor;
-    return CreatePenIndirect32( &logpen );
+    return CreatePenIndirect( &logpen );
 }
 
 /***********************************************************************
@@ -113,7 +113,7 @@ INT16 PEN_GetObject16( PENOBJ * pen, INT16 count, LPSTR buffer )
 /***********************************************************************
  *           PEN_GetObject32
  */
-INT32 PEN_GetObject32( PENOBJ * pen, INT32 count, LPSTR buffer )
+INT PEN_GetObject( PENOBJ * pen, INT count, LPSTR buffer )
 {
     if (count > sizeof(pen->logpen)) count = sizeof(pen->logpen);
     memcpy( buffer, &pen->logpen, count );
diff --git a/objects/region.c b/objects/region.c
index 7f53e9d0f4a..89baa0f7da6 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -95,7 +95,7 @@ static void REGION_IntersectRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2
 static void REGION_UnionRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2);
 static void REGION_SubtractRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2);
 static void REGION_XorRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2);
-static void REGION_UnionRectWithRegion(const RECT32 *rect, WINEREGION *rgn);
+static void REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn);
 
 
 /***********************************************************************
@@ -104,7 +104,7 @@ static void REGION_UnionRectWithRegion(const RECT32 *rect, WINEREGION *rgn);
  */
 static void REGION_DumpRegion(WINEREGION *pReg)
 {
-    RECT32 *pRect, *pRectEnd = pReg->rects + pReg->numRects;
+    RECT *pRect, *pRectEnd = pReg->rects + pReg->numRects;
 
     TRACE(region, "Region %p: %d,%d - %d,%d %d rects\n", pReg,
 	    pReg->extents.left, pReg->extents.top,
@@ -125,7 +125,7 @@ static WINEREGION *REGION_AllocWineRegion( void )
 
     if ((pReg = HeapAlloc(SystemHeap, 0, sizeof( WINEREGION ))))
     {
-	if ((pReg->rects = HeapAlloc(SystemHeap, 0, sizeof( RECT32 ))))
+	if ((pReg->rects = HeapAlloc(SystemHeap, 0, sizeof( RECT ))))
 	{
 	    pReg->size = 1;
 	    EMPTY_REGION(pReg);
@@ -140,9 +140,9 @@ static WINEREGION *REGION_AllocWineRegion( void )
  *          REGION_CreateRegion
  *          Create a new empty region.
  */
-static HRGN32 REGION_CreateRegion(void)
+static HRGN REGION_CreateRegion(void)
 {
-    HRGN32 hrgn;
+    HRGN hrgn;
     RGNOBJ *obj;
     
     if(!(hrgn = GDI_AllocObject( sizeof(RGNOBJ), REGION_MAGIC )))
@@ -169,7 +169,7 @@ static void REGION_DestroyWineRegion( WINEREGION* pReg )
 /***********************************************************************
  *           REGION_DeleteObject
  */
-BOOL32 REGION_DeleteObject( HRGN32 hrgn, RGNOBJ * obj )
+BOOL REGION_DeleteObject( HRGN hrgn, RGNOBJ * obj )
 {
     TRACE(region, " %04x\n", hrgn );
 
@@ -182,21 +182,21 @@ BOOL32 REGION_DeleteObject( HRGN32 hrgn, RGNOBJ * obj )
  */
 INT16 WINAPI OffsetRgn16( HRGN16 hrgn, INT16 x, INT16 y )
 {
-    return OffsetRgn32( hrgn, x, y );
+    return OffsetRgn( hrgn, x, y );
 }
 
 /***********************************************************************
  *           OffsetRgn32   (GDI32.256)
  */
-INT32 WINAPI OffsetRgn32( HRGN32 hrgn, INT32 x, INT32 y )
+INT WINAPI OffsetRgn( HRGN hrgn, INT x, INT y )
 {
     RGNOBJ * obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
 
     if (obj)
     {
-	INT32 ret;
+	INT ret;
 	int nbox = obj->rgn->numRects;
-	RECT32 *pbox = obj->rgn->rects;
+	RECT *pbox = obj->rgn->rects;
 	
 	TRACE(region, " %04x %d,%d\n", hrgn, x, y );
 	if(nbox && (x || y)) {
@@ -225,8 +225,8 @@ INT32 WINAPI OffsetRgn32( HRGN32 hrgn, INT32 x, INT32 y )
  */
 INT16 WINAPI GetRgnBox16( HRGN16 hrgn, LPRECT16 rect )
 {
-    RECT32 r;
-    INT16 ret = (INT16)GetRgnBox32( hrgn, &r );
+    RECT r;
+    INT16 ret = (INT16)GetRgnBox( hrgn, &r );
     CONV_RECT32TO16( &r, rect );
     return ret;
 }
@@ -234,12 +234,12 @@ INT16 WINAPI GetRgnBox16( HRGN16 hrgn, LPRECT16 rect )
 /***********************************************************************
  *           GetRgnBox32    (GDI32.219)
  */
-INT32 WINAPI GetRgnBox32( HRGN32 hrgn, LPRECT32 rect )
+INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect )
 {
     RGNOBJ * obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
     if (obj)
     {
-	INT32 ret;
+	INT ret;
 	TRACE(region, " %04x\n", hrgn );
 	rect->left = obj->rgn->extents.left;
 	rect->top = obj->rgn->extents.top;
@@ -273,14 +273,14 @@ HRGN16 WINAPI CreateRectRgn16(INT16 left, INT16 top, INT16 right, INT16 bottom)
 /***********************************************************************
  *           CreateRectRgn32   (GDI32.59)
  */
-HRGN32 WINAPI CreateRectRgn32(INT32 left, INT32 top, INT32 right, INT32 bottom)
+HRGN WINAPI CreateRectRgn(INT left, INT top, INT right, INT bottom)
 {
-    HRGN32 hrgn;
+    HRGN hrgn;
 
     if (!(hrgn = REGION_CreateRegion()))
 	return 0;
     TRACE(region, "\n");
-    SetRectRgn32(hrgn, left, top, right, bottom);
+    SetRectRgn(hrgn, left, top, right, bottom);
     return hrgn;
 }
 
@@ -296,9 +296,9 @@ HRGN16 WINAPI CreateRectRgnIndirect16( const RECT16* rect )
 /***********************************************************************
  *           CreateRectRgnIndirect32    (GDI32.60)
  */
-HRGN32 WINAPI CreateRectRgnIndirect32( const RECT32* rect )
+HRGN WINAPI CreateRectRgnIndirect( const RECT* rect )
 {
-    return CreateRectRgn32( rect->left, rect->top, rect->right, rect->bottom );
+    return CreateRectRgn( rect->left, rect->top, rect->right, rect->bottom );
 }
 
 
@@ -311,9 +311,9 @@ VOID WINAPI SetRectRgn16( HRGN16 hrgn, INT16 left, INT16 top,
 			  INT16 right, INT16 bottom )
 {
     if(left < right)
-        SetRectRgn32( hrgn, left, top, right, bottom );
+        SetRectRgn( hrgn, left, top, right, bottom );
     else
-        SetRectRgn32( hrgn, 0, 0, 0, 0 );
+        SetRectRgn( hrgn, 0, 0, 0, 0 );
 }
 
 
@@ -322,8 +322,8 @@ VOID WINAPI SetRectRgn16( HRGN16 hrgn, INT16 left, INT16 top,
  *
  * Allows either or both left and top to be greater than right or bottom.
  */
-VOID WINAPI SetRectRgn32( HRGN32 hrgn, INT32 left, INT32 top,
-			  INT32 right, INT32 bottom )
+VOID WINAPI SetRectRgn( HRGN hrgn, INT left, INT top,
+			  INT right, INT bottom )
 {
     RGNOBJ * obj;
 
@@ -332,8 +332,8 @@ VOID WINAPI SetRectRgn32( HRGN32 hrgn, INT32 left, INT32 top,
     
     if (!(obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ))) return;
 
-    if (left > right) { INT32 tmp = left; left = right; right = tmp; }
-    if (top > bottom) { INT32 tmp = top; top = bottom; bottom = tmp; }
+    if (left > right) { INT tmp = left; left = right; right = tmp; }
+    if (top > bottom) { INT tmp = top; top = bottom; bottom = tmp; }
 
     if((left != right) && (top != bottom))
     {
@@ -366,31 +366,31 @@ HRGN16 WINAPI CreateRoundRectRgn16( INT16 left, INT16 top,
     if( ellipse_width == 0 || ellipse_height == 0 )
         return CreateRectRgn16( left, top, right, bottom );
     else
-        return (HRGN16)CreateRoundRectRgn32( left, top, right, bottom,
+        return (HRGN16)CreateRoundRectRgn( left, top, right, bottom,
 					 ellipse_width, ellipse_height );
 }
 
 /***********************************************************************
  *           CreateRoundRectRgn32    (GDI32.61)
  */
-HRGN32 WINAPI CreateRoundRectRgn32( INT32 left, INT32 top,
-				    INT32 right, INT32 bottom,
-				    INT32 ellipse_width, INT32 ellipse_height )
+HRGN WINAPI CreateRoundRectRgn( INT left, INT top,
+				    INT right, INT bottom,
+				    INT ellipse_width, INT ellipse_height )
 {
     RGNOBJ * obj;
-    HRGN32 hrgn;
+    HRGN hrgn;
     int asq, bsq, d, xd, yd;
-    RECT32 rect;
+    RECT rect;
     
       /* Check if we can do a normal rectangle instead */
 
     if ((ellipse_width == 0) || (ellipse_height == 0))
-	return CreateRectRgn32( left, top, right, bottom );
+	return CreateRectRgn( left, top, right, bottom );
 
       /* Make the dimensions sensible */
 
-    if (left > right) { INT32 tmp = left; left = right; right = tmp; }
-    if (top > bottom) { INT32 tmp = top; top = bottom; bottom = tmp; }
+    if (left > right) { INT tmp = left; left = right; right = tmp; }
+    if (top > bottom) { INT tmp = top; top = bottom; bottom = tmp; }
 
     ellipse_width = abs(ellipse_width);
     ellipse_height = abs(ellipse_height);
@@ -484,7 +484,7 @@ HRGN32 WINAPI CreateRoundRectRgn32( INT32 left, INT32 top,
 HRGN16 WINAPI CreateEllipticRgn16( INT16 left, INT16 top,
 				   INT16 right, INT16 bottom )
 {
-    return (HRGN16)CreateRoundRectRgn32( left, top, right, bottom,
+    return (HRGN16)CreateRoundRectRgn( left, top, right, bottom,
 					 right-left, bottom-top );
 }
 
@@ -492,10 +492,10 @@ HRGN16 WINAPI CreateEllipticRgn16( INT16 left, INT16 top,
 /***********************************************************************
  *           CreateEllipticRgn32    (GDI32.39)
  */
-HRGN32 WINAPI CreateEllipticRgn32( INT32 left, INT32 top,
-				   INT32 right, INT32 bottom )
+HRGN WINAPI CreateEllipticRgn( INT left, INT top,
+				   INT right, INT bottom )
 {
-    return CreateRoundRectRgn32( left, top, right, bottom,
+    return CreateRoundRectRgn( left, top, right, bottom,
 				 right-left, bottom-top );
 }
 
@@ -505,7 +505,7 @@ HRGN32 WINAPI CreateEllipticRgn32( INT32 left, INT32 top,
  */
 HRGN16 WINAPI CreateEllipticRgnIndirect16( const RECT16 *rect )
 {
-    return CreateRoundRectRgn32( rect->left, rect->top, rect->right,
+    return CreateRoundRectRgn( rect->left, rect->top, rect->right,
 				 rect->bottom, rect->right - rect->left,
 				 rect->bottom - rect->top );
 }
@@ -514,9 +514,9 @@ HRGN16 WINAPI CreateEllipticRgnIndirect16( const RECT16 *rect )
 /***********************************************************************
  *           CreateEllipticRgnIndirect32    (GDI32.40)
  */
-HRGN32 WINAPI CreateEllipticRgnIndirect32( const RECT32 *rect )
+HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect )
 {
-    return CreateRoundRectRgn32( rect->left, rect->top, rect->right,
+    return CreateRoundRectRgn( rect->left, rect->top, rect->right,
 				 rect->bottom, rect->right - rect->left,
 				 rect->bottom - rect->top );
 }
@@ -525,7 +525,7 @@ HRGN32 WINAPI CreateEllipticRgnIndirect32( const RECT32 *rect )
  *           GetRegionData32   (GDI32.217)
  * 
  */
-DWORD WINAPI GetRegionData32(HRGN32 hrgn, DWORD count, LPRGNDATA rgndata)
+DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata)
 {
     DWORD size;
     RGNOBJ *obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
@@ -535,7 +535,7 @@ DWORD WINAPI GetRegionData32(HRGN32 hrgn, DWORD count, LPRGNDATA rgndata)
 
     if(!obj) return 0;
 
-    size = obj->rgn->numRects * sizeof(RECT32);
+    size = obj->rgn->numRects * sizeof(RECT);
     if(count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL)
     {
         GDI_HEAP_UNLOCK( hrgn );
@@ -563,18 +563,18 @@ DWORD WINAPI GetRegionData32(HRGN32 hrgn, DWORD count, LPRGNDATA rgndata)
  */
 DWORD WINAPI GetRegionData16(HRGN16 hrgn, DWORD count, LPRGNDATA rgndata)
 {
-    return GetRegionData32((HRGN32)hrgn, count, rgndata);
+    return GetRegionData((HRGN)hrgn, count, rgndata);
 }
 
 /***********************************************************************
  *           ExtCreateRegion   (GDI32.94)
  * 
  */
-HRGN32 WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* rgndata)
+HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* rgndata)
 {
-    HRGN32 hrgn = CreateRectRgn32(0, 0, 0, 0);
+    HRGN hrgn = CreateRectRgn(0, 0, 0, 0);
     RGNOBJ *obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
-    RECT32 *pCurRect, *pEndRect;
+    RECT *pCurRect, *pEndRect;
 
     TRACE(region, " %p %ld %p. Returning %04x\n",
 		   lpXform, dwCount, rgndata, hrgn);
@@ -590,12 +590,12 @@ HRGN32 WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDAT
     {
         WARN(region, "Type not RDH_RECTANGLES\n");
 	GDI_HEAP_UNLOCK( hrgn );
-	DeleteObject32( hrgn );
+	DeleteObject( hrgn );
 	return 0;
     }
 
-    pEndRect = (RECT32 *)rgndata->Buffer + rgndata->rdh.nCount;
-    for(pCurRect = (RECT32 *)rgndata->Buffer; pCurRect < pEndRect; pCurRect++)
+    pEndRect = (RECT *)rgndata->Buffer + rgndata->rdh.nCount;
+    for(pCurRect = (RECT *)rgndata->Buffer; pCurRect < pEndRect; pCurRect++)
         REGION_UnionRectWithRegion( pCurRect, obj->rgn );
 
     GDI_HEAP_UNLOCK( hrgn );
@@ -607,20 +607,20 @@ HRGN32 WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDAT
  */
 BOOL16 WINAPI PtInRegion16( HRGN16 hrgn, INT16 x, INT16 y )
 {
-    return PtInRegion32( hrgn, x, y );
+    return PtInRegion( hrgn, x, y );
 }
 
 
 /***********************************************************************
  *           PtInRegion32    (GDI32.278)
  */
-BOOL32 WINAPI PtInRegion32( HRGN32 hrgn, INT32 x, INT32 y )
+BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y )
 {
     RGNOBJ * obj;
     
     if ((obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC )))
     {
-	BOOL32 ret = FALSE;
+	BOOL ret = FALSE;
 	int i;
 
 	if (obj->rgn->numRects > 0 && INRECT(obj->rgn->extents, x, y))
@@ -639,10 +639,10 @@ BOOL32 WINAPI PtInRegion32( HRGN32 hrgn, INT32 x, INT32 y )
  */
 BOOL16 WINAPI RectInRegion16( HRGN16 hrgn, const RECT16 *rect )
 {
-    RECT32 r32;
+    RECT r32;
 
     CONV_RECT16TO32(rect, &r32);
-    return (BOOL16)RectInRegion32(hrgn, &r32);
+    return (BOOL16)RectInRegion(hrgn, &r32);
 }
 
 
@@ -651,14 +651,14 @@ BOOL16 WINAPI RectInRegion16( HRGN16 hrgn, const RECT16 *rect )
  *
  * Returns TRUE if rect is at least partly inside hrgn
  */
-BOOL32 WINAPI RectInRegion32( HRGN32 hrgn, const RECT32 *rect )
+BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect )
 {
     RGNOBJ * obj;
     
     if ((obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC )))
     {
-	RECT32 *pCurRect, *pRectEnd;
-	BOOL32 ret = FALSE;
+	RECT *pCurRect, *pRectEnd;
+	BOOL ret = FALSE;
     
     /* this is (just) a useful optimization */
 	if ((obj->rgn->numRects > 0) && EXTENTCHECK(&obj->rgn->extents,
@@ -697,17 +697,17 @@ BOOL32 WINAPI RectInRegion32( HRGN32 hrgn, const RECT32 *rect )
  */
 BOOL16 WINAPI EqualRgn16( HRGN16 rgn1, HRGN16 rgn2 )
 {
-    return EqualRgn32( rgn1, rgn2 );
+    return EqualRgn( rgn1, rgn2 );
 }
 
 
 /***********************************************************************
  *           EqualRgn32    (GDI32.90)
  */
-BOOL32 WINAPI EqualRgn32( HRGN32 hrgn1, HRGN32 hrgn2 )
+BOOL WINAPI EqualRgn( HRGN hrgn1, HRGN hrgn2 )
 {
     RGNOBJ *obj1, *obj2;
-    BOOL32 ret = FALSE;
+    BOOL ret = FALSE;
 
     if ((obj1 = (RGNOBJ *) GDI_GetObjPtr( hrgn1, REGION_MAGIC ))) 
     {
@@ -718,10 +718,10 @@ BOOL32 WINAPI EqualRgn32( HRGN32 hrgn1, HRGN32 hrgn2 )
 	    ret = TRUE;
 	    if ( obj1->rgn->numRects != obj2->rgn->numRects ) ret = FALSE;
 	    else if ( obj1->rgn->numRects == 0 ) ret = TRUE;
-	    else if ( !EqualRect32(&obj1->rgn->extents, &obj2->rgn->extents) )
+	    else if ( !EqualRect(&obj1->rgn->extents, &obj2->rgn->extents) )
 		ret = FALSE;
 	    else for( i = 0; i < obj1->rgn->numRects; i++ ) {
-		if (!EqualRect32(obj1->rgn->rects + i, obj2->rgn->rects + i)) {
+		if (!EqualRect(obj1->rgn->rects + i, obj2->rgn->rects + i)) {
 		    ret = FALSE;
 		    break;
 		}
@@ -737,7 +737,7 @@ BOOL32 WINAPI EqualRgn32( HRGN32 hrgn1, HRGN32 hrgn2 )
  *           Adds a rectangle to a WINEREGION
  *           See below for REGION_UnionRectWithRgn
  */
-static void REGION_UnionRectWithRegion(const RECT32 *rect, WINEREGION *rgn)
+static void REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn)
 {
     WINEREGION region;
 
@@ -745,7 +745,7 @@ static void REGION_UnionRectWithRegion(const RECT32 *rect, WINEREGION *rgn)
     region.numRects = 1;
     region.size = 1;
     region.type = SIMPLEREGION;
-    CopyRect32(&(region.extents), rect);
+    CopyRect(&(region.extents), rect);
     REGION_UnionRegion(rgn, rgn, &region);
     return;
 }
@@ -755,7 +755,7 @@ static void REGION_UnionRectWithRegion(const RECT32 *rect, WINEREGION *rgn)
  *           Adds a rectangle to a HRGN32
  *           A helper used by scroll.c
  */
-BOOL32 REGION_UnionRectWithRgn( HRGN32 hrgn, const RECT32 *lpRect )
+BOOL REGION_UnionRectWithRgn( HRGN hrgn, const RECT *lpRect )
 {
     RGNOBJ *obj = (RGNOBJ *) GDI_HEAP_LOCK( hrgn );
 
@@ -771,16 +771,16 @@ BOOL32 REGION_UnionRectWithRgn( HRGN32 hrgn, const RECT32 *lpRect )
  * Create a region that is a frame around another region.
  * Expand all rectangles by +/- x and y, then subtract original region.
  */
-BOOL32 REGION_FrameRgn( HRGN32 hDest, HRGN32 hSrc, INT32 x, INT32 y )
+BOOL REGION_FrameRgn( HRGN hDest, HRGN hSrc, INT x, INT y )
 {
-    BOOL32 bRet;
+    BOOL bRet;
     RGNOBJ *srcObj = (RGNOBJ*) GDI_GetObjPtr( hSrc, REGION_MAGIC );
 
     if (srcObj->rgn->numRects != 0) 
     {
 	RGNOBJ* destObj = (RGNOBJ*) GDI_GetObjPtr( hDest, REGION_MAGIC );
-	RECT32 *pRect, *pEndRect;
-	RECT32 tempRect;
+	RECT *pRect, *pEndRect;
+	RECT tempRect;
 
 	EMPTY_REGION( destObj->rgn );
 	
@@ -809,20 +809,20 @@ BOOL32 REGION_FrameRgn( HRGN32 hDest, HRGN32 hSrc, INT32 x, INT32 y )
  * Convert region to device co-ords for the supplied dc. 
  * Used by X11DRV_PaintRgn.
  */
-BOOL32 REGION_LPTODP( HDC32 hdc, HRGN32 hDest, HRGN32 hSrc )
+BOOL REGION_LPTODP( HDC hdc, HRGN hDest, HRGN hSrc )
 {
-    RECT32 *pCurRect, *pEndRect;
+    RECT *pCurRect, *pEndRect;
     RGNOBJ *srcObj, *destObj;
     DC * dc = DC_GetDCPtr( hdc );
-    RECT32 tmpRect;
+    RECT tmpRect;
 
     TRACE(region, " hdc=%04x dest=%04x src=%04x\n",
 		    hdc, hDest, hSrc) ;
     
     if (dc->w.MapMode == MM_TEXT) /* Requires only a translation */
     {
-        if( CombineRgn32( hDest, hSrc, 0, RGN_COPY ) == ERROR ) return FALSE;
-	OffsetRgn32( hDest, dc->vportOrgX - dc->wndOrgX, 
+        if( CombineRgn( hDest, hSrc, 0, RGN_COPY ) == ERROR ) return FALSE;
+	OffsetRgn( hDest, dc->vportOrgX - dc->wndOrgX, 
 		     dc->vportOrgY - dc->wndOrgY );
 	return TRUE;
     }
@@ -857,7 +857,7 @@ BOOL32 REGION_LPTODP( HDC32 hdc, HRGN32 hDest, HRGN32 hSrc )
  */
 INT16 WINAPI CombineRgn16(HRGN16 hDest, HRGN16 hSrc1, HRGN16 hSrc2, INT16 mode)
 {
-    return (INT16)CombineRgn32( hDest, hSrc1, hSrc2, mode );
+    return (INT16)CombineRgn( hDest, hSrc1, hSrc2, mode );
 }
 
 
@@ -866,10 +866,10 @@ INT16 WINAPI CombineRgn16(HRGN16 hDest, HRGN16 hSrc1, HRGN16 hSrc2, INT16 mode)
  *
  * Note: The behavior is correct even if src and dest regions are the same.
  */
-INT32 WINAPI CombineRgn32(HRGN32 hDest, HRGN32 hSrc1, HRGN32 hSrc2, INT32 mode)
+INT WINAPI CombineRgn(HRGN hDest, HRGN hSrc1, HRGN hSrc2, INT mode)
 {
     RGNOBJ *destObj = (RGNOBJ *) GDI_GetObjPtr( hDest, REGION_MAGIC);
-    INT32 result = ERROR;
+    INT result = ERROR;
 
     TRACE(region, " %04x,%04x -> %04x mode=%x\n", 
 		 hSrc1, hSrc2, hDest, mode );
@@ -932,7 +932,7 @@ INT32 WINAPI CombineRgn32(HRGN32 hDest, HRGN32 hSrc1, HRGN32 hSrc2, INT32 mode)
  */
 static void REGION_SetExtents (WINEREGION *pReg)
 {
-    RECT32 *pRect, *pRectEnd, *pExtents;
+    RECT *pRect, *pRectEnd, *pExtents;
 
     if (pReg->numRects == 0)
     {
@@ -979,7 +979,7 @@ static void REGION_CopyRegion(WINEREGION *dst, WINEREGION *src)
 	if (dst->size < src->numRects)
 	{
 	    if (! (dst->rects = HeapReAlloc( SystemHeap, 0, dst->rects,
-				src->numRects * sizeof(RECT32) )))
+				src->numRects * sizeof(RECT) )))
 		return;
 	    dst->size = src->numRects;
 	}
@@ -991,7 +991,7 @@ static void REGION_CopyRegion(WINEREGION *dst, WINEREGION *src)
 	dst->type = src->type;
 
 	memcpy((char *) dst->rects, (char *) src->rects,
-	       (int) (src->numRects * sizeof(RECT32)));
+	       (int) (src->numRects * sizeof(RECT)));
     }
     return;
 }
@@ -1012,17 +1012,17 @@ static void REGION_CopyRegion(WINEREGION *dst, WINEREGION *src)
  *          - pReg->numRects will be decreased.
  *
  */
-static INT32 REGION_Coalesce (
+static INT REGION_Coalesce (
 	     WINEREGION *pReg, /* Region to coalesce */
-	     INT32 prevStart,  /* Index of start of previous band */
-	     INT32 curStart    /* Index of start of current band */
+	     INT prevStart,  /* Index of start of previous band */
+	     INT curStart    /* Index of start of current band */
 ) {
-    RECT32 *pPrevRect;          /* Current rect in previous band */
-    RECT32 *pCurRect;           /* Current rect in current band */
-    RECT32 *pRegEnd;            /* End of region */
-    INT32 curNumRects;          /* Number of rectangles in current band */
-    INT32 prevNumRects;         /* Number of rectangles in previous band */
-    INT32 bandtop;               /* top coordinate for current band */
+    RECT *pPrevRect;          /* Current rect in previous band */
+    RECT *pCurRect;           /* Current rect in current band */
+    RECT *pRegEnd;            /* End of region */
+    INT curNumRects;          /* Number of rectangles in current band */
+    INT prevNumRects;         /* Number of rectangles in previous band */
+    INT bandtop;               /* top coordinate for current band */
 
     pRegEnd = &pReg->rects[pReg->numRects];
 
@@ -1166,21 +1166,21 @@ static void REGION_RegionOp(
 	    void (*nonOverlap1Func)(), /* Function to call for non-overlapping bands in region 1 */
 	    void (*nonOverlap2Func)()  /* Function to call for non-overlapping bands in region 2 */
 ) {
-    RECT32 *r1;                         /* Pointer into first region */
-    RECT32 *r2;                         /* Pointer into 2d region */
-    RECT32 *r1End;                      /* End of 1st region */
-    RECT32 *r2End;                      /* End of 2d region */
-    INT32 ybot;                         /* Bottom of intersection */
-    INT32 ytop;                         /* Top of intersection */
-    RECT32 *oldRects;                   /* Old rects for newReg */
-    INT32 prevBand;                     /* Index of start of
+    RECT *r1;                         /* Pointer into first region */
+    RECT *r2;                         /* Pointer into 2d region */
+    RECT *r1End;                      /* End of 1st region */
+    RECT *r2End;                      /* End of 2d region */
+    INT ybot;                         /* Bottom of intersection */
+    INT ytop;                         /* Top of intersection */
+    RECT *oldRects;                   /* Old rects for newReg */
+    INT prevBand;                     /* Index of start of
 						 * previous band in newReg */
-    INT32 curBand;                      /* Index of start of current
+    INT curBand;                      /* Index of start of current
 						 * band in newReg */
-    RECT32 *r1BandEnd;                  /* End of current band in r1 */
-    RECT32 *r2BandEnd;                  /* End of current band in r2 */
-    INT32 top;                          /* Top of non-overlapping band */
-    INT32 bot;                          /* Bottom of non-overlapping band */
+    RECT *r1BandEnd;                  /* End of current band in r1 */
+    RECT *r2BandEnd;                  /* End of current band in r2 */
+    INT top;                          /* Top of non-overlapping band */
+    INT bot;                          /* Bottom of non-overlapping band */
     
     /*
      * Initialization:
@@ -1214,7 +1214,7 @@ static void REGION_RegionOp(
     newReg->size = MAX(reg1->numRects,reg2->numRects) * 2;
 
     if (! (newReg->rects = HeapAlloc( SystemHeap, 0, 
-			          sizeof(RECT32) * newReg->size )))
+			          sizeof(RECT) * newReg->size )))
     {
 	newReg->size = 0;
 	return;
@@ -1404,10 +1404,10 @@ static void REGION_RegionOp(
     {
 	if (REGION_NOT_EMPTY(newReg))
 	{
-	    RECT32 *prev_rects = newReg->rects;
+	    RECT *prev_rects = newReg->rects;
 	    newReg->size = newReg->numRects;
 	    newReg->rects = HeapReAlloc( SystemHeap, 0, newReg->rects,
-				   sizeof(RECT32) * newReg->size );
+				   sizeof(RECT) * newReg->size );
 	    if (! newReg->rects)
 		newReg->rects = prev_rects;
 	}
@@ -1419,7 +1419,7 @@ static void REGION_RegionOp(
 	     */
 	    newReg->size = 1;
 	    HeapFree( SystemHeap, 0, newReg->rects );
-	    newReg->rects = HeapAlloc( SystemHeap, 0, sizeof(RECT32) );
+	    newReg->rects = HeapAlloc( SystemHeap, 0, sizeof(RECT) );
 	}
     }
     HeapFree( SystemHeap, 0, oldRects );
@@ -1443,12 +1443,12 @@ static void REGION_RegionOp(
  *      Rectangles may be added to the region.
  *
  */
-static void REGION_IntersectO(WINEREGION *pReg,  RECT32 *r1, RECT32 *r1End,
-		RECT32 *r2, RECT32 *r2End, INT32 top, INT32 bottom)
+static void REGION_IntersectO(WINEREGION *pReg,  RECT *r1, RECT *r1End,
+		RECT *r2, RECT *r2End, INT top, INT bottom)
 
 {
-    INT32       left, right;
-    RECT32      *pNextRect;
+    INT       left, right;
+    RECT      *pNextRect;
 
     pNextRect = &pReg->rects[pReg->numRects];
 
@@ -1542,10 +1542,10 @@ static void REGION_IntersectRegion(WINEREGION *newReg, WINEREGION *reg1,
  *      with the rectangles we're passed.
  *
  */
-static void REGION_UnionNonO (WINEREGION *pReg, RECT32 *r, RECT32 *rEnd,
-			      INT32 top, INT32 bottom)
+static void REGION_UnionNonO (WINEREGION *pReg, RECT *r, RECT *rEnd,
+			      INT top, INT bottom)
 {
-    RECT32 *pNextRect;
+    RECT *pNextRect;
 
     pNextRect = &pReg->rects[pReg->numRects];
 
@@ -1577,10 +1577,10 @@ static void REGION_UnionNonO (WINEREGION *pReg, RECT32 *r, RECT32 *rEnd,
  *      be changed.
  *
  */
-static void REGION_UnionO (WINEREGION *pReg, RECT32 *r1, RECT32 *r1End,
-			   RECT32 *r2, RECT32 *r2End, INT32 top, INT32 bottom)
+static void REGION_UnionO (WINEREGION *pReg, RECT *r1, RECT *r1End,
+			   RECT *r2, RECT *r2End, INT top, INT bottom)
 {
-    RECT32 *pNextRect;
+    RECT *pNextRect;
     
     pNextRect = &pReg->rects[pReg->numRects];
 
@@ -1717,10 +1717,10 @@ static void REGION_UnionRegion(WINEREGION *newReg, WINEREGION *reg1,
  *      pReg may be affected.
  *
  */
-static void REGION_SubtractNonO1 (WINEREGION *pReg, RECT32 *r, RECT32 *rEnd, 
-		INT32 top, INT32 bottom)
+static void REGION_SubtractNonO1 (WINEREGION *pReg, RECT *r, RECT *rEnd, 
+		INT top, INT bottom)
 {
-    RECT32 *pNextRect;
+    RECT *pNextRect;
 	
     pNextRect = &pReg->rects[pReg->numRects];
 	
@@ -1752,11 +1752,11 @@ static void REGION_SubtractNonO1 (WINEREGION *pReg, RECT32 *r, RECT32 *rEnd,
  *      pReg may have rectangles added to it.
  *
  */
-static void REGION_SubtractO (WINEREGION *pReg, RECT32 *r1, RECT32 *r1End, 
-		RECT32 *r2, RECT32 *r2End, INT32 top, INT32 bottom)
+static void REGION_SubtractO (WINEREGION *pReg, RECT *r1, RECT *r1End, 
+		RECT *r2, RECT *r2End, INT top, INT bottom)
 {
-    RECT32 *pNextRect;
-    INT32 left;
+    RECT *pNextRect;
+    INT left;
     
     left = r1->left;
     pNextRect = &pReg->rects[pReg->numRects];
@@ -1944,7 +1944,7 @@ static void REGION_XorRegion(WINEREGION *dr, WINEREGION *sra,
  *
  */
 static void REGION_InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE,
-                INT32 scanline, ScanLineListBlock **SLLBlock, INT32 *iSLLBlock)
+                INT scanline, ScanLineListBlock **SLLBlock, INT *iSLLBlock)
 
 {
     EdgeTableEntry *start, *prev;
@@ -2030,13 +2030,13 @@ static void REGION_InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE,
  *     which an edge is initially entered.
  *
  */
-static void REGION_CreateETandAET(const INT32 *Count, INT32 nbpolygons, 
-            const POINT32 *pts, EdgeTable *ET, EdgeTableEntry *AET,
+static void REGION_CreateETandAET(const INT *Count, INT nbpolygons, 
+            const POINT *pts, EdgeTable *ET, EdgeTableEntry *AET,
             EdgeTableEntry *pETEs, ScanLineListBlock *pSLLBlock)
 {
-    const POINT32 *top, *bottom;
-    const POINT32 *PrevPt, *CurrPt, *EndPt;
-    INT32 poly, count;
+    const POINT *top, *bottom;
+    const POINT *PrevPt, *CurrPt, *EndPt;
+    INT poly, count;
     int iSLLBlock = 0;
     int dy;
 
@@ -2209,12 +2209,12 @@ static void REGION_computeWAET(EdgeTableEntry *AET)
  *     Edge Table.
  *
  */
-static BOOL32 REGION_InsertionSort(EdgeTableEntry *AET)
+static BOOL REGION_InsertionSort(EdgeTableEntry *AET)
 {
     EdgeTableEntry *pETEchase;
     EdgeTableEntry *pETEinsert;
     EdgeTableEntry *pETEchaseBackTMP;
-    BOOL32 changed = FALSE;
+    BOOL changed = FALSE;
 
     AET = AET->next;
     while (AET) 
@@ -2267,19 +2267,19 @@ static void REGION_FreeStorage(ScanLineListBlock *pSLLBlock)
 static int REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock, 
 		       POINTBLOCK *FirstPtBlock, WINEREGION *reg)
 {
-    RECT32 *rects;
-    POINT32 *pts;
+    RECT *rects;
+    POINT *pts;
     POINTBLOCK *CurPtBlock;
     int i;
-    RECT32 *extents;
-    INT32 numRects;
+    RECT *extents;
+    INT numRects;
  
     extents = &reg->extents;
  
     numRects = ((numFullPtBlocks * NUMPTSTOBUFFER) + iCurPtBlock) >> 1;
  
     if (!(reg->rects = HeapReAlloc( SystemHeap, 0, reg->rects, 
-			   sizeof(RECT32) * numRects )))
+			   sizeof(RECT) * numRects )))
         return(0);
  
     reg->size = numRects;
@@ -2332,18 +2332,18 @@ static int REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock,
 /***********************************************************************
  *           CreatePolyPolygonRgn32    (GDI32.57)
  */
-HRGN32 WINAPI CreatePolyPolygonRgn32(const POINT32 *Pts, const INT32 *Count, 
-		      INT32 nbpolygons, INT32 mode)
+HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, 
+		      INT nbpolygons, INT mode)
 {
-    HRGN32 hrgn;
+    HRGN hrgn;
     RGNOBJ *obj;
     WINEREGION *region;
     register EdgeTableEntry *pAET;   /* Active Edge Table       */
-    register INT32 y;                /* current scanline        */
+    register INT y;                /* current scanline        */
     register int iPts = 0;           /* number of pts in buffer */
     register EdgeTableEntry *pWETE;  /* Winding Edge Table Entry*/
     register ScanLineList *pSLL;     /* current scanLineList    */
-    register POINT32 *pts;           /* output buffer           */
+    register POINT *pts;           /* output buffer           */
     EdgeTableEntry *pPrevAET;        /* ptr to previous AET     */
     EdgeTable ET;                    /* header node for ET      */
     EdgeTableEntry AET;              /* header node for AET     */
@@ -2353,7 +2353,7 @@ HRGN32 WINAPI CreatePolyPolygonRgn32(const POINT32 *Pts, const INT32 *Count,
     POINTBLOCK FirstPtBlock, *curPtBlock; /* PtBlock buffers    */
     POINTBLOCK *tmpPtBlock;
     int numFullPtBlocks = 0;
-    INT32 poly, total;
+    INT poly, total;
 
     if(!(hrgn = REGION_CreateRegion()))
         return 0;
@@ -2373,7 +2373,7 @@ HRGN32 WINAPI CreatePolyPolygonRgn32(const POINT32 *Pts, const INT32 *Count,
 	  (Pts[2].x == Pts[3].x) &&
 	  (Pts[3].y == Pts[0].y))))
     {
-        SetRectRgn32( hrgn, MIN(Pts[0].x, Pts[2].x), MIN(Pts[0].y, Pts[2].y), 
+        SetRectRgn( hrgn, MIN(Pts[0].x, Pts[2].x), MIN(Pts[0].y, Pts[2].y), 
 		            MAX(Pts[0].x, Pts[2].x), MAX(Pts[0].y, Pts[2].y) );
 	GDI_HEAP_UNLOCK( hrgn );
 	return hrgn;
@@ -2522,21 +2522,21 @@ HRGN16 WINAPI CreatePolygonRgn16( const POINT16 * points, INT16 count,
 HRGN16 WINAPI CreatePolyPolygonRgn16( const POINT16 *points,
                 const INT16 *count, INT16 nbpolygons, INT16 mode )
 {
-    HRGN32 hrgn;
+    HRGN hrgn;
     int i, npts = 0;
-    INT32 *count32;
-    POINT32 *points32;
+    INT *count32;
+    POINT *points32;
 
     for (i = 0; i < nbpolygons; i++)
 	npts += count[i];
-    points32 = HeapAlloc( SystemHeap, 0, npts * sizeof(POINT32) );
+    points32 = HeapAlloc( SystemHeap, 0, npts * sizeof(POINT) );
     for (i = 0; i < npts; i++)
     	CONV_POINT16TO32( &(points[i]), &(points32[i]) );
 
-    count32 = HeapAlloc( SystemHeap, 0, nbpolygons * sizeof(INT32) );
+    count32 = HeapAlloc( SystemHeap, 0, nbpolygons * sizeof(INT) );
     for (i = 0; i < nbpolygons; i++)
     	count32[i] = count[i];
-    hrgn = CreatePolyPolygonRgn32( points32, count32, nbpolygons, mode );
+    hrgn = CreatePolyPolygonRgn( points32, count32, nbpolygons, mode );
     HeapFree( SystemHeap, 0, count32 );
     HeapFree( SystemHeap, 0, points32 );
     return hrgn;
@@ -2545,10 +2545,10 @@ HRGN16 WINAPI CreatePolyPolygonRgn16( const POINT16 *points,
 /***********************************************************************
  *           CreatePolygonRgn32    (GDI32.58)
  */
-HRGN32 WINAPI CreatePolygonRgn32( const POINT32 *points, INT32 count,
-                                  INT32 mode )
+HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count,
+                                  INT mode )
 {
-    return CreatePolyPolygonRgn32( points, &count, 1, mode );
+    return CreatePolyPolygonRgn( points, &count, 1, mode );
 }
 
 
@@ -2559,7 +2559,7 @@ HRGN32 WINAPI CreatePolygonRgn32( const POINT32 *points, INT32 count,
  *     This function is UNDOCUMENTED, it isn't even in the header file.
  *     I assume that it will return a HRGN32!??
  */
-HRGN32 WINAPI GetRandomRgn(DWORD dwArg1, DWORD dwArg2, DWORD dwArg3)
+HRGN WINAPI GetRandomRgn(DWORD dwArg1, DWORD dwArg2, DWORD dwArg3)
 {
     FIXME (region, "(0x%08lx 0x%08lx 0x%08lx): empty stub!\n",
 	   dwArg1, dwArg2, dwArg3);
diff --git a/objects/text.c b/objects/text.c
index 5597cb92ea2..52b359e6224 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -257,12 +257,12 @@ INT16 WINAPI DrawText16( HDC16 hdc, LPCSTR str, INT16 i_count,
                               rect, line, len, NULL )) return 0;
             if (prefix_offset != -1)
             {
-                HPEN32 hpen = CreatePen32( PS_SOLID, 1, GetTextColor32(hdc) );
-                HPEN32 oldPen = SelectObject32( hdc, hpen );
-                MoveTo(hdc, x + prefix_x, y + tm.tmAscent + 1 );
-                LineTo32(hdc, x + prefix_end + 1, y + tm.tmAscent + 1 );
-                SelectObject32( hdc, oldPen );
-                DeleteObject32( hpen );
+                HPEN hpen = CreatePen( PS_SOLID, 1, GetTextColor(hdc) );
+                HPEN oldPen = SelectObject( hdc, hpen );
+                MoveTo16(hdc, x + prefix_x, y + tm.tmAscent + 1 );
+                LineTo(hdc, x + prefix_end + 1, y + tm.tmAscent + 1 );
+                SelectObject( hdc, oldPen );
+                DeleteObject( hpen );
             }
 	}
 	else if (size.cx > max_width)
@@ -291,8 +291,8 @@ INT16 WINAPI DrawText16( HDC16 hdc, LPCSTR str, INT16 i_count,
 /***********************************************************************
  *           DrawText32A    (USER32.164)
  */
-INT32 WINAPI DrawText32A( HDC32 hdc, LPCSTR str, INT32 count,
-                          LPRECT32 rect, UINT32 flags )
+INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count,
+                          LPRECT rect, UINT flags )
 {
     RECT16 rect16;
     INT16 ret;
@@ -309,11 +309,11 @@ INT32 WINAPI DrawText32A( HDC32 hdc, LPCSTR str, INT32 count,
 /***********************************************************************
  *           DrawText32W    (USER32.167)
  */
-INT32 WINAPI DrawText32W( HDC32 hdc, LPCWSTR str, INT32 count,
-                          LPRECT32 rect, UINT32 flags )
+INT WINAPI DrawTextW( HDC hdc, LPCWSTR str, INT count,
+                          LPRECT rect, UINT flags )
 {
     LPSTR p = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-    INT32 ret = DrawText32A( hdc, p, count, rect, flags );
+    INT ret = DrawTextA( hdc, p, count, rect, flags );
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
 }
@@ -321,8 +321,8 @@ INT32 WINAPI DrawText32W( HDC32 hdc, LPCWSTR str, INT32 count,
 /***********************************************************************
  *           DrawTextEx32A    (USER32.165)
  */
-INT32 WINAPI DrawTextEx32A( HDC32 hdc, LPCSTR str, INT32 count,
-                     LPRECT32 rect, UINT32 flags, LPDRAWTEXTPARAMS dtp )
+INT WINAPI DrawTextExA( HDC hdc, LPCSTR str, INT count,
+                     LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp )
 {
     TRACE(text,"(%d,'%s',%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp);
     if(dtp) {
@@ -330,18 +330,18 @@ INT32 WINAPI DrawTextEx32A( HDC32 hdc, LPCSTR str, INT32 count,
                    dtp->iTabLength,dtp->iLeftMargin,dtp->iRightMargin,
                    dtp->uiLengthDrawn);
     }
-    return DrawText32A(hdc,str,count,rect,flags);
+    return DrawTextA(hdc,str,count,rect,flags);
 }
 
 /***********************************************************************
  *           DrawTextEx32W    (USER32.166)
  */
-INT32 WINAPI DrawTextEx32W( HDC32 hdc, LPCWSTR str, INT32 count,
-                     LPRECT32 rect, UINT32 flags, LPDRAWTEXTPARAMS dtp )
+INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT count,
+                     LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp )
 {
     TRACE(text,"(%d,%p,%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp);
     FIXME(text,"ignores extended functionality\n");
-    return DrawText32W(hdc,str,count,rect,flags);
+    return DrawTextW(hdc,str,count,rect,flags);
 }
 
 /***********************************************************************
@@ -351,16 +351,16 @@ BOOL16 WINAPI ExtTextOut16( HDC16 hdc, INT16 x, INT16 y, UINT16 flags,
                             const RECT16 *lprect, LPCSTR str, UINT16 count,
                             const INT16 *lpDx )
 {
-    BOOL32	ret;
+    BOOL	ret;
     int		i;
-    RECT32	rect32;
-    LPINT32	lpdx32 = NULL;
+    RECT	rect32;
+    LPINT	lpdx32 = NULL;
 
-    if (lpDx) lpdx32 = (LPINT32)HEAP_xalloc( GetProcessHeap(), 0,
-                                             sizeof(INT32)*count );
+    if (lpDx) lpdx32 = (LPINT)HEAP_xalloc( GetProcessHeap(), 0,
+                                             sizeof(INT)*count );
     if (lprect)	CONV_RECT16TO32(lprect,&rect32);
     if (lpdx32)	for (i=count;i--;) lpdx32[i]=lpDx[i];
-    ret = ExtTextOut32A(hdc,x,y,flags,lprect?&rect32:NULL,str,count,lpdx32);
+    ret = ExtTextOutA(hdc,x,y,flags,lprect?&rect32:NULL,str,count,lpdx32);
     if (lpdx32) HeapFree( GetProcessHeap(), 0, lpdx32 );
     return ret;
 
@@ -371,9 +371,9 @@ BOOL16 WINAPI ExtTextOut16( HDC16 hdc, INT16 x, INT16 y, UINT16 flags,
 /***********************************************************************
  *           ExtTextOut32A    (GDI32.98)
  */
-BOOL32 WINAPI ExtTextOut32A( HDC32 hdc, INT32 x, INT32 y, UINT32 flags,
-                             const RECT32 *lprect, LPCSTR str, UINT32 count,
-                             const INT32 *lpDx )
+BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags,
+                             const RECT *lprect, LPCSTR str, UINT count,
+                             const INT *lpDx )
 {
     DC * dc = DC_GetDCPtr( hdc );
     return dc && dc->funcs->pExtTextOut && 
@@ -384,12 +384,12 @@ BOOL32 WINAPI ExtTextOut32A( HDC32 hdc, INT32 x, INT32 y, UINT32 flags,
 /***********************************************************************
  *           ExtTextOut32W    (GDI32.99)
  */
-BOOL32 WINAPI ExtTextOut32W( HDC32 hdc, INT32 x, INT32 y, UINT32 flags,
-                             const RECT32 *lprect, LPCWSTR str, UINT32 count,
-                             const INT32 *lpDx )
+BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
+                             const RECT *lprect, LPCWSTR str, UINT count,
+                             const INT *lpDx )
 {
     LPSTR p = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-    INT32 ret = ExtTextOut32A( hdc, x, y, flags, lprect, p, count, lpDx );
+    INT ret = ExtTextOutA( hdc, x, y, flags, lprect, p, count, lpDx );
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
 }
@@ -407,18 +407,18 @@ BOOL16 WINAPI TextOut16( HDC16 hdc, INT16 x, INT16 y, LPCSTR str, INT16 count )
 /***********************************************************************
  *           TextOut32A    (GDI32.355)
  */
-BOOL32 WINAPI TextOut32A( HDC32 hdc, INT32 x, INT32 y, LPCSTR str, INT32 count )
+BOOL WINAPI TextOutA( HDC hdc, INT x, INT y, LPCSTR str, INT count )
 {
-    return ExtTextOut32A( hdc, x, y, 0, NULL, str, count, NULL );
+    return ExtTextOutA( hdc, x, y, 0, NULL, str, count, NULL );
 }
 
 
 /***********************************************************************
  *           TextOut32W    (GDI32.356)
  */
-BOOL32 WINAPI TextOut32W(HDC32 hdc, INT32 x, INT32 y, LPCWSTR str, INT32 count)
+BOOL WINAPI TextOutW(HDC hdc, INT x, INT y, LPCWSTR str, INT count)
 {
-    return ExtTextOut32W( hdc, x, y, 0, NULL, str, count, NULL );
+    return ExtTextOutW( hdc, x, y, 0, NULL, str, count, NULL );
 }
 
 
@@ -432,18 +432,18 @@ BOOL32 WINAPI TextOut32W(HDC32 hdc, INT32 x, INT32 y, LPCWSTR str, INT32 count)
  * completed...
  * 
  */
-static BOOL32 TEXT_GrayString(HDC32 hdc, HBRUSH32 hb, 
-                              GRAYSTRINGPROC32 fn, LPARAM lp, INT32 len,
-                              INT32 x, INT32 y, INT32 cx, INT32 cy, 
-                              BOOL32 unicode, BOOL32 _32bit)
+static BOOL TEXT_GrayString(HDC hdc, HBRUSH hb, 
+                              GRAYSTRINGPROC fn, LPARAM lp, INT len,
+                              INT x, INT y, INT cx, INT cy, 
+                              BOOL unicode, BOOL _32bit)
 {
-    HBITMAP32 hbm, hbmsave;
-    HBRUSH32 hbsave;
-    HFONT32 hfsave;
-    HDC32 memdc = CreateCompatibleDC32(hdc);
+    HBITMAP hbm, hbmsave;
+    HBRUSH hbsave;
+    HFONT hfsave;
+    HDC memdc = CreateCompatibleDC(hdc);
     int slen = len;
-    BOOL32 retval = TRUE;
-    RECT32 r;
+    BOOL retval = TRUE;
+    RECT r;
     COLORREF fg, bg;
 
     if(!hdc) return FALSE;
@@ -451,16 +451,16 @@ static BOOL32 TEXT_GrayString(HDC32 hdc, HBRUSH32 hb,
     if(len == 0)
     {
         if(unicode)
-    	    slen = lstrlen32W((LPCWSTR)lp);
+    	    slen = lstrlenW((LPCWSTR)lp);
     	else if(_32bit)
-    	    slen = lstrlen32A((LPCSTR)lp);
+    	    slen = lstrlenA((LPCSTR)lp);
     	else
-    	    slen = lstrlen32A((LPCSTR)PTR_SEG_TO_LIN(lp));
+    	    slen = lstrlenA((LPCSTR)PTR_SEG_TO_LIN(lp));
     }
 
     if((cx == 0 || cy == 0) && slen != -1)
     {
-        SIZE32 s;
+        SIZE s;
         if(unicode)
             GetTextExtentPoint32W(hdc, (LPCWSTR)lp, slen, &s);
         else if(_32bit)
@@ -475,27 +475,27 @@ static BOOL32 TEXT_GrayString(HDC32 hdc, HBRUSH32 hb,
     r.right = cx;
     r.bottom = cy;
 
-    hbm = CreateBitmap32(cx, cy, 1, 1, NULL);
-    hbmsave = (HBITMAP32)SelectObject32(memdc, hbm);
-    FillRect32(memdc, &r, (HBRUSH32)GetStockObject32(BLACK_BRUSH));
-    SetTextColor32(memdc, RGB(255, 255, 255));
-    SetBkColor32(memdc, RGB(0, 0, 0));
-    hfsave = (HFONT32)SelectObject32(memdc, GetCurrentObject(hdc, OBJ_FONT));
+    hbm = CreateBitmap(cx, cy, 1, 1, NULL);
+    hbmsave = (HBITMAP)SelectObject(memdc, hbm);
+    FillRect(memdc, &r, (HBRUSH)GetStockObject(BLACK_BRUSH));
+    SetTextColor(memdc, RGB(255, 255, 255));
+    SetBkColor(memdc, RGB(0, 0, 0));
+    hfsave = (HFONT)SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT));
             
     if(fn)
         if(_32bit)
             retval = fn(memdc, lp, slen);
         else
-            retval = (BOOL32)((BOOL16)((GRAYSTRINGPROC16)fn)((HDC16)memdc, lp, (INT16)slen));
+            retval = (BOOL)((BOOL16)((GRAYSTRINGPROC16)fn)((HDC16)memdc, lp, (INT16)slen));
     else
         if(unicode)
-            TextOut32W(memdc, 0, 0, (LPCWSTR)lp, slen);
+            TextOutW(memdc, 0, 0, (LPCWSTR)lp, slen);
         else if(_32bit)
-            TextOut32A(memdc, 0, 0, (LPCSTR)lp, slen);
+            TextOutA(memdc, 0, 0, (LPCSTR)lp, slen);
         else
-            TextOut32A(memdc, 0, 0, (LPCSTR)PTR_SEG_TO_LIN(lp), slen);
+            TextOutA(memdc, 0, 0, (LPCSTR)PTR_SEG_TO_LIN(lp), slen);
 
-    SelectObject32(memdc, hfsave);
+    SelectObject(memdc, hfsave);
 
 /*
  * Windows doc says that the bitmap isn't grayed when len == -1 and
@@ -506,22 +506,22 @@ static BOOL32 TEXT_GrayString(HDC32 hdc, HBRUSH32 hb,
     if(retval || len != -1)
 #endif
     {
-        hbsave = (HBRUSH32)SelectObject32(memdc, CACHE_GetPattern55AABrush());
-        PatBlt32(memdc, 0, 0, cx, cy, 0x000A0329);
-        SelectObject32(memdc, hbsave);
+        hbsave = (HBRUSH)SelectObject(memdc, CACHE_GetPattern55AABrush());
+        PatBlt(memdc, 0, 0, cx, cy, 0x000A0329);
+        SelectObject(memdc, hbsave);
     }
 
-    if(hb) hbsave = (HBRUSH32)SelectObject32(hdc, hb);
-    fg = SetTextColor32(hdc, RGB(0, 0, 0));
-    bg = SetBkColor32(hdc, RGB(255, 255, 255));
-    BitBlt32(hdc, x, y, cx, cy, memdc, 0, 0, 0x00E20746);
-    SetTextColor32(hdc, fg);
-    SetBkColor32(hdc, bg);
-    if(hb) SelectObject32(hdc, hbsave);
-
-    SelectObject32(memdc, hbmsave);
-    DeleteObject32(hbm);
-    DeleteDC32(memdc);
+    if(hb) hbsave = (HBRUSH)SelectObject(hdc, hb);
+    fg = SetTextColor(hdc, RGB(0, 0, 0));
+    bg = SetBkColor(hdc, RGB(255, 255, 255));
+    BitBlt(hdc, x, y, cx, cy, memdc, 0, 0, 0x00E20746);
+    SetTextColor(hdc, fg);
+    SetBkColor(hdc, bg);
+    if(hb) SelectObject(hdc, hbsave);
+
+    SelectObject(memdc, hbmsave);
+    DeleteObject(hbm);
+    DeleteDC(memdc);
     return retval;
 }
 
@@ -533,16 +533,16 @@ BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc,
                             LPARAM lParam, INT16 cch, INT16 x, INT16 y,
                             INT16 cx, INT16 cy )
 {
-    return TEXT_GrayString(hdc, hbr, (GRAYSTRINGPROC32)gsprc, lParam, cch, x, y, cx, cy, FALSE, FALSE);
+    return TEXT_GrayString(hdc, hbr, (GRAYSTRINGPROC)gsprc, lParam, cch, x, y, cx, cy, FALSE, FALSE);
 }
 
 
 /***********************************************************************
  *           GrayString32A   (USER32.315)
  */
-BOOL32 WINAPI GrayString32A( HDC32 hdc, HBRUSH32 hbr, GRAYSTRINGPROC32 gsprc,
-                             LPARAM lParam, INT32 cch, INT32 x, INT32 y,
-                             INT32 cx, INT32 cy )
+BOOL WINAPI GrayStringA( HDC hdc, HBRUSH hbr, GRAYSTRINGPROC gsprc,
+                             LPARAM lParam, INT cch, INT x, INT y,
+                             INT cx, INT cy )
 {
     return TEXT_GrayString(hdc, hbr, gsprc, lParam, cch, x, y, cx, cy, FALSE, TRUE);
 }
@@ -551,9 +551,9 @@ BOOL32 WINAPI GrayString32A( HDC32 hdc, HBRUSH32 hbr, GRAYSTRINGPROC32 gsprc,
 /***********************************************************************
  *           GrayString32W   (USER32.316)
  */
-BOOL32 WINAPI GrayString32W( HDC32 hdc, HBRUSH32 hbr, GRAYSTRINGPROC32 gsprc,
-                             LPARAM lParam, INT32 cch, INT32 x, INT32 y,
-                             INT32 cx, INT32 cy )
+BOOL WINAPI GrayStringW( HDC hdc, HBRUSH hbr, GRAYSTRINGPROC gsprc,
+                             LPARAM lParam, INT cch, INT x, INT y,
+                             INT cx, INT cy )
 {
     return TEXT_GrayString(hdc, hbr, gsprc, lParam, cch, x, y, cx, cy, TRUE, TRUE);
 }
@@ -566,12 +566,12 @@ BOOL32 WINAPI GrayString32W( HDC32 hdc, HBRUSH32 hbr, GRAYSTRINGPROC32 gsprc,
  * Note: this doesn't work too well for text-alignment modes other
  *       than TA_LEFT|TA_TOP. But we want bug-for-bug compatibility :-)
  */
-LONG TEXT_TabbedTextOut( HDC32 hdc, INT32 x, INT32 y, LPCSTR lpstr,
-                         INT32 count, INT32 cTabStops, const INT16 *lpTabPos16,
-                         const INT32 *lpTabPos32, INT32 nTabOrg,
-                         BOOL32 fDisplayText )
+LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCSTR lpstr,
+                         INT count, INT cTabStops, const INT16 *lpTabPos16,
+                         const INT *lpTabPos32, INT nTabOrg,
+                         BOOL fDisplayText )
 {
-    INT32 defWidth;
+    INT defWidth;
     DWORD extent = 0;
     int i, tabPos = x;
     int start = x;
@@ -592,7 +592,7 @@ LONG TEXT_TabbedTextOut( HDC32 hdc, INT32 x, INT32 y, LPCSTR lpstr,
     {
         for (i = 0; i < count; i++)
             if (lpstr[i] == '\t') break;
-        extent = GetTextExtent( hdc, lpstr, i );
+        extent = GetTextExtent16( hdc, lpstr, i );
         if (lpTabPos32)
         {
             while ((cTabStops > 0) &&
@@ -619,10 +619,10 @@ LONG TEXT_TabbedTextOut( HDC32 hdc, INT32 x, INT32 y, LPCSTR lpstr,
             tabPos = nTabOrg + ((x + LOWORD(extent) - nTabOrg) / defWidth + 1) * defWidth;
         if (fDisplayText)
         {
-            RECT32 r;
-            SetRect32( &r, x, y, tabPos, y+HIWORD(extent) );
-            ExtTextOut32A( hdc, x, y,
-                           GetBkMode32(hdc) == OPAQUE ? ETO_OPAQUE : 0,
+            RECT r;
+            SetRect( &r, x, y, tabPos, y+HIWORD(extent) );
+            ExtTextOutA( hdc, x, y,
+                           GetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0,
                            &r, lpstr, i, NULL );
         }
         x = tabPos;
@@ -650,9 +650,9 @@ LONG WINAPI TabbedTextOut16( HDC16 hdc, INT16 x, INT16 y, LPCSTR lpstr,
 /***********************************************************************
  *           TabbedTextOut32A    (USER32.542)
  */
-LONG WINAPI TabbedTextOut32A( HDC32 hdc, INT32 x, INT32 y, LPCSTR lpstr,
-                              INT32 count, INT32 cTabStops,
-                              const INT32 *lpTabPos, INT32 nTabOrg )
+LONG WINAPI TabbedTextOutA( HDC hdc, INT x, INT y, LPCSTR lpstr,
+                              INT count, INT cTabStops,
+                              const INT *lpTabPos, INT nTabOrg )
 {
     TRACE(text, "%04x %d,%d '%.*s' %d\n",
                   hdc, x, y, count, lpstr, count );
@@ -664,14 +664,14 @@ LONG WINAPI TabbedTextOut32A( HDC32 hdc, INT32 x, INT32 y, LPCSTR lpstr,
 /***********************************************************************
  *           TabbedTextOut32W    (USER32.543)
  */
-LONG WINAPI TabbedTextOut32W( HDC32 hdc, INT32 x, INT32 y, LPCWSTR str,
-                              INT32 count, INT32 cTabStops,
-                              const INT32 *lpTabPos, INT32 nTabOrg )
+LONG WINAPI TabbedTextOutW( HDC hdc, INT x, INT y, LPCWSTR str,
+                              INT count, INT cTabStops,
+                              const INT *lpTabPos, INT nTabOrg )
 {
     LONG ret;
     LPSTR p = HEAP_xalloc( GetProcessHeap(), 0, count + 1 );
     lstrcpynWtoA( p, str, count + 1 );
-    ret = TabbedTextOut32A( hdc, x, y, p, count, cTabStops,
+    ret = TabbedTextOutA( hdc, x, y, p, count, cTabStops,
                             lpTabPos, nTabOrg );
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
@@ -694,8 +694,8 @@ DWORD WINAPI GetTabbedTextExtent16( HDC16 hdc, LPCSTR lpstr, INT16 count,
 /***********************************************************************
  *           GetTabbedTextExtent32A    (USER32.293)
  */
-DWORD WINAPI GetTabbedTextExtent32A( HDC32 hdc, LPCSTR lpstr, INT32 count, 
-                                     INT32 cTabStops, const INT32 *lpTabPos )
+DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count, 
+                                     INT cTabStops, const INT *lpTabPos )
 {
     TRACE(text, "%04x '%.*s' %d\n",
                   hdc, count, lpstr, count );
@@ -707,13 +707,13 @@ DWORD WINAPI GetTabbedTextExtent32A( HDC32 hdc, LPCSTR lpstr, INT32 count,
 /***********************************************************************
  *           GetTabbedTextExtent32W    (USER32.294)
  */
-DWORD WINAPI GetTabbedTextExtent32W( HDC32 hdc, LPCWSTR lpstr, INT32 count, 
-                                     INT32 cTabStops, const INT32 *lpTabPos )
+DWORD WINAPI GetTabbedTextExtentW( HDC hdc, LPCWSTR lpstr, INT count, 
+                                     INT cTabStops, const INT *lpTabPos )
 {
     LONG ret;
     LPSTR p = HEAP_xalloc( GetProcessHeap(), 0, count + 1 );
     lstrcpynWtoA( p, lpstr, count + 1 );
-    ret = GetTabbedTextExtent32A( hdc, p, count, cTabStops, lpTabPos );
+    ret = GetTabbedTextExtentA( hdc, p, count, cTabStops, lpTabPos );
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
 }
@@ -729,8 +729,8 @@ DWORD WINAPI GetTabbedTextExtent32W( HDC32 hdc, LPCWSTR lpstr, INT32 count,
  *    Success: Character set identifier
  *    Failure: DEFAULT_CHARSET
  */
-UINT32 WINAPI GetTextCharset32(
-    HDC32 hdc) /* [in] Handle to device context */
+UINT WINAPI GetTextCharset(
+    HDC hdc) /* [in] Handle to device context */
 {
     /* MSDN docs say this is equivalent */
     return GetTextCharsetInfo(hdc, NULL, 0);
@@ -741,7 +741,7 @@ UINT32 WINAPI GetTextCharset32(
  */
 UINT16 WINAPI GetTextCharset16(HDC16 hdc)
 {
-    return (UINT16)GetTextCharset32(hdc);
+    return (UINT16)GetTextCharset(hdc);
 }
 
 /***********************************************************************
@@ -756,20 +756,20 @@ UINT16 WINAPI GetTextCharset16(HDC16 hdc)
  *    Success: Character set identifier
  *    Failure: DEFAULT_CHARSET
  */
-UINT32 WINAPI GetTextCharsetInfo(
-    HDC32 hdc,          /* [in]  Handle to device context */
+UINT WINAPI GetTextCharsetInfo(
+    HDC hdc,          /* [in]  Handle to device context */
     LPFONTSIGNATURE fs, /* [out] Pointer to struct to receive data */
     DWORD flags)        /* [in]  Reserved - must be 0 */
 {
-    HGDIOBJ32 hFont;
-    UINT32 charSet = DEFAULT_CHARSET;
-    LOGFONT32W lf;
+    HGDIOBJ hFont;
+    UINT charSet = DEFAULT_CHARSET;
+    LOGFONTW lf;
     CHARSETINFO csinfo;
 
     hFont = GetCurrentObject(hdc, OBJ_FONT);
     if (hFont == 0)
         return(DEFAULT_CHARSET);
-    if ( GetObject32W(hFont, sizeof(LOGFONT32W), &lf) != 0 )
+    if ( GetObjectW(hFont, sizeof(LOGFONTW), &lf) != 0 )
         charSet = lf.lfCharSet;
 
     if (fs != NULL) {
diff --git a/ole/bindctx.c b/ole/bindctx.c
index 862a687a0d3..923ad7309a6 100644
--- a/ole/bindctx.c
+++ b/ole/bindctx.c
@@ -33,13 +33,13 @@ HRESULT WINAPI BindCtxImpl_ReleaseObjects(IBindCtx* iface);
 HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts);
 HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts);
 HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectTable** pprot);
-HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR32 pszkey, IUnknown* punk);
-HRESULT WINAPI BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR32 pszkey, IUnknown* punk);
+HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk);
+HRESULT WINAPI BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk);
 HRESULT WINAPI BindCtxImpl_EnumObjectParam(IBindCtx* iface,IEnumString** ppenum);
-HRESULT WINAPI BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR32 pszkey);
+HRESULT WINAPI BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR pszkey);
 
 HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC * ppbc);
-HRESULT WINAPI CreateBindCtx32(DWORD reserved, LPBC * ppbc);
+HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc);
 
 HRESULT WINAPI BindCtxImpl_Construct(BindCtxImpl* This);
 HRESULT WINAPI BindCtxImpl_Destroy(BindCtxImpl* This);
@@ -217,7 +217,7 @@ HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectT
 /******************************************************************************
  *        BindCtx_RegisterObjectParam
  ******************************************************************************/
-HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR32 pszkey, IUnknown* punk)
+HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk)
 {
     ICOM_THIS(BindCtxImpl,iface);
     FIXME(ole,"(%p,%p,%p),stub!\n",This,pszkey,punk);
@@ -228,7 +228,7 @@ HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR32 pszkey
 /******************************************************************************
  *        BindCtx_GetObjectParam
  ******************************************************************************/
-HRESULT WINAPI BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR32 pszkey, IUnknown* punk)
+HRESULT WINAPI BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk)
 {
     ICOM_THIS(BindCtxImpl,iface);
     FIXME(ole,"(%p,%p,%p),stub!\n",This,pszkey,punk);
@@ -250,7 +250,7 @@ HRESULT WINAPI BindCtxImpl_EnumObjectParam(IBindCtx* iface,IEnumString** ppenum)
 /******************************************************************************
  *        BindCtx_RevokeObjectParam
  ******************************************************************************/
-HRESULT WINAPI BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR32 pszkey)
+HRESULT WINAPI BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR pszkey)
 {
     ICOM_THIS(BindCtxImpl,iface);
     FIXME(ole,"(%p,%p),stub!\n",This,pszkey);
@@ -272,7 +272,7 @@ HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC * ppbc)
 /******************************************************************************
  *        CreateBindCtx32
  ******************************************************************************/
-HRESULT WINAPI CreateBindCtx32(DWORD reserved, LPBC * ppbc)
+HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc)
 {
     BindCtxImpl* newBindCtx = 0;
     HRESULT        hr = S_OK;
diff --git a/ole/compobj.c b/ole/compobj.c
index 856135dda50..0c8d340f7ad 100644
--- a/ole/compobj.c
+++ b/ole/compobj.c
@@ -95,13 +95,13 @@ static COM_ExternalLockList elList = { EL_END_OF_LIST };
  */
 static void COM_ExternalLockFreeList();
 static void COM_ExternalLockAddRef(IUnknown *pUnk);
-static void COM_ExternalLockRelease(IUnknown *pUnk, BOOL32 bRelAll);
+static void COM_ExternalLockRelease(IUnknown *pUnk, BOOL bRelAll);
 void COM_ExternalLockDump(); /* testing purposes, not static to avoid warning */
 
 /*
  * Private methods used to managed the linked list   
  */
-static BOOL32 COM_ExternalLockInsert(
+static BOOL COM_ExternalLockInsert(
   IUnknown *pUnk);
 
 static void COM_ExternalLockDelete(
@@ -120,7 +120,7 @@ static COM_ExternalLock* COM_ExternalLockLocate(
  * TODO: Most of these things will have to be made thread-safe.
  */
 LPMALLOC16 currentMalloc16=NULL;
-LPMALLOC32 currentMalloc32=NULL;
+LPMALLOC currentMalloc32=NULL;
 
 HTASK16 hETask = 0;
 WORD Table_ETask[62];
@@ -158,7 +158,7 @@ static RegisteredClass* firstRegisteredClass = NULL;
  */
 typedef struct tagOpenDll {
   char *DllName;                /* really only needed for debugging */
-    HINSTANCE32 hLibrary;       
+    HINSTANCE hLibrary;       
     struct tagOpenDll *next;
 } OpenDll;
 
@@ -205,7 +205,7 @@ HRESULT WINAPI CoInitialize16(
  *
  * See CoInitializeEx32
  */
-HRESULT WINAPI CoInitialize32(
+HRESULT WINAPI CoInitialize(
 	LPVOID lpReserved	/* [in] pointer to win32 malloc interface
                                    (obsolete, should be NULL) */
 ) 
@@ -213,7 +213,7 @@ HRESULT WINAPI CoInitialize32(
   /*
    * Just delegate to the newer method.
    */
-  return CoInitializeEx32(lpReserved, COINIT_APARTMENTTHREADED);
+  return CoInitializeEx(lpReserved, COINIT_APARTMENTTHREADED);
 }
 
 /******************************************************************************
@@ -234,7 +234,7 @@ HRESULT WINAPI CoInitialize32(
  *
  * See the windows documentation for more details.
  */
-HRESULT WINAPI CoInitializeEx32(
+HRESULT WINAPI CoInitializeEx(
 	LPVOID lpReserved,	/* [in] pointer to win32 malloc interface
                                    (obsolete, should be NULL) */
 	DWORD dwCoInit		/* [in] A value from COINIT specifies the threading model */
@@ -301,7 +301,7 @@ void WINAPI CoUninitialize16(void)
  *
  * See the windows documentation for more details.
  */
-void WINAPI CoUninitialize32(void)
+void WINAPI CoUninitialize(void)
 {
   TRACE(ole,"()\n");
   
@@ -359,12 +359,12 @@ HRESULT WINAPI CoGetMalloc16(
  * RETURNS
  *	The current win32 IMalloc
  */
-HRESULT WINAPI CoGetMalloc32(
+HRESULT WINAPI CoGetMalloc(
 	DWORD dwMemContext,	/* [in] unknown */
-	LPMALLOC32 *lpMalloc	/* [out] current win32 malloc interface */
+	LPMALLOC *lpMalloc	/* [out] current win32 malloc interface */
 ) {
     if(!currentMalloc32)
-	currentMalloc32 = IMalloc32_Constructor();
+	currentMalloc32 = IMalloc_Constructor();
     *lpMalloc = currentMalloc32;
     return S_OK;
 }
@@ -413,7 +413,7 @@ BOOL16 WINAPI IsEqualGUID16(
  * RETURNS
  *	TRUE if equal
  */
-BOOL32 WINAPI IsEqualGUID32(
+BOOL WINAPI IsEqualGUID32(
      REFGUID rguid1, /* [in] unique id 1 */
      REFGUID rguid2  /* [in] unique id 2 */
      )
@@ -519,7 +519,7 @@ HRESULT WINAPI CoCreateGuid(
    static UINT16                   clock_seq;
    struct timeval                  tv;
    unsigned long long              clock_reg;
-   UINT32 clock_high, clock_low;
+   UINT clock_high, clock_low;
    UINT16 temp_clock_seq, temp_clock_mid, temp_clock_hi_and_version;
 #ifdef HAVE_NET_IF_H
    int             sd;
@@ -703,8 +703,8 @@ sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
  * RETURNS
  *	the converted GUID
  */
-HRESULT WINAPI CLSIDFromString32(
-	LPCOLESTR32 idstr,	/* [in] string representation of GUID */
+HRESULT WINAPI CLSIDFromString(
+	LPCOLESTR idstr,	/* [in] string representation of GUID */
 	CLSID *id		/* [out] GUID represented by above string */
 ) {
     LPOLESTR16      xid = HEAP_strdupWtoA(GetProcessHeap(),0,idstr);
@@ -803,15 +803,15 @@ HRESULT WINAPI StringFromCLSID16(
  * RETURNS
  *	the string representation and OLESTATUS
  */
-HRESULT WINAPI StringFromCLSID32(
+HRESULT WINAPI StringFromCLSID(
         REFCLSID id,            /* [in] the GUID to be converted */
-	LPOLESTR32 *idstr	/* [out] a pointer to a to-be-allocated pointer pointing to the resulting string */
+	LPOLESTR *idstr	/* [out] a pointer to a to-be-allocated pointer pointing to the resulting string */
 ) {
 	char            buf[80];
 	OLESTATUS       ret;
-	LPMALLOC32	mllc;
+	LPMALLOC	mllc;
 
-	if ((ret=CoGetMalloc32(0,&mllc)))
+	if ((ret=CoGetMalloc(0,&mllc)))
 		return ret;
 
 	ret=WINE_StringFromCLSID(id,buf);
@@ -832,8 +832,8 @@ HRESULT WINAPI StringFromCLSID32(
  *	The (UNICODE) string representation of the GUID in 'str'
  *	The length of the resulting string, 0 if there was any problem.
  */
-INT32 WINAPI
-StringFromGUID2(REFGUID id, LPOLESTR32 str, INT32 cmax)
+INT WINAPI
+StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax)
 {
   char		xguid[80];
 
@@ -862,13 +862,13 @@ HRESULT WINAPI CLSIDFromProgID16(
 
 	buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8);
 	sprintf(buf,"%s\\CLSID",progid);
-	if ((err=RegOpenKey32A(HKEY_CLASSES_ROOT,buf,&xhkey))) {
+	if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) {
 		HeapFree(GetProcessHeap(),0,buf);
 		return OLE_ERROR_GENERIC;
 	}
 	HeapFree(GetProcessHeap(),0,buf);
 	buf2len = sizeof(buf2);
-	if ((err=RegQueryValue32A(xhkey,NULL,buf2,&buf2len))) {
+	if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) {
 		RegCloseKey(xhkey);
 		return OLE_ERROR_GENERIC;
 	}
@@ -882,8 +882,8 @@ HRESULT WINAPI CLSIDFromProgID16(
  * RETURNS
  *	riid associated with the progid
  */
-HRESULT WINAPI CLSIDFromProgID32(
-	LPCOLESTR32 progid,	/* [in] program id as found in registry */
+HRESULT WINAPI CLSIDFromProgID(
+	LPCOLESTR progid,	/* [in] program id as found in registry */
 	LPCLSID riid		/* [out] associated CLSID */
 ) {
 	LPOLESTR16 pid = HEAP_strdupWtoA(GetProcessHeap(),0,progid);
@@ -897,7 +897,7 @@ HRESULT WINAPI CLSIDFromProgID32(
 /***********************************************************************
  *           LookupETask (COMPOBJ.94)
  */
-OLESTATUS WINAPI LookupETask(HTASK16 *hTask,LPVOID p) {
+OLESTATUS WINAPI LookupETask16(HTASK16 *hTask,LPVOID p) {
 	FIXME(ole,"(%p,%p),stub!\n",hTask,p);
 	if ((*hTask = GetCurrentTask()) == hETask) {
 		memcpy(p, Table_ETask, sizeof(Table_ETask));
@@ -909,7 +909,7 @@ OLESTATUS WINAPI LookupETask(HTASK16 *hTask,LPVOID p) {
 /***********************************************************************
  *           SetETask (COMPOBJ.95)
  */
-OLESTATUS WINAPI SetETask(HTASK16 hTask, LPVOID p) {
+OLESTATUS WINAPI SetETask16(HTASK16 hTask, LPVOID p) {
         FIXME(ole,"(%04x,%p),stub!\n",hTask,p);
 	hETask = hTask;
 	return 0;
@@ -1017,7 +1017,7 @@ static HRESULT COM_GetRegisteredClassObject(
  *
  * See the Windows documentation for more details.
  */
-HRESULT WINAPI CoRegisterClassObject32(
+HRESULT WINAPI CoRegisterClassObject(
 	REFCLSID rclsid,
 	LPUNKNOWN pUnk,
 	DWORD dwClsContext, /* [in] CLSCTX flags indicating the context in which to run the executable */
@@ -1104,7 +1104,7 @@ HRESULT WINAPI CoRegisterClassObject32(
  *
  * See the Windows documentation for more details.
  */
-HRESULT WINAPI CoRevokeClassObject32(
+HRESULT WINAPI CoRevokeClassObject(
         DWORD dwRegister) 
 {
   RegisteredClass** prevClassLink;
@@ -1168,7 +1168,7 @@ HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext,
 
     char dllName[MAX_PATH+1];
     DWORD dllNameLen = sizeof(dllName);
-    HINSTANCE32 hLibrary;
+    HINSTANCE hLibrary;
     typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, 
 			     REFIID iid, LPVOID *ppv);
     DllGetClassObjectFunc DllGetClassObject;
@@ -1208,17 +1208,17 @@ HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext,
         HKEY CLSIDkey,key;
 
         /* lookup CLSID in registry key HKCR/CLSID */
-        hres = RegOpenKeyEx32A(HKEY_CLASSES_ROOT, "CLSID", 0, 
+        hres = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, 
 			       KEY_READ, &CLSIDkey);
 
 	if (hres != ERROR_SUCCESS)
 	        return REGDB_E_READREGDB;
-        hres = RegOpenKeyEx32A(CLSIDkey,xclsid,0,KEY_QUERY_VALUE,&key);
+        hres = RegOpenKeyExA(CLSIDkey,xclsid,0,KEY_QUERY_VALUE,&key);
 	if (hres != ERROR_SUCCESS) {
 	    RegCloseKey(CLSIDkey);
 	    return REGDB_E_CLASSNOTREG;
 	}
-	hres = RegQueryValue32A(key, "InprocServer32", dllName, &dllNameLen);
+	hres = RegQueryValueA(key, "InprocServer32", dllName, &dllNameLen);
 	RegCloseKey(key);
 	RegCloseKey(CLSIDkey);
 	if (hres != ERROR_SUCCESS)
@@ -1231,7 +1231,7 @@ HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext,
 	    TRACE(ole,"couldn't load InprocServer32 dll %s\n", dllName);
 	    return E_ACCESSDENIED; /* or should this be CO_E_DLLNOTFOUND? */
 	}
-	DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress32(hLibrary, "DllGetClassObject");
+	DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject");
 	if (!DllGetClassObject) {
 	    /* not sure if this should be called here CoFreeLibrary(hLibrary);*/
 	    TRACE(ole,"couldn't find function DllGetClassObject in %s\n", dllName);
@@ -1308,7 +1308,7 @@ HRESULT WINAPI CoCreateInstance(
 /***********************************************************************
  *           CoFreeLibrary [COMPOBJ.13]
  */
-void WINAPI CoFreeLibrary(HINSTANCE32 hLibrary)
+void WINAPI CoFreeLibrary(HINSTANCE hLibrary)
 {
     OpenDll *ptr, *prev;
     OpenDll *tmp;
@@ -1329,7 +1329,7 @@ void WINAPI CoFreeLibrary(HINSTANCE32 hLibrary)
     /* assert: ptr points to the library entry to free */
 
     /* free library and remove node from list */
-    FreeLibrary32(hLibrary);
+    FreeLibrary(hLibrary);
     if (ptr == openDllList) {
 	tmp = openDllList->next;
 	HeapFree(GetProcessHeap(), 0, openDllList->DllName);
@@ -1372,7 +1372,7 @@ void WINAPI CoFreeUnusedLibraries(void)
 
     for (ptr = openDllList; ptr != NULL; ) {
 	DllCanUnloadNow = (DllCanUnloadNowFunc)
-	    GetProcAddress32(ptr->hLibrary, "DllCanUnloadNow");
+	    GetProcAddress(ptr->hLibrary, "DllCanUnloadNow");
 	
 	if (DllCanUnloadNow() == S_OK) {
 	    tmp=ptr->next;
@@ -1404,8 +1404,8 @@ HRESULT WINAPI CoFileTimeNow(
 LPVOID WINAPI CoTaskMemAlloc(
 	ULONG size	/* [in] size of memoryblock to be allocated */
 ) {
-    LPMALLOC32	lpmalloc;
-    HRESULT	ret = CoGetMalloc32(0,&lpmalloc);
+    LPMALLOC	lpmalloc;
+    HRESULT	ret = CoGetMalloc(0,&lpmalloc);
 
     if (ret) 
 	return NULL;
@@ -1418,8 +1418,8 @@ LPVOID WINAPI CoTaskMemAlloc(
 VOID WINAPI CoTaskMemFree(
 	LPVOID ptr	/* [in] pointer to be freed */
 ) {
-    LPMALLOC32	lpmalloc;
-    HRESULT	ret = CoGetMalloc32(0,&lpmalloc);
+    LPMALLOC	lpmalloc;
+    HRESULT	ret = CoGetMalloc(0,&lpmalloc);
 
     if (ret) return;
     lpmalloc->lpvtbl->fnFree(lpmalloc,ptr);
@@ -1428,15 +1428,15 @@ VOID WINAPI CoTaskMemFree(
 /***********************************************************************
  *           CoLoadLibrary (OLE32.30)
  */
-HINSTANCE32 WINAPI CoLoadLibrary(LPOLESTR16 lpszLibName, BOOL32 bAutoFree)
+HINSTANCE WINAPI CoLoadLibrary(LPOLESTR16 lpszLibName, BOOL bAutoFree)
 {
-    HINSTANCE32 hLibrary;
+    HINSTANCE hLibrary;
     OpenDll *ptr;
     OpenDll *tmp;
   
     TRACE(ole,"CoLoadLibrary(%p, %d\n", lpszLibName, bAutoFree);
 
-    hLibrary = LoadLibrary32A(lpszLibName);
+    hLibrary = LoadLibraryA(lpszLibName);
 
     if (!bAutoFree)
 	return hLibrary;
@@ -1492,10 +1492,10 @@ HRESULT WINAPI CoLockObjectExternal16(
 /******************************************************************************
  *		CoLockObjectExternal32	[OLE32.31]
  */
-HRESULT WINAPI CoLockObjectExternal32(
+HRESULT WINAPI CoLockObjectExternal(
     LPUNKNOWN pUnk,		/* [in] object to be locked */
-    BOOL32 fLock,		/* [in] do lock */
-    BOOL32 fLastUnlockReleases) /* [in] unlock all */
+    BOOL fLock,		/* [in] do lock */
+    BOOL fLastUnlockReleases) /* [in] unlock all */
 {
 
   if (fLock) 
@@ -1530,7 +1530,7 @@ HRESULT WINAPI CoGetState16(LPDWORD state)
 /***********************************************************************
  *           CoSetState32 [COM32.42]
  */
-HRESULT WINAPI CoSetState32(LPDWORD state)
+HRESULT WINAPI CoSetState(LPDWORD state)
 {
     FIXME(ole, "(%p),stub!\n", state);
     *state = 0;
@@ -1548,7 +1548,7 @@ static void COM_RevokeAllClasses()
 {
   while (firstRegisteredClass!=0)
   {
-    CoRevokeClassObject32(firstRegisteredClass->dwCookie);
+    CoRevokeClassObject(firstRegisteredClass->dwCookie);
   }
 }
 
@@ -1581,7 +1581,7 @@ static void COM_ExternalLockAddRef(
  */
 static void COM_ExternalLockRelease(
   IUnknown *pUnk,
-  BOOL32   bRelAll)
+  BOOL   bRelAll)
 {
   COM_ExternalLock *externalLock = COM_ExternalLockFind(pUnk);
 
@@ -1667,7 +1667,7 @@ static COM_ExternalLock* COM_ExternalLockLocate(
 /****************************************************************************
  * Internal - Insert a new IUnknown* to the linked list
  */
-static BOOL32 COM_ExternalLockInsert(
+static BOOL COM_ExternalLockInsert(
   IUnknown *pUnk)
 {
   COM_ExternalLock *newLock      = NULL;
diff --git a/ole/filemoniker.c b/ole/filemoniker.c
index a3252deacae..50de54425ce 100644
--- a/ole/filemoniker.c
+++ b/ole/filemoniker.c
@@ -28,14 +28,14 @@ static ULONG   WINAPI FileMonikerImpl_AddRef(IMoniker* iface);
 static ULONG   WINAPI FileMonikerImpl_Release(IMoniker* iface);
 static HRESULT WINAPI FileMonikerImpl_GetClassID(const IMoniker* iface, CLSID *pClassID);
 static HRESULT WINAPI FileMonikerImpl_IsDirty(IMoniker* iface);
-static HRESULT WINAPI FileMonikerImpl_Load(IMoniker* iface, IStream32* pStm);
-static HRESULT WINAPI FileMonikerImpl_Save(IMoniker* iface, IStream32* pStm, BOOL32 fClearDirty);
+static HRESULT WINAPI FileMonikerImpl_Load(IMoniker* iface, IStream* pStm);
+static HRESULT WINAPI FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty);
 static HRESULT WINAPI FileMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize);
 static HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult);
 static HRESULT WINAPI FileMonikerImpl_BindToStorage(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult);
 static HRESULT WINAPI FileMonikerImpl_Reduce(IMoniker* iface,IBindCtx* pbc, DWORD dwReduceHowFar,IMoniker** ppmkToLeft, IMoniker** ppmkReduced);
-static HRESULT WINAPI FileMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL32 fOnlyIfNotGeneric, IMoniker** ppmkComposite);
-static HRESULT WINAPI FileMonikerImpl_Enum(IMoniker* iface,BOOL32 fForward, IEnumMoniker** ppenumMoniker);
+static HRESULT WINAPI FileMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite);
+static HRESULT WINAPI FileMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker);
 static HRESULT WINAPI FileMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker);
 static HRESULT WINAPI FileMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash);
 static HRESULT WINAPI FileMonikerImpl_IsRunning(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning);
@@ -43,11 +43,11 @@ static HRESULT WINAPI FileMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBind
 static HRESULT WINAPI FileMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk);
 static HRESULT WINAPI FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther, IMoniker** ppmkPrefix);
 static HRESULT WINAPI FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath);
-static HRESULT WINAPI FileMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR32 *ppszDisplayName);
-static HRESULT WINAPI FileMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR32 pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut);
+static HRESULT WINAPI FileMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName);
+static HRESULT WINAPI FileMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut);
 static HRESULT WINAPI FileMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys);
 
-static HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR32 lpszPathName);
+static HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName);
 static HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* iface);
 
 // Virtual function table for the FileMonikerImpl class.
@@ -173,7 +173,7 @@ HRESULT WINAPI FileMonikerImpl_IsDirty(IMoniker* iface)
  ******************************************************************************/
 HRESULT WINAPI FileMonikerImpl_Load(
           IMoniker* iface,
-          IStream32* pStm)
+          IStream* pStm)
 {
     FileMonikerImpl* This=(FileMonikerImpl*)iface;
 
@@ -187,8 +187,8 @@ HRESULT WINAPI FileMonikerImpl_Load(
  ******************************************************************************/
 HRESULT WINAPI FileMonikerImpl_Save(
           IMoniker* iface,
-          IStream32* pStm,
-	  BOOL32 fClearDirty)
+          IStream* pStm,
+	  BOOL fClearDirty)
 {
     FileMonikerImpl* This=(FileMonikerImpl*)iface;
 
@@ -214,7 +214,7 @@ HRESULT WINAPI FileMonikerImpl_GetSizeMax(
 /******************************************************************************
  *         FileMoniker_Construct
  *******************************************************************************/
-HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR32 lpszPathName){
+HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPathName){
 
     FIXME(ole,"(%p,%p),stub!\n",This,lpszPathName);
 
@@ -278,7 +278,7 @@ HRESULT WINAPI FileMonikerImpl_Reduce(IMoniker* iface,IBindCtx* pbc, DWORD dwRed
 /******************************************************************************
  *        FileMoniker_ComposeWith
  ******************************************************************************/
-HRESULT WINAPI FileMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL32 fOnlyIfNotGeneric,
+HRESULT WINAPI FileMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL fOnlyIfNotGeneric,
                                            IMoniker** ppmkComposite)
 {
     FileMonikerImpl* This=(FileMonikerImpl*)iface;
@@ -291,7 +291,7 @@ HRESULT WINAPI FileMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BO
 /******************************************************************************
  *        FileMoniker_Enum
  ******************************************************************************/
-HRESULT WINAPI FileMonikerImpl_Enum(IMoniker* iface,BOOL32 fForward, IEnumMoniker** ppenumMoniker)
+HRESULT WINAPI FileMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker)
 {
     FileMonikerImpl* This=(FileMonikerImpl*)iface;
 
@@ -392,7 +392,7 @@ HRESULT WINAPI FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther,
  *        FileMoniker_GetDisplayName
  ******************************************************************************/
 HRESULT WINAPI FileMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft,
-                                              LPOLESTR32 *ppszDisplayName)
+                                              LPOLESTR *ppszDisplayName)
 {
     FileMonikerImpl* This=(FileMonikerImpl*)iface;
 
@@ -405,7 +405,7 @@ HRESULT WINAPI FileMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMo
  *        FileMoniker_ParseDisplayName
  ******************************************************************************/
 HRESULT WINAPI FileMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft,
-                                                LPOLESTR32 pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut)
+                                                LPOLESTR pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut)
 {
     FileMonikerImpl* This=(FileMonikerImpl*)iface;
 
@@ -439,7 +439,7 @@ HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName,LPMONIKER* ppmk){
 /******************************************************************************
  *        CreateFileMoniker32
  ******************************************************************************/
-HRESULT WINAPI CreateFileMoniker32(LPCOLESTR32 lpszPathName, LPMONIKER * ppmk)
+HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER * ppmk)
 {
     FileMonikerImpl* newFileMoniker = 0;
     HRESULT        hr = S_OK;
diff --git a/ole/ifs.c b/ole/ifs.c
index 5621548c4ff..defe8911878 100644
--- a/ole/ifs.c
+++ b/ole/ifs.c
@@ -223,7 +223,7 @@ IMalloc16_Constructor() {
 	This->ref = 1;
 	/* FIXME: implement multiple heaps */
 	This->heap = GlobalAlloc16(GMEM_MOVEABLE,64000);
-	LocalInit(This->heap,0,64000);
+	LocalInit16(This->heap,0,64000);
 	return (LPMALLOC16)SEGPTR_GET(This);
 }
 
@@ -233,14 +233,14 @@ IMalloc16_Constructor() {
 typedef struct
 {
         /* IUnknown fields */
-        ICOM_VTABLE(IMalloc32)* lpvtbl;
+        ICOM_VTABLE(IMalloc)* lpvtbl;
         DWORD                   ref;
 } IMalloc32Impl;
 
 /******************************************************************************
  *		IMalloc32_QueryInterface	[VTABLE]
  */
-static HRESULT WINAPI IMalloc32_fnQueryInterface(LPMALLOC32 iface,REFIID refiid,LPVOID *obj) {
+static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVOID *obj) {
 	ICOM_THIS(IMalloc32Impl,iface);
 	char	xrefiid[50];
 
@@ -258,7 +258,7 @@ static HRESULT WINAPI IMalloc32_fnQueryInterface(LPMALLOC32 iface,REFIID refiid,
 /******************************************************************************
  *		IMalloc32_AddRef	[VTABLE]
  */
-static ULONG WINAPI IMalloc32_fnAddRef(LPMALLOC32 iface) {
+static ULONG WINAPI IMalloc_fnAddRef(LPMALLOC iface) {
 	ICOM_THIS(IMalloc32Impl,iface);
 	TRACE(relay,"(%p)->AddRef()\n",This);
 	return 1; /* cannot be freed */
@@ -267,7 +267,7 @@ static ULONG WINAPI IMalloc32_fnAddRef(LPMALLOC32 iface) {
 /******************************************************************************
  *		IMalloc32_Release	[VTABLE]
  */
-static ULONG WINAPI IMalloc32_fnRelease(LPMALLOC32 iface) {
+static ULONG WINAPI IMalloc_fnRelease(LPMALLOC iface) {
 	ICOM_THIS(IMalloc32Impl,iface);
 	TRACE(relay,"(%p)->Release()\n",This);
 	return 1; /* cannot be freed */
@@ -276,7 +276,7 @@ static ULONG WINAPI IMalloc32_fnRelease(LPMALLOC32 iface) {
 /******************************************************************************
  * IMalloc32_Alloc [VTABLE]
  */
-static LPVOID WINAPI IMalloc32_fnAlloc(LPMALLOC32 iface,DWORD cb) {
+static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface,DWORD cb) {
 	ICOM_THIS(IMalloc32Impl,iface);
 	TRACE(relay,"(%p)->Alloc(%ld)\n",This,cb);
 	return HeapAlloc(GetProcessHeap(),0,cb);
@@ -285,7 +285,7 @@ static LPVOID WINAPI IMalloc32_fnAlloc(LPMALLOC32 iface,DWORD cb) {
 /******************************************************************************
  * IMalloc32_Realloc [VTABLE]
  */
-static LPVOID WINAPI IMalloc32_fnRealloc(LPMALLOC32 iface,LPVOID pv,DWORD cb) {
+static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) {
 	ICOM_THIS(IMalloc32Impl,iface);
 	TRACE(relay,"(%p)->Realloc(%p,%ld)\n",This,pv,cb);
 	return HeapReAlloc(GetProcessHeap(),0,pv,cb);
@@ -294,7 +294,7 @@ static LPVOID WINAPI IMalloc32_fnRealloc(LPMALLOC32 iface,LPVOID pv,DWORD cb) {
 /******************************************************************************
  * IMalloc32_Free [VTABLE]
  */
-static VOID WINAPI IMalloc32_fnFree(LPMALLOC32 iface,LPVOID pv) {
+static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) {
 	ICOM_THIS(IMalloc32Impl,iface);
 	TRACE(relay,"(%p)->Free(%p)\n",This,pv);
 	HeapFree(GetProcessHeap(),0,pv);
@@ -303,8 +303,8 @@ static VOID WINAPI IMalloc32_fnFree(LPMALLOC32 iface,LPVOID pv) {
 /******************************************************************************
  * IMalloc32_GetSize [VTABLE]
  */
-static DWORD WINAPI IMalloc32_fnGetSize(const IMalloc32* iface,LPVOID pv) {
-	ICOM_CTHIS(IMalloc32,iface);
+static DWORD WINAPI IMalloc_fnGetSize(const IMalloc* iface,LPVOID pv) {
+	ICOM_CTHIS(IMalloc,iface);
 	TRACE(relay,"(%p)->GetSize(%p)\n",This,pv);
 	return HeapSize(GetProcessHeap(),0,pv);
 }
@@ -312,7 +312,7 @@ static DWORD WINAPI IMalloc32_fnGetSize(const IMalloc32* iface,LPVOID pv) {
 /******************************************************************************
  * IMalloc32_DidAlloc [VTABLE]
  */
-static INT32 WINAPI IMalloc32_fnDidAlloc(const IMalloc32* iface,LPVOID pv) {
+static INT WINAPI IMalloc_fnDidAlloc(const IMalloc* iface,LPVOID pv) {
 	ICOM_CTHIS(IMalloc32Impl,iface);
 	TRACE(relay,"(%p)->DidAlloc(%p)\n",This,pv);
 	return -1;
@@ -321,35 +321,35 @@ static INT32 WINAPI IMalloc32_fnDidAlloc(const IMalloc32* iface,LPVOID pv) {
 /******************************************************************************
  * IMalloc32_HeapMinimize [VTABLE]
  */
-static LPVOID WINAPI IMalloc32_fnHeapMinimize(LPMALLOC32 iface) {
+static LPVOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) {
 	ICOM_THIS(IMalloc32Impl,iface);
 	TRACE(relay,"(%p)->HeapMinimize()\n",This);
 	return NULL;
 }
 
-static ICOM_VTABLE(IMalloc32) VT_IMalloc32 = {
-    IMalloc32_fnQueryInterface,
-    IMalloc32_fnAddRef,
-  IMalloc32_fnRelease,
-  IMalloc32_fnAlloc,
-  IMalloc32_fnRealloc,
-  IMalloc32_fnFree,
-  IMalloc32_fnGetSize,
-  IMalloc32_fnDidAlloc,
-  IMalloc32_fnHeapMinimize
+static ICOM_VTABLE(IMalloc) VT_IMalloc32 = {
+    IMalloc_fnQueryInterface,
+    IMalloc_fnAddRef,
+  IMalloc_fnRelease,
+  IMalloc_fnAlloc,
+  IMalloc_fnRealloc,
+  IMalloc_fnFree,
+  IMalloc_fnGetSize,
+  IMalloc_fnDidAlloc,
+  IMalloc_fnHeapMinimize
 };
 
 /******************************************************************************
  * IMalloc32_Constructor [VTABLE]
  */
-LPMALLOC32
-IMalloc32_Constructor() {
+LPMALLOC
+IMalloc_Constructor() {
 	IMalloc32Impl* This;
 
 	This = (IMalloc32Impl*)HeapAlloc(GetProcessHeap(),0,sizeof(IMalloc32Impl));
 	This->lpvtbl = &VT_IMalloc32;
 	This->ref = 1;
-	return (LPMALLOC32)This;
+	return (LPMALLOC)This;
 }
 
 /****************************************************************************
@@ -362,13 +362,13 @@ IMalloc32_Constructor() {
  * RETURNS
  *  True, if the passed pointer is a valid interface
  */
-BOOL32 WINAPI IsValidInterface32(
+BOOL WINAPI IsValidInterface(
 	LPUNKNOWN punk	/* [in] interface to be tested */
 ) {
 	return !(
-		IsBadReadPtr32(punk,4)					||
-		IsBadReadPtr32(punk->lpvtbl,4)				||
-		IsBadReadPtr32(punk->lpvtbl->fnQueryInterface,9)	||
-		IsBadCodePtr32(punk->lpvtbl->fnQueryInterface)
+		IsBadReadPtr(punk,4)					||
+		IsBadReadPtr(punk->lpvtbl,4)				||
+		IsBadReadPtr(punk->lpvtbl->fnQueryInterface,9)	||
+		IsBadCodePtr(punk->lpvtbl->fnQueryInterface)
 	);
 }
diff --git a/ole/ifs.h b/ole/ifs.h
index 02a2f2d2927..ea56cc6ebb1 100644
--- a/ole/ifs.h
+++ b/ole/ifs.h
@@ -2,6 +2,6 @@
 #define __WINE_OLE_IFS_H
 
 extern LPMALLOC16 IMalloc16_Constructor();
-extern LPMALLOC32 IMalloc32_Constructor();
+extern LPMALLOC IMalloc_Constructor();
 
 #endif /* __WINE_OLE_IFS_H */
diff --git a/ole/itemmoniker.c b/ole/itemmoniker.c
index 7c2a18491b9..52aaf847c82 100644
--- a/ole/itemmoniker.c
+++ b/ole/itemmoniker.c
@@ -28,14 +28,14 @@ static ULONG   WINAPI ItemMonikerImpl_AddRef(IMoniker* iface);
 static ULONG   WINAPI ItemMonikerImpl_Release(IMoniker* iface);
 static HRESULT WINAPI ItemMonikerImpl_GetClassID(const IMoniker* iface, CLSID *pClassID);
 static HRESULT WINAPI ItemMonikerImpl_IsDirty(IMoniker* iface);
-static HRESULT WINAPI ItemMonikerImpl_Load(IMoniker* iface, IStream32* pStm);
-static HRESULT WINAPI ItemMonikerImpl_Save(IMoniker* iface, IStream32* pStm, BOOL32 fClearDirty);
+static HRESULT WINAPI ItemMonikerImpl_Load(IMoniker* iface, IStream* pStm);
+static HRESULT WINAPI ItemMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty);
 static HRESULT WINAPI ItemMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize);
 static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult);
 static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult);
 static HRESULT WINAPI ItemMonikerImpl_Reduce(IMoniker* iface,IBindCtx* pbc, DWORD dwReduceHowFar,IMoniker** ppmkToLeft, IMoniker** ppmkReduced);
-static HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL32 fOnlyIfNotGeneric, IMoniker** ppmkComposite);
-static HRESULT WINAPI ItemMonikerImpl_Enum(IMoniker* iface,BOOL32 fForward, IEnumMoniker** ppenumMoniker);
+static HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite);
+static HRESULT WINAPI ItemMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker);
 static HRESULT WINAPI ItemMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker);
 static HRESULT WINAPI ItemMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash);
 static HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning);
@@ -43,11 +43,11 @@ static HRESULT WINAPI ItemMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBind
 static HRESULT WINAPI ItemMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk);
 static HRESULT WINAPI ItemMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther, IMoniker** ppmkPrefix);
 static HRESULT WINAPI ItemMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath);
-static HRESULT WINAPI ItemMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR32 *ppszDisplayName);
-static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR32 pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut);
+static HRESULT WINAPI ItemMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName);
+static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut);
 static HRESULT WINAPI ItemMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys);
 
-static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* iface, LPCOLESTR32 lpszDelim,LPCOLESTR32 lpszItem);
+static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* iface, LPCOLESTR lpszDelim,LPCOLESTR lpszItem);
 static HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* iface);
 
 // Virtual function table for the ItemMonikerImpl class.
@@ -171,7 +171,7 @@ HRESULT WINAPI ItemMonikerImpl_IsDirty(IMoniker* iface)
  ******************************************************************************/
 HRESULT WINAPI ItemMonikerImpl_Load(
           IMoniker* iface,
-          IStream32* pStm)
+          IStream* pStm)
 {
     ItemMonikerImpl* This=(ItemMonikerImpl*)iface;
 
@@ -184,8 +184,8 @@ HRESULT WINAPI ItemMonikerImpl_Load(
  ******************************************************************************/
 HRESULT WINAPI ItemMonikerImpl_Save(
           IMoniker* iface,
-          IStream32* pStm,
-          BOOL32 fClearDirty)
+          IStream* pStm,
+          BOOL fClearDirty)
 {
     ItemMonikerImpl* This=(ItemMonikerImpl*)iface;
 
@@ -209,7 +209,7 @@ HRESULT WINAPI ItemMonikerImpl_GetSizeMax(
 /******************************************************************************
  *         ItemMoniker_Construct
  *******************************************************************************/
-HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR32 lpszDelim,LPCOLESTR32 lpszItem){
+HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR lpszDelim,LPCOLESTR lpszItem){
 
     FIXME(ole,"(%p,%p,%p),stub!\n",This,lpszDelim,lpszItem);
 
@@ -270,7 +270,7 @@ HRESULT WINAPI ItemMonikerImpl_Reduce(IMoniker* iface,IBindCtx* pbc, DWORD dwRed
 /******************************************************************************
  *        ItemMoniker_ComposeWith
  ******************************************************************************/
-HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL32 fOnlyIfNotGeneric,
+HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL fOnlyIfNotGeneric,
                                            IMoniker** ppmkComposite)
 {
     ItemMonikerImpl* This=(ItemMonikerImpl*)iface;
@@ -282,7 +282,7 @@ HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BO
 /******************************************************************************
  *        ItemMoniker_Enum
  ******************************************************************************/
-HRESULT WINAPI ItemMonikerImpl_Enum(IMoniker* iface,BOOL32 fForward, IEnumMoniker** ppenumMoniker)
+HRESULT WINAPI ItemMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker)
 {
     ItemMonikerImpl* This=(ItemMonikerImpl*)iface;
 
@@ -375,7 +375,7 @@ HRESULT WINAPI ItemMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther,
  *        ItemMoniker_GetDisplayName
  ******************************************************************************/
 HRESULT WINAPI ItemMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft,
-                                              LPOLESTR32 *ppszDisplayName)
+                                              LPOLESTR *ppszDisplayName)
 {
     ItemMonikerImpl* This=(ItemMonikerImpl*)iface;
 
@@ -387,7 +387,7 @@ HRESULT WINAPI ItemMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMo
  *        ItemMoniker_ParseDisplayName
  ******************************************************************************/
 HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft,
-                                                LPOLESTR32 pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut)
+                                                LPOLESTR pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut)
 {
     ItemMonikerImpl* This=(ItemMonikerImpl*)iface;
 
@@ -409,7 +409,7 @@ HRESULT WINAPI ItemMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
 /******************************************************************************
  *        CreateItemMoniker16	[OLE2.28]
  ******************************************************************************/
-HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim,LPCOLESTR32  lpszItem,LPMONIKER* ppmk){// [in] pathname [out] new moniker object
+HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim,LPCOLESTR  lpszItem,LPMONIKER* ppmk){// [in] pathname [out] new moniker object
 
     FIXME(ole,"(%s,%p),stub!\n",lpszDelim,ppmk);
     *ppmk = NULL;
@@ -419,7 +419,7 @@ HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim,LPCOLESTR32  lpszItem,L
 /******************************************************************************
  *        CreateItemMoniker32	[OLE32.55]
  ******************************************************************************/
-HRESULT WINAPI CreateItemMoniker32(LPCOLESTR32 lpszDelim,LPCOLESTR32  lpszItem, LPMONIKER * ppmk)
+HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim,LPCOLESTR  lpszItem, LPMONIKER * ppmk)
 {
 
     ItemMonikerImpl* newItemMoniker = 0;
diff --git a/ole/moniker.c b/ole/moniker.c
index 8e7c3d793f9..04329d5f579 100644
--- a/ole/moniker.c
+++ b/ole/moniker.c
@@ -27,7 +27,7 @@ HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPVOID *pprot) {
 /***********************************************************************
  *           GetRunningObjectTable32 (OLE2.73)
  */
-HRESULT WINAPI GetRunningObjectTable32(DWORD reserved, LPVOID *pprot) {
+HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPVOID *pprot) {
 	FIXME(ole,"(%ld,%p),stub!\n",reserved,pprot);
     return E_FAIL;
 }
diff --git a/ole/ole2.c b/ole/ole2.c
index 43bc6536fc7..61f909d46df 100644
--- a/ole/ole2.c
+++ b/ole/ole2.c
@@ -25,7 +25,7 @@
  */
 typedef struct tagDropTargetNode
 {
-  HWND32          hwndTarget;
+  HWND          hwndTarget;
   IDropTarget*    dropTarget;
   struct tagDropTargetNode* prevDropTarget;
   struct tagDropTargetNode* nextDropTarget;
@@ -37,11 +37,11 @@ typedef struct tagTrackerWindowInfo
   IDropSource* dropSource;
   DWORD        dwOKEffect;
   DWORD*       pdwEffect;
-  BOOL32       trackingDone;
+  BOOL       trackingDone;
   HRESULT      returnValue;
 
-  BOOL32       escPressed;
-  HWND32       curDragTargetHWND;
+  BOOL       escPressed;
+  HWND       curDragTargetHWND;
   IDropTarget* curDragTarget;
 } TrackerWindowInfo;
 
@@ -69,21 +69,21 @@ static void            OLEDD_UnInitialize();
 static void            OLEDD_InsertDropTarget(
 			 DropTargetNode* nodeToAdd);
 static DropTargetNode* OLEDD_ExtractDropTarget(
-                         HWND32 hwndOfTarget);
+                         HWND hwndOfTarget);
 static DropTargetNode* OLEDD_FindDropTarget(
-                         HWND32 hwndOfTarget);
+                         HWND hwndOfTarget);
 static LRESULT WINAPI  OLEDD_DragTrackerWindowProc(
-			 HWND32   hwnd, 
-			 UINT32   uMsg,
-			 WPARAM32 wParam, 
+			 HWND   hwnd, 
+			 UINT   uMsg,
+			 WPARAM wParam, 
 			 LPARAM   lParam);
 static void OLEDD_TrackMouseMove(
                          TrackerWindowInfo* trackerInfo,
-			 POINT32            mousePos,
+			 POINT            mousePos,
 			 DWORD              keyState);
 static void OLEDD_TrackStateChange(
                          TrackerWindowInfo* trackerInfo,
-			 POINT32            mousePos,
+			 POINT            mousePos,
 			 DWORD              keyState);
 static DWORD OLEDD_GetButtonState();
 
@@ -109,7 +109,7 @@ HRESULT WINAPI OleInitialize(LPVOID reserved)
   /*
    * The first duty of the OleInitialize is to initialize the COM libraries.
    */
-  hr = CoInitializeEx32(NULL, COINIT_APARTMENTTHREADED);
+  hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
 
   /*
    * If the CoInitializeEx call failed, the OLE libraries can't be 
@@ -188,13 +188,13 @@ void WINAPI OleUninitialize(void)
   /*
    * Then, uninitialize the COM libraries.
    */
-  CoUninitialize32();
+  CoUninitialize();
 }
 
 /***********************************************************************
  *           OleFlushClipboard   [OLE2.76]
  */
-HRESULT WINAPI OleFlushClipboard(void)
+HRESULT WINAPI OleFlushClipboard16(void)
 {
     return S_OK;
 }
@@ -211,7 +211,7 @@ HRESULT WINAPI OleSetClipboard(LPVOID pDataObj)
 /******************************************************************************
  *		CoRegisterMessageFilter32	[OLE32.38]
  */
-HRESULT WINAPI CoRegisterMessageFilter32(
+HRESULT WINAPI CoRegisterMessageFilter(
     LPMESSAGEFILTER lpMessageFilter,	/* Pointer to interface */
     LPMESSAGEFILTER *lplpMessageFilter	/* Indirect pointer to prior instance if non-NULL */
 ) {
@@ -244,8 +244,8 @@ HRESULT WINAPI RegisterDragDrop16(
 /***********************************************************************
  *           RegisterDragDrop32 (OLE32.139)
  */
-HRESULT WINAPI RegisterDragDrop32(
-	HWND32 hwnd,
+HRESULT WINAPI RegisterDragDrop(
+	HWND hwnd,
 	LPDROPTARGET pDropTarget) 
 {
   DropTargetNode* dropTargetInfo;
@@ -297,8 +297,8 @@ HRESULT WINAPI RevokeDragDrop16(
 /***********************************************************************
  *           RevokeDragDrop32 (OLE32.141)
  */
-HRESULT WINAPI RevokeDragDrop32(
-	HWND32 hwnd)
+HRESULT WINAPI RevokeDragDrop(
+	HWND hwnd)
 {
   DropTargetNode* dropTargetInfo;
 
@@ -328,10 +328,10 @@ HRESULT WINAPI RevokeDragDrop32(
 /***********************************************************************
  *           OleRegGetUserType (OLE32.122)
  */
-HRESULT WINAPI OleRegGetUserType32( 
+HRESULT WINAPI OleRegGetUserType( 
 	REFCLSID clsid, 
 	DWORD dwFormOfType,
-	LPOLESTR32* pszUserType)
+	LPOLESTR* pszUserType)
 {
 	FIXME(ole,",stub!\n");
 	return S_OK;
@@ -340,15 +340,15 @@ HRESULT WINAPI OleRegGetUserType32(
 /***********************************************************************
  * DoDragDrop32 [OLE32.65]
  */
-HRESULT WINAPI DoDragDrop32 (
+HRESULT WINAPI DoDragDrop (
   IDataObject *pDataObject,  /* ptr to the data obj           */
   IDropSource* pDropSource,  /* ptr to the source obj         */
   DWORD       dwOKEffect,    /* effects allowed by the source */
   DWORD       *pdwEffect)    /* ptr to effects of the source  */
 {
   TrackerWindowInfo trackerInfo;
-  HWND32            hwndTrackWindow;
-  MSG32             msg;
+  HWND            hwndTrackWindow;
+  MSG             msg;
 
   TRACE(ole,"(DataObject %p, DropSource %p)\n", pDataObject, pDropSource);
 
@@ -364,11 +364,11 @@ HRESULT WINAPI DoDragDrop32 (
   trackerInfo.curDragTargetHWND = 0;
   trackerInfo.curDragTarget     = 0;
 
-  hwndTrackWindow = CreateWindow32A(OLEDD_DRAGTRACKERCLASS,
+  hwndTrackWindow = CreateWindowA(OLEDD_DRAGTRACKERCLASS,
 				    "TrackerWindow",
 				    WS_POPUP,
-				    CW_USEDEFAULT32, CW_USEDEFAULT32,
-				    CW_USEDEFAULT32, CW_USEDEFAULT32,
+				    CW_USEDEFAULT, CW_USEDEFAULT,
+				    CW_USEDEFAULT, CW_USEDEFAULT,
 				    0,
 				    0,
 				    0,
@@ -379,12 +379,12 @@ HRESULT WINAPI DoDragDrop32 (
     /*
      * Capture the mouse input
      */
-    SetCapture32(hwndTrackWindow);
+    SetCapture(hwndTrackWindow);
 
     /*
      * Pump messages. All mouse input should go the the capture window.
      */
-    while (!trackerInfo.trackingDone && GetMessage32A(&msg, 0, 0, 0) )
+    while (!trackerInfo.trackingDone && GetMessageA(&msg, 0, 0, 0) )
     {
       if ( (msg.message >= WM_KEYFIRST) && 
 	   (msg.message <= WM_KEYFIRST) )
@@ -413,14 +413,14 @@ HRESULT WINAPI DoDragDrop32 (
 	/*
 	 * Dispatch the messages only when it's not a keyboard message.
 	 */
-	DispatchMessage32A(&msg);
+	DispatchMessageA(&msg);
       }
     }
 
     /*
      * Destroy the temporary window.
      */
-    DestroyWindow32(hwndTrackWindow);
+    DestroyWindow(hwndTrackWindow);
 
     return trackerInfo.returnValue;
   }
@@ -467,9 +467,9 @@ HRESULT WINAPI OleGetClipboard32(
 /***********************************************************************
  * OleCreateMenuDescriptor [OLE32.97]
  */
-HOLEMENU32 WINAPI OleCreateMenuDescriptor(
-  HMENU32                hmenuCombined,
-  LPOLEMENUGROUPWIDTHS32 lpMenuWidths)
+HOLEMENU WINAPI OleCreateMenuDescriptor(
+  HMENU                hmenuCombined,
+  LPOLEMENUGROUPWIDTHS lpMenuWidths)
 {
   FIXME(ole,"(%x,%p),stub!\n", hmenuCombined, lpMenuWidths);
 
@@ -480,7 +480,7 @@ HOLEMENU32 WINAPI OleCreateMenuDescriptor(
  * OleDestroyMenuDescriptor [OLE32.99]
  */
 void WINAPI OleDestroyMenuDescriptor(
-  HOLEMENU32 hmenuDescriptor)
+  HOLEMENU hmenuDescriptor)
 {
   FIXME(ole,"(%x),stub!\n", (unsigned int)hmenuDescriptor);
 }
@@ -489,9 +489,9 @@ void WINAPI OleDestroyMenuDescriptor(
  * OleSetMenuDescriptor [OLE32.129]
  */
 HRESULT WINAPI OleSetMenuDescriptor(
-  HOLEMENU32               hmenuDescriptor,
-  HWND32                   hwndFrame,
-  HWND32                   hwndActiveObject,
+  HOLEMENU               hmenuDescriptor,
+  HWND                   hwndFrame,
+  HWND                   hwndActiveObject,
   LPOLEINPLACEFRAME        lpFrame,
   LPOLEINPLACEACTIVEOBJECT lpActiveObject)
 {
@@ -512,18 +512,18 @@ HRESULT WINAPI OleSetMenuDescriptor(
  */
 static void OLEDD_Initialize()
 {
-    WNDCLASS32A wndClass;
+    WNDCLASSA wndClass;
 
-    ZeroMemory (&wndClass, sizeof(WNDCLASS32A));
+    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC32)OLEDD_DragTrackerWindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)OLEDD_DragTrackerWindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(TrackerWindowInfo*);
     wndClass.hCursor       = 0;
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = OLEDD_DRAGTRACKERCLASS;
  
-    RegisterClass32A (&wndClass);
+    RegisterClassA (&wndClass);
 }
 
 /***
@@ -538,7 +538,7 @@ static void OLEDD_UnInitialize()
    */
   while (targetListHead!=NULL)
   {
-    RevokeDragDrop32(targetListHead->hwndTarget);
+    RevokeDragDrop(targetListHead->hwndTarget);
   }
 }
 
@@ -603,7 +603,7 @@ static void OLEDD_InsertDropTarget(DropTargetNode* nodeToAdd)
  *
  * Removes the target node from the tree.
  */
-static DropTargetNode* OLEDD_ExtractDropTarget(HWND32 hwndOfTarget)
+static DropTargetNode* OLEDD_ExtractDropTarget(HWND hwndOfTarget)
 {
   DropTargetNode*  curNode;
   DropTargetNode** parentNodeLink;
@@ -676,7 +676,7 @@ static DropTargetNode* OLEDD_ExtractDropTarget(HWND32 hwndOfTarget)
  *
  * Finds information about the drop target.
  */
-static DropTargetNode* OLEDD_FindDropTarget(HWND32 hwndOfTarget)
+static DropTargetNode* OLEDD_FindDropTarget(HWND hwndOfTarget)
 {
   DropTargetNode*  curNode;
 
@@ -725,33 +725,33 @@ static DropTargetNode* OLEDD_FindDropTarget(HWND32 hwndOfTarget)
  * of this behavior.
  */
 static LRESULT WINAPI OLEDD_DragTrackerWindowProc(
-			 HWND32   hwnd, 
-			 UINT32   uMsg,
-			 WPARAM32 wParam, 
+			 HWND   hwnd, 
+			 UINT   uMsg,
+			 WPARAM wParam, 
 			 LPARAM   lParam)
 {
   switch (uMsg)
   {
     case WM_CREATE:
     {
-      LPCREATESTRUCT32A createStruct = (LPCREATESTRUCT32A)lParam;
+      LPCREATESTRUCTA createStruct = (LPCREATESTRUCTA)lParam;
 
-      SetWindowLong32A(hwnd, 0, (LONG)createStruct->lpCreateParams); 
+      SetWindowLongA(hwnd, 0, (LONG)createStruct->lpCreateParams); 
 
       
       break;
     }
     case WM_MOUSEMOVE:
     {
-      TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLong32A(hwnd, 0);
-      POINT32            mousePos;
+      TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLongA(hwnd, 0);
+      POINT            mousePos;
 
       /*
        * Get the current mouse position in screen coordinates.
        */
       mousePos.x = LOWORD(lParam);
       mousePos.y = HIWORD(lParam);
-      ClientToScreen32(hwnd, &mousePos);
+      ClientToScreen(hwnd, &mousePos);
 
       /*
        * Track the movement of the mouse.
@@ -767,15 +767,15 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc(
     case WM_MBUTTONDOWN:
     case WM_RBUTTONDOWN:
     {
-      TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLong32A(hwnd, 0);
-      POINT32            mousePos;
+      TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLongA(hwnd, 0);
+      POINT            mousePos;
 
       /*
        * Get the current mouse position in screen coordinates.
        */
       mousePos.x = LOWORD(lParam);
       mousePos.y = HIWORD(lParam);
-      ClientToScreen32(hwnd, &mousePos);
+      ClientToScreen(hwnd, &mousePos);
 
       /*
        * Notify everyone that the button state changed
@@ -790,7 +790,7 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc(
   /*
    * This is a window proc after all. Let's call the default.
    */
-  return DefWindowProc32A (hwnd, uMsg, wParam, lParam);
+  return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 }
 
 /***
@@ -812,16 +812,16 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc(
  */
 static void OLEDD_TrackMouseMove(
   TrackerWindowInfo* trackerInfo,
-  POINT32            mousePos,
+  POINT            mousePos,
   DWORD              keyState)
 {
-  HWND32   hwndNewTarget = 0;
+  HWND   hwndNewTarget = 0;
   HRESULT  hr = S_OK;
 
   /*
    * Get the handle of the window under the mouse
    */
-  hwndNewTarget = WindowFromPoint32(mousePos);
+  hwndNewTarget = WindowFromPoint(mousePos);
 
   /*
    * If we are hovering over the same target as before, send the
@@ -928,11 +928,11 @@ static void OLEDD_TrackMouseMove(
 	 (*trackerInfo->pdwEffect & DROPEFFECT_COPY) ||
 	 (*trackerInfo->pdwEffect & DROPEFFECT_LINK) )
     {
-      SetCursor32(LoadCursor32A(0, IDC_SIZEALL32A));
+      SetCursor(LoadCursorA(0, IDC_SIZEALLA));
     }
     else
     {
-      SetCursor32(LoadCursor32A(0, IDC_NO32A));
+      SetCursor(LoadCursorA(0, IDC_NOA));
     }
   }  
 }
@@ -955,7 +955,7 @@ static void OLEDD_TrackMouseMove(
  */
 static void OLEDD_TrackStateChange(
   TrackerWindowInfo* trackerInfo,
-  POINT32            mousePos,
+  POINT            mousePos,
   DWORD              keyState)
 {
   /*
diff --git a/ole/ole2disp.c b/ole/ole2disp.c
index 36b41f28b8b..fe0c5b44a7a 100644
--- a/ole/ole2disp.c
+++ b/ole/ole2disp.c
@@ -60,10 +60,10 @@ BSTR16 WINAPI SysAllocString16(LPOLESTR16 in)
 /******************************************************************************
  *		SysAllocString32	[OLEAUT32.2]
  */
-BSTR32 WINAPI SysAllocString32(LPOLESTR32 in)
+BSTR WINAPI SysAllocString(LPOLESTR in)
 {
     /* Delegate this to the SysAllocStringLen32 method. */
-    return SysAllocStringLen32(in, lstrlen32W(in));
+    return SysAllocStringLen(in, lstrlenW(in));
 }
 
 /******************************************************************************
@@ -80,7 +80,7 @@ INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPOLESTR16 in)
 /******************************************************************************
  *		SysReAllocString32	[OLEAUT32.3]
  */
-INT32 WINAPI SysReAllocString32(LPBSTR32 old,LPOLESTR32 in)
+INT WINAPI SysReAllocString(LPBSTR old,LPOLESTR in)
 {
     /*
      * Sanity check
@@ -92,12 +92,12 @@ INT32 WINAPI SysReAllocString32(LPBSTR32 old,LPOLESTR32 in)
      * Make sure we free the old string.
      */
     if (*old!=NULL)      
-      SysFreeString32(*old);
+      SysFreeString(*old);
 
     /*
      * Allocate the new string
      */
-    *old = SysAllocString32(in);
+    *old = SysAllocString(in);
 
      return 1;
 }
@@ -123,7 +123,7 @@ BSTR16 WINAPI SysAllocStringLen16(char *in, int len)
  * the string. Meaning that the count is double the number of wide 
  * characters in the string.
  */
-BSTR32 WINAPI SysAllocStringLen32(WCHAR *in, int len)
+BSTR WINAPI SysAllocStringLen(WCHAR *in, int len)
 {
     DWORD  bufferSize;
     DWORD* newBuffer;
@@ -195,7 +195,7 @@ int WINAPI SysReAllocStringLen16(BSTR16 *old,char *in,int len)
 /******************************************************************************
  *             SysReAllocStringLen32   [OLEAUT32.5]
  */
-int WINAPI SysReAllocStringLen32(BSTR32* old, WCHAR* in, int len)
+int WINAPI SysReAllocStringLen(BSTR* old, WCHAR* in, int len)
 {
     /*
      * Sanity check
@@ -207,12 +207,12 @@ int WINAPI SysReAllocStringLen32(BSTR32* old, WCHAR* in, int len)
      * Make sure we free the old string.
      */
     if (*old!=NULL)      
-      SysFreeString32(*old);
+      SysFreeString(*old);
 
     /*
      * Allocate the new string
      */
-    *old = SysAllocStringLen32(in, len);
+    *old = SysAllocStringLen(in, len);
 
     return 1;
 }
@@ -228,7 +228,7 @@ void WINAPI SysFreeString16(BSTR16 in)
 /******************************************************************************
  *		SysFreeString32	[OLEAUT32.6]
  */
-void WINAPI SysFreeString32(BSTR32 in)
+void WINAPI SysFreeString(BSTR in)
 {
     DWORD* bufferPointer;
 
@@ -263,7 +263,7 @@ int WINAPI SysStringLen16(BSTR16 str)
  * It is the same number that was passed in as the "len" parameter if the
  * string was allocated with a SysAllocStringLen method call.
  */
-int WINAPI SysStringLen32(BSTR32 str)
+int WINAPI SysStringLen(BSTR str)
 {
     DWORD* bufferPointer;
 
@@ -286,15 +286,15 @@ int WINAPI SysStringLen32(BSTR32 str)
  * It is the same number that was passed in as the "len" parameter if the
  * string was allocated with a SysAllocStringLen method call.
  */
-int WINAPI SysStringByteLen(BSTR32 str)
+int WINAPI SysStringByteLen(BSTR str)
 {
-  return SysStringLen32(str)*sizeof(WCHAR);
+  return SysStringLen(str)*sizeof(WCHAR);
 }
 
 /******************************************************************************
  * CreateDispTypeInfo [OLE2DISP.31]
  */
-OLESTATUS WINAPI CreateDispTypeInfo(
+OLESTATUS WINAPI CreateDispTypeInfo16(
 	INTERFACEDATA *pidata,
 	LCID lcid,
 	LPVOID **pptinfo /*ITypeInfo*/ 
@@ -306,7 +306,7 @@ OLESTATUS WINAPI CreateDispTypeInfo(
 /******************************************************************************
  * RegisterActiveObject [OLE2DISP.35]
  */
-OLESTATUS WINAPI RegisterActiveObject(
+OLESTATUS WINAPI RegisterActiveObject16(
 	IUnknown * punk,REFCLSID rclsid,DWORD dwFlags, DWORD * pdwRegister
 ) {
 	char	buf[80];
@@ -318,9 +318,9 @@ OLESTATUS WINAPI RegisterActiveObject(
 /******************************************************************************
  *		OleTranslateColor	[OLEAUT32.421]
  */
-INT32 WINAPI OleTranslateColor(
+INT WINAPI OleTranslateColor(
   LONG clr,
-  HPALETTE32  hpal,
+  HPALETTE  hpal,
   COLORREF* pColorRef)
 {
   FIXME(ole,"():stub\n");
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index ae55e9386f4..6a2671ade1b 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -641,7 +641,7 @@ LANGID WINAPI GetSystemDefaultLangID()
  */
 INT16 WINAPI GetLocaleInfo16(LCID lcid,LCTYPE LCType,LPSTR buf,INT16 len)
 {
-	return GetLocaleInfo32A(lcid,LCType,buf,len);
+	return GetLocaleInfoA(lcid,LCType,buf,len);
 }
 /******************************************************************************
  * ConvertDefaultLocale32 [KERNEL32.147]
@@ -667,7 +667,7 @@ LCID WINAPI ConvertDefaultLocale32 (LCID lcid)
  *  except for LOCALE_FONTSIGNATURE  which "will return a non-NULL
  *  terminated string".
  */
-INT32 WINAPI GetLocaleInfo32A(LCID lcid,LCTYPE LCType,LPSTR buf,INT32 len)
+INT WINAPI GetLocaleInfoA(LCID lcid,LCTYPE LCType,LPSTR buf,INT len)
 {
   LPCSTR  retString;
 	int	found,i;
@@ -747,7 +747,7 @@ INT32 WINAPI GetLocaleInfo32A(LCID lcid,LCTYPE LCType,LPSTR buf,INT32 len)
         return sizeof(FONTSIGNATURE);
     }
     /* if len=0 return only the length, don't touch the buffer*/
-    if (len) lstrcpyn32A(buf,retString,len);
+    if (len) lstrcpynA(buf,retString,len);
     return strlen(retString)+1;
 }
 
@@ -759,7 +759,7 @@ INT32 WINAPI GetLocaleInfo32A(LCID lcid,LCTYPE LCType,LPSTR buf,INT32 len)
  *  or characters (Unicode version), of" wbuf. Thus the number returned is
  *  the same between GetLocaleInfo32W and GetLocaleInfo32A.
  */
-INT32 WINAPI GetLocaleInfo32W(LCID lcid,LCTYPE LCType,LPWSTR wbuf,INT32 len)
+INT WINAPI GetLocaleInfoW(LCID lcid,LCTYPE LCType,LPWSTR wbuf,INT len)
 {	WORD wlen;
 	LPSTR abuf;
 	
@@ -769,7 +769,7 @@ INT32 WINAPI GetLocaleInfo32W(LCID lcid,LCTYPE LCType,LPWSTR wbuf,INT32 len)
 	}
 
 	abuf = (LPSTR)HeapAlloc(GetProcessHeap(),0,len);
-	wlen = GetLocaleInfo32A(lcid, LCType, abuf, len);
+	wlen = GetLocaleInfoA(lcid, LCType, abuf, len);
 
 	if (wlen && len)	/* if len=0 return only the length*/
 	  lstrcpynAtoW(wbuf,abuf,len);
@@ -790,7 +790,7 @@ BOOL16 WINAPI SetLocaleInfoA(DWORD lcid, DWORD lctype, LPCSTR data)
 /******************************************************************************
  *		IsValidLocale	[KERNEL32.489]
  */
-BOOL32 WINAPI IsValidLocale(LCID lcid,DWORD flags)
+BOOL WINAPI IsValidLocale(LCID lcid,DWORD flags)
 {
 	/* we support ANY language. Well, at least say that...*/
 	return TRUE;
@@ -799,20 +799,20 @@ BOOL32 WINAPI IsValidLocale(LCID lcid,DWORD flags)
 /******************************************************************************
  *		EnumSystemLocales32W	[KERNEL32.209]
  */
-BOOL32 WINAPI EnumSystemLocales32W( LOCALE_ENUMPROC32W lpfnLocaleEnum,
+BOOL WINAPI EnumSystemLocalesW( LOCALE_ENUMPROCW lpfnLocaleEnum,
                                     DWORD flags )
 {
 	int	i;
-	BOOL32	ret;
+	BOOL	ret;
 	WCHAR	buffer[200];
 	HKEY	xhkey;
 
 	TRACE(win32,"(%p,%08lx)\n",lpfnLocaleEnum,flags );
 	/* see if we can reuse the Win95 registry entries.... */
-	if (ERROR_SUCCESS==RegOpenKey32A(HKEY_LOCAL_MACHINE,"System\\CurrentControlSet\\control\\Nls\\Locale\\",&xhkey)) {
+	if (ERROR_SUCCESS==RegOpenKeyA(HKEY_LOCAL_MACHINE,"System\\CurrentControlSet\\control\\Nls\\Locale\\",&xhkey)) {
 		i=0;
 		while (1) {
-			if (ERROR_SUCCESS!=RegEnumKey32W(xhkey,i,buffer,sizeof(buffer)))
+			if (ERROR_SUCCESS!=RegEnumKeyW(xhkey,i,buffer,sizeof(buffer)))
 				break;
             		if (!lpfnLocaleEnum(buffer))
 				break;
@@ -842,7 +842,7 @@ BOOL32 WINAPI EnumSystemLocales32W( LOCALE_ENUMPROC32W lpfnLocaleEnum,
 /******************************************************************************
  *		EnumSystemLocales32A	[KERNEL32.208]
  */
-BOOL32 WINAPI EnumSystemLocales32A(LOCALE_ENUMPROC32A lpfnLocaleEnum,
+BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA lpfnLocaleEnum,
                                    DWORD flags)
 {
 	int	i;
@@ -852,10 +852,10 @@ BOOL32 WINAPI EnumSystemLocales32A(LOCALE_ENUMPROC32A lpfnLocaleEnum,
 	TRACE(win32,"(%p,%08lx)\n",
 		lpfnLocaleEnum,flags
 	);
-	if (ERROR_SUCCESS==RegOpenKey32A(HKEY_LOCAL_MACHINE,"System\\CurrentControlSet\\control\\Nls\\Locale\\",&xhkey)) {
+	if (ERROR_SUCCESS==RegOpenKeyA(HKEY_LOCAL_MACHINE,"System\\CurrentControlSet\\control\\Nls\\Locale\\",&xhkey)) {
 		i=0;
 		while (1) {
-			if (ERROR_SUCCESS!=RegEnumKey32A(xhkey,i,buffer,sizeof(buffer)))
+			if (ERROR_SUCCESS!=RegEnumKeyA(xhkey,i,buffer,sizeof(buffer)))
 				break;
             		if (!lpfnLocaleEnum(buffer))
 				break;
@@ -1398,15 +1398,15 @@ const WORD OLE2NLS_CT_CType3_LUT[] = {
 BOOL16 WINAPI GetStringType16(LCID locale,DWORD dwInfoType,LPCSTR src,
                               INT16 cchSrc,LPWORD chartype)
 {
-	return GetStringTypeEx32A(locale,dwInfoType,src,cchSrc,chartype);
+	return GetStringTypeExA(locale,dwInfoType,src,cchSrc,chartype);
 }
 /******************************************************************************
  *		GetStringType32A	[KERNEL32.396]
  */
-BOOL32 WINAPI GetStringType32A(LCID locale,DWORD dwInfoType,LPCSTR src,
-                               INT32 cchSrc,LPWORD chartype)
+BOOL WINAPI GetStringTypeA(LCID locale,DWORD dwInfoType,LPCSTR src,
+                               INT cchSrc,LPWORD chartype)
 {
-	return GetStringTypeEx32A(locale,dwInfoType,src,cchSrc,chartype);
+	return GetStringTypeExA(locale,dwInfoType,src,cchSrc,chartype);
 }
 
 /******************************************************************************
@@ -1414,8 +1414,8 @@ BOOL32 WINAPI GetStringType32A(LCID locale,DWORD dwInfoType,LPCSTR src,
  *
  * FIXME: Ignores the locale.
  */
-BOOL32 WINAPI GetStringTypeEx32A(LCID locale,DWORD dwInfoType,LPCSTR src,
-                                 INT32 cchSrc,LPWORD chartype)
+BOOL WINAPI GetStringTypeExA(LCID locale,DWORD dwInfoType,LPCSTR src,
+                                 INT cchSrc,LPWORD chartype)
 {
 	int	i;
 	
@@ -1426,7 +1426,7 @@ BOOL32 WINAPI GetStringTypeEx32A(LCID locale,DWORD dwInfoType,LPCSTR src,
 	}
 
 	if (cchSrc==-1)
-	  cchSrc=lstrlen32A(src)+1;
+	  cchSrc=lstrlenA(src)+1;
 	  
 	switch (dwInfoType) {
 	case CT_CTYPE1:
@@ -1473,10 +1473,10 @@ BOOL32 WINAPI GetStringTypeEx32A(LCID locale,DWORD dwInfoType,LPCSTR src,
  * NOTES
  * Yes, this is missing LCID locale. MS fault.
  */
-BOOL32 WINAPI GetStringType32W(DWORD dwInfoType,LPCWSTR src,INT32 cchSrc,
+BOOL WINAPI GetStringTypeW(DWORD dwInfoType,LPCWSTR src,INT cchSrc,
                                LPWORD chartype)
 {
-	return GetStringTypeEx32W(0/*defaultlocale*/,dwInfoType,src,cchSrc,chartype);
+	return GetStringTypeExW(0/*defaultlocale*/,dwInfoType,src,cchSrc,chartype);
 }
 
 /******************************************************************************
@@ -1484,14 +1484,14 @@ BOOL32 WINAPI GetStringType32W(DWORD dwInfoType,LPCWSTR src,INT32 cchSrc,
  *
  * FIXME: unicode chars are assumed chars
  */
-BOOL32 WINAPI GetStringTypeEx32W(LCID locale,DWORD dwInfoType,LPCWSTR src,
-                                 INT32 cchSrc,LPWORD chartype)
+BOOL WINAPI GetStringTypeExW(LCID locale,DWORD dwInfoType,LPCWSTR src,
+                                 INT cchSrc,LPWORD chartype)
 {
 	int	i;
 
 
 	if (cchSrc==-1)
-	  cchSrc=lstrlen32W(src)+1;
+	  cchSrc=lstrlenW(src)+1;
 	
 	switch (dwInfoType) {
 	case CT_CTYPE2:
@@ -1525,7 +1525,7 @@ BOOL32 WINAPI GetStringTypeEx32W(LCID locale,DWORD dwInfoType,LPCWSTR src,
  * FIXME:  Windows keeps language names in a string table
  *         resource in VER.DLL ...
  */
-LPCSTR WINE_GetLanguageName( UINT32 langid )
+LPCSTR WINE_GetLanguageName( UINT langid )
 {
     int i;
     for ( i = 0; languages[i].langid != 0; i++ )
@@ -1956,7 +1956,7 @@ static int OLE2NLS_isSymbol(unsigned char c)
   /* This function is used by LCMapString32A.  Characters 
      for which it returns true are ignored when mapping a
      string with NORM_IGNORESYMBOLS */
-  return ( (c!=0) && !IsCharAlphaNumeric32A(c) );
+  return ( (c!=0) && !IsCharAlphaNumericA(c) );
 }
 
 /******************************************************************************
@@ -1993,15 +1993,15 @@ static int identity(int c)
  *    wide characters in strings passed to LCMapString32A,
  *    so there is nothing to be done for this flag.
  */
-INT32 WINAPI LCMapString32A(
+INT WINAPI LCMapStringA(
 	LCID lcid /* locale identifier created with MAKELCID; 
 		     LOCALE_SYSTEM_DEFAULT and LOCALE_USER_DEFAULT are 
                      predefined values. */,
 	DWORD mapflags /* flags */,
 	LPCSTR srcstr  /* source buffer */,
-	INT32 srclen   /* source length */,
+	INT srclen   /* source length */,
 	LPSTR dststr   /* destination buffer */,
-	INT32 dstlen   /* destination buffer length */) 
+	INT dstlen   /* destination buffer length */) 
 {
   int i;
 
@@ -2015,9 +2015,9 @@ INT32 WINAPI LCMapString32A(
     return 0;
   }
   if (srclen == -1) 
-    srclen = lstrlen32A(srcstr) + 1 ;    /* (include final '\0') */
+    srclen = lstrlenA(srcstr) + 1 ;    /* (include final '\0') */
 
-#define LCMAPSTRING32A_SUPPORTED_FLAGS (LCMAP_UPPERCASE     | \
+#define LCMAPSTRINGA_SUPPORTED_FLAGS (LCMAP_UPPERCASE     | \
                                         LCMAP_LOWERCASE     | \
                                         LCMAP_SORTKEY       | \
                                         NORM_IGNORECASE     | \
@@ -2025,12 +2025,12 @@ INT32 WINAPI LCMapString32A(
                                         SORT_STRINGSORT     | \
                                         NORM_IGNOREWIDTH)
 
-  if (mapflags & ~LCMAPSTRING32A_SUPPORTED_FLAGS)
+  if (mapflags & ~LCMAPSTRINGA_SUPPORTED_FLAGS)
   {
     FIXME(string,"(0x%04lx,0x%08lx,%p,%d,%p,%d): "
 	  "unimplemented flags: 0x%08lx\n",
 	  lcid,
-  	  mapflags & ~LCMAPSTRING32A_SUPPORTED_FLAGS,
+  	  mapflags & ~LCMAPSTRINGA_SUPPORTED_FLAGS,
 	  srcstr,
 	  srclen,
 	  dststr,
@@ -2150,7 +2150,7 @@ INT32 WINAPI LCMapString32A(
     }
 
     /*FIXME the Pointercheck should not be nessesary */
-    if (IsBadWritePtr32 (dststr,room))
+    if (IsBadWritePtr (dststr,room))
     { ERR (string,"bad destination buffer (dststr) : %p,%d\n",dststr,dstlen);
       SetLastError(ERROR_INSUFFICIENT_BUFFER);
       return 0;
@@ -2234,9 +2234,9 @@ INT32 WINAPI LCMapString32A(
  *
  * See LCMapString32A for documentation
  */
-INT32 WINAPI LCMapString32W(
-	LCID lcid,DWORD mapflags,LPCWSTR srcstr,INT32 srclen,LPWSTR dststr,
-	INT32 dstlen)
+INT WINAPI LCMapStringW(
+	LCID lcid,DWORD mapflags,LPCWSTR srcstr,INT srclen,LPWSTR dststr,
+	INT dstlen)
 {
   int i;
  
@@ -2250,7 +2250,7 @@ INT32 WINAPI LCMapString32W(
     return 0;
   }
   if (srclen==-1) 
-    srclen = lstrlen32W(srcstr)+1;
+    srclen = lstrlenW(srcstr)+1;
   if (mapflags & LCMAP_SORTKEY) 
   {
     FIXME(string,"(0x%04lx,0x%08lx,%p,%d,%p,%d): "
@@ -2284,7 +2284,7 @@ INT32 WINAPI LCMapString32W(
 UINT16 WINAPI CompareString16(DWORD lcid,DWORD fdwStyle,
                               LPCSTR s1,DWORD l1,LPCSTR s2,DWORD l2)
 {
-	return (UINT16)CompareString32A(lcid,fdwStyle,s1,l1,s2,l2);
+	return (UINT16)CompareStringA(lcid,fdwStyle,s1,l1,s2,l2);
 }
 
 /******************************************************************************
@@ -2310,7 +2310,7 @@ UINT16 WINAPI CompareString16(DWORD lcid,DWORD fdwStyle,
  * 
  * Quite inefficient.
  */
-UINT32 WINAPI CompareString32A(
+UINT WINAPI CompareStringA(
     DWORD lcid,     /* locale ID */
     DWORD fdwStyle, /* comparison-style options */
     LPCSTR s1,      /* first string */
@@ -2336,16 +2336,16 @@ UINT32 WINAPI CompareString32A(
     FIXME(ole, "IGNORESYMBOLS not supported\n");
   	
   mapstring_flags = LCMAP_SORTKEY | fdwStyle ;
-  len1 = LCMapString32A(lcid,mapstring_flags,s1,l1,NULL,0);
-  len2 = LCMapString32A(lcid,mapstring_flags,s2,l2,NULL,0);
+  len1 = LCMapStringA(lcid,mapstring_flags,s1,l1,NULL,0);
+  len2 = LCMapStringA(lcid,mapstring_flags,s2,l2,NULL,0);
 
   if ((len1==0)||(len2==0))
     return 0;     /* something wrong happened */
 
   sk1 = (LPSTR)HeapAlloc(GetProcessHeap(),0,len1);
   sk2 = (LPSTR)HeapAlloc(GetProcessHeap(),0,len2);
-  if ( (!LCMapString32A(lcid,mapstring_flags,s1,l1,sk1,len1))
-	 || (!LCMapString32A(lcid,mapstring_flags,s2,l2,sk2,len2)) )
+  if ( (!LCMapStringA(lcid,mapstring_flags,s1,l1,sk1,len1))
+	 || (!LCMapStringA(lcid,mapstring_flags,s2,l2,sk2,len2)) )
   {
     ERR(ole,"Bug in LCmapString32A.\n");
     result = 0;
@@ -2373,7 +2373,7 @@ UINT32 WINAPI CompareString32A(
  * FIXME :  Does only string sort.  Should
  * be reimplemented the same way as CompareString32A.
  */
-UINT32 WINAPI CompareString32W(DWORD lcid, DWORD fdwStyle, 
+UINT WINAPI CompareStringW(DWORD lcid, DWORD fdwStyle, 
                                LPCWSTR s1, DWORD l1, LPCWSTR s2,DWORD l2)
 {
 	int len,ret;
@@ -2384,11 +2384,11 @@ UINT32 WINAPI CompareString32W(DWORD lcid, DWORD fdwStyle,
 
 	/* Is strcmp defaulting to string sort or to word sort?? */
 	/* FIXME: Handle NORM_STRINGSORT */
-	l1 = (l1==-1)?lstrlen32W(s1):l1;
-	l2 = (l2==-1)?lstrlen32W(s2):l2;
+	l1 = (l1==-1)?lstrlenW(s1):l1;
+	l2 = (l2==-1)?lstrlenW(s2):l2;
 	len = l1<l2 ? l1:l2;
 	ret = (fdwStyle & NORM_IGNORECASE) ?
-		lstrncmpi32W(s1,s2,len)	: lstrncmp32W(s1,s2,len);
+		lstrncmpiW(s1,s2,len)	: lstrncmpW(s1,s2,len);
 	/* not equal, return 1 or 3 */
 	if(ret!=0) return ret+2;
 	/* same len, return 2 */
@@ -2433,15 +2433,15 @@ UINT32 WINAPI CompareString32W(DWORD lcid, DWORD fdwStyle,
 
  These functions REQUIRE valid locale, date,  and format. 
  */
-static INT32 OLE_GetFormatA(LCID locale,
+static INT OLE_GetFormatA(LCID locale,
 			    DWORD flags,
 			    DWORD tflags,
 			    LPSYSTEMTIME xtime,
 			    LPCSTR _format, 	/*in*/
 			    LPSTR date,		/*out*/
-			    INT32 datelen)
+			    INT datelen)
 {
-   INT32 inpos, outpos;
+   INT inpos, outpos;
    int count, type, inquote, Overflow;
    char buf[40];
    char format[40];
@@ -2513,12 +2513,12 @@ static INT32 OLE_GetFormatA(LCID locale,
        {
 	    if         (type == 'd') {
 	       if        (count == 4) {
-		  GetLocaleInfo32A(locale,
+		  GetLocaleInfoA(locale,
 				   LOCALE_SDAYNAME1
 				   + xtime->wDayOfWeek - 1,
 				   buf, sizeof(buf));
 	       } else if (count == 3) {
-			   GetLocaleInfo32A(locale, 
+			   GetLocaleInfoA(locale, 
 					    LOCALE_SABBREVDAYNAME1 
 					    + xtime->wDayOfWeek - 1,
 					    buf, sizeof(buf));
@@ -2527,12 +2527,12 @@ static INT32 OLE_GetFormatA(LCID locale,
 	       }
 	    } else if (type == 'M') {
 	       if (count == 3) {
-		  GetLocaleInfo32A(locale, 
+		  GetLocaleInfoA(locale, 
 				   LOCALE_SABBREVMONTHNAME1
 				   + xtime->wMonth - 1,
 				   buf, sizeof(buf));
 	       } else if (count == 4) {
-		  GetLocaleInfo32A(locale,
+		  GetLocaleInfoA(locale,
 				   LOCALE_SMONTHNAME1
 				   + xtime->wMonth - 1,
 				   buf, sizeof(buf));
@@ -2571,7 +2571,7 @@ static INT32 OLE_GetFormatA(LCID locale,
 		  sprintf(buf, "%c", (xtime->wHour < 12) ? 'A' : 'P');
 	       } else if (count == 2) {
 		  /* sprintf(buf, "%s", (xtime->wHour < 12) ? "AM" : "PM"); */
-		  GetLocaleInfo32A(locale,
+		  GetLocaleInfoA(locale,
 				   (xtime->wHour<12) 
 				   ? LOCALE_S1159 : LOCALE_S2359,
 				   buf, sizeof(buf));
@@ -2645,12 +2645,12 @@ static INT32 OLE_GetFormatA(LCID locale,
 /******************************************************************************
  * OLE_GetFormatW [INTERNAL]
  */
-static INT32 OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
+static INT OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
 			    LPSYSTEMTIME xtime,
 			    LPCWSTR format,
-			    LPWSTR output, INT32 outlen)
+			    LPWSTR output, INT outlen)
 {
-   INT32   inpos, outpos;
+   INT   inpos, outpos;
    int     count, type=0, inquote;
    int     Overflow; /* loop check */
    WCHAR   buf[40];
@@ -2714,37 +2714,37 @@ static INT32 OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
 			(count==2 && type =='t') )  ) {
 	 if        (type == 'd') {
 	    if        (count == 3) {
-	       GetLocaleInfo32W(locale,
+	       GetLocaleInfoW(locale,
 			     LOCALE_SDAYNAME1 + xtime->wDayOfWeek -1,
 			     buf, sizeof(buf)/sizeof(WCHAR) );
 	    } else if (count == 3) {
-	       GetLocaleInfo32W(locale,
+	       GetLocaleInfoW(locale,
 				LOCALE_SABBREVDAYNAME1 +
 				xtime->wDayOfWeek -1,
 				buf, sizeof(buf)/sizeof(WCHAR) );
 	    } else {
-	       wsnprintf32W(buf, 5, argarr[count], xtime->wDay );
+	       wsnprintfW(buf, 5, argarr[count], xtime->wDay );
 	    };
 	 } else if (type == 'M') {
 	    if        (count == 4) {
-	       GetLocaleInfo32W(locale,  LOCALE_SMONTHNAME1 +
+	       GetLocaleInfoW(locale,  LOCALE_SMONTHNAME1 +
 				xtime->wMonth -1, buf,
 				sizeof(buf)/sizeof(WCHAR) );
 	    } else if (count == 3) {
-	       GetLocaleInfo32W(locale,  LOCALE_SABBREVMONTHNAME1 +
+	       GetLocaleInfoW(locale,  LOCALE_SABBREVMONTHNAME1 +
 				xtime->wMonth -1, buf,
 				sizeof(buf)/sizeof(WCHAR) );
 	    } else {
-	       wsnprintf32W(buf, 5, argarr[count], xtime->wMonth);
+	       wsnprintfW(buf, 5, argarr[count], xtime->wMonth);
 	    }
 	 } else if (type == 'y') {
 	    if        (count == 4) {
-	       wsnprintf32W(buf, 6, argarr[1] /* "%d" */,
+	       wsnprintfW(buf, 6, argarr[1] /* "%d" */,
 			 xtime->wYear);
 	    } else if (count == 3) {
 	       lstrcpynAtoW(buf, "yyy", 5);
 	    } else {
-	       wsnprintf32W(buf, 6, argarr[count],
+	       wsnprintfW(buf, 6, argarr[count],
 			    xtime->wYear % 100);
 	    }
 	 } else if (type == 'g') {
@@ -2757,19 +2757,19 @@ static INT32 OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
 	    }
 	 } else if (type == 'h') {
 	    /* hours 1:00-12:00 --- is this right? */
-	    wsnprintf32W(buf, 5, argarr[count], 
+	    wsnprintfW(buf, 5, argarr[count], 
 			 (xtime->wHour-1)%12 +1);
 	 } else if (type == 'H') {
-	    wsnprintf32W(buf, 5, argarr[count], 
+	    wsnprintfW(buf, 5, argarr[count], 
 			 xtime->wHour);
 	 } else if (type == 'm' ) {
-	    wsnprintf32W(buf, 5, argarr[count],
+	    wsnprintfW(buf, 5, argarr[count],
 			 xtime->wMinute);
 	 } else if (type == 's' ) {
-	    wsnprintf32W(buf, 5, argarr[count],
+	    wsnprintfW(buf, 5, argarr[count],
 			 xtime->wSecond);
 	 } else if (type == 't') {
-	    GetLocaleInfo32W(locale, (xtime->wHour < 12) ?
+	    GetLocaleInfoW(locale, (xtime->wHour < 12) ?
 			     LOCALE_S1159 : LOCALE_S2359,
 			     buf, sizeof(buf) );
 	    if        (count == 1) {
@@ -2782,14 +2782,14 @@ static INT32 OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
 	 inpos--;
 
 	 /* cat buf onto the output */
-	 outlen = lstrlen32W(buf);
+	 outlen = lstrlenW(buf);
 	 if (outpos + buflen < outlen) {
 	    output[outpos] = 0;  /* a "hook" for strcat */
-	    lstrcat32W(output, buf);
+	    lstrcatW(output, buf);
 	    outpos += buflen;
 	 } else {
 	    output[outpos] = 0;
-	    lstrcatn32W(output, buf, outlen - outpos);
+	    lstrcatnW(output, buf, outlen - outpos);
 	    output[outlen - 1] = 0;
 	    Overflow = 1;
 	    break; /* Abnormal exit */
@@ -2868,9 +2868,9 @@ static INT32 OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
  * - gg   era string
  *
  */
-INT32 WINAPI GetDateFormat32A(LCID locale,DWORD flags,
+INT WINAPI GetDateFormatA(LCID locale,DWORD flags,
 			      LPSYSTEMTIME xtime,
-			      LPCSTR format, LPSTR date,INT32 datelen) 
+			      LPCSTR format, LPSTR date,INT datelen) 
 {
    
   char format_buf[40];
@@ -2878,7 +2878,7 @@ INT32 WINAPI GetDateFormat32A(LCID locale,DWORD flags,
   SYSTEMTIME t;
   LPSYSTEMTIME thistime;
   LCID thislocale;
-  INT32 ret;
+  INT ret;
 
   TRACE(ole,"(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",
 	      locale,flags,xtime,format,date,datelen);
@@ -2903,7 +2903,7 @@ INT32 WINAPI GetDateFormat32A(LCID locale,DWORD flags,
   };
 
   if (format == NULL) {
-     GetLocaleInfo32A(thislocale, ((flags&DATE_LONGDATE) 
+     GetLocaleInfoA(thislocale, ((flags&DATE_LONGDATE) 
 				   ? LOCALE_SLONGDATE
 				   : LOCALE_SSHORTDATE),
 		      format_buf, sizeof(format_buf));
@@ -2931,15 +2931,15 @@ INT32 WINAPI GetDateFormat32A(LCID locale,DWORD flags,
  * Accepts & returns sizes as counts of Unicode characters.
  *
  */
-INT32 WINAPI GetDateFormat32W(LCID locale,DWORD flags,
+INT WINAPI GetDateFormatW(LCID locale,DWORD flags,
 			      LPSYSTEMTIME xtime,
 			      LPCWSTR format,
-			      LPWSTR date, INT32 datelen)
+			      LPWSTR date, INT datelen)
 {
    unsigned short datearr[] = {'1','9','9','4','-','1','-','1',0};
 
    FIXME(ole, "STUB (should call OLE_GetFormatW)\n");   
-   lstrcpyn32W(date, datearr, datelen);
+   lstrcpynW(date, datearr, datelen);
    return (  datelen < 9) ? datelen : 9;
    
    
@@ -2948,8 +2948,8 @@ INT32 WINAPI GetDateFormat32W(LCID locale,DWORD flags,
 /**************************************************************************
  *              EnumDateFormats32A	(KERNEL32.198)
  */
-BOOL32 WINAPI EnumDateFormats32A(
-  DATEFMT_ENUMPROC32A lpDateFmtEnumProc, LCID Locale,  DWORD dwFlags)
+BOOL WINAPI EnumDateFormatsA(
+  DATEFMT_ENUMPROCA lpDateFmtEnumProc, LCID Locale,  DWORD dwFlags)
 {
   FIXME(ole, "Only US English supported\n");
 
@@ -2985,8 +2985,8 @@ BOOL32 WINAPI EnumDateFormats32A(
 /**************************************************************************
  *              EnumDateFormats32W	(KERNEL32.199)
  */
-BOOL32 WINAPI EnumDateFormats32W(
-  DATEFMT_ENUMPROC32W lpDateFmtEnumProc, LCID Locale, DWORD dwFlags)
+BOOL WINAPI EnumDateFormatsW(
+  DATEFMT_ENUMPROCW lpDateFmtEnumProc, LCID Locale, DWORD dwFlags)
 {
   FIXME(ole, "(%p, %ld, %ld): stub\n", lpDateFmtEnumProc, Locale, dwFlags);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -2996,8 +2996,8 @@ BOOL32 WINAPI EnumDateFormats32W(
 /**************************************************************************
  *              EnumTimeFormats32A	(KERNEL32.210)
  */
-BOOL32 WINAPI EnumTimeFormats32A(
-  TIMEFMT_ENUMPROC32A lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags)
+BOOL WINAPI EnumTimeFormatsA(
+  TIMEFMT_ENUMPROCA lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags)
 {
   FIXME(ole, "Only US English supported\n");
 
@@ -3023,8 +3023,8 @@ BOOL32 WINAPI EnumTimeFormats32A(
 /**************************************************************************
  *              EnumTimeFormats32W	(KERNEL32.211)
  */
-BOOL32 WINAPI EnumTimeFormats32W(
-  TIMEFMT_ENUMPROC32W lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags)
+BOOL WINAPI EnumTimeFormatsW(
+  TIMEFMT_ENUMPROCW lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags)
 {
   FIXME(ole, "(%p,%ld,%ld): stub\n", lpTimeFmtEnumProc, Locale, dwFlags);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -3034,26 +3034,26 @@ BOOL32 WINAPI EnumTimeFormats32W(
 /**************************************************************************
  *              GetNumberFormat32A	(KERNEL32.355)
  */
-INT32 WINAPI GetNumberFormat32A(LCID locale, DWORD dwflags,
-			       LPCSTR lpvalue,   const NUMBERFMT32A * lpFormat,
+INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags,
+			       LPCSTR lpvalue,   const NUMBERFMTA * lpFormat,
 			       LPSTR lpNumberStr, int cchNumber)
 {
  FIXME(file,"%s: stub, no reformating done\n",lpvalue);
 
- lstrcpyn32A( lpNumberStr, lpvalue, cchNumber );
- return cchNumber? lstrlen32A( lpNumberStr ) : 0;
+ lstrcpynA( lpNumberStr, lpvalue, cchNumber );
+ return cchNumber? lstrlenA( lpNumberStr ) : 0;
 }
 /**************************************************************************
  *              GetNumberFormat32W	(KERNEL32.xxx)
  */
-INT32 WINAPI GetNumberFormat32W(LCID locale, DWORD dwflags,
-			       LPCWSTR lpvalue,  const NUMBERFMT32W * lpFormat,
+INT WINAPI GetNumberFormatW(LCID locale, DWORD dwflags,
+			       LPCWSTR lpvalue,  const NUMBERFMTW * lpFormat,
 			       LPWSTR lpNumberStr, int cchNumber)
 {
  FIXME(file,"%s: stub, no reformating done\n",debugstr_w(lpvalue));
 
- lstrcpyn32W( lpNumberStr, lpvalue, cchNumber );
- return cchNumber? lstrlen32W( lpNumberStr ) : 0;
+ lstrcpynW( lpNumberStr, lpvalue, cchNumber );
+ return cchNumber? lstrlenW( lpNumberStr ) : 0;
 }
 /******************************************************************************
  *		OLE2NLS_CheckLocale	[intern]
@@ -3093,20 +3093,20 @@ static LCID OLE2NLS_CheckLocale (LCID locale)
  * tt time marker (AM, PM)
  *
  */
-INT32 WINAPI 
-GetTimeFormat32A(LCID locale,        /* in  */
+INT WINAPI 
+GetTimeFormatA(LCID locale,        /* in  */
 		 DWORD flags,        /* in  */
 		 LPSYSTEMTIME xtime, /* in  */ 
 		 LPCSTR format,      /* in  */
 		 LPSTR timestr,      /* out */
-		 INT32 timelen       /* in  */) 
+		 INT timelen       /* in  */) 
 { char format_buf[40];
   LPCSTR thisformat;
   SYSTEMTIME t;
   LPSYSTEMTIME thistime;
   LCID thislocale=0;
   DWORD thisflags=LOCALE_STIMEFORMAT; /* standart timeformat */
-  INT32 ret;
+  INT ret;
     
   TRACE(ole,"GetTimeFormat(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",locale,flags,xtime,format,timestr,timelen);
 
@@ -3122,7 +3122,7 @@ GetTimeFormat32A(LCID locale,        /* in  */
   { if (flags & LOCALE_NOUSEROVERRIDE)  /*use system default*/
     { thislocale = GetSystemDefaultLCID();
     }
-    GetLocaleInfo32A(thislocale, thisflags, format_buf, sizeof(format_buf));
+    GetLocaleInfoA(thislocale, thisflags, format_buf, sizeof(format_buf));
     thisformat = format_buf;
   }
   else 
@@ -3146,20 +3146,20 @@ GetTimeFormat32A(LCID locale,        /* in  */
  *		GetTimeFormat32W	[KERNEL32.423]
  * Makes a Unicode string of the time
  */
-INT32 WINAPI 
-GetTimeFormat32W(LCID locale,        /* in  */
+INT WINAPI 
+GetTimeFormatW(LCID locale,        /* in  */
 		 DWORD flags,        /* in  */
 		 LPSYSTEMTIME xtime, /* in  */ 
 		 LPCWSTR format,     /* in  */
 		 LPWSTR timestr,     /* out */
-		 INT32 timelen       /* in  */) 
+		 INT timelen       /* in  */) 
 {	WCHAR format_buf[40];
 	LPCWSTR thisformat;
 	SYSTEMTIME t;
 	LPSYSTEMTIME thistime;
 	LCID thislocale=0;
 	DWORD thisflags=LOCALE_STIMEFORMAT; /* standart timeformat */
-	INT32 ret;
+	INT ret;
 	    
 	TRACE(ole,"GetTimeFormat(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",locale,flags,
 	xtime,debugstr_w(format),timestr,timelen);
@@ -3176,7 +3176,7 @@ GetTimeFormat32W(LCID locale,        /* in  */
 	{ if (flags & LOCALE_NOUSEROVERRIDE)  /*use system default*/
 	  { thislocale = GetSystemDefaultLCID();
 	  }
-	  GetLocaleInfo32W(thislocale, thisflags, format_buf, 40);
+	  GetLocaleInfoW(thislocale, thisflags, format_buf, 40);
 	  thisformat = format_buf;
 	}	  
 	else 
diff --git a/ole/olecli.c b/ole/olecli.c
index 48c68605a24..6db40467e75 100644
--- a/ole/olecli.c
+++ b/ole/olecli.c
@@ -32,7 +32,7 @@ OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
 /******************************************************************************
  *		OleRegisterClientDoc32	[OLECLI32.41]
  */
-OLESTATUS WINAPI OleRegisterClientDoc32(LPCSTR classname, LPCSTR docname,
+OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname,
                                         LONG reserved, LHCLIENTDOC *hRet )
 {
     FIXME(ole,"(%s,%s,...): stub\n",classname,docname);
@@ -52,7 +52,7 @@ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
 /******************************************************************************
  *		OleRenameClientDoc32	[OLECLI32.43]
  */
-OLESTATUS WINAPI OleRenameClientDoc32(LHCLIENTDOC hDoc, LPCSTR newName)
+OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName)
 {
     FIXME(ole,"(%ld,%s,...): stub\n",hDoc, newName);
     return OLE_OK;
@@ -70,7 +70,7 @@ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
 /******************************************************************************
  *		OleRevokeClientDoc32	[OLECLI32.42]
  */
-OLESTATUS WINAPI OleRevokeClientDoc32(LHCLIENTDOC hServerDoc)
+OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc)
 {
     FIXME(ole,"(%ld): stub\n",hServerDoc);
     return OLE_OK;
@@ -79,7 +79,7 @@ OLESTATUS WINAPI OleRevokeClientDoc32(LHCLIENTDOC hServerDoc)
 /******************************************************************************
  *           OleCreateLinkFromClip32	[OLECLI32.11]
  */
-OLESTATUS WINAPI OleCreateLinkFromClip32( 
+OLESTATUS WINAPI OleCreateLinkFromClip( 
 	LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,
 	LPOLEOBJECT *lpoleob,OLEOPT_RENDER render,OLECLIPFORMAT clipformat
 ) {
@@ -91,14 +91,14 @@ OLESTATUS WINAPI OleCreateLinkFromClip32(
 /******************************************************************************
  *           OleQueryLinkFromClip32	[OLECLI32.9]
  */
-OLESTATUS WINAPI OleQueryLinkFromClip32(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
+OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
 	FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat);
 	return OLE_OK;
 }
 /******************************************************************************
  *           OleQueryCreateFromClip32	[OLECLI32.10]
  */
-OLESTATUS WINAPI OleQueryCreateFromClip32(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
+OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
 	FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat);
 	return OLE_OK;
 }
@@ -121,7 +121,7 @@ BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
 /******************************************************************************
  *		OleIsDcMeta32	[OLECLI32.60]
  */
-BOOL32 WINAPI OleIsDcMeta32(HDC32 hdc)
+BOOL WINAPI OleIsDcMeta(HDC hdc)
 {
         TRACE(ole,"(%04x)\n",hdc);
 	if (GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC ) != 0) {
@@ -135,7 +135,7 @@ BOOL32 WINAPI OleIsDcMeta32(HDC32 hdc)
 /******************************************************************************
  *		OleSetHostNames32	[OLECLI32.15]
  */
-OLESTATUS WINAPI OleSetHostNames32(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) {
+OLESTATUS WINAPI OleSetHostNames(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) {
 	FIXME(ole,"(%p,%s,%s): stub\n",oleob,name1,name2);
 	return OLE_OK;
 }
@@ -143,7 +143,7 @@ OLESTATUS WINAPI OleSetHostNames32(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2)
 /******************************************************************************
  *		OleQueryType32	[OLECLI32.14]
  */
-OLESTATUS WINAPI OleQueryType32(LPOLEOBJECT oleob,LONG*xlong) {
+OLESTATUS WINAPI OleQueryType(LPOLEOBJECT oleob,LONG*xlong) {
 	FIXME(ole,"(%p,%p): stub!\n",oleob,xlong);
 	if (!oleob)
 		return 0x10;
@@ -155,7 +155,7 @@ OLESTATUS WINAPI OleQueryType32(LPOLEOBJECT oleob,LONG*xlong) {
 /******************************************************************************
  *		OleCreateFromClip32	[OLECLI32.12]
  */
-OLESTATUS WINAPI OleCreateFromClip32(
+OLESTATUS WINAPI OleCreateFromClip(
 	LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,
 	LPOLEOBJECT *lpoleob,OLEOPT_RENDER render, OLECLIPFORMAT clipformat
 ) {
@@ -168,7 +168,7 @@ OLESTATUS WINAPI OleCreateFromClip32(
 /***********************************************************************
  *           OleIsCurrentClipboard32 [OLE32.110]
  */
-HRESULT WINAPI OleIsCurrentClipboard32 (
+HRESULT WINAPI OleIsCurrentClipboard (
   IDataObject *pDataObject)  /* ptr to the data obj previously copied or cut */
 {
   FIXME(ole,"(DataObject %p): stub!\n", pDataObject);
diff --git a/ole/oledlg.c b/ole/oledlg.c
index 8aef25b1c10..2adca0e5128 100644
--- a/ole/oledlg.c
+++ b/ole/oledlg.c
@@ -15,10 +15,10 @@
 /***********************************************************************
  *           OleUIAddVerbMenu32A (OLEDLG.1)
  */
-BOOL32 WINAPI OleUIAddVerbMenu32A(
+BOOL WINAPI OleUIAddVerbMenuA(
   LPOLEOBJECT lpOleObj, LPCSTR lpszShortType,
-  HMENU32 hMenu, UINT32 uPos, UINT32 uIDVerbMin, UINT32 uIDVerbMax,
-  BOOL32 bAddConvert, UINT32 idConvert, HMENU32 *lphMenu)
+  HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
+  BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
 {
   FIXME(ole, "(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
     lpOleObj, debugstr_a(lpszShortType),
@@ -32,10 +32,10 @@ BOOL32 WINAPI OleUIAddVerbMenu32A(
 /***********************************************************************
  *           OleUIAddVerbMenu32W (OLEDLG.14)
  */
-BOOL32 WINAPI OleUIAddVerbMenu32W(
+BOOL WINAPI OleUIAddVerbMenuW(
   LPOLEOBJECT lpOleObj, LPCWSTR lpszShortType,
-  HMENU32 hMenu, UINT32 uPos, UINT32 uIDVerbMin, UINT32 uIDVerbMax,
-  BOOL32 bAddConvert, UINT32 idConvert, HMENU32 *lphMenu)
+  HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
+  BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
 {
   FIXME(ole, "(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
     lpOleObj, debugstr_w(lpszShortType),
@@ -49,8 +49,8 @@ BOOL32 WINAPI OleUIAddVerbMenu32W(
 /***********************************************************************
  *           OleUICanConvertOrActivateAs32 (OLEDLG.2)
  */
-BOOL32 WINAPI OleUICanConvertOrActivateAs32(
-    REFCLSID rClsid, BOOL32 fIsLinkedObject, WORD wFormat)
+BOOL WINAPI OleUICanConvertOrActivateAs(
+    REFCLSID rClsid, BOOL fIsLinkedObject, WORD wFormat)
 {
   FIXME(ole, "(%p, %d, %hd): stub\n",
     rClsid, fIsLinkedObject, wFormat
@@ -62,7 +62,7 @@ BOOL32 WINAPI OleUICanConvertOrActivateAs32(
 /***********************************************************************
  *           OleUIInsertObject32A (OLEDLG.3)
  */
-UINT32 WINAPI OleUIInsertObject32A(LPOLEUIINSERTOBJECT32A lpOleUIInsertObject)
+UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIInsertObject);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -72,7 +72,7 @@ UINT32 WINAPI OleUIInsertObject32A(LPOLEUIINSERTOBJECT32A lpOleUIInsertObject)
 /***********************************************************************
  *           OleUIInsertObject32W (OLEDLG.20)
  */
-UINT32 WINAPI OleUIInsertObject32W(LPOLEUIINSERTOBJECT32W lpOleUIInsertObject)
+UINT WINAPI OleUIInsertObjectW(LPOLEUIINSERTOBJECTW lpOleUIInsertObject)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIInsertObject);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -82,7 +82,7 @@ UINT32 WINAPI OleUIInsertObject32W(LPOLEUIINSERTOBJECT32W lpOleUIInsertObject)
 /***********************************************************************
  *           OleUIPasteSpecial32A (OLEDLG.4)
  */
-UINT32 WINAPI OleUIPasteSpecial32A(LPOLEUIPASTESPECIAL32A lpOleUIPasteSpecial)
+UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIPasteSpecial);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -92,7 +92,7 @@ UINT32 WINAPI OleUIPasteSpecial32A(LPOLEUIPASTESPECIAL32A lpOleUIPasteSpecial)
 /***********************************************************************
  *           OleUIPasteSpecial32W (OLEDLG.22)
  */
-UINT32 WINAPI OleUIPasteSpecial32W(LPOLEUIPASTESPECIAL32W lpOleUIPasteSpecial)
+UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIPasteSpecial);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -102,7 +102,7 @@ UINT32 WINAPI OleUIPasteSpecial32W(LPOLEUIPASTESPECIAL32W lpOleUIPasteSpecial)
 /***********************************************************************
  *           OleUIEditLinks32A (OLEDLG.5)
  */
-UINT32 WINAPI OleUIEditLinks32A(LPOLEUIEDITLINKS32A lpOleUIEditLinks)
+UINT WINAPI OleUIEditLinksA(LPOLEUIEDITLINKSA lpOleUIEditLinks)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIEditLinks);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -112,7 +112,7 @@ UINT32 WINAPI OleUIEditLinks32A(LPOLEUIEDITLINKS32A lpOleUIEditLinks)
 /***********************************************************************
  *           OleUIEditLinks32W (OLEDLG.19)
  */
-UINT32 WINAPI OleUIEditLinks32W(LPOLEUIEDITLINKS32W lpOleUIEditLinks)
+UINT WINAPI OleUIEditLinksW(LPOLEUIEDITLINKSW lpOleUIEditLinks)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIEditLinks);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -122,8 +122,8 @@ UINT32 WINAPI OleUIEditLinks32W(LPOLEUIEDITLINKS32W lpOleUIEditLinks)
 /***********************************************************************
  *           OleUIChangeIcon32A (OLEDLG.6)
  */
-UINT32 WINAPI OleUIChangeIcon32A(
-  LPOLEUICHANGEICON32A lpOleUIChangeIcon)
+UINT WINAPI OleUIChangeIconA(
+  LPOLEUICHANGEICONA lpOleUIChangeIcon)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIChangeIcon);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -133,8 +133,8 @@ UINT32 WINAPI OleUIChangeIcon32A(
 /***********************************************************************
  *           OleUIChangeIcon32W (OLEDLG.16)
  */
-UINT32 WINAPI OleUIChangeIcon32W(
-  LPOLEUICHANGEICON32W lpOleUIChangeIcon)
+UINT WINAPI OleUIChangeIconW(
+  LPOLEUICHANGEICONW lpOleUIChangeIcon)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIChangeIcon);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -144,7 +144,7 @@ UINT32 WINAPI OleUIChangeIcon32W(
 /***********************************************************************
  *           OleUIConvert32A (OLEDLG.7)
  */
-UINT32 WINAPI OleUIConvert32A(LPOLEUICONVERT32A lpOleUIConvert)
+UINT WINAPI OleUIConvertA(LPOLEUICONVERTA lpOleUIConvert)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIConvert);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -154,7 +154,7 @@ UINT32 WINAPI OleUIConvert32A(LPOLEUICONVERT32A lpOleUIConvert)
 /***********************************************************************
  *           OleUIConvert32W (OLEDLG.18)
  */
-UINT32 WINAPI OleUIConvert32W(LPOLEUICONVERT32W lpOleUIConvert)
+UINT WINAPI OleUIConvertW(LPOLEUICONVERTW lpOleUIConvert)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIConvert);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -164,7 +164,7 @@ UINT32 WINAPI OleUIConvert32W(LPOLEUICONVERT32W lpOleUIConvert)
 /***********************************************************************
  *           OleUIBusy32A (OLEDLG.8)
  */
-UINT32 WINAPI OleUIBusy32A(LPOLEUIBUSY32A lpOleUIBusy)
+UINT WINAPI OleUIBusyA(LPOLEUIBUSYA lpOleUIBusy)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIBusy);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -174,7 +174,7 @@ UINT32 WINAPI OleUIBusy32A(LPOLEUIBUSY32A lpOleUIBusy)
 /***********************************************************************
  *           OleUIBusy32W (OLEDLG.15)
  */
-UINT32 WINAPI OleUIBusy32W(LPOLEUIBUSY32W lpOleUIBusy)
+UINT WINAPI OleUIBusyW(LPOLEUIBUSYW lpOleUIBusy)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIBusy);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -184,9 +184,9 @@ UINT32 WINAPI OleUIBusy32W(LPOLEUIBUSY32W lpOleUIBusy)
 /***********************************************************************
  *           OleUIUpdateLinks32A (OLEDLG.9)
  */
-BOOL32 WINAPI OleUIUpdateLinks32A(
-  LPOLEUILINKCONTAINER32A lpOleUILinkCntr,
-  HWND32 hwndParent, LPSTR lpszTitle, INT32 cLinks)
+BOOL WINAPI OleUIUpdateLinksA(
+  LPOLEUILINKCONTAINERA lpOleUILinkCntr,
+  HWND hwndParent, LPSTR lpszTitle, INT cLinks)
 {
   FIXME(ole,"(%p, 0x%08x, %s, %d): stub\n",
     lpOleUILinkCntr, hwndParent, debugstr_a(lpszTitle), cLinks
@@ -201,9 +201,9 @@ BOOL32 WINAPI OleUIUpdateLinks32A(
  *     I haven't been able to find the ordinal for this function,
  *     This means it can't be called from outside the DLL.
  */
-BOOL32 WINAPI OleUIUpdateLinks32W(
-  LPOLEUILINKCONTAINER32W lpOleUILinkCntr,
-  HWND32 hwndParent, LPWSTR lpszTitle, INT32 cLinks)
+BOOL WINAPI OleUIUpdateLinksW(
+  LPOLEUILINKCONTAINERW lpOleUILinkCntr,
+  HWND hwndParent, LPWSTR lpszTitle, INT cLinks)
 {
   FIXME(ole, "(%p, 0x%08x, %s, %d): stub\n",
     lpOleUILinkCntr, hwndParent, debugstr_w(lpszTitle), cLinks
@@ -215,8 +215,8 @@ BOOL32 WINAPI OleUIUpdateLinks32W(
 /***********************************************************************
  *           OleUIPromptUser32A (OLEDLG.10)
  */
-INT32 __cdecl OleUIPromptUser32A(
-  INT32 nTemplate, HWND32 hwndParent, ...)
+INT __cdecl OleUIPromptUserA(
+  INT nTemplate, HWND hwndParent, ...)
 {
   FIXME(ole, "(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -226,8 +226,8 @@ INT32 __cdecl OleUIPromptUser32A(
 /***********************************************************************
  *           OleUIPromptUser32W (OLEDLG.13)
  */
-INT32 __cdecl OleUIPromptUser32W(
-  INT32 nTemplate, HWND32 hwndParent, ...)
+INT __cdecl OleUIPromptUserW(
+  INT nTemplate, HWND hwndParent, ...)
 {
   FIXME(ole, "(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -237,8 +237,8 @@ INT32 __cdecl OleUIPromptUser32W(
 /***********************************************************************
  *           OleUIObjectProperties32A (OLEDLG.11)
  */
-UINT32 WINAPI OleUIObjectProperties32A(
-  LPOLEUIOBJECTPROPS32A lpOleUIObjectProps)
+UINT WINAPI OleUIObjectPropertiesA(
+  LPOLEUIOBJECTPROPSA lpOleUIObjectProps)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIObjectProps);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -248,8 +248,8 @@ UINT32 WINAPI OleUIObjectProperties32A(
 /***********************************************************************
  *           OleUIObjectProperties32W (OLEDLG.21)
  */
-UINT32 WINAPI OleUIObjectProperties32W(
-  LPOLEUIOBJECTPROPS32W lpOleUIObjectProps)
+UINT WINAPI OleUIObjectPropertiesW(
+  LPOLEUIOBJECTPROPSW lpOleUIObjectProps)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIObjectProps);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -259,8 +259,8 @@ UINT32 WINAPI OleUIObjectProperties32W(
 /***********************************************************************
  *           OleUIChangeSource32A (OLEDLG.12)
  */
-UINT32 WINAPI OleUIChangeSource32A(
-  LPOLEUICHANGESOURCE32A lpOleUIChangeSource)
+UINT WINAPI OleUIChangeSourceA(
+  LPOLEUICHANGESOURCEA lpOleUIChangeSource)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIChangeSource);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -270,8 +270,8 @@ UINT32 WINAPI OleUIChangeSource32A(
 /***********************************************************************
  *           OleUIChangeSource32W (OLEDLG.17)
  */
-UINT32 WINAPI OleUIChangeSource32W(
-  LPOLEUICHANGESOURCE32W lpOleUIChangeSource)
+UINT WINAPI OleUIChangeSourceW(
+  LPOLEUICHANGESOURCEW lpOleUIChangeSource)
 {
   FIXME(ole, "(%p): stub\n", lpOleUIChangeSource);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/ole/olefont.c b/ole/olefont.c
index 475fce67347..8b645882521 100644
--- a/ole/olefont.c
+++ b/ole/olefont.c
@@ -60,31 +60,31 @@ static void         OLEFontImpl_Destroy(OLEFontImpl* fontDesc);
 static HRESULT      WINAPI OLEFontImpl_QueryInterface(IFont* iface, REFIID riid, VOID** ppvoid);
 static ULONG        WINAPI OLEFontImpl_AddRef(IFont* iface);
 static ULONG        WINAPI OLEFontImpl_Release(IFont* iface);
-static HRESULT      WINAPI OLEFontImpl_get_Name(IFont* iface, BSTR32* pname);
-static HRESULT      WINAPI OLEFontImpl_put_Name(IFont* iface, BSTR32 name);
+static HRESULT      WINAPI OLEFontImpl_get_Name(IFont* iface, BSTR* pname);
+static HRESULT      WINAPI OLEFontImpl_put_Name(IFont* iface, BSTR name);
 static HRESULT      WINAPI OLEFontImpl_get_Size(IFont* iface, CY* psize);
 static HRESULT      WINAPI OLEFontImpl_put_Size(IFont* iface, CY size);
-static HRESULT      WINAPI OLEFontImpl_get_Bold(IFont* iface, BOOL32* pbold);
-static HRESULT      WINAPI OLEFontImpl_put_Bold(IFont* iface, BOOL32 bold);
-static HRESULT      WINAPI OLEFontImpl_get_Italic(IFont* iface, BOOL32* pitalic);
-static HRESULT      WINAPI OLEFontImpl_put_Italic(IFont* iface, BOOL32 italic);
-static HRESULT      WINAPI OLEFontImpl_get_Underline(IFont* iface, BOOL32* punderline);
-static HRESULT      WINAPI OLEFontImpl_put_Underline(IFont* iface, BOOL32 underline);
-static HRESULT      WINAPI OLEFontImpl_get_Strikethrough(IFont* iface, BOOL32* pstrikethrough);
-static HRESULT      WINAPI OLEFontImpl_put_Strikethrough(IFont* iface, BOOL32 strikethrough);
+static HRESULT      WINAPI OLEFontImpl_get_Bold(IFont* iface, BOOL* pbold);
+static HRESULT      WINAPI OLEFontImpl_put_Bold(IFont* iface, BOOL bold);
+static HRESULT      WINAPI OLEFontImpl_get_Italic(IFont* iface, BOOL* pitalic);
+static HRESULT      WINAPI OLEFontImpl_put_Italic(IFont* iface, BOOL italic);
+static HRESULT      WINAPI OLEFontImpl_get_Underline(IFont* iface, BOOL* punderline);
+static HRESULT      WINAPI OLEFontImpl_put_Underline(IFont* iface, BOOL underline);
+static HRESULT      WINAPI OLEFontImpl_get_Strikethrough(IFont* iface, BOOL* pstrikethrough);
+static HRESULT      WINAPI OLEFontImpl_put_Strikethrough(IFont* iface, BOOL strikethrough);
 static HRESULT      WINAPI OLEFontImpl_get_Weight(IFont* iface, short* pweight);
 static HRESULT      WINAPI OLEFontImpl_put_Weight(IFont* iface, short weight);
 static HRESULT      WINAPI OLEFontImpl_get_Charset(IFont* iface, short* pcharset);
 static HRESULT      WINAPI OLEFontImpl_put_Charset(IFont* iface, short charset);
-static HRESULT      WINAPI OLEFontImpl_get_hFont(IFont* iface, HFONT32* phfont);
-static HRESULT      WINAPI OLEFontImpl_put_hFont(IFont* iface, HFONT32 hfont);
+static HRESULT      WINAPI OLEFontImpl_get_hFont(IFont* iface, HFONT* phfont);
+static HRESULT      WINAPI OLEFontImpl_put_hFont(IFont* iface, HFONT hfont);
 static HRESULT      WINAPI OLEFontImpl_Clone(IFont* iface, IFont** ppfont);
 static HRESULT      WINAPI OLEFontImpl_IsEqual(IFont* iface, IFont* pFontOther);
 static HRESULT      WINAPI OLEFontImpl_SetRatio(IFont* iface, long cyLogical, long cyHimetric);
 static HRESULT      WINAPI OLEFontImpl_QueryTextMetrics(IFont* iface, TEXTMETRICOLE* ptm);
-static HRESULT      WINAPI OLEFontImpl_AddRefHfont(IFont* iface, HFONT32 hfont);
-static HRESULT      WINAPI OLEFontImpl_ReleaseHfont(IFont* iface, HFONT32 hfont);
-static HRESULT      WINAPI OLEFontImpl_SetHdc(IFont* iface, HDC32 hdc);
+static HRESULT      WINAPI OLEFontImpl_AddRefHfont(IFont* iface, HFONT hfont);
+static HRESULT      WINAPI OLEFontImpl_ReleaseHfont(IFont* iface, HFONT hfont);
+static HRESULT      WINAPI OLEFontImpl_SetHdc(IFont* iface, HDC hdc);
 
 /***********************************************************************
  * Prototypes for the implementation functions for the IDispatch
@@ -98,13 +98,13 @@ static ULONG   WINAPI OLEFontImpl_IDispatch_Release(IDispatch* iface);
 static HRESULT WINAPI OLEFontImpl_GetTypeInfoCount(IDispatch*    iface, 
 					           unsigned int* pctinfo);
 static HRESULT WINAPI OLEFontImpl_GetTypeInfo(IDispatch*  iface, 
-				       	      UINT32      iTInfo,
+				       	      UINT      iTInfo,
 				              LCID        lcid, 
 				              ITypeInfo** ppTInfo);
 static HRESULT WINAPI OLEFontImpl_GetIDsOfNames(IDispatch*  iface,
 					        REFIID      riid, 
-					        LPOLESTR32* rgszNames, 
-					        UINT32      cNames, 
+					        LPOLESTR* rgszNames, 
+					        UINT      cNames, 
 					        LCID        lcid,
 					        DISPID*     rgDispId);
 static HRESULT WINAPI OLEFontImpl_Invoke(IDispatch*  iface,
@@ -115,7 +115,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke(IDispatch*  iface,
 				         DISPPARAMS* pDispParams,
 				         VARIANT*    pVarResult, 
 				         EXCEPINFO*  pExepInfo,
-				         UINT32*     puArgErr); 
+				         UINT*     puArgErr); 
 
 /*
  * Virtual function tables for the OLEFontImpl class.
@@ -251,8 +251,8 @@ static OLEFontImpl* OLEFontImpl_Construct(LPFONTDESC fontDesc)
   newObject->description.cbSizeofstruct = sizeof(FONTDESC);
   newObject->description.lpstrName = HeapAlloc(GetProcessHeap(),
 					       0, 
-					       (lstrlen32W(fontDesc->lpstrName)+1) * sizeof(WCHAR));
-  lstrcpy32W(newObject->description.lpstrName, fontDesc->lpstrName);
+					       (lstrlenW(fontDesc->lpstrName)+1) * sizeof(WCHAR));
+  lstrcpyW(newObject->description.lpstrName, fontDesc->lpstrName);
   newObject->description.cySize         = fontDesc->cySize;
   newObject->description.sWeight        = fontDesc->sWeight;
   newObject->description.sCharset       = fontDesc->sCharset;
@@ -387,7 +387,7 @@ ULONG WINAPI OLEFontImpl_Release(
  */
 static HRESULT WINAPI OLEFontImpl_get_Name(
   IFont*  iface, 
-  BSTR32* pname)
+  BSTR* pname)
 {
   _ICOM_THIS(OLEFontImpl, iface);
 
@@ -398,7 +398,7 @@ static HRESULT WINAPI OLEFontImpl_get_Name(
     return E_POINTER;
 
   if (this->description.lpstrName!=0)
-    *pname = SysAllocString32(this->description.lpstrName);
+    *pname = SysAllocString(this->description.lpstrName);
   else
     *pname = 0;
 
@@ -412,7 +412,7 @@ static HRESULT WINAPI OLEFontImpl_get_Name(
  */
 static HRESULT WINAPI OLEFontImpl_put_Name(
   IFont* iface, 
-  BSTR32 name)
+  BSTR name)
 {
   _ICOM_THIS(OLEFontImpl, iface);
 
@@ -420,20 +420,20 @@ static HRESULT WINAPI OLEFontImpl_put_Name(
   {
     this->description.lpstrName = HeapAlloc(GetProcessHeap(),
 					    0, 
-					    (lstrlen32W(name)+1) * sizeof(WCHAR));
+					    (lstrlenW(name)+1) * sizeof(WCHAR));
   }
   else
   {
     this->description.lpstrName = HeapReAlloc(GetProcessHeap(),
 					      0, 
 					      this->description.lpstrName,
-					      (lstrlen32W(name)+1) * sizeof(WCHAR));
+					      (lstrlenW(name)+1) * sizeof(WCHAR));
   }
 
   if (this->description.lpstrName==0)
     return E_OUTOFMEMORY;
 
-  lstrcpy32W(this->description.lpstrName, name);
+  lstrcpyW(this->description.lpstrName, name);
 
   return S_OK;
 }
@@ -483,7 +483,7 @@ static HRESULT WINAPI OLEFontImpl_put_Size(
  */
 static HRESULT WINAPI OLEFontImpl_get_Bold(
   IFont*  iface, 
-  BOOL32* pbold)
+  BOOL* pbold)
 {
   FIXME(ole,"():Stub\n");
   return E_NOTIMPL;
@@ -496,7 +496,7 @@ static HRESULT WINAPI OLEFontImpl_get_Bold(
  */
 static HRESULT WINAPI OLEFontImpl_put_Bold(
   IFont* iface,
-  BOOL32 bold)
+  BOOL bold)
 {
   FIXME(ole,"():Stub\n");
   return E_NOTIMPL;
@@ -509,7 +509,7 @@ static HRESULT WINAPI OLEFontImpl_put_Bold(
  */
 static HRESULT WINAPI OLEFontImpl_get_Italic(
   IFont*  iface, 
-  BOOL32* pitalic)
+  BOOL* pitalic)
 {
   _ICOM_THIS(OLEFontImpl, iface);
 
@@ -531,7 +531,7 @@ static HRESULT WINAPI OLEFontImpl_get_Italic(
  */
 static HRESULT WINAPI OLEFontImpl_put_Italic(
   IFont* iface, 
-  BOOL32 italic)
+  BOOL italic)
 {
   _ICOM_THIS(OLEFontImpl, iface);
 
@@ -547,7 +547,7 @@ static HRESULT WINAPI OLEFontImpl_put_Italic(
  */
 static HRESULT WINAPI OLEFontImpl_get_Underline(
   IFont*  iface, 
-  BOOL32* punderline)
+  BOOL* punderline)
 {
   _ICOM_THIS(OLEFontImpl, iface);
 
@@ -569,7 +569,7 @@ static HRESULT WINAPI OLEFontImpl_get_Underline(
  */
 static HRESULT WINAPI OLEFontImpl_put_Underline(
   IFont* iface,
-  BOOL32 underline)
+  BOOL underline)
 {
   _ICOM_THIS(OLEFontImpl, iface);
 
@@ -585,7 +585,7 @@ static HRESULT WINAPI OLEFontImpl_put_Underline(
  */
 static HRESULT WINAPI OLEFontImpl_get_Strikethrough(
   IFont*  iface, 
-  BOOL32* pstrikethrough)
+  BOOL* pstrikethrough)
 {
   _ICOM_THIS(OLEFontImpl, iface);
 
@@ -607,7 +607,7 @@ static HRESULT WINAPI OLEFontImpl_get_Strikethrough(
  */
 static HRESULT WINAPI OLEFontImpl_put_Strikethrough(
  IFont* iface, 
- BOOL32 strikethrough)
+ BOOL strikethrough)
 {
   _ICOM_THIS(OLEFontImpl, iface);
 
@@ -699,7 +699,7 @@ static HRESULT WINAPI OLEFontImpl_put_Charset(
  */
 static HRESULT WINAPI OLEFontImpl_get_hFont(
   IFont*   iface,
-  HFONT32* phfont)
+  HFONT* phfont)
 {
   FIXME(ole,"():Stub\n");
   return E_NOTIMPL;
@@ -712,7 +712,7 @@ static HRESULT WINAPI OLEFontImpl_get_hFont(
  */
 static HRESULT WINAPI OLEFontImpl_put_hFont(
   IFont*  iface,
-  HFONT32 hfont)
+  HFONT hfont)
 {
   FIXME(ole,"():Stub\n");
   return E_NOTIMPL;
@@ -778,7 +778,7 @@ static HRESULT      WINAPI OLEFontImpl_QueryTextMetrics(
  */
 static HRESULT WINAPI OLEFontImpl_AddRefHfont(
   IFont*  iface, 
-  HFONT32 hfont)
+  HFONT hfont)
 {
   FIXME(ole,"():Stub\n");
   return E_NOTIMPL;
@@ -791,7 +791,7 @@ static HRESULT WINAPI OLEFontImpl_AddRefHfont(
  */
 static HRESULT WINAPI OLEFontImpl_ReleaseHfont(
   IFont*  iface,
-  HFONT32 hfont)
+  HFONT hfont)
 {
   FIXME(ole,"():Stub\n");
   return E_NOTIMPL;
@@ -804,7 +804,7 @@ static HRESULT WINAPI OLEFontImpl_ReleaseHfont(
  */
 static HRESULT WINAPI OLEFontImpl_SetHdc(
   IFont* iface,
-  HDC32  hdc)
+  HDC  hdc)
 {
   FIXME(ole,"():Stub\n");
   return E_NOTIMPL;
@@ -872,7 +872,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfoCount(
  */
 static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
   IDispatch*  iface, 
-  UINT32      iTInfo,
+  UINT      iTInfo,
   LCID        lcid, 
   ITypeInfo** ppTInfo)
 {
@@ -889,8 +889,8 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
 static HRESULT WINAPI OLEFontImpl_GetIDsOfNames(
   IDispatch*  iface,
   REFIID      riid, 
-  LPOLESTR32* rgszNames, 
-  UINT32      cNames, 
+  LPOLESTR* rgszNames, 
+  UINT      cNames, 
   LCID        lcid,
   DISPID*     rgDispId)
 {
@@ -913,7 +913,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
   DISPPARAMS* pDispParams,
   VARIANT*    pVarResult, 
   EXCEPINFO*  pExepInfo,
-  UINT32*     puArgErr)
+  UINT*     puArgErr)
 {
   FIXME(ole,"():Stub\n");
 
diff --git a/ole/oleobj.c b/ole/oleobj.c
index a561ba8ad0a..38dfb0eb7db 100644
--- a/ole/oleobj.c
+++ b/ole/oleobj.c
@@ -199,7 +199,7 @@ IOleAdviseHolder_SendOnClose (LPOLEADVISEHOLDER this)
 /***********************************************************************
  * CreateOleAdviseHolder [OLE32.59]
  */
-HRESULT WINAPI CreateOleAdviseHolder32 (LPOLEADVISEHOLDER *ppOAHolder)
+HRESULT WINAPI CreateOleAdviseHolder (LPOLEADVISEHOLDER *ppOAHolder)
 {
     FIXME(ole,"(%p): stub!\n", ppOAHolder);
 
diff --git a/ole/olesvr.c b/ole/olesvr.c
index 378e3a5b957..f7ca59d113b 100644
--- a/ole/olesvr.c
+++ b/ole/olesvr.c
@@ -38,7 +38,7 @@ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer)
 /******************************************************************************
  *		OleBlockServer32	[OLESVR32.4]
  */
-OLESTATUS WINAPI OleBlockServer32(LHSERVER hServer)
+OLESTATUS WINAPI OleBlockServer(LHSERVER hServer)
 {
     FIXME(ole,"(%ld): stub\n",hServer);
     return OLE_OK;
@@ -58,7 +58,7 @@ OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block)
 /******************************************************************************
  *		OleUnblockServer32	[OLESVR32.5]
  */
-OLESTATUS WINAPI OleUnblockServer32(LHSERVER hServer, BOOL32 *block)
+OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block)
 {
     FIXME(ole,"(%ld): stub\n",hServer);
     /* no more blocked messages :) */
@@ -90,7 +90,7 @@ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc)
 /******************************************************************************
  *		OleRevokeServerDoc32	[OLESVR32.7]
  */
-OLESTATUS WINAPI OleRevokeServerDoc32(LHSERVERDOC hServerDoc)
+OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc)
 {
     FIXME(ole,"(%ld): stub\n",hServerDoc);
     return OLE_OK;
@@ -99,7 +99,7 @@ OLESTATUS WINAPI OleRevokeServerDoc32(LHSERVERDOC hServerDoc)
 /******************************************************************************
  *		OleRevokeServer	[OLESVR.3]
  */
-OLESTATUS WINAPI OleRevokeServer(LHSERVER hServer)
+OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer)
 {
     FIXME(ole,"%ld - stub\n",hServer);
     return OLE_OK;
@@ -108,7 +108,7 @@ OLESTATUS WINAPI OleRevokeServer(LHSERVER hServer)
 /******************************************************************************
  * OleRegisterServer32 [OLESVR32.2]
  */
-OLESTATUS WINAPI OleRegisterServer32(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* hRet,HINSTANCE32 hinst,OLE_SERVER_USE osu) {
+OLESTATUS WINAPI OleRegisterServer(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* hRet,HINSTANCE hinst,OLE_SERVER_USE osu) {
 	FIXME(ole,"(%s,%p,%p,%08x,%d): stub!\n",svrname,olesvr,hRet,hinst,osu);
     	*hRet=++OLE_current_handle;
 	return OLE_OK;
@@ -117,7 +117,7 @@ OLESTATUS WINAPI OleRegisterServer32(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER*
 /******************************************************************************
  * OleRegisterServerDoc32 [OLESVR32.6]
  */
-OLESTATUS WINAPI OleRegisterServerDoc32( LHSERVER hServer, LPCSTR docname,
+OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname,
                                          LPOLESERVERDOC document,
                                          LHSERVERDOC *hRet)
 {
@@ -130,7 +130,7 @@ OLESTATUS WINAPI OleRegisterServerDoc32( LHSERVER hServer, LPCSTR docname,
  *		OleRenameServerDoc32	[OLESVR32.8]
  *
  */
-OLESTATUS WINAPI OleRenameServerDoc32(LHSERVERDOC hDoc, LPCSTR newName)
+OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName)
 {
     FIXME(ole,"(%ld,%s): stub.\n",hDoc, newName);
     return OLE_OK;
diff --git a/ole/safearray.c b/ole/safearray.c
index 8a77d2fec3f..1f45159afe3 100644
--- a/ole/safearray.c
+++ b/ole/safearray.c
@@ -18,25 +18,25 @@
 #include "wine/obj_base.h"
 
 /* Localy used methods */
-static INT32  
+static INT  
 endOfDim(LONG *coor, SAFEARRAYBOUND *mat, LONG dim, LONG realDim);
 
 static ULONG   
 calcDisplacement(LONG *coor, SAFEARRAYBOUND *mat, LONG dim);
 
-static BOOL32  
+static BOOL  
 isPointer(USHORT feature);
 
-static INT32   
+static INT   
 getFeatures(VARTYPE vt);
 
-static BOOL32  
+static BOOL  
 validCoordinate(LONG *coor, SAFEARRAY *psa);
 
-static BOOL32  
+static BOOL  
 resizeSafeArray(SAFEARRAY *psa, LONG lDelta);
 
-static BOOL32  
+static BOOL  
 validArg(SAFEARRAY *psa);
 
 static ULONG   
@@ -100,8 +100,8 @@ VARTYPE_NOT_SUPPORTED 	/* VT_BYREF    [V]          void* for local use	*/
 /*************************************************************************
  * Allocate the appropriate amount of memory for the SafeArray descriptor
  */
-HRESULT WINAPI SafeArrayAllocDescriptor32( 
-  UINT32    cDims, 
+HRESULT WINAPI SafeArrayAllocDescriptor( 
+  UINT    cDims, 
   SAFEARRAY **ppsaOut) 
 {
   SAFEARRAYBOUND *sab;
@@ -124,7 +124,7 @@ HRESULT WINAPI SafeArrayAllocDescriptor32(
 /*************************************************************************
  * Allocate the appropriate amount of data for the SafeArray data
  */
-HRESULT WINAPI SafeArrayAllocData32(
+HRESULT WINAPI SafeArrayAllocData(
   SAFEARRAY *psa) 
 {
   ULONG  ulWholeArraySize;   /* to store the size of the whole thing */
@@ -148,9 +148,9 @@ HRESULT WINAPI SafeArrayAllocData32(
 /*************************************************************************
  * Create a SafeArray object by encapsulating AllocDescriptor and AllocData 
  */
-SAFEARRAY* WINAPI SafeArrayCreate32(
+SAFEARRAY* WINAPI SafeArrayCreate(
   VARTYPE        vt, 
-  UINT32         cDims, 
+  UINT         cDims, 
   SAFEARRAYBOUND *rgsabound)
 {
   SAFEARRAY *psa;
@@ -162,7 +162,7 @@ SAFEARRAY* WINAPI SafeArrayCreate32(
     return NULL;
 
   /* Allocate memory for the array descriptor */
-  if( FAILED( hRes = SafeArrayAllocDescriptor32(cDims, &psa)))
+  if( FAILED( hRes = SafeArrayAllocDescriptor(cDims, &psa)))
     return NULL;
 
   /* setup data members... */ 
@@ -179,8 +179,8 @@ SAFEARRAY* WINAPI SafeArrayCreate32(
   }
 
   /* allocate memory for the data... */ 
-  if( FAILED( hRes = SafeArrayAllocData32(psa))) {
-    SafeArrayDestroyDescriptor32(psa); 
+  if( FAILED( hRes = SafeArrayAllocData(psa))) {
+    SafeArrayDestroyDescriptor(psa); 
     return NULL;
   }
 
@@ -190,7 +190,7 @@ SAFEARRAY* WINAPI SafeArrayCreate32(
 /*************************************************************************
  * Frees the memory associated with the descriptor.
  */
-HRESULT WINAPI SafeArrayDestroyDescriptor32(
+HRESULT WINAPI SafeArrayDestroyDescriptor(
   SAFEARRAY *psa)
 {
   /* Check for lockness before to free... */
@@ -212,7 +212,7 @@ HRESULT WINAPI SafeArrayDestroyDescriptor32(
  * only when psa->cLocks is > 0... I don't get it since pvData is allocated 
  * before the array is locked, therefore  
  */
-HRESULT WINAPI SafeArrayLock32(
+HRESULT WINAPI SafeArrayLock(
   SAFEARRAY *psa)
 {
   if(! validArg(psa))     
@@ -226,7 +226,7 @@ HRESULT WINAPI SafeArrayLock32(
 /*************************************************************************
  * Decrement the lock counter
  */
-HRESULT WINAPI SafeArrayUnlock32(
+HRESULT WINAPI SafeArrayUnlock(
   SAFEARRAY *psa)
 {
   if(! validArg(psa)) 
@@ -242,7 +242,7 @@ HRESULT WINAPI SafeArrayUnlock32(
 /*************************************************************************
  * Set the data at the given coordinate
  */
-HRESULT WINAPI SafeArrayPutElement32(
+HRESULT WINAPI SafeArrayPutElement(
   SAFEARRAY *psa, 
   LONG      *rgIndices, 
   void      *pv)
@@ -250,7 +250,7 @@ HRESULT WINAPI SafeArrayPutElement32(
   ULONG stepCountInSAData     = 0;    /* Number of array item to skip to get to 
                                          the desired one... */
   PVOID elementStorageAddress = NULL; /* Adress to store the data */
-  BSTR32  pbstrReAllocStr     = NULL; /* BSTR reallocated */
+  BSTR  pbstrReAllocStr     = NULL; /* BSTR reallocated */
 
   /* Validate the index given */
   if(! validCoordinate(rgIndices, psa)) 
@@ -258,7 +258,7 @@ HRESULT WINAPI SafeArrayPutElement32(
   if(! validArg(psa))
     return E_INVALIDARG;
 
-  if( SafeArrayLock32(psa) == S_OK) {
+  if( SafeArrayLock(psa) == S_OK) {
 
     /* Figure out the number of items to skip */
     stepCountInSAData = calcDisplacement(rgIndices, psa->rgsabound, psa->cDims);
@@ -275,14 +275,14 @@ HRESULT WINAPI SafeArrayPutElement32(
 
       if(psa->fFeatures == FADF_BSTR) { /* Create a new object */
 
-        if((pbstrReAllocStr = SysAllocString32( (OLECHAR32*)pv )) == NULL) {
-          SafeArrayUnlock32(psa);  
+        if((pbstrReAllocStr = SysAllocString( (OLECHAR*)pv )) == NULL) {
+          SafeArrayUnlock(psa);  
           return E_OUTOFMEMORY;
         } else 
-          *((BSTR32*)elementStorageAddress) = pbstrReAllocStr;
+          *((BSTR*)elementStorageAddress) = pbstrReAllocStr;
 
       } else /* dupplicate the memory */
-        memcpy(elementStorageAddress, pv, SafeArrayGetElemsize32(psa) );
+        memcpy(elementStorageAddress, pv, SafeArrayGetElemsize(psa) );
     }
 
   } else {
@@ -291,14 +291,14 @@ HRESULT WINAPI SafeArrayPutElement32(
   }
 
   TRACE(ole,"SafeArray: item put at adress %p.\n",elementStorageAddress);
-  return SafeArrayUnlock32(psa);  
+  return SafeArrayUnlock(psa);  
 }
 
 
 /*************************************************************************
  * Return the data element corresponding the the given coordinate
  */
-HRESULT WINAPI SafeArrayGetElement32(
+HRESULT WINAPI SafeArrayGetElement(
   SAFEARRAY *psa, 
   LONG      *rgIndices, 
   void      *pv)
@@ -306,7 +306,7 @@ HRESULT WINAPI SafeArrayGetElement32(
   ULONG stepCountInSAData     = 0;    /* Number of array item to skip to get to 
                                          the desired one... */
   PVOID elementStorageAddress = NULL; /* Adress to store the data */
-  BSTR32  pbstrReturnedStr    = NULL; /* BSTR reallocated */
+  BSTR  pbstrReturnedStr    = NULL; /* BSTR reallocated */
 
   if(! validArg(psa)) 
     return E_INVALIDARG;
@@ -314,7 +314,7 @@ HRESULT WINAPI SafeArrayGetElement32(
   if(! validCoordinate(rgIndices, psa)) /* Validate the index given */
     return(DISP_E_BADINDEX);
 
-  if( SafeArrayLock32(psa) == S_OK) {
+  if( SafeArrayLock(psa) == S_OK) {
 
     /* Figure out the number of items to skip */
     stepCountInSAData = calcDisplacement(rgIndices, psa->rgsabound, psa->cDims);
@@ -324,31 +324,31 @@ HRESULT WINAPI SafeArrayGetElement32(
   
     if( psa->fFeatures == FADF_BSTR) {           /* reallocate the obj */
       if( (pbstrReturnedStr = 
-          SysAllocString32( *(OLECHAR32**)elementStorageAddress )) == NULL) {
-        SafeArrayUnlock32(psa);
+          SysAllocString( *(OLECHAR**)elementStorageAddress )) == NULL) {
+        SafeArrayUnlock(psa);
         return E_OUTOFMEMORY;
       } else 
-        *((BSTR32*)pv) = pbstrReturnedStr; 
+        *((BSTR*)pv) = pbstrReturnedStr; 
         
     } else if( isPointer(psa->fFeatures) )       /* simply copy the pointer */
        pv = *((PVOID*)elementStorageAddress); 
     else                                         /* copy the bytes */
-      memcpy(pv, elementStorageAddress, SafeArrayGetElemsize32(psa) );
+      memcpy(pv, elementStorageAddress, SafeArrayGetElemsize(psa) );
 
   } else {
     ERR(ole, "SafeArray: Cannot lock array....\n");
     return E_UNEXPECTED; /* UNDOC error condition */
   }
 
-  return( SafeArrayUnlock32(psa) );  
+  return( SafeArrayUnlock(psa) );  
 }
 
 /*************************************************************************
  * return the UP bound for a given array dimension
  */
-HRESULT WINAPI SafeArrayGetUBound32(
+HRESULT WINAPI SafeArrayGetUBound(
   SAFEARRAY *psa, 
-  UINT32    nDim,
+  UINT    nDim,
   LONG      *plUbound)
 {
   if(! validArg(psa))   
@@ -366,9 +366,9 @@ HRESULT WINAPI SafeArrayGetUBound32(
 /*************************************************************************
  * Return the LO bound for a given array dimension 
  */
-HRESULT WINAPI SafeArrayGetLBound32(
+HRESULT WINAPI SafeArrayGetLBound(
   SAFEARRAY *psa,
-  UINT32    nDim, 
+  UINT    nDim, 
   LONG      *plLbound)
 {
   if(! validArg(psa))   
@@ -384,7 +384,7 @@ HRESULT WINAPI SafeArrayGetLBound32(
 /*************************************************************************
  * returns the number of dimension in the array
  */
-UINT32 WINAPI SafeArrayGetDim32(
+UINT WINAPI SafeArrayGetDim(
   SAFEARRAY * psa)
 { 
   return psa->cDims;
@@ -393,7 +393,7 @@ UINT32 WINAPI SafeArrayGetDim32(
 /*************************************************************************
  * Return the size of the element in the array
  */
-UINT32 WINAPI SafeArrayGetElemsize32(
+UINT WINAPI SafeArrayGetElemsize(
   SAFEARRAY * psa)
 { 
   return psa->cbElements;
@@ -402,7 +402,7 @@ UINT32 WINAPI SafeArrayGetElemsize32(
 /*************************************************************************
  * increment the access count and return the data 
  */
-HRESULT WINAPI SafeArrayAccessData32(
+HRESULT WINAPI SafeArrayAccessData(
   SAFEARRAY *psa, 
   void      **ppvData)
 { 
@@ -411,7 +411,7 @@ HRESULT WINAPI SafeArrayAccessData32(
   if(! validArg(psa)) 
     return E_INVALIDARG;
 
-  hRes = SafeArrayLock32(psa);
+  hRes = SafeArrayLock(psa);
 
   switch (hRes) {
     case S_OK: 
@@ -429,19 +429,19 @@ HRESULT WINAPI SafeArrayAccessData32(
 /*************************************************************************
  * Decrement the access count
  */
-HRESULT WINAPI SafeArrayUnaccessData32(
+HRESULT WINAPI SafeArrayUnaccessData(
   SAFEARRAY * psa)
 { 
   if(! validArg(psa)) 
     return E_INVALIDARG;
 
-  return(SafeArrayUnlock32(psa));
+  return(SafeArrayUnlock(psa));
 }
 
 /************************************************************************ 
  * Return a pointer to the element at rgIndices
  */
-HRESULT WINAPI SafeArrayPtrOfIndex32(
+HRESULT WINAPI SafeArrayPtrOfIndex(
   SAFEARRAY *psa, 
   LONG      *rgIndices, 
   void      **ppvData)
@@ -466,14 +466,14 @@ HRESULT WINAPI SafeArrayPtrOfIndex32(
 /************************************************************************ 
  * Frees the memory data bloc
  */
-HRESULT WINAPI SafeArrayDestroyData32(
+HRESULT WINAPI SafeArrayDestroyData(
   SAFEARRAY *psa)
 { 
   HRESULT  hRes;
   ULONG    ulWholeArraySize; /* count spot in array  */
   ULONG    ulDataIter;       /* to iterate the data space */
   IUnknown *punk;
-  BSTR32   bstr;
+  BSTR   bstr;
 
   if(! validArg(psa)) 
     return E_INVALIDARG;
@@ -495,10 +495,10 @@ HRESULT WINAPI SafeArrayDestroyData32(
   } else if(psa->fFeatures & FADF_BSTR) {  /* deallocate the obj */
 
     for(ulDataIter=0; ulDataIter < ulWholeArraySize; ulDataIter++) {
-      bstr = *(BSTR32*)(psa->pvData+(ulDataIter*(psa->cbElements)));
+      bstr = *(BSTR*)(psa->pvData+(ulDataIter*(psa->cbElements)));
 
       if( bstr != NULL) 
-        SysFreeString32( bstr );
+        SysFreeString( bstr );
     }
   }
       
@@ -521,7 +521,7 @@ HRESULT WINAPI SafeArrayDestroyData32(
  * Copy the psaSource's data block into psaTarget if dimension and size
  * permits it.
  */
-HRESULT WINAPI SafeArrayCopyData32(
+HRESULT WINAPI SafeArrayCopyData(
   SAFEARRAY *psaSource,
   SAFEARRAY **psaTarget)
 { 
@@ -529,12 +529,12 @@ HRESULT WINAPI SafeArrayCopyData32(
   LONG     lDelta;           /* looper */
   IUnknown *punk;   
   ULONG    ulWholeArraySize; /* Number of item in SA */
-  BSTR32   bstr;
+  BSTR   bstr;
 
   if(! (validArg(psaSource) && validArg(*psaTarget)) ) 
     return E_INVALIDARG;
 
-  if(SafeArrayGetDim32(psaSource) != SafeArrayGetDim32(*psaTarget))
+  if(SafeArrayGetDim(psaSource) != SafeArrayGetDim(*psaTarget))
     return E_INVALIDARG;
 
   ulWholeArraySize = getArraySize(psaSource); 
@@ -559,10 +559,10 @@ HRESULT WINAPI SafeArrayCopyData32(
                                                         that must be freed */ 
     for(lDelta=0;lDelta < ulWholeArraySize; lDelta++) {
       bstr = 
-        *(BSTR32*)((*psaTarget)->pvData + (lDelta * (*psaTarget)->cbElements));
+        *(BSTR*)((*psaTarget)->pvData + (lDelta * (*psaTarget)->cbElements));
 
       if( bstr != NULL) 
-        SysFreeString32( bstr );
+        SysFreeString( bstr );
     }
   }
 
@@ -572,7 +572,7 @@ HRESULT WINAPI SafeArrayCopyData32(
 /************************************************************************ 
  * Deallocates all memory reserved for the SafeArray
  */
-HRESULT WINAPI SafeArrayDestroy32(
+HRESULT WINAPI SafeArrayDestroy(
   SAFEARRAY * psa)
 { 
   HRESULT hRes;
@@ -583,8 +583,8 @@ HRESULT WINAPI SafeArrayDestroy32(
   if(psa->cLocks > 0) 
     return DISP_E_ARRAYISLOCKED;
 
-  if((hRes = SafeArrayDestroyData32( psa )) == S_OK)
-    if((hRes = SafeArrayDestroyDescriptor32( psa )) == S_OK)
+  if((hRes = SafeArrayDestroyData( psa )) == S_OK)
+    if((hRes = SafeArrayDestroyDescriptor( psa )) == S_OK)
       return S_OK;
 
   return E_UNEXPECTED; /* UNDOC error condition */
@@ -593,7 +593,7 @@ HRESULT WINAPI SafeArrayDestroy32(
 /************************************************************************ 
  * Make a dupplicate of a SafeArray
  */
-HRESULT WINAPI SafeArrayCopy32(
+HRESULT WINAPI SafeArrayCopy(
   SAFEARRAY *psa, 
   SAFEARRAY **ppsaOut)
 { 
@@ -603,7 +603,7 @@ HRESULT WINAPI SafeArrayCopy32(
   if(! validArg(psa)) 
     return E_INVALIDARG;
 
-  if((hRes=SafeArrayAllocDescriptor32(psa->cDims, ppsaOut)) == S_OK){
+  if((hRes=SafeArrayAllocDescriptor(psa->cDims, ppsaOut)) == S_OK){
 
     /* Duplicate the SAFEARRAY struc */
     memcpy(*ppsaOut, psa, 
@@ -621,12 +621,12 @@ HRESULT WINAPI SafeArrayCopy32(
       if( (hRes=duplicateData(psa, ppsaOut)) != S_OK) { /* E_OUTOFMEMORY */
         HeapFree(GetProcessHeap(), 0, (*ppsaOut)->pvData);
         (*ppsaOut)->pvData = NULL;
-        SafeArrayDestroyDescriptor32(*ppsaOut);
+        SafeArrayDestroyDescriptor(*ppsaOut);
         return hRes;
       }
         
     } else { /* failed to allocate or dupplicate... */
-      SafeArrayDestroyDescriptor32(*ppsaOut);
+      SafeArrayDestroyDescriptor(*ppsaOut);
       return E_UNEXPECTED; /* UNDOC error condition */
     }
   } else { /* failed to allocate mem for descriptor */
@@ -640,7 +640,7 @@ HRESULT WINAPI SafeArrayCopy32(
  * Creates a one dimension safearray where the data is next to the 
  * SAFEARRAY structure.
  */
-SAFEARRAY* WINAPI SafeArrayCreateVector32(
+SAFEARRAY* WINAPI SafeArrayCreateVector(
   VARTYPE vt, 
   LONG    lLbound, 
   ULONG   cElements) 
@@ -674,7 +674,7 @@ SAFEARRAY* WINAPI SafeArrayCreateVector32(
 /************************************************************************ 
  * Changes the caracteristics of the last dimension of the SafeArray
  */
-HRESULT WINAPI SafeArrayRedim32(
+HRESULT WINAPI SafeArrayRedim(
   SAFEARRAY      *psa, 
   SAFEARRAYBOUND *psaboundNew)
 { 
@@ -690,7 +690,7 @@ HRESULT WINAPI SafeArrayRedim32(
   if( psa->fFeatures & FADF_FIXEDSIZE )    
     return E_INVALIDARG;
 
-  if( SafeArrayLock32(psa)==E_UNEXPECTED ) 
+  if( SafeArrayLock(psa)==E_UNEXPECTED ) 
     return E_UNEXPECTED;/* UNDOC error condition */
 
   /* find the delta in number of array spot to apply to the new array */
@@ -710,7 +710,7 @@ HRESULT WINAPI SafeArrayRedim32(
   psa->rgsabound[0].cElements = psaboundNew->cElements;
   psa->rgsabound[0].lLbound   = psaboundNew->lLbound;
 
-  return SafeArrayUnlock32(psa);
+  return SafeArrayUnlock(psa);
 }
 
 /************************************************************************
@@ -720,7 +720,7 @@ HRESULT WINAPI SafeArrayRedim32(
 /************************************************************************ 
  * Used to validate the SAFEARRAY type of arg
  */
-static BOOL32 validArg(
+static BOOL validArg(
   SAFEARRAY *psa) 
 {
   SAFEARRAYBOUND *sab;
@@ -745,14 +745,14 @@ static BOOL32 validArg(
 /************************************************************************ 
  * Used to reallocate memory
  */
-static BOOL32 resizeSafeArray(
+static BOOL resizeSafeArray(
   SAFEARRAY *psa, 
   LONG lDelta)
 {
   ULONG    ulWholeArraySize;  /* use as multiplicator */
   PVOID    pvNewBlock = NULL;  
   IUnknown *punk;
-  BSTR32   bstr;
+  BSTR   bstr;
 
   ulWholeArraySize = getArraySize(psa);
 
@@ -768,11 +768,11 @@ static BOOL32 resizeSafeArray(
 
     else if(psa->fFeatures & FADF_BSTR)  /* BSTR that need to be freed */
 	    for(;lDelta < 0; lDelta++) {
-        bstr = *(BSTR32*)
+        bstr = *(BSTR*)
           (psa->pvData+((ulWholeArraySize+lDelta)*psa->cbElements));
 
         if( bstr != NULL )
-          SysFreeString32( bstr );
+          SysFreeString( bstr );
       }
   }
 
@@ -797,7 +797,7 @@ static BOOL32 resizeSafeArray(
 /************************************************************************ 
  * Used to set the fFeatures data member of the SAFEARRAY structure. 
  */
-static INT32 getFeatures(
+static INT getFeatures(
   VARTYPE vt) 
 {
   switch(vt) {
@@ -812,7 +812,7 @@ static INT32 getFeatures(
  * Used to figure out if the fFeatures data member of the SAFEARRAY 
  * structure contain any information about the type of data stored... 
  */
-static BOOL32 isPointer(
+static BOOL isPointer(
   USHORT feature) 
 {
   switch(feature) {
@@ -853,7 +853,7 @@ static ULONG calcDisplacement(
  * Recursivity agent for calcDisplacement method.  Used within Put and 
  * Get methods.
  */
-static INT32 endOfDim(
+static INT endOfDim(
   LONG           *coor, 
   SAFEARRAYBOUND *mat, 
   LONG           dim, 
@@ -870,19 +870,19 @@ static INT32 endOfDim(
  * Method used to validate the coordinate received in Put and Get 
  * methods.
  */
-static BOOL32 validCoordinate(
+static BOOL validCoordinate(
   LONG      *coor, 
   SAFEARRAY *psa) 
 {
-  INT32   iter=0;
+  INT   iter=0;
   LONG    lUBound;
   LONG    lLBound;
   HRESULT hRes;
 
   for(; iter<psa->cDims; iter++) {
-    if((hRes = SafeArrayGetLBound32(psa, iter, &lLBound)) != S_OK)
+    if((hRes = SafeArrayGetLBound(psa, iter, &lLBound)) != S_OK)
       return FALSE;
-    if((hRes = SafeArrayGetUBound32(psa, iter, &lUBound)) != S_OK)
+    if((hRes = SafeArrayGetUBound(psa, iter, &lUBound)) != S_OK)
       return FALSE;
  
     if(lLBound == lUBound) 
@@ -922,11 +922,11 @@ static HRESULT duplicateData(
   ULONG    ulWholeArraySize; /* size of the thing */
   LONG     lDelta;
   IUnknown *punk;
-  BSTR32   pbstrReAllocStr = NULL; /* BSTR reallocated */
+  BSTR   pbstrReAllocStr = NULL; /* BSTR reallocated */
 
   ulWholeArraySize = getArraySize(psa); /* Number of item in SA */
   
-  SafeArrayLock32(*ppsaOut);
+  SafeArrayLock(*ppsaOut);
 
   if( isPointer(psa->fFeatures) ) {  /* If datatype is object increment 
                                         object's reference count */
@@ -946,14 +946,14 @@ static HRESULT duplicateData(
                                                the BSTR in the new array */
 
     for(lDelta=0; lDelta < ulWholeArraySize; lDelta++) {
-      if(( pbstrReAllocStr = SysAllocString32(
-            *(BSTR32*)(psa->pvData+(lDelta * psa->cbElements)))) == NULL) {
+      if(( pbstrReAllocStr = SysAllocString(
+            *(BSTR*)(psa->pvData+(lDelta * psa->cbElements)))) == NULL) {
 
-        SafeArrayUnlock32(*ppsaOut);
+        SafeArrayUnlock(*ppsaOut);
         return E_OUTOFMEMORY;
       }
 
-      *((BSTR32*)((*ppsaOut)->pvData+(lDelta * psa->cbElements))) = 
+      *((BSTR*)((*ppsaOut)->pvData+(lDelta * psa->cbElements))) = 
         pbstrReAllocStr;
     }
 
@@ -963,7 +963,7 @@ static HRESULT duplicateData(
       ulWholeArraySize*psa->cbElements);
   }
 
-  SafeArrayUnlock32(*ppsaOut);
+  SafeArrayUnlock(*ppsaOut);
 
   return S_OK;
 }
diff --git a/ole/stg_bigblockfile.c b/ole/stg_bigblockfile.c
index 1b50496311f..e523a576f25 100644
--- a/ole/stg_bigblockfile.c
+++ b/ole/stg_bigblockfile.c
@@ -96,7 +96,7 @@ static DWORD BIGBLOCKFILE_GetProtectMode(DWORD openFlags);
  * and the blocks in use list.
  */
 BigBlockFile * BIGBLOCKFILE_Construct(
-  HANDLE32 hFile, 
+  HANDLE hFile, 
     DWORD    openFlags,
   ULONG    blocksize)
 {
@@ -109,7 +109,7 @@ BigBlockFile * BIGBLOCKFILE_Construct(
 
   This->hfile = hFile;
   
-  if (This->hfile == INVALID_HANDLE_VALUE32)
+  if (This->hfile == INVALID_HANDLE_VALUE)
   {
     HeapFree(GetProcessHeap(), 0, This);
     return NULL;
@@ -119,7 +119,7 @@ BigBlockFile * BIGBLOCKFILE_Construct(
 
   /* create the file mapping object
    */
-  This->hfilemap = CreateFileMapping32A(This->hfile,
+  This->hfilemap = CreateFileMappingA(This->hfile,
 					NULL,
 					This->flProtect, 
 					0, 0,
@@ -330,7 +330,7 @@ void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize)
   /*
    * re-create the file mapping object
    */
-  This->hfilemap = CreateFileMapping32A(This->hfile,
+  This->hfilemap = CreateFileMappingA(This->hfile,
 					NULL,
 					This->flProtect,
 					0, 0, 
@@ -828,9 +828,9 @@ static void BIGBLOCKFILE_FreeAllMappedPages(
 static DWORD BIGBLOCKFILE_GetProtectMode(DWORD openFlags)
 {
   DWORD flProtect        = PAGE_READONLY;
-  BOOL32 bSTGM_WRITE     = ((openFlags & STGM_WRITE) == STGM_WRITE);
-  BOOL32 bSTGM_READWRITE = ((openFlags & STGM_READWRITE) == STGM_READWRITE);
-  BOOL32 bSTGM_READ      = ! (bSTGM_WRITE || bSTGM_READWRITE);
+  BOOL bSTGM_WRITE     = ((openFlags & STGM_WRITE) == STGM_WRITE);
+  BOOL bSTGM_READWRITE = ((openFlags & STGM_READWRITE) == STGM_READWRITE);
+  BOOL bSTGM_READ      = ! (bSTGM_WRITE || bSTGM_READWRITE);
 
   if (bSTGM_READ)
     flProtect = PAGE_READONLY;
diff --git a/ole/stg_stream.c b/ole/stg_stream.c
index 15373299fef..2d82e572e8d 100644
--- a/ole/stg_stream.c
+++ b/ole/stg_stream.c
@@ -26,7 +26,7 @@
 /*
  * Virtual function table for the StgStreamImpl class.
  */
-static ICOM_VTABLE(IStream32) StgStreamImpl_Vtbl =
+static ICOM_VTABLE(IStream) StgStreamImpl_Vtbl =
 {
     StgStreamImpl_QueryInterface,
     StgStreamImpl_AddRef,
@@ -56,7 +56,7 @@ static ICOM_VTABLE(IStream32) StgStreamImpl_Vtbl =
  *    ownerProperty - Index of the property that points to this stream.
  */
 StgStreamImpl* StgStreamImpl_Construct(
-		Storage32BaseImpl* parentStorage,
+		StorageBaseImpl* parentStorage,
 		ULONG              ownerProperty)
 {
   StgStreamImpl* newStream;
@@ -76,7 +76,7 @@ StgStreamImpl* StgStreamImpl_Construct(
      * stream out-lives the storage in the client application.
      */
     newStream->parentStorage = parentStorage;
-    IStorage32_AddRef((IStorage32*)newStream->parentStorage);
+    IStorage_AddRef((IStorage*)newStream->parentStorage);
     
     newStream->ownerProperty = ownerProperty;
     
@@ -116,7 +116,7 @@ void StgStreamImpl_Destroy(StgStreamImpl* This)
   /*
    * Release the reference we are holding on the parent storage.
    */
-  IStorage32_Release((IStorage32*)This->parentStorage);
+  IStorage_Release((IStorage*)This->parentStorage);
   This->parentStorage = 0;
 
   /*
@@ -145,7 +145,7 @@ void StgStreamImpl_Destroy(StgStreamImpl* This)
  * class
  */
 HRESULT WINAPI StgStreamImpl_QueryInterface(
-		  IStream32*     iface,
+		  IStream*     iface,
 		  REFIID         riid,	      /* [in] */          
 		  void**         ppvObject)   /* [iid_is][out] */ 
 {
@@ -167,11 +167,11 @@ HRESULT WINAPI StgStreamImpl_QueryInterface(
    */
   if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
-    *ppvObject = (IStream32*)This;
+    *ppvObject = (IStream*)This;
   }
   else if (memcmp(&IID_IStorage, riid, sizeof(IID_IStream)) == 0) 
   {
-    *ppvObject = (IStream32*)This;
+    *ppvObject = (IStream*)This;
   }
   
   /*
@@ -194,7 +194,7 @@ HRESULT WINAPI StgStreamImpl_QueryInterface(
  * class
  */
 ULONG WINAPI StgStreamImpl_AddRef(
-		IStream32* iface)
+		IStream* iface)
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
 
@@ -208,7 +208,7 @@ ULONG WINAPI StgStreamImpl_AddRef(
  * class
  */
 ULONG WINAPI StgStreamImpl_Release(
-		IStream32* iface)
+		IStream* iface)
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
 
@@ -238,7 +238,7 @@ void StgStreamImpl_OpenBlockChain(
         StgStreamImpl* This)
 {
   StgProperty    curProperty;
-  BOOL32         readSucessful;
+  BOOL         readSucessful;
 
   /*
    * Make sure no old object is staying behind.
@@ -258,7 +258,7 @@ void StgStreamImpl_OpenBlockChain(
   /*
    * Read the information from the property.
    */
-  readSucessful = Storage32Impl_ReadProperty(This->parentStorage->ancestorStorage,
+  readSucessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage,
 					     This->ownerProperty,
 					     &curProperty);
   
@@ -305,7 +305,7 @@ void StgStreamImpl_OpenBlockChain(
  * See the documentation of ISequentialStream for more info.
  */
 HRESULT WINAPI StgStreamImpl_Read( 
-		  IStream32*     iface,
+		  IStream*     iface,
 		  void*          pv,        /* [length_is][size_is][out] */
 		  ULONG          cb,        /* [in] */                     
 		  ULONG*         pcbRead)   /* [out] */                    
@@ -385,7 +385,7 @@ HRESULT WINAPI StgStreamImpl_Read(
  * See the documentation of ISequentialStream for more info.
  */
 HRESULT WINAPI StgStreamImpl_Write(
-	          IStream32*     iface,
+	          IStream*     iface,
 		  const void*    pv,          /* [size_is][in] */ 
 		  ULONG          cb,          /* [in] */          
 		  ULONG*         pcbWritten)  /* [out] */         
@@ -462,7 +462,7 @@ HRESULT WINAPI StgStreamImpl_Write(
  * See the documentation of IStream for more info.
  */        
 HRESULT WINAPI StgStreamImpl_Seek( 
-		  IStream32*      iface,
+		  IStream*      iface,
 		  LARGE_INTEGER   dlibMove,         /* [in] */ 
 		  DWORD           dwOrigin,         /* [in] */ 
 		  ULARGE_INTEGER* plibNewPosition) /* [out] */
@@ -539,13 +539,13 @@ HRESULT WINAPI StgStreamImpl_Seek(
  * See the documentation of IStream for more info.
  */
 HRESULT WINAPI StgStreamImpl_SetSize( 
-				     IStream32*      iface,
+				     IStream*      iface,
 				     ULARGE_INTEGER  libNewSize)   /* [in] */ 
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
 
   StgProperty    curProperty;
-  BOOL32         Success;
+  BOOL         Success;
 
   /*
    * As documented.
@@ -579,7 +579,7 @@ HRESULT WINAPI StgStreamImpl_SetSize(
   /*
    * Read this stream's property to see if it's small blocks or big blocks
    */
-  Success = Storage32Impl_ReadProperty(This->parentStorage->ancestorStorage,
+  Success = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage,
                                        This->ownerProperty,
                                        &curProperty); 
   /*
@@ -611,7 +611,7 @@ HRESULT WINAPI StgStreamImpl_SetSize(
   /*
    * Write to the property the new information about this stream
    */
-  Success = Storage32Impl_ReadProperty(This->parentStorage->ancestorStorage,
+  Success = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage,
                                        This->ownerProperty,
                                        &curProperty);
 
@@ -620,7 +620,7 @@ HRESULT WINAPI StgStreamImpl_SetSize(
   
   if (Success)
   {
-    Storage32Impl_WriteProperty(This->parentStorage->ancestorStorage,
+    StorageImpl_WriteProperty(This->parentStorage->ancestorStorage,
 				This->ownerProperty,
 				&curProperty);
   }
@@ -631,8 +631,8 @@ HRESULT WINAPI StgStreamImpl_SetSize(
 }
         
 HRESULT WINAPI StgStreamImpl_CopyTo( 
-				    IStream32*      iface,
-				    IStream32*      pstm,         /* [unique][in] */ 
+				    IStream*      iface,
+				    IStream*      pstm,         /* [unique][in] */ 
 				    ULARGE_INTEGER  cb,           /* [in] */         
 				    ULARGE_INTEGER* pcbRead,      /* [out] */        
 				    ULARGE_INTEGER* pcbWritten)   /* [out] */        
@@ -649,7 +649,7 @@ HRESULT WINAPI StgStreamImpl_CopyTo(
  * See the documentation of IStream for more info.
  */        
 HRESULT WINAPI StgStreamImpl_Commit( 
-		  IStream32*      iface,
+		  IStream*      iface,
 		  DWORD           grfCommitFlags)  /* [in] */ 
 {
   return S_OK;
@@ -664,13 +664,13 @@ HRESULT WINAPI StgStreamImpl_Commit(
  * See the documentation of IStream for more info.
  */        
 HRESULT WINAPI StgStreamImpl_Revert( 
-		  IStream32* iface)
+		  IStream* iface)
 {
   return S_OK;
 }
 
 HRESULT WINAPI StgStreamImpl_LockRegion( 
-					IStream32*     iface,
+					IStream*     iface,
 					ULARGE_INTEGER libOffset,   /* [in] */ 
 					ULARGE_INTEGER cb,          /* [in] */ 
 					DWORD          dwLockType)  /* [in] */ 
@@ -679,7 +679,7 @@ HRESULT WINAPI StgStreamImpl_LockRegion(
 }
 
 HRESULT WINAPI StgStreamImpl_UnlockRegion( 
-					  IStream32*     iface,
+					  IStream*     iface,
 					  ULARGE_INTEGER libOffset,   /* [in] */ 
 					  ULARGE_INTEGER cb,          /* [in] */ 
 					  DWORD          dwLockType)  /* [in] */ 
@@ -696,19 +696,19 @@ HRESULT WINAPI StgStreamImpl_UnlockRegion(
  * See the documentation of IStream for more info.
  */        
 HRESULT WINAPI StgStreamImpl_Stat( 
-		  IStream32*     iface,
+		  IStream*     iface,
 		  STATSTG*       pstatstg,     /* [out] */
 		  DWORD          grfStatFlag)  /* [in] */ 
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
 
   StgProperty    curProperty;
-  BOOL32         readSucessful;
+  BOOL         readSucessful;
   
   /*
    * Read the information from the property.
    */
-  readSucessful = Storage32Impl_ReadProperty(This->parentStorage->ancestorStorage,
+  readSucessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage,
 					     This->ownerProperty,
 					     &curProperty);
   
@@ -725,8 +725,8 @@ HRESULT WINAPI StgStreamImpl_Stat(
 }
         
 HRESULT WINAPI StgStreamImpl_Clone( 
-				   IStream32*     iface,
-				   IStream32**    ppstm) /* [out] */ 
+				   IStream*     iface,
+				   IStream**    ppstm) /* [out] */ 
 {
   return E_NOTIMPL;
 }
diff --git a/ole/storage.c b/ole/storage.c
index 7c306e5df8f..f9b18379b4f 100644
--- a/ole/storage.c
+++ b/ole/storage.c
@@ -83,15 +83,15 @@ static void _create_istream16(LPSTREAM16 *str);
  *
  * Reading OLE compound storage
  */
-static BOOL32
-STORAGE_get_big_block(HFILE32 hf,int n,BYTE *block) {
+static BOOL
+STORAGE_get_big_block(HFILE hf,int n,BYTE *block) {
 	assert(n>=-1);
-	if (-1==_llseek32(hf,(n+1)*BIGSIZE,SEEK_SET)) {
+	if (-1==_llseek(hf,(n+1)*BIGSIZE,SEEK_SET)) {
 		WARN(ole," seek failed (%ld)\n",GetLastError());
 		return FALSE;
 	}
-	assert((n+1)*BIGSIZE==_llseek32(hf,0,SEEK_CUR));
-	if (BIGSIZE!=_lread32(hf,block,BIGSIZE)) {
+	assert((n+1)*BIGSIZE==_llseek(hf,0,SEEK_CUR));
+	if (BIGSIZE!=_lread(hf,block,BIGSIZE)) {
 		WARN(ole,"(block size %d): read didn't read (%ld)\n",n,GetLastError());
 		assert(0);
 		return FALSE;
@@ -102,15 +102,15 @@ STORAGE_get_big_block(HFILE32 hf,int n,BYTE *block) {
 /******************************************************************************
  * STORAGE_put_big_block [INTERNAL]
  */
-static BOOL32
-STORAGE_put_big_block(HFILE32 hf,int n,BYTE *block) {
+static BOOL
+STORAGE_put_big_block(HFILE hf,int n,BYTE *block) {
 	assert(n>=-1);
-	if (-1==_llseek32(hf,(n+1)*BIGSIZE,SEEK_SET)) {
+	if (-1==_llseek(hf,(n+1)*BIGSIZE,SEEK_SET)) {
 		WARN(ole," seek failed (%ld)\n",GetLastError());
 		return FALSE;
 	}
-	assert((n+1)*BIGSIZE==_llseek32(hf,0,SEEK_CUR));
-	if (BIGSIZE!=_lwrite32(hf,block,BIGSIZE)) {
+	assert((n+1)*BIGSIZE==_llseek(hf,0,SEEK_CUR));
+	if (BIGSIZE!=_lwrite(hf,block,BIGSIZE)) {
 		WARN(ole," write failed (%ld)\n",GetLastError());
 		return FALSE;
 	}
@@ -121,8 +121,8 @@ STORAGE_put_big_block(HFILE32 hf,int n,BYTE *block) {
  * STORAGE_get_next_big_blocknr [INTERNAL]
  */
 static int
-STORAGE_get_next_big_blocknr(HFILE32 hf,int blocknr) {
-	INT32	bbs[BIGSIZE/sizeof(INT32)];
+STORAGE_get_next_big_blocknr(HFILE hf,int blocknr) {
+	INT	bbs[BIGSIZE/sizeof(INT)];
 	struct	storage_header	sth;
 
 	READ_HEADER;
@@ -140,8 +140,8 @@ STORAGE_get_next_big_blocknr(HFILE32 hf,int blocknr) {
  * STORAGE_get_nth_next_big_blocknr [INTERNAL]
  */
 static int
-STORAGE_get_nth_next_big_blocknr(HFILE32 hf,int blocknr,int nr) {
-	INT32	bbs[BIGSIZE/sizeof(INT32)];
+STORAGE_get_nth_next_big_blocknr(HFILE hf,int blocknr,int nr) {
+	INT	bbs[BIGSIZE/sizeof(INT)];
 	int	lastblock = -1;
 	struct storage_header sth;
 
@@ -165,8 +165,8 @@ STORAGE_get_nth_next_big_blocknr(HFILE32 hf,int blocknr,int nr) {
 /******************************************************************************
  *		STORAGE_get_root_pps_entry	[Internal]
  */
-static BOOL32
-STORAGE_get_root_pps_entry(HFILE32 hf,struct storage_pps_entry *pstde) {
+static BOOL
+STORAGE_get_root_pps_entry(HFILE hf,struct storage_pps_entry *pstde) {
 	int	blocknr,i;
 	BYTE	block[BIGSIZE];
 	struct storage_pps_entry	*stde=(struct storage_pps_entry*)block;
@@ -192,8 +192,8 @@ STORAGE_get_root_pps_entry(HFILE32 hf,struct storage_pps_entry *pstde) {
 /******************************************************************************
  * STORAGE_get_small_block [INTERNAL]
  */
-static BOOL32
-STORAGE_get_small_block(HFILE32 hf,int blocknr,BYTE *sblock) {
+static BOOL
+STORAGE_get_small_block(HFILE hf,int blocknr,BYTE *sblock) {
 	BYTE				block[BIGSIZE];
 	int				bigblocknr;
 	struct storage_pps_entry	root;
@@ -211,8 +211,8 @@ STORAGE_get_small_block(HFILE32 hf,int blocknr,BYTE *sblock) {
 /******************************************************************************
  * STORAGE_put_small_block [INTERNAL]
  */
-static BOOL32
-STORAGE_put_small_block(HFILE32 hf,int blocknr,BYTE *sblock) {
+static BOOL
+STORAGE_put_small_block(HFILE hf,int blocknr,BYTE *sblock) {
 	BYTE				block[BIGSIZE];
 	int				bigblocknr;
 	struct storage_pps_entry	root;
@@ -233,9 +233,9 @@ STORAGE_put_small_block(HFILE32 hf,int blocknr,BYTE *sblock) {
  * STORAGE_get_next_small_blocknr [INTERNAL]
  */
 static int
-STORAGE_get_next_small_blocknr(HFILE32 hf,int blocknr) {
+STORAGE_get_next_small_blocknr(HFILE hf,int blocknr) {
 	BYTE				block[BIGSIZE];
-	LPINT32				sbd = (LPINT32)block;
+	LPINT				sbd = (LPINT)block;
 	int				bigblocknr;
 	struct storage_header		sth;
 
@@ -252,10 +252,10 @@ STORAGE_get_next_small_blocknr(HFILE32 hf,int blocknr) {
  * STORAGE_get_nth_next_small_blocknr [INTERNAL]
  */
 static int
-STORAGE_get_nth_next_small_blocknr(HFILE32 hf,int blocknr,int nr) {
+STORAGE_get_nth_next_small_blocknr(HFILE hf,int blocknr,int nr) {
 	int	lastblocknr;
 	BYTE	block[BIGSIZE];
-	LPINT32	sbd = (LPINT32)block;
+	LPINT	sbd = (LPINT)block;
 	struct storage_header sth;
 
 	READ_HEADER;
@@ -281,7 +281,7 @@ STORAGE_get_nth_next_small_blocknr(HFILE32 hf,int blocknr,int nr) {
  * STORAGE_get_pps_entry [INTERNAL]
  */
 static int
-STORAGE_get_pps_entry(HFILE32 hf,int n,struct storage_pps_entry *pstde) {
+STORAGE_get_pps_entry(HFILE hf,int n,struct storage_pps_entry *pstde) {
 	int	blocknr;
 	BYTE	block[BIGSIZE];
 	struct storage_pps_entry *stde = (struct storage_pps_entry*)(((LPBYTE)block)+128*(n&3));
@@ -301,7 +301,7 @@ STORAGE_get_pps_entry(HFILE32 hf,int n,struct storage_pps_entry *pstde) {
  *		STORAGE_put_pps_entry	[Internal]
  */
 static int
-STORAGE_put_pps_entry(HFILE32 hf,int n,struct storage_pps_entry *pstde) {
+STORAGE_put_pps_entry(HFILE hf,int n,struct storage_pps_entry *pstde) {
 	int	blocknr;
 	BYTE	block[BIGSIZE];
 	struct storage_pps_entry *stde = (struct storage_pps_entry*)(((LPBYTE)block)+128*(n&3));
@@ -322,7 +322,7 @@ STORAGE_put_pps_entry(HFILE32 hf,int n,struct storage_pps_entry *pstde) {
  *		STORAGE_look_for_named_pps	[Internal]
  */
 static int
-STORAGE_look_for_named_pps(HFILE32 hf,int n,LPOLESTR32 name) {
+STORAGE_look_for_named_pps(HFILE hf,int n,LPOLESTR name) {
 	struct storage_pps_entry	stde;
 	int				ret;
 
@@ -331,7 +331,7 @@ STORAGE_look_for_named_pps(HFILE32 hf,int n,LPOLESTR32 name) {
 	if (1!=STORAGE_get_pps_entry(hf,n,&stde))
 		return -1;
 
-	if (!lstrcmp32W(name,stde.pps_rawname))
+	if (!lstrcmpW(name,stde.pps_rawname))
 		return n;
 	if (stde.pps_prev != -1) {
 		ret=STORAGE_look_for_named_pps(hf,stde.pps_prev,name);
@@ -382,14 +382,14 @@ STORAGE_dump_pps_entry(struct storage_pps_entry *stde) {
 /******************************************************************************
  * STORAGE_init_storage [INTERNAL]
  */
-static BOOL32 
-STORAGE_init_storage(HFILE32 hf) {
+static BOOL 
+STORAGE_init_storage(HFILE hf) {
 	BYTE	block[BIGSIZE];
 	LPDWORD	bbs;
 	struct storage_header *sth;
 	struct storage_pps_entry *stde;
 
-	assert(-1!=_llseek32(hf,0,SEEK_SET));
+	assert(-1!=_llseek(hf,0,SEEK_SET));
 	/* block -1 is the storage header */
 	sth = (struct storage_header*)block;
 	memcpy(sth->magic,STORAGE_magic,8);
@@ -401,35 +401,35 @@ STORAGE_init_storage(HFILE32 hf) {
 	sth->sbd_startblock	= 0xffffffff;
 	memset(sth->bbd_list,0xff,sizeof(sth->bbd_list));
 	sth->bbd_list[0]	= 0;
-	assert(BIGSIZE==_lwrite32(hf,block,BIGSIZE));
+	assert(BIGSIZE==_lwrite(hf,block,BIGSIZE));
 	/* block 0 is the big block directory */
 	bbs=(LPDWORD)block;
 	memset(block,0xff,sizeof(block)); /* mark all blocks as free */
 	bbs[0]=STORAGE_CHAINENTRY_ENDOFCHAIN; /* for this block */
 	bbs[1]=STORAGE_CHAINENTRY_ENDOFCHAIN; /* for directory entry */
-	assert(BIGSIZE==_lwrite32(hf,block,BIGSIZE));
+	assert(BIGSIZE==_lwrite(hf,block,BIGSIZE));
 	/* block 1 is the root directory entry */
 	memset(block,0x00,sizeof(block));
 	stde = (struct storage_pps_entry*)block;
 	lstrcpyAtoW(stde->pps_rawname,"RootEntry");
-	stde->pps_sizeofname	= lstrlen32W(stde->pps_rawname)*2+2;
+	stde->pps_sizeofname	= lstrlenW(stde->pps_rawname)*2+2;
 	stde->pps_type		= 5;
 	stde->pps_dir		= -1;
 	stde->pps_next		= -1;
 	stde->pps_prev		= -1;
 	stde->pps_sb		= 0xffffffff;
 	stde->pps_size		= 0;
-	assert(BIGSIZE==_lwrite32(hf,block,BIGSIZE));
+	assert(BIGSIZE==_lwrite(hf,block,BIGSIZE));
 	return TRUE;
 }
 
 /******************************************************************************
  *		STORAGE_set_big_chain	[Internal]
  */
-static BOOL32
-STORAGE_set_big_chain(HFILE32 hf,int blocknr,INT32 type) {
+static BOOL
+STORAGE_set_big_chain(HFILE hf,int blocknr,INT type) {
 	BYTE	block[BIGSIZE];
-	LPINT32	bbd = (LPINT32)block;
+	LPINT	bbd = (LPINT)block;
 	int	nextblocknr,bigblocknr;
 	struct storage_header sth;
 
@@ -454,10 +454,10 @@ STORAGE_set_big_chain(HFILE32 hf,int blocknr,INT32 type) {
 /******************************************************************************
  * STORAGE_set_small_chain [Internal]
  */
-static BOOL32
-STORAGE_set_small_chain(HFILE32 hf,int blocknr,INT32 type) {
+static BOOL
+STORAGE_set_small_chain(HFILE hf,int blocknr,INT type) {
 	BYTE	block[BIGSIZE];
-	LPINT32	sbd = (LPINT32)block;
+	LPINT	sbd = (LPINT)block;
 	int	lastblocknr,nextsmallblocknr,bigblocknr;
 	struct storage_header sth;
 
@@ -488,9 +488,9 @@ STORAGE_set_small_chain(HFILE32 hf,int blocknr,INT32 type) {
  *		STORAGE_get_free_big_blocknr	[Internal]
  */
 static int 
-STORAGE_get_free_big_blocknr(HFILE32 hf) {
+STORAGE_get_free_big_blocknr(HFILE hf) {
 	BYTE	block[BIGSIZE];
-	LPINT32	sbd = (LPINT32)block;
+	LPINT	sbd = (LPINT)block;
 	int	lastbigblocknr,i,curblock,bigblocknr;
 	struct storage_header sth;
 
@@ -547,9 +547,9 @@ STORAGE_get_free_big_blocknr(HFILE32 hf) {
  *		STORAGE_get_free_small_blocknr	[Internal]
  */
 static int 
-STORAGE_get_free_small_blocknr(HFILE32 hf) {
+STORAGE_get_free_small_blocknr(HFILE hf) {
 	BYTE	block[BIGSIZE];
-	LPINT32	sbd = (LPINT32)block;
+	LPINT	sbd = (LPINT)block;
 	int	lastbigblocknr,newblocknr,i,curblock,bigblocknr;
 	struct storage_pps_entry	root;
 	struct storage_header sth;
@@ -629,7 +629,7 @@ STORAGE_get_free_small_blocknr(HFILE32 hf) {
  *		STORAGE_get_free_pps_entry	[Internal]
  */
 static int
-STORAGE_get_free_pps_entry(HFILE32 hf) {
+STORAGE_get_free_pps_entry(HFILE hf) {
 	int	blocknr,i,curblock,lastblocknr;
 	BYTE	block[BIGSIZE];
 	struct storage_pps_entry *stde = (struct storage_pps_entry*)block;
@@ -675,7 +675,7 @@ typedef struct
         SEGPTR                          thisptr; /* pointer to this struct as segmented */
         struct storage_pps_entry        stde;
         int                             ppsent;
-        HFILE32                         hf;
+        HFILE                         hf;
         ULARGE_INTEGER                  offset;
 } IStream16Impl;
 
@@ -838,7 +838,7 @@ HRESULT WINAPI IStream16_fnWrite(
 	BYTE	block[BIGSIZE];
 	ULONG	*byteswritten=pcbWrite,xxwritten;
 	int	oldsize,newsize,i,curoffset=0,lastblocknr,blocknr,cc;
-	HFILE32	hf = This->hf;
+	HFILE	hf = This->hf;
 
 	if (!pcbWrite) byteswritten=&xxwritten;
 	*byteswritten = 0;
@@ -1154,20 +1154,20 @@ static void _create_istream16(LPSTREAM16 *str) {
 typedef struct
 {
         /* IUnknown fields */
-        ICOM_VTABLE(IStream32)*         lpvtbl;
+        ICOM_VTABLE(IStream)*         lpvtbl;
         DWORD                           ref;
         /* IStream32 fields */
         struct storage_pps_entry        stde;
         int                             ppsent;
-        HFILE32                         hf;
+        HFILE                         hf;
         ULARGE_INTEGER                  offset;
 } IStream32Impl;
 
 /*****************************************************************************
  *		IStream32_QueryInterface	[VTABLE]
  */
-HRESULT WINAPI IStream32_fnQueryInterface(
-	IStream32* iface,REFIID refiid,LPVOID *obj
+HRESULT WINAPI IStream_fnQueryInterface(
+	IStream* iface,REFIID refiid,LPVOID *obj
 ) {
 	ICOM_THIS(IStream32Impl,iface);
 	char    xrefiid[50];
@@ -1185,7 +1185,7 @@ HRESULT WINAPI IStream32_fnQueryInterface(
 /******************************************************************************
  * IStream32_AddRef [VTABLE]
  */
-ULONG WINAPI IStream32_fnAddRef(IStream32* iface) {
+ULONG WINAPI IStream_fnAddRef(IStream* iface) {
 	ICOM_THIS(IStream32Impl,iface);
 	return ++(This->ref);
 }
@@ -1193,7 +1193,7 @@ ULONG WINAPI IStream32_fnAddRef(IStream32* iface) {
 /******************************************************************************
  * IStream32_Release [VTABLE]
  */
-ULONG WINAPI IStream32_fnRelease(IStream32* iface) {
+ULONG WINAPI IStream_fnRelease(IStream* iface) {
 	ICOM_THIS(IStream32Impl,iface);
 	FlushFileBuffers(This->hf);
 	This->ref--;
@@ -1216,7 +1216,7 @@ typedef struct
         SEGPTR                          thisptr; /* pointer to this struct as segmented */
         struct storage_pps_entry        stde;
         int                             ppsent;
-        HFILE32                         hf;
+        HFILE                         hf;
 } IStorage16Impl;
 
 /******************************************************************************
@@ -1324,7 +1324,7 @@ HRESULT WINAPI IStorage16_fnCreateStorage(
 	int		ppsent,x;
 	struct storage_pps_entry	stde;
 	struct storage_header sth;
-	HFILE32		hf=This->hf;
+	HFILE		hf=This->hf;
 
 	READ_HEADER;
 
@@ -1359,7 +1359,7 @@ HRESULT WINAPI IStorage16_fnCreateStorage(
 	assert(STORAGE_put_pps_entry(lpstg->hf,x,&stde));
 	assert(1==STORAGE_get_pps_entry(lpstg->hf,ppsent,&(lpstg->stde)));
 	lstrcpyAtoW(lpstg->stde.pps_rawname,pwcsName);
-	lpstg->stde.pps_sizeofname = lstrlen32A(pwcsName)*2+2;
+	lpstg->stde.pps_sizeofname = lstrlenA(pwcsName)*2+2;
 	lpstg->stde.pps_next	= -1;
 	lpstg->stde.pps_prev	= -1;
 	lpstg->stde.pps_dir	= -1;
@@ -1412,7 +1412,7 @@ HRESULT WINAPI IStorage16_fnCreateStream(
 	assert(STORAGE_put_pps_entry(lpstr->hf,x,&stde));
 	assert(1==STORAGE_get_pps_entry(lpstr->hf,ppsent,&(lpstr->stde)));
 	lstrcpyAtoW(lpstr->stde.pps_rawname,pwcsName);
-	lpstr->stde.pps_sizeofname = lstrlen32A(pwcsName)*2+2;
+	lpstr->stde.pps_sizeofname = lstrlenA(pwcsName)*2+2;
 	lpstr->stde.pps_next	= -1;
 	lpstr->stde.pps_prev	= -1;
 	lpstr->stde.pps_dir	= -1;
@@ -1573,7 +1573,7 @@ static void _create_istorage16(LPSTORAGE16 *stg) {
 HRESULT WINAPI StgCreateDocFile16(
 	LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved,IStorage16 **ppstgOpen
 ) {
-	HFILE32		hf;
+	HFILE		hf;
 	int		i,ret;
 	IStorage16Impl*	lpstg;
 	struct storage_pps_entry	stde;
@@ -1582,8 +1582,8 @@ HRESULT WINAPI StgCreateDocFile16(
 		pwcsName,grfMode,reserved,ppstgOpen
 	);
 	_create_istorage16(ppstgOpen);
-	hf = CreateFile32A(pwcsName,GENERIC_READ|GENERIC_WRITE,0,NULL,CREATE_NEW,0,0);
-	if (hf==INVALID_HANDLE_VALUE32) {
+	hf = CreateFileA(pwcsName,GENERIC_READ|GENERIC_WRITE,0,NULL,CREATE_NEW,0,0);
+	if (hf==INVALID_HANDLE_VALUE) {
 		WARN(ole,"couldn't open file for storage:%ld\n",GetLastError());
 		return E_FAIL;
 	}
@@ -1616,36 +1616,36 @@ HRESULT WINAPI StgCreateDocFile16(
  * StgIsStorageFile16 [STORAGE.5]
  */
 HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) {
-	HFILE32		hf;
+	HFILE		hf;
 	OFSTRUCT	ofs;
 	BYTE		magic[24];
 
 	TRACE(ole,"(\'%s\')\n",fn);
-	hf = OpenFile32(fn,&ofs,OF_SHARE_DENY_NONE);
-	if (hf==HFILE_ERROR32)
+	hf = OpenFile(fn,&ofs,OF_SHARE_DENY_NONE);
+	if (hf==HFILE_ERROR)
 		return STG_E_FILENOTFOUND;
-	if (24!=_lread32(hf,magic,24)) {
+	if (24!=_lread(hf,magic,24)) {
 		WARN(ole," too short\n");
-		_lclose32(hf);
+		_lclose(hf);
 		return S_FALSE;
 	}
 	if (!memcmp(magic,STORAGE_magic,8)) {
 		WARN(ole," -> YES\n");
-		_lclose32(hf);
+		_lclose(hf);
 		return S_OK;
 	}
 	if (!memcmp(magic,STORAGE_notmagic,8)) {
 		WARN(ole," -> NO\n");
-		_lclose32(hf);
+		_lclose(hf);
 		return S_FALSE;
 	}
 	if (!memcmp(magic,STORAGE_oldmagic,8)) {
 		WARN(ole," -> old format\n");
-		_lclose32(hf);
+		_lclose(hf);
 		return STG_E_OLDFORMAT;
 	}
 	WARN(ole," -> Invalid header.\n");
-	_lclose32(hf);
+	_lclose(hf);
 	return STG_E_INVALIDHEADER;
 }
 
@@ -1653,7 +1653,7 @@ HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) {
  * StgIsStorageFile32 [OLE32.146]
  */
 HRESULT WINAPI 
-StgIsStorageFile32(LPCOLESTR32 fn) 
+StgIsStorageFile(LPCOLESTR fn) 
 {
 	LPOLESTR16	xfn = HEAP_strdupWtoA(GetProcessHeap(),0,fn);
 	OLESTATUS	ret = StgIsStorageFile16(xfn);
@@ -1670,7 +1670,7 @@ HRESULT WINAPI StgOpenStorage16(
 	const OLECHAR16 * pwcsName,IStorage16 *pstgPriority,DWORD grfMode,
 	SNB16 snbExclude,DWORD reserved, IStorage16 **ppstgOpen
 ) {
-	HFILE32		hf;
+	HFILE		hf;
 	int		ret,i;
 	IStorage16Impl*	lpstg;
 	struct storage_pps_entry	stde;
@@ -1679,8 +1679,8 @@ HRESULT WINAPI StgOpenStorage16(
 		pwcsName,pstgPriority,grfMode,snbExclude,reserved,ppstgOpen
 	);
 	_create_istorage16(ppstgOpen);
-	hf = CreateFile32A(pwcsName,GENERIC_READ,0,NULL,0,0,0);
-	if (hf==INVALID_HANDLE_VALUE32) {
+	hf = CreateFileA(pwcsName,GENERIC_READ,0,NULL,0,0,0);
+	if (hf==INVALID_HANDLE_VALUE) {
 		WARN(ole,"Couldn't open file for storage\n");
 		return E_FAIL;
 	}
diff --git a/ole/storage32.c b/ole/storage32.c
index 1073db7350d..84835f172e9 100644
--- a/ole/storage32.c
+++ b/ole/storage32.c
@@ -39,42 +39,42 @@ static const char rootPropertyName[] = "Root Entry";
  * Forward declaration of internal functions used by the method DestroyElement
  */
 static HRESULT deleteStorageProperty(
-  Storage32Impl *parentStorage,
-  OLECHAR32     *propertyToDeleteName);
+  StorageImpl *parentStorage,
+  OLECHAR     *propertyToDeleteName);
 
 static HRESULT deleteStreamProperty(
-  Storage32Impl *parentStorage,
+  StorageImpl *parentStorage,
   ULONG         foundPropertyIndexToDelete,
   StgProperty   propertyToDelete);
 
 static HRESULT findPlaceholder(
-  Storage32Impl *storage,
+  StorageImpl *storage,
   ULONG         propertyIndexToStore,
   ULONG         storagePropertyIndex,
-  INT32         typeOfRelation);
+  INT         typeOfRelation);
 
 static HRESULT adjustPropertyChain( 
-  Storage32Impl *This,
+  StorageImpl *This,
   StgProperty   propertyToDelete,
   StgProperty   parentProperty,
   ULONG         parentPropertyId,
-  INT32         typeOfRelation);
+  INT         typeOfRelation);
 
 /***********************************************************************
  * Declaration of the functions used to manipulate StgProperty
  */
 
 static ULONG getFreeProperty(
-  Storage32Impl *storage);
+  StorageImpl *storage);
 
 static void updatePropertyChain(
-  Storage32Impl *storage,
+  StorageImpl *storage,
   ULONG       newPropertyIndex,
   StgProperty newProperty);
 
 static LONG propertyNameCmp(
-  OLECHAR32 *newProperty,
-  OLECHAR32 *currentProperty);
+  OLECHAR *newProperty,
+  OLECHAR *currentProperty);
 
 
 /***********************************************************************
@@ -89,51 +89,51 @@ static DWORD GetCreationModeFromSTGM(DWORD stgm);
 /*
  * Virtual function table for the IStorage32Impl class.
  */
-static ICOM_VTABLE(IStorage32) Storage32Impl_Vtbl =
+static ICOM_VTABLE(IStorage) Storage32Impl_Vtbl =
 {
-    Storage32BaseImpl_QueryInterface,
-    Storage32BaseImpl_AddRef,
-    Storage32BaseImpl_Release,
-    Storage32BaseImpl_CreateStream,
-    Storage32BaseImpl_OpenStream,
-    Storage32Impl_CreateStorage,
-    Storage32BaseImpl_OpenStorage,
-    Storage32Impl_CopyTo,
-    Storage32Impl_MoveElementTo,
-    Storage32Impl_Commit,
-    Storage32Impl_Revert,
-    Storage32BaseImpl_EnumElements,
-    Storage32Impl_DestroyElement,
-    Storage32BaseImpl_RenameElement,
-    Storage32Impl_SetElementTimes,
-    Storage32BaseImpl_SetClass,
-    Storage32Impl_SetStateBits,
-    Storage32BaseImpl_Stat
+    StorageBaseImpl_QueryInterface,
+    StorageBaseImpl_AddRef,
+    StorageBaseImpl_Release,
+    StorageBaseImpl_CreateStream,
+    StorageBaseImpl_OpenStream,
+    StorageImpl_CreateStorage,
+    StorageBaseImpl_OpenStorage,
+    StorageImpl_CopyTo,
+    StorageImpl_MoveElementTo,
+    StorageImpl_Commit,
+    StorageImpl_Revert,
+    StorageBaseImpl_EnumElements,
+    StorageImpl_DestroyElement,
+    StorageBaseImpl_RenameElement,
+    StorageImpl_SetElementTimes,
+    StorageBaseImpl_SetClass,
+    StorageImpl_SetStateBits,
+    StorageBaseImpl_Stat
 };
 
 /*
  * Virtual function table for the Storage32InternalImpl class.
  */
-static ICOM_VTABLE(IStorage32) Storage32InternalImpl_Vtbl =
+static ICOM_VTABLE(IStorage) Storage32InternalImpl_Vtbl =
   {
-    Storage32BaseImpl_QueryInterface,
-    Storage32BaseImpl_AddRef,
-    Storage32BaseImpl_Release,
-    Storage32BaseImpl_CreateStream,
-    Storage32BaseImpl_OpenStream,
-    Storage32Impl_CreateStorage,
-    Storage32BaseImpl_OpenStorage,
-    Storage32Impl_CopyTo,
-    Storage32Impl_MoveElementTo,
-    Storage32InternalImpl_Commit,
-    Storage32InternalImpl_Revert,
-    Storage32BaseImpl_EnumElements,
-    Storage32Impl_DestroyElement,
-    Storage32BaseImpl_RenameElement,
-    Storage32Impl_SetElementTimes,
-    Storage32BaseImpl_SetClass,
-    Storage32Impl_SetStateBits,
-    Storage32BaseImpl_Stat
+    StorageBaseImpl_QueryInterface,
+    StorageBaseImpl_AddRef,
+    StorageBaseImpl_Release,
+    StorageBaseImpl_CreateStream,
+    StorageBaseImpl_OpenStream,
+    StorageImpl_CreateStorage,
+    StorageBaseImpl_OpenStorage,
+    StorageImpl_CopyTo,
+    StorageImpl_MoveElementTo,
+    StorageInternalImpl_Commit,
+    StorageInternalImpl_Revert,
+    StorageBaseImpl_EnumElements,
+    StorageImpl_DestroyElement,
+    StorageBaseImpl_RenameElement,
+    StorageImpl_SetElementTimes,
+    StorageBaseImpl_SetClass,
+    StorageImpl_SetStateBits,
+    StorageBaseImpl_Stat
 };
 
 /*
@@ -166,12 +166,12 @@ static ICOM_VTABLE(IEnumSTATSTG) IEnumSTATSTGImpl_Vtbl =
  * 
  * See Windows documentation for more details on IUnknown methods.
  */
-HRESULT WINAPI Storage32BaseImpl_QueryInterface(
-  IStorage32*        iface,
+HRESULT WINAPI StorageBaseImpl_QueryInterface(
+  IStorage*        iface,
   REFIID             riid,
   void**             ppvObject)
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
+  ICOM_THIS(StorageBaseImpl,iface);
   /*
    * Perform a sanity check on the parameters.
    */
@@ -188,11 +188,11 @@ HRESULT WINAPI Storage32BaseImpl_QueryInterface(
    */
   if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
-    *ppvObject = (IStorage32*)This;
+    *ppvObject = (IStorage*)This;
   }
   else if (memcmp(&IID_IStorage, riid, sizeof(IID_IStorage)) == 0) 
   {
-    *ppvObject = (IStorage32*)This;
+    *ppvObject = (IStorage*)This;
   }
   
   /*
@@ -205,7 +205,7 @@ HRESULT WINAPI Storage32BaseImpl_QueryInterface(
    * Query Interface always increases the reference count by one when it is
    * successful
    */
-  Storage32BaseImpl_AddRef(iface);
+  StorageBaseImpl_AddRef(iface);
 
   return S_OK;
 }
@@ -218,10 +218,10 @@ HRESULT WINAPI Storage32BaseImpl_QueryInterface(
  * 
  * See Windows documentation for more details on IUnknown methods.
  */
-ULONG WINAPI Storage32BaseImpl_AddRef( 
-            IStorage32* iface)
+ULONG WINAPI StorageBaseImpl_AddRef( 
+            IStorage* iface)
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
+  ICOM_THIS(StorageBaseImpl,iface);
   This->ref++;
 
   return This->ref;
@@ -235,10 +235,10 @@ ULONG WINAPI Storage32BaseImpl_AddRef(
  * 
  * See Windows documentation for more details on IUnknown methods.
  */
-ULONG WINAPI Storage32BaseImpl_Release( 
-      IStorage32* iface)
+ULONG WINAPI StorageBaseImpl_Release( 
+      IStorage* iface)
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
+  ICOM_THIS(StorageBaseImpl,iface);
   /*
    * Decrease the reference count on this object.
    */
@@ -269,15 +269,15 @@ ULONG WINAPI Storage32BaseImpl_Release(
  *
  * See Windows documentation for more details on IStorage methods.
  */
-HRESULT WINAPI Storage32BaseImpl_OpenStream( 
-  IStorage32*        iface,
-  const OLECHAR32*   pwcsName,  /* [string][in] */
+HRESULT WINAPI StorageBaseImpl_OpenStream( 
+  IStorage*        iface,
+  const OLECHAR*   pwcsName,  /* [string][in] */
   void*              reserved1, /* [unique][in] */
   DWORD              grfMode,   /* [in]  */        
   DWORD              reserved2, /* [in]  */        
-  IStream32**        ppstm)     /* [out] */       
+  IStream**        ppstm)     /* [out] */       
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
+  ICOM_THIS(StorageBaseImpl,iface);
   IEnumSTATSTGImpl* propertyEnumeration;
   StgStreamImpl*    newStream;
   StgProperty       currentProperty;
@@ -338,7 +338,7 @@ HRESULT WINAPI Storage32BaseImpl_OpenStream(
     
     if (newStream!=0)
     {
-      *ppstm = (IStream32*)newStream;
+      *ppstm = (IStream*)newStream;
 
       /*
        * Since we are returning a pointer to the interface, we have to 
@@ -362,17 +362,17 @@ HRESULT WINAPI Storage32BaseImpl_OpenStream(
  * 
  * See Windows documentation for more details on IStorage methods.
  */        
-HRESULT WINAPI Storage32BaseImpl_OpenStorage( 
-  IStorage32*        iface,
-  const OLECHAR32*   pwcsName,      /* [string][unique][in] */ 
-  IStorage32*        pstgPriority,  /* [unique][in] */         
+HRESULT WINAPI StorageBaseImpl_OpenStorage( 
+  IStorage*        iface,
+  const OLECHAR*   pwcsName,      /* [string][unique][in] */ 
+  IStorage*        pstgPriority,  /* [unique][in] */         
   DWORD              grfMode,       /* [in] */                 
-  SNB32              snbExclude,    /* [unique][in] */         
+  SNB              snbExclude,    /* [unique][in] */         
   DWORD              reserved,      /* [in] */                 
-  IStorage32**       ppstg)         /* [out] */                        
+  IStorage**       ppstg)         /* [out] */                        
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
-  Storage32InternalImpl* newStorage;
+  ICOM_THIS(StorageBaseImpl,iface);
+  StorageInternalImpl* newStorage;
   IEnumSTATSTGImpl*      propertyEnumeration;
   StgProperty            currentProperty;
   ULONG                  foundPropertyIndex;
@@ -431,19 +431,19 @@ HRESULT WINAPI Storage32BaseImpl_OpenStorage(
     /*
      * Construct a new Storage object
      */
-    newStorage = Storage32InternalImpl_Construct(
+    newStorage = StorageInternalImpl_Construct(
                    This->ancestorStorage,
                    foundPropertyIndex);
     
     if (newStorage != 0)
     {
-      *ppstg = (IStorage32*)newStorage;
+      *ppstg = (IStorage*)newStorage;
 
       /*
        * Since we are returning a pointer to the interface, 
        * we have to nail down the reference.
        */
-      Storage32BaseImpl_AddRef(*ppstg);
+      StorageBaseImpl_AddRef(*ppstg);
       
       return S_OK;
     }
@@ -462,14 +462,14 @@ HRESULT WINAPI Storage32BaseImpl_OpenStorage(
  * 
  * See Windows documentation for more details on IStorage methods.
  */        
-HRESULT WINAPI Storage32BaseImpl_EnumElements( 
-  IStorage32*        iface,
+HRESULT WINAPI StorageBaseImpl_EnumElements( 
+  IStorage*        iface,
   DWORD              reserved1, /* [in] */                  
   void*              reserved2, /* [size_is][unique][in] */ 
   DWORD              reserved3, /* [in] */                  
   IEnumSTATSTG**     ppenum)    /* [out] */                 
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
+  ICOM_THIS(StorageBaseImpl,iface);
   IEnumSTATSTGImpl* newEnum;
 
   /*
@@ -508,14 +508,14 @@ HRESULT WINAPI Storage32BaseImpl_EnumElements(
  * 
  * See Windows documentation for more details on IStorage methods.
  */        
-HRESULT WINAPI Storage32BaseImpl_Stat( 
-  IStorage32*        iface,
+HRESULT WINAPI StorageBaseImpl_Stat( 
+  IStorage*        iface,
   STATSTG*           pstatstg,     /* [out] */ 
   DWORD              grfStatFlag)  /* [in] */  
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
+  ICOM_THIS(StorageBaseImpl,iface);
   StgProperty    curProperty;
-  BOOL32         readSucessful;
+  BOOL         readSucessful;
 
   /*
    * Perform a sanity check on the parameters.
@@ -526,7 +526,7 @@ HRESULT WINAPI Storage32BaseImpl_Stat(
   /*
    * Read the information from the property.
    */
-  readSucessful = Storage32Impl_ReadProperty(
+  readSucessful = StorageImpl_ReadProperty(
                     This->ancestorStorage,
                     This->rootPropertySetIndex,
                     &curProperty);
@@ -555,12 +555,12 @@ HRESULT WINAPI Storage32BaseImpl_Stat(
  *    of the deleted StgProperty object setting it with the new name and to 
  *    perform a DestroyElement of the old StgProperty.
  */
-HRESULT WINAPI Storage32BaseImpl_RenameElement(
-            IStorage32*        iface,
-            const OLECHAR32*   pwcsOldName,  /* [in] */
-            const OLECHAR32*   pwcsNewName)  /* [in] */
+HRESULT WINAPI StorageBaseImpl_RenameElement(
+            IStorage*        iface,
+            const OLECHAR*   pwcsOldName,  /* [in] */
+            const OLECHAR*   pwcsNewName)  /* [in] */
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
+  ICOM_THIS(StorageBaseImpl,iface);
   IEnumSTATSTGImpl* propertyEnumeration;
   StgProperty       currentProperty;
   ULONG             foundPropertyIndex;
@@ -610,12 +610,12 @@ HRESULT WINAPI Storage32BaseImpl_RenameElement(
      * Setup a new property for the renamed property
      */
     renamedProperty.sizeOfNameString = 
-      ( lstrlen32W(pwcsNewName)+1 ) * sizeof(WCHAR);
+      ( lstrlenW(pwcsNewName)+1 ) * sizeof(WCHAR);
   
     if (renamedProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN)
       return STG_E_INVALIDNAME;
   
-    lstrcpy32W(renamedProperty.name, pwcsNewName);
+    lstrcpyW(renamedProperty.name, pwcsNewName);
  
     renamedProperty.propertyType  = currentProperty.propertyType;
     renamedProperty.startingBlock = currentProperty.startingBlock;
@@ -647,7 +647,7 @@ HRESULT WINAPI Storage32BaseImpl_RenameElement(
     /*
      * Save the new property into the new property spot
      */  
-    Storage32Impl_WriteProperty(
+    StorageImpl_WriteProperty(
       This->ancestorStorage,
       renamedPropertyIndex, 
       &renamedProperty);
@@ -656,7 +656,7 @@ HRESULT WINAPI Storage32BaseImpl_RenameElement(
      * Find a spot in the property chain for our newly created property.
      */
     updatePropertyChain(
-      (Storage32Impl*)This,
+      (StorageImpl*)This,
       renamedPropertyIndex, 
       renamedProperty);
 
@@ -673,7 +673,7 @@ HRESULT WINAPI Storage32BaseImpl_RenameElement(
      */
     currentProperty.dirProperty  = PROPERTY_NULL;
     currentProperty.propertyType = PROPTYPE_STORAGE;
-    Storage32Impl_WriteProperty(
+    StorageImpl_WriteProperty(
       This->ancestorStorage,
       foundPropertyIndex, 
       &currentProperty);
@@ -682,7 +682,7 @@ HRESULT WINAPI Storage32BaseImpl_RenameElement(
      * Invoke Destroy to get rid of the ole property and automatically redo 
      * the linking of it's previous and next members... 
      */ 
-    Storage32Impl_DestroyElement((IStorage32*)This->ancestorStorage, pwcsOldName); 
+    StorageImpl_DestroyElement((IStorage*)This->ancestorStorage, pwcsOldName); 
 
   }
   else
@@ -703,15 +703,15 @@ HRESULT WINAPI Storage32BaseImpl_RenameElement(
  *
  * See Windows documentation for more details on IStorage methods.
  */
-HRESULT WINAPI Storage32BaseImpl_CreateStream(
-            IStorage32*        iface,
-            const OLECHAR32*   pwcsName,  /* [string][in] */
+HRESULT WINAPI StorageBaseImpl_CreateStream(
+            IStorage*        iface,
+            const OLECHAR*   pwcsName,  /* [string][in] */
             DWORD              grfMode,   /* [in] */
             DWORD              reserved1, /* [in] */
             DWORD              reserved2, /* [in] */
-            IStream32**        ppstm)     /* [out] */
+            IStream**        ppstm)     /* [out] */
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
+  ICOM_THIS(StorageBaseImpl,iface);
   IEnumSTATSTGImpl* propertyEnumeration;
   StgStreamImpl*    newStream;
   StgProperty       currentProperty, newStreamProperty;
@@ -763,7 +763,7 @@ HRESULT WINAPI Storage32BaseImpl_CreateStream(
      * An element with this name already exists 
      */
     if (grfMode & STGM_CREATE)
-      Storage32Impl_DestroyElement((IStorage32*)This->ancestorStorage, pwcsName); 
+      StorageImpl_DestroyElement((IStorage*)This->ancestorStorage, pwcsName); 
     else 
       return STG_E_FILEALREADYEXISTS;
   }
@@ -774,12 +774,12 @@ HRESULT WINAPI Storage32BaseImpl_CreateStream(
   memset(&newStreamProperty, 0, sizeof(StgProperty));
 
   newStreamProperty.sizeOfNameString =
-      ( lstrlen32W(pwcsName)+1 ) * sizeof(WCHAR);
+      ( lstrlenW(pwcsName)+1 ) * sizeof(WCHAR);
 
   if (newStreamProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN)
     return STG_E_INVALIDNAME;
 
-  lstrcpy32W(newStreamProperty.name, pwcsName);
+  lstrcpyW(newStreamProperty.name, pwcsName);
 
   newStreamProperty.propertyType  = PROPTYPE_STREAM;
   newStreamProperty.startingBlock = BLOCK_END_OF_CHAIN;
@@ -807,7 +807,7 @@ HRESULT WINAPI Storage32BaseImpl_CreateStream(
   /*
    * Save the new property into the new property spot
    */  
-  Storage32Impl_WriteProperty(
+  StorageImpl_WriteProperty(
     This->ancestorStorage,
     newPropertyIndex, 
     &newStreamProperty);
@@ -816,7 +816,7 @@ HRESULT WINAPI Storage32BaseImpl_CreateStream(
    * Find a spot in the property chain for our newly created property.
    */
   updatePropertyChain(
-    (Storage32Impl*)This,
+    (StorageImpl*)This,
     newPropertyIndex, 
     newStreamProperty);
 
@@ -827,7 +827,7 @@ HRESULT WINAPI Storage32BaseImpl_CreateStream(
 
   if (newStream != 0)
   {
-    *ppstm = (IStream32*)newStream;
+    *ppstm = (IStream*)newStream;
 
     /*
      * Since we are returning a pointer to the interface, we have to nail down
@@ -851,23 +851,23 @@ HRESULT WINAPI Storage32BaseImpl_CreateStream(
  *
  * See Windows documentation for more details on IStorage methods.
  */
-HRESULT WINAPI Storage32BaseImpl_SetClass(
-  IStorage32*        iface,
+HRESULT WINAPI StorageBaseImpl_SetClass(
+  IStorage*        iface,
   REFCLSID           clsid) /* [in] */
 {
-  ICOM_THIS(Storage32BaseImpl,iface);
+  ICOM_THIS(StorageBaseImpl,iface);
   HRESULT hRes = E_FAIL;
   StgProperty curProperty;
-  BOOL32 success;
+  BOOL success;
   
-  success = Storage32Impl_ReadProperty(This->ancestorStorage,
+  success = StorageImpl_ReadProperty(This->ancestorStorage,
                                        This->rootPropertySetIndex,
                                        &curProperty);
   if (success)
   {
     curProperty.propertyUniqueID = *clsid;
 
-    success =  Storage32Impl_WriteProperty(This->ancestorStorage,
+    success =  StorageImpl_WriteProperty(This->ancestorStorage,
                                            This->rootPropertySetIndex,
                                            &curProperty);
     if (success)
@@ -888,15 +888,15 @@ HRESULT WINAPI Storage32BaseImpl_SetClass(
  *
  * See Windows documentation for more details on IStorage methods.
  */
-HRESULT WINAPI Storage32Impl_CreateStorage( 
-  IStorage32*      iface,
-  const OLECHAR32  *pwcsName, /* [string][in] */ 
+HRESULT WINAPI StorageImpl_CreateStorage( 
+  IStorage*      iface,
+  const OLECHAR  *pwcsName, /* [string][in] */ 
   DWORD            grfMode,   /* [in] */ 
   DWORD            reserved1, /* [in] */ 
   DWORD            reserved2, /* [in] */ 
-  IStorage32       **ppstg)   /* [out] */ 
+  IStorage       **ppstg)   /* [out] */ 
 {
-  Storage32Impl* const This=(Storage32Impl*)iface;
+  StorageImpl* const This=(StorageImpl*)iface;
 
   IEnumSTATSTGImpl *propertyEnumeration;
   StgProperty      currentProperty;
@@ -943,7 +943,7 @@ HRESULT WINAPI Storage32Impl_CreateStorage(
      * An element with this name already exists 
      */
     if (grfMode & STGM_CREATE)
-      Storage32Impl_DestroyElement((IStorage32*)This->ancestorStorage, pwcsName); 
+      StorageImpl_DestroyElement((IStorage*)This->ancestorStorage, pwcsName); 
     else 
       return STG_E_FILEALREADYEXISTS;
   }
@@ -953,12 +953,12 @@ HRESULT WINAPI Storage32Impl_CreateStorage(
    */
   memset(&newProperty, 0, sizeof(StgProperty));
 
-  newProperty.sizeOfNameString = (lstrlen32W(pwcsName)+1)*sizeof(WCHAR);
+  newProperty.sizeOfNameString = (lstrlenW(pwcsName)+1)*sizeof(WCHAR);
 
   if (newProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN)
     return STG_E_INVALIDNAME;
 
-  lstrcpy32W(newProperty.name, pwcsName);
+  lstrcpyW(newProperty.name, pwcsName);
 
   newProperty.propertyType  = PROPTYPE_STORAGE;
   newProperty.startingBlock = BLOCK_END_OF_CHAIN;
@@ -986,7 +986,7 @@ HRESULT WINAPI Storage32Impl_CreateStorage(
   /*
    * Save the new property into the new property spot
    */  
-  Storage32Impl_WriteProperty(
+  StorageImpl_WriteProperty(
     This->ancestorStorage,
     newPropertyIndex, 
     &newProperty);
@@ -1002,9 +1002,9 @@ HRESULT WINAPI Storage32Impl_CreateStorage(
   /* 
    * Open it to get a pointer to return.
    */
-  hr = Storage32BaseImpl_OpenStorage(
+  hr = StorageBaseImpl_OpenStorage(
          iface,
-         (OLECHAR32*)pwcsName,
+         (OLECHAR*)pwcsName,
          0,
          grfMode,
          0,
@@ -1027,11 +1027,11 @@ HRESULT WINAPI Storage32Impl_CreateStorage(
  * Get a free property or create a new one.
  */
 static ULONG getFreeProperty(
-  Storage32Impl *storage)
+  StorageImpl *storage)
 {
   ULONG       currentPropertyIndex = 0;
   ULONG       newPropertyIndex     = PROPERTY_NULL;
-  BOOL32      readSucessful        = TRUE;
+  BOOL      readSucessful        = TRUE;
   StgProperty currentProperty;
 
   do
@@ -1039,7 +1039,7 @@ static ULONG getFreeProperty(
     /*
      * Start by reading the root property
      */
-    readSucessful = Storage32Impl_ReadProperty(storage->ancestorStorage,
+    readSucessful = StorageImpl_ReadProperty(storage->ancestorStorage,
                                                currentPropertyIndex,
                                                &currentProperty);
     if (readSucessful)
@@ -1107,7 +1107,7 @@ static ULONG getFreeProperty(
       propertyIndex < lastProperty;
       propertyIndex++)
     {
-      Storage32Impl_WriteProperty(
+      StorageImpl_WriteProperty(
         storage->ancestorStorage,
         propertyIndex, 
         &emptyProperty);
@@ -1129,11 +1129,11 @@ static ULONG getFreeProperty(
  *          0 when newPrpoerty == currentProperty
  */
 static LONG propertyNameCmp(
-  OLECHAR32 *newProperty,
-  OLECHAR32 *currentProperty)
+  OLECHAR *newProperty,
+  OLECHAR *currentProperty)
 {
-  LONG sizeOfNew = (lstrlen32W(newProperty)    +1) * sizeof(WCHAR);
-  LONG sizeOfCur = (lstrlen32W(currentProperty)+1) * sizeof(WCHAR);
+  LONG sizeOfNew = (lstrlenW(newProperty)    +1) * sizeof(WCHAR);
+  LONG sizeOfCur = (lstrlenW(currentProperty)+1) * sizeof(WCHAR);
   LONG diff      = sizeOfNew - sizeOfCur;
 
   if (diff == 0) 
@@ -1144,10 +1144,10 @@ static LONG propertyNameCmp(
     WCHAR wsnew[PROPERTY_NAME_MAX_LEN];    
     WCHAR wscur[PROPERTY_NAME_MAX_LEN];    
 
-    diff = lstrcmp32W( (LPCWSTR)CRTDLL__wcsupr(
-                           lstrcpyn32W(wsnew, newProperty, sizeOfNew)), 
+    diff = lstrcmpW( (LPCWSTR)CRTDLL__wcsupr(
+                           lstrcpynW(wsnew, newProperty, sizeOfNew)), 
                        (LPCWSTR)CRTDLL__wcsupr(
-                           lstrcpyn32W(wscur, currentProperty, sizeOfCur)));
+                           lstrcpynW(wscur, currentProperty, sizeOfCur)));
   }
 
   return diff;  
@@ -1160,7 +1160,7 @@ static LONG propertyNameCmp(
  * Properly link this new element in the property chain.
  */
 static void updatePropertyChain(
-  Storage32Impl *storage,
+  StorageImpl *storage,
   ULONG         newPropertyIndex,
   StgProperty   newProperty) 
 {
@@ -1169,7 +1169,7 @@ static void updatePropertyChain(
   /*
    * Read the root property
    */
-  Storage32Impl_ReadProperty(storage->ancestorStorage,
+  StorageImpl_ReadProperty(storage->ancestorStorage,
                              storage->rootPropertySetIndex,
                              &currentProperty);
 
@@ -1179,7 +1179,7 @@ static void updatePropertyChain(
      * The root storage contains some element, therefore, start the research
      * for the appropriate location.
      */
-    BOOL32 found = 0;
+    BOOL found = 0;
     ULONG  current, next, previous, currentPropertyId;
 
     /*
@@ -1190,7 +1190,7 @@ static void updatePropertyChain(
     /*
      * Read 
      */
-    Storage32Impl_ReadProperty(storage->ancestorStorage,
+    StorageImpl_ReadProperty(storage->ancestorStorage,
                                currentProperty.dirProperty,
                                &currentProperty);
 
@@ -1206,7 +1206,7 @@ static void updatePropertyChain(
       {
         if (previous != PROPERTY_NULL)
         {
-          Storage32Impl_ReadProperty(storage->ancestorStorage,
+          StorageImpl_ReadProperty(storage->ancestorStorage,
                                      previous,
                                      &currentProperty);
           current = previous;
@@ -1214,7 +1214,7 @@ static void updatePropertyChain(
         else
         {
           currentProperty.previousProperty = newPropertyIndex;
-          Storage32Impl_WriteProperty(storage->ancestorStorage,
+          StorageImpl_WriteProperty(storage->ancestorStorage,
                                       current,
                                       &currentProperty);
           found = 1;
@@ -1224,7 +1224,7 @@ static void updatePropertyChain(
       {
         if (next != PROPERTY_NULL)
         {
-          Storage32Impl_ReadProperty(storage->ancestorStorage,
+          StorageImpl_ReadProperty(storage->ancestorStorage,
                                      next,
                                      &currentProperty);
           current = next;
@@ -1232,7 +1232,7 @@ static void updatePropertyChain(
         else
         {
           currentProperty.nextProperty = newPropertyIndex;
-          Storage32Impl_WriteProperty(storage->ancestorStorage,
+          StorageImpl_WriteProperty(storage->ancestorStorage,
                                       current,
                                       &currentProperty);
           found = 1;
@@ -1249,7 +1249,7 @@ static void updatePropertyChain(
      * The root storage is empty, link the new property to it's dir property
      */
     currentProperty.dirProperty = newPropertyIndex;
-    Storage32Impl_WriteProperty(storage->ancestorStorage,
+    StorageImpl_WriteProperty(storage->ancestorStorage,
                                 storage->rootPropertySetIndex,
                                 &currentProperty);
   }
@@ -1259,12 +1259,12 @@ static void updatePropertyChain(
 /*************************************************************************
  * CopyTo (IStorage)
  */
-HRESULT WINAPI Storage32Impl_CopyTo( 
-  IStorage32*   iface,
+HRESULT WINAPI StorageImpl_CopyTo( 
+  IStorage*   iface,
   DWORD         ciidExclude,  /* [in] */ 
   const IID     *rgiidExclude,/* [size_is][unique][in] */ 
-  SNB32         snbExclude,   /* [unique][in] */ 
-  IStorage32    *pstgDest)    /* [unique][in] */ 
+  SNB         snbExclude,   /* [unique][in] */ 
+  IStorage    *pstgDest)    /* [unique][in] */ 
 {
   return E_NOTIMPL;
 }
@@ -1272,11 +1272,11 @@ HRESULT WINAPI Storage32Impl_CopyTo(
 /*************************************************************************
  * MoveElementTo (IStorage)
  */
-HRESULT WINAPI Storage32Impl_MoveElementTo( 
-  IStorage32*     iface,
-  const OLECHAR32 *pwcsName,   /* [string][in] */ 
-  IStorage32      *pstgDest,   /* [unique][in] */ 
-  const OLECHAR32 *pwcsNewName,/* [string][in] */ 
+HRESULT WINAPI StorageImpl_MoveElementTo( 
+  IStorage*     iface,
+  const OLECHAR *pwcsName,   /* [string][in] */ 
+  IStorage      *pstgDest,   /* [unique][in] */ 
+  const OLECHAR *pwcsNewName,/* [string][in] */ 
   DWORD           grfFlags)    /* [in] */ 
 {
   return E_NOTIMPL;
@@ -1285,8 +1285,8 @@ HRESULT WINAPI Storage32Impl_MoveElementTo(
 /*************************************************************************
  * Commit (IStorage)
  */
-HRESULT WINAPI Storage32Impl_Commit( 
-  IStorage32*   iface,
+HRESULT WINAPI StorageImpl_Commit( 
+  IStorage*   iface,
   DWORD         grfCommitFlags)/* [in] */ 
 {
   FIXME(ole, "(%ld): stub!\n", grfCommitFlags);
@@ -1296,8 +1296,8 @@ HRESULT WINAPI Storage32Impl_Commit(
 /*************************************************************************
  * Revert (IStorage)
  */
-HRESULT WINAPI Storage32Impl_Revert( 
-  IStorage32* iface)
+HRESULT WINAPI StorageImpl_Revert( 
+  IStorage* iface)
 {
   return E_NOTIMPL;
 }
@@ -1313,15 +1313,15 @@ HRESULT WINAPI Storage32Impl_Revert(
  *          enumeration stategy that would give all the leaves of a storage 
  *          first. (postfix order)
  */
-HRESULT WINAPI Storage32Impl_DestroyElement( 
-  IStorage32*     iface,
-  const OLECHAR32 *pwcsName)/* [string][in] */ 
+HRESULT WINAPI StorageImpl_DestroyElement( 
+  IStorage*     iface,
+  const OLECHAR *pwcsName)/* [string][in] */ 
 {
-  Storage32Impl* const This=(Storage32Impl*)iface;
+  StorageImpl* const This=(StorageImpl*)iface;
 
   IEnumSTATSTGImpl* propertyEnumeration;
   HRESULT           hr = S_OK;
-  BOOL32            res;
+  BOOL            res;
   StgProperty       propertyToDelete;
   StgProperty       parentProperty;
   ULONG             foundPropertyIndexToDelete;
@@ -1362,7 +1362,7 @@ HRESULT WINAPI Storage32Impl_DestroyElement(
   /* 
    * First, read This's StgProperty..
    */
-  res = Storage32Impl_ReadProperty( 
+  res = StorageImpl_ReadProperty( 
           This->ancestorStorage,
           This->rootPropertySetIndex,
           &parentProperty);
@@ -1441,11 +1441,11 @@ HRESULT WINAPI Storage32Impl_DestroyElement(
  *
  */
 static HRESULT deleteStorageProperty(
-  Storage32Impl *parentStorage,
-  OLECHAR32     *propertyToDeleteName)
+  StorageImpl *parentStorage,
+  OLECHAR     *propertyToDeleteName)
 {
   IEnumSTATSTG *elements     = 0;
-  IStorage32   *childStorage = 0;
+  IStorage   *childStorage = 0;
   STATSTG      currentElement;
   HRESULT      hr;
   HRESULT      destroyHr = S_OK;
@@ -1453,8 +1453,8 @@ static HRESULT deleteStorageProperty(
   /*
    * Open the storage and enumerate it
    */
-  hr = Storage32BaseImpl_OpenStorage(
-        (IStorage32*)parentStorage,
+  hr = StorageBaseImpl_OpenStorage(
+        (IStorage*)parentStorage,
         propertyToDeleteName,
         0,
         STGM_SHARE_EXCLUSIVE,
@@ -1470,7 +1470,7 @@ static HRESULT deleteStorageProperty(
   /* 
    * Enumerate the elements
    */
-  IStorage32_EnumElements( childStorage, 0, 0, 0, &elements);
+  IStorage_EnumElements( childStorage, 0, 0, 0, &elements);
 
   do
   {
@@ -1480,9 +1480,9 @@ static HRESULT deleteStorageProperty(
     hr = IEnumSTATSTG_Next(elements, 1, &currentElement, NULL);
     if (hr==S_OK)
     {
-      destroyHr = Storage32Impl_DestroyElement(
-                    (IStorage32*)childStorage, 
-                    (OLECHAR32*)currentElement.pwcsName);
+      destroyHr = StorageImpl_DestroyElement(
+                    (IStorage*)childStorage, 
+                    (OLECHAR*)currentElement.pwcsName);
 
       CoTaskMemFree(currentElement.pwcsName);
     }
@@ -1495,7 +1495,7 @@ static HRESULT deleteStorageProperty(
 
   } while ((hr == S_OK) && (destroyHr == S_OK));
 
-  IStorage32_Release(childStorage);
+  IStorage_Release(childStorage);
   IEnumSTATSTG_Release(elements);
     
   return destroyHr;
@@ -1509,20 +1509,20 @@ static HRESULT deleteStorageProperty(
  *
  */
 static HRESULT deleteStreamProperty(
-  Storage32Impl *parentStorage,
+  StorageImpl *parentStorage,
   ULONG         indexOfPropertyToDelete,
   StgProperty   propertyToDelete)
 {
-  IStream32      *pis;
+  IStream      *pis;
   HRESULT        hr;
   ULARGE_INTEGER size;
 
   size.HighPart = 0;
   size.LowPart = 0;
 
-  hr = Storage32BaseImpl_OpenStream(
-         (IStorage32*)parentStorage,
-         (OLECHAR32*)propertyToDelete.name,
+  hr = StorageBaseImpl_OpenStream(
+         (IStorage*)parentStorage,
+         (OLECHAR*)propertyToDelete.name,
          NULL,
          STGM_SHARE_EXCLUSIVE,
          0,
@@ -1536,7 +1536,7 @@ static HRESULT deleteStreamProperty(
   /* 
    * Zap the stream 
    */ 
-  hr = IStream32_SetSize(pis, size); 
+  hr = IStream_SetSize(pis, size); 
 
   if(hr != S_OK)
   {
@@ -1553,7 +1553,7 @@ static HRESULT deleteStreamProperty(
    * but since we are here to zap it, I don't do it...
    */
 
-  Storage32Impl_WriteProperty(
+  StorageImpl_WriteProperty(
     parentStorage->ancestorStorage, 
     indexOfPropertyToDelete,
     &propertyToDelete);
@@ -1569,19 +1569,19 @@ static HRESULT deleteStreamProperty(
  *
  */
 static HRESULT findPlaceholder(
-  Storage32Impl *storage,
+  StorageImpl *storage,
   ULONG         propertyIndexToStore,
   ULONG         storePropertyIndex,
-  INT32         typeOfRelation)
+  INT         typeOfRelation)
 {
   StgProperty storeProperty;
   HRESULT     hr = S_OK;
-  BOOL32      res = TRUE;
+  BOOL      res = TRUE;
 
   /*
    * Read the storage property
    */
-  res = Storage32Impl_ReadProperty(
+  res = StorageImpl_ReadProperty(
           storage->ancestorStorage,
           storePropertyIndex, 
           &storeProperty);
@@ -1637,7 +1637,7 @@ static HRESULT findPlaceholder(
     }
   }
 
-  hr = Storage32Impl_WriteProperty(
+  hr = StorageImpl_WriteProperty(
          storage->ancestorStorage,
          storePropertyIndex, 
          &storeProperty);
@@ -1658,19 +1658,19 @@ static HRESULT findPlaceholder(
  * to be deleted and find them a place in the Storage.
  */
 static HRESULT adjustPropertyChain( 
-  Storage32Impl *This,
+  StorageImpl *This,
   StgProperty   propertyToDelete,
   StgProperty   parentProperty,
   ULONG         parentPropertyId,
-  INT32         typeOfRelation)
+  INT         typeOfRelation)
 {
   ULONG   newLinkProperty        = PROPERTY_NULL;
-  BOOL32  needToFindAPlaceholder = FALSE;
+  BOOL  needToFindAPlaceholder = FALSE;
   ULONG   storeNode              = PROPERTY_NULL;
   ULONG   toStoreNode            = PROPERTY_NULL;
-  INT32   relationType           = 0;
+  INT   relationType           = 0;
   HRESULT hr                     = S_OK;
-  BOOL32  res                    = TRUE;
+  BOOL  res                    = TRUE;
   
   if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) 
   {
@@ -1779,7 +1779,7 @@ static HRESULT adjustPropertyChain(
   /* 
    * Write back the parent property    
    */
-  res = Storage32Impl_WriteProperty(
+  res = StorageImpl_WriteProperty(
           This->ancestorStorage, 
           parentPropertyId,
           &parentProperty);
@@ -1808,9 +1808,9 @@ static HRESULT adjustPropertyChain(
 /******************************************************************************
  * SetElementTimes (IStorage)
  */
-HRESULT WINAPI Storage32Impl_SetElementTimes( 
-  IStorage32*     iface,
-  const OLECHAR32 *pwcsName,/* [string][in] */ 
+HRESULT WINAPI StorageImpl_SetElementTimes( 
+  IStorage*     iface,
+  const OLECHAR *pwcsName,/* [string][in] */ 
   const FILETIME  *pctime,  /* [in] */ 
   const FILETIME  *patime,  /* [in] */ 
   const FILETIME  *pmtime)  /* [in] */ 
@@ -1821,34 +1821,34 @@ HRESULT WINAPI Storage32Impl_SetElementTimes(
 /******************************************************************************
  * SetStateBits (IStorage)
  */
-HRESULT WINAPI Storage32Impl_SetStateBits( 
-  IStorage32*   iface,
+HRESULT WINAPI StorageImpl_SetStateBits( 
+  IStorage*   iface,
   DWORD         grfStateBits,/* [in] */ 
   DWORD         grfMask)     /* [in] */ 
 {
   return E_NOTIMPL;
 }
 
-HRESULT Storage32Impl_Construct(
-  Storage32Impl* This,
-  HANDLE32       hFile,
+HRESULT StorageImpl_Construct(
+  StorageImpl* This,
+  HANDLE       hFile,
   DWORD          openFlags)
 {
   HRESULT     hr = S_OK;
   StgProperty currentProperty;
-  BOOL32      readSucessful;
+  BOOL      readSucessful;
   ULONG       currentPropertyIndex;
   
   if ( FAILED( validateSTGM(openFlags) ))
     return STG_E_INVALIDFLAG;
 
-  memset(This, 0, sizeof(Storage32Impl));
+  memset(This, 0, sizeof(StorageImpl));
   
   /*
    * Initialize the virtual fgunction table.
    */
   This->lpvtbl       = &Storage32Impl_Vtbl;
-  This->v_destructor = &Storage32Impl_Destroy;
+  This->v_destructor = &StorageImpl_Destroy;
   
   /*
    * This is the top-level storage so initialize the ancester pointer
@@ -1897,7 +1897,7 @@ HRESULT Storage32Impl_Construct(
     This->extBigBlockDepotStart = BLOCK_END_OF_CHAIN;
     This->extBigBlockDepotCount = 0;
 
-    Storage32Impl_SaveFileHeader(This);
+    StorageImpl_SaveFileHeader(This);
 
     /*
      * Add one block for the big block depot and one block for the properties
@@ -1909,18 +1909,18 @@ HRESULT Storage32Impl_Construct(
     /*
      * Initialize the big block depot
      */
-    bigBlockBuffer = Storage32Impl_GetBigBlock(This, 0);
+    bigBlockBuffer = StorageImpl_GetBigBlock(This, 0);
     memset(bigBlockBuffer, BLOCK_UNUSED, This->bigBlockSize);
     StorageUtl_WriteDWord(bigBlockBuffer, 0, BLOCK_SPECIAL);
     StorageUtl_WriteDWord(bigBlockBuffer, sizeof(ULONG), BLOCK_END_OF_CHAIN);
-    Storage32Impl_ReleaseBigBlock(This, bigBlockBuffer);
+    StorageImpl_ReleaseBigBlock(This, bigBlockBuffer);
   }
   else
   {
     /*
      * Load the header for the file.
      */
-    Storage32Impl_LoadFileHeader(This);
+    StorageImpl_LoadFileHeader(This);
   }
 
   /*
@@ -1951,7 +1951,7 @@ HRESULT Storage32Impl_Construct(
     memset(&rootProp, 0, sizeof(rootProp));
     lstrcpyAtoW(rootProp.name, rootPropertyName);
 
-    rootProp.sizeOfNameString = (lstrlen32W(rootProp.name)+1) * sizeof(WCHAR);
+    rootProp.sizeOfNameString = (lstrlenW(rootProp.name)+1) * sizeof(WCHAR);
     rootProp.propertyType     = PROPTYPE_ROOT;
     rootProp.previousProperty = PROPERTY_NULL;
     rootProp.nextProperty     = PROPERTY_NULL;
@@ -1960,7 +1960,7 @@ HRESULT Storage32Impl_Construct(
     rootProp.size.HighPart    = 0;
     rootProp.size.LowPart     = 0;
 
-    Storage32Impl_WriteProperty(This, 0, &rootProp);
+    StorageImpl_WriteProperty(This, 0, &rootProp);
   }
 
   /*
@@ -1970,7 +1970,7 @@ HRESULT Storage32Impl_Construct(
   
   do
   {
-    readSucessful = Storage32Impl_ReadProperty(
+    readSucessful = StorageImpl_ReadProperty(
                       This, 
                       currentPropertyIndex, 
                       &currentProperty);
@@ -2005,8 +2005,8 @@ HRESULT Storage32Impl_Construct(
   return hr;
 }
 
-void Storage32Impl_Destroy(
-  Storage32Impl* This)
+void StorageImpl_Destroy(
+  StorageImpl* This)
 {
   BlockChainStream_Destroy(This->smallBlockRootChain);
   BlockChainStream_Destroy(This->rootBlockChain);
@@ -2023,8 +2023,8 @@ void Storage32Impl_Destroy(
  * If the big block depot is filled, this method will enlarge it.
  *
  */
-ULONG Storage32Impl_GetNextFreeBigBlock(
-  Storage32Impl* This)
+ULONG StorageImpl_GetNextFreeBigBlock(
+  StorageImpl* This)
 {
   ULONG depotBlockIndexPos;
   void  *depotBuffer;
@@ -2060,13 +2060,13 @@ ULONG Storage32Impl_GetNextFreeBigBlock(
         /*
          * Flag it as a block depot.
          */
-        Storage32Impl_SetNextBlockInChain(This,
+        StorageImpl_SetNextBlockInChain(This,
                                           depotBlockIndexPos,
                                           BLOCK_SPECIAL);
 
         /* Save new header information.
          */
-        Storage32Impl_SaveFileHeader(This);
+        StorageImpl_SaveFileHeader(This);
       }
     }
     else
@@ -2102,22 +2102,22 @@ ULONG Storage32Impl_GetNextFreeBigBlock(
 
         /* Flag the block depot.
          */
-        Storage32Impl_SetNextBlockInChain(This,
+        StorageImpl_SetNextBlockInChain(This,
                                           depotBlockIndexPos,
                                           BLOCK_SPECIAL);
 
         /* If necessary, flag the extended depot block.
          */
         if (extIndex != BLOCK_UNUSED)
-          Storage32Impl_SetNextBlockInChain(This, extIndex, BLOCK_EXTBBDEPOT);
+          StorageImpl_SetNextBlockInChain(This, extIndex, BLOCK_EXTBBDEPOT);
 
         /* Save header information.
          */
-        Storage32Impl_SaveFileHeader(This);
+        StorageImpl_SaveFileHeader(This);
       }
     }
 
-    depotBuffer = Storage32Impl_GetROBigBlock(This, depotBlockIndexPos);
+    depotBuffer = StorageImpl_GetROBigBlock(This, depotBlockIndexPos);
 
     if (depotBuffer != 0)
     {
@@ -2134,7 +2134,7 @@ ULONG Storage32Impl_GetNextFreeBigBlock(
         depotBlockOffset += sizeof(ULONG);
       }
 
-      Storage32Impl_ReleaseBigBlock(This, depotBuffer);
+      StorageImpl_ReleaseBigBlock(This, depotBuffer);
     }
 
     depotIndex++;
@@ -2149,18 +2149,18 @@ ULONG Storage32Impl_GetNextFreeBigBlock(
  * This will create a depot block, essentially it is a block initialized
  * to BLOCK_UNUSEDs.
  */
-void Storage32Impl_AddBlockDepot(Storage32Impl* This, ULONG blockIndex)
+void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex)
 {
   BYTE* blockBuffer;
 
-  blockBuffer = Storage32Impl_GetBigBlock(This, blockIndex);
+  blockBuffer = StorageImpl_GetBigBlock(This, blockIndex);
 
   /*
    * Initialize blocks as free
    */
   memset(blockBuffer, BLOCK_UNUSED, This->bigBlockSize);
 
-  Storage32Impl_ReleaseBigBlock(This, blockBuffer);
+  StorageImpl_ReleaseBigBlock(This, blockBuffer);
 }
 
 /******************************************************************************
@@ -2170,7 +2170,7 @@ void Storage32Impl_AddBlockDepot(Storage32Impl* This, ULONG blockIndex)
  * index. This method is only for depot indexes equal or greater than
  * COUNT_BBDEPOTINHEADER.
  */
-ULONG Storage32Impl_GetExtDepotBlock(Storage32Impl* This, ULONG depotIndex)
+ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex)
 {
   ULONG depotBlocksPerExtBlock = (This->bigBlockSize / sizeof(ULONG)) - 1;
   ULONG numExtBlocks           = depotIndex - COUNT_BBDEPOTINHEADER;
@@ -2194,7 +2194,7 @@ ULONG Storage32Impl_GetExtDepotBlock(Storage32Impl* This, ULONG depotIndex)
   {
     BYTE* depotBuffer;
 
-    depotBuffer = Storage32Impl_GetROBigBlock(This, extBlockIndex);
+    depotBuffer = StorageImpl_GetROBigBlock(This, extBlockIndex);
 
     if (depotBuffer != 0)
     {
@@ -2202,7 +2202,7 @@ ULONG Storage32Impl_GetExtDepotBlock(Storage32Impl* This, ULONG depotIndex)
                            extBlockOffset * sizeof(ULONG),
                            &blockIndex);
 
-      Storage32Impl_ReleaseBigBlock(This, depotBuffer);
+      StorageImpl_ReleaseBigBlock(This, depotBuffer);
     }
   }
 
@@ -2216,7 +2216,7 @@ ULONG Storage32Impl_GetExtDepotBlock(Storage32Impl* This, ULONG depotIndex)
  * This method is only for depot indexes equal or greater than
  * COUNT_BBDEPOTINHEADER.
  */
-void Storage32Impl_SetExtDepotBlock(Storage32Impl* This,
+void Storage32Impl_SetExtDepotBlock(StorageImpl* This,
                                     ULONG depotIndex,
                                     ULONG blockIndex)
 {
@@ -2238,7 +2238,7 @@ void Storage32Impl_SetExtDepotBlock(Storage32Impl* This,
   {
     BYTE* depotBuffer;
 
-    depotBuffer = Storage32Impl_GetBigBlock(This, extBlockIndex);
+    depotBuffer = StorageImpl_GetBigBlock(This, extBlockIndex);
 
     if (depotBuffer != 0)
     {
@@ -2246,7 +2246,7 @@ void Storage32Impl_SetExtDepotBlock(Storage32Impl* This,
                             extBlockOffset * sizeof(ULONG),
                             blockIndex);
 
-      Storage32Impl_ReleaseBigBlock(This, depotBuffer);
+      StorageImpl_ReleaseBigBlock(This, depotBuffer);
     }
   }
 }
@@ -2256,7 +2256,7 @@ void Storage32Impl_SetExtDepotBlock(Storage32Impl* This,
  *
  * Creates an extended depot block.
  */
-ULONG Storage32Impl_AddExtBlockDepot(Storage32Impl* This)
+ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This)
 {
   ULONG numExtBlocks           = This->extBigBlockDepotCount;
   ULONG nextExtBlock           = This->extBigBlockDepotStart;
@@ -2290,17 +2290,17 @@ ULONG Storage32Impl_AddExtBlockDepot(Storage32Impl* This)
     /*
      * Add the new extended block to the chain.
      */
-    depotBuffer = Storage32Impl_GetBigBlock(This, nextExtBlock);
+    depotBuffer = StorageImpl_GetBigBlock(This, nextExtBlock);
     StorageUtl_WriteDWord(depotBuffer, nextBlockOffset, index);
-    Storage32Impl_ReleaseBigBlock(This, depotBuffer);
+    StorageImpl_ReleaseBigBlock(This, depotBuffer);
   }
 
   /*
    * Initialize this block.
    */
-  depotBuffer = Storage32Impl_GetBigBlock(This, index);
+  depotBuffer = StorageImpl_GetBigBlock(This, index);
   memset(depotBuffer, BLOCK_UNUSED, This->bigBlockSize);
-  Storage32Impl_ReleaseBigBlock(This, depotBuffer);
+  StorageImpl_ReleaseBigBlock(This, depotBuffer);
 
   return index;
 }
@@ -2310,11 +2310,11 @@ ULONG Storage32Impl_AddExtBlockDepot(Storage32Impl* This)
  *
  * This method will flag the specified block as free in the big block depot.
  */
-void  Storage32Impl_FreeBigBlock(
-  Storage32Impl* This,
+void  StorageImpl_FreeBigBlock(
+  StorageImpl* This,
   ULONG          blockIndex)
 {
-  Storage32Impl_SetNextBlockInChain(This, blockIndex, BLOCK_UNUSED);
+  StorageImpl_SetNextBlockInChain(This, blockIndex, BLOCK_UNUSED);
 }
 
 /************************************************************************
@@ -2340,8 +2340,8 @@ void  Storage32Impl_FreeBigBlock(
  *
  * See Windows documentation for more details on IStorage methods.
  */
-ULONG Storage32Impl_GetNextBlockInChain(
-  Storage32Impl* This,
+ULONG StorageImpl_GetNextBlockInChain(
+  StorageImpl* This,
   ULONG          blockIndex)
 {
   ULONG offsetInDepot    = blockIndex * sizeof (ULONG);
@@ -2372,7 +2372,7 @@ ULONG Storage32Impl_GetNextBlockInChain(
       depotBlockIndexPos = Storage32Impl_GetExtDepotBlock(This, depotBlockCount);
     }
 
-    depotBuffer = Storage32Impl_GetROBigBlock(This, depotBlockIndexPos);
+    depotBuffer = StorageImpl_GetROBigBlock(This, depotBlockIndexPos);
 
     if (depotBuffer!=0)
     {
@@ -2384,7 +2384,7 @@ ULONG Storage32Impl_GetNextBlockInChain(
         This->blockDepotCached[index] = nextBlockIndex;
       }
 
-      Storage32Impl_ReleaseBigBlock(This, depotBuffer);
+      StorageImpl_ReleaseBigBlock(This, depotBuffer);
     }
   }
 
@@ -2408,19 +2408,19 @@ ULONG Storage32Impl_GetNextBlockInChain(
  *    - BLOCK_UNUSED: there is no next extended block.
  *    - Any other return values denotes failure.
  */
-ULONG Storage32Impl_GetNextExtendedBlock(Storage32Impl* This, ULONG blockIndex)
+ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This, ULONG blockIndex)
 {
   ULONG nextBlockIndex   = BLOCK_SPECIAL;
   ULONG depotBlockOffset = This->bigBlockSize - sizeof(ULONG);
   void* depotBuffer;
 
-  depotBuffer = Storage32Impl_GetROBigBlock(This, blockIndex);
+  depotBuffer = StorageImpl_GetROBigBlock(This, blockIndex);
 
   if (depotBuffer!=0)
   {
     StorageUtl_ReadDWord(depotBuffer, depotBlockOffset, &nextBlockIndex);
 
-    Storage32Impl_ReleaseBigBlock(This, depotBuffer);
+    StorageImpl_ReleaseBigBlock(This, depotBuffer);
   }
 
   return nextBlockIndex;
@@ -2440,8 +2440,8 @@ ULONG Storage32Impl_GetNextExtendedBlock(Storage32Impl* This, ULONG blockIndex)
  * Storage32Impl_SetNextBlockInChain(This, 7, BLOCK_END_OF_CHAIN);
  *
  */
-void  Storage32Impl_SetNextBlockInChain(
-          Storage32Impl* This,
+void  StorageImpl_SetNextBlockInChain(
+          StorageImpl* This,
           ULONG          blockIndex,
           ULONG          nextBlock)
 {
@@ -2465,12 +2465,12 @@ void  Storage32Impl_SetNextBlockInChain(
     depotBlockIndexPos = Storage32Impl_GetExtDepotBlock(This, depotBlockCount);
   }
 
-  depotBuffer = Storage32Impl_GetBigBlock(This, depotBlockIndexPos);
+  depotBuffer = StorageImpl_GetBigBlock(This, depotBlockIndexPos);
 
   if (depotBuffer!=0)
   {
     StorageUtl_WriteDWord(depotBuffer, depotBlockOffset, nextBlock);
-    Storage32Impl_ReleaseBigBlock(This, depotBuffer);
+    StorageImpl_ReleaseBigBlock(This, depotBuffer);
   }
 
   /*
@@ -2487,8 +2487,8 @@ void  Storage32Impl_SetNextBlockInChain(
  *
  * This method will read in the file header, i.e. big block index -1.
  */
-HRESULT Storage32Impl_LoadFileHeader(
-          Storage32Impl* This)
+HRESULT StorageImpl_LoadFileHeader(
+          StorageImpl* This)
 {
   HRESULT hr = STG_E_FILENOTFOUND;
   void*   headerBigBlock = NULL;
@@ -2497,7 +2497,7 @@ HRESULT Storage32Impl_LoadFileHeader(
   /*
    * Get a pointer to the big block of data containing the header.
    */
-  headerBigBlock = Storage32Impl_GetROBigBlock(This, -1);
+  headerBigBlock = StorageImpl_GetROBigBlock(This, -1);
 
   /*
    * Extract the information from the header.
@@ -2510,13 +2510,13 @@ HRESULT Storage32Impl_LoadFileHeader(
      */
     if (memcmp(headerBigBlock, STORAGE_oldmagic, sizeof(STORAGE_oldmagic))==0)
     {
-      Storage32Impl_ReleaseBigBlock(This, headerBigBlock);
+      StorageImpl_ReleaseBigBlock(This, headerBigBlock);
       return STG_E_OLDFORMAT;
     }
 
     if (memcmp(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic))!=0)
     {
-      Storage32Impl_ReleaseBigBlock(This, headerBigBlock);
+      StorageImpl_ReleaseBigBlock(This, headerBigBlock);
       return STG_E_INVALIDHEADER;
     }
 
@@ -2587,7 +2587,7 @@ HRESULT Storage32Impl_LoadFileHeader(
     /*
      * Release the block.
      */
-    Storage32Impl_ReleaseBigBlock(This, headerBigBlock);
+    StorageImpl_ReleaseBigBlock(This, headerBigBlock);
   }
   
   return hr;
@@ -2598,17 +2598,17 @@ HRESULT Storage32Impl_LoadFileHeader(
  *
  * This method will save to the file the header, i.e. big block -1.
  */
-void Storage32Impl_SaveFileHeader(
-          Storage32Impl* This)
+void StorageImpl_SaveFileHeader(
+          StorageImpl* This)
 {
   BYTE   headerBigBlock[BIG_BLOCK_SIZE];
   int    index;
-  BOOL32 success;
+  BOOL success;
 
   /*
    * Get a pointer to the big block of data containing the header.
    */
-  success = Storage32Impl_ReadBigBlock(This, -1, headerBigBlock);
+  success = StorageImpl_ReadBigBlock(This, -1, headerBigBlock);
   
   /*
    * If the block read failed, the file is probably new.
@@ -2687,7 +2687,7 @@ void Storage32Impl_SaveFileHeader(
   /*
    * Write the big block back to the file.
    */
-  Storage32Impl_WriteBigBlock(This, -1, headerBigBlock);
+  StorageImpl_WriteBigBlock(This, -1, headerBigBlock);
 }
 
 /******************************************************************************
@@ -2695,14 +2695,14 @@ void Storage32Impl_SaveFileHeader(
  *
  * This method will read the specified property from the property chain.
  */
-BOOL32 Storage32Impl_ReadProperty(
-  Storage32Impl* This,
+BOOL StorageImpl_ReadProperty(
+  StorageImpl* This,
   ULONG          index,
   StgProperty*   buffer)
 {
   BYTE           currentProperty[PROPSET_BLOCK_SIZE];
   ULARGE_INTEGER offsetInPropSet;
-  BOOL32         readSucessful;
+  BOOL         readSucessful;
   ULONG          bytesRead;
   
   offsetInPropSet.HighPart = 0;
@@ -2789,14 +2789,14 @@ BOOL32 Storage32Impl_ReadProperty(
 /*********************************************************************
  * Write the specified property into the property chain
  */
-BOOL32 Storage32Impl_WriteProperty(
-  Storage32Impl* This,
+BOOL StorageImpl_WriteProperty(
+  StorageImpl* This,
   ULONG          index,
   StgProperty*   buffer)
 {
   BYTE           currentProperty[PROPSET_BLOCK_SIZE];
   ULARGE_INTEGER offsetInPropSet;
-  BOOL32         writeSucessful;
+  BOOL         writeSucessful;
   ULONG          bytesWritten;
 
   offsetInPropSet.HighPart = 0;
@@ -2814,7 +2814,7 @@ BOOL32 Storage32Impl_WriteProperty(
   /* 
    * Reassign the size in case of mistake....
    */
-  buffer->sizeOfNameString = (lstrlen32W(buffer->name)+1) * sizeof(WCHAR);
+  buffer->sizeOfNameString = (lstrlenW(buffer->name)+1) * sizeof(WCHAR);
 
   StorageUtl_WriteWord(
     currentProperty,  
@@ -2879,20 +2879,20 @@ BOOL32 Storage32Impl_WriteProperty(
   return writeSucessful;
 }
 
-BOOL32 Storage32Impl_ReadBigBlock(
-  Storage32Impl* This,
+BOOL StorageImpl_ReadBigBlock(
+  StorageImpl* This,
   ULONG          blockIndex,
   void*          buffer)
 {
   void* bigBlockBuffer;
 
-  bigBlockBuffer = Storage32Impl_GetROBigBlock(This, blockIndex);
+  bigBlockBuffer = StorageImpl_GetROBigBlock(This, blockIndex);
 
   if (bigBlockBuffer!=0)
   {
     memcpy(buffer, bigBlockBuffer, This->bigBlockSize);
 
-    Storage32Impl_ReleaseBigBlock(This, bigBlockBuffer);
+    StorageImpl_ReleaseBigBlock(This, bigBlockBuffer);
 
     return TRUE;
   }
@@ -2900,20 +2900,20 @@ BOOL32 Storage32Impl_ReadBigBlock(
   return FALSE;
 }
 
-BOOL32 Storage32Impl_WriteBigBlock(
-  Storage32Impl* This,
+BOOL StorageImpl_WriteBigBlock(
+  StorageImpl* This,
   ULONG          blockIndex,
   void*          buffer)
 {
   void* bigBlockBuffer;
 
-  bigBlockBuffer = Storage32Impl_GetBigBlock(This, blockIndex);
+  bigBlockBuffer = StorageImpl_GetBigBlock(This, blockIndex);
 
   if (bigBlockBuffer!=0)
   {
     memcpy(bigBlockBuffer, buffer, This->bigBlockSize);
 
-    Storage32Impl_ReleaseBigBlock(This, bigBlockBuffer);
+    StorageImpl_ReleaseBigBlock(This, bigBlockBuffer);
     
     return TRUE;
   }
@@ -2921,22 +2921,22 @@ BOOL32 Storage32Impl_WriteBigBlock(
   return FALSE;
 }
 
-void* Storage32Impl_GetROBigBlock(
-  Storage32Impl* This,
+void* StorageImpl_GetROBigBlock(
+  StorageImpl* This,
   ULONG          blockIndex)
 {
   return BIGBLOCKFILE_GetROBigBlock(This->bigBlockFile, blockIndex);
 }
 
-void* Storage32Impl_GetBigBlock(
-  Storage32Impl* This,
+void* StorageImpl_GetBigBlock(
+  StorageImpl* This,
   ULONG          blockIndex)
 {
   return BIGBLOCKFILE_GetBigBlock(This->bigBlockFile, blockIndex);
 }
 
-void Storage32Impl_ReleaseBigBlock(
-  Storage32Impl* This,
+void StorageImpl_ReleaseBigBlock(
+  StorageImpl* This,
   void*          pBigBlock)
 {
   BIGBLOCKFILE_ReleaseBigBlock(This->bigBlockFile, pBigBlock);
@@ -2949,14 +2949,14 @@ void Storage32Impl_ReleaseBigBlock(
  * The small block chain will be destroyed.
  */
 BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
-                      Storage32Impl* This,
+                      StorageImpl* This,
                       SmallBlockChainStream** ppsbChain)
 {
   ULONG bbHeadOfChain = BLOCK_END_OF_CHAIN;
   ULARGE_INTEGER size, offset;
   ULONG cbRead, cbWritten, cbTotalRead, cbTotalWritten;
   ULONG propertyIndex;
-  BOOL32 successRead, successWrite;
+  BOOL successRead, successWrite;
   StgProperty chainProperty;
   BYTE buffer[DEF_SMALL_BLOCK_SIZE];
   BlockChainStream *bbTempChain = NULL;
@@ -3022,11 +3022,11 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
    * Change the property information. This chain is now a big block chain
    * and it doesn't reside in the small blocks chain anymore.
    */
-  Storage32Impl_ReadProperty(This, propertyIndex, &chainProperty);
+  StorageImpl_ReadProperty(This, propertyIndex, &chainProperty);
 
   chainProperty.startingBlock = bbHeadOfChain;
 
-  Storage32Impl_WriteProperty(This, propertyIndex, &chainProperty);
+  StorageImpl_WriteProperty(This, propertyIndex, &chainProperty);
 
   /*
    * Destroy the temporary propertyless big block chain.
@@ -3044,32 +3044,32 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
 ** Storage32InternalImpl implementation
 */
 
-Storage32InternalImpl* Storage32InternalImpl_Construct(
-  Storage32Impl* ancestorStorage,  
+StorageInternalImpl* StorageInternalImpl_Construct(
+  StorageImpl* ancestorStorage,  
   ULONG          rootPropertyIndex)
 {
-  Storage32InternalImpl* newStorage;
+  StorageInternalImpl* newStorage;
 
   /*
    * Allocate space for the new storage object
    */
-  newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(Storage32InternalImpl));
+  newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageInternalImpl));
 
   if (newStorage!=0)
   {
-    memset(newStorage, 0, sizeof(Storage32InternalImpl));
+    memset(newStorage, 0, sizeof(StorageInternalImpl));
 
     /*
      * Initialize the virtual function table.
      */
     newStorage->lpvtbl       = &Storage32InternalImpl_Vtbl;
-    newStorage->v_destructor = &Storage32InternalImpl_Destroy;
+    newStorage->v_destructor = &StorageInternalImpl_Destroy;
 
     /*
      * Keep the ancestor storage pointer and nail a reference to it.
      */
     newStorage->ancestorStorage = ancestorStorage;
-    Storage32BaseImpl_AddRef((IStorage32*)(newStorage->ancestorStorage));
+    StorageBaseImpl_AddRef((IStorage*)(newStorage->ancestorStorage));
 
     /*
      * Keep the index of the root property set for this storage,
@@ -3082,8 +3082,8 @@ Storage32InternalImpl* Storage32InternalImpl_Construct(
   return 0;
 }
 
-void Storage32InternalImpl_Destroy(
-  Storage32InternalImpl* This)
+void StorageInternalImpl_Destroy(
+  StorageInternalImpl* This)
 {
   HeapFree(GetProcessHeap(), 0, This);
 }
@@ -3095,8 +3095,8 @@ void Storage32InternalImpl_Destroy(
 ** The non-root storages cannot be opened in transacted mode thus this function
 ** does nothing.
 */
-HRESULT WINAPI Storage32InternalImpl_Commit( 
-  IStorage32*            iface,
+HRESULT WINAPI StorageInternalImpl_Commit( 
+  IStorage*            iface,
   DWORD                  grfCommitFlags)  /* [in] */ 
 {
   return S_OK;
@@ -3109,8 +3109,8 @@ HRESULT WINAPI Storage32InternalImpl_Commit(
 ** The non-root storages cannot be opened in transacted mode thus this function
 ** does nothing.
 */
-HRESULT WINAPI Storage32InternalImpl_Revert( 
-  IStorage32*            iface)
+HRESULT WINAPI StorageInternalImpl_Revert( 
+  IStorage*            iface)
 {
   return S_OK;
 }
@@ -3120,7 +3120,7 @@ HRESULT WINAPI Storage32InternalImpl_Revert(
 */
 
 IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(
-  Storage32Impl* parentStorage,
+  StorageImpl* parentStorage,
   ULONG          firstPropertyNode)
 {
   IEnumSTATSTGImpl* newEnumeration;
@@ -3140,7 +3140,7 @@ IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(
      * enumeration out-lives the storage in the client application.
      */
     newEnumeration->parentStorage = parentStorage;
-    IStorage32_AddRef((IStorage32*)newEnumeration->parentStorage);
+    IStorage_AddRef((IStorage*)newEnumeration->parentStorage);
     
     newEnumeration->firstPropertyNode   = firstPropertyNode;
     
@@ -3163,7 +3163,7 @@ IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(
 
 void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This)
 {
-  IStorage32_Release((IStorage32*)This->parentStorage);
+  IStorage_Release((IStorage*)This->parentStorage);
   HeapFree(GetProcessHeap(), 0, This->stackToVisit);
   HeapFree(GetProcessHeap(), 0, This);
 }
@@ -3291,7 +3291,7 @@ HRESULT WINAPI IEnumSTATSTGImpl_Next(
     /*
      * Read the property from the storage.
      */
-    Storage32Impl_ReadProperty(This->parentStorage,
+    StorageImpl_ReadProperty(This->parentStorage,
       currentSearchNode, 
       &currentProperty);
 
@@ -3352,7 +3352,7 @@ HRESULT WINAPI IEnumSTATSTGImpl_Skip(
     /*
      * Read the property from the storage.
      */
-    Storage32Impl_ReadProperty(This->parentStorage,
+    StorageImpl_ReadProperty(This->parentStorage,
       currentSearchNode, 
       &currentProperty);
     
@@ -3384,7 +3384,7 @@ HRESULT WINAPI IEnumSTATSTGImpl_Reset(
   IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface;
 
   StgProperty rootProperty;
-  BOOL32      readSucessful;
+  BOOL      readSucessful;
 
   /*
    * Re-initialize the search stack to an empty stack
@@ -3394,7 +3394,7 @@ HRESULT WINAPI IEnumSTATSTGImpl_Reset(
   /*
    * Read the root property from the storage.
    */
-  readSucessful = Storage32Impl_ReadProperty(
+  readSucessful = StorageImpl_ReadProperty(
                     This->parentStorage,
                     This->firstPropertyNode, 
                     &rootProperty);
@@ -3455,7 +3455,7 @@ HRESULT WINAPI IEnumSTATSTGImpl_Clone(
   return S_OK;
 }
 
-INT32 IEnumSTATSTGImpl_FindParentProperty(
+INT IEnumSTATSTGImpl_FindParentProperty(
   IEnumSTATSTGImpl *This,
   ULONG             childProperty, 
   StgProperty      *currentProperty,
@@ -3492,7 +3492,7 @@ INT32 IEnumSTATSTGImpl_FindParentProperty(
     /*
      * Read the property from the storage.
      */
-    Storage32Impl_ReadProperty(
+    StorageImpl_ReadProperty(
       This->parentStorage,
       currentSearchNode, 
       currentProperty);
@@ -3522,7 +3522,7 @@ INT32 IEnumSTATSTGImpl_FindParentProperty(
 
 ULONG IEnumSTATSTGImpl_FindProperty(
   IEnumSTATSTGImpl* This,
-  const OLECHAR32*  lpszPropName,
+  const OLECHAR*  lpszPropName,
   StgProperty*      currentProperty)
 {
   ULONG currentSearchNode;
@@ -3542,13 +3542,13 @@ ULONG IEnumSTATSTGImpl_FindProperty(
     /*
      * Read the property from the storage.
      */
-    Storage32Impl_ReadProperty(This->parentStorage,
+    StorageImpl_ReadProperty(This->parentStorage,
       currentSearchNode, 
       currentProperty);
 
     if ( propertyNameCmp(
-          (OLECHAR32*)currentProperty->name, 
-          (OLECHAR32*)lpszPropName) == 0)
+          (OLECHAR*)currentProperty->name, 
+          (OLECHAR*)lpszPropName) == 0)
       return currentSearchNode;
 
     /*
@@ -3570,7 +3570,7 @@ void IEnumSTATSTGImpl_PushSearchNode(
   ULONG             nodeToPush)
 {
   StgProperty rootProperty;
-  BOOL32      readSucessful;
+  BOOL      readSucessful;
 
   /*
    * First, make sure we're not trying to push an unexisting node.
@@ -3598,7 +3598,7 @@ void IEnumSTATSTGImpl_PushSearchNode(
   /*
    * Read the root property from the storage.
    */
-  readSucessful = Storage32Impl_ReadProperty(
+  readSucessful = StorageImpl_ReadProperty(
                     This->parentStorage,
                     nodeToPush, 
                     &rootProperty);
@@ -3616,7 +3616,7 @@ void IEnumSTATSTGImpl_PushSearchNode(
 
 ULONG IEnumSTATSTGImpl_PopSearchNode(
   IEnumSTATSTGImpl* This,
-  BOOL32            remove)
+  BOOL            remove)
 {
   ULONG topNode;
 
@@ -3688,9 +3688,9 @@ void StorageUtl_CopyPropertyToSTATSTG(
   else
   {
     destination->pwcsName = 
-      CoTaskMemAlloc((lstrlen32W(source->name)+1)*sizeof(WCHAR));
+      CoTaskMemAlloc((lstrlenW(source->name)+1)*sizeof(WCHAR));
 
-    lstrcpy32W((LPWSTR)destination->pwcsName, source->name);
+    lstrcpyW((LPWSTR)destination->pwcsName, source->name);
   }
   
   switch (source->propertyType)
@@ -3725,7 +3725,7 @@ void StorageUtl_CopyPropertyToSTATSTG(
 */
 
 BlockChainStream* BlockChainStream_Construct(
-  Storage32Impl* parentStorage,  
+  StorageImpl* parentStorage,  
   ULONG*         headOfStreamPlaceHolder,
   ULONG          propertyIndex)
 {
@@ -3756,14 +3756,14 @@ void BlockChainStream_Destroy(BlockChainStream* This)
 ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This)
 {
   StgProperty chainProperty;
-  BOOL32      readSucessful;
+  BOOL      readSucessful;
 
   if (This->headOfStreamPlaceHolder != 0)
     return *(This->headOfStreamPlaceHolder);
 
   if (This->ownerPropertyIndex != PROPERTY_NULL)
   {
-    readSucessful = Storage32Impl_ReadProperty(
+    readSucessful = StorageImpl_ReadProperty(
                       This->parentStorage,
                       This->ownerPropertyIndex,
                       &chainProperty);
@@ -3795,7 +3795,7 @@ ULONG BlockChainStream_GetCount(BlockChainStream* This)
   {
     count++;
 
-    blockIndex = Storage32Impl_GetNextBlockInChain(
+    blockIndex = StorageImpl_GetNextBlockInChain(
                    This->parentStorage, 
                    blockIndex);
   }
@@ -3810,7 +3810,7 @@ ULONG BlockChainStream_GetCount(BlockChainStream* This)
  * bytesRead may be NULL.
  * Failure will be returned if the specified number of bytes has not been read.
  */
-BOOL32 BlockChainStream_ReadAt(BlockChainStream* This,
+BOOL BlockChainStream_ReadAt(BlockChainStream* This,
   ULARGE_INTEGER offset,
   ULONG          size,
   void*          buffer,
@@ -3831,7 +3831,7 @@ BOOL32 BlockChainStream_ReadAt(BlockChainStream* This,
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
     blockIndex = 
-      Storage32Impl_GetNextBlockInChain(This->parentStorage, blockIndex);
+      StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
     
     blockNoInSequence--;
   }
@@ -3854,17 +3854,17 @@ BOOL32 BlockChainStream_ReadAt(BlockChainStream* This,
      * Copy those bytes to the buffer
      */
     bigBlockBuffer = 
-      Storage32Impl_GetROBigBlock(This->parentStorage, blockIndex);
+      StorageImpl_GetROBigBlock(This->parentStorage, blockIndex);
     
     memcpy(bufferWalker, bigBlockBuffer + offsetInBlock, bytesToReadInBuffer);
     
-    Storage32Impl_ReleaseBigBlock(This->parentStorage, bigBlockBuffer);
+    StorageImpl_ReleaseBigBlock(This->parentStorage, bigBlockBuffer);
     
     /*
      * Step to the next big block.
      */
     blockIndex    = 
-      Storage32Impl_GetNextBlockInChain(This->parentStorage, blockIndex);
+      StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
     bufferWalker += bytesToReadInBuffer;
     size         -= bytesToReadInBuffer;
@@ -3883,7 +3883,7 @@ BOOL32 BlockChainStream_ReadAt(BlockChainStream* This,
  * bytesWritten may be NULL.
  * Will fail if not all specified number of bytes have been written.
  */
-BOOL32 BlockChainStream_WriteAt(BlockChainStream* This,
+BOOL BlockChainStream_WriteAt(BlockChainStream* This,
   ULARGE_INTEGER    offset,
   ULONG             size,
   const void*       buffer,
@@ -3904,7 +3904,7 @@ BOOL32 BlockChainStream_WriteAt(BlockChainStream* This,
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
     blockIndex = 
-      Storage32Impl_GetNextBlockInChain(This->parentStorage, blockIndex);
+      StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
     
     blockNoInSequence--;
   }
@@ -3927,17 +3927,17 @@ BOOL32 BlockChainStream_WriteAt(BlockChainStream* This,
     /*
      * Copy those bytes to the buffer
      */
-    bigBlockBuffer = Storage32Impl_GetBigBlock(This->parentStorage, blockIndex);
+    bigBlockBuffer = StorageImpl_GetBigBlock(This->parentStorage, blockIndex);
     
     memcpy(bigBlockBuffer + offsetInBlock, bufferWalker, bytesToWrite);
     
-    Storage32Impl_ReleaseBigBlock(This->parentStorage, bigBlockBuffer);
+    StorageImpl_ReleaseBigBlock(This->parentStorage, bigBlockBuffer);
     
     /*
      * Step to the next big block.
      */
     blockIndex    = 
-      Storage32Impl_GetNextBlockInChain(This->parentStorage, blockIndex);
+      StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
     bufferWalker  += bytesToWrite;
     size          -= bytesToWrite;
@@ -3953,7 +3953,7 @@ BOOL32 BlockChainStream_WriteAt(BlockChainStream* This,
  *
  * Shrinks this chain in the big block depot.
  */
-BOOL32 BlockChainStream_Shrink(BlockChainStream* This,
+BOOL BlockChainStream_Shrink(BlockChainStream* This,
                                ULARGE_INTEGER    newSize)
 {
   ULONG blockIndex, extraBlock;
@@ -3976,17 +3976,17 @@ BOOL32 BlockChainStream_Shrink(BlockChainStream* This,
   while (count < numBlocks)
   {
     blockIndex = 
-      Storage32Impl_GetNextBlockInChain(This->parentStorage, blockIndex);
+      StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
     count++;
   }
 
   /* Get the next block before marking the new end */
   extraBlock = 
-    Storage32Impl_GetNextBlockInChain(This->parentStorage, blockIndex);
+    StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
   /* Mark the new end of chain */
-  Storage32Impl_SetNextBlockInChain(
+  StorageImpl_SetNextBlockInChain(
     This->parentStorage, 
     blockIndex, 
     BLOCK_END_OF_CHAIN);
@@ -3997,9 +3997,9 @@ BOOL32 BlockChainStream_Shrink(BlockChainStream* This,
   while (extraBlock != BLOCK_END_OF_CHAIN)
   {
     blockIndex = 
-      Storage32Impl_GetNextBlockInChain(This->parentStorage, extraBlock);
+      StorageImpl_GetNextBlockInChain(This->parentStorage, extraBlock);
 
-    Storage32Impl_FreeBigBlock(This->parentStorage, extraBlock);
+    StorageImpl_FreeBigBlock(This->parentStorage, extraBlock);
     extraBlock = blockIndex;
   }
 
@@ -4011,7 +4011,7 @@ BOOL32 BlockChainStream_Shrink(BlockChainStream* This,
  *
  * Grows this chain in the big block depot.
  */
-BOOL32 BlockChainStream_Enlarge(BlockChainStream* This,
+BOOL BlockChainStream_Enlarge(BlockChainStream* This,
                                 ULARGE_INTEGER    newSize)
 {
   ULONG blockIndex, currentBlock;
@@ -4025,8 +4025,8 @@ BOOL32 BlockChainStream_Enlarge(BlockChainStream* This,
    */
   if (blockIndex == BLOCK_END_OF_CHAIN)
   {
-    blockIndex = Storage32Impl_GetNextFreeBigBlock(This->parentStorage);
-    Storage32Impl_SetNextBlockInChain(This->parentStorage,
+    blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage);
+    StorageImpl_SetNextBlockInChain(This->parentStorage,
                                       blockIndex,
                                       BLOCK_END_OF_CHAIN);
 
@@ -4039,14 +4039,14 @@ BOOL32 BlockChainStream_Enlarge(BlockChainStream* This,
     StgProperty chainProp;
     assert(This->ownerPropertyIndex != PROPERTY_NULL);
 
-    Storage32Impl_ReadProperty(
+    StorageImpl_ReadProperty(
       This->parentStorage, 
       This->ownerPropertyIndex,
       &chainProp);
 
       chainProp.startingBlock = blockIndex; 
 
-    Storage32Impl_WriteProperty(
+    StorageImpl_WriteProperty(
       This->parentStorage, 
       This->ownerPropertyIndex,
       &chainProp);
@@ -4072,7 +4072,7 @@ BOOL32 BlockChainStream_Enlarge(BlockChainStream* This,
     currentBlock = blockIndex;
 
     blockIndex = 
-      Storage32Impl_GetNextBlockInChain(This->parentStorage, currentBlock);
+      StorageImpl_GetNextBlockInChain(This->parentStorage, currentBlock);
   }
 
   /*
@@ -4080,14 +4080,14 @@ BOOL32 BlockChainStream_Enlarge(BlockChainStream* This,
    */
   while (oldNumBlocks < newNumBlocks)
   {
-    blockIndex = Storage32Impl_GetNextFreeBigBlock(This->parentStorage);
+    blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage);
 
-    Storage32Impl_SetNextBlockInChain(
+    StorageImpl_SetNextBlockInChain(
       This->parentStorage, 
       currentBlock, 
       blockIndex);
 
-    Storage32Impl_SetNextBlockInChain(
+    StorageImpl_SetNextBlockInChain(
       This->parentStorage, 
       blockIndex, 
       BLOCK_END_OF_CHAIN);
@@ -4109,7 +4109,7 @@ BOOL32 BlockChainStream_Enlarge(BlockChainStream* This,
  *       Currently, the blocks are still in the file. So the file size
  *       doesn't shrink even if we shrink streams. 
  */
-BOOL32 BlockChainStream_SetSize(
+BOOL BlockChainStream_SetSize(
   BlockChainStream* This,
   ULARGE_INTEGER    newSize)
 {
@@ -4161,7 +4161,7 @@ ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This)
      * This chain is a data stream read the property and return 
      * the appropriate size
      */
-    Storage32Impl_ReadProperty(
+    StorageImpl_ReadProperty(
       This->parentStorage,
       This->ownerPropertyIndex,
       &chainProperty);
@@ -4191,7 +4191,7 @@ ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This)
 */
 
 SmallBlockChainStream* SmallBlockChainStream_Construct(
-  Storage32Impl* parentStorage,  
+  StorageImpl* parentStorage,  
   ULONG          propertyIndex)
 {
   SmallBlockChainStream* newStream;
@@ -4219,11 +4219,11 @@ ULONG SmallBlockChainStream_GetHeadOfChain(
   SmallBlockChainStream* This)
 {
   StgProperty chainProperty;
-  BOOL32      readSucessful;
+  BOOL      readSucessful;
 
   if (This->ownerPropertyIndex)
   {
-    readSucessful = Storage32Impl_ReadProperty(
+    readSucessful = StorageImpl_ReadProperty(
                       This->parentStorage,
                       This->ownerPropertyIndex,
                       &chainProperty);
@@ -4255,7 +4255,7 @@ ULONG SmallBlockChainStream_GetNextBlockInChain(
   DWORD  buffer;
   ULONG  nextBlockInChain = BLOCK_END_OF_CHAIN;
   ULONG  bytesRead;
-  BOOL32 success;
+  BOOL success;
 
   offsetOfBlockInDepot.HighPart = 0;
   offsetOfBlockInDepot.LowPart  = blockIndex * sizeof(ULONG);
@@ -4338,7 +4338,7 @@ ULONG SmallBlockChainStream_GetNextFreeBlock(
   ULONG bytesRead;
   ULONG blockIndex = 0;
   ULONG nextBlockIndex = BLOCK_END_OF_CHAIN;
-  BOOL32 success = TRUE;
+  BOOL success = TRUE;
   ULONG smallBlocksPerBigBlock;
 
   offsetOfBlockInDepot.HighPart = 0;
@@ -4381,17 +4381,17 @@ ULONG SmallBlockChainStream_GetNextFreeBlock(
       {
         sbdIndex = nextBlock;
         nextBlock = 
-          Storage32Impl_GetNextBlockInChain(This->parentStorage, sbdIndex);
+          StorageImpl_GetNextBlockInChain(This->parentStorage, sbdIndex);
       }
 
-      newsbdIndex = Storage32Impl_GetNextFreeBigBlock(This->parentStorage);
+      newsbdIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage);
       if (sbdIndex != BLOCK_END_OF_CHAIN)
-        Storage32Impl_SetNextBlockInChain(
+        StorageImpl_SetNextBlockInChain(
           This->parentStorage, 
           sbdIndex, 
           newsbdIndex);
 
-      Storage32Impl_SetNextBlockInChain(
+      StorageImpl_SetNextBlockInChain(
         This->parentStorage, 
         newsbdIndex, 
         BLOCK_END_OF_CHAIN);
@@ -4400,10 +4400,10 @@ ULONG SmallBlockChainStream_GetNextFreeBlock(
        * Initialize all the small blocks to free
        */
       smallBlockDepot = 
-        Storage32Impl_GetBigBlock(This->parentStorage, newsbdIndex);
+        StorageImpl_GetBigBlock(This->parentStorage, newsbdIndex);
 
       memset(smallBlockDepot, BLOCK_UNUSED, This->parentStorage->bigBlockSize);
-      Storage32Impl_ReleaseBigBlock(This->parentStorage, smallBlockDepot);
+      StorageImpl_ReleaseBigBlock(This->parentStorage, smallBlockDepot);
 
       if (count == 0)
       {
@@ -4417,20 +4417,20 @@ ULONG SmallBlockChainStream_GetNextFreeBlock(
          * Save it in the header
          */
         This->parentStorage->smallBlockDepotStart = newsbdIndex;
-        Storage32Impl_SaveFileHeader(This->parentStorage);
+        StorageImpl_SaveFileHeader(This->parentStorage);
 
         /*
          * And allocate the first big block that will contain small blocks 
          */
         sbStartIndex = 
-          Storage32Impl_GetNextFreeBigBlock(This->parentStorage);
+          StorageImpl_GetNextFreeBigBlock(This->parentStorage);
 
-        Storage32Impl_SetNextBlockInChain(
+        StorageImpl_SetNextBlockInChain(
           This->parentStorage, 
           sbStartIndex, 
           BLOCK_END_OF_CHAIN);
 
-        Storage32Impl_ReadProperty(
+        StorageImpl_ReadProperty(
           This->parentStorage, 
           This->parentStorage->rootPropertySetIndex, 
           &rootProp);
@@ -4439,7 +4439,7 @@ ULONG SmallBlockChainStream_GetNextFreeBlock(
         rootProp.size.HighPart = 0;
         rootProp.size.LowPart  = This->parentStorage->bigBlockSize;
 
-        Storage32Impl_WriteProperty(
+        StorageImpl_WriteProperty(
           This->parentStorage, 
           This->parentStorage->rootPropertySetIndex, 
           &rootProp);
@@ -4458,7 +4458,7 @@ ULONG SmallBlockChainStream_GetNextFreeBlock(
     StgProperty rootProp;
     ULONG blocksRequired = (blockIndex / smallBlocksPerBigBlock) + 1;
 
-    Storage32Impl_ReadProperty(
+    StorageImpl_ReadProperty(
       This->parentStorage, 
       This->parentStorage->rootPropertySetIndex, 
       &rootProp);
@@ -4472,7 +4472,7 @@ ULONG SmallBlockChainStream_GetNextFreeBlock(
         This->parentStorage->smallBlockRootChain, 
         rootProp.size);
 
-      Storage32Impl_WriteProperty(
+      StorageImpl_WriteProperty(
         This->parentStorage, 
         This->parentStorage->rootPropertySetIndex, 
         &rootProp);
@@ -4489,7 +4489,7 @@ ULONG SmallBlockChainStream_GetNextFreeBlock(
  * bytesRead may be NULL.
  * Failure will be returned if the specified number of bytes has not been read. 
  */
-BOOL32 SmallBlockChainStream_ReadAt(
+BOOL SmallBlockChainStream_ReadAt(
   SmallBlockChainStream* This,
   ULARGE_INTEGER         offset,
   ULONG                  size,
@@ -4577,7 +4577,7 @@ BOOL32 SmallBlockChainStream_ReadAt(
  * bytesWritten may be NULL.
  * Will fail if not all specified number of bytes have been written.
  */
-BOOL32 SmallBlockChainStream_WriteAt(
+BOOL SmallBlockChainStream_WriteAt(
   SmallBlockChainStream* This,
   ULARGE_INTEGER offset,
   ULONG          size,
@@ -4665,7 +4665,7 @@ BOOL32 SmallBlockChainStream_WriteAt(
  *
  * Shrinks this chain in the small block depot. 
  */
-BOOL32 SmallBlockChainStream_Shrink(
+BOOL SmallBlockChainStream_Shrink(
   SmallBlockChainStream* This,
   ULARGE_INTEGER newSize)
 {
@@ -4716,7 +4716,7 @@ BOOL32 SmallBlockChainStream_Shrink(
  *
  * Grows this chain in the small block depot.
  */
-BOOL32 SmallBlockChainStream_Enlarge(
+BOOL SmallBlockChainStream_Enlarge(
   SmallBlockChainStream* This,
   ULARGE_INTEGER newSize)
 {
@@ -4733,12 +4733,12 @@ BOOL32 SmallBlockChainStream_Enlarge(
   {
     StgProperty chainProp;
 
-    Storage32Impl_ReadProperty(This->parentStorage, This->ownerPropertyIndex,
+    StorageImpl_ReadProperty(This->parentStorage, This->ownerPropertyIndex,
                                &chainProp);
 
     chainProp.startingBlock = SmallBlockChainStream_GetNextFreeBlock(This);
 
-    Storage32Impl_WriteProperty(This->parentStorage, This->ownerPropertyIndex,
+    StorageImpl_WriteProperty(This->parentStorage, This->ownerPropertyIndex,
                                 &chainProp);
 
     blockIndex = chainProp.startingBlock;
@@ -4821,7 +4821,7 @@ ULONG SmallBlockChainStream_GetCount(SmallBlockChainStream* This)
  *       Currently, the blocks are still in the file. So the file size
  *       doesn't shrink even if we shrink streams. 
  */
-BOOL32 SmallBlockChainStream_SetSize(
+BOOL SmallBlockChainStream_SetSize(
                 SmallBlockChainStream* This,
                 ULARGE_INTEGER    newSize)
 {
@@ -4851,7 +4851,7 @@ ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This)
 {
   StgProperty chainProperty;
 
-  Storage32Impl_ReadProperty(
+  StorageImpl_ReadProperty(
     This->parentStorage,
     This->ownerPropertyIndex,
     &chainProperty);
@@ -4863,14 +4863,14 @@ ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This)
  *    StgCreateDocfile32  [OLE32.144]
  *    TODO Validate grfMode (STGM)
  */
-HRESULT WINAPI StgCreateDocfile32(
-  LPCOLESTR32 pwcsName,
+HRESULT WINAPI StgCreateDocfile(
+  LPCOLESTR pwcsName,
   DWORD       grfMode,
   DWORD       reserved,
-  IStorage32  **ppstgOpen)
+  IStorage  **ppstgOpen)
 {
-  Storage32Impl* newStorage = 0;
-  HANDLE32       hFile      = INVALID_HANDLE_VALUE32;
+  StorageImpl* newStorage = 0;
+  HANDLE       hFile      = INVALID_HANDLE_VALUE;
   HRESULT        hr         = S_OK;
   DWORD          shareMode;
   DWORD          accessMode;
@@ -4909,7 +4909,7 @@ HRESULT WINAPI StgCreateDocfile32(
    */
   *ppstgOpen = 0;
 
-  hFile = CreateFile32W(pwcsName,
+  hFile = CreateFileW(pwcsName,
                         accessMode,
                         shareMode,
             NULL,
@@ -4917,7 +4917,7 @@ HRESULT WINAPI StgCreateDocfile32(
                         fileAttributes,
             0);
  
-  if (hFile == INVALID_HANDLE_VALUE32)
+  if (hFile == INVALID_HANDLE_VALUE)
   {
     return E_FAIL;
   }
@@ -4925,12 +4925,12 @@ HRESULT WINAPI StgCreateDocfile32(
   /*
    * Allocate and initialize the new IStorage32object.
    */
-  newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(Storage32Impl));
+  newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
  
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
 
-  hr = Storage32Impl_Construct(
+  hr = StorageImpl_Construct(
          newStorage,
          hFile,
          grfMode);
@@ -4941,8 +4941,8 @@ HRESULT WINAPI StgCreateDocfile32(
   /*
    * Get an "out" pointer for the caller.
    */
-  hr = Storage32BaseImpl_QueryInterface(
-         (IStorage32*)newStorage,
+  hr = StorageBaseImpl_QueryInterface(
+         (IStorage*)newStorage,
          (REFIID)&IID_IStorage,
          (void**)ppstgOpen);
 
@@ -4952,17 +4952,17 @@ HRESULT WINAPI StgCreateDocfile32(
 /******************************************************************************
  *              StgOpenStorage32        [OLE32.148]
  */
-HRESULT WINAPI StgOpenStorage32(
-  const OLECHAR32 *pwcsName,
-  IStorage32      *pstgPriority,
+HRESULT WINAPI StgOpenStorage(
+  const OLECHAR *pwcsName,
+  IStorage      *pstgPriority,
   DWORD           grfMode,
-  SNB32           snbExclude,
+  SNB           snbExclude,
   DWORD           reserved, 
-  IStorage32      **ppstgOpen)
+  IStorage      **ppstgOpen)
 {
-  Storage32Impl* newStorage = 0;
+  StorageImpl* newStorage = 0;
   HRESULT        hr = S_OK;
-  HANDLE32       hFile = 0;
+  HANDLE       hFile = 0;
   DWORD          shareMode;
   DWORD          accessMode;
 
@@ -4989,7 +4989,7 @@ HRESULT WINAPI StgOpenStorage32(
    */
   *ppstgOpen = 0;
   
-  hFile = CreateFile32W( pwcsName, 
+  hFile = CreateFileW( pwcsName, 
                         accessMode,
                         shareMode,
             NULL,
@@ -4998,7 +4998,7 @@ HRESULT WINAPI StgOpenStorage32(
             0);
   
   
-  if (hFile==INVALID_HANDLE_VALUE32)
+  if (hFile==INVALID_HANDLE_VALUE)
   {
     return E_FAIL;
   }
@@ -5006,12 +5006,12 @@ HRESULT WINAPI StgOpenStorage32(
   /*
    * Allocate and initialize the new IStorage32object.
    */
-  newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(Storage32Impl));
+  newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
   
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
 
-  hr = Storage32Impl_Construct(
+  hr = StorageImpl_Construct(
          newStorage,
          hFile,
          grfMode);
@@ -5022,8 +5022,8 @@ HRESULT WINAPI StgOpenStorage32(
   /*
    * Get an "out" pointer for the caller.
    */
-  hr = Storage32BaseImpl_QueryInterface(
-         (IStorage32*)newStorage,
+  hr = StorageBaseImpl_QueryInterface(
+         (IStorage*)newStorage,
          (REFIID)&IID_IStorage,
          (void**)ppstgOpen);
   
@@ -5035,13 +5035,13 @@ HRESULT WINAPI StgOpenStorage32(
  *
  * This method will store the specified CLSID in the specified storage object
  */
-HRESULT WINAPI WriteClassStg32(IStorage32* pStg, REFCLSID rclsid)
+HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid)
 {
   HRESULT hRes;
 
   assert(pStg != 0);
 
-  hRes = IStorage32_SetClass(pStg, rclsid);
+  hRes = IStorage_SetClass(pStg, rclsid);
 
   return hRes;
 }
@@ -5075,31 +5075,31 @@ HRESULT WINAPI WriteClassStg32(IStorage32* pStg, REFCLSID rclsid)
  */
 static HRESULT validateSTGM(DWORD stgm)
 {
-  BOOL32 bSTGM_TRANSACTED       = ((stgm & STGM_TRANSACTED) == STGM_TRANSACTED);
-  BOOL32 bSTGM_SIMPLE           = ((stgm & STGM_SIMPLE) == STGM_SIMPLE);
-  BOOL32 bSTGM_DIRECT           = ! (bSTGM_TRANSACTED || bSTGM_SIMPLE);
+  BOOL bSTGM_TRANSACTED       = ((stgm & STGM_TRANSACTED) == STGM_TRANSACTED);
+  BOOL bSTGM_SIMPLE           = ((stgm & STGM_SIMPLE) == STGM_SIMPLE);
+  BOOL bSTGM_DIRECT           = ! (bSTGM_TRANSACTED || bSTGM_SIMPLE);
    
-  BOOL32 bSTGM_WRITE            = ((stgm & STGM_WRITE) == STGM_WRITE);
-  BOOL32 bSTGM_READWRITE        = ((stgm & STGM_READWRITE) == STGM_READWRITE);
-  BOOL32 bSTGM_READ             = ! (bSTGM_WRITE || bSTGM_READWRITE);
+  BOOL bSTGM_WRITE            = ((stgm & STGM_WRITE) == STGM_WRITE);
+  BOOL bSTGM_READWRITE        = ((stgm & STGM_READWRITE) == STGM_READWRITE);
+  BOOL bSTGM_READ             = ! (bSTGM_WRITE || bSTGM_READWRITE);
    
-  BOOL32 bSTGM_SHARE_DENY_NONE  =
+  BOOL bSTGM_SHARE_DENY_NONE  =
                      ((stgm & STGM_SHARE_DENY_NONE)  == STGM_SHARE_DENY_NONE);
 
-  BOOL32 bSTGM_SHARE_DENY_READ  =
+  BOOL bSTGM_SHARE_DENY_READ  =
                      ((stgm & STGM_SHARE_DENY_READ)  == STGM_SHARE_DENY_READ);
 
-  BOOL32 bSTGM_SHARE_DENY_WRITE =
+  BOOL bSTGM_SHARE_DENY_WRITE =
                      ((stgm & STGM_SHARE_DENY_WRITE) == STGM_SHARE_DENY_WRITE);
 
-  BOOL32 bSTGM_SHARE_EXCLUSIVE  =
+  BOOL bSTGM_SHARE_EXCLUSIVE  =
                      ((stgm & STGM_SHARE_EXCLUSIVE)  == STGM_SHARE_EXCLUSIVE);
 
-  BOOL32 bSTGM_CREATE           = ((stgm & STGM_CREATE) == STGM_CREATE);
-  BOOL32 bSTGM_CONVERT          = ((stgm & STGM_CONVERT) == STGM_CONVERT);
+  BOOL bSTGM_CREATE           = ((stgm & STGM_CREATE) == STGM_CREATE);
+  BOOL bSTGM_CONVERT          = ((stgm & STGM_CONVERT) == STGM_CONVERT);
    
-  BOOL32 bSTGM_NOSCRATCH        = ((stgm & STGM_NOSCRATCH) == STGM_NOSCRATCH);
-  BOOL32 bSTGM_NOSNAPSHOT       = ((stgm & STGM_NOSNAPSHOT) == STGM_NOSNAPSHOT);
+  BOOL bSTGM_NOSCRATCH        = ((stgm & STGM_NOSCRATCH) == STGM_NOSCRATCH);
+  BOOL bSTGM_NOSNAPSHOT       = ((stgm & STGM_NOSNAPSHOT) == STGM_NOSNAPSHOT);
 
   /* 
    * STGM_DIRECT | STGM_TRANSACTED | STGM_SIMPLE
@@ -5161,16 +5161,16 @@ static HRESULT validateSTGM(DWORD stgm)
 static DWORD GetShareModeFromSTGM(DWORD stgm)
 {
   DWORD dwShareMode = 0;
-  BOOL32 bSTGM_SHARE_DENY_NONE  =
+  BOOL bSTGM_SHARE_DENY_NONE  =
                      ((stgm & STGM_SHARE_DENY_NONE)  == STGM_SHARE_DENY_NONE);
 
-  BOOL32 bSTGM_SHARE_DENY_READ  =
+  BOOL bSTGM_SHARE_DENY_READ  =
                      ((stgm & STGM_SHARE_DENY_READ)  == STGM_SHARE_DENY_READ);
 
-  BOOL32 bSTGM_SHARE_DENY_WRITE =
+  BOOL bSTGM_SHARE_DENY_WRITE =
                      ((stgm & STGM_SHARE_DENY_WRITE) == STGM_SHARE_DENY_WRITE);
 
-  BOOL32 bSTGM_SHARE_EXCLUSIVE  =
+  BOOL bSTGM_SHARE_EXCLUSIVE  =
                      ((stgm & STGM_SHARE_EXCLUSIVE)  == STGM_SHARE_EXCLUSIVE);
 
   if ((bSTGM_SHARE_EXCLUSIVE) || (bSTGM_SHARE_DENY_READ))
@@ -5194,9 +5194,9 @@ static DWORD GetShareModeFromSTGM(DWORD stgm)
 static DWORD GetAccessModeFromSTGM(DWORD stgm)
 {
   DWORD dwDesiredAccess = 0;
-  BOOL32 bSTGM_WRITE     = ((stgm & STGM_WRITE) == STGM_WRITE);
-  BOOL32 bSTGM_READWRITE = ((stgm & STGM_READWRITE) == STGM_READWRITE);
-  BOOL32 bSTGM_READ      = ! (bSTGM_WRITE || bSTGM_READWRITE);
+  BOOL bSTGM_WRITE     = ((stgm & STGM_WRITE) == STGM_WRITE);
+  BOOL bSTGM_READWRITE = ((stgm & STGM_READWRITE) == STGM_READWRITE);
+  BOOL bSTGM_READ      = ! (bSTGM_WRITE || bSTGM_READWRITE);
 
   if (bSTGM_READ)
     dwDesiredAccess = GENERIC_READ;
@@ -5219,9 +5219,9 @@ static DWORD GetAccessModeFromSTGM(DWORD stgm)
 static DWORD GetCreationModeFromSTGM(DWORD stgm)
 {
   DWORD dwCreationDistribution;
-  BOOL32 bSTGM_CREATE      = ((stgm & STGM_CREATE) == STGM_CREATE);
-  BOOL32 bSTGM_CONVERT     = ((stgm & STGM_CONVERT) == STGM_CONVERT);
-  BOOL32 bSTGM_FAILIFTHERE = ! (bSTGM_CREATE || bSTGM_CONVERT);
+  BOOL bSTGM_CREATE      = ((stgm & STGM_CREATE) == STGM_CREATE);
+  BOOL bSTGM_CONVERT     = ((stgm & STGM_CONVERT) == STGM_CONVERT);
+  BOOL bSTGM_FAILIFTHERE = ! (bSTGM_CREATE || bSTGM_CONVERT);
 
   if (bSTGM_CREATE)
     dwCreationDistribution = CREATE_NEW;
diff --git a/ole/storage32.h b/ole/storage32.h
index 216f797d740..a60ad370812 100644
--- a/ole/storage32.h
+++ b/ole/storage32.h
@@ -88,9 +88,9 @@ static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d}
  * Forward declarations of all the structures used by the storage
  * module.
  */
-typedef struct Storage32BaseImpl     Storage32BaseImpl;
-typedef struct Storage32Impl         Storage32Impl;
-typedef struct Storage32InternalImpl Storage32InternalImpl;
+typedef struct StorageBaseImpl     StorageBaseImpl;
+typedef struct StorageImpl         StorageImpl;
+typedef struct StorageInternalImpl StorageInternalImpl;
 typedef struct BlockChainStream      BlockChainStream;
 typedef struct SmallBlockChainStream SmallBlockChainStream;
 typedef struct IEnumSTATSTGImpl      IEnumSTATSTGImpl;
@@ -137,8 +137,8 @@ struct BigBlockFile
 {
   ULARGE_INTEGER filesize;
   ULONG blocksize;
-  HANDLE32 hfile;
-  HANDLE32 hfilemap;
+  HANDLE hfile;
+  HANDLE hfilemap;
   DWORD flProtect;
   MappedPage *headmap_ro;
   MappedPage *headmap_w;
@@ -149,7 +149,7 @@ struct BigBlockFile
  * Declaration of the functions used to manipulate the BigBlockFile
  * data structure.
  */
-BigBlockFile*  BIGBLOCKFILE_Construct(HANDLE32 hFile,
+BigBlockFile*  BIGBLOCKFILE_Construct(HANDLE hFile,
                                       DWORD openFlags,
                                       ULONG blocksize);
 void           BIGBLOCKFILE_Destructor(LPBIGBLOCKFILE This);
@@ -168,9 +168,9 @@ ULARGE_INTEGER BIGBLOCKFILE_GetSize(LPBIGBLOCKFILE This);
  * In OOP terms, this is the base class for all the IStorage32 implementations
  * contained in this file.
  */
-struct Storage32BaseImpl
+struct StorageBaseImpl
 {
-  ICOM_VTABLE(IStorage32)*  lpvtbl;   /* Needs to be the first item in the stuct
+  ICOM_VTABLE(IStorage)*  lpvtbl;   /* Needs to be the first item in the stuct
 				       * since we want to cast this in a Storage32 pointer */
 
   /*
@@ -181,7 +181,7 @@ struct Storage32BaseImpl
   /* 
    * Ancestor storage (top level) 
    */
-  Storage32Impl* ancestorStorage;		 
+  StorageImpl* ancestorStorage;		 
   
   /*
    * Index of the property for the root of
@@ -192,68 +192,68 @@ struct Storage32BaseImpl
   /* 
    * virtual Destructor method.
    */
-  void (*v_destructor)(Storage32BaseImpl*);
+  void (*v_destructor)(StorageBaseImpl*);
 };
 
 
 /*
  * Prototypes for the methods of the Storage32BaseImpl class.
  */
-HRESULT WINAPI Storage32BaseImpl_QueryInterface(
-            IStorage32*        iface,
+HRESULT WINAPI StorageBaseImpl_QueryInterface(
+            IStorage*        iface,
             REFIID             riid,
             void**             ppvObject);
         
-ULONG WINAPI Storage32BaseImpl_AddRef( 
-            IStorage32*        iface);
+ULONG WINAPI StorageBaseImpl_AddRef( 
+            IStorage*        iface);
         
-ULONG WINAPI Storage32BaseImpl_Release( 
-            IStorage32*        iface);
+ULONG WINAPI StorageBaseImpl_Release( 
+            IStorage*        iface);
         
-HRESULT WINAPI Storage32BaseImpl_OpenStream( 
-            IStorage32*        iface,
-            const OLECHAR32*   pwcsName,  /* [string][in] */
+HRESULT WINAPI StorageBaseImpl_OpenStream( 
+            IStorage*        iface,
+            const OLECHAR*   pwcsName,  /* [string][in] */
             void*              reserved1, /* [unique][in] */
             DWORD              grfMode,   /* [in] */        
             DWORD              reserved2, /* [in] */        
-            IStream32**        ppstm);    /* [out] */   
+            IStream**        ppstm);    /* [out] */   
     
-HRESULT WINAPI Storage32BaseImpl_OpenStorage( 
-            IStorage32*        iface,
-            const OLECHAR32*   pwcsName,      /* [string][unique][in] */ 
-            IStorage32*        pstgPriority,  /* [unique][in] */         
+HRESULT WINAPI StorageBaseImpl_OpenStorage( 
+            IStorage*        iface,
+            const OLECHAR*   pwcsName,      /* [string][unique][in] */ 
+            IStorage*        pstgPriority,  /* [unique][in] */         
             DWORD              grfMode,       /* [in] */                 
-            SNB32              snbExclude,    /* [unique][in] */         
+            SNB              snbExclude,    /* [unique][in] */         
             DWORD              reserved,      /* [in] */                 
-            IStorage32**       ppstg);        /* [out] */                
+            IStorage**       ppstg);        /* [out] */                
           
-HRESULT WINAPI Storage32BaseImpl_EnumElements( 
-            IStorage32*        iface,
+HRESULT WINAPI StorageBaseImpl_EnumElements( 
+            IStorage*        iface,
             DWORD              reserved1, /* [in] */                  
             void*              reserved2, /* [size_is][unique][in] */ 
             DWORD              reserved3, /* [in] */                  
             IEnumSTATSTG**     ppenum);   /* [out] */   
 
-HRESULT WINAPI Storage32BaseImpl_Stat( 
-            IStorage32*        iface,
+HRESULT WINAPI StorageBaseImpl_Stat( 
+            IStorage*        iface,
             STATSTG*           pstatstg,     /* [out] */ 
             DWORD              grfStatFlag); /* [in] */  
 
-HRESULT WINAPI Storage32BaseImpl_RenameElement(
-            IStorage32*        iface,
-            const OLECHAR32*   pwcsOldName,  /* [string][in] */
-            const OLECHAR32*   pwcsNewName); /* [string][in] */
+HRESULT WINAPI StorageBaseImpl_RenameElement(
+            IStorage*        iface,
+            const OLECHAR*   pwcsOldName,  /* [string][in] */
+            const OLECHAR*   pwcsNewName); /* [string][in] */
 
-HRESULT WINAPI Storage32BaseImpl_CreateStream(
-            IStorage32*        iface,
-            const OLECHAR32*   pwcsName,  /* [string][in] */
+HRESULT WINAPI StorageBaseImpl_CreateStream(
+            IStorage*        iface,
+            const OLECHAR*   pwcsName,  /* [string][in] */
             DWORD              grfMode,   /* [in] */
             DWORD              reserved1, /* [in] */
             DWORD              reserved2, /* [in] */
-            IStream32**        ppstm);    /* [out] */
+            IStream**        ppstm);    /* [out] */
 
-HRESULT WINAPI Storage32BaseImpl_SetClass(
-            IStorage32*        iface,
+HRESULT WINAPI StorageBaseImpl_SetClass(
+            IStorage*        iface,
             REFCLSID           clsid);  /* [in] */
 
 /****************************************************************************
@@ -262,9 +262,9 @@ HRESULT WINAPI Storage32BaseImpl_SetClass(
  * This implementation of the IStorage32 interface represents a root
  * storage. Basically, a document file.
  */
-struct Storage32Impl
+struct StorageImpl
 {
-  ICOM_VTABLE(IStorage32) *lpvtbl;   /* Needs to be the first item in the stuct
+  ICOM_VTABLE(IStorage) *lpvtbl;   /* Needs to be the first item in the stuct
 				      * since we want to cast this in a Storage32 pointer */
 
   /*
@@ -272,15 +272,15 @@ struct Storage32Impl
    * casting as a Storage32BaseImpl
    */
   ULONG		        ref;
-  struct Storage32Impl* ancestorStorage;		 
+  struct StorageImpl* ancestorStorage;		 
   ULONG                 rootPropertySetIndex;
-  void (*v_destructor)(struct Storage32Impl*);
+  void (*v_destructor)(struct StorageImpl*);
   
   /*
    * The following data members are specific to the Storage32Impl
    * class
    */
-  HANDLE32           hFile;      /* Physical support for the Docfile */
+  HANDLE           hFile;      /* Physical support for the Docfile */
   
   /*
    * File header
@@ -316,129 +316,129 @@ struct Storage32Impl
  * Method declaration for the Storage32Impl class
  */        
 
-HRESULT WINAPI Storage32Impl_CreateStorage( 
-            IStorage32*      iface,
-            const OLECHAR32* pwcsName,  /* [string][in] */ 
+HRESULT WINAPI StorageImpl_CreateStorage( 
+            IStorage*      iface,
+            const OLECHAR* pwcsName,  /* [string][in] */ 
             DWORD            grfMode,   /* [in] */ 
             DWORD            dwStgFmt,  /* [in] */ 
             DWORD            reserved2, /* [in] */ 
-            IStorage32**     ppstg);    /* [out] */ 
+            IStorage**     ppstg);    /* [out] */ 
         
-HRESULT WINAPI Storage32Impl_CopyTo( 
-            IStorage32*      iface,
+HRESULT WINAPI StorageImpl_CopyTo( 
+            IStorage*      iface,
             DWORD          ciidExclude,  /* [in] */ 
             const IID*     rgiidExclude, /* [size_is][unique][in] */ 
-            SNB32            snbExclude, /* [unique][in] */ 
-            IStorage32*    pstgDest);    /* [unique][in] */ 
+            SNB            snbExclude, /* [unique][in] */ 
+            IStorage*    pstgDest);    /* [unique][in] */ 
         
-HRESULT WINAPI Storage32Impl_MoveElementTo( 
-            IStorage32*      iface,
-            const OLECHAR32* pwcsName,    /* [string][in] */ 
-            IStorage32*      pstgDest,    /* [unique][in] */ 
-            const OLECHAR32* pwcsNewName, /* [string][in] */ 
+HRESULT WINAPI StorageImpl_MoveElementTo( 
+            IStorage*      iface,
+            const OLECHAR* pwcsName,    /* [string][in] */ 
+            IStorage*      pstgDest,    /* [unique][in] */ 
+            const OLECHAR* pwcsNewName, /* [string][in] */ 
             DWORD            grfFlags);   /* [in] */ 
         
-HRESULT WINAPI Storage32Impl_Commit( 
-            IStorage32*      iface,
+HRESULT WINAPI StorageImpl_Commit( 
+            IStorage*      iface,
             DWORD          grfCommitFlags); /* [in] */ 
         
-HRESULT WINAPI Storage32Impl_Revert( 
-            IStorage32*      iface);
+HRESULT WINAPI StorageImpl_Revert( 
+            IStorage*      iface);
         
-HRESULT WINAPI Storage32Impl_DestroyElement( 
-            IStorage32*      iface,
-            const OLECHAR32* pwcsName); /* [string][in] */ 
+HRESULT WINAPI StorageImpl_DestroyElement( 
+            IStorage*      iface,
+            const OLECHAR* pwcsName); /* [string][in] */ 
         
-HRESULT WINAPI Storage32Impl_SetElementTimes( 
-            IStorage32*      iface,
-            const OLECHAR32* pwcsName, /* [string][in] */ 
+HRESULT WINAPI StorageImpl_SetElementTimes( 
+            IStorage*      iface,
+            const OLECHAR* pwcsName, /* [string][in] */ 
             const FILETIME*  pctime,   /* [in] */ 
             const FILETIME*  patime,   /* [in] */ 
             const FILETIME*  pmtime);  /* [in] */ 
 
-HRESULT WINAPI Storage32Impl_SetStateBits( 
-            IStorage32*      iface,
+HRESULT WINAPI StorageImpl_SetStateBits( 
+            IStorage*      iface,
             DWORD          grfStateBits, /* [in] */ 
             DWORD          grfMask);     /* [in] */ 
         
-void Storage32Impl_Destroy(
-	    Storage32Impl* This);
+void StorageImpl_Destroy(
+	    StorageImpl* This);
 
-HRESULT Storage32Impl_Construct(
-	    Storage32Impl* This,
-	    HANDLE32       hFile,
+HRESULT StorageImpl_Construct(
+	    StorageImpl* This,
+	    HANDLE       hFile,
 	    DWORD          openFlags);
 
-BOOL32 Storage32Impl_ReadBigBlock(
-            Storage32Impl* This,
+BOOL StorageImpl_ReadBigBlock(
+            StorageImpl* This,
 	    ULONG          blockIndex,
 	    void*          buffer);
 
-BOOL32 Storage32Impl_WriteBigBlock(
-            Storage32Impl* This,
+BOOL StorageImpl_WriteBigBlock(
+            StorageImpl* This,
 	    ULONG          blockIndex,
 	    void*          buffer);
 
-void* Storage32Impl_GetROBigBlock(
-            Storage32Impl* This,
+void* StorageImpl_GetROBigBlock(
+            StorageImpl* This,
 	    ULONG          blockIndex);
 
-void* Storage32Impl_GetBigBlock(
-	    Storage32Impl* This,
+void* StorageImpl_GetBigBlock(
+	    StorageImpl* This,
 	    ULONG          blockIndex);
 
-void Storage32Impl_ReleaseBigBlock(
-            Storage32Impl* This,
+void StorageImpl_ReleaseBigBlock(
+            StorageImpl* This,
             void*          pBigBlock);
 
-ULONG Storage32Impl_GetNextFreeBigBlock(
-            Storage32Impl* This);
+ULONG StorageImpl_GetNextFreeBigBlock(
+            StorageImpl* This);
 
-void Storage32Impl_FreeBigBlock(
-            Storage32Impl* This,
+void StorageImpl_FreeBigBlock(
+            StorageImpl* This,
 	    ULONG blockIndex);
 
-ULONG Storage32Impl_GetNextBlockInChain(
-            Storage32Impl* This,
+ULONG StorageImpl_GetNextBlockInChain(
+            StorageImpl* This,
 	    ULONG blockIndex);
 
-void Storage32Impl_SetNextBlockInChain(
-            Storage32Impl* This,
+void StorageImpl_SetNextBlockInChain(
+            StorageImpl* This,
 	    ULONG blockIndex,
       ULONG nextBlock);
 
-HRESULT Storage32Impl_LoadFileHeader(
-	    Storage32Impl* This);
+HRESULT StorageImpl_LoadFileHeader(
+	    StorageImpl* This);
 
-void Storage32Impl_SaveFileHeader(
-            Storage32Impl* This);
+void StorageImpl_SaveFileHeader(
+            StorageImpl* This);
 
-BOOL32 Storage32Impl_ReadProperty(
-            Storage32Impl* This,
+BOOL StorageImpl_ReadProperty(
+            StorageImpl* This,
 	    ULONG          index,
 	    StgProperty*    buffer);
 
-BOOL32 Storage32Impl_WriteProperty(
-            Storage32Impl* This,
+BOOL StorageImpl_WriteProperty(
+            StorageImpl* This,
 	    ULONG          index,
 	    StgProperty*   buffer);
 
 BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
-                      Storage32Impl* This,
+                      StorageImpl* This,
                       SmallBlockChainStream** ppsbChain);
 
-ULONG Storage32Impl_GetNextExtendedBlock(Storage32Impl* This,
+ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This,
                                          ULONG blockIndex);
 
-void Storage32Impl_AddBlockDepot(Storage32Impl* This,
+void Storage32Impl_AddBlockDepot(StorageImpl* This,
                                  ULONG blockIndex);
 
-ULONG Storage32Impl_AddExtBlockDepot(Storage32Impl* This);
+ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This);
 
-ULONG Storage32Impl_GetExtDepotBlock(Storage32Impl* This,
+ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This,
                                      ULONG depotIndex);
 
-void Storage32Impl_SetExtDepotBlock(Storage32Impl* This,
+void Storage32Impl_SetExtDepotBlock(StorageImpl* This,
                                     ULONG depotIndex,
                                     ULONG blockIndex);
 /****************************************************************************
@@ -448,9 +448,9 @@ void Storage32Impl_SetExtDepotBlock(Storage32Impl* This,
  * This one implements the IStorage32 interface for storage that are
  * inside another storage.
  */
-struct Storage32InternalImpl
+struct StorageInternalImpl
 {
-  ICOM_VTABLE(IStorage32) *lpvtbl;	/* Needs to be the first item in the stuct
+  ICOM_VTABLE(IStorage) *lpvtbl;	/* Needs to be the first item in the stuct
 					 * since we want to cast this in a Storage32 pointer */
 
   /*
@@ -458,9 +458,9 @@ struct Storage32InternalImpl
    * casting as a Storage32BaseImpl
    */
   ULONG		             ref;
-  struct Storage32Impl* ancestorStorage;		 
+  struct StorageImpl* ancestorStorage;		 
   ULONG                    rootPropertySetIndex;
-  void (*v_destructor)(struct Storage32InternalImpl*);
+  void (*v_destructor)(struct StorageInternalImpl*);
 
   /*
    * There is no specific data for this class.
@@ -470,19 +470,19 @@ struct Storage32InternalImpl
 /*
  * Method definitions for the Storage32InternalImpl class.
  */
-Storage32InternalImpl* Storage32InternalImpl_Construct(
-	    Storage32Impl* ancestorStorage,	
+StorageInternalImpl* StorageInternalImpl_Construct(
+	    StorageImpl* ancestorStorage,	
 	    ULONG          rootTropertyIndex);
 
-void Storage32InternalImpl_Destroy(
-       	    Storage32InternalImpl* This);
+void StorageInternalImpl_Destroy(
+       	    StorageInternalImpl* This);
 
-HRESULT WINAPI Storage32InternalImpl_Commit( 
-	    IStorage32*            iface,
+HRESULT WINAPI StorageInternalImpl_Commit( 
+	    IStorage*            iface,
 	    DWORD                  grfCommitFlags); /* [in] */ 
 
-HRESULT WINAPI Storage32InternalImpl_Revert( 
-     	    IStorage32*            iface);
+HRESULT WINAPI StorageInternalImpl_Revert( 
+     	    IStorage*            iface);
 
 
 /****************************************************************************
@@ -498,7 +498,7 @@ struct IEnumSTATSTGImpl
 					 * since we want to cast this in a IEnumSTATSTG pointer */
   
   ULONG		 ref;		        /* Reference count */
-  Storage32Impl* parentStorage;         /* Reference to the parent storage */
+  StorageImpl* parentStorage;         /* Reference to the parent storage */
   ULONG          firstPropertyNode;     /* Index of the root of the storage to enumerate */
 
   /*
@@ -545,7 +545,7 @@ HRESULT WINAPI IEnumSTATSTGImpl_Clone(
 	    IEnumSTATSTG**    ppenum);
 
 IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(
-            Storage32Impl* This,
+            StorageImpl* This,
 	    ULONG          firstPropertyNode);
 
 void IEnumSTATSTGImpl_Destroy(
@@ -557,14 +557,14 @@ void IEnumSTATSTGImpl_PushSearchNode(
 
 ULONG IEnumSTATSTGImpl_PopSearchNode(
             IEnumSTATSTGImpl* This,
-	    BOOL32            remove);
+	    BOOL            remove);
 
 ULONG IEnumSTATSTGImpl_FindProperty(
             IEnumSTATSTGImpl* This,
-	    const OLECHAR32*  lpszPropName,
+	    const OLECHAR*  lpszPropName,
 	    StgProperty*      buffer);
 
-INT32 IEnumSTATSTGImpl_FindParentProperty(
+INT IEnumSTATSTGImpl_FindParentProperty(
   IEnumSTATSTGImpl *This,
   ULONG             childProperty,
   StgProperty      *currentProperty,
@@ -579,7 +579,7 @@ INT32 IEnumSTATSTGImpl_FindParentProperty(
  */
 struct StgStreamImpl
 {
-  ICOM_VTABLE(IStream32) *lpvtbl;  /* Needs to be the first item in the stuct
+  ICOM_VTABLE(IStream) *lpvtbl;  /* Needs to be the first item in the stuct
 				    * since we want to cast this in a IStream pointer */
   
   /*
@@ -590,7 +590,7 @@ struct StgStreamImpl
   /*
    * Storage that is the parent(owner) of the stream
    */
-  Storage32BaseImpl* parentStorage;
+  StorageBaseImpl* parentStorage;
 
   /*
    * Index of the property that owns (points to) this stream.
@@ -621,7 +621,7 @@ struct StgStreamImpl
  * Method definition for the StgStreamImpl class.
  */
 StgStreamImpl* StgStreamImpl_Construct(
-		Storage32BaseImpl* parentStorage,
+		StorageBaseImpl* parentStorage,
 		ULONG              ownerProperty);
 
 void StgStreamImpl_Destroy(
@@ -631,72 +631,72 @@ void StgStreamImpl_OpenBlockChain(
                 StgStreamImpl* This);
 
 HRESULT WINAPI StgStreamImpl_QueryInterface(
-		IStream32*      iface,
+		IStream*      iface,
 		REFIID         riid,		/* [in] */          
 		void**         ppvObject);  /* [iid_is][out] */ 
         
 ULONG WINAPI StgStreamImpl_AddRef(
-		IStream32*      iface);
+		IStream*      iface);
         
 ULONG WINAPI StgStreamImpl_Release(
-		IStream32*      iface);
+		IStream*      iface);
         
 HRESULT WINAPI StgStreamImpl_Read( 
-	        IStream32*      iface,
+	        IStream*      iface,
 		void*          pv,        /* [length_is][size_is][out] */
 		ULONG          cb,        /* [in] */                     
 		ULONG*         pcbRead);  /* [out] */                    
         
 HRESULT WINAPI StgStreamImpl_Write(
-		IStream32*      iface,
+		IStream*      iface,
 		const void*    pv,          /* [size_is][in] */ 
 		ULONG          cb,          /* [in] */          
 		ULONG*         pcbWritten); /* [out] */         
         
 HRESULT WINAPI StgStreamImpl_Seek( 
-		IStream32*      iface,
+		IStream*      iface,
 		LARGE_INTEGER   dlibMove,         /* [in] */ 
 		DWORD           dwOrigin,         /* [in] */ 
 		ULARGE_INTEGER* plibNewPosition); /* [out] */
         
 HRESULT WINAPI StgStreamImpl_SetSize( 
-	        IStream32*      iface,
+	        IStream*      iface,
 		ULARGE_INTEGER  libNewSize);  /* [in] */ 
         
 HRESULT WINAPI StgStreamImpl_CopyTo( 
-		IStream32*      iface,
-		IStream32*      pstm,         /* [unique][in] */ 
+		IStream*      iface,
+		IStream*      pstm,         /* [unique][in] */ 
 		ULARGE_INTEGER  cb,           /* [in] */         
 		ULARGE_INTEGER* pcbRead,      /* [out] */        
 		ULARGE_INTEGER* pcbWritten);  /* [out] */        
 
 HRESULT WINAPI StgStreamImpl_Commit( 
-	    	IStream32*      iface,
+	    	IStream*      iface,
 		DWORD           grfCommitFlags); /* [in] */ 
         
 HRESULT WINAPI StgStreamImpl_Revert( 
-		IStream32*  iface);
+		IStream*  iface);
         
 HRESULT WINAPI StgStreamImpl_LockRegion( 
-		IStream32*     iface,
+		IStream*     iface,
 		ULARGE_INTEGER libOffset,   /* [in] */ 
 		ULARGE_INTEGER cb,          /* [in] */ 
 		DWORD          dwLockType); /* [in] */ 
         
 HRESULT WINAPI StgStreamImpl_UnlockRegion( 
-		IStream32*     iface,
+		IStream*     iface,
 		ULARGE_INTEGER libOffset,   /* [in] */ 
 	        ULARGE_INTEGER cb,          /* [in] */ 
 		DWORD          dwLockType); /* [in] */ 
         
 HRESULT WINAPI StgStreamImpl_Stat( 
-		IStream32*     iface,
+		IStream*     iface,
 	        STATSTG*       pstatstg,     /* [out] */
 	        DWORD          grfStatFlag); /* [in] */ 
         
 HRESULT WINAPI StgStreamImpl_Clone( 
-		IStream32*     iface,
-		IStream32**    ppstm);       /* [out] */ 
+		IStream*     iface,
+		IStream**    ppstm);       /* [out] */ 
 
 
 /********************************************************************************
@@ -722,7 +722,7 @@ void StorageUtl_CopyPropertyToSTATSTG(STATSTG*     destination,
  */
 struct BlockChainStream
 {
-  Storage32Impl* parentStorage;
+  StorageImpl* parentStorage;
   ULONG*         headOfStreamPlaceHolder;
   ULONG          ownerPropertyIndex;
 };
@@ -731,7 +731,7 @@ struct BlockChainStream
  * Methods for the BlockChainStream class.
  */
 BlockChainStream* BlockChainStream_Construct(
-		Storage32Impl* parentStorage,	
+		StorageImpl* parentStorage,	
 		ULONG*         headOfStreamPlaceHolder,
 		ULONG          propertyIndex);
 
@@ -741,21 +741,21 @@ void BlockChainStream_Destroy(
 ULONG BlockChainStream_GetHeadOfChain(
 		BlockChainStream* This);
 
-BOOL32 BlockChainStream_ReadAt(
+BOOL BlockChainStream_ReadAt(
 		BlockChainStream* This,
 		ULARGE_INTEGER offset,
 		ULONG          size,
 		void*          buffer,
 		ULONG*         bytesRead);
 
-BOOL32 BlockChainStream_WriteAt(
+BOOL BlockChainStream_WriteAt(
 		BlockChainStream* This,
 		ULARGE_INTEGER offset,
 		ULONG          size,
 		const void*    buffer,
 		ULONG*         bytesWritten);
 
-BOOL32 BlockChainStream_SetSize(
+BOOL BlockChainStream_SetSize(
 		BlockChainStream* This,
 		ULARGE_INTEGER    newSize);
 
@@ -773,7 +773,7 @@ ULONG BlockChainStream_GetCount(
  */
 struct SmallBlockChainStream
 {
-  Storage32Impl* parentStorage;
+  StorageImpl* parentStorage;
   ULONG          ownerPropertyIndex;
 };
 
@@ -781,7 +781,7 @@ struct SmallBlockChainStream
  * Methods of the SmallBlockChainStream class.
  */
 SmallBlockChainStream* SmallBlockChainStream_Construct(
-	       Storage32Impl* parentStorage,	
+	       StorageImpl* parentStorage,	
 	       ULONG          propertyIndex);
 
 void SmallBlockChainStream_Destroy(
@@ -806,21 +806,21 @@ void SmallBlockChainStream_FreeBlock(
 ULONG SmallBlockChainStream_GetNextFreeBlock(
          SmallBlockChainStream* This);
 
-BOOL32 SmallBlockChainStream_ReadAt(
+BOOL SmallBlockChainStream_ReadAt(
 	       SmallBlockChainStream* This,
 	       ULARGE_INTEGER offset,
 	       ULONG          size,
 	       void*          buffer,
 	       ULONG*         bytesRead);
 
-BOOL32 SmallBlockChainStream_WriteAt(
+BOOL SmallBlockChainStream_WriteAt(
 	       SmallBlockChainStream* This,
 	       ULARGE_INTEGER offset,
 	       ULONG          size,
 	       const void*    buffer,
 	       ULONG*         bytesWritten);
 
-BOOL32 SmallBlockChainStream_SetSize(
+BOOL SmallBlockChainStream_SetSize(
 	       SmallBlockChainStream* This,
 	       ULARGE_INTEGER          newSize);
 
diff --git a/ole/typelib.c b/ole/typelib.c
index 674215a976e..bd87d1e0d06 100644
--- a/ole/typelib.c
+++ b/ole/typelib.c
@@ -62,12 +62,12 @@ QueryPathOfRegTypeLib16(
  *	path of typelib
  */
 HRESULT WINAPI
-QueryPathOfRegTypeLib32(	
+QueryPathOfRegTypeLib(	
 	REFGUID guid,	/* [in] referenced guid */
 	WORD wMaj,	/* [in] major version */
 	WORD wMin,	/* [in] minor version */
 	LCID lcid,	/* [in] locale id */
-	LPBSTR32 path	/* [out] path of typelib */
+	LPBSTR path	/* [out] path of typelib */
 ) {
 	char	xguid[80];
 	char	typelibkey[100],pathname[260];
@@ -104,7 +104,7 @@ QueryPathOfRegTypeLib32(
  *    Failure: Status
  */
 HRESULT WINAPI LoadTypeLib16(
-    OLECHAR32 *szFile, /* [in] Name of file to load from */
+    OLECHAR *szFile, /* [in] Name of file to load from */
     void * *pptLib) /* [out] Pointer to pointer to loaded type library */
 {
     FIXME(ole, "('%s',%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib);
@@ -126,8 +126,8 @@ HRESULT WINAPI LoadTypeLib16(
  *    Success: S_OK
  *    Failure: Status
  */
-HRESULT WINAPI LoadTypeLib32(
-    OLECHAR32 *szFile,   /* [in] Name of file to load from */
+HRESULT WINAPI LoadTypeLib(
+    OLECHAR *szFile,   /* [in] Name of file to load from */
     void * *pptLib) /* [out] Pointer to pointer to loaded type library */
 {
     FIXME(ole, "('%s',%p): stub\n",debugstr_w(szFile),pptLib);
@@ -168,10 +168,10 @@ HRESULT WINAPI LoadRegTypeLib(
  *    Success: S_OK
  *    Failure: Status
  */
-HRESULT WINAPI RegisterTypeLib32(
+HRESULT WINAPI RegisterTypeLib(
      ITypeLib * ptlib,      /*[in] Pointer to the library*/
-     OLECHAR32 * szFullPath, /*[in] full Path of the library*/
-     OLECHAR32 * szHelpDir)  /*[in] dir to the helpfile for the library, may be NULL*/
+     OLECHAR * szFullPath, /*[in] full Path of the library*/
+     OLECHAR * szHelpDir)  /*[in] dir to the helpfile for the library, may be NULL*/
 {   FIXME(ole, "(%p,%s,%s): stub\n",ptlib, debugstr_w(szFullPath),debugstr_w(szHelpDir));
     return S_OK;	/* FIXME: pretend everything is OK */
 }
@@ -181,7 +181,7 @@ HRESULT WINAPI RegisterTypeLib32(
  * RETURNS
  *	path of typelib
  */
-DWORD WINAPI OABuildVersion(void)
+DWORD WINAPI OABuildVersion16(void)
 {
 WINDOWS_VERSION ver = VERSION_GetVersion();
 
diff --git a/ole/variant.c b/ole/variant.c
index 52a9e3efe22..348cdc0c7b2 100644
--- a/ole/variant.c
+++ b/ole/variant.c
@@ -106,9 +106,9 @@ static const double DAYS_IN_ONE_YEAR = 365.2515;
  * the tm struct, tm_sec, tm_min, tm_hour, tm_year, tm_day, tm_mon.
  *
  ******************************************************************************/
-static BOOL32 DateTimeStringToTm( OLECHAR32* strIn, LCID lcid, struct tm* pTm )
+static BOOL DateTimeStringToTm( OLECHAR* strIn, LCID lcid, struct tm* pTm )
 {
-	BOOL32 res = FALSE;
+	BOOL res = FALSE;
 	double		fsec;
 	int 		tzp;
 	int 		dtype;
@@ -219,7 +219,7 @@ static BOOL32 DateTimeStringToTm( OLECHAR32* strIn, LCID lcid, struct tm* pTm )
  *
  * Returns TRUE if successfull.
  */
-static BOOL32 TmToDATE( struct tm* pTm, DATE *pDateOut )
+static BOOL TmToDATE( struct tm* pTm, DATE *pDateOut )
 {
 	if( (pTm->tm_year - 1900) >= 0 )
 	{
@@ -323,7 +323,7 @@ static BOOL32 TmToDATE( struct tm* pTm, DATE *pDateOut )
  *
  * Returns TRUE if successfull.
  */
-static BOOL32 DateToTm( DATE dateIn, LCID lcid, struct tm* pTm )
+static BOOL DateToTm( DATE dateIn, LCID lcid, struct tm* pTm )
 {
 	/* Do not process dates smaller than January 1, 1900.
 	 * Which corresponds to 2.0 in the windows DATE format.
@@ -513,12 +513,12 @@ static int SizeOfVariantData( VARIANT* parg )
  *	   StringDupAtoBstr		[INTERNAL]
  * 
  */
-static BSTR32 StringDupAtoBstr( char* strIn )
+static BSTR StringDupAtoBstr( char* strIn )
 {
-	BSTR32 bstr = NULL;
-	OLECHAR32* pNewString = NULL;
+	BSTR bstr = NULL;
+	OLECHAR* pNewString = NULL;
 	pNewString = HEAP_strdupAtoW( GetProcessHeap(), 0, strIn );
-	bstr = SysAllocString32( pNewString );
+	bstr = SysAllocString( pNewString );
 	HeapFree( GetProcessHeap(), 0, pNewString );
 	return bstr;
 }
@@ -531,7 +531,7 @@ static BSTR32 StringDupAtoBstr( char* strIn )
 static double round( double d )
 {
    double decimals = 0.0, integerValue = 0.0, roundedValue = 0.0;
-    BOOL32 bEvenNumber = FALSE;
+    BOOL bEvenNumber = FALSE;
     int nSign = 0;
 
     /* Save the sign of the number
@@ -620,27 +620,27 @@ static void RemoveCharacterFromString( LPSTR str, LPSTR strOfCharToRemove )
  *
  * Checks if the string is of proper format to be converted to a real value.
  */
-static BOOL32 IsValidRealString( LPSTR strRealString )
+static BOOL IsValidRealString( LPSTR strRealString )
 {
 	/* Real values that have a decimal point are required to either have
 	 * digits before or after the decimal point.  We will assume that
 	 * we do not have any digits at either position. If we do encounter
 	 * some we will disable this flag.
 	 */
-	BOOL32 bDigitsRequired = TRUE;
+	BOOL bDigitsRequired = TRUE;
 	/* Processed fields in the string representation of the real number.
 	 */
-	BOOL32 bWhiteSpaceProcessed = FALSE;
-	BOOL32 bFirstSignProcessed = FALSE;
-	BOOL32 bFirstDigitsProcessed = FALSE;
-	BOOL32 bDecimalPointProcessed = FALSE;
-	BOOL32 bSecondDigitsProcessed = FALSE;
-	BOOL32 bExponentProcessed = FALSE;
-	BOOL32 bSecondSignProcessed = FALSE;
-	BOOL32 bThirdDigitsProcessed = FALSE;
+	BOOL bWhiteSpaceProcessed = FALSE;
+	BOOL bFirstSignProcessed = FALSE;
+	BOOL bFirstDigitsProcessed = FALSE;
+	BOOL bDecimalPointProcessed = FALSE;
+	BOOL bSecondDigitsProcessed = FALSE;
+	BOOL bExponentProcessed = FALSE;
+	BOOL bSecondSignProcessed = FALSE;
+	BOOL bThirdDigitsProcessed = FALSE;
 	/* Assume string parameter "strRealString" is valid and try to disprove it.
 	 */
-	BOOL32 bValidRealString = TRUE;
+	BOOL bValidRealString = TRUE;
 
 	/* Used to count the number of tokens in the "strRealString".
 	 */
@@ -876,10 +876,10 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 	{
 
     case( VT_EMPTY ):
-        res = VariantClear32( pd );
+        res = VariantClear( pd );
         break;
     case( VT_NULL ):
-        res = VariantClear32( pd );
+        res = VariantClear( pd );
         if( res == S_OK )
         {
             pd->vt = VT_NULL;
@@ -889,42 +889,42 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
         {
         case( VT_I1 ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_I2 ):
-			res = VarI1FromI232( ps->u.iVal, &(pd->u.cVal) );
+			res = VarI1FromI2( ps->u.iVal, &(pd->u.cVal) );
 			break;
 		case( VT_INT ):
 		case( VT_I4 ):
-			res = VarI1FromI432( ps->u.lVal, &(pd->u.cVal) );
+			res = VarI1FromI4( ps->u.lVal, &(pd->u.cVal) );
 			break;
 		case( VT_UI1 ):
-			res = VarI1FromUI132( ps->u.bVal, &(pd->u.cVal) );
+			res = VarI1FromUI1( ps->u.bVal, &(pd->u.cVal) );
 			break;
 		case( VT_UI2 ):
-			res = VarI1FromUI232( ps->u.uiVal, &(pd->u.cVal) );
+			res = VarI1FromUI2( ps->u.uiVal, &(pd->u.cVal) );
 			break;
 		case( VT_UINT ):
 		case( VT_UI4 ):
-			res = VarI1FromUI432( ps->u.ulVal, &(pd->u.cVal) );
+			res = VarI1FromUI4( ps->u.ulVal, &(pd->u.cVal) );
 			break;
 		case( VT_R4 ):
-			res = VarI1FromR432( ps->u.fltVal, &(pd->u.cVal) );
+			res = VarI1FromR4( ps->u.fltVal, &(pd->u.cVal) );
 			break;
 		case( VT_R8 ):
-			res = VarI1FromR832( ps->u.dblVal, &(pd->u.cVal) );
+			res = VarI1FromR8( ps->u.dblVal, &(pd->u.cVal) );
 			break;
 		case( VT_DATE ):
-			res = VarI1FromDate32( ps->u.date, &(pd->u.cVal) );
+			res = VarI1FromDate( ps->u.date, &(pd->u.cVal) );
 			break;
 		case( VT_BOOL ):
-			res = VarI1FromBool32( ps->u.boolVal, &(pd->u.cVal) );
+			res = VarI1FromBool( ps->u.boolVal, &(pd->u.cVal) );
 			break;
 		case( VT_BSTR ):
-			res = VarI1FromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.cVal) );
+			res = VarI1FromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.cVal) );
 			break;
 		case( VT_CY ):
-	     res = VarI1FromCy32( ps->u.cyVal, &(pd->u.cVal) );
+	     res = VarI1FromCy( ps->u.cyVal, &(pd->u.cVal) );
 		case( VT_DISPATCH ):
 			/*res = VarI1FromDisp32( ps->u.pdispVal, lcid, &(pd->u.cVal) );*/
 		case( VT_UNKNOWN ):
@@ -942,42 +942,42 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarI2FromI132( ps->u.cVal, &(pd->u.iVal) );
+			res = VarI2FromI1( ps->u.cVal, &(pd->u.iVal) );
 			break;
         case( VT_I2 ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_INT ):
 		case( VT_I4 ):
-			res = VarI2FromI432( ps->u.lVal, &(pd->u.iVal) );
+			res = VarI2FromI4( ps->u.lVal, &(pd->u.iVal) );
 			break;
 		case( VT_UI1 ):
-			res = VarI2FromUI132( ps->u.bVal, &(pd->u.iVal) );
+			res = VarI2FromUI1( ps->u.bVal, &(pd->u.iVal) );
 			break;
 		case( VT_UI2 ):
-			res = VarI2FromUI232( ps->u.uiVal, &(pd->u.iVal) );
+			res = VarI2FromUI2( ps->u.uiVal, &(pd->u.iVal) );
 			break;
 		case( VT_UINT ):
 		case( VT_UI4 ):
-			res = VarI2FromUI432( ps->u.ulVal, &(pd->u.iVal) );
+			res = VarI2FromUI4( ps->u.ulVal, &(pd->u.iVal) );
 			break;
 		case( VT_R4 ):
-			res = VarI2FromR432( ps->u.fltVal, &(pd->u.iVal) );
+			res = VarI2FromR4( ps->u.fltVal, &(pd->u.iVal) );
 			break;
 		case( VT_R8 ):
-			res = VarI2FromR832( ps->u.dblVal, &(pd->u.iVal) );
+			res = VarI2FromR8( ps->u.dblVal, &(pd->u.iVal) );
 			break;
 		case( VT_DATE ):
-			res = VarI2FromDate32( ps->u.date, &(pd->u.iVal) );
+			res = VarI2FromDate( ps->u.date, &(pd->u.iVal) );
 			break;
 		case( VT_BOOL ):
-			res = VarI2FromBool32( ps->u.boolVal, &(pd->u.iVal) );
+			res = VarI2FromBool( ps->u.boolVal, &(pd->u.iVal) );
 			break;
 		case( VT_BSTR ):
-			res = VarI2FromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.iVal) );
+			res = VarI2FromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.iVal) );
 			break;
 		case( VT_CY ):
-	     res = VarI2FromCy32( ps->u.cyVal, &(pd->u.iVal) );
+	     res = VarI2FromCy( ps->u.cyVal, &(pd->u.iVal) );
 		case( VT_DISPATCH ):
 			/*res = VarI2FromDisp32( ps->u.pdispVal, lcid, &(pd->u.iVal) );*/
 		case( VT_UNKNOWN ):
@@ -996,42 +996,42 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarI4FromI132( ps->u.cVal, &(pd->u.lVal) );
+			res = VarI4FromI1( ps->u.cVal, &(pd->u.lVal) );
 			break;
 		case( VT_I2 ):
-			res = VarI4FromI232( ps->u.iVal, &(pd->u.lVal) );
+			res = VarI4FromI2( ps->u.iVal, &(pd->u.lVal) );
             break;
         case( VT_INT ):
         case( VT_I4 ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_UI1 ):
-			res = VarI4FromUI132( ps->u.bVal, &(pd->u.lVal) );
+			res = VarI4FromUI1( ps->u.bVal, &(pd->u.lVal) );
 			break;
 		case( VT_UI2 ):
-			res = VarI4FromUI232( ps->u.uiVal, &(pd->u.lVal) );
+			res = VarI4FromUI2( ps->u.uiVal, &(pd->u.lVal) );
 			break;
 		case( VT_UINT ):
 		case( VT_UI4 ):
-			res = VarI4FromUI432( ps->u.ulVal, &(pd->u.lVal) );
+			res = VarI4FromUI4( ps->u.ulVal, &(pd->u.lVal) );
 			break;
 		case( VT_R4 ):
-			res = VarI4FromR432( ps->u.fltVal, &(pd->u.lVal) );
+			res = VarI4FromR4( ps->u.fltVal, &(pd->u.lVal) );
 			break;
 		case( VT_R8 ):
-			res = VarI4FromR832( ps->u.dblVal, &(pd->u.lVal) );
+			res = VarI4FromR8( ps->u.dblVal, &(pd->u.lVal) );
 			break;
 		case( VT_DATE ):
-			res = VarI4FromDate32( ps->u.date, &(pd->u.lVal) );
+			res = VarI4FromDate( ps->u.date, &(pd->u.lVal) );
 			break;
 		case( VT_BOOL ):
-			res = VarI4FromBool32( ps->u.boolVal, &(pd->u.lVal) );
+			res = VarI4FromBool( ps->u.boolVal, &(pd->u.lVal) );
 			break;
 		case( VT_BSTR ):
-			res = VarI4FromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.lVal) );
+			res = VarI4FromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.lVal) );
 			break;
 		case( VT_CY ):
-	     res = VarI4FromCy32( ps->u.cyVal, &(pd->u.lVal) );
+	     res = VarI4FromCy( ps->u.cyVal, &(pd->u.lVal) );
 		case( VT_DISPATCH ):
 			/*res = VarI4FromDisp32( ps->u.pdispVal, lcid, &(pd->u.lVal) );*/
 		case( VT_UNKNOWN ):
@@ -1049,42 +1049,42 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarUI1FromI132( ps->u.cVal, &(pd->u.bVal) );
+			res = VarUI1FromI1( ps->u.cVal, &(pd->u.bVal) );
 			break;
 		case( VT_I2 ):
-			res = VarUI1FromI232( ps->u.iVal, &(pd->u.bVal) );
+			res = VarUI1FromI2( ps->u.iVal, &(pd->u.bVal) );
 			break;
 		case( VT_INT ):
 		case( VT_I4 ):
-			res = VarUI1FromI432( ps->u.lVal, &(pd->u.bVal) );
+			res = VarUI1FromI4( ps->u.lVal, &(pd->u.bVal) );
 			break;
         case( VT_UI1 ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_UI2 ):
-			res = VarUI1FromUI232( ps->u.uiVal, &(pd->u.bVal) );
+			res = VarUI1FromUI2( ps->u.uiVal, &(pd->u.bVal) );
 			break;
 		case( VT_UINT ):
 		case( VT_UI4 ):
-			res = VarUI1FromUI432( ps->u.ulVal, &(pd->u.bVal) );
+			res = VarUI1FromUI4( ps->u.ulVal, &(pd->u.bVal) );
 			break;
 		case( VT_R4 ):
-			res = VarUI1FromR432( ps->u.fltVal, &(pd->u.bVal) );
+			res = VarUI1FromR4( ps->u.fltVal, &(pd->u.bVal) );
 			break;
 		case( VT_R8 ):
-			res = VarUI1FromR832( ps->u.dblVal, &(pd->u.bVal) );
+			res = VarUI1FromR8( ps->u.dblVal, &(pd->u.bVal) );
 			break;
 		case( VT_DATE ):
-			res = VarUI1FromDate32( ps->u.date, &(pd->u.bVal) );
+			res = VarUI1FromDate( ps->u.date, &(pd->u.bVal) );
 			break;
 		case( VT_BOOL ):
-			res = VarUI1FromBool32( ps->u.boolVal, &(pd->u.bVal) );
+			res = VarUI1FromBool( ps->u.boolVal, &(pd->u.bVal) );
 			break;
 		case( VT_BSTR ):
-			res = VarUI1FromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.bVal) );
+			res = VarUI1FromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.bVal) );
 			break;
 		case( VT_CY ):
-	     res = VarUI1FromCy32( ps->u.cyVal, &(pd->u.bVal) );
+	     res = VarUI1FromCy( ps->u.cyVal, &(pd->u.bVal) );
 		case( VT_DISPATCH ):
 			/*res = VarUI1FromDisp32( ps->u.pdispVal, lcid, &(pd->u.bVal) );*/
 		case( VT_UNKNOWN ):
@@ -1102,42 +1102,42 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarUI2FromI132( ps->u.cVal, &(pd->u.uiVal) );
+			res = VarUI2FromI1( ps->u.cVal, &(pd->u.uiVal) );
 			break;
 		case( VT_I2 ):
-			res = VarUI2FromI232( ps->u.iVal, &(pd->u.uiVal) );
+			res = VarUI2FromI2( ps->u.iVal, &(pd->u.uiVal) );
 			break;
 		case( VT_INT ):
 		case( VT_I4 ):
-			res = VarUI2FromI432( ps->u.lVal, &(pd->u.uiVal) );
+			res = VarUI2FromI4( ps->u.lVal, &(pd->u.uiVal) );
 			break;
 		case( VT_UI1 ):
-			res = VarUI2FromUI132( ps->u.bVal, &(pd->u.uiVal) );
+			res = VarUI2FromUI1( ps->u.bVal, &(pd->u.uiVal) );
 			break;
         case( VT_UI2 ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_UINT ):
 		case( VT_UI4 ):
-			res = VarUI2FromUI432( ps->u.ulVal, &(pd->u.uiVal) );
+			res = VarUI2FromUI4( ps->u.ulVal, &(pd->u.uiVal) );
 			break;
 		case( VT_R4 ):
-			res = VarUI2FromR432( ps->u.fltVal, &(pd->u.uiVal) );
+			res = VarUI2FromR4( ps->u.fltVal, &(pd->u.uiVal) );
 			break;
 		case( VT_R8 ):
-			res = VarUI2FromR832( ps->u.dblVal, &(pd->u.uiVal) );
+			res = VarUI2FromR8( ps->u.dblVal, &(pd->u.uiVal) );
 			break;
 		case( VT_DATE ):
-			res = VarUI2FromDate32( ps->u.date, &(pd->u.uiVal) );
+			res = VarUI2FromDate( ps->u.date, &(pd->u.uiVal) );
 			break;
 		case( VT_BOOL ):
-			res = VarUI2FromBool32( ps->u.boolVal, &(pd->u.uiVal) );
+			res = VarUI2FromBool( ps->u.boolVal, &(pd->u.uiVal) );
 			break;
 		case( VT_BSTR ):
-			res = VarUI2FromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.uiVal) );
+			res = VarUI2FromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.uiVal) );
 			break;
 		case( VT_CY ):
-	     res = VarUI2FromCy32( ps->u.cyVal, &(pd->u.uiVal) );
+	     res = VarUI2FromCy( ps->u.cyVal, &(pd->u.uiVal) );
 		case( VT_DISPATCH ):
 			/*res = VarUI2FromDisp32( ps->u.pdispVal, lcid, &(pd->u.uiVal) );*/
 		case( VT_UNKNOWN ):
@@ -1156,41 +1156,41 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarUI4FromI132( ps->u.cVal, &(pd->u.ulVal) );
+			res = VarUI4FromI1( ps->u.cVal, &(pd->u.ulVal) );
 			break;
 		case( VT_I2 ):
-			res = VarUI4FromI232( ps->u.iVal, &(pd->u.ulVal) );
+			res = VarUI4FromI2( ps->u.iVal, &(pd->u.ulVal) );
 			break;
 		case( VT_INT ):
 		case( VT_I4 ):
-			res = VarUI4FromI432( ps->u.lVal, &(pd->u.ulVal) );
+			res = VarUI4FromI4( ps->u.lVal, &(pd->u.ulVal) );
 			break;
 		case( VT_UI1 ):
-			res = VarUI4FromUI132( ps->u.bVal, &(pd->u.ulVal) );
+			res = VarUI4FromUI1( ps->u.bVal, &(pd->u.ulVal) );
 			break;
 		case( VT_UI2 ):
-			res = VarUI4FromUI232( ps->u.uiVal, &(pd->u.ulVal) );
+			res = VarUI4FromUI2( ps->u.uiVal, &(pd->u.ulVal) );
 			break;
         case( VT_UI4 ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_R4 ):
-			res = VarUI4FromR432( ps->u.fltVal, &(pd->u.ulVal) );
+			res = VarUI4FromR4( ps->u.fltVal, &(pd->u.ulVal) );
 			break;
 		case( VT_R8 ):
-			res = VarUI4FromR832( ps->u.dblVal, &(pd->u.ulVal) );
+			res = VarUI4FromR8( ps->u.dblVal, &(pd->u.ulVal) );
 			break;
 		case( VT_DATE ):
-			res = VarUI4FromDate32( ps->u.date, &(pd->u.ulVal) );
+			res = VarUI4FromDate( ps->u.date, &(pd->u.ulVal) );
 			break;
 		case( VT_BOOL ):
-			res = VarUI4FromBool32( ps->u.boolVal, &(pd->u.ulVal) );
+			res = VarUI4FromBool( ps->u.boolVal, &(pd->u.ulVal) );
 			break;
 		case( VT_BSTR ):
-			res = VarUI4FromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.ulVal) );
+			res = VarUI4FromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.ulVal) );
 			break;
 		case( VT_CY ):
-	     res = VarUI4FromCy32( ps->u.cyVal, &(pd->u.ulVal) );
+	     res = VarUI4FromCy( ps->u.cyVal, &(pd->u.ulVal) );
 		case( VT_DISPATCH ):
 			/*res = VarUI4FromDisp32( ps->u.pdispVal, lcid, &(pd->u.ulVal) );*/
 		case( VT_UNKNOWN ):
@@ -1208,42 +1208,42 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarR4FromI132( ps->u.cVal, &(pd->u.fltVal) );
+			res = VarR4FromI1( ps->u.cVal, &(pd->u.fltVal) );
 			break;
 		case( VT_I2 ):
-			res = VarR4FromI232( ps->u.iVal, &(pd->u.fltVal) );
+			res = VarR4FromI2( ps->u.iVal, &(pd->u.fltVal) );
 			break;
 		case( VT_INT ):
 		case( VT_I4 ):
-			res = VarR4FromI432( ps->u.lVal, &(pd->u.fltVal) );
+			res = VarR4FromI4( ps->u.lVal, &(pd->u.fltVal) );
 			break;
 		case( VT_UI1 ):
-			res = VarR4FromUI132( ps->u.bVal, &(pd->u.fltVal) );
+			res = VarR4FromUI1( ps->u.bVal, &(pd->u.fltVal) );
 			break;
 		case( VT_UI2 ):
-			res = VarR4FromUI232( ps->u.uiVal, &(pd->u.fltVal) );
+			res = VarR4FromUI2( ps->u.uiVal, &(pd->u.fltVal) );
 			break;
 		case( VT_UINT ):
 		case( VT_UI4 ):
-			res = VarR4FromUI432( ps->u.ulVal, &(pd->u.fltVal) );
+			res = VarR4FromUI4( ps->u.ulVal, &(pd->u.fltVal) );
 			break;
         case( VT_R4 ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_R8 ):
-			res = VarR4FromR832( ps->u.dblVal, &(pd->u.fltVal) );
+			res = VarR4FromR8( ps->u.dblVal, &(pd->u.fltVal) );
 			break;
 		case( VT_DATE ):
-			res = VarR4FromDate32( ps->u.date, &(pd->u.fltVal) );
+			res = VarR4FromDate( ps->u.date, &(pd->u.fltVal) );
 			break;
 		case( VT_BOOL ):
-			res = VarR4FromBool32( ps->u.boolVal, &(pd->u.fltVal) );
+			res = VarR4FromBool( ps->u.boolVal, &(pd->u.fltVal) );
 			break;
 		case( VT_BSTR ):
-			res = VarR4FromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.fltVal) );
+			res = VarR4FromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.fltVal) );
 			break;
 		case( VT_CY ):
-	     res = VarR4FromCy32( ps->u.cyVal, &(pd->u.fltVal) );
+	     res = VarR4FromCy( ps->u.cyVal, &(pd->u.fltVal) );
 		case( VT_DISPATCH ):
 			/*res = VarR4FromDisp32( ps->u.pdispVal, lcid, &(pd->u.fltVal) );*/
 		case( VT_UNKNOWN ):
@@ -1261,42 +1261,42 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarR8FromI132( ps->u.cVal, &(pd->u.dblVal) );
+			res = VarR8FromI1( ps->u.cVal, &(pd->u.dblVal) );
 			break;
 		case( VT_I2 ):
-			res = VarR8FromI232( ps->u.iVal, &(pd->u.dblVal) );
+			res = VarR8FromI2( ps->u.iVal, &(pd->u.dblVal) );
 			break;
 		case( VT_INT ):
 		case( VT_I4 ):
-			res = VarR8FromI432( ps->u.lVal, &(pd->u.dblVal) );
+			res = VarR8FromI4( ps->u.lVal, &(pd->u.dblVal) );
 			break;
 		case( VT_UI1 ):
-			res = VarR8FromUI132( ps->u.bVal, &(pd->u.dblVal) );
+			res = VarR8FromUI1( ps->u.bVal, &(pd->u.dblVal) );
 			break;
 		case( VT_UI2 ):
-			res = VarR8FromUI232( ps->u.uiVal, &(pd->u.dblVal) );
+			res = VarR8FromUI2( ps->u.uiVal, &(pd->u.dblVal) );
 			break;
 		case( VT_UINT ):
 		case( VT_UI4 ):
-			res = VarR8FromUI432( ps->u.ulVal, &(pd->u.dblVal) );
+			res = VarR8FromUI4( ps->u.ulVal, &(pd->u.dblVal) );
 			break;
 		case( VT_R4 ):
-			res = VarR8FromR432( ps->u.fltVal, &(pd->u.dblVal) );
+			res = VarR8FromR4( ps->u.fltVal, &(pd->u.dblVal) );
 			break;
         case( VT_R8 ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_DATE ):
-			res = VarR8FromDate32( ps->u.date, &(pd->u.dblVal) );
+			res = VarR8FromDate( ps->u.date, &(pd->u.dblVal) );
 			break;
 		case( VT_BOOL ):
-			res = VarR8FromBool32( ps->u.boolVal, &(pd->u.dblVal) );
+			res = VarR8FromBool( ps->u.boolVal, &(pd->u.dblVal) );
 			break;
 		case( VT_BSTR ):
-			res = VarR8FromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.dblVal) );
+			res = VarR8FromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.dblVal) );
 			break;
 		case( VT_CY ):
-	     res = VarR8FromCy32( ps->u.cyVal, &(pd->u.dblVal) );
+	     res = VarR8FromCy( ps->u.cyVal, &(pd->u.dblVal) );
 		case( VT_DISPATCH ):
 			/*res = VarR8FromDisp32( ps->u.pdispVal, lcid, &(pd->u.dblVal) );*/
 		case( VT_UNKNOWN ):
@@ -1314,46 +1314,46 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarDateFromI132( ps->u.cVal, &(pd->u.date) );
+			res = VarDateFromI1( ps->u.cVal, &(pd->u.date) );
 			break;
 		case( VT_I2 ):
-			res = VarDateFromI232( ps->u.iVal, &(pd->u.date) );
+			res = VarDateFromI2( ps->u.iVal, &(pd->u.date) );
 			break;
 		case( VT_INT ):
-			res = VarDateFromInt32( ps->u.intVal, &(pd->u.date) );
+			res = VarDateFromInt( ps->u.intVal, &(pd->u.date) );
 			break;
 		case( VT_I4 ):
-			res = VarDateFromI432( ps->u.lVal, &(pd->u.date) );
+			res = VarDateFromI4( ps->u.lVal, &(pd->u.date) );
 			break;
 		case( VT_UI1 ):
-			res = VarDateFromUI132( ps->u.bVal, &(pd->u.date) );
+			res = VarDateFromUI1( ps->u.bVal, &(pd->u.date) );
 			break;
 		case( VT_UI2 ):
-			res = VarDateFromUI232( ps->u.uiVal, &(pd->u.date) );
+			res = VarDateFromUI2( ps->u.uiVal, &(pd->u.date) );
 			break;
 		case( VT_UINT ):
-			res = VarDateFromUint32( ps->u.uintVal, &(pd->u.date) );
+			res = VarDateFromUint( ps->u.uintVal, &(pd->u.date) );
 			break;
 		case( VT_UI4 ):
-			res = VarDateFromUI432( ps->u.ulVal, &(pd->u.date) );
+			res = VarDateFromUI4( ps->u.ulVal, &(pd->u.date) );
 			break;
 		case( VT_R4 ):
-			res = VarDateFromR432( ps->u.fltVal, &(pd->u.date) );
+			res = VarDateFromR4( ps->u.fltVal, &(pd->u.date) );
 			break;
 		case( VT_R8 ):
-			res = VarDateFromR832( ps->u.dblVal, &(pd->u.date) );
+			res = VarDateFromR8( ps->u.dblVal, &(pd->u.date) );
 			break;
         case( VT_DATE ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_BOOL ):
-			res = VarDateFromBool32( ps->u.boolVal, &(pd->u.date) );
+			res = VarDateFromBool( ps->u.boolVal, &(pd->u.date) );
 			break;
 		case( VT_BSTR ):
-			res = VarDateFromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.date) );
+			res = VarDateFromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.date) );
 			break;
 		case( VT_CY ):
-	     res = VarDateFromCy32( ps->u.cyVal, &(pd->u.date) );
+	     res = VarDateFromCy( ps->u.cyVal, &(pd->u.date) );
 		case( VT_DISPATCH ):
 			/*res = VarDateFromDisp32( ps->u.pdispVal, lcid, &(pd->u.date) );*/
 		case( VT_UNKNOWN ):
@@ -1371,46 +1371,46 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarBoolFromI132( ps->u.cVal, &(pd->u.boolVal) );
+			res = VarBoolFromI1( ps->u.cVal, &(pd->u.boolVal) );
 			break;
 		case( VT_I2 ):
-			res = VarBoolFromI232( ps->u.iVal, &(pd->u.boolVal) );
+			res = VarBoolFromI2( ps->u.iVal, &(pd->u.boolVal) );
 			break;
 		case( VT_INT ):
-			res = VarBoolFromInt32( ps->u.intVal, &(pd->u.boolVal) );
+			res = VarBoolFromInt( ps->u.intVal, &(pd->u.boolVal) );
 			break;
 		case( VT_I4 ):
-			res = VarBoolFromI432( ps->u.lVal, &(pd->u.boolVal) );
+			res = VarBoolFromI4( ps->u.lVal, &(pd->u.boolVal) );
 			break;
 		case( VT_UI1 ):
-			res = VarBoolFromUI132( ps->u.bVal, &(pd->u.boolVal) );
+			res = VarBoolFromUI1( ps->u.bVal, &(pd->u.boolVal) );
 			break;
 		case( VT_UI2 ):
-			res = VarBoolFromUI232( ps->u.uiVal, &(pd->u.boolVal) );
+			res = VarBoolFromUI2( ps->u.uiVal, &(pd->u.boolVal) );
 			break;
 		case( VT_UINT ):
-			res = VarBoolFromUint32( ps->u.uintVal, &(pd->u.boolVal) );
+			res = VarBoolFromUint( ps->u.uintVal, &(pd->u.boolVal) );
 			break;
 		case( VT_UI4 ):
-			res = VarBoolFromUI432( ps->u.ulVal, &(pd->u.boolVal) );
+			res = VarBoolFromUI4( ps->u.ulVal, &(pd->u.boolVal) );
 			break;
 		case( VT_R4 ):
-			res = VarBoolFromR432( ps->u.fltVal, &(pd->u.boolVal) );
+			res = VarBoolFromR4( ps->u.fltVal, &(pd->u.boolVal) );
 			break;
 		case( VT_R8 ):
-			res = VarBoolFromR832( ps->u.dblVal, &(pd->u.boolVal) );
+			res = VarBoolFromR8( ps->u.dblVal, &(pd->u.boolVal) );
 			break;
 		case( VT_DATE ):
-			res = VarBoolFromDate32( ps->u.date, &(pd->u.boolVal) );
+			res = VarBoolFromDate( ps->u.date, &(pd->u.boolVal) );
 			break;
         case( VT_BOOL ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_BSTR ):
-			res = VarBoolFromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.boolVal) );
+			res = VarBoolFromStr( ps->u.bstrVal, lcid, dwFlags, &(pd->u.boolVal) );
 			break;
 		case( VT_CY ):
-	     res = VarBoolFromCy32( ps->u.cyVal, &(pd->u.boolVal) );
+	     res = VarBoolFromCy( ps->u.cyVal, &(pd->u.boolVal) );
 		case( VT_DISPATCH ):
 			/*res = VarBoolFromDisp32( ps->u.pdispVal, lcid, &(pd->u.boolVal) );*/
 		case( VT_UNKNOWN ):
@@ -1428,43 +1428,43 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 		switch( vtFrom )
 		{
 		case( VT_I1 ):
-			res = VarBstrFromI132( ps->u.cVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromI1( ps->u.cVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_I2 ):
-			res = VarBstrFromI232( ps->u.iVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromI2( ps->u.iVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_INT ):
-			res = VarBstrFromInt32( ps->u.intVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromInt( ps->u.intVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_I4 ):
-			res = VarBstrFromI432( ps->u.lVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromI4( ps->u.lVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_UI1 ):
-			res = VarBstrFromUI132( ps->u.bVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromUI1( ps->u.bVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_UI2 ):
-			res = VarBstrFromUI232( ps->u.uiVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromUI2( ps->u.uiVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_UINT ):
-			res = VarBstrFromUint32( ps->u.uintVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromUint( ps->u.uintVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_UI4 ):
-			res = VarBstrFromUI432( ps->u.ulVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromUI4( ps->u.ulVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_R4 ):
-			res = VarBstrFromR432( ps->u.fltVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromR4( ps->u.fltVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_R8 ):
-			res = VarBstrFromR832( ps->u.dblVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromR8( ps->u.dblVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_DATE ):
-			res = VarBstrFromDate32( ps->u.date, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromDate( ps->u.date, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
 		case( VT_BOOL ):
-			res = VarBstrFromBool32( ps->u.boolVal, lcid, dwFlags, &(pd->u.bstrVal) );
+			res = VarBstrFromBool( ps->u.boolVal, lcid, dwFlags, &(pd->u.bstrVal) );
 			break;
         case( VT_BSTR ):
-            res = VariantCopy32( pd, ps );
+            res = VariantCopy( pd, ps );
             break;
 		case( VT_CY ):
 	     /*res = VarBstrFromCy32( ps->u.cyVal, lcid, dwFlags, &(pd->u.bstrVal) );*/
@@ -1485,43 +1485,43 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
 	switch( vtFrom )
 	  {
 	  case( VT_I1 ):
-	     res = VarCyFromI132( ps->u.cVal, &(pd->u.cyVal) );
+	     res = VarCyFromI1( ps->u.cVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_I2 ):
-	     res = VarCyFromI232( ps->u.iVal, &(pd->u.cyVal) );
+	     res = VarCyFromI2( ps->u.iVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_INT ):
-	     res = VarCyFromInt32( ps->u.intVal, &(pd->u.cyVal) );
+	     res = VarCyFromInt( ps->u.intVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_I4 ):
-	     res = VarCyFromI432( ps->u.lVal, &(pd->u.cyVal) );
+	     res = VarCyFromI4( ps->u.lVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_UI1 ):
-	     res = VarCyFromUI132( ps->u.bVal, &(pd->u.cyVal) );
+	     res = VarCyFromUI1( ps->u.bVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_UI2 ):
-	     res = VarCyFromUI232( ps->u.uiVal, &(pd->u.cyVal) );
+	     res = VarCyFromUI2( ps->u.uiVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_UINT ):
-	     res = VarCyFromUint32( ps->u.uintVal, &(pd->u.cyVal) );
+	     res = VarCyFromUint( ps->u.uintVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_UI4 ):
-	     res = VarCyFromUI432( ps->u.ulVal, &(pd->u.cyVal) );
+	     res = VarCyFromUI4( ps->u.ulVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_R4 ):
-	     res = VarCyFromR432( ps->u.fltVal, &(pd->u.cyVal) );
+	     res = VarCyFromR4( ps->u.fltVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_R8 ):
-	     res = VarCyFromR832( ps->u.dblVal, &(pd->u.cyVal) );
+	     res = VarCyFromR8( ps->u.dblVal, &(pd->u.cyVal) );
 	     break;
 	  case( VT_DATE ):
-	     res = VarCyFromDate32( ps->u.date, &(pd->u.cyVal) );
+	     res = VarCyFromDate( ps->u.date, &(pd->u.cyVal) );
 	     break;
 	  case( VT_BOOL ):
-	     res = VarCyFromBool32( ps->u.date, &(pd->u.cyVal) );
+	     res = VarCyFromBool( ps->u.date, &(pd->u.cyVal) );
 	     break;
 	  case( VT_CY ):
-	     res = VariantCopy32( pd, ps );
+	     res = VariantCopy( pd, ps );
 	     break;
 	  case( VT_BSTR ):
 	     /*res = VarCyFromStr32( ps->u.bstrVal, lcid, dwFlags, &(pd->u.cyVal) );*/
@@ -1642,7 +1642,7 @@ static HRESULT WINAPI ValidateVt( VARTYPE vt )
  * Initializes the Variant.  Unlike VariantClear it does not interpret the current
  * contents of the Variant.
  */
-void WINAPI VariantInit32(VARIANTARG* pvarg)
+void WINAPI VariantInit(VARIANTARG* pvarg)
 {
 	TRACE(ole,"(%p),stub\n",pvarg);
 
@@ -1662,7 +1662,7 @@ void WINAPI VariantInit32(VARIANTARG* pvarg)
  * freed.  If the vt is VT_BSTR the string is freed. If VT_DISPATCH the object is
  * released. If VT_ARRAY the array is freed.
  */
-HRESULT WINAPI VariantClear32(VARIANTARG* pvarg)
+HRESULT WINAPI VariantClear(VARIANTARG* pvarg)
 {
 	HRESULT res = S_OK;
 	TRACE(ole,"(%p),stub\n",pvarg);
@@ -1675,7 +1675,7 @@ HRESULT WINAPI VariantClear32(VARIANTARG* pvarg)
 			switch( pvarg->vt & VT_TYPEMASK )
 			{
 			case( VT_BSTR ):
-				SysFreeString32( pvarg->u.bstrVal );
+				SysFreeString( pvarg->u.bstrVal );
 				break;
 			case( VT_DISPATCH ):
 				break;
@@ -1706,7 +1706,7 @@ HRESULT WINAPI VariantClear32(VARIANTARG* pvarg)
  *
  * Frees up the designation variant and makes a copy of the source.
  */
-HRESULT WINAPI VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
+HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
 {
 	HRESULT res = S_OK;
 	TRACE(ole,"(%p, %p),stub\n", pvargDest, pvargSrc);
@@ -1717,7 +1717,7 @@ HRESULT WINAPI VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
 	 */
 	if( pvargDest != pvargSrc && res == S_OK )
 	{
-		res = VariantClear32( pvargDest );
+		res = VariantClear( pvargDest );
 		
 		if( res == S_OK )
 		{
@@ -1741,7 +1741,7 @@ HRESULT WINAPI VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
 				switch( pvargSrc->vt & VT_TYPEMASK )
 				{
 				case( VT_BSTR ):
-				   pvargDest->u.bstrVal = SysAllocString32( pvargSrc->u.bstrVal );
+				   pvargDest->u.bstrVal = SysAllocString( pvargSrc->u.bstrVal );
 				   break;
 				case( VT_DISPATCH ):
 					break;
@@ -1770,7 +1770,7 @@ HRESULT WINAPI VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
  * Frees up the destination variant and makes a copy of the source.  If
  * the source is of type VT_BYREF it performs the necessary indirections.
  */
-HRESULT WINAPI VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc)
+HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc)
 {
 	HRESULT res = S_OK;
 	TRACE(ole,"(%p, %p),stub\n", pvargDest, pvargSrc);
@@ -1782,19 +1782,19 @@ HRESULT WINAPI VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc)
 	if( pvargSrc->vt & VT_BYREF )
 	{
 		VARIANTARG varg;
-		VariantInit32( &varg );
+		VariantInit( &varg );
 		/* handle the in place copy.
 		 */
 		if( pvargDest == pvargSrc )
 		{
 			/* we will use a copy of the source instead.
 			 */
-			res = VariantCopy32( &varg, pvargSrc );
+			res = VariantCopy( &varg, pvargSrc );
 			pvargSrc = &varg;
 		}
 		if( res == S_OK )
 		{
-			res = VariantClear32( pvargDest );
+			res = VariantClear( pvargDest );
 			if( res == S_OK )
 			{
 				/* In the case of by reference we need
@@ -1805,7 +1805,7 @@ HRESULT WINAPI VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc)
 				switch( pvargSrc->vt & VT_TYPEMASK )
 				{
 				case( VT_BSTR ):
-				   pvargDest->u.bstrVal = SysAllocString32( *(pvargSrc->u.pbstrVal) );
+				   pvargDest->u.bstrVal = SysAllocString( *(pvargSrc->u.pbstrVal) );
 				   break;
 				case( VT_DISPATCH ):
 					break;
@@ -1835,7 +1835,7 @@ HRESULT WINAPI VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc)
 							(pvargSrc->u.pvarVal)->wReserved1 |= PROCESSING_INNER_VARIANT;
 							/* Dereference the inner variant.
 							 */
-							res = VariantCopyInd32( pvargDest, pvargSrc->u.pvarVal );
+							res = VariantCopyInd( pvargDest, pvargSrc->u.pvarVal );
 						}
 					}
 					break;
@@ -1860,11 +1860,11 @@ HRESULT WINAPI VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc)
 		}
 		/* this should not fail.
 		 */
-		VariantClear32( &varg );
+		VariantClear( &varg );
 	}
 	else
 	{
-		res = VariantCopy32( pvargDest, pvargSrc );
+		res = VariantCopy( pvargDest, pvargSrc );
 	}
 	return res;
 }
@@ -1872,21 +1872,21 @@ HRESULT WINAPI VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc)
 /******************************************************************************
  *		VariantChangeType32	[OLEAUT32.12]
  */
-HRESULT WINAPI VariantChangeType32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
+HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 							USHORT wFlags, VARTYPE vt)
 {
-	return VariantChangeTypeEx32( pvargDest, pvargSrc, 0, wFlags, vt );
+	return VariantChangeTypeEx( pvargDest, pvargSrc, 0, wFlags, vt );
 }
 
 /******************************************************************************
  *		VariantChangeTypeEx32	[OLEAUT32.147]
  */
-HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
+HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 							  LCID lcid, USHORT wFlags, VARTYPE vt)
 {
 	HRESULT res = S_OK;
 	VARIANTARG varg;
-	VariantInit32( &varg );
+	VariantInit( &varg );
 	
 	TRACE(ole,"(%p, %p, %ld, %u, %u),stub\n", pvargDest, pvargSrc, lcid, wFlags, vt);
 
@@ -1905,7 +1905,7 @@ HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc
 	 */
 	if( res == S_OK && pvargDest == pvargSrc )
 	{
-		res = VariantCopy32( &varg, pvargSrc );
+		res = VariantCopy( &varg, pvargSrc );
 		pvargSrc = &varg;
 	}
 
@@ -1913,7 +1913,7 @@ HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc
 	{
 		/* free up the destination variant.
 		 */
-		res = VariantClear32( pvargDest );
+		res = VariantClear( pvargDest );
 	}
 
 	if( res == S_OK )
@@ -1923,14 +1923,14 @@ HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc
 			/* Convert the source variant to a "byvalue" variant.
 			 */
 			VARIANTARG Variant;
-			VariantInit32( &Variant );
-			res = VariantCopyInd32( &Variant, pvargSrc );
+			VariantInit( &Variant );
+			res = VariantCopyInd( &Variant, pvargSrc );
 			if( res == S_OK )
 			{
 				res = Coerce( pvargDest, lcid, wFlags, &Variant, vt );
 				/* this should not fail.
 				 */
-				VariantClear32( &Variant );
+				VariantClear( &Variant );
 			}
 	
 		}
@@ -1943,7 +1943,7 @@ HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc
 	}
 	/* this should not fail.
 	 */
-	VariantClear32( &varg );
+	VariantClear( &varg );
 	
 	return res;
 }
@@ -1954,7 +1954,7 @@ HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc
 /******************************************************************************
  *		VarUI1FromI232		[OLEAUT32.130]
  */
-HRESULT WINAPI VarUI1FromI232(short sIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromI2(short sIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pbOut );
 
@@ -1973,7 +1973,7 @@ HRESULT WINAPI VarUI1FromI232(short sIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromI432		[OLEAUT32.131]
  */
-HRESULT WINAPI VarUI1FromI432(LONG lIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromI4(LONG lIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pbOut );
 
@@ -1993,7 +1993,7 @@ HRESULT WINAPI VarUI1FromI432(LONG lIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromR432		[OLEAUT32.132]
  */
-HRESULT WINAPI VarUI1FromR432(FLOAT fltIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromR4(FLOAT fltIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, pbOut );
 
@@ -2013,7 +2013,7 @@ HRESULT WINAPI VarUI1FromR432(FLOAT fltIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromR832		[OLEAUT32.133]
  */
-HRESULT WINAPI VarUI1FromR832(double dblIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromR8(double dblIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pbOut );
 
@@ -2033,7 +2033,7 @@ HRESULT WINAPI VarUI1FromR832(double dblIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromDate32		[OLEAUT32.135]
  */
-HRESULT WINAPI VarUI1FromDate32(DATE dateIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromDate(DATE dateIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pbOut );
 
@@ -2053,7 +2053,7 @@ HRESULT WINAPI VarUI1FromDate32(DATE dateIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromBool32		[OLEAUT32.138]
  */
-HRESULT WINAPI VarUI1FromBool32(VARIANT_BOOL boolIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromBool(VARIANT_BOOL boolIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pbOut );
 
@@ -2065,7 +2065,7 @@ HRESULT WINAPI VarUI1FromBool32(VARIANT_BOOL boolIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromI132		[OLEAUT32.237]
  */
-HRESULT WINAPI VarUI1FromI132(CHAR cIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromI1(CHAR cIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pbOut );
 
@@ -2077,7 +2077,7 @@ HRESULT WINAPI VarUI1FromI132(CHAR cIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromUI232		[OLEAUT32.238]
  */
-HRESULT WINAPI VarUI1FromUI232(USHORT uiIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromUI2(USHORT uiIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pbOut );
 
@@ -2096,7 +2096,7 @@ HRESULT WINAPI VarUI1FromUI232(USHORT uiIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromUI432		[OLEAUT32.239]
  */
-HRESULT WINAPI VarUI1FromUI432(ULONG ulIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pbOut );
 
@@ -2116,7 +2116,7 @@ HRESULT WINAPI VarUI1FromUI432(ULONG ulIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromStr32		[OLEAUT32.54]
  */
-HRESULT WINAPI VarUI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -2157,7 +2157,7 @@ HRESULT WINAPI VarUI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, BYTE*
  *              VarUI1FromCy32 [OLEAUT32.134]
  * Convert currency to unsigned char
  */
-HRESULT WINAPI VarUI1FromCy32(CY cyIn, BYTE* pbOut) {
+HRESULT WINAPI VarUI1FromCy(CY cyIn, BYTE* pbOut) {
    double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000);
    
    if (t > UI1_MAX || t < UI1_MIN) return DISP_E_OVERFLOW;
@@ -2169,7 +2169,7 @@ HRESULT WINAPI VarUI1FromCy32(CY cyIn, BYTE* pbOut) {
 /******************************************************************************
  *		VarI2FromUI132		[OLEAUT32.48]
  */
-HRESULT WINAPI VarI2FromUI132(BYTE bIn, short* psOut)
+HRESULT WINAPI VarI2FromUI1(BYTE bIn, short* psOut)
 {
 	TRACE( ole, "( 0x%08x, %p ), stub\n", bIn, psOut );
 
@@ -2181,7 +2181,7 @@ HRESULT WINAPI VarI2FromUI132(BYTE bIn, short* psOut)
 /******************************************************************************
  *		VarI2FromI432		[OLEAUT32.49]
  */
-HRESULT WINAPI VarI2FromI432(LONG lIn, short* psOut)
+HRESULT WINAPI VarI2FromI4(LONG lIn, short* psOut)
 {
 	TRACE( ole, "( %lx, %p ), stub\n", lIn, psOut );
 
@@ -2200,7 +2200,7 @@ HRESULT WINAPI VarI2FromI432(LONG lIn, short* psOut)
 /******************************************************************************
  *		VarI2FromR432		[OLEAUT32.50]
  */
-HRESULT WINAPI VarI2FromR432(FLOAT fltIn, short* psOut)
+HRESULT WINAPI VarI2FromR4(FLOAT fltIn, short* psOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, psOut );
 
@@ -2220,7 +2220,7 @@ HRESULT WINAPI VarI2FromR432(FLOAT fltIn, short* psOut)
 /******************************************************************************
  *		VarI2FromR832		[OLEAUT32.51]
  */
-HRESULT WINAPI VarI2FromR832(double dblIn, short* psOut)
+HRESULT WINAPI VarI2FromR8(double dblIn, short* psOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, psOut );
 
@@ -2240,7 +2240,7 @@ HRESULT WINAPI VarI2FromR832(double dblIn, short* psOut)
 /******************************************************************************
  *		VarI2FromDate32		[OLEAUT32.53]
  */
-HRESULT WINAPI VarI2FromDate32(DATE dateIn, short* psOut)
+HRESULT WINAPI VarI2FromDate(DATE dateIn, short* psOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, psOut );
 
@@ -2260,7 +2260,7 @@ HRESULT WINAPI VarI2FromDate32(DATE dateIn, short* psOut)
 /******************************************************************************
  *		VarI2FromBool32		[OLEAUT32.56]
  */
-HRESULT WINAPI VarI2FromBool32(VARIANT_BOOL boolIn, short* psOut)
+HRESULT WINAPI VarI2FromBool(VARIANT_BOOL boolIn, short* psOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, psOut );
 
@@ -2272,7 +2272,7 @@ HRESULT WINAPI VarI2FromBool32(VARIANT_BOOL boolIn, short* psOut)
 /******************************************************************************
  *		VarI2FromI132		[OLEAUT32.48]
  */
-HRESULT WINAPI VarI2FromI132(CHAR cIn, short* psOut)
+HRESULT WINAPI VarI2FromI1(CHAR cIn, short* psOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, psOut );
 
@@ -2284,7 +2284,7 @@ HRESULT WINAPI VarI2FromI132(CHAR cIn, short* psOut)
 /******************************************************************************
  *		VarI2FromUI232		[OLEAUT32.206]
  */
-HRESULT WINAPI VarI2FromUI232(USHORT uiIn, short* psOut)
+HRESULT WINAPI VarI2FromUI2(USHORT uiIn, short* psOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, psOut );
 
@@ -2303,7 +2303,7 @@ HRESULT WINAPI VarI2FromUI232(USHORT uiIn, short* psOut)
 /******************************************************************************
  *		VarI2FromUI432		[OLEAUT32.49]
  */
-HRESULT WINAPI VarI2FromUI432(ULONG ulIn, short* psOut)
+HRESULT WINAPI VarI2FromUI4(ULONG ulIn, short* psOut)
 {
 	TRACE( ole, "( %lx, %p ), stub\n", ulIn, psOut );
 
@@ -2322,7 +2322,7 @@ HRESULT WINAPI VarI2FromUI432(ULONG ulIn, short* psOut)
 /******************************************************************************
  *		VarI2FromStr32		[OLEAUT32.54]
  */
-HRESULT WINAPI VarI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, short* psOut)
+HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, short* psOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -2363,7 +2363,7 @@ HRESULT WINAPI VarI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, short*
  *              VarI2FromCy32 [OLEAUT32.52]
  * Convert currency to signed short
  */
-HRESULT WINAPI VarI2FromCy32(CY cyIn, short* psOut) {
+HRESULT WINAPI VarI2FromCy(CY cyIn, short* psOut) {
    double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000);
    
    if (t > I2_MAX || t < I2_MIN) return DISP_E_OVERFLOW;
@@ -2375,7 +2375,7 @@ HRESULT WINAPI VarI2FromCy32(CY cyIn, short* psOut) {
 /******************************************************************************
  *		VarI4FromUI132		[OLEAUT32.58]
  */
-HRESULT WINAPI VarI4FromUI132(BYTE bIn, LONG* plOut)
+HRESULT WINAPI VarI4FromUI1(BYTE bIn, LONG* plOut)
 {
 	TRACE( ole, "( %X, %p ), stub\n", bIn, plOut );
 
@@ -2388,7 +2388,7 @@ HRESULT WINAPI VarI4FromUI132(BYTE bIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromR432		[OLEAUT32.60]
  */
-HRESULT WINAPI VarI4FromR432(FLOAT fltIn, LONG* plOut)
+HRESULT WINAPI VarI4FromR4(FLOAT fltIn, LONG* plOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, plOut );
 
@@ -2408,7 +2408,7 @@ HRESULT WINAPI VarI4FromR432(FLOAT fltIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromR832		[OLEAUT32.61]
  */
-HRESULT WINAPI VarI4FromR832(double dblIn, LONG* plOut)
+HRESULT WINAPI VarI4FromR8(double dblIn, LONG* plOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, plOut );
 
@@ -2428,7 +2428,7 @@ HRESULT WINAPI VarI4FromR832(double dblIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromDate32		[OLEAUT32.63]
  */
-HRESULT WINAPI VarI4FromDate32(DATE dateIn, LONG* plOut)
+HRESULT WINAPI VarI4FromDate(DATE dateIn, LONG* plOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, plOut );
 
@@ -2448,7 +2448,7 @@ HRESULT WINAPI VarI4FromDate32(DATE dateIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromBool32		[OLEAUT32.66]
  */
-HRESULT WINAPI VarI4FromBool32(VARIANT_BOOL boolIn, LONG* plOut)
+HRESULT WINAPI VarI4FromBool(VARIANT_BOOL boolIn, LONG* plOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, plOut );
 
@@ -2460,7 +2460,7 @@ HRESULT WINAPI VarI4FromBool32(VARIANT_BOOL boolIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromI132		[OLEAUT32.209]
  */
-HRESULT WINAPI VarI4FromI132(CHAR cIn, LONG* plOut)
+HRESULT WINAPI VarI4FromI1(CHAR cIn, LONG* plOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, plOut );
 
@@ -2472,7 +2472,7 @@ HRESULT WINAPI VarI4FromI132(CHAR cIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromUI232		[OLEAUT32.210]
  */
-HRESULT WINAPI VarI4FromUI232(USHORT uiIn, LONG* plOut)
+HRESULT WINAPI VarI4FromUI2(USHORT uiIn, LONG* plOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, plOut );
 
@@ -2484,7 +2484,7 @@ HRESULT WINAPI VarI4FromUI232(USHORT uiIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromUI432		[OLEAUT32.211]
  */
-HRESULT WINAPI VarI4FromUI432(ULONG ulIn, LONG* plOut)
+HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG* plOut)
 {
 	TRACE( ole, "( %lx, %p ), stub\n", ulIn, plOut );
 
@@ -2503,7 +2503,7 @@ HRESULT WINAPI VarI4FromUI432(ULONG ulIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromI232		[OLEAUT32.59]
  */
-HRESULT WINAPI VarI4FromI232(short sIn, LONG* plOut)
+HRESULT WINAPI VarI4FromI2(short sIn, LONG* plOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, plOut );
 
@@ -2515,7 +2515,7 @@ HRESULT WINAPI VarI4FromI232(short sIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromStr32		[OLEAUT32.64]
  */
-HRESULT WINAPI VarI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, LONG* plOut)
+HRESULT WINAPI VarI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG* plOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -2556,7 +2556,7 @@ HRESULT WINAPI VarI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, LONG*
  *              VarI4FromCy32 [OLEAUT32.62]
  * Convert currency to signed long
  */
-HRESULT WINAPI VarI4FromCy32(CY cyIn, LONG* plOut) {
+HRESULT WINAPI VarI4FromCy(CY cyIn, LONG* plOut) {
    double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000);
    
    if (t > I4_MAX || t < I4_MIN) return DISP_E_OVERFLOW;
@@ -2568,7 +2568,7 @@ HRESULT WINAPI VarI4FromCy32(CY cyIn, LONG* plOut) {
 /******************************************************************************
  *		VarR4FromUI132		[OLEAUT32.68]
  */
-HRESULT WINAPI VarR4FromUI132(BYTE bIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromUI1(BYTE bIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %X, %p ), stub\n", bIn, pfltOut );
 
@@ -2580,7 +2580,7 @@ HRESULT WINAPI VarR4FromUI132(BYTE bIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromI232		[OLEAUT32.69]
  */
-HRESULT WINAPI VarR4FromI232(short sIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromI2(short sIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pfltOut );
 
@@ -2592,7 +2592,7 @@ HRESULT WINAPI VarR4FromI232(short sIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromI432		[OLEAUT32.70]
  */
-HRESULT WINAPI VarR4FromI432(LONG lIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromI4(LONG lIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %lx, %p ), stub\n", lIn, pfltOut );
 
@@ -2604,7 +2604,7 @@ HRESULT WINAPI VarR4FromI432(LONG lIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromR832		[OLEAUT32.71]
  */
-HRESULT WINAPI VarR4FromR832(double dblIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromR8(double dblIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pfltOut );
 
@@ -2623,7 +2623,7 @@ HRESULT WINAPI VarR4FromR832(double dblIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromDate32		[OLEAUT32.73]
  */
-HRESULT WINAPI VarR4FromDate32(DATE dateIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromDate(DATE dateIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pfltOut );
 
@@ -2642,7 +2642,7 @@ HRESULT WINAPI VarR4FromDate32(DATE dateIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromBool32		[OLEAUT32.76]
  */
-HRESULT WINAPI VarR4FromBool32(VARIANT_BOOL boolIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromBool(VARIANT_BOOL boolIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pfltOut );
 
@@ -2654,7 +2654,7 @@ HRESULT WINAPI VarR4FromBool32(VARIANT_BOOL boolIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromI132		[OLEAUT32.213]
  */
-HRESULT WINAPI VarR4FromI132(CHAR cIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromI1(CHAR cIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pfltOut );
 
@@ -2666,7 +2666,7 @@ HRESULT WINAPI VarR4FromI132(CHAR cIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromUI232		[OLEAUT32.214]
  */
-HRESULT WINAPI VarR4FromUI232(USHORT uiIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromUI2(USHORT uiIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pfltOut );
 
@@ -2678,7 +2678,7 @@ HRESULT WINAPI VarR4FromUI232(USHORT uiIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromUI432		[OLEAUT32.215]
  */
-HRESULT WINAPI VarR4FromUI432(ULONG ulIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromUI4(ULONG ulIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pfltOut );
 
@@ -2690,7 +2690,7 @@ HRESULT WINAPI VarR4FromUI432(ULONG ulIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromStr32		[OLEAUT32.74]
  */
-HRESULT WINAPI VarR4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, FLOAT* pfltOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -2730,7 +2730,7 @@ HRESULT WINAPI VarR4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, FLOAT*
  *              VarR4FromCy32 [OLEAUT32.72]
  * Convert currency to float
  */
-HRESULT WINAPI VarR4FromCy32(CY cyIn, FLOAT* pfltOut) {
+HRESULT WINAPI VarR4FromCy(CY cyIn, FLOAT* pfltOut) {
    *pfltOut = (FLOAT)((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000);
    
    return S_OK;
@@ -2739,7 +2739,7 @@ HRESULT WINAPI VarR4FromCy32(CY cyIn, FLOAT* pfltOut) {
 /******************************************************************************
  *		VarR8FromUI132		[OLEAUT32.68]
  */
-HRESULT WINAPI VarR8FromUI132(BYTE bIn, double* pdblOut)
+HRESULT WINAPI VarR8FromUI1(BYTE bIn, double* pdblOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pdblOut );
 
@@ -2751,7 +2751,7 @@ HRESULT WINAPI VarR8FromUI132(BYTE bIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromI232		[OLEAUT32.69]
  */
-HRESULT WINAPI VarR8FromI232(short sIn, double* pdblOut)
+HRESULT WINAPI VarR8FromI2(short sIn, double* pdblOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pdblOut );
 
@@ -2763,7 +2763,7 @@ HRESULT WINAPI VarR8FromI232(short sIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromI432		[OLEAUT32.70]
  */
-HRESULT WINAPI VarR8FromI432(LONG lIn, double* pdblOut)
+HRESULT WINAPI VarR8FromI4(LONG lIn, double* pdblOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pdblOut );
 
@@ -2775,7 +2775,7 @@ HRESULT WINAPI VarR8FromI432(LONG lIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromR432		[OLEAUT32.81]
  */
-HRESULT WINAPI VarR8FromR432(FLOAT fltIn, double* pdblOut)
+HRESULT WINAPI VarR8FromR4(FLOAT fltIn, double* pdblOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, pdblOut );
 
@@ -2787,7 +2787,7 @@ HRESULT WINAPI VarR8FromR432(FLOAT fltIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromDate32		[OLEAUT32.83]
  */
-HRESULT WINAPI VarR8FromDate32(DATE dateIn, double* pdblOut)
+HRESULT WINAPI VarR8FromDate(DATE dateIn, double* pdblOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pdblOut );
 
@@ -2799,7 +2799,7 @@ HRESULT WINAPI VarR8FromDate32(DATE dateIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromBool32		[OLEAUT32.86]
  */
-HRESULT WINAPI VarR8FromBool32(VARIANT_BOOL boolIn, double* pdblOut)
+HRESULT WINAPI VarR8FromBool(VARIANT_BOOL boolIn, double* pdblOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pdblOut );
 
@@ -2811,7 +2811,7 @@ HRESULT WINAPI VarR8FromBool32(VARIANT_BOOL boolIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromI132		[OLEAUT32.217]
  */
-HRESULT WINAPI VarR8FromI132(CHAR cIn, double* pdblOut)
+HRESULT WINAPI VarR8FromI1(CHAR cIn, double* pdblOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pdblOut );
 
@@ -2823,7 +2823,7 @@ HRESULT WINAPI VarR8FromI132(CHAR cIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromUI232		[OLEAUT32.218]
  */
-HRESULT WINAPI VarR8FromUI232(USHORT uiIn, double* pdblOut)
+HRESULT WINAPI VarR8FromUI2(USHORT uiIn, double* pdblOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pdblOut );
 
@@ -2835,7 +2835,7 @@ HRESULT WINAPI VarR8FromUI232(USHORT uiIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromUI432		[OLEAUT32.219]
  */
-HRESULT WINAPI VarR8FromUI432(ULONG ulIn, double* pdblOut)
+HRESULT WINAPI VarR8FromUI4(ULONG ulIn, double* pdblOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pdblOut );
 
@@ -2847,7 +2847,7 @@ HRESULT WINAPI VarR8FromUI432(ULONG ulIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromStr32		[OLEAUT32.84]
  */
-HRESULT WINAPI VarR8FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, double* pdblOut)
+HRESULT WINAPI VarR8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, double* pdblOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -2880,7 +2880,7 @@ HRESULT WINAPI VarR8FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, double
  *              VarR8FromCy32 [OLEAUT32.82]
  * Convert currency to double
  */
-HRESULT WINAPI VarR8FromCy32(CY cyIn, double* pdblOut) {
+HRESULT WINAPI VarR8FromCy(CY cyIn, double* pdblOut) {
    *pdblOut = (double)((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000);
    
    return S_OK;
@@ -2889,7 +2889,7 @@ HRESULT WINAPI VarR8FromCy32(CY cyIn, double* pdblOut) {
 /******************************************************************************
  *		VarDateFromUI132		[OLEAUT32.]
  */
-HRESULT WINAPI VarDateFromUI132(BYTE bIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromUI1(BYTE bIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pdateOut );
 
@@ -2901,7 +2901,7 @@ HRESULT WINAPI VarDateFromUI132(BYTE bIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromI232		[OLEAUT32.222]
  */
-HRESULT WINAPI VarDateFromI232(short sIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromI2(short sIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pdateOut );
 
@@ -2913,7 +2913,7 @@ HRESULT WINAPI VarDateFromI232(short sIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromI432		[OLEAUT32.90]
  */
-HRESULT WINAPI VarDateFromI432(LONG lIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromI4(LONG lIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pdateOut );
 
@@ -2930,7 +2930,7 @@ HRESULT WINAPI VarDateFromI432(LONG lIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromR432		[OLEAUT32.91]
  */
-HRESULT WINAPI VarDateFromR432(FLOAT fltIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromR4(FLOAT fltIn, DATE* pdateOut)
 {
     TRACE( ole, "( %f, %p ), stub\n", fltIn, pdateOut );
 
@@ -2947,7 +2947,7 @@ HRESULT WINAPI VarDateFromR432(FLOAT fltIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromR832		[OLEAUT32.92]
  */
-HRESULT WINAPI VarDateFromR832(double dblIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromR8(double dblIn, DATE* pdateOut)
 {
     TRACE( ole, "( %f, %p ), stub\n", dblIn, pdateOut );
 
@@ -2986,7 +2986,7 @@ HRESULT WINAPI VarDateFromR832(double dblIn, DATE* pdateOut)
  * These are the only characters allowed in a string representing a date and time:
  * [A-Z] [a-z] [0-9] ':' '-' '/' ',' ' ' '\t'
  */
-HRESULT WINAPI VarDateFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, DATE* pdateOut)
+HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pdateOut)
 {
 	HRESULT ret = S_OK;
     struct tm TM = { 0,0,0,0,0,0,0,0,0 };
@@ -3012,7 +3012,7 @@ HRESULT WINAPI VarDateFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, DATE
 /******************************************************************************
  *		VarDateFromI132		[OLEAUT32.221]
  */
-HRESULT WINAPI VarDateFromI132(CHAR cIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromI1(CHAR cIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pdateOut );
 
@@ -3024,7 +3024,7 @@ HRESULT WINAPI VarDateFromI132(CHAR cIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromUI232		[OLEAUT32.222]
  */
-HRESULT WINAPI VarDateFromUI232(USHORT uiIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromUI2(USHORT uiIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pdateOut );
 
@@ -3041,7 +3041,7 @@ HRESULT WINAPI VarDateFromUI232(USHORT uiIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromUI432		[OLEAUT32.223]
  */
-HRESULT WINAPI VarDateFromUI432(ULONG ulIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pdateOut );
 
@@ -3058,7 +3058,7 @@ HRESULT WINAPI VarDateFromUI432(ULONG ulIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromBool32		[OLEAUT32.96]
  */
-HRESULT WINAPI VarDateFromBool32(VARIANT_BOOL boolIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromBool(VARIANT_BOOL boolIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pdateOut );
 
@@ -3071,7 +3071,7 @@ HRESULT WINAPI VarDateFromBool32(VARIANT_BOOL boolIn, DATE* pdateOut)
  *              VarDateFromCy32 [OLEAUT32.93]
  * Convert currency to date
  */
-HRESULT WINAPI VarDateFromCy32(CY cyIn, DATE* pdateOut) {
+HRESULT WINAPI VarDateFromCy(CY cyIn, DATE* pdateOut) {
    *pdateOut = (DATE)((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000);
 
    if (*pdateOut > DATE_MAX || *pdateOut < DATE_MIN) return DISP_E_TYPEMISMATCH;
@@ -3081,7 +3081,7 @@ HRESULT WINAPI VarDateFromCy32(CY cyIn, DATE* pdateOut) {
 /******************************************************************************
  *		VarBstrFromUI132		[OLEAUT32.108]
  */
-HRESULT WINAPI VarBstrFromUI132(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromUI1(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 	TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", bVal, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%d", bVal );
@@ -3094,7 +3094,7 @@ HRESULT WINAPI VarBstrFromUI132(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR32* pbs
 /******************************************************************************
  *		VarBstrFromI232		[OLEAUT32.109]
  */
-HRESULT WINAPI VarBstrFromI232(short iVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromI2(short iVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 	TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", iVal, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%d", iVal );
@@ -3106,7 +3106,7 @@ HRESULT WINAPI VarBstrFromI232(short iVal, LCID lcid, ULONG dwFlags, BSTR32* pbs
 /******************************************************************************
  *		VarBstrFromI432		[OLEAUT32.110]
  */
-HRESULT WINAPI VarBstrFromI432(LONG lIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromI4(LONG lIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 	TRACE( ole, "( %ld, %ld, %ld, %p ), stub\n", lIn, lcid, dwFlags, pbstrOut );
 
@@ -3119,7 +3119,7 @@ HRESULT WINAPI VarBstrFromI432(LONG lIn, LCID lcid, ULONG dwFlags, BSTR32* pbstr
 /******************************************************************************
  *		VarBstrFromR432		[OLEAUT32.111]
  */
-HRESULT WINAPI VarBstrFromR432(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 	TRACE( ole, "( %f, %ld, %ld, %p ), stub\n", fltIn, lcid, dwFlags, pbstrOut );
 
@@ -3132,7 +3132,7 @@ HRESULT WINAPI VarBstrFromR432(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR32* pb
 /******************************************************************************
  *		VarBstrFromR832		[OLEAUT32.112]
  */
-HRESULT WINAPI VarBstrFromR832(double dblIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 	TRACE( ole, "( %f, %ld, %ld, %p ), stub\n", dblIn, lcid, dwFlags, pbstrOut );
 
@@ -3171,7 +3171,7 @@ HRESULT WINAPI VarBstrFromR832(double dblIn, LCID lcid, ULONG dwFlags, BSTR32* p
  *		  int tm_isdst;    daylight savings time flag
  *		  };
  */
-HRESULT WINAPI VarBstrFromDate32(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 		struct tm TM = {0,0,0,0,0,0,0,0,0};
 	 
@@ -3197,7 +3197,7 @@ HRESULT WINAPI VarBstrFromDate32(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR32*
 /******************************************************************************
  *		VarBstrFromBool32		[OLEAUT32.116]
  */
-HRESULT WINAPI VarBstrFromBool32(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 	TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", boolIn, lcid, dwFlags, pbstrOut );
 
@@ -3218,7 +3218,7 @@ HRESULT WINAPI VarBstrFromBool32(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags,
 /******************************************************************************
  *		VarBstrFromI132		[OLEAUT32.229]
  */
-HRESULT WINAPI VarBstrFromI132(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromI1(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 	TRACE( ole, "( %c, %ld, %ld, %p ), stub\n", cIn, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%d", cIn );
@@ -3230,7 +3230,7 @@ HRESULT WINAPI VarBstrFromI132(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR32* pbstr
 /******************************************************************************
  *		VarBstrFromUI232		[OLEAUT32.230]
  */
-HRESULT WINAPI VarBstrFromUI232(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromUI2(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 	TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", uiIn, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%d", uiIn );
@@ -3242,7 +3242,7 @@ HRESULT WINAPI VarBstrFromUI232(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR32* p
 /******************************************************************************
  *		VarBstrFromUI432		[OLEAUT32.231]
  */
-HRESULT WINAPI VarBstrFromUI432(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
 	TRACE( ole, "( %ld, %ld, %ld, %p ), stub\n", ulIn, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%ld", ulIn );
@@ -3254,7 +3254,7 @@ HRESULT WINAPI VarBstrFromUI432(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR32* pb
 /******************************************************************************
  *		VarBoolFromUI132		[OLEAUT32.118]
  */
-HRESULT WINAPI VarBoolFromUI132(BYTE bIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromUI1(BYTE bIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pboolOut );
 
@@ -3273,7 +3273,7 @@ HRESULT WINAPI VarBoolFromUI132(BYTE bIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromI232		[OLEAUT32.119]
  */
-HRESULT WINAPI VarBoolFromI232(short sIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromI2(short sIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pboolOut );
 
@@ -3292,7 +3292,7 @@ HRESULT WINAPI VarBoolFromI232(short sIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromI432		[OLEAUT32.120]
  */
-HRESULT WINAPI VarBoolFromI432(LONG lIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromI4(LONG lIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pboolOut );
 
@@ -3311,7 +3311,7 @@ HRESULT WINAPI VarBoolFromI432(LONG lIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromR432		[OLEAUT32.121]
  */
-HRESULT WINAPI VarBoolFromR432(FLOAT fltIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromR4(FLOAT fltIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, pboolOut );
 
@@ -3330,7 +3330,7 @@ HRESULT WINAPI VarBoolFromR432(FLOAT fltIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromR832		[OLEAUT32.122]
  */
-HRESULT WINAPI VarBoolFromR832(double dblIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromR8(double dblIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pboolOut );
 
@@ -3349,7 +3349,7 @@ HRESULT WINAPI VarBoolFromR832(double dblIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromDate32		[OLEAUT32.123]
  */
-HRESULT WINAPI VarBoolFromDate32(DATE dateIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromDate(DATE dateIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pboolOut );
 
@@ -3368,7 +3368,7 @@ HRESULT WINAPI VarBoolFromDate32(DATE dateIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromStr32		[OLEAUT32.125]
  */
-HRESULT WINAPI VarBoolFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut)
 {
 	HRESULT ret = S_OK;
 	char* pNewString = NULL;
@@ -3397,7 +3397,7 @@ HRESULT WINAPI VarBoolFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, VARI
 			/* Try converting the string to a floating point number.
 			 */
 			double dValue = 0.0;
-			HRESULT res = VarR8FromStr32( strIn, lcid, dwFlags, &dValue );
+			HRESULT res = VarR8FromStr( strIn, lcid, dwFlags, &dValue );
 			if( res != S_OK )
 			{
 				ret = DISP_E_TYPEMISMATCH;
@@ -3421,7 +3421,7 @@ HRESULT WINAPI VarBoolFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, VARI
 /******************************************************************************
  *		VarBoolFromI132		[OLEAUT32.233]
  */
-HRESULT WINAPI VarBoolFromI132(CHAR cIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromI1(CHAR cIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pboolOut );
 
@@ -3440,7 +3440,7 @@ HRESULT WINAPI VarBoolFromI132(CHAR cIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromUI232		[OLEAUT32.234]
  */
-HRESULT WINAPI VarBoolFromUI232(USHORT uiIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromUI2(USHORT uiIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pboolOut );
 
@@ -3459,7 +3459,7 @@ HRESULT WINAPI VarBoolFromUI232(USHORT uiIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromUI432		[OLEAUT32.235]
  */
-HRESULT WINAPI VarBoolFromUI432(ULONG ulIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pboolOut );
 
@@ -3479,7 +3479,7 @@ HRESULT WINAPI VarBoolFromUI432(ULONG ulIn, VARIANT_BOOL* pboolOut)
  *              VarBoolFromCy32 [OLEAUT32.124]
  * Convert currency to boolean
  */
-HRESULT WINAPI VarBoolFromCy32(CY cyIn, VARIANT_BOOL* pboolOut) {
+HRESULT WINAPI VarBoolFromCy(CY cyIn, VARIANT_BOOL* pboolOut) {
       if (cyIn.u.Hi || cyIn.u.Lo) *pboolOut = -1;
       else *pboolOut = 0;
       
@@ -3489,7 +3489,7 @@ HRESULT WINAPI VarBoolFromCy32(CY cyIn, VARIANT_BOOL* pboolOut) {
 /******************************************************************************
  *		VarI1FromUI132		[OLEAUT32.244]
  */
-HRESULT WINAPI VarI1FromUI132(BYTE bIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromUI1(BYTE bIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pcOut );
 
@@ -3508,7 +3508,7 @@ HRESULT WINAPI VarI1FromUI132(BYTE bIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromI232		[OLEAUT32.245]
  */
-HRESULT WINAPI VarI1FromI232(short uiIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromI2(short uiIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pcOut );
 
@@ -3525,7 +3525,7 @@ HRESULT WINAPI VarI1FromI232(short uiIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromI432		[OLEAUT32.246]
  */
-HRESULT WINAPI VarI1FromI432(LONG lIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromI4(LONG lIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pcOut );
 
@@ -3542,7 +3542,7 @@ HRESULT WINAPI VarI1FromI432(LONG lIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromR432		[OLEAUT32.247]
  */
-HRESULT WINAPI VarI1FromR432(FLOAT fltIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromR4(FLOAT fltIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, pcOut );
 
@@ -3560,7 +3560,7 @@ HRESULT WINAPI VarI1FromR432(FLOAT fltIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromR832		[OLEAUT32.248]
  */
-HRESULT WINAPI VarI1FromR832(double dblIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromR8(double dblIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pcOut );
 
@@ -3578,7 +3578,7 @@ HRESULT WINAPI VarI1FromR832(double dblIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromDate32		[OLEAUT32.249]
  */
-HRESULT WINAPI VarI1FromDate32(DATE dateIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromDate(DATE dateIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pcOut );
 
@@ -3596,7 +3596,7 @@ HRESULT WINAPI VarI1FromDate32(DATE dateIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromStr32		[OLEAUT32.251]
  */
-HRESULT WINAPI VarI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, CHAR* pcOut)
+HRESULT WINAPI VarI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, CHAR* pcOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -3636,7 +3636,7 @@ HRESULT WINAPI VarI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, CHAR*
 /******************************************************************************
  *		VarI1FromBool32		[OLEAUT32.253]
  */
-HRESULT WINAPI VarI1FromBool32(VARIANT_BOOL boolIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromBool(VARIANT_BOOL boolIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pcOut );
 
@@ -3648,7 +3648,7 @@ HRESULT WINAPI VarI1FromBool32(VARIANT_BOOL boolIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromUI232		[OLEAUT32.254]
  */
-HRESULT WINAPI VarI1FromUI232(USHORT uiIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromUI2(USHORT uiIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pcOut );
 
@@ -3665,7 +3665,7 @@ HRESULT WINAPI VarI1FromUI232(USHORT uiIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromUI432		[OLEAUT32.255]
  */
-HRESULT WINAPI VarI1FromUI432(ULONG ulIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromUI4(ULONG ulIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pcOut );
 
@@ -3683,7 +3683,7 @@ HRESULT WINAPI VarI1FromUI432(ULONG ulIn, CHAR* pcOut)
  *              VarI1FromCy32 [OLEAUT32.250]
  * Convert currency to signed char
  */
-HRESULT WINAPI VarI1FromCy32(CY cyIn, CHAR* pcOut) {
+HRESULT WINAPI VarI1FromCy(CY cyIn, CHAR* pcOut) {
    double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000);
    
    if (t > CHAR_MAX || t < CHAR_MIN) return DISP_E_OVERFLOW;
@@ -3695,7 +3695,7 @@ HRESULT WINAPI VarI1FromCy32(CY cyIn, CHAR* pcOut) {
 /******************************************************************************
  *		VarUI2FromUI132		[OLEAUT32.257]
  */
-HRESULT WINAPI VarUI2FromUI132(BYTE bIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromUI1(BYTE bIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, puiOut );
 
@@ -3707,7 +3707,7 @@ HRESULT WINAPI VarUI2FromUI132(BYTE bIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromI232		[OLEAUT32.258]
  */
-HRESULT WINAPI VarUI2FromI232(short uiIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromI2(short uiIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, puiOut );
 
@@ -3724,7 +3724,7 @@ HRESULT WINAPI VarUI2FromI232(short uiIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromI432		[OLEAUT32.259]
  */
-HRESULT WINAPI VarUI2FromI432(LONG lIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromI4(LONG lIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, puiOut );
 
@@ -3741,7 +3741,7 @@ HRESULT WINAPI VarUI2FromI432(LONG lIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromR432		[OLEAUT32.260]
  */
-HRESULT WINAPI VarUI2FromR432(FLOAT fltIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromR4(FLOAT fltIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, puiOut );
 
@@ -3759,7 +3759,7 @@ HRESULT WINAPI VarUI2FromR432(FLOAT fltIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromR832		[OLEAUT32.261]
  */
-HRESULT WINAPI VarUI2FromR832(double dblIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromR8(double dblIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, puiOut );
 
@@ -3777,7 +3777,7 @@ HRESULT WINAPI VarUI2FromR832(double dblIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromDate32		[OLEAUT32.262]
  */
-HRESULT WINAPI VarUI2FromDate32(DATE dateIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromDate(DATE dateIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, puiOut );
 
@@ -3795,7 +3795,7 @@ HRESULT WINAPI VarUI2FromDate32(DATE dateIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromStr32		[OLEAUT32.264]
  */
-HRESULT WINAPI VarUI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, USHORT* puiOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -3835,7 +3835,7 @@ HRESULT WINAPI VarUI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, USHOR
 /******************************************************************************
  *		VarUI2FromBool32		[OLEAUT32.266]
  */
-HRESULT WINAPI VarUI2FromBool32(VARIANT_BOOL boolIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL boolIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, puiOut );
 
@@ -3847,7 +3847,7 @@ HRESULT WINAPI VarUI2FromBool32(VARIANT_BOOL boolIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromI132		[OLEAUT32.267]
  */
-HRESULT WINAPI VarUI2FromI132(CHAR cIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromI1(CHAR cIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, puiOut );
 
@@ -3859,7 +3859,7 @@ HRESULT WINAPI VarUI2FromI132(CHAR cIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromUI432		[OLEAUT32.268]
  */
-HRESULT WINAPI VarUI2FromUI432(ULONG ulIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, puiOut );
 
@@ -3876,7 +3876,7 @@ HRESULT WINAPI VarUI2FromUI432(ULONG ulIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI4FromStr32		[OLEAUT32.277]
  */
-HRESULT WINAPI VarUI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG* pulOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -3917,7 +3917,7 @@ HRESULT WINAPI VarUI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, ULONG
  *              VarUI2FromCy32 [OLEAUT32.263]
  * Convert currency to unsigned short
  */
-HRESULT WINAPI VarUI2FromCy32(CY cyIn, USHORT* pusOut) {
+HRESULT WINAPI VarUI2FromCy(CY cyIn, USHORT* pusOut) {
    double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000);
    
    if (t > UI2_MAX || t < UI2_MIN) return DISP_E_OVERFLOW;
@@ -3930,7 +3930,7 @@ HRESULT WINAPI VarUI2FromCy32(CY cyIn, USHORT* pusOut) {
 /******************************************************************************
  *		VarUI4FromUI132		[OLEAUT32.270]
  */
-HRESULT WINAPI VarUI4FromUI132(BYTE bIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromUI1(BYTE bIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pulOut );
 
@@ -3942,7 +3942,7 @@ HRESULT WINAPI VarUI4FromUI132(BYTE bIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromI232		[OLEAUT32.271]
  */
-HRESULT WINAPI VarUI4FromI232(short uiIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromI2(short uiIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pulOut );
 
@@ -3959,7 +3959,7 @@ HRESULT WINAPI VarUI4FromI232(short uiIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromI432		[OLEAUT32.272]
  */
-HRESULT WINAPI VarUI4FromI432(LONG lIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromI4(LONG lIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pulOut );
 
@@ -3976,7 +3976,7 @@ HRESULT WINAPI VarUI4FromI432(LONG lIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromR432		[OLEAUT32.273]
  */
-HRESULT WINAPI VarUI4FromR432(FLOAT fltIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromR4(FLOAT fltIn, ULONG* pulOut)
 {
     fltIn = round( fltIn );
     if( fltIn < UI4_MIN || fltIn > UI4_MAX )
@@ -3992,7 +3992,7 @@ HRESULT WINAPI VarUI4FromR432(FLOAT fltIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromR832		[OLEAUT32.274]
  */
-HRESULT WINAPI VarUI4FromR832(double dblIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromR8(double dblIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pulOut );
 
@@ -4010,7 +4010,7 @@ HRESULT WINAPI VarUI4FromR832(double dblIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromDate32		[OLEAUT32.275]
  */
-HRESULT WINAPI VarUI4FromDate32(DATE dateIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromDate(DATE dateIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pulOut );
 
@@ -4028,7 +4028,7 @@ HRESULT WINAPI VarUI4FromDate32(DATE dateIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromBool32		[OLEAUT32.279]
  */
-HRESULT WINAPI VarUI4FromBool32(VARIANT_BOOL boolIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromBool(VARIANT_BOOL boolIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pulOut );
 
@@ -4040,7 +4040,7 @@ HRESULT WINAPI VarUI4FromBool32(VARIANT_BOOL boolIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromI132		[OLEAUT32.280]
  */
-HRESULT WINAPI VarUI4FromI132(CHAR cIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromI1(CHAR cIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pulOut );
 
@@ -4052,7 +4052,7 @@ HRESULT WINAPI VarUI4FromI132(CHAR cIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromUI232		[OLEAUT32.281]
  */
-HRESULT WINAPI VarUI4FromUI232(USHORT uiIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromUI2(USHORT uiIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pulOut );
 
@@ -4065,7 +4065,7 @@ HRESULT WINAPI VarUI4FromUI232(USHORT uiIn, ULONG* pulOut)
  *              VarUI4FromCy32 [OLEAUT32.276]
  * Convert currency to unsigned long
  */
-HRESULT WINAPI VarUI4FromCy32(CY cyIn, ULONG* pulOut) {
+HRESULT WINAPI VarUI4FromCy(CY cyIn, ULONG* pulOut) {
    double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000);
    
    if (t > UI4_MAX || t < UI4_MIN) return DISP_E_OVERFLOW;
@@ -4079,7 +4079,7 @@ HRESULT WINAPI VarUI4FromCy32(CY cyIn, ULONG* pulOut) {
  *              VarCyFromUI132 [OLEAUT32.98]
  * Convert unsigned char to currency
  */
-HRESULT WINAPI VarCyFromUI132(BYTE bIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromUI1(BYTE bIn, CY* pcyOut) {
    pcyOut->u.Hi = 0;
    pcyOut->u.Lo = ((ULONG)bIn) * 10000;
    
@@ -4090,7 +4090,7 @@ HRESULT WINAPI VarCyFromUI132(BYTE bIn, CY* pcyOut) {
  *              VarCyFromI232 [OLEAUT32.99]
  * Convert signed short to currency
  */
-HRESULT WINAPI VarCyFromI232(short sIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromI2(short sIn, CY* pcyOut) {
    if (sIn < 0) pcyOut->u.Hi = -1;
    else pcyOut->u.Hi = 0;
    pcyOut->u.Lo = ((ULONG)sIn) * 10000;
@@ -4102,7 +4102,7 @@ HRESULT WINAPI VarCyFromI232(short sIn, CY* pcyOut) {
  *              VarCyFromI432 [OLEAUT32.100]
  * Convert signed long to currency
  */
-HRESULT WINAPI VarCyFromI432(LONG lIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromI4(LONG lIn, CY* pcyOut) {
       double t = (double)lIn * (double)10000;
       pcyOut->u.Hi = (LONG)(t / (double)4294967296.0);
       pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0);
@@ -4115,7 +4115,7 @@ HRESULT WINAPI VarCyFromI432(LONG lIn, CY* pcyOut) {
  *              VarCyFromR432 [OLEAUT32.101]
  * Convert float to currency
  */
-HRESULT WINAPI VarCyFromR432(FLOAT fltIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromR4(FLOAT fltIn, CY* pcyOut) {
    double t = round((double)fltIn * (double)10000);
    pcyOut->u.Hi = (LONG)(t / (double)4294967296.0);
    pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0);
@@ -4128,7 +4128,7 @@ HRESULT WINAPI VarCyFromR432(FLOAT fltIn, CY* pcyOut) {
  *              VarCyFromR832 [OLEAUT32.102]
  * Convert double to currency
  */
-HRESULT WINAPI VarCyFromR832(double dblIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromR8(double dblIn, CY* pcyOut) {
    double t = round(dblIn * (double)10000);
    pcyOut->u.Hi = (LONG)(t / (double)4294967296.0);
    pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0);
@@ -4141,7 +4141,7 @@ HRESULT WINAPI VarCyFromR832(double dblIn, CY* pcyOut) {
  *              VarCyFromDate32 [OLEAUT32.103]
  * Convert date to currency
  */
-HRESULT WINAPI VarCyFromDate32(DATE dateIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromDate(DATE dateIn, CY* pcyOut) {
    double t = round((double)dateIn * (double)10000);
    pcyOut->u.Hi = (LONG)(t / (double)4294967296.0);
    pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0);
@@ -4154,7 +4154,7 @@ HRESULT WINAPI VarCyFromDate32(DATE dateIn, CY* pcyOut) {
  *              VarCyFromBool32 [OLEAUT32.106]
  * Convert boolean to currency
  */
-HRESULT WINAPI VarCyFromBool32(VARIANT_BOOL boolIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromBool(VARIANT_BOOL boolIn, CY* pcyOut) {
    if (boolIn < 0) pcyOut->u.Hi = -1;
    else pcyOut->u.Hi = 0;
    pcyOut->u.Lo = (ULONG)boolIn * (ULONG)10000;
@@ -4166,7 +4166,7 @@ HRESULT WINAPI VarCyFromBool32(VARIANT_BOOL boolIn, CY* pcyOut) {
  *              VarCyFromI132 [OLEAUT32.225]
  * Convert signed char to currency
  */
-HRESULT WINAPI VarCyFromI132(CHAR cIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromI1(CHAR cIn, CY* pcyOut) {
    if (cIn < 0) pcyOut->u.Hi = -1;
    else pcyOut->u.Hi = 0;
    pcyOut->u.Lo = (ULONG)cIn * (ULONG)10000;
@@ -4178,7 +4178,7 @@ HRESULT WINAPI VarCyFromI132(CHAR cIn, CY* pcyOut) {
  *              VarCyFromUI232 [OLEAUT32.226]
  * Convert unsigned short to currency
  */
-HRESULT WINAPI VarCyFromUI232(USHORT usIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromUI2(USHORT usIn, CY* pcyOut) {
    pcyOut->u.Hi = 0;
    pcyOut->u.Lo = (ULONG)usIn * (ULONG)10000;
    
@@ -4189,7 +4189,7 @@ HRESULT WINAPI VarCyFromUI232(USHORT usIn, CY* pcyOut) {
  *              VarCyFromUI432 [OLEAUT32.227]
  * Convert unsigned long to currency
  */
-HRESULT WINAPI VarCyFromUI432(ULONG ulIn, CY* pcyOut) {
+HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY* pcyOut) {
    double t = (double)ulIn * (double)10000;
    pcyOut->u.Hi = (LONG)(t / (double)4294967296.0);
    pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0);
diff --git a/programs/avitools/icinfo.c b/programs/avitools/icinfo.c
index a536f67754d..48720ffa719 100644
--- a/programs/avitools/icinfo.c
+++ b/programs/avitools/icinfo.c
@@ -13,7 +13,7 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show)
     char	buf[128],type[5],handler[5];
     HMODULE	msvfw32 = LoadLibrary("msvfw32.dll");
 
-BOOL32  (VFWAPI  *fnICInfo)(DWORD fccType, DWORD fccHandler, ICINFO * lpicinfo);
+BOOL  (VFWAPI  *fnICInfo)(DWORD fccType, DWORD fccHandler, ICINFO * lpicinfo);
 LRESULT (VFWAPI *fnICClose)(HIC hic);
 HIC	(VFWAPI	*fnICOpen)(DWORD fccType, DWORD fccHandler, UINT wMode);
 LRESULT	(VFWAPI	*fnICGetInfo)(HIC hic,ICINFO *picinfo, DWORD cb);
@@ -69,7 +69,7 @@ LRESULT	(VFWAPI	*fnICSendMessage)(HIC hic, UINT msg, DWORD dw1, DWORD dw2);
 	w2s(ii.szDescription,buf);
 	printf("\tszDescription: %s\n",buf);
 	if (doabout) ICAbout(hic,0);
-	if (doconfigure && ICQueryConfigure32(hic))
+	if (doconfigure && ICQueryConfigure(hic))
 		ICConfigure(hic,0);
 	fnICClose(hic);
     }
diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index 71980db384b..8f4b239988e 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -100,11 +100,11 @@ BOOL ExistFile(LPCSTR szFilename) {
  *           FALSE - if it does not
  */
    WIN32_FIND_DATA entry;
-   HANDLE32 hFile;
+   HANDLE hFile;
    
    hFile = FindFirstFile(szFilename, &entry);
    
-   return (hFile!=INVALID_HANDLE_VALUE32);
+   return (hFile!=INVALID_HANDLE_VALUE);
 }
 
 VOID DoSaveFile(VOID) {
diff --git a/programs/notepad/lcc.h b/programs/notepad/lcc.h
index 8b14a9f0e93..60c88adaaa9 100644
--- a/programs/notepad/lcc.h
+++ b/programs/notepad/lcc.h
@@ -12,8 +12,8 @@
    #include "assert.h"
    #include "shellapi.h"
 
-   #define HANDLE32 HANDLE
-   #define INVALID_HANDLE_VALUE32 INVALID_HANDLE_VALUE
+   #define HANDLE HANDLE
+   #define INVALID_HANDLE_VALUE INVALID_HANDLE_VALUE
 
    #define WINE_RELEASE_INFO "Compiled using LCC"
    #define OIC_WINEICON 0
diff --git a/programs/progman/group.c b/programs/progman/group.c
index 0fcbadaa7a1..fa2df797895 100644
--- a/programs/progman/group.c
+++ b/programs/progman/group.c
@@ -115,8 +115,8 @@ HLOCAL GROUP_AddGroup(LPCSTR lpszName, LPCSTR lpszGrpFile, INT nCmdShow,
       if (hGrpFile) LocalFree(hGrpFile);
       return(0);
     }
-  hmemcpy(LocalLock(hName), lpszName, 1 + lstrlen(lpszName));
-  hmemcpy(LocalLock(hGrpFile), lpszGrpFile, 1 + lstrlen(lpszGrpFile));
+  hmemcpy16(LocalLock(hName), lpszName, 1 + lstrlen(lpszName));
+  hmemcpy16(LocalLock(hGrpFile), lpszGrpFile, 1 + lstrlen(lpszGrpFile));
 
   Globals.hActiveGroup   = hGroup;
 
diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c
index 438c4648bba..2eee09eb8bc 100644
--- a/programs/progman/grpfile.c
+++ b/programs/progman/grpfile.c
@@ -271,7 +271,7 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size,
   if (iconANDbits_ptr + iconANDsize > buffer + size ||
       iconXORbits_ptr + iconXORsize > buffer + size) return(0);
 
-  hIcon = CreateCursorIconIndirect(Globals.hInstance, &iconinfo,
+  hIcon = CreateCursorIconIndirect16(Globals.hInstance, &iconinfo,
 				   (LPSTR)iconANDbits_ptr,
 				   (LPSTR)iconXORbits_ptr);
 
@@ -635,7 +635,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, GROUP *group)
       LPVOID XorBits, AndBits;
       INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes;
       INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2);
-      DumpIcon(LocalLock(program->hIcon), 0, &XorBits, &AndBits);
+      DumpIcon16(LocalLock(program->hIcon), 0, &XorBits, &AndBits);
 
       PUT_SHORT(buffer, 0, iconinfo->ptHotSpot.x);
       PUT_SHORT(buffer, 2, iconinfo->ptHotSpot.y);
diff --git a/programs/progman/main.c b/programs/progman/main.c
index 4023c4628d3..f682a94f51e 100644
--- a/programs/progman/main.c
+++ b/programs/progman/main.c
@@ -65,13 +65,13 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show)
     PROFILE_GetWineIniString("progman", "progman.ini", "progman.ini", 
 			     buffer, sizeof(buffer));
     Globals.lpszIniFile = p = LocalLock(LocalAlloc(LMEM_FIXED, lstrlen(buffer)+1));
-    hmemcpy(p, buffer, 1 + lstrlen(buffer));
+    hmemcpy16(p, buffer, 1 + lstrlen(buffer));
 
     /* Redirect `progman.ico' */
     PROFILE_GetWineIniString("progman", "progman.ico", "progman.ico", 
 			     buffer, sizeof(buffer));
     Globals.lpszIcoFile = p = LocalLock(LocalAlloc(LMEM_FIXED, lstrlen(buffer)+1));
-    hmemcpy(p, buffer, 1 + lstrlen(buffer));
+    hmemcpy16(p, buffer, 1 + lstrlen(buffer));
   }
 #endif
 
@@ -301,7 +301,7 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
       WritePrivateProfileString("Settings", "AutoArrange",
 				Globals.bAutoArrange ? "1" : "0",
 				Globals.lpszIniFile);
-      WriteOutProfiles();
+      WriteOutProfiles16();
       break;
 
     case PM_MIN_ON_RUN:
@@ -312,7 +312,7 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
       WritePrivateProfileString("Settings", "MinOnRun",
 				Globals.bMinOnRun ? "1" : "0",
 				Globals.lpszIniFile);
-      WriteOutProfiles();
+      WriteOutProfiles16();
       break;
 
     case PM_SAVE_SETTINGS:
@@ -323,7 +323,7 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
       WritePrivateProfileString("Settings", "SaveSettings",
 				Globals.bSaveSettings ? "1" : "0",
 				Globals.lpszIniFile);
-      WriteOutProfiles();
+      WriteOutProfiles16();
       break;
 
       /* Menu Windows */
diff --git a/programs/progman/program.c b/programs/progman/program.c
index 871e9398127..40ff409c139 100644
--- a/programs/progman/program.c
+++ b/programs/progman/program.c
@@ -168,10 +168,10 @@ HLOCAL PROGRAM_AddProgram(HLOCAL hGroup, HICON hIcon, LPCSTR lpszName,
       if (hWorkDir)  LocalFree(hWorkDir);
       return(0);
     }
-  hmemcpy(LocalLock(hName),     lpszName,     1 + lstrlen(lpszName));
-  hmemcpy(LocalLock(hCmdLine),  lpszCmdLine,  1 + lstrlen(lpszCmdLine));
-  hmemcpy(LocalLock(hIconFile), lpszIconFile, 1 + lstrlen(lpszIconFile));
-  hmemcpy(LocalLock(hWorkDir),  lpszWorkDir,  1 + lstrlen(lpszWorkDir));
+  hmemcpy16(LocalLock(hName),     lpszName,     1 + lstrlen(lpszName));
+  hmemcpy16(LocalLock(hCmdLine),  lpszCmdLine,  1 + lstrlen(lpszCmdLine));
+  hmemcpy16(LocalLock(hIconFile), lpszIconFile, 1 + lstrlen(lpszIconFile));
+  hmemcpy16(LocalLock(hWorkDir),  lpszWorkDir,  1 + lstrlen(lpszWorkDir));
 
   group->hActiveProgram  = hProgram;
 
diff --git a/programs/view/init.c b/programs/view/init.c
index e6e20dacda1..e5105508682 100644
--- a/programs/view/init.c
+++ b/programs/view/init.c
@@ -24,7 +24,7 @@ BOOL InitApplication(HINSTANCE hInstance)
 
   /* Load small icon image */
   wc.hIconSm = LoadImage(hInstance,		
-			 MAKEINTRESOURCE32A(IDI_APPICON),
+			 MAKEINTRESOURCEA(IDI_APPICON),
 			 IMAGE_ICON,
 			 16, 16,
 			 0);
diff --git a/programs/winhelp/hlp2sgml.c b/programs/winhelp/hlp2sgml.c
index b90f46f35f9..3bc3ab967fd 100644
--- a/programs/winhelp/hlp2sgml.c
+++ b/programs/winhelp/hlp2sgml.c
@@ -252,19 +252,19 @@ int main(int argc, char **argv)
 
 static FILE *file = 0;
 
-HFILE WINAPI OpenFile32( LPCSTR path, OFSTRUCT *ofs, UINT mode )
+HFILE WINAPI OpenFile( LPCSTR path, OFSTRUCT *ofs, UINT mode )
 {
   file = *path ? fopen(path, "r") : stdin;
   return file ? 1 : HFILE_ERROR;
 }
 
-HFILE WINAPI _lclose32( HFILE hFile )
+HFILE WINAPI _lclose( HFILE hFile )
 {
   fclose(file);
   return 0;
 }
 
-LONG WINAPI _hread32( HFILE hFile, LPVOID buffer, LONG count )
+LONG WINAPI _hread( HFILE hFile, LPVOID buffer, LONG count )
 {
   return fread(buffer, 1, count, file);
 }
@@ -314,14 +314,14 @@ INT WINAPI lstrlen(LPCSTR str)
   return strlen(str);
 }
 
-LPSTR WINAPI lstrcpy32A( LPSTR dst, LPCSTR src )
+LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src )
 {
     if (!src || !dst) return NULL;
     strcpy( dst, src );
     return dst;
 }
 
-void WINAPI hmemcpy(LPVOID hpvDest, LPCVOID hpvSource, LONG cbCopy)
+void WINAPI hmemcpy16(LPVOID hpvDest, LPCVOID hpvSource, LONG cbCopy)
 {
   memcpy(hpvDest, hpvSource, cbCopy);
 }
diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c
index bc1cac363e2..d06655decb8 100644
--- a/programs/winhelp/hlpfile.c
+++ b/programs/winhelp/hlpfile.c
@@ -704,7 +704,7 @@ static BYTE *HLPFILE_Uncompress1(BYTE *ptr, BYTE *end, BYTE *newptr)
 	      INT code   = GET_USHORT(ptr, 0);
 	      INT len    = 3 + (code >> 12);
 	      INT offset = code & 0xfff;
-	      hmemcpy(newptr, newptr - offset - 1, len);
+	      hmemcpy16(newptr, newptr - offset - 1, len);
 	      newptr += len;
 	      ptr    += 2;
 	    }
@@ -736,7 +736,7 @@ static BOOL HLPFILE_Uncompress1_Phrases()
   if (!phrases.hBuffer) return FALSE;
   newbuf = phrases.buf = GlobalLock(phrases.hBuffer);
 
-  hmemcpy(newbuf, buf + 0x11, 2 * num + 2);
+  hmemcpy16(newbuf, buf + 0x11, 2 * num + 2);
   HLPFILE_Uncompress1(buf + 0x13 + 2 * num, end, newbuf + 2 * num + 2);
 
   for (i = 0; i < num; i++)
@@ -854,7 +854,7 @@ static VOID HLPFILE_Uncompress2(BYTE **pptr, BYTE *end, BYTE *newptr)
 	  phptr = phrases.buf + GET_USHORT(phrases.buf, 2 * index);
 	  phend = phrases.buf + GET_USHORT(phrases.buf, 2 * index + 2);
 
-	  hmemcpy(newptr, phptr, phend - phptr);
+	  hmemcpy16(newptr, phptr, phend - phptr);
 	  newptr += phend - phptr;
 	  if (space) *newptr++ = ' ';
 
diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c
index a21f7de2c9d..7fd17bd31df 100644
--- a/programs/winhelp/winhelp.c
+++ b/programs/winhelp/winhelp.c
@@ -906,7 +906,7 @@ static BOOL WINHELP_AppendText(WINHELP_LINE ***linep, WINHELP_LINE_PART ***partp
       ptr    += sizeof(WINHELP_LINE_PART);
     }
 
-  hmemcpy(ptr, text, textlen);
+  hmemcpy16(ptr, text, textlen);
   part->rect.left     = line->rect.right + (*partp ? space->cx : 0);
   part->rect.right    = part->rect.left + textsize->cx;
   line->rect.right    = part->rect.right;
diff --git a/relay32/advapi32.spec b/relay32/advapi32.spec
index fd826104971..244f9c34517 100644
--- a/relay32/advapi32.spec
+++ b/relay32/advapi32.spec
@@ -3,7 +3,7 @@ type	win32
 
 0000 stub AbortSystemShutdownA
 0001 stub AbortSystemShutdownW
-0002 stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) AccessCheck32
+0002 stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) AccessCheck
 0003 stub AccessCheckAndAuditAlarmA
 0004 stub AccessCheckAndAuditAlarmW
 0005 stub AddAccessAllowedAce
@@ -16,21 +16,21 @@ type	win32
 0012 stdcall AllocateLocallyUniqueId(ptr) AllocateLocallyUniqueId
 0013 stub AreAllAccessesGranted
 0014 stub AreAnyAccessesGranted
-0015 stdcall BackupEventLogA (long str) BackupEventLog32A
-0016 stdcall BackupEventLogW (long wstr) BackupEventLog32W
+0015 stdcall BackupEventLogA (long str) BackupEventLogA
+0016 stdcall BackupEventLogW (long wstr) BackupEventLogW
 0017 stub ChangeServiceConfigA
 0018 stub ChangeServiceConfigW
-0019 stdcall ClearEventLogA (long str) ClearEventLog32A
-0020 stdcall ClearEventLogW (long wstr) ClearEventLog32W
-0021 stdcall CloseEventLog (long) CloseEventLog32
+0019 stdcall ClearEventLogA (long str) ClearEventLogA
+0020 stdcall ClearEventLogW (long wstr) ClearEventLogW
+0021 stdcall CloseEventLog (long) CloseEventLog
 0022 stdcall CloseServiceHandle(long) CloseServiceHandle
 0023 stdcall ControlService(long long ptr) ControlService
 0024 stdcall CopySid(long ptr ptr) CopySid
 0025 stub CreatePrivateObjectSecurity
 0026 stub CreateProcessAsUserA
 0027 stub CreateProcessAsUserW
-0028 stdcall CreateServiceA(long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) CreateService32A
-0029 stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) CreateService32A
+0028 stdcall CreateServiceA(long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) CreateServiceA
+0029 stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) CreateServiceA
 0030 stdcall CryptAcquireContextA(ptr str str long long) CryptAcquireContextA
 0031 stub CryptAcquireContextW
 0032 stub CryptContextAddRef
@@ -71,27 +71,27 @@ type	win32
 0067 stub CryptVerifySignatureW
 0068 stub DeleteAce
 0069 stdcall DeleteService(long) DeleteService
-0070 stdcall DeregisterEventSource(long) DeregisterEventSource32
+0070 stdcall DeregisterEventSource(long) DeregisterEventSource
 0071 stub DestroyPrivateObjectSecurity
 0072 stub DuplicateToken
 0073 stub EnumDependentServicesA
 0074 stub EnumDependentServicesW
-0075 stdcall EnumServicesStatusA (long long long ptr long ptr ptr ptr) EnumServicesStatus32A
-0076 stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) EnumServicesStatus32A
+0075 stdcall EnumServicesStatusA (long long long ptr long ptr ptr ptr) EnumServicesStatusA
+0076 stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) EnumServicesStatusA
 0077 stdcall EqualPrefixSid(ptr ptr) EqualPrefixSid
 0078 stdcall EqualSid(ptr ptr) EqualSid
 0079 stub FindFirstFreeAce
 0080 stdcall FreeSid(ptr) FreeSid
 0081 stub GetAce
 0082 stub GetAclInformation
-0083 stdcall GetFileSecurityA(str long ptr long ptr) GetFileSecurity32A
-0084 stdcall GetFileSecurityW(wstr long ptr long ptr) GetFileSecurity32W
+0083 stdcall GetFileSecurityA(str long ptr long ptr) GetFileSecurityA
+0084 stdcall GetFileSecurityW(wstr long ptr long ptr) GetFileSecurityW
 0085 stub GetKernelObjectSecurity
 0086 stdcall GetLengthSid(ptr) GetLengthSid
-0087 stdcall GetNumberOfEventLogRecords (long ptr) GetNumberOfEventLogRecords32
-0088 stdcall GetOldestEventLogRecord (long ptr) GetOldestEventLogRecord32
+0087 stdcall GetNumberOfEventLogRecords (long ptr) GetNumberOfEventLogRecords
+0088 stdcall GetOldestEventLogRecord (long ptr) GetOldestEventLogRecord
 0089 stub GetPrivateObjectSecurity
-0090 stdcall GetSecurityDescriptorControl (ptr ptr ptr) GetSecurityDescriptorControl32
+0090 stdcall GetSecurityDescriptorControl (ptr ptr ptr) GetSecurityDescriptorControl
 0091 stdcall GetSecurityDescriptorDacl (ptr ptr ptr ptr) GetSecurityDescriptorDacl
 0092 stdcall GetSecurityDescriptorGroup(ptr ptr ptr) GetSecurityDescriptorGroup
 0093 stdcall GetSecurityDescriptorLength(ptr) GetSecurityDescriptorLength
@@ -106,11 +106,11 @@ type	win32
 0102 stdcall GetSidSubAuthority(ptr long) GetSidSubAuthority
 0103 stdcall GetSidSubAuthorityCount(ptr) GetSidSubAuthorityCount
 0104 stdcall GetTokenInformation(long long ptr long ptr) GetTokenInformation
-0105 stdcall GetUserNameA(ptr ptr) GetUserName32A
-0106 stdcall GetUserNameW(ptr ptr) GetUserName32W
+0105 stdcall GetUserNameA(ptr ptr) GetUserNameA
+0106 stdcall GetUserNameW(ptr ptr) GetUserNameW
 0107 stub ImpersonateLoggedOnUser
 0108 stub ImpersonateNamedPipeClient
-0109 stdcall ImpersonateSelf(long) ImpersonateSelf32
+0109 stdcall ImpersonateSelf(long) ImpersonateSelf
 0110 stub InitializeAcl
 0111 stdcall InitializeSecurityDescriptor(ptr long) InitializeSecurityDescriptor
 0112 stdcall InitializeSid(ptr ptr long) InitializeSid
@@ -125,34 +125,34 @@ type	win32
 0121 stub LogonUserW
 0122 stub LookupAccountNameA
 0123 stub LookupAccountNameW
-0124 stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) LookupAccountSid32A
-0125 stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) LookupAccountSid32W
+0124 stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) LookupAccountSidA
+0125 stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) LookupAccountSidW
 0126 stub LookupPrivilegeDisplayNameA
 0127 stub LookupPrivilegeDisplayNameW
 0128 stub LookupPrivilegeNameA
 0129 stub LookupPrivilegeNameW
-0130 stdcall LookupPrivilegeValueA(ptr ptr ptr) LookupPrivilegeValue32A
-0131 stdcall LookupPrivilegeValueW(ptr ptr ptr) LookupPrivilegeValue32W
+0130 stdcall LookupPrivilegeValueA(ptr ptr ptr) LookupPrivilegeValueA
+0131 stdcall LookupPrivilegeValueW(ptr ptr ptr) LookupPrivilegeValueW
 0132 stub MakeAbsoluteSD
 0133 stdcall MakeSelfRelativeSD(ptr ptr ptr) MakeSelfRelativeSD
 0134 stub MapGenericMask
 0135 stdcall NotifyBootConfigStatus(long) NotifyBootConfigStatus
-0136 stdcall NotifyChangeEventLog (long long) NotifyChangeEventLog32
+0136 stdcall NotifyChangeEventLog (long long) NotifyChangeEventLog
 0137 stub ObjectCloseAuditAlarmA
 0138 stub ObjectCloseAuditAlarmW
 0139 stub ObjectOpenAuditAlarmA
 0140 stub ObjectOpenAuditAlarmW
 0141 stub ObjectPrivilegeAuditAlarmA
 0142 stub ObjectPrivilegeAuditAlarmW
-0143 stdcall OpenBackupEventLogA (str str) OpenBackupEventLog32A
-0144 stdcall OpenBackupEventLogW (wstr wstr) OpenBackupEventLog32W
-0145 stdcall OpenEventLogA (str str) OpenEventLog32A
-0146 stdcall OpenEventLogW (wstr wstr) OpenEventLog32W
+0143 stdcall OpenBackupEventLogA (str str) OpenBackupEventLogA
+0144 stdcall OpenBackupEventLogW (wstr wstr) OpenBackupEventLogW
+0145 stdcall OpenEventLogA (str str) OpenEventLogA
+0146 stdcall OpenEventLogW (wstr wstr) OpenEventLogW
 0147 stdcall OpenProcessToken(long long ptr) OpenProcessToken
-0148 stdcall OpenSCManagerA(ptr ptr long) OpenSCManager32A
-0149 stdcall OpenSCManagerW(ptr ptr long) OpenSCManager32W
-0150 stdcall OpenServiceA(long str long) OpenService32A
-0151 stdcall OpenServiceW(long wstr long) OpenService32W
+0148 stdcall OpenSCManagerA(ptr ptr long) OpenSCManagerA
+0149 stdcall OpenSCManagerW(ptr ptr long) OpenSCManagerW
+0150 stdcall OpenServiceA(long str long) OpenServiceA
+0151 stdcall OpenServiceW(long wstr long) OpenServiceW
 0152 stdcall OpenThreadToken(long long long ptr) OpenThreadToken
 0153 stub PrivilegeCheck
 0154 stub PrivilegedServiceAuditAlarmA
@@ -163,66 +163,66 @@ type	win32
 0159 stub QueryServiceLockStatusW
 0160 stub QueryServiceObjectSecurity
 0161 stdcall QueryServiceStatus(long ptr) QueryServiceStatus
-0162 stdcall ReadEventLogA (long long long ptr long ptr ptr) ReadEventLog32A
-0163 stdcall ReadEventLogW (long long long ptr long ptr ptr) ReadEventLog32W
+0162 stdcall ReadEventLogA (long long long ptr long ptr ptr) ReadEventLogA
+0163 stdcall ReadEventLogW (long long long ptr long ptr ptr) ReadEventLogW
 0164 stdcall RegCloseKey(long) RegCloseKey
-0165 stdcall RegConnectRegistryA(str long ptr) RegConnectRegistry32A
-0166 stdcall RegConnectRegistryW(wstr long ptr) RegConnectRegistry32W
-0167 stdcall RegCreateKeyA(long str ptr) RegCreateKey32A
-0168 stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) RegCreateKeyEx32A
-0169 stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) RegCreateKeyEx32W
-0170 stdcall RegCreateKeyW(long wstr ptr) RegCreateKey32W
-0171 stdcall RegDeleteKeyA(long str) RegDeleteKey32A
-0172 stdcall RegDeleteKeyW(long wstr) RegDeleteKey32W
-0173 stdcall RegDeleteValueA(long str) RegDeleteValue32A
-0174 stdcall RegDeleteValueW(long wstr) RegDeleteValue32W
-0175 stdcall RegEnumKeyA(long long ptr long) RegEnumKey32A
-0176 stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) RegEnumKeyEx32A
-0177 stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) RegEnumKeyEx32W
-0178 stdcall RegEnumKeyW(long long ptr long) RegEnumKey32W
-0179 stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) RegEnumValue32A
-0180 stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) RegEnumValue32W
+0165 stdcall RegConnectRegistryA(str long ptr) RegConnectRegistryA
+0166 stdcall RegConnectRegistryW(wstr long ptr) RegConnectRegistryW
+0167 stdcall RegCreateKeyA(long str ptr) RegCreateKeyA
+0168 stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) RegCreateKeyExA
+0169 stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) RegCreateKeyExW
+0170 stdcall RegCreateKeyW(long wstr ptr) RegCreateKeyW
+0171 stdcall RegDeleteKeyA(long str) RegDeleteKeyA
+0172 stdcall RegDeleteKeyW(long wstr) RegDeleteKeyW
+0173 stdcall RegDeleteValueA(long str) RegDeleteValueA
+0174 stdcall RegDeleteValueW(long wstr) RegDeleteValueW
+0175 stdcall RegEnumKeyA(long long ptr long) RegEnumKeyA
+0176 stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) RegEnumKeyExA
+0177 stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) RegEnumKeyExW
+0178 stdcall RegEnumKeyW(long long ptr long) RegEnumKeyW
+0179 stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) RegEnumValueA
+0180 stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) RegEnumValueW
 0181 stdcall RegFlushKey(long) RegFlushKey
 0182 stdcall RegGetKeySecurity(long long ptr ptr) RegGetKeySecurity
-0183 stdcall RegLoadKeyA(long str str) RegLoadKey32A
-0184 stdcall RegLoadKeyW(long wstr wstr) RegLoadKey32W
+0183 stdcall RegLoadKeyA(long str str) RegLoadKeyA
+0184 stdcall RegLoadKeyW(long wstr wstr) RegLoadKeyW
 0185 stdcall RegNotifyChangeKeyValue(long long long long long) RegNotifyChangeKeyValue
-0186 stdcall RegOpenKeyA(long str ptr) RegOpenKey32A
-0187 stdcall RegOpenKeyExA(long str long long ptr) RegOpenKeyEx32A
-0188 stdcall RegOpenKeyExW(long wstr long long ptr) RegOpenKeyEx32W
-0189 stdcall RegOpenKeyW(long wstr ptr) RegOpenKey32W
-0190 stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) RegQueryInfoKey32A
-0191 stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) RegQueryInfoKey32W
+0186 stdcall RegOpenKeyA(long str ptr) RegOpenKeyA
+0187 stdcall RegOpenKeyExA(long str long long ptr) RegOpenKeyExA
+0188 stdcall RegOpenKeyExW(long wstr long long ptr) RegOpenKeyExW
+0189 stdcall RegOpenKeyW(long wstr ptr) RegOpenKeyW
+0190 stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) RegQueryInfoKeyA
+0191 stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) RegQueryInfoKeyW
 0192 stub RegQueryMultipleValuesA
 0193 stub RegQueryMultipleValuesW
-0194 stdcall RegQueryValueA(long str ptr ptr) RegQueryValue32A
-0195 stdcall RegQueryValueExA(long str ptr ptr ptr ptr) RegQueryValueEx32A
-0196 stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) RegQueryValueEx32W
-0197 stdcall RegQueryValueW(long wstr ptr ptr) RegQueryValue32W
+0194 stdcall RegQueryValueA(long str ptr ptr) RegQueryValueA
+0195 stdcall RegQueryValueExA(long str ptr ptr ptr ptr) RegQueryValueExA
+0196 stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) RegQueryValueExW
+0197 stdcall RegQueryValueW(long wstr ptr ptr) RegQueryValueW
 0198 stub RegRemapPreDefKey
-0199 stdcall RegReplaceKeyA(long str str str) RegReplaceKey32A
-0200 stdcall RegReplaceKeyW(long wstr wstr wstr) RegReplaceKey32W
-0201 stdcall RegRestoreKeyA(long str long) RegRestoreKey32A
-0202 stdcall RegRestoreKeyW(long wstr long) RegRestoreKey32W
-0203 stdcall RegSaveKeyA(long ptr ptr) RegSaveKey32A
-0204 stdcall RegSaveKeyW(long ptr ptr) RegSaveKey32W
+0199 stdcall RegReplaceKeyA(long str str str) RegReplaceKeyA
+0200 stdcall RegReplaceKeyW(long wstr wstr wstr) RegReplaceKeyW
+0201 stdcall RegRestoreKeyA(long str long) RegRestoreKeyA
+0202 stdcall RegRestoreKeyW(long wstr long) RegRestoreKeyW
+0203 stdcall RegSaveKeyA(long ptr ptr) RegSaveKeyA
+0204 stdcall RegSaveKeyW(long ptr ptr) RegSaveKeyW
 0205 stdcall RegSetKeySecurity(long long ptr) RegSetKeySecurity
-0206 stdcall RegSetValueA(long str long ptr long) RegSetValue32A
-0207 stdcall RegSetValueExA(long str long long ptr long) RegSetValueEx32A
-0208 stdcall RegSetValueExW(long wstr long long ptr long) RegSetValueEx32W
-0209 stdcall RegSetValueW(long wstr long ptr long) RegSetValue32W
-0210 stdcall RegUnLoadKeyA(long str) RegUnLoadKey32A
-0211 stdcall RegUnLoadKeyW(long wstr) RegUnLoadKey32W
-0212 stdcall RegisterEventSourceA(ptr ptr) RegisterEventSource32A
-0213 stdcall RegisterEventSourceW(ptr ptr) RegisterEventSource32W
+0206 stdcall RegSetValueA(long str long ptr long) RegSetValueA
+0207 stdcall RegSetValueExA(long str long long ptr long) RegSetValueExA
+0208 stdcall RegSetValueExW(long wstr long long ptr long) RegSetValueExW
+0209 stdcall RegSetValueW(long wstr long ptr long) RegSetValueW
+0210 stdcall RegUnLoadKeyA(long str) RegUnLoadKeyA
+0211 stdcall RegUnLoadKeyW(long wstr) RegUnLoadKeyW
+0212 stdcall RegisterEventSourceA(ptr ptr) RegisterEventSourceA
+0213 stdcall RegisterEventSourceW(ptr ptr) RegisterEventSourceW
 0214 stdcall RegisterServiceCtrlHandlerA (ptr ptr) RegisterServiceCtrlHandlerA
 0215 stdcall RegisterServiceCtrlHandlerW (ptr ptr) RegisterServiceCtrlHandlerW
-0216 stdcall ReportEventA (long long long long ptr long long str ptr) ReportEvent32A
-0217 stdcall ReportEventW (long long long long ptr long long wstr ptr) ReportEvent32W
+0216 stdcall ReportEventA (long long long long ptr long long str ptr) ReportEventA
+0217 stdcall ReportEventW (long long long long ptr long long wstr ptr) ReportEventW
 0218 stdcall RevertToSelf() RevertToSelf
 0219 stub SetAclInformation
-0220 stdcall SetFileSecurityA(str long ptr ) SetFileSecurity32A
-0221 stdcall SetFileSecurityW(wstr long ptr) SetFileSecurity32W
+0220 stdcall SetFileSecurityA(str long ptr ) SetFileSecurityA
+0221 stdcall SetFileSecurityW(wstr long ptr) SetFileSecurityW
 0222 stub SetKernelObjectSecurity
 0223 stub SetPrivateObjectSecurity
 0224 stdcall SetSecurityDescriptorDacl(ptr long ptr long) SetSecurityDescriptorDacl
@@ -234,10 +234,10 @@ type	win32
 0230 stdcall SetServiceStatus(long long)SetServiceStatus
 0231 stub SetThreadToken
 0232 stub SetTokenInformation
-0233 stdcall StartServiceA(long long ptr) StartService32A
-0234 stdcall StartServiceCtrlDispatcherA(ptr) StartServiceCtrlDispatcher32A
-0235 stdcall StartServiceCtrlDispatcherW(ptr) StartServiceCtrlDispatcher32W
-0236 stdcall StartServiceW(long long ptr) StartService32W
+0233 stdcall StartServiceA(long long ptr) StartServiceA
+0234 stdcall StartServiceCtrlDispatcherA(ptr) StartServiceCtrlDispatcherA
+0235 stdcall StartServiceCtrlDispatcherW(ptr) StartServiceCtrlDispatcherW
+0236 stdcall StartServiceW(long long ptr) StartServiceW
 0237 stub UnlockServiceDatabase
 0238 stdcall LsaOpenPolicy(long long long long) LsaOpenPolicy
 0239 stub LsaLookupSids
diff --git a/relay32/builtin32.c b/relay32/builtin32.c
index 50442bd4bce..f2742854263 100644
--- a/relay32/builtin32.c
+++ b/relay32/builtin32.c
@@ -26,7 +26,7 @@ typedef struct
 typedef struct
 {
     const BUILTIN32_DESCRIPTOR *descr;     /* DLL descriptor */
-    BOOL32                      used;      /* Used by default */
+    BOOL                      used;      /* Used by default */
 } BUILTIN32_DLL;
 
 
@@ -120,7 +120,7 @@ extern void RELAY_CallFrom32();
  *
  * Load a built-in Win32 module. Helper function for BUILTIN32_LoadImage.
  */
-static HMODULE32 BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
+static HMODULE BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
 {
 
     IMAGE_DATA_DIRECTORY *dir;
@@ -131,7 +131,7 @@ static HMODULE32 BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
     LPVOID *funcs;
     LPSTR *names;
     DEBUG_ENTRY_POINT *debug;
-    INT32 i, size;
+    INT i, size;
     BYTE *addr;
 
     /* Allocate the module */
@@ -286,7 +286,7 @@ static HMODULE32 BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
         if (dll->descr->names[i])
             *names = (LPSTR)((BYTE *)dll->descr->names[i] - addr);
 
-    return (HMODULE32)addr;
+    return (HMODULE)addr;
 }
 
 /***********************************************************************
@@ -295,7 +295,7 @@ static HMODULE32 BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
  * Load a built-in module. If the 'force' parameter is FALSE, we only
  * load the module if it has not been disabled via the -dll option.
  */
-HMODULE32 BUILTIN32_LoadImage( LPCSTR name, OFSTRUCT *ofs, BOOL32 force )
+HMODULE BUILTIN32_LoadImage( LPCSTR name, OFSTRUCT *ofs, BOOL force )
 {
     BUILTIN32_DLL *table;
     char dllname[16], *p;
@@ -303,11 +303,11 @@ HMODULE32 BUILTIN32_LoadImage( LPCSTR name, OFSTRUCT *ofs, BOOL32 force )
     /* Fix the name in case we have a full path and extension */
 
     if ((p = strrchr( name, '\\' ))) name = p + 1;
-    lstrcpyn32A( dllname, name, sizeof(dllname) );
+    lstrcpynA( dllname, name, sizeof(dllname) );
     if ((p = strrchr( dllname, '.' ))) *p = '\0';
 
     for (table = BuiltinDLLs; table->descr; table++)
-        if (!lstrcmpi32A( table->descr->name, dllname )) break;
+        if (!lstrcmpiA( table->descr->name, dllname )) break;
     if (!table->descr) return 0;
     if (!table->used)
     {
@@ -333,14 +333,14 @@ ENTRYPOINT32 BUILTIN32_GetEntryPoint( char *buffer, void *relay,
                                       unsigned int *typemask )
 {
     BUILTIN32_DLL *dll;
-    HMODULE32 hModule;
+    HMODULE hModule;
     int ordinal = 0, i;
 
     /* First find the module */
 
     for (dll = BuiltinDLLs; dll->descr; dll++)
         if (dll->used 
-            && ((hModule = GetModuleHandle32A(dll->descr->name)) != 0))
+            && ((hModule = GetModuleHandleA(dll->descr->name)) != 0))
         {
             IMAGE_SECTION_HEADER *sec = PE_SECTIONS(hModule);
             DEBUG_ENTRY_POINT *debug = 
@@ -374,9 +374,9 @@ ENTRYPOINT32 BUILTIN32_GetEntryPoint( char *buffer, void *relay,
  *
  * FIXME: enhance to do it module relative.
  */
-void BUILTIN32_SwitchRelayDebug(BOOL32 onoff) {
+void BUILTIN32_SwitchRelayDebug(BOOL onoff) {
     BUILTIN32_DLL *dll;
-    HMODULE32 hModule;
+    HMODULE hModule;
     int i;
 
 #ifdef __i386__
@@ -385,7 +385,7 @@ void BUILTIN32_SwitchRelayDebug(BOOL32 onoff) {
     for (dll = BuiltinDLLs; dll->descr; dll++) {
 	IMAGE_SECTION_HEADER *sec;
 	DEBUG_ENTRY_POINT *debug;
-        if (!dll->used || !(hModule = GetModuleHandle32A(dll->descr->name)))
+        if (!dll->used || !(hModule = GetModuleHandleA(dll->descr->name)))
 	    continue;
 
 	sec = PE_SECTIONS(hModule);
@@ -448,7 +448,7 @@ int BUILTIN32_EnableDLL( const char *name, int len, int enable )
 
     for (i = 0, dll = BuiltinDLLs; dll->descr; dll++)
     {
-        if (!lstrncmpi32A( name, dll->descr->name, len ))
+        if (!lstrncmpiA( name, dll->descr->name, len ))
         {
             dll->used = enable;
             return TRUE;
diff --git a/relay32/comctl32.spec b/relay32/comctl32.spec
index 69d45bba52b..69dc5f42351 100644
--- a/relay32/comctl32.spec
+++ b/relay32/comctl32.spec
@@ -10,8 +10,8 @@ init	COMCTL32_LibMain
   2 stdcall MenuHelp(long long long long long long ptr) MenuHelp
   3 stdcall ShowHideMenuCtl(long long ptr) ShowHideMenuCtl
   4 stdcall GetEffectiveClientRect(long long long) GetEffectiveClientRect
-  5 stdcall DrawStatusTextA(long ptr str long) DrawStatusText32A
-  6 stdcall CreateStatusWindowA(long str long long) CreateStatusWindow32A
+  5 stdcall DrawStatusTextA(long ptr str long) DrawStatusTextA
+  6 stdcall CreateStatusWindowA(long str long long) CreateStatusWindowA
   7 stdcall CreateToolbar(long long long long long long ptr long) CreateToolbar
   8 stdcall CreateMappedBitmap(long long long ptr long) CreateMappedBitmap
   9 stub COMCTL32_9
@@ -23,17 +23,17 @@ init	COMCTL32_LibMain
  15 stdcall DrawInsert(long long long) DrawInsert
  16 stdcall CreateUpDownControl(long long long long long long long long long long long long) CreateUpDownControl
  17 stdcall InitCommonControls() InitCommonControls
- 18 stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPage32A
- 19 stdcall CreatePropertySheetPageA(ptr) CreatePropertySheetPage32A
- 20 stdcall CreatePropertySheetPageW(ptr) CreatePropertySheetPage32W
- 21 stdcall CreateStatusWindow(long str long long) CreateStatusWindow32A
- 22 stdcall CreateStatusWindowW(long wstr long long) CreateStatusWindow32W
+ 18 stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPageA
+ 19 stdcall CreatePropertySheetPageA(ptr) CreatePropertySheetPageA
+ 20 stdcall CreatePropertySheetPageW(ptr) CreatePropertySheetPageW
+ 21 stdcall CreateStatusWindow(long str long long) CreateStatusWindowA
+ 22 stdcall CreateStatusWindowW(long wstr long long) CreateStatusWindowW
  23 stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) CreateToolbarEx
- 24 stdcall DestroyPropertySheetPage(long) DestroyPropertySheetPage32
+ 24 stdcall DestroyPropertySheetPage(long) DestroyPropertySheetPage
  25 stdcall DllGetVersion(ptr) COMCTL32_DllGetVersion
  26 stub DllInstall
- 27 stdcall DrawStatusText(long ptr ptr long) DrawStatusText32A
- 28 stdcall DrawStatusTextW(long ptr wstr long) DrawStatusText32W
+ 27 stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA
+ 28 stdcall DrawStatusTextW(long ptr wstr long) DrawStatusTextW
  29 stdcall FlatSB_EnableScrollBar (long long long) FlatSB_EnableScrollBar
  30 stdcall FlatSB_GetScrollInfo (long long ptr) FlatSB_GetScrollInfo
  31 stdcall FlatSB_GetScrollPos (long long) FlatSB_GetScrollPos
@@ -67,9 +67,9 @@ init	COMCTL32_LibMain
  59 stdcall ImageList_GetImageCount(ptr) ImageList_GetImageCount
  60 stdcall ImageList_GetImageInfo(ptr long ptr) ImageList_GetImageInfo
  61 stdcall ImageList_GetImageRect(ptr long ptr) ImageList_GetImageRect
- 62 stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImage32A
- 63 stdcall ImageList_LoadImageA(long str long long long long long) ImageList_LoadImage32A
- 64 stdcall ImageList_LoadImageW(long wstr long long long long long) ImageList_LoadImage32W
+ 62 stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImageA
+ 63 stdcall ImageList_LoadImageA(long str long long long long long) ImageList_LoadImageA
+ 64 stdcall ImageList_LoadImageW(long wstr long long long long long) ImageList_LoadImageW
  65 stdcall ImageList_Merge(ptr long ptr long long long) ImageList_Merge
  66 stdcall ImageList_Read(ptr) ImageList_Read
  67 stdcall ImageList_Remove(ptr long) ImageList_Remove
@@ -88,19 +88,19 @@ init	COMCTL32_LibMain
  80 stdcall ImageList_Write(ptr ptr) ImageList_Write
  81 stdcall InitCommonControlsEx(ptr) InitCommonControlsEx
  82 stdcall InitializeFlatSB(long) InitializeFlatSB
- 83 stdcall PropertySheet(ptr) PropertySheet32A
- 84 stdcall PropertySheetA(ptr) PropertySheet32A
- 85 stdcall PropertySheetW(ptr) PropertySheet32W
+ 83 stdcall PropertySheet(ptr) PropertySheetA
+ 84 stdcall PropertySheetA(ptr) PropertySheetA
+ 85 stdcall PropertySheetW(ptr) PropertySheetW
  86 stdcall UninitializeFlatSB(long) UninitializeFlatSB
  87 stub _TrackMouseEvent
 
-151 stdcall CreateMRUListA(ptr) CreateMRUList32A
-152 stdcall FreeMRUList(ptr) FreeMRUList32A
+151 stdcall CreateMRUListA(ptr) CreateMRUListA
+152 stdcall FreeMRUList(ptr) FreeMRUListA
 153 stub AddMRUStringA@8
 154 stub EnumMRUListA@16
 155 stub FindMRUStringA@12
 156 stub DelMRUString@8
-157 stdcall CreateMRUListLazyA(ptr long long long) CreateMRUListLazy32A
+157 stdcall CreateMRUListLazyA(ptr long long long) CreateMRUListLazyA
 
 163 stub CreatePage
 164 stub CreateProxyPage
@@ -108,10 +108,10 @@ init	COMCTL32_LibMain
 167 stdcall AddMRUData(ptr long long) AddMRUData
 169 stdcall FindMRUData(ptr long long long) FindMRUData
 
-233 stdcall Str_GetPtrA(str str long) Str_GetPtr32A
-234 stdcall Str_SetPtrA(str str) Str_SetPtr32A
-235 stdcall Str_GetPtrW(wstr wstr long) Str_GetPtr32W
-236 stdcall Str_SetPtrW(wstr wstr) Str_SetPtr32W
+233 stdcall Str_GetPtrA(str str long) Str_GetPtrA
+234 stdcall Str_SetPtrA(str str) Str_SetPtrA
+235 stdcall Str_GetPtrW(wstr wstr long) Str_GetPtrW
+236 stdcall Str_SetPtrW(wstr wstr) Str_SetPtrW
 
 320 stdcall DSA_Create(long long) DSA_Create
 321 stdcall DSA_Destroy(ptr) DSA_Destroy
diff --git a/relay32/comdlg32.spec b/relay32/comdlg32.spec
index 520b7ccd4e5..da3c2305691 100644
--- a/relay32/comdlg32.spec
+++ b/relay32/comdlg32.spec
@@ -2,26 +2,26 @@ name	comdlg32
 type	win32
 
  0 stub ArrowBtnWndProc
- 1 stdcall ChooseColorA(ptr) ChooseColor32A
- 2 stdcall ChooseColorW(ptr) ChooseColor32W
- 3 stdcall ChooseFontA(ptr) ChooseFont32A
- 4 stdcall ChooseFontW(ptr) ChooseFont32W
+ 1 stdcall ChooseColorA(ptr) ChooseColorA
+ 2 stdcall ChooseColorW(ptr) ChooseColorW
+ 3 stdcall ChooseFontA(ptr) ChooseFontA
+ 4 stdcall ChooseFontW(ptr) ChooseFontW
  5 stdcall CommDlgExtendedError() CommDlgExtendedError
- 6 stdcall FindTextA(ptr) FindText32A
- 7 stdcall FindTextW(ptr) FindText32W
- 8 stdcall GetFileTitleA(ptr ptr long) GetFileTitle32A
- 9 stdcall GetFileTitleW(ptr ptr long) GetFileTitle32W
-10 stdcall GetOpenFileNameA(ptr) GetOpenFileName32A
-11 stdcall GetOpenFileNameW(ptr) GetOpenFileName32W
-12 stdcall GetSaveFileNameA(ptr) GetSaveFileName32A
-13 stdcall GetSaveFileNameW(ptr) GetSaveFileName32W
+ 6 stdcall FindTextA(ptr) FindTextA
+ 7 stdcall FindTextW(ptr) FindTextW
+ 8 stdcall GetFileTitleA(ptr ptr long) GetFileTitleA
+ 9 stdcall GetFileTitleW(ptr ptr long) GetFileTitleW
+10 stdcall GetOpenFileNameA(ptr) GetOpenFileNameA
+11 stdcall GetOpenFileNameW(ptr) GetOpenFileNameW
+12 stdcall GetSaveFileNameA(ptr) GetSaveFileNameA
+13 stdcall GetSaveFileNameW(ptr) GetSaveFileNameW
 14 stub LoadAlterBitmap
-15 stdcall PageSetupDlgA(ptr) PageSetupDlg32A
+15 stdcall PageSetupDlgA(ptr) PageSetupDlgA
 16 stub PageSetupDlgW
-17 stdcall PrintDlgA(ptr) PrintDlg32A
-18 stdcall PrintDlgW(ptr) PrintDlg32W
-19 stdcall ReplaceTextA(ptr) ReplaceText32A
-20 stdcall ReplaceTextW(ptr) ReplaceText32W
+17 stdcall PrintDlgA(ptr) PrintDlgA
+18 stdcall PrintDlgW(ptr) PrintDlgW
+19 stdcall ReplaceTextA(ptr) ReplaceTextA
+20 stdcall ReplaceTextW(ptr) ReplaceTextW
 21 stub WantArrows
 22 stub dwLBSubclass
 23 stub dwOKSubclass
diff --git a/relay32/crtdll.spec b/relay32/crtdll.spec
index e9d9a23e10a..33bbab98d64 100644
--- a/relay32/crtdll.spec
+++ b/relay32/crtdll.spec
@@ -484,7 +484,7 @@ type	win32
 480 cdecl strtol(str ptr long) strtol
 481 cdecl strtoul(str ptr long) strtoul
 482 cdecl strxfrm(ptr str long) strxfrm
-483 varargs swprintf() wsprintf32W
+483 varargs swprintf() wsprintfW
 484 stub swscanf
 485 cdecl system(str) CRTDLL_system
 486 cdecl tan(double) tan
diff --git a/relay32/ddraw.spec b/relay32/ddraw.spec
index 46d88b4243a..98682806997 100644
--- a/relay32/ddraw.spec
+++ b/relay32/ddraw.spec
@@ -8,7 +8,7 @@ type win32
    5  stdcall DSoundHelp(long long long) DSoundHelp
    6  stdcall DirectDrawCreate(ptr ptr ptr) DirectDrawCreate
    7  stdcall DirectDrawCreateClipper(long ptr ptr) DirectDrawCreateClipper
-   8  stdcall DirectDrawEnumerateA(ptr ptr) DirectDrawEnumerate32A
+   8  stdcall DirectDrawEnumerateA(ptr ptr) DirectDrawEnumerateA
    9  stub DirectDrawEnumerateW
   10  stub DllCanUnloadNow
   11  stub DllGetClassObject
diff --git a/relay32/dinput.spec b/relay32/dinput.spec
index 5d2e9e13267..f995b65ce87 100644
--- a/relay32/dinput.spec
+++ b/relay32/dinput.spec
@@ -1,7 +1,7 @@
 name dinput
 type win32
 
-0 stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreate32A
+0 stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA
 1 stub DirectInputCreateW
 2 stub DllCanUnloadNow
 3 stub DllGetClassObject
diff --git a/relay32/dsound.spec b/relay32/dsound.spec
index de7c4b289ed..65d6753c703 100644
--- a/relay32/dsound.spec
+++ b/relay32/dsound.spec
@@ -3,7 +3,7 @@ type win32
 
 0 stub DirectSoundUnknown
 1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate
-2 stdcall DirectSoundEnumerateA(ptr ptr) DirectSoundEnumerate32A
+2 stdcall DirectSoundEnumerateA(ptr ptr) DirectSoundEnumerateA
 3 stub DirectSoundEnumerateW
 4 stdcall DllCanUnloadNow() DSOUND_DllCanUnloadNow
 5 stdcall DllGetClassObject(ptr ptr ptr) DSOUND_DllGetClassObject
diff --git a/relay32/gdi32.spec b/relay32/gdi32.spec
index 14e9cb3f3e7..f32a6822f77 100644
--- a/relay32/gdi32.spec
+++ b/relay32/gdi32.spec
@@ -2,112 +2,112 @@ name	gdi32
 type	win32
 init	MAIN_GdiInit
 
-  0 stdcall AbortDoc(long) AbortDoc32
-  1 stdcall AbortPath(long) AbortPath32
-  2 stdcall AddFontResourceA(str) AddFontResource32A
+  0 stdcall AbortDoc(long) AbortDoc
+  1 stdcall AbortPath(long) AbortPath
+  2 stdcall AddFontResourceA(str) AddFontResourceA
   3 stub AddFontResourceTracking
-  4 stdcall AddFontResourceW(wstr) AddFontResource32W
+  4 stdcall AddFontResourceW(wstr) AddFontResourceW
   5 stdcall AngleArc(long long long long long long) AngleArc
-  6 stdcall AnimatePalette(long long long ptr) AnimatePalette32
-  7 stdcall Arc(long long long long long long long long long) Arc32
+  6 stdcall AnimatePalette(long long long ptr) AnimatePalette
+  7 stdcall Arc(long long long long long long long long long) Arc
   8 stdcall ArcTo(long long long long long long long long long) ArcTo
-  9 stdcall BeginPath(long) BeginPath32
- 10 stdcall BitBlt(long long long long long long long long long) BitBlt32
+  9 stdcall BeginPath(long) BeginPath
+ 10 stdcall BitBlt(long long long long long long long long long) BitBlt
  11 stub CancelDC
  12 stub CheckColorsInGamut
  13 stdcall ChoosePixelFormat(long ptr) ChoosePixelFormat
- 14 stdcall Chord(long long long long long long long long long) Chord32
+ 14 stdcall Chord(long long long long long long long long long) Chord
  15 stdcall CloseEnhMetaFile(long) CloseEnhMetaFile
- 16 stdcall CloseFigure(long) CloseFigure32
- 17 stdcall CloseMetaFile(long) CloseMetaFile32
+ 16 stdcall CloseFigure(long) CloseFigure
+ 17 stdcall CloseMetaFile(long) CloseMetaFile
  18 stub ColorMatchToTarget
- 19 stdcall CombineRgn(long long long long) CombineRgn32
+ 19 stdcall CombineRgn(long long long long) CombineRgn
  20 stdcall CombineTransform(ptr ptr ptr) CombineTransform
- 21 stdcall CopyEnhMetaFileA(long str) CopyEnhMetaFile32A
+ 21 stdcall CopyEnhMetaFileA(long str) CopyEnhMetaFileA
  22 stub CopyEnhMetaFileW
- 23 stdcall CopyMetaFileA(long str) CopyMetaFile32A
- 24 stdcall CopyMetaFileW(long wstr) CopyMetaFile32W
- 25 stdcall CreateBitmap(long long long long ptr) CreateBitmap32
- 26 stdcall CreateBitmapIndirect(ptr) CreateBitmapIndirect32
- 27 stdcall CreateBrushIndirect(ptr) CreateBrushIndirect32
+ 23 stdcall CopyMetaFileA(long str) CopyMetaFileA
+ 24 stdcall CopyMetaFileW(long wstr) CopyMetaFileW
+ 25 stdcall CreateBitmap(long long long long ptr) CreateBitmap
+ 26 stdcall CreateBitmapIndirect(ptr) CreateBitmapIndirect
+ 27 stdcall CreateBrushIndirect(ptr) CreateBrushIndirect
  28 stub CreateColorSpaceA
  29 stub CreateColorSpaceW
- 30 stdcall CreateCompatibleBitmap(long long long) CreateCompatibleBitmap32
- 31 stdcall CreateCompatibleDC(long) CreateCompatibleDC32
- 32 stdcall CreateDCA(str str str ptr) CreateDC32A
- 33 stdcall CreateDCW(wstr wstr wstr ptr) CreateDC32W
- 34 stdcall CreateDIBPatternBrush(long long) CreateDIBPatternBrush32
+ 30 stdcall CreateCompatibleBitmap(long long long) CreateCompatibleBitmap
+ 31 stdcall CreateCompatibleDC(long) CreateCompatibleDC
+ 32 stdcall CreateDCA(str str str ptr) CreateDCA
+ 33 stdcall CreateDCW(wstr wstr wstr ptr) CreateDCW
+ 34 stdcall CreateDIBPatternBrush(long long) CreateDIBPatternBrush
  35 stdcall CreateDIBPatternBrushPt(long long) CreateDIBPatternBrushPt
- 36 stdcall CreateDIBSection(long ptr long ptr long long) CreateDIBSection32
- 37 stdcall CreateDIBitmap(long ptr long ptr ptr long) CreateDIBitmap32
- 38 stdcall CreateDiscardableBitmap(long long long) CreateDiscardableBitmap32
- 39 stdcall CreateEllipticRgn(long long long long) CreateEllipticRgn32
- 40 stdcall CreateEllipticRgnIndirect(ptr) CreateEllipticRgnIndirect32
- 41 stdcall CreateEnhMetaFileA(long str ptr str) CreateEnhMetaFile32A
- 42 stdcall CreateEnhMetaFileW(long wstr ptr wstr) CreateEnhMetaFile32W
- 43 stdcall CreateFontA(long long long long long long long long long long long long long str) CreateFont32A
- 44 stdcall CreateFontIndirectA(ptr) CreateFontIndirect32A
- 45 stdcall CreateFontIndirectW(ptr) CreateFontIndirect32W
- 46 stdcall CreateFontW(long long long long long long long long long long long long long wstr) CreateFont32W
- 47 stdcall CreateHalftonePalette(long) CreateHalftonePalette32
- 48 stdcall CreateHatchBrush(long long) CreateHatchBrush32
- 49 stdcall CreateICA(str str str ptr) CreateIC32A
- 50 stdcall CreateICW(wstr wstr wstr ptr) CreateIC32W
- 51 stdcall CreateMetaFileA(str) CreateMetaFile32A
- 52 stdcall CreateMetaFileW(wstr) CreateMetaFile32W
- 53 stdcall CreatePalette(ptr) CreatePalette32
- 54 stdcall CreatePatternBrush(long) CreatePatternBrush32
- 55 stdcall CreatePen(long long long) CreatePen32
- 56 stdcall CreatePenIndirect(ptr) CreatePenIndirect32
- 57 stdcall CreatePolyPolygonRgn(ptr ptr long long) CreatePolyPolygonRgn32
- 58 stdcall CreatePolygonRgn(ptr long long) CreatePolygonRgn32
- 59 stdcall CreateRectRgn(long long long long) CreateRectRgn32
- 60 stdcall CreateRectRgnIndirect(ptr) CreateRectRgnIndirect32
- 61 stdcall CreateRoundRectRgn(long long long long long long) CreateRoundRectRgn32
- 62 stdcall CreateScalableFontResourceA(long str str str) CreateScalableFontResource32A
- 63 stdcall CreateScalableFontResourceW(long wstr wstr wstr) CreateScalableFontResource32W
- 64 stdcall CreateSolidBrush(long) CreateSolidBrush32
- 65 stdcall DPtoLP(long ptr long) DPtoLP32
+ 36 stdcall CreateDIBSection(long ptr long ptr long long) CreateDIBSection
+ 37 stdcall CreateDIBitmap(long ptr long ptr ptr long) CreateDIBitmap
+ 38 stdcall CreateDiscardableBitmap(long long long) CreateDiscardableBitmap
+ 39 stdcall CreateEllipticRgn(long long long long) CreateEllipticRgn
+ 40 stdcall CreateEllipticRgnIndirect(ptr) CreateEllipticRgnIndirect
+ 41 stdcall CreateEnhMetaFileA(long str ptr str) CreateEnhMetaFileA
+ 42 stdcall CreateEnhMetaFileW(long wstr ptr wstr) CreateEnhMetaFileW
+ 43 stdcall CreateFontA(long long long long long long long long long long long long long str) CreateFontA
+ 44 stdcall CreateFontIndirectA(ptr) CreateFontIndirectA
+ 45 stdcall CreateFontIndirectW(ptr) CreateFontIndirectW
+ 46 stdcall CreateFontW(long long long long long long long long long long long long long wstr) CreateFontW
+ 47 stdcall CreateHalftonePalette(long) CreateHalftonePalette
+ 48 stdcall CreateHatchBrush(long long) CreateHatchBrush
+ 49 stdcall CreateICA(str str str ptr) CreateICA
+ 50 stdcall CreateICW(wstr wstr wstr ptr) CreateICW
+ 51 stdcall CreateMetaFileA(str) CreateMetaFileA
+ 52 stdcall CreateMetaFileW(wstr) CreateMetaFileW
+ 53 stdcall CreatePalette(ptr) CreatePalette
+ 54 stdcall CreatePatternBrush(long) CreatePatternBrush
+ 55 stdcall CreatePen(long long long) CreatePen
+ 56 stdcall CreatePenIndirect(ptr) CreatePenIndirect
+ 57 stdcall CreatePolyPolygonRgn(ptr ptr long long) CreatePolyPolygonRgn
+ 58 stdcall CreatePolygonRgn(ptr long long) CreatePolygonRgn
+ 59 stdcall CreateRectRgn(long long long long) CreateRectRgn
+ 60 stdcall CreateRectRgnIndirect(ptr) CreateRectRgnIndirect
+ 61 stdcall CreateRoundRectRgn(long long long long long long) CreateRoundRectRgn
+ 62 stdcall CreateScalableFontResourceA(long str str str) CreateScalableFontResourceA
+ 63 stdcall CreateScalableFontResourceW(long wstr wstr wstr) CreateScalableFontResourceW
+ 64 stdcall CreateSolidBrush(long) CreateSolidBrush
+ 65 stdcall DPtoLP(long ptr long) DPtoLP
  66 stub DeleteColorSpace
- 67 stdcall DeleteDC(long) DeleteDC32
+ 67 stdcall DeleteDC(long) DeleteDC
  68 stdcall DeleteEnhMetaFile(long) DeleteEnhMetaFile
- 69 stdcall DeleteMetaFile(long) DeleteMetaFile32
- 70 stdcall DeleteObject(long)	DeleteObject32
+ 69 stdcall DeleteMetaFile(long) DeleteMetaFile
+ 70 stdcall DeleteObject(long)	DeleteObject
  71 stdcall DescribePixelFormat(long long long ptr) DescribePixelFormat
  72 stub DeviceCapabilitiesExA
  73 stub DeviceCapabilitiesExW
  74 stdcall DrawEscape(long long long ptr) DrawEscape
- 75 stdcall Ellipse(long long long long long) Ellipse32
- 76 stdcall EndDoc(long) EndDoc32
- 77 stdcall EndPage(long) EndPage32
- 78 stdcall EndPath(long) EndPath32
- 79 stdcall EnumEnhMetaFile(long long ptr ptr ptr) EnumEnhMetaFile32
- 80 stdcall EnumFontFamiliesA(long str ptr long) EnumFontFamilies32A
- 81 stdcall EnumFontFamiliesExA(long str ptr long long) EnumFontFamiliesEx32A
- 82 stdcall EnumFontFamiliesExW(long wstr ptr long long) EnumFontFamiliesEx32W
- 83 stdcall EnumFontFamiliesW(long wstr ptr long) EnumFontFamilies32W
- 84 stdcall EnumFontsA(long str ptr long) EnumFonts32A
- 85 stdcall EnumFontsW(long wstr ptr long) EnumFonts32W
+ 75 stdcall Ellipse(long long long long long) Ellipse
+ 76 stdcall EndDoc(long) EndDoc
+ 77 stdcall EndPage(long) EndPage
+ 78 stdcall EndPath(long) EndPath
+ 79 stdcall EnumEnhMetaFile(long long ptr ptr ptr) EnumEnhMetaFile
+ 80 stdcall EnumFontFamiliesA(long str ptr long) EnumFontFamiliesA
+ 81 stdcall EnumFontFamiliesExA(long str ptr long long) EnumFontFamiliesExA
+ 82 stdcall EnumFontFamiliesExW(long wstr ptr long long) EnumFontFamiliesExW
+ 83 stdcall EnumFontFamiliesW(long wstr ptr long) EnumFontFamiliesW
+ 84 stdcall EnumFontsA(long str ptr long) EnumFontsA
+ 85 stdcall EnumFontsW(long wstr ptr long) EnumFontsW
  86 stub EnumICMProfilesA
  87 stub EnumICMProfilesW
- 88 stdcall EnumMetaFile(long long ptr ptr) EnumMetaFile32
- 89 stdcall EnumObjects(long long ptr long) EnumObjects32
- 90 stdcall EqualRgn(long long) EqualRgn32
- 91 stdcall Escape(long long long ptr ptr) Escape32
- 92 stdcall ExcludeClipRect(long long long long long) ExcludeClipRect32
- 93 stdcall ExtCreatePen(long long ptr long ptr) ExtCreatePen32
+ 88 stdcall EnumMetaFile(long long ptr ptr) EnumMetaFile
+ 89 stdcall EnumObjects(long long ptr long) EnumObjects
+ 90 stdcall EqualRgn(long long) EqualRgn
+ 91 stdcall Escape(long long long ptr ptr) Escape
+ 92 stdcall ExcludeClipRect(long long long long long) ExcludeClipRect
+ 93 stdcall ExtCreatePen(long long ptr long ptr) ExtCreatePen
  94 stdcall ExtCreateRegion(ptr long ptr) ExtCreateRegion
  95 stdcall ExtEscape(long long long ptr long ptr) ExtEscape
- 96 stdcall ExtFloodFill(long long long long long) ExtFloodFill32
+ 96 stdcall ExtFloodFill(long long long long long) ExtFloodFill
  97 stdcall ExtSelectClipRgn(long long long) ExtSelectClipRgn
- 98 stdcall ExtTextOutA(long long long long ptr str long ptr) ExtTextOut32A
- 99 stdcall ExtTextOutW(long long long long ptr wstr long ptr) ExtTextOut32W
-100 stdcall FillPath(long) FillPath32
-101 stdcall FillRgn(long long long) FillRgn32
+ 98 stdcall ExtTextOutA(long long long long ptr str long ptr) ExtTextOutA
+ 99 stdcall ExtTextOutW(long long long long ptr wstr long ptr) ExtTextOutW
+100 stdcall FillPath(long) FillPath
+101 stdcall FillRgn(long long long) FillRgn
 102 stdcall FixBrushOrgEx(long long long ptr) FixBrushOrgEx
-103 stdcall FlattenPath(long) FlattenPath32
-104 stdcall FloodFill(long long long long) FloodFill32
-105 stdcall FrameRgn(long long long long long) FrameRgn32
+103 stdcall FlattenPath(long) FlattenPath
+104 stdcall FloodFill(long long long long) FloodFill
+105 stdcall FrameRgn(long long long long long) FrameRgn
 106 stub FreeImageColorMatcher
 107 stub GdiAssociateObject
 108 stub GdiCleanCacheDC
@@ -143,179 +143,179 @@ init	MAIN_GdiInit
 138 stub GdiSetAttrs
 139 stdcall GdiSetBatchLimit(long) GdiSetBatchLimit
 140 stub GdiSetServerAttr
-141 stdcall GetArcDirection(long) GetArcDirection32
-142 stdcall GetAspectRatioFilterEx(long ptr) GetAspectRatioFilterEx32
-143 stdcall GetBitmapBits(long long ptr) GetBitmapBits32
-144 stdcall GetBitmapDimensionEx(long ptr) GetBitmapDimensionEx32
-145 stdcall GetBkColor(long) GetBkColor32
-146 stdcall GetBkMode(long) GetBkMode32
-147 stdcall GetBoundsRect(long ptr long) GetBoundsRect32
-148 stdcall GetBrushOrgEx(long ptr) GetBrushOrgEx32
-149 stdcall GetCharABCWidthsA(long long long ptr) GetCharABCWidths32A
-150 stdcall GetCharABCWidthsFloatA(long long long ptr) GetCharABCWidthsFloat32A
-151 stdcall GetCharABCWidthsFloatW(long long long ptr) GetCharABCWidthsFloat32W
-152 stdcall GetCharABCWidthsW(long long long ptr) GetCharABCWidths32W
+141 stdcall GetArcDirection(long) GetArcDirection
+142 stdcall GetAspectRatioFilterEx(long ptr) GetAspectRatioFilterEx
+143 stdcall GetBitmapBits(long long ptr) GetBitmapBits
+144 stdcall GetBitmapDimensionEx(long ptr) GetBitmapDimensionEx
+145 stdcall GetBkColor(long) GetBkColor
+146 stdcall GetBkMode(long) GetBkMode
+147 stdcall GetBoundsRect(long ptr long) GetBoundsRect
+148 stdcall GetBrushOrgEx(long ptr) GetBrushOrgEx
+149 stdcall GetCharABCWidthsA(long long long ptr) GetCharABCWidthsA
+150 stdcall GetCharABCWidthsFloatA(long long long ptr) GetCharABCWidthsFloatA
+151 stdcall GetCharABCWidthsFloatW(long long long ptr) GetCharABCWidthsFloatW
+152 stdcall GetCharABCWidthsW(long long long ptr) GetCharABCWidthsW
 153 stdcall GetCharWidth32A(long long long long) GetCharWidth32A
 154 stdcall GetCharWidth32W(long long long long) GetCharWidth32W
 155 stdcall GetCharWidthA(long long long long) GetCharWidth32A
-156 stdcall GetCharWidthFloatA(long long long ptr) GetCharWidthFloat32A
-157 stdcall GetCharWidthFloatW(long long long ptr) GetCharWidthFloat32W
+156 stdcall GetCharWidthFloatA(long long long ptr) GetCharWidthFloatA
+157 stdcall GetCharWidthFloatW(long long long ptr) GetCharWidthFloatW
 158 stdcall GetCharWidthW(long long long long) GetCharWidth32W
 159 stub GetCharWidthWOW
-160 stdcall GetCharacterPlacementA(long str long long ptr long) GetCharacterPlacement32A
-161 stdcall GetCharacterPlacementW(long wstr long long ptr long) GetCharacterPlacement32W
-162 stdcall GetClipBox(long ptr) GetClipBox32
-163 stdcall GetClipRgn(long long) GetClipRgn32
+160 stdcall GetCharacterPlacementA(long str long long ptr long) GetCharacterPlacementA
+161 stdcall GetCharacterPlacementW(long wstr long long ptr long) GetCharacterPlacementW
+162 stdcall GetClipBox(long ptr) GetClipBox
+163 stdcall GetClipRgn(long long) GetClipRgn
 164 stdcall GetColorAdjustment(long ptr) GetColorAdjustment
 165 stdcall GetColorSpace(long) GetColorSpace
 166 stdcall GetCurrentObject(long long) GetCurrentObject
-167 stdcall GetCurrentPositionEx(long ptr) GetCurrentPositionEx32
+167 stdcall GetCurrentPositionEx(long ptr) GetCurrentPositionEx
 168 stdcall GetDCOrgEx(long ptr) GetDCOrgEx
-169 stdcall GetDIBColorTable(long long long ptr) GetDIBColorTable32
-170 stdcall GetDIBits(long long long long ptr ptr long) GetDIBits32
-171 stdcall GetDeviceCaps(long long) GetDeviceCaps32
+169 stdcall GetDIBColorTable(long long long ptr) GetDIBColorTable
+170 stdcall GetDIBits(long long long long ptr ptr long) GetDIBits
+171 stdcall GetDeviceCaps(long long) GetDeviceCaps
 172 stub GetDeviceGammaRamp
 173 stub GetETM
-174 stdcall GetEnhMetaFileA(str) GetEnhMetaFile32A
+174 stdcall GetEnhMetaFileA(str) GetEnhMetaFileA
 175 stdcall GetEnhMetaFileBits(long long ptr) GetEnhMetaFileBits
-176 stdcall GetEnhMetaFileDescriptionA(long long ptr) GetEnhMetaFileDescription32A
-177 stdcall GetEnhMetaFileDescriptionW(long long ptr) GetEnhMetaFileDescription32W
+176 stdcall GetEnhMetaFileDescriptionA(long long ptr) GetEnhMetaFileDescriptionA
+177 stdcall GetEnhMetaFileDescriptionW(long long ptr) GetEnhMetaFileDescriptionW
 178 stdcall GetEnhMetaFileHeader(long long ptr) GetEnhMetaFileHeader
 179 stdcall GetEnhMetaFilePaletteEntries (long long ptr) GetEnhMetaFilePaletteEntries
-180 stdcall GetEnhMetaFileW(wstr) GetEnhMetaFile32W
-181 stdcall GetFontData(long long long ptr long) GetFontData32
-182 stdcall GetFontLanguageInfo(long) GetFontLanguageInfo32
+180 stdcall GetEnhMetaFileW(wstr) GetEnhMetaFileW
+181 stdcall GetFontData(long long long ptr long) GetFontData
+182 stdcall GetFontLanguageInfo(long) GetFontLanguageInfo
 183 stub GetFontResourceInfo
 184 stub GetFontResourceInfoW
 185 stub GetGlyphOutline
-186 stdcall GetGlyphOutlineA(long long long ptr long ptr ptr) GetGlyphOutline32A
-187 stdcall GetGlyphOutlineW(long long long ptr long ptr ptr) GetGlyphOutline32W
+186 stdcall GetGlyphOutlineA(long long long ptr long ptr ptr) GetGlyphOutlineA
+187 stdcall GetGlyphOutlineW(long long long ptr long ptr ptr) GetGlyphOutlineW
 188 stdcall GetGraphicsMode(long) GetGraphicsMode
 189 stub GetICMProfileA
 190 stub GetICMProfileW
 191 stub GetKerningPairs
-192 stdcall GetKerningPairsA(long long ptr) GetKerningPairs32A
-193 stdcall GetKerningPairsW(long long ptr) GetKerningPairs32W
+192 stdcall GetKerningPairsA(long long ptr) GetKerningPairsA
+193 stdcall GetKerningPairsW(long long ptr) GetKerningPairsW
 194 stub GetLogColorSpaceA
 195 stub GetLogColorSpaceW
-196 stdcall GetMapMode(long) GetMapMode32
-197 stdcall GetMetaFileA(str) GetMetaFile32A
+196 stdcall GetMapMode(long) GetMapMode
+197 stdcall GetMetaFileA(str) GetMetaFileA
 198 stdcall GetMetaFileBitsEx(long long ptr) GetMetaFileBitsEx
-199 stdcall GetMetaFileW(wstr) GetMetaFile32W
+199 stdcall GetMetaFileW(wstr) GetMetaFileW
 200 stub GetMetaRgn
 201 stdcall GetMiterLimit(long ptr) GetMiterLimit
-202 stdcall GetNearestColor(long long) GetNearestColor32
-203 stdcall GetNearestPaletteIndex(long long) GetNearestPaletteIndex32
-204 stdcall GetObjectA(long long ptr) GetObject32A
+202 stdcall GetNearestColor(long long) GetNearestColor
+203 stdcall GetNearestPaletteIndex(long long) GetNearestPaletteIndex
+204 stdcall GetObjectA(long long ptr) GetObjectA
 205 stdcall GetObjectType(long) GetObjectType
-206 stdcall GetObjectW(long long ptr) GetObject32W
-207 stdcall GetOutlineTextMetricsA(long long ptr) GetOutlineTextMetrics32A
-208 stdcall GetOutlineTextMetricsW(long long ptr) GetOutlineTextMetrics32W
-209 stdcall GetPaletteEntries(long long long ptr) GetPaletteEntries32
-210 stdcall GetPath(long ptr ptr long) GetPath32
-211 stdcall GetPixel(long long long) GetPixel32
+206 stdcall GetObjectW(long long ptr) GetObjectW
+207 stdcall GetOutlineTextMetricsA(long long ptr) GetOutlineTextMetricsA
+208 stdcall GetOutlineTextMetricsW(long long ptr) GetOutlineTextMetricsW
+209 stdcall GetPaletteEntries(long long long ptr) GetPaletteEntries
+210 stdcall GetPath(long ptr ptr long) GetPath
+211 stdcall GetPixel(long long long) GetPixel
 212 stdcall GetPixelFormat(long) GetPixelFormat
-213 stdcall GetPolyFillMode(long) GetPolyFillMode32
-214 stdcall GetROP2(long) GetROP232
+213 stdcall GetPolyFillMode(long) GetPolyFillMode
+214 stdcall GetROP2(long) GetROP2
 215 stdcall GetRandomRgn(long long long) GetRandomRgn
-216 stdcall GetRasterizerCaps(ptr long) GetRasterizerCaps32
-217 stdcall GetRegionData(long long ptr) GetRegionData32
-218 stdcall GetRelAbs(long) GetRelAbs32
-219 stdcall GetRgnBox(long ptr) GetRgnBox32
-220 stdcall GetStockObject(long) GetStockObject32
-221 stdcall GetStretchBltMode(long) GetStretchBltMode32
-222 stdcall GetSystemPaletteEntries(long long long ptr) GetSystemPaletteEntries32
-223 stdcall GetSystemPaletteUse(long) GetSystemPaletteUse32
-224 stdcall GetTextAlign(long) GetTextAlign32
-225 stdcall GetTextCharacterExtra(long) GetTextCharacterExtra32
-226 stdcall GetTextCharset(long) GetTextCharset32
-227 stdcall GetTextColor(long) GetTextColor32
-228 stdcall GetTextExtentExPointA(long str long long ptr ptr ptr) GetTextExtentExPoint32A
-229 stdcall GetTextExtentExPointW(long wstr long long ptr ptr ptr) GetTextExtentExPoint32W
+216 stdcall GetRasterizerCaps(ptr long) GetRasterizerCaps
+217 stdcall GetRegionData(long long ptr) GetRegionData
+218 stdcall GetRelAbs(long) GetRelAbs
+219 stdcall GetRgnBox(long ptr) GetRgnBox
+220 stdcall GetStockObject(long) GetStockObject
+221 stdcall GetStretchBltMode(long) GetStretchBltMode
+222 stdcall GetSystemPaletteEntries(long long long ptr) GetSystemPaletteEntries
+223 stdcall GetSystemPaletteUse(long) GetSystemPaletteUse
+224 stdcall GetTextAlign(long) GetTextAlign
+225 stdcall GetTextCharacterExtra(long) GetTextCharacterExtra
+226 stdcall GetTextCharset(long) GetTextCharset
+227 stdcall GetTextColor(long) GetTextColor
+228 stdcall GetTextExtentExPointA(long str long long ptr ptr ptr) GetTextExtentExPointA
+229 stdcall GetTextExtentExPointW(long wstr long long ptr ptr ptr) GetTextExtentExPointW
 230 stdcall GetTextExtentPoint32A(long ptr long ptr) GetTextExtentPoint32A
 231 stdcall GetTextExtentPoint32W(long ptr long ptr) GetTextExtentPoint32W
-232 stdcall GetTextExtentPointA(long ptr long ptr) GetTextExtentPoint32ABuggy
-233 stdcall GetTextExtentPointW(long ptr long ptr) GetTextExtentPoint32WBuggy
-234 stdcall GetTextFaceA(long long ptr) GetTextFace32A
-235 stdcall GetTextFaceW(long long ptr) GetTextFace32W
-236 stdcall GetTextMetricsA(long ptr) GetTextMetrics32A
-237 stdcall GetTextMetricsW(long ptr) GetTextMetrics32W
+232 stdcall GetTextExtentPointA(long ptr long ptr) GetTextExtentPointA
+233 stdcall GetTextExtentPointW(long ptr long ptr) GetTextExtentPointW
+234 stdcall GetTextFaceA(long long ptr) GetTextFaceA
+235 stdcall GetTextFaceW(long long ptr) GetTextFaceW
+236 stdcall GetTextMetricsA(long ptr) GetTextMetricsA
+237 stdcall GetTextMetricsW(long ptr) GetTextMetricsW
 238 stub GetTransform
-239 stdcall GetViewportExtEx(long ptr) GetViewportExtEx32
-240 stdcall GetViewportOrgEx(long ptr) GetViewportOrgEx32
+239 stdcall GetViewportExtEx(long ptr) GetViewportExtEx
+240 stdcall GetViewportOrgEx(long ptr) GetViewportOrgEx
 241 stdcall GetWinMetaFileBits(long long ptr long long) GetWinMetaFileBits
-242 stdcall GetWindowExtEx(long ptr) GetWindowExtEx32
-243 stdcall GetWindowOrgEx(long ptr) GetWindowOrgEx32
+242 stdcall GetWindowExtEx(long ptr) GetWindowExtEx
+243 stdcall GetWindowOrgEx(long ptr) GetWindowOrgEx
 244 stdcall GetWorldTransform(long ptr) GetWorldTransform
-245 stdcall IntersectClipRect(long long long long long) IntersectClipRect32
-246 stdcall InvertRgn(long long) InvertRgn32
-247 stdcall LPtoDP(long ptr long) LPtoDP32
-248 stdcall LineDDA(long long long long ptr long) LineDDA32
-249 stdcall LineTo(long long long) LineTo32
+245 stdcall IntersectClipRect(long long long long long) IntersectClipRect
+246 stdcall InvertRgn(long long) InvertRgn
+247 stdcall LPtoDP(long ptr long) LPtoDP
+248 stdcall LineDDA(long long long long ptr long) LineDDA
+249 stdcall LineTo(long long long) LineTo
 250 stub LoadImageColorMatcherA
 251 stub LoadImageColorMatcherW
-252 stdcall MaskBlt(long long long long long long long long long long long long) MaskBlt32
+252 stdcall MaskBlt(long long long long long long long long long long long long) MaskBlt
 253 stdcall ModifyWorldTransform(long ptr long) ModifyWorldTransform
-254 stdcall MoveToEx(long long long ptr) MoveToEx32
-255 stdcall OffsetClipRgn(long long long) OffsetClipRgn32
-256 stdcall OffsetRgn(long long long) OffsetRgn32
-257 stdcall OffsetViewportOrgEx(long long long ptr) OffsetViewportOrgEx32
-258 stdcall OffsetWindowOrgEx(long long long ptr) OffsetWindowOrgEx32
-259 stdcall PaintRgn(long long) PaintRgn32
-260 stdcall PatBlt(long long long long long long) PatBlt32
-261 stdcall PathToRegion(long) PathToRegion32
-262 stdcall Pie(long long long long long long long long long) Pie32
+254 stdcall MoveToEx(long long long ptr) MoveToEx
+255 stdcall OffsetClipRgn(long long long) OffsetClipRgn
+256 stdcall OffsetRgn(long long long) OffsetRgn
+257 stdcall OffsetViewportOrgEx(long long long ptr) OffsetViewportOrgEx
+258 stdcall OffsetWindowOrgEx(long long long ptr) OffsetWindowOrgEx
+259 stdcall PaintRgn(long long) PaintRgn
+260 stdcall PatBlt(long long long long long long) PatBlt
+261 stdcall PathToRegion(long) PathToRegion
+262 stdcall Pie(long long long long long long long long long) Pie
 263 stdcall PlayEnhMetaFile(long long ptr) PlayEnhMetaFile
 264 stdcall PlayEnhMetaFileRecord(long ptr ptr long) PlayEnhMetaFileRecord
-265 stdcall PlayMetaFile(long long) PlayMetaFile32
-266 stdcall PlayMetaFileRecord(long ptr ptr long) PlayMetaFileRecord32
-267 stdcall PlgBlt(long ptr long long long long long long long long) PlgBlt32
-268 stdcall PolyBezier(long ptr long) PolyBezier32
-269 stdcall PolyBezierTo(long ptr long) PolyBezierTo32
+265 stdcall PlayMetaFile(long long) PlayMetaFile
+266 stdcall PlayMetaFileRecord(long ptr ptr long) PlayMetaFileRecord
+267 stdcall PlgBlt(long ptr long long long long long long long long) PlgBlt
+268 stdcall PolyBezier(long ptr long) PolyBezier
+269 stdcall PolyBezierTo(long ptr long) PolyBezierTo
 270 stdcall PolyDraw(long ptr ptr long) PolyDraw
-271 stdcall PolyPolygon(long ptr ptr long) PolyPolygon32
+271 stdcall PolyPolygon(long ptr ptr long) PolyPolygon
 272 stdcall PolyPolyline(long ptr ptr long) PolyPolyline
 273 stub PolyTextOutA
 274 stub PolyTextOutW
-275 stdcall Polygon(long ptr long) Polygon32
-276 stdcall Polyline(long ptr long) Polyline32
-277 stdcall PolylineTo(long ptr long) PolylineTo32
-278 stdcall PtInRegion(long long long) PtInRegion32
-279 stdcall PtVisible(long long long) PtVisible32
-280 stdcall RealizePalette(long) RealizePalette32
-281 stdcall RectInRegion(long ptr) RectInRegion32
-282 stdcall RectVisible(long ptr) RectVisible32
-283 stdcall Rectangle(long long long long long) Rectangle32
-284 stdcall RemoveFontResourceA(str) RemoveFontResource32A
+275 stdcall Polygon(long ptr long) Polygon
+276 stdcall Polyline(long ptr long) Polyline
+277 stdcall PolylineTo(long ptr long) PolylineTo
+278 stdcall PtInRegion(long long long) PtInRegion
+279 stdcall PtVisible(long long long) PtVisible
+280 stdcall RealizePalette(long) RealizePalette
+281 stdcall RectInRegion(long ptr) RectInRegion
+282 stdcall RectVisible(long ptr) RectVisible
+283 stdcall Rectangle(long long long long long) Rectangle
+284 stdcall RemoveFontResourceA(str) RemoveFontResourceA
 285 stub RemoveFontResourceTracking
-286 stdcall RemoveFontResourceW(wstr) RemoveFontResource32W
-287 stdcall ResetDCA(long ptr) ResetDC32A
-288 stdcall ResetDCW(long ptr) ResetDC32W
-289 stdcall ResizePalette(long long) ResizePalette32
-290 stdcall RestoreDC(long long) RestoreDC32
-291 stdcall RoundRect(long long long long long long long) RoundRect32
-292 stdcall SaveDC(long) SaveDC32
-293 stdcall ScaleViewportExtEx(long long long long long ptr) ScaleViewportExtEx32
-294 stdcall ScaleWindowExtEx(long long long long long ptr) ScaleWindowExtEx32
+286 stdcall RemoveFontResourceW(wstr) RemoveFontResourceW
+287 stdcall ResetDCA(long ptr) ResetDCA
+288 stdcall ResetDCW(long ptr) ResetDCW
+289 stdcall ResizePalette(long long) ResizePalette
+290 stdcall RestoreDC(long long) RestoreDC
+291 stdcall RoundRect(long long long long long long long) RoundRect
+292 stdcall SaveDC(long) SaveDC
+293 stdcall ScaleViewportExtEx(long long long long long ptr) ScaleViewportExtEx
+294 stdcall ScaleWindowExtEx(long long long long long ptr) ScaleWindowExtEx
 295 stub SelectBrushLocal
-296 stdcall SelectClipPath(long long) SelectClipPath32
-297 stdcall SelectClipRgn(long long) SelectClipRgn32
+296 stdcall SelectClipPath(long long) SelectClipPath
+297 stdcall SelectClipRgn(long long) SelectClipRgn
 298 stub SelectFontLocal
-299 stdcall SelectObject(long long) SelectObject32
-300 stdcall SelectPalette(long long long) SelectPalette32
-301 stdcall SetAbortProc(long ptr) SetAbortProc32
-302 stdcall SetArcDirection(long long) SetArcDirection32
-303 stdcall SetBitmapBits(long long ptr) SetBitmapBits32
-304 stdcall SetBitmapDimensionEx(long long long ptr) SetBitmapDimensionEx32
-305 stdcall SetBkColor(long long) SetBkColor32
-306 stdcall SetBkMode(long long) SetBkMode32
-307 stdcall SetBoundsRect(long ptr long) SetBoundsRect32
+299 stdcall SelectObject(long long) SelectObject
+300 stdcall SelectPalette(long long long) SelectPalette
+301 stdcall SetAbortProc(long ptr) SetAbortProc
+302 stdcall SetArcDirection(long long) SetArcDirection
+303 stdcall SetBitmapBits(long long ptr) SetBitmapBits
+304 stdcall SetBitmapDimensionEx(long long long ptr) SetBitmapDimensionEx
+305 stdcall SetBkColor(long long) SetBkColor
+306 stdcall SetBkMode(long long) SetBkMode
+307 stdcall SetBoundsRect(long ptr long) SetBoundsRect
 308 stdcall SetBrushOrgEx(long long long ptr) SetBrushOrgEx
-309 stdcall SetColorAdjustment(long ptr) SetColorAdjustment32
+309 stdcall SetColorAdjustment(long ptr) SetColorAdjustment
 310 stub SetColorSpace
-311 stdcall SetDIBColorTable(long long long ptr) SetDIBColorTable32
-312 stdcall SetDIBits(long long long long ptr ptr long) SetDIBits32
-313 stdcall SetDIBitsToDevice(long long long long long long long long long ptr ptr long) SetDIBitsToDevice32
+311 stdcall SetDIBColorTable(long long long ptr) SetDIBColorTable
+312 stdcall SetDIBits(long long long long ptr ptr long) SetDIBits
+313 stdcall SetDIBitsToDevice(long long long long long long long long long ptr ptr long) SetDIBitsToDevice
 314 stub SetDeviceGammaRamp
 315 stdcall SetEnhMetaFileBits(long ptr) SetEnhMetaFileBits
 316 stub SetFontEnumeration
@@ -323,46 +323,46 @@ init	MAIN_GdiInit
 318 stdcall SetICMMode(long long) SetICMMode
 319 stub SetICMProfileA
 320 stub SetICMProfileW
-321 stdcall SetMapMode(long long) SetMapMode32
-322 stdcall SetMapperFlags(long long) SetMapperFlags32
+321 stdcall SetMapMode(long long) SetMapMode
+322 stdcall SetMapperFlags(long long) SetMapperFlags
 323 stdcall SetMetaFileBitsEx(long ptr) SetMetaFileBitsEx
 324 stub SetMetaRgn
 325 stdcall SetMiterLimit(long long ptr) SetMiterLimit
-326 stdcall SetPaletteEntries(long long long ptr) SetPaletteEntries32
-327 stdcall SetPixel(long long long long) SetPixel32
+326 stdcall SetPaletteEntries(long long long ptr) SetPaletteEntries
+327 stdcall SetPixel(long long long long) SetPixel
 328 stdcall SetPixelFormat(long long ptr) SetPixelFormat
-329 stdcall SetPixelV(long long long long) SetPixelV32
-330 stdcall SetPolyFillMode(long long) SetPolyFillMode32
-331 stdcall SetROP2(long long) SetROP232
-332 stdcall SetRectRgn(long long long long long) SetRectRgn32
-333 stdcall SetRelAbs(long long) SetRelAbs32
-334 stdcall SetStretchBltMode(long long) SetStretchBltMode32
-335 stdcall SetSystemPaletteUse(long long) SetSystemPaletteUse32
-336 stdcall SetTextAlign(long long) SetTextAlign32
-337 stdcall SetTextCharacterExtra(long long) SetTextCharacterExtra32
-338 stdcall SetTextColor(long long) SetTextColor32
-339 stdcall SetTextJustification(long long long) SetTextJustification32
-340 stdcall SetViewportExtEx(long long long ptr) SetViewportExtEx32
-341 stdcall SetViewportOrgEx(long long long ptr) SetViewportOrgEx32
+329 stdcall SetPixelV(long long long long) SetPixelV
+330 stdcall SetPolyFillMode(long long) SetPolyFillMode
+331 stdcall SetROP2(long long) SetROP2
+332 stdcall SetRectRgn(long long long long long) SetRectRgn
+333 stdcall SetRelAbs(long long) SetRelAbs
+334 stdcall SetStretchBltMode(long long) SetStretchBltMode
+335 stdcall SetSystemPaletteUse(long long) SetSystemPaletteUse
+336 stdcall SetTextAlign(long long) SetTextAlign
+337 stdcall SetTextCharacterExtra(long long) SetTextCharacterExtra
+338 stdcall SetTextColor(long long) SetTextColor
+339 stdcall SetTextJustification(long long long) SetTextJustification
+340 stdcall SetViewportExtEx(long long long ptr) SetViewportExtEx
+341 stdcall SetViewportOrgEx(long long long ptr) SetViewportOrgEx
 342 stub SetVirtualResolution
 343 stdcall SetWinMetaFileBits(long ptr long ptr) SetWinMetaFileBits
-344 stdcall SetWindowExtEx(long long long ptr) SetWindowExtEx32
-345 stdcall SetWindowOrgEx(long long long ptr) SetWindowOrgEx32
+344 stdcall SetWindowExtEx(long long long ptr) SetWindowExtEx
+345 stdcall SetWindowOrgEx(long long long ptr) SetWindowOrgEx
 346 stdcall SetWorldTransform(long ptr) SetWorldTransform
-347 stdcall StartDocA(long ptr) StartDoc32A
-348 stdcall StartDocW(long ptr) StartDoc32W
-349 stdcall StartPage(long) StartPage32 
-350 stdcall StretchBlt(long long long long long long long long long long long) StretchBlt32
-351 stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) StretchDIBits32
-352 stdcall StrokeAndFillPath(long) StrokeAndFillPath32
-353 stdcall StrokePath(long) StrokePath32
+347 stdcall StartDocA(long ptr) StartDocA
+348 stdcall StartDocW(long ptr) StartDocW
+349 stdcall StartPage(long) StartPage 
+350 stdcall StretchBlt(long long long long long long long long long long long) StretchBlt
+351 stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) StretchDIBits
+352 stdcall StrokeAndFillPath(long) StrokeAndFillPath
+353 stdcall StrokePath(long) StrokePath
 354 stdcall SwapBuffers(long) SwapBuffers
-355 stdcall TextOutA(long long long str long) TextOut32A
-356 stdcall TextOutW(long long long wstr long) TextOut32W
+355 stdcall TextOutA(long long long str long) TextOutA
+356 stdcall TextOutW(long long long wstr long) TextOutW
 357 stub UnloadNetworkFonts
-358 stdcall UnrealizeObject(long) UnrealizeObject32
-359 stdcall UpdateColors(long) UpdateColors32
-360 stdcall WidenPath(long) WidenPath32
+358 stdcall UnrealizeObject(long) UnrealizeObject
+359 stdcall UpdateColors(long) UpdateColors
+360 stdcall WidenPath(long) WidenPath
 361 stub pstackConnect
 #late additions
 362 stub DeviceCapabilitiesEx
@@ -389,7 +389,7 @@ init	MAIN_GdiInit
 383 stub UpdateICMRegKeyA
 384 stub UpdateICMRegKeyW
 385 stub gdiPlaySpoolStream
-386 stdcall SetObjectOwner(long long) SetObjectOwner32
+386 stdcall SetObjectOwner(long long) SetObjectOwner
 387 stub UpdateICMRegKey
 388 extern pfnRealizePalette pfnRealizePalette
 389 extern pfnSelectPalette pfnSelectPalette
diff --git a/relay32/imagehlp.spec b/relay32/imagehlp.spec
index f364be5f6e4..ee6e1a2ab73 100644
--- a/relay32/imagehlp.spec
+++ b/relay32/imagehlp.spec
@@ -2,63 +2,63 @@ name	imagehlp
 type	win32
 init	IMAGEHLP_LibMain
 
-  1 stdcall BindImage(str str str) BindImage32
-  2 stdcall BindImageEx(long str str str ptr) BindImageEx32
-  3 stdcall CheckSumMappedFile(ptr long ptr ptr) CheckSumMappedFile32
-  4 stdcall EnumerateLoadedModules(long ptr ptr) EnumerateLoadedModules32
-  5 stdcall FindDebugInfoFile(str str str) FindDebugInfoFile32
-  6 stdcall FindExecutableImage(str str str) FindExecutableImage32
-  7 stdcall GetImageConfigInformation(ptr ptr) GetImageConfigInformation32
-  8 stdcall GetImageUnusedHeaderBytes(ptr ptr) GetImageUnusedHeaderBytes32
-  9 stdcall GetTimestampForLoadedLibrary(long) GetTimestampForLoadedLibrary32
- 10 stdcall ImageAddCertificate(long ptr ptr) ImageAddCertificate32
- 11 stdcall ImageDirectoryEntryToData(ptr long long ptr) ImageDirectoryEntryToData32
- 12 stdcall ImageEnumerateCertificates(long long ptr ptr long) ImageEnumerateCertificates32
- 13 stdcall ImageGetCertificateData(long long ptr ptr) ImageGetCertificateData32
- 14 stdcall ImageGetCertificateHeader(long long ptr) ImageGetCertificateHeader32
- 15 stdcall ImageGetDigestStream(long long ptr long) ImageGetDigestStream32
- 16 stdcall ImageLoad(str str) ImageLoad32
- 17 stdcall ImageNtHeader(ptr) ImageNtHeader32
- 18 stdcall ImageRemoveCertificate(long long) ImageRemoveCertificate32
- 19 stdcall ImageRvaToSection(ptr ptr long) ImageRvaToSection32
- 20 stdcall ImageRvaToVa(ptr ptr long ptr) ImageRvaToVa32
- 21 stdcall ImageUnload(ptr) ImageUnload32
- 22 stdcall ImagehlpApiVersion() ImagehlpApiVersion32
- 23 stdcall ImagehlpApiVersionEx(ptr) ImagehlpApiVersionEx32
- 24 stdcall MakeSureDirectoryPathExists(str) MakeSureDirectoryPathExists32
- 25 stdcall MapAndLoad(str str ptr long long) MapAndLoad32
- 26 stdcall MapDebugInformation(long str str long) MapDebugInformation32
- 27 stdcall MapFileAndCheckSumA(str ptr ptr) MapFileAndCheckSum32A
- 28 stdcall MapFileAndCheckSumW(wstr ptr ptr) MapFileAndCheckSum32W
+  1 stdcall BindImage(str str str) BindImage
+  2 stdcall BindImageEx(long str str str ptr) BindImageEx
+  3 stdcall CheckSumMappedFile(ptr long ptr ptr) CheckSumMappedFile
+  4 stdcall EnumerateLoadedModules(long ptr ptr) EnumerateLoadedModules
+  5 stdcall FindDebugInfoFile(str str str) FindDebugInfoFile
+  6 stdcall FindExecutableImage(str str str) FindExecutableImage
+  7 stdcall GetImageConfigInformation(ptr ptr) GetImageConfigInformation
+  8 stdcall GetImageUnusedHeaderBytes(ptr ptr) GetImageUnusedHeaderBytes
+  9 stdcall GetTimestampForLoadedLibrary(long) GetTimestampForLoadedLibrary
+ 10 stdcall ImageAddCertificate(long ptr ptr) ImageAddCertificate
+ 11 stdcall ImageDirectoryEntryToData(ptr long long ptr) ImageDirectoryEntryToData
+ 12 stdcall ImageEnumerateCertificates(long long ptr ptr long) ImageEnumerateCertificates
+ 13 stdcall ImageGetCertificateData(long long ptr ptr) ImageGetCertificateData
+ 14 stdcall ImageGetCertificateHeader(long long ptr) ImageGetCertificateHeader
+ 15 stdcall ImageGetDigestStream(long long ptr long) ImageGetDigestStream
+ 16 stdcall ImageLoad(str str) ImageLoad
+ 17 stdcall ImageNtHeader(ptr) ImageNtHeader
+ 18 stdcall ImageRemoveCertificate(long long) ImageRemoveCertificate
+ 19 stdcall ImageRvaToSection(ptr ptr long) ImageRvaToSection
+ 20 stdcall ImageRvaToVa(ptr ptr long ptr) ImageRvaToVa
+ 21 stdcall ImageUnload(ptr) ImageUnload
+ 22 stdcall ImagehlpApiVersion() ImagehlpApiVersion
+ 23 stdcall ImagehlpApiVersionEx(ptr) ImagehlpApiVersionEx
+ 24 stdcall MakeSureDirectoryPathExists(str) MakeSureDirectoryPathExists
+ 25 stdcall MapAndLoad(str str ptr long long) MapAndLoad
+ 26 stdcall MapDebugInformation(long str str long) MapDebugInformation
+ 27 stdcall MapFileAndCheckSumA(str ptr ptr) MapFileAndCheckSumA
+ 28 stdcall MapFileAndCheckSumW(wstr ptr ptr) MapFileAndCheckSumW
  29 stub  MarkImageAsRunFromSwap
- 30 stdcall ReBaseImage(str str long long long long ptr ptr ptr ptr long) ReBaseImage32
- 31 stdcall RemovePrivateCvSymbolic(ptr ptr ptr) RemovePrivateCvSymbolic32
- 32 stdcall RemoveRelocations(ptr) RemoveRelocations32
- 33 stdcall SearchTreeForFile(str str str) SearchTreeForFile32
- 34 stdcall SetImageConfigInformation(ptr ptr) SetImageConfigInformation32
- 35 stdcall SplitSymbols(str str str long) SplitSymbols32
- 36 stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) StackWalk32
- 37 stdcall SymCleanup(long) SymCleanup32
- 38 stdcall SymEnumerateModules(long ptr ptr) SymEnumerateModules32
- 39 stdcall SymEnumerateSymbols(long long ptr ptr) SymEnumerateSymbols32
- 40 stdcall SymFunctionTableAccess(long long) SymFunctionTableAccess32
- 41 stdcall SymGetModuleBase(long long) SymGetModuleBase32
- 42 stdcall SymGetModuleInfo(long long ptr) SymGetModuleInfo32
- 43 stdcall SymGetOptions() SymGetOptions32
- 44 stdcall SymGetSearchPath(long str long) SymGetSearchPath32
- 45 stdcall SymGetSymFromAddr(long long ptr ptr) SymGetSymFromAddr32
- 46 stdcall SymGetSymFromName(long str ptr) SymGetSymFromName32
- 47 stdcall SymGetSymNext(long ptr) SymGetSymNext32
- 48 stdcall SymGetSymPrev(long ptr) SymGetSymPrev32
- 49 stdcall SymInitialize(long str long) SymInitialize32
- 50 stdcall SymLoadModule(long long str str long long) SymLoadModule32
- 51 stdcall SymRegisterCallback(long ptr ptr) SymRegisterCallback32
- 52 stdcall SymSetOptions(long) SymSetOptions32
- 53 stdcall SymSetSearchPath(long str) SymSetSearchPath32
- 54 stdcall SymUnDName(ptr str long) SymUnDName32
- 55 stdcall SymUnloadModule(long long) SymUnloadModule32
- 56 stdcall TouchFileTimes(long ptr) TouchFileTimes32
- 57 stdcall UnDecorateSymbolName(str str long long) UnDecorateSymbolName32
- 58 stdcall UnMapAndLoad(ptr) UnMapAndLoad32
- 59 stdcall UnmapDebugInformation(ptr) UnmapDebugInformation32
- 60 stdcall UpdateDebugInfoFile(str str str ptr) UpdateDebugInfoFile32
+ 30 stdcall ReBaseImage(str str long long long long ptr ptr ptr ptr long) ReBaseImage
+ 31 stdcall RemovePrivateCvSymbolic(ptr ptr ptr) RemovePrivateCvSymbolic
+ 32 stdcall RemoveRelocations(ptr) RemoveRelocations
+ 33 stdcall SearchTreeForFile(str str str) SearchTreeForFile
+ 34 stdcall SetImageConfigInformation(ptr ptr) SetImageConfigInformation
+ 35 stdcall SplitSymbols(str str str long) SplitSymbols
+ 36 stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) StackWalk
+ 37 stdcall SymCleanup(long) SymCleanup
+ 38 stdcall SymEnumerateModules(long ptr ptr) SymEnumerateModules
+ 39 stdcall SymEnumerateSymbols(long long ptr ptr) SymEnumerateSymbols
+ 40 stdcall SymFunctionTableAccess(long long) SymFunctionTableAccess
+ 41 stdcall SymGetModuleBase(long long) SymGetModuleBase
+ 42 stdcall SymGetModuleInfo(long long ptr) SymGetModuleInfo
+ 43 stdcall SymGetOptions() SymGetOptions
+ 44 stdcall SymGetSearchPath(long str long) SymGetSearchPath
+ 45 stdcall SymGetSymFromAddr(long long ptr ptr) SymGetSymFromAddr
+ 46 stdcall SymGetSymFromName(long str ptr) SymGetSymFromName
+ 47 stdcall SymGetSymNext(long ptr) SymGetSymNext
+ 48 stdcall SymGetSymPrev(long ptr) SymGetSymPrev
+ 49 stdcall SymInitialize(long str long) SymInitialize
+ 50 stdcall SymLoadModule(long long str str long long) SymLoadModule
+ 51 stdcall SymRegisterCallback(long ptr ptr) SymRegisterCallback
+ 52 stdcall SymSetOptions(long) SymSetOptions
+ 53 stdcall SymSetSearchPath(long str) SymSetSearchPath
+ 54 stdcall SymUnDName(ptr str long) SymUnDName
+ 55 stdcall SymUnloadModule(long long) SymUnloadModule
+ 56 stdcall TouchFileTimes(long ptr) TouchFileTimes
+ 57 stdcall UnDecorateSymbolName(str str long long) UnDecorateSymbolName
+ 58 stdcall UnMapAndLoad(ptr) UnMapAndLoad
+ 59 stdcall UnmapDebugInformation(ptr) UnmapDebugInformation
+ 60 stdcall UpdateDebugInfoFile(str str str ptr) UpdateDebugInfoFile
diff --git a/relay32/imm32.spec b/relay32/imm32.spec
index f85fb830616..e69a6e2c620 100644
--- a/relay32/imm32.spec
+++ b/relay32/imm32.spec
@@ -1,75 +1,75 @@
 name	imm32
 type	win32
 
-  1 stdcall ImmAssociateContext(long long) ImmAssociateContext32
-  2 stdcall ImmConfigureIMEA(long long long ptr) ImmConfigureIME32A
-  3 stdcall ImmConfigureIMEW(long long long ptr) ImmConfigureIME32W
-  4 stdcall ImmCreateContext() ImmCreateContext32
+  1 stdcall ImmAssociateContext(long long) ImmAssociateContext
+  2 stdcall ImmConfigureIMEA(long long long ptr) ImmConfigureIMEA
+  3 stdcall ImmConfigureIMEW(long long long ptr) ImmConfigureIMEW
+  4 stdcall ImmCreateContext() ImmCreateContext
   5 stub ImmCreateIMCC
   6 stub ImmCreateSoftKeyboard
-  7 stdcall ImmDestroyContext(long) ImmDestroyContext32
+  7 stdcall ImmDestroyContext(long) ImmDestroyContext
   8 stub ImmDestroyIMCC
   9 stub ImmDestroySoftKeyboard
- 10 stdcall ImmEnumRegisterWordA(long ptr str long str ptr) ImmEnumRegisterWord32A
- 11 stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) ImmEnumRegisterWord32W
- 12 stdcall ImmEscapeA(long long long ptr) ImmEscape32A
- 13 stdcall ImmEscapeW(long long long ptr) ImmEscape32W
+ 10 stdcall ImmEnumRegisterWordA(long ptr str long str ptr) ImmEnumRegisterWordA
+ 11 stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) ImmEnumRegisterWordW
+ 12 stdcall ImmEscapeA(long long long ptr) ImmEscapeA
+ 13 stdcall ImmEscapeW(long long long ptr) ImmEscapeW
  14 stub ImmGenerateMessage
- 15 stdcall ImmGetCandidateListA(long long ptr long) ImmGetCandidateList32A
- 16 stdcall ImmGetCandidateListCountA(long ptr) ImmGetCandidateListCount32A
- 17 stdcall ImmGetCandidateListCountW(long ptr) ImmGetCandidateListCount32W
- 18 stdcall ImmGetCandidateListW(long long ptr long) ImmGetCandidateList32W
- 19 stdcall ImmGetCandidateWindow(long long ptr) ImmGetCandidateWindow32
- 20 stdcall ImmGetCompositionFontA(long ptr) ImmGetCompositionFont32A
- 21 stdcall ImmGetCompositionFontW(long ptr) ImmGetCompositionFont32W
- 22 stdcall ImmGetCompositionStringA (long long ptr long) ImmGetCompositionString32A
- 23 stdcall ImmGetCompositionStringW (long long ptr long) ImmGetCompositionString32W
- 24 stdcall ImmGetCompositionWindow(long ptr) ImmGetCompositionWindow32
- 25 stdcall ImmGetContext(long) ImmGetContext32
- 26 stdcall ImmGetConversionListA(long long str ptr long long) ImmGetConversionList32A
- 27 stdcall ImmGetConversionListW(long long wstr ptr long long) ImmGetConversionList32W
- 28 stdcall ImmGetConversionStatus(long ptr ptr) ImmGetConversionStatus32
- 29 stdcall ImmGetDefaultIMEWnd(long) ImmGetDefaultIMEWnd32
- 30 stdcall ImmGetDescriptionA(long str long) ImmGetDescription32A
- 31 stdcall ImmGetDescriptionW(long wstr long) ImmGetDescription32W
- 32 stdcall ImmGetGuideLineA(long long str long) ImmGetGuideLine32A
- 33 stdcall ImmGetGuideLineW(long long wstr long) ImmGetGuideLine32W
+ 15 stdcall ImmGetCandidateListA(long long ptr long) ImmGetCandidateListA
+ 16 stdcall ImmGetCandidateListCountA(long ptr) ImmGetCandidateListCountA
+ 17 stdcall ImmGetCandidateListCountW(long ptr) ImmGetCandidateListCountW
+ 18 stdcall ImmGetCandidateListW(long long ptr long) ImmGetCandidateListW
+ 19 stdcall ImmGetCandidateWindow(long long ptr) ImmGetCandidateWindow
+ 20 stdcall ImmGetCompositionFontA(long ptr) ImmGetCompositionFontA
+ 21 stdcall ImmGetCompositionFontW(long ptr) ImmGetCompositionFontW
+ 22 stdcall ImmGetCompositionStringA (long long ptr long) ImmGetCompositionStringA
+ 23 stdcall ImmGetCompositionStringW (long long ptr long) ImmGetCompositionStringW
+ 24 stdcall ImmGetCompositionWindow(long ptr) ImmGetCompositionWindow
+ 25 stdcall ImmGetContext(long) ImmGetContext
+ 26 stdcall ImmGetConversionListA(long long str ptr long long) ImmGetConversionListA
+ 27 stdcall ImmGetConversionListW(long long wstr ptr long long) ImmGetConversionListW
+ 28 stdcall ImmGetConversionStatus(long ptr ptr) ImmGetConversionStatus
+ 29 stdcall ImmGetDefaultIMEWnd(long) ImmGetDefaultIMEWnd
+ 30 stdcall ImmGetDescriptionA(long str long) ImmGetDescriptionA
+ 31 stdcall ImmGetDescriptionW(long wstr long) ImmGetDescriptionW
+ 32 stdcall ImmGetGuideLineA(long long str long) ImmGetGuideLineA
+ 33 stdcall ImmGetGuideLineW(long long wstr long) ImmGetGuideLineW
  34 stub ImmGetHotKey
  35 stub ImmGetIMCCLockCount
  36 stub ImmGetIMCCSize
  37 stub ImmGetIMCLockCount
- 38 stdcall ImmGetIMEFileNameA(long str long) ImmGetIMEFileName32A
- 39 stdcall ImmGetIMEFileNameW(long wstr long) ImmGetIMEFileName32W
- 40 stdcall ImmGetOpenStatus(long) ImmGetOpenStatus32
- 41 stdcall ImmGetProperty(long long) ImmGetProperty32
- 42 stdcall ImmGetRegisterWordStyleA(long long ptr) ImmGetRegisterWordStyle32A
- 43 stdcall ImmGetRegisterWordStyleW(long long ptr) ImmGetRegisterWordStyle32W
- 44 stdcall ImmGetStatusWindowPos(long ptr) ImmGetStatusWindowPos32
- 45 stdcall ImmGetVirtualKey(long) ImmGetVirtualKey32
- 46 stdcall ImmInstallIMEA(str str) ImmInstallIME32A
- 47 stdcall ImmInstallIMEW(wstr wstr) ImmInstallIME32W
- 48 stdcall ImmIsIME(long) ImmIsIME32
- 49 stdcall ImmIsUIMessageA(long long long long) ImmIsUIMessage32A
- 50 stdcall ImmIsUIMessageW(long long long long) ImmIsUIMessage32W
+ 38 stdcall ImmGetIMEFileNameA(long str long) ImmGetIMEFileNameA
+ 39 stdcall ImmGetIMEFileNameW(long wstr long) ImmGetIMEFileNameW
+ 40 stdcall ImmGetOpenStatus(long) ImmGetOpenStatus
+ 41 stdcall ImmGetProperty(long long) ImmGetProperty
+ 42 stdcall ImmGetRegisterWordStyleA(long long ptr) ImmGetRegisterWordStyleA
+ 43 stdcall ImmGetRegisterWordStyleW(long long ptr) ImmGetRegisterWordStyleW
+ 44 stdcall ImmGetStatusWindowPos(long ptr) ImmGetStatusWindowPos
+ 45 stdcall ImmGetVirtualKey(long) ImmGetVirtualKey
+ 46 stdcall ImmInstallIMEA(str str) ImmInstallIMEA
+ 47 stdcall ImmInstallIMEW(wstr wstr) ImmInstallIMEW
+ 48 stdcall ImmIsIME(long) ImmIsIME
+ 49 stdcall ImmIsUIMessageA(long long long long) ImmIsUIMessageA
+ 50 stdcall ImmIsUIMessageW(long long long long) ImmIsUIMessageW
  51 stub ImmLockIMC
  52 stub ImmLockIMCC
- 53 stdcall ImmNotifyIME(long long long long) ImmNotifyIME32
+ 53 stdcall ImmNotifyIME(long long long long) ImmNotifyIME
  54 stub ImmReSizeIMCC
- 55 stdcall ImmRegisterWordA(long str long str) ImmRegisterWord32A
- 56 stdcall ImmRegisterWordW(long wstr long wstr) ImmRegisterWord32W
- 57 stdcall ImmReleaseContext(long long) ImmReleaseContext32
- 58 stdcall ImmSetCandidateWindow(long ptr) ImmSetCandidateWindow32
- 59 stdcall ImmSetCompositionFontA(long ptr) ImmSetCompositionFont32A
- 60 stdcall ImmSetCompositionFontW(long ptr) ImmSetCompositionFont32W
- 61 stdcall ImmSetCompositionStringA(long long ptr long ptr long) ImmSetCompositionString32A
- 62 stdcall ImmSetCompositionStringW(long long ptr long ptr long) ImmSetCompositionString32W
- 63 stdcall ImmSetCompositionWindow(long ptr) ImmSetCompositionWindow32
- 64 stdcall ImmSetConversionStatus(long long long) ImmSetConversionStatus32
+ 55 stdcall ImmRegisterWordA(long str long str) ImmRegisterWordA
+ 56 stdcall ImmRegisterWordW(long wstr long wstr) ImmRegisterWordW
+ 57 stdcall ImmReleaseContext(long long) ImmReleaseContext
+ 58 stdcall ImmSetCandidateWindow(long ptr) ImmSetCandidateWindow
+ 59 stdcall ImmSetCompositionFontA(long ptr) ImmSetCompositionFontA
+ 60 stdcall ImmSetCompositionFontW(long ptr) ImmSetCompositionFontW
+ 61 stdcall ImmSetCompositionStringA(long long ptr long ptr long) ImmSetCompositionStringA
+ 62 stdcall ImmSetCompositionStringW(long long ptr long ptr long) ImmSetCompositionStringW
+ 63 stdcall ImmSetCompositionWindow(long ptr) ImmSetCompositionWindow
+ 64 stdcall ImmSetConversionStatus(long long long) ImmSetConversionStatus
  65 stub ImmSetHotKey
- 66 stdcall ImmSetOpenStatus(long long) ImmSetOpenStatus32
- 67 stdcall ImmSetStatusWindowPos(long ptr) ImmSetStatusWindowPos32
+ 66 stdcall ImmSetOpenStatus(long long) ImmSetOpenStatus
+ 67 stdcall ImmSetStatusWindowPos(long ptr) ImmSetStatusWindowPos
  68 stub ImmShowSoftKeyboard
- 69 stdcall ImmSimulateHotKey(long long) ImmSimulateHotKey32
+ 69 stdcall ImmSimulateHotKey(long long) ImmSimulateHotKey
  70 stub ImmUnlockIMC
  71 stub ImmUnlockIMCC
- 72 stdcall ImmUnregisterWordA(long str long str) ImmUnregisterWord32A
+ 72 stdcall ImmUnregisterWordA(long str long str) ImmUnregisterWordA
diff --git a/relay32/kernel32.spec b/relay32/kernel32.spec
index 7f99c60f980..ce923bd59d7 100644
--- a/relay32/kernel32.spec
+++ b/relay32/kernel32.spec
@@ -22,13 +22,13 @@ init	MAIN_KernelInit
   7 register VxDCall6() VxDCall6
   8 register VxDCall7() VxDCall7
   9 register VxDCall8() VxDCall8
- 10 stdcall k32CharToOemA(str str) CharToOem32A
- 11 stdcall k32CharToOemBuffA(str str long) CharToOemBuff32A
- 12 stdcall k32OemToCharA(ptr ptr) OemToChar32A
- 13 stdcall k32OemToCharBuffA(ptr ptr long) OemToCharBuff32A
- 14 stdcall k32LoadStringA(long long ptr long) LoadString32A
- 15 varargs k32wsprintfA() wsprintf32A
- 16 stdcall k32wvsprintfA(ptr str ptr) wvsprintf32A
+ 10 stdcall k32CharToOemA(str str) CharToOemA
+ 11 stdcall k32CharToOemBuffA(str str long) CharToOemBuffA
+ 12 stdcall k32OemToCharA(ptr ptr) OemToCharA
+ 13 stdcall k32OemToCharBuffA(ptr ptr long) OemToCharBuffA
+ 14 stdcall k32LoadStringA(long long ptr long) LoadStringA
+ 15 varargs k32wsprintfA() wsprintfA
+ 16 stdcall k32wvsprintfA(ptr str ptr) wvsprintfA
  17 register CommonUnimpStub() CommonUnimpStub
  18 stdcall GetProcessDword(long long) GetProcessDword
  19 stub ThunkTheTemplateHandle
@@ -62,7 +62,7 @@ init	MAIN_KernelInit
  47 stub LogCBThkSL
  48 stdcall ReleaseThunkLock(ptr) ReleaseThunkLock
  49 stdcall RestoreThunkLock(long) RestoreThunkLock
- 50 stdcall AddAtomA(str) AddAtom32A
+ 50 stdcall AddAtomA(str) AddAtomA
  51 register W32S_BackTo32() W32S_BackTo32
  52 stdcall GetThunkBuff() GetThunkBuff
  53 stdcall GetThunkStuff(str str) GetThunkStuff
@@ -105,7 +105,7 @@ init	MAIN_KernelInit
  90 register QT_ThunkPrime() QT_ThunkPrime
  91 stdcall PK16FNF(ptr) PK16FNF
  92 stdcall GetPK16SysVar() GetPK16SysVar
- 93 stdcall GetpWin16Lock(ptr) GetpWin16Lock32
+ 93 stdcall GetpWin16Lock(ptr) GetpWin16Lock
  94 stdcall _CheckNotSysLevel(ptr) _CheckNotSysLevel
  95 stdcall _ConfirmSysLevel(ptr) _ConfirmSysLevel
  96 stdcall _ConfirmWin16Lock() _ConfirmWin16Lock
@@ -115,7 +115,7 @@ init	MAIN_KernelInit
 100 stdcall _KERNEL32_100(long long long) _KERNEL32_100
 101 stub _KERNEL32_101
 
-102 stdcall AddAtomW(wstr) AddAtom32W
+102 stdcall AddAtomW(wstr) AddAtomW
 103 stdcall AllocConsole() AllocConsole
 104 stub AllocLSCallback
 105 stdcall AllocSLCallback(ptr ptr) AllocSLCallback
@@ -126,10 +126,10 @@ init	MAIN_KernelInit
 110 stdcall Beep(long long) Beep
 111 stub BeginUpdateResourceA
 112 stub BeginUpdateResourceW
-113 stdcall BuildCommDCBA(str ptr) BuildCommDCB32A
-114 stdcall BuildCommDCBAndTimeoutsA(str ptr ptr) BuildCommDCBAndTimeouts32A
-115 stdcall BuildCommDCBAndTimeoutsW(wstr ptr ptr) BuildCommDCBAndTimeouts32W
-116 stdcall BuildCommDCBW(wstr ptr) BuildCommDCB32W
+113 stdcall BuildCommDCBA(str ptr) BuildCommDCBA
+114 stdcall BuildCommDCBAndTimeoutsA(str ptr ptr) BuildCommDCBAndTimeoutsA
+115 stdcall BuildCommDCBAndTimeoutsW(wstr ptr ptr) BuildCommDCBAndTimeoutsW
+116 stdcall BuildCommDCBW(wstr ptr) BuildCommDCBW
 117 stub CallNamedPipeA
 118 stub CallNamedPipeW
 119 stub Callback12
@@ -148,7 +148,7 @@ init	MAIN_KernelInit
 132 stub Callback60
 133 stub Callback64
 134 stub Callback8
-135 stdcall ClearCommBreak(long) ClearCommBreak32
+135 stdcall ClearCommBreak(long) ClearCommBreak
 136 stdcall ClearCommError(long ptr ptr) ClearCommError
 137 stdcall CloseHandle(long) CloseHandle
 138 stub CloseProfileUserMapping
@@ -156,39 +156,39 @@ init	MAIN_KernelInit
 140 stub CommConfigDialogA
 141 stub CommConfigDialogW
 142 stdcall CompareFileTime(ptr ptr) CompareFileTime
-143 stdcall CompareStringA(long long str long str long) CompareString32A
-144 stdcall CompareStringW(long long wstr long wstr long) CompareString32W
+143 stdcall CompareStringA(long long str long str long) CompareStringA
+144 stdcall CompareStringW(long long wstr long wstr long) CompareStringW
 145 stub ConnectNamedPipe
 146 stdcall ContinueDebugEvent(long long long) ContinueDebugEvent
 147 stdcall ConvertDefaultLocale (long) ConvertDefaultLocale32
 148 stdcall ConvertToGlobalHandle(long) ConvertToGlobalHandle
-149 stdcall CopyFileA(str str long) CopyFile32A
-150 stdcall CopyFileW(wstr wstr long) CopyFile32W
+149 stdcall CopyFileA(str str long) CopyFileA
+150 stdcall CopyFileW(wstr wstr long) CopyFileW
 151 stdcall CreateConsoleScreenBuffer(long long ptr long ptr) CreateConsoleScreenBuffer
-152 stdcall CreateDirectoryA(str ptr) CreateDirectory32A
-153 stdcall CreateDirectoryExA(str str ptr) CreateDirectoryEx32A
-154 stdcall CreateDirectoryExW(wstr wstr ptr) CreateDirectoryEx32W
-155 stdcall CreateDirectoryW(wstr ptr) CreateDirectory32W
-156 stdcall CreateEventA(ptr long long str) CreateEvent32A
-157 stdcall CreateEventW(ptr long long wstr) CreateEvent32W
-158 stdcall CreateFileA(str long long ptr long long long) CreateFile32A
-159 stdcall CreateFileMappingA(long ptr long long long str) CreateFileMapping32A
-160 stdcall CreateFileMappingW(long ptr long long long wstr) CreateFileMapping32W
-161 stdcall CreateFileW(wstr long long ptr long long long) CreateFile32W
+152 stdcall CreateDirectoryA(str ptr) CreateDirectoryA
+153 stdcall CreateDirectoryExA(str str ptr) CreateDirectoryExA
+154 stdcall CreateDirectoryExW(wstr wstr ptr) CreateDirectoryExW
+155 stdcall CreateDirectoryW(wstr ptr) CreateDirectoryW
+156 stdcall CreateEventA(ptr long long str) CreateEventA
+157 stdcall CreateEventW(ptr long long wstr) CreateEventW
+158 stdcall CreateFileA(str long long ptr long long long) CreateFileA
+159 stdcall CreateFileMappingA(long ptr long long long str) CreateFileMappingA
+160 stdcall CreateFileMappingW(long ptr long long long wstr) CreateFileMappingW
+161 stdcall CreateFileW(wstr long long ptr long long long) CreateFileW
 162 stub CreateIoCompletionPort
 163 stub CreateKernelThread
-164 stdcall CreateMailslotA(ptr long long ptr) CreateMailslot32A
-165 stdcall CreateMailslotW(ptr long long ptr) CreateMailslot32W
-166 stdcall CreateMutexA(ptr long str) CreateMutex32A
-167 stdcall CreateMutexW(ptr long wstr) CreateMutex32W
+164 stdcall CreateMailslotA(ptr long long ptr) CreateMailslotA
+165 stdcall CreateMailslotW(ptr long long ptr) CreateMailslotW
+166 stdcall CreateMutexA(ptr long str) CreateMutexA
+167 stdcall CreateMutexW(ptr long wstr) CreateMutexW
 168 stdcall CreateNamedPipeA(str long long long long long long ptr) CreateNamedPipeA
 169 stdcall CreateNamedPipeW(wstr long long long long long long ptr) CreateNamedPipeW
 170 stdcall CreatePipe(ptr ptr ptr long) CreatePipe
-171 stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) CreateProcess32A
-172 stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) CreateProcess32W
+171 stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) CreateProcessA
+172 stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) CreateProcessW
 173 stub CreateRemoteThread
-174 stdcall CreateSemaphoreA(ptr long long str) CreateSemaphore32A
-175 stdcall CreateSemaphoreW(ptr long long wstr) CreateSemaphore32W
+174 stdcall CreateSemaphoreA(ptr long long str) CreateSemaphoreA
+175 stdcall CreateSemaphoreW(ptr long long wstr) CreateSemaphoreW
 176 stub CreateSocketHandle
 177 stub CreateTapePartition
 178 stdcall CreateThread(ptr long ptr long long ptr) CreateThread
@@ -197,12 +197,12 @@ init	MAIN_KernelInit
 # FIXME
 #181 register DebugBreak() DebugBreak
 181 stub DebugBreak
-182 stdcall DefineDosDeviceA(long str str) DefineDosDevice32A
+182 stdcall DefineDosDeviceA(long str str) DefineDosDeviceA
 183 stub DefineDosDeviceW
-184 stdcall DeleteAtom(long) DeleteAtom32
+184 stdcall DeleteAtom(long) DeleteAtom
 185 stdcall DeleteCriticalSection(ptr) DeleteCriticalSection
-186 stdcall DeleteFileA(str) DeleteFile32A
-187 stdcall DeleteFileW(wstr) DeleteFile32W
+186 stdcall DeleteFileA(str) DeleteFileA
+187 stdcall DeleteFileW(wstr) DeleteFileW
 188 stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) DeviceIoControl
 189 stdcall DisableThreadLibraryCalls(long) DisableThreadLibraryCalls
 190 stub DisconnectNamedPipe
@@ -213,26 +213,26 @@ init	MAIN_KernelInit
 195 stdcall EnterCriticalSection(ptr) EnterCriticalSection
 196 stub EnumCalendarInfoA
 197 stub EnumCalendarInfoW
-198 stdcall EnumDateFormatsA(ptr long long) EnumDateFormats32A
-199 stdcall EnumDateFormatsW(ptr long long) EnumDateFormats32W
-200 stdcall EnumResourceLanguagesA(long str str ptr long) EnumResourceLanguages32A
-201 stdcall EnumResourceLanguagesW(long wstr wstr ptr long) EnumResourceLanguages32W
-202 stdcall EnumResourceNamesA(long str ptr long) EnumResourceNames32A
-203 stdcall EnumResourceNamesW(long wstr ptr long) EnumResourceNames32W
-204 stdcall EnumResourceTypesA(long ptr long) EnumResourceTypes32A
-205 stdcall EnumResourceTypesW(long ptr long) EnumResourceTypes32W
-206 stdcall EnumSystemCodePagesA(ptr long) EnumSystemCodePages32A
-207 stdcall EnumSystemCodePagesW(ptr long) EnumSystemCodePages32W
-208 stdcall EnumSystemLocalesA(ptr long) EnumSystemLocales32A
-209 stdcall EnumSystemLocalesW(ptr long) EnumSystemLocales32W
-210 stdcall EnumTimeFormatsA(ptr long long) EnumTimeFormats32A
-211 stdcall EnumTimeFormatsW(ptr long long) EnumTimeFormats32W
+198 stdcall EnumDateFormatsA(ptr long long) EnumDateFormatsA
+199 stdcall EnumDateFormatsW(ptr long long) EnumDateFormatsW
+200 stdcall EnumResourceLanguagesA(long str str ptr long) EnumResourceLanguagesA
+201 stdcall EnumResourceLanguagesW(long wstr wstr ptr long) EnumResourceLanguagesW
+202 stdcall EnumResourceNamesA(long str ptr long) EnumResourceNamesA
+203 stdcall EnumResourceNamesW(long wstr ptr long) EnumResourceNamesW
+204 stdcall EnumResourceTypesA(long ptr long) EnumResourceTypesA
+205 stdcall EnumResourceTypesW(long ptr long) EnumResourceTypesW
+206 stdcall EnumSystemCodePagesA(ptr long) EnumSystemCodePagesA
+207 stdcall EnumSystemCodePagesW(ptr long) EnumSystemCodePagesW
+208 stdcall EnumSystemLocalesA(ptr long) EnumSystemLocalesA
+209 stdcall EnumSystemLocalesW(ptr long) EnumSystemLocalesW
+210 stdcall EnumTimeFormatsA(ptr long long) EnumTimeFormatsA
+211 stdcall EnumTimeFormatsW(ptr long long) EnumTimeFormatsW
 212 stub EraseTape
-213 stdcall EscapeCommFunction(long long) EscapeCommFunction32
+213 stdcall EscapeCommFunction(long long) EscapeCommFunction
 214 stdcall ExitProcess(long) ExitProcess
 215 stdcall ExitThread(long) ExitThread
-216 stdcall ExpandEnvironmentStringsA(str ptr long) ExpandEnvironmentStrings32A
-217 stdcall ExpandEnvironmentStringsW(wstr ptr long) ExpandEnvironmentStrings32W
+216 stdcall ExpandEnvironmentStringsA(str ptr long) ExpandEnvironmentStringsA
+217 stdcall ExpandEnvironmentStringsW(wstr ptr long) ExpandEnvironmentStringsW
 218 register FT_Exit0() FT_Exit0
 219 register FT_Exit12() FT_Exit12
 220 register FT_Exit16() FT_Exit16
@@ -250,8 +250,8 @@ init	MAIN_KernelInit
 232 register FT_Exit8() FT_Exit8
 233 register FT_Prolog() FT_Prolog
 234 register FT_Thunk() FT_Thunk
-235 stdcall FatalAppExitA(long str) FatalAppExit32A
-236 stdcall FatalAppExitW(long wstr) FatalAppExit32W
+235 stdcall FatalAppExitA(long str) FatalAppExitA
+236 stdcall FatalAppExitW(long wstr) FatalAppExitW
 237 stub FatalExit
 238 stdcall FileTimeToDosDateTime(ptr ptr ptr) FileTimeToDosDateTime
 239 stdcall FileTimeToLocalFileTime(ptr ptr) FileTimeToLocalFileTime
@@ -259,97 +259,97 @@ init	MAIN_KernelInit
 241 stdcall FillConsoleOutputAttribute(long long long long ptr) FillConsoleOutputAttribute
 242 stdcall FillConsoleOutputCharacterA(long long long long ptr) FillConsoleOutputCharacterA
 243 stdcall FillConsoleOutputCharacterW(long long long long ptr) FillConsoleOutputCharacterW
-244 stdcall FindAtomA(str) FindAtom32A
-245 stdcall FindAtomW(wstr) FindAtom32W
+244 stdcall FindAtomA(str) FindAtomA
+245 stdcall FindAtomW(wstr) FindAtomW
 247 stdcall FindCloseChangeNotification(long) FindCloseChangeNotification
-246 stdcall FindClose(long) FindClose32
-248 stdcall FindFirstChangeNotificationA(str long long) FindFirstChangeNotification32A
-249 stdcall FindFirstChangeNotificationW(wstr long long) FindFirstChangeNotification32W
-250 stdcall FindFirstFileA(str ptr) FindFirstFile32A
-251 stdcall FindFirstFileW(wstr ptr) FindFirstFile32W
+246 stdcall FindClose(long) FindClose
+248 stdcall FindFirstChangeNotificationA(str long long) FindFirstChangeNotificationA
+249 stdcall FindFirstChangeNotificationW(wstr long long) FindFirstChangeNotificationW
+250 stdcall FindFirstFileA(str ptr) FindFirstFileA
+251 stdcall FindFirstFileW(wstr ptr) FindFirstFileW
 252 stdcall FindNextChangeNotification(long) FindNextChangeNotification
-253 stdcall FindNextFileA(long ptr) FindNextFile32A
-254 stdcall FindNextFileW(long ptr) FindNextFile32W
-255 stdcall FindResourceA(long str str) FindResource32A
-256 stdcall FindResourceExA(long str str long) FindResourceEx32A
-257 stdcall FindResourceExW(long wstr wstr long) FindResourceEx32W
-258 stdcall FindResourceW(long wstr wstr) FindResource32W
+253 stdcall FindNextFileA(long ptr) FindNextFileA
+254 stdcall FindNextFileW(long ptr) FindNextFileW
+255 stdcall FindResourceA(long str str) FindResourceA
+256 stdcall FindResourceExA(long str str long) FindResourceExA
+257 stdcall FindResourceExW(long wstr wstr long) FindResourceExW
+258 stdcall FindResourceW(long wstr wstr) FindResourceW
 259 stdcall FlushConsoleInputBuffer(long) FlushConsoleInputBuffer
 260 stdcall FlushFileBuffers(long) FlushFileBuffers
 261 stdcall FlushInstructionCache(long long long) FlushInstructionCache
 262 stdcall FlushViewOfFile(ptr long) FlushViewOfFile
 263 stub FoldStringA
 264 stub FoldStringW
-265 stdcall FormatMessageA(long ptr long long ptr long ptr) FormatMessage32A
-266 stdcall FormatMessageW(long ptr long long ptr long ptr) FormatMessage32W
+265 stdcall FormatMessageA(long ptr long long ptr long ptr) FormatMessageA
+266 stdcall FormatMessageW(long ptr long long ptr long ptr) FormatMessageW
 267 stdcall FreeConsole() FreeConsole
-268 stdcall FreeEnvironmentStringsA(ptr) FreeEnvironmentStrings32A
-269 stdcall FreeEnvironmentStringsW(ptr) FreeEnvironmentStrings32W
+268 stdcall FreeEnvironmentStringsA(ptr) FreeEnvironmentStringsA
+269 stdcall FreeEnvironmentStringsW(ptr) FreeEnvironmentStringsW
 270 stub FreeLSCallback
 272 stub FreeLibraryAndExitThread
-271 stdcall FreeLibrary(long) FreeLibrary32
-273 stdcall FreeResource(long) FreeResource32
+271 stdcall FreeLibrary(long) FreeLibrary
+273 stdcall FreeResource(long) FreeResource
 274 stdcall FreeSLCallback(long) FreeSLCallback
 275 stdcall GenerateConsoleCtrlEvent(long long) GenerateConsoleCtrlEvent
 276 stdcall GetACP() GetACP
-277 stdcall GetAtomNameA(long ptr long) GetAtomName32A
-278 stdcall GetAtomNameW(long ptr long) GetAtomName32W
+277 stdcall GetAtomNameA(long ptr long) GetAtomNameA
+278 stdcall GetAtomNameW(long ptr long) GetAtomNameW
 279 stub GetBinaryType
-280 stdcall GetBinaryTypeA(ptr ptr) GetBinaryType32A
-281 stdcall GetBinaryTypeW(ptr ptr) GetBinaryType32W
+280 stdcall GetBinaryTypeA(ptr ptr) GetBinaryTypeA
+281 stdcall GetBinaryTypeW(ptr ptr) GetBinaryTypeW
 282 stdcall GetCPInfo(long ptr) GetCPInfo
 283 stub GetCommConfig
 284 stdcall GetCommMask(long ptr) GetCommMask
 285 stdcall GetCommModemStatus(long ptr) GetCommModemStatus
 286 stub GetCommProperties
-287 stdcall GetCommState(long ptr) GetCommState32
+287 stdcall GetCommState(long ptr) GetCommState
 288 stdcall GetCommTimeouts(long ptr) GetCommTimeouts
-289 stdcall GetCommandLineA() GetCommandLine32A
-290 stdcall GetCommandLineW() GetCommandLine32W
-291 stdcall GetCompressedFileSizeA(long ptr) GetCompressedFileSize32A
-292 stdcall GetCompressedFileSizeW(long ptr) GetCompressedFileSize32W
-293 stdcall GetComputerNameA(ptr ptr) GetComputerName32A
-294 stdcall GetComputerNameW(ptr ptr) GetComputerName32W
+289 stdcall GetCommandLineA() GetCommandLineA
+290 stdcall GetCommandLineW() GetCommandLineW
+291 stdcall GetCompressedFileSizeA(long ptr) GetCompressedFileSizeA
+292 stdcall GetCompressedFileSizeW(long ptr) GetCompressedFileSizeW
+293 stdcall GetComputerNameA(ptr ptr) GetComputerNameA
+294 stdcall GetComputerNameW(ptr ptr) GetComputerNameW
 295 stdcall GetConsoleCP() GetConsoleCP
-296 stdcall GetConsoleCursorInfo(long ptr) GetConsoleCursorInfo32
+296 stdcall GetConsoleCursorInfo(long ptr) GetConsoleCursorInfo
 297 stdcall GetConsoleMode(long ptr) GetConsoleMode
 298 stdcall GetConsoleOutputCP() GetConsoleOutputCP
 299 stdcall GetConsoleScreenBufferInfo(long ptr) GetConsoleScreenBufferInfo
-300 stdcall GetConsoleTitleA(ptr long) GetConsoleTitle32A
-301 stdcall GetConsoleTitleW(ptr long) GetConsoleTitle32W
+300 stdcall GetConsoleTitleA(ptr long) GetConsoleTitleA
+301 stdcall GetConsoleTitleW(ptr long) GetConsoleTitleW
 302 stub GetCurrencyFormatA
 303 stub GetCurrencyFormatW
-304 stdcall GetCurrentDirectoryA(long ptr) GetCurrentDirectory32A
-305 stdcall GetCurrentDirectoryW(long ptr) GetCurrentDirectory32W
+304 stdcall GetCurrentDirectoryA(long ptr) GetCurrentDirectoryA
+305 stdcall GetCurrentDirectoryW(long ptr) GetCurrentDirectoryW
 306 stdcall GetCurrentProcess() GetCurrentProcess
 307 stdcall GetCurrentProcessId() GetCurrentProcessId
 308 stdcall GetCurrentThread() GetCurrentThread
 309 stdcall GetCurrentThreadId() GetCurrentThreadId
-310 stdcall GetDateFormatA(long long ptr str ptr long) GetDateFormat32A
-311 stdcall GetDateFormatW(long long ptr wstr ptr long) GetDateFormat32W
+310 stdcall GetDateFormatA(long long ptr str ptr long) GetDateFormatA
+311 stdcall GetDateFormatW(long long ptr wstr ptr long) GetDateFormatW
 312 stub GetDaylightFlag
 313 stub GetDefaultCommConfigA
 314 stub GetDefaultCommConfigW
-315 stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) GetDiskFreeSpace32A
-316 stdcall GetDiskFreeSpaceW(wstr ptr ptr ptr ptr) GetDiskFreeSpace32W
-317 stdcall GetDriveTypeA(str) GetDriveType32A
-318 stdcall GetDriveTypeW(wstr) GetDriveType32W
-319 stdcall GetEnvironmentStrings() GetEnvironmentStrings32A
-320 stdcall GetEnvironmentStringsA() GetEnvironmentStrings32A
-321 stdcall GetEnvironmentStringsW() GetEnvironmentStrings32W
-322 stdcall GetEnvironmentVariableA(str ptr long) GetEnvironmentVariable32A
-323 stdcall GetEnvironmentVariableW(wstr ptr long) GetEnvironmentVariable32W
+315 stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) GetDiskFreeSpaceA
+316 stdcall GetDiskFreeSpaceW(wstr ptr ptr ptr ptr) GetDiskFreeSpaceW
+317 stdcall GetDriveTypeA(str) GetDriveTypeA
+318 stdcall GetDriveTypeW(wstr) GetDriveTypeW
+319 stdcall GetEnvironmentStrings() GetEnvironmentStringsA
+320 stdcall GetEnvironmentStringsA() GetEnvironmentStringsA
+321 stdcall GetEnvironmentStringsW() GetEnvironmentStringsW
+322 stdcall GetEnvironmentVariableA(str ptr long) GetEnvironmentVariableA
+323 stdcall GetEnvironmentVariableW(wstr ptr long) GetEnvironmentVariableW
 324 stub GetErrorMode
 325 stdcall GetExitCodeProcess(long ptr) GetExitCodeProcess
 326 stdcall GetExitCodeThread(long ptr) GetExitCodeThread
-327 stdcall GetFileAttributesA(str) GetFileAttributes32A
-328 stdcall GetFileAttributesW(wstr) GetFileAttributes32W
+327 stdcall GetFileAttributesA(str) GetFileAttributesA
+328 stdcall GetFileAttributesW(wstr) GetFileAttributesW
 329 stdcall GetFileInformationByHandle(long ptr) GetFileInformationByHandle
 330 stdcall GetFileSize(long ptr) GetFileSize
 331 stdcall GetFileTime(long ptr ptr ptr) GetFileTime
 332 stdcall GetFileType(long) GetFileType
-333 stdcall GetFullPathNameA(str long ptr ptr) GetFullPathName32A
-334 stdcall GetFullPathNameW(wstr long ptr ptr) GetFullPathName32W
+333 stdcall GetFullPathNameA(str long ptr ptr) GetFullPathNameA
+334 stdcall GetFullPathNameW(wstr long ptr ptr) GetFullPathNameW
 335 stub GetHandleContext
 336 stdcall GetHandleInformation(long ptr) GetHandleInformation
 337 stub GetLSCallbackTarget
@@ -357,37 +357,37 @@ init	MAIN_KernelInit
 339 stdcall GetLargestConsoleWindowSize(long) GetLargestConsoleWindowSize
 340 stdcall GetLastError() GetLastError
 341 stdcall GetLocalTime(ptr) GetLocalTime
-342 stdcall GetLocaleInfoA(long long ptr long) GetLocaleInfo32A
-343 stdcall GetLocaleInfoW(long long ptr long) GetLocaleInfo32W
-344 stdcall GetLogicalDriveStringsA(long ptr) GetLogicalDriveStrings32A
-345 stdcall GetLogicalDriveStringsW(long ptr) GetLogicalDriveStrings32W
+342 stdcall GetLocaleInfoA(long long ptr long) GetLocaleInfoA
+343 stdcall GetLocaleInfoW(long long ptr long) GetLocaleInfoW
+344 stdcall GetLogicalDriveStringsA(long ptr) GetLogicalDriveStringsA
+345 stdcall GetLogicalDriveStringsW(long ptr) GetLogicalDriveStringsW
 346 stdcall GetLogicalDrives() GetLogicalDrives
 347 stdcall GetMailslotInfo(long ptr ptr ptr ptr) GetMailslotInfo
-348 stdcall GetModuleFileNameA(long ptr long) GetModuleFileName32A
-349 stdcall GetModuleFileNameW(long ptr long) GetModuleFileName32W
-350 stdcall GetModuleHandleA(str) GetModuleHandle32A
-351 stdcall GetModuleHandleW(wstr) GetModuleHandle32W
+348 stdcall GetModuleFileNameA(long ptr long) GetModuleFileNameA
+349 stdcall GetModuleFileNameW(long ptr long) GetModuleFileNameW
+350 stdcall GetModuleHandleA(str) GetModuleHandleA
+351 stdcall GetModuleHandleW(wstr) GetModuleHandleW
 352 stub GetNamedPipeHandleStateA
 353 stub GetNamedPipeHandleStateW
 354 stub GetNamedPipeInfo
-355 stdcall GetNumberFormatA(long long str ptr ptr long) GetNumberFormat32A
-356 stdcall GetNumberFormatW(long long wstr ptr ptr long) GetNumberFormat32W
+355 stdcall GetNumberFormatA(long long str ptr ptr long) GetNumberFormatA
+356 stdcall GetNumberFormatW(long long wstr ptr ptr long) GetNumberFormatW
 357 stdcall GetNumberOfConsoleInputEvents(long ptr) GetNumberOfConsoleInputEvents
 358 stdcall GetNumberOfConsoleMouseButtons(long ptr) GetNumberOfConsoleMouseButtons
 359 stdcall GetOEMCP() GetOEMCP
 360 stub GetOverlappedResult
 361 stdcall GetPriorityClass(long) GetPriorityClass
-362 stdcall GetPrivateProfileIntA(str str long str) GetPrivateProfileInt32A
-363 stdcall GetPrivateProfileIntW(wstr wstr long wstr) GetPrivateProfileInt32W
-364 stdcall GetPrivateProfileSectionA(str str long str) GetPrivateProfileSection32A
-365 stdcall GetPrivateProfileSectionNamesA(ptr long str) GetPrivateProfileSectionNames32A
-366 stdcall GetPrivateProfileSectionNamesW(ptr long wstr) GetPrivateProfileSectionNames32W
-367 stdcall GetPrivateProfileSectionW(wstr wstr long wstr) GetPrivateProfileSection32W
-368 stdcall GetPrivateProfileStringA(str str str ptr long str) GetPrivateProfileString32A
-369 stdcall GetPrivateProfileStringW(wstr wstr wstr ptr long wstr) GetPrivateProfileString32W
-370 stdcall GetPrivateProfileStructA (str str ptr long str) GetPrivateProfileStruct32A
-371 stdcall GetPrivateProfileStructW(wstr wstr ptr long wstr) GetPrivateProfileStruct32W
-372 stdcall GetProcAddress(long str) GetProcAddress32
+362 stdcall GetPrivateProfileIntA(str str long str) GetPrivateProfileIntA
+363 stdcall GetPrivateProfileIntW(wstr wstr long wstr) GetPrivateProfileIntW
+364 stdcall GetPrivateProfileSectionA(str str long str) GetPrivateProfileSectionA
+365 stdcall GetPrivateProfileSectionNamesA(ptr long str) GetPrivateProfileSectionNamesA
+366 stdcall GetPrivateProfileSectionNamesW(ptr long wstr) GetPrivateProfileSectionNamesW
+367 stdcall GetPrivateProfileSectionW(wstr wstr long wstr) GetPrivateProfileSectionW
+368 stdcall GetPrivateProfileStringA(str str str ptr long str) GetPrivateProfileStringA
+369 stdcall GetPrivateProfileStringW(wstr wstr wstr ptr long wstr) GetPrivateProfileStringW
+370 stdcall GetPrivateProfileStructA (str str ptr long str) GetPrivateProfileStructA
+371 stdcall GetPrivateProfileStructW(wstr wstr ptr long wstr) GetPrivateProfileStructW
+372 stdcall GetProcAddress(long str) GetProcAddress
 373 stdcall GetProcessAffinityMask(long ptr ptr) GetProcessAffinityMask
 374 stdcall GetProcessFlags(long) GetProcessFlags
 375 stdcall GetProcessHeap() GetProcessHeap
@@ -397,28 +397,28 @@ init	MAIN_KernelInit
 379 stdcall GetProcessVersion(long) GetProcessVersion
 380 stdcall GetProcessWorkingSetSize(long ptr ptr) GetProcessWorkingSetSize
 381 stub GetProductName
-382 stdcall GetProfileIntA(str str long) GetProfileInt32A
-383 stdcall GetProfileIntW(wstr wstr long) GetProfileInt32W
-384 stdcall GetProfileSectionA(str str long) GetProfileSection32A
-385 stdcall GetProfileSectionW(wstr wstr long) GetProfileSection32W
-386 stdcall GetProfileStringA(str str str ptr long) GetProfileString32A
-387 stdcall GetProfileStringW(wstr wstr wstr ptr long) GetProfileString32W
+382 stdcall GetProfileIntA(str str long) GetProfileIntA
+383 stdcall GetProfileIntW(wstr wstr long) GetProfileIntW
+384 stdcall GetProfileSectionA(str str long) GetProfileSectionA
+385 stdcall GetProfileSectionW(wstr wstr long) GetProfileSectionW
+386 stdcall GetProfileStringA(str str str ptr long) GetProfileStringA
+387 stdcall GetProfileStringW(wstr wstr wstr ptr long) GetProfileStringW
 388 stub GetQueuedCompletionStatus
 389 stub GetSLCallbackTarget
 390 stub GetSLCallbackTemplate
-391 stdcall GetShortPathNameA(str ptr long) GetShortPathName32A
-392 stdcall GetShortPathNameW(wstr ptr long) GetShortPathName32W
-393 stdcall GetStartupInfoA(ptr) GetStartupInfo32A
-394 stdcall GetStartupInfoW(ptr) GetStartupInfo32W
+391 stdcall GetShortPathNameA(str ptr long) GetShortPathNameA
+392 stdcall GetShortPathNameW(wstr ptr long) GetShortPathNameW
+393 stdcall GetStartupInfoA(ptr) GetStartupInfoA
+394 stdcall GetStartupInfoW(ptr) GetStartupInfoW
 395 stdcall GetStdHandle(long) GetStdHandle
-396 stdcall GetStringTypeA(long long str long ptr) GetStringType32A
-397 stdcall GetStringTypeExA(long long str long ptr) GetStringTypeEx32A
-398 stdcall GetStringTypeExW(long long wstr long ptr) GetStringTypeEx32W
-399 stdcall GetStringTypeW(long wstr long ptr) GetStringType32W
+396 stdcall GetStringTypeA(long long str long ptr) GetStringTypeA
+397 stdcall GetStringTypeExA(long long str long ptr) GetStringTypeExA
+398 stdcall GetStringTypeExW(long long wstr long ptr) GetStringTypeExW
+399 stdcall GetStringTypeW(long wstr long ptr) GetStringTypeW
 400 stdcall GetSystemDefaultLCID() GetSystemDefaultLCID
 401 stdcall GetSystemDefaultLangID() GetSystemDefaultLangID
-402 stdcall GetSystemDirectoryA(ptr long) GetSystemDirectory32A
-403 stdcall GetSystemDirectoryW(ptr long) GetSystemDirectory32W
+402 stdcall GetSystemDirectoryA(ptr long) GetSystemDirectoryA
+403 stdcall GetSystemDirectoryW(ptr long) GetSystemDirectoryW
 404 stdcall GetSystemInfo(ptr) GetSystemInfo
 405 stdcall GetSystemPowerStatus(ptr) GetSystemPowerStatus
 406 stdcall GetSystemTime(ptr) GetSystemTime
@@ -427,49 +427,49 @@ init	MAIN_KernelInit
 409 stub GetTapeParameters
 410 stub GetTapePosition
 411 stub GetTapeStatus
-412 stdcall GetTempFileNameA(str str long ptr) GetTempFileName32A
-413 stdcall GetTempFileNameW(wstr wstr long ptr) GetTempFileName32W
-414 stdcall GetTempPathA(long ptr) GetTempPath32A
-415 stdcall GetTempPathW(long ptr) GetTempPath32W
+412 stdcall GetTempFileNameA(str str long ptr) GetTempFileNameA
+413 stdcall GetTempFileNameW(wstr wstr long ptr) GetTempFileNameW
+414 stdcall GetTempPathA(long ptr) GetTempPathA
+415 stdcall GetTempPathW(long ptr) GetTempPathW
 416 stdcall GetThreadContext(long ptr) GetThreadContext
 417 stdcall GetThreadLocale() GetThreadLocale
 418 stdcall GetThreadPriority(long) GetThreadPriority
 419 stdcall GetThreadSelectorEntry(long long ptr) GetThreadSelectorEntry
 420 stdcall GetThreadTimes(long ptr ptr ptr ptr) GetThreadTimes
 421 stdcall GetTickCount() GetTickCount
-422 stdcall GetTimeFormatA(long long ptr str ptr long) GetTimeFormat32A
-423 stdcall GetTimeFormatW(long long ptr wstr ptr long) GetTimeFormat32W
+422 stdcall GetTimeFormatA(long long ptr str ptr long) GetTimeFormatA
+423 stdcall GetTimeFormatW(long long ptr wstr ptr long) GetTimeFormatW
 424 stdcall GetTimeZoneInformation(ptr) GetTimeZoneInformation
 425 stdcall GetUserDefaultLCID() GetUserDefaultLCID
 426 stdcall GetUserDefaultLangID() GetUserDefaultLangID
-427 stdcall GetVersion() GetVersion32
-428 stdcall GetVersionExA(ptr) GetVersionEx32A
-429 stdcall GetVersionExW(ptr) GetVersionEx32W
-430 stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) GetVolumeInformation32A
-431 stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) GetVolumeInformation32W
-432 stdcall GetWindowsDirectoryA(ptr long) GetWindowsDirectory32A
-433 stdcall GetWindowsDirectoryW(ptr long) GetWindowsDirectory32W
-434 stdcall GlobalAddAtomA(str) GlobalAddAtom32A
-435 stdcall GlobalAddAtomW(wstr) GlobalAddAtom32W
-436 stdcall GlobalAlloc(long long) GlobalAlloc32
-437 stdcall GlobalCompact(long) GlobalCompact32
+427 stdcall GetVersion() GetVersion
+428 stdcall GetVersionExA(ptr) GetVersionExA
+429 stdcall GetVersionExW(ptr) GetVersionExW
+430 stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) GetVolumeInformationA
+431 stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) GetVolumeInformationW
+432 stdcall GetWindowsDirectoryA(ptr long) GetWindowsDirectoryA
+433 stdcall GetWindowsDirectoryW(ptr long) GetWindowsDirectoryW
+434 stdcall GlobalAddAtomA(str) GlobalAddAtomA
+435 stdcall GlobalAddAtomW(wstr) GlobalAddAtomW
+436 stdcall GlobalAlloc(long long) GlobalAlloc
+437 stdcall GlobalCompact(long) GlobalCompact
 438 stdcall GlobalDeleteAtom(long) GlobalDeleteAtom
-439 stdcall GlobalFindAtomA(str) GlobalFindAtom32A
-440 stdcall GlobalFindAtomW(wstr) GlobalFindAtom32W
-441 stdcall GlobalFix(long) GlobalFix32
-442 stdcall GlobalFlags(long) GlobalFlags32
-443 stdcall GlobalFree(long) GlobalFree32
-444 stdcall GlobalGetAtomNameA(long ptr long) GlobalGetAtomName32A
-445 stdcall GlobalGetAtomNameW(long ptr long) GlobalGetAtomName32W
-446 stdcall GlobalHandle(ptr) GlobalHandle32
-447 stdcall GlobalLock(long) GlobalLock32
+439 stdcall GlobalFindAtomA(str) GlobalFindAtomA
+440 stdcall GlobalFindAtomW(wstr) GlobalFindAtomW
+441 stdcall GlobalFix(long) GlobalFix
+442 stdcall GlobalFlags(long) GlobalFlags
+443 stdcall GlobalFree(long) GlobalFree
+444 stdcall GlobalGetAtomNameA(long ptr long) GlobalGetAtomNameA
+445 stdcall GlobalGetAtomNameW(long ptr long) GlobalGetAtomNameW
+446 stdcall GlobalHandle(ptr) GlobalHandle
+447 stdcall GlobalLock(long) GlobalLock
 448 stdcall GlobalMemoryStatus(ptr) GlobalMemoryStatus
-449 stdcall GlobalReAlloc(long long long) GlobalReAlloc32
-450 stdcall GlobalSize(long) GlobalSize32
-451 stdcall GlobalUnWire(long) GlobalUnWire32
-452 stdcall GlobalUnfix(long) GlobalUnfix32
-453 stdcall GlobalUnlock(long) GlobalUnlock32
-454 stdcall GlobalWire(long) GlobalWire32
+449 stdcall GlobalReAlloc(long long long) GlobalReAlloc
+450 stdcall GlobalSize(long) GlobalSize
+451 stdcall GlobalUnWire(long) GlobalUnWire
+452 stdcall GlobalUnfix(long) GlobalUnfix
+453 stdcall GlobalUnlock(long) GlobalUnlock
+454 stdcall GlobalWire(long) GlobalWire
 455 stub Heap32First
 456 stub Heap32ListFirst
 457 stub Heap32ListNext
@@ -492,14 +492,14 @@ init	MAIN_KernelInit
 474 stdcall InterlockedExchange(ptr long) InterlockedExchange
 475 stdcall InterlockedIncrement(ptr) InterlockedIncrement
 476 stub InvalidateNLSCache
-477 stdcall IsBadCodePtr(ptr) IsBadCodePtr32
-478 stdcall IsBadHugeReadPtr(ptr long) IsBadHugeReadPtr32
-479 stdcall IsBadHugeWritePtr(ptr long) IsBadHugeWritePtr32
-480 stdcall IsBadReadPtr(ptr long) IsBadReadPtr32
-481 stdcall IsBadStringPtrA(ptr long) IsBadStringPtr32A
-482 stdcall IsBadStringPtrW(ptr long) IsBadStringPtr32W
-483 stdcall IsBadWritePtr(ptr long) IsBadWritePtr32
-484 stdcall IsDBCSLeadByte(long) IsDBCSLeadByte32
+477 stdcall IsBadCodePtr(ptr) IsBadCodePtr
+478 stdcall IsBadHugeReadPtr(ptr long) IsBadHugeReadPtr
+479 stdcall IsBadHugeWritePtr(ptr long) IsBadHugeWritePtr
+480 stdcall IsBadReadPtr(ptr long) IsBadReadPtr
+481 stdcall IsBadStringPtrA(ptr long) IsBadStringPtrA
+482 stdcall IsBadStringPtrW(ptr long) IsBadStringPtrW
+483 stdcall IsBadWritePtr(ptr long) IsBadWritePtr
+484 stdcall IsDBCSLeadByte(long) IsDBCSLeadByte
 485 stdcall IsDBCSLeadByteEx(long long) IsDBCSLeadByteEx
 486 stub IsLSCallback
 487 stub IsSLCallback
@@ -507,29 +507,29 @@ init	MAIN_KernelInit
 489 stdcall IsValidLocale(long long) IsValidLocale
 490 register K32Thk1632Epilog() K32Thk1632Epilog
 491 register K32Thk1632Prolog() K32Thk1632Prolog
-492 stdcall LCMapStringA(long long str long ptr long) LCMapString32A
-493 stdcall LCMapStringW(long long wstr long ptr long) LCMapString32W
+492 stdcall LCMapStringA(long long str long ptr long) LCMapStringA
+493 stdcall LCMapStringW(long long wstr long ptr long) LCMapStringW
 494 stdcall LeaveCriticalSection(ptr) LeaveCriticalSection
-495 stdcall LoadLibraryA(str) LoadLibrary32A
-496 stdcall LoadLibraryExA( str long long) LoadLibraryEx32A
-497 stdcall LoadLibraryExW(wstr long long) LoadLibraryEx32W
-498 stdcall LoadLibraryW(wstr) LoadLibrary32W
-499 stdcall LoadModule(str ptr) LoadModule32
-500 stdcall LoadResource(long long) LoadResource32
-501 stdcall LocalAlloc(long long) LocalAlloc32
-502 stdcall LocalCompact(long) LocalCompact32
+495 stdcall LoadLibraryA(str) LoadLibraryA
+496 stdcall LoadLibraryExA( str long long) LoadLibraryExA
+497 stdcall LoadLibraryExW(wstr long long) LoadLibraryExW
+498 stdcall LoadLibraryW(wstr) LoadLibraryW
+499 stdcall LoadModule(str ptr) LoadModule
+500 stdcall LoadResource(long long) LoadResource
+501 stdcall LocalAlloc(long long) LocalAlloc
+502 stdcall LocalCompact(long) LocalCompact
 503 stdcall LocalFileTimeToFileTime(ptr ptr) LocalFileTimeToFileTime
-504 stdcall LocalFlags(long) LocalFlags32
-505 stdcall LocalFree(long) LocalFree32
-506 stdcall LocalHandle(ptr) LocalHandle32
-507 stdcall LocalLock(long) LocalLock32
-508 stdcall LocalReAlloc(long long long) LocalReAlloc32
-509 stdcall LocalShrink(long long) LocalShrink32
-510 stdcall LocalSize(long) LocalSize32
-511 stdcall LocalUnlock(long) LocalUnlock32
+504 stdcall LocalFlags(long) LocalFlags
+505 stdcall LocalFree(long) LocalFree
+506 stdcall LocalHandle(ptr) LocalHandle
+507 stdcall LocalLock(long) LocalLock
+508 stdcall LocalReAlloc(long long long) LocalReAlloc
+509 stdcall LocalShrink(long long) LocalShrink
+510 stdcall LocalSize(long) LocalSize
+511 stdcall LocalUnlock(long) LocalUnlock
 512 stdcall LockFile(long long long long long) LockFile
 513 stub LockFileEx
-514 stdcall LockResource(long) LockResource32
+514 stdcall LockResource(long) LockResource
 515 stdcall MakeCriticalSectionGlobal(ptr) MakeCriticalSectionGlobal
 516 register MapHInstLS() MapHInstLS
 517 register MapHInstLS_PN() MapHInstLS_PN
@@ -544,29 +544,29 @@ init	MAIN_KernelInit
 526 stdcall MapViewOfFileEx(long long long long long ptr) MapViewOfFileEx
 527 stub Module32First
 528 stub Module32Next
-529 stdcall MoveFileA(str str) MoveFile32A
-530 stdcall MoveFileExA(str str long) MoveFileEx32A
-531 stdcall MoveFileExW(wstr wstr long) MoveFileEx32W
-532 stdcall MoveFileW(wstr wstr) MoveFile32W
-533 stdcall MulDiv(long long long) MulDiv32
+529 stdcall MoveFileA(str str) MoveFileA
+530 stdcall MoveFileExA(str str long) MoveFileExA
+531 stdcall MoveFileExW(wstr wstr long) MoveFileExW
+532 stdcall MoveFileW(wstr wstr) MoveFileW
+533 stdcall MulDiv(long long long) MulDiv
 534 stdcall MultiByteToWideChar(long long str long ptr long) MultiByteToWideChar
 535 stub NotifyNLSUserCache
-536 stdcall OpenEventA(long long str) OpenEvent32A
-537 stdcall OpenEventW(long long wstr) OpenEvent32W
-538 stdcall OpenFile(str ptr long) OpenFile32
-539 stdcall OpenFileMappingA(long long str) OpenFileMapping32A
-540 stdcall OpenFileMappingW(long long wstr) OpenFileMapping32W
-541 stdcall OpenMutexA(long long str) OpenMutex32A
-542 stdcall OpenMutexW(long long wstr) OpenMutex32W
+536 stdcall OpenEventA(long long str) OpenEventA
+537 stdcall OpenEventW(long long wstr) OpenEventW
+538 stdcall OpenFile(str ptr long) OpenFile
+539 stdcall OpenFileMappingA(long long str) OpenFileMappingA
+540 stdcall OpenFileMappingW(long long wstr) OpenFileMappingW
+541 stdcall OpenMutexA(long long str) OpenMutexA
+542 stdcall OpenMutexW(long long wstr) OpenMutexW
 543 stdcall OpenProcess(long long long) OpenProcess
 544 stub OpenProfileUserMapping
-545 stdcall OpenSemaphoreA(long long str) OpenSemaphore32A
-546 stdcall OpenSemaphoreW(long long wstr) OpenSemaphore32W
+545 stdcall OpenSemaphoreA(long long str) OpenSemaphoreA
+546 stdcall OpenSemaphoreW(long long wstr) OpenSemaphoreW
 547 stub OpenVxDHandle
-548 stdcall OutputDebugStringA(str) OutputDebugString32A
-549 stdcall OutputDebugStringW(wstr) OutputDebugString32W
-550 stdcall PeekConsoleInputA(ptr ptr long ptr) PeekConsoleInput32A
-551 stdcall PeekConsoleInputW(ptr ptr long ptr) PeekConsoleInput32W
+548 stdcall OutputDebugStringA(str) OutputDebugStringA
+549 stdcall OutputDebugStringW(wstr) OutputDebugStringW
+550 stdcall PeekConsoleInputA(ptr ptr long ptr) PeekConsoleInputA
+551 stdcall PeekConsoleInputW(ptr ptr long ptr) PeekConsoleInputW
 552 stub PeekNamedPipe
 553 stub PostQueuedCompletionStatus
 554 stub PrepareTape
@@ -575,24 +575,24 @@ init	MAIN_KernelInit
 557 stdcall PulseEvent(long) PulseEvent
 558 stdcall PurgeComm(long long) PurgeComm
 559 register QT_Thunk() QT_Thunk
-560 stdcall QueryDosDeviceA(str ptr long) QueryDosDevice32A
-561 stdcall QueryDosDeviceW(wstr ptr long) QueryDosDevice32W
+560 stdcall QueryDosDeviceA(str ptr long) QueryDosDeviceA
+561 stdcall QueryDosDeviceW(wstr ptr long) QueryDosDeviceW
 562 stub QueryNumberOfEventLogRecords
 563 stub QueryOldestEventLogRecord
 564 stdcall QueryPerformanceCounter(ptr) QueryPerformanceCounter
 565 stdcall QueryPerformanceFrequency(ptr) QueryPerformanceFrequency
 566 stdcall QueueUserAPC(ptr long long) QueueUserAPC
 567 register RaiseException() RaiseException
-568 stdcall ReadConsoleA(long ptr long ptr ptr) ReadConsole32A
-569 stdcall ReadConsoleInputA(long ptr long ptr) ReadConsoleInput32A
-570 stdcall ReadConsoleInputW(long ptr long ptr) ReadConsoleInput32W 
+568 stdcall ReadConsoleA(long ptr long ptr ptr) ReadConsoleA
+569 stdcall ReadConsoleInputA(long ptr long ptr) ReadConsoleInputA
+570 stdcall ReadConsoleInputW(long ptr long ptr) ReadConsoleInputW 
 570 stub ReadConsoleInputW
 571 stub ReadConsoleOutputA
 572 stub ReadConsoleOutputAttribute
-573 stdcall ReadConsoleOutputCharacterA(long ptr long long ptr) ReadConsoleOutputCharacter32A
+573 stdcall ReadConsoleOutputCharacterA(long ptr long long ptr) ReadConsoleOutputCharacterA
 574 stub ReadConsoleOutputCharacterW
 575 stub ReadConsoleOutputW
-576 stdcall ReadConsoleW(long ptr long ptr ptr) ReadConsole32W
+576 stdcall ReadConsoleW(long ptr long ptr ptr) ReadConsoleW
 577 stdcall ReadFile(long ptr long ptr ptr) ReadFile
 578 stdcall ReadFileEx(long ptr long ptr ptr) ReadFileEx
 579 stdcall ReadProcessMemory(long ptr ptr long ptr) ReadProcessMemory
@@ -600,8 +600,8 @@ init	MAIN_KernelInit
 581 stdcall ReinitializeCriticalSection(ptr) ReinitializeCriticalSection
 582 stdcall ReleaseMutex(long) ReleaseMutex
 583 stdcall ReleaseSemaphore(long long ptr) ReleaseSemaphore
-584 stdcall RemoveDirectoryA(str) RemoveDirectory32A
-585 stdcall RemoveDirectoryW(wstr) RemoveDirectory32W
+584 stdcall RemoveDirectoryA(str) RemoveDirectoryA
+585 stdcall RemoveDirectoryW(wstr) RemoveDirectoryW
 586 stdcall ResetEvent(long) ResetEvent
 587 stdcall ResumeThread(long) ResumeThread
 588 stdcall RtlFillMemory(ptr long long) RtlFillMemory
@@ -630,45 +630,45 @@ init	MAIN_KernelInit
 611 register SUnMapLS_IP_EBP_8() SUnMapLS_IP_EBP_8
 612 stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) ScrollConsoleScreenBuffer
 613 stub ScrollConsoleScreenBufferW
-614 stdcall SearchPathA(str str str long ptr ptr) SearchPath32A
-615 stdcall SearchPathW(wstr wstr wstr long ptr ptr) SearchPath32W
-616 stdcall SetCommBreak(long) SetCommBreak32
+614 stdcall SearchPathA(str str str long ptr ptr) SearchPathA
+615 stdcall SearchPathW(wstr wstr wstr long ptr ptr) SearchPathW
+616 stdcall SetCommBreak(long) SetCommBreak
 617 stub SetCommConfig
 618 stdcall SetCommMask(long ptr) SetCommMask
-619 stdcall SetCommState(long ptr) SetCommState32
+619 stdcall SetCommState(long ptr) SetCommState
 620 stdcall SetCommTimeouts(long ptr) SetCommTimeouts
-621 stdcall SetComputerNameA(str) SetComputerName32A
-622 stdcall SetComputerNameW(wstr) SetComputerName32W
+621 stdcall SetComputerNameA(str) SetComputerNameA
+622 stdcall SetComputerNameW(wstr) SetComputerNameW
 623 stdcall SetConsoleActiveScreenBuffer(long) SetConsoleActiveScreenBuffer
 624 stub SetConsoleCP
 625 stdcall SetConsoleCtrlHandler(ptr long) SetConsoleCtrlHandler
-626 stdcall SetConsoleCursorInfo(long ptr) SetConsoleCursorInfo32
+626 stdcall SetConsoleCursorInfo(long ptr) SetConsoleCursorInfo
 627 stdcall SetConsoleCursorPosition(long long) SetConsoleCursorPosition
 628 stdcall SetConsoleMode(long long) SetConsoleMode
 629 stub SetConsoleOutputCP
 630 stdcall SetConsoleScreenBufferSize(long long) SetConsoleScreenBufferSize
-631 stdcall SetConsoleTextAttribute(long long) SetConsoleTextAttribute32
-632 stdcall SetConsoleTitleA(str) SetConsoleTitle32A
-633 stdcall SetConsoleTitleW(wstr) SetConsoleTitle32W
+631 stdcall SetConsoleTextAttribute(long long) SetConsoleTextAttribute
+632 stdcall SetConsoleTitleA(str) SetConsoleTitleA
+633 stdcall SetConsoleTitleW(wstr) SetConsoleTitleW
 634 stdcall SetConsoleWindowInfo(long long ptr) SetConsoleWindowInfo
-635 stdcall SetCurrentDirectoryA(str) SetCurrentDirectory32A
-636 stdcall SetCurrentDirectoryW(wstr) SetCurrentDirectory32W
+635 stdcall SetCurrentDirectoryA(str) SetCurrentDirectoryA
+636 stdcall SetCurrentDirectoryW(wstr) SetCurrentDirectoryW
 637 stub SetDaylightFlag
 638 stub SetDefaultCommConfigA
 639 stub SetDefaultCommConfigW
 640 stdcall SetEndOfFile(long) SetEndOfFile
-641 stdcall SetEnvironmentVariableA(str str) SetEnvironmentVariable32A
-642 stdcall SetEnvironmentVariableW(wstr wstr) SetEnvironmentVariable32W
-643 stdcall SetErrorMode(long) SetErrorMode32
+641 stdcall SetEnvironmentVariableA(str str) SetEnvironmentVariableA
+642 stdcall SetEnvironmentVariableW(wstr wstr) SetEnvironmentVariableW
+643 stdcall SetErrorMode(long) SetErrorMode
 644 stdcall SetEvent(long) SetEvent
 645 stdcall SetFileApisToANSI() SetFileApisToANSI
 646 stdcall SetFileApisToOEM() SetFileApisToOEM
-647 stdcall SetFileAttributesA(str long) SetFileAttributes32A
-648 stdcall SetFileAttributesW(wstr long) SetFileAttributes32W
+647 stdcall SetFileAttributesA(str long) SetFileAttributesA
+648 stdcall SetFileAttributesW(wstr long) SetFileAttributesW
 649 stdcall SetFilePointer(long long ptr long) SetFilePointer
 650 stdcall SetFileTime(long ptr ptr ptr) SetFileTime
 651 stub SetHandleContext
-652 stdcall SetHandleCount(long) SetHandleCount32
+652 stdcall SetHandleCount(long) SetHandleCount
 653 stdcall SetHandleInformation(long long long) SetHandleInformation
 654 stdcall SetLastError(long) SetLastError
 655 stub SetLocalTime
@@ -691,15 +691,15 @@ init	MAIN_KernelInit
 672 stdcall SetThreadPriority(long long) SetThreadPriority
 673 stdcall SetTimeZoneInformation(ptr) SetTimeZoneInformation
 674 stdcall SetUnhandledExceptionFilter(ptr) SetUnhandledExceptionFilter
-675 stdcall SetVolumeLabelA(str str) SetVolumeLabel32A
+675 stdcall SetVolumeLabelA(str str) SetVolumeLabelA
 676 stub SetVolumeLabelW
 677 stdcall SetupComm(long long long) SetupComm
-678 stdcall SizeofResource(long long) SizeofResource32
+678 stdcall SizeofResource(long long) SizeofResource
 679 stdcall Sleep(long) Sleep
 680 stdcall SleepEx(long long) SleepEx
 681 stdcall SuspendThread(long) SuspendThread
 682 stdcall SystemTimeToFileTime(ptr ptr) SystemTimeToFileTime
-683 stdcall SystemTimeToTzSpecificLocalTime (ptr ptr ptr) SystemTimeToTzSpecificLocalTime32
+683 stdcall SystemTimeToTzSpecificLocalTime (ptr ptr ptr) SystemTimeToTzSpecificLocalTime
 684 stdcall TerminateProcess(long long) TerminateProcess
 685 stdcall TerminateThread(long long) TerminateThread
 686 stub Thread32First
@@ -713,7 +713,7 @@ init	MAIN_KernelInit
 694 stdcall TlsSetValue(long ptr) TlsSetValue
 695 stub Toolhelp32ReadProcessMemory
 696 stub TransactNamedPipe
-697 stdcall TransmitCommChar(long long) TransmitCommChar32
+697 stdcall TransmitCommChar(long long) TransmitCommChar
 698 stdcall UTRegister(long str str str ptr ptr ptr) UTRegister
 699 stdcall UTUnRegister(long) UTUnRegister
 700 stdcall UnMapLS(long) UnMapLS
@@ -723,10 +723,10 @@ init	MAIN_KernelInit
 704 stdcall UnlockFile(long long long long long) UnlockFile
 705 stub UnlockFileEx
 706 stdcall UnmapViewOfFile(ptr) UnmapViewOfFile
-707 stdcall UpdateResourceA(long str str long ptr long) UpdateResource32A
-708 stdcall UpdateResourceW(long wstr wstr long ptr long) UpdateResource32W
-709 stdcall VerLanguageNameA(long str long) VerLanguageName32A
-710 stdcall VerLanguageNameW(long wstr long) VerLanguageName32W
+707 stdcall UpdateResourceA(long str str long ptr long) UpdateResourceA
+708 stdcall UpdateResourceW(long wstr wstr long ptr long) UpdateResourceW
+709 stdcall VerLanguageNameA(long str long) VerLanguageNameA
+710 stdcall VerLanguageNameW(long wstr long) VerLanguageNameW
 711 stdcall VirtualAlloc(ptr long long long) VirtualAlloc
 712 stdcall VirtualFree(ptr long long) VirtualFree
 713 stdcall VirtualLock(ptr long) VirtualLock
@@ -741,62 +741,62 @@ init	MAIN_KernelInit
 722 stdcall WaitForMultipleObjectsEx(long ptr long long long) WaitForMultipleObjectsEx
 723 stdcall WaitForSingleObject(long long) WaitForSingleObject
 724 stdcall WaitForSingleObjectEx(long long long) WaitForSingleObjectEx
-725 stdcall WaitNamedPipeA (str long) WaitNamedPipe32A
-726 stdcall WaitNamedPipeW (wstr long) WaitNamedPipe32W
+725 stdcall WaitNamedPipeA (str long) WaitNamedPipeA
+726 stdcall WaitNamedPipeW (wstr long) WaitNamedPipeW
 727 stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) WideCharToMultiByte
-728 stdcall WinExec(str long) WinExec32
-729 stdcall WriteConsoleA(long ptr long ptr ptr) WriteConsole32A
-730 stdcall WriteConsoleInputA(long ptr long ptr) WriteConsoleInput32A
+728 stdcall WinExec(str long) WinExec
+729 stdcall WriteConsoleA(long ptr long ptr ptr) WriteConsoleA
+730 stdcall WriteConsoleInputA(long ptr long ptr) WriteConsoleInputA
 731 stub WriteConsoleInputW
-732 stdcall WriteConsoleOutputA(long ptr long long ptr) WriteConsoleOutput32A
+732 stdcall WriteConsoleOutputA(long ptr long long ptr) WriteConsoleOutputA
 733 stub WriteConsoleOutputAttribute
 734 stub WriteConsoleOutputCharacterA
 735 stub WriteConsoleOutputCharacterW
 736 stub WriteConsoleOutputW
-737 stdcall WriteConsoleW(long ptr long ptr ptr) WriteConsole32W
+737 stdcall WriteConsoleW(long ptr long ptr ptr) WriteConsoleW
 738 stdcall WriteFile(long ptr long ptr ptr) WriteFile
 739 stub WriteFileEx
-740 stdcall WritePrivateProfileSectionA(str str str) WritePrivateProfileSection32A
-741 stdcall WritePrivateProfileSectionW(wstr wstr wstr) WritePrivateProfileSection32W
-742 stdcall WritePrivateProfileStringA(str str str str) WritePrivateProfileString32A
-743 stdcall WritePrivateProfileStringW(wstr wstr wstr wstr) WritePrivateProfileString32W
-744 stdcall WritePrivateProfileStructA (str str ptr long str) WritePrivateProfileStruct32A
-745 stdcall WritePrivateProfileStructW(wstr wstr ptr long wstr) WritePrivateProfileStruct32W
+740 stdcall WritePrivateProfileSectionA(str str str) WritePrivateProfileSectionA
+741 stdcall WritePrivateProfileSectionW(wstr wstr wstr) WritePrivateProfileSectionW
+742 stdcall WritePrivateProfileStringA(str str str str) WritePrivateProfileStringA
+743 stdcall WritePrivateProfileStringW(wstr wstr wstr wstr) WritePrivateProfileStringW
+744 stdcall WritePrivateProfileStructA (str str ptr long str) WritePrivateProfileStructA
+745 stdcall WritePrivateProfileStructW(wstr wstr ptr long wstr) WritePrivateProfileStructW
 746 stdcall WriteProcessMemory(long ptr ptr long ptr) WriteProcessMemory
-747 stdcall WriteProfileSectionA(str str) WriteProfileSection32A
-748 stdcall WriteProfileSectionW(str str) WriteProfileSection32W
-749 stdcall WriteProfileStringA(str str str) WriteProfileString32A
-750 stdcall WriteProfileStringW(wstr wstr wstr) WriteProfileString32W
+747 stdcall WriteProfileSectionA(str str) WriteProfileSectionA
+748 stdcall WriteProfileSectionW(str str) WriteProfileSectionW
+749 stdcall WriteProfileStringA(str str str) WriteProfileStringA
+750 stdcall WriteProfileStringW(wstr wstr wstr) WriteProfileStringW
 751 stub WriteTapemark
 752 stub _DebugOut
 753 stub _DebugPrintf
-754 stdcall _hread(long ptr long) _hread32
-755 stdcall _hwrite(long ptr long) _hwrite32
-756 stdcall _lclose(long) _lclose32
-757 stdcall _lcreat(ptr long) _lcreat32
-758 stdcall _llseek(long long long) _llseek32
-759 stdcall _lopen(str long) _lopen32
-760 stdcall _lread(long ptr long) _lread32
-761 stdcall _lwrite(long ptr long) _lwrite32
+754 stdcall _hread(long ptr long) _hread
+755 stdcall _hwrite(long ptr long) _hwrite
+756 stdcall _lclose(long) _lclose
+757 stdcall _lcreat(ptr long) _lcreat
+758 stdcall _llseek(long long long) _llseek
+759 stdcall _lopen(str long) _lopen
+760 stdcall _lread(long ptr long) _lread
+761 stdcall _lwrite(long ptr long) _lwrite
 762 stub dprintf
-763 stdcall lstrcat(str str) lstrcat32A
-764 stdcall lstrcatA(str str) lstrcat32A
-765 stdcall lstrcatW(wstr wstr) lstrcat32W
-766 stdcall lstrcmp(str str) lstrcmp32A
-767 stdcall lstrcmpA(str str) lstrcmp32A
-768 stdcall lstrcmpW(wstr wstr) lstrcmp32W
-769 stdcall lstrcmpi(str str) lstrcmpi32A
-770 stdcall lstrcmpiA(str str) lstrcmpi32A
-771 stdcall lstrcmpiW(wstr wstr) lstrcmpi32W
-772 stdcall lstrcpy(ptr str) lstrcpy32A
-773 stdcall lstrcpyA(ptr str) lstrcpy32A
-774 stdcall lstrcpyW(ptr wstr) lstrcpy32W
-775 stdcall lstrcpyn(ptr str long) lstrcpyn32A
-776 stdcall lstrcpynA(ptr str long) lstrcpyn32A
-777 stdcall lstrcpynW(ptr wstr long) lstrcpyn32W
-778 stdcall lstrlen(str) lstrlen32A
-779 stdcall lstrlenA(str) lstrlen32A
-780 stdcall lstrlenW(wstr) lstrlen32W
+763 stdcall lstrcat(str str) lstrcatA
+764 stdcall lstrcatA(str str) lstrcatA
+765 stdcall lstrcatW(wstr wstr) lstrcatW
+766 stdcall lstrcmp(str str) lstrcmpA
+767 stdcall lstrcmpA(str str) lstrcmpA
+768 stdcall lstrcmpW(wstr wstr) lstrcmpW
+769 stdcall lstrcmpi(str str) lstrcmpiA
+770 stdcall lstrcmpiA(str str) lstrcmpiA
+771 stdcall lstrcmpiW(wstr wstr) lstrcmpiW
+772 stdcall lstrcpy(ptr str) lstrcpyA
+773 stdcall lstrcpyA(ptr str) lstrcpyA
+774 stdcall lstrcpyW(ptr wstr) lstrcpyW
+775 stdcall lstrcpyn(ptr str long) lstrcpynA
+776 stdcall lstrcpynA(ptr str long) lstrcpynA
+777 stdcall lstrcpynW(ptr wstr long) lstrcpynW
+778 stdcall lstrlen(str) lstrlenA
+779 stdcall lstrlenA(str) lstrlenA
+780 stdcall lstrlenW(wstr) lstrlenW
 # 
 # Functions exported by kernel32.dll in NT 3.51
 # 
@@ -875,8 +875,8 @@ init	MAIN_KernelInit
 # NT 4.0 additions
 856 stub CancelIo
 857 stub CancelWaitableTimer
-858 stdcall CopyFileExA (str str ptr ptr ptr long) CopyFileEx32A
-859 stdcall CopyFileExW (wstr wstr ptr ptr ptr long) CopyFileEx32W
+858 stdcall CopyFileExA (str str ptr ptr ptr long) CopyFileExA
+859 stdcall CopyFileExW (wstr wstr ptr ptr ptr long) CopyFileExW
 860 stub CreateFiber
 861 stub CreateWaitableTimerA
 862 stub CreateWaitableTimerW
@@ -888,10 +888,10 @@ init	MAIN_KernelInit
 868 stub GetConsoleInputExeNameW
 869 stub GetConsoleKeyboardLayoutNameA
 870 stub GetConsoleKeyboardLayoutNameW
-871 stdcall GetDiskFreeSpaceExA (str ptr ptr ptr) GetDiskFreeSpaceEx32A
-873 stdcall GetDiskFreeSpaceExW (wstr ptr ptr ptr) GetDiskFreeSpaceEx32W
-874 stdcall GetFileAttributesExA(str long ptr) GetFileAttributesEx32A
-875 stdcall GetFileAttributesExW(wstr long ptr) GetFileAttributesEx32W
+871 stdcall GetDiskFreeSpaceExA (str ptr ptr ptr) GetDiskFreeSpaceExA
+873 stdcall GetDiskFreeSpaceExW (wstr ptr ptr ptr) GetDiskFreeSpaceExW
+874 stdcall GetFileAttributesExA(str long ptr) GetFileAttributesExA
+875 stdcall GetFileAttributesExW(wstr long ptr) GetFileAttributesExW
 876 stub GetProcessPriorityBoost
 877 stub GetThreadPriorityBoost
 878 stdcall InterlockedCompareExchange (ptr long long) InterlockedCompareExchange
diff --git a/relay32/lz32.spec b/relay32/lz32.spec
index acfd24b3f2b..76f3f02156c 100644
--- a/relay32/lz32.spec
+++ b/relay32/lz32.spec
@@ -1,15 +1,15 @@
 name	lz32
 type	win32
 
-0 stdcall LZCopy(long long) LZCopy32
-1 stdcall LZOpenFileA(str ptr long) LZOpenFile32A
-2 stdcall LZInit(long) LZInit32
-3 stdcall LZSeek(long long long) LZSeek32
-4 stdcall LZRead(long ptr long) LZRead32
-5 stdcall LZClose(long) LZClose32
-6 stdcall LZStart() LZStart32
-7 stdcall CopyLZFile(long long) CopyLZFile32
+0 stdcall LZCopy(long long) LZCopy
+1 stdcall LZOpenFileA(str ptr long) LZOpenFileA
+2 stdcall LZInit(long) LZInit
+3 stdcall LZSeek(long long long) LZSeek
+4 stdcall LZRead(long ptr long) LZRead
+5 stdcall LZClose(long) LZClose
+6 stdcall LZStart() LZStart
+7 stdcall CopyLZFile(long long) CopyLZFile
 8 stdcall LZDone() LZDone
-9 stdcall GetExpandedNameA(str ptr) GetExpandedName32A
-10 stdcall LZOpenFileW(wstr ptr long) LZOpenFile32W
-11 stdcall GetExpandedNameW(wstr ptr) GetExpandedName32W
+9 stdcall GetExpandedNameA(str ptr) GetExpandedNameA
+10 stdcall LZOpenFileW(wstr ptr long) LZOpenFileW
+11 stdcall GetExpandedNameW(wstr ptr) GetExpandedNameW
diff --git a/relay32/mpr.spec b/relay32/mpr.spec
index 09fa6f4850e..077c4b4ba38 100644
--- a/relay32/mpr.spec
+++ b/relay32/mpr.spec
@@ -25,15 +25,15 @@ type win32
 0022 stdcall MPR_22(long) _MPR_22
 0023 stub MPR_23
 0024 stub MPR_24
-0025 stdcall MultinetGetConnectionPerformanceA(ptr ptr) MultinetGetConnectionPerformance32A
+0025 stdcall MultinetGetConnectionPerformanceA(ptr ptr) MultinetGetConnectionPerformanceA
 0026 stub MultinetGetConnectionPerformanceW
-0027 stdcall MultinetGetErrorTextA(long ptr long)MultinetGetErrorText32A
-0028 stdcall MultinetGetErrorTextW(long ptr long)MultinetGetErrorText32W
+0027 stdcall MultinetGetErrorTextA(long ptr long)MultinetGetErrorTextA
+0028 stdcall MultinetGetErrorTextW(long ptr long)MultinetGetErrorTextW
 0029 stub NPSAuthenticationDialogA
 0030 stub NPSCopyStringA
 0031 stub NPSDeviceGetNumberA
 0032 stub NPSDeviceGetStringA
-0033 stdcall NPSGetProviderHandleA(long) NPSGetProviderHandle32A
+0033 stdcall NPSGetProviderHandleA(long) NPSGetProviderHandleA
 0034 stub NPSGetProviderNameA
 0035 stub NPSGetSectionNameA
 0036 stub NPSNotifyGetContextA
@@ -46,32 +46,32 @@ type win32
 0043 stub PwdGetPasswordStatusW
 0044 stub PwdSetPasswordStatusA
 0045 stub PwdSetPasswordStatusW
-0046 stdcall WNetAddConnection2A(ptr str str long) WNetAddConnection2_32A
-0047 stdcall WNetAddConnection2W(ptr wstr wstr long) WNetAddConnection2_32W
-0048 stdcall WNetAddConnection3A(long ptr str str long) WNetAddConnection3_32A
-0049 stdcall WNetAddConnection3W(long ptr wstr wstr long) WNetAddConnection3_32W
-0050 stdcall WNetAddConnectionA(str str str) WNetAddConnection32A
-0051 stdcall WNetAddConnectionW(wstr wstr wstr) WNetAddConnection32W
+0046 stdcall WNetAddConnection2A(ptr str str long) WNetAddConnection2A
+0047 stdcall WNetAddConnection2W(ptr wstr wstr long) WNetAddConnection2W
+0048 stdcall WNetAddConnection3A(long ptr str str long) WNetAddConnection3A
+0049 stdcall WNetAddConnection3W(long ptr wstr wstr long) WNetAddConnection3W
+0050 stdcall WNetAddConnectionA(str str str) WNetAddConnectionA
+0051 stdcall WNetAddConnectionW(wstr wstr wstr) WNetAddConnectionW
 0052 stdcall WNetCachePassword(str long str long long) WNetCachePassword
-0053 stdcall WNetCancelConnection2A(str long long) WNetCancelConnection232A
-0054 stdcall WNetCancelConnection2W(wstr long long) WNetCancelConnection232W
-0055 stdcall WNetCancelConnectionA(str long) WNetCancelConnection32A
-0056 stdcall WNetCancelConnectionW(wstr long) WNetCancelConnection32W
+0053 stdcall WNetCancelConnection2A(str long long) WNetCancelConnection2A
+0054 stdcall WNetCancelConnection2W(wstr long long) WNetCancelConnection2W
+0055 stdcall WNetCancelConnectionA(str long) WNetCancelConnectionA
+0056 stdcall WNetCancelConnectionW(wstr long) WNetCancelConnectionW
 0057 stub WNetCloseEnum
-0058 stdcall WNetConnectionDialog1A(ptr) WNetConnectionDialog1_32A
-0059 stdcall WNetConnectionDialog1W(ptr) WNetConnectionDialog1_32W
-0060 stdcall WNetConnectionDialog(long long) WNetConnectionDialog_32
+0058 stdcall WNetConnectionDialog1A(ptr) WNetConnectionDialog1A
+0059 stdcall WNetConnectionDialog1W(ptr) WNetConnectionDialog1W
+0060 stdcall WNetConnectionDialog(long long) WNetConnectionDialog
 0061 stub WNetDisconnectDialog1A
 0062 stub WNetDisconnectDialog1W
 0063 stub WNetDisconnectDialog
-0064 stdcall WNetEnumCachedPasswords(str long long ptr) WNetEnumCachedPasswords32
+0064 stdcall WNetEnumCachedPasswords(str long long ptr) WNetEnumCachedPasswords
 0065 stub WNetEnumResourceA
 0066 stub WNetEnumResourceW
 0067 stub WNetFormatNetworkNameA
 0068 stub WNetFormatNetworkNameW
 0069 stdcall WNetGetCachedPassword(ptr long ptr ptr long) WNetGetCachedPassword
-0070 stdcall WNetGetConnectionA(str ptr ptr) WNetGetConnection32A
-0071 stdcall WNetGetConnectionW(wstr ptr ptr) WNetGetConnection32W
+0070 stdcall WNetGetConnectionA(str ptr ptr) WNetGetConnectionA
+0071 stdcall WNetGetConnectionW(wstr ptr ptr) WNetGetConnectionW
 0072 stub WNetGetHomeDirectoryA
 0073 stub WNetGetHomeDirectoryW
 0074 stub WNetGetLastErrorA
@@ -80,20 +80,20 @@ type win32
 0077 stub WNetGetNetworkInformationW
 0078 stub WNetGetProviderNameA
 0079 stub WNetGetProviderNameW
-0080 stdcall WNetGetResourceInformationA(ptr ptr ptr ptr) WNetGetResourceInformation32A
+0080 stdcall WNetGetResourceInformationA(ptr ptr ptr ptr) WNetGetResourceInformationA
 0081 stub WNetGetResourceInformationW
 0082 stub WNetGetResourceParentA
 0083 stub WNetGetResourceParentW
 0084 stub WNetGetUniversalNameA
 0085 stub WNetGetUniversalNameW
-0086 stdcall WNetGetUserA(str ptr ptr) WNetGetUser32A
-0087 stdcall WNetGetUserW(wstr wstr ptr) WNetGetUser32W
+0086 stdcall WNetGetUserA(str ptr ptr) WNetGetUserA
+0087 stdcall WNetGetUserW(wstr wstr ptr) WNetGetUserW
 0088 stub WNetLogoffA
 0089 stub WNetLogoffW
 0090 stub WNetLogonA
 0091 stub WNetLogonW
-0092 stdcall WNetOpenEnumA(long long long ptr ptr) WNetOpenEnum32A
-0093 stdcall WNetOpenEnumW(long long long ptr ptr) WNetOpenEnum32W
+0092 stdcall WNetOpenEnumA(long long long ptr ptr) WNetOpenEnumA
+0093 stdcall WNetOpenEnumW(long long long ptr ptr) WNetOpenEnumW
 0094 stub WNetRemoveCachedPassword
 0095 stub WNetRestoreConnectionA
 0096 stub WNetRestoreConnectionW
diff --git a/relay32/msacm32.spec b/relay32/msacm32.spec
index 1a8b2d82b1a..d4a70b9beed 100644
--- a/relay32/msacm32.spec
+++ b/relay32/msacm32.spec
@@ -3,46 +3,46 @@ type win32
 init MSACM32_LibMain
 
  1 stub XRegThunkEntry
- 2 stdcall acmDriverAddA(ptr long long long long) acmDriverAdd32A
- 3 stdcall acmDriverAddW(ptr long long long long) acmDriverAdd32W
- 4 stdcall acmDriverClose(long long) acmDriverClose32
- 5 stdcall acmDriverDetailsA(long ptr long) acmDriverDetails32A
- 6 stdcall acmDriverDetailsW(long ptr long) acmDriverDetails32W
- 7 stdcall acmDriverEnum(ptr long long) acmDriverEnum32
- 8 stdcall acmDriverID(long ptr long) acmDriverID32
- 9 stdcall acmDriverMessage(long long long long) acmDriverMessage32
-10 stdcall acmDriverOpen(ptr long long) acmDriverOpen32
-11 stdcall acmDriverPriority(long long long) acmDriverPriority32
-12 stdcall acmDriverRemove(long long) acmDriverRemove32
-13 stdcall acmFilterChooseA(ptr) acmFilterChoose32A
-14 stdcall acmFilterChooseW(ptr) acmFilterChoose32W
-15 stdcall acmFilterDetailsA(long ptr long) acmFilterDetails32A
-16 stdcall acmFilterDetailsW(long ptr long) acmFilterDetails32W
-17 stdcall acmFilterEnumA(long ptr ptr long long) acmFilterEnum32A
-18 stdcall acmFilterEnumW(long ptr ptr long long) acmFilterEnum32W
-19 stdcall acmFilterTagDetailsA(long ptr long) acmFilterTagDetails32A
-20 stdcall acmFilterTagDetailsW(long ptr long) acmFilterTagDetails32W
-21 stdcall acmFilterTagEnumA(long ptr ptr long long) acmFilterTagEnum32A
-22 stdcall acmFilterTagEnumW(long ptr ptr long long) acmFilterTagEnum32W
-23 stdcall acmFormatChooseA(ptr) acmFormatChoose32A
-24 stdcall acmFormatChooseW(ptr) acmFormatChoose32W
-25 stdcall acmFormatDetailsA(long ptr long) acmFormatDetails32A
-26 stdcall acmFormatDetailsW(long ptr long) acmFormatDetails32W
-27 stdcall acmFormatEnumA(long ptr ptr long long) acmFormatEnum32A
-28 stdcall acmFormatEnumW(long ptr ptr long long) acmFormatEnum32W
-29 stdcall acmFormatSuggest(long ptr ptr long long) acmFormatSuggest32
-30 stdcall acmFormatTagDetailsA(long ptr long) acmFormatTagDetails32A
-31 stdcall acmFormatTagDetailsW(long ptr long) acmFormatTagDetails32W
-32 stdcall acmFormatTagEnumA(long ptr ptr long long) acmFormatTagEnum32A
-33 stdcall acmFormatTagEnumW(long ptr ptr long long) acmFormatTagEnum32W
-34 stdcall acmGetVersion() acmGetVersion32
+ 2 stdcall acmDriverAddA(ptr long long long long) acmDriverAddA
+ 3 stdcall acmDriverAddW(ptr long long long long) acmDriverAddW
+ 4 stdcall acmDriverClose(long long) acmDriverClose
+ 5 stdcall acmDriverDetailsA(long ptr long) acmDriverDetailsA
+ 6 stdcall acmDriverDetailsW(long ptr long) acmDriverDetailsW
+ 7 stdcall acmDriverEnum(ptr long long) acmDriverEnum
+ 8 stdcall acmDriverID(long ptr long) acmDriverID
+ 9 stdcall acmDriverMessage(long long long long) acmDriverMessage
+10 stdcall acmDriverOpen(ptr long long) acmDriverOpen
+11 stdcall acmDriverPriority(long long long) acmDriverPriority
+12 stdcall acmDriverRemove(long long) acmDriverRemove
+13 stdcall acmFilterChooseA(ptr) acmFilterChooseA
+14 stdcall acmFilterChooseW(ptr) acmFilterChooseW
+15 stdcall acmFilterDetailsA(long ptr long) acmFilterDetailsA
+16 stdcall acmFilterDetailsW(long ptr long) acmFilterDetailsW
+17 stdcall acmFilterEnumA(long ptr ptr long long) acmFilterEnumA
+18 stdcall acmFilterEnumW(long ptr ptr long long) acmFilterEnumW
+19 stdcall acmFilterTagDetailsA(long ptr long) acmFilterTagDetailsA
+20 stdcall acmFilterTagDetailsW(long ptr long) acmFilterTagDetailsW
+21 stdcall acmFilterTagEnumA(long ptr ptr long long) acmFilterTagEnumA
+22 stdcall acmFilterTagEnumW(long ptr ptr long long) acmFilterTagEnumW
+23 stdcall acmFormatChooseA(ptr) acmFormatChooseA
+24 stdcall acmFormatChooseW(ptr) acmFormatChooseW
+25 stdcall acmFormatDetailsA(long ptr long) acmFormatDetailsA
+26 stdcall acmFormatDetailsW(long ptr long) acmFormatDetailsW
+27 stdcall acmFormatEnumA(long ptr ptr long long) acmFormatEnumA
+28 stdcall acmFormatEnumW(long ptr ptr long long) acmFormatEnumW
+29 stdcall acmFormatSuggest(long ptr ptr long long) acmFormatSuggest
+30 stdcall acmFormatTagDetailsA(long ptr long) acmFormatTagDetailsA
+31 stdcall acmFormatTagDetailsW(long ptr long) acmFormatTagDetailsW
+32 stdcall acmFormatTagEnumA(long ptr ptr long long) acmFormatTagEnumA
+33 stdcall acmFormatTagEnumW(long ptr ptr long long) acmFormatTagEnumW
+34 stdcall acmGetVersion() acmGetVersion
 35 stub acmMessage32
-36 stdcall acmMetrics(long long ptr) acmMetrics32
-37 stdcall acmStreamClose(long long) acmStreamClose32
-38 stdcall acmStreamConvert(long ptr long) acmStreamConvert32
-39 stdcall acmStreamMessage(long long long long) acmStreamMessage32
-40 stdcall acmStreamOpen(ptr long ptr ptr ptr long long long) acmStreamOpen32
-41 stdcall acmStreamPrepareHeader(long ptr long) acmStreamPrepareHeader32
-42 stdcall acmStreamReset(long long) acmStreamReset32
-43 stdcall acmStreamSize(long long ptr long) acmStreamSize32
-44 stdcall acmStreamUnprepareHeader(long ptr long) acmStreamUnprepareHeader32
+36 stdcall acmMetrics(long long ptr) acmMetrics
+37 stdcall acmStreamClose(long long) acmStreamClose
+38 stdcall acmStreamConvert(long ptr long) acmStreamConvert
+39 stdcall acmStreamMessage(long long long long) acmStreamMessage
+40 stdcall acmStreamOpen(ptr long ptr ptr ptr long long long) acmStreamOpen
+41 stdcall acmStreamPrepareHeader(long ptr long) acmStreamPrepareHeader
+42 stdcall acmStreamReset(long long) acmStreamReset
+43 stdcall acmStreamSize(long long ptr long) acmStreamSize
+44 stdcall acmStreamUnprepareHeader(long ptr long) acmStreamUnprepareHeader
diff --git a/relay32/msvfw32.spec b/relay32/msvfw32.spec
index 0ea93c6c961..c34562791f3 100644
--- a/relay32/msvfw32.spec
+++ b/relay32/msvfw32.spec
@@ -12,7 +12,7 @@ type	win32
   7 stub    DrawDibEnd
   8 stub    DrawDibGetBuffer
   9 stub    DrawDibGetPalette
- 10 stdcall DrawDibOpen() DrawDibOpen32
+ 10 stdcall DrawDibOpen() DrawDibOpen
  11 stub    DrawDibProfileDisplay
  12 stub    DrawDibRealize
  13 stub    DrawDibSetPalette
@@ -24,31 +24,31 @@ type	win32
  19 stub    GetOpenFileNamePreviewW
  20 stub    GetSaveFileNamePreviewA
  21 stub    GetSaveFileNamePreviewW
- 22 stdcall ICClose(long) ICClose32
- 23 cdecl   ICCompress(long long ptr ptr ptr ptr ptr ptr long long long ptr ptr) ICCompress32
+ 22 stdcall ICClose(long) ICClose
+ 23 cdecl   ICCompress(long long ptr ptr ptr ptr ptr ptr long long long ptr ptr) ICCompress
  24 stub    ICCompressorChoose
  25 stub    ICCompressorFree
- 26 cdecl   ICDecompress(long long ptr ptr ptr ptr) ICDecompress32
+ 26 cdecl   ICDecompress(long long ptr ptr ptr ptr) ICDecompress
  27 stub    ICDraw 	# CDECL too
- 28 cdecl   ICDrawBegin(long long long long long long long long long ptr long long long long long long) ICDrawBegin32
+ 28 cdecl   ICDrawBegin(long long long long long long long long long ptr long long long long long long) ICDrawBegin
  29 stub    ICGetDisplayFormat
- 30 stdcall ICGetInfo(long ptr long) ICGetInfo32
+ 30 stdcall ICGetInfo(long ptr long) ICGetInfo
  31 stub    ICImageCompress
  32 stub    ICImageDecompress
- 33 stdcall ICInfo(long long ptr) ICInfo32
+ 33 stdcall ICInfo(long long ptr) ICInfo
  34 stub    ICInstall
- 35 stdcall ICLocate(long long ptr ptr long) ICLocate32
+ 35 stdcall ICLocate(long long ptr ptr long) ICLocate
  36 stub    ICMThunk32
- 37 stdcall ICOpen(long long long) ICOpen32
+ 37 stdcall ICOpen(long long long) ICOpen
  38 stub    ICOpenFunction
  39 stub    ICRemove
- 40 stdcall ICSendMessage(long long long long) ICSendMessage32
+ 40 stdcall ICSendMessage(long long long long) ICSendMessage
  41 stub    ICSeqCompressFrame
  42 stub    ICSeqCompressFrameEnd
  43 stub    ICSeqCompressFrameStart
- 44 cdecl   MCIWndCreate (long long long ptr) MCIWndCreate32
- 45 cdecl   MCIWndCreateA (long long long str) MCIWndCreate32A
- 46 cdecl   MCIWndCreateW (long long long wstr) MCIWndCreate32W
+ 44 cdecl   MCIWndCreate (long long long ptr) MCIWndCreate
+ 45 cdecl   MCIWndCreateA (long long long str) MCIWndCreateA
+ 46 cdecl   MCIWndCreateW (long long long wstr) MCIWndCreateW
  47 stub    MCIWndRegisterClass
  48 stub    StretchDIB
  49 stub    ls_ThunkData32
diff --git a/relay32/ntdll.spec b/relay32/ntdll.spec
index ad367ac74c6..fd43bd7326e 100644
--- a/relay32/ntdll.spec
+++ b/relay32/ntdll.spec
@@ -916,7 +916,7 @@ type	win32
 908 stub pow
 909 stub qsort
 910 stub sin
-911 varargs sprintf() wsprintf32A
+911 varargs sprintf() wsprintfA
 912 stub sqrt
 913 varargs sscanf() sscanf
 914 cdecl strcat(str str) strcat
@@ -932,7 +932,7 @@ type	win32
 924 cdecl strrchr(str long) strrchr
 925 cdecl strspn(str str) strspn
 926 cdecl strstr(str str) strstr
-927 varargs swprintf() wsprintf32W
+927 varargs swprintf() wsprintfW
 928 stub tan
 929 cdecl tolower(long) tolower
 930 cdecl toupper(long) toupper
diff --git a/relay32/ole32.spec b/relay32/ole32.spec
index 3f0fa5000c5..6a251fa2cd0 100644
--- a/relay32/ole32.spec
+++ b/relay32/ole32.spec
@@ -2,8 +2,8 @@ name	ole32
 type	win32
 
   1 stub BindMoniker                # stdcall (ptr long ptr ptr) return 0,ERR_NOTIMPLEMENTED
-  2 stdcall CLSIDFromProgID(wstr ptr) CLSIDFromProgID32
-  3 stdcall CLSIDFromString(wstr ptr) CLSIDFromString32
+  2 stdcall CLSIDFromProgID(wstr ptr) CLSIDFromProgID
+  3 stdcall CLSIDFromString(wstr ptr) CLSIDFromString
   4 stdcall CoBuildVersion() CoBuildVersion
   5 stub CoCreateFreeThreadedMarshaler # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
   6 stdcall CoCreateGuid(ptr) CoCreateGuid
@@ -20,52 +20,52 @@ type	win32
  17 stub CoGetCurrentLogicalThreadId
  18 stdcall CoGetCurrentProcess() CoGetCurrentProcess
  19 stub CoGetInterfaceAndReleaseStream # stdcall (ptr ptr ptr) return 0,ERR_NOTIMPLEMENTED
- 20 stdcall CoGetMalloc(long ptr) CoGetMalloc32
+ 20 stdcall CoGetMalloc(long ptr) CoGetMalloc
  21 stub CoGetMarshalSizeMax        # stdcall (ptr ptr ptr long ptr long) return 0,ERR_NOTIMPLEMENTED
  22 stub CoGetPSClsid               # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
  23 stub CoGetStandardMarshal       # stdcall (ptr ptr long ptr long ptr) return 0,ERR_NOTIMPLEMENTED
  24 stub CoGetState
  25 stub CoGetTreatAsClass          # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
- 26 stdcall CoInitialize(ptr) CoInitialize32
+ 26 stdcall CoInitialize(ptr) CoInitialize
  27 stdcall CoInitializeWOW(long long) CoInitializeWOW
  28 stub CoIsHandlerConnected       # stdcall (ptr) return 0,ERR_NOTIMPLEMENTED
  29 stub CoIsOle1Class              # stdcall (ptr) return 0,ERR_NOTIMPLEMENTED
  30 stdcall CoLoadLibrary(wstr long) CoLoadLibrary
- 31 stdcall CoLockObjectExternal(ptr long long) CoLockObjectExternal32
+ 31 stdcall CoLockObjectExternal(ptr long long) CoLockObjectExternal
  32 stub CoMarshalHresult           # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
  33 stub CoMarshalInterThreadInterfaceInStream # stdcall (ptr ptr ptr) return 0,ERR_NOTIMPLEMENTED
  34 stub CoMarshalInterface         # stdcall (ptr ptr ptr long ptr long) return 0,ERR_NOTIMPLEMENTED
  35 stub CoQueryReleaseObject
- 36 stdcall CoRegisterClassObject(ptr ptr long long ptr) CoRegisterClassObject32
+ 36 stdcall CoRegisterClassObject(ptr ptr long long ptr) CoRegisterClassObject
  37 stub CoRegisterMallocSpy        # stdcall (ptr) return 0,ERR_NOTIMPLEMENTED
- 38 stdcall CoRegisterMessageFilter(ptr ptr) CoRegisterMessageFilter32
+ 38 stdcall CoRegisterMessageFilter(ptr ptr) CoRegisterMessageFilter
  39 stub CoReleaseMarshalData       # stdcall (ptr) return 0,ERR_NOTIMPLEMENTED
- 40 stdcall CoRevokeClassObject(long) CoRevokeClassObject32
+ 40 stdcall CoRevokeClassObject(long) CoRevokeClassObject
  41 stub CoRevokeMallocSpy          # stdcall () return 0,ERR_NOTIMPLEMENTED
- 42 stdcall CoSetState(ptr) CoSetState32
+ 42 stdcall CoSetState(ptr) CoSetState
  43 stdcall CoTaskMemAlloc(long) CoTaskMemAlloc
  44 stdcall CoTaskMemFree(ptr) CoTaskMemFree
  45 stub CoTaskMemRealloc           # stdcall (ptr long) return 0,ERR_NOTIMPLEMENTED
  46 stub CoTreatAsClass             # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
- 47 stdcall CoUninitialize() CoUninitialize32
+ 47 stdcall CoUninitialize() CoUninitialize
  48 stub CoUnloadingWOW
  49 stub CoUnmarshalHresult         # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
  50 stub CoUnmarshalInterface       # stdcall (ptr ptr ptr) return 0,ERR_NOTIMPLEMENTED
  51 stub CreateAntiMoniker          # stdcall (ptr) return 0,ERR_NOTIMPLEMENTED
- 52 stdcall CreateBindCtx(long ptr) CreateBindCtx32
+ 52 stdcall CreateBindCtx(long ptr) CreateBindCtx
  53 stub CreateDataAdviseHolder     # stdcall (ptr) return 0,ERR_NOTIMPLEMENTED
  54 stub CreateDataCache            # stdcall (ptr ptr ptr ptr) return 0,ERR_NOTIMPLEMENTED
- 55 stdcall CreateFileMoniker(wstr ptr) CreateFileMoniker32
+ 55 stdcall CreateFileMoniker(wstr ptr) CreateFileMoniker
  56 stub CreateGenericComposite     # stdcall (ptr ptr ptr) return 0,ERR_NOTIMPLEMENTED
  57 stub CreateILockBytesOnHGlobal  # stdcall (ptr long ptr) return 0,ERR_NOTIMPLEMENTED
- 58 stdcall CreateItemMoniker(wstr wstr ptr) CreateItemMoniker32
- 59 stdcall CreateOleAdviseHolder(ptr) CreateOleAdviseHolder32
+ 58 stdcall CreateItemMoniker(wstr wstr ptr) CreateItemMoniker
+ 59 stdcall CreateOleAdviseHolder(ptr) CreateOleAdviseHolder
  60 stub CreatePointerMoniker       # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
  61 stub CreateStreamOnHGlobal      # stdcall (ptr long ptr) return 0,ERR_NOTIMPLEMENTED
  62 stub DllDebugObjectRPCHook
  63 stub DllGetClassObject
  64 stub DllGetClassObjectWOW
- 65 stdcall DoDragDrop(ptr ptr long ptr) DoDragDrop32
+ 65 stdcall DoDragDrop(ptr ptr long ptr) DoDragDrop
  66 stub EnableHookObject
  67 stub GetClassFile
  68 stub GetConvertStg
@@ -73,12 +73,12 @@ type	win32
  70 stub GetHGlobalFromILockBytes
  71 stub GetHGlobalFromStream
  72 stub GetHookInterface
- 73 stdcall GetRunningObjectTable(long ptr) GetRunningObjectTable32
+ 73 stdcall GetRunningObjectTable(long ptr) GetRunningObjectTable
  74 stub IIDFromString
  75 stub IsAccelerator
  76 stdcall IsEqualGUID(ptr ptr) IsEqualGUID32
  77 stub IsValidIid
- 78 stdcall IsValidInterface(ptr) IsValidInterface32
+ 78 stdcall IsValidInterface(ptr) IsValidInterface
  79 stub IsValidPtrIn
  80 stub IsValidPtrOut
  81 stub MkParseDisplayName
@@ -110,7 +110,7 @@ type	win32
 107 stub OleGetIconOfFile
 108 stdcall OleInitialize(ptr) OleInitialize
 109 stdcall OleInitializeWOW(long) OleInitializeWOW
-110 stdcall OleIsCurrentClipboard(ptr) OleIsCurrentClipboard32
+110 stdcall OleIsCurrentClipboard(ptr) OleIsCurrentClipboard
 111 stub OleIsRunning
 112 stub OleLoad
 113 stub OleLoadFromStream
@@ -122,7 +122,7 @@ type	win32
 119 stub OleRegEnumFormatEtc
 120 stub OleRegEnumVerbs
 121 stdcall OleRegGetMiscStatus(ptr long ptr) OleRegGetMiscStatus32
-122 stdcall OleRegGetUserType(long long ptr) OleRegGetUserType32
+122 stdcall OleRegGetUserType(long long ptr) OleRegGetUserType
 123 stub OleRun
 124 stub OleSave
 125 stub OleSaveToStream
@@ -139,31 +139,31 @@ type	win32
 136 stub ReadFmtUserTypeStg
 137 stub ReadOleStg
 138 stub ReadStringStream
-139 stdcall RegisterDragDrop(long ptr) RegisterDragDrop32
+139 stdcall RegisterDragDrop(long ptr) RegisterDragDrop
 140 stub ReleaseStgMedium
-141 stdcall RevokeDragDrop(long) RevokeDragDrop32
+141 stdcall RevokeDragDrop(long) RevokeDragDrop
 142 stub SetConvertStg
 143 stub SetDocumentBitStg
-144 stdcall StgCreateDocfile(wstr long long ptr) StgCreateDocfile32
+144 stdcall StgCreateDocfile(wstr long long ptr) StgCreateDocfile
 145 stub StgCreateDocfileOnILockBytes
-146 stdcall StgIsStorageFile(wstr) StgIsStorageFile32
+146 stdcall StgIsStorageFile(wstr) StgIsStorageFile
 147 stub StgIsStorageILockBytes
-148 stdcall StgOpenStorage(wstr ptr long ptr long ptr) StgOpenStorage32
+148 stdcall StgOpenStorage(wstr ptr long ptr long ptr) StgOpenStorage
 149 stub StgOpenStorageOnILockBytes
 150 stub StgSetTimes
-151 stdcall StringFromCLSID(ptr ptr) StringFromCLSID32
+151 stdcall StringFromCLSID(ptr ptr) StringFromCLSID
 152 stdcall StringFromGUID2(ptr ptr long) StringFromGUID2
-153 stdcall StringFromIID(ptr ptr) StringFromCLSID32
+153 stdcall StringFromIID(ptr ptr) StringFromCLSID
 154 stub UtConvertDvtd16toDvtd32
 155 stub UtConvertDvtd32toDvtd16
 156 stub UtGetDvtd16Info
 157 stub UtGetDvtd32Info
-158 stdcall WriteClassStg(ptr ptr) WriteClassStg32
+158 stdcall WriteClassStg(ptr ptr) WriteClassStg
 159 stub WriteClassStm
 160 stub WriteFmtUserTypeStg
 161 stub WriteOleStg
 162 stub WriteStringStream
-163 stdcall CoInitializeEx(ptr long) CoInitializeEx32
+163 stdcall CoInitializeEx(ptr long) CoInitializeEx
 164 stub CoInitializeSecurity       # stdcall (ptr long ptr ptr long long ptr long ptr) return 0,ERR_NOTIMPLEMENTED
 165 stub CoCreateInstanceEx         # stdcall (ptr ptr long ptr long ptr) return 0,ERR_NOTIMPLEMENTED
 166 stub PropVariantClear
diff --git a/relay32/oleaut32.spec b/relay32/oleaut32.spec
index a4cb6a91077..a125ff0a099 100644
--- a/relay32/oleaut32.spec
+++ b/relay32/oleaut32.spec
@@ -2,32 +2,32 @@ name oleaut32
 type win32
 
 1 stub DllGetClassObject
-2 stdcall SysAllocString(wstr) SysAllocString32
-3 stdcall SysReAllocString(ptr wstr) SysReAllocString32
-4 stdcall SysAllocStringLen(wstr long) SysAllocStringLen32
-5 stdcall SysReAllocStringLen(ptr ptr long) SysReAllocStringLen32
-6 stdcall SysFreeString(wstr) SysFreeString32
-7 stdcall SysStringLen(wstr) SysStringLen32
-8 stdcall VariantInit(ptr) VariantInit32
-9 stdcall VariantClear(ptr) VariantClear32
-10 stdcall VariantCopy(ptr ptr) VariantCopy32
-11 stdcall VariantCopyInd(ptr ptr) VariantCopyInd32
-12 stdcall VariantChangeType(ptr ptr) VariantChangeType32
+2 stdcall SysAllocString(wstr) SysAllocString
+3 stdcall SysReAllocString(ptr wstr) SysReAllocString
+4 stdcall SysAllocStringLen(wstr long) SysAllocStringLen
+5 stdcall SysReAllocStringLen(ptr ptr long) SysReAllocStringLen
+6 stdcall SysFreeString(wstr) SysFreeString
+7 stdcall SysStringLen(wstr) SysStringLen
+8 stdcall VariantInit(ptr) VariantInit
+9 stdcall VariantClear(ptr) VariantClear
+10 stdcall VariantCopy(ptr ptr) VariantCopy
+11 stdcall VariantCopyInd(ptr ptr) VariantCopyInd
+12 stdcall VariantChangeType(ptr ptr) VariantChangeType
 13 stub VariantTimeToDosDateTime
 14 stub DosDateTimeToVariantTime
-15 stdcall SafeArrayCreate(long long ptr) SafeArrayCreate32
-16 stdcall SafeArrayDestroy(ptr) SafeArrayDestroy32
-17 stdcall SafeArrayGetDim(ptr) SafeArrayGetDim32
-18 stdcall SafeArrayGetElemsize(ptr) SafeArrayGetElemsize32
-19 stdcall SafeArrayGetUBound(ptr long long) SafeArrayGetUBound32
-20 stdcall SafeArrayGetLBound(ptr long long) SafeArrayGetLBound32
-21 stdcall SafeArrayLock(ptr) SafeArrayLock32
-22 stdcall SafeArrayUnlock(ptr) SafeArrayUnlock32
-23 stdcall SafeArrayAccessData(ptr ptr) SafeArrayAccessData32
-24 stdcall SafeArrayUnaccessData(ptr) SafeArrayUnaccessData32
-25 stdcall SafeArrayGetElement(ptr ptr ptr) SafeArrayGetElement32
-26 stdcall SafeArrayPutElement(ptr ptr ptr) SafeArrayPutElement32
-27 stdcall SafeArrayCopy(ptr ptr) SafeArrayCopy32
+15 stdcall SafeArrayCreate(long long ptr) SafeArrayCreate
+16 stdcall SafeArrayDestroy(ptr) SafeArrayDestroy
+17 stdcall SafeArrayGetDim(ptr) SafeArrayGetDim
+18 stdcall SafeArrayGetElemsize(ptr) SafeArrayGetElemsize
+19 stdcall SafeArrayGetUBound(ptr long long) SafeArrayGetUBound
+20 stdcall SafeArrayGetLBound(ptr long long) SafeArrayGetLBound
+21 stdcall SafeArrayLock(ptr) SafeArrayLock
+22 stdcall SafeArrayUnlock(ptr) SafeArrayUnlock
+23 stdcall SafeArrayAccessData(ptr ptr) SafeArrayAccessData
+24 stdcall SafeArrayUnaccessData(ptr) SafeArrayUnaccessData
+25 stdcall SafeArrayGetElement(ptr ptr ptr) SafeArrayGetElement
+26 stdcall SafeArrayPutElement(ptr ptr ptr) SafeArrayPutElement
+27 stdcall SafeArrayCopy(ptr ptr) SafeArrayCopy
 28 stub DispGetParam
 29 stub DispGetIDsOfNames
 30 stub DispInvoke
@@ -36,105 +36,105 @@ type win32
 33 stub RegisterActiveObject
 34 stub RevokeActiveObject
 35 stub GetActiveObject
-36 stdcall SafeArrayAllocDescriptor(long ptr) SafeArrayAllocDescriptor32
-37 stdcall SafeArrayAllocData(ptr) SafeArrayAllocData32
-38 stdcall SafeArrayDestroyDescriptor(ptr) SafeArrayDestroyDescriptor32
-39 stdcall SafeArrayDestroyData(ptr) SafeArrayDestroyData32
-40 stdcall SafeArrayRedim(ptr ptr) SafeArrayRedim32
+36 stdcall SafeArrayAllocDescriptor(long ptr) SafeArrayAllocDescriptor
+37 stdcall SafeArrayAllocData(ptr) SafeArrayAllocData
+38 stdcall SafeArrayDestroyDescriptor(ptr) SafeArrayDestroyDescriptor
+39 stdcall SafeArrayDestroyData(ptr) SafeArrayDestroyData
+40 stdcall SafeArrayRedim(ptr ptr) SafeArrayRedim
 41 stub OACreateTypeLib2
 46 stub VarParseNumFromStr
 47 stub VarNumFromParseNum
-48 stdcall VarI2FromUI1(long ptr) VarI2FromUI132
-49 stdcall VarI2FromI4(long ptr) VarI2FromI432
-50 stdcall VarI2FromR4(long ptr) VarI2FromR432
-51 stdcall VarI2FromR8(double ptr) VarI2FromR832
-52 stdcall VarI2FromCy(double ptr) VarI2FromCy32
-53 stdcall VarI2FromDate(long ptr) VarI2FromDate32
-54 stdcall VarI2FromStr(wstr long long ptr) VarI2FromStr32
+48 stdcall VarI2FromUI1(long ptr) VarI2FromUI1
+49 stdcall VarI2FromI4(long ptr) VarI2FromI4
+50 stdcall VarI2FromR4(long ptr) VarI2FromR4
+51 stdcall VarI2FromR8(double ptr) VarI2FromR8
+52 stdcall VarI2FromCy(double ptr) VarI2FromCy
+53 stdcall VarI2FromDate(long ptr) VarI2FromDate
+54 stdcall VarI2FromStr(wstr long long ptr) VarI2FromStr
 55 stub VarI2FromDisp
-56 stdcall VarI2FromBool(long ptr) VarI2FromBool32
-58 stdcall VarI4FromUI1(long ptr) VarI4FromUI132
-59 stdcall VarI4FromI2(long ptr) VarI4FromI232
-60 stdcall VarI4FromR4(long ptr) VarI4FromR432
-61 stdcall VarI4FromR8(double ptr) VarI4FromR832
-62 stdcall VarI4FromCy(double ptr) VarI4FromCy32
-63 stdcall VarI4FromDate(long ptr) VarI4FromDate32
-64 stdcall VarI4FromStr(wstr long long ptr) VarI4FromStr32
+56 stdcall VarI2FromBool(long ptr) VarI2FromBool
+58 stdcall VarI4FromUI1(long ptr) VarI4FromUI1
+59 stdcall VarI4FromI2(long ptr) VarI4FromI2
+60 stdcall VarI4FromR4(long ptr) VarI4FromR4
+61 stdcall VarI4FromR8(double ptr) VarI4FromR8
+62 stdcall VarI4FromCy(double ptr) VarI4FromCy
+63 stdcall VarI4FromDate(long ptr) VarI4FromDate
+64 stdcall VarI4FromStr(wstr long long ptr) VarI4FromStr
 65 stub VarI4FromDisp
-66 stdcall VarI4FromBool(long ptr) VarI4FromBool32
-68 stdcall VarR4FromUI1(long ptr) VarR4FromUI132
-69 stdcall VarR4FromI2(long ptr) VarR4FromI232
-70 stdcall VarR4FromI4(long ptr) VarR4FromI432
-71 stdcall VarR4FromR8(double ptr) VarR4FromR832
-72 stdcall VarR4FromCy(double ptr) VarR4FromCy32
-73 stdcall VarR4FromDate(long ptr) VarR4FromDate32
-74 stdcall VarR4FromStr(wstr long long ptr) VarR4FromStr32
+66 stdcall VarI4FromBool(long ptr) VarI4FromBool
+68 stdcall VarR4FromUI1(long ptr) VarR4FromUI1
+69 stdcall VarR4FromI2(long ptr) VarR4FromI2
+70 stdcall VarR4FromI4(long ptr) VarR4FromI4
+71 stdcall VarR4FromR8(double ptr) VarR4FromR8
+72 stdcall VarR4FromCy(double ptr) VarR4FromCy
+73 stdcall VarR4FromDate(long ptr) VarR4FromDate
+74 stdcall VarR4FromStr(wstr long long ptr) VarR4FromStr
 75 stub VarR4FromDisp
-76 stdcall VarR4FromBool(long ptr) VarR4FromBool32
-78 stdcall VarR8FromUI1(long ptr) VarR8FromUI132
-79 stdcall VarR8FromI2(long ptr) VarR8FromI232
-80 stdcall VarR8FromI4(long ptr) VarR8FromI432
-81 stdcall VarR8FromR4(long ptr) VarR8FromR432
-82 stdcall VarR8FromCy(double ptr) VarR8FromCy32
-83 stdcall VarR8FromDate(long ptr) VarR8FromDate32
-84 stdcall VarR8FromStr(wstr long long ptr) VarR8FromStr32
+76 stdcall VarR4FromBool(long ptr) VarR4FromBool
+78 stdcall VarR8FromUI1(long ptr) VarR8FromUI1
+79 stdcall VarR8FromI2(long ptr) VarR8FromI2
+80 stdcall VarR8FromI4(long ptr) VarR8FromI4
+81 stdcall VarR8FromR4(long ptr) VarR8FromR4
+82 stdcall VarR8FromCy(double ptr) VarR8FromCy
+83 stdcall VarR8FromDate(long ptr) VarR8FromDate
+84 stdcall VarR8FromStr(wstr long long ptr) VarR8FromStr
 85 stub VarR8FromDisp
-86 stdcall VarR8FromBool(long ptr) VarR8FromBool32
-88 stdcall VarDateFromUI1(long ptr) VarDateFromUI132
-89 stdcall VarDateFromI2(long ptr) VarDateFromI232
-90 stdcall VarDateFromI4(long ptr) VarDateFromI432
-91 stdcall VarDateFromR4(long ptr) VarDateFromR432
-92 stdcall VarDateFromR8(double ptr) VarDateFromR832
-93 stdcall VarDateFromCy(double ptr) VarDateFromCy32
-94 stdcall VarDateFromStr(wstr long long ptr) VarDateFromStr32
+86 stdcall VarR8FromBool(long ptr) VarR8FromBool
+88 stdcall VarDateFromUI1(long ptr) VarDateFromUI1
+89 stdcall VarDateFromI2(long ptr) VarDateFromI2
+90 stdcall VarDateFromI4(long ptr) VarDateFromI4
+91 stdcall VarDateFromR4(long ptr) VarDateFromR4
+92 stdcall VarDateFromR8(double ptr) VarDateFromR8
+93 stdcall VarDateFromCy(double ptr) VarDateFromCy
+94 stdcall VarDateFromStr(wstr long long ptr) VarDateFromStr
 95 stub VarDateFromDisp
-96 stdcall VarDateFromBool(long ptr) VarDateFromBool32
-98 stdcall VarCyFromUI1(long ptr) VarCyFromUI132
-99 stdcall VarCyFromI2(long ptr) VarCyFromI232
-100 stdcall VarCyFromI4(long ptr) VarCyFromI432
-101 stdcall VarCyFromR4(long ptr) VarCyFromR432
-102 stdcall VarCyFromR8(double ptr) VarCyFromR832
-103 stdcall VarCyFromDate(double ptr) VarCyFromDate32
+96 stdcall VarDateFromBool(long ptr) VarDateFromBool
+98 stdcall VarCyFromUI1(long ptr) VarCyFromUI1
+99 stdcall VarCyFromI2(long ptr) VarCyFromI2
+100 stdcall VarCyFromI4(long ptr) VarCyFromI4
+101 stdcall VarCyFromR4(long ptr) VarCyFromR4
+102 stdcall VarCyFromR8(double ptr) VarCyFromR8
+103 stdcall VarCyFromDate(double ptr) VarCyFromDate
 104 stub VarCyFromStr
 105 stub VarCyFromDisp
-106 stdcall VarCyFromBool(long ptr) VarCyFromBool32
-108 stdcall VarBstrFromUI1(long long long ptr) VarBstrFromUI132
-109 stdcall VarBstrFromI2(long long long ptr) VarBstrFromI232
-110 stdcall VarBstrFromI4(long long long ptr) VarBstrFromI432
-111 stdcall VarBstrFromR4(long long long ptr) VarBstrFromR432
-112 stdcall VarBstrFromR8(double long long ptr) VarBstrFromR832
+106 stdcall VarCyFromBool(long ptr) VarCyFromBool
+108 stdcall VarBstrFromUI1(long long long ptr) VarBstrFromUI1
+109 stdcall VarBstrFromI2(long long long ptr) VarBstrFromI2
+110 stdcall VarBstrFromI4(long long long ptr) VarBstrFromI4
+111 stdcall VarBstrFromR4(long long long ptr) VarBstrFromR4
+112 stdcall VarBstrFromR8(double long long ptr) VarBstrFromR8
 113 stub VarBstrFromCy
-114 stdcall VarBstrFromDate(long long long ptr) VarBstrFromDate32
+114 stdcall VarBstrFromDate(long long long ptr) VarBstrFromDate
 115 stub VarBstrFromDisp
-116 stdcall VarBstrFromBool(long long long ptr) VarBstrFromBool32
-118 stdcall VarBoolFromUI1(long ptr) VarBoolFromUI132
-119 stdcall VarBoolFromI2(long ptr) VarBoolFromI232
-120 stdcall VarBoolFromI4(long ptr) VarBoolFromI432
-121 stdcall VarBoolFromR4(long ptr) VarBoolFromR432
-122 stdcall VarBoolFromR8(double ptr) VarBoolFromR832
-123 stdcall VarBoolFromDate(long ptr) VarBoolFromDate32
-124 stdcall VarBoolFromCy(double ptr) VarBoolFromCy32
-125 stdcall VarBoolFromStr(wstr long long ptr) VarBoolFromStr32
+116 stdcall VarBstrFromBool(long long long ptr) VarBstrFromBool
+118 stdcall VarBoolFromUI1(long ptr) VarBoolFromUI1
+119 stdcall VarBoolFromI2(long ptr) VarBoolFromI2
+120 stdcall VarBoolFromI4(long ptr) VarBoolFromI4
+121 stdcall VarBoolFromR4(long ptr) VarBoolFromR4
+122 stdcall VarBoolFromR8(double ptr) VarBoolFromR8
+123 stdcall VarBoolFromDate(long ptr) VarBoolFromDate
+124 stdcall VarBoolFromCy(double ptr) VarBoolFromCy
+125 stdcall VarBoolFromStr(wstr long long ptr) VarBoolFromStr
 126 stub VarBoolFromDisp
-130 stdcall VarUI1FromI2(long ptr) VarUI1FromI232
-131 stdcall VarUI1FromI4(long ptr) VarUI1FromI432
-132 stdcall VarUI1FromR4(long ptr) VarUI1FromR432
-133 stdcall VarUI1FromR8(double ptr) VarUI1FromR832
-134 stdcall VarUI1FromCy(double ptr) VarUI1FromCy32
-135 stdcall VarUI1FromDate(long ptr) VarUI1FromDate32
-136 stdcall VarUI1FromStr(wstr long long ptr) VarUI1FromStr32
+130 stdcall VarUI1FromI2(long ptr) VarUI1FromI2
+131 stdcall VarUI1FromI4(long ptr) VarUI1FromI4
+132 stdcall VarUI1FromR4(long ptr) VarUI1FromR4
+133 stdcall VarUI1FromR8(double ptr) VarUI1FromR8
+134 stdcall VarUI1FromCy(double ptr) VarUI1FromCy
+135 stdcall VarUI1FromDate(long ptr) VarUI1FromDate
+136 stdcall VarUI1FromStr(wstr long long ptr) VarUI1FromStr
 137 stub VarUI1FromDisp
-138 stdcall VarUI1FromBool(long ptr) VarUI1FromBool32
+138 stdcall VarUI1FromBool(long ptr) VarUI1FromBool
 146 stub DispCallFunc
-147 stdcall VariantChangeTypeEx(ptr ptr) VariantChangeTypeEx32
+147 stdcall VariantChangeTypeEx(ptr ptr) VariantChangeTypeEx
 148 stub SafeArrayPtrOfIndex
 149 stdcall SysStringByteLen(ptr) SysStringByteLen
 150 stub SysAllocStringByteLen
 160 stub CreateTypeLib
-161 stdcall LoadTypeLib (ptr ptr) LoadTypeLib32
+161 stdcall LoadTypeLib (ptr ptr) LoadTypeLib
 162 stdcall LoadRegTypeLib (ptr long long long ptr) LoadRegTypeLib
-163 stdcall RegisterTypeLib(ptr str str) RegisterTypeLib32
-164 stdcall QueryPathOfRegTypeLib(ptr long long long ptr) QueryPathOfRegTypeLib32
+163 stdcall RegisterTypeLib(ptr str str) RegisterTypeLib
+164 stdcall QueryPathOfRegTypeLib(ptr long long long ptr) QueryPathOfRegTypeLib
 165 stub LHashValOfNameSys
 166 stub LHashValOfNameSysA
 170 stdcall OaBuildVersion() OaBuildVersion
@@ -158,82 +158,82 @@ type win32
 201 stub SetErrorInfo
 202 stub CreateErrorInfo
 205 stub VarI2FromI1
-206 stdcall VarI2FromUI2(long ptr) VarI2FromUI232
-207 stdcall VarI2FromUI4(long ptr) VarI2FromUI432
+206 stdcall VarI2FromUI2(long ptr) VarI2FromUI2
+207 stdcall VarI2FromUI4(long ptr) VarI2FromUI4
 208 stub VarI2FromDec
-209 stdcall VarI4FromI1(long ptr) VarI4FromI132
-210 stdcall VarI4FromUI2(long ptr) VarI4FromUI232
-211 stdcall VarI4FromUI4(long ptr) VarI4FromUI432
+209 stdcall VarI4FromI1(long ptr) VarI4FromI1
+210 stdcall VarI4FromUI2(long ptr) VarI4FromUI2
+211 stdcall VarI4FromUI4(long ptr) VarI4FromUI4
 212 stub VarI4FromDec
-213 stdcall VarR4FromI1(long ptr) VarR4FromI132
-214 stdcall VarR4FromUI2(long ptr) VarR4FromUI232
-215 stdcall VarR4FromUI4(long ptr) VarR4FromUI432
+213 stdcall VarR4FromI1(long ptr) VarR4FromI1
+214 stdcall VarR4FromUI2(long ptr) VarR4FromUI2
+215 stdcall VarR4FromUI4(long ptr) VarR4FromUI4
 216 stub VarR4FromDec
-217 stdcall VarR8FromI1(long ptr) VarR8FromI132
-218 stdcall VarR8FromUI2(long ptr) VarR8FromUI232
-219 stdcall VarR8FromUI4(long ptr) VarR8FromUI432
+217 stdcall VarR8FromI1(long ptr) VarR8FromI1
+218 stdcall VarR8FromUI2(long ptr) VarR8FromUI2
+219 stdcall VarR8FromUI4(long ptr) VarR8FromUI4
 220 stub VarR8FromDec
-221 stdcall VarDateFromI1(long ptr) VarDateFromI132
-222 stdcall VarDateFromUI2(long ptr) VarDateFromUI232
-223 stdcall VarDateFromUI4(long ptr) VarDateFromUI432
+221 stdcall VarDateFromI1(long ptr) VarDateFromI1
+222 stdcall VarDateFromUI2(long ptr) VarDateFromUI2
+223 stdcall VarDateFromUI4(long ptr) VarDateFromUI4
 224 stub VarDateFromDec
-225 stdcall VarCyFromI1(long ptr) VarCyFromI132
-226 stdcall VarCyFromUI2(long ptr) VarCyFromUI232
-227 stdcall VarCyFromUI4(long ptr) VarCyFromUI432
+225 stdcall VarCyFromI1(long ptr) VarCyFromI1
+226 stdcall VarCyFromUI2(long ptr) VarCyFromUI2
+227 stdcall VarCyFromUI4(long ptr) VarCyFromUI4
 228 stub VarCyFromDec
-229 stdcall VarBstrFromI1(long long long ptr) VarBstrFromI132
-230 stdcall VarBstrFromUI2(long long long ptr) VarBstrFromUI232
-231 stdcall VarBstrFromUI4(long long long ptr) VarBstrFromUI432
+229 stdcall VarBstrFromI1(long long long ptr) VarBstrFromI1
+230 stdcall VarBstrFromUI2(long long long ptr) VarBstrFromUI2
+231 stdcall VarBstrFromUI4(long long long ptr) VarBstrFromUI4
 232 stub VarBstrFromDec
-233 stdcall VarBoolFromI1(long ptr) VarBoolFromI132
-234 stdcall VarBoolFromUI2(long ptr) VarBoolFromUI232
-235 stdcall VarBoolFromUI4(long ptr) VarBoolFromUI432
+233 stdcall VarBoolFromI1(long ptr) VarBoolFromI1
+234 stdcall VarBoolFromUI2(long ptr) VarBoolFromUI2
+235 stdcall VarBoolFromUI4(long ptr) VarBoolFromUI4
 236 stub VarBoolFromDec
-237 stdcall VarUI1FromI1(long ptr) VarUI1FromI132
-238 stdcall VarUI1FromUI2(long ptr) VarUI1FromUI232
-239 stdcall VarUI1FromUI4(long ptr) VarUI1FromUI432
+237 stdcall VarUI1FromI1(long ptr) VarUI1FromI1
+238 stdcall VarUI1FromUI2(long ptr) VarUI1FromUI2
+239 stdcall VarUI1FromUI4(long ptr) VarUI1FromUI4
 240 stub VarUI1FromDec
 241 stub VarDecFromI1
 242 stub VarDecFromUI2
 243 stub VarDecFromUI4
-244 stdcall VarI1FromUI1(long ptr) VarI1FromUI132
-245 stdcall VarI1FromI2(long ptr) VarI1FromI232
-246 stdcall VarI1FromI4(long ptr) VarI1FromI432
-247 stdcall VarI1FromR4(long ptr) VarI1FromR432
-248 stdcall VarI1FromR8(double ptr) VarI1FromR832
-249 stdcall VarI1FromDate(long ptr) VarI1FromDate32
-250 stdcall VarI1FromCy(double ptr) VarI1FromCy32
-251 stdcall VarI1FromStr(wstr long long ptr) VarI1FromStr32
+244 stdcall VarI1FromUI1(long ptr) VarI1FromUI1
+245 stdcall VarI1FromI2(long ptr) VarI1FromI2
+246 stdcall VarI1FromI4(long ptr) VarI1FromI4
+247 stdcall VarI1FromR4(long ptr) VarI1FromR4
+248 stdcall VarI1FromR8(double ptr) VarI1FromR8
+249 stdcall VarI1FromDate(long ptr) VarI1FromDate
+250 stdcall VarI1FromCy(double ptr) VarI1FromCy
+251 stdcall VarI1FromStr(wstr long long ptr) VarI1FromStr
 252 stub VarI1FromDisp
-253 stdcall VarI1FromBool(long ptr) VarI1FromBool32
-254 stdcall VarI1FromUI2(long ptr) VarI1FromUI232
-255 stdcall VarI1FromUI4(long ptr) VarI1FromUI432
+253 stdcall VarI1FromBool(long ptr) VarI1FromBool
+254 stdcall VarI1FromUI2(long ptr) VarI1FromUI2
+255 stdcall VarI1FromUI4(long ptr) VarI1FromUI4
 256 stub VarI1FromDec
-257 stdcall VarUI2FromUI1(long ptr) VarUI2FromUI132
-258 stdcall VarUI2FromI2(long ptr) VarUI2FromI232
-259 stdcall VarUI2FromI4(long ptr) VarUI2FromI432
-260 stdcall VarUI2FromR4(long ptr) VarUI2FromR432
-261 stdcall VarUI2FromR8(double ptr) VarUI2FromR832
-262 stdcall VarUI2FromDate(long ptr) VarUI2FromDate32
-263 stdcall VarUI2FromCy(double ptr) VarUI2FromCy32
-264 stdcall VarUI2FromStr(wstr long long ptr) VarUI2FromStr32
+257 stdcall VarUI2FromUI1(long ptr) VarUI2FromUI1
+258 stdcall VarUI2FromI2(long ptr) VarUI2FromI2
+259 stdcall VarUI2FromI4(long ptr) VarUI2FromI4
+260 stdcall VarUI2FromR4(long ptr) VarUI2FromR4
+261 stdcall VarUI2FromR8(double ptr) VarUI2FromR8
+262 stdcall VarUI2FromDate(long ptr) VarUI2FromDate
+263 stdcall VarUI2FromCy(double ptr) VarUI2FromCy
+264 stdcall VarUI2FromStr(wstr long long ptr) VarUI2FromStr
 265 stub VarUI2FromDisp
-266 stdcall VarUI2FromBool(long ptr) VarUI2FromBool32
-267 stdcall VarUI2FromI1(long ptr) VarUI2FromI132
-268 stdcall VarUI2FromUI4(long ptr) VarUI2FromUI432
+266 stdcall VarUI2FromBool(long ptr) VarUI2FromBool
+267 stdcall VarUI2FromI1(long ptr) VarUI2FromI1
+268 stdcall VarUI2FromUI4(long ptr) VarUI2FromUI4
 269 stub VarUI2FromDec
-270 stdcall VarUI4FromUI1(long ptr) VarUI4FromUI132
-271 stdcall VarUI4FromI2(long ptr) VarUI4FromI232
-272 stdcall VarUI4FromI4(long ptr) VarUI4FromI432
-273 stdcall VarUI4FromR4(long ptr) VarUI4FromR432
-274 stdcall VarUI4FromR8(double ptr) VarUI4FromR832
-275 stdcall VarUI4FromDate(long ptr) VarUI4FromDate32
-276 stdcall VarUI4FromCy(double ptr) VarUI4FromCy32
-277 stdcall VarUI4FromStr(wstr long long ptr) VarUI4FromStr32
+270 stdcall VarUI4FromUI1(long ptr) VarUI4FromUI1
+271 stdcall VarUI4FromI2(long ptr) VarUI4FromI2
+272 stdcall VarUI4FromI4(long ptr) VarUI4FromI4
+273 stdcall VarUI4FromR4(long ptr) VarUI4FromR4
+274 stdcall VarUI4FromR8(double ptr) VarUI4FromR8
+275 stdcall VarUI4FromDate(long ptr) VarUI4FromDate
+276 stdcall VarUI4FromCy(double ptr) VarUI4FromCy
+277 stdcall VarUI4FromStr(wstr long long ptr) VarUI4FromStr
 278 stub VarUI4FromDisp
-279 stdcall VarUI4FromBool(long ptr) VarUI4FromBool32
-280 stdcall VarUI4FromI1(long ptr) VarUI4FromI132
-281 stdcall VarUI4FromUI2(long ptr) VarUI4FromUI232
+279 stdcall VarUI4FromBool(long ptr) VarUI4FromBool
+280 stdcall VarUI4FromI1(long ptr) VarUI4FromI1
+281 stdcall VarUI4FromUI2(long ptr) VarUI4FromUI2
 282 stub VarUI4FromDec
 283 stub BSTR_UserSize
 284 stub BSTR_UserMarshal
diff --git a/relay32/olecli32.spec b/relay32/olecli32.spec
index bb863522ff9..c98805c7a1b 100644
--- a/relay32/olecli32.spec
+++ b/relay32/olecli32.spec
@@ -8,13 +8,13 @@ type win32
    6 stub OleClone
    7 stub OleCopyFromLink
    8 stub OleEqual
-   9 stdcall OleQueryLinkFromClip(str long long) OleQueryLinkFromClip32
-  10 stdcall OleQueryCreateFromClip(str long long) OleQueryCreateFromClip32
-  11 stdcall OleCreateLinkFromClip(str long ptr str long long) OleCreateLinkFromClip32
-  12 stdcall OleCreateFromClip(str ptr long str ptr long long) OleCreateFromClip32
+   9 stdcall OleQueryLinkFromClip(str long long) OleQueryLinkFromClip
+  10 stdcall OleQueryCreateFromClip(str long long) OleQueryCreateFromClip
+  11 stdcall OleCreateLinkFromClip(str long ptr str long long) OleCreateLinkFromClip
+  12 stdcall OleCreateFromClip(str ptr long str ptr long long) OleCreateFromClip
   13 stub OleCopyToClipboard
-  14 stdcall OleQueryType(ptr ptr) OleQueryType32
-  15 stdcall OleSetHostNames(ptr str str) OleSetHostNames32
+  14 stdcall OleQueryType(ptr ptr) OleQueryType
+  15 stdcall OleSetHostNames(ptr str str) OleSetHostNames
   16 stub OleSetTargetDevice
   17 stub OleSetBounds
   18 stub OleQueryBounds
@@ -40,9 +40,9 @@ type win32
   38 stub OleCreateFromFile
   39 stub OleCreateLinkFromFile
   40 stub OleRelease
-  41 stdcall OleRegisterClientDoc(str str long ptr) OleRegisterClientDoc32
-  42 stdcall OleRevokeClientDoc(long) OleRevokeClientDoc32
-  43 stdcall OleRenameClientDoc(long str) OleRenameClientDoc32
+  41 stdcall OleRegisterClientDoc(str str long ptr) OleRegisterClientDoc
+  42 stdcall OleRevokeClientDoc(long) OleRevokeClientDoc
+  43 stdcall OleRenameClientDoc(long str) OleRenameClientDoc
   44 stub OleRevertClientDoc
   45 stub OleSavedClientDoc
   46 stub OleRename
@@ -56,4 +56,4 @@ type win32
   57 stub OleExecute
   58 stub OleCreateInvisible
   59 stub OleQueryClientVersion
-  60 stdcall OleIsDcMeta(long) OleIsDcMeta32
+  60 stdcall OleIsDcMeta(long) OleIsDcMeta
diff --git a/relay32/oledlg.spec b/relay32/oledlg.spec
index ba6b630cc56..cc53b9e0721 100644
--- a/relay32/oledlg.spec
+++ b/relay32/oledlg.spec
@@ -1,26 +1,26 @@
 name	oledlg
 type	win32
 
-  1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) OleUIAddVerbMenu32A
-  2 stdcall OleUICanConvertOrActivateAs(ptr long long) OleUICanConvertOrActivateAs32
-  3 stdcall OleUIInsertObjectA(ptr) OleUIInsertObject32A
-  4 stdcall OleUIPasteSpecialA(ptr) OleUIPasteSpecial32A
-  5 stdcall OleUIEditLinksA(ptr) OleUIEditLinks32A
-  6 stdcall OleUIChangeIconA(ptr) OleUIChangeIcon32A
-  7 stdcall OleUIConvertA(ptr) OleUIConvert32A
-  8 stdcall OleUIBusyA(ptr) OleUIBusy32A
-  9 stdcall OleUIUpdateLinksA(ptr long str long) OleUIUpdateLinks32A
- 10 varargs OleUIPromptUserA() OleUIPromptUser32A
- 11 stdcall OleUIObjectPropertiesA(ptr) OleUIObjectProperties32A
- 12 stdcall OleUIChangeSourceA(ptr) OleUIChangeSource32A
- 13 varargs OleUIPromptUserW() OleUIPromptUser32W
- 14 stdcall OleUIAddVerbMenuW(ptr wstr long long long long long long ptr) OleUIAddVerbMenu32W
- 15 stdcall OleUIBusyW(ptr) OleUIBusy32W
- 16 stdcall OleUIChangeIconW(ptr) OleUIChangeIcon32W
- 17 stdcall OleUIChangeSourceW(ptr) OleUIChangeSource32W
- 18 stdcall OleUIConvertW(ptr) OleUIConvert32W
- 19 stdcall OleUIEditLinksW(ptr) OleUIEditLinks32W
- 20 stdcall OleUIInsertObjectW(ptr) OleUIInsertObject32W
- 21 stdcall OleUIObjectPropertiesW(ptr) OleUIObjectProperties32W
- 22 stdcall OleUIPasteSpecialW(ptr) OleUIPasteSpecial32W
+  1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) OleUIAddVerbMenuA
+  2 stdcall OleUICanConvertOrActivateAs(ptr long long) OleUICanConvertOrActivateAs
+  3 stdcall OleUIInsertObjectA(ptr) OleUIInsertObjectA
+  4 stdcall OleUIPasteSpecialA(ptr) OleUIPasteSpecialA
+  5 stdcall OleUIEditLinksA(ptr) OleUIEditLinksA
+  6 stdcall OleUIChangeIconA(ptr) OleUIChangeIconA
+  7 stdcall OleUIConvertA(ptr) OleUIConvertA
+  8 stdcall OleUIBusyA(ptr) OleUIBusyA
+  9 stdcall OleUIUpdateLinksA(ptr long str long) OleUIUpdateLinksA
+ 10 varargs OleUIPromptUserA() OleUIPromptUserA
+ 11 stdcall OleUIObjectPropertiesA(ptr) OleUIObjectPropertiesA
+ 12 stdcall OleUIChangeSourceA(ptr) OleUIChangeSourceA
+ 13 varargs OleUIPromptUserW() OleUIPromptUserW
+ 14 stdcall OleUIAddVerbMenuW(ptr wstr long long long long long long ptr) OleUIAddVerbMenuW
+ 15 stdcall OleUIBusyW(ptr) OleUIBusyW
+ 16 stdcall OleUIChangeIconW(ptr) OleUIChangeIconW
+ 17 stdcall OleUIChangeSourceW(ptr) OleUIChangeSourceW
+ 18 stdcall OleUIConvertW(ptr) OleUIConvertW
+ 19 stdcall OleUIEditLinksW(ptr) OleUIEditLinksW
+ 20 stdcall OleUIInsertObjectW(ptr) OleUIInsertObjectW
+ 21 stdcall OleUIObjectPropertiesW(ptr) OleUIObjectPropertiesW
+ 22 stdcall OleUIPasteSpecialW(ptr) OleUIPasteSpecialW
 
diff --git a/relay32/olesvr32.spec b/relay32/olesvr32.spec
index 99726ddee89..46df44657eb 100644
--- a/relay32/olesvr32.spec
+++ b/relay32/olesvr32.spec
@@ -2,13 +2,13 @@ name	olesvr32
 type	win32
 
  1 stub WEP
- 2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer32
+ 2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
  3 stub OleRevokeServer
- 4 stdcall OleBlockServer(long) OleBlockServer32
- 5 stdcall OleUnblockServer(long ptr) OleUnblockServer32
- 6 stdcall OleRegisterServerDoc(ptr str ptr ptr) OleRegisterServerDoc32
- 7 stdcall OleRevokeServerDoc(long) OleRevokeServerDoc32
- 8 stdcall OleRenameServerDoc(long str) OleRenameServerDoc32
+ 4 stdcall OleBlockServer(long) OleBlockServer
+ 5 stdcall OleUnblockServer(long ptr) OleUnblockServer
+ 6 stdcall OleRegisterServerDoc(ptr str ptr ptr) OleRegisterServerDoc
+ 7 stdcall OleRevokeServerDoc(long) OleRevokeServerDoc
+ 8 stdcall OleRenameServerDoc(long str) OleRenameServerDoc
  9 stub OleRevertServerDoc
 10 stub OleSavedServerDoc
 11 stub OleRevokeObject
diff --git a/relay32/rasapi32.spec b/relay32/rasapi32.spec
index a4c14770dda..682dbf1251d 100644
--- a/relay32/rasapi32.spec
+++ b/relay32/rasapi32.spec
@@ -45,7 +45,7 @@ type	win32
 541 stub	RasDialW
 542 stub	RasEditPhonebookEntryA
 543 stub	RasEditPhonebookEntryW
-544 stdcall	RasEnumConnectionsA(ptr ptr ptr) RasEnumConnections32A
+544 stdcall	RasEnumConnectionsA(ptr ptr ptr) RasEnumConnectionsA
 545 stub	RasEnumConnectionsW
 546 stub	RasEnumEntriesA
 547 stub	RasEnumEntriesW
diff --git a/relay32/relay386.c b/relay32/relay386.c
index 5f740a6f423..50c96819284 100644
--- a/relay32/relay386.c
+++ b/relay32/relay386.c
@@ -71,7 +71,7 @@ int RELAY_CallFrom32( int ret_addr, ... )
 {
     int i, ret;
     char buffer[80];
-    FARPROC32 func;
+    FARPROC func;
     unsigned int mask, typemask;
     WORD fs;
 
@@ -81,7 +81,7 @@ int RELAY_CallFrom32( int ret_addr, ... )
     WORD nb_args = *(WORD *)(relay_addr + 1) / sizeof(int);
 
     assert(TRACE_ON(relay));
-    func = (FARPROC32)BUILTIN32_GetEntryPoint( buffer, relay_addr - 5,
+    func = (FARPROC)BUILTIN32_GetEntryPoint( buffer, relay_addr - 5,
                                                &typemask );
       DPRINTF( "Call %s(", buffer );
       args++;
diff --git a/relay32/shell32.spec b/relay32/shell32.spec
index 7082c6d37a2..fe6931f3285 100644
--- a/relay32/shell32.spec
+++ b/relay32/shell32.spec
@@ -34,60 +34,60 @@ init	Shell32LibMain
   26 stub ILLoadFromStream@8
   27 stub ILSaveToStream@8
   28 stub SHILCreateFromPath@12
-  29 stdcall PathIsRoot(ptr) PathIsRoot32AW
-  30 stdcall PathBuildRoot(ptr long) PathBuildRoot32A
-  31 stdcall PathFindExtension(ptr) PathFindExtension32AW
-  32 stdcall PathAddBackslash(ptr) PathAddBackslash32AW
-  33 stdcall PathRemoveBlanks(str) PathRemoveBlanks32AW
-  34 stdcall PathFindFilename(ptr) PathFindFilename32AW
-  35 stdcall PathRemoveFileSpec(str) PathRemoveFileSpec32A
-  36 stdcall PathAppend(str str) PathAppend32A
-  37 stdcall PathCombine(ptr ptr ptr) PathCombine32AW
+  29 stdcall PathIsRoot(ptr) PathIsRootAW
+  30 stdcall PathBuildRoot(ptr long) PathBuildRootA
+  31 stdcall PathFindExtension(ptr) PathFindExtensionAW
+  32 stdcall PathAddBackslash(ptr) PathAddBackslashAW
+  33 stdcall PathRemoveBlanks(str) PathRemoveBlanksAW
+  34 stdcall PathFindFilename(ptr) PathFindFilenameAW
+  35 stdcall PathRemoveFileSpec(str) PathRemoveFileSpecA
+  36 stdcall PathAppend(str str) PathAppendA
+  37 stdcall PathCombine(ptr ptr ptr) PathCombineAW
   38 stub PathStripPath
-  39 stdcall PathIsUNC (ptr) PathIsUNC32AW
-  40 stdcall PathIsRelative (ptr) PathIsRelative32AW
+  39 stdcall PathIsUNC (ptr) PathIsUNCAW
+  40 stdcall PathIsRelative (ptr) PathIsRelativeAW
   41 stub Control_RunDLLA@16
   42 stub Control_RunDLLW@16
-  43 stdcall PathIsExe (ptr) PathIsExe32AW
+  43 stdcall PathIsExe (ptr) PathIsExeAW
   44 stub DoEnvironmentSubstA@8
-  45 stdcall PathFileExists(str) PathFileExists32A
-  46 stdcall PathMatchSpec (str str) PathMatchSpec32AW
+  45 stdcall PathFileExists(str) PathFileExistsA
+  46 stdcall PathMatchSpec (str str) PathMatchSpecAW
   47 stub PathMakeUniqueName@20
-  48 stdcall PathSetDlgItemPath (long long ptr) PathSetDlgItemPath32AW
-  49 stdcall PathQualify (ptr) PathQualify32AW
+  48 stdcall PathSetDlgItemPath (long long ptr) PathSetDlgItemPathAW
+  49 stdcall PathQualify (ptr) PathQualifyAW
   50 stub PathStripToRoot@4
   51 stdcall PathResolve(str long long) PathResolve
-  52 stdcall PathGetArgs(str) PathGetArgs32AW
+  52 stdcall PathGetArgs(str) PathGetArgsAW
   53 stub DoEnvironmentSubstW@8
-  54 stdcall DragAcceptFiles(long long) DragAcceptFiles32
-  55 stdcall PathQuoteSpaces (ptr) PathQuoteSpaces32AW
-  56 stdcall PathUnquoteSpaces(str) PathUnquoteSpaces32AW
-  57 stdcall PathGetDriveNumber (str) PathGetDriveNumber32
-  58 stdcall ParseField(str long ptr long) ParseField32A
+  54 stdcall DragAcceptFiles(long long) DragAcceptFiles
+  55 stdcall PathQuoteSpaces (ptr) PathQuoteSpacesAW
+  56 stdcall PathUnquoteSpaces(str) PathUnquoteSpacesAW
+  57 stdcall PathGetDriveNumber (str) PathGetDriveNumber
+  58 stdcall ParseField(str long ptr long) ParseFieldA
   59 stub RestartDialog@12
   60 stdcall ExitWindowsDialog(long) ExitWindowsDialog
   61 stdcall RunFileDlg(long long long str str long) RunFileDlg
   62 stdcall PickIconDlg(long long long long) PickIconDlg
   63 stdcall GetFileNameFromBrowse(long long long long str str str) GetFileNameFromBrowse
-  64 stdcall DriveType (long) DriveType32
+  64 stdcall DriveType (long) DriveType
   65 stub InvalidateDriveType
   66 stub IsNetDrive
-  67 stdcall Shell_MergeMenus (long long long long long long) Shell_MergeMenus32
+  67 stdcall Shell_MergeMenus (long long long long long long) Shell_MergeMenus
   68 stdcall SHGetSettings(long long long) SHGetSettings
   69 stub SHGetNetResource
   70 stub SHCreateDefClassObject
   71 stdcall Shell_GetImageList(ptr ptr) Shell_GetImageList
-  72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndex32A # ASCII!!!
+  72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexA # ASCII!!!
   73 stub SHShellFolderView_Message
   74 stub SHCreateStdEnumFmtEtc
-  75 stdcall PathYetAnotherMakeUniqueName(ptr ptr) PathYetAnotherMakeUniqueName32A
+  75 stdcall PathYetAnotherMakeUniqueName(ptr ptr) PathYetAnotherMakeUniqueNameA
   76 stub DragQueryInfo
   77 stdcall SHMapPIDLToSystemImageListIndex(long long long) SHMapPIDLToSystemImageListIndex
   78 stdcall OleStrToStrN(str long wstr long) OleStrToStrN
   79 stdcall StrToOleStrN(wstr long str long) StrToOleStrN
-  80 stdcall DragFinish(long) DragFinish32
-  81 stdcall DragQueryFile(long long ptr long) DragQueryFile32A
-  82 stdcall DragQueryFileA(long long ptr long) DragQueryFile32A
+  80 stdcall DragFinish(long) DragFinish
+  81 stdcall DragQueryFile(long long ptr long) DragQueryFileA
+  82 stdcall DragQueryFileA(long long ptr long) DragQueryFileA
   83 stub CIDLData_CreateFromIDArray
   84 stub SHIsBadInterfacePtr
   85 stdcall OpenRegStream(long long long long) OpenRegStream
@@ -104,7 +104,7 @@ init	Shell32LibMain
   96 stdcall StrRetToStrN (long long long long) StrRetToStrN
   97 stdcall SHWaitForFileToOpen (long long long) SHWaitForFileToOpen
   98 stdcall SHGetRealIDL (long long long) SHGetRealIDL
-  99 stdcall SetAppStartingCursor (long long) SetAppStartingCursor32
+  99 stdcall SetAppStartingCursor (long long) SetAppStartingCursor
  100 stdcall SHRestricted(long) SHRestricted
  101 stub DragQueryFileAorW   # exported by name
  102 stdcall SHCoCreateInstance(ptr ptr long ptr ptr) SHCoCreateInstance
@@ -124,7 +124,7 @@ init	Shell32LibMain
  116 stdcall FileMenu_TrackPopupMenuEx (long long long long long long) FileMenu_TrackPopupMenuEx
  117 stub FileMenu_DeleteItemByCmd
  118 stdcall FileMenu_Destroy (long) FileMenu_Destroy
- 119 stdcall IsLFNDrive(str) IsLFNDrive32A
+ 119 stdcall IsLFNDrive(str) IsLFNDriveA
  120 stub FileMenu_AbortInitMenu
  121 stdcall SHFlushClipboard () SHFlushClipboard
  122 stdcall RunDLL_CallEntry16 (long long long long long) RunDLL_CallEntry16 #name wrong?
@@ -138,9 +138,9 @@ init	Shell32LibMain
  130 stub DAD_DragEnter
  131 stub DAD_DragEnterEx
  132 stub DAD_DragLeave
- 133 stdcall DragQueryFileW(long long ptr long) DragQueryFile32W
+ 133 stdcall DragQueryFileW(long long ptr long) DragQueryFileW
  134 stub DAD_DragMove
- 135 stdcall DragQueryPoint(long ptr) DragQueryPoint32
+ 135 stdcall DragQueryPoint(long ptr) DragQueryPoint
  136 stub DAD_SetDragImage
  137 stdcall DAD_ShowDragImage (long) DAD_ShowDragImage
  138 stub DuplicateIcon   # exported by name
@@ -150,24 +150,24 @@ init	Shell32LibMain
  142 stub FileMenu_DeleteSeparator
  143 stub FileMenu_EnableItemByCmd
  144 stub FileMenu_GetItemExtent
- 145 stdcall PathFindOnPath (ptr ptr) PathFindOnPath32AW
+ 145 stdcall PathFindOnPath (ptr ptr) PathFindOnPathAW
  146 stub RLBuildListOfPaths
  147 stdcall SHCLSIDFromString(long long) SHCLSIDFromString
- 148 stdcall ExtractAssociatedIconA(long ptr long) ExtractAssociatedIcon32A   # exported by name
+ 148 stdcall ExtractAssociatedIconA(long ptr long) ExtractAssociatedIconA   # exported by name
  149 stdcall SHFind_InitMenuPopup(long long long long) SHFind_InitMenuPopup
  150 stub ExtractAssociatedIconExA   # exported by name
- 151 stdcall SHLoadOLE (long) SHLoadOLE32
+ 151 stdcall SHLoadOLE (long) SHLoadOLE
  152 stdcall ILGetSize(ptr) ILGetSize
  153 stdcall ILGetNext(ptr) ILGetNext
  154 stdcall ILAppend (long long long) ILAppend
  155 stdcall ILFree (ptr) ILFree
  156 stdcall ILGlobalFree (ptr) ILGlobalFree
  157 stdcall ILCreateFromPath (ptr) ILCreateFromPath
- 158 stdcall PathGetExtension(str long long) PathGetExtension32AW
+ 158 stdcall PathGetExtension(str long long) PathGetExtensionAW
  159 stub PathIsDirectory
  160 stub SHNetConnectionDialog
  161 stdcall SHRunControlPanel (long long) SHRunControlPanel
- 162 stdcall SHSimpleIDListFromPath (ptr) SHSimpleIDListFromPath32AW
+ 162 stdcall SHSimpleIDListFromPath (ptr) SHSimpleIDListFromPathAW
  163 stub StrToOleStr
  164 stub Win32DeleteFile
  165 stdcall SHCreateDirectory(long long) SHCreateDirectory
@@ -179,27 +179,27 @@ init	Shell32LibMain
  171 stub PathCleanupSpec
  172 stub SHCreateLinks
  173 stub SHValidateUNC
- 174 stdcall SHCreateShellFolderViewEx (ptr ptr) SHCreateShellFolderViewEx32
- 175 stdcall SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPath32
+ 174 stdcall SHCreateShellFolderViewEx (ptr ptr) SHCreateShellFolderViewEx
+ 175 stdcall SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPath
  176 stdcall SHSetInstanceExplorer (long) SHSetInstanceExplorer
  177 stub DAD_SetDragImageFromListView
  178 stub SHObjectProperties
  179 stub SHGetNewLinkInfoA
  180 stub SHGetNewLinkInfoW
- 181 stdcall RegisterShellHook(long long) RegisterShellHook32
+ 181 stdcall RegisterShellHook(long long) RegisterShellHook
  182 cdecl ShellMessageBoxW(long long long str long long) ShellMessageBoxW
  183 cdecl ShellMessageBoxA(long long long str long long) ShellMessageBoxA
  184 stdcall ArrangeWindows(long long long long long) ArrangeWindows
  185 stub SHHandleDiskFull
  186 stub ExtractAssociatedIconExW   # exported by name
  187 stub ExtractAssociatedIconW   # exported by name
- 188 stdcall ExtractIconA(long str long) ExtractIcon32A   # exported by name
- 189 stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconEx32AW
- 190 stdcall ExtractIconExA(str long ptr ptr long) ExtractIconEx32A
- 191 stdcall ExtractIconExW(wstr long ptr ptr long) ExtractIconEx32W
+ 188 stdcall ExtractIconA(long str long) ExtractIconA   # exported by name
+ 189 stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExAW
+ 190 stdcall ExtractIconExA(str long ptr ptr long) ExtractIconExA
+ 191 stdcall ExtractIconExW(wstr long ptr ptr long) ExtractIconExW
  192 stub ExtractIconResInfoA   # exported by name
  193 stub ExtractIconResInfoW   # exported by name
- 194 stdcall ExtractIconW(long wstr long) ExtractIcon32W   # exported by name
+ 194 stdcall ExtractIconW(long wstr long) ExtractIconW   # exported by name
  195 stdcall SHFree(ptr) SHFree
  196 stdcall SHAlloc(long) SHAlloc
  197 stub SHGlobalDefect
@@ -223,8 +223,8 @@ init	Shell32LibMain
  215 stub SHStartNetConnectionDialog@12
  216 stub ExtractVersionResource16W   # exported by name
  217 stub FindExeDlgProc   # exported by name
- 218 stdcall FindExecutableA(ptr ptr ptr) FindExecutable32A   # exported by name
- 219 stdcall FindExecutableW(wstr wstr wstr) FindExecutable32W   # exported by name
+ 218 stdcall FindExecutableA(ptr ptr ptr) FindExecutableA   # exported by name
+ 219 stdcall FindExecutableW(wstr wstr wstr) FindExecutableW   # exported by name
  220 stdcall FreeIconList(long) FreeIconList   # exported by name
  221 stub InternalExtractIconListA   # exported by name
  222 stub InternalExtractIconListW   # exported by name
@@ -239,35 +239,35 @@ init	Shell32LibMain
  231 stub RealShellExecuteExW   # exported by name
  232 stub RealShellExecuteW   # exported by name
  233 stub RegenerateUserEnvironment   # exported by name
- 234 stdcall SHAddToRecentDocs (long ptr) SHAddToRecentDocs32  # exported by name
- 235 stdcall SHAppBarMessage(long ptr) SHAppBarMessage32   # exported by name
- 236 stdcall SHBrowseForFolder(ptr) SHBrowseForFolder32A   # exported by name
- 237 stdcall SHBrowseForFolderA(ptr) SHBrowseForFolder32A   # exported by name
+ 234 stdcall SHAddToRecentDocs (long ptr) SHAddToRecentDocs  # exported by name
+ 235 stdcall SHAppBarMessage(long ptr) SHAppBarMessage   # exported by name
+ 236 stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA   # exported by name
+ 237 stdcall SHBrowseForFolderA(ptr) SHBrowseForFolderA   # exported by name
  238 stub SHBrowseForFolderW@4   # exported by name
- 239 stdcall SHChangeNotify (long long ptr ptr) SHChangeNotify32  # exported by name
+ 239 stdcall SHChangeNotify (long long ptr ptr) SHChangeNotify  # exported by name
  240 stub SHEmptyRecycleBinA@12   # exported by name
  241 stub SHEmptyRecycleBinW@12   # exported by name
- 242 stdcall SHFileOperation (ptr) SHFileOperation32   # exported by name
- 243 stdcall SHFileOperationA (ptr) SHFileOperation32A  # exported by name
- 244 stdcall SHFileOperationW (ptr) SHFileOperation32W   # exported by name
+ 242 stdcall SHFileOperation (ptr) SHFileOperationAW   # exported by name
+ 243 stdcall SHFileOperationA (ptr) SHFileOperationA  # exported by name
+ 244 stdcall SHFileOperationW (ptr) SHFileOperationW   # exported by name
  245 stub SHFormatDrive@16   # exported by name
  246 stub SHFreeNameMappings@4   # exported by name
- 247 stdcall SHGetDataFromIDListA (ptr ptr long ptr long) SHGetDataFromIDList32A
- 248 stdcall SHGetDataFromIDListW (ptr ptr long ptr long) SHGetDataFromIDList32W
+ 247 stdcall SHGetDataFromIDListA (ptr ptr long ptr long) SHGetDataFromIDListA
+ 248 stdcall SHGetDataFromIDListW (ptr ptr long ptr long) SHGetDataFromIDListW
  249 stub PathParseIconLocation@4
  250 stub PathRemoveExtension@4
  251 stub PathRemoveArgs@4
  252 stdcall SHGetDesktopFolder(ptr) SHGetDesktopFolder   # exported by name
- 253 stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfo32A   # exported by name
- 254 stdcall SHGetFileInfoA(ptr long ptr long long) SHGetFileInfo32A   # exported by name
- 255 stdcall SHGetFileInfoW(ptr long ptr long long) SHGetFileInfo32W # exported by name
+ 253 stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA   # exported by name
+ 254 stdcall SHGetFileInfoA(ptr long ptr long long) SHGetFileInfoA   # exported by name
+ 255 stdcall SHGetFileInfoW(ptr long ptr long long) SHGetFileInfoW # exported by name
  256 stdcall SHGetInstanceExplorer (long) SHGetInstanceExplorer
  257 stdcall SHGetMalloc(ptr) SHGetMalloc   # exported by name
  258 stub SHGetNewLinkInfo@20   # exported by name
- 259 stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDList32   # exported by name
+ 259 stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListAW   # exported by name
  260 stub SHGetPathFromIDList@8 # exported by name
- 261 stdcall SHGetPathFromIDListA (long long) SHGetPathFromIDList32A # exported by name
- 262 stdcall SHGetPathFromIDListW (long long) SHGetPathFromIDList32W # exported by name
+ 261 stdcall SHGetPathFromIDListA (long long) SHGetPathFromIDListA # exported by name
+ 262 stdcall SHGetPathFromIDListW (long long) SHGetPathFromIDListW # exported by name
  263 stdcall SHGetSpecialFolderLocation(long long ptr) SHGetSpecialFolderLocation   # exported by name
  264 stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLL   # exported by name
  265 stub SHHelpShortcuts_RunDLLA@16   # exported by name
@@ -280,27 +280,27 @@ init	Shell32LibMain
  271 stub SheChangeDirA
  272 stub SheChangeDirExA
  273 stub SheChangeDirExW
- 274 stdcall SheChangeDirW(wstr) SheChangeDir32W
+ 274 stdcall SheChangeDirW(wstr) SheChangeDirW
  275 stub SheConvertPathW
  276 stub SheFullPathA
  277 stub SheFullPathW
  278 stub SheGetCurDrive
  279 stub SheGetDirA@8
  280 stub SheGetDirExW@12
- 281 stdcall SheGetDirW (long long) SheGetDir32W
+ 281 stdcall SheGetDirW (long long) SheGetDirW
  282 stub SheGetPathOffsetW
  283 stub SheRemoveQuotesA
  284 stub SheRemoveQuotesW
  285 stub SheSetCurDrive
  286 stub SheShortenPathA
  287 stub SheShortenPathW
- 288 stdcall ShellAboutA(long str str long) ShellAbout32A
- 289 stdcall ShellAboutW(long wstr wstr long) ShellAbout32W
- 290 stdcall ShellExecuteA(long str str str str long) ShellExecute32A
- 291 stdcall ShellExecuteEx (long) ShellExecuteEx32
- 292 stdcall ShellExecuteExA (long) ShellExecuteEx32A
- 293 stdcall ShellExecuteExW (long) ShellExecuteEx32W
- 294 stdcall ShellExecuteW (long wstr wstr wstr wstr long) ShellExecute32W
+ 288 stdcall ShellAboutA(long str str long) ShellAboutA
+ 289 stdcall ShellAboutW(long wstr wstr long) ShellAboutW
+ 290 stdcall ShellExecuteA(long str str str str long) ShellExecuteA
+ 291 stdcall ShellExecuteEx (long) ShellExecuteExAW
+ 292 stdcall ShellExecuteExA (long) ShellExecuteExA
+ 293 stdcall ShellExecuteExW (long) ShellExecuteExW
+ 294 stdcall ShellExecuteW (long wstr wstr wstr wstr long) ShellExecuteW
  295 stub ShellHookProc   # exported by name
  296 stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIcon
  297 stdcall Shell_NotifyIconA(long ptr) Shell_NotifyIconA
@@ -337,13 +337,13 @@ init	Shell32LibMain
  328 stub StrStrW # proper ordinal unknown 
  329 stub WOWShellExecute # proper ordinal unknown
 
- 505 stdcall SHRegCloseKey (long) SHRegCloseKey32
- 506 stdcall SHRegOpenKeyA (long str long) SHRegOpenKey32A
- 507 stdcall SHRegOpenKeyW (long wstr long) SHRegOpenKey32W
+ 505 stdcall SHRegCloseKey (long) SHRegCloseKey
+ 506 stdcall SHRegOpenKeyA (long str long) SHRegOpenKeyA
+ 507 stdcall SHRegOpenKeyW (long wstr long) SHRegOpenKeyW
  508 stub SHRegQueryValueA@16
- 509 stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) SHRegQueryValueEx32A
- 510 stdcall SHRegQueryValueW (long long long long) SHRegQueryValue32W
- 511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) SHRegQueryValueEx32W
+ 509 stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) SHRegQueryValueExA
+ 510 stdcall SHRegQueryValueW (long long long long) SHRegQueryValueW
+ 511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) SHRegQueryValueExW
  512 stub SHRegDeleteKeyW@8
 
  520 stdcall SHAllocShared (long long long) SHAllocShared
@@ -375,5 +375,5 @@ init	Shell32LibMain
 1217 stub FOOBAR1217   # no joke! This is the real name!!
 
 # later additions ... FIXME: incorrect ordinals
-1218 stdcall SHGetSpecialFolderPathA(long ptr long long) SHGetSpecialFolderPath32A
+1218 stdcall SHGetSpecialFolderPathA(long ptr long long) SHGetSpecialFolderPathA
 1219 stub DoEnvironmentSubstW
diff --git a/relay32/snoop.c b/relay32/snoop.c
index e83e828719a..645ecd5d29e 100644
--- a/relay32/snoop.c
+++ b/relay32/snoop.c
@@ -61,12 +61,12 @@ typedef	struct tagSNOOP_FUN {
 	DWORD		snoopentry;	/* SNOOP_Entry relative */
 	/* unreached */
 	int		nrofargs;
-	FARPROC32	origfun;
+	FARPROC	origfun;
 	char		*name;
 } SNOOP_FUN;
 
 typedef struct tagSNOOP_DLL {
-	HMODULE32	hmod;
+	HMODULE	hmod;
 	SNOOP_FUN	*funs;
 	LPCSTR		name;
 	int		nrofordinals;
@@ -80,7 +80,7 @@ typedef struct tagSNOOP_RETURNENTRY {
 	 */
 	DWORD		snoopret;	/* SNOOP_Ret relative */
 	/* unreached */
-	FARPROC32	origreturn;
+	FARPROC	origreturn;
 	SNOOP_DLL	*dll;
 	DWORD		ordinal;
 	DWORD		origESP;
@@ -136,7 +136,7 @@ int SNOOP_ShowDebugmsgSnoop(const char *dll, int ord, const char *fname) {
 }
 
 void
-SNOOP_RegisterDLL(HMODULE32 hmod,LPCSTR name,DWORD nrofordinals) {
+SNOOP_RegisterDLL(HMODULE hmod,LPCSTR name,DWORD nrofordinals) {
 	SNOOP_DLL	**dll = &(firstdll);
 	char		*s;
 
@@ -162,8 +162,8 @@ SNOOP_RegisterDLL(HMODULE32 hmod,LPCSTR name,DWORD nrofordinals) {
 	}
 }
 
-FARPROC32
-SNOOP_GetProcAddress32(HMODULE32 hmod,LPCSTR name,DWORD ordinal,FARPROC32 origfun) {
+FARPROC
+SNOOP_GetProcAddress(HMODULE hmod,LPCSTR name,DWORD ordinal,FARPROC origfun) {
 	SNOOP_DLL			*dll = firstdll;
 	SNOOP_FUN			*fun;
 	int				j;
@@ -208,7 +208,7 @@ SNOOP_GetProcAddress32(HMODULE32 hmod,LPCSTR name,DWORD ordinal,FARPROC32 origfu
 	fun->snoopentry	= (char*)SNOOP_Entry-((char*)(&fun->nrofargs));
 	fun->origfun	= origfun;
 	fun->nrofargs	= -1;
-	return (FARPROC32)&(fun->lcall);
+	return (FARPROC)&(fun->lcall);
 }
 
 static char*
@@ -225,7 +225,7 @@ SNOOP_PrintArg(DWORD x) {
 		return buf;
 	}
 	i=0;nostring=0;
-	if (!IsBadStringPtr32A((LPSTR)x,80)) {
+	if (!IsBadStringPtrA((LPSTR)x,80)) {
 		while (i<80) {
 			LPBYTE	s=(LPBYTE)x;
 
@@ -244,7 +244,7 @@ SNOOP_PrintArg(DWORD x) {
 		}
 	}
 	i=0;nostring=0;
-	if (!IsBadStringPtr32W((LPWSTR)x,80)) {
+	if (!IsBadStringPtrW((LPWSTR)x,80)) {
 		while (i<80) {
 			LPWSTR	s=(LPWSTR)x;
 
@@ -321,7 +321,7 @@ REGS_ENTRYPOINT(SNOOP_Entry) {
 	ret->lcall	= 0xe8;
 	/* NOTE: origreturn struct member MUST come directly after snoopret */
 	ret->snoopret	= ((char*)SNOOP_Return)-(char*)(&ret->origreturn);
-	ret->origreturn	= (FARPROC32)CALLER1REF;
+	ret->origreturn	= (FARPROC)CALLER1REF;
 	CALLER1REF	= (DWORD)&ret->lcall;
 	ret->dll	= dll;
 	ret->args	= NULL;
@@ -378,12 +378,12 @@ REGS_ENTRYPOINT(SNOOP_Return) {
 	ret->origreturn = NULL; /* mark as empty */
 }
 #else	/* !__i386__ */
-void SNOOP_RegisterDLL(HMODULE32 hmod,LPCSTR name,DWORD nrofordinals) {
+void SNOOP_RegisterDLL(HMODULE hmod,LPCSTR name,DWORD nrofordinals) {
 	FIXME(snoop,"snooping works only on i386 for now.\n");
 	return;
 }
 
-FARPROC32 SNOOP_GetProcAddress32(HMODULE32 hmod,LPCSTR name,DWORD ordinal,FARPROC32 origfun) {
+FARPROC SNOOP_GetProcAddress(HMODULE hmod,LPCSTR name,DWORD ordinal,FARPROC origfun) {
 	return origfun;
 }
 #endif	/* !__i386__ */
diff --git a/relay32/tapi32.spec b/relay32/tapi32.spec
index 3f45edd27c7..7664a25a2c4 100644
--- a/relay32/tapi32.spec
+++ b/relay32/tapi32.spec
@@ -53,7 +53,7 @@ type	win32
  50 stub    linePark
  51 stub    linePickup
  52 stub    linePrepareAddToConference
- 53 stdcall lineRedirect(long ptr long) lineRedirect32
+ 53 stdcall lineRedirect(long ptr long) lineRedirect
  54 stub    lineRegisterRequestRecipient
  55 stub    lineReleaseUserUserInfo
  56 stub    lineRemoveFromConference
@@ -113,5 +113,5 @@ type	win32
 110 stub    phoneShutdown
 111 stub    tapiGetLocationInfo
 112 stub    tapiRequestDrop
-113 stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCall32
+113 stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCall
 114 stub    tapiRequestMediaCall
diff --git a/relay32/user32.spec b/relay32/user32.spec
index e404195ccff..559720c4200 100644
--- a/relay32/user32.spec
+++ b/relay32/user32.spec
@@ -2,615 +2,615 @@ name	user32
 type	win32
 init	MAIN_UserInit
 
-  1 stdcall ActivateKeyboardLayout(long long) ActivateKeyboardLayout32
-  2 stdcall AdjustWindowRect(ptr long long) AdjustWindowRect32
-  3 stdcall AdjustWindowRectEx(ptr long long long) AdjustWindowRectEx32
-  4 stdcall AnyPopup() AnyPopup32
-  5 stdcall AppendMenuA(long long long ptr) AppendMenu32A
-  6 stdcall AppendMenuW(long long long ptr) AppendMenu32W
-  7 stdcall ArrangeIconicWindows(long) ArrangeIconicWindows32
+  1 stdcall ActivateKeyboardLayout(long long) ActivateKeyboardLayout
+  2 stdcall AdjustWindowRect(ptr long long) AdjustWindowRect
+  3 stdcall AdjustWindowRectEx(ptr long long long) AdjustWindowRectEx
+  4 stdcall AnyPopup() AnyPopup
+  5 stdcall AppendMenuA(long long long ptr) AppendMenuA
+  6 stdcall AppendMenuW(long long long ptr) AppendMenuW
+  7 stdcall ArrangeIconicWindows(long) ArrangeIconicWindows
   8 stdcall AttachThreadInput(long long long) AttachThreadInput
-  9 stdcall BeginDeferWindowPos(long) BeginDeferWindowPos32
- 10 stdcall BeginPaint(long ptr) BeginPaint32
- 11 stdcall BringWindowToTop(long) BringWindowToTop32
+  9 stdcall BeginDeferWindowPos(long) BeginDeferWindowPos
+ 10 stdcall BeginPaint(long ptr) BeginPaint
+ 11 stdcall BringWindowToTop(long) BringWindowToTop
  12 stdcall BroadcastSystemMessage(long ptr long long long) BroadcastSystemMessage
  13 stub CalcChildScroll
  14 stub CallMsgFilter
- 15 stdcall CallMsgFilterA(ptr long) CallMsgFilter32A
- 16 stdcall CallMsgFilterW(ptr long) CallMsgFilter32W
- 17 stdcall CallNextHookEx(long long long long) CallNextHookEx32
- 18 stdcall CallWindowProcA(ptr long long long long) CallWindowProc32A
- 19 stdcall CallWindowProcW(ptr long long long long) CallWindowProc32W
+ 15 stdcall CallMsgFilterA(ptr long) CallMsgFilterA
+ 16 stdcall CallMsgFilterW(ptr long) CallMsgFilterW
+ 17 stdcall CallNextHookEx(long long long long) CallNextHookEx
+ 18 stdcall CallWindowProcA(ptr long long long long) CallWindowProcA
+ 19 stdcall CallWindowProcW(ptr long long long long) CallWindowProcW
  20 stub CascadeChildWindows
  21 stdcall CascadeWindows(long long ptr long ptr) CascadeWindows
- 22 stdcall ChangeClipboardChain(long long) ChangeClipboardChain32
- 23 stdcall ChangeMenuA(long long ptr long long) ChangeMenu32A
- 24 stdcall ChangeMenuW(long long ptr long long) ChangeMenu32W
- 25 stdcall CharLowerA(str) CharLower32A
- 26 stdcall CharLowerBuffA(str long) CharLowerBuff32A
- 27 stdcall CharLowerBuffW(wstr long) CharLowerBuff32W
- 28 stdcall CharLowerW(wstr) CharLower32W
- 29 stdcall CharNextA(str) CharNext32A
- 30 stdcall CharNextExA(long str long) CharNextEx32A
- 31 stdcall CharNextExW(long wstr long) CharNextEx32W
- 32 stdcall CharNextW(wstr) CharNext32W
- 33 stdcall CharPrevA(str str) CharPrev32A
- 34 stdcall CharPrevExA(long str str long) CharPrevEx32A
- 35 stdcall CharPrevExW(long wstr wstr long) CharPrevEx32W
- 36 stdcall CharPrevW(wstr wstr) CharPrev32W
- 37 stdcall CharToOemA(str ptr) CharToOem32A
- 38 stdcall CharToOemBuffA(str ptr long) CharToOemBuff32A
- 39 stdcall CharToOemBuffW(wstr ptr long) CharToOemBuff32W
- 40 stdcall CharToOemW(wstr ptr) CharToOem32W
- 41 stdcall CharUpperA(str) CharUpper32A
- 42 stdcall CharUpperBuffA(str long) CharUpperBuff32A
- 43 stdcall CharUpperBuffW(wstr long) CharUpperBuff32W
- 44 stdcall CharUpperW(wstr) CharUpper32W
- 45 stdcall CheckDlgButton(long long long) CheckDlgButton32
- 46 stdcall CheckMenuItem(long long long) CheckMenuItem32
- 47 stdcall CheckMenuRadioItem(long long long long long) CheckMenuRadioItem32
- 48 stdcall CheckRadioButton(long long long long) CheckRadioButton32
- 49 stdcall ChildWindowFromPoint(long long long) ChildWindowFromPoint32
- 50 stdcall ChildWindowFromPointEx(long long long long) ChildWindowFromPointEx32
+ 22 stdcall ChangeClipboardChain(long long) ChangeClipboardChain
+ 23 stdcall ChangeMenuA(long long ptr long long) ChangeMenuA
+ 24 stdcall ChangeMenuW(long long ptr long long) ChangeMenuW
+ 25 stdcall CharLowerA(str) CharLowerA
+ 26 stdcall CharLowerBuffA(str long) CharLowerBuffA
+ 27 stdcall CharLowerBuffW(wstr long) CharLowerBuffW
+ 28 stdcall CharLowerW(wstr) CharLowerW
+ 29 stdcall CharNextA(str) CharNextA
+ 30 stdcall CharNextExA(long str long) CharNextExA
+ 31 stdcall CharNextExW(long wstr long) CharNextExW
+ 32 stdcall CharNextW(wstr) CharNextW
+ 33 stdcall CharPrevA(str str) CharPrevA
+ 34 stdcall CharPrevExA(long str str long) CharPrevExA
+ 35 stdcall CharPrevExW(long wstr wstr long) CharPrevExW
+ 36 stdcall CharPrevW(wstr wstr) CharPrevW
+ 37 stdcall CharToOemA(str ptr) CharToOemA
+ 38 stdcall CharToOemBuffA(str ptr long) CharToOemBuffA
+ 39 stdcall CharToOemBuffW(wstr ptr long) CharToOemBuffW
+ 40 stdcall CharToOemW(wstr ptr) CharToOemW
+ 41 stdcall CharUpperA(str) CharUpperA
+ 42 stdcall CharUpperBuffA(str long) CharUpperBuffA
+ 43 stdcall CharUpperBuffW(wstr long) CharUpperBuffW
+ 44 stdcall CharUpperW(wstr) CharUpperW
+ 45 stdcall CheckDlgButton(long long long) CheckDlgButton
+ 46 stdcall CheckMenuItem(long long long) CheckMenuItem
+ 47 stdcall CheckMenuRadioItem(long long long long long) CheckMenuRadioItem
+ 48 stdcall CheckRadioButton(long long long long) CheckRadioButton
+ 49 stdcall ChildWindowFromPoint(long long long) ChildWindowFromPoint
+ 50 stdcall ChildWindowFromPointEx(long long long long) ChildWindowFromPointEx
  51 stub ClientThreadConnect
- 52 stdcall ClientToScreen(long ptr) ClientToScreen32
- 53 stdcall ClipCursor(ptr) ClipCursor32
- 54 stdcall CloseClipboard() CloseClipboard32
+ 52 stdcall ClientToScreen(long ptr) ClientToScreen
+ 53 stdcall ClipCursor(ptr) ClipCursor
+ 54 stdcall CloseClipboard() CloseClipboard
  55 stub CloseDesktop
- 56 stdcall CloseWindow(long) CloseWindow32
+ 56 stdcall CloseWindow(long) CloseWindow
  57 stub CloseWindowStation
- 58 stdcall CopyAcceleratorTableA(long ptr long) CopyAcceleratorTable32A
- 59 stdcall CopyAcceleratorTableW(long ptr long) CopyAcceleratorTable32W
- 60 stdcall CopyIcon(long) CopyIcon32
- 61 stdcall CopyImage(long long long long long) CopyImage32
- 62 stdcall CopyRect(ptr ptr) CopyRect32
- 63 stdcall CountClipboardFormats() CountClipboardFormats32
- 64 stdcall CreateAcceleratorTableA(ptr long) CreateAcceleratorTable32A
+ 58 stdcall CopyAcceleratorTableA(long ptr long) CopyAcceleratorTableA
+ 59 stdcall CopyAcceleratorTableW(long ptr long) CopyAcceleratorTableW
+ 60 stdcall CopyIcon(long) CopyIcon
+ 61 stdcall CopyImage(long long long long long) CopyImage
+ 62 stdcall CopyRect(ptr ptr) CopyRect
+ 63 stdcall CountClipboardFormats() CountClipboardFormats
+ 64 stdcall CreateAcceleratorTableA(ptr long) CreateAcceleratorTableA
  65 stub CreateAcceleratorTableW
- 66 stdcall CreateCaret(long long long long) CreateCaret32
- 67 stdcall CreateCursor(long long long long long ptr ptr) CreateCursor32
+ 66 stdcall CreateCaret(long long long long) CreateCaret
+ 67 stdcall CreateCursor(long long long long long ptr ptr) CreateCursor
  68 stub CreateDesktopA
- 69 stdcall CreateDesktopW(wstr wstr ptr long long ptr) CreateDesktop32W
- 70 stdcall CreateDialogIndirectParamA(long ptr long ptr long) CreateDialogIndirectParam32A
- 71 stdcall CreateDialogIndirectParamAorW (long ptr long ptr long) CreateDialogIndirectParam32AorW
- 72 stdcall CreateDialogIndirectParamW(long ptr long ptr long) CreateDialogIndirectParam32W
- 73 stdcall CreateDialogParamA(long ptr long ptr long) CreateDialogParam32A
- 74 stdcall CreateDialogParamW(long ptr long ptr long) CreateDialogParam32W
- 75 stdcall CreateIcon(long long long long long ptr ptr) CreateIcon32
- 76 stdcall CreateIconFromResource (ptr long long long) CreateIconFromResource32
- 77 stdcall CreateIconFromResourceEx(ptr long long long long long long) CreateIconFromResourceEx32
+ 69 stdcall CreateDesktopW(wstr wstr ptr long long ptr) CreateDesktopW
+ 70 stdcall CreateDialogIndirectParamA(long ptr long ptr long) CreateDialogIndirectParamA
+ 71 stdcall CreateDialogIndirectParamAorW (long ptr long ptr long) CreateDialogIndirectParamAorW
+ 72 stdcall CreateDialogIndirectParamW(long ptr long ptr long) CreateDialogIndirectParamW
+ 73 stdcall CreateDialogParamA(long ptr long ptr long) CreateDialogParamA
+ 74 stdcall CreateDialogParamW(long ptr long ptr long) CreateDialogParamW
+ 75 stdcall CreateIcon(long long long long long ptr ptr) CreateIcon
+ 76 stdcall CreateIconFromResource (ptr long long long) CreateIconFromResource
+ 77 stdcall CreateIconFromResourceEx(ptr long long long long long long) CreateIconFromResourceEx
  78 stdcall CreateIconIndirect(ptr) CreateIconIndirect
- 79 stdcall CreateMDIWindowA(ptr ptr long long long long long long long long) CreateMDIWindow32A
- 80 stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) CreateMDIWindow32W
- 81 stdcall CreateMenu() CreateMenu32
- 82 stdcall CreatePopupMenu() CreatePopupMenu32
- 83 stdcall CreateWindowExA(long str str long long long long long long long long ptr) CreateWindowEx32A
- 84 stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) CreateWindowEx32W
+ 79 stdcall CreateMDIWindowA(ptr ptr long long long long long long long long) CreateMDIWindowA
+ 80 stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) CreateMDIWindowW
+ 81 stdcall CreateMenu() CreateMenu
+ 82 stdcall CreatePopupMenu() CreatePopupMenu
+ 83 stdcall CreateWindowExA(long str str long long long long long long long long ptr) CreateWindowExA
+ 84 stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) CreateWindowExW
  85 stub CreateWindowStationA
- 86 stdcall CreateWindowStationW(wstr long long ptr) CreateWindowStation32W
+ 86 stdcall CreateWindowStationW(wstr long long ptr) CreateWindowStationW
  87 stub DdeAbandonTransaction
- 88 stdcall DdeAccessData(long ptr) DdeAccessData32
+ 88 stdcall DdeAccessData(long ptr) DdeAccessData
  89 stub DdeAddData
- 90 stdcall DdeClientTransaction(ptr long long long long long long ptr) DdeClientTransaction32
- 91 stdcall DdeCmpStringHandles(long long) DdeCmpStringHandles32
- 92 stdcall DdeConnect(long long long ptr) DdeConnect32
- 93 stdcall DdeConnectList(long long long long ptr) DdeConnectList32
- 94 stdcall DdeCreateDataHandle(long ptr long long long long long) DdeCreateDataHandle32
- 95 stdcall DdeCreateStringHandleA(long str long) DdeCreateStringHandle32A
- 96 stdcall DdeCreateStringHandleW(long wstr long) DdeCreateStringHandle32W
- 97 stdcall DdeDisconnect(long) DdeDisconnect32
- 98 stdcall DdeDisconnectList(long) DdeDisconnectList32
- 99 stdcall DdeEnableCallback(long long long) DdeEnableCallback32
-100 stdcall DdeFreeDataHandle(long) DdeFreeDataHandle32
-101 stdcall DdeFreeStringHandle(long long) DdeFreeStringHandle32
-102 stdcall DdeGetData(long ptr long long) DdeGetData32
-103 stdcall DdeGetLastError(long) DdeGetLastError32
+ 90 stdcall DdeClientTransaction(ptr long long long long long long ptr) DdeClientTransaction
+ 91 stdcall DdeCmpStringHandles(long long) DdeCmpStringHandles
+ 92 stdcall DdeConnect(long long long ptr) DdeConnect
+ 93 stdcall DdeConnectList(long long long long ptr) DdeConnectList
+ 94 stdcall DdeCreateDataHandle(long ptr long long long long long) DdeCreateDataHandle
+ 95 stdcall DdeCreateStringHandleA(long str long) DdeCreateStringHandleA
+ 96 stdcall DdeCreateStringHandleW(long wstr long) DdeCreateStringHandleW
+ 97 stdcall DdeDisconnect(long) DdeDisconnect
+ 98 stdcall DdeDisconnectList(long) DdeDisconnectList
+ 99 stdcall DdeEnableCallback(long long long) DdeEnableCallback
+100 stdcall DdeFreeDataHandle(long) DdeFreeDataHandle
+101 stdcall DdeFreeStringHandle(long long) DdeFreeStringHandle
+102 stdcall DdeGetData(long ptr long long) DdeGetData
+103 stdcall DdeGetLastError(long) DdeGetLastError
 104 stub DdeGetQualityOfService
 105 stub DdeImpersonateClient
-106 stdcall DdeInitializeA(ptr ptr long long) DdeInitialize32A
-107 stdcall DdeInitializeW(ptr ptr long long) DdeInitialize32W
-108 stdcall DdeKeepStringHandle(long long) DdeKeepStringHandle32
-109 stdcall DdeNameService(long long long long) DdeNameService32
-110 stdcall DdePostAdvise(long long long) DdePostAdvise32
+106 stdcall DdeInitializeA(ptr ptr long long) DdeInitializeA
+107 stdcall DdeInitializeW(ptr ptr long long) DdeInitializeW
+108 stdcall DdeKeepStringHandle(long long) DdeKeepStringHandle
+109 stdcall DdeNameService(long long long long) DdeNameService
+110 stdcall DdePostAdvise(long long long) DdePostAdvise
 111 stub DdeQueryConvInfo
-112 stdcall DdeQueryNextServer(long long) DdeQueryNextServer32
-113 stdcall DdeQueryStringA(long long ptr long long) DdeQueryString32A
-114 stdcall DdeQueryStringW(long long ptr long long) DdeQueryString32W
+112 stdcall DdeQueryNextServer(long long) DdeQueryNextServer
+113 stdcall DdeQueryStringA(long long ptr long long) DdeQueryStringA
+114 stdcall DdeQueryStringW(long long ptr long long) DdeQueryStringW
 115 stdcall DdeReconnect(long) DdeReconnect
 116 stub DdeSetQualityOfService
 117 stub DdeSetUserHandle
-118 stdcall DdeUnaccessData(long) DdeUnaccessData32
-119 stdcall DdeUninitialize(long) DdeUninitialize32
-120 stdcall DefDlgProcA(long long long long) DefDlgProc32A
-121 stdcall DefDlgProcW(long long long long) DefDlgProc32W
-122 stdcall DefFrameProcA(long long long long long) DefFrameProc32A
-123 stdcall DefFrameProcW(long long long long long) DefFrameProc32W
-124 stdcall DefMDIChildProcA(long long long long) DefMDIChildProc32A
-125 stdcall DefMDIChildProcW(long long long long) DefMDIChildProc32W
-126 stdcall DefWindowProcA(long long long long) DefWindowProc32A
-127 stdcall DefWindowProcW(long long long long) DefWindowProc32W
-128 stdcall DeferWindowPos(long long long long long long long long) DeferWindowPos32
-129 stdcall DeleteMenu(long long long) DeleteMenu32
+118 stdcall DdeUnaccessData(long) DdeUnaccessData
+119 stdcall DdeUninitialize(long) DdeUninitialize
+120 stdcall DefDlgProcA(long long long long) DefDlgProcA
+121 stdcall DefDlgProcW(long long long long) DefDlgProcW
+122 stdcall DefFrameProcA(long long long long long) DefFrameProcA
+123 stdcall DefFrameProcW(long long long long long) DefFrameProcW
+124 stdcall DefMDIChildProcA(long long long long) DefMDIChildProcA
+125 stdcall DefMDIChildProcW(long long long long) DefMDIChildProcW
+126 stdcall DefWindowProcA(long long long long) DefWindowProcA
+127 stdcall DefWindowProcW(long long long long) DefWindowProcW
+128 stdcall DeferWindowPos(long long long long long long long long) DeferWindowPos
+129 stdcall DeleteMenu(long long long) DeleteMenu
 130 stdcall DestroyAcceleratorTable(long) DestroyAcceleratorTable
-131 stdcall DestroyCaret() DestroyCaret32
-132 stdcall DestroyCursor(long) DestroyCursor32
-133 stdcall DestroyIcon(long) DestroyIcon32
-134 stdcall DestroyMenu(long) DestroyMenu32
-135 stdcall DestroyWindow(long) DestroyWindow32
-136 stdcall DialogBoxIndirectParamA(long ptr long ptr long) DialogBoxIndirectParam32A
-137 stdcall DialogBoxIndirectParamAorW(long ptr long ptr long) DialogBoxIndirectParam32A
-138 stdcall DialogBoxIndirectParamW(long ptr long ptr long) DialogBoxIndirectParam32W
-139 stdcall DialogBoxParamA(long str long ptr long) DialogBoxParam32A
-140 stdcall DialogBoxParamW(long wstr long ptr long) DialogBoxParam32W
-141 stdcall DispatchMessageA(ptr) DispatchMessage32A
-142 stdcall DispatchMessageW(ptr) DispatchMessage32W
-143 stdcall DlgDirListA(long ptr long long long) DlgDirList32A
-144 stdcall DlgDirListComboBoxA(long ptr long long long) DlgDirListComboBox32A
-145 stdcall DlgDirListComboBoxW(long ptr long long long) DlgDirListComboBox32W
-146 stdcall DlgDirListW(long ptr long long long) DlgDirList32W
-147 stdcall DlgDirSelectComboBoxExA(long ptr long long) DlgDirSelectComboBoxEx32A
-148 stdcall DlgDirSelectComboBoxExW(long ptr long long) DlgDirSelectComboBoxEx32W
-149 stdcall DlgDirSelectExA(long ptr long long) DlgDirSelectEx32A
-150 stdcall DlgDirSelectExW(long ptr long long) DlgDirSelectEx32W
-151 stdcall DragDetect(long long long) DragDetect32
+131 stdcall DestroyCaret() DestroyCaret
+132 stdcall DestroyCursor(long) DestroyCursor
+133 stdcall DestroyIcon(long) DestroyIcon
+134 stdcall DestroyMenu(long) DestroyMenu
+135 stdcall DestroyWindow(long) DestroyWindow
+136 stdcall DialogBoxIndirectParamA(long ptr long ptr long) DialogBoxIndirectParamA
+137 stdcall DialogBoxIndirectParamAorW(long ptr long ptr long) DialogBoxIndirectParamA
+138 stdcall DialogBoxIndirectParamW(long ptr long ptr long) DialogBoxIndirectParamW
+139 stdcall DialogBoxParamA(long str long ptr long) DialogBoxParamA
+140 stdcall DialogBoxParamW(long wstr long ptr long) DialogBoxParamW
+141 stdcall DispatchMessageA(ptr) DispatchMessageA
+142 stdcall DispatchMessageW(ptr) DispatchMessageW
+143 stdcall DlgDirListA(long ptr long long long) DlgDirListA
+144 stdcall DlgDirListComboBoxA(long ptr long long long) DlgDirListComboBoxA
+145 stdcall DlgDirListComboBoxW(long ptr long long long) DlgDirListComboBoxW
+146 stdcall DlgDirListW(long ptr long long long) DlgDirListW
+147 stdcall DlgDirSelectComboBoxExA(long ptr long long) DlgDirSelectComboBoxExA
+148 stdcall DlgDirSelectComboBoxExW(long ptr long long) DlgDirSelectComboBoxExW
+149 stdcall DlgDirSelectExA(long ptr long long) DlgDirSelectExA
+150 stdcall DlgDirSelectExW(long ptr long long) DlgDirSelectExW
+151 stdcall DragDetect(long long long) DragDetect
 152 stub DragObject
-153 stdcall DrawAnimatedRects(long long ptr ptr) DrawAnimatedRects32
-154 stdcall DrawCaption(long long ptr long) DrawCaption32
-155 stdcall DrawEdge(long ptr long long) DrawEdge32
-156 stdcall DrawFocusRect(long ptr) DrawFocusRect32
+153 stdcall DrawAnimatedRects(long long ptr ptr) DrawAnimatedRects
+154 stdcall DrawCaption(long long ptr long) DrawCaption
+155 stdcall DrawEdge(long ptr long long) DrawEdge
+156 stdcall DrawFocusRect(long ptr) DrawFocusRect
 157 stub DrawFrame
-158 stdcall DrawFrameControl(long ptr long long) DrawFrameControl32
-159 stdcall DrawIcon(long long long long) DrawIcon32
-160 stdcall DrawIconEx(long long long long long long long long long) DrawIconEx32
-161 stdcall DrawMenuBar(long) DrawMenuBar32
-162 stdcall DrawStateA(long long ptr long long long long long long long) DrawState32A
-163 stdcall DrawStateW(long long ptr long long long long long long long) DrawState32W
-164 stdcall DrawTextA(long str long ptr long) DrawText32A
-165 stdcall DrawTextExA(long str long ptr long ptr) DrawTextEx32A
-166 stdcall DrawTextExW(long wstr long ptr long ptr) DrawTextEx32W
-167 stdcall DrawTextW(long wstr long ptr long) DrawText32W
+158 stdcall DrawFrameControl(long ptr long long) DrawFrameControl
+159 stdcall DrawIcon(long long long long) DrawIcon
+160 stdcall DrawIconEx(long long long long long long long long long) DrawIconEx
+161 stdcall DrawMenuBar(long) DrawMenuBar
+162 stdcall DrawStateA(long long ptr long long long long long long long) DrawStateA
+163 stdcall DrawStateW(long long ptr long long long long long long long) DrawStateW
+164 stdcall DrawTextA(long str long ptr long) DrawTextA
+165 stdcall DrawTextExA(long str long ptr long ptr) DrawTextExA
+166 stdcall DrawTextExW(long wstr long ptr long ptr) DrawTextExW
+167 stdcall DrawTextW(long wstr long ptr long) DrawTextW
 168 stub EditWndProc
-169 stdcall EmptyClipboard() EmptyClipboard32
-170 stdcall EnableMenuItem(long long long) EnableMenuItem32
-171 stdcall EnableScrollBar(long long long) EnableScrollBar32
-172 stdcall EnableWindow(long long) EnableWindow32
-173 stdcall EndDeferWindowPos(long) EndDeferWindowPos32
-174 stdcall EndDialog(long long) EndDialog32
+169 stdcall EmptyClipboard() EmptyClipboard
+170 stdcall EnableMenuItem(long long long) EnableMenuItem
+171 stdcall EnableScrollBar(long long long) EnableScrollBar
+172 stdcall EnableWindow(long long) EnableWindow
+173 stdcall EndDeferWindowPos(long) EndDeferWindowPos
+174 stdcall EndDialog(long long) EndDialog
 175 stdcall EndMenu() EndMenu
-176 stdcall EndPaint(long ptr) EndPaint32
+176 stdcall EndPaint(long ptr) EndPaint
 177 stub EndTask
-178 stdcall EnumChildWindows(long ptr long) EnumChildWindows32
-179 stdcall EnumClipboardFormats(long) EnumClipboardFormats32
+178 stdcall EnumChildWindows(long ptr long) EnumChildWindows
+179 stdcall EnumClipboardFormats(long) EnumClipboardFormats
 180 stub EnumDesktopsA
 181 stub EnumDesktopsW
 182 stub EnumDisplayDeviceModesA
 183 stub EnumDisplayDeviceModesW
 184 stub EnumDisplayDevicesA
 185 stub EnumDisplayDevicesW
-186 stdcall EnumPropsA(long ptr) EnumProps32A
-187 stdcall EnumPropsExA(long ptr long) EnumPropsEx32A
-188 stdcall EnumPropsExW(long ptr long) EnumPropsEx32W
-189 stdcall EnumPropsW(long ptr) EnumProps32W
+186 stdcall EnumPropsA(long ptr) EnumPropsA
+187 stdcall EnumPropsExA(long ptr long) EnumPropsExA
+188 stdcall EnumPropsExW(long ptr long) EnumPropsExW
+189 stdcall EnumPropsW(long ptr) EnumPropsW
 190 stdcall EnumThreadWindows(long ptr long) EnumThreadWindows
 191 stub EnumWindowStationsA
 192 stub EnumWindowStationsW
-193 stdcall EnumWindows(ptr long) EnumWindows32
-194 stdcall EqualRect(ptr ptr) EqualRect32
-195 stdcall ExcludeUpdateRgn(long long) ExcludeUpdateRgn32
+193 stdcall EnumWindows(ptr long) EnumWindows
+194 stdcall EqualRect(ptr ptr) EqualRect
+195 stdcall ExcludeUpdateRgn(long long) ExcludeUpdateRgn
 196 stdcall ExitWindowsEx(long long) ExitWindowsEx
-197 stdcall FillRect(long ptr long) FillRect32
-198 stdcall FindWindowA(str str) FindWindow32A
-199 stdcall FindWindowExA(long long str str) FindWindowEx32A
-200 stdcall FindWindowExW(long long wstr wstr) FindWindowEx32W
-201 stdcall FindWindowW(wstr wstr) FindWindow32W
-202 stdcall FlashWindow(long long) FlashWindow32
-203 stdcall FrameRect(long ptr long) FrameRect32
+197 stdcall FillRect(long ptr long) FillRect
+198 stdcall FindWindowA(str str) FindWindowA
+199 stdcall FindWindowExA(long long str str) FindWindowExA
+200 stdcall FindWindowExW(long long wstr wstr) FindWindowExW
+201 stdcall FindWindowW(wstr wstr) FindWindowW
+202 stdcall FlashWindow(long long) FlashWindow
+203 stdcall FrameRect(long ptr long) FrameRect
 204 stdcall FreeDDElParam(long long) FreeDDElParam
-205 stdcall GetActiveWindow() GetActiveWindow32
-206 stdcall GetAppCompatFlags(long) GetAppCompatFlags32
-207 stdcall GetAsyncKeyState(long) GetAsyncKeyState32
-208 stdcall GetCapture() GetCapture32
-209 stdcall GetCaretBlinkTime() GetCaretBlinkTime32
-210 stdcall GetCaretPos(ptr) GetCaretPos32
-211 stdcall GetClassInfoA(long str ptr) GetClassInfo32A
-212 stdcall GetClassInfoExA(long str ptr) GetClassInfoEx32A
-213 stdcall GetClassInfoExW(long wstr ptr) GetClassInfoEx32W
-214 stdcall GetClassInfoW(long wstr ptr) GetClassInfo32W
-215 stdcall GetClassLongA(long long) GetClassLong32A
-216 stdcall GetClassLongW(long long) GetClassLong32W
-217 stdcall GetClassNameA(long ptr long) GetClassName32A
-218 stdcall GetClassNameW(long ptr long) GetClassName32W
-219 stdcall GetClassWord(long long) GetClassWord32
-220 stdcall GetClientRect(long long) GetClientRect32
-221 stdcall GetClipCursor(ptr) GetClipCursor32
-222 stdcall GetClipboardData(long) GetClipboardData32
-223 stdcall GetClipboardFormatNameA(long ptr long) GetClipboardFormatName32A
-224 stdcall GetClipboardFormatNameW(long ptr long) GetClipboardFormatName32W
-225 stdcall GetClipboardOwner() GetClipboardOwner32
-226 stdcall GetClipboardViewer(long) GetClipboardViewer32
-227 stdcall GetCursor() GetCursor32
+205 stdcall GetActiveWindow() GetActiveWindow
+206 stdcall GetAppCompatFlags(long) GetAppCompatFlags
+207 stdcall GetAsyncKeyState(long) GetAsyncKeyState
+208 stdcall GetCapture() GetCapture
+209 stdcall GetCaretBlinkTime() GetCaretBlinkTime
+210 stdcall GetCaretPos(ptr) GetCaretPos
+211 stdcall GetClassInfoA(long str ptr) GetClassInfoA
+212 stdcall GetClassInfoExA(long str ptr) GetClassInfoExA
+213 stdcall GetClassInfoExW(long wstr ptr) GetClassInfoExW
+214 stdcall GetClassInfoW(long wstr ptr) GetClassInfoW
+215 stdcall GetClassLongA(long long) GetClassLongA
+216 stdcall GetClassLongW(long long) GetClassLongW
+217 stdcall GetClassNameA(long ptr long) GetClassNameA
+218 stdcall GetClassNameW(long ptr long) GetClassNameW
+219 stdcall GetClassWord(long long) GetClassWord
+220 stdcall GetClientRect(long long) GetClientRect
+221 stdcall GetClipCursor(ptr) GetClipCursor
+222 stdcall GetClipboardData(long) GetClipboardData
+223 stdcall GetClipboardFormatNameA(long ptr long) GetClipboardFormatNameA
+224 stdcall GetClipboardFormatNameW(long ptr long) GetClipboardFormatNameW
+225 stdcall GetClipboardOwner() GetClipboardOwner
+226 stdcall GetClipboardViewer(long) GetClipboardViewer
+227 stdcall GetCursor() GetCursor
 228 stub GetCursorInfo
-229 stdcall GetCursorPos(ptr) GetCursorPos32
-230 stdcall GetDC(long) GetDC32
-231 stdcall GetDCEx(long long long) GetDCEx32
-232 stdcall GetDesktopWindow() GetDesktopWindow32
+229 stdcall GetCursorPos(ptr) GetCursorPos
+230 stdcall GetDC(long) GetDC
+231 stdcall GetDCEx(long long long) GetDCEx
+232 stdcall GetDesktopWindow() GetDesktopWindow
 233 stdcall GetDialogBaseUnits() GetDialogBaseUnits
-234 stdcall GetDlgCtrlID(long) GetDlgCtrlID32
-235 stdcall GetDlgItem(long long) GetDlgItem32
-236 stdcall GetDlgItemInt(long long ptr long) GetDlgItemInt32
-237 stdcall GetDlgItemTextA(long long ptr long) GetDlgItemText32A
-238 stdcall GetDlgItemTextW(long long ptr long) GetDlgItemText32W
-239 stdcall GetDoubleClickTime() GetDoubleClickTime32
-240 stdcall GetFocus() GetFocus32
-241 stdcall GetForegroundWindow() GetForegroundWindow32
-242 stdcall GetIconInfo(long ptr) GetIconInfo32
+234 stdcall GetDlgCtrlID(long) GetDlgCtrlID
+235 stdcall GetDlgItem(long long) GetDlgItem
+236 stdcall GetDlgItemInt(long long ptr long) GetDlgItemInt
+237 stdcall GetDlgItemTextA(long long ptr long) GetDlgItemTextA
+238 stdcall GetDlgItemTextW(long long ptr long) GetDlgItemTextW
+239 stdcall GetDoubleClickTime() GetDoubleClickTime
+240 stdcall GetFocus() GetFocus
+241 stdcall GetForegroundWindow() GetForegroundWindow
+242 stdcall GetIconInfo(long ptr) GetIconInfo
 243 stub GetInputDesktop
-244 stdcall GetInputState() GetInputState32
-245 stdcall GetInternalWindowPos(long ptr ptr) GetInternalWindowPos32
-246 stdcall GetKBCodePage() GetKBCodePage32
-247 stdcall GetKeyNameTextA(long ptr long) GetKeyNameText32A
-248 stdcall GetKeyNameTextW(long ptr long) GetKeyNameText32W
-249 stdcall GetKeyState(long) GetKeyState32
+244 stdcall GetInputState() GetInputState
+245 stdcall GetInternalWindowPos(long ptr ptr) GetInternalWindowPos
+246 stdcall GetKBCodePage() GetKBCodePage
+247 stdcall GetKeyNameTextA(long ptr long) GetKeyNameTextA
+248 stdcall GetKeyNameTextW(long ptr long) GetKeyNameTextW
+249 stdcall GetKeyState(long) GetKeyState
 250 stdcall GetKeyboardLayout(long) GetKeyboardLayout
 251 stdcall GetKeyboardLayoutList(long ptr) GetKeyboardLayoutList
-252 stdcall GetKeyboardLayoutNameA(ptr) GetKeyboardLayoutName32A
-253 stdcall GetKeyboardLayoutNameW(ptr) GetKeyboardLayoutName32W
+252 stdcall GetKeyboardLayoutNameA(ptr) GetKeyboardLayoutNameA
+253 stdcall GetKeyboardLayoutNameW(ptr) GetKeyboardLayoutNameW
 254 stdcall GetKeyboardState(ptr) GetKeyboardState
-255 stdcall GetKeyboardType(long) GetKeyboardType32
-256 stdcall GetLastActivePopup(long) GetLastActivePopup32
-257 stdcall GetMenu(long) GetMenu32
+255 stdcall GetKeyboardType(long) GetKeyboardType
+256 stdcall GetLastActivePopup(long) GetLastActivePopup
+257 stdcall GetMenu(long) GetMenu
 258 stdcall GetMenuCheckMarkDimensions() GetMenuCheckMarkDimensions
-259 stdcall GetMenuContextHelpId(long) GetMenuContextHelpId32
-260 stdcall GetMenuDefaultItem(long long long) GetMenuDefaultItem32
+259 stdcall GetMenuContextHelpId(long) GetMenuContextHelpId
+260 stdcall GetMenuDefaultItem(long long long) GetMenuDefaultItem
 261 stub GetMenuIndex
-262 stdcall GetMenuItemCount(long) GetMenuItemCount32
-263 stdcall GetMenuItemID(long long) GetMenuItemID32
-264 stdcall GetMenuItemInfoA(long long long ptr) GetMenuItemInfo32A
-265 stdcall GetMenuItemInfoW(long long long ptr) GetMenuItemInfo32W
-266 stdcall GetMenuItemRect(long long long ptr) GetMenuItemRect32
-267 stdcall GetMenuState(long long long) GetMenuState32
-268 stdcall GetMenuStringA(long long ptr long long) GetMenuString32A
-269 stdcall GetMenuStringW(long long ptr long long) GetMenuString32W
-270 stdcall GetMessageA(ptr long long long) GetMessage32A
+262 stdcall GetMenuItemCount(long) GetMenuItemCount
+263 stdcall GetMenuItemID(long long) GetMenuItemID
+264 stdcall GetMenuItemInfoA(long long long ptr) GetMenuItemInfoA
+265 stdcall GetMenuItemInfoW(long long long ptr) GetMenuItemInfoW
+266 stdcall GetMenuItemRect(long long long ptr) GetMenuItemRect
+267 stdcall GetMenuState(long long long) GetMenuState
+268 stdcall GetMenuStringA(long long ptr long long) GetMenuStringA
+269 stdcall GetMenuStringW(long long ptr long long) GetMenuStringW
+270 stdcall GetMessageA(ptr long long long) GetMessageA
 271 stdcall GetMessageExtraInfo() GetMessageExtraInfo
 272 stdcall GetMessagePos() GetMessagePos
 273 stdcall GetMessageTime() GetMessageTime
-274 stdcall GetMessageW(ptr long long long) GetMessage32W
-275 stdcall GetNextDlgGroupItem(long long long) GetNextDlgGroupItem32
-276 stdcall GetNextDlgTabItem(long long long) GetNextDlgTabItem32
-277 stdcall GetOpenClipboardWindow() GetOpenClipboardWindow32
-278 stdcall GetParent(long) GetParent32
-279 stdcall GetPriorityClipboardFormat(ptr long) GetPriorityClipboardFormat32
+274 stdcall GetMessageW(ptr long long long) GetMessageW
+275 stdcall GetNextDlgGroupItem(long long long) GetNextDlgGroupItem
+276 stdcall GetNextDlgTabItem(long long long) GetNextDlgTabItem
+277 stdcall GetOpenClipboardWindow() GetOpenClipboardWindow
+278 stdcall GetParent(long) GetParent
+279 stdcall GetPriorityClipboardFormat(ptr long) GetPriorityClipboardFormat
 280 stdcall GetProcessWindowStation() GetProcessWindowStation
-281 stdcall GetPropA(long ptr) GetProp32A
-282 stdcall GetPropW(long ptr) GetProp32W
-283 stdcall GetQueueStatus(long) GetQueueStatus32
-284 stdcall GetScrollInfo(long long ptr) GetScrollInfo32
-285 stdcall GetScrollPos(long long) GetScrollPos32
-286 stdcall GetScrollRange(long long ptr ptr) GetScrollRange32
-287 stdcall GetShellWindow() GetShellWindow32
-288 stdcall GetSubMenu(long long) GetSubMenu32
-289 stdcall GetSysColor(long) GetSysColor32
-290 stdcall GetSysColorBrush(long) GetSysColorBrush32
-291 stdcall GetSystemMenu(long long) GetSystemMenu32
-292 stdcall GetSystemMetrics(long) GetSystemMetrics32
-293 stdcall GetTabbedTextExtentA(long str long long ptr) GetTabbedTextExtent32A
-294 stdcall GetTabbedTextExtentW(long wstr long long ptr) GetTabbedTextExtent32W
+281 stdcall GetPropA(long ptr) GetPropA
+282 stdcall GetPropW(long ptr) GetPropW
+283 stdcall GetQueueStatus(long) GetQueueStatus
+284 stdcall GetScrollInfo(long long ptr) GetScrollInfo
+285 stdcall GetScrollPos(long long) GetScrollPos
+286 stdcall GetScrollRange(long long ptr ptr) GetScrollRange
+287 stdcall GetShellWindow() GetShellWindow
+288 stdcall GetSubMenu(long long) GetSubMenu
+289 stdcall GetSysColor(long) GetSysColor
+290 stdcall GetSysColorBrush(long) GetSysColorBrush
+291 stdcall GetSystemMenu(long long) GetSystemMenu
+292 stdcall GetSystemMetrics(long) GetSystemMetrics
+293 stdcall GetTabbedTextExtentA(long str long long ptr) GetTabbedTextExtentA
+294 stdcall GetTabbedTextExtentW(long wstr long long ptr) GetTabbedTextExtentW
 295 stdcall GetThreadDesktop(long) GetThreadDesktop
-296 stdcall GetTopWindow(long) GetTopWindow32
-297 stdcall GetUpdateRect(long ptr long) GetUpdateRect32
-298 stdcall GetUpdateRgn(long long long) GetUpdateRgn32
-299 stdcall GetUserObjectInformationA (long long ptr long ptr) GetUserObjectInformation32A
-300 stdcall GetUserObjectInformationW (long long ptr long ptr) GetUserObjectInformation32W
-301 stdcall GetUserObjectSecurity (long ptr ptr long ptr) GetUserObjectSecurity32
-302 stdcall GetWindow(long long) GetWindow32
+296 stdcall GetTopWindow(long) GetTopWindow
+297 stdcall GetUpdateRect(long ptr long) GetUpdateRect
+298 stdcall GetUpdateRgn(long long long) GetUpdateRgn
+299 stdcall GetUserObjectInformationA (long long ptr long ptr) GetUserObjectInformationA
+300 stdcall GetUserObjectInformationW (long long ptr long ptr) GetUserObjectInformationW
+301 stdcall GetUserObjectSecurity (long ptr ptr long ptr) GetUserObjectSecurity
+302 stdcall GetWindow(long long) GetWindow
 303 stdcall GetWindowContextHelpId(long) GetWindowContextHelpId
-304 stdcall GetWindowDC(long) GetWindowDC32
-305 stdcall GetWindowLongA(long long) GetWindowLong32A
-306 stdcall GetWindowLongW(long long) GetWindowLong32W
-307 stdcall GetWindowPlacement(long ptr) GetWindowPlacement32
-308 stdcall GetWindowRect(long ptr) GetWindowRect32
-309 stdcall GetWindowTextA(long ptr long) GetWindowText32A
-310 stdcall GetWindowTextLengthA(long) GetWindowTextLength32A
-311 stdcall GetWindowTextLengthW(long) GetWindowTextLength32W
-312 stdcall GetWindowTextW(long ptr long) GetWindowText32W
+304 stdcall GetWindowDC(long) GetWindowDC
+305 stdcall GetWindowLongA(long long) GetWindowLongA
+306 stdcall GetWindowLongW(long long) GetWindowLongW
+307 stdcall GetWindowPlacement(long ptr) GetWindowPlacement
+308 stdcall GetWindowRect(long ptr) GetWindowRect
+309 stdcall GetWindowTextA(long ptr long) GetWindowTextA
+310 stdcall GetWindowTextLengthA(long) GetWindowTextLengthA
+311 stdcall GetWindowTextLengthW(long) GetWindowTextLengthW
+312 stdcall GetWindowTextW(long ptr long) GetWindowTextW
 313 stdcall GetWindowThreadProcessId(long ptr) GetWindowThreadProcessId
-314 stdcall GetWindowWord(long long) GetWindowWord32
-315 stdcall GrayStringA(long long ptr long long long long long long) GrayString32A
-316 stdcall GrayStringW(long long ptr long long long long long long) GrayString32W
-317 stdcall HideCaret(long) HideCaret32
-318 stdcall HiliteMenuItem(long long long long) HiliteMenuItem32
+314 stdcall GetWindowWord(long long) GetWindowWord
+315 stdcall GrayStringA(long long ptr long long long long long long) GrayStringA
+316 stdcall GrayStringW(long long ptr long long long long long long) GrayStringW
+317 stdcall HideCaret(long) HideCaret
+318 stdcall HiliteMenuItem(long long long long) HiliteMenuItem
 319 stub ImpersonateDdeClientWindow
-320 stdcall InSendMessage() InSendMessage32
-321 stdcall InflateRect(ptr long long) InflateRect32
-322 stdcall InsertMenuA(long long long long ptr) InsertMenu32A
-323 stdcall InsertMenuItemA(long long long ptr) InsertMenuItem32A
-324 stdcall InsertMenuItemW(long long long ptr) InsertMenuItem32W
-325 stdcall InsertMenuW(long long long long ptr) InsertMenu32W
+320 stdcall InSendMessage() InSendMessage
+321 stdcall InflateRect(ptr long long) InflateRect
+322 stdcall InsertMenuA(long long long long ptr) InsertMenuA
+323 stdcall InsertMenuItemA(long long long ptr) InsertMenuItemA
+324 stdcall InsertMenuItemW(long long long ptr) InsertMenuItemW
+325 stdcall InsertMenuW(long long long long ptr) InsertMenuW
 326 stdcall InternalGetWindowText(long long long) InternalGetWindowText
-327 stdcall IntersectRect(ptr ptr ptr) IntersectRect32
-328 stdcall InvalidateRect(long ptr long) InvalidateRect32
-329 stdcall InvalidateRgn(long long long) InvalidateRgn32
-330 stdcall InvertRect(long ptr) InvertRect32
-331 stdcall IsCharAlphaA(long) IsCharAlpha32A
-332 stdcall IsCharAlphaNumericA(long) IsCharAlphaNumeric32A
-333 stdcall IsCharAlphaNumericW(long) IsCharAlphaNumeric32W
-334 stdcall IsCharAlphaW(long) IsCharAlpha32W
-335 stdcall IsCharLowerA(long) IsCharLower32A
-336 stdcall IsCharLowerW(long) IsCharLower32W
-337 stdcall IsCharUpperA(long) IsCharUpper32A
-338 stdcall IsCharUpperW(long) IsCharUpper32W
-339 stdcall IsChild(long long) IsChild32
-340 stdcall IsClipboardFormatAvailable(long) IsClipboardFormatAvailable32
+327 stdcall IntersectRect(ptr ptr ptr) IntersectRect
+328 stdcall InvalidateRect(long ptr long) InvalidateRect
+329 stdcall InvalidateRgn(long long long) InvalidateRgn
+330 stdcall InvertRect(long ptr) InvertRect
+331 stdcall IsCharAlphaA(long) IsCharAlphaA
+332 stdcall IsCharAlphaNumericA(long) IsCharAlphaNumericA
+333 stdcall IsCharAlphaNumericW(long) IsCharAlphaNumericW
+334 stdcall IsCharAlphaW(long) IsCharAlphaW
+335 stdcall IsCharLowerA(long) IsCharLowerA
+336 stdcall IsCharLowerW(long) IsCharLowerW
+337 stdcall IsCharUpperA(long) IsCharUpperA
+338 stdcall IsCharUpperW(long) IsCharUpperW
+339 stdcall IsChild(long long) IsChild
+340 stdcall IsClipboardFormatAvailable(long) IsClipboardFormatAvailable
 341 stub IsDialogMessage
-342 stdcall IsDialogMessageA(long ptr) IsDialogMessage32A
-343 stdcall IsDialogMessageW(long ptr) IsDialogMessage32W
-344 stdcall IsDlgButtonChecked(long long) IsDlgButtonChecked32
-345 stdcall IsIconic(long) IsIconic32
-346 stdcall IsMenu(long) IsMenu32
-347 stdcall IsRectEmpty(ptr) IsRectEmpty32
-348 stdcall IsWindow(long) IsWindow32
-349 stdcall IsWindowEnabled(long) IsWindowEnabled32
+342 stdcall IsDialogMessageA(long ptr) IsDialogMessageA
+343 stdcall IsDialogMessageW(long ptr) IsDialogMessageW
+344 stdcall IsDlgButtonChecked(long long) IsDlgButtonChecked
+345 stdcall IsIconic(long) IsIconic
+346 stdcall IsMenu(long) IsMenu
+347 stdcall IsRectEmpty(ptr) IsRectEmpty
+348 stdcall IsWindow(long) IsWindow
+349 stdcall IsWindowEnabled(long) IsWindowEnabled
 350 stdcall IsWindowUnicode(long) IsWindowUnicode
-351 stdcall IsWindowVisible(long) IsWindowVisible32
-352 stdcall IsZoomed(long) IsZoomed32
-353 stdcall KillSystemTimer(long long) KillSystemTimer32
-354 stdcall KillTimer(long long) KillTimer32
-355 stdcall LoadAcceleratorsA(long str) LoadAccelerators32A
-356 stdcall LoadAcceleratorsW(long wstr) LoadAccelerators32W
-357 stdcall LoadBitmapA(long str) LoadBitmap32A
-358 stdcall LoadBitmapW(long wstr) LoadBitmap32W
-359 stdcall LoadCursorA(long str) LoadCursor32A
-360 stdcall LoadCursorFromFileA(str) LoadCursorFromFile32A
-361 stdcall LoadCursorFromFileW(wstr) LoadCursorFromFile32W
-362 stdcall LoadCursorW(long wstr) LoadCursor32W
-363 stdcall LoadIconA(long str) LoadIcon32A
-364 stdcall LoadIconW(long wstr) LoadIcon32W
-365 stdcall LoadImageA(long str long long long long) LoadImage32A
-366 stdcall LoadImageW(long wstr long long long long) LoadImage32W
-367 stdcall LoadKeyboardLayoutA(str long) LoadKeyboardLayout32A
-368 stdcall LoadKeyboardLayoutW(wstr long) LoadKeyboardLayout32W
+351 stdcall IsWindowVisible(long) IsWindowVisible
+352 stdcall IsZoomed(long) IsZoomed
+353 stdcall KillSystemTimer(long long) KillSystemTimer
+354 stdcall KillTimer(long long) KillTimer
+355 stdcall LoadAcceleratorsA(long str) LoadAcceleratorsA
+356 stdcall LoadAcceleratorsW(long wstr) LoadAcceleratorsW
+357 stdcall LoadBitmapA(long str) LoadBitmapA
+358 stdcall LoadBitmapW(long wstr) LoadBitmapW
+359 stdcall LoadCursorA(long str) LoadCursorA
+360 stdcall LoadCursorFromFileA(str) LoadCursorFromFileA
+361 stdcall LoadCursorFromFileW(wstr) LoadCursorFromFileW
+362 stdcall LoadCursorW(long wstr) LoadCursorW
+363 stdcall LoadIconA(long str) LoadIconA
+364 stdcall LoadIconW(long wstr) LoadIconW
+365 stdcall LoadImageA(long str long long long long) LoadImageA
+366 stdcall LoadImageW(long wstr long long long long) LoadImageW
+367 stdcall LoadKeyboardLayoutA(str long) LoadKeyboardLayoutA
+368 stdcall LoadKeyboardLayoutW(wstr long) LoadKeyboardLayoutW
 369 stdcall LoadLocalFonts() LoadLocalFonts
-370 stdcall LoadMenuA(long str) LoadMenu32A
-371 stdcall LoadMenuIndirectA(ptr) LoadMenuIndirect32A
-372 stdcall LoadMenuIndirectW(ptr) LoadMenuIndirect32W
-373 stdcall LoadMenuW(long wstr) LoadMenu32W
+370 stdcall LoadMenuA(long str) LoadMenuA
+371 stdcall LoadMenuIndirectA(ptr) LoadMenuIndirectA
+372 stdcall LoadMenuIndirectW(ptr) LoadMenuIndirectW
+373 stdcall LoadMenuW(long wstr) LoadMenuW
 374 stub LoadRemoteFonts
-375 stdcall LoadStringA(long long ptr long) LoadString32A
-376 stdcall LoadStringW(long long ptr long) LoadString32W
+375 stdcall LoadStringA(long long ptr long) LoadStringA
+376 stdcall LoadStringW(long long ptr long) LoadStringW
 377 stub LockWindowStation
-378 stdcall LockWindowUpdate(long) LockWindowUpdate32
-379 stdcall LookupIconIdFromDirectory(ptr long) LookupIconIdFromDirectory32
-380 stdcall LookupIconIdFromDirectoryEx(ptr long long long long) LookupIconIdFromDirectoryEx32
+378 stdcall LockWindowUpdate(long) LockWindowUpdate
+379 stdcall LookupIconIdFromDirectory(ptr long) LookupIconIdFromDirectory
+380 stdcall LookupIconIdFromDirectoryEx(ptr long long long long) LookupIconIdFromDirectoryEx
 381 stub MBToWCSEx
-382 stdcall MapDialogRect(long ptr) MapDialogRect32
-383 stdcall MapVirtualKeyA(long long) MapVirtualKey32A
+382 stdcall MapDialogRect(long ptr) MapDialogRect
+383 stdcall MapVirtualKeyA(long long) MapVirtualKeyA
 384 stdcall MapVirtualKeyExA(long long long) MapVirtualKeyEx32A
-385 stdcall MapVirtualKeyW(long long) MapVirtualKey32A
-386 stdcall MapWindowPoints(long long ptr long) MapWindowPoints32
+385 stdcall MapVirtualKeyW(long long) MapVirtualKeyA
+386 stdcall MapWindowPoints(long long ptr long) MapWindowPoints
 387 stub MenuItemFromPoint
 388 stub MenuWindowProcA
 389 stub MenuWindowProcW
-390 stdcall MessageBeep(long) MessageBeep32
-391 stdcall MessageBoxA(long str str long) MessageBox32A
-392 stdcall MessageBoxExA(long str str long long) MessageBoxEx32A
-393 stdcall MessageBoxExW(long wstr wstr long long) MessageBoxEx32W
-394 stdcall MessageBoxIndirectA(ptr) MessageBoxIndirect32A
-395 stdcall MessageBoxIndirectW(ptr) MessageBoxIndirect32W
-396 stdcall MessageBoxW(long wstr wstr long) MessageBox32W
-397 stdcall ModifyMenuA(long long long long ptr) ModifyMenu32A
-398 stdcall ModifyMenuW(long long long long ptr) ModifyMenu32W
-399 stdcall MoveWindow(long long long long long long) MoveWindow32
+390 stdcall MessageBeep(long) MessageBeep
+391 stdcall MessageBoxA(long str str long) MessageBoxA
+392 stdcall MessageBoxExA(long str str long long) MessageBoxExA
+393 stdcall MessageBoxExW(long wstr wstr long long) MessageBoxExW
+394 stdcall MessageBoxIndirectA(ptr) MessageBoxIndirectA
+395 stdcall MessageBoxIndirectW(ptr) MessageBoxIndirectW
+396 stdcall MessageBoxW(long wstr wstr long) MessageBoxW
+397 stdcall ModifyMenuA(long long long long ptr) ModifyMenuA
+398 stdcall ModifyMenuW(long long long long ptr) ModifyMenuW
+399 stdcall MoveWindow(long long long long long long) MoveWindow
 400 stdcall MsgWaitForMultipleObjects(long ptr long long long) MsgWaitForMultipleObjects
 401 stdcall OemKeyScan(long) OemKeyScan
-402 stdcall OemToCharA(ptr ptr) OemToChar32A
-403 stdcall OemToCharBuffA(ptr ptr long) OemToCharBuff32A
-404 stdcall OemToCharBuffW(ptr ptr long) OemToCharBuff32W
-405 stdcall OemToCharW(ptr ptr) OemToChar32W
-406 stdcall OffsetRect(ptr long long) OffsetRect32
-407 stdcall OpenClipboard(long) OpenClipboard32
-408 stdcall OpenDesktopA(str long long long) OpenDesktop32A
+402 stdcall OemToCharA(ptr ptr) OemToCharA
+403 stdcall OemToCharBuffA(ptr ptr long) OemToCharBuffA
+404 stdcall OemToCharBuffW(ptr ptr long) OemToCharBuffW
+405 stdcall OemToCharW(ptr ptr) OemToCharW
+406 stdcall OffsetRect(ptr long long) OffsetRect
+407 stdcall OpenClipboard(long) OpenClipboard
+408 stdcall OpenDesktopA(str long long long) OpenDesktopA
 409 stub OpenDesktopW
-410 stdcall OpenIcon(long) OpenIcon32
+410 stdcall OpenIcon(long) OpenIcon
 411 stub OpenInputDesktop
 412 stub OpenWindowStationA
 413 stub OpenWindowStationW
 414 stdcall PackDDElParam(long long long) PackDDElParam
 415 stdcall PaintDesktop(long) PaintDesktop
-416 stdcall PeekMessageA(ptr long long long long) PeekMessage32A
-417 stdcall PeekMessageW(ptr long long long long) PeekMessage32W
+416 stdcall PeekMessageA(ptr long long long long) PeekMessageA
+417 stdcall PeekMessageW(ptr long long long long) PeekMessageW
 418 stub PlaySoundEvent
-419 stdcall PostMessageA(long long long long) PostMessage32A
-420 stdcall PostMessageW(long long long long) PostMessage32W
-421 stdcall PostQuitMessage(long) PostQuitMessage32
-422 stdcall PostThreadMessageA(long long long long) PostThreadMessage32A
-423 stdcall PostThreadMessageW(long long long long) PostThreadMessage32W
-424 stdcall PtInRect(ptr long long) PtInRect32
+419 stdcall PostMessageA(long long long long) PostMessageA
+420 stdcall PostMessageW(long long long long) PostMessageW
+421 stdcall PostQuitMessage(long) PostQuitMessage
+422 stdcall PostThreadMessageA(long long long long) PostThreadMessageA
+423 stdcall PostThreadMessageW(long long long long) PostThreadMessageW
+424 stdcall PtInRect(ptr long long) PtInRect
 425 stub QuerySendMessage
-426 stdcall RedrawWindow(long ptr long long) RedrawWindow32
-427 stdcall RegisterClassA(ptr) RegisterClass32A
-428 stdcall RegisterClassExA(ptr) RegisterClassEx32A
-429 stdcall RegisterClassExW(ptr) RegisterClassEx32W
-430 stdcall RegisterClassW(ptr) RegisterClass32W
-431 stdcall RegisterClipboardFormatA(str) RegisterClipboardFormat32A
-432 stdcall RegisterClipboardFormatW(wstr) RegisterClipboardFormat32W
+426 stdcall RedrawWindow(long ptr long long) RedrawWindow
+427 stdcall RegisterClassA(ptr) RegisterClassA
+428 stdcall RegisterClassExA(ptr) RegisterClassExA
+429 stdcall RegisterClassExW(ptr) RegisterClassExW
+430 stdcall RegisterClassW(ptr) RegisterClassW
+431 stdcall RegisterClipboardFormatA(str) RegisterClipboardFormatA
+432 stdcall RegisterClipboardFormatW(wstr) RegisterClipboardFormatW
 433 stdcall RegisterHotKey(long long long long) RegisterHotKey
 434 stdcall RegisterLogonProcess(long long) RegisterLogonProcess
 435 stub RegisterSystemThread
-436 stdcall RegisterTasklist (long) RegisterTaskList32
-437 stdcall RegisterWindowMessageA(str) RegisterWindowMessage32A
-438 stdcall RegisterWindowMessageW(wstr) RegisterWindowMessage32W
+436 stdcall RegisterTasklist (long) RegisterTaskList
+437 stdcall RegisterWindowMessageA(str) RegisterWindowMessageA
+438 stdcall RegisterWindowMessageW(wstr) RegisterWindowMessageW
 439 stdcall ReleaseCapture() ReleaseCapture
-440 stdcall ReleaseDC(long long) ReleaseDC32
-441 stdcall RemoveMenu(long long long) RemoveMenu32
-442 stdcall RemovePropA(long str) RemoveProp32A
-443 stdcall RemovePropW(long wstr) RemoveProp32W
-444 stdcall ReplyMessage(long) ReplyMessage32
+440 stdcall ReleaseDC(long long) ReleaseDC
+441 stdcall RemoveMenu(long long long) RemoveMenu
+442 stdcall RemovePropA(long str) RemovePropA
+443 stdcall RemovePropW(long wstr) RemovePropW
+444 stdcall ReplyMessage(long) ReplyMessage
 445 stub ResetDisplay
 446 stdcall ReuseDDElParam(long long long long long) ReuseDDElParam
-447 stdcall ScreenToClient(long ptr) ScreenToClient32
-448 stdcall ScrollChildren(long long long long) ScrollChildren32
-449 stdcall ScrollDC(long long long ptr ptr long ptr) ScrollDC32
-450 stdcall ScrollWindow(long long long ptr ptr) ScrollWindow32
-451 stdcall ScrollWindowEx(long long long ptr ptr long ptr long) ScrollWindowEx32
-452 stdcall SendDlgItemMessageA(long long long long long) SendDlgItemMessage32A
-453 stdcall SendDlgItemMessageW(long long long long long) SendDlgItemMessage32W
-454 stdcall SendMessageA(long long long long) SendMessage32A
-455 stdcall SendMessageCallbackA(long long long long ptr long) SendMessageCallBack32A
+447 stdcall ScreenToClient(long ptr) ScreenToClient
+448 stdcall ScrollChildren(long long long long) ScrollChildren
+449 stdcall ScrollDC(long long long ptr ptr long ptr) ScrollDC
+450 stdcall ScrollWindow(long long long ptr ptr) ScrollWindow
+451 stdcall ScrollWindowEx(long long long ptr ptr long ptr long) ScrollWindowEx
+452 stdcall SendDlgItemMessageA(long long long long long) SendDlgItemMessageA
+453 stdcall SendDlgItemMessageW(long long long long long) SendDlgItemMessageW
+454 stdcall SendMessageA(long long long long) SendMessageA
+455 stdcall SendMessageCallbackA(long long long long ptr long) SendMessageCallBackA
 456 stub SendMessageCallbackW
-457 stdcall SendMessageTimeoutA(long long long long ptr ptr) SendMessageTimeout32A
-458 stdcall SendMessageTimeoutW(long long long long ptr ptr) SendMessageTimeout32W
-459 stdcall SendMessageW(long long long long) SendMessage32W
-460 stdcall SendNotifyMessageA(long long long long) SendNotifyMessage32A
-461 stdcall SendNotifyMessageW(long long long long) SendNotifyMessage32W
+457 stdcall SendMessageTimeoutA(long long long long ptr ptr) SendMessageTimeoutA
+458 stdcall SendMessageTimeoutW(long long long long ptr ptr) SendMessageTimeoutW
+459 stdcall SendMessageW(long long long long) SendMessageW
+460 stdcall SendNotifyMessageA(long long long long) SendNotifyMessageA
+461 stdcall SendNotifyMessageW(long long long long) SendNotifyMessageW
 462 stub ServerSetFunctionPointers
-463 stdcall SetActiveWindow(long) SetActiveWindow32
-464 stdcall SetCapture(long) SetCapture32
-465 stdcall SetCaretBlinkTime(long) SetCaretBlinkTime32
-466 stdcall SetCaretPos(long long) SetCaretPos32
-467 stdcall SetClassLongA(long long long) SetClassLong32A
-468 stdcall SetClassLongW(long long long) SetClassLong32W
-469 stdcall SetClassWord(long long long) SetClassWord32
-470 stdcall SetClipboardData(long long) SetClipboardData32
-471 stdcall SetClipboardViewer(long) SetClipboardViewer32
-472 stdcall SetCursor(long) SetCursor32
+463 stdcall SetActiveWindow(long) SetActiveWindow
+464 stdcall SetCapture(long) SetCapture
+465 stdcall SetCaretBlinkTime(long) SetCaretBlinkTime
+466 stdcall SetCaretPos(long long) SetCaretPos
+467 stdcall SetClassLongA(long long long) SetClassLongA
+468 stdcall SetClassLongW(long long long) SetClassLongW
+469 stdcall SetClassWord(long long long) SetClassWord
+470 stdcall SetClipboardData(long long) SetClipboardData
+471 stdcall SetClipboardViewer(long) SetClipboardViewer
+472 stdcall SetCursor(long) SetCursor
 473 stub SetCursorContents
-474 stdcall SetCursorPos(long long) SetCursorPos32
+474 stdcall SetCursorPos(long long) SetCursorPos
 475 stdcall SetDebugErrorLevel(long) SetDebugErrorLevel
-476 stdcall SetDeskWallPaper(str) SetDeskWallPaper32
-477 stdcall SetDlgItemInt(long long long long) SetDlgItemInt32
-478 stdcall SetDlgItemTextA(long long str) SetDlgItemText32A
-479 stdcall SetDlgItemTextW(long long wstr) SetDlgItemText32W
-480 stdcall SetDoubleClickTime(long) SetDoubleClickTime32
-481 stdcall SetFocus(long) SetFocus32
-482 stdcall SetForegroundWindow(long) SetForegroundWindow32
-483 stdcall SetInternalWindowPos(long long ptr ptr) SetInternalWindowPos32
+476 stdcall SetDeskWallPaper(str) SetDeskWallPaper
+477 stdcall SetDlgItemInt(long long long long) SetDlgItemInt
+478 stdcall SetDlgItemTextA(long long str) SetDlgItemTextA
+479 stdcall SetDlgItemTextW(long long wstr) SetDlgItemTextW
+480 stdcall SetDoubleClickTime(long) SetDoubleClickTime
+481 stdcall SetFocus(long) SetFocus
+482 stdcall SetForegroundWindow(long) SetForegroundWindow
+483 stdcall SetInternalWindowPos(long long ptr ptr) SetInternalWindowPos
 484 stdcall SetKeyboardState(ptr) SetKeyboardState
 485 stdcall SetLastErrorEx(long long) SetLastErrorEx
 486 stdcall SetLogonNotifyWindow(long long) SetLogonNotifyWindow
-487 stdcall SetMenu(long long) SetMenu32
-488 stdcall SetMenuContextHelpId(long long) SetMenuContextHelpId32
-489 stdcall SetMenuDefaultItem(long long long) SetMenuDefaultItem32
-490 stdcall SetMenuItemBitmaps(long long long long long) SetMenuItemBitmaps32
-491 stdcall SetMenuItemInfoA(long long long ptr) SetMenuItemInfo32A
-492 stdcall SetMenuItemInfoW(long long long ptr) SetMenuItemInfo32W
+487 stdcall SetMenu(long long) SetMenu
+488 stdcall SetMenuContextHelpId(long long) SetMenuContextHelpId
+489 stdcall SetMenuDefaultItem(long long long) SetMenuDefaultItem
+490 stdcall SetMenuItemBitmaps(long long long long long) SetMenuItemBitmaps
+491 stdcall SetMenuItemInfoA(long long long ptr) SetMenuItemInfoA
+492 stdcall SetMenuItemInfoW(long long long ptr) SetMenuItemInfoW
 493 stub SetMessageExtraInfo
-494 stdcall SetMessageQueue(long) SetMessageQueue32
-495 stdcall SetParent(long long) SetParent32
+494 stdcall SetMessageQueue(long) SetMessageQueue
+495 stdcall SetParent(long long) SetParent
 496 stdcall SetProcessWindowStation(long) SetProcessWindowStation
-497 stdcall SetPropA(long str long) SetProp32A
-498 stdcall SetPropW(long wstr long) SetProp32W
-499 stdcall SetRect(ptr long long long long) SetRect32
-500 stdcall SetRectEmpty(ptr) SetRectEmpty32
-501 stdcall SetScrollInfo(long long ptr long) SetScrollInfo32
-502 stdcall SetScrollPos(long long long long) SetScrollPos32
-503 stdcall SetScrollRange(long long long long long) SetScrollRange32
-504 stdcall SetShellWindow(long) SetShellWindow32
-505 stdcall SetSysColors(long ptr ptr) SetSysColors32
+497 stdcall SetPropA(long str long) SetPropA
+498 stdcall SetPropW(long wstr long) SetPropW
+499 stdcall SetRect(ptr long long long long) SetRect
+500 stdcall SetRectEmpty(ptr) SetRectEmpty
+501 stdcall SetScrollInfo(long long ptr long) SetScrollInfo
+502 stdcall SetScrollPos(long long long long) SetScrollPos
+503 stdcall SetScrollRange(long long long long long) SetScrollRange
+504 stdcall SetShellWindow(long) SetShellWindow
+505 stdcall SetSysColors(long ptr ptr) SetSysColors
 506 stub SetSysColorsTemp
 507 stub SetSystemCursor
-508 stdcall SetSystemMenu(long long) SetSystemMenu32
-509 stdcall SetSystemTimer(long long long ptr) SetSystemTimer32
+508 stdcall SetSystemMenu(long long) SetSystemMenu
+509 stdcall SetSystemTimer(long long long ptr) SetSystemTimer
 510 stdcall SetThreadDesktop(long) SetThreadDesktop
-511 stdcall SetTimer(long long long ptr) SetTimer32
-512 stdcall SetUserObjectInformationA(long long long long) SetUserObjectInformation32A
+511 stdcall SetTimer(long long long ptr) SetTimer
+512 stdcall SetUserObjectInformationA(long long long long) SetUserObjectInformationA
 513 stub SetUserObjectInformationW
 514 stdcall SetUserObjectSecurity(long ptr ptr) SetUserObjectSecurity
 515 stdcall SetWindowContextHelpId(long long) SetWindowContextHelpId
 516 stub SetWindowFullScreenState
-517 stdcall SetWindowLongA(long long long) SetWindowLong32A
-518 stdcall SetWindowLongW(long long long) SetWindowLong32W
-519 stdcall SetWindowPlacement(long ptr) SetWindowPlacement32
-520 stdcall SetWindowPos(long long long long long long long) SetWindowPos32
+517 stdcall SetWindowLongA(long long long) SetWindowLongA
+518 stdcall SetWindowLongW(long long long) SetWindowLongW
+519 stdcall SetWindowPlacement(long ptr) SetWindowPlacement
+520 stdcall SetWindowPos(long long long long long long long) SetWindowPos
 521 stdcall SetWindowStationUser(long long) SetWindowStationUser
-522 stdcall SetWindowTextA(long str) SetWindowText32A
-523 stdcall SetWindowTextW(long wstr) SetWindowText32W
-524 stdcall SetWindowWord(long long long) SetWindowWord32
-525 stdcall SetWindowsHookA(long ptr) SetWindowsHook32A
-526 stdcall SetWindowsHookExA(long long long long) SetWindowsHookEx32A
-527 stdcall SetWindowsHookExW(long long long long) SetWindowsHookEx32W
-528 stdcall SetWindowsHookW(long long long long) SetWindowsHook32W
-529 stdcall ShowCaret(long) ShowCaret32
-530 stdcall ShowCursor(long) ShowCursor32
-531 stdcall ShowOwnedPopups(long long) ShowOwnedPopups32
-532 stdcall ShowScrollBar(long long long) ShowScrollBar32
+522 stdcall SetWindowTextA(long str) SetWindowTextA
+523 stdcall SetWindowTextW(long wstr) SetWindowTextW
+524 stdcall SetWindowWord(long long long) SetWindowWord
+525 stdcall SetWindowsHookA(long ptr) SetWindowsHookA
+526 stdcall SetWindowsHookExA(long long long long) SetWindowsHookExA
+527 stdcall SetWindowsHookExW(long long long long) SetWindowsHookExW
+528 stdcall SetWindowsHookW(long long long long) SetWindowsHookW
+529 stdcall ShowCaret(long) ShowCaret
+530 stdcall ShowCursor(long) ShowCursor
+531 stdcall ShowOwnedPopups(long long) ShowOwnedPopups
+532 stdcall ShowScrollBar(long long long) ShowScrollBar
 533 stub ShowStartGlass
-534 stdcall ShowWindow(long long) ShowWindow32
-535 stdcall ShowWindowAsync(long long) ShowWindowAsync32
-536 stdcall SubtractRect(ptr ptr ptr) SubtractRect32
-537 stdcall SwapMouseButton(long) SwapMouseButton32
+534 stdcall ShowWindow(long long) ShowWindow
+535 stdcall ShowWindowAsync(long long) ShowWindowAsync
+536 stdcall SubtractRect(ptr ptr ptr) SubtractRect
+537 stdcall SwapMouseButton(long) SwapMouseButton
 538 stub SwitchDesktop
-539 stdcall SwitchToThisWindow(long long) SwitchToThisWindow32
-540 stdcall SystemParametersInfoA(long long ptr long) SystemParametersInfo32A
-541 stdcall SystemParametersInfoW(long long ptr long) SystemParametersInfo32W
-542 stdcall TabbedTextOutA(long long long str long long ptr long) TabbedTextOut32A
-543 stdcall TabbedTextOutW(long long long wstr long long ptr long) TabbedTextOut32W
+539 stdcall SwitchToThisWindow(long long) SwitchToThisWindow
+540 stdcall SystemParametersInfoA(long long ptr long) SystemParametersInfoA
+541 stdcall SystemParametersInfoW(long long ptr long) SystemParametersInfoW
+542 stdcall TabbedTextOutA(long long long str long long ptr long) TabbedTextOutA
+543 stdcall TabbedTextOutW(long long long wstr long long ptr long) TabbedTextOutW
 544 stub TileChildWindows
 545 stdcall TileWindows(long long ptr long ptr) TileWindows
-546 stdcall ToAscii(long long ptr ptr long) ToAscii32
+546 stdcall ToAscii(long long ptr ptr long) ToAscii
 547 stub ToAsciiEx
-548 stdcall ToUnicode(long long ptr wstr long long) ToUnicode32
-549 stdcall TrackPopupMenu(long long long long long long ptr) TrackPopupMenu32
+548 stdcall ToUnicode(long long ptr wstr long long) ToUnicode
+549 stdcall TrackPopupMenu(long long long long long long ptr) TrackPopupMenu
 550 stdcall TrackPopupMenuEx(long long long long long ptr) TrackPopupMenuEx
-551 stdcall TranslateAccelerator(long long ptr) TranslateAccelerator32
-552 stdcall TranslateAcceleratorA(long long ptr) TranslateAccelerator32
-553 stdcall TranslateAcceleratorW(long long ptr) TranslateAccelerator32
+551 stdcall TranslateAccelerator(long long ptr) TranslateAccelerator
+552 stdcall TranslateAcceleratorA(long long ptr) TranslateAccelerator
+553 stdcall TranslateAcceleratorW(long long ptr) TranslateAccelerator
 554 stub TranslateCharsetInfo
-555 stdcall TranslateMDISysAccel(long ptr) TranslateMDISysAccel32
-556 stdcall TranslateMessage(ptr) TranslateMessage32
-557 stdcall UnhookWindowsHook(long ptr) UnhookWindowsHook32
-558 stdcall UnhookWindowsHookEx(long) UnhookWindowsHookEx32
-559 stdcall UnionRect(ptr ptr ptr) UnionRect32
+555 stdcall TranslateMDISysAccel(long ptr) TranslateMDISysAccel
+556 stdcall TranslateMessage(ptr) TranslateMessage
+557 stdcall UnhookWindowsHook(long ptr) UnhookWindowsHook
+558 stdcall UnhookWindowsHookEx(long) UnhookWindowsHookEx
+559 stdcall UnionRect(ptr ptr ptr) UnionRect
 560 stub UnloadKeyboardLayout
 561 stub UnlockWindowStation
 562 stdcall UnpackDDElParam(long long ptr ptr) UnpackDDElParam
-563 stdcall UnregisterClassA(str long) UnregisterClass32A
-564 stdcall UnregisterClassW(wstr long) UnregisterClass32W
+563 stdcall UnregisterClassA(str long) UnregisterClassA
+564 stdcall UnregisterClassW(wstr long) UnregisterClassW
 565 stdcall UnregisterHotKey(long long) UnregisterHotKey
 566 stub UpdatePerUserSystemParameters
-567 stdcall UpdateWindow(long) UpdateWindow32
+567 stdcall UpdateWindow(long) UpdateWindow
 568 stub UserClientDllInitialize
 569 stub UserRealizePalette
 570 stub UserRegisterWowHandlers
-571 stdcall ValidateRect(long ptr) ValidateRect32
-572 stdcall ValidateRgn(long long) ValidateRgn32
-573 stdcall VkKeyScanA(long) VkKeyScan32A
+571 stdcall ValidateRect(long ptr) ValidateRect
+572 stdcall ValidateRgn(long long) ValidateRgn
+573 stdcall VkKeyScanA(long) VkKeyScanA
 574 stub VkKeyScanExA
 575 stub VkKeyScanExW
-576 stdcall VkKeyScanW(long) VkKeyScan32W
+576 stdcall VkKeyScanW(long) VkKeyScanW
 577 stdcall WaitForInputIdle(long long) WaitForInputIdle
 578 stdcall WaitMessage() WaitMessage
-579 stdcall WinHelpA(long str long long) WinHelp32A
-580 stdcall WinHelpW(long wstr long long) WinHelp32W
-581 stdcall WindowFromDC(long) WindowFromDC32
-582 stdcall WindowFromPoint(long long) WindowFromPoint32
+579 stdcall WinHelpA(long str long long) WinHelpA
+580 stdcall WinHelpW(long wstr long long) WinHelpW
+581 stdcall WindowFromDC(long) WindowFromDC
+582 stdcall WindowFromPoint(long long) WindowFromPoint
 583 stdcall keybd_event(long long long long) keybd_event
 584 stdcall mouse_event(long long long long long) mouse_event
-585 varargs wsprintfA() wsprintf32A
-586 varargs wsprintfW() wsprintf32W
-587 stdcall wvsprintfA(ptr str ptr) wvsprintf32A
-588 stdcall wvsprintfW(ptr wstr ptr) wvsprintf32W
+585 varargs wsprintfA() wsprintfA
+586 varargs wsprintfW() wsprintfW
+587 stdcall wvsprintfA(ptr str ptr) wvsprintfA
+588 stdcall wvsprintfW(ptr wstr ptr) wvsprintfW
 #late additions
-589 stdcall ChangeDisplaySettingsA(ptr long) ChangeDisplaySettings32A
+589 stdcall ChangeDisplaySettingsA(ptr long) ChangeDisplaySettingsA
 590 stub ChangeDisplaySettingsW
 591 stub EnumDesktopWindows
-592 stdcall EnumDisplaySettingsA(str long ptr) EnumDisplaySettings32A
-593 stdcall EnumDisplaySettingsW(wstr long ptr ) EnumDisplaySettings32W
-594 stdcall GetWindowRgn(long long) GetWindowRgn32
+592 stdcall EnumDisplaySettingsA(str long ptr) EnumDisplaySettingsA
+593 stdcall EnumDisplaySettingsW(wstr long ptr ) EnumDisplaySettingsW
+594 stdcall GetWindowRgn(long long) GetWindowRgn
 595 stub MapVirtualKeyExW
 596 stub RegisterServicesProcess
-597 stdcall SetWindowRgn(long long long) SetWindowRgn32
+597 stdcall SetWindowRgn(long long long) SetWindowRgn
 598 stub ToUnicodeEx
-599 stdcall DrawCaptionTempA(long long ptr long long str long) DrawCaptionTemp32A
+599 stdcall DrawCaptionTempA(long long ptr long long str long) DrawCaptionTempA
 600 stub RegisterNetworkCapabilities
 601 stub WNDPROC_CALLBACK
-602 stdcall DrawCaptionTempW(long long ptr long long wstr long) DrawCaptionTemp32W
+602 stdcall DrawCaptionTempW(long long ptr long long wstr long) DrawCaptionTempW
 603 stub IsHungAppWindow
 604 stub ChangeDisplaySettingsA
 605 stub ChangeDisplaySettingsW
-606 stdcall SetWindowText(long str) SetWindowText32A
-607 stdcall GetMonitorInfoA(long ptr) GetMonitorInfo32A
-608 stdcall GetMonitorInfoW(long ptr) GetMonitorInfo32W
+606 stdcall SetWindowText(long str) SetWindowTextA
+607 stdcall GetMonitorInfoA(long ptr) GetMonitorInfoA
+608 stdcall GetMonitorInfoW(long ptr) GetMonitorInfoW
 609 stdcall MonitorFromWindow(long long) MonitorFromWindow
 610 stdcall MonitorFromRect(ptr long) MonitorFromRect
 611 stdcall MonitorFromPoint(long long long) MonitorFromPoint
diff --git a/relay32/version.spec b/relay32/version.spec
index f1644b2b87b..59bf90b7f82 100644
--- a/relay32/version.spec
+++ b/relay32/version.spec
@@ -1,17 +1,17 @@
 name version
 type win32
 
-0 stdcall GetFileVersionInfoA(str long long ptr) GetFileVersionInfo32A
-1 stdcall GetFileVersionInfoSizeA(str ptr) GetFileVersionInfoSize32A
-2 stdcall GetFileVersionInfoSizeW(wstr ptr) GetFileVersionInfoSize32W
-3 stdcall GetFileVersionInfoW(wstr long long ptr) GetFileVersionInfo32W
+0 stdcall GetFileVersionInfoA(str long long ptr) GetFileVersionInfoA
+1 stdcall GetFileVersionInfoSizeA(str ptr) GetFileVersionInfoSizeA
+2 stdcall GetFileVersionInfoSizeW(wstr ptr) GetFileVersionInfoSizeW
+3 stdcall GetFileVersionInfoW(wstr long long ptr) GetFileVersionInfoW
 #4 stub VerFThk_ThunkData32
-5 stdcall VerFindFileA(long str str str ptr ptr ptr ptr) VerFindFile32A
-6 stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) VerFindFile32W
-7 stdcall VerInstallFileA(long str str str str str ptr ptr) VerInstallFile32A
-8 stdcall VerInstallFileW(long wstr wstr wstr wstr wstr ptr ptr) VerInstallFile32W
-9 stdcall VerLanguageNameA(long ptr long) VerLanguageName32A
-10 stdcall VerLanguageNameW(long ptr long) VerLanguageName32W
-11 stdcall VerQueryValueA(ptr str ptr ptr) VerQueryValue32A
-12 stdcall VerQueryValueW(ptr wstr ptr ptr) VerQueryValue32W
+5 stdcall VerFindFileA(long str str str ptr ptr ptr ptr) VerFindFileA
+6 stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) VerFindFileW
+7 stdcall VerInstallFileA(long str str str str str ptr ptr) VerInstallFileA
+8 stdcall VerInstallFileW(long wstr wstr wstr wstr wstr ptr ptr) VerInstallFileW
+9 stdcall VerLanguageNameA(long ptr long) VerLanguageNameA
+10 stdcall VerLanguageNameW(long ptr long) VerLanguageNameW
+11 stdcall VerQueryValueA(ptr str ptr ptr) VerQueryValueA
+12 stdcall VerQueryValueW(ptr wstr ptr ptr) VerQueryValueW
 #13 stub VerThkSL_ThunkData32
diff --git a/relay32/winmm.spec b/relay32/winmm.spec
index 476fd48bc7c..7fecf2e07aa 100644
--- a/relay32/winmm.spec
+++ b/relay32/winmm.spec
@@ -1,187 +1,187 @@
 name winmm
 type win32
 
-  1 stdcall PlaySoundA(ptr long long) PlaySound32A
-  2 stdcall WINMM_2(ptr long long) PlaySound32A
+  1 stdcall PlaySoundA(ptr long long) PlaySoundA
+  2 stdcall WINMM_2(ptr long long) PlaySoundA
   3 stub WINMM_3
-  4 stdcall CloseDriver(long long long) CloseDriver32
-  5 stdcall DefDriverProc(long long long long long) DefDriverProc32
+  4 stdcall CloseDriver(long long long) CloseDriver
+  5 stdcall DefDriverProc(long long long long long) DefDriverProc
   6 stub DriverCallback
   7 stub DrvClose
   8 stub DrvDefDriverProc
-  9 stdcall DrvGetModuleHandle(long) GetDriverModuleHandle32
+  9 stdcall DrvGetModuleHandle(long) GetDriverModuleHandle
  10 stub DrvOpen
  11 stub DrvOpenA
  12 stub DrvSendMessage
  13 stub GetDriverFlags
- 14 stdcall GetDriverModuleHandle(long) GetDriverModuleHandle32
- 15 stdcall OpenDriver(wstr wstr long) OpenDriver32W
- 16 stdcall OpenDriverA(str str long) OpenDriver32A
- 17 stdcall PlaySound(ptr long long) PlaySound32A
- 18 stdcall PlaySoundW(ptr long long) PlaySound32W
- 19 stdcall SendDriverMessage(long long long long) SendDriverMessage32
- 20 stdcall auxGetDevCapsA(long ptr long) auxGetDevCaps32A
- 21 stdcall auxGetDevCapsW(long ptr long) auxGetDevCaps32W
- 22 stdcall auxGetNumDevs() auxGetNumDevs32
- 23 stdcall auxGetVolume(long ptr) auxGetVolume32
- 24 stdcall auxOutMessage(long long long long) auxOutMessage32
- 25 stdcall auxSetVolume(long long) auxSetVolume32
+ 14 stdcall GetDriverModuleHandle(long) GetDriverModuleHandle
+ 15 stdcall OpenDriver(wstr wstr long) OpenDriverW
+ 16 stdcall OpenDriverA(str str long) OpenDriverA
+ 17 stdcall PlaySound(ptr long long) PlaySoundA
+ 18 stdcall PlaySoundW(ptr long long) PlaySoundW
+ 19 stdcall SendDriverMessage(long long long long) SendDriverMessage
+ 20 stdcall auxGetDevCapsA(long ptr long) auxGetDevCapsA
+ 21 stdcall auxGetDevCapsW(long ptr long) auxGetDevCapsW
+ 22 stdcall auxGetNumDevs() auxGetNumDevs
+ 23 stdcall auxGetVolume(long ptr) auxGetVolume
+ 24 stdcall auxOutMessage(long long long long) auxOutMessage
+ 25 stdcall auxSetVolume(long long) auxSetVolume
  26 stub joyConfigChanged
- 27 stdcall joyGetDevCapsA(long ptr long) joyGetDevCaps32A
- 28 stdcall joyGetDevCapsW(long ptr long) joyGetDevCaps32W
- 29 stdcall joyGetNumDevs() joyGetNumDevs32
- 30 stdcall joyGetPos(long ptr) joyGetPos32
+ 27 stdcall joyGetDevCapsA(long ptr long) joyGetDevCapsA
+ 28 stdcall joyGetDevCapsW(long ptr long) joyGetDevCapsW
+ 29 stdcall joyGetNumDevs() joyGetNumDevs
+ 30 stdcall joyGetPos(long ptr) joyGetPos
  31 stdcall joyGetPosEx(long ptr) joyGetPosEx
- 32 stdcall joyGetThreshold(long ptr) joyGetThreshold32
- 33 stdcall joyReleaseCapture(long) joyReleaseCapture32
- 34 stdcall joySetCapture(long long long long) joySetCapture32
- 35 stdcall joySetThreshold(long long) joySetThreshold32
- 36 stdcall mciDriverNotify(long long long) mciDriverNotify32
- 37 stdcall mciDriverYield(long) mciDriverYield32
+ 32 stdcall joyGetThreshold(long ptr) joyGetThreshold
+ 33 stdcall joyReleaseCapture(long) joyReleaseCapture
+ 34 stdcall joySetCapture(long long long long) joySetCapture
+ 35 stdcall joySetThreshold(long long) joySetThreshold
+ 36 stdcall mciDriverNotify(long long long) mciDriverNotify
+ 37 stdcall mciDriverYield(long) mciDriverYield
  38 stub mciExecute
- 39 stdcall mciFreeCommandResource(long) mciFreeCommandResource32
- 40 stdcall mciGetCreatorTask(long) mciGetCreatorTask32
- 41 stdcall mciGetDeviceIDA(str) mciGetDeviceID32A
- 42 stdcall mciGetDeviceIDFromElementIDW(long str) mciGetDeviceIDFromElementID32W
- 43 stdcall mciGetDeviceIDW(str) mciGetDeviceID32W
- 44 stdcall mciGetDriverData(long) mciGetDriverData32
- 45 stdcall mciGetErrorStringA(long ptr long) mciGetErrorString32A
- 46 stdcall mciGetErrorStringW(long ptr long) mciGetErrorString32W
- 47 stdcall mciGetYieldProc(long ptr) mciGetYieldProc32
- 48 stdcall mciLoadCommandResource(long wstr long) mciLoadCommandResource32 
- 49 stdcall mciSendCommandA(long long long long) mciSendCommand32A
- 50 stdcall mciSendCommandW(long long long long) mciSendCommand32W
- 51 stdcall mciSendStringA(str ptr long long) mciSendString32A
- 52 stdcall mciSendStringW(str ptr long long) mciSendString32W
- 53 stdcall mciSetDriverData(long long) mciSetDriverData32
- 54 stdcall mciSetYieldProc(ptr) mciSetYieldProc32
+ 39 stdcall mciFreeCommandResource(long) mciFreeCommandResource
+ 40 stdcall mciGetCreatorTask(long) mciGetCreatorTask
+ 41 stdcall mciGetDeviceIDA(str) mciGetDeviceIDA
+ 42 stdcall mciGetDeviceIDFromElementIDW(long str) mciGetDeviceIDFromElementIDW
+ 43 stdcall mciGetDeviceIDW(str) mciGetDeviceIDW
+ 44 stdcall mciGetDriverData(long) mciGetDriverData
+ 45 stdcall mciGetErrorStringA(long ptr long) mciGetErrorStringA
+ 46 stdcall mciGetErrorStringW(long ptr long) mciGetErrorStringW
+ 47 stdcall mciGetYieldProc(long ptr) mciGetYieldProc
+ 48 stdcall mciLoadCommandResource(long wstr long) mciLoadCommandResource 
+ 49 stdcall mciSendCommandA(long long long long) mciSendCommandA
+ 50 stdcall mciSendCommandW(long long long long) mciSendCommandW
+ 51 stdcall mciSendStringA(str ptr long long) mciSendStringA
+ 52 stdcall mciSendStringW(str ptr long long) mciSendStringW
+ 53 stdcall mciSetDriverData(long long) mciSetDriverData
+ 54 stdcall mciSetYieldProc(ptr) mciSetYieldProc
  55 stub midiConnect
  56 stub midiDisconnect
- 57 stdcall midiInAddBuffer(long ptr long) midiInAddBuffer32
- 58 stdcall midiInClose(long) midiInClose32
- 59 stdcall midiInGetDevCapsA(long ptr long) midiInGetDevCaps32A
- 60 stdcall midiInGetDevCapsW(long ptr long) midiInGetDevCaps32W
- 61 stdcall midiInGetErrorTextA(long ptr long) midiInGetErrorText32A
- 62 stdcall midiInGetErrorTextW(long ptr long) midiInGetErrorText32W
- 63 stdcall midiInGetID(long) midiInGetID32
- 64 stdcall midiInGetNumDevs() midiInGetNumDevs32
- 65 stdcall midiInMessage(long long long long) midiInMessage32
- 66 stdcall midiInOpen(ptr long long long long) midiInOpen32
- 67 stdcall midiInPrepareHeader(long ptr long) midiInPrepareHeader32
- 68 stdcall midiInReset(long) midiInReset32
- 69 stdcall midiInStart(long) midiInStart32
- 70 stdcall midiInStop(long) midiInStop32
- 71 stdcall midiInUnprepareHeader(long ptr long) midiInUnprepareHeader32
- 72 stdcall midiOutCacheDrumPatches(long long ptr long) midiOutCacheDrumPatches32
- 73 stdcall midiOutCachePatches(long long ptr long) midiOutCachePatches32
- 74 stdcall midiOutClose(long) midiOutClose32
- 75 stdcall midiOutGetDevCapsA(long ptr long) midiOutGetDevCaps32A
- 76 stdcall midiOutGetDevCapsW(long ptr long) midiOutGetDevCaps32W
- 77 stdcall midiOutGetErrorTextA(long ptr long) midiOutGetErrorText32A
- 78 stdcall midiOutGetErrorTextW(long ptr long) midiOutGetErrorText32W
- 79 stdcall midiOutGetID(long) midiOutGetID32
- 80 stdcall midiOutGetNumDevs() midiOutGetNumDevs32
- 81 stdcall midiOutGetVolume(long ptr) midiOutGetVolume32
- 82 stdcall midiOutLongMsg(long ptr long) midiOutLongMsg32
- 83 stdcall midiOutMessage(long long long long) midiOutMessage32
- 84 stdcall midiOutOpen(ptr long long long long) midiOutOpen32
- 85 stdcall midiOutPrepareHeader(long ptr long) midiOutPrepareHeader32
- 86 stdcall midiOutReset(long) midiOutReset32
- 87 stdcall midiOutSetVolume(long ptr) midiOutSetVolume32
- 88 stdcall midiOutShortMsg(long long) midiOutShortMsg32
- 89 stdcall midiOutUnprepareHeader(long ptr long) midiOutUnprepareHeader32
- 90 stdcall midiStreamClose(long) midiStreamClose32
- 91 stdcall midiStreamOpen(ptr ptr long long long long) midiStreamOpen32
- 92 stdcall midiStreamOut(long ptr long) midiStreamOut32
- 93 stdcall midiStreamPause(long) midiStreamPause32
- 94 stdcall midiStreamPosition(long ptr long) midiStreamPosition32
- 95 stdcall midiStreamProperty(long ptr long) midiStreamProperty32
- 96 stdcall midiStreamRestart(long) midiStreamRestart32
- 97 stdcall midiStreamStop(long) midiStreamStop32
- 98 stdcall mixerClose(long) mixerClose32
- 99 stdcall mixerGetControlDetailsA(long ptr long) mixerGetControlDetails32A
-100 stdcall mixerGetControlDetailsW(long ptr long) mixerGetControlDetails32W
-101 stdcall mixerGetDevCapsA(long ptr long) mixerGetDevCaps32A
-102 stdcall mixerGetDevCapsW(long ptr long) mixerGetDevCaps32W
-103 stdcall mixerGetID(long ptr long) mixerGetID32
-104 stdcall mixerGetLineControlsA(long ptr long) mixerGetLineControls32A
-105 stdcall mixerGetLineControlsW(long ptr long) mixerGetLineControls32W
-106 stdcall mixerGetLineInfoA(long ptr long) mixerGetLineInfo32A
-107 stdcall mixerGetLineInfoW(long ptr long) mixerGetLineInfo32W
-108 stdcall mixerGetNumDevs() mixerGetNumDevs32
-109 stdcall mixerMessage(long long long long) mixerMessage32
-110 stdcall mixerOpen(ptr long long long long) mixerOpen32
-111 stdcall mixerSetControlDetails(long ptr long) mixerSetControlDetails32
-112 stdcall mmioAdvance(long ptr long) mmioAdvance32
-113 stdcall mmioAscend(long ptr long) mmioAscend32
-114 stdcall mmioClose(long long) mmioClose32
-115 stdcall mmioCreateChunk(long ptr long) mmioCreateChunk32
+ 57 stdcall midiInAddBuffer(long ptr long) midiInAddBuffer
+ 58 stdcall midiInClose(long) midiInClose
+ 59 stdcall midiInGetDevCapsA(long ptr long) midiInGetDevCapsA
+ 60 stdcall midiInGetDevCapsW(long ptr long) midiInGetDevCapsW
+ 61 stdcall midiInGetErrorTextA(long ptr long) midiInGetErrorTextA
+ 62 stdcall midiInGetErrorTextW(long ptr long) midiInGetErrorTextW
+ 63 stdcall midiInGetID(long) midiInGetID
+ 64 stdcall midiInGetNumDevs() midiInGetNumDevs
+ 65 stdcall midiInMessage(long long long long) midiInMessage
+ 66 stdcall midiInOpen(ptr long long long long) midiInOpen
+ 67 stdcall midiInPrepareHeader(long ptr long) midiInPrepareHeader
+ 68 stdcall midiInReset(long) midiInReset
+ 69 stdcall midiInStart(long) midiInStart
+ 70 stdcall midiInStop(long) midiInStop
+ 71 stdcall midiInUnprepareHeader(long ptr long) midiInUnprepareHeader
+ 72 stdcall midiOutCacheDrumPatches(long long ptr long) midiOutCacheDrumPatches
+ 73 stdcall midiOutCachePatches(long long ptr long) midiOutCachePatches
+ 74 stdcall midiOutClose(long) midiOutClose
+ 75 stdcall midiOutGetDevCapsA(long ptr long) midiOutGetDevCapsA
+ 76 stdcall midiOutGetDevCapsW(long ptr long) midiOutGetDevCapsW
+ 77 stdcall midiOutGetErrorTextA(long ptr long) midiOutGetErrorTextA
+ 78 stdcall midiOutGetErrorTextW(long ptr long) midiOutGetErrorTextW
+ 79 stdcall midiOutGetID(long) midiOutGetID
+ 80 stdcall midiOutGetNumDevs() midiOutGetNumDevs
+ 81 stdcall midiOutGetVolume(long ptr) midiOutGetVolume
+ 82 stdcall midiOutLongMsg(long ptr long) midiOutLongMsg
+ 83 stdcall midiOutMessage(long long long long) midiOutMessage
+ 84 stdcall midiOutOpen(ptr long long long long) midiOutOpen
+ 85 stdcall midiOutPrepareHeader(long ptr long) midiOutPrepareHeader
+ 86 stdcall midiOutReset(long) midiOutReset
+ 87 stdcall midiOutSetVolume(long ptr) midiOutSetVolume
+ 88 stdcall midiOutShortMsg(long long) midiOutShortMsg
+ 89 stdcall midiOutUnprepareHeader(long ptr long) midiOutUnprepareHeader
+ 90 stdcall midiStreamClose(long) midiStreamClose
+ 91 stdcall midiStreamOpen(ptr ptr long long long long) midiStreamOpen
+ 92 stdcall midiStreamOut(long ptr long) midiStreamOut
+ 93 stdcall midiStreamPause(long) midiStreamPause
+ 94 stdcall midiStreamPosition(long ptr long) midiStreamPosition
+ 95 stdcall midiStreamProperty(long ptr long) midiStreamProperty
+ 96 stdcall midiStreamRestart(long) midiStreamRestart
+ 97 stdcall midiStreamStop(long) midiStreamStop
+ 98 stdcall mixerClose(long) mixerClose
+ 99 stdcall mixerGetControlDetailsA(long ptr long) mixerGetControlDetailsA
+100 stdcall mixerGetControlDetailsW(long ptr long) mixerGetControlDetailsW
+101 stdcall mixerGetDevCapsA(long ptr long) mixerGetDevCapsA
+102 stdcall mixerGetDevCapsW(long ptr long) mixerGetDevCapsW
+103 stdcall mixerGetID(long ptr long) mixerGetID
+104 stdcall mixerGetLineControlsA(long ptr long) mixerGetLineControlsA
+105 stdcall mixerGetLineControlsW(long ptr long) mixerGetLineControlsW
+106 stdcall mixerGetLineInfoA(long ptr long) mixerGetLineInfoA
+107 stdcall mixerGetLineInfoW(long ptr long) mixerGetLineInfoW
+108 stdcall mixerGetNumDevs() mixerGetNumDevs
+109 stdcall mixerMessage(long long long long) mixerMessage
+110 stdcall mixerOpen(ptr long long long long) mixerOpen
+111 stdcall mixerSetControlDetails(long ptr long) mixerSetControlDetails
+112 stdcall mmioAdvance(long ptr long) mmioAdvance
+113 stdcall mmioAscend(long ptr long) mmioAscend
+114 stdcall mmioClose(long long) mmioClose
+115 stdcall mmioCreateChunk(long ptr long) mmioCreateChunk
 116 stdcall mmioDescend(long ptr ptr long) mmioDescend
-117 stdcall mmioFlush(long long) mmioFlush32
-118 stdcall mmioGetInfo(long ptr long) mmioGetInfo32
+117 stdcall mmioFlush(long long) mmioFlush
+118 stdcall mmioGetInfo(long ptr long) mmioGetInfo
 119 stub mmioInstallIOProc16
-120 stdcall mmioInstallIOProcA(long ptr long) mmioInstallIOProc32A
+120 stdcall mmioInstallIOProcA(long ptr long) mmioInstallIOProcA
 121 stub mmioInstallIOProcW
-122 stdcall mmioOpenA(str ptr long) mmioOpen32A
-123 stdcall mmioOpenW(wstr ptr long) mmioOpen32W
-124 stdcall mmioRead(long ptr long) mmioRead32
-125 stdcall mmioRenameA(ptr ptr ptr long) mmioRename32A
-126 stdcall mmioRenameW(ptr ptr ptr long) mmioRename32W
-127 stdcall mmioSeek(long long long) mmioSeek32
+122 stdcall mmioOpenA(str ptr long) mmioOpenA
+123 stdcall mmioOpenW(wstr ptr long) mmioOpenW
+124 stdcall mmioRead(long ptr long) mmioRead
+125 stdcall mmioRenameA(ptr ptr ptr long) mmioRenameA
+126 stdcall mmioRenameW(ptr ptr ptr long) mmioRenameW
+127 stdcall mmioSeek(long long long) mmioSeek
 128 stdcall mmioSendMessage(long long long long) mmioSendMessage
-129 stdcall mmioSetBuffer(long ptr long long) mmioSetBuffer32
-130 stdcall mmioSetInfo(long ptr long) mmioSetInfo32
-131 stdcall mmioStringToFOURCCA(str long) mmioStringToFOURCC32A
-132 stdcall mmioStringToFOURCCW(wstr long) mmioStringToFOURCC32W
-133 stdcall mmioWrite(long ptr long) mmioWrite32
-134 stdcall mmsystemGetVersion() mmsystemGetVersion32
+129 stdcall mmioSetBuffer(long ptr long long) mmioSetBuffer
+130 stdcall mmioSetInfo(long ptr long) mmioSetInfo
+131 stdcall mmioStringToFOURCCA(str long) mmioStringToFOURCCA
+132 stdcall mmioStringToFOURCCW(wstr long) mmioStringToFOURCCW
+133 stdcall mmioWrite(long ptr long) mmioWrite
+134 stdcall mmsystemGetVersion() mmsystemGetVersion
 135 stdcall sndPlaySoundA(ptr long) sndPlaySound
 136 stdcall sndPlaySoundW(ptr long) sndPlaySound32W
-137 stdcall timeBeginPeriod(long) timeBeginPeriod32
-138 stdcall timeEndPeriod(long) timeEndPeriod32
-139 stdcall timeGetDevCaps(ptr long) timeGetDevCaps32
-140 stdcall timeGetSystemTime(ptr long) timeGetSystemTime32
+137 stdcall timeBeginPeriod(long) timeBeginPeriod
+138 stdcall timeEndPeriod(long) timeEndPeriod
+139 stdcall timeGetDevCaps(ptr long) timeGetDevCaps
+140 stdcall timeGetSystemTime(ptr long) timeGetSystemTime
 141 stdcall timeGetTime() timeGetTime
-142 stdcall timeKillEvent(long) timeKillEvent32
-143 stdcall timeSetEvent(long long ptr long long) timeSetEvent32
-144 stdcall waveInAddBuffer(long ptr long) waveInAddBuffer32
-145 stdcall waveInClose(long) waveInClose32
-146 stdcall waveInGetDevCapsA(long ptr long) waveInGetDevCaps32A
-147 stdcall waveInGetDevCapsW(long ptr long) waveInGetDevCaps32W
-148 stdcall waveInGetErrorTextA(long ptr long) waveInGetErrorText32A
-149 stdcall waveInGetErrorTextW(long ptr long) waveInGetErrorText32W
-150 stdcall waveInGetID(long ptr) waveInGetID32
-151 stdcall waveInGetNumDevs() waveInGetNumDevs32
-152 stdcall waveInGetPosition(long ptr long) waveInGetPosition32
-153 stdcall waveInMessage(long long long long) waveInMessage32
-154 stdcall waveInOpen(ptr long ptr long long long) waveInOpen32
-155 stdcall waveInPrepareHeader(long ptr long) waveInPrepareHeader32
-156 stdcall waveInReset(long) waveInReset32
-157 stdcall waveInStart(long) waveInStart32
-158 stdcall waveInStop(long) waveInStop32
-159 stdcall waveInUnprepareHeader(long ptr long) waveInUnprepareHeader32
-160 stdcall waveOutBreakLoop(long) waveOutBreakLoop32
-161 stdcall waveOutClose(long) waveOutClose32
-162 stdcall waveOutGetDevCapsA(long ptr long) waveOutGetDevCaps32A
-163 stdcall waveOutGetDevCapsW(long ptr long) waveOutGetDevCaps32W
-164 stdcall waveOutGetErrorTextA(long ptr long) waveOutGetErrorText32A
-165 stdcall waveOutGetErrorTextW(long ptr long) waveOutGetErrorText32W
-166 stdcall waveOutGetID(long ptr) waveOutGetID32
-167 stdcall waveOutGetNumDevs() waveOutGetNumDevs32
-168 stdcall waveOutGetPitch(long ptr) waveOutGetPitch32
-169 stdcall waveOutGetPlaybackRate(long ptr) waveOutGetPlaybackRate32
-170 stdcall waveOutGetPosition(long ptr long) waveOutGetPosition32
-171 stdcall waveOutGetVolume(long ptr) waveOutGetVolume32
-172 stdcall waveOutMessage(long long long long) waveOutMessage32
-173 stdcall waveOutOpen(ptr long ptr long long long) waveOutOpen32
-174 stdcall waveOutPause(long) waveOutPause32
-175 stdcall waveOutPrepareHeader(long ptr long) waveOutPrepareHeader32
-176 stdcall waveOutReset(long) waveOutReset32
-177 stdcall waveOutRestart(long) waveOutRestart32
-178 stdcall waveOutSetPitch(long long) waveOutSetPitch32
-179 stdcall waveOutSetPlaybackRate(long long) waveOutSetPlaybackRate32
-180 stdcall waveOutSetVolume(long long) waveOutSetVolume32
-181 stdcall waveOutUnprepareHeader(long ptr long) waveOutUnprepareHeader32
-182 stdcall waveOutWrite(long ptr long) waveOutWrite32
+142 stdcall timeKillEvent(long) timeKillEvent
+143 stdcall timeSetEvent(long long ptr long long) timeSetEvent
+144 stdcall waveInAddBuffer(long ptr long) waveInAddBuffer
+145 stdcall waveInClose(long) waveInClose
+146 stdcall waveInGetDevCapsA(long ptr long) waveInGetDevCapsA
+147 stdcall waveInGetDevCapsW(long ptr long) waveInGetDevCapsW
+148 stdcall waveInGetErrorTextA(long ptr long) waveInGetErrorTextA
+149 stdcall waveInGetErrorTextW(long ptr long) waveInGetErrorTextW
+150 stdcall waveInGetID(long ptr) waveInGetID
+151 stdcall waveInGetNumDevs() waveInGetNumDevs
+152 stdcall waveInGetPosition(long ptr long) waveInGetPosition
+153 stdcall waveInMessage(long long long long) waveInMessage
+154 stdcall waveInOpen(ptr long ptr long long long) waveInOpen
+155 stdcall waveInPrepareHeader(long ptr long) waveInPrepareHeader
+156 stdcall waveInReset(long) waveInReset
+157 stdcall waveInStart(long) waveInStart
+158 stdcall waveInStop(long) waveInStop
+159 stdcall waveInUnprepareHeader(long ptr long) waveInUnprepareHeader
+160 stdcall waveOutBreakLoop(long) waveOutBreakLoop
+161 stdcall waveOutClose(long) waveOutClose
+162 stdcall waveOutGetDevCapsA(long ptr long) waveOutGetDevCapsA
+163 stdcall waveOutGetDevCapsW(long ptr long) waveOutGetDevCapsW
+164 stdcall waveOutGetErrorTextA(long ptr long) waveOutGetErrorTextA
+165 stdcall waveOutGetErrorTextW(long ptr long) waveOutGetErrorTextW
+166 stdcall waveOutGetID(long ptr) waveOutGetID
+167 stdcall waveOutGetNumDevs() waveOutGetNumDevs
+168 stdcall waveOutGetPitch(long ptr) waveOutGetPitch
+169 stdcall waveOutGetPlaybackRate(long ptr) waveOutGetPlaybackRate
+170 stdcall waveOutGetPosition(long ptr long) waveOutGetPosition
+171 stdcall waveOutGetVolume(long ptr) waveOutGetVolume
+172 stdcall waveOutMessage(long long long long) waveOutMessage
+173 stdcall waveOutOpen(ptr long ptr long long long) waveOutOpen
+174 stdcall waveOutPause(long) waveOutPause
+175 stdcall waveOutPrepareHeader(long ptr long) waveOutPrepareHeader
+176 stdcall waveOutReset(long) waveOutReset
+177 stdcall waveOutRestart(long) waveOutRestart
+178 stdcall waveOutSetPitch(long long) waveOutSetPitch
+179 stdcall waveOutSetPlaybackRate(long long) waveOutSetPlaybackRate
+180 stdcall waveOutSetVolume(long long) waveOutSetVolume
+181 stdcall waveOutUnprepareHeader(long ptr long) waveOutUnprepareHeader
+182 stdcall waveOutWrite(long ptr long) waveOutWrite
 183 stub winmmf_ThunkData32
 184 stub winmmsl_ThunkData32
diff --git a/relay32/winspool.spec b/relay32/winspool.spec
index 35e0329730d..b46209202a9 100644
--- a/relay32/winspool.spec
+++ b/relay32/winspool.spec
@@ -3,11 +3,11 @@ type	win32
 
 101 stub ADVANCEDSETUPDIALOG
 102 stub AbortPrinter
-103 stdcall AddFormA(long long ptr) AddForm32A
-104 stdcall AddFormW(long long ptr) AddForm32W
-105 stdcall AddJobA(long long ptr long ptr) AddJob32A
-106 stdcall AddJobW(long long ptr long ptr) AddJob32W
-107 stdcall AddMonitorA(str long ptr) AddMonitor32A
+103 stdcall AddFormA(long long ptr) AddFormA
+104 stdcall AddFormW(long long ptr) AddFormW
+105 stdcall AddJobA(long long ptr long ptr) AddJobA
+106 stdcall AddJobW(long long ptr long ptr) AddJobW
+107 stdcall AddMonitorA(str long ptr) AddMonitorA
 108 stub AddMonitorW
 109 stub AddPortA
 110 stub AddPortExA
@@ -17,45 +17,45 @@ type	win32
 114 stub AddPrintProcessorW
 115 stub AddPrintProvidorA
 116 stub AddPrintProvidorW
-117 stdcall AddPrinterA(str long ptr) AddPrinter32A
+117 stdcall AddPrinterA(str long ptr) AddPrinterA
 118 stub AddPrinterConnectionA
 119 stub AddPrinterConnectionW
-120 stdcall AddPrinterDriverA(str long ptr) AddPrinterDriver32A
-121 stdcall AddPrinterDriverW(wstr long ptr) AddPrinterDriver32W
-122 stdcall AddPrinterW(wstr long ptr) AddPrinter32W
+120 stdcall AddPrinterDriverA(str long ptr) AddPrinterDriverA
+121 stdcall AddPrinterDriverW(wstr long ptr) AddPrinterDriverW
+122 stdcall AddPrinterW(wstr long ptr) AddPrinterW
 123 stub AdvancedDocumentPropertiesA
 124 stub AdvancedDocumentPropertiesW
 125 stub AdvancedSetupDialog
-126 stdcall ClosePrinter(long) ClosePrinter32
+126 stdcall ClosePrinter(long) ClosePrinter
 127 stub ConfigurePortA
 128 stub ConfigurePortW
 129 stub ConnectToPrinterDlg
 130 stub CreatePrinterIC
 131 stub DEVICECAPABILITIES
 132 stub DEVICEMODE
-133 stdcall DeleteFormA(long str) DeleteForm32A
-134 stdcall DeleteFormW(long wstr) DeleteForm32W
-135 stdcall DeleteMonitorA(str str str) DeleteMonitor32A
+133 stdcall DeleteFormA(long str) DeleteFormA
+134 stdcall DeleteFormW(long wstr) DeleteFormW
+135 stdcall DeleteMonitorA(str str str) DeleteMonitorA
 136 stub DeleteMonitorW
-137 stdcall DeletePortA(str long str) DeletePort32A
+137 stdcall DeletePortA(str long str) DeletePortA
 138 stub DeletePortW
 139 stub DeletePrintProcessorA
 140 stub DeletePrintProcessorW
 141 stub DeletePrintProvidorA
 142 stub DeletePrintProvidorW
-143 stdcall DeletePrinter(long) DeletePrinter32
+143 stdcall DeletePrinter(long) DeletePrinter
 144 stub DeletePrinterConnectionA
 145 stub DeletePrinterConnectionW
-146 stdcall DeletePrinterDriverA(str str str) DeletePrinterDriver32A
+146 stdcall DeletePrinterDriverA(str str str) DeletePrinterDriverA
 147 stub DeletePrinterDriverW
 148 stub DeletePrinterIC
 149 stub DevQueryPrint
 150 stub DeviceCapabilities
-151 stdcall DeviceCapabilitiesA(str str long ptr ptr) DeviceCapabilities32A
-152 stdcall DeviceCapabilitiesW(wstr wstr long wstr ptr) DeviceCapabilities32W
+151 stdcall DeviceCapabilitiesA(str str long ptr ptr) DeviceCapabilitiesA
+152 stdcall DeviceCapabilitiesW(wstr wstr long wstr ptr) DeviceCapabilitiesW
 153 stub DeviceMode
 154 stub DocumentEvent
-155 stdcall DocumentPropertiesA(long long ptr ptr ptr long) DocumentProperties32A
+155 stdcall DocumentPropertiesA(long long ptr ptr ptr long) DocumentPropertiesA
 156 stub DocumentPropertiesW
 157 stub EXTDEVICEMODE
 158 stub EndDocPrinter
@@ -66,7 +66,7 @@ type	win32
 163 stub EnumJobsW
 164 stub EnumMonitorsA
 165 stub EnumMonitorsW
-166 stdcall EnumPortsA(ptr long ptr ptr ptr ptr) EnumPorts32A
+166 stdcall EnumPortsA(ptr long ptr ptr ptr ptr) EnumPortsA
 167 stub EnumPortsW
 168 stub EnumPrintProcessorDatatypesA
 169 stub EnumPrintProcessorDatatypesW
@@ -74,47 +74,47 @@ type	win32
 171 stub EnumPrintProcessorsW
 172 stub EnumPrinterDriversA
 173 stub EnumPrinterDriversW
-174 stdcall EnumPrintersA(long ptr long ptr long ptr ptr) EnumPrinters32A
-175 stdcall EnumPrintersW(long ptr long ptr long ptr ptr) EnumPrinters32W
+174 stdcall EnumPrintersA(long ptr long ptr long ptr ptr) EnumPrintersA
+175 stdcall EnumPrintersW(long ptr long ptr long ptr ptr) EnumPrintersW
 176 stub ExtDeviceMode
 177 stub FindClosePrinterChangeNotification
 178 stub FindFirstPrinterChangeNotification
 179 stub FindNextPrinterChangeNotification
 180 stub FreePrinterNotifyInfo
-181 stdcall GetFormA(long str long ptr long ptr) GetForm32A
-182 stdcall GetFormW(long wstr long ptr long ptr) GetForm32W
+181 stdcall GetFormA(long str long ptr long ptr) GetFormA
+182 stdcall GetFormW(long wstr long ptr long ptr) GetFormW
 183 stub GetJobA
 184 stub GetJobW
 185 stub GetPrintProcessorDirectoryA
 186 stub GetPrintProcessorDirectoryW
-187 stdcall GetPrinterA(long long ptr long ptr) GetPrinter32A
+187 stdcall GetPrinterA(long long ptr long ptr) GetPrinterA
 188 stub GetPrinterDataA
 189 stub GetPrinterDataW
-190 stdcall GetPrinterDriverA(long str long ptr long ptr) GetPrinterDriver32A
+190 stdcall GetPrinterDriverA(long str long ptr long ptr) GetPrinterDriverA
 191 stub GetPrinterDriverDirectoryA
 192 stub GetPrinterDriverDirectoryW
-193 stdcall GetPrinterDriverW(long str long ptr long ptr) GetPrinterDriver32W
-194 stdcall GetPrinterW(long long ptr long ptr) GetPrinter32W
+193 stdcall GetPrinterDriverW(long str long ptr long ptr) GetPrinterDriverW
+194 stdcall GetPrinterW(long long ptr long ptr) GetPrinterW
 195 stub InitializeDll
-196 stdcall OpenPrinterA(str ptr ptr) OpenPrinter32A
-197 stdcall OpenPrinterW(wstr ptr ptr) OpenPrinter32W
+196 stdcall OpenPrinterA(str ptr ptr) OpenPrinterA
+197 stdcall OpenPrinterW(wstr ptr ptr) OpenPrinterW
 198 stub PlayGdiScriptOnPrinterIC
 199 stub PrinterMessageBoxA
 200 stub PrinterMessageBoxW
 201 stub PrinterProperties
-202 stdcall ReadPrinter(long ptr long ptr) ReadPrinter32
-203 stdcall ResetPrinterA(long ptr) ResetPrinter32A
-204 stdcall ResetPrinterW(long ptr) ResetPrinter32W
+202 stdcall ReadPrinter(long ptr long ptr) ReadPrinter
+203 stdcall ResetPrinterA(long ptr) ResetPrinterA
+204 stdcall ResetPrinterW(long ptr) ResetPrinterW
 205 stub ScheduleJob
 206 stub SetAllocFailCount
-207 stdcall SetFormA(long str long ptr) SetForm32A
-208 stdcall SetFormW(long wstr long ptr) SetForm32W
-209 stdcall SetJobA(long long long ptr long) SetJob32A
-210 stdcall SetJobW(long long long ptr long) SetJob32W
-211 stdcall SetPrinterA(long long ptr long) SetPrinter32A
+207 stdcall SetFormA(long str long ptr) SetFormA
+208 stdcall SetFormW(long wstr long ptr) SetFormW
+209 stdcall SetJobA(long long long ptr long) SetJobA
+210 stdcall SetJobW(long long long ptr long) SetJobW
+211 stdcall SetPrinterA(long long ptr long) SetPrinterA
 212 stub SetPrinterDataA
 213 stub SetPrinterDataW
-214 stdcall SetPrinterW(long long ptr long) SetPrinter32W
+214 stdcall SetPrinterW(long long ptr long) SetPrinterW
 215 stub SpoolerDevQueryPrintW
 216 stub SpoolerInit
 217 stub StartDocDlgA
@@ -123,4 +123,4 @@ type	win32
 220 stub StartDocPrinterW
 221 stub StartPagePrinter
 222 stub WaitForPrinterChange
-223 stdcall WritePrinter(long ptr long ptr) WritePrinter32
+223 stdcall WritePrinter(long ptr long ptr) WritePrinter
diff --git a/relay32/wnaspi32.spec b/relay32/wnaspi32.spec
index 0f7cdb51f1a..8ea90cbc645 100644
--- a/relay32/wnaspi32.spec
+++ b/relay32/wnaspi32.spec
@@ -1,6 +1,6 @@
 name	wnaspi32
 type	win32
 
-0 stdcall GetASPI32SupportInfo() GetASPI32SupportInfo32
-1 cdecl SendASPI32Command(ptr) SendASPI32Command32
+0 stdcall GetASPI32SupportInfo() GetASPI32SupportInfo
+1 cdecl SendASPI32Command(ptr) SendASPI32Command
 3 stub GetASPI32DLLVersion
diff --git a/relay32/wsock32.spec b/relay32/wsock32.spec
index b1b49f59f57..9e642a27f71 100644
--- a/relay32/wsock32.spec
+++ b/relay32/wsock32.spec
@@ -1,53 +1,53 @@
 name	wsock32
 type	win32
 
-001 stdcall accept(long ptr ptr) WINSOCK_accept32
-002 stdcall bind(long ptr long) WINSOCK_bind32
-003 stdcall closesocket(long) WINSOCK_closesocket32
-004 stdcall connect(long ptr long) WINSOCK_connect32
-005 stdcall getpeername(long ptr ptr) WINSOCK_getpeername32
-006 stdcall getsockname(long ptr ptr) WINSOCK_getsockname32
-007 stdcall getsockopt(long long long ptr ptr) WINSOCK_getsockopt32
+001 stdcall accept(long ptr ptr) WINSOCK_accept
+002 stdcall bind(long ptr long) WINSOCK_bind
+003 stdcall closesocket(long) WINSOCK_closesocket
+004 stdcall connect(long ptr long) WINSOCK_connect
+005 stdcall getpeername(long ptr ptr) WINSOCK_getpeername
+006 stdcall getsockname(long ptr ptr) WINSOCK_getsockname
+007 stdcall getsockopt(long long long ptr ptr) WINSOCK_getsockopt
 008 stdcall htonl(long) WINSOCK_htonl
 009 stdcall htons(long) WINSOCK_htons
 010 stdcall inet_addr(str) WINSOCK_inet_addr
-011 stdcall inet_ntoa(ptr) WINSOCK_inet_ntoa32
-012 stdcall ioctlsocket(long long ptr) WINSOCK_ioctlsocket32
-013 stdcall listen(long long) WINSOCK_listen32
+011 stdcall inet_ntoa(ptr) WINSOCK_inet_ntoa
+012 stdcall ioctlsocket(long long ptr) WINSOCK_ioctlsocket
+013 stdcall listen(long long) WINSOCK_listen
 014 stdcall ntohl(long) WINSOCK_ntohl
 015 stdcall ntohs(long) WINSOCK_ntohs
-016 stdcall recv(long ptr long long) WINSOCK_recv32
-017 stdcall recvfrom(long ptr long long ptr ptr) WINSOCK_recvfrom32
-018 stdcall select(long ptr ptr ptr ptr) WINSOCK_select32
-019 stdcall send(long ptr long long) WINSOCK_send32
-020 stdcall sendto(long ptr long long ptr long) WINSOCK_sendto32
-021 stdcall setsockopt(long long long ptr long) WINSOCK_setsockopt32
-022 stdcall shutdown(long long) WINSOCK_shutdown32
-023 stdcall socket(long long long) WINSOCK_socket32
-051 stdcall gethostbyaddr(ptr long long) WINSOCK_gethostbyaddr32
-052 stdcall gethostbyname(str) WINSOCK_gethostbyname32
-053 stdcall getprotobyname(str) WINSOCK_getprotobyname32
-054 stdcall getprotobynumber(long) WINSOCK_getprotobynumber32
-055 stdcall getservbyname(str str) WINSOCK_getservbyname32
-056 stdcall getservbyport(long str) WINSOCK_getservbyport32
-057 stdcall gethostname(ptr long) WINSOCK_gethostname32
-101 stdcall WSAAsyncSelect(long long long long) WSAAsyncSelect32
-102 stdcall WSAAsyncGetHostByAddr(long long ptr long long ptr long) WSAAsyncGetHostByAddr32
-103 stdcall WSAAsyncGetHostByName(long long str ptr long) WSAAsyncGetHostByName32
-104 stdcall WSAAsyncGetProtoByNumber(long long long ptr long) WSAAsyncGetProtoByNumber32
-105 stdcall WSAAsyncGetProtoByName(long long str ptr long) WSAAsyncGetProtoByName32
-106 stdcall WSAAsyncGetServByPort(long long long str ptr long) WSAAsyncGetServByPort32
-107 stdcall WSAAsyncGetServByName(long long str str ptr long) WSAAsyncGetServByName32
-108 stdcall WSACancelAsyncRequest(long) WSACancelAsyncRequest32
-109 stdcall WSASetBlockingHook(ptr) WSASetBlockingHook32
-110 stdcall WSAUnhookBlockingHook() WSAUnhookBlockingHook32
+016 stdcall recv(long ptr long long) WINSOCK_recv
+017 stdcall recvfrom(long ptr long long ptr ptr) WINSOCK_recvfrom
+018 stdcall select(long ptr ptr ptr ptr) WINSOCK_select
+019 stdcall send(long ptr long long) WINSOCK_send
+020 stdcall sendto(long ptr long long ptr long) WINSOCK_sendto
+021 stdcall setsockopt(long long long ptr long) WINSOCK_setsockopt
+022 stdcall shutdown(long long) WINSOCK_shutdown
+023 stdcall socket(long long long) WINSOCK_socket
+051 stdcall gethostbyaddr(ptr long long) WINSOCK_gethostbyaddr
+052 stdcall gethostbyname(str) WINSOCK_gethostbyname
+053 stdcall getprotobyname(str) WINSOCK_getprotobyname
+054 stdcall getprotobynumber(long) WINSOCK_getprotobynumber
+055 stdcall getservbyname(str str) WINSOCK_getservbyname
+056 stdcall getservbyport(long str) WINSOCK_getservbyport
+057 stdcall gethostname(ptr long) WINSOCK_gethostname
+101 stdcall WSAAsyncSelect(long long long long) WSAAsyncSelect
+102 stdcall WSAAsyncGetHostByAddr(long long ptr long long ptr long) WSAAsyncGetHostByAddr
+103 stdcall WSAAsyncGetHostByName(long long str ptr long) WSAAsyncGetHostByName
+104 stdcall WSAAsyncGetProtoByNumber(long long long ptr long) WSAAsyncGetProtoByNumber
+105 stdcall WSAAsyncGetProtoByName(long long str ptr long) WSAAsyncGetProtoByName
+106 stdcall WSAAsyncGetServByPort(long long long str ptr long) WSAAsyncGetServByPort
+107 stdcall WSAAsyncGetServByName(long long str str ptr long) WSAAsyncGetServByName
+108 stdcall WSACancelAsyncRequest(long) WSACancelAsyncRequest
+109 stdcall WSASetBlockingHook(ptr) WSASetBlockingHook
+110 stdcall WSAUnhookBlockingHook() WSAUnhookBlockingHook
 111 stdcall WSAGetLastError() WSAGetLastError
-112 stdcall WSASetLastError(long) WSASetLastError32
+112 stdcall WSASetLastError(long) WSASetLastError
 113 stdcall WSACancelBlockingCall() WSACancelBlockingCall
 114 stdcall WSAIsBlocking() WSAIsBlocking
-115 stdcall WSAStartup(long ptr) WSAStartup32
+115 stdcall WSAStartup(long ptr) WSAStartup
 116 stdcall WSACleanup() WSACleanup
-151 stdcall __WSAFDIsSet(long ptr) __WSAFDIsSet32
+151 stdcall __WSAFDIsSet(long ptr) __WSAFDIsSet
 #500 stub WEP
 # applications *should* 'degrade gracefully if these are not present
 # ... as it is, they don't
diff --git a/resources/sysres.c b/resources/sysres.c
index 758e632dccd..477643b5468 100644
--- a/resources/sysres.c
+++ b/resources/sysres.c
@@ -73,7 +73,7 @@ HGLOBAL16 SYSRES_LoadResource( SYSTEM_RESOURCE id )
 
     resPtr = SYSRES_Resources[Options.language][id];
     return GLOBAL_CreateBlock( GMEM_FIXED, resPtr->data, resPtr->datasize,
-			       GetCurrentPDB(), FALSE, FALSE, TRUE, NULL );
+			       GetCurrentPDB16(), FALSE, FALSE, TRUE, NULL );
 }
 
 
diff --git a/resources/sysres_Ca.rc b/resources/sysres_Ca.rc
index fb4ae3aba5b..87f98af3830 100644
--- a/resources/sysres_Ca.rc
+++ b/resources/sysres_Ca.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Desfer", EM_UNDO32
+		MENUITEM "&Desfer", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "&Retallar", WM_CUT
 		MENUITEM "&Copiar", WM_COPY
 		MENUITEM "&Enganxar", WM_PASTE
 		MENUITEM "&Suprimir", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Seleccionar &tot el text", EM_SETSEL32
+		MENUITEM "Seleccionar &tot el text", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Cz.rc b/resources/sysres_Cz.rc
index 52072880e9c..44ffde7bee1 100644
--- a/resources/sysres_Cz.rc
+++ b/resources/sysres_Cz.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Undo", EM_UNDO32
+		MENUITEM "&Undo", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "Cu&t", WM_CUT
 		MENUITEM "&Copy", WM_COPY
 		MENUITEM "&Paste", WM_PASTE
 		MENUITEM "&Delete", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Select &All", EM_SETSEL32
+		MENUITEM "Select &All", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Da.rc b/resources/sysres_Da.rc
index 5f5651b3c26..ce02633f9cd 100644
--- a/resources/sysres_Da.rc
+++ b/resources/sysres_Da.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Fortryd", EM_UNDO32
+		MENUITEM "&Fortryd", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "&Klip", WM_CUT
 		MENUITEM "K&opier", WM_COPY
 		MENUITEM "Sæt &ind", WM_PASTE
 		MENUITEM "&Slet", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Vælg &Alt", EM_SETSEL32
+		MENUITEM "Vælg &Alt", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_De.rc b/resources/sysres_De.rc
index 4499a8fd640..726b8dcd76f 100644
--- a/resources/sysres_De.rc
+++ b/resources/sysres_De.rc
@@ -21,14 +21,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Rückgängig", EM_UNDO32
+		MENUITEM "&Rückgängig", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "&Ausschneiden", WM_CUT
 		MENUITEM "&Kopieren", WM_COPY
 		MENUITEM "&Einfügen", WM_PASTE
 		MENUITEM "&Löschen", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "&Alles markieren", EM_SETSEL32
+		MENUITEM "&Alles markieren", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_En.rc b/resources/sysres_En.rc
index 2d4071476be..69fa8474b76 100644
--- a/resources/sysres_En.rc
+++ b/resources/sysres_En.rc
@@ -22,14 +22,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Undo", EM_UNDO32
+		MENUITEM "&Undo", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "Cu&t", WM_CUT
 		MENUITEM "&Copy", WM_COPY
 		MENUITEM "&Paste", WM_PASTE
 		MENUITEM "&Delete", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Select &All", EM_SETSEL32
+		MENUITEM "Select &All", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Eo.rc b/resources/sysres_Eo.rc
index a17069bb864..cd6061aec08 100644
--- a/resources/sysres_Eo.rc
+++ b/resources/sysres_Eo.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Undo", EM_UNDO32
+		MENUITEM "&Undo", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "Cu&t", WM_CUT
 		MENUITEM "&Copy", WM_COPY
 		MENUITEM "&Paste", WM_PASTE
 		MENUITEM "&Delete", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Select &All", EM_SETSEL32
+		MENUITEM "Select &All", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Es.rc b/resources/sysres_Es.rc
index bc086affc47..d68c76425e0 100644
--- a/resources/sysres_Es.rc
+++ b/resources/sysres_Es.rc
@@ -20,14 +20,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Undo", EM_UNDO32
+		MENUITEM "&Undo", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "Co&rtar", WM_CUT
 		MENUITEM "&Copiar", WM_COPY
 		MENUITEM "&Pegar", WM_PASTE
 		MENUITEM "&Borrar", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Seleccionar &todo", EM_SETSEL32
+		MENUITEM "Seleccionar &todo", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Fi.rc b/resources/sysres_Fi.rc
index fbc4fbe72ae..ad30320a621 100644
--- a/resources/sysres_Fi.rc
+++ b/resources/sysres_Fi.rc
@@ -21,14 +21,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "Pala&uta", EM_UNDO32
+		MENUITEM "Pala&uta", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "&Leikkaa", WM_CUT
 		MENUITEM "&Kopio", WM_COPY
 		MENUITEM "L&iitä", WM_PASTE
 		MENUITEM "&Poista", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "&Valitse Kaikki", EM_SETSEL32
+		MENUITEM "&Valitse Kaikki", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Fr.rc b/resources/sysres_Fr.rc
index 4e006b21604..d06e7b57ae9 100644
--- a/resources/sysres_Fr.rc
+++ b/resources/sysres_Fr.rc
@@ -22,14 +22,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Annuler", EM_UNDO32
+		MENUITEM "&Annuler", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "Coupe&r", WM_CUT
 		MENUITEM "&Copier", WM_COPY
 		MENUITEM "C&oller", WM_PASTE
 		MENUITEM "E&ffacer", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Tout &sélectionner", EM_SETSEL32
+		MENUITEM "Tout &sélectionner", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Hu.rc b/resources/sysres_Hu.rc
index 91eca6418fc..da1d1bad2c4 100644
--- a/resources/sysres_Hu.rc
+++ b/resources/sysres_Hu.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
         POPUP ""
         BEGIN
-                MENUITEM "&Visszavonás", EM_UNDO32
+                MENUITEM "&Visszavonás", EM_UNDO
                 MENUITEM SEPARATOR
                 MENUITEM "&Kivágás", WM_CUT
                 MENUITEM "&Másolás", WM_COPY
                 MENUITEM "&Beillesztés", WM_PASTE
                 MENUITEM "&Törlés", WM_CLEAR
                 MENUITEM SEPARATOR
-                MENUITEM "M&inden kijelölése", EM_SETSEL32
+                MENUITEM "M&inden kijelölése", EM_SETSEL
         END
 END
 
diff --git a/resources/sysres_It.rc b/resources/sysres_It.rc
index 3b387af8ead..77f1bcbde35 100644
--- a/resources/sysres_It.rc
+++ b/resources/sysres_It.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-                MENUITEM "&Annulla", EM_UNDO32
+                MENUITEM "&Annulla", EM_UNDO
 		MENUITEM SEPARATOR
                 MENUITEM "&Taglia", WM_CUT
                 MENUITEM "&Copia", WM_COPY
                 MENUITEM "&Incolla", WM_PASTE
                 MENUITEM "&Elimina", WM_CLEAR
 		MENUITEM SEPARATOR
-                MENUITEM "Sele&ziona tutto", EM_SETSEL32
+                MENUITEM "Sele&ziona tutto", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Ko.rc b/resources/sysres_Ko.rc
index 544733e6af8..55d188d804a 100644
--- a/resources/sysres_Ko.rc
+++ b/resources/sysres_Ko.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "½ÇÇà Ãë¼Ò(&U)", EM_UNDO32
+		MENUITEM "½ÇÇà Ãë¼Ò(&U)", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "À߶󳻱â(&T)", WM_CUT
 		MENUITEM "º¹»ç(&C)", WM_COPY
 		MENUITEM "ºÙ¿©³Ö±â(&P)", WM_PASTE
 		MENUITEM "»èÁ¦(&D)", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Àüü ¼±ÅÃ(&A)", EM_SETSEL32
+		MENUITEM "Àüü ¼±ÅÃ(&A)", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Nl.rc b/resources/sysres_Nl.rc
index fb261af76f6..ab48d9f78f7 100644
--- a/resources/sysres_Nl.rc
+++ b/resources/sysres_Nl.rc
@@ -22,14 +22,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Ongedaan maken", EM_UNDO32
+		MENUITEM "&Ongedaan maken", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "K&nippen", WM_CUT
 		MENUITEM "&Kopieren", WM_COPY
 		MENUITEM "&Plakken", WM_PASTE
 		MENUITEM "&Wissen", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "&Alles selecteren", EM_SETSEL32
+		MENUITEM "&Alles selecteren", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_No.rc b/resources/sysres_No.rc
index 0181b9892db..ac8e35201d6 100644
--- a/resources/sysres_No.rc
+++ b/resources/sysres_No.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Undo", EM_UNDO32
+		MENUITEM "&Undo", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "Cu&t", WM_CUT
 		MENUITEM "&Copy", WM_COPY
 		MENUITEM "&Paste", WM_PASTE
 		MENUITEM "&Delete", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Select &All", EM_SETSEL32
+		MENUITEM "Select &All", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Pl.rc b/resources/sysres_Pl.rc
index e28b3a2882c..a5a6caf4195 100644
--- a/resources/sysres_Pl.rc
+++ b/resources/sysres_Pl.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Cofnij", EM_UNDO32
+		MENUITEM "&Cofnij", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "W&ytnij", WM_CUT
 		MENUITEM "&Kopiuj", WM_COPY
 		MENUITEM "&Wklej", WM_PASTE
 		MENUITEM "&Usu\xf1", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "&Zaznacz wszystko", EM_SETSEL32
+		MENUITEM "&Zaznacz wszystko", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Po.rc b/resources/sysres_Po.rc
index d0ca54b2eeb..d013d55570f 100644
--- a/resources/sysres_Po.rc
+++ b/resources/sysres_Po.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Voltar", EM_UNDO32
+		MENUITEM "&Voltar", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "&Recortar", WM_CUT
 		MENUITEM "&Copiar", WM_COPY
 		MENUITEM "Co&lar", WM_PASTE
 		MENUITEM "&Apagar", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Selecionar &Tudo", EM_SETSEL32
+		MENUITEM "Selecionar &Tudo", EM_SETSEL
 	END
 }
 
diff --git a/resources/sysres_Sw.rc b/resources/sysres_Sw.rc
index b5b40eef77e..a3d701133ed 100644
--- a/resources/sysres_Sw.rc
+++ b/resources/sysres_Sw.rc
@@ -19,14 +19,14 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
 	POPUP ""
 	BEGIN
-		MENUITEM "&Undo", EM_UNDO32
+		MENUITEM "&Undo", EM_UNDO
 		MENUITEM SEPARATOR
 		MENUITEM "K&lipp", WM_CUT
 		MENUITEM "&Kopiera", WM_COPY
 		MENUITEM "Klistra &in", WM_PASTE
 		MENUITEM "&Ta bort", WM_CLEAR
 		MENUITEM SEPARATOR
-		MENUITEM "Markera &alla", EM_SETSEL32
+		MENUITEM "Markera &alla", EM_SETSEL
 	END
 }
 
diff --git a/scheduler/client.c b/scheduler/client.c
index 0800f9ed406..b1c688ea00c 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -348,7 +348,7 @@ int CLIENT_CloseHandle( int handle )
  * Send a duplicate handle request. Return 0 if OK.
  */
 int CLIENT_DuplicateHandle( int src_process, int src_handle, int dst_process, int dst_handle,
-                            DWORD access, BOOL32 inherit, DWORD options )
+                            DWORD access, BOOL inherit, DWORD options )
 {
     struct dup_handle_request req;
     struct dup_handle_reply reply;
@@ -372,7 +372,7 @@ int CLIENT_DuplicateHandle( int src_process, int src_handle, int dst_process, in
  *
  * Open a handle to a process.
  */
-int CLIENT_OpenProcess( void *pid, DWORD access, BOOL32 inherit )
+int CLIENT_OpenProcess( void *pid, DWORD access, BOOL inherit )
 {
     struct open_process_request req;
     struct open_process_reply reply;
diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index dd8bc1ebdfc..fa88191a0d7 100644
--- a/scheduler/critsection.c
+++ b/scheduler/critsection.c
@@ -38,7 +38,7 @@ void WINAPI InitializeCriticalSection( CRITICAL_SECTION *crit )
     crit->LockSemaphore  = 0;
     if (SystemHeap)
     {
-        crit->LockSemaphore = CreateSemaphore32A( NULL, 0, 1, NULL );
+        crit->LockSemaphore = CreateSemaphoreA( NULL, 0, 1, NULL );
         crit->Reserved      = (DWORD)-1;
     }
     else
@@ -100,7 +100,7 @@ void WINAPI EnterCriticalSection( CRITICAL_SECTION *crit )
         if (crit->LockSemaphore)
         {
             /* FIXME: should set a timeout and raise an exception */
-            WaitForSingleObject( crit->LockSemaphore, INFINITE32 );
+            WaitForSingleObject( crit->LockSemaphore, INFINITE );
         }
         else if (crit->Reserved != (DWORD)-1)
         {
@@ -128,7 +128,7 @@ void WINAPI EnterCriticalSection( CRITICAL_SECTION *crit )
 /***********************************************************************
  *           TryEnterCriticalSection   (KERNEL32.898) (NTDLL.969)
  */
-BOOL32 WINAPI TryEnterCriticalSection( CRITICAL_SECTION *crit )
+BOOL WINAPI TryEnterCriticalSection( CRITICAL_SECTION *crit )
 {
     if (InterlockedIncrement( &crit->LockCount ))
     {
diff --git a/scheduler/event.c b/scheduler/event.c
index 597689d04f8..9dd1b0f41da 100644
--- a/scheduler/event.c
+++ b/scheduler/event.c
@@ -23,13 +23,13 @@ typedef struct
 /***********************************************************************
  *           CreateEvent32A    (KERNEL32.156)
  */
-HANDLE32 WINAPI CreateEvent32A( SECURITY_ATTRIBUTES *sa, BOOL32 manual_reset,
-                                BOOL32 initial_state, LPCSTR name )
+HANDLE WINAPI CreateEventA( SECURITY_ATTRIBUTES *sa, BOOL manual_reset,
+                                BOOL initial_state, LPCSTR name )
 {
     struct create_event_request req;
     struct create_event_reply reply;
     int len = name ? strlen(name) + 1 : 0;
-    HANDLE32 handle;
+    HANDLE handle;
     EVENT *event;
 
     req.manual_reset = manual_reset;
@@ -46,7 +46,7 @@ HANDLE32 WINAPI CreateEvent32A( SECURITY_ATTRIBUTES *sa, BOOL32 manual_reset,
     if (event)
         K32OBJ_DecCount( &event->header );
     SYSTEM_UNLOCK();
-    if (handle == INVALID_HANDLE_VALUE32) handle = 0;
+    if (handle == INVALID_HANDLE_VALUE) handle = 0;
     return handle;
 }
 
@@ -54,11 +54,11 @@ HANDLE32 WINAPI CreateEvent32A( SECURITY_ATTRIBUTES *sa, BOOL32 manual_reset,
 /***********************************************************************
  *           CreateEvent32W    (KERNEL32.157)
  */
-HANDLE32 WINAPI CreateEvent32W( SECURITY_ATTRIBUTES *sa, BOOL32 manual_reset,
-                                BOOL32 initial_state, LPCWSTR name )
+HANDLE WINAPI CreateEventW( SECURITY_ATTRIBUTES *sa, BOOL manual_reset,
+                                BOOL initial_state, LPCWSTR name )
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    HANDLE32 ret = CreateEvent32A( sa, manual_reset, initial_state, nameA );
+    HANDLE ret = CreateEventA( sa, manual_reset, initial_state, nameA );
     if (nameA) HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
 }
@@ -66,18 +66,18 @@ HANDLE32 WINAPI CreateEvent32W( SECURITY_ATTRIBUTES *sa, BOOL32 manual_reset,
 /***********************************************************************
  *           WIN16_CreateEvent    (KERNEL.457)
  */
-HANDLE32 WINAPI WIN16_CreateEvent( BOOL32 manual_reset, BOOL32 initial_state )
+HANDLE WINAPI WIN16_CreateEvent( BOOL manual_reset, BOOL initial_state )
 {
-    return CreateEvent32A( NULL, manual_reset, initial_state, NULL );
+    return CreateEventA( NULL, manual_reset, initial_state, NULL );
 }
 
 
 /***********************************************************************
  *           OpenEvent32A    (KERNEL32.536)
  */
-HANDLE32 WINAPI OpenEvent32A( DWORD access, BOOL32 inherit, LPCSTR name )
+HANDLE WINAPI OpenEventA( DWORD access, BOOL inherit, LPCSTR name )
 {
-    HANDLE32 handle = 0;
+    HANDLE handle = 0;
     K32OBJ *obj;
     struct open_named_obj_request req;
     struct open_named_obj_reply reply;
@@ -95,7 +95,7 @@ HANDLE32 WINAPI OpenEvent32A( DWORD access, BOOL32 inherit, LPCSTR name )
         {
             handle = HANDLE_Alloc( PROCESS_Current(), obj, access, inherit, reply.handle );
             K32OBJ_DecCount( obj );
-            if (handle == INVALID_HANDLE_VALUE32)
+            if (handle == INVALID_HANDLE_VALUE)
                 handle = 0; /* must return 0 on failure, not -1 */
         }
         else CLIENT_CloseHandle( reply.handle );
@@ -108,10 +108,10 @@ HANDLE32 WINAPI OpenEvent32A( DWORD access, BOOL32 inherit, LPCSTR name )
 /***********************************************************************
  *           OpenEvent32W    (KERNEL32.537)
  */
-HANDLE32 WINAPI OpenEvent32W( DWORD access, BOOL32 inherit, LPCWSTR name )
+HANDLE WINAPI OpenEventW( DWORD access, BOOL inherit, LPCWSTR name )
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    HANDLE32 ret = OpenEvent32A( access, inherit, nameA );
+    HANDLE ret = OpenEventA( access, inherit, nameA );
     if (nameA) HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
 }
@@ -122,7 +122,7 @@ HANDLE32 WINAPI OpenEvent32W( DWORD access, BOOL32 inherit, LPCWSTR name )
  *
  * Execute an event operation (set,reset,pulse).
  */
-static BOOL32 EVENT_Operation( HANDLE32 handle, enum event_op op )
+static BOOL EVENT_Operation( HANDLE handle, enum event_op op )
 {
     struct event_op_request req;
 
@@ -138,7 +138,7 @@ static BOOL32 EVENT_Operation( HANDLE32 handle, enum event_op op )
 /***********************************************************************
  *           PulseEvent    (KERNEL32.557)
  */
-BOOL32 WINAPI PulseEvent( HANDLE32 handle )
+BOOL WINAPI PulseEvent( HANDLE handle )
 {
     return EVENT_Operation( handle, PULSE_EVENT );
 }
@@ -147,7 +147,7 @@ BOOL32 WINAPI PulseEvent( HANDLE32 handle )
 /***********************************************************************
  *           SetEvent    (KERNEL32.644)
  */
-BOOL32 WINAPI SetEvent( HANDLE32 handle )
+BOOL WINAPI SetEvent( HANDLE handle )
 {
     return EVENT_Operation( handle, SET_EVENT );
 }
@@ -156,7 +156,7 @@ BOOL32 WINAPI SetEvent( HANDLE32 handle )
 /***********************************************************************
  *           ResetEvent    (KERNEL32.586)
  */
-BOOL32 WINAPI ResetEvent( HANDLE32 handle )
+BOOL WINAPI ResetEvent( HANDLE handle )
 {
     return EVENT_Operation( handle, RESET_EVENT );
 }
@@ -172,16 +172,16 @@ BOOL32 WINAPI ResetEvent( HANDLE32 handle )
 /***********************************************************************
  *       VWin32_EventCreate	(KERNEL.442)
  */
-HANDLE32 WINAPI VWin32_EventCreate(VOID)
+HANDLE WINAPI VWin32_EventCreate(VOID)
 {
-    HANDLE32 hEvent = CreateEvent32A( NULL, FALSE, 0, NULL );
+    HANDLE hEvent = CreateEventA( NULL, FALSE, 0, NULL );
     return ConvertToGlobalHandle( hEvent );
 }
 
 /***********************************************************************
  *       VWin32_EventDestroy	(KERNEL.443)
  */
-VOID WINAPI VWin32_EventDestroy(HANDLE32 event)
+VOID WINAPI VWin32_EventDestroy(HANDLE event)
 {
     CloseHandle( event );
 }
@@ -189,17 +189,17 @@ VOID WINAPI VWin32_EventDestroy(HANDLE32 event)
 /***********************************************************************
  *       VWin32_EventWait	(KERNEL.450) 
  */
-VOID WINAPI VWin32_EventWait(HANDLE32 event)
+VOID WINAPI VWin32_EventWait(HANDLE event)
 {
     SYSLEVEL_ReleaseWin16Lock();
-    WaitForSingleObject( event, INFINITE32 );
+    WaitForSingleObject( event, INFINITE );
     SYSLEVEL_RestoreWin16Lock();
 }
 
 /***********************************************************************
  *       VWin32_EventSet	(KERNEL.451)
  */
-VOID WINAPI VWin32_EventSet(HANDLE32 event)
+VOID WINAPI VWin32_EventSet(HANDLE event)
 {
     SetEvent( event );
 }
diff --git a/scheduler/handle.c b/scheduler/handle.c
index d8289843bd1..032921b0e2a 100644
--- a/scheduler/handle.c
+++ b/scheduler/handle.c
@@ -27,7 +27,7 @@
 /***********************************************************************
  *           HANDLE_GrowTable
  */
-static BOOL32 HANDLE_GrowTable( PDB32 *process, INT32 incr )
+static BOOL HANDLE_GrowTable( PDB *process, INT incr )
 {
     HANDLE_TABLE *table;
 
@@ -52,7 +52,7 @@ static BOOL32 HANDLE_GrowTable( PDB32 *process, INT32 incr )
  *
  * Create a process handle table, optionally inheriting the parent's handles.
  */
-BOOL32 HANDLE_CreateTable( PDB32 *pdb, BOOL32 inherit )
+BOOL HANDLE_CreateTable( PDB *pdb, BOOL inherit )
 {
     DWORD size;
 
@@ -74,7 +74,7 @@ BOOL32 HANDLE_CreateTable( PDB32 *pdb, BOOL32 inherit )
         {
             HANDLE_ENTRY *src = pdb->parent->handle_table->entries;
             HANDLE_ENTRY *dst = pdb->handle_table->entries;
-            HANDLE32 h;
+            HANDLE h;
 
             for (h = 0; h < size; h++, src++, dst++)
             {
@@ -107,10 +107,10 @@ BOOL32 HANDLE_CreateTable( PDB32 *pdb, BOOL32 inherit )
  *
  * Allocate a handle for a kernel object and increment its refcount.
  */
-HANDLE32 HANDLE_Alloc( PDB32 *pdb, K32OBJ *ptr, DWORD access,
-                       BOOL32 inherit, int server_handle )
+HANDLE HANDLE_Alloc( PDB *pdb, K32OBJ *ptr, DWORD access,
+                       BOOL inherit, int server_handle )
 {
-    HANDLE32 h;
+    HANDLE h;
     HANDLE_ENTRY *entry;
 
     assert( ptr );
@@ -138,7 +138,7 @@ HANDLE32 HANDLE_Alloc( PDB32 *pdb, K32OBJ *ptr, DWORD access,
     SYSTEM_UNLOCK();
     if (server_handle != -1) CLIENT_CloseHandle( server_handle );
     SetLastError( ERROR_OUTOFMEMORY );
-    return INVALID_HANDLE_VALUE32;
+    return INVALID_HANDLE_VALUE;
 }
 
 
@@ -148,7 +148,7 @@ HANDLE32 HANDLE_Alloc( PDB32 *pdb, K32OBJ *ptr, DWORD access,
  * Retrieve a pointer to a kernel object and increments its reference count.
  * The refcount must be decremented when the pointer is no longer used.
  */
-K32OBJ *HANDLE_GetObjPtr( PDB32 *pdb, HANDLE32 handle,
+K32OBJ *HANDLE_GetObjPtr( PDB *pdb, HANDLE handle,
                           K32OBJ_TYPE type, DWORD access,
                           int *server_handle )
 {
@@ -196,7 +196,7 @@ K32OBJ *HANDLE_GetObjPtr( PDB32 *pdb, HANDLE32 handle,
  *
  * Retrieve the server handle associated to an object.
  */
-int HANDLE_GetServerHandle( PDB32 *pdb, HANDLE32 handle,
+int HANDLE_GetServerHandle( PDB *pdb, HANDLE handle,
                             K32OBJ_TYPE type, DWORD access )
 {
     int server_handle;
@@ -215,9 +215,9 @@ int HANDLE_GetServerHandle( PDB32 *pdb, HANDLE32 handle,
 /*********************************************************************
  *           HANDLE_GetAccess
  */
-static BOOL32 HANDLE_GetAccess( PDB32 *pdb, HANDLE32 handle, LPDWORD access )
+static BOOL HANDLE_GetAccess( PDB *pdb, HANDLE handle, LPDWORD access )
 {
-    BOOL32 ret = FALSE;
+    BOOL ret = FALSE;
 
     SYSTEM_LOCK();
     if ((handle > 0) && (handle < pdb->handle_table->count))
@@ -238,9 +238,9 @@ static BOOL32 HANDLE_GetAccess( PDB32 *pdb, HANDLE32 handle, LPDWORD access )
 /*********************************************************************
  *           HANDLE_Close
  */
-static BOOL32 HANDLE_Close( PDB32 *pdb, HANDLE32 handle )
+static BOOL HANDLE_Close( PDB *pdb, HANDLE handle )
 {
-    BOOL32 ret = FALSE;
+    BOOL ret = FALSE;
     K32OBJ *ptr;
 
     if (HANDLE_IS_GLOBAL( handle ))
@@ -278,11 +278,11 @@ static BOOL32 HANDLE_Close( PDB32 *pdb, HANDLE32 handle )
  * Close all handles pointing to a given object (or all handles of the
  * process if the object is NULL)
  */
-void HANDLE_CloseAll( PDB32 *pdb, K32OBJ *obj )
+void HANDLE_CloseAll( PDB *pdb, K32OBJ *obj )
 {
     HANDLE_ENTRY *entry;
     K32OBJ *ptr;
-    HANDLE32 handle;
+    HANDLE handle;
 
     SYSTEM_LOCK();
     entry = pdb->handle_table->entries;
@@ -302,7 +302,7 @@ void HANDLE_CloseAll( PDB32 *pdb, K32OBJ *obj )
 /*********************************************************************
  *           CloseHandle   (KERNEL32.23)
  */
-BOOL32 WINAPI CloseHandle( HANDLE32 handle )
+BOOL WINAPI CloseHandle( HANDLE handle )
 {
     return HANDLE_Close( PROCESS_Current(), handle );
 }
@@ -311,10 +311,10 @@ BOOL32 WINAPI CloseHandle( HANDLE32 handle )
 /*********************************************************************
  *           GetHandleInformation   (KERNEL32.336)
  */
-BOOL32 WINAPI GetHandleInformation( HANDLE32 handle, LPDWORD flags )
+BOOL WINAPI GetHandleInformation( HANDLE handle, LPDWORD flags )
 {
-    BOOL32 ret = FALSE;
-    PDB32 *pdb = PROCESS_Current();
+    BOOL ret = FALSE;
+    PDB *pdb = PROCESS_Current();
 
     SYSTEM_LOCK();
     if ((handle > 0) && (handle < pdb->handle_table->count))
@@ -336,10 +336,10 @@ BOOL32 WINAPI GetHandleInformation( HANDLE32 handle, LPDWORD flags )
 /*********************************************************************
  *           SetHandleInformation   (KERNEL32.653)
  */
-BOOL32 WINAPI SetHandleInformation( HANDLE32 handle, DWORD mask, DWORD flags )
+BOOL WINAPI SetHandleInformation( HANDLE handle, DWORD mask, DWORD flags )
 {
-    BOOL32 ret = FALSE;
-    PDB32 *pdb = PROCESS_Current();
+    BOOL ret = FALSE;
+    PDB *pdb = PROCESS_Current();
 
     mask  = (mask << RESERVED_SHIFT) & RESERVED_ALL;
     flags = (flags << RESERVED_SHIFT) & RESERVED_ALL;
@@ -362,19 +362,19 @@ BOOL32 WINAPI SetHandleInformation( HANDLE32 handle, DWORD mask, DWORD flags )
 /*********************************************************************
  *           DuplicateHandle   (KERNEL32.192)
  */
-BOOL32 WINAPI DuplicateHandle( HANDLE32 source_process, HANDLE32 source,
-                               HANDLE32 dest_process, HANDLE32 *dest,
-                               DWORD access, BOOL32 inherit, DWORD options )
+BOOL WINAPI DuplicateHandle( HANDLE source_process, HANDLE source,
+                               HANDLE dest_process, HANDLE *dest,
+                               DWORD access, BOOL inherit, DWORD options )
 {
-    PDB32 *src_pdb = NULL, *dst_pdb = NULL;
+    PDB *src_pdb = NULL, *dst_pdb = NULL;
     K32OBJ *obj = NULL;
-    BOOL32 ret = FALSE;
-    HANDLE32 handle;
+    BOOL ret = FALSE;
+    HANDLE handle;
     int src_process, src_handle, dst_process, dst_handle;
 
     SYSTEM_LOCK();
 
-    if (!(src_pdb = (PDB32 *)HANDLE_GetObjPtr( PROCESS_Current(), source_process,
+    if (!(src_pdb = (PDB *)HANDLE_GetObjPtr( PROCESS_Current(), source_process,
                                     K32OBJ_PROCESS, PROCESS_DUP_HANDLE, &src_process )))
         goto done;
     if (!(obj = HANDLE_GetObjPtr( src_pdb, source, K32OBJ_UNKNOWN, 0, &src_handle )))
@@ -389,7 +389,7 @@ BOOL32 WINAPI DuplicateHandle( HANDLE32 source_process, HANDLE32 source,
 
     /* And duplicate the handle in the dest process */
 
-    if (!(dst_pdb = (PDB32 *)HANDLE_GetObjPtr( PROCESS_Current(), dest_process,
+    if (!(dst_pdb = (PDB *)HANDLE_GetObjPtr( PROCESS_Current(), dest_process,
                                     K32OBJ_PROCESS, PROCESS_DUP_HANDLE, &dst_process )))
         goto done;
 
@@ -400,7 +400,7 @@ BOOL32 WINAPI DuplicateHandle( HANDLE32 source_process, HANDLE32 source,
         dst_handle = -1;
 
     if ((handle = HANDLE_Alloc( dst_pdb, obj, access, inherit,
-                                dst_handle )) != INVALID_HANDLE_VALUE32)
+                                dst_handle )) != INVALID_HANDLE_VALUE)
     {
         if (dest) *dest = handle;
         ret = TRUE;
@@ -418,10 +418,10 @@ done:
 /***********************************************************************
  *           ConvertToGlobalHandle    		(KERNEL32)
  */
-HANDLE32 WINAPI ConvertToGlobalHandle(HANDLE32 hSrc)
+HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc)
 {
     int src_handle, dst_handle;
-    HANDLE32 handle;
+    HANDLE handle;
     K32OBJ *obj = NULL;
     DWORD access;
 
@@ -440,7 +440,7 @@ HANDLE32 WINAPI ConvertToGlobalHandle(HANDLE32 hSrc)
         dst_handle = -1;
 
     if ((handle = HANDLE_Alloc( PROCESS_Initial(), obj, access, FALSE,
-                                dst_handle )) != INVALID_HANDLE_VALUE32)
+                                dst_handle )) != INVALID_HANDLE_VALUE)
         handle = HANDLE_LOCAL_TO_GLOBAL(handle);
     else
         handle = 0;
diff --git a/scheduler/k32obj.c b/scheduler/k32obj.c
index 83c2b0ab253..1f6f991b235 100644
--- a/scheduler/k32obj.c
+++ b/scheduler/k32obj.c
@@ -55,7 +55,7 @@ typedef struct _NE
 {
     struct _NE *next;
     K32OBJ     *obj;
-    UINT32      len;
+    UINT      len;
     char        name[1];
 } NAME_ENTRY;
 
@@ -126,9 +126,9 @@ static void K32OBJ_Destroy( K32OBJ *obj )
  *
  * Check if a pointer is a valid kernel object
  */
-BOOL32 K32OBJ_IsValid( K32OBJ *ptr, K32OBJ_TYPE type )
+BOOL K32OBJ_IsValid( K32OBJ *ptr, K32OBJ_TYPE type )
 {
-    if (IsBadReadPtr32( ptr, sizeof(*ptr) )) return FALSE;
+    if (IsBadReadPtr( ptr, sizeof(*ptr) )) return FALSE;
     return (ptr->type == type);
 }
 
@@ -139,10 +139,10 @@ BOOL32 K32OBJ_IsValid( K32OBJ *ptr, K32OBJ_TYPE type )
  * Add a name entry for an object. We don't check for duplicates here.
  * FIXME: should use some sort of hashing.
  */
-BOOL32 K32OBJ_AddName( K32OBJ *obj, LPCSTR name )
+BOOL K32OBJ_AddName( K32OBJ *obj, LPCSTR name )
 {
     NAME_ENTRY *entry;
-    UINT32 len;
+    UINT len;
 
     if (!name) return TRUE;  /* Anonymous object */
     len = strlen( name );
@@ -156,7 +156,7 @@ BOOL32 K32OBJ_AddName( K32OBJ *obj, LPCSTR name )
     entry->next = K32OBJ_FirstEntry;
     entry->obj  = obj;
     entry->len  = len;
-    lstrcpy32A( entry->name, name );
+    lstrcpyA( entry->name, name );
     K32OBJ_FirstEntry = entry;
     SYSTEM_UNLOCK();
     return TRUE;
@@ -171,9 +171,9 @@ BOOL32 K32OBJ_AddName( K32OBJ *obj, LPCSTR name )
  * The refcount of the object must be decremented once it is initialized.
  */
 K32OBJ *K32OBJ_Create( K32OBJ_TYPE type, DWORD size, LPCSTR name, int server_handle,
-                       DWORD access, SECURITY_ATTRIBUTES *sa, HANDLE32 *handle)
+                       DWORD access, SECURITY_ATTRIBUTES *sa, HANDLE *handle)
 {
-    BOOL32 inherit = (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle);
+    BOOL inherit = (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle);
 
     /* Check if the name already exists */
 
@@ -188,7 +188,7 @@ K32OBJ *K32OBJ_Create( K32OBJ_TYPE type, DWORD size, LPCSTR name, int server_han
         else
         {
             SetLastError( ERROR_DUP_NAME );
-            *handle = INVALID_HANDLE_VALUE32;
+            *handle = INVALID_HANDLE_VALUE;
             if (server_handle != -1) CLIENT_CloseHandle( server_handle );
         }
         K32OBJ_DecCount( obj );
@@ -201,7 +201,7 @@ K32OBJ *K32OBJ_Create( K32OBJ_TYPE type, DWORD size, LPCSTR name, int server_han
     if (!(obj = HeapAlloc( SystemHeap, 0, size )))
     {
         SYSTEM_UNLOCK();
-        *handle = INVALID_HANDLE_VALUE32;
+        *handle = INVALID_HANDLE_VALUE;
         if (server_handle != -1) CLIENT_CloseHandle( server_handle );
         return NULL;
     }
@@ -216,7 +216,7 @@ K32OBJ *K32OBJ_Create( K32OBJ_TYPE type, DWORD size, LPCSTR name, int server_han
          * initialized properly */
         HeapFree( SystemHeap, 0, obj );
         SYSTEM_UNLOCK();
-        *handle = INVALID_HANDLE_VALUE32;
+        *handle = INVALID_HANDLE_VALUE;
         if (server_handle != -1) CLIENT_CloseHandle( server_handle );
         return NULL;
     }
@@ -238,7 +238,7 @@ K32OBJ *K32OBJ_Create( K32OBJ_TYPE type, DWORD size, LPCSTR name, int server_han
 K32OBJ *K32OBJ_FindName( LPCSTR name )
 {
     NAME_ENTRY *entry;
-    UINT32 len;
+    UINT len;
 
     if (!name) return NULL;  /* Anonymous object */
     len = strlen( name );
diff --git a/scheduler/mutex.c b/scheduler/mutex.c
index 895216ec267..f809a619321 100644
--- a/scheduler/mutex.c
+++ b/scheduler/mutex.c
@@ -22,13 +22,13 @@ typedef struct _MUTEX
 /***********************************************************************
  *           CreateMutex32A   (KERNEL32.166)
  */
-HANDLE32 WINAPI CreateMutex32A( SECURITY_ATTRIBUTES *sa, BOOL32 owner,
+HANDLE WINAPI CreateMutexA( SECURITY_ATTRIBUTES *sa, BOOL owner,
                                 LPCSTR name )
 {
     struct create_mutex_request req;
     struct create_mutex_reply reply;
     int len = name ? strlen(name) + 1 : 0;
-    HANDLE32 handle;
+    HANDLE handle;
     MUTEX *mutex;
 
     req.owned   = owner;
@@ -43,7 +43,7 @@ HANDLE32 WINAPI CreateMutex32A( SECURITY_ATTRIBUTES *sa, BOOL32 owner,
                                     name, reply.handle, MUTEX_ALL_ACCESS,
                                     sa, &handle );
     if (mutex) K32OBJ_DecCount( &mutex->header );
-    if (handle == INVALID_HANDLE_VALUE32) handle = 0;
+    if (handle == INVALID_HANDLE_VALUE) handle = 0;
     SYSTEM_UNLOCK();
     return handle;
 }
@@ -52,11 +52,11 @@ HANDLE32 WINAPI CreateMutex32A( SECURITY_ATTRIBUTES *sa, BOOL32 owner,
 /***********************************************************************
  *           CreateMutex32W   (KERNEL32.167)
  */
-HANDLE32 WINAPI CreateMutex32W( SECURITY_ATTRIBUTES *sa, BOOL32 owner,
+HANDLE WINAPI CreateMutexW( SECURITY_ATTRIBUTES *sa, BOOL owner,
                                 LPCWSTR name )
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    HANDLE32 ret = CreateMutex32A( sa, owner, nameA );
+    HANDLE ret = CreateMutexA( sa, owner, nameA );
     if (nameA) HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
 }
@@ -65,9 +65,9 @@ HANDLE32 WINAPI CreateMutex32W( SECURITY_ATTRIBUTES *sa, BOOL32 owner,
 /***********************************************************************
  *           OpenMutex32A   (KERNEL32.541)
  */
-HANDLE32 WINAPI OpenMutex32A( DWORD access, BOOL32 inherit, LPCSTR name )
+HANDLE WINAPI OpenMutexA( DWORD access, BOOL inherit, LPCSTR name )
 {
-    HANDLE32 handle = 0;
+    HANDLE handle = 0;
     K32OBJ *obj;
     struct open_named_obj_request req;
     struct open_named_obj_reply reply;
@@ -85,7 +85,7 @@ HANDLE32 WINAPI OpenMutex32A( DWORD access, BOOL32 inherit, LPCSTR name )
         {
             handle = HANDLE_Alloc( PROCESS_Current(), obj, access, inherit, reply.handle );
             K32OBJ_DecCount( obj );
-            if (handle == INVALID_HANDLE_VALUE32)
+            if (handle == INVALID_HANDLE_VALUE)
                 handle = 0; /* must return 0 on failure, not -1 */
         }
         else CLIENT_CloseHandle( reply.handle );
@@ -98,10 +98,10 @@ HANDLE32 WINAPI OpenMutex32A( DWORD access, BOOL32 inherit, LPCSTR name )
 /***********************************************************************
  *           OpenMutex32W   (KERNEL32.542)
  */
-HANDLE32 WINAPI OpenMutex32W( DWORD access, BOOL32 inherit, LPCWSTR name )
+HANDLE WINAPI OpenMutexW( DWORD access, BOOL inherit, LPCWSTR name )
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    HANDLE32 ret = OpenMutex32A( access, inherit, nameA );
+    HANDLE ret = OpenMutexA( access, inherit, nameA );
     if (nameA) HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
 }
@@ -110,7 +110,7 @@ HANDLE32 WINAPI OpenMutex32W( DWORD access, BOOL32 inherit, LPCWSTR name )
 /***********************************************************************
  *           ReleaseMutex   (KERNEL32.582)
  */
-BOOL32 WINAPI ReleaseMutex( HANDLE32 handle )
+BOOL WINAPI ReleaseMutex( HANDLE handle )
 {
     struct release_mutex_request req;
 
diff --git a/scheduler/pipe.c b/scheduler/pipe.c
index cc27c6a73cd..a7b4889900a 100644
--- a/scheduler/pipe.c
+++ b/scheduler/pipe.c
@@ -22,7 +22,7 @@ typedef struct _PIPE
 /***********************************************************************
  *	CreatePipe    (KERNEL32.170)
  */
-BOOL32 WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe,
+BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe,
                           LPSECURITY_ATTRIBUTES sa, DWORD size )
 {
     struct create_pipe_request req;
@@ -53,7 +53,7 @@ BOOL32 WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe,
                                               sa, hWritePipe )))
     {
         CloseHandle( *hReadPipe );
-        *hReadPipe = INVALID_HANDLE_VALUE32;
+        *hReadPipe = INVALID_HANDLE_VALUE;
         SYSTEM_UNLOCK();
         return FALSE;
     }
diff --git a/scheduler/process.c b/scheduler/process.c
index 7e23a61ac01..ef903bd5e3d 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -32,15 +32,15 @@ const K32OBJ_OPS PROCESS_Ops =
 };
 
 /* The initial process PDB */
-static PDB32 initial_pdb;
+static PDB initial_pdb;
 
-static PDB32 *PROCESS_PDBList = NULL;
+static PDB *PROCESS_PDBList = NULL;
 static DWORD PROCESS_PDBList_Size = 0;
 
 /***********************************************************************
  *           PROCESS_Current
  */
-PDB32 *PROCESS_Current(void)
+PDB *PROCESS_Current(void)
 {
     return THREAD_Current()->process;
 }
@@ -53,7 +53,7 @@ PDB32 *PROCESS_Current(void)
  *        into all address spaces as is KERNEL32 in Windows 95)
  *
  */
-PDB32 *PROCESS_Initial(void)
+PDB *PROCESS_Initial(void)
 {
     return &initial_pdb;
 }
@@ -63,7 +63,7 @@ PDB32 *PROCESS_Initial(void)
  *
  * Retrieve information about a process
  */
-static BOOL32 PROCESS_QueryInfo( HANDLE32 handle,
+static BOOL PROCESS_QueryInfo( HANDLE handle,
                                  struct get_process_info_reply *reply )
 {
     struct get_process_info_request req;
@@ -78,7 +78,7 @@ static BOOL32 PROCESS_QueryInfo( HANDLE32 handle,
  *
  * Check if a handle is to the current process
  */
-BOOL32 PROCESS_IsCurrent( HANDLE32 handle )
+BOOL PROCESS_IsCurrent( HANDLE handle )
 {
     struct get_process_info_reply reply;
     return (PROCESS_QueryInfo( handle, &reply ) &&
@@ -91,9 +91,9 @@ BOOL32 PROCESS_IsCurrent( HANDLE32 handle )
  *
  * Convert a process id to a PDB, making sure it is valid.
  */
-PDB32 *PROCESS_IdToPDB( DWORD id )
+PDB *PROCESS_IdToPDB( DWORD id )
 {
-    PDB32 *pdb;
+    PDB *pdb;
 
     if (!id) return PROCESS_Current();
     pdb = PROCESS_ID_TO_PDB( id );
@@ -112,7 +112,7 @@ PDB32 *PROCESS_IdToPDB( DWORD id )
  *
  * Build the env DB for the initial process
  */
-static BOOL32 PROCESS_BuildEnvDB( PDB32 *pdb )
+static BOOL PROCESS_BuildEnvDB( PDB *pdb )
 {
     /* Allocate the env DB (FIXME: should not be on the system heap) */
 
@@ -122,7 +122,7 @@ static BOOL32 PROCESS_BuildEnvDB( PDB32 *pdb )
 
     /* Allocate startup info */
     if (!(pdb->env_db->startup_info = 
-          HeapAlloc( SystemHeap, HEAP_ZERO_MEMORY, sizeof(STARTUPINFO32A) )))
+          HeapAlloc( SystemHeap, HEAP_ZERO_MEMORY, sizeof(STARTUPINFOA) )))
         return FALSE;
 
     /* Allocate the standard handles */
@@ -144,8 +144,8 @@ static BOOL32 PROCESS_BuildEnvDB( PDB32 *pdb )
 /***********************************************************************
  *           PROCESS_InheritEnvDB
  */
-static BOOL32 PROCESS_InheritEnvDB( PDB32 *pdb, LPCSTR cmd_line, LPCSTR env,
-                                    BOOL32 inherit_handles, STARTUPINFO32A *startup )
+static BOOL PROCESS_InheritEnvDB( PDB *pdb, LPCSTR cmd_line, LPCSTR env,
+                                    BOOL inherit_handles, STARTUPINFOA *startup )
 {
     if (!(pdb->env_db = HeapAlloc(pdb->heap, HEAP_ZERO_MEMORY, sizeof(ENVDB))))
         return FALSE;
@@ -162,7 +162,7 @@ static BOOL32 PROCESS_InheritEnvDB( PDB32 *pdb, LPCSTR cmd_line, LPCSTR env,
 
     /* Remember startup info */
     if (!(pdb->env_db->startup_info = 
-          HeapAlloc( pdb->heap, HEAP_ZERO_MEMORY, sizeof(STARTUPINFO32A) )))
+          HeapAlloc( pdb->heap, HEAP_ZERO_MEMORY, sizeof(STARTUPINFOA) )))
         return FALSE;
     *pdb->env_db->startup_info = *startup;
 
@@ -189,7 +189,7 @@ static BOOL32 PROCESS_InheritEnvDB( PDB32 *pdb, LPCSTR cmd_line, LPCSTR env,
  * Insert this PDB into the global PDB list
  */
 
-static void PROCESS_PDBList_Insert (PDB32 *pdb)
+static void PROCESS_PDBList_Insert (PDB *pdb)
 {
   TRACE (process, "Inserting PDB 0x%0lx, #%ld current\n", 
 	 PDB_TO_PROCESS_ID (pdb), PROCESS_PDBList_Size);
@@ -206,7 +206,7 @@ static void PROCESS_PDBList_Insert (PDB32 *pdb)
     }
   else
     {
-      PDB32 *first = PROCESS_PDBList, *last = PROCESS_PDBList;
+      PDB *first = PROCESS_PDBList, *last = PROCESS_PDBList;
       if (first->list_prev) last = first->list_prev;
 
       PROCESS_PDBList = pdb;
@@ -224,9 +224,9 @@ static void PROCESS_PDBList_Insert (PDB32 *pdb)
  * Remove this PDB from the global PDB list
  */
 
-static void PROCESS_PDBList_Remove (PDB32 *pdb)
+static void PROCESS_PDBList_Remove (PDB *pdb)
 {
-  PDB32 *next = pdb->list_next, *prev = pdb->list_prev;
+  PDB *next = pdb->list_next, *prev = pdb->list_prev;
   
   TRACE (process, "Removing PDB 0x%0lx, #%ld current\n", 
 	 PDB_TO_PROCESS_ID (pdb), PROCESS_PDBList_Size);
@@ -268,7 +268,7 @@ int	PROCESS_PDBList_Getsize ()
  * Return the head of the PDB list
  */
 
-PDB32*	PROCESS_PDBList_Getfirst ()
+PDB*	PROCESS_PDBList_Getfirst ()
 {
   return PROCESS_PDBList;
 }
@@ -279,7 +279,7 @@ PDB32*	PROCESS_PDBList_Getfirst ()
  * If at the end of the list, return NULL.
  */
 
-PDB32*	PROCESS_PDBList_Getnext (PDB32 *pdb)
+PDB*	PROCESS_PDBList_Getnext (PDB *pdb)
 {
   return (pdb->list_next != PROCESS_PDBList) ? pdb->list_next : NULL;
 }
@@ -289,7 +289,7 @@ PDB32*	PROCESS_PDBList_Getnext (PDB32 *pdb)
  *
  * Free a PDB and all associated storage.
  */
-static void PROCESS_FreePDB( PDB32 *pdb )
+static void PROCESS_FreePDB( PDB *pdb )
 {
     /*
      * FIXME: 
@@ -313,9 +313,9 @@ static void PROCESS_FreePDB( PDB32 *pdb )
  * Allocate and fill a PDB structure.
  * Runs in the context of the parent process.
  */
-static PDB32 *PROCESS_CreatePDB( PDB32 *parent, BOOL32 inherit )
+static PDB *PROCESS_CreatePDB( PDB *parent, BOOL inherit )
 {
-    PDB32 *pdb = HeapAlloc( SystemHeap, HEAP_ZERO_MEMORY, sizeof(PDB32) );
+    PDB *pdb = HeapAlloc( SystemHeap, HEAP_ZERO_MEMORY, sizeof(PDB) );
 
     if (!pdb) return NULL;
     pdb->header.type     = K32OBJ_PROCESS;
@@ -348,11 +348,11 @@ error:
  *
  * Second part of CreatePDB
  */
-static BOOL32 PROCESS_FinishCreatePDB( PDB32 *pdb )
+static BOOL PROCESS_FinishCreatePDB( PDB *pdb )
 {
     InitializeCriticalSection( &pdb->crit_section );
     /* Allocate the event */
-    if (!(pdb->load_done_evt = CreateEvent32A( NULL, TRUE, FALSE, NULL )))
+    if (!(pdb->load_done_evt = CreateEventA( NULL, TRUE, FALSE, NULL )))
         return FALSE;
     return TRUE;
 }
@@ -361,7 +361,7 @@ static BOOL32 PROCESS_FinishCreatePDB( PDB32 *pdb )
 /***********************************************************************
  *           PROCESS_Init
  */
-BOOL32 PROCESS_Init(void)
+BOOL PROCESS_Init(void)
 {
     THDB *thdb;
 
@@ -409,21 +409,21 @@ BOOL32 PROCESS_Init(void)
  *
  * Create a new process database and associated info.
  */
-PDB32 *PROCESS_Create( NE_MODULE *pModule, LPCSTR cmd_line, LPCSTR env,
+PDB *PROCESS_Create( NE_MODULE *pModule, LPCSTR cmd_line, LPCSTR env,
                        HINSTANCE16 hInstance, HINSTANCE16 hPrevInstance,
-                       BOOL32 inherit, STARTUPINFO32A *startup,
+                       BOOL inherit, STARTUPINFOA *startup,
                        PROCESS_INFORMATION *info )
 {
     DWORD size, commit;
     int server_thandle, server_phandle;
-    UINT32 cmdShow = 0;
+    UINT cmdShow = 0;
     THDB *thdb = NULL;
-    PDB32 *parent = PROCESS_Current();
-    PDB32 *pdb = PROCESS_CreatePDB( parent, inherit );
+    PDB *parent = PROCESS_Current();
+    PDB *pdb = PROCESS_CreatePDB( parent, inherit );
     TDB *pTask;
 
     if (!pdb) return NULL;
-    info->hThread = info->hProcess = INVALID_HANDLE_VALUE32;
+    info->hThread = info->hProcess = INVALID_HANDLE_VALUE;
     if (!PROCESS_FinishCreatePDB( pdb )) goto error;
 
     /* Create the heap */
@@ -455,10 +455,10 @@ PDB32 *PROCESS_Create( NE_MODULE *pModule, LPCSTR cmd_line, LPCSTR env,
     if (!(thdb = THREAD_Create( pdb, size, FALSE, &server_thandle, &server_phandle,
                                 NULL, NULL ))) goto error;
     if ((info->hThread = HANDLE_Alloc( parent, &thdb->header, THREAD_ALL_ACCESS,
-                                       FALSE, server_thandle )) == INVALID_HANDLE_VALUE32)
+                                       FALSE, server_thandle )) == INVALID_HANDLE_VALUE)
         goto error;
     if ((info->hProcess = HANDLE_Alloc( parent, &pdb->header, PROCESS_ALL_ACCESS,
-                                        FALSE, server_phandle )) == INVALID_HANDLE_VALUE32)
+                                        FALSE, server_phandle )) == INVALID_HANDLE_VALUE)
         goto error;
     info->dwProcessId = PDB_TO_PROCESS_ID(pdb);
     info->dwThreadId  = THDB_TO_THREAD_ID(thdb);
@@ -492,8 +492,8 @@ PDB32 *PROCESS_Create( NE_MODULE *pModule, LPCSTR cmd_line, LPCSTR env,
     return pdb;
 
 error:
-    if (info->hThread != INVALID_HANDLE_VALUE32) CloseHandle( info->hThread );
-    if (info->hProcess != INVALID_HANDLE_VALUE32) CloseHandle( info->hProcess );
+    if (info->hThread != INVALID_HANDLE_VALUE) CloseHandle( info->hThread );
+    if (info->hProcess != INVALID_HANDLE_VALUE) CloseHandle( info->hProcess );
     if (thdb) K32OBJ_DecCount( &thdb->header );
     PROCESS_FreePDB( pdb );
     return NULL;
@@ -505,7 +505,7 @@ error:
  */
 static void PROCESS_Destroy( K32OBJ *ptr )
 {
-    PDB32 *pdb = (PDB32 *)ptr;
+    PDB *pdb = (PDB *)ptr;
     assert( ptr->type == K32OBJ_PROCESS );
 
     /* Free everything */
@@ -520,7 +520,7 @@ static void PROCESS_Destroy( K32OBJ *ptr )
  */
 void WINAPI ExitProcess( DWORD status )
 {
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
     TDB *pTask = (TDB *)GlobalLock16( pdb->task );
     if ( pTask ) pTask->nEvents++;
 
@@ -541,7 +541,7 @@ void WINAPI ExitProcess( DWORD status )
 /******************************************************************************
  *           TerminateProcess   (KERNEL32.684)
  */
-BOOL32 WINAPI TerminateProcess( HANDLE32 handle, DWORD exit_code )
+BOOL WINAPI TerminateProcess( HANDLE handle, DWORD exit_code )
 {
     struct terminate_process_request req;
 
@@ -555,7 +555,7 @@ BOOL32 WINAPI TerminateProcess( HANDLE32 handle, DWORD exit_code )
 /***********************************************************************
  *           GetCurrentProcess   (KERNEL32.198)
  */
-HANDLE32 WINAPI GetCurrentProcess(void)
+HANDLE WINAPI GetCurrentProcess(void)
 {
     return CURRENT_PROCESS_PSEUDOHANDLE;
 }
@@ -564,10 +564,10 @@ HANDLE32 WINAPI GetCurrentProcess(void)
 /*********************************************************************
  *           OpenProcess   (KERNEL32.543)
  */
-HANDLE32 WINAPI OpenProcess( DWORD access, BOOL32 inherit, DWORD id )
+HANDLE WINAPI OpenProcess( DWORD access, BOOL inherit, DWORD id )
 {
     int server_handle;
-    PDB32 *pdb = PROCESS_ID_TO_PDB(id);
+    PDB *pdb = PROCESS_ID_TO_PDB(id);
     if (!K32OBJ_IsValid( &pdb->header, K32OBJ_PROCESS ))
     {
         SetLastError( ERROR_INVALID_HANDLE );
@@ -588,7 +588,7 @@ HANDLE32 WINAPI OpenProcess( DWORD access, BOOL32 inherit, DWORD id )
  */
 DWORD WINAPI GetCurrentProcessId(void)
 {
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
     return PDB_TO_PROCESS_ID( pdb );
 }
 
@@ -596,9 +596,9 @@ DWORD WINAPI GetCurrentProcessId(void)
 /***********************************************************************
  *           GetProcessHeap    (KERNEL32.259)
  */
-HANDLE32 WINAPI GetProcessHeap(void)
+HANDLE WINAPI GetProcessHeap(void)
 {
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
     return pdb->heap ? pdb->heap : SystemHeap;
 }
 
@@ -615,7 +615,7 @@ LCID WINAPI GetThreadLocale(void)
 /***********************************************************************
  *           SetPriorityClass   (KERNEL32.503)
  */
-BOOL32 WINAPI SetPriorityClass( HANDLE32 hprocess, DWORD priorityclass )
+BOOL WINAPI SetPriorityClass( HANDLE hprocess, DWORD priorityclass )
 {
     struct set_process_info_request req;
     req.handle = HANDLE_GetServerHandle( PROCESS_Current(), hprocess,
@@ -631,7 +631,7 @@ BOOL32 WINAPI SetPriorityClass( HANDLE32 hprocess, DWORD priorityclass )
 /***********************************************************************
  *           GetPriorityClass   (KERNEL32.250)
  */
-DWORD WINAPI GetPriorityClass(HANDLE32 hprocess)
+DWORD WINAPI GetPriorityClass(HANDLE hprocess)
 {
     struct get_process_info_reply reply;
     if (!PROCESS_QueryInfo( hprocess, &reply )) return 0;
@@ -642,7 +642,7 @@ DWORD WINAPI GetPriorityClass(HANDLE32 hprocess)
 /***********************************************************************
  *          SetProcessAffinityMask   (KERNEL32.662)
  */
-BOOL32 WINAPI SetProcessAffinityMask( HANDLE32 hProcess, DWORD affmask )
+BOOL WINAPI SetProcessAffinityMask( HANDLE hProcess, DWORD affmask )
 {
     struct set_process_info_request req;
     req.handle = HANDLE_GetServerHandle( PROCESS_Current(), hProcess,
@@ -657,7 +657,7 @@ BOOL32 WINAPI SetProcessAffinityMask( HANDLE32 hProcess, DWORD affmask )
 /**********************************************************************
  *          GetProcessAffinityMask    (KERNEL32.373)
  */
-BOOL32 WINAPI GetProcessAffinityMask( HANDLE32 hProcess,
+BOOL WINAPI GetProcessAffinityMask( HANDLE hProcess,
                                       LPDWORD lpProcessAffinityMask,
                                       LPDWORD lpSystemAffinityMask )
 {
@@ -672,9 +672,9 @@ BOOL32 WINAPI GetProcessAffinityMask( HANDLE32 hProcess,
 /***********************************************************************
  *           GetStdHandle    (KERNEL32.276)
  */
-HANDLE32 WINAPI GetStdHandle( DWORD std_handle )
+HANDLE WINAPI GetStdHandle( DWORD std_handle )
 {
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
 
     switch(std_handle)
     {
@@ -683,16 +683,16 @@ HANDLE32 WINAPI GetStdHandle( DWORD std_handle )
     case STD_ERROR_HANDLE:  return pdb->env_db->hStderr;
     }
     SetLastError( ERROR_INVALID_PARAMETER );
-    return INVALID_HANDLE_VALUE32;
+    return INVALID_HANDLE_VALUE;
 }
 
 
 /***********************************************************************
  *           SetStdHandle    (KERNEL32.506)
  */
-BOOL32 WINAPI SetStdHandle( DWORD std_handle, HANDLE32 handle )
+BOOL WINAPI SetStdHandle( DWORD std_handle, HANDLE handle )
 {
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
     /* FIXME: should we close the previous handle? */
     switch(std_handle)
     {
@@ -716,7 +716,7 @@ BOOL32 WINAPI SetStdHandle( DWORD std_handle, HANDLE32 handle )
 DWORD WINAPI GetProcessVersion( DWORD processid )
 {
     TDB *pTask;
-    PDB32 *pdb = PROCESS_IdToPDB( processid );
+    PDB *pdb = PROCESS_IdToPDB( processid );
 
     if (!pdb) return 0;
     if (!(pTask = (TDB *)GlobalLock16( pdb->task ))) return 0;
@@ -728,7 +728,7 @@ DWORD WINAPI GetProcessVersion( DWORD processid )
  */
 DWORD WINAPI GetProcessFlags( DWORD processid )
 {
-    PDB32 *pdb = PROCESS_IdToPDB( processid );
+    PDB *pdb = PROCESS_IdToPDB( processid );
     if (!pdb) return 0;
     return pdb->flags;
 }
@@ -744,7 +744,7 @@ DWORD WINAPI GetProcessFlags( DWORD processid )
  *
  * RETURNS  STD
  */
-BOOL32 WINAPI SetProcessWorkingSetSize(HANDLE32 hProcess,DWORD minset,
+BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess,DWORD minset,
                                        DWORD maxset)
 {
     FIXME(process,"(0x%08x,%ld,%ld): stub - harmless\n",hProcess,minset,maxset);
@@ -758,7 +758,7 @@ BOOL32 WINAPI SetProcessWorkingSetSize(HANDLE32 hProcess,DWORD minset,
 /***********************************************************************
  *           GetProcessWorkingSetSize    (KERNEL32)
  */
-BOOL32 WINAPI GetProcessWorkingSetSize(HANDLE32 hProcess,LPDWORD minset,
+BOOL WINAPI GetProcessWorkingSetSize(HANDLE hProcess,LPDWORD minset,
                                        LPDWORD maxset)
 {
 	FIXME(process,"(0x%08x,%p,%p): stub\n",hProcess,minset,maxset);
@@ -779,7 +779,7 @@ BOOL32 WINAPI GetProcessWorkingSetSize(HANDLE32 hProcess,LPDWORD minset,
 #define SHUTDOWN_NORETRY 1
 static unsigned int shutdown_noretry = 0;
 static unsigned int shutdown_priority = 0x280L;
-BOOL32 WINAPI SetProcessShutdownParameters(DWORD level,DWORD flags)
+BOOL WINAPI SetProcessShutdownParameters(DWORD level,DWORD flags)
 {
     if (flags & SHUTDOWN_NORETRY)
       shutdown_noretry = 1;
@@ -800,7 +800,7 @@ BOOL32 WINAPI SetProcessShutdownParameters(DWORD level,DWORD flags)
  * GetProcessShutdownParameters                 (KERNEL32)
  *
  */
-BOOL32 WINAPI GetProcessShutdownParameters( LPDWORD lpdwLevel,
+BOOL WINAPI GetProcessShutdownParameters( LPDWORD lpdwLevel,
 					    LPDWORD lpdwFlags )
 {
   (*lpdwLevel) = shutdown_priority;
@@ -810,7 +810,7 @@ BOOL32 WINAPI GetProcessShutdownParameters( LPDWORD lpdwLevel,
 /***********************************************************************
  *           SetProcessPriorityBoost    (KERNEL32)
  */
-BOOL32 WINAPI SetProcessPriorityBoost(HANDLE32 hprocess,BOOL32 disableboost)
+BOOL WINAPI SetProcessPriorityBoost(HANDLE hprocess,BOOL disableboost)
 {
     FIXME(process,"(%d,%d): stub\n",hprocess,disableboost);
     /* Say we can do it. I doubt the program will notice that we don't. */
@@ -822,7 +822,7 @@ BOOL32 WINAPI SetProcessPriorityBoost(HANDLE32 hprocess,BOOL32 disableboost)
  * FIXME: check this, if we ever run win32 binaries in different addressspaces
  *	  ... and add a sizecheck
  */
-BOOL32 WINAPI ReadProcessMemory( HANDLE32 hProcess, LPCVOID lpBaseAddress,
+BOOL WINAPI ReadProcessMemory( HANDLE hProcess, LPCVOID lpBaseAddress,
                                  LPVOID lpBuffer, DWORD nSize,
                                  LPDWORD lpNumberOfBytesRead )
 {
@@ -836,7 +836,7 @@ BOOL32 WINAPI ReadProcessMemory( HANDLE32 hProcess, LPCVOID lpBaseAddress,
  * FIXME: check this, if we ever run win32 binaries in different addressspaces
  *	  ... and add a sizecheck
  */
-BOOL32 WINAPI WriteProcessMemory(HANDLE32 hProcess, LPVOID lpBaseAddress,
+BOOL WINAPI WriteProcessMemory(HANDLE hProcess, LPVOID lpBaseAddress,
                                  LPVOID lpBuffer, DWORD nSize,
                                  LPDWORD lpNumberOfBytesWritten )
 {
@@ -866,8 +866,8 @@ DWORD WINAPI RegisterServiceProcess(DWORD dwProcessId, DWORD dwType)
  *   Success: TRUE
  *   Failure: FALSE
  */
-BOOL32 WINAPI GetExitCodeProcess(
-    HANDLE32 hProcess,  /* [I] handle to the process */
+BOOL WINAPI GetExitCodeProcess(
+    HANDLE hProcess,  /* [I] handle to the process */
     LPDWORD lpExitCode) /* [O] address to receive termination status */
 {
     struct get_process_info_reply reply;
@@ -880,7 +880,7 @@ BOOL32 WINAPI GetExitCodeProcess(
 /***********************************************************************
  * GetProcessHeaps [KERNEL32.376]
  */
-DWORD WINAPI GetProcessHeaps(DWORD nrofheaps,HANDLE32 *heaps) {
+DWORD WINAPI GetProcessHeaps(DWORD nrofheaps,HANDLE *heaps) {
 	FIXME(win32,"(%ld,%p), incomplete implementation.\n",nrofheaps,heaps);
 
 	if (nrofheaps) {
@@ -899,7 +899,7 @@ DWORD WINAPI GetProcessHeaps(DWORD nrofheaps,HANDLE32 *heaps) {
 void PROCESS_SuspendOtherThreads(void)
 {
 #if 0
-    PDB32 *pdb;
+    PDB *pdb;
     THREAD_ENTRY *entry;
 
     SYSTEM_LOCK();
@@ -910,7 +910,7 @@ void PROCESS_SuspendOtherThreads(void)
     {
          if (entry->thread != THREAD_Current() && !THREAD_IsWin16(entry->thread))
          {
-             HANDLE32 handle = HANDLE_Alloc( PROCESS_Current(), 
+             HANDLE handle = HANDLE_Alloc( PROCESS_Current(), 
                                              &entry->thread->header,
                                              THREAD_ALL_ACCESS, FALSE, -1 );
              SuspendThread(handle);
@@ -931,7 +931,7 @@ void PROCESS_SuspendOtherThreads(void)
 void PROCESS_ResumeOtherThreads(void)
 {
 #if 0
-    PDB32 *pdb;
+    PDB *pdb;
     THREAD_ENTRY *entry;
 
     SYSTEM_LOCK();
@@ -942,7 +942,7 @@ void PROCESS_ResumeOtherThreads(void)
     {
          if (entry->thread != THREAD_Current() && !THREAD_IsWin16(entry->thread))
          {
-             HANDLE32 handle = HANDLE_Alloc( PROCESS_Current(), 
+             HANDLE handle = HANDLE_Alloc( PROCESS_Current(), 
                                              &entry->thread->header,
                                              THREAD_ALL_ACCESS, FALSE, -1 );
              ResumeThread(handle);
diff --git a/scheduler/semaphore.c b/scheduler/semaphore.c
index 7a0ce620bcc..d329ec9aa57 100644
--- a/scheduler/semaphore.c
+++ b/scheduler/semaphore.c
@@ -22,13 +22,13 @@ typedef struct
 /***********************************************************************
  *           CreateSemaphore32A   (KERNEL32.174)
  */
-HANDLE32 WINAPI CreateSemaphore32A( SECURITY_ATTRIBUTES *sa, LONG initial,
+HANDLE WINAPI CreateSemaphoreA( SECURITY_ATTRIBUTES *sa, LONG initial,
                                     LONG max, LPCSTR name )
 {
     struct create_semaphore_request req;
     struct create_semaphore_reply reply;
     int len = name ? strlen(name) + 1 : 0;
-    HANDLE32 handle;
+    HANDLE handle;
     SEMAPHORE *sem;
 
     /* Check parameters */
@@ -53,7 +53,7 @@ HANDLE32 WINAPI CreateSemaphore32A( SECURITY_ATTRIBUTES *sa, LONG initial,
                                       sa, &handle);
     if (sem) K32OBJ_DecCount( &sem->header );
     SYSTEM_UNLOCK();
-    if (handle == INVALID_HANDLE_VALUE32) handle = 0;
+    if (handle == INVALID_HANDLE_VALUE) handle = 0;
     return handle;
 }
 
@@ -61,11 +61,11 @@ HANDLE32 WINAPI CreateSemaphore32A( SECURITY_ATTRIBUTES *sa, LONG initial,
 /***********************************************************************
  *           CreateSemaphore32W   (KERNEL32.175)
  */
-HANDLE32 WINAPI CreateSemaphore32W( SECURITY_ATTRIBUTES *sa, LONG initial,
+HANDLE WINAPI CreateSemaphoreW( SECURITY_ATTRIBUTES *sa, LONG initial,
                                     LONG max, LPCWSTR name )
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    HANDLE32 ret = CreateSemaphore32A( sa, initial, max, nameA );
+    HANDLE ret = CreateSemaphoreA( sa, initial, max, nameA );
     if (nameA) HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
 }
@@ -74,9 +74,9 @@ HANDLE32 WINAPI CreateSemaphore32W( SECURITY_ATTRIBUTES *sa, LONG initial,
 /***********************************************************************
  *           OpenSemaphore32A   (KERNEL32.545)
  */
-HANDLE32 WINAPI OpenSemaphore32A( DWORD access, BOOL32 inherit, LPCSTR name )
+HANDLE WINAPI OpenSemaphoreA( DWORD access, BOOL inherit, LPCSTR name )
 {
-    HANDLE32 handle = 0;
+    HANDLE handle = 0;
     K32OBJ *obj;
     struct open_named_obj_request req;
     struct open_named_obj_reply reply;
@@ -94,7 +94,7 @@ HANDLE32 WINAPI OpenSemaphore32A( DWORD access, BOOL32 inherit, LPCSTR name )
         {
             handle = HANDLE_Alloc( PROCESS_Current(), obj, access, inherit, reply.handle );
             K32OBJ_DecCount( obj );
-            if (handle == INVALID_HANDLE_VALUE32)
+            if (handle == INVALID_HANDLE_VALUE)
                 handle = 0; /* must return 0 on failure, not -1 */
         }
         else CLIENT_CloseHandle( reply.handle );
@@ -107,10 +107,10 @@ HANDLE32 WINAPI OpenSemaphore32A( DWORD access, BOOL32 inherit, LPCSTR name )
 /***********************************************************************
  *           OpenSemaphore32W   (KERNEL32.546)
  */
-HANDLE32 WINAPI OpenSemaphore32W( DWORD access, BOOL32 inherit, LPCWSTR name )
+HANDLE WINAPI OpenSemaphoreW( DWORD access, BOOL inherit, LPCWSTR name )
 {
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
-    HANDLE32 ret = OpenSemaphore32A( access, inherit, nameA );
+    HANDLE ret = OpenSemaphoreA( access, inherit, nameA );
     if (nameA) HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
 }
@@ -119,7 +119,7 @@ HANDLE32 WINAPI OpenSemaphore32W( DWORD access, BOOL32 inherit, LPCWSTR name )
 /***********************************************************************
  *           ReleaseSemaphore   (KERNEL32.583)
  */
-BOOL32 WINAPI ReleaseSemaphore( HANDLE32 handle, LONG count, LONG *previous )
+BOOL WINAPI ReleaseSemaphore( HANDLE handle, LONG count, LONG *previous )
 {
     struct release_semaphore_request req;
     struct release_semaphore_reply reply;
diff --git a/scheduler/synchro.c b/scheduler/synchro.c
index 3cce74d54b6..9a23e53ebbe 100644
--- a/scheduler/synchro.c
+++ b/scheduler/synchro.c
@@ -29,7 +29,7 @@ VOID WINAPI Sleep( DWORD timeout )
 /******************************************************************************
  *              SleepEx   (KERNEL32.680)
  */
-DWORD WINAPI SleepEx( DWORD timeout, BOOL32 alertable )
+DWORD WINAPI SleepEx( DWORD timeout, BOOL alertable )
 {
     DWORD ret = WaitForMultipleObjectsEx( 0, NULL, FALSE, timeout, alertable );
     if (ret != WAIT_IO_COMPLETION) ret = 0;
@@ -40,7 +40,7 @@ DWORD WINAPI SleepEx( DWORD timeout, BOOL32 alertable )
 /***********************************************************************
  *           WaitForSingleObject   (KERNEL32.723)
  */
-DWORD WINAPI WaitForSingleObject( HANDLE32 handle, DWORD timeout )
+DWORD WINAPI WaitForSingleObject( HANDLE handle, DWORD timeout )
 {
     return WaitForMultipleObjectsEx( 1, &handle, FALSE, timeout, FALSE );
 }
@@ -49,8 +49,8 @@ DWORD WINAPI WaitForSingleObject( HANDLE32 handle, DWORD timeout )
 /***********************************************************************
  *           WaitForSingleObjectEx   (KERNEL32.724)
  */
-DWORD WINAPI WaitForSingleObjectEx( HANDLE32 handle, DWORD timeout,
-                                    BOOL32 alertable )
+DWORD WINAPI WaitForSingleObjectEx( HANDLE handle, DWORD timeout,
+                                    BOOL alertable )
 {
     return WaitForMultipleObjectsEx( 1, &handle, FALSE, timeout, alertable );
 }
@@ -59,8 +59,8 @@ DWORD WINAPI WaitForSingleObjectEx( HANDLE32 handle, DWORD timeout,
 /***********************************************************************
  *           WaitForMultipleObjects   (KERNEL32.721)
  */
-DWORD WINAPI WaitForMultipleObjects( DWORD count, const HANDLE32 *handles,
-                                     BOOL32 wait_all, DWORD timeout )
+DWORD WINAPI WaitForMultipleObjects( DWORD count, const HANDLE *handles,
+                                     BOOL wait_all, DWORD timeout )
 {
     return WaitForMultipleObjectsEx( count, handles, wait_all, timeout, FALSE );
 }
@@ -69,9 +69,9 @@ DWORD WINAPI WaitForMultipleObjects( DWORD count, const HANDLE32 *handles,
 /***********************************************************************
  *           WaitForMultipleObjectsEx   (KERNEL32.722)
  */
-DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE32 *handles,
-                                       BOOL32 wait_all, DWORD timeout,
-                                       BOOL32 alertable )
+DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles,
+                                       BOOL wait_all, DWORD timeout,
+                                       BOOL alertable )
 {
     struct select_request req;
     struct select_reply reply;
@@ -103,7 +103,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE32 *handles,
 
     if (wait_all) req.flags |= SELECT_ALL;
     if (alertable) req.flags |= SELECT_ALERTABLE;
-    if (timeout != INFINITE32) req.flags |= SELECT_TIMEOUT;
+    if (timeout != INFINITE) req.flags |= SELECT_TIMEOUT;
 
     CLIENT_SendRequest( REQ_SELECT, -1, 2,
                         &req, sizeof(req),
@@ -127,7 +127,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE32 *handles,
 /***********************************************************************
  *           WIN16_WaitForSingleObject   (KERNEL.460)
  */
-DWORD WINAPI WIN16_WaitForSingleObject( HANDLE32 handle, DWORD timeout )
+DWORD WINAPI WIN16_WaitForSingleObject( HANDLE handle, DWORD timeout )
 {
     DWORD retval;
 
@@ -141,8 +141,8 @@ DWORD WINAPI WIN16_WaitForSingleObject( HANDLE32 handle, DWORD timeout )
 /***********************************************************************
  *           WIN16_WaitForMultipleObjects   (KERNEL.461)
  */
-DWORD WINAPI WIN16_WaitForMultipleObjects( DWORD count, const HANDLE32 *handles,
-                                           BOOL32 wait_all, DWORD timeout )
+DWORD WINAPI WIN16_WaitForMultipleObjects( DWORD count, const HANDLE *handles,
+                                           BOOL wait_all, DWORD timeout )
 {
     DWORD retval;
 
@@ -157,9 +157,9 @@ DWORD WINAPI WIN16_WaitForMultipleObjects( DWORD count, const HANDLE32 *handles,
  *           WIN16_WaitForMultipleObjectsEx   (KERNEL.495)
  */
 DWORD WINAPI WIN16_WaitForMultipleObjectsEx( DWORD count, 
-                                             const HANDLE32 *handles,
-                                             BOOL32 wait_all, DWORD timeout,
-                                             BOOL32 alertable )
+                                             const HANDLE *handles,
+                                             BOOL wait_all, DWORD timeout,
+                                             BOOL alertable )
 {
     DWORD retval;
 
diff --git a/scheduler/syslevel.c b/scheduler/syslevel.c
index 8babea4b924..297c6dfb928 100644
--- a/scheduler/syslevel.c
+++ b/scheduler/syslevel.c
@@ -37,7 +37,7 @@ void SYSLEVEL_Init(void)
 /************************************************************************
  *           GetpWin16Lock32    (KERNEL32.93)
  */
-VOID WINAPI GetpWin16Lock32(CRITICAL_SECTION **lock)
+VOID WINAPI GetpWin16Lock(CRITICAL_SECTION **lock)
 {
     *lock = &Win16Mutex;
 }
diff --git a/scheduler/thread.c b/scheduler/thread.c
index 5802f05c043..67963333b7f 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -36,7 +36,7 @@ const K32OBJ_OPS THREAD_Ops =
 };
 
 /* Is threading code initialized? */
-BOOL32 THREAD_InitDone = FALSE;
+BOOL THREAD_InitDone = FALSE;
 
 /* THDB of the initial thread */
 static THDB initial_thdb;
@@ -56,7 +56,7 @@ THDB *THREAD_Current(void)
 /***********************************************************************
  *           THREAD_IsWin16
  */
-BOOL32 THREAD_IsWin16( THDB *thdb )
+BOOL THREAD_IsWin16( THDB *thdb )
 {
     if (!thdb || !thdb->process)
         return TRUE;
@@ -81,7 +81,7 @@ THDB *THREAD_IdToTHDB( DWORD id )
     if (!K32OBJ_IsValid( &thdb->header, K32OBJ_THREAD ))
     {
         /* Allow task handles to be used; convert to main thread */
-        if ( IsTask( id ) )
+        if ( IsTask16( id ) )
         {
             TDB *pTask = (TDB *)GlobalLock16( id );
             if (pTask) return pTask->thdb;
@@ -99,7 +99,7 @@ THDB *THREAD_IdToTHDB( DWORD id )
  *
  * Initialization of a newly created THDB.
  */
-static BOOL32 THREAD_InitTHDB( THDB *thdb, DWORD stack_size, BOOL32 alloc_stack16,
+static BOOL THREAD_InitTHDB( THDB *thdb, DWORD stack_size, BOOL alloc_stack16,
                                int *server_thandle, int *server_phandle )
 {
     DWORD old_prot;
@@ -147,7 +147,7 @@ static BOOL32 THREAD_InitTHDB( THDB *thdb, DWORD stack_size, BOOL32 alloc_stack1
 
     /* Create the thread event */
 
-    if (!(thdb->event = CreateEvent32A( NULL, FALSE, FALSE, NULL ))) goto error;
+    if (!(thdb->event = CreateEventA( NULL, FALSE, FALSE, NULL ))) goto error;
     thdb->event = ConvertToGlobalHandle( thdb->event );
     return TRUE;
 
@@ -165,7 +165,7 @@ error:
  *
  * Create the initial thread.
  */
-THDB *THREAD_CreateInitialThread( PDB32 *pdb )
+THDB *THREAD_CreateInitialThread( PDB *pdb )
 {
     int fd[2];
     char buffer[16];
@@ -234,7 +234,7 @@ THDB *THREAD_CreateInitialThread( PDB32 *pdb )
 /***********************************************************************
  *           THREAD_Create
  */
-THDB *THREAD_Create( PDB32 *pdb, DWORD stack_size, BOOL32 alloc_stack16,
+THDB *THREAD_Create( PDB *pdb, DWORD stack_size, BOOL alloc_stack16,
                      int *server_thandle, int *server_phandle,
                      LPTHREAD_START_ROUTINE start_addr, LPVOID param )
 {
@@ -325,28 +325,28 @@ void THREAD_Start( THDB *thdb )
 /***********************************************************************
  *           CreateThread   (KERNEL32.63)
  */
-HANDLE32 WINAPI CreateThread( SECURITY_ATTRIBUTES *sa, DWORD stack,
+HANDLE WINAPI CreateThread( SECURITY_ATTRIBUTES *sa, DWORD stack,
                               LPTHREAD_START_ROUTINE start, LPVOID param,
                               DWORD flags, LPDWORD id )
 {
     int server_handle = -1;
-    HANDLE32 handle = INVALID_HANDLE_VALUE32;
-    BOOL32 inherit = (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle);
+    HANDLE handle = INVALID_HANDLE_VALUE;
+    BOOL inherit = (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle);
 
     THDB *thread = THREAD_Create( PROCESS_Current(), stack,
                                   TRUE, &server_handle, NULL, start, param );
-    if (!thread) return INVALID_HANDLE_VALUE32;
+    if (!thread) return INVALID_HANDLE_VALUE;
     handle = HANDLE_Alloc( PROCESS_Current(), &thread->header,
                            THREAD_ALL_ACCESS, inherit, server_handle );
-    if (handle == INVALID_HANDLE_VALUE32) goto error;
+    if (handle == INVALID_HANDLE_VALUE) goto error;
     if (SYSDEPS_SpawnThread( thread ) == -1) goto error;
     if (id) *id = THDB_TO_THREAD_ID( thread );
     return handle;
 
 error:
-    if (handle != INVALID_HANDLE_VALUE32) CloseHandle( handle );
+    if (handle != INVALID_HANDLE_VALUE) CloseHandle( handle );
     K32OBJ_DecCount( &thread->header );
-    return INVALID_HANDLE_VALUE32;
+    return INVALID_HANDLE_VALUE;
 }
 
 
@@ -390,7 +390,7 @@ void WINAPI ExitThread(
  * RETURNS
  *    Pseudohandle for the current thread
  */
-HANDLE32 WINAPI GetCurrentThread(void)
+HANDLE WINAPI GetCurrentThread(void)
 {
     return CURRENT_THREAD_PSEUDOHANDLE;
 }
@@ -518,7 +518,7 @@ DWORD WINAPI TlsAlloc(void)
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI TlsFree(
+BOOL WINAPI TlsFree(
     DWORD index) /* [in] TLS Index to free */
 {
     DWORD mask;
@@ -574,7 +574,7 @@ LPVOID WINAPI TlsGetValue(
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI TlsSetValue(
+BOOL WINAPI TlsSetValue(
     DWORD index,  /* [in] TLS index to set value for */
     LPVOID value) /* [in] Value to be stored */
 {
@@ -596,8 +596,8 @@ BOOL32 WINAPI TlsSetValue(
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetThreadContext(
-    HANDLE32 handle,  /* [in]  Handle to thread with context */
+BOOL WINAPI SetThreadContext(
+    HANDLE handle,  /* [in]  Handle to thread with context */
     CONTEXT *context) /* [out] Address of context structure */
 {
     FIXME( thread, "not implemented\n" );
@@ -611,8 +611,8 @@ BOOL32 WINAPI SetThreadContext(
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI GetThreadContext(
-    HANDLE32 handle,  /* [in]  Handle to thread with context */
+BOOL WINAPI GetThreadContext(
+    HANDLE handle,  /* [in]  Handle to thread with context */
     CONTEXT *context) /* [out] Address of context structure */
 {
     WORD cs, ds;
@@ -639,8 +639,8 @@ BOOL32 WINAPI GetThreadContext(
  *    Success: Thread's priority level.
  *    Failure: THREAD_PRIORITY_ERROR_RETURN
  */
-INT32 WINAPI GetThreadPriority(
-    HANDLE32 hthread) /* [in] Handle to thread */
+INT WINAPI GetThreadPriority(
+    HANDLE hthread) /* [in] Handle to thread */
 {
     struct get_thread_info_request req;
     struct get_thread_info_reply reply;
@@ -660,9 +660,9 @@ INT32 WINAPI GetThreadPriority(
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetThreadPriority(
-    HANDLE32 hthread, /* [in] Handle to thread */
-    INT32 priority)   /* [in] Thread priority level */
+BOOL WINAPI SetThreadPriority(
+    HANDLE hthread, /* [in] Handle to thread */
+    INT priority)   /* [in] Thread priority level */
 {
     struct set_thread_info_request req;
     req.handle = HANDLE_GetServerHandle( PROCESS_Current(), hthread,
@@ -678,7 +678,7 @@ BOOL32 WINAPI SetThreadPriority(
 /**********************************************************************
  *           SetThreadAffinityMask   (KERNEL32.669)
  */
-DWORD WINAPI SetThreadAffinityMask( HANDLE32 hThread, DWORD dwThreadAffinityMask )
+DWORD WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD dwThreadAffinityMask )
 {
     struct set_thread_info_request req;
     req.handle = HANDLE_GetServerHandle( PROCESS_Current(), hThread,
@@ -699,8 +699,8 @@ DWORD WINAPI SetThreadAffinityMask( HANDLE32 hThread, DWORD dwThreadAffinityMask
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI TerminateThread(
-    HANDLE32 handle, /* [in] Handle to thread */
+BOOL WINAPI TerminateThread(
+    HANDLE handle, /* [in] Handle to thread */
     DWORD exitcode)  /* [in] Exit code for thread */
 {
     struct terminate_thread_request req;
@@ -720,8 +720,8 @@ BOOL32 WINAPI TerminateThread(
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI GetExitCodeThread(
-    HANDLE32 hthread, /* [in]  Handle to thread */
+BOOL WINAPI GetExitCodeThread(
+    HANDLE hthread, /* [in]  Handle to thread */
     LPDWORD exitcode) /* [out] Address to receive termination status */
 {
     struct get_thread_info_request req;
@@ -747,7 +747,7 @@ BOOL32 WINAPI GetExitCodeThread(
  *    Already running: 0
  */
 DWORD WINAPI ResumeThread(
-    HANDLE32 hthread) /* [in] Identifies thread to restart */
+    HANDLE hthread) /* [in] Identifies thread to restart */
 {
     struct resume_thread_request req;
     struct resume_thread_reply reply;
@@ -767,7 +767,7 @@ DWORD WINAPI ResumeThread(
  *    Failure: 0xFFFFFFFF
  */
 DWORD WINAPI SuspendThread(
-    HANDLE32 hthread) /* [in] Handle to the thread */
+    HANDLE hthread) /* [in] Handle to the thread */
 {
     struct suspend_thread_request req;
     struct suspend_thread_reply reply;
@@ -782,7 +782,7 @@ DWORD WINAPI SuspendThread(
 /***********************************************************************
  *              QueueUserAPC  (KERNEL32.566)
  */
-DWORD WINAPI QueueUserAPC( PAPCFUNC func, HANDLE32 hthread, ULONG_PTR data )
+DWORD WINAPI QueueUserAPC( PAPCFUNC func, HANDLE hthread, ULONG_PTR data )
 {
     struct queue_apc_request req;
     req.handle = HANDLE_GetServerHandle( PROCESS_Current(), hthread,
@@ -804,8 +804,8 @@ DWORD WINAPI QueueUserAPC( PAPCFUNC func, HANDLE32 hthread, ULONG_PTR data )
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI GetThreadTimes( 
-    HANDLE32 thread,         /* [in]  Specifies the thread of interest */
+BOOL WINAPI GetThreadTimes( 
+    HANDLE thread,         /* [in]  Specifies the thread of interest */
     LPFILETIME creationtime, /* [out] When the thread was created */
     LPFILETIME exittime,     /* [out] When the thread was destroyed */
     LPFILETIME kerneltime,   /* [out] Time thread spent in kernel mode */
@@ -830,10 +830,10 @@ BOOL32 WINAPI GetThreadTimes(
  * TODO:
  *    1. Reset the Key State (currenly per thread key state is not maintained)
  */
-BOOL32 WINAPI AttachThreadInput( 
+BOOL WINAPI AttachThreadInput( 
     DWORD idAttach,   /* [in] Thread to attach */
     DWORD idAttachTo, /* [in] Thread to attach to */
-    BOOL32 fAttach)   /* [in] Attach or detach */
+    BOOL fAttach)   /* [in] Attach or detach */
 {
     MESSAGEQUEUE *pSrcMsgQ = 0, *pTgtMsgQ = 0;
     BOOL16 bRet = 0;
@@ -851,8 +851,8 @@ BOOL32 WINAPI AttachThreadInput(
         goto CLEANUP;
         
     /* Retrieve message queues corresponding to the thread id's */
-    pTgtMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetThreadQueue( idAttach ) );
-    pSrcMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetThreadQueue( idAttachTo ) );
+    pTgtMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetThreadQueue16( idAttach ) );
+    pSrcMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetThreadQueue16( idAttachTo ) );
 
     /* Ensure we have message queues and that Src and Tgt threads
      * are not system threads.
@@ -904,7 +904,7 @@ CLEANUP:
 /**********************************************************************
  * VWin32_BoostThreadGroup [KERNEL.535]
  */
-VOID WINAPI VWin32_BoostThreadGroup( DWORD threadId, INT32 boost )
+VOID WINAPI VWin32_BoostThreadGroup( DWORD threadId, INT boost )
 {
     FIXME(thread, "(0x%08lx,%d): stub\n", threadId, boost);
 }
@@ -912,7 +912,7 @@ VOID WINAPI VWin32_BoostThreadGroup( DWORD threadId, INT32 boost )
 /**********************************************************************
  * VWin32_BoostThreadStatic [KERNEL.536]
  */
-VOID WINAPI VWin32_BoostThreadStatic( DWORD threadId, INT32 boost )
+VOID WINAPI VWin32_BoostThreadStatic( DWORD threadId, INT boost )
 {
     FIXME(thread, "(0x%08lx,%d): stub\n", threadId, boost);
 }
@@ -927,7 +927,7 @@ VOID WINAPI VWin32_BoostThreadStatic( DWORD threadId, INT32 boost )
  * NOTES
  *  Implemented in NT only (3.1 and above according to MS
  */
-BOOL32 WINAPI SetThreadLocale(
+BOOL WINAPI SetThreadLocale(
     LCID lcid)     /* [in] Locale identifier */
 {
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/tools/build.c b/tools/build.c
index 94903c01234..31e10896a79 100644
--- a/tools/build.c
+++ b/tools/build.c
@@ -2205,7 +2205,7 @@ static void BuildRet16Func( FILE *outfile )
  * (ebp+4)   ret addr
  * (ebp)     ebp
  */
-static void BuildCallTo32CBClient( FILE *outfile, BOOL32 isEx )
+static void BuildCallTo32CBClient( FILE *outfile, BOOL isEx )
 {
     char *name = isEx? "CBClientEx" : "CBClient";
     int size = isEx? 24 : 16;
diff --git a/tsx11/ts_xf86vmode.c b/tsx11/ts_xf86vmode.c
index 5091df58978..7106301cc5d 100644
--- a/tsx11/ts_xf86vmode.c
+++ b/tsx11/ts_xf86vmode.c
@@ -11,7 +11,7 @@
 #include "wintypes.h"
 #ifdef HAVE_LIBXXF86VM
 #define XMD_H
-
+typedef int INT32;
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86vmode.h>
 #include "debug.h"
diff --git a/win32/code_page.c b/win32/code_page.c
index 89a2b15c41b..041340b341f 100644
--- a/win32/code_page.c
+++ b/win32/code_page.c
@@ -17,7 +17,7 @@
  * RETURNS
  *    Current ANSI code-page identifier, default if no current defined
  */
-UINT32 WINAPI GetACP(void)
+UINT WINAPI GetACP(void)
 {
     /* This introduces too many messages */
 /*    FIXME(win32, "(void): stub\n"); */
@@ -28,7 +28,7 @@ UINT32 WINAPI GetACP(void)
 /***********************************************************************
  *           GetCPInfo            (KERNEL32.154)
  */
-BOOL32 WINAPI GetCPInfo( UINT32 codepage, LPCPINFO cpinfo )
+BOOL WINAPI GetCPInfo( UINT codepage, LPCPINFO cpinfo )
 {
     cpinfo->DefaultChar[0] = '?';
     switch (codepage)
@@ -64,7 +64,7 @@ BOOL32 WINAPI GetCPInfo( UINT32 codepage, LPCPINFO cpinfo )
 /***********************************************************************
  *              GetOEMCP                (KERNEL32.248)
  */
-UINT32 WINAPI GetOEMCP(void)
+UINT WINAPI GetOEMCP(void)
 {
     return 437;    /* MS-DOS United States */
 }
@@ -72,7 +72,7 @@ UINT32 WINAPI GetOEMCP(void)
 /***********************************************************************
  *           IsValidCodePage   (KERNEL32.360)
  */
-BOOL32 WINAPI IsValidCodePage(UINT32 CodePage)
+BOOL WINAPI IsValidCodePage(UINT CodePage)
 {
     switch ( CodePage )
     {
@@ -115,14 +115,14 @@ BOOL32 WINAPI IsValidCodePage(UINT32 CodePage)
  *   Does not properly handle flags.
  *
  */
-INT32 WINAPI MultiByteToWideChar(UINT32 page, DWORD flags,
-			         LPCSTR src, INT32 srclen,
-                                 LPWSTR dst, INT32 dstlen)
+INT WINAPI MultiByteToWideChar(UINT page, DWORD flags,
+			         LPCSTR src, INT srclen,
+                                 LPWSTR dst, INT dstlen)
 {
     int ret;
 
     if (srclen == -1)
-	srclen = lstrlen32A(src)+1;
+	srclen = lstrlenA(src)+1;
     if (!dstlen || !dst)
 	return srclen;
 
@@ -171,9 +171,9 @@ INT32 WINAPI MultiByteToWideChar(UINT32 page, DWORD flags,
  *   Does not properly handle flags.
  *
  */
-INT32 WINAPI WideCharToMultiByte(UINT32 page, DWORD flags, LPCWSTR src,
-				 INT32 srclen,LPSTR dst, INT32 dstlen,
-				 LPCSTR defchar, BOOL32 *used)
+INT WINAPI WideCharToMultiByte(UINT page, DWORD flags, LPCWSTR src,
+				 INT srclen,LPSTR dst, INT dstlen,
+				 LPCSTR defchar, BOOL *used)
 {
     int count = 0;
     int eos = 0;
@@ -195,7 +195,7 @@ INT32 WINAPI WideCharToMultiByte(UINT32 page, DWORD flags, LPCWSTR src,
 	*used=0;
     if (srclen == -1)
       {
-	srclen = lstrlen32W(src)+1;
+	srclen = lstrlenW(src)+1;
 	 care_for_eos=1;
       }
     while(srclen && (dont_copy || dstlen))
@@ -238,7 +238,7 @@ INT32 WINAPI WideCharToMultiByte(UINT32 page, DWORD flags, LPCWSTR src,
 /***********************************************************************
  *           IsDBCSLeadByteEx   (KERNEL32.359)
  */
-BOOL32 WINAPI IsDBCSLeadByteEx( UINT32 codepage, BYTE testchar )
+BOOL WINAPI IsDBCSLeadByteEx( UINT codepage, BYTE testchar )
 {
     CPINFO cpinfo;
     int i;
@@ -267,7 +267,7 @@ BOOL16 WINAPI IsDBCSLeadByte16( BYTE testchar )
 /***********************************************************************
  *           IsDBCSLeadByte32   (KERNEL32.358)
  */
-BOOL32 WINAPI IsDBCSLeadByte32( BYTE testchar )
+BOOL WINAPI IsDBCSLeadByte( BYTE testchar )
 {
     return IsDBCSLeadByteEx(GetACP(), testchar);
 }
@@ -276,7 +276,7 @@ BOOL32 WINAPI IsDBCSLeadByte32( BYTE testchar )
 /***********************************************************************
  *              EnumSystemCodePages32A                (KERNEL32.92)
  */
-BOOL32 WINAPI EnumSystemCodePages32A(CODEPAGE_ENUMPROC32A lpfnCodePageEnum,DWORD flags)
+BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA lpfnCodePageEnum,DWORD flags)
 {
 	TRACE(win32,"(%p,%08lx)\n",lpfnCodePageEnum,flags);
 	lpfnCodePageEnum("437");
@@ -286,7 +286,7 @@ BOOL32 WINAPI EnumSystemCodePages32A(CODEPAGE_ENUMPROC32A lpfnCodePageEnum,DWORD
 /***********************************************************************
  *              EnumSystemCodePages32W                (KERNEL32.93)
  */
-BOOL32 WINAPI EnumSystemCodePages32W( CODEPAGE_ENUMPROC32W lpfnCodePageEnum,
+BOOL WINAPI EnumSystemCodePagesW( CODEPAGE_ENUMPROCW lpfnCodePageEnum,
                                       DWORD flags)
 {
     WCHAR	*cp;
diff --git a/win32/console.c b/win32/console.c
index 98ebbec6d2b..0fb413b20f5 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -62,7 +62,7 @@ FILE *wine_openpty(int *master, int *slave, char *name,
 /****************************************************************************
  *		CONSOLE_GetInfo
  */
-static BOOL32 CONSOLE_GetInfo( HANDLE32 handle, struct get_console_info_reply *reply )
+static BOOL CONSOLE_GetInfo( HANDLE handle, struct get_console_info_reply *reply )
 {
     struct get_console_info_request req;
 
@@ -80,7 +80,7 @@ static BOOL32 CONSOLE_GetInfo( HANDLE32 handle, struct get_console_info_reply *r
  * queue. Does translation of vt100 style function keys and xterm-mouse clicks.
  */
 static void
-CONSOLE_string_to_IR( HANDLE32 hConsoleInput,unsigned char *buf,int len) {
+CONSOLE_string_to_IR( HANDLE hConsoleInput,unsigned char *buf,int len) {
     int			j,k;
     INPUT_RECORD	ir;
     DWORD		junk;
@@ -130,9 +130,9 @@ CONSOLE_string_to_IR( HANDLE32 hConsoleInput,unsigned char *buf,int len) {
 		}
 	    }
 
-	    assert(WriteConsoleInput32A( hConsoleInput, &ir, 1, &junk ));
+	    assert(WriteConsoleInputA( hConsoleInput, &ir, 1, &junk ));
 	    ir.Event.KeyEvent.bKeyDown = 0;
-	    assert(WriteConsoleInput32A( hConsoleInput, &ir, 1, &junk ));
+	    assert(WriteConsoleInputA( hConsoleInput, &ir, 1, &junk ));
 	    continue;
 	}
 	/* inchar is ESC */
@@ -147,9 +147,9 @@ CONSOLE_string_to_IR( HANDLE32 hConsoleInput,unsigned char *buf,int len) {
 	    );
 	    ir.Event.KeyEvent.dwControlKeyState = 0;
 	    ir.Event.KeyEvent.uChar.AsciiChar	= 27;
-	    assert(WriteConsoleInput32A( hConsoleInput, &ir, 1, &junk ));
+	    assert(WriteConsoleInputA( hConsoleInput, &ir, 1, &junk ));
 	    ir.Event.KeyEvent.bKeyDown = 0;
-	    assert(WriteConsoleInput32A( hConsoleInput, &ir, 1, &junk ));
+	    assert(WriteConsoleInputA( hConsoleInput, &ir, 1, &junk ));
 	    continue;
 	}
 	for (k=j;k<len;k++) {
@@ -216,7 +216,7 @@ CONSOLE_string_to_IR( HANDLE32 hConsoleInput,unsigned char *buf,int len) {
 		    else
 			ir.Event.MouseEvent.dwButtonState = 1<<(buf[k+1]-' ');
 		    ir.Event.MouseEvent.dwEventFlags	  = 0; /* FIXME */
-		    assert(WriteConsoleInput32A( hConsoleInput, &ir, 1, &junk));
+		    assert(WriteConsoleInputA( hConsoleInput, &ir, 1, &junk));
 		    j=k+3;
 		}
 	    	break;
@@ -225,9 +225,9 @@ CONSOLE_string_to_IR( HANDLE32 hConsoleInput,unsigned char *buf,int len) {
 	    if (scancode) {
 		ir.Event.KeyEvent.wVirtualScanCode = scancode;
 		ir.Event.KeyEvent.wVirtualKeyCode = MapVirtualKey16(scancode,1);
-		assert(WriteConsoleInput32A( hConsoleInput, &ir, 1, &junk ));
+		assert(WriteConsoleInputA( hConsoleInput, &ir, 1, &junk ));
 		ir.Event.KeyEvent.bKeyDown		= 0;
-		assert(WriteConsoleInput32A( hConsoleInput, &ir, 1, &junk ));
+		assert(WriteConsoleInputA( hConsoleInput, &ir, 1, &junk ));
 		j=k;
 		continue;
 	    }
@@ -242,7 +242,7 @@ CONSOLE_string_to_IR( HANDLE32 hConsoleInput,unsigned char *buf,int len) {
  * in an internal queue.
  */
 static void
-CONSOLE_get_input( HANDLE32 handle, BOOL32 blockwait )
+CONSOLE_get_input( HANDLE handle, BOOL blockwait )
 {
     char	*buf = HeapAlloc(GetProcessHeap(),0,1);
     int		len = 0;
@@ -281,7 +281,7 @@ CONSOLE_get_input( HANDLE32 handle, BOOL32 blockwait )
  */
 static unsigned int console_ignore_ctrl_c = 0;
 static HANDLER_ROUTINE *handlers[]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-BOOL32 WINAPI SetConsoleCtrlHandler( HANDLER_ROUTINE *func, BOOL32 add )
+BOOL WINAPI SetConsoleCtrlHandler( HANDLER_ROUTINE *func, BOOL add )
 {
   unsigned int alloc_loop = sizeof(handlers)/sizeof(HANDLER_ROUTINE *);
   unsigned int done = 0;
@@ -334,7 +334,7 @@ BOOL32 WINAPI SetConsoleCtrlHandler( HANDLER_ROUTINE *func, BOOL32 add )
  *    Success: True
  *    Failure: False (and *should* [but doesn't] set LastError)
  */
-BOOL32 WINAPI GenerateConsoleCtrlEvent( DWORD dwCtrlEvent,
+BOOL WINAPI GenerateConsoleCtrlEvent( DWORD dwCtrlEvent,
 					DWORD dwProcessGroupID )
 {
   if (dwCtrlEvent != CTRL_C_EVENT && dwCtrlEvent != CTRL_BREAK_EVENT)
@@ -372,21 +372,21 @@ BOOL32 WINAPI GenerateConsoleCtrlEvent( DWORD dwCtrlEvent,
  *    Success: Handle to new console screen buffer
  *    Failure: INVALID_HANDLE_VALUE
  */
-HANDLE32 WINAPI CreateConsoleScreenBuffer( DWORD dwDesiredAccess,
+HANDLE WINAPI CreateConsoleScreenBuffer( DWORD dwDesiredAccess,
                 DWORD dwShareMode, LPSECURITY_ATTRIBUTES sa,
                 DWORD dwFlags, LPVOID lpScreenBufferData )
 {
     FIXME(console, "(%ld,%ld,%p,%ld,%p): stub\n",dwDesiredAccess,
           dwShareMode, sa, dwFlags, lpScreenBufferData);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return INVALID_HANDLE_VALUE32;
+    return INVALID_HANDLE_VALUE;
 }
 
 
 /***********************************************************************
  *           GetConsoleScreenBufferInfo   (KERNEL32.190)
  */
-BOOL32 WINAPI GetConsoleScreenBufferInfo( HANDLE32 hConsoleOutput,
+BOOL WINAPI GetConsoleScreenBufferInfo( HANDLE hConsoleOutput,
                                           LPCONSOLE_SCREEN_BUFFER_INFO csbi )
 {
     csbi->dwSize.x = 80;
@@ -411,8 +411,8 @@ BOOL32 WINAPI GetConsoleScreenBufferInfo( HANDLE32 hConsoleOutput,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetConsoleActiveScreenBuffer(
-    HANDLE32 hConsoleOutput) /* [in] Handle to console screen buffer */
+BOOL WINAPI SetConsoleActiveScreenBuffer(
+    HANDLE hConsoleOutput) /* [in] Handle to console screen buffer */
 {
     FIXME(console, "(%x): stub\n", hConsoleOutput);
     return FALSE;
@@ -422,7 +422,7 @@ BOOL32 WINAPI SetConsoleActiveScreenBuffer(
 /***********************************************************************
  *            GetLargestConsoleWindowSize   (KERNEL32.226)
  */
-DWORD WINAPI GetLargestConsoleWindowSize( HANDLE32 hConsoleOutput )
+DWORD WINAPI GetLargestConsoleWindowSize( HANDLE hConsoleOutput )
 {
     return (DWORD)MAKELONG(80,24);
 }
@@ -430,10 +430,10 @@ DWORD WINAPI GetLargestConsoleWindowSize( HANDLE32 hConsoleOutput )
 /***********************************************************************
  *            FreeConsole (KERNEL32.267)
  */
-BOOL32 WINAPI FreeConsole(VOID)
+BOOL WINAPI FreeConsole(VOID)
 {
 
-	PDB32 *pdb = PROCESS_Current();
+	PDB *pdb = PROCESS_Current();
 	CONSOLE *console;
 
 	SYSTEM_LOCK();
@@ -466,19 +466,19 @@ BOOL32 WINAPI FreeConsole(VOID)
  *
  * Open a handle to the current process console.
  */
-HANDLE32 CONSOLE_OpenHandle( BOOL32 output, DWORD access, LPSECURITY_ATTRIBUTES sa )
+HANDLE CONSOLE_OpenHandle( BOOL output, DWORD access, LPSECURITY_ATTRIBUTES sa )
 {
     struct open_console_request req;
     struct open_console_reply reply;
     CONSOLE *console;
-    HANDLE32 handle;
+    HANDLE handle;
 
     req.output  = output;
     req.access  = access;
     req.inherit = (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle);
     CLIENT_SendRequest( REQ_OPEN_CONSOLE, -1, 1, &req, sizeof(req) );
     CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL );
-    if (reply.handle == -1) return INVALID_HANDLE_VALUE32;
+    if (reply.handle == -1) return INVALID_HANDLE_VALUE;
 
     SYSTEM_LOCK();
     if (!(console = (CONSOLE*)HeapAlloc( SystemHeap, 0, sizeof(*console))))
@@ -510,7 +510,7 @@ HANDLE32 CONSOLE_OpenHandle( BOOL32 output, DWORD access, LPSECURITY_ATTRIBUTES
  *
  * To test for complex console: pid == 0 -> simple, otherwise complex.
  */
-static BOOL32 CONSOLE_make_complex(HANDLE32 handle)
+static BOOL CONSOLE_make_complex(HANDLE handle)
 {
         struct set_console_fd_request req;
         struct get_console_info_reply info;
@@ -571,7 +571,7 @@ static BOOL32 CONSOLE_make_complex(HANDLE32 handle)
 	sprintf(buf,"%c[?1001s%c[?1000h",27,27);
 	WriteFile(handle,buf,strlen(buf),&xlen,NULL);
         
-        if (GetConsoleTitle32A( buf, sizeof(buf) ))
+        if (GetConsoleTitleA( buf, sizeof(buf) ))
         {
 	    WriteFile(handle,"\033]2;",4,&xlen,NULL);
 	    WriteFile(handle,buf,strlen(buf),&xlen,NULL);
@@ -587,13 +587,13 @@ static BOOL32 CONSOLE_make_complex(HANDLE32 handle)
  *
  * creates an xterm with a pty to our program
  */
-BOOL32 WINAPI AllocConsole(VOID)
+BOOL WINAPI AllocConsole(VOID)
 {
         struct open_console_request req;
         struct open_console_reply reply;
-	PDB32 *pdb = PROCESS_Current();
+	PDB *pdb = PROCESS_Current();
 	CONSOLE *console;
-	HANDLE32 hIn, hOut, hErr;
+	HANDLE hIn, hOut, hErr;
 
 	SYSTEM_LOCK();		/* FIXME: really only need to lock the process */
 
@@ -634,7 +634,7 @@ BOOL32 WINAPI AllocConsole(VOID)
             return FALSE;
         }
 	if ((hIn = HANDLE_Alloc(pdb,&console->header, req.access,
-                                FALSE, reply.handle)) == INVALID_HANDLE_VALUE32)
+                                FALSE, reply.handle)) == INVALID_HANDLE_VALUE)
         {
             K32OBJ_DecCount(&console->header);
             SYSTEM_UNLOCK();
@@ -651,7 +651,7 @@ BOOL32 WINAPI AllocConsole(VOID)
             return FALSE;
         }
 	if ((hOut = HANDLE_Alloc(pdb,&console->header, req.access,
-                                 FALSE, reply.handle)) == INVALID_HANDLE_VALUE32)
+                                 FALSE, reply.handle)) == INVALID_HANDLE_VALUE)
         {
             CloseHandle(hIn);
             K32OBJ_DecCount(&console->header);
@@ -681,7 +681,7 @@ BOOL32 WINAPI AllocConsole(VOID)
 
 	SetLastError(ERROR_SUCCESS);
 	SYSTEM_UNLOCK();
-	SetConsoleTitle32A("Wine Console");
+	SetConsoleTitleA("Wine Console");
 	return TRUE;
 }
 
@@ -692,7 +692,7 @@ BOOL32 WINAPI AllocConsole(VOID)
  * RETURNS
  *    Code page code
  */
-UINT32 WINAPI GetConsoleCP(VOID)
+UINT WINAPI GetConsoleCP(VOID)
 {
     return GetACP();
 }
@@ -701,7 +701,7 @@ UINT32 WINAPI GetConsoleCP(VOID)
 /***********************************************************************
  *            GetConsoleOutputCP   (KERNEL32.189)
  */
-UINT32 WINAPI GetConsoleOutputCP(VOID)
+UINT WINAPI GetConsoleOutputCP(VOID)
 {
     return GetConsoleCP();
 }
@@ -709,7 +709,7 @@ UINT32 WINAPI GetConsoleOutputCP(VOID)
 /***********************************************************************
  *            GetConsoleMode   (KERNEL32.188)
  */
-BOOL32 WINAPI GetConsoleMode(HANDLE32 hcon,LPDWORD mode)
+BOOL WINAPI GetConsoleMode(HANDLE hcon,LPDWORD mode)
 {
     struct get_console_mode_request req;
     struct get_console_mode_reply reply;
@@ -735,7 +735,7 @@ BOOL32 WINAPI GetConsoleMode(HANDLE32 hcon,LPDWORD mode)
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetConsoleMode( HANDLE32 hcon, DWORD mode )
+BOOL WINAPI SetConsoleMode( HANDLE hcon, DWORD mode )
 {
     struct set_console_mode_request req;
 
@@ -751,16 +751,16 @@ BOOL32 WINAPI SetConsoleMode( HANDLE32 hcon, DWORD mode )
 /***********************************************************************
  *            GetConsoleTitleA   (KERNEL32.191)
  */
-DWORD WINAPI GetConsoleTitle32A(LPSTR title,DWORD size)
+DWORD WINAPI GetConsoleTitleA(LPSTR title,DWORD size)
 {
     struct get_console_info_request req;
     struct get_console_info_reply reply;
     int len;
     DWORD ret = 0;
-    HANDLE32 hcon;
+    HANDLE hcon;
 
-    if ((hcon = CreateFile32A( "CONOUT$", GENERIC_READ, 0, NULL,
-                               OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE32)
+    if ((hcon = CreateFileA( "CONOUT$", GENERIC_READ, 0, NULL,
+                               OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE)
         return 0;
     if ((req.handle = HANDLE_GetServerHandle( PROCESS_Current(), hcon,
                                               K32OBJ_CONSOLE, GENERIC_READ )) == -1)
@@ -790,13 +790,13 @@ DWORD WINAPI GetConsoleTitle32A(LPSTR title,DWORD size)
  *    Success: Length of string copied
  *    Failure: 0
  */
-DWORD WINAPI GetConsoleTitle32W( LPWSTR title, DWORD size )
+DWORD WINAPI GetConsoleTitleW( LPWSTR title, DWORD size )
 {
     char *tmp;
     DWORD ret;
 
     if (!(tmp = HeapAlloc( GetProcessHeap(), 0, size ))) return 0;
-    ret = GetConsoleTitle32A( tmp, size );
+    ret = GetConsoleTitleA( tmp, size );
     lstrcpyAtoW( title, tmp );
     HeapFree( GetProcessHeap(), 0, tmp );
     return ret;
@@ -806,7 +806,7 @@ DWORD WINAPI GetConsoleTitle32W( LPWSTR title, DWORD size )
 /***********************************************************************
  *            WriteConsoleA   (KERNEL32.729)
  */
-BOOL32 WINAPI WriteConsole32A( HANDLE32 hConsoleOutput,
+BOOL WINAPI WriteConsoleA( HANDLE hConsoleOutput,
                                LPCVOID lpBuffer,
                                DWORD nNumberOfCharsToWrite,
                                LPDWORD lpNumberOfCharsWritten,
@@ -827,7 +827,7 @@ BOOL32 WINAPI WriteConsole32A( HANDLE32 hConsoleOutput,
 /***********************************************************************
  *            WriteConsoleOutputA   (KERNEL32.732)
  */
-BOOL32 WINAPI WriteConsoleOutput32A( HANDLE32 hConsoleOutput,
+BOOL WINAPI WriteConsoleOutputA( HANDLE hConsoleOutput,
                                      LPCHAR_INFO lpBuffer,
                                      COORD dwBufferSize,
                                      COORD dwBufferCoord,
@@ -880,13 +880,13 @@ BOOL32 WINAPI WriteConsoleOutput32A( HANDLE32 hConsoleOutput,
 /***********************************************************************
  *            WriteConsoleW   (KERNEL32.577)
  */
-BOOL32 WINAPI WriteConsole32W( HANDLE32 hConsoleOutput,
+BOOL WINAPI WriteConsoleW( HANDLE hConsoleOutput,
                                LPCVOID lpBuffer,
                                DWORD nNumberOfCharsToWrite,
                                LPDWORD lpNumberOfCharsWritten,
                                LPVOID lpReserved )
 {
-        BOOL32 ret;
+        BOOL ret;
         LPSTR xstring=HeapAlloc( GetProcessHeap(), 0, nNumberOfCharsToWrite );
 
 	lstrcpynWtoA( xstring,  lpBuffer,nNumberOfCharsToWrite);
@@ -902,7 +902,7 @@ BOOL32 WINAPI WriteConsole32W( HANDLE32 hConsoleOutput,
 /***********************************************************************
  *            ReadConsoleA   (KERNEL32.419)
  */
-BOOL32 WINAPI ReadConsole32A( HANDLE32 hConsoleInput,
+BOOL WINAPI ReadConsoleA( HANDLE hConsoleInput,
                               LPVOID lpBuffer,
                               DWORD nNumberOfCharsToRead,
                               LPDWORD lpNumberOfCharsRead,
@@ -951,16 +951,16 @@ BOOL32 WINAPI ReadConsole32A( HANDLE32 hConsoleInput,
 /***********************************************************************
  *            ReadConsoleW   (KERNEL32.427)
  */
-BOOL32 WINAPI ReadConsole32W( HANDLE32 hConsoleInput,
+BOOL WINAPI ReadConsoleW( HANDLE hConsoleInput,
                               LPVOID lpBuffer,
                               DWORD nNumberOfCharsToRead,
                               LPDWORD lpNumberOfCharsRead,
                               LPVOID lpReserved )
 {
-    BOOL32 ret;
+    BOOL ret;
     LPSTR buf = (LPSTR)HeapAlloc(GetProcessHeap(), 0, nNumberOfCharsToRead);
 
-    ret = ReadConsole32A(
+    ret = ReadConsoleA(
     	hConsoleInput,
 	buf,
 	nNumberOfCharsToRead,
@@ -987,7 +987,7 @@ BOOL32 WINAPI ReadConsole32W( HANDLE32 hConsoleInput,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI ReadConsoleInput32A(HANDLE32 hConsoleInput,
+BOOL WINAPI ReadConsoleInputA(HANDLE hConsoleInput,
 				  LPINPUT_RECORD lpBuffer,
 				  DWORD nLength, LPDWORD lpNumberOfEventsRead)
 {
@@ -1019,18 +1019,18 @@ BOOL32 WINAPI ReadConsoleInput32A(HANDLE32 hConsoleInput,
 /***********************************************************************
  *            ReadConsoleInput32W   (KERNEL32.570)
  */
-BOOL32 WINAPI ReadConsoleInput32W( HANDLE32 handle, LPINPUT_RECORD buffer,
+BOOL WINAPI ReadConsoleInputW( HANDLE handle, LPINPUT_RECORD buffer,
                                    DWORD count, LPDWORD read )
 {
     /* FIXME: Fix this if we get UNICODE input. */
-    return ReadConsoleInput32A( handle, buffer, count, read );
+    return ReadConsoleInputA( handle, buffer, count, read );
 }
 
 
 /***********************************************************************
  *            FlushConsoleInputBuffer   (KERNEL32.132)
  */
-BOOL32 WINAPI FlushConsoleInputBuffer( HANDLE32 handle )
+BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle )
 {
     struct read_console_input_request req;
     int len;
@@ -1052,7 +1052,7 @@ BOOL32 WINAPI FlushConsoleInputBuffer( HANDLE32 handle )
  *
  * Does not need a complex console.
  */
-BOOL32 WINAPI PeekConsoleInput32A( HANDLE32 handle, LPINPUT_RECORD buffer,
+BOOL WINAPI PeekConsoleInputA( HANDLE handle, LPINPUT_RECORD buffer,
                                    DWORD count, LPDWORD read )
 {
     struct read_console_input_request req;
@@ -1078,13 +1078,13 @@ BOOL32 WINAPI PeekConsoleInput32A( HANDLE32 handle, LPINPUT_RECORD buffer,
 /***********************************************************************
  *            PeekConsoleInputW   (KERNEL32.551)
  */
-BOOL32 WINAPI PeekConsoleInput32W(HANDLE32 hConsoleInput,
+BOOL WINAPI PeekConsoleInputW(HANDLE hConsoleInput,
                                   LPINPUT_RECORD pirBuffer,
                                   DWORD cInRecords,
                                   LPDWORD lpcRead)
 {
     /* FIXME: Hmm. Fix this if we get UNICODE input. */
-    return PeekConsoleInput32A(hConsoleInput,pirBuffer,cInRecords,lpcRead);
+    return PeekConsoleInputA(hConsoleInput,pirBuffer,cInRecords,lpcRead);
 }
 
 
@@ -1092,7 +1092,7 @@ BOOL32 WINAPI PeekConsoleInput32W(HANDLE32 hConsoleInput,
  * WriteConsoleInput32A [KERNEL32.730]  Write data to a console input buffer
  *
  */
-BOOL32 WINAPI WriteConsoleInput32A( HANDLE32 handle, INPUT_RECORD *buffer,
+BOOL WINAPI WriteConsoleInputA( HANDLE handle, INPUT_RECORD *buffer,
                                     DWORD count, LPDWORD written )
 {
     struct write_console_input_request req;
@@ -1119,15 +1119,15 @@ BOOL32 WINAPI WriteConsoleInput32A( HANDLE32 handle, INPUT_RECORD *buffer,
  * but should remember the title and set it on creation of the latter.
  * (not fixed at this time).
  */
-BOOL32 WINAPI SetConsoleTitle32A(LPCSTR title)
+BOOL WINAPI SetConsoleTitleA(LPCSTR title)
 {
 #if 0
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
     CONSOLE *console;
     DWORD written;
     char titleformat[]="\033]2;%s\a"; /*this should work for xterms*/
     LPSTR titlestring; 
-    BOOL32 ret=FALSE;
+    BOOL ret=FALSE;
 
     TRACE(console,"(%s)\n",title);
 
@@ -1164,11 +1164,11 @@ BOOL32 WINAPI SetConsoleTitle32A(LPCSTR title)
 
     struct set_console_info_request req;
     struct get_console_info_reply info;
-    HANDLE32 hcon;
+    HANDLE hcon;
     DWORD written;
 
-    if ((hcon = CreateFile32A( "CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL,
-                               OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE32)
+    if ((hcon = CreateFileA( "CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL,
+                               OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE)
         return FALSE;
     if ((req.handle = HANDLE_GetServerHandle( PROCESS_Current(), hcon,
                                               K32OBJ_CONSOLE, GENERIC_WRITE )) == -1)
@@ -1204,12 +1204,12 @@ BOOL32 WINAPI SetConsoleTitle32A(LPCSTR title)
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetConsoleTitle32W( LPCWSTR title )
+BOOL WINAPI SetConsoleTitleW( LPCWSTR title )
 {
-    BOOL32 ret;
+    BOOL ret;
 
     LPSTR titleA = HEAP_strdupWtoA( GetProcessHeap(), 0, title );
-    ret = SetConsoleTitle32A(titleA);
+    ret = SetConsoleTitleA(titleA);
     HeapFree( GetProcessHeap(), 0, titleA );
     return ret;
 }
@@ -1224,7 +1224,7 @@ BOOL32 WINAPI SetConsoleTitle32W( LPCWSTR title )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI SetConsoleCursorPosition( HANDLE32 hcon, COORD pos )
+BOOL WINAPI SetConsoleCursorPosition( HANDLE hcon, COORD pos )
 {
     char 	xbuf[20];
     DWORD	xlen;
@@ -1249,7 +1249,7 @@ BOOL32 WINAPI SetConsoleCursorPosition( HANDLE32 hcon, COORD pos )
 /***********************************************************************
  *            GetNumberOfConsoleInputEvents   (KERNEL32.246)
  */
-BOOL32 WINAPI GetNumberOfConsoleInputEvents(HANDLE32 hcon,LPDWORD nrofevents)
+BOOL WINAPI GetNumberOfConsoleInputEvents(HANDLE hcon,LPDWORD nrofevents)
 {
     CONSOLE_get_input(hcon,FALSE);
     *nrofevents = 1; /* UMM */
@@ -1259,7 +1259,7 @@ BOOL32 WINAPI GetNumberOfConsoleInputEvents(HANDLE32 hcon,LPDWORD nrofevents)
 /***********************************************************************
  *            GetNumberOfConsoleMouseButtons   (KERNEL32.358)
  */
-BOOL32 WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons)
+BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons)
 {
     FIXME(console,"(%p): stub\n", nrofbuttons);
     *nrofbuttons = 2;
@@ -1277,7 +1277,7 @@ BOOL32 WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons)
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI GetConsoleCursorInfo32( HANDLE32 hcon,
+BOOL WINAPI GetConsoleCursorInfo( HANDLE hcon,
                                       LPCONSOLE_CURSOR_INFO cinfo )
 {
     struct get_console_info_reply reply;
@@ -1299,8 +1299,8 @@ BOOL32 WINAPI GetConsoleCursorInfo32( HANDLE32 hcon,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetConsoleCursorInfo32( 
-    HANDLE32 hcon,                /* [in] Handle to console screen buffer */
+BOOL WINAPI SetConsoleCursorInfo( 
+    HANDLE hcon,                /* [in] Handle to console screen buffer */
     LPCONSOLE_CURSOR_INFO cinfo)  /* [in] Address of cursor information */
 {
     struct set_console_info_request req;
@@ -1329,9 +1329,9 @@ BOOL32 WINAPI SetConsoleCursorInfo32(
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetConsoleWindowInfo(
-    HANDLE32 hcon,       /* [in] Handle to console screen buffer */
-    BOOL32 bAbsolute,    /* [in] Coordinate type flag */
+BOOL WINAPI SetConsoleWindowInfo(
+    HANDLE hcon,       /* [in] Handle to console screen buffer */
+    BOOL bAbsolute,    /* [in] Coordinate type flag */
     LPSMALL_RECT window) /* [in] Address of new window rectangle */
 {
     FIXME(console, "(%x,%d,%p): stub\n", hcon, bAbsolute, window);
@@ -1349,7 +1349,7 @@ BOOL32 WINAPI SetConsoleWindowInfo(
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetConsoleTextAttribute32(HANDLE32 hConsoleOutput,WORD wAttr)
+BOOL WINAPI SetConsoleTextAttribute(HANDLE hConsoleOutput,WORD wAttr)
 {
     const int colormap[8] = {
     	0,4,2,6,
@@ -1381,7 +1381,7 @@ BOOL32 WINAPI SetConsoleTextAttribute32(HANDLE32 hConsoleOutput,WORD wAttr)
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI SetConsoleScreenBufferSize( HANDLE32 hConsoleOutput, 
+BOOL WINAPI SetConsoleScreenBufferSize( HANDLE hConsoleOutput, 
                                           COORD dwSize )
 {
     FIXME(console, "(%d,%dx%d): stub\n",hConsoleOutput,dwSize.x,dwSize.y);
@@ -1403,8 +1403,8 @@ BOOL32 WINAPI SetConsoleScreenBufferSize( HANDLE32 hConsoleOutput,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI FillConsoleOutputCharacterA(
-    HANDLE32 hConsoleOutput,
+BOOL WINAPI FillConsoleOutputCharacterA(
+    HANDLE hConsoleOutput,
     BYTE cCharacter,
     DWORD nLength,
     COORD dwCoord,
@@ -1435,7 +1435,7 @@ BOOL32 WINAPI FillConsoleOutputCharacterA(
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI FillConsoleOutputCharacterW(HANDLE32 hConsoleOutput,
+BOOL WINAPI FillConsoleOutputCharacterW(HANDLE hConsoleOutput,
                                             WCHAR cCharacter,
                                             DWORD nLength,
                                            COORD dwCoord, 
@@ -1469,7 +1469,7 @@ BOOL32 WINAPI FillConsoleOutputCharacterW(HANDLE32 hConsoleOutput,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI FillConsoleOutputAttribute( HANDLE32 hConsoleOutput, 
+BOOL WINAPI FillConsoleOutputAttribute( HANDLE hConsoleOutput, 
               WORD wAttribute, DWORD nLength, COORD dwCoord, 
               LPDWORD lpNumAttrsWritten)
 {
@@ -1485,7 +1485,7 @@ BOOL32 WINAPI FillConsoleOutputAttribute( HANDLE32 hConsoleOutput,
  * BUGS
  *   Unimplemented
  */
-BOOL32 WINAPI ReadConsoleOutputCharacter32A(HANDLE32 hConsoleOutput, 
+BOOL WINAPI ReadConsoleOutputCharacterA(HANDLE hConsoleOutput, 
 	      LPSTR lpstr, DWORD dword, COORD coord, LPDWORD lpdword)
 {
     FIXME(console, "(%d,%p,%ld,%dx%d,%p): stub\n", hConsoleOutput,lpstr,
@@ -1501,7 +1501,7 @@ BOOL32 WINAPI ReadConsoleOutputCharacter32A(HANDLE32 hConsoleOutput,
  * BUGS
  *   Unimplemented
  */
-BOOL32 WINAPI ScrollConsoleScreenBuffer( HANDLE32 hConsoleOutput, 
+BOOL WINAPI ScrollConsoleScreenBuffer( HANDLE hConsoleOutput, 
 	      LPSMALL_RECT lpScrollRect, LPSMALL_RECT lpClipRect,
               COORD dwDestOrigin, LPCHAR_INFO lpFill)
 {
diff --git a/win32/device.c b/win32/device.c
index 934a5be26ae..12b3cd18ba3 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -33,26 +33,26 @@
 #include "server.h"
 
 
-static BOOL32 DeviceIo_VTDAPI(DWORD dwIoControlCode, 
+static BOOL DeviceIo_VTDAPI(DWORD dwIoControlCode, 
 			      LPVOID lpvInBuffer, DWORD cbInBuffer,
 			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 			      LPDWORD lpcbBytesReturned,
 			      LPOVERLAPPED lpOverlapped);
-static BOOL32 DeviceIo_MONODEBG(DWORD dwIoControlCode, 
+static BOOL DeviceIo_MONODEBG(DWORD dwIoControlCode, 
 			      LPVOID lpvInBuffer, DWORD cbInBuffer,
 			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 			      LPDWORD lpcbBytesReturned,
 			      LPOVERLAPPED lpOverlapped);
 
-static BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context );
+static BOOL VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context );
 
-static BOOL32 DeviceIo_IFSMgr(DWORD dwIoControlCode, 
+static BOOL DeviceIo_IFSMgr(DWORD dwIoControlCode, 
 			      LPVOID lpvInBuffer, DWORD cbInBuffer,
 			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 			      LPDWORD lpcbBytesReturned,
 			      LPOVERLAPPED lpOverlapped);
 
-static BOOL32 DeviceIo_VWin32(DWORD dwIoControlCode, 
+static BOOL DeviceIo_VWin32(DWORD dwIoControlCode, 
 			      LPVOID lpvInBuffer, DWORD cbInBuffer,
 			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 			      LPDWORD lpcbBytesReturned,
@@ -66,8 +66,8 @@ struct VxDInfo
 {
     LPCSTR  name;
     WORD    id;
-    BOOL32  (*vxdcall)(DWORD *, DWORD, CONTEXT *);
-    BOOL32  (*deviceio)(DWORD, LPVOID, DWORD, 
+    BOOL  (*vxdcall)(DWORD *, DWORD, CONTEXT *);
+    BOOL  (*deviceio)(DWORD, LPVOID, DWORD, 
                         LPVOID, DWORD, LPDWORD, LPOVERLAPPED);
 };
 
@@ -254,20 +254,20 @@ LPCSTR VMM_Service_Name[N_VMM_SERVICE] =
     "<KERNEL32.101>"          /* 0x0028 -- What does this do??? */
 };
 
-HANDLE32 DEVICE_Open( LPCSTR filename, DWORD access,
+HANDLE DEVICE_Open( LPCSTR filename, DWORD access,
                       LPSECURITY_ATTRIBUTES sa )
 {
     const struct VxDInfo *info;
 
     for (info = VxDList; info->name; info++)
-        if (!lstrcmpi32A( info->name, filename ))
+        if (!lstrcmpiA( info->name, filename ))
             return FILE_CreateDevice( info->id | 0x10000, access, sa );
 
     FIXME(win32, "Unknown VxD %s\n", filename);
     return FILE_CreateDevice( 0x10000, access, sa );
 }
 
-static const struct VxDInfo *DEVICE_GetInfo( HANDLE32 handle )
+static const struct VxDInfo *DEVICE_GetInfo( HANDLE handle )
 {
     struct get_file_info_request req;
     struct get_file_info_reply reply;
@@ -298,7 +298,7 @@ static const struct VxDInfo *DEVICE_GetInfo( HANDLE32 handle )
  * A return value of FALSE indicates that something has gone wrong which
  * GetLastError can decypher.
  */
-BOOL32 WINAPI DeviceIoControl(HANDLE32 hDevice, DWORD dwIoControlCode, 
+BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, 
 			      LPVOID lpvInBuffer, DWORD cbInBuffer,
 			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 			      LPDWORD lpcbBytesReturned,
@@ -386,12 +386,12 @@ BOOL32 WINAPI DeviceIoControl(HANDLE32 hDevice, DWORD dwIoControlCode,
 /***********************************************************************
  *           DeviceIo_VTDAPI
  */
-static BOOL32 DeviceIo_VTDAPI(DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbInBuffer,
+static BOOL DeviceIo_VTDAPI(DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbInBuffer,
 			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 			      LPDWORD lpcbBytesReturned,
 			      LPOVERLAPPED lpOverlapped)
 {
-    BOOL32 retv = TRUE;
+    BOOL retv = TRUE;
 
     switch (dwIoControlCode)
     {
@@ -472,9 +472,9 @@ REGS_ENTRYPOINT(VxDCall8) { VxDCall( context, 8 ); }
 /***********************************************************************
  *           VxDCall_VMM
  */
-BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
+BOOL VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
 {
-    BOOL32 ok = TRUE;
+    BOOL ok = TRUE;
 
     switch ( LOWORD(service) )
     {
@@ -483,7 +483,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         HKEY    hkey       = (HKEY)   STACK32_POP( context );
         LPCSTR  lpszSubKey = (LPCSTR) STACK32_POP( context );
         LPHKEY  retkey     = (LPHKEY) STACK32_POP( context );
-        *retv = RegOpenKey32A( hkey, lpszSubKey, retkey );
+        *retv = RegOpenKeyA( hkey, lpszSubKey, retkey );
     }
     break;
 
@@ -492,7 +492,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         HKEY    hkey       = (HKEY)   STACK32_POP( context );
         LPCSTR  lpszSubKey = (LPCSTR) STACK32_POP( context );
         LPHKEY  retkey     = (LPHKEY) STACK32_POP( context );
-        *retv = RegCreateKey32A( hkey, lpszSubKey, retkey );
+        *retv = RegCreateKeyA( hkey, lpszSubKey, retkey );
     }
     break;
 
@@ -507,7 +507,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
     {
         HKEY    hkey       = (HKEY)   STACK32_POP( context );
         LPCSTR  lpszSubKey = (LPCSTR) STACK32_POP( context );
-        *retv = RegDeleteKey32A( hkey, lpszSubKey );
+        *retv = RegDeleteKeyA( hkey, lpszSubKey );
     }
     break;
 
@@ -518,7 +518,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         DWORD   dwType     = (DWORD)  STACK32_POP( context );
         LPCSTR  lpszData   = (LPCSTR) STACK32_POP( context );
         DWORD   cbData     = (DWORD)  STACK32_POP( context );
-        *retv = RegSetValue32A( hkey, lpszSubKey, dwType, lpszData, cbData );
+        *retv = RegSetValueA( hkey, lpszSubKey, dwType, lpszData, cbData );
     }
     break;
 
@@ -526,7 +526,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
     {
         HKEY    hkey       = (HKEY)   STACK32_POP( context );
         LPSTR   lpszValue  = (LPSTR)  STACK32_POP( context );
-        *retv = RegDeleteValue32A( hkey, lpszValue );
+        *retv = RegDeleteValueA( hkey, lpszValue );
     }
     break;
 
@@ -536,7 +536,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         LPSTR   lpszSubKey = (LPSTR)  STACK32_POP( context );
         LPSTR   lpszData   = (LPSTR)  STACK32_POP( context );
         LPDWORD lpcbData   = (LPDWORD)STACK32_POP( context );
-        *retv = RegQueryValue32A( hkey, lpszSubKey, lpszData, lpcbData );
+        *retv = RegQueryValueA( hkey, lpszSubKey, lpszData, lpcbData );
     }
     break;
 
@@ -546,7 +546,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         DWORD   iSubkey    = (DWORD)  STACK32_POP( context );
         LPSTR   lpszName   = (LPSTR)  STACK32_POP( context );
         DWORD   lpcchName  = (DWORD)  STACK32_POP( context );
-        *retv = RegEnumKey32A( hkey, iSubkey, lpszName, lpcchName );
+        *retv = RegEnumKeyA( hkey, iSubkey, lpszName, lpcchName );
     }
     break;
 
@@ -560,7 +560,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         LPDWORD lpdwType   = (LPDWORD)STACK32_POP( context );
         LPBYTE  lpbData    = (LPBYTE) STACK32_POP( context );
         LPDWORD lpcbData   = (LPDWORD)STACK32_POP( context );
-        *retv = RegEnumValue32A( hkey, iValue, lpszValue, lpcchValue, 
+        *retv = RegEnumValueA( hkey, iValue, lpszValue, lpcchValue, 
                                  lpReserved, lpdwType, lpbData, lpcbData );
     }
     break;
@@ -573,7 +573,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         LPDWORD lpdwType   = (LPDWORD)STACK32_POP( context );
         LPBYTE  lpbData    = (LPBYTE) STACK32_POP( context );
         LPDWORD lpcbData   = (LPDWORD)STACK32_POP( context );
-        *retv = RegQueryValueEx32A( hkey, lpszValue, lpReserved, 
+        *retv = RegQueryValueExA( hkey, lpszValue, lpReserved, 
                                     lpdwType, lpbData, lpcbData );
     }
     break;
@@ -586,7 +586,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         DWORD   dwType     = (DWORD)  STACK32_POP( context );
         LPBYTE  lpbData    = (LPBYTE) STACK32_POP( context );
         DWORD   cbData     = (DWORD)STACK32_POP( context );
-        *retv = RegSetValueEx32A( hkey, lpszValue, dwReserved, 
+        *retv = RegSetValueExA( hkey, lpszValue, dwReserved, 
                                   dwType, lpbData, cbData );
     }
     break;
@@ -613,7 +613,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
                            = (LPDWORD)STACK32_POP( context );
         LPDWORD lpcchMaxValueData 
                            = (LPDWORD)STACK32_POP( context );
-        *retv = RegQueryInfoKey32A( hkey, NULL, NULL, NULL, lpcSubKeys, lpcchMaxSubKey,
+        *retv = RegQueryInfoKeyA( hkey, NULL, NULL, NULL, lpcSubKeys, lpcchMaxSubKey,
                                     NULL, lpcValues, lpcchMaxValueName, lpcchMaxValueData,
                                     NULL, NULL );
     }
@@ -624,7 +624,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         HKEY    hkey       = (HKEY)   STACK32_POP( context );
         LPCSTR  lpszSubKey = (LPCSTR) STACK32_POP( context );
         LPCSTR  lpszFile   = (LPCSTR) STACK32_POP( context );
-        *retv = RegLoadKey32A( hkey, lpszSubKey, lpszFile );
+        *retv = RegLoadKeyA( hkey, lpszSubKey, lpszFile );
     }
     break;
 
@@ -632,7 +632,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
     {
         HKEY    hkey       = (HKEY)   STACK32_POP( context );
         LPCSTR  lpszSubKey = (LPCSTR) STACK32_POP( context );
-        *retv = RegUnLoadKey32A( hkey, lpszSubKey );
+        *retv = RegUnLoadKeyA( hkey, lpszSubKey );
     }
     break;
 
@@ -642,7 +642,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         LPCSTR  lpszFile   = (LPCSTR) STACK32_POP( context );
         LPSECURITY_ATTRIBUTES sa = 
                (LPSECURITY_ATTRIBUTES)STACK32_POP( context );
-        *retv = RegSaveKey32A( hkey, lpszFile, sa );
+        *retv = RegSaveKeyA( hkey, lpszFile, sa );
     }
     break;
 
@@ -657,7 +657,7 @@ BOOL32 VxDCall_VMM( DWORD *retv, DWORD service, CONTEXT *context )
         LPCSTR  lpszSubKey = (LPCSTR) STACK32_POP( context );
         LPCSTR  lpszNewFile= (LPCSTR) STACK32_POP( context );
         LPCSTR  lpszOldFile= (LPCSTR) STACK32_POP( context );
-        *retv = RegReplaceKey32A( hkey, lpszSubKey, lpszNewFile, lpszOldFile );
+        *retv = RegReplaceKeyA( hkey, lpszSubKey, lpszNewFile, lpszOldFile );
     }
     break;
 
@@ -747,12 +747,12 @@ static void CONTEXT_2_win32apieq(CONTEXT *pCxt,struct win32apireq *pOut)
 	/* FIXME: pOut->ar_pad ignored */
 }
 
-static BOOL32 DeviceIo_IFSMgr(DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbInBuffer,
+static BOOL DeviceIo_IFSMgr(DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbInBuffer,
 			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 			      LPDWORD lpcbBytesReturned,
 			      LPOVERLAPPED lpOverlapped)
 {
-    BOOL32 retv = TRUE;
+    BOOL retv = TRUE;
 	TRACE(win32,"(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
 			dwIoControlCode,
 			lpvInBuffer,cbInBuffer,
@@ -847,13 +847,13 @@ static void CONTEXT_2_DIOCRegs( CONTEXT *pCxt, DIOC_REGISTERS *pOut )
 }
 
 
-static BOOL32 DeviceIo_VWin32(DWORD dwIoControlCode, 
+static BOOL DeviceIo_VWin32(DWORD dwIoControlCode, 
 			      LPVOID lpvInBuffer, DWORD cbInBuffer,
 			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 			      LPDWORD lpcbBytesReturned,
 			      LPOVERLAPPED lpOverlapped)
 {
-    BOOL32 retv = TRUE;
+    BOOL retv = TRUE;
 
     switch (dwIoControlCode)
     {
@@ -909,7 +909,7 @@ static BOOL32 DeviceIo_VWin32(DWORD dwIoControlCode,
 
 
 /* this is used by some Origin games */
-static BOOL32 DeviceIo_MONODEBG(DWORD dwIoControlCode, 
+static BOOL DeviceIo_MONODEBG(DWORD dwIoControlCode, 
 			      LPVOID lpvInBuffer, DWORD cbInBuffer,
 			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 			      LPDWORD lpcbBytesReturned,
diff --git a/win32/except.c b/win32/except.c
index 110b7627673..d65cf6ec42b 100644
--- a/win32/except.c
+++ b/win32/except.c
@@ -193,7 +193,7 @@ REGS_ENTRYPOINT(RaiseException)
 DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers)
 {
     char message[80];
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
 
     /* FIXME: Should check if the process is being debugged */
 
@@ -208,7 +208,7 @@ DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers)
     sprintf( message, "Unhandled exception 0x%08lx at address 0x%08lx.",
              epointers->ExceptionRecord->ExceptionCode,
              (DWORD)epointers->ExceptionRecord->ExceptionAddress );
-    MessageBox32A( 0, message, "Error", MB_OK | MB_ICONHAND );
+    MessageBoxA( 0, message, "Error", MB_OK | MB_ICONHAND );
     return EXCEPTION_EXECUTE_HANDLER;
 }
 
@@ -219,7 +219,7 @@ DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers)
 LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter(
                                           LPTOP_LEVEL_EXCEPTION_FILTER filter )
 {
-    PDB32 *pdb = PROCESS_Current();
+    PDB *pdb = PROCESS_Current();
     LPTOP_LEVEL_EXCEPTION_FILTER old = pdb->top_filter;
     pdb->top_filter = filter;
     return old;
diff --git a/win32/file.c b/win32/file.c
index 7c484365b29..c06744f7fad 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -35,7 +35,7 @@ VOID
     LPOVERLAPPED lpOverlapped
     );
 
-BOOL32 WINAPI ReadFileEx(HFILE32 hFile, LPVOID lpBuffer, DWORD numtoread,
+BOOL WINAPI ReadFileEx(HFILE hFile, LPVOID lpBuffer, DWORD numtoread,
 			 LPOVERLAPPED lpOverlapped, 
 			 LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine)
 {
@@ -51,14 +51,14 @@ BOOL32 WINAPI ReadFileEx(HFILE32 hFile, LPVOID lpBuffer, DWORD numtoread,
  */
 BOOL16 WINAPI SetFileAttributes16( LPCSTR lpFileName, DWORD attributes )
 {
-    return SetFileAttributes32A( lpFileName, attributes );
+    return SetFileAttributesA( lpFileName, attributes );
 }
 
 
 /**************************************************************************
  *              SetFileAttributes32A	(KERNEL32.490)
  */
-BOOL32 WINAPI SetFileAttributes32A(LPCSTR lpFileName, DWORD attributes)
+BOOL WINAPI SetFileAttributesA(LPCSTR lpFileName, DWORD attributes)
 {
     struct stat buf;
     DOS_FULL_NAME full_name;
@@ -105,10 +105,10 @@ BOOL32 WINAPI SetFileAttributes32A(LPCSTR lpFileName, DWORD attributes)
 /**************************************************************************
  *              SetFileAttributes32W	(KERNEL32.491)
  */
-BOOL32 WINAPI SetFileAttributes32W(LPCWSTR lpFileName, DWORD attributes)
+BOOL WINAPI SetFileAttributesW(LPCWSTR lpFileName, DWORD attributes)
 {
     LPSTR afn = HEAP_strdupWtoA( GetProcessHeap(), 0, lpFileName );
-    BOOL32 res = SetFileAttributes32A( afn, attributes );
+    BOOL res = SetFileAttributesA( afn, attributes );
     HeapFree( GetProcessHeap(), 0, afn );
     return res;
 }
@@ -139,7 +139,7 @@ VOID WINAPI SetFileApisToANSI(void)
  *    TRUE:  Set of file functions is using ANSI code page
  *    FALSE: Set of file functions is using OEM code page
  */
-BOOL32 WINAPI AreFileApisANSI(void)
+BOOL WINAPI AreFileApisANSI(void)
 {
     FIXME(file,"(void): stub\n");
     return TRUE;
diff --git a/win32/init.c b/win32/init.c
index 6856117f7cf..b0f3833ffcd 100644
--- a/win32/init.c
+++ b/win32/init.c
@@ -17,9 +17,9 @@
 /***********************************************************************
  *              GetStartupInfoA         (KERNEL32.273)
  */
-VOID WINAPI GetStartupInfo32A(LPSTARTUPINFO32A lpStartupInfo)
+VOID WINAPI GetStartupInfoA(LPSTARTUPINFOA lpStartupInfo)
 {
-    lpStartupInfo->cb = sizeof(STARTUPINFO32A);
+    lpStartupInfo->cb = sizeof(STARTUPINFOA);
     lpStartupInfo->lpReserved = "<Reserved>";
     lpStartupInfo->lpDesktop = "Desktop";
     lpStartupInfo->lpTitle = "Title";
@@ -27,46 +27,46 @@ VOID WINAPI GetStartupInfo32A(LPSTARTUPINFO32A lpStartupInfo)
     lpStartupInfo->cbReserved2 = 0;
     lpStartupInfo->lpReserved2 = NULL; /* must be NULL for VC runtime */
     lpStartupInfo->dwFlags    = STARTF_USESTDHANDLES;
-    lpStartupInfo->hStdInput  = (HANDLE32)0;
-    lpStartupInfo->hStdOutput = (HANDLE32)1;
-    lpStartupInfo->hStdError  = (HANDLE32)2;
+    lpStartupInfo->hStdInput  = (HANDLE)0;
+    lpStartupInfo->hStdOutput = (HANDLE)1;
+    lpStartupInfo->hStdError  = (HANDLE)2;
 }
 
 /***********************************************************************
  *              GetStartupInfoW         (KERNEL32.274)
  */
-VOID WINAPI GetStartupInfo32W(LPSTARTUPINFO32W lpStartupInfo)
+VOID WINAPI GetStartupInfoW(LPSTARTUPINFOW lpStartupInfo)
 {
-    lpStartupInfo->cb = sizeof(STARTUPINFO32W);
+    lpStartupInfo->cb = sizeof(STARTUPINFOW);
     lpStartupInfo->lpReserved = HEAP_strdupAtoW(GetProcessHeap(),0,"<Reserved>");
     lpStartupInfo->lpDesktop = HEAP_strdupAtoW(GetProcessHeap(), 0, "Desktop");
     lpStartupInfo->lpTitle = HEAP_strdupAtoW(GetProcessHeap(), 0, "Title");
 
     lpStartupInfo->cbReserved2 = 0;
     lpStartupInfo->lpReserved2 = NULL; /* must be NULL for VC runtime */
-    lpStartupInfo->hStdInput  = (HANDLE32)0;
-    lpStartupInfo->hStdOutput = (HANDLE32)1;
-    lpStartupInfo->hStdError  = (HANDLE32)2;
+    lpStartupInfo->hStdInput  = (HANDLE)0;
+    lpStartupInfo->hStdOutput = (HANDLE)1;
+    lpStartupInfo->hStdError  = (HANDLE)2;
 }
 
 /***********************************************************************
  *              GetComputerNameA         (KERNEL32.165)
  */
-BOOL32 WINAPI GetComputerName32A(LPSTR name,LPDWORD size)
+BOOL WINAPI GetComputerNameA(LPSTR name,LPDWORD size)
 {
 	if (-1==gethostname(name,*size))
 		return FALSE;
-	*size = lstrlen32A(name);
+	*size = lstrlenA(name);
 	return TRUE;
 }
 
 /***********************************************************************
  *              GetComputerNameW         (KERNEL32.166)
  */
-BOOL32 WINAPI GetComputerName32W(LPWSTR name,LPDWORD size)
+BOOL WINAPI GetComputerNameW(LPWSTR name,LPDWORD size)
 {
     LPSTR nameA = (LPSTR)HeapAlloc( GetProcessHeap(), 0, *size);
-    BOOL32 ret = GetComputerName32A(nameA,size);
+    BOOL ret = GetComputerNameA(nameA,size);
     if (ret) lstrcpynAtoW(name,nameA,*size+1);
     HeapFree( GetProcessHeap(), 0, nameA );
     return ret;
diff --git a/win32/kernel32.c b/win32/kernel32.c
index 3c44f3950e3..60b1e1d8e8d 100644
--- a/win32/kernel32.c
+++ b/win32/kernel32.c
@@ -53,7 +53,7 @@ static void _write_ftprolog(LPBYTE relayCode ,DWORD *targetTable) {
 	*x++	= 0x0f;*x++=0xb6;*x++=0xd1; /* movzbl edx,cl */
 	*x++	= 0x8B;*x++=0x14;*x++=0x95;*(DWORD**)x= targetTable;
 	x+=4;	/* mov edx, [4*edx + targetTable] */
-	*x++	= 0x68; *(DWORD*)x = (DWORD)GetProcAddress32(GetModuleHandle32A("KERNEL32"),"FT_Prolog");
+	*x++	= 0x68; *(DWORD*)x = (DWORD)GetProcAddress(GetModuleHandleA("KERNEL32"),"FT_Prolog");
 	x+=4; 	/* push FT_Prolog */
 	*x++	= 0xC3;		/* lret */
 	/* fill rest with 0xCC / int 3 */
@@ -80,7 +80,7 @@ static void _write_qtthunk(
 	*x++	= 0x8A;*x++=0x4D;*x++=0xFC; /* movb cl,[ebp-04] */
 	*x++	= 0x8B;*x++=0x14;*x++=0x8D;*(DWORD**)x= targetTable;
 	x+=4;	/* mov edx, [4*ecx + targetTable */
-	*x++	= 0xB8; *(DWORD*)x = (DWORD)GetProcAddress32(GetModuleHandle32A("KERNEL32"),"QT_Thunk");
+	*x++	= 0xB8; *(DWORD*)x = (DWORD)GetProcAddress(GetModuleHandleA("KERNEL32"),"QT_Thunk");
 	x+=4; 	/* mov eax , QT_Thunk */
 	*x++	= 0xFF; *x++ = 0xE0;	/* jmp eax */
 	/* should fill the rest of the 32 bytes with 0xCC */
@@ -93,7 +93,7 @@ static LPVOID _loadthunk(LPCSTR module, LPCSTR func, LPCSTR module32,
                          struct ThunkDataCommon *TD32, DWORD checksum)
 {
     struct ThunkDataCommon *TD16;
-    HMODULE32 hmod;
+    HMODULE hmod;
     int ordinal;
 
     if ((hmod = LoadLibrary16(module)) <= 32) 
@@ -158,24 +158,24 @@ LPVOID WINAPI GetThunkBuff(void)
  *		ThunkConnect32		(KERNEL32)
  * Connects a 32bit and a 16bit thunkbuffer.
  */
-UINT32 WINAPI ThunkConnect32( 
+UINT WINAPI ThunkConnect32( 
 	struct ThunkDataCommon *TD,  /* [in/out] thunkbuffer */
 	LPSTR thunkfun16,            /* [in] win16 thunkfunction */
 	LPSTR module16,              /* [in] name of win16 dll */
 	LPSTR module32,              /* [in] name of win32 dll */
-	HMODULE32 hmod32,            /* [in] hmodule of win32 dll */
+	HMODULE hmod32,            /* [in] hmodule of win32 dll */
 	DWORD dwReason               /* [in] initialisation argument */
 ) {
-    BOOL32 directionSL;
+    BOOL directionSL;
 
-    if (!lstrncmp32A(TD->magic, "SL01", 4))
+    if (!lstrncmpA(TD->magic, "SL01", 4))
     {
         directionSL = TRUE;
 
         TRACE(thunk, "SL01 thunk %s (%lx) <- %s (%s), Reason: %ld\n",
                      module32, (DWORD)TD, module16, thunkfun16, dwReason);
     }
-    else if (!lstrncmp32A(TD->magic, "LS01", 4))
+    else if (!lstrncmpA(TD->magic, "LS01", 4))
     {
         directionSL = FALSE;
 
@@ -478,7 +478,7 @@ DWORD WINAPI WOWCallback16(
  * RETURNS
  *	TRUE for success
  */
-BOOL32 WINAPI WOWCallback16Ex(
+BOOL WINAPI WOWCallback16Ex(
 	FARPROC16 vpfn16,	/* [in] win16 function to call */
 	DWORD dwFlags,		/* [in] flags */
 	DWORD cbArgs,		/* [in] nr of arguments */
@@ -687,13 +687,13 @@ LPVOID WINAPI ThunkInitLSF(
 	LPCSTR dll16,	/* [in] name of win16 dll */
 	LPCSTR dll32	/* [in] name of win32 dll */
 ) {
-	HMODULE32	hkrnl32 = GetModuleHandle32A("KERNEL32");
+	HMODULE	hkrnl32 = GetModuleHandleA("KERNEL32");
 	LPDWORD		addr,addr2;
 
 	/* FIXME: add checks for valid code ... */
 	/* write pointers to kernel32.89 and kernel32.90 (+ordinal base of 1) */
-	*(DWORD*)(thunk+0x35) = (DWORD)GetProcAddress32(hkrnl32,(LPSTR)90);
-	*(DWORD*)(thunk+0x6D) = (DWORD)GetProcAddress32(hkrnl32,(LPSTR)89);
+	*(DWORD*)(thunk+0x35) = (DWORD)GetProcAddress(hkrnl32,(LPSTR)90);
+	*(DWORD*)(thunk+0x6D) = (DWORD)GetProcAddress(hkrnl32,(LPSTR)89);
 
 	
 	if (!(addr = _loadthunk( dll16, thkbuf, dll32, NULL, len )))
@@ -793,7 +793,7 @@ VOID WINAPI ThunkInitSL(
  * RETURNS
  *	TRUE for success.
  */
-BOOL32 WINAPI SSInit()
+BOOL WINAPI SSInit16()
 {
     return TRUE;
 }
@@ -806,7 +806,7 @@ BOOL32 WINAPI SSInit()
  * RETURNS
  *	TRUE for success.
  */
-BOOL32 WINAPI SSOnBigStack()
+BOOL WINAPI SSOnBigStack()
 {
     TRACE(thunk, "Yes, thunking is initialized\n");
     return TRUE;
@@ -823,7 +823,7 @@ BOOL32 WINAPI SSOnBigStack()
 DWORD WINAPIV SSCall(
 	DWORD nr,	/* [in] number of argument bytes */
 	DWORD flags,	/* [in] FIXME: flags ? */
-	FARPROC32 fun,	/* [in] function to call */
+	FARPROC fun,	/* [in] function to call */
 	...		/* [in/out] arguments */
 ) {
     DWORD i,ret;
@@ -879,7 +879,7 @@ DWORD WINAPIV SSCall(
 REGS_ENTRYPOINT(W32S_BackTo32)
 {
     LPDWORD stack = (LPDWORD)ESP_reg( context );
-    FARPROC32 proc = (FARPROC32) stack[0];
+    FARPROC proc = (FARPROC) stack[0];
 
     EAX_reg( context ) = proc( stack[2], stack[3], stack[4], stack[5], stack[6],
                                stack[7], stack[8], stack[9], stack[10], stack[11] );
@@ -933,7 +933,7 @@ AllocSLCallback(
 	*x++=0x66;*x++=0x52;				/* pushl edx */
 	*x++=0xea;*(DWORD*)x=callback;x+=4;		/* jmpf callback */
 
-	*(PDB32**)(thunk+18) = PROCESS_Current();
+	*(PDB**)(thunk+18) = PROCESS_Current();
 
 	sel = SELECTOR_AllocBlock( thunk , 32, SEGMENT_CODE, FALSE, FALSE );
 	return (sel<<16)|0;
@@ -955,7 +955,7 @@ FreeSLCallback(
  * 		GetTEBSelectorFS	(KERNEL.475)
  * 	Set the 16-bit %fs to the 32-bit %fs (current TEB selector)
  */
-VOID WINAPI GetTEBSelectorFS( CONTEXT *context ) 
+VOID WINAPI GetTEBSelectorFS16( CONTEXT *context ) 
 {
     GET_FS( FS_reg(context) );
 }
@@ -968,36 +968,36 @@ VOID WINAPI GetTEBSelectorFS( CONTEXT *context )
  *  TRUE, if it is.
  *  FALSE if not.
  */
-BOOL16 WINAPI IsPeFormat(
+BOOL16 WINAPI IsPeFormat16(
 	LPSTR	fn,	/* [in] filename to executeable */
 	HFILE16 hf16	/* [in] open file, if filename is NULL */
 ) {
 	IMAGE_DOS_HEADER	mzh;
-        HFILE32                 hf=FILE_GetHandle32(hf16);
+        HFILE                 hf=FILE_GetHandle(hf16);
 	OFSTRUCT		ofs;
 	DWORD			xmagic;
 
 	if (fn) {
-		hf = OpenFile32(fn,&ofs,OF_READ);
-		if (hf==HFILE_ERROR32)
+		hf = OpenFile(fn,&ofs,OF_READ);
+		if (hf==HFILE_ERROR)
 			return FALSE;
 	}
-	_llseek32(hf,0,SEEK_SET);
-	if (sizeof(mzh)!=_lread32(hf,&mzh,sizeof(mzh))) {
-		_lclose32(hf);
+	_llseek(hf,0,SEEK_SET);
+	if (sizeof(mzh)!=_lread(hf,&mzh,sizeof(mzh))) {
+		_lclose(hf);
 		return FALSE;
 	}
 	if (mzh.e_magic!=IMAGE_DOS_SIGNATURE) {
 		WARN(dosmem,"File has not got dos signature!\n");
-		_lclose32(hf);
+		_lclose(hf);
 		return FALSE;
 	}
-	_llseek32(hf,mzh.e_lfanew,SEEK_SET);
-	if (sizeof(DWORD)!=_lread32(hf,&xmagic,sizeof(DWORD))) {
-		_lclose32(hf);
+	_llseek(hf,mzh.e_lfanew,SEEK_SET);
+	if (sizeof(DWORD)!=_lread(hf,&xmagic,sizeof(DWORD))) {
+		_lclose(hf);
 		return FALSE;
 	}
-	_lclose32(hf);
+	_lclose(hf);
 	return (xmagic == IMAGE_NT_SIGNATURE);
 }
 
@@ -1009,12 +1009,12 @@ BOOL16 WINAPI IsPeFormat(
  * RETURNS
  *	The new handle
  */
-HANDLE32 WINAPI WOWHandle32(
+HANDLE WINAPI WOWHandle32(
 	WORD handle,		/* [in] win16 handle */
 	WOW_HANDLE_TYPE type	/* [in] handle type */
 ) {
 	TRACE(win32,"(0x%04x,%d)\n",handle,type);
-	return (HANDLE32)handle;
+	return (HANDLE)handle;
 }
 
 /***********************************************************************
@@ -1115,8 +1115,8 @@ REGS_ENTRYPOINT(K32Thk1632Epilog)
 /***********************************************************************
  *           UpdateResource32A                 (KERNEL32.707)
  */
-BOOL32 WINAPI UpdateResource32A(
-  HANDLE32  hUpdate,
+BOOL WINAPI UpdateResourceA(
+  HANDLE  hUpdate,
   LPCSTR  lpType,
   LPCSTR  lpName,
   WORD    wLanguage,
@@ -1131,8 +1131,8 @@ BOOL32 WINAPI UpdateResource32A(
 /***********************************************************************
  *           UpdateResource32W                 (KERNEL32.708)
  */
-BOOL32 WINAPI UpdateResource32W(
-  HANDLE32  hUpdate,
+BOOL WINAPI UpdateResourceW(
+  HANDLE  hUpdate,
   LPCWSTR lpType,
   LPCWSTR lpName,
   WORD    wLanguage,
@@ -1148,7 +1148,7 @@ BOOL32 WINAPI UpdateResource32W(
 /***********************************************************************
  *           WaitNamedPipe32A                 [KERNEL32.725]
  */
-BOOL32 WINAPI WaitNamedPipe32A (LPCSTR lpNamedPipeName, DWORD nTimeOut)
+BOOL WINAPI WaitNamedPipeA (LPCSTR lpNamedPipeName, DWORD nTimeOut)
 {	FIXME (win32,"%s 0x%08lx\n",lpNamedPipeName,nTimeOut);
 	SetLastError(ERROR_PIPE_NOT_CONNECTED);
 	return FALSE;
@@ -1156,7 +1156,7 @@ BOOL32 WINAPI WaitNamedPipe32A (LPCSTR lpNamedPipeName, DWORD nTimeOut)
 /***********************************************************************
  *           WaitNamedPipe32W                 [KERNEL32.726]
  */
-BOOL32 WINAPI WaitNamedPipe32W (LPCWSTR lpNamedPipeName, DWORD nTimeOut)
+BOOL WINAPI WaitNamedPipeW (LPCWSTR lpNamedPipeName, DWORD nTimeOut)
 {	FIXME (win32,"%s 0x%08lx\n",debugstr_w(lpNamedPipeName),nTimeOut);
 	SetLastError(ERROR_PIPE_NOT_CONNECTED);
 	return FALSE;
@@ -1195,10 +1195,10 @@ BOOL32 WINAPI WaitNamedPipe32W (LPCWSTR lpNamedPipeName, DWORD nTimeOut)
  * determine if the file is an 16 or 32 bit Windows executable
  * by check the flags in the header.
  */
-BOOL32 WINAPI GetBinaryType32A (LPCSTR lpApplicationName, LPDWORD lpBinaryType)
+BOOL WINAPI GetBinaryTypeA (LPCSTR lpApplicationName, LPDWORD lpBinaryType)
 {
-	BOOL32 ret = FALSE;
-	HFILE32 hfile;
+	BOOL ret = FALSE;
+	HFILE hfile;
 	OFSTRUCT ofs;
 	IMAGE_DOS_HEADER mz_header;
 	char magic[4];
@@ -1214,26 +1214,26 @@ BOOL32 WINAPI GetBinaryType32A (LPCSTR lpApplicationName, LPDWORD lpBinaryType)
 
 	/* Open the file indicated by lpApplicationName for reading.
 	 */
-	hfile = OpenFile32( lpApplicationName, &ofs, OF_READ );
+	hfile = OpenFile( lpApplicationName, &ofs, OF_READ );
 
 	/* If we cannot read the file return failed.
 	 */
-	if( hfile == HFILE_ERROR32 )
+	if( hfile == HFILE_ERROR )
 	{
 		return FALSE;
 	}
 
 	/* Seek to the start of the file and read the DOS header information.
 	 */
-	if( _llseek32( hfile, 0, SEEK_SET ) >= 0  &&
-		_lread32( hfile, &mz_header, sizeof(mz_header) ) == sizeof(mz_header) )
+	if( _llseek( hfile, 0, SEEK_SET ) >= 0  &&
+		_lread( hfile, &mz_header, sizeof(mz_header) ) == sizeof(mz_header) )
 	{
 		/* Now that we have the header check the e_magic field
 		 * to see if this is a dos image.
 		 */
 		if( mz_header.e_magic == IMAGE_DOS_SIGNATURE )
 		{
-			BOOL32 lfanewValid = FALSE;
+			BOOL lfanewValid = FALSE;
 			/* We do have a DOS image so we will now try to seek into
 			 * the file by the amount indicated by the field
 			 * "Offset to extended header" and read in the
@@ -1252,8 +1252,8 @@ BOOL32 WINAPI GetBinaryType32A (LPCSTR lpApplicationName, LPDWORD lpBinaryType)
 					( mz_header.e_lfarlc >= sizeof(IMAGE_DOS_HEADER) ) )
 				{
 					if( mz_header.e_lfanew >= sizeof(IMAGE_DOS_HEADER) &&
-						_llseek32( hfile, mz_header.e_lfanew, SEEK_SET ) >= 0 &&
-						_lread32( hfile, magic, sizeof(magic) ) == sizeof(magic) )
+						_llseek( hfile, mz_header.e_lfanew, SEEK_SET ) >= 0 &&
+						_lread( hfile, magic, sizeof(magic) ) == sizeof(magic) )
 					{
 						lfanewValid = TRUE;
 					}
@@ -1295,7 +1295,7 @@ BOOL32 WINAPI GetBinaryType32A (LPCSTR lpApplicationName, LPDWORD lpBinaryType)
 					 * determine if it is a 16/32bit Windows executable.
 					 */
 					IMAGE_OS2_HEADER ne_header;
-					if( _lread32( hfile, &ne_header, sizeof(ne_header) ) == sizeof(ne_header) )
+					if( _lread( hfile, &ne_header, sizeof(ne_header) ) == sizeof(ne_header) )
 					{
 						/* Check the format flag to determine if it is
 						 * Win32 or not.
@@ -1333,9 +1333,9 @@ BOOL32 WINAPI GetBinaryType32A (LPCSTR lpApplicationName, LPDWORD lpBinaryType)
  *
  * See GetBinaryType32A.
  */
-BOOL32 WINAPI GetBinaryType32W (LPCWSTR lpApplicationName, LPDWORD lpBinaryType)
+BOOL WINAPI GetBinaryTypeW (LPCWSTR lpApplicationName, LPDWORD lpBinaryType)
 {
-	BOOL32 ret = FALSE;
+	BOOL ret = FALSE;
 	LPSTR strNew = NULL;
 	
 	TRACE (win32,"%s\n",debugstr_w(lpApplicationName));
@@ -1354,7 +1354,7 @@ BOOL32 WINAPI GetBinaryType32W (LPCWSTR lpApplicationName, LPDWORD lpBinaryType)
 
 	if( strNew != NULL )
 	{
-		ret = GetBinaryType32A( strNew, lpBinaryType );
+		ret = GetBinaryTypeA( strNew, lpBinaryType );
 
 		/* Free the allocated string.
 		 */
@@ -1381,5 +1381,5 @@ void WINAPI PK16FNF(LPSTR strPtr)
        FIXME(win32, "(%p): stub\n", strPtr);
 
        /* fill in a fake filename that'll be easy to recognize */
-       lstrcpy32A(strPtr, "WINESTUB.FIX");
+       lstrcpyA(strPtr, "WINESTUB.FIX");
 }
diff --git a/win32/newfns.c b/win32/newfns.c
index b65c9e382e2..501452542e0 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -19,7 +19,7 @@ at a later date. */
 /****************************************************************************
  *		UTRegister (KERNEL32.697)
  */
-BOOL32 WINAPI UTRegister(HMODULE32 hModule,
+BOOL WINAPI UTRegister(HMODULE hModule,
                       LPSTR lpsz16BITDLL,
                       LPSTR lpszInitName,
                       LPSTR lpszProcName,
@@ -34,7 +34,7 @@ BOOL32 WINAPI UTRegister(HMODULE32 hModule,
 /****************************************************************************
  *		UTUnRegister (KERNEL32.698)
  */
-BOOL32 WINAPI UTUnRegister(HMODULE32 hModule)
+BOOL WINAPI UTUnRegister(HMODULE hModule)
 {
     FIXME(updown, "(%#x...): stub\n", hModule);
     return TRUE;
@@ -44,7 +44,7 @@ BOOL32 WINAPI UTUnRegister(HMODULE32 hModule)
 /****************************************************************************
  *		QueryPerformanceCounter (KERNEL32.564)
  */
-BOOL32 WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter)
+BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter)
 {
     struct timeval tv;
 
@@ -57,7 +57,7 @@ BOOL32 WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter)
 /****************************************************************************
  *		QueryPerformanceFrequency (KERNEL32.565)
  */
-BOOL32 WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency)
+BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency)
 {
 	frequency->LowPart	= 1000000;
 	frequency->HighPart	= 0;
@@ -67,7 +67,7 @@ BOOL32 WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency)
 /****************************************************************************
  *		FlushInstructionCache (KERNEL32.261)
  */
-BOOL32 WINAPI FlushInstructionCache(DWORD x,DWORD y,DWORD z) {
+BOOL WINAPI FlushInstructionCache(DWORD x,DWORD y,DWORD z) {
 	FIXME(debug,"(0x%08lx,0x%08lx,0x%08lx): stub\n",x,y,z);
 	return TRUE;
 }
@@ -75,7 +75,7 @@ BOOL32 WINAPI FlushInstructionCache(DWORD x,DWORD y,DWORD z) {
 /***********************************************************************
  *           CreateNamedPipeA   (KERNEL32.168)
  */
-HANDLE32 WINAPI CreateNamedPipeA (LPCSTR lpName, DWORD dwOpenMode,
+HANDLE WINAPI CreateNamedPipeA (LPCSTR lpName, DWORD dwOpenMode,
 				  DWORD dwPipeMode, DWORD nMaxInstances,
 				  DWORD nOutBufferSize, DWORD nInBufferSize,
 				  DWORD nDefaultTimeOut,
@@ -91,13 +91,13 @@ HANDLE32 WINAPI CreateNamedPipeA (LPCSTR lpName, DWORD dwOpenMode,
   } */
 
   SetLastError (ERROR_UNKNOWN);
-  return INVALID_HANDLE_VALUE32;
+  return INVALID_HANDLE_VALUE;
 }
 
 /***********************************************************************
  *           CreateNamedPipeW   (KERNEL32.169)
  */
-HANDLE32 WINAPI CreateNamedPipeW (LPCWSTR lpName, DWORD dwOpenMode,
+HANDLE WINAPI CreateNamedPipeW (LPCWSTR lpName, DWORD dwOpenMode,
 				  DWORD dwPipeMode, DWORD nMaxInstances,
 				  DWORD nOutBufferSize, DWORD nInBufferSize,
 				  DWORD nDefaultTimeOut,
@@ -109,13 +109,13 @@ HANDLE32 WINAPI CreateNamedPipeW (LPCWSTR lpName, DWORD dwOpenMode,
 	 lpSecurityAttributes);
 
   SetLastError (ERROR_UNKNOWN);
-  return INVALID_HANDLE_VALUE32;
+  return INVALID_HANDLE_VALUE;
 }
 
 /***********************************************************************
  *           GetSystemPowerStatus      (KERNEL32.621)
  */
-BOOL32 WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS sps_ptr)
+BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS sps_ptr)
 {
     return FALSE;   /* no power management support */
 }
@@ -124,8 +124,8 @@ BOOL32 WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS sps_ptr)
 /***********************************************************************
  *           SetSystemPowerState      (KERNEL32.630)
  */
-BOOL32 WINAPI SetSystemPowerState(BOOL32 suspend_or_hibernate,
-                                  BOOL32 force_flag)
+BOOL WINAPI SetSystemPowerState(BOOL suspend_or_hibernate,
+                                  BOOL force_flag)
 {
     /* suspend_or_hibernate flag: w95 does not support
        this feature anyway */
@@ -146,7 +146,7 @@ BOOL32 WINAPI SetSystemPowerState(BOOL32 suspend_or_hibernate,
 /******************************************************************************
  * CreateMailslot32A [KERNEL32.164]
  */
-HANDLE32 WINAPI CreateMailslot32A( LPCSTR lpName, DWORD nMaxMessageSize,
+HANDLE WINAPI CreateMailslotA( LPCSTR lpName, DWORD nMaxMessageSize,
                                    DWORD lReadTimeout, LPSECURITY_ATTRIBUTES sa)
 {
     FIXME(win32, "(%s,%ld,%ld,%p): stub\n", debugstr_a(lpName),
@@ -168,7 +168,7 @@ HANDLE32 WINAPI CreateMailslot32A( LPCSTR lpName, DWORD nMaxMessageSize,
  *    Success: Handle to mailslot
  *    Failure: INVALID_HANDLE_VALUE
  */
-HANDLE32 WINAPI CreateMailslot32W( LPCWSTR lpName, DWORD nMaxMessageSize,
+HANDLE WINAPI CreateMailslotW( LPCWSTR lpName, DWORD nMaxMessageSize,
                                    DWORD lReadTimeout, LPSECURITY_ATTRIBUTES sa )
 {
     FIXME(win32, "(%s,%ld,%ld,%p): stub\n", debugstr_w(lpName), 
@@ -191,7 +191,7 @@ HANDLE32 WINAPI CreateMailslot32W( LPCWSTR lpName, DWORD nMaxMessageSize,
  *    Success: TRUE
  *    Failure: FALSE
  */
-BOOL32 WINAPI GetMailslotInfo( HANDLE32 hMailslot, LPDWORD lpMaxMessageSize,
+BOOL WINAPI GetMailslotInfo( HANDLE hMailslot, LPDWORD lpMaxMessageSize,
                                LPDWORD lpNextSize, LPDWORD lpMessageCount,
                                LPDWORD lpReadTimeout )
 {
@@ -210,7 +210,7 @@ BOOL32 WINAPI GetMailslotInfo( HANDLE32 hMailslot, LPDWORD lpMaxMessageSize,
  * NOTES
  *    This should call the W function below
  */
-DWORD WINAPI GetCompressedFileSize32A(
+DWORD WINAPI GetCompressedFileSizeA(
     LPCSTR lpFileName,
     LPDWORD lpFileSizeHigh)
 {
@@ -226,7 +226,7 @@ DWORD WINAPI GetCompressedFileSize32A(
  *    Success: Low-order doubleword of number of bytes
  *    Failure: 0xffffffff
  */
-DWORD WINAPI GetCompressedFileSize32W(
+DWORD WINAPI GetCompressedFileSizeW(
     LPCWSTR lpFileName,     /* [in]  Pointer to name of file */
     LPDWORD lpFileSizeHigh) /* [out] Receives high-order doubleword of size */
 {
@@ -295,7 +295,7 @@ VOID WINAPI SetDebugErrorLevel( DWORD dwLevel )
  *
  * RETURNS STD
  */
-BOOL32 WINAPI WaitForDebugEvent( LPDEBUG_EVENT lpDebugEvent, 
+BOOL WINAPI WaitForDebugEvent( LPDEBUG_EVENT lpDebugEvent, 
                                  DWORD dwMilliseconds )
 {
     FIXME(win32, "(%p,%ld): stub\n", lpDebugEvent, dwMilliseconds);
@@ -306,10 +306,10 @@ BOOL32 WINAPI WaitForDebugEvent( LPDEBUG_EVENT lpDebugEvent,
 /******************************************************************************
  * SetComputerName32A [KERNEL32.621]  
  */
-BOOL32 WINAPI SetComputerName32A( LPCSTR lpComputerName )
+BOOL WINAPI SetComputerNameA( LPCSTR lpComputerName )
 {
     LPWSTR lpComputerNameW = HEAP_strdupAtoW(GetProcessHeap(),0,lpComputerName);
-    BOOL32 ret = SetComputerName32W(lpComputerNameW);
+    BOOL ret = SetComputerNameW(lpComputerNameW);
     HeapFree(GetProcessHeap(),0,lpComputerNameW);
     return ret;
 }
@@ -323,14 +323,14 @@ BOOL32 WINAPI SetComputerName32A( LPCSTR lpComputerName )
  * 
  * RETURNS STD
  */
-BOOL32 WINAPI SetComputerName32W( LPCWSTR lpComputerName )
+BOOL WINAPI SetComputerNameW( LPCWSTR lpComputerName )
 {
     FIXME(win32, "(%s): stub\n", debugstr_w(lpComputerName));
     return TRUE;
 }
 
 
-BOOL32 WINAPI EnumPorts32A(LPSTR name,DWORD level,LPBYTE ports,DWORD bufsize,LPDWORD bufneeded,LPDWORD bufreturned) {
+BOOL WINAPI EnumPortsA(LPSTR name,DWORD level,LPBYTE ports,DWORD bufsize,LPDWORD bufneeded,LPDWORD bufreturned) {
 	FIXME(win32,"(%s,%ld,%p,%ld,%p,%p), stub!\n",name,level,ports,bufsize,bufneeded,bufreturned);
 	return FALSE;
 }
@@ -339,7 +339,7 @@ BOOL32 WINAPI EnumPorts32A(LPSTR name,DWORD level,LPBYTE ports,DWORD bufsize,LPD
  * IsDebuggerPresent [KERNEL32.827]
  *
  */
-BOOL32 WINAPI IsDebuggerPresent() {
+BOOL WINAPI IsDebuggerPresent() {
 	FIXME(win32," ... no debuggers yet, returning FALSE.\n");
 	return FALSE; 
 }
@@ -350,8 +350,8 @@ BOOL32 WINAPI IsDebuggerPresent() {
  * NOTES
  *    Return type should be HDESK
  */
-HANDLE32 WINAPI OpenDesktop32A( LPCSTR lpszDesktop, DWORD dwFlags, 
-                                BOOL32 fInherit, DWORD dwDesiredAccess )
+HANDLE WINAPI OpenDesktopA( LPCSTR lpszDesktop, DWORD dwFlags, 
+                                BOOL fInherit, DWORD dwDesiredAccess )
 {
     FIXME(win32,"(%s,%lx,%i,%lx): stub\n",debugstr_a(lpszDesktop),dwFlags,
           fInherit,dwDesiredAccess);
@@ -359,7 +359,7 @@ HANDLE32 WINAPI OpenDesktop32A( LPCSTR lpszDesktop, DWORD dwFlags,
 }
 
 
-BOOL32 WINAPI SetUserObjectInformation32A( HANDLE32 hObj, int nIndex, 
+BOOL WINAPI SetUserObjectInformationA( HANDLE hObj, int nIndex, 
                                            LPVOID pvInfo, DWORD nLength )
 {
     FIXME(win32,"(%x,%d,%p,%lx): stub\n",hObj,nIndex,pvInfo,nLength);
@@ -367,7 +367,7 @@ BOOL32 WINAPI SetUserObjectInformation32A( HANDLE32 hObj, int nIndex,
 }
 
 
-BOOL32 WINAPI SetThreadDesktop( HANDLE32 hDesktop )
+BOOL WINAPI SetThreadDesktop( HANDLE hDesktop )
 {
     FIXME(win32,"(%x): stub\n",hDesktop);
     return TRUE;
diff --git a/win32/ordinals.c b/win32/ordinals.c
index 01a76ef5cbb..732b543137d 100644
--- a/win32/ordinals.c
+++ b/win32/ordinals.c
@@ -20,7 +20,7 @@
 /**********************************************************************
  *           WOWGetDescriptor        (KERNEL32.88) (WOW32.1)
  */
-BOOL32 WINAPI WOWGetDescriptor(SEGPTR segptr,LPLDT_ENTRY ldtent)
+BOOL WINAPI WOWGetDescriptor(SEGPTR segptr,LPLDT_ENTRY ldtent)
 {
     return GetThreadSelectorEntry(GetCurrentThreadId(),segptr>>16,ldtent);
 }
@@ -32,7 +32,7 @@ BOOL32 WINAPI WOWGetDescriptor(SEGPTR segptr,LPLDT_ENTRY ldtent)
  */
 DWORD WINAPI GetProcessDword(DWORD processid,DWORD action)
 {
-	PDB32	*process = processid? PROCESS_IdToPDB( processid )
+	PDB	*process = processid? PROCESS_IdToPDB( processid )
                                     : PROCESS_Current();
 	TDB	*pTask;
 
@@ -69,7 +69,7 @@ DWORD WINAPI GetProcessDword(DWORD processid,DWORD action)
 	case 32:/* get showwindow flag from startupinfo */
 		return (DWORD)(process->env_db->startup_info->wShowWindow);
 	case 36:{/* return startup x and y sizes */
-		LPSTARTUPINFO32A si = process->env_db->startup_info;
+		LPSTARTUPINFOA si = process->env_db->startup_info;
 		DWORD x,y;
 
 		x=si->dwXSize;if (x==0x80000000) x=0x8000;
@@ -77,7 +77,7 @@ DWORD WINAPI GetProcessDword(DWORD processid,DWORD action)
 		return (y<<16)+x;
 	}
 	case 40:{/* return startup x and y */
-		LPSTARTUPINFO32A si = process->env_db->startup_info;
+		LPSTARTUPINFOA si = process->env_db->startup_info;
 		DWORD x,y;
 
 		x=si->dwX;if (x==0x80000000) x=0x8000;
@@ -105,7 +105,7 @@ DWORD WINAPI GetProcessDword(DWORD processid,DWORD action)
  */
 VOID WINAPI SetProcessDword(DWORD processid,DWORD action,DWORD value)
 {
-	PDB32	*process = processid? PROCESS_IdToPDB( processid )
+	PDB	*process = processid? PROCESS_IdToPDB( processid )
                                     : PROCESS_Current();
 
 	action+=56;
@@ -171,7 +171,7 @@ void WINAPI HouseCleanLogicallyDeadHandles(void)
 }
 
 
-BOOL32 WINAPI _KERNEL32_100(HANDLE32 threadid,DWORD exitcode,DWORD x) {
+BOOL WINAPI _KERNEL32_100(HANDLE threadid,DWORD exitcode,DWORD x) {
 	FIXME(thread,"(%d,%ld,0x%08lx): stub\n",threadid,exitcode,x);
 	return TRUE;
 }
@@ -223,7 +223,7 @@ HRESULT WINAPI DeregisterShellHookWindow ( DWORD u )
 /***********************************************************************
  *           RegisterTaskList32   			[USER23.436]
  */
-DWORD WINAPI RegisterTaskList32 (DWORD x)
+DWORD WINAPI RegisterTaskList (DWORD x)
 {	FIXME(win,"0x%08lx\n",x);
 	return TRUE;
 }
diff --git a/win32/process.c b/win32/process.c
index 3e466c3273a..d5e1379f716 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -22,7 +22,7 @@
 /**********************************************************************
  *  ContinueDebugEvent [KERNEL32.146]
  */
-BOOL32 WINAPI ContinueDebugEvent(DWORD pid,DWORD tid,DWORD contstatus) {
+BOOL WINAPI ContinueDebugEvent(DWORD pid,DWORD tid,DWORD contstatus) {
     FIXME(win32,"(0x%lx,%ld,%ld): stub\n",pid,tid,contstatus);
 	return TRUE;
 }
@@ -46,12 +46,12 @@ void Process_ClockTimeToFileTime( clock_t unix_time, LPFILETIME filetime )
     /* Yes, double, because long int might overflow here. */
 #if (SIZEOF_LONG_LONG >= 8)
     unsigned long long t = td;
-    filetime->dwLowDateTime  = (UINT32) t;
-    filetime->dwHighDateTime = (UINT32) (t >> 32);
+    filetime->dwLowDateTime  = (UINT) t;
+    filetime->dwHighDateTime = (UINT) (t >> 32);
 #else
     double divider = 1. * (1 << 16) * (1 << 16);
-    filetime->dwHighDateTime = (UINT32) (td / divider);
-    filetime->dwLowDateTime  = (UINT32) (td - filetime->dwHighDateTime*divider);
+    filetime->dwHighDateTime = (UINT) (td / divider);
+    filetime->dwLowDateTime  = (UINT) (td - filetime->dwHighDateTime*divider);
     /* using floor() produces wierd results, better leave this as it is 
      * ( with (UINT32) convertion )
      */
@@ -67,8 +67,8 @@ void Process_ClockTimeToFileTime( clock_t unix_time, LPFILETIME filetime )
  *                    Also, there is a need to separate times
  *                    used by different applications.
  */
-BOOL32 WINAPI GetProcessTimes(
-	HANDLE32 hprocess,LPFILETIME lpCreationTime,LPFILETIME lpExitTime,
+BOOL WINAPI GetProcessTimes(
+	HANDLE hprocess,LPFILETIME lpCreationTime,LPFILETIME lpExitTime,
 	LPFILETIME lpKernelTime, LPFILETIME lpUserTime
 ) {
 	struct tms tms;
diff --git a/win32/struct32.c b/win32/struct32.c
index 6750f58293b..22d872d7730 100644
--- a/win32/struct32.c
+++ b/win32/struct32.c
@@ -8,9 +8,9 @@
 #include "winerror.h"
 #include "debug.h"
 
-void STRUCT32_MSG16to32(const MSG16 *msg16,MSG32 *msg32)
+void STRUCT32_MSG16to32(const MSG16 *msg16,MSG *msg32)
 {
-	msg32->hwnd=(HWND32)msg16->hwnd;
+	msg32->hwnd=(HWND)msg16->hwnd;
 	msg32->message=msg16->message;
 	msg32->wParam=msg16->wParam;
 	msg32->lParam=msg16->lParam;
@@ -19,7 +19,7 @@ void STRUCT32_MSG16to32(const MSG16 *msg16,MSG32 *msg32)
 	msg32->pt.y=msg16->pt.y;
 }
 
-void STRUCT32_MSG32to16(const MSG32 *msg32,MSG16 *msg16)
+void STRUCT32_MSG32to16(const MSG *msg32,MSG16 *msg16)
 {
 	msg16->hwnd=(HWND16)msg32->hwnd;
 	msg16->message=msg32->message;
@@ -30,7 +30,7 @@ void STRUCT32_MSG32to16(const MSG32 *msg32,MSG16 *msg16)
 	msg16->pt.y=msg32->pt.y;
 }
 
-void STRUCT32_MINMAXINFO32to16( const MINMAXINFO32 *from, MINMAXINFO16 *to )
+void STRUCT32_MINMAXINFO32to16( const MINMAXINFO *from, MINMAXINFO16 *to )
 {
     CONV_POINT32TO16( &from->ptReserved,     &to->ptReserved );
     CONV_POINT32TO16( &from->ptMaxSize,      &to->ptMaxSize );
@@ -39,7 +39,7 @@ void STRUCT32_MINMAXINFO32to16( const MINMAXINFO32 *from, MINMAXINFO16 *to )
     CONV_POINT32TO16( &from->ptMaxTrackSize, &to->ptMaxTrackSize );
 }
 
-void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16 *from, MINMAXINFO32 *to )
+void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16 *from, MINMAXINFO *to )
 {
     CONV_POINT16TO32( &from->ptReserved,     &to->ptReserved );
     CONV_POINT16TO32( &from->ptMaxSize,      &to->ptMaxSize );
@@ -48,7 +48,7 @@ void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16 *from, MINMAXINFO32 *to )
     CONV_POINT16TO32( &from->ptMaxTrackSize, &to->ptMaxTrackSize );
 }
 
-void STRUCT32_WINDOWPOS32to16( const WINDOWPOS32* from, WINDOWPOS16* to )
+void STRUCT32_WINDOWPOS32to16( const WINDOWPOS* from, WINDOWPOS16* to )
 {
     to->hwnd            = (HWND16)from->hwnd;
     to->hwndInsertAfter = (HWND16)from->hwndInsertAfter;
@@ -59,18 +59,18 @@ void STRUCT32_WINDOWPOS32to16( const WINDOWPOS32* from, WINDOWPOS16* to )
     to->flags           = (UINT16)from->flags;
 }
 
-void STRUCT32_WINDOWPOS16to32( const WINDOWPOS16* from, WINDOWPOS32* to )
+void STRUCT32_WINDOWPOS16to32( const WINDOWPOS16* from, WINDOWPOS* to )
 {
-    to->hwnd            = (HWND32)from->hwnd;
-    to->hwndInsertAfter = (HWND32)from->hwndInsertAfter;
-    to->x               = (INT32)from->x;
-    to->y               = (INT32)from->y;
-    to->cx              = (INT32)from->cx;
-    to->cy              = (INT32)from->cy;
-    to->flags           = (UINT32)from->flags;
+    to->hwnd            = (HWND)from->hwnd;
+    to->hwndInsertAfter = (HWND)from->hwndInsertAfter;
+    to->x               = (INT)from->x;
+    to->y               = (INT)from->y;
+    to->cx              = (INT)from->cx;
+    to->cy              = (INT)from->cy;
+    to->flags           = (UINT)from->flags;
 }
 
-void STRUCT32_NCCALCSIZE32to16Flat( const NCCALCSIZE_PARAMS32* from,
+void STRUCT32_NCCALCSIZE32to16Flat( const NCCALCSIZE_PARAMS* from,
                                     NCCALCSIZE_PARAMS16* to, int validRects )
 {
     CONV_RECT32TO16( &from->rgrc[0], &to->rgrc[0] );
@@ -82,7 +82,7 @@ void STRUCT32_NCCALCSIZE32to16Flat( const NCCALCSIZE_PARAMS32* from,
 }
 
 void STRUCT32_NCCALCSIZE16to32Flat( const NCCALCSIZE_PARAMS16* from,
-                                    NCCALCSIZE_PARAMS32* to, int validRects )
+                                    NCCALCSIZE_PARAMS* to, int validRects )
 {
     CONV_RECT16TO32( &from->rgrc[0], &to->rgrc[0] );
     if (validRects)
@@ -93,7 +93,7 @@ void STRUCT32_NCCALCSIZE16to32Flat( const NCCALCSIZE_PARAMS16* from,
 }
 
 /* The strings are not copied */
-void STRUCT32_CREATESTRUCT32Ato16( const CREATESTRUCT32A* from,
+void STRUCT32_CREATESTRUCT32Ato16( const CREATESTRUCTA* from,
                                    CREATESTRUCT16* to )
 {
     to->lpCreateParams = from->lpCreateParams;
@@ -109,22 +109,22 @@ void STRUCT32_CREATESTRUCT32Ato16( const CREATESTRUCT32A* from,
 }
 
 void STRUCT32_CREATESTRUCT16to32A( const CREATESTRUCT16* from,
-                                   CREATESTRUCT32A *to )
+                                   CREATESTRUCTA *to )
 {
     to->lpCreateParams = from->lpCreateParams;
-    to->hInstance      = (HINSTANCE32)from->hInstance;
-    to->hMenu          = (HMENU32)from->hMenu;
-    to->hwndParent     = (HWND32)from->hwndParent;
-    to->cy             = (INT32)from->cy;
-    to->cx             = (INT32)from->cx;
-    to->y              = (INT32)from->y;
-    to->x              = (INT32)from->x;
+    to->hInstance      = (HINSTANCE)from->hInstance;
+    to->hMenu          = (HMENU)from->hMenu;
+    to->hwndParent     = (HWND)from->hwndParent;
+    to->cy             = (INT)from->cy;
+    to->cx             = (INT)from->cx;
+    to->y              = (INT)from->y;
+    to->x              = (INT)from->x;
     to->style          = from->style;
     to->dwExStyle      = from->dwExStyle;
 }
 
 /* The strings are not copied */
-void STRUCT32_MDICREATESTRUCT32Ato16( const MDICREATESTRUCT32A* from,
+void STRUCT32_MDICREATESTRUCT32Ato16( const MDICREATESTRUCTA* from,
                                       MDICREATESTRUCT16* to )
 {
     to->hOwner = (HINSTANCE16)from->hOwner;
@@ -137,13 +137,13 @@ void STRUCT32_MDICREATESTRUCT32Ato16( const MDICREATESTRUCT32A* from,
 }
 
 void STRUCT32_MDICREATESTRUCT16to32A( const MDICREATESTRUCT16* from,
-                                      MDICREATESTRUCT32A *to )
+                                      MDICREATESTRUCTA *to )
 {
-    to->hOwner = (HINSTANCE32)from->hOwner;
-    to->x      = (INT32)from->x;     
-    to->y      = (INT32)from->y;     
-    to->cx     = (INT32)from->cx;    
-    to->cy     = (INT32)from->cy;    
+    to->hOwner = (HINSTANCE)from->hOwner;
+    to->x      = (INT)from->x;     
+    to->y      = (INT)from->y;     
+    to->cx     = (INT)from->cx;    
+    to->cy     = (INT)from->cy;    
     to->style  = from->style; 
     to->lParam = from->lParam;
 }
diff --git a/win32/time.c b/win32/time.c
index f9c7dbeb7b5..f3b0fb297ad 100644
--- a/win32/time.c
+++ b/win32/time.c
@@ -62,7 +62,7 @@ VOID WINAPI GetSystemTime(LPSYSTEMTIME systime)
 /***********************************************************************
  *              SetSystemTime            (KERNEL32.507)
  */
-BOOL32 WINAPI SetSystemTime(const SYSTEMTIME *systime)
+BOOL WINAPI SetSystemTime(const SYSTEMTIME *systime)
 {
     struct timeval tv;
     struct timezone tz;
@@ -117,7 +117,7 @@ DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION tzinfo)
 /***********************************************************************
  *              SetTimeZoneInformation  (KERNEL32.515)
  */
-BOOL32 WINAPI SetTimeZoneInformation(const LPTIME_ZONE_INFORMATION tzinfo)
+BOOL WINAPI SetTimeZoneInformation(const LPTIME_ZONE_INFORMATION tzinfo)
 {
     struct timezone tz;
 
@@ -141,7 +141,7 @@ VOID WINAPI GetSystemTimeAsFileTime(LPFILETIME systemtimeAsfiletime) {
 /***********************************************************************
  *              SystemTimeToTzSpecificLocalTime32  (KERNEL32.683)
  */
-BOOL32 WINAPI SystemTimeToTzSpecificLocalTime32(
+BOOL WINAPI SystemTimeToTzSpecificLocalTime(
   LPTIME_ZONE_INFORMATION lpTimeZoneInformation,
   LPSYSTEMTIME lpUniversalTime,
   LPSYSTEMTIME lpLocalTime) {
diff --git a/windows/caret.c b/windows/caret.c
index a5f61cae364..b0f04d3bb00 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -12,16 +12,16 @@
 
 typedef struct
 {
-    HWND32     hwnd;
-    UINT32     hidden;
-    BOOL32     on;
-    INT32      x;
-    INT32      y;
-    INT32      width;
-    INT32      height;
+    HWND     hwnd;
+    UINT     hidden;
+    BOOL     on;
+    INT      x;
+    INT      y;
+    INT      width;
+    INT      height;
     HBRUSH16   hBrush;
-    UINT32     timeout;
-    UINT32     timerid;
+    UINT     timeout;
+    UINT     timerid;
 } CARET;
 
 typedef enum
@@ -36,7 +36,7 @@ static CARET Caret = { 0, 0, FALSE, 0, 0, 2, 12, 0, 500, 0 };
 /*****************************************************************
  *              CARET_GetHwnd
  */
-HWND32 CARET_GetHwnd(void)
+HWND CARET_GetHwnd(void)
 {
     return Caret.hwnd;
 }
@@ -44,7 +44,7 @@ HWND32 CARET_GetHwnd(void)
 /*****************************************************************
  *              CARET_GetRect
  */
-void CARET_GetRect(LPRECT32 lprc)
+void CARET_GetRect(LPRECT lprc)
 {
     lprc->right = (lprc->left = Caret.x) + Caret.width - 1;
     lprc->bottom = (lprc->top = Caret.y) + Caret.height - 1;
@@ -55,7 +55,7 @@ void CARET_GetRect(LPRECT32 lprc)
  */
 static void CARET_DisplayCaret( DISPLAY_CARET status )
 {
-    HDC32 hdc;
+    HDC hdc;
     HBRUSH16 hPrevBrush;
 
     if (Caret.on && (status == CARET_ON)) return;
@@ -65,18 +65,18 @@ static void CARET_DisplayCaret( DISPLAY_CARET status )
 
     Caret.on = !Caret.on;
     /* do not use DCX_CACHE here, for x,y,width,height are in logical units */
-    if (!(hdc = GetDCEx32( Caret.hwnd, 0, DCX_USESTYLE /*| DCX_CACHE*/ ))) return;
-    hPrevBrush = SelectObject32( hdc, Caret.hBrush );
-    PatBlt32( hdc, Caret.x, Caret.y, Caret.width, Caret.height, PATINVERT );
-    SelectObject32( hdc, hPrevBrush );
-    ReleaseDC32( Caret.hwnd, hdc );
+    if (!(hdc = GetDCEx( Caret.hwnd, 0, DCX_USESTYLE /*| DCX_CACHE*/ ))) return;
+    hPrevBrush = SelectObject( hdc, Caret.hBrush );
+    PatBlt( hdc, Caret.x, Caret.y, Caret.width, Caret.height, PATINVERT );
+    SelectObject( hdc, hPrevBrush );
+    ReleaseDC( Caret.hwnd, hdc );
 }
 
   
 /*****************************************************************
  *               CARET_Callback
  */
-static VOID CALLBACK CARET_Callback( HWND32 hwnd, UINT32 msg, UINT32 id, DWORD ctime)
+static VOID CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT id, DWORD ctime)
 {
     TRACE(caret,"hwnd=%04x, timerid=%d, caret=%d\n",
                   hwnd, id, Caret.on);
@@ -89,8 +89,8 @@ static VOID CALLBACK CARET_Callback( HWND32 hwnd, UINT32 msg, UINT32 id, DWORD c
  */
 static void CARET_SetTimer(void)
 {
-    if (Caret.timerid) KillSystemTimer32( (HWND32)0, Caret.timerid );
-    Caret.timerid = SetSystemTimer32( (HWND32)0, 0, Caret.timeout,
+    if (Caret.timerid) KillSystemTimer( (HWND)0, Caret.timerid );
+    Caret.timerid = SetSystemTimer( (HWND)0, 0, Caret.timeout,
                                       CARET_Callback );
 }
 
@@ -102,8 +102,8 @@ static void CARET_ResetTimer(void)
 {
     if (Caret.timerid) 
     {
-	KillSystemTimer32( (HWND32)0, Caret.timerid );
-	Caret.timerid = SetSystemTimer32( (HWND32)0, 0, Caret.timeout,
+	KillSystemTimer( (HWND)0, Caret.timerid );
+	Caret.timerid = SetSystemTimer( (HWND)0, 0, Caret.timeout,
                                           CARET_Callback );
     }
 }
@@ -116,7 +116,7 @@ static void CARET_KillTimer(void)
 {
     if (Caret.timerid) 
     {
-	KillSystemTimer32( (HWND32)0, Caret.timerid );
+	KillSystemTimer( (HWND)0, Caret.timerid );
 	Caret.timerid = 0;
     }
 }
@@ -128,21 +128,21 @@ static void CARET_KillTimer(void)
 void WINAPI CreateCaret16( HWND16 hwnd, HBITMAP16 bitmap,
                            INT16 width, INT16 height )
 {
-    CreateCaret32( hwnd, bitmap, width, height );
+    CreateCaret( hwnd, bitmap, width, height );
 }
 
 /*****************************************************************
  *           CreateCaret32   (USER32.66)
  */
-BOOL32 WINAPI CreateCaret32( HWND32 hwnd, HBITMAP32 bitmap,
-                             INT32 width, INT32 height )
+BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap,
+                             INT width, INT height )
 {
     TRACE(caret,"hwnd=%04x\n", hwnd);
 
     if (!hwnd) return FALSE;
 
     /* if cursor already exists, destroy it */
-    if (Caret.hwnd) DestroyCaret32();
+    if (Caret.hwnd) DestroyCaret();
 
     if (bitmap && (bitmap != 1))
     {
@@ -151,15 +151,15 @@ BOOL32 WINAPI CreateCaret32( HWND32 hwnd, HBITMAP32 bitmap,
         Caret.width = bmp.bmWidth;
         Caret.height = bmp.bmHeight;
         /* FIXME: we should make a copy of the bitmap instead of a brush */
-        Caret.hBrush = CreatePatternBrush32( bitmap );
+        Caret.hBrush = CreatePatternBrush( bitmap );
     }
     else
     {
-        Caret.width = width ? width : GetSystemMetrics32(SM_CXBORDER);
-        Caret.height = height ? height : GetSystemMetrics32(SM_CYBORDER);
-        Caret.hBrush = CreateSolidBrush32(bitmap ?
-                                          GetSysColor32(COLOR_GRAYTEXT) :
-                                          GetSysColor32(COLOR_WINDOW) );
+        Caret.width = width ? width : GetSystemMetrics(SM_CXBORDER);
+        Caret.height = height ? height : GetSystemMetrics(SM_CYBORDER);
+        Caret.hBrush = CreateSolidBrush(bitmap ?
+                                          GetSysColor(COLOR_GRAYTEXT) :
+                                          GetSysColor(COLOR_WINDOW) );
     }
 
     Caret.hwnd = hwnd;
@@ -168,7 +168,7 @@ BOOL32 WINAPI CreateCaret32( HWND32 hwnd, HBITMAP32 bitmap,
     Caret.x = 0;
     Caret.y = 0;
 
-    Caret.timeout = GetProfileInt32A( "windows", "CursorBlinkRate", 500 );
+    Caret.timeout = GetProfileIntA( "windows", "CursorBlinkRate", 500 );
     return TRUE;
 }
    
@@ -178,14 +178,14 @@ BOOL32 WINAPI CreateCaret32( HWND32 hwnd, HBITMAP32 bitmap,
  */
 void WINAPI DestroyCaret16(void)
 {
-    DestroyCaret32();
+    DestroyCaret();
 }
 
 
 /*****************************************************************
  *           DestroyCaret32   (USER32.131)
  */
-BOOL32 WINAPI DestroyCaret32(void)
+BOOL WINAPI DestroyCaret(void)
 {
     if (!Caret.hwnd) return FALSE;
 
@@ -194,7 +194,7 @@ BOOL32 WINAPI DestroyCaret32(void)
 
     CARET_KillTimer();
     CARET_DisplayCaret(CARET_OFF);
-    DeleteObject32( Caret.hBrush );
+    DeleteObject( Caret.hBrush );
     Caret.hwnd = 0;
     return TRUE;
 }
@@ -205,14 +205,14 @@ BOOL32 WINAPI DestroyCaret32(void)
  */
 void WINAPI SetCaretPos16( INT16 x, INT16 y )
 {
-    SetCaretPos32( x, y );
+    SetCaretPos( x, y );
 }
 
 
 /*****************************************************************
  *           SetCaretPos32   (USER32.466)
  */
-BOOL32 WINAPI SetCaretPos32( INT32 x, INT32 y)
+BOOL WINAPI SetCaretPos( INT x, INT y)
 {
     if (!Caret.hwnd) return FALSE;
     if ((x == Caret.x) && (y == Caret.y)) return TRUE;
@@ -237,14 +237,14 @@ BOOL32 WINAPI SetCaretPos32( INT32 x, INT32 y)
  */
 void WINAPI HideCaret16( HWND16 hwnd )
 {
-    HideCaret32( hwnd );
+    HideCaret( hwnd );
 }
 
 
 /*****************************************************************
  *           HideCaret32   (USER32.317)
  */
-BOOL32 WINAPI HideCaret32( HWND32 hwnd )
+BOOL WINAPI HideCaret( HWND hwnd )
 {
     if (!Caret.hwnd) return FALSE;
     if (hwnd && (Caret.hwnd != hwnd)) return FALSE;
@@ -264,14 +264,14 @@ BOOL32 WINAPI HideCaret32( HWND32 hwnd )
  */
 void WINAPI ShowCaret16( HWND16 hwnd )
 {
-    ShowCaret32( hwnd );
+    ShowCaret( hwnd );
 }
 
 
 /*****************************************************************
  *           ShowCaret32   (USER32.529)
  */
-BOOL32 WINAPI ShowCaret32( HWND32 hwnd )
+BOOL WINAPI ShowCaret( HWND hwnd )
 {
     if (!Caret.hwnd) return FALSE;
     if (hwnd && (Caret.hwnd != hwnd)) return FALSE;
@@ -297,13 +297,13 @@ BOOL32 WINAPI ShowCaret32( HWND32 hwnd )
  */
 void WINAPI SetCaretBlinkTime16( UINT16 msecs )
 {
-    SetCaretBlinkTime32( msecs );
+    SetCaretBlinkTime( msecs );
 }
 
 /*****************************************************************
  *           SetCaretBlinkTime32   (USER32.465)
  */
-BOOL32 WINAPI SetCaretBlinkTime32( UINT32 msecs )
+BOOL WINAPI SetCaretBlinkTime( UINT msecs )
 {
     if (!Caret.hwnd) return FALSE;
 
@@ -321,14 +321,14 @@ BOOL32 WINAPI SetCaretBlinkTime32( UINT32 msecs )
  */
 UINT16 WINAPI GetCaretBlinkTime16(void)
 {
-    return (UINT16)GetCaretBlinkTime32();
+    return (UINT16)GetCaretBlinkTime();
 }
 
 
 /*****************************************************************
  *           GetCaretBlinkTime32   (USER32.209)
  */
-UINT32 WINAPI GetCaretBlinkTime32(void)
+UINT WINAPI GetCaretBlinkTime(void)
 {
     return Caret.timeout;
 }
@@ -351,7 +351,7 @@ VOID WINAPI GetCaretPos16( LPPOINT16 pt )
 /*****************************************************************
  *           GetCaretPos32   (USER32.210)
  */
-BOOL32 WINAPI GetCaretPos32( LPPOINT32 pt )
+BOOL WINAPI GetCaretPos( LPPOINT pt )
 {
     if (!Caret.hwnd || !pt) return FALSE;
     pt->x = Caret.x;
diff --git a/windows/class.c b/windows/class.c
index 69db2210f69..ed39c794f3a 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -46,14 +46,14 @@ void CLASS_DumpClass( CLASS *ptr )
         return;
     }
 
-    GlobalGetAtomName32A( ptr->atomName, className, sizeof(className) );
+    GlobalGetAtomNameA( ptr->atomName, className, sizeof(className) );
 
     DUMP( "Class %p:\n", ptr );
     DUMP( "next=%p  name=%04x '%s'  style=%08x  wndProc=%08x\n"
              "inst=%04x  dce=%08x  icon=%04x  cursor=%04x  bkgnd=%04x\n"
              "clsExtra=%d  winExtra=%d  #windows=%d\n",
              ptr->next, ptr->atomName, className, ptr->style,
-             (UINT32)ptr->winproc, ptr->hInstance, (UINT32)ptr->dce,
+             (UINT)ptr->winproc, ptr->hInstance, (UINT)ptr->dce,
              ptr->hIcon, ptr->hCursor, ptr->hbrBackground,
              ptr->cbClsExtra, ptr->cbWndExtra, ptr->cWindows );
     if (ptr->cbClsExtra)
@@ -80,9 +80,9 @@ void CLASS_WalkClasses(void)
     DUMP( " Class   Name                  Style   WndProc\n" );
     for (ptr = firstClass; ptr; ptr = ptr->next)
     {
-        GlobalGetAtomName32A( ptr->atomName, className, sizeof(className) );
-        DUMP( "%08x %-20.20s %08x %08x\n", (UINT32)ptr, className,
-                 ptr->style, (UINT32)ptr->winproc );
+        GlobalGetAtomNameA( ptr->atomName, className, sizeof(className) );
+        DUMP( "%08x %-20.20s %08x %08x\n", (UINT)ptr, className,
+                 ptr->style, (UINT)ptr->winproc );
     }
     DUMP( "\n" );
 }
@@ -152,8 +152,8 @@ static void CLASS_SetMenuNameW( CLASS *classPtr, LPCWSTR name )
     if (HIWORD(classPtr->menuNameA)) SEGPTR_FREE( classPtr->menuNameA );
     if (classPtr->menuNameW) HeapFree( SystemHeap, 0, classPtr->menuNameW );
     if ((classPtr->menuNameW = HeapAlloc( SystemHeap, 0,
-                                         (lstrlen32W(name)+1)*sizeof(WCHAR) )))
-        lstrcpy32W( classPtr->menuNameW, name );
+                                         (lstrlenW(name)+1)*sizeof(WCHAR) )))
+        lstrcpyW( classPtr->menuNameW, name );
     classPtr->menuNameA = 0;
 }
 
@@ -221,8 +221,8 @@ static void CLASS_SetClassNameW( CLASS *classPtr, LPCWSTR name )
     if (HIWORD(classPtr->classNameA)) SEGPTR_FREE( classPtr->classNameA );
     if (classPtr->classNameW) HeapFree( SystemHeap, 0, classPtr->classNameW );
     if ((classPtr->classNameW = HeapAlloc( SystemHeap, 0,
-                                         (lstrlen32W(name)+1)*sizeof(WCHAR) )))
-        lstrcpy32W( classPtr->classNameW, name );
+                                         (lstrlenW(name)+1)*sizeof(WCHAR) )))
+        lstrcpyW( classPtr->classNameW, name );
     classPtr->classNameA = 0;
 }
 
@@ -232,7 +232,7 @@ static void CLASS_SetClassNameW( CLASS *classPtr, LPCWSTR name )
  *
  * Free a class structure.
  */
-static BOOL32 CLASS_FreeClass( CLASS *classPtr )
+static BOOL CLASS_FreeClass( CLASS *classPtr )
 {
     CLASS **ppClass;
     TRACE(class,"%p \n", classPtr);  
@@ -255,7 +255,7 @@ static BOOL32 CLASS_FreeClass( CLASS *classPtr )
     /* Delete the class */
 
     if (classPtr->dce) DCE_FreeDCE( classPtr->dce );
-    if (classPtr->hbrBackground) DeleteObject32( classPtr->hbrBackground );
+    if (classPtr->hbrBackground) DeleteObject( classPtr->hbrBackground );
     GlobalDeleteAtom( classPtr->atomName );
     CLASS_SetMenuNameA( classPtr, NULL );
     CLASS_SetClassNameA( classPtr, NULL );
@@ -292,7 +292,7 @@ void CLASS_FreeModuleClasses( HMODULE16 hModule )
  *  980805 a local class will be found now if registred with hInst=0
  *  and looed up with a hInst!=0. msmoney does it (jsch)
  */
-CLASS *CLASS_FindClassByAtom( ATOM atom, HINSTANCE32 hinstance )
+CLASS *CLASS_FindClassByAtom( ATOM atom, HINSTANCE hinstance )
 {   CLASS * class, *tclass=0;
 
     TRACE(class,"0x%08x 0x%08x\n", atom, hinstance);
@@ -342,9 +342,9 @@ CLASS *CLASS_FindClassByAtom( ATOM atom, HINSTANCE32 hinstance )
  *
  * The real RegisterClass() functionality.
  */
-static CLASS *CLASS_RegisterClass( ATOM atom, HINSTANCE32 hInstance,
-                                   DWORD style, INT32 classExtra,
-                                   INT32 winExtra, WNDPROC16 wndProc,
+static CLASS *CLASS_RegisterClass( ATOM atom, HINSTANCE hInstance,
+                                   DWORD style, INT classExtra,
+                                   INT winExtra, WNDPROC16 wndProc,
                                    WINDOWPROCTYPE wndProcType )
 {
     CLASS *classPtr;
@@ -449,13 +449,13 @@ bg=%04x style=%08x clsExt=%d winExt=%d class=%p name='%s'\n",
  *	>0: Unique identifier
  *	0: Failure
  */
-ATOM WINAPI RegisterClass32A(
-	    const WNDCLASS32A* wc /* Address of structure with class data */
+ATOM WINAPI RegisterClassA(
+	    const WNDCLASSA* wc /* Address of structure with class data */
 ) {
     ATOM atom;
     CLASS *classPtr;
 
-    if (!(atom = GlobalAddAtom32A( wc->lpszClassName ))) 
+    if (!(atom = GlobalAddAtomA( wc->lpszClassName ))) 
     {
         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
         return FALSE;
@@ -489,12 +489,12 @@ ATOM WINAPI RegisterClass32A(
 /***********************************************************************
  *           RegisterClass32W      (USER32.430)
  */
-ATOM WINAPI RegisterClass32W( const WNDCLASS32W* wc )
+ATOM WINAPI RegisterClassW( const WNDCLASSW* wc )
 {
     ATOM atom;
     CLASS *classPtr;
 
-    if (!(atom = GlobalAddAtom32W( wc->lpszClassName )))
+    if (!(atom = GlobalAddAtomW( wc->lpszClassName )))
     {
         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
         return FALSE;
@@ -564,12 +564,12 @@ ATOM WINAPI RegisterClassEx16( const WNDCLASSEX16 *wc )
 /***********************************************************************
  *           RegisterClassEx32A      (USER32.428)
  */
-ATOM WINAPI RegisterClassEx32A( const WNDCLASSEX32A* wc )
+ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
 {
     ATOM atom;
     CLASS *classPtr;
 
-    if (!(atom = GlobalAddAtom32A( wc->lpszClassName )))
+    if (!(atom = GlobalAddAtomA( wc->lpszClassName )))
     {
         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
         return FALSE;
@@ -602,12 +602,12 @@ ATOM WINAPI RegisterClassEx32A( const WNDCLASSEX32A* wc )
 /***********************************************************************
  *           RegisterClassEx32W      (USER32.429)
  */
-ATOM WINAPI RegisterClassEx32W( const WNDCLASSEX32W* wc )
+ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
 {
     ATOM atom;
     CLASS *classPtr;
 
-    if (!(atom = GlobalAddAtom32W( wc->lpszClassName )))
+    if (!(atom = GlobalAddAtomW( wc->lpszClassName )))
     {
         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
         return 0;
@@ -657,14 +657,14 @@ BOOL16 WINAPI UnregisterClass16( SEGPTR className, HINSTANCE16 hInstance )
  *           UnregisterClass32A    (USER32.563)
  *
  */
-BOOL32 WINAPI UnregisterClass32A( LPCSTR className, HINSTANCE32 hInstance )
+BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance )
 {   CLASS *classPtr;
     ATOM atom;
-    BOOL32 ret;
+    BOOL ret;
 
     TRACE(class,"%s %x\n",className, hInstance);
 
-    if (!(atom = GlobalFindAtom32A( className )))
+    if (!(atom = GlobalFindAtomA( className )))
     {
         SetLastError(ERROR_CLASS_DOES_NOT_EXIST);
         return FALSE;
@@ -683,14 +683,14 @@ BOOL32 WINAPI UnregisterClass32A( LPCSTR className, HINSTANCE32 hInstance )
 /***********************************************************************
  *           UnregisterClass32W    (USER32.564)
  */
-BOOL32 WINAPI UnregisterClass32W( LPCWSTR className, HINSTANCE32 hInstance )
+BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance )
 {   CLASS *classPtr;
     ATOM atom;
-    BOOL32 ret;
+    BOOL ret;
 
     TRACE(class,"%s %x\n",debugstr_w(className), hInstance);
 
-    if (!(atom = GlobalFindAtom32W( className )))
+    if (!(atom = GlobalFindAtomW( className )))
     {
         SetLastError(ERROR_CLASS_DOES_NOT_EXIST);
         return FALSE;
@@ -711,14 +711,14 @@ BOOL32 WINAPI UnregisterClass32W( LPCWSTR className, HINSTANCE32 hInstance )
  */
 WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset )
 {
-    return GetClassWord32( hwnd, offset );
+    return GetClassWord( hwnd, offset );
 }
 
 
 /***********************************************************************
  *           GetClassWord32    (USER32.219)
  */
-WORD WINAPI GetClassWord32( HWND32 hwnd, INT32 offset )
+WORD WINAPI GetClassWord( HWND hwnd, INT offset )
 {
     WND * wndPtr;
     
@@ -741,7 +741,7 @@ WORD WINAPI GetClassWord32( HWND32 hwnd, INT32 offset )
         case GCW_CBWNDEXTRA:
         case GCW_CBCLSEXTRA:
         case GCW_HMODULE:
-            return (WORD)GetClassLong32A( hwnd, offset );
+            return (WORD)GetClassLongA( hwnd, offset );
     }
 
     WARN(class, "Invalid offset %d\n", offset);
@@ -765,10 +765,10 @@ LONG WINAPI GetClassLong16( HWND16 hwnd, INT16 offset )
         if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0;
         return (LONG)WINPROC_GetProc( wndPtr->class->winproc, WIN_PROC_16 );
     case GCL_MENUNAME:
-        ret = GetClassLong32A( hwnd, offset );
+        ret = GetClassLongA( hwnd, offset );
         return (LONG)SEGPTR_GET( (void *)ret );
     default:
-        return GetClassLong32A( hwnd, offset );
+        return GetClassLongA( hwnd, offset );
     }
 }
 
@@ -776,7 +776,7 @@ LONG WINAPI GetClassLong16( HWND16 hwnd, INT16 offset )
 /***********************************************************************
  *           GetClassLong32A    (USER32.215)
  */
-LONG WINAPI GetClassLong32A( HWND32 hwnd, INT32 offset )
+LONG WINAPI GetClassLongA( HWND hwnd, INT offset )
 {
     WND * wndPtr;
     
@@ -803,7 +803,7 @@ LONG WINAPI GetClassLong32A( HWND32 hwnd, INT32 offset )
         case GCL_HCURSOR:
         case GCL_HICON:
         case GCL_HICONSM:
-            return GetClassWord32( hwnd, offset );
+            return GetClassWord( hwnd, offset );
     }
     WARN(class, "Invalid offset %d\n", offset);
     return 0;
@@ -813,7 +813,7 @@ LONG WINAPI GetClassLong32A( HWND32 hwnd, INT32 offset )
 /***********************************************************************
  *           GetClassLong32W    (USER32.216)
  */
-LONG WINAPI GetClassLong32W( HWND32 hwnd, INT32 offset )
+LONG WINAPI GetClassLongW( HWND hwnd, INT offset )
 {
     WND * wndPtr;
 
@@ -828,7 +828,7 @@ LONG WINAPI GetClassLong32W( HWND32 hwnd, INT32 offset )
         if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0;
         return (LONG)CLASS_GetMenuNameW( wndPtr->class );
     default:
-        return GetClassLong32A( hwnd, offset );
+        return GetClassLongA( hwnd, offset );
     }
 }
 
@@ -838,14 +838,14 @@ LONG WINAPI GetClassLong32W( HWND32 hwnd, INT32 offset )
  */
 WORD WINAPI SetClassWord16( HWND16 hwnd, INT16 offset, WORD newval )
 {
-    return SetClassWord32( hwnd, offset, newval );
+    return SetClassWord( hwnd, offset, newval );
 }
 
 
 /***********************************************************************
  *           SetClassWord32    (USER32.469)
  */
-WORD WINAPI SetClassWord32( HWND32 hwnd, INT32 offset, WORD newval )
+WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval )
 {
     WND * wndPtr;
     WORD retval = 0;
@@ -870,7 +870,7 @@ WORD WINAPI SetClassWord32( HWND32 hwnd, INT32 offset, WORD newval )
         case GCW_CBWNDEXTRA:
         case GCW_CBCLSEXTRA:
         case GCW_HMODULE:
-            return (WORD)SetClassLong32A( hwnd, offset, (LONG)newval );
+            return (WORD)SetClassLongA( hwnd, offset, (LONG)newval );
         case GCW_HBRBACKGROUND: ptr = &wndPtr->class->hbrBackground; break;
         case GCW_HCURSOR:       ptr = &wndPtr->class->hCursor; break;
         case GCW_HICON:         ptr = &wndPtr->class->hIcon; break;
@@ -915,9 +915,9 @@ LONG WINAPI SetClassLong16( HWND16 hwnd, INT16 offset, LONG newval )
                          WIN_PROC_16, WIN_PROC_CLASS );
         return retval;
     case GCL_MENUNAME:
-        return SetClassLong32A( hwnd, offset, (LONG)PTR_SEG_TO_LIN(newval) );
+        return SetClassLongA( hwnd, offset, (LONG)PTR_SEG_TO_LIN(newval) );
     default:
-        return SetClassLong32A( hwnd, offset, newval );
+        return SetClassLongA( hwnd, offset, newval );
     }
 }
 
@@ -925,7 +925,7 @@ LONG WINAPI SetClassLong16( HWND16 hwnd, INT16 offset, LONG newval )
 /***********************************************************************
  *           SetClassLong32A    (USER32.467)
  */
-LONG WINAPI SetClassLong32A( HWND32 hwnd, INT32 offset, LONG newval )
+LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval )
 {
     WND * wndPtr;
     LONG retval = 0;
@@ -959,7 +959,7 @@ LONG WINAPI SetClassLong32A( HWND32 hwnd, INT32 offset, LONG newval )
         case GCL_HCURSOR:
         case GCL_HICON:
         case GCL_HICONSM:
-            return SetClassWord32( hwnd, offset, (WORD)newval );
+            return SetClassWord( hwnd, offset, (WORD)newval );
         case GCL_STYLE:      ptr = &wndPtr->class->style; break;
         case GCL_CBWNDEXTRA: ptr = &wndPtr->class->cbWndExtra; break;
         case GCL_CBCLSEXTRA: ptr = &wndPtr->class->cbClsExtra; break;
@@ -977,7 +977,7 @@ LONG WINAPI SetClassLong32A( HWND32 hwnd, INT32 offset, LONG newval )
 /***********************************************************************
  *           SetClassLong32W    (USER32.468)
  */
-LONG WINAPI SetClassLong32W( HWND32 hwnd, INT32 offset, LONG newval )
+LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval )
 {
     WND *wndPtr;
     LONG retval;
@@ -997,7 +997,7 @@ LONG WINAPI SetClassLong32W( HWND32 hwnd, INT32 offset, LONG newval )
         CLASS_SetMenuNameW( wndPtr->class, (LPCWSTR)newval );
         return 0;  /* Old value is now meaningless anyway */
     default:
-        return SetClassLong32A( hwnd, offset, newval );
+        return SetClassLongA( hwnd, offset, newval );
     }
 }
 
@@ -1016,12 +1016,12 @@ INT16 WINAPI GetClassName16( HWND16 hwnd, LPSTR buffer, INT16 count )
 /***********************************************************************
  *           GetClassName32A      (USER32.217)
  */
-INT32 WINAPI GetClassName32A( HWND32 hwnd, LPSTR buffer, INT32 count )
-{   INT32 ret;
+INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count )
+{   INT ret;
     WND *wndPtr;
             
     if (!(wndPtr = WIN_FindWndPtr(hwnd))) return 0;
-    ret = GlobalGetAtomName32A( wndPtr->class->atomName, buffer, count );
+    ret = GlobalGetAtomNameA( wndPtr->class->atomName, buffer, count );
 
     TRACE(class,"%x %s %x\n",hwnd, buffer, count);
     return ret;
@@ -1031,12 +1031,12 @@ INT32 WINAPI GetClassName32A( HWND32 hwnd, LPSTR buffer, INT32 count )
 /***********************************************************************
  *           GetClassName32W      (USER32.218)
  */
-INT32 WINAPI GetClassName32W( HWND32 hwnd, LPWSTR buffer, INT32 count )
-{   INT32 ret;
+INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count )
+{   INT ret;
     WND *wndPtr;
 
     if (!(wndPtr = WIN_FindWndPtr(hwnd))) return 0;
-    ret = GlobalGetAtomName32W( wndPtr->class->atomName, buffer, count );
+    ret = GlobalGetAtomNameW( wndPtr->class->atomName, buffer, count );
 
     TRACE(class,"%x %s %x\n",hwnd, debugstr_w(buffer), count);
     
@@ -1083,8 +1083,8 @@ BOOL16 WINAPI GetClassInfo16( HINSTANCE16 hInstance, SEGPTR name,
 /***********************************************************************
  *           GetClassInfo32A      (USER32.211)
  */
-BOOL32 WINAPI GetClassInfo32A( HINSTANCE32 hInstance, LPCSTR name,
-                               WNDCLASS32A *wc )
+BOOL WINAPI GetClassInfoA( HINSTANCE hInstance, LPCSTR name,
+                               WNDCLASSA *wc )
 {
     ATOM atom;
     CLASS *classPtr;
@@ -1096,7 +1096,7 @@ BOOL32 WINAPI GetClassInfo32A( HINSTANCE32 hInstance, LPCSTR name,
     registred with hInstance=NULL in WINE because of the late loading
     of this dll. fixes file dialogs in WinWord95 (jsch)*/
 
-    if (!(atom=GlobalFindAtom32A(name)) || !(classPtr=CLASS_FindClassByAtom(atom,hInstance)))
+    if (!(atom=GlobalFindAtomA(name)) || !(classPtr=CLASS_FindClassByAtom(atom,hInstance)))
         return FALSE;
 
     if  (classPtr->hInstance && (hInstance != classPtr->hInstance))
@@ -1107,14 +1107,14 @@ BOOL32 WINAPI GetClassInfo32A( HINSTANCE32 hInstance, LPCSTR name,
     }
 
     wc->style         = classPtr->style;
-    wc->lpfnWndProc   = (WNDPROC32)WINPROC_GetProc( classPtr->winproc,
+    wc->lpfnWndProc   = (WNDPROC)WINPROC_GetProc( classPtr->winproc,
                                                     WIN_PROC_32A );
     wc->cbClsExtra    = classPtr->cbClsExtra;
     wc->cbWndExtra    = classPtr->cbWndExtra;
     wc->hInstance     = classPtr->hInstance;
-    wc->hIcon         = (HICON32)classPtr->hIcon;
-    wc->hCursor       = (HCURSOR32)classPtr->hCursor;
-    wc->hbrBackground = (HBRUSH32)classPtr->hbrBackground;
+    wc->hIcon         = (HICON)classPtr->hIcon;
+    wc->hCursor       = (HCURSOR)classPtr->hCursor;
+    wc->hbrBackground = (HBRUSH)classPtr->hbrBackground;
     wc->lpszMenuName  = CLASS_GetMenuNameA( classPtr );
     wc->lpszClassName = CLASS_GetClassNameA( classPtr );
     return TRUE;
@@ -1124,28 +1124,28 @@ BOOL32 WINAPI GetClassInfo32A( HINSTANCE32 hInstance, LPCSTR name,
 /***********************************************************************
  *           GetClassInfo32W      (USER32.214)
  */
-BOOL32 WINAPI GetClassInfo32W( HINSTANCE32 hInstance, LPCWSTR name,
-                               WNDCLASS32W *wc )
+BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name,
+                               WNDCLASSW *wc )
 {
     ATOM atom;
     CLASS *classPtr;
 
     TRACE(class,"%x %p %p\n",hInstance, name, wc);
 
-    if (!(atom = GlobalFindAtom32W( name )) ||
+    if (!(atom = GlobalFindAtomW( name )) ||
         !(classPtr = CLASS_FindClassByAtom( atom, hInstance )) ||
 	(classPtr->hInstance && (hInstance != classPtr->hInstance)))
         return FALSE;
 
     wc->style         = classPtr->style;
-    wc->lpfnWndProc   = (WNDPROC32)WINPROC_GetProc( classPtr->winproc,
+    wc->lpfnWndProc   = (WNDPROC)WINPROC_GetProc( classPtr->winproc,
                                                     WIN_PROC_32W );
     wc->cbClsExtra    = classPtr->cbClsExtra;
     wc->cbWndExtra    = classPtr->cbWndExtra;
     wc->hInstance     = classPtr->hInstance;
-    wc->hIcon         = (HICON32)classPtr->hIcon;
-    wc->hCursor       = (HCURSOR32)classPtr->hCursor;
-    wc->hbrBackground = (HBRUSH32)classPtr->hbrBackground;
+    wc->hIcon         = (HICON)classPtr->hIcon;
+    wc->hCursor       = (HCURSOR)classPtr->hCursor;
+    wc->hbrBackground = (HBRUSH)classPtr->hbrBackground;
     wc->lpszMenuName  = CLASS_GetMenuNameW( classPtr );
     wc->lpszClassName = CLASS_GetClassNameW( classPtr );
     return TRUE;
@@ -1193,27 +1193,27 @@ BOOL16 WINAPI GetClassInfoEx16( HINSTANCE16 hInstance, SEGPTR name,
 /***********************************************************************
  *           GetClassInfoEx32A      (USER32.212)
  */
-BOOL32 WINAPI GetClassInfoEx32A( HINSTANCE32 hInstance, LPCSTR name,
-                                 WNDCLASSEX32A *wc )
+BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name,
+                                 WNDCLASSEXA *wc )
 {
     ATOM atom;
     CLASS *classPtr;
 
     TRACE(class,"%x %p %p\n",hInstance, name, wc);
     
-    if (!(atom = GlobalFindAtom32A( name )) ||
+    if (!(atom = GlobalFindAtomA( name )) ||
         !(classPtr = CLASS_FindClassByAtom( atom, hInstance )) 
 	/*|| (hInstance != classPtr->hInstance) */ ) return FALSE;
     wc->style         = classPtr->style;
-    wc->lpfnWndProc   = (WNDPROC32)WINPROC_GetProc( classPtr->winproc,
+    wc->lpfnWndProc   = (WNDPROC)WINPROC_GetProc( classPtr->winproc,
                                                     WIN_PROC_32A );
     wc->cbClsExtra    = classPtr->cbClsExtra;
     wc->cbWndExtra    = classPtr->cbWndExtra;
     wc->hInstance     = classPtr->hInstance;
-    wc->hIcon         = (HICON32)classPtr->hIcon;
-    wc->hIconSm       = (HICON32)classPtr->hIconSm;
-    wc->hCursor       = (HCURSOR32)classPtr->hCursor;
-    wc->hbrBackground = (HBRUSH32)classPtr->hbrBackground;
+    wc->hIcon         = (HICON)classPtr->hIcon;
+    wc->hIconSm       = (HICON)classPtr->hIconSm;
+    wc->hCursor       = (HCURSOR)classPtr->hCursor;
+    wc->hbrBackground = (HBRUSH)classPtr->hbrBackground;
     wc->lpszMenuName  = CLASS_GetMenuNameA( classPtr );
     wc->lpszClassName  = CLASS_GetClassNameA( classPtr );
     return TRUE;
@@ -1223,27 +1223,27 @@ BOOL32 WINAPI GetClassInfoEx32A( HINSTANCE32 hInstance, LPCSTR name,
 /***********************************************************************
  *           GetClassInfoEx32W      (USER32.213)
  */
-BOOL32 WINAPI GetClassInfoEx32W( HINSTANCE32 hInstance, LPCWSTR name,
-                                 WNDCLASSEX32W *wc )
+BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name,
+                                 WNDCLASSEXW *wc )
 {
     ATOM atom;
     CLASS *classPtr;
 
     TRACE(class,"%x %p %p\n",hInstance, name, wc);
     
-    if (!(atom = GlobalFindAtom32W( name )) ||
+    if (!(atom = GlobalFindAtomW( name )) ||
         !(classPtr = CLASS_FindClassByAtom( atom, hInstance )) ||
         (hInstance != classPtr->hInstance)) return FALSE;
     wc->style         = classPtr->style;
-    wc->lpfnWndProc   = (WNDPROC32)WINPROC_GetProc( classPtr->winproc,
+    wc->lpfnWndProc   = (WNDPROC)WINPROC_GetProc( classPtr->winproc,
                                                     WIN_PROC_32W );
     wc->cbClsExtra    = classPtr->cbClsExtra;
     wc->cbWndExtra    = classPtr->cbWndExtra;
     wc->hInstance     = classPtr->hInstance;
-    wc->hIcon         = (HICON32)classPtr->hIcon;
-    wc->hIconSm       = (HICON32)classPtr->hIconSm;
-    wc->hCursor       = (HCURSOR32)classPtr->hCursor;
-    wc->hbrBackground = (HBRUSH32)classPtr->hbrBackground;
+    wc->hIcon         = (HICON)classPtr->hIcon;
+    wc->hIconSm       = (HICON)classPtr->hIconSm;
+    wc->hCursor       = (HCURSOR)classPtr->hCursor;
+    wc->hbrBackground = (HBRUSH)classPtr->hbrBackground;
     wc->lpszMenuName  = CLASS_GetMenuNameW( classPtr );
     wc->lpszClassName = CLASS_GetClassNameW( classPtr );;
     return TRUE;
@@ -1253,18 +1253,18 @@ BOOL32 WINAPI GetClassInfoEx32W( HINSTANCE32 hInstance, LPCWSTR name,
 /***********************************************************************
  *           ClassFirst      (TOOLHELP.69)
  */
-BOOL16 WINAPI ClassFirst( CLASSENTRY *pClassEntry )
+BOOL16 WINAPI ClassFirst16( CLASSENTRY *pClassEntry )
 {
     TRACE(class,"%p\n",pClassEntry);
     pClassEntry->wNext = 1;
-    return ClassNext( pClassEntry );
+    return ClassNext16( pClassEntry );
 }
 
 
 /***********************************************************************
  *           ClassNext      (TOOLHELP.70)
  */
-BOOL16 WINAPI ClassNext( CLASSENTRY *pClassEntry )
+BOOL16 WINAPI ClassNext16( CLASSENTRY *pClassEntry )
 {
     int i;
     CLASS *class = firstClass;
@@ -1280,7 +1280,7 @@ BOOL16 WINAPI ClassNext( CLASSENTRY *pClassEntry )
     }
     pClassEntry->hInst = class->hInstance;
     pClassEntry->wNext++;
-    GlobalGetAtomName32A( class->atomName, pClassEntry->szClassName,
+    GlobalGetAtomNameA( class->atomName, pClassEntry->szClassName,
                           sizeof(pClassEntry->szClassName) );
     return TRUE;
 }
diff --git a/windows/clipboard.c b/windows/clipboard.c
index d6753b5cccb..c7af89c26a9 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -34,34 +34,34 @@ extern CLIPBOARD_DRIVER TTYDRV_CLIPBOARD_Driver;
  */
 
 static HQUEUE16 hqClipLock   = 0;
-static BOOL32 bCBHasChanged  = FALSE;
+static BOOL bCBHasChanged  = FALSE;
 
-HWND32 hWndClipOwner  = 0;   /* current clipboard owner */
-HWND32 hWndClipWindow = 0;   /* window that opened clipboard */
-static HWND32 hWndViewer     = 0;   /* start of viewers chain */
+HWND hWndClipOwner  = 0;   /* current clipboard owner */
+HWND hWndClipWindow = 0;   /* window that opened clipboard */
+static HWND hWndViewer     = 0;   /* start of viewers chain */
 
 static WORD LastRegFormat = CF_REGFORMATBASE;
 
-CLIPFORMAT ClipFormats[16]  = {
-    { CF_TEXT, 1, 0, "Text", (HANDLE32)NULL, 0, NULL, &ClipFormats[1] , (HANDLE16)NULL},
-    { CF_BITMAP, 1, 0, "Bitmap", (HANDLE32)NULL, 0, &ClipFormats[0], &ClipFormats[2] , (HANDLE16)NULL},
-    { CF_METAFILEPICT, 1, 0, "MetaFile Picture", (HANDLE32)NULL, 0, &ClipFormats[1], &ClipFormats[3] , (HANDLE16)NULL},
-    { CF_SYLK, 1, 0, "Sylk", (HANDLE32)NULL, 0, &ClipFormats[2], &ClipFormats[4] , (HANDLE16)NULL},
-    { CF_DIF, 1, 0, "DIF", (HANDLE32)NULL, 0, &ClipFormats[3], &ClipFormats[5] , (HANDLE16)NULL},
-    { CF_TIFF, 1, 0, "TIFF", (HANDLE32)NULL, 0, &ClipFormats[4], &ClipFormats[6] , (HANDLE16)NULL},
-    { CF_OEMTEXT, 1, 0, "OEM Text", (HANDLE32)NULL, 0, &ClipFormats[5], &ClipFormats[7] , (HANDLE16)NULL},
-    { CF_DIB, 1, 0, "DIB", (HANDLE32)NULL, 0, &ClipFormats[6], &ClipFormats[8] , (HANDLE16)NULL},
-    { CF_PALETTE, 1, 0, "Palette", (HANDLE32)NULL, 0, &ClipFormats[7], &ClipFormats[9] , (HANDLE16)NULL},
-    { CF_PENDATA, 1, 0, "PenData", (HANDLE32)NULL, 0, &ClipFormats[8], &ClipFormats[10] , (HANDLE16)NULL},
-    { CF_RIFF, 1, 0, "RIFF", (HANDLE32)NULL, 0, &ClipFormats[9], &ClipFormats[11] , (HANDLE16)NULL},
-    { CF_WAVE, 1, 0, "Wave", (HANDLE32)NULL, 0, &ClipFormats[10], &ClipFormats[12] , (HANDLE16)NULL},
-    { CF_OWNERDISPLAY, 1, 0, "Owner Display", (HANDLE32)NULL, 0, &ClipFormats[11], &ClipFormats[13] , (HANDLE16)NULL},
-    { CF_DSPTEXT, 1, 0, "DSPText", (HANDLE32)NULL, 0, &ClipFormats[12], &ClipFormats[14] , (HANDLE16)NULL},
-    { CF_DSPMETAFILEPICT, 1, 0, "DSPMetaFile Picture", (HANDLE32)NULL, 0, &ClipFormats[13], &ClipFormats[15] , (HANDLE16)NULL},
-    { CF_DSPBITMAP, 1, 0, "DSPBitmap", (HANDLE32)NULL, 0, &ClipFormats[14], NULL , (HANDLE16)NULL}
+WINE_CLIPFORMAT ClipFormats[16]  = {
+    { CF_TEXT, 1, 0, "Text", (HANDLE)NULL, 0, NULL, &ClipFormats[1] , (HANDLE16)NULL},
+    { CF_BITMAP, 1, 0, "Bitmap", (HANDLE)NULL, 0, &ClipFormats[0], &ClipFormats[2] , (HANDLE16)NULL},
+    { CF_METAFILEPICT, 1, 0, "MetaFile Picture", (HANDLE)NULL, 0, &ClipFormats[1], &ClipFormats[3] , (HANDLE16)NULL},
+    { CF_SYLK, 1, 0, "Sylk", (HANDLE)NULL, 0, &ClipFormats[2], &ClipFormats[4] , (HANDLE16)NULL},
+    { CF_DIF, 1, 0, "DIF", (HANDLE)NULL, 0, &ClipFormats[3], &ClipFormats[5] , (HANDLE16)NULL},
+    { CF_TIFF, 1, 0, "TIFF", (HANDLE)NULL, 0, &ClipFormats[4], &ClipFormats[6] , (HANDLE16)NULL},
+    { CF_OEMTEXT, 1, 0, "OEM Text", (HANDLE)NULL, 0, &ClipFormats[5], &ClipFormats[7] , (HANDLE16)NULL},
+    { CF_DIB, 1, 0, "DIB", (HANDLE)NULL, 0, &ClipFormats[6], &ClipFormats[8] , (HANDLE16)NULL},
+    { CF_PALETTE, 1, 0, "Palette", (HANDLE)NULL, 0, &ClipFormats[7], &ClipFormats[9] , (HANDLE16)NULL},
+    { CF_PENDATA, 1, 0, "PenData", (HANDLE)NULL, 0, &ClipFormats[8], &ClipFormats[10] , (HANDLE16)NULL},
+    { CF_RIFF, 1, 0, "RIFF", (HANDLE)NULL, 0, &ClipFormats[9], &ClipFormats[11] , (HANDLE16)NULL},
+    { CF_WAVE, 1, 0, "Wave", (HANDLE)NULL, 0, &ClipFormats[10], &ClipFormats[12] , (HANDLE16)NULL},
+    { CF_OWNERDISPLAY, 1, 0, "Owner Display", (HANDLE)NULL, 0, &ClipFormats[11], &ClipFormats[13] , (HANDLE16)NULL},
+    { CF_DSPTEXT, 1, 0, "DSPText", (HANDLE)NULL, 0, &ClipFormats[12], &ClipFormats[14] , (HANDLE16)NULL},
+    { CF_DSPMETAFILEPICT, 1, 0, "DSPMetaFile Picture", (HANDLE)NULL, 0, &ClipFormats[13], &ClipFormats[15] , (HANDLE16)NULL},
+    { CF_DSPBITMAP, 1, 0, "DSPBitmap", (HANDLE)NULL, 0, &ClipFormats[14], NULL , (HANDLE16)NULL}
     };
 
-static LPCLIPFORMAT __lookup_format( LPCLIPFORMAT lpFormat, WORD wID )
+static LPWINE_CLIPFORMAT __lookup_format( LPWINE_CLIPFORMAT lpFormat, WORD wID )
 {
     while(TRUE)
     {
@@ -98,7 +98,7 @@ void CLIPBOARD_ResetLock( HQUEUE16 hqCurrent, HQUEUE16 hqNew )
 	{
  	    hWndClipOwner = 0;
 	    hWndClipWindow = 0;
-	    EmptyClipboard32();
+	    EmptyClipboard();
 	    hqClipLock = 0;
 	}
     }
@@ -108,13 +108,13 @@ void CLIPBOARD_ResetLock( HQUEUE16 hqCurrent, HQUEUE16 hqNew )
 /**************************************************************************
  *			CLIPBOARD_DeleteRecord
  */
-void CLIPBOARD_DeleteRecord(LPCLIPFORMAT lpFormat, BOOL32 bChange)
+void CLIPBOARD_DeleteRecord(LPWINE_CLIPFORMAT lpFormat, BOOL bChange)
 {
     if( (lpFormat->wFormatID >= CF_GDIOBJFIRST &&
 	 lpFormat->wFormatID <= CF_GDIOBJLAST) || lpFormat->wFormatID == CF_BITMAP )
     {
       if (lpFormat->hData32)
-	DeleteObject32(lpFormat->hData32);
+	DeleteObject(lpFormat->hData32);
       if (lpFormat->hData16)
 	DeleteObject16(lpFormat->hData16);
     }
@@ -122,8 +122,8 @@ void CLIPBOARD_DeleteRecord(LPCLIPFORMAT lpFormat, BOOL32 bChange)
     {
       if (lpFormat->hData32)
       {
-        DeleteMetaFile32( ((METAFILEPICT32 *)GlobalLock32( lpFormat->hData32 ))->hMF );
-	GlobalFree32(lpFormat->hData32);
+        DeleteMetaFile( ((METAFILEPICT *)GlobalLock( lpFormat->hData32 ))->hMF );
+	GlobalFree(lpFormat->hData32);
 	if (lpFormat->hData16)
 	  /* HMETAFILE16 and HMETAFILE32 are apparently the same thing, 
 	     and a shallow copy is enough to share a METAFILEPICT
@@ -140,7 +140,7 @@ void CLIPBOARD_DeleteRecord(LPCLIPFORMAT lpFormat, BOOL32 bChange)
     else 
     {
       if (lpFormat->hData32)
-	GlobalFree32(lpFormat->hData32);
+	GlobalFree(lpFormat->hData32);
       if (lpFormat->hData16)
 	GlobalFree16(lpFormat->hData16);
     }
@@ -155,7 +155,7 @@ void CLIPBOARD_DeleteRecord(LPCLIPFORMAT lpFormat, BOOL32 bChange)
 /**************************************************************************
  *			CLIPBOARD_IsPresent
  */
-BOOL32 CLIPBOARD_IsPresent(WORD wFormat)
+BOOL CLIPBOARD_IsPresent(WORD wFormat)
 {
     /* special case */
 
@@ -164,7 +164,7 @@ BOOL32 CLIPBOARD_IsPresent(WORD wFormat)
                ClipFormats[CF_OEMTEXT-1].wDataPresent;
     else
     {
-	LPCLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
+	LPWINE_CLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
 	if( lpFormat ) return (lpFormat->wDataPresent);
     }
     return FALSE;
@@ -175,7 +175,7 @@ BOOL32 CLIPBOARD_IsPresent(WORD wFormat)
  */
 BOOL16 WINAPI OpenClipboard16( HWND16 hWnd )
 {
-    return OpenClipboard32( hWnd );
+    return OpenClipboard( hWnd );
 }
 
 
@@ -184,15 +184,15 @@ BOOL16 WINAPI OpenClipboard16( HWND16 hWnd )
  *
  * Note: Netscape uses NULL hWnd to open the clipboard.
  */
-BOOL32 WINAPI OpenClipboard32( HWND32 hWnd )
+BOOL WINAPI OpenClipboard( HWND hWnd )
 {
-    BOOL32 bRet;
+    BOOL bRet;
 
     TRACE(clipboard,"(%04x)...\n", hWnd);
 
     if (!hqClipLock)
     {
-	 hqClipLock = GetFastQueue();
+	 hqClipLock = GetFastQueue16();
     	 hWndClipWindow = hWnd;
 	 bCBHasChanged = FALSE;
 	 bRet = TRUE;
@@ -209,18 +209,18 @@ BOOL32 WINAPI OpenClipboard32( HWND32 hWnd )
  */
 BOOL16 WINAPI CloseClipboard16(void)
 {
-    return CloseClipboard32();
+    return CloseClipboard();
 }
 
 
 /**************************************************************************
  *            CloseClipboard32   (USER32.54)
  */
-BOOL32 WINAPI CloseClipboard32(void)
+BOOL WINAPI CloseClipboard(void)
 {
     TRACE(clipboard,"!\n");
 
-    if (hqClipLock == GetFastQueue())
+    if (hqClipLock == GetFastQueue16())
     {
 	hWndClipWindow = 0;
 
@@ -237,20 +237,20 @@ BOOL32 WINAPI CloseClipboard32(void)
  */
 BOOL16 WINAPI EmptyClipboard16(void)
 {
-    return EmptyClipboard32();
+    return EmptyClipboard();
 }
 
 
 /**************************************************************************
  *            EmptyClipboard32   (USER32.169)
  */
-BOOL32 WINAPI EmptyClipboard32(void)
+BOOL WINAPI EmptyClipboard(void)
 {
-    LPCLIPFORMAT lpFormat = ClipFormats; 
+    LPWINE_CLIPFORMAT lpFormat = ClipFormats; 
 
     TRACE(clipboard,"(void)\n");
 
-    if (hqClipLock != GetFastQueue()) return FALSE;
+    if (hqClipLock != GetFastQueue16()) return FALSE;
 
     /* destroy private objects */
 
@@ -285,7 +285,7 @@ HWND16 WINAPI GetClipboardOwner16(void)
 /**************************************************************************
  *            GetClipboardOwner32   (USER32.225)
  */
-HWND32 WINAPI GetClipboardOwner32(void)
+HWND WINAPI GetClipboardOwner(void)
 {
     return hWndClipOwner;
 }
@@ -296,7 +296,7 @@ HWND32 WINAPI GetClipboardOwner32(void)
  */
 HANDLE16 WINAPI SetClipboardData16( UINT16 wFormat, HANDLE16 hData )
 {
-    LPCLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
+    LPWINE_CLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
 
     TRACE(clipboard, "(%04X, %04x) !\n", wFormat, hData);
 
@@ -307,7 +307,7 @@ HANDLE16 WINAPI SetClipboardData16( UINT16 wFormat, HANDLE16 hData )
      *  adding new data).
      */
 
-    if( (hqClipLock != GetFastQueue()) || !lpFormat ||
+    if( (hqClipLock != GetFastQueue16()) || !lpFormat ||
 	(!hData && (!hWndClipOwner || (hWndClipOwner != hWndClipWindow))) ) return 0; 
 
     CLIPBOARD_GetDriver()->pSetClipboardData(wFormat);
@@ -342,9 +342,9 @@ HANDLE16 WINAPI SetClipboardData16( UINT16 wFormat, HANDLE16 hData )
 /**************************************************************************
  *            SetClipboardData32   (USER32.470)
  */
-HANDLE32 WINAPI SetClipboardData32( UINT32 wFormat, HANDLE32 hData )
+HANDLE WINAPI SetClipboardData( UINT wFormat, HANDLE hData )
 {
-    LPCLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
+    LPWINE_CLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
 
     TRACE(clipboard, "(%08X, %08x) !\n", wFormat, hData);
 
@@ -355,7 +355,7 @@ HANDLE32 WINAPI SetClipboardData32( UINT32 wFormat, HANDLE32 hData )
      *  adding new data).
      */
 
-    if( (hqClipLock != GetFastQueue()) || !lpFormat ||
+    if( (hqClipLock != GetFastQueue16()) || !lpFormat ||
 	(!hData && (!hWndClipOwner || (hWndClipOwner != hWndClipWindow))) ) return 0; 
 
     CLIPBOARD_GetDriver()->pSetClipboardData(wFormat);
@@ -390,11 +390,11 @@ HANDLE32 WINAPI SetClipboardData32( UINT32 wFormat, HANDLE32 hData )
 /**************************************************************************
  *                      CLIPBOARD_RenderFormat
  */
-static BOOL32 CLIPBOARD_RenderFormat(LPCLIPFORMAT lpFormat)
+static BOOL CLIPBOARD_RenderFormat(LPWINE_CLIPFORMAT lpFormat)
 {
   if( lpFormat->wDataPresent && !lpFormat->hData16 && !lpFormat->hData32 )
   {
-    if( IsWindow32(hWndClipOwner) )
+    if( IsWindow(hWndClipOwner) )
       SendMessage16(hWndClipOwner,WM_RENDERFORMAT,
 		    (WPARAM16)lpFormat->wFormatID,0L);
     else
@@ -413,7 +413,7 @@ static BOOL32 CLIPBOARD_RenderFormat(LPCLIPFORMAT lpFormat)
  *
  * Convert text between UNIX and DOS formats.
  */
-static BOOL32 CLIPBOARD_RenderText(LPCLIPFORMAT lpTarget, LPCLIPFORMAT lpSource)
+static BOOL CLIPBOARD_RenderText(LPWINE_CLIPFORMAT lpTarget, LPWINE_CLIPFORMAT lpSource)
 {
     UINT16 size;
     LPCSTR lpstrS; 
@@ -421,8 +421,8 @@ static BOOL32 CLIPBOARD_RenderText(LPCLIPFORMAT lpTarget, LPCLIPFORMAT lpSource)
 
     if (lpSource->hData32)
     {
-      size = GlobalSize32( lpSource->hData32 );
-      lpstrS = (LPSTR)GlobalLock32(lpSource->hData32);
+      size = GlobalSize( lpSource->hData32 );
+      lpstrS = (LPSTR)GlobalLock(lpSource->hData32);
     }
     else
     {
@@ -434,19 +434,19 @@ static BOOL32 CLIPBOARD_RenderText(LPCLIPFORMAT lpTarget, LPCLIPFORMAT lpSource)
     TRACE(clipboard,"\tconverting from '%s' to '%s', %i chars\n",
 			   	      lpSource->Name, lpTarget->Name, size);
 
-    lpTarget->hData32 = GlobalAlloc32(GMEM_ZEROINIT, size); 
-    lpstrT = (LPSTR)GlobalLock32(lpTarget->hData32);
+    lpTarget->hData32 = GlobalAlloc(GMEM_ZEROINIT, size); 
+    lpstrT = (LPSTR)GlobalLock(lpTarget->hData32);
 
     if( lpstrT )
     {
 	if( lpSource->wFormatID == CF_TEXT )
-	    CharToOemBuff32A(lpstrS, lpstrT, size);
+	    CharToOemBuffA(lpstrS, lpstrT, size);
 	else
-	    OemToCharBuff32A(lpstrS, lpstrT, size);
+	    OemToCharBuffA(lpstrS, lpstrT, size);
 	TRACE(clipboard,"\tgot %s\n", lpstrT);
-	GlobalUnlock32(lpTarget->hData32);
+	GlobalUnlock(lpTarget->hData32);
 	if (lpSource->hData32)
-	  GlobalUnlock32(lpSource->hData32);
+	  GlobalUnlock(lpSource->hData32);
 	else
 	  GlobalUnlock16(lpSource->hData16);
 	return TRUE;
@@ -454,7 +454,7 @@ static BOOL32 CLIPBOARD_RenderText(LPCLIPFORMAT lpTarget, LPCLIPFORMAT lpSource)
 
     lpTarget->hData32 = 0;
     if (lpSource->hData32)
-      GlobalUnlock32(lpSource->hData32);
+      GlobalUnlock(lpSource->hData32);
     else
       GlobalUnlock16(lpSource->hData16);
     return FALSE;
@@ -465,10 +465,10 @@ static BOOL32 CLIPBOARD_RenderText(LPCLIPFORMAT lpTarget, LPCLIPFORMAT lpSource)
  */
 HANDLE16 WINAPI GetClipboardData16( UINT16 wFormat )
 {
-    LPCLIPFORMAT lpRender = ClipFormats; 
-    LPCLIPFORMAT lpUpdate = NULL;
+    LPWINE_CLIPFORMAT lpRender = ClipFormats; 
+    LPWINE_CLIPFORMAT lpUpdate = NULL;
 
-    if (hqClipLock != GetFastQueue()) return 0;
+    if (hqClipLock != GetFastQueue16()) return 0;
 
     TRACE(clipboard,"(%04X)\n", wFormat);
 
@@ -504,7 +504,7 @@ HANDLE16 WINAPI GetClipboardData16( UINT16 wFormat )
       if( lpUpdate->wFormatID == CF_METAFILEPICT )
 	size = sizeof( METAFILEPICT16 );
       else
-	size = GlobalSize32(lpUpdate->hData32);
+	size = GlobalSize(lpUpdate->hData32);
       lpUpdate->hData16 = GlobalAlloc16(GMEM_ZEROINIT, size);
       if( !lpUpdate->hData16 )
 	ERR(clipboard, "(%04X) -- not enough memory in 16b heap\n", wFormat);
@@ -516,17 +516,17 @@ HANDLE16 WINAPI GetClipboardData16( UINT16 wFormat )
 	FIXME(clipboard,"\tin the appropriate file.\n");
 #ifdef SOMEONE_IMPLEMENTED_ME
 	CopyMetaFilePict32to16( GlobalLock16(lpUpdate->hData16), 
-			        GlobalLock32(lpUpdate->hData32) );
+			        GlobalLock(lpUpdate->hData32) );
 #endif
       }
       else
       {
 	memcpy( GlobalLock16(lpUpdate->hData16), 
-		GlobalLock32(lpUpdate->hData32), 
+		GlobalLock(lpUpdate->hData32), 
 		size );
       }
 	GlobalUnlock16(lpUpdate->hData16);
-	GlobalUnlock32(lpUpdate->hData32);
+	GlobalUnlock(lpUpdate->hData32);
       }
     }
 
@@ -539,12 +539,12 @@ HANDLE16 WINAPI GetClipboardData16( UINT16 wFormat )
 /**************************************************************************
  *             GetClipboardData32   (USER32.222)
  */
-HANDLE32 WINAPI GetClipboardData32( UINT32 wFormat )
+HANDLE WINAPI GetClipboardData( UINT wFormat )
 {
-    LPCLIPFORMAT lpRender = ClipFormats; 
-    LPCLIPFORMAT lpUpdate = NULL;
+    LPWINE_CLIPFORMAT lpRender = ClipFormats; 
+    LPWINE_CLIPFORMAT lpUpdate = NULL;
 
-    if (hqClipLock != GetFastQueue()) return 0;
+    if (hqClipLock != GetFastQueue16()) return 0;
 
     TRACE(clipboard,"(%08X)\n", wFormat);
 
@@ -578,26 +578,26 @@ HANDLE32 WINAPI GetClipboardData32( UINT32 wFormat )
     {
       int size;
       if( lpUpdate->wFormatID == CF_METAFILEPICT )
-	size = sizeof( METAFILEPICT32 );
+	size = sizeof( METAFILEPICT );
       else
 	size = GlobalSize16(lpUpdate->hData16);
-      lpUpdate->hData32 = GlobalAlloc32(GMEM_ZEROINIT, size); 
+      lpUpdate->hData32 = GlobalAlloc(GMEM_ZEROINIT, size); 
       if( lpUpdate->wFormatID == CF_METAFILEPICT )
       {
 	FIXME(clipboard,"\timplement function CopyMetaFilePict16to32\n");
 	FIXME(clipboard,"\tin the appropriate file.\n");
 #ifdef SOMEONE_IMPLEMENTED_ME
 	CopyMetaFilePict16to32( GlobalLock16(lpUpdate->hData32), 
-			        GlobalLock32(lpUpdate->hData16) );
+			        GlobalLock(lpUpdate->hData16) );
 #endif
       }
       else
       {
-	memcpy( GlobalLock32(lpUpdate->hData32), 
+	memcpy( GlobalLock(lpUpdate->hData32), 
 		GlobalLock16(lpUpdate->hData16), 
 		size );
       }
-      GlobalUnlock32(lpUpdate->hData32);
+      GlobalUnlock(lpUpdate->hData32);
       GlobalUnlock16(lpUpdate->hData16);
     }
 
@@ -611,17 +611,17 @@ HANDLE32 WINAPI GetClipboardData32( UINT32 wFormat )
  */
 INT16 WINAPI CountClipboardFormats16(void)
 {
-    return CountClipboardFormats32();
+    return CountClipboardFormats();
 }
 
 
 /**************************************************************************
  *           CountClipboardFormats32   (USER32.63)
  */
-INT32 WINAPI CountClipboardFormats32(void)
+INT WINAPI CountClipboardFormats(void)
 {
-    INT32 FormatCount = 0;
-    LPCLIPFORMAT lpFormat = ClipFormats; 
+    INT FormatCount = 0;
+    LPWINE_CLIPFORMAT lpFormat = ClipFormats; 
 
     TRACE(clipboard,"(void)\n");
 
@@ -652,20 +652,20 @@ INT32 WINAPI CountClipboardFormats32(void)
  */
 UINT16 WINAPI EnumClipboardFormats16( UINT16 wFormat )
 {
-    return EnumClipboardFormats32( wFormat );
+    return EnumClipboardFormats( wFormat );
 }
 
 
 /**************************************************************************
  *            EnumClipboardFormats32   (USER32.179)
  */
-UINT32 WINAPI EnumClipboardFormats32( UINT32 wFormat )
+UINT WINAPI EnumClipboardFormats( UINT wFormat )
 {
-    LPCLIPFORMAT lpFormat = ClipFormats; 
+    LPWINE_CLIPFORMAT lpFormat = ClipFormats; 
 
     TRACE(clipboard,"(%04X)\n", wFormat);
 
-    if( hqClipLock != GetFastQueue() ) return 0;
+    if( hqClipLock != GetFastQueue16() ) return 0;
 
     if( (!wFormat || wFormat == CF_TEXT || wFormat == CF_OEMTEXT) ) 
         CLIPBOARD_GetDriver()->pRequestSelection();
@@ -703,8 +703,8 @@ UINT32 WINAPI EnumClipboardFormats32( UINT32 wFormat )
  */
 UINT16 WINAPI RegisterClipboardFormat16( LPCSTR FormatName )
 {
-    LPCLIPFORMAT lpNewFormat; 
-    LPCLIPFORMAT lpFormat = ClipFormats; 
+    LPWINE_CLIPFORMAT lpNewFormat; 
+    LPWINE_CLIPFORMAT lpFormat = ClipFormats; 
 
     if (FormatName == NULL) return 0;
 
@@ -727,7 +727,7 @@ UINT16 WINAPI RegisterClipboardFormat16( LPCSTR FormatName )
 
     /* allocate storage for new format entry */
 
-    lpNewFormat = (LPCLIPFORMAT)xmalloc(sizeof(CLIPFORMAT));
+    lpNewFormat = (LPWINE_CLIPFORMAT)xmalloc(sizeof(WINE_CLIPFORMAT));
     lpFormat->NextFormat = lpNewFormat;
     lpNewFormat->wFormatID = LastRegFormat;
     lpNewFormat->wRefCount = 1;
@@ -749,7 +749,7 @@ UINT16 WINAPI RegisterClipboardFormat16( LPCSTR FormatName )
 /**************************************************************************
  *            RegisterClipboardFormat32A   (USER32.431)
  */
-UINT32 WINAPI RegisterClipboardFormat32A( LPCSTR formatName )
+UINT WINAPI RegisterClipboardFormatA( LPCSTR formatName )
 {
     return RegisterClipboardFormat16( formatName );
 }
@@ -758,10 +758,10 @@ UINT32 WINAPI RegisterClipboardFormat32A( LPCSTR formatName )
 /**************************************************************************
  *            RegisterClipboardFormat32W   (USER32.432)
  */
-UINT32 WINAPI RegisterClipboardFormat32W( LPCWSTR formatName )
+UINT WINAPI RegisterClipboardFormatW( LPCWSTR formatName )
 {
     LPSTR aFormat = HEAP_strdupWtoA( GetProcessHeap(), 0, formatName );
-    UINT32 ret = RegisterClipboardFormat32A( aFormat );
+    UINT ret = RegisterClipboardFormatA( aFormat );
     HeapFree( GetProcessHeap(), 0, aFormat );
     return ret;
 }
@@ -771,16 +771,16 @@ UINT32 WINAPI RegisterClipboardFormat32W( LPCWSTR formatName )
  */
 INT16 WINAPI GetClipboardFormatName16( UINT16 wFormat, LPSTR retStr, INT16 maxlen )
 {
-    return GetClipboardFormatName32A( wFormat, retStr, maxlen );
+    return GetClipboardFormatNameA( wFormat, retStr, maxlen );
 }
 
 
 /**************************************************************************
  *            GetClipboardFormatName32A   (USER32.223)
  */
-INT32 WINAPI GetClipboardFormatName32A( UINT32 wFormat, LPSTR retStr, INT32 maxlen )
+INT WINAPI GetClipboardFormatNameA( UINT wFormat, LPSTR retStr, INT maxlen )
 {
-    LPCLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
+    LPWINE_CLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
 
     TRACE(clipboard, "(%04X, %p, %d) !\n", wFormat, retStr, maxlen);
 
@@ -789,7 +789,7 @@ INT32 WINAPI GetClipboardFormatName32A( UINT32 wFormat, LPSTR retStr, INT32 maxl
 
     TRACE(clipboard, "Name='%s' !\n", lpFormat->Name);
 
-    lstrcpyn32A( retStr, lpFormat->Name, maxlen );
+    lstrcpynA( retStr, lpFormat->Name, maxlen );
     return strlen(retStr);
 }
 
@@ -797,10 +797,10 @@ INT32 WINAPI GetClipboardFormatName32A( UINT32 wFormat, LPSTR retStr, INT32 maxl
 /**************************************************************************
  *            GetClipboardFormatName32W   (USER32.224)
  */
-INT32 WINAPI GetClipboardFormatName32W( UINT32 wFormat, LPWSTR retStr, INT32 maxlen )
+INT WINAPI GetClipboardFormatNameW( UINT wFormat, LPWSTR retStr, INT maxlen )
 {
     LPSTR p = HEAP_xalloc( GetProcessHeap(), 0, maxlen );
-    INT32 ret = GetClipboardFormatName32A( wFormat, p, maxlen );
+    INT ret = GetClipboardFormatNameA( wFormat, p, maxlen );
     lstrcpynAtoW( retStr, p, maxlen );
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
@@ -812,16 +812,16 @@ INT32 WINAPI GetClipboardFormatName32W( UINT32 wFormat, LPWSTR retStr, INT32 max
  */
 HWND16 WINAPI SetClipboardViewer16( HWND16 hWnd )
 {
-    return SetClipboardViewer32( hWnd );
+    return SetClipboardViewer( hWnd );
 }
 
 
 /**************************************************************************
  *            SetClipboardViewer32   (USER32.471)
  */
-HWND32 WINAPI SetClipboardViewer32( HWND32 hWnd )
+HWND WINAPI SetClipboardViewer( HWND hWnd )
 {
-    HWND32 hwndPrev = hWndViewer;
+    HWND hwndPrev = hWndViewer;
 
     TRACE(clipboard,"(%04x): returning %04x\n", hWnd, hwndPrev);
 
@@ -842,7 +842,7 @@ HWND16 WINAPI GetClipboardViewer16(void)
 /**************************************************************************
  *           GetClipboardViewer32   (USER32.226)
  */
-HWND32 WINAPI GetClipboardViewer32(void)
+HWND WINAPI GetClipboardViewer(void)
 {
     return hWndViewer;
 }
@@ -853,15 +853,15 @@ HWND32 WINAPI GetClipboardViewer32(void)
  */
 BOOL16 WINAPI ChangeClipboardChain16(HWND16 hWnd, HWND16 hWndNext)
 {
-    return ChangeClipboardChain32(hWnd, hWndNext);
+    return ChangeClipboardChain(hWnd, hWndNext);
 }
 
 /**************************************************************************
  *           ChangeClipboardChain32   (USER32.22)
  */
-BOOL32 WINAPI ChangeClipboardChain32(HWND32 hWnd, HWND32 hWndNext)
+BOOL WINAPI ChangeClipboardChain(HWND hWnd, HWND hWndNext)
 {
-    BOOL32 bRet = 0;
+    BOOL bRet = 0;
 
     FIXME(clipboard, "(0x%04x, 0x%04x): stub?\n", hWnd, hWndNext);
 
@@ -883,14 +883,14 @@ BOOL32 WINAPI ChangeClipboardChain32(HWND32 hWnd, HWND32 hWndNext)
  */
 BOOL16 WINAPI IsClipboardFormatAvailable16( UINT16 wFormat )
 {
-    return IsClipboardFormatAvailable32( wFormat );
+    return IsClipboardFormatAvailable( wFormat );
 }
 
 
 /**************************************************************************
  *           IsClipboardFormatAvailable32   (USER32.340)
  */
-BOOL32 WINAPI IsClipboardFormatAvailable32( UINT32 wFormat )
+BOOL WINAPI IsClipboardFormatAvailable( UINT wFormat )
 {
     TRACE(clipboard,"(%04X) !\n", wFormat);
 
@@ -913,7 +913,7 @@ HWND16 WINAPI GetOpenClipboardWindow16(void)
 /**************************************************************************
  *             GetOpenClipboardWindow32   (USER32.277)
  */
-HWND32 WINAPI GetOpenClipboardWindow32(void)
+HWND WINAPI GetOpenClipboardWindow(void)
 {
     return hWndClipWindow;
 }
@@ -932,19 +932,19 @@ INT16 WINAPI GetPriorityClipboardFormat16( UINT16 *lpPriorityList, INT16 nCount)
 /**************************************************************************
  *             GetPriorityClipboardFormat32   (USER32.279)
  */
-INT32 WINAPI GetPriorityClipboardFormat32( UINT32 *lpPriorityList, INT32 nCount )
+INT WINAPI GetPriorityClipboardFormat( UINT *lpPriorityList, INT nCount )
 {
     int Counter;
 
-    if(CountClipboardFormats32() == 0) 
+    if(CountClipboardFormats() == 0) 
     { 
         return 0;
     }
 
     for(Counter = 0; Counter <= nCount; Counter++)
     {
-        if(IsClipboardFormatAvailable32(*(lpPriorityList+sizeof(INT32)*Counter)))
-            return *(lpPriorityList+sizeof(INT32)*Counter);
+        if(IsClipboardFormatAvailable(*(lpPriorityList+sizeof(INT)*Counter)))
+            return *(lpPriorityList+sizeof(INT)*Counter);
     }
 
     return -1;
diff --git a/windows/dce.c b/windows/dce.c
index 8aee87eac7b..25bf2361480 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -34,10 +34,10 @@
 #define NB_DCE    5  /* Number of DCEs created at startup */
 
 static DCE *firstDCE = 0;
-static HDC32 defaultDCstate = 0;
+static HDC defaultDCstate = 0;
 
 static void DCE_DeleteClipRgn( DCE* );
-static INT32 DCE_ReleaseDC( DCE* );
+static INT DCE_ReleaseDC( DCE* );
 
 
 /***********************************************************************
@@ -63,7 +63,7 @@ static void DCE_DumpCache(void)
  *
  * Allocate a new DCE.
  */
-DCE *DCE_AllocDCE( HWND32 hWnd, DCE_TYPE type )
+DCE *DCE_AllocDCE( HWND hWnd, DCE_TYPE type )
 {
     DCE * dce;
     if (!(dce = HeapAlloc( SystemHeap, 0, sizeof(DCE) ))) return NULL;
@@ -75,7 +75,7 @@ DCE *DCE_AllocDCE( HWND32 hWnd, DCE_TYPE type )
 
     /* store DCE handle in DC hook data field */
 
-    SetDCHook( dce->hDC, (FARPROC16)DCHook, (DWORD)dce );
+    SetDCHook( dce->hDC, (FARPROC16)DCHook16, (DWORD)dce );
 
     dce->hwndCurrent = hWnd;
     dce->hClipRgn    = 0;
@@ -92,7 +92,7 @@ DCE *DCE_AllocDCE( HWND32 hWnd, DCE_TYPE type )
 	    if( wnd->dwStyle & WS_CLIPCHILDREN ) dce->DCXflags |= DCX_CLIPCHILDREN;
 	    if( wnd->dwStyle & WS_CLIPSIBLINGS ) dce->DCXflags |= DCX_CLIPSIBLINGS;
 	}
-	SetHookFlags(dce->hDC,DCHF_INVALIDATEVISRGN);
+	SetHookFlags16(dce->hDC,DCHF_INVALIDATEVISRGN);
     }
     else dce->DCXflags = DCX_CACHE | DCX_DCEEMPTY;
 
@@ -113,9 +113,9 @@ DCE* DCE_FreeDCE( DCE *dce )
 
     SetDCHook(dce->hDC, NULL, 0L);
 
-    DeleteDC32( dce->hDC );
+    DeleteDC( dce->hDC );
     if( dce->hClipRgn && !(dce->DCXflags & DCX_KEEPCLIPRGN) )
-	DeleteObject32(dce->hClipRgn);
+	DeleteObject(dce->hClipRgn);
     HeapFree( SystemHeap, 0, dce );
     return *ppDCE;
 }
@@ -174,20 +174,20 @@ static void DCE_DeleteClipRgn( DCE* dce )
 	dce->DCXflags &= ~DCX_KEEPCLIPRGN;
     else
 	if( dce->hClipRgn > 1 )
-	    DeleteObject32( dce->hClipRgn );
+	    DeleteObject( dce->hClipRgn );
 
     dce->hClipRgn = 0;
 
     TRACE(dc,"\trestoring VisRgn\n");
 
-    RestoreVisRgn(dce->hDC);
+    RestoreVisRgn16(dce->hDC);
 }
 
 
 /***********************************************************************
  *   DCE_ReleaseDC
  */
-static INT32 DCE_ReleaseDC( DCE* dce )
+static INT DCE_ReleaseDC( DCE* dce )
 {
     if ((dce->DCXflags & (DCX_DCEEMPTY | DCX_DCEBUSY)) != DCX_DCEBUSY) return 0;
 
@@ -199,7 +199,7 @@ static INT32 DCE_ReleaseDC( DCE* dce )
 
     if (dce->DCXflags & DCX_CACHE)
     {
-        SetDCState( dce->hDC, defaultDCstate );
+        SetDCState16( dce->hDC, defaultDCstate );
         dce->DCXflags &= ~DCX_DCEBUSY;
 	if (dce->DCXflags & DCX_DCEDIRTY)
 	{
@@ -223,10 +223,10 @@ static INT32 DCE_ReleaseDC( DCE* dce )
  * DCE's for windows that have pWnd->parent as an ansector and whose client 
  * rect intersects with specified update rectangle. 
  */
-BOOL32 DCE_InvalidateDCE(WND* pWnd, const RECT32* pRectUpdate)
+BOOL DCE_InvalidateDCE(WND* pWnd, const RECT* pRectUpdate)
 {
     WND* wndScope = pWnd->parent;
-    BOOL32 bRet = FALSE;
+    BOOL bRet = FALSE;
 
     if( wndScope )
     {
@@ -249,7 +249,7 @@ BOOL32 DCE_InvalidateDCE(WND* pWnd, const RECT32* pRectUpdate)
 		if( wndCurrent && wndCurrent != WIN_GetDesktop() )
 		{
 		    WND* wnd = wndCurrent;
-		    INT32 xoffset = 0, yoffset = 0;
+		    INT xoffset = 0, yoffset = 0;
 
 		    if( (wndCurrent == wndScope) && !(dce->DCXflags & DCX_CLIPCHILDREN) ) continue;
 
@@ -259,15 +259,15 @@ BOOL32 DCE_InvalidateDCE(WND* pWnd, const RECT32* pRectUpdate)
 		    {
 			if( wnd == wndScope )
 		 	{
-			    RECT32 wndRect;
+			    RECT wndRect;
 
 			    wndRect = wndCurrent->rectWindow;
 
-			    OffsetRect32( &wndRect, xoffset - wndCurrent->rectClient.left, 
+			    OffsetRect( &wndRect, xoffset - wndCurrent->rectClient.left, 
 						    yoffset - wndCurrent->rectClient.top);
 
 			    if (pWnd == wndCurrent ||
-				IntersectRect32( &wndRect, &wndRect, pRectUpdate ))
+				IntersectRect( &wndRect, &wndRect, pRectUpdate ))
 			    { 
 				if( !(dce->DCXflags & DCX_DCEBUSY) )
 				{
@@ -288,7 +288,7 @@ BOOL32 DCE_InvalidateDCE(WND* pWnd, const RECT32* pRectUpdate)
 						(unsigned)dce, wndCurrent->hwndSelf);
 
 				    dce->DCXflags |= DCX_DCEDIRTY;
-				    SetHookFlags(dce->hDC, DCHF_INVALIDATEVISRGN);
+				    SetHookFlags16(dce->hDC, DCHF_INVALIDATEVISRGN);
 				    bRet = TRUE;
 				}
 			    }
@@ -315,7 +315,7 @@ void DCE_Init(void)
     for (i = 0; i < NB_DCE; i++)
     {
 	if (!(dce = DCE_AllocDCE( 0, DCE_CACHE_DC ))) return;
-	if (!defaultDCstate) defaultDCstate = GetDCState( dce->hDC );
+	if (!defaultDCstate) defaultDCstate = GetDCState16( dce->hDC );
     }
 }
 
@@ -327,14 +327,14 @@ void DCE_Init(void)
  * window area clipped by the client area of all ancestors) in the
  * corresponding coordinates. Return FALSE if the visible region is empty.
  */
-static BOOL32 DCE_GetVisRect( WND *wndPtr, BOOL32 clientArea, RECT32 *lprect )
+static BOOL DCE_GetVisRect( WND *wndPtr, BOOL clientArea, RECT *lprect )
 {
     *lprect = clientArea ? wndPtr->rectClient : wndPtr->rectWindow;
 
     if (wndPtr->dwStyle & WS_VISIBLE)
     {
-	INT32 xoffset = lprect->left;
-	INT32 yoffset = lprect->top;
+	INT xoffset = lprect->left;
+	INT yoffset = lprect->top;
 
 	while (wndPtr->dwStyle & WS_CHILD)
 	{
@@ -345,7 +345,7 @@ static BOOL32 DCE_GetVisRect( WND *wndPtr, BOOL32 clientArea, RECT32 *lprect )
 
 	    xoffset += wndPtr->rectClient.left;
 	    yoffset += wndPtr->rectClient.top;
-	    OffsetRect32( lprect, wndPtr->rectClient.left,
+	    OffsetRect( lprect, wndPtr->rectClient.left,
 				  wndPtr->rectClient.top );
 
 	    if( (wndPtr->rectClient.left >= wndPtr->rectClient.right) ||
@@ -361,12 +361,12 @@ static BOOL32 DCE_GetVisRect( WND *wndPtr, BOOL32 clientArea, RECT32 *lprect )
 	    lprect->top = MAX( lprect->top, wndPtr->rectClient.top );
 	    lprect->bottom = MIN( lprect->bottom, wndPtr->rectClient.bottom );
 	}
-	OffsetRect32( lprect, -xoffset, -yoffset );
+	OffsetRect( lprect, -xoffset, -yoffset );
 	return TRUE;
     }
 
 fail:
-    SetRectEmpty32( lprect );
+    SetRectEmpty( lprect );
     return FALSE;
 }
 
@@ -378,10 +378,10 @@ fail:
  * adding to the clip region the intersection of the target rectangle
  * with an offset window rectangle.
  */
-static BOOL32 DCE_AddClipRects( WND *pWndStart, WND *pWndEnd, 
-			        HRGN32 hrgnClip, LPRECT32 lpRect, int x, int y )
+static BOOL DCE_AddClipRects( WND *pWndStart, WND *pWndEnd, 
+			        HRGN hrgnClip, LPRECT lpRect, int x, int y )
 {
-    RECT32 rect;
+    RECT rect;
 
     if( pWndStart->pDriver->pIsSelfClipping( pWndStart ) )
         return TRUE; /* The driver itself will do the clipping */
@@ -395,7 +395,7 @@ static BOOL32 DCE_AddClipRects( WND *pWndStart, WND *pWndEnd,
 	rect.right = pWndStart->rectWindow.right + x;
 	rect.bottom = pWndStart->rectWindow.bottom + y;
 
-	if( IntersectRect32( &rect, &rect, lpRect ))
+	if( IntersectRect( &rect, &rect, lpRect ))
 	    if(!REGION_UnionRectWithRgn( hrgnClip, &rect ))
 		break;
     }
@@ -410,10 +410,10 @@ static BOOL32 DCE_AddClipRects( WND *pWndStart, WND *pWndEnd,
  * clipped by the client area of all ancestors, and then optionally
  * by siblings and children.
  */
-HRGN32 DCE_GetVisRgn( HWND32 hwnd, WORD flags, HWND32 hwndChild, WORD cflags )
+HRGN DCE_GetVisRgn( HWND hwnd, WORD flags, HWND hwndChild, WORD cflags )
 {
-    HRGN32 hrgnVis = 0;
-    RECT32 rect;
+    HRGN hrgnVis = 0;
+    RECT rect;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
     WND *childWnd = WIN_FindWndPtr( hwndChild );
 
@@ -421,10 +421,10 @@ HRGN32 DCE_GetVisRgn( HWND32 hwnd, WORD flags, HWND32 hwndChild, WORD cflags )
 
     if (wndPtr && DCE_GetVisRect(wndPtr, !(flags & DCX_WINDOW), &rect))
     {
-	if((hrgnVis = CreateRectRgnIndirect32( &rect )))
+	if((hrgnVis = CreateRectRgnIndirect( &rect )))
         {
-	    HRGN32 hrgnClip = CreateRectRgn32( 0, 0, 0, 0 );
-	    INT32 xoffset, yoffset;
+	    HRGN hrgnClip = CreateRectRgn( 0, 0, 0, 0 );
+	    INT xoffset, yoffset;
 
 	    if( hrgnClip )
 	    {
@@ -514,18 +514,18 @@ HRGN32 DCE_GetVisRgn( HWND32 hwnd, WORD flags, HWND32 hwndChild, WORD cflags )
 		 * to substract it from the visible rectangle.
 	         */
 
-		CombineRgn32( hrgnVis, hrgnVis, hrgnClip, RGN_DIFF );
-		DeleteObject32( hrgnClip );
+		CombineRgn( hrgnVis, hrgnVis, hrgnClip, RGN_DIFF );
+		DeleteObject( hrgnClip );
 	    }
 	    else
 	    {
-		DeleteObject32( hrgnVis );
+		DeleteObject( hrgnVis );
 		hrgnVis = 0;
 	    }
 	}
     }
     else
-	hrgnVis = CreateRectRgn32(0, 0, 0, 0); /* empty */
+	hrgnVis = CreateRectRgn(0, 0, 0, 0); /* empty */
     return hrgnVis;
 }
 
@@ -535,12 +535,12 @@ HRGN32 DCE_GetVisRgn( HWND32 hwnd, WORD flags, HWND32 hwndChild, WORD cflags )
  * Change region from DC-origin relative coordinates to screen coords.
  */
 
-static void DCE_OffsetVisRgn( HDC32 hDC, HRGN32 hVisRgn )
+static void DCE_OffsetVisRgn( HDC hDC, HRGN hVisRgn )
 {
     DC *dc;
     if (!(dc = (DC *) GDI_GetObjPtr( hDC, DC_MAGIC ))) return;
 
-    OffsetRgn32( hVisRgn, dc->w.DCOrgX, dc->w.DCOrgY );
+    OffsetRgn( hVisRgn, dc->w.DCOrgX, dc->w.DCOrgY );
 
     GDI_HEAP_UNLOCK( hDC );
 }
@@ -551,15 +551,15 @@ static void DCE_OffsetVisRgn( HDC32 hDC, HRGN32 hVisRgn )
  *  Translate given region from the wnd client to the DC coordinates
  *  and add it to the clipping region.
  */
-INT16 DCE_ExcludeRgn( HDC32 hDC, WND* wnd, HRGN32 hRgn )
+INT16 DCE_ExcludeRgn( HDC hDC, WND* wnd, HRGN hRgn )
 {
-  POINT32  pt = {0, 0};
+  POINT  pt = {0, 0};
   DCE     *dce = firstDCE;
 
   while (dce && (dce->hDC != hDC)) dce = dce->next;
   if( dce )
   {
-      MapWindowPoints32( wnd->hwndSelf, dce->hwndCurrent, &pt, 1);
+      MapWindowPoints( wnd->hwndSelf, dce->hwndCurrent, &pt, 1);
       if( dce->DCXflags & DCX_WINDOW )
       { 
 	  wnd = WIN_FindWndPtr(dce->hwndCurrent);
@@ -568,7 +568,7 @@ INT16 DCE_ExcludeRgn( HDC32 hDC, WND* wnd, HRGN32 hRgn )
       }
   }
   else return ERROR;
-  OffsetRgn32(hRgn, pt.x, pt.y);
+  OffsetRgn(hRgn, pt.x, pt.y);
 
   return ExtSelectClipRgn( hDC, hRgn, RGN_DIFF );
 }
@@ -578,7 +578,7 @@ INT16 DCE_ExcludeRgn( HDC32 hDC, WND* wnd, HRGN32 hRgn )
  */
 HDC16 WINAPI GetDCEx16( HWND16 hwnd, HRGN16 hrgnClip, DWORD flags )
 {
-    return (HDC16)GetDCEx32( hwnd, hrgnClip, flags );
+    return (HDC16)GetDCEx( hwnd, hrgnClip, flags );
 }
 
 
@@ -589,16 +589,16 @@ HDC16 WINAPI GetDCEx16( HWND16 hwnd, HRGN16 hrgnClip, DWORD flags )
  *
  * FIXME: Full support for hrgnClip == 1 (alias for entire window).
  */
-HDC32 WINAPI GetDCEx32( HWND32 hwnd, HRGN32 hrgnClip, DWORD flags )
+HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags )
 {
-    HRGN32 	hrgnVisible = 0;
-    HDC32 	hdc = 0;
+    HRGN 	hrgnVisible = 0;
+    HDC 	hdc = 0;
     DCE * 	dce;
     DC * 	dc;
     WND * 	wndPtr;
     DWORD 	dcxFlags = 0;
-    BOOL32	bUpdateVisRgn = TRUE;
-    BOOL32	bUpdateClipOrigin = FALSE;
+    BOOL	bUpdateVisRgn = TRUE;
+    BOOL	bUpdateClipOrigin = FALSE;
 
     TRACE(dc,"hwnd %04x, hrgnClip %04x, flags %08x\n", 
 				hwnd, hrgnClip, (unsigned)flags);
@@ -709,7 +709,7 @@ HDC32 WINAPI GetDCEx32( HWND32 hwnd, HRGN32 hrgnClip, DWORD flags )
 		    DCE_DeleteClipRgn( dce );
 		}
 		else 
-		    RestoreVisRgn(dce->hDC);
+		    RestoreVisRgn16(dce->hDC);
 	    }
 	}
     }
@@ -744,20 +744,20 @@ HDC32 WINAPI GetDCEx32( HWND32 hwnd, HRGN32 hrgnClip, DWORD flags )
                 hrgnVisible = DCE_GetVisRgn( parentPtr->hwndSelf, dcxFlags,
                                              wndPtr->hwndSelf, flags );
 		if( flags & DCX_WINDOW )
-		    OffsetRgn32( hrgnVisible, -wndPtr->rectWindow.left,
+		    OffsetRgn( hrgnVisible, -wndPtr->rectWindow.left,
 					      -wndPtr->rectWindow.top );
 		else
-		    OffsetRgn32( hrgnVisible, -wndPtr->rectClient.left,
+		    OffsetRgn( hrgnVisible, -wndPtr->rectClient.left,
 					      -wndPtr->rectClient.top );
                 DCE_OffsetVisRgn( hdc, hrgnVisible );
 	    }
 	    else
-		hrgnVisible = CreateRectRgn32( 0, 0, 0, 0 );
+		hrgnVisible = CreateRectRgn( 0, 0, 0, 0 );
         }
         else 
-	    if ((hwnd == GetDesktopWindow32()) &&
+	    if ((hwnd == GetDesktopWindow()) &&
                 (X11DRV_WND_GetXRootWindow(wndPtr) == DefaultRootWindow(display)))
-                 hrgnVisible = CreateRectRgn32( 0, 0, SYSMETRICS_CXSCREEN,
+                 hrgnVisible = CreateRectRgn( 0, 0, SYSMETRICS_CXSCREEN,
 						      SYSMETRICS_CYSCREEN );
 	    else 
             {
@@ -767,7 +767,7 @@ HDC32 WINAPI GetDCEx32( HWND32 hwnd, HRGN32 hrgnClip, DWORD flags )
 
 	dc->w.flags &= ~DC_DIRTY;
 	dce->DCXflags &= ~DCX_DCEDIRTY;
-	SelectVisRgn( hdc, hrgnVisible );
+	SelectVisRgn16( hdc, hrgnVisible );
     }
     else
 	TRACE(dc,"no visrgn update %08x dce, hwnd [%04x]\n", (unsigned)dce, hwnd);
@@ -776,22 +776,22 @@ HDC32 WINAPI GetDCEx32( HWND32 hwnd, HRGN32 hrgnClip, DWORD flags )
 
     if( flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN) )
     {
-	if( !hrgnVisible ) hrgnVisible = CreateRectRgn32( 0, 0, 0, 0 );
+	if( !hrgnVisible ) hrgnVisible = CreateRectRgn( 0, 0, 0, 0 );
 
 	dce->DCXflags |= flags & (DCX_KEEPCLIPRGN | DCX_INTERSECTRGN | DCX_EXCLUDERGN);
 	dce->hClipRgn = hrgnClip;
 
 	TRACE(dc, "\tsaved VisRgn, clipRgn = %04x\n", hrgnClip);
 
-	SaveVisRgn( hdc );
-        CombineRgn32( hrgnVisible, hrgnClip, 0, RGN_COPY );
+	SaveVisRgn16( hdc );
+        CombineRgn( hrgnVisible, hrgnClip, 0, RGN_COPY );
         DCE_OffsetVisRgn( hdc, hrgnVisible );
-        CombineRgn32( hrgnVisible, InquireVisRgn( hdc ), hrgnVisible,
+        CombineRgn( hrgnVisible, InquireVisRgn16( hdc ), hrgnVisible,
                       (flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF );
-	SelectVisRgn( hdc, hrgnVisible );
+	SelectVisRgn16( hdc, hrgnVisible );
     }
 
-    if( hrgnVisible ) DeleteObject32( hrgnVisible );
+    if( hrgnVisible ) DeleteObject( hrgnVisible );
 
     TRACE(dc, "(%04x,%04x,0x%lx): returning %04x\n", 
 	       hwnd, hrgnClip, flags, hdc);
@@ -804,7 +804,7 @@ HDC32 WINAPI GetDCEx32( HWND32 hwnd, HRGN32 hrgnClip, DWORD flags )
  */
 HDC16 WINAPI GetDC16( HWND16 hwnd )
 {
-    return (HDC16)GetDC32( hwnd );
+    return (HDC16)GetDC( hwnd );
 }
 
 
@@ -814,12 +814,12 @@ HDC16 WINAPI GetDC16( HWND16 hwnd )
  *	:Handle to DC
  *	NULL: Failure
  */
-HDC32 WINAPI GetDC32(
-	     HWND32 hwnd /* handle of window */
+HDC WINAPI GetDC(
+	     HWND hwnd /* handle of window */
 ) {
     if (!hwnd)
-        return GetDCEx32( GetDesktopWindow32(), 0, DCX_CACHE | DCX_WINDOW );
-    return GetDCEx32( hwnd, 0, DCX_USESTYLE );
+        return GetDCEx( GetDesktopWindow(), 0, DCX_CACHE | DCX_WINDOW );
+    return GetDCEx( hwnd, 0, DCX_USESTYLE );
 }
 
 
@@ -836,10 +836,10 @@ HDC16 WINAPI GetWindowDC16( HWND16 hwnd )
 /***********************************************************************
  *           GetWindowDC32    (USER32.304)
  */
-HDC32 WINAPI GetWindowDC32( HWND32 hwnd )
+HDC WINAPI GetWindowDC( HWND hwnd )
 {
-    if (!hwnd) hwnd = GetDesktopWindow32();
-    return GetDCEx32( hwnd, 0, DCX_USESTYLE | DCX_WINDOW );
+    if (!hwnd) hwnd = GetDesktopWindow();
+    return GetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW );
 }
 
 
@@ -848,7 +848,7 @@ HDC32 WINAPI GetWindowDC32( HWND32 hwnd )
  */
 INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc )
 {
-    return (INT16)ReleaseDC32( hwnd, hdc );
+    return (INT16)ReleaseDC( hwnd, hdc );
 }
 
 
@@ -859,9 +859,9 @@ INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc )
  *	1: Success
  *	0: Failure
  */
-INT32 WINAPI ReleaseDC32( 
-             HWND32 hwnd /* Handle of window - ignored */, 
-             HDC32 hdc   /* Handle of device context */
+INT WINAPI ReleaseDC( 
+             HWND hwnd /* Handle of window - ignored */, 
+             HDC hdc   /* Handle of device context */
 ) {
     DCE * dce = firstDCE;
     
@@ -880,9 +880,9 @@ INT32 WINAPI ReleaseDC32(
  *
  * See "Undoc. Windows" for hints (DC, SetDCHook, SetHookFlags)..  
  */
-BOOL16 WINAPI DCHook( HDC16 hDC, WORD code, DWORD data, LPARAM lParam )
+BOOL16 WINAPI DCHook16( HDC16 hDC, WORD code, DWORD data, LPARAM lParam )
 {
-    HRGN32 hVisRgn;
+    HRGN hVisRgn;
     DCE *dce = firstDCE;;
 
     TRACE(dc,"hDC = %04x, %i\n", hDC, code);
@@ -901,7 +901,7 @@ BOOL16 WINAPI DCHook( HDC16 hDC, WORD code, DWORD data, LPARAM lParam )
 
            if( dce->DCXflags & DCX_DCEBUSY )
  	   {
-	       SetHookFlags(hDC, DCHF_VALIDATEVISRGN);
+	       SetHookFlags16(hDC, DCHF_VALIDATEVISRGN);
 	       hVisRgn = DCE_GetVisRgn(dce->hwndCurrent, dce->DCXflags, 0, 0);
 
 	       TRACE(dc,"\tapplying saved clipRgn\n");
@@ -914,15 +914,15 @@ BOOL16 WINAPI DCHook( HDC16 hDC, WORD code, DWORD data, LPARAM lParam )
 
                     if( (!dce->hClipRgn && dce->DCXflags & DCX_INTERSECTRGN) ||
                          (dce->hClipRgn == 1 && dce->DCXflags & DCX_EXCLUDERGN) )            
-                         SetRectRgn32(hVisRgn,0,0,0,0);
+                         SetRectRgn(hVisRgn,0,0,0,0);
                     else
-                         CombineRgn32(hVisRgn, hVisRgn, dce->hClipRgn, 
+                         CombineRgn(hVisRgn, hVisRgn, dce->hClipRgn, 
                                       (dce->DCXflags & DCX_EXCLUDERGN)? RGN_DIFF:RGN_AND);
 	       }
 	       dce->DCXflags &= ~DCX_DCEDIRTY;
                DCE_OffsetVisRgn( hDC, hVisRgn );
-	       SelectVisRgn(hDC, hVisRgn);
-	       DeleteObject32( hVisRgn );
+	       SelectVisRgn16(hDC, hVisRgn);
+	       DeleteObject( hVisRgn );
 	   }
            else /* non-fatal but shouldn't happen */
 	     WARN(dc, "DC is not in use!\n");
@@ -943,14 +943,14 @@ BOOL16 WINAPI DCHook( HDC16 hDC, WORD code, DWORD data, LPARAM lParam )
  */
 HWND16 WINAPI WindowFromDC16( HDC16 hDC )
 {
-    return (HWND16)WindowFromDC32( hDC );
+    return (HWND16)WindowFromDC( hDC );
 }
 
 
 /**********************************************************************
  *          WindowFromDC32   (USER32.581)
  */
-HWND32 WINAPI WindowFromDC32( HDC32 hDC )
+HWND WINAPI WindowFromDC( HDC hDC )
 {
     DCE *dce = firstDCE;
     while (dce && (dce->hDC != hDC)) dce = dce->next;
@@ -963,14 +963,14 @@ HWND32 WINAPI WindowFromDC32( HDC32 hDC )
  */
 BOOL16 WINAPI LockWindowUpdate16( HWND16 hwnd )
 {
-    return LockWindowUpdate32( hwnd );
+    return LockWindowUpdate( hwnd );
 }
 
 
 /***********************************************************************
  *           LockWindowUpdate32   (USER32.378)
  */
-BOOL32 WINAPI LockWindowUpdate32( HWND32 hwnd )
+BOOL WINAPI LockWindowUpdate( HWND hwnd )
 {
     /* FIXME? DCX_LOCKWINDOWUPDATE is unimplemented */
     return TRUE;
diff --git a/windows/defdlg.c b/windows/defdlg.c
index 01fb79f5c3a..5ad889e09ce 100644
--- a/windows/defdlg.c
+++ b/windows/defdlg.c
@@ -17,29 +17,29 @@
  * Set the focus to a control of the dialog, selecting the text if
  * the control is an edit dialog.
  */
-static void DEFDLG_SetFocus( HWND32 hwndDlg, HWND32 hwndCtrl )
+static void DEFDLG_SetFocus( HWND hwndDlg, HWND hwndCtrl )
 {
-    HWND32 hwndPrev = GetFocus32();
+    HWND hwndPrev = GetFocus();
 
-    if (IsChild32( hwndDlg, hwndPrev ))
+    if (IsChild( hwndDlg, hwndPrev ))
     {
         if (SendMessage16( hwndPrev, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL)
             SendMessage16( hwndPrev, EM_SETSEL16, TRUE, MAKELONG( -1, 0 ) );
     }
     if (SendMessage16( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL)
         SendMessage16( hwndCtrl, EM_SETSEL16, FALSE, MAKELONG( 0, -1 ) );
-    SetFocus32( hwndCtrl );
+    SetFocus( hwndCtrl );
 }
 
 
 /***********************************************************************
  *           DEFDLG_SaveFocus
  */
-static BOOL32 DEFDLG_SaveFocus( HWND32 hwnd, DIALOGINFO *infoPtr )
+static BOOL DEFDLG_SaveFocus( HWND hwnd, DIALOGINFO *infoPtr )
 {
-    HWND32 hwndFocus = GetFocus32();
+    HWND hwndFocus = GetFocus();
 
-    if (!hwndFocus || !IsChild32( hwnd, hwndFocus )) return FALSE;
+    if (!hwndFocus || !IsChild( hwnd, hwndFocus )) return FALSE;
     infoPtr->hwndFocus = hwndFocus;
       /* Remove default button */
     return TRUE;
@@ -49,10 +49,10 @@ static BOOL32 DEFDLG_SaveFocus( HWND32 hwnd, DIALOGINFO *infoPtr )
 /***********************************************************************
  *           DEFDLG_RestoreFocus
  */
-static BOOL32 DEFDLG_RestoreFocus( HWND32 hwnd, DIALOGINFO *infoPtr )
+static BOOL DEFDLG_RestoreFocus( HWND hwnd, DIALOGINFO *infoPtr )
 {
-    if (!infoPtr->hwndFocus || IsIconic32(hwnd)) return FALSE;
-    if (!IsWindow32( infoPtr->hwndFocus )) return FALSE;
+    if (!infoPtr->hwndFocus || IsIconic(hwnd)) return FALSE;
+    if (!IsWindow( infoPtr->hwndFocus )) return FALSE;
     DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus );
     /* This used to set infoPtr->hwndFocus to NULL for no apparent reason,
        sometimes losing focus when receiving WM_SETFOCUS messages. */
@@ -65,14 +65,14 @@ static BOOL32 DEFDLG_RestoreFocus( HWND32 hwnd, DIALOGINFO *infoPtr )
  *
  * Find the current default push-button.
  */
-static HWND32 DEFDLG_FindDefButton( HWND32 hwndDlg )
+static HWND DEFDLG_FindDefButton( HWND hwndDlg )
 {
-    HWND32 hwndChild = GetWindow32( hwndDlg, GW_CHILD );
+    HWND hwndChild = GetWindow( hwndDlg, GW_CHILD );
     while (hwndChild)
     {
         if (SendMessage16( hwndChild, WM_GETDLGCODE, 0, 0 ) & DLGC_DEFPUSHBUTTON)
             break;
-        hwndChild = GetWindow32( hwndChild, GW_HWNDNEXT );
+        hwndChild = GetWindow( hwndChild, GW_HWNDNEXT );
     }
     return hwndChild;
 }
@@ -83,8 +83,8 @@ static HWND32 DEFDLG_FindDefButton( HWND32 hwndDlg )
  *
  * Set the new default button to be hwndNew.
  */
-static BOOL32 DEFDLG_SetDefButton( HWND32 hwndDlg, DIALOGINFO *dlgInfo,
-                                   HWND32 hwndNew )
+static BOOL DEFDLG_SetDefButton( HWND hwndDlg, DIALOGINFO *dlgInfo,
+                                   HWND hwndNew )
 {
     if (hwndNew &&
         !(SendMessage16(hwndNew, WM_GETDLGCODE, 0, 0 ) & DLGC_UNDEFPUSHBUTTON))
@@ -92,14 +92,14 @@ static BOOL32 DEFDLG_SetDefButton( HWND32 hwndDlg, DIALOGINFO *dlgInfo,
     
     if (dlgInfo->idResult)  /* There's already a default pushbutton */
     {
-        HWND32 hwndOld = GetDlgItem32( hwndDlg, dlgInfo->idResult );
-        if (SendMessage32A( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)
-            SendMessage32A( hwndOld, BM_SETSTYLE32, BS_PUSHBUTTON, TRUE );
+        HWND hwndOld = GetDlgItem( hwndDlg, dlgInfo->idResult );
+        if (SendMessageA( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)
+            SendMessageA( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE );
     }
     if (hwndNew)
     {
-        SendMessage32A( hwndNew, BM_SETSTYLE32, BS_DEFPUSHBUTTON, TRUE );
-        dlgInfo->idResult = GetDlgCtrlID32( hwndNew );
+        SendMessageA( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE );
+        dlgInfo->idResult = GetDlgCtrlID( hwndNew );
     }
     else dlgInfo->idResult = 0;
     return TRUE;
@@ -112,13 +112,13 @@ static BOOL32 DEFDLG_SetDefButton( HWND32 hwndDlg, DIALOGINFO *dlgInfo,
  * Implementation of DefDlgProc(). Only handle messages that need special
  * handling for dialogs.
  */
-static LRESULT DEFDLG_Proc( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam,
                             LPARAM lParam, DIALOGINFO *dlgInfo )
 {
     switch(msg)
     {
         case WM_ERASEBKGND:
-	    FillWindow( hwnd, hwnd, (HDC16)wParam, (HBRUSH16)CTLCOLOR_DLG );
+	    FillWindow16( hwnd, hwnd, (HDC16)wParam, (HBRUSH16)CTLCOLOR_DLG );
 	    return 1;
 
 	case WM_NCDESTROY:
@@ -134,14 +134,14 @@ static LRESULT DEFDLG_Proc( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
 	      /* Delete font */
 	    if (dlgInfo->hUserFont)
 	    {
-		DeleteObject32( dlgInfo->hUserFont );
+		DeleteObject( dlgInfo->hUserFont );
 		dlgInfo->hUserFont = 0;
 	    }
 
 	      /* Delete menu */
 	    if (dlgInfo->hMenu)
 	    {		
-		DestroyMenu32( dlgInfo->hMenu );
+		DestroyMenu( dlgInfo->hMenu );
 		dlgInfo->hMenu = 0;
 	    }
 
@@ -151,11 +151,11 @@ static LRESULT DEFDLG_Proc( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
             dlgInfo->flags |= DF_END;  /* just in case */
 
 	      /* Window clean-up */
-	    return DefWindowProc32A( hwnd, msg, wParam, lParam );
+	    return DefWindowProcA( hwnd, msg, wParam, lParam );
 
 	case WM_SHOWWINDOW:
 	    if (!wParam) DEFDLG_SaveFocus( hwnd, dlgInfo );
-	    return DefWindowProc32A( hwnd, msg, wParam, lParam );
+	    return DefWindowProcA( hwnd, msg, wParam, lParam );
 
 	case WM_ACTIVATE:
 	    if (wParam) DEFDLG_RestoreFocus( hwnd, dlgInfo );
@@ -169,25 +169,25 @@ static LRESULT DEFDLG_Proc( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
         case DM_SETDEFID:
             if (dlgInfo->flags & DF_END) return 1;
             DEFDLG_SetDefButton( hwnd, dlgInfo,
-                                 wParam ? GetDlgItem32( hwnd, wParam ) : 0 );
+                                 wParam ? GetDlgItem( hwnd, wParam ) : 0 );
             return 1;
 
         case DM_GETDEFID:
             {
-                HWND32 hwndDefId;
+                HWND hwndDefId;
                 if (dlgInfo->flags & DF_END) return 0;
                 if (dlgInfo->idResult)
                     return MAKELONG( dlgInfo->idResult, DC_HASDEFID );
                 if ((hwndDefId = DEFDLG_FindDefButton( hwnd )))
-                    return MAKELONG( GetDlgCtrlID32( hwndDefId ), DC_HASDEFID);
+                    return MAKELONG( GetDlgCtrlID( hwndDefId ), DC_HASDEFID);
             }
 	    return 0;
 
 	case WM_NEXTDLGCTL:
 	    {
-                HWND32 hwndDest = (HWND32)wParam;
+                HWND hwndDest = (HWND)wParam;
                 if (!lParam)
-                    hwndDest = GetNextDlgTabItem32(hwnd, GetFocus32(), wParam);
+                    hwndDest = GetNextDlgTabItem(hwnd, GetFocus(), wParam);
                 if (hwndDest) DEFDLG_SetFocus( hwnd, hwndDest );
                 DEFDLG_SetDefButton( hwnd, dlgInfo, hwndDest );
             }
@@ -197,7 +197,7 @@ static LRESULT DEFDLG_Proc( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
         case WM_LBUTTONDOWN:
         case WM_NCLBUTTONDOWN:
             {
-                HWND32 hwndFocus = GetFocus32();
+                HWND hwndFocus = GetFocus();
                 if (hwndFocus)
                 {
                     WND *wnd = WIN_FindWndPtr( hwndFocus );
@@ -206,25 +206,25 @@ static LRESULT DEFDLG_Proc( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
                     {
                         /* always make combo box hide its listbox control */
 
-                        if( WIDGETS_IsControl32( wnd, BIC32_COMBO ) )
-                            SendMessage32A( hwndFocus, CB_SHOWDROPDOWN32,
+                        if( WIDGETS_IsControl( wnd, BIC32_COMBO ) )
+                            SendMessageA( hwndFocus, CB_SHOWDROPDOWN,
                                             FALSE, 0 );
-                        else if( WIDGETS_IsControl32( wnd, BIC32_EDIT ) &&
-                                 WIDGETS_IsControl32( wnd->parent,
+                        else if( WIDGETS_IsControl( wnd, BIC32_EDIT ) &&
+                                 WIDGETS_IsControl( wnd->parent,
                                                       BIC32_COMBO ))
-                            SendMessage32A( wnd->parent->hwndSelf, 
-                                            CB_SHOWDROPDOWN32, FALSE, 0 );
+                            SendMessageA( wnd->parent->hwndSelf, 
+                                            CB_SHOWDROPDOWN, FALSE, 0 );
                     }
                 }
             }
-	    return DefWindowProc32A( hwnd, msg, wParam, lParam );
+	    return DefWindowProcA( hwnd, msg, wParam, lParam );
 
 	case WM_GETFONT: 
 	    return dlgInfo->hUserFont;
 
         case WM_CLOSE:
-            PostMessage32A( hwnd, WM_COMMAND, IDCANCEL,
-                            (LPARAM)GetDlgItem32( hwnd, IDCANCEL ) );
+            PostMessageA( hwnd, WM_COMMAND, IDCANCEL,
+                            (LPARAM)GetDlgItem( hwnd, IDCANCEL ) );
             return 0;
     }
     return 0;
@@ -233,7 +233,7 @@ static LRESULT DEFDLG_Proc( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
 /***********************************************************************
  *           DEFDLG_Epilog
  */
-static LRESULT DEFDLG_Epilog(DIALOGINFO* dlgInfo, UINT32 msg, BOOL32 fResult)
+static LRESULT DEFDLG_Epilog(DIALOGINFO* dlgInfo, UINT msg, BOOL fResult)
 {
     /* see SDK 3.1 */
 
@@ -253,7 +253,7 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
                              LPARAM lParam )
 {
     DIALOGINFO * dlgInfo;
-    BOOL32 result = FALSE;
+    BOOL result = FALSE;
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     
     if (!wndPtr) return 0;
@@ -268,7 +268,7 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
             result = LOWORD(result);
     }
 
-    if (!result && IsWindow32(hwnd))
+    if (!result && IsWindow(hwnd))
     {
         /* callback didn't process this message */
 
@@ -287,8 +287,8 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
             case WM_ENTERMENULOOP:
             case WM_LBUTTONDOWN:
             case WM_NCLBUTTONDOWN:
-                return DEFDLG_Proc( (HWND32)hwnd, msg, 
-                                    (WPARAM32)wParam, lParam, dlgInfo );
+                return DEFDLG_Proc( (HWND)hwnd, msg, 
+                                    (WPARAM)wParam, lParam, dlgInfo );
             case WM_INITDIALOG:
             case WM_VKEYTOITEM:
             case WM_COMPAREITEM:
@@ -306,11 +306,11 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 /***********************************************************************
  *           DefDlgProc32A   (USER32.120)
  */
-LRESULT WINAPI DefDlgProc32A( HWND32 hwnd, UINT32 msg,
-                              WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg,
+                              WPARAM wParam, LPARAM lParam )
 {
     DIALOGINFO * dlgInfo;
-    BOOL32 result = FALSE;
+    BOOL result = FALSE;
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     
     if (!wndPtr) return 0;
@@ -318,14 +318,14 @@ LRESULT WINAPI DefDlgProc32A( HWND32 hwnd, UINT32 msg,
     dlgInfo->msgResult = 0;
 
     if (dlgInfo->dlgProc) {      /* Call dialog procedure */
-        result = CallWindowProc32A( (WNDPROC32)dlgInfo->dlgProc,
+        result = CallWindowProcA( (WNDPROC)dlgInfo->dlgProc,
                                             hwnd, msg, wParam, lParam );
         /* 16 bit dlg procs only return BOOL16 */
         if( WINPROC_GetProcType( dlgInfo->dlgProc ) == WIN_PROC_16 )
             result = LOWORD(result);
     }
 
-    if (!result && IsWindow32(hwnd))
+    if (!result && IsWindow(hwnd))
     {
         /* callback didn't process this message */
 
@@ -344,8 +344,8 @@ LRESULT WINAPI DefDlgProc32A( HWND32 hwnd, UINT32 msg,
             case WM_ENTERMENULOOP:
             case WM_LBUTTONDOWN:
             case WM_NCLBUTTONDOWN:
-                 return DEFDLG_Proc( (HWND32)hwnd, msg,
-                                     (WPARAM32)wParam, lParam, dlgInfo );
+                 return DEFDLG_Proc( (HWND)hwnd, msg,
+                                     (WPARAM)wParam, lParam, dlgInfo );
             case WM_INITDIALOG:
             case WM_VKEYTOITEM:
             case WM_COMPAREITEM:
@@ -353,7 +353,7 @@ LRESULT WINAPI DefDlgProc32A( HWND32 hwnd, UINT32 msg,
                  break;
 
             default:
-                 return DefWindowProc32A( hwnd, msg, wParam, lParam );
+                 return DefWindowProcA( hwnd, msg, wParam, lParam );
         }
     }
     return DEFDLG_Epilog(dlgInfo, msg, result);
@@ -363,11 +363,11 @@ LRESULT WINAPI DefDlgProc32A( HWND32 hwnd, UINT32 msg,
 /***********************************************************************
  *           DefDlgProc32W   (USER32.121)
  */
-LRESULT WINAPI DefDlgProc32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam,
                               LPARAM lParam )
 {
     DIALOGINFO * dlgInfo;
-    BOOL32 result = FALSE;
+    BOOL result = FALSE;
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     
     if (!wndPtr) return 0;
@@ -375,14 +375,14 @@ LRESULT WINAPI DefDlgProc32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
     dlgInfo->msgResult = 0;
 
     if (dlgInfo->dlgProc) {      /* Call dialog procedure */
-        result = CallWindowProc32W( (WNDPROC32)dlgInfo->dlgProc,
+        result = CallWindowProcW( (WNDPROC)dlgInfo->dlgProc,
                                             hwnd, msg, wParam, lParam );
         /* 16 bit dlg procs only return BOOL16 */
         if( WINPROC_GetProcType( dlgInfo->dlgProc ) == WIN_PROC_16 )
             result = LOWORD(result);
     }
 
-    if (!result && IsWindow32(hwnd))
+    if (!result && IsWindow(hwnd))
     {
         /* callback didn't process this message */
 
@@ -401,8 +401,8 @@ LRESULT WINAPI DefDlgProc32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
             case WM_ENTERMENULOOP:
             case WM_LBUTTONDOWN:
             case WM_NCLBUTTONDOWN:
-                 return DEFDLG_Proc( (HWND32)hwnd, msg,
-                                     (WPARAM32)wParam, lParam, dlgInfo );
+                 return DEFDLG_Proc( (HWND)hwnd, msg,
+                                     (WPARAM)wParam, lParam, dlgInfo );
             case WM_INITDIALOG:
             case WM_VKEYTOITEM:
             case WM_COMPAREITEM:
@@ -410,7 +410,7 @@ LRESULT WINAPI DefDlgProc32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
                  break;
 
             default:
-                 return DefWindowProc32W( hwnd, msg, wParam, lParam );
+                 return DefWindowProcW( hwnd, msg, wParam, lParam );
         }
     }
     return DEFDLG_Epilog(dlgInfo, msg, result);
diff --git a/windows/defwnd.c b/windows/defwnd.c
index d2022502e57..265a5597712 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -33,7 +33,7 @@ static short iMenuSysKey = 0;
  *
  * Handle the WM_WINDOWPOSCHANGED message.
  */
-static void DEFWND_HandleWindowPosChanged( WND *wndPtr, UINT32 flags )
+static void DEFWND_HandleWindowPosChanged( WND *wndPtr, UINT flags )
 {
     WPARAM16 wp = SIZE_RESTORED;
 
@@ -70,39 +70,39 @@ void DEFWND_SetText( WND *wndPtr, LPCSTR text )
  *
  * Default colors for control painting.
  */
-HBRUSH32 DEFWND_ControlColor( HDC32 hDC, UINT16 ctlType )
+HBRUSH DEFWND_ControlColor( HDC hDC, UINT16 ctlType )
 {
     if( ctlType == CTLCOLOR_SCROLLBAR)
     {
-	HBRUSH32 hb = GetSysColorBrush32(COLOR_SCROLLBAR);
-	SetBkColor32( hDC, RGB(255, 255, 255) );
-	SetTextColor32( hDC, RGB(0, 0, 0) );
-	UnrealizeObject32( hb );
+	HBRUSH hb = GetSysColorBrush(COLOR_SCROLLBAR);
+	SetBkColor( hDC, RGB(255, 255, 255) );
+	SetTextColor( hDC, RGB(0, 0, 0) );
+	UnrealizeObject( hb );
         return hb;
     }
 
-    SetTextColor32( hDC, GetSysColor32(COLOR_WINDOWTEXT));
+    SetTextColor( hDC, GetSysColor(COLOR_WINDOWTEXT));
 
     if (TWEAK_WineLook > WIN31_LOOK) {
 	if ((ctlType == CTLCOLOR_EDIT) || (ctlType == CTLCOLOR_LISTBOX))
-	    SetBkColor32( hDC, GetSysColor32(COLOR_WINDOW) );
+	    SetBkColor( hDC, GetSysColor(COLOR_WINDOW) );
 	else {
-	    SetBkColor32( hDC, GetSysColor32(COLOR_3DFACE) );
-	    return GetSysColorBrush32(COLOR_3DFACE);
+	    SetBkColor( hDC, GetSysColor(COLOR_3DFACE) );
+	    return GetSysColorBrush(COLOR_3DFACE);
 	}
     }
     else
-	SetBkColor32( hDC, GetSysColor32(COLOR_WINDOW) );
-    return GetSysColorBrush32(COLOR_WINDOW);
+	SetBkColor( hDC, GetSysColor(COLOR_WINDOW) );
+    return GetSysColorBrush(COLOR_WINDOW);
 }
 
 
 /***********************************************************************
  *           DEFWND_SetRedraw
  */
-static void DEFWND_SetRedraw( WND* wndPtr, WPARAM32 wParam )
+static void DEFWND_SetRedraw( WND* wndPtr, WPARAM wParam )
 {
-    BOOL32 bVisible = wndPtr->dwStyle & WS_VISIBLE;
+    BOOL bVisible = wndPtr->dwStyle & WS_VISIBLE;
 
     TRACE(win,"%04x %i\n", wndPtr->hwndSelf, (wParam!=0) );
 
@@ -130,13 +130,13 @@ static void DEFWND_SetRedraw( WND* wndPtr, WPARAM32 wParam )
  *
  * Default window procedure for messages that are the same in Win16 and Win32.
  */
-static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
+static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT msg, WPARAM wParam,
                                   LPARAM lParam )
 {
     switch(msg)
     {
     case WM_NCPAINT:
-	return NC_HandleNCPaint( wndPtr->hwndSelf, (HRGN32)wParam );
+	return NC_HandleNCPaint( wndPtr->hwndSelf, (HRGN)wParam );
 
     case WM_NCHITTEST:
         return NC_HandleNCHitTest( wndPtr->hwndSelf, MAKEPOINT16(lParam) );
@@ -153,14 +153,14 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
         if ((wndPtr->flags & WIN_ISWIN32) || (TWEAK_WineLook > WIN31_LOOK))
         {
 	    ClientToScreen16(wndPtr->hwndSelf, (LPPOINT16)&lParam);
-            SendMessage32A( wndPtr->hwndSelf, WM_CONTEXTMENU,
+            SendMessageA( wndPtr->hwndSelf, WM_CONTEXTMENU,
 			    wndPtr->hwndSelf, lParam);
         }
         break;
 
     case WM_CONTEXTMENU:
 	if( wndPtr->dwStyle & WS_CHILD )
-	    SendMessage32A( wndPtr->parent->hwndSelf, msg, wParam, lParam );
+	    SendMessageA( wndPtr->parent->hwndSelf, msg, wParam, lParam );
 	else
 	  if (wndPtr->hSysMenu)
 	  { /*
@@ -198,7 +198,7 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
 			SYSMETRICS_CYICON)/2;
 		TRACE(win,"Painting class icon: vis rect=(%i,%i - %i,%i)\n",
 		ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom );
-	        DrawIcon32( hdc, x, y, wndPtr->class->hIcon );
+	        DrawIcon( hdc, x, y, wndPtr->class->hIcon );
 	      }
 	      EndPaint16( wndPtr->hwndSelf, &ps );
 	    }
@@ -210,7 +210,7 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
         return 0;
 
     case WM_CLOSE:
-	DestroyWindow32( wndPtr->hwndSelf );
+	DestroyWindow( wndPtr->hwndSelf );
 	return 0;
 
     case WM_MOUSEACTIVATE:
@@ -230,10 +230,10 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
 	if (LOWORD(wParam) != WA_INACTIVE) {
 		/* I don't know who put this SetWindowPos here, it does not
 		 * seem very logical to have it here... (FIXME?) */
-		SetWindowPos32(wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0,
+		SetWindowPos(wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0,
 			 SWP_NOMOVE | SWP_NOSIZE);
 		if (!(wndPtr->dwStyle & WS_MINIMIZE))
-			SetFocus32(wndPtr->hwndSelf);
+			SetFocus(wndPtr->hwndSelf);
 	}
 	break;
 
@@ -244,13 +244,13 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
 
 	    if (wndPtr->class->hbrBackground <= (HBRUSH16)(COLOR_MAX+1))
             {
-                HBRUSH32 hbrush = CreateSolidBrush32( 
-                       GetSysColor32(((DWORD)wndPtr->class->hbrBackground)-1));
-                 FillWindow( GetParent16(wndPtr->hwndSelf), wndPtr->hwndSelf,
+                HBRUSH hbrush = CreateSolidBrush( 
+                       GetSysColor(((DWORD)wndPtr->class->hbrBackground)-1));
+                 FillWindow16( GetParent16(wndPtr->hwndSelf), wndPtr->hwndSelf,
                              (HDC16)wParam, hbrush);
-                 DeleteObject32( hbrush );
+                 DeleteObject( hbrush );
             }
-            else FillWindow( GetParent16(wndPtr->hwndSelf), wndPtr->hwndSelf,
+            else FillWindow16( GetParent16(wndPtr->hwndSelf), wndPtr->hwndSelf,
                              (HDC16)wParam, wndPtr->class->hbrBackground );
 	    return 1;
 	}
@@ -265,10 +265,10 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
     case WM_CTLCOLORDLG:
     case WM_CTLCOLORSTATIC:
     case WM_CTLCOLORSCROLLBAR:
-	return (LRESULT)DEFWND_ControlColor( (HDC32)wParam, msg - WM_CTLCOLORMSGBOX );
+	return (LRESULT)DEFWND_ControlColor( (HDC)wParam, msg - WM_CTLCOLORMSGBOX );
 
     case WM_CTLCOLOR:
-	return (LRESULT)DEFWND_ControlColor( (HDC32)wParam, HIWORD(lParam) );
+	return (LRESULT)DEFWND_ControlColor( (HDC)wParam, HIWORD(lParam) );
 	
     case WM_GETTEXTLENGTH:
         if (wndPtr->text) return (LRESULT)strlen(wndPtr->text);
@@ -302,7 +302,7 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
 
 	    if( wParam == VK_F4 )	/* try to close the window */
 	    {
-		HWND32 hWnd = WIN_GetTopParent( wndPtr->hwndSelf );
+		HWND hWnd = WIN_GetTopParent( wndPtr->hwndSelf );
 		wndPtr = WIN_FindWndPtr( hWnd );
 		if( wndPtr && !(wndPtr->class->style & CS_NOCLOSE) )
 		    PostMessage16( hWnd, WM_SYSCOMMAND, SC_CLOSE, 0 );
@@ -311,7 +311,7 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
 	else if( wParam == VK_F10 )
 	        iF10Key = 1;
 	     else
-	        if( wParam == VK_ESCAPE && (GetKeyState32(VK_SHIFT) & 0x8000))
+	        if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000))
 		    SendMessage16( wndPtr->hwndSelf, WM_SYSCOMMAND,
                                   (WPARAM16)SC_KEYMENU, (LPARAM)VK_SPACE);
 	break;
@@ -344,7 +344,7 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
                                (WPARAM16)SC_KEYMENU, (LPARAM)(DWORD)wParam );
         } 
 	else /* check for Ctrl-Esc */
-            if (wParam != VK_ESCAPE) MessageBeep32(0);
+            if (wParam != VK_ESCAPE) MessageBeep(0);
 	break;
 
     case WM_SHOWWINDOW:
@@ -352,12 +352,12 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
         if (!(wndPtr->dwStyle & WS_POPUP) || !wndPtr->owner) return 0;
         if ((wndPtr->dwStyle & WS_VISIBLE) && wParam) return 0;
 	else if (!(wndPtr->dwStyle & WS_VISIBLE) && !wParam) return 0;
-        ShowWindow32( wndPtr->hwndSelf, wParam ? SW_SHOWNOACTIVATE : SW_HIDE );
+        ShowWindow( wndPtr->hwndSelf, wParam ? SW_SHOWNOACTIVATE : SW_HIDE );
 	break; 
 
     case WM_CANCELMODE:
 	if (wndPtr->parent == WIN_GetDesktop()) EndMenu();
-	if (GetCapture32() == wndPtr->hwndSelf) ReleaseCapture();
+	if (GetCapture() == wndPtr->hwndSelf) ReleaseCapture();
 	break;
 
     case WM_VKEYTOITEM:
@@ -421,7 +421,7 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 
     case WM_NCCALCSIZE:
         {
-            RECT32 rect32;
+            RECT rect32;
             CONV_RECT16TO32( (RECT16 *)PTR_SEG_TO_LIN(lParam), &rect32 );
             result = NC_HandleNCCalcSize( wndPtr, &rect32 );
             CONV_RECT32TO16( &rect32, (RECT16 *)PTR_SEG_TO_LIN(lParam) );
@@ -443,14 +443,14 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
     case WM_GETTEXT:
         if (wParam && wndPtr->text)
         {
-            lstrcpyn32A( (LPSTR)PTR_SEG_TO_LIN(lParam), wndPtr->text, wParam );
+            lstrcpynA( (LPSTR)PTR_SEG_TO_LIN(lParam), wndPtr->text, wParam );
             result = (LRESULT)strlen( (LPSTR)PTR_SEG_TO_LIN(lParam) );
         }
         break;
 
     case WM_SETTEXT:
 	DEFWND_SetText( wndPtr, (LPSTR)PTR_SEG_TO_LIN(lParam) );
-	if( wndPtr->dwStyle & WS_CAPTION ) NC_HandleNCPaint( hwnd , (HRGN32)1 );
+	if( wndPtr->dwStyle & WS_CAPTION ) NC_HandleNCPaint( hwnd , (HRGN)1 );
         break;
 
     default:
@@ -467,37 +467,37 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
  *  DefWindowProc32A [USER32.126] 
  *
  */
-LRESULT WINAPI DefWindowProc32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam,
                                  LPARAM lParam )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     LRESULT result = 0;
 
     if (!wndPtr) return 0;
-    SPY_EnterMessage( SPY_DEFWNDPROC32, hwnd, msg, wParam, lParam );
+    SPY_EnterMessage( SPY_DEFWNDPROC, hwnd, msg, wParam, lParam );
 
     switch(msg)
     {
     case WM_NCCREATE:
 	{
-	    CREATESTRUCT32A *cs = (CREATESTRUCT32A *)lParam;
+	    CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam;
 	    if (cs->lpszName) DEFWND_SetText( wndPtr, cs->lpszName );
 	    result = 1;
 	}
         break;
 
     case WM_NCCALCSIZE:
-        result = NC_HandleNCCalcSize( wndPtr, (RECT32 *)lParam );
+        result = NC_HandleNCCalcSize( wndPtr, (RECT *)lParam );
         break;
 
     case WM_WINDOWPOSCHANGING:
-	result = WINPOS_HandleWindowPosChanging32( wndPtr,
-                                                   (WINDOWPOS32 *)lParam );
+	result = WINPOS_HandleWindowPosChanging( wndPtr,
+                                                   (WINDOWPOS *)lParam );
         break;
 
     case WM_WINDOWPOSCHANGED:
 	{
-	    WINDOWPOS32 * winPos = (WINDOWPOS32 *)lParam;
+	    WINDOWPOS * winPos = (WINDOWPOS *)lParam;
             DEFWND_HandleWindowPosChanged( wndPtr, winPos->flags );
 	}
         break;
@@ -505,14 +505,14 @@ LRESULT WINAPI DefWindowProc32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
     case WM_GETTEXT:
         if (wParam && wndPtr->text)
         {
-            lstrcpyn32A( (LPSTR)lParam, wndPtr->text, wParam );
+            lstrcpynA( (LPSTR)lParam, wndPtr->text, wParam );
             result = (LRESULT)strlen( (LPSTR)lParam );
         }
         break;
 
     case WM_SETTEXT:
 	DEFWND_SetText( wndPtr, (LPSTR)lParam );
-	NC_HandleNCPaint( hwnd , (HRGN32)1 );  /* Repaint caption */
+	NC_HandleNCPaint( hwnd , (HRGN)1 );  /* Repaint caption */
         break;
 
     default:
@@ -520,7 +520,7 @@ LRESULT WINAPI DefWindowProc32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
         break;
     }
 
-    SPY_ExitMessage( SPY_RESULT_DEFWND32, hwnd, msg, result );
+    SPY_ExitMessage( SPY_RESULT_DEFWND, hwnd, msg, result );
     return result;
 }
 
@@ -534,10 +534,10 @@ LRESULT WINAPI DefWindowProc32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
  *  RETURNS
  *     Return value is dependent upon the message.
 */
-LRESULT WINAPI DefWindowProc32W( 
-    HWND32 hwnd,      /* [in] window procedure recieving message */
-    UINT32 msg,       /* [in] message identifier */
-    WPARAM32 wParam,  /* [in] first message parameter */
+LRESULT WINAPI DefWindowProcW( 
+    HWND hwnd,      /* [in] window procedure recieving message */
+    UINT msg,       /* [in] message identifier */
+    WPARAM wParam,  /* [in] first message parameter */
     LPARAM lParam )   /* [in] second message parameter */
 {
     LRESULT result;
@@ -546,7 +546,7 @@ LRESULT WINAPI DefWindowProc32W(
     {
     case WM_NCCREATE:
 	{
-	    CREATESTRUCT32W *cs = (CREATESTRUCT32W *)lParam;
+	    CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam;
 	    if (cs->lpszName)
             {
                 WND *wndPtr = WIN_FindWndPtr( hwnd );
@@ -561,7 +561,7 @@ LRESULT WINAPI DefWindowProc32W(
     case WM_GETTEXT:
         {
             LPSTR str = HeapAlloc( GetProcessHeap(), 0, wParam );
-            result = DefWindowProc32A( hwnd, msg, wParam, (LPARAM)str );
+            result = DefWindowProcA( hwnd, msg, wParam, (LPARAM)str );
             lstrcpynAtoW( (LPWSTR)lParam, str, wParam );
             HeapFree( GetProcessHeap(), 0, str );
         }
@@ -570,13 +570,13 @@ LRESULT WINAPI DefWindowProc32W(
     case WM_SETTEXT:
         {
             LPSTR str = HEAP_strdupWtoA( GetProcessHeap(), 0, (LPWSTR)lParam );
-            result = DefWindowProc32A( hwnd, msg, wParam, (LPARAM)str );
+            result = DefWindowProcA( hwnd, msg, wParam, (LPARAM)str );
             HeapFree( GetProcessHeap(), 0, str );
         }
         break;
 
     default:
-        result = DefWindowProc32A( hwnd, msg, wParam, lParam );
+        result = DefWindowProcA( hwnd, msg, wParam, lParam );
         break;
     }
     return result;
diff --git a/windows/dialog.c b/windows/dialog.c
index 8752738e6dc..bec39652886 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -34,7 +34,7 @@ typedef struct
     INT16      y;
     INT16      cx;
     INT16      cy;
-    UINT32     id;
+    UINT     id;
     LPCSTR     className;
     LPCSTR     windowName;
     LPVOID     data;
@@ -56,9 +56,9 @@ typedef struct
     LPCSTR     caption;
     WORD       pointSize;
     WORD       weight;
-    BOOL32     italic;
+    BOOL     italic;
     LPCSTR     faceName;
-    BOOL32     dialogEx;
+    BOOL     dialogEx;
 } DLG_TEMPLATE;
 
   /* Dialog base units */
@@ -70,7 +70,7 @@ static WORD xBaseUnit = 0, yBaseUnit = 0;
  *
  * Initialisation of the dialog manager.
  */
-BOOL32 DIALOG_Init(void)
+BOOL DIALOG_Init(void)
 {
     TEXTMETRIC16 tm;
     HDC16 hdc;
@@ -79,7 +79,7 @@ BOOL32 DIALOG_Init(void)
 
     if (!(hdc = CreateDC16( "DISPLAY", NULL, NULL, NULL ))) return FALSE;
     GetTextMetrics16( hdc, &tm );
-    DeleteDC32( hdc );
+    DeleteDC( hdc );
     xBaseUnit = tm.tmAveCharWidth;
     yBaseUnit = tm.tmHeight;
 
@@ -138,7 +138,7 @@ static LPCSTR DIALOG_GetControl16( LPCSTR p, DLG_CONTROL_INFO *info )
     if (int_id)
     {
 	  /* Integer id, not documented (?). Only works for SS_ICON controls */
-	info->windowName = (LPCSTR)(UINT32)GET_WORD(p+1);
+	info->windowName = (LPCSTR)(UINT)GET_WORD(p+1);
 	p += 3;
     }
     else
@@ -172,7 +172,7 @@ static LPCSTR DIALOG_GetControl16( LPCSTR p, DLG_CONTROL_INFO *info )
  * fill the header structure and return a pointer to the next control.
  */
 static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info,
-                                        BOOL32 dialogEx )
+                                        BOOL dialogEx )
 {
     if (dialogEx)
     {
@@ -227,18 +227,18 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info,
     else
     {
         info->className = (LPCSTR)p;
-        p += lstrlen32W( (LPCWSTR)p ) + 1;
+        p += lstrlenW( (LPCWSTR)p ) + 1;
     }
 
     if (GET_WORD(p) == 0xffff)  /* Is it an integer id? */
     {
-	info->windowName = (LPCSTR)(UINT32)GET_WORD(p + 1);
+	info->windowName = (LPCSTR)(UINT)GET_WORD(p + 1);
 	p += 2;
     }
     else
     {
 	info->windowName = (LPCSTR)p;
-        p += lstrlen32W( (LPCWSTR)p ) + 1;
+        p += lstrlenW( (LPCWSTR)p ) + 1;
     }
 
     TRACE(dialog,"    %s %s %d, %d, %d, %d, %d, %08lx, %08lx, %08lx\n", 
@@ -274,14 +274,14 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info,
  *
  * Create the control windows for a dialog.
  */
-static BOOL32 DIALOG_CreateControls( WND *pWnd, LPCSTR template,
+static BOOL DIALOG_CreateControls( WND *pWnd, LPCSTR template,
                                      const DLG_TEMPLATE *dlgTemplate,
-                                     HINSTANCE32 hInst, BOOL32 win32 )
+                                     HINSTANCE hInst, BOOL win32 )
 {
     DIALOGINFO *dlgInfo = (DIALOGINFO *)pWnd->wExtra;
     DLG_CONTROL_INFO info;
-    HWND32 hwndCtrl, hwndDefButton = 0;
-    INT32 items = dlgTemplate->nbItems;
+    HWND hwndCtrl, hwndDefButton = 0;
+    INT items = dlgTemplate->nbItems;
 
     TRACE(dialog, " BEGIN\n" );
     while (items--)
@@ -301,7 +301,7 @@ static BOOL32 DIALOG_CreateControls( WND *pWnd, LPCSTR template,
                         ERR(dialog, "Insufficient memory to create heap for edit control\n" );
                         continue;
                     }
-                    LocalInit(dlgInfo->hDialogHeap, 0, 0xffff);
+                    LocalInit16(dlgInfo->hDialogHeap, 0, 0xffff);
                 }
                 instance = dlgInfo->hDialogHeap;
             }
@@ -321,7 +321,7 @@ static BOOL32 DIALOG_CreateControls( WND *pWnd, LPCSTR template,
         {
             template = (LPCSTR)DIALOG_GetControl32( (WORD *)template, &info,
                                                     dlgTemplate->dialogEx );
-            hwndCtrl = CreateWindowEx32W( info.exStyle | WS_EX_NOPARENTNOTIFY,
+            hwndCtrl = CreateWindowExW( info.exStyle | WS_EX_NOPARENTNOTIFY,
                                           (LPCWSTR)info.className,
                                           (LPCWSTR)info.windowName,
                                           info.style | WS_CHILD,
@@ -329,23 +329,23 @@ static BOOL32 DIALOG_CreateControls( WND *pWnd, LPCSTR template,
                                           info.y * dlgInfo->yBaseUnit / 8,
                                           info.cx * dlgInfo->xBaseUnit / 4,
                                           info.cy * dlgInfo->yBaseUnit / 8,
-                                          pWnd->hwndSelf, (HMENU32)info.id,
+                                          pWnd->hwndSelf, (HMENU)info.id,
                                           hInst, info.data );
         }
         if (!hwndCtrl) return FALSE;
 
             /* Send initialisation messages to the control */
-        if (dlgInfo->hUserFont) SendMessage32A( hwndCtrl, WM_SETFONT,
-                                             (WPARAM32)dlgInfo->hUserFont, 0 );
-        if (SendMessage32A(hwndCtrl, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)
+        if (dlgInfo->hUserFont) SendMessageA( hwndCtrl, WM_SETFONT,
+                                             (WPARAM)dlgInfo->hUserFont, 0 );
+        if (SendMessageA(hwndCtrl, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)
         {
               /* If there's already a default push-button, set it back */
               /* to normal and use this one instead. */
             if (hwndDefButton)
-                SendMessage32A( hwndDefButton, BM_SETSTYLE32,
+                SendMessageA( hwndDefButton, BM_SETSTYLE,
                                 BS_PUSHBUTTON,FALSE );
             hwndDefButton = hwndCtrl;
-            dlgInfo->idResult = GetWindowWord32( hwndCtrl, GWW_ID );
+            dlgInfo->idResult = GetWindowWord( hwndCtrl, GWW_ID );
         }
     }    
     TRACE(dialog, " END\n" );
@@ -381,7 +381,7 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result )
         p++;
         break;
     case 0xff:
-        result->menuName = (LPCSTR)(UINT32)GET_WORD( p + 1 );
+        result->menuName = (LPCSTR)(UINT)GET_WORD( p + 1 );
         p += 3;
 	TRACE(dialog, " MENU %04x\n", LOWORD(result->menuName) );
         break;
@@ -467,14 +467,14 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result )
         p++;
         break;
     case 0xffff:
-        result->menuName = (LPCSTR)(UINT32)GET_WORD( p + 1 );
+        result->menuName = (LPCSTR)(UINT)GET_WORD( p + 1 );
         p += 2;
 	TRACE(dialog, " MENU %04x\n", LOWORD(result->menuName) );
         break;
     default:
         result->menuName = (LPCSTR)p;
         TRACE(dialog, " MENU %s\n", debugstr_w( (LPCWSTR)p ));
-        p += lstrlen32W( (LPCWSTR)p ) + 1;
+        p += lstrlenW( (LPCWSTR)p ) + 1;
         break;
     }
 
@@ -487,21 +487,21 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result )
         p++;
         break;
     case 0xffff:
-        result->className = (LPCSTR)(UINT32)GET_WORD( p + 1 );
+        result->className = (LPCSTR)(UINT)GET_WORD( p + 1 );
         p += 2;
 	TRACE(dialog, " CLASS %04x\n", LOWORD(result->className) );
         break;
     default:
         result->className = (LPCSTR)p;
         TRACE(dialog, " CLASS %s\n", debugstr_w( (LPCWSTR)p ));
-        p += lstrlen32W( (LPCWSTR)p ) + 1;
+        p += lstrlenW( (LPCWSTR)p ) + 1;
         break;
     }
 
     /* Get the window caption */
 
     result->caption = (LPCSTR)p;
-    p += lstrlen32W( (LPCWSTR)p ) + 1;
+    p += lstrlenW( (LPCWSTR)p ) + 1;
     TRACE(dialog, " CAPTION %s\n", debugstr_w( (LPCWSTR)result->caption ) );
 
     /* Get the font name */
@@ -521,7 +521,7 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result )
             result->italic = FALSE;
         }
 	result->faceName = (LPCSTR)p;
-        p += lstrlen32W( (LPCWSTR)p ) + 1;
+        p += lstrlenW( (LPCWSTR)p ) + 1;
 	TRACE(dialog, " FONT %d, %s, %d, %s\n",
               result->pointSize, debugstr_w( (LPCWSTR)result->faceName ),
               result->weight, result->italic ? "TRUE" : "FALSE" );
@@ -535,15 +535,15 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result )
 /***********************************************************************
  *           DIALOG_CreateIndirect
  */
-HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
-                              BOOL32 win32Template, HWND32 owner,
+HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate,
+                              BOOL win32Template, HWND owner,
                               DLGPROC16 dlgProc, LPARAM param,
                               WINDOWPROCTYPE procType )
 {
     HMENU16 hMenu = 0;
     HFONT16 hFont = 0;
-    HWND32 hwnd;
-    RECT32 rect;
+    HWND hwnd;
+    RECT rect;
     WND * wndPtr;
     DLG_TEMPLATE template;
     DIALOGINFO * dlgInfo;
@@ -568,7 +568,7 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
 	    hMenu = LoadMenu16( hInst, SEGPTR_GET(str) );
             SEGPTR_FREE( str );
 	}
-        else hMenu = LoadMenu32W( hInst, (LPCWSTR)template.menuName );
+        else hMenu = LoadMenuW( hInst, (LPCWSTR)template.menuName );
     }
 
       /* Create custom font if needed */
@@ -579,7 +579,7 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
           /* (see CreateFont() documentation in the Windows SDK).   */
 
 	if (win32Template)
-	    hFont = CreateFont32W( -template.pointSize, 0, 0, 0,
+	    hFont = CreateFontW( -template.pointSize, 0, 0, 0,
                                    template.weight, template.italic, FALSE,
                                    FALSE, DEFAULT_CHARSET, 0, 0, PROOF_QUALITY,
                                    FF_DONTCARE, (LPCWSTR)template.faceName );
@@ -593,11 +593,11 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
 	    TEXTMETRIC16 tm;
 	    HFONT16 oldFont;
 
-	    HDC32 hdc = GetDC32(0);
-	    oldFont = SelectObject32( hdc, hFont );
+	    HDC hdc = GetDC(0);
+	    oldFont = SelectObject( hdc, hFont );
 	    GetTextMetrics16( hdc, &tm );
-	    SelectObject32( hdc, oldFont );
-	    ReleaseDC32( 0, hdc );
+	    SelectObject( hdc, oldFont );
+	    ReleaseDC( 0, hdc );
 	    xUnit = tm.tmAveCharWidth;
 	    yUnit = tm.tmHeight;
             if (!(tm.tmPitchAndFamily & TMPF_FIXED_PITCH))
@@ -612,7 +612,7 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
     rect.bottom = template.cy * yUnit / 8;
     if (template.style & DS_MODALFRAME)
         template.exStyle |= WS_EX_DLGMODALFRAME;
-    AdjustWindowRectEx32( &rect, template.style, 
+    AdjustWindowRectEx( &rect, template.style, 
                           hMenu ? TRUE : FALSE , template.exStyle );
     rect.right -= rect.left;
     rect.bottom -= rect.top;
@@ -620,7 +620,7 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
     if ((INT16)template.x == CW_USEDEFAULT16)
     {
         rect.left = rect.top = (procType == WIN_PROC_16) ? CW_USEDEFAULT16
-                                                         : CW_USEDEFAULT32;
+                                                         : CW_USEDEFAULT;
     }
     else
     {
@@ -639,7 +639,7 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
             INT16 dX, dY;
 
             if( !(template.style & DS_ABSALIGN) )
-                ClientToScreen32( owner, (POINT32 *)&rect );
+                ClientToScreen( owner, (POINT *)&rect );
 	    
             /* try to fit it into the desktop */
 
@@ -658,7 +658,7 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
                                 rect.left, rect.top, rect.right, rect.bottom,
                                 owner, hMenu, hInst, NULL );
     else
-        hwnd = CreateWindowEx32W(template.exStyle, (LPCWSTR)template.className,
+        hwnd = CreateWindowExW(template.exStyle, (LPCWSTR)template.className,
                                  (LPCWSTR)template.caption,
                                  template.style & ~WS_VISIBLE,
                                  rect.left, rect.top, rect.right, rect.bottom,
@@ -666,8 +666,8 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
 	
     if (!hwnd)
     {
-	if (hFont) DeleteObject32( hFont );
-	if (hMenu) DestroyMenu32( hMenu );
+	if (hFont) DeleteObject( hFont );
+	if (hMenu) DestroyMenu( hMenu );
 	return 0;
     }
     wndPtr = WIN_FindWndPtr( hwnd );
@@ -688,7 +688,7 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
     dlgInfo->hDialogHeap = 0;
 
     if (dlgInfo->hUserFont)
-        SendMessage32A( hwnd, WM_SETFONT, (WPARAM32)dlgInfo->hUserFont, 0 );
+        SendMessageA( hwnd, WM_SETFONT, (WPARAM)dlgInfo->hUserFont, 0 );
 
     /* Create controls */
 
@@ -697,20 +697,20 @@ HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,
     {
        /* Send initialisation messages and set focus */
 
-	dlgInfo->hwndFocus = GetNextDlgTabItem32( hwnd, 0, FALSE );
+	dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE );
 
-	if (SendMessage32A( hwnd, WM_INITDIALOG, (WPARAM32)dlgInfo->hwndFocus, param ))
-            SetFocus32( dlgInfo->hwndFocus );
+	if (SendMessageA( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ))
+            SetFocus( dlgInfo->hwndFocus );
 
 	if (template.style & WS_VISIBLE && !(wndPtr->dwStyle & WS_VISIBLE)) 
 	{
-	   ShowWindow32( hwnd, SW_SHOWNORMAL );	/* SW_SHOW doesn't always work */
-	   UpdateWindow32( hwnd );
+	   ShowWindow( hwnd, SW_SHOWNORMAL );	/* SW_SHOW doesn't always work */
+	   UpdateWindow( hwnd );
 	}
 	return hwnd;
     }
 
-    if( IsWindow32(hwnd) ) DestroyWindow32( hwnd );
+    if( IsWindow(hwnd) ) DestroyWindow( hwnd );
     return 0;
 }
 
@@ -752,32 +752,32 @@ HWND16 WINAPI CreateDialogParam16( HINSTANCE16 hInst, SEGPTR dlgTemplate,
 /***********************************************************************
  *           CreateDialogParam32A   (USER32.73)
  */
-HWND32 WINAPI CreateDialogParam32A( HINSTANCE32 hInst, LPCSTR name,
-                                    HWND32 owner, DLGPROC32 dlgProc,
+HWND WINAPI CreateDialogParamA( HINSTANCE hInst, LPCSTR name,
+                                    HWND owner, DLGPROC dlgProc,
                                     LPARAM param )
 {
     if (HIWORD(name))
     {
         LPWSTR str = HEAP_strdupAtoW( GetProcessHeap(), 0, name );
-        HWND32 hwnd = CreateDialogParam32W( hInst, str, owner, dlgProc, param);
+        HWND hwnd = CreateDialogParamW( hInst, str, owner, dlgProc, param);
         HeapFree( GetProcessHeap(), 0, str );
         return hwnd;
     }
-    return CreateDialogParam32W( hInst, (LPCWSTR)name, owner, dlgProc, param );
+    return CreateDialogParamW( hInst, (LPCWSTR)name, owner, dlgProc, param );
 }
 
 
 /***********************************************************************
  *           CreateDialogParam32W   (USER32.74)
  */
-HWND32 WINAPI CreateDialogParam32W( HINSTANCE32 hInst, LPCWSTR name,
-                                    HWND32 owner, DLGPROC32 dlgProc,
+HWND WINAPI CreateDialogParamW( HINSTANCE hInst, LPCWSTR name,
+                                    HWND owner, DLGPROC dlgProc,
                                     LPARAM param )
 {
-    HANDLE32 hrsrc = FindResource32W( hInst, name, RT_DIALOG32W );
+    HANDLE hrsrc = FindResourceW( hInst, name, RT_DIALOGW );
     if (!hrsrc) return 0;
-    return CreateDialogIndirectParam32W( hInst,
-                                         (LPVOID)LoadResource32(hInst, hrsrc),
+    return CreateDialogIndirectParamW( hInst,
+                                         (LPVOID)LoadResource(hInst, hrsrc),
                                          owner, dlgProc, param );
 }
 
@@ -808,9 +808,9 @@ HWND16 WINAPI CreateDialogIndirectParam16( HINSTANCE16 hInst,
 /***********************************************************************
  *           CreateDialogIndirectParam32A   (USER32.69)
  */
-HWND32 WINAPI CreateDialogIndirectParam32A( HINSTANCE32 hInst,
+HWND WINAPI CreateDialogIndirectParamA( HINSTANCE hInst,
                                             LPCVOID dlgTemplate,
-                                            HWND32 owner, DLGPROC32 dlgProc,
+                                            HWND owner, DLGPROC dlgProc,
                                             LPARAM param )
 {
     return DIALOG_CreateIndirect( hInst, dlgTemplate, TRUE, owner,
@@ -820,9 +820,9 @@ HWND32 WINAPI CreateDialogIndirectParam32A( HINSTANCE32 hInst,
 /***********************************************************************
  *           CreateDialogIndirectParam32AorW   (USER32.71)
  */
-HWND32 WINAPI CreateDialogIndirectParam32AorW( HINSTANCE32 hInst,
+HWND WINAPI CreateDialogIndirectParamAorW( HINSTANCE hInst,
                                             LPCVOID dlgTemplate,
-                                            HWND32 owner, DLGPROC32 dlgProc,
+                                            HWND owner, DLGPROC dlgProc,
                                             LPARAM param )
 {   FIXME(dialog,"assume WIN_PROC_32W\n");
     return DIALOG_CreateIndirect( hInst, dlgTemplate, TRUE, owner,
@@ -832,9 +832,9 @@ HWND32 WINAPI CreateDialogIndirectParam32AorW( HINSTANCE32 hInst,
 /***********************************************************************
  *           CreateDialogIndirectParam32W   (USER32.72)
  */
-HWND32 WINAPI CreateDialogIndirectParam32W( HINSTANCE32 hInst,
+HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst,
                                             LPCVOID dlgTemplate,
-                                            HWND32 owner, DLGPROC32 dlgProc,
+                                            HWND owner, DLGPROC dlgProc,
                                             LPARAM param )
 {
     return DIALOG_CreateIndirect( hInst, dlgTemplate, TRUE, owner,
@@ -845,12 +845,12 @@ HWND32 WINAPI CreateDialogIndirectParam32W( HINSTANCE32 hInst,
 /***********************************************************************
  *           DIALOG_DoDialogBox
  */
-INT32 DIALOG_DoDialogBox( HWND32 hwnd, HWND32 owner )
+INT DIALOG_DoDialogBox( HWND hwnd, HWND owner )
 {
     WND * wndPtr;
     DIALOGINFO * dlgInfo;
-    MSG32 msg;
-    INT32 retval;
+    MSG msg;
+    INT retval;
 
       /* Owner must be a top-level window */
     owner = WIN_GetTopParent( owner );
@@ -859,22 +859,22 @@ INT32 DIALOG_DoDialogBox( HWND32 hwnd, HWND32 owner )
 
     if (!dlgInfo->flags & DF_END) /* was EndDialog called in WM_INITDIALOG ? */
     {
-        EnableWindow32( owner, FALSE );
-        ShowWindow32( hwnd, SW_SHOW );
+        EnableWindow( owner, FALSE );
+        ShowWindow( hwnd, SW_SHOW );
         while (MSG_InternalGetMessage(&msg, hwnd, owner, MSGF_DIALOGBOX, 
                                       PM_REMOVE, !(wndPtr->dwStyle & DS_NOIDLEMSG) ))
         {
-            if (!IsDialogMessage32A( hwnd, &msg))
+            if (!IsDialogMessageA( hwnd, &msg))
             {
-                TranslateMessage32( &msg );
-                DispatchMessage32A( &msg );
+                TranslateMessage( &msg );
+                DispatchMessageA( &msg );
             }
             if (dlgInfo->flags & DF_END) break;
         }
-        EnableWindow32( owner, TRUE );
+        EnableWindow( owner, TRUE );
     }
     retval = dlgInfo->idResult; 
-    DestroyWindow32( hwnd );
+    DestroyWindow( hwnd );
     return retval;
 }
 
@@ -904,10 +904,10 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, SEGPTR template,
 /***********************************************************************
  *           DialogBoxParam32A   (USER32.139)
  */
-INT32 WINAPI DialogBoxParam32A( HINSTANCE32 hInst, LPCSTR name,
-                                HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
+INT WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name,
+                                HWND owner, DLGPROC dlgProc, LPARAM param )
 {
-    HWND32 hwnd = CreateDialogParam32A( hInst, name, owner, dlgProc, param );
+    HWND hwnd = CreateDialogParamA( hInst, name, owner, dlgProc, param );
     if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
     return -1;
 }
@@ -916,10 +916,10 @@ INT32 WINAPI DialogBoxParam32A( HINSTANCE32 hInst, LPCSTR name,
 /***********************************************************************
  *           DialogBoxParam32W   (USER32.140)
  */
-INT32 WINAPI DialogBoxParam32W( HINSTANCE32 hInst, LPCWSTR name,
-                                HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
+INT WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name,
+                                HWND owner, DLGPROC dlgProc, LPARAM param )
 {
-    HWND32 hwnd = CreateDialogParam32W( hInst, name, owner, dlgProc, param );
+    HWND hwnd = CreateDialogParamW( hInst, name, owner, dlgProc, param );
     if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
     return -1;
 }
@@ -956,11 +956,11 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
 /***********************************************************************
  *           DialogBoxIndirectParam32A   (USER32.136)
  */
-INT32 WINAPI DialogBoxIndirectParam32A(HINSTANCE32 hInstance, LPCVOID template,
-                                       HWND32 owner, DLGPROC32 dlgProc,
+INT WINAPI DialogBoxIndirectParamA(HINSTANCE hInstance, LPCVOID template,
+                                       HWND owner, DLGPROC dlgProc,
                                        LPARAM param )
 {
-    HWND32 hwnd = CreateDialogIndirectParam32A( hInstance, template,
+    HWND hwnd = CreateDialogIndirectParamA( hInstance, template,
                                                 owner, dlgProc, param );
     if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
     return -1;
@@ -970,11 +970,11 @@ INT32 WINAPI DialogBoxIndirectParam32A(HINSTANCE32 hInstance, LPCVOID template,
 /***********************************************************************
  *           DialogBoxIndirectParam32W   (USER32.138)
  */
-INT32 WINAPI DialogBoxIndirectParam32W(HINSTANCE32 hInstance, LPCVOID template,
-                                       HWND32 owner, DLGPROC32 dlgProc,
+INT WINAPI DialogBoxIndirectParamW(HINSTANCE hInstance, LPCVOID template,
+                                       HWND owner, DLGPROC dlgProc,
                                        LPARAM param )
 {
-    HWND32 hwnd = CreateDialogIndirectParam32W( hInstance, template,
+    HWND hwnd = CreateDialogIndirectParamW( hInstance, template,
                                                 owner, dlgProc, param );
     if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
     return -1;
@@ -986,14 +986,14 @@ INT32 WINAPI DialogBoxIndirectParam32W(HINSTANCE32 hInstance, LPCVOID template,
  */
 BOOL16 WINAPI EndDialog16( HWND16 hwnd, INT16 retval )
 {
-    return EndDialog32( hwnd, retval );
+    return EndDialog( hwnd, retval );
 }
 
 
 /***********************************************************************
  *           EndDialog32   (USER.88)
  */
-BOOL32 WINAPI EndDialog32( HWND32 hwnd, INT32 retval )
+BOOL WINAPI EndDialog( HWND hwnd, INT retval )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     DIALOGINFO * dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
@@ -1012,21 +1012,21 @@ BOOL32 WINAPI EndDialog32( HWND32 hwnd, INT32 retval )
 /***********************************************************************
  *           DIALOG_IsAccelerator
  */
-static BOOL32 DIALOG_IsAccelerator( HWND32 hwnd, HWND32 hwndDlg, WPARAM32 vKey )
+static BOOL DIALOG_IsAccelerator( HWND hwnd, HWND hwndDlg, WPARAM vKey )
 {
-    HWND32 hwndControl = hwnd;
-    HWND32 hwndNext;
+    HWND hwndControl = hwnd;
+    HWND hwndNext;
     WND *wndPtr;
-    BOOL32 RetVal = FALSE;
-    INT32 dlgCode;
+    BOOL RetVal = FALSE;
+    INT dlgCode;
 
     if (vKey == VK_SPACE)
     {
-        dlgCode = SendMessage32A( hwndControl, WM_GETDLGCODE, 0, 0 );
+        dlgCode = SendMessageA( hwndControl, WM_GETDLGCODE, 0, 0 );
         if (dlgCode & DLGC_BUTTON)
         {
-            SendMessage32A( hwndControl, WM_LBUTTONDOWN, 0, 0);
-            SendMessage32A( hwndControl, WM_LBUTTONUP, 0, 0);
+            SendMessageA( hwndControl, WM_LBUTTONDOWN, 0, 0);
+            SendMessageA( hwndControl, WM_LBUTTONUP, 0, 0);
             RetVal = TRUE;
         }
     }
@@ -1038,7 +1038,7 @@ static BOOL32 DIALOG_IsAccelerator( HWND32 hwnd, HWND32 hwndDlg, WPARAM32 vKey )
             if (wndPtr != NULL && wndPtr->text != NULL && 
                     (wndPtr->dwStyle & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE)
             {
-                dlgCode = SendMessage32A( hwndControl, WM_GETDLGCODE, 0, 0 );
+                dlgCode = SendMessageA( hwndControl, WM_GETDLGCODE, 0, 0 );
                 if (dlgCode & (DLGC_BUTTON | DLGC_STATIC))
                 {
                     /* find the accelerator key */
@@ -1056,16 +1056,16 @@ static BOOL32 DIALOG_IsAccelerator( HWND32 hwnd, HWND32 hwndDlg, WPARAM32 vKey )
                             (wndPtr->dwStyle & 0x0f) == BS_GROUPBOX )
                         {
                             /* set focus to the control */
-                            SendMessage32A( hwndDlg, WM_NEXTDLGCTL,
+                            SendMessageA( hwndDlg, WM_NEXTDLGCTL,
                                     hwndControl, 1);
                             /* and bump it on to next */
-                            SendMessage32A( hwndDlg, WM_NEXTDLGCTL, 0, 0);
+                            SendMessageA( hwndDlg, WM_NEXTDLGCTL, 0, 0);
                         }
                         else if (dlgCode & 
 			    (DLGC_DEFPUSHBUTTON | DLGC_UNDEFPUSHBUTTON))
                         {
                             /* send command message as from the control */
-                            SendMessage32A( hwndDlg, WM_COMMAND, 
+                            SendMessageA( hwndDlg, WM_COMMAND, 
                                 MAKEWPARAM( LOWORD(wndPtr->wIDmenu), 
                                     BN_CLICKED ),
                                 (LPARAM)hwndControl );
@@ -1073,29 +1073,29 @@ static BOOL32 DIALOG_IsAccelerator( HWND32 hwnd, HWND32 hwndDlg, WPARAM32 vKey )
                         else
                         {
                             /* click the control */
-                            SendMessage32A( hwndControl, WM_LBUTTONDOWN, 0, 0);
-                            SendMessage32A( hwndControl, WM_LBUTTONUP, 0, 0);
+                            SendMessageA( hwndControl, WM_LBUTTONDOWN, 0, 0);
+                            SendMessageA( hwndControl, WM_LBUTTONUP, 0, 0);
                         }
                         RetVal = TRUE;
                         break;
                     }
                 }
             }
-	    hwndNext = GetWindow32( hwndControl, GW_CHILD );
+	    hwndNext = GetWindow( hwndControl, GW_CHILD );
 	    if (!hwndNext)
 	    {
-	        hwndNext = GetWindow32( hwndControl, GW_HWNDNEXT );
+	        hwndNext = GetWindow( hwndControl, GW_HWNDNEXT );
 	    }
 	    while (!hwndNext)
 	    {
-		hwndControl = GetParent32( hwndControl );
+		hwndControl = GetParent( hwndControl );
 		if (hwndControl == hwndDlg)
 		{
-		    hwndNext = GetWindow32( hwndDlg, GW_CHILD );
+		    hwndNext = GetWindow( hwndDlg, GW_CHILD );
 		}
 		else
 		{
-		    hwndNext = GetWindow32( hwndControl, GW_HWNDNEXT );
+		    hwndNext = GetWindow( hwndControl, GW_HWNDNEXT );
 		}
 	    }
             hwndControl = hwndNext;
@@ -1109,10 +1109,10 @@ static BOOL32 DIALOG_IsAccelerator( HWND32 hwnd, HWND32 hwndDlg, WPARAM32 vKey )
 /***********************************************************************
  *           DIALOG_IsDialogMessage
  */
-static BOOL32 DIALOG_IsDialogMessage( HWND32 hwnd, HWND32 hwndDlg,
-                                      UINT32 message, WPARAM32 wParam,
-                                      LPARAM lParam, BOOL32 *translate,
-                                      BOOL32 *dispatch, INT32 dlgCode )
+static BOOL DIALOG_IsDialogMessage( HWND hwnd, HWND hwndDlg,
+                                      UINT message, WPARAM wParam,
+                                      LPARAM lParam, BOOL *translate,
+                                      BOOL *dispatch, INT dlgCode )
 {
     *translate = *dispatch = FALSE;
 
@@ -1143,8 +1143,8 @@ static BOOL32 DIALOG_IsDialogMessage( HWND32 hwnd, HWND32 hwndDlg,
         case VK_TAB:
             if (!(dlgCode & DLGC_WANTTAB))
             {
-                SendMessage32A( hwndDlg, WM_NEXTDLGCTL,
-                                (GetKeyState32(VK_SHIFT) & 0x8000), 0 );
+                SendMessageA( hwndDlg, WM_NEXTDLGCTL,
+                                (GetKeyState(VK_SHIFT) & 0x8000), 0 );
                 return TRUE;
             }
             break;
@@ -1155,17 +1155,17 @@ static BOOL32 DIALOG_IsDialogMessage( HWND32 hwnd, HWND32 hwndDlg,
         case VK_UP:
             if (!(dlgCode & DLGC_WANTARROWS))
             {
-                BOOL32 fPrevious = (wParam == VK_LEFT || wParam == VK_UP);
-                HWND32 hwndNext = 
-                    GetNextDlgGroupItem32 (hwndDlg, GetFocus32(), fPrevious );
-                SendMessage32A( hwndDlg, WM_NEXTDLGCTL, hwndNext, 1 );
+                BOOL fPrevious = (wParam == VK_LEFT || wParam == VK_UP);
+                HWND hwndNext = 
+                    GetNextDlgGroupItem (hwndDlg, GetFocus(), fPrevious );
+                SendMessageA( hwndDlg, WM_NEXTDLGCTL, hwndNext, 1 );
                 return TRUE;
             }
             break;
 
         case VK_ESCAPE:
-            SendMessage32A( hwndDlg, WM_COMMAND, IDCANCEL,
-                            (LPARAM)GetDlgItem32( hwndDlg, IDCANCEL ) );
+            SendMessageA( hwndDlg, WM_COMMAND, IDCANCEL,
+                            (LPARAM)GetDlgItem( hwndDlg, IDCANCEL ) );
             return TRUE;
 
         case VK_RETURN:
@@ -1173,14 +1173,14 @@ static BOOL32 DIALOG_IsDialogMessage( HWND32 hwnd, HWND32 hwndDlg,
                 DWORD dw = SendMessage16( hwndDlg, DM_GETDEFID, 0, 0 );
                 if (HIWORD(dw) == DC_HASDEFID)
                 {
-                    SendMessage32A( hwndDlg, WM_COMMAND, 
+                    SendMessageA( hwndDlg, WM_COMMAND, 
                                     MAKEWPARAM( LOWORD(dw), BN_CLICKED ),
-                                    (LPARAM)GetDlgItem32(hwndDlg, LOWORD(dw)));
+                                    (LPARAM)GetDlgItem(hwndDlg, LOWORD(dw)));
                 }
                 else
                 {
-                    SendMessage32A( hwndDlg, WM_COMMAND, IDOK,
-                                    (LPARAM)GetDlgItem32( hwndDlg, IDOK ) );
+                    SendMessageA( hwndDlg, WM_COMMAND, IDOK,
+                                    (LPARAM)GetDlgItem( hwndDlg, IDOK ) );
     
                 }
             }
@@ -1215,8 +1215,8 @@ static BOOL32 DIALOG_IsDialogMessage( HWND32 hwnd, HWND32 hwndDlg,
 BOOL16 WINAPI WIN16_IsDialogMessage16( HWND16 hwndDlg, SEGPTR msg16 )
 {
     LPMSG16 msg = PTR_SEG_TO_LIN(msg16);
-    BOOL32 ret, translate, dispatch;
-    INT32 dlgCode;
+    BOOL ret, translate, dispatch;
+    INT dlgCode;
 
     if ((hwndDlg != msg->hwnd) && !IsChild16( hwndDlg, msg->hwnd ))
         return FALSE;
@@ -1234,7 +1234,7 @@ BOOL16 WINAPI WIN16_IsDialogMessage16( HWND16 hwndDlg, SEGPTR msg16 )
 BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, LPMSG16 msg )
 {
     LPMSG16 msg16 = SEGPTR_NEW(MSG16);
-    BOOL32 ret;
+    BOOL ret;
 
     *msg16 = *msg;
     ret = WIN16_IsDialogMessage16( hwndDlg, SEGPTR_GET(msg16) );
@@ -1245,20 +1245,20 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, LPMSG16 msg )
 /***********************************************************************
  *           IsDialogMessage32A   (USER32.342)
  */
-BOOL32 WINAPI IsDialogMessage32A( HWND32 hwndDlg, LPMSG32 msg )
+BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG msg )
 {
-    BOOL32 ret, translate, dispatch;
-    INT32 dlgCode;
+    BOOL ret, translate, dispatch;
+    INT dlgCode;
 
-    if ((hwndDlg != msg->hwnd) && !IsChild32( hwndDlg, msg->hwnd ))
+    if ((hwndDlg != msg->hwnd) && !IsChild( hwndDlg, msg->hwnd ))
         return FALSE;
 
-    dlgCode = SendMessage32A( msg->hwnd, WM_GETDLGCODE, 0, (LPARAM)msg);
+    dlgCode = SendMessageA( msg->hwnd, WM_GETDLGCODE, 0, (LPARAM)msg);
     ret = DIALOG_IsDialogMessage( msg->hwnd, hwndDlg, msg->message,
                                   msg->wParam, msg->lParam,
                                   &translate, &dispatch, dlgCode );
-    if (translate) TranslateMessage32( msg );
-    if (dispatch) DispatchMessage32A( msg );
+    if (translate) TranslateMessage( msg );
+    if (dispatch) DispatchMessageA( msg );
     return ret;
 }
 
@@ -1266,20 +1266,20 @@ BOOL32 WINAPI IsDialogMessage32A( HWND32 hwndDlg, LPMSG32 msg )
 /***********************************************************************
  *           IsDialogMessage32W   (USER32.343)
  */
-BOOL32 WINAPI IsDialogMessage32W( HWND32 hwndDlg, LPMSG32 msg )
+BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg )
 {
-    BOOL32 ret, translate, dispatch;
-    INT32 dlgCode;
+    BOOL ret, translate, dispatch;
+    INT dlgCode;
 
-    if ((hwndDlg != msg->hwnd) && !IsChild32( hwndDlg, msg->hwnd ))
+    if ((hwndDlg != msg->hwnd) && !IsChild( hwndDlg, msg->hwnd ))
         return FALSE;
 
-    dlgCode = SendMessage32W( msg->hwnd, WM_GETDLGCODE, 0, (LPARAM)msg);
+    dlgCode = SendMessageW( msg->hwnd, WM_GETDLGCODE, 0, (LPARAM)msg);
     ret = DIALOG_IsDialogMessage( msg->hwnd, hwndDlg, msg->message,
                                   msg->wParam, msg->lParam,
                                   &translate, &dispatch, dlgCode );
-    if (translate) TranslateMessage32( msg );
-    if (dispatch) DispatchMessage32W( msg );
+    if (translate) TranslateMessage( msg );
+    if (dispatch) DispatchMessageW( msg );
     return ret;
 }
 
@@ -1298,7 +1298,7 @@ INT16 WINAPI GetDlgCtrlID16( HWND16 hwnd )
 /****************************************************************
  *         GetDlgCtrlID32   (USER32.234)
  */
-INT32 WINAPI GetDlgCtrlID32( HWND32 hwnd )
+INT WINAPI GetDlgCtrlID( HWND hwnd )
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
     if (wndPtr) return wndPtr->wIDmenu;
@@ -1323,7 +1323,7 @@ HWND16 WINAPI GetDlgItem16( HWND16 hwndDlg, INT16 id )
 /***********************************************************************
  *           GetDlgItem32   (USER32.235)
  */
-HWND32 WINAPI GetDlgItem32( HWND32 hwndDlg, INT32 id )
+HWND WINAPI GetDlgItem( HWND hwndDlg, INT id )
 {
     WND *pWnd;
 
@@ -1349,11 +1349,11 @@ LRESULT WINAPI SendDlgItemMessage16( HWND16 hwnd, INT16 id, UINT16 msg,
 /*******************************************************************
  *           SendDlgItemMessage32A   (USER32.452)
  */
-LRESULT WINAPI SendDlgItemMessage32A( HWND32 hwnd, INT32 id, UINT32 msg,
-                                      WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI SendDlgItemMessageA( HWND hwnd, INT id, UINT msg,
+                                      WPARAM wParam, LPARAM lParam )
 {
-    HWND32 hwndCtrl = GetDlgItem32( hwnd, id );
-    if (hwndCtrl) return SendMessage32A( hwndCtrl, msg, wParam, lParam );
+    HWND hwndCtrl = GetDlgItem( hwnd, id );
+    if (hwndCtrl) return SendMessageA( hwndCtrl, msg, wParam, lParam );
     else return 0;
 }
 
@@ -1361,11 +1361,11 @@ LRESULT WINAPI SendDlgItemMessage32A( HWND32 hwnd, INT32 id, UINT32 msg,
 /*******************************************************************
  *           SendDlgItemMessage32W   (USER32.453)
  */
-LRESULT WINAPI SendDlgItemMessage32W( HWND32 hwnd, INT32 id, UINT32 msg,
-                                      WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI SendDlgItemMessageW( HWND hwnd, INT id, UINT msg,
+                                      WPARAM wParam, LPARAM lParam )
 {
-    HWND32 hwndCtrl = GetDlgItem32( hwnd, id );
-    if (hwndCtrl) return SendMessage32W( hwndCtrl, msg, wParam, lParam );
+    HWND hwndCtrl = GetDlgItem( hwnd, id );
+    if (hwndCtrl) return SendMessageW( hwndCtrl, msg, wParam, lParam );
     else return 0;
 }
 
@@ -1382,18 +1382,18 @@ void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString )
 /*******************************************************************
  *           SetDlgItemText32A   (USER32.478)
  */
-BOOL32 WINAPI SetDlgItemText32A( HWND32 hwnd, INT32 id, LPCSTR lpString )
+BOOL WINAPI SetDlgItemTextA( HWND hwnd, INT id, LPCSTR lpString )
 {
-    return SendDlgItemMessage32A( hwnd, id, WM_SETTEXT, 0, (LPARAM)lpString );
+    return SendDlgItemMessageA( hwnd, id, WM_SETTEXT, 0, (LPARAM)lpString );
 }
 
 
 /*******************************************************************
  *           SetDlgItemText32W   (USER32.479)
  */
-BOOL32 WINAPI SetDlgItemText32W( HWND32 hwnd, INT32 id, LPCWSTR lpString )
+BOOL WINAPI SetDlgItemTextW( HWND hwnd, INT id, LPCWSTR lpString )
 {
-    return SendDlgItemMessage32W( hwnd, id, WM_SETTEXT, 0, (LPARAM)lpString );
+    return SendDlgItemMessageW( hwnd, id, WM_SETTEXT, 0, (LPARAM)lpString );
 }
 
 
@@ -1410,9 +1410,9 @@ INT16 WINAPI GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len )
 /***********************************************************************
  *           GetDlgItemText32A   (USER32.237)
  */
-INT32 WINAPI GetDlgItemText32A( HWND32 hwnd, INT32 id, LPSTR str, UINT32 len )
+INT WINAPI GetDlgItemTextA( HWND hwnd, INT id, LPSTR str, UINT len )
 {
-    return (INT32)SendDlgItemMessage32A( hwnd, id, WM_GETTEXT,
+    return (INT)SendDlgItemMessageA( hwnd, id, WM_GETTEXT,
                                          len, (LPARAM)str );
 }
 
@@ -1420,9 +1420,9 @@ INT32 WINAPI GetDlgItemText32A( HWND32 hwnd, INT32 id, LPSTR str, UINT32 len )
 /***********************************************************************
  *           GetDlgItemText32W   (USER32.238)
  */
-INT32 WINAPI GetDlgItemText32W( HWND32 hwnd, INT32 id, LPWSTR str, UINT32 len )
+INT WINAPI GetDlgItemTextW( HWND hwnd, INT id, LPWSTR str, UINT len )
 {
-    return (INT32)SendDlgItemMessage32W( hwnd, id, WM_GETTEXT,
+    return (INT)SendDlgItemMessageW( hwnd, id, WM_GETTEXT,
                                          len, (LPARAM)str );
 }
 
@@ -1432,21 +1432,21 @@ INT32 WINAPI GetDlgItemText32W( HWND32 hwnd, INT32 id, LPWSTR str, UINT32 len )
  */
 void WINAPI SetDlgItemInt16( HWND16 hwnd, INT16 id, UINT16 value, BOOL16 fSigned )
 {
-    SetDlgItemInt32( hwnd, (UINT32)(UINT16)id, value, fSigned );
+    SetDlgItemInt( hwnd, (UINT)(UINT16)id, value, fSigned );
 }
 
 
 /*******************************************************************
  *           SetDlgItemInt32   (USER32.477)
  */
-BOOL32 WINAPI SetDlgItemInt32( HWND32 hwnd, INT32 id, UINT32 value,
-                             BOOL32 fSigned )
+BOOL WINAPI SetDlgItemInt( HWND hwnd, INT id, UINT value,
+                             BOOL fSigned )
 {
     char str[20];
 
-    if (fSigned) sprintf( str, "%d", (INT32)value );
+    if (fSigned) sprintf( str, "%d", (INT)value );
     else sprintf( str, "%u", value );
-    SendDlgItemMessage32A( hwnd, id, WM_SETTEXT, 0, (LPARAM)str );
+    SendDlgItemMessageA( hwnd, id, WM_SETTEXT, 0, (LPARAM)str );
     return TRUE;
 }
 
@@ -1457,15 +1457,15 @@ BOOL32 WINAPI SetDlgItemInt32( HWND32 hwnd, INT32 id, UINT32 value,
 UINT16 WINAPI GetDlgItemInt16( HWND16 hwnd, INT16 id, BOOL16 *translated,
                                BOOL16 fSigned )
 {
-    UINT32 result;
-    BOOL32 ok;
+    UINT result;
+    BOOL ok;
 
     if (translated) *translated = FALSE;
-    result = GetDlgItemInt32( hwnd, (UINT32)(UINT16)id, &ok, fSigned );
+    result = GetDlgItemInt( hwnd, (UINT)(UINT16)id, &ok, fSigned );
     if (!ok) return 0;
     if (fSigned)
     {
-        if (((INT32)result < -32767) || ((INT32)result > 32767)) return 0;
+        if (((INT)result < -32767) || ((INT)result > 32767)) return 0;
     }
     else
     {
@@ -1479,15 +1479,15 @@ UINT16 WINAPI GetDlgItemInt16( HWND16 hwnd, INT16 id, BOOL16 *translated,
 /***********************************************************************
  *           GetDlgItemInt32   (USER32.236)
  */
-UINT32 WINAPI GetDlgItemInt32( HWND32 hwnd, INT32 id, BOOL32 *translated,
-                               BOOL32 fSigned )
+UINT WINAPI GetDlgItemInt( HWND hwnd, INT id, BOOL *translated,
+                               BOOL fSigned )
 {
     char str[30];
     char * endptr;
     long result = 0;
     
     if (translated) *translated = FALSE;
-    if (!SendDlgItemMessage32A(hwnd, id, WM_GETTEXT, sizeof(str), (LPARAM)str))
+    if (!SendDlgItemMessageA(hwnd, id, WM_GETTEXT, sizeof(str), (LPARAM)str))
         return 0;
     if (fSigned)
     {
@@ -1505,7 +1505,7 @@ UINT32 WINAPI GetDlgItemInt32( HWND32 hwnd, INT32 id, BOOL32 *translated,
         if ((result == ULONG_MAX) && (errno == ERANGE)) return 0;
     }
     if (translated) *translated = TRUE;
-    return (UINT32)result;
+    return (UINT)result;
 }
 
 
@@ -1514,7 +1514,7 @@ UINT32 WINAPI GetDlgItemInt32( HWND32 hwnd, INT32 id, BOOL32 *translated,
  */
 BOOL16 WINAPI CheckDlgButton16( HWND16 hwnd, INT16 id, UINT16 check )
 {
-    SendDlgItemMessage32A( hwnd, id, BM_SETCHECK32, check, 0 );
+    SendDlgItemMessageA( hwnd, id, BM_SETCHECK, check, 0 );
     return TRUE;
 }
 
@@ -1522,9 +1522,9 @@ BOOL16 WINAPI CheckDlgButton16( HWND16 hwnd, INT16 id, UINT16 check )
 /***********************************************************************
  *           CheckDlgButton32   (USER32.45)
  */
-BOOL32 WINAPI CheckDlgButton32( HWND32 hwnd, INT32 id, UINT32 check )
+BOOL WINAPI CheckDlgButton( HWND hwnd, INT id, UINT check )
 {
-    SendDlgItemMessage32A( hwnd, id, BM_SETCHECK32, check, 0 );
+    SendDlgItemMessageA( hwnd, id, BM_SETCHECK, check, 0 );
     return TRUE;
 }
 
@@ -1534,16 +1534,16 @@ BOOL32 WINAPI CheckDlgButton32( HWND32 hwnd, INT32 id, UINT32 check )
  */
 UINT16 WINAPI IsDlgButtonChecked16( HWND16 hwnd, UINT16 id )
 {
-    return (UINT16)SendDlgItemMessage32A( hwnd, id, BM_GETCHECK32, 0, 0 );
+    return (UINT16)SendDlgItemMessageA( hwnd, id, BM_GETCHECK, 0, 0 );
 }
 
 
 /***********************************************************************
  *           IsDlgButtonChecked32   (USER32.344)
  */
-UINT32 WINAPI IsDlgButtonChecked32( HWND32 hwnd, UINT32 id )
+UINT WINAPI IsDlgButtonChecked( HWND hwnd, UINT id )
 {
-    return (UINT32)SendDlgItemMessage32A( hwnd, id, BM_GETCHECK32, 0, 0 );
+    return (UINT)SendDlgItemMessageA( hwnd, id, BM_GETCHECK, 0, 0 );
 }
 
 
@@ -1553,15 +1553,15 @@ UINT32 WINAPI IsDlgButtonChecked32( HWND32 hwnd, UINT32 id )
 BOOL16 WINAPI CheckRadioButton16( HWND16 hwndDlg, UINT16 firstID,
                                   UINT16 lastID, UINT16 checkID )
 {
-    return CheckRadioButton32( hwndDlg, firstID, lastID, checkID );
+    return CheckRadioButton( hwndDlg, firstID, lastID, checkID );
 }
 
 
 /***********************************************************************
  *           CheckRadioButton32   (USER32.48)
  */
-BOOL32 WINAPI CheckRadioButton32( HWND32 hwndDlg, UINT32 firstID,
-                                  UINT32 lastID, UINT32 checkID )
+BOOL WINAPI CheckRadioButton( HWND hwndDlg, UINT firstID,
+                                  UINT lastID, UINT checkID )
 {
     WND *pWnd = WIN_FindWndPtr( hwndDlg );
     if (!pWnd) return FALSE;
@@ -1574,7 +1574,7 @@ BOOL32 WINAPI CheckRadioButton32( HWND32 hwndDlg, UINT32 firstID,
         lastID = firstID;  /* Buttons are in reverse order */
     while (pWnd)
     {
-	SendMessage32A( pWnd->hwndSelf, BM_SETCHECK32,
+	SendMessageA( pWnd->hwndSelf, BM_SETCHECK,
                         (pWnd->wIDmenu == checkID), 0 );
         if (pWnd->wIDmenu == lastID) break;
 	pWnd = pWnd->next;
@@ -1611,7 +1611,7 @@ void WINAPI MapDialogRect16( HWND16 hwnd, LPRECT16 rect )
 /***********************************************************************
  *           MapDialogRect32   (USER32.382)
  */
-BOOL32 WINAPI MapDialogRect32( HWND32 hwnd, LPRECT32 rect )
+BOOL WINAPI MapDialogRect( HWND hwnd, LPRECT rect )
 {
     DIALOGINFO * dlgInfo;
     WND * wndPtr = WIN_FindWndPtr( hwnd );
@@ -1631,15 +1631,15 @@ BOOL32 WINAPI MapDialogRect32( HWND32 hwnd, LPRECT32 rect )
 HWND16 WINAPI GetNextDlgGroupItem16( HWND16 hwndDlg, HWND16 hwndCtrl,
                                      BOOL16 fPrevious )
 {
-    return (HWND16)GetNextDlgGroupItem32( hwndDlg, hwndCtrl, fPrevious );
+    return (HWND16)GetNextDlgGroupItem( hwndDlg, hwndCtrl, fPrevious );
 }
 
 
 /***********************************************************************
  *           GetNextDlgGroupItem32   (USER32.275)
  */
-HWND32 WINAPI GetNextDlgGroupItem32( HWND32 hwndDlg, HWND32 hwndCtrl,
-                                     BOOL32 fPrevious )
+HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl,
+                                     BOOL fPrevious )
 {
     WND *pWnd, *pWndLast, *pWndCtrl, *pWndDlg;
 
@@ -1692,15 +1692,15 @@ HWND32 WINAPI GetNextDlgGroupItem32( HWND32 hwndDlg, HWND32 hwndCtrl,
 HWND16 WINAPI GetNextDlgTabItem16( HWND16 hwndDlg, HWND16 hwndCtrl,
                                    BOOL16 fPrevious )
 {
-    return (HWND16)GetNextDlgTabItem32( hwndDlg, hwndCtrl, fPrevious );
+    return (HWND16)GetNextDlgTabItem( hwndDlg, hwndCtrl, fPrevious );
 }
 
 
 /***********************************************************************
  *           GetNextDlgTabItem32   (USER32.276)
  */
-HWND32 WINAPI GetNextDlgTabItem32( HWND32 hwndDlg, HWND32 hwndCtrl,
-                                   BOOL32 fPrevious )
+HWND WINAPI GetNextDlgTabItem( HWND hwndDlg, HWND hwndCtrl,
+                                   BOOL fPrevious )
 {
     WND *pWnd, *pWndLast, *pWndCtrl, *pWndDlg;
 
@@ -1743,32 +1743,32 @@ HWND32 WINAPI GetNextDlgTabItem32( HWND32 hwndDlg, HWND32 hwndCtrl,
  *
  * Helper function for DlgDirSelect*
  */
-static BOOL32 DIALOG_DlgDirSelect( HWND32 hwnd, LPSTR str, INT32 len,
-                                   INT32 id, BOOL32 win32, BOOL32 unicode,
-                                   BOOL32 combo )
+static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPSTR str, INT len,
+                                   INT id, BOOL win32, BOOL unicode,
+                                   BOOL combo )
 {
     char *buffer, *ptr;
-    INT32 item, size;
-    BOOL32 ret;
-    HWND32 listbox = GetDlgItem32( hwnd, id );
+    INT item, size;
+    BOOL ret;
+    HWND listbox = GetDlgItem( hwnd, id );
 
     TRACE(dialog, "%04x '%s' %d\n", hwnd, str, id );
     if (!listbox) return FALSE;
     if (win32)
     {
-        item = SendMessage32A(listbox, combo ? CB_GETCURSEL32
-                                             : LB_GETCURSEL32, 0, 0 );
+        item = SendMessageA(listbox, combo ? CB_GETCURSEL
+                                             : LB_GETCURSEL, 0, 0 );
         if (item == LB_ERR) return FALSE;
-        size = SendMessage32A(listbox, combo ? CB_GETLBTEXTLEN32
-                                             : LB_GETTEXTLEN32, 0, 0 );
+        size = SendMessageA(listbox, combo ? CB_GETLBTEXTLEN
+                                             : LB_GETTEXTLEN, 0, 0 );
         if (size == LB_ERR) return FALSE;
     }
     else
     {
-        item = SendMessage32A(listbox, combo ? CB_GETCURSEL16
+        item = SendMessageA(listbox, combo ? CB_GETCURSEL16
                                              : LB_GETCURSEL16, 0, 0 );
         if (item == LB_ERR) return FALSE;
-        size = SendMessage32A(listbox, combo ? CB_GETLBTEXTLEN16
+        size = SendMessageA(listbox, combo ? CB_GETLBTEXTLEN16
                                              : LB_GETTEXTLEN16, 0, 0 );
         if (size == LB_ERR) return FALSE;
     }
@@ -1776,7 +1776,7 @@ static BOOL32 DIALOG_DlgDirSelect( HWND32 hwnd, LPSTR str, INT32 len,
     if (!(buffer = SEGPTR_ALLOC( size+1 ))) return FALSE;
 
     if (win32)
-        SendMessage32A( listbox, combo ? CB_GETLBTEXT32 : LB_GETTEXT32,
+        SendMessageA( listbox, combo ? CB_GETLBTEXT : LB_GETTEXT,
                         item, (LPARAM)buffer );
     else
         SendMessage16( listbox, combo ? CB_GETLBTEXT16 : LB_GETTEXT16,
@@ -1799,7 +1799,7 @@ static BOOL32 DIALOG_DlgDirSelect( HWND32 hwnd, LPSTR str, INT32 len,
     else ptr = buffer;
 
     if (unicode) lstrcpynAtoW( (LPWSTR)str, ptr, len );
-    else lstrcpyn32A( str, ptr, len );
+    else lstrcpynA( str, ptr, len );
     SEGPTR_FREE( buffer );
     TRACE(dialog, "Returning %d '%s'\n", ret, str );
     return ret;
@@ -1811,16 +1811,16 @@ static BOOL32 DIALOG_DlgDirSelect( HWND32 hwnd, LPSTR str, INT32 len,
  *
  * Helper function for DlgDirList*
  */
-static INT32 DIALOG_DlgDirList( HWND32 hDlg, LPSTR spec, INT32 idLBox,
-                                INT32 idStatic, UINT32 attrib, BOOL32 combo )
+static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox,
+                                INT idStatic, UINT attrib, BOOL combo )
 {
     int drive;
-    HWND32 hwnd;
+    HWND hwnd;
     LPSTR orig_spec = spec;
 
 #define SENDMSG(msg,wparam,lparam) \
-    ((attrib & DDL_POSTMSGS) ? PostMessage32A( hwnd, msg, wparam, lparam ) \
-                             : SendMessage32A( hwnd, msg, wparam, lparam ))
+    ((attrib & DDL_POSTMSGS) ? PostMessageA( hwnd, msg, wparam, lparam ) \
+                             : SendMessageA( hwnd, msg, wparam, lparam ))
 
     TRACE(dialog, "%04x '%s' %d %d %04x\n",
                     hDlg, spec ? spec : "NULL", idLBox, idStatic, attrib );
@@ -1857,41 +1857,41 @@ static INT32 DIALOG_DlgDirList( HWND32 hDlg, LPSTR spec, INT32 idLBox,
     TRACE(dialog, "path=%c:\\%s mask=%s\n",
                     'A' + drive, DRIVE_GetDosCwd(drive), spec );
 
-    if (idLBox && ((hwnd = GetDlgItem32( hDlg, idLBox )) != 0))
+    if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0))
     {
-        SENDMSG( combo ? CB_RESETCONTENT32 : LB_RESETCONTENT32, 0, 0 );
+        SENDMSG( combo ? CB_RESETCONTENT : LB_RESETCONTENT, 0, 0 );
         if (attrib & DDL_DIRECTORY)
         {
             if (!(attrib & DDL_EXCLUSIVE))
             {
-                if (SENDMSG( combo ? CB_DIR32 : LB_DIR32,
+                if (SENDMSG( combo ? CB_DIR : LB_DIR,
                              attrib & ~(DDL_DIRECTORY | DDL_DRIVES),
                              (LPARAM)spec ) == LB_ERR)
                     return FALSE;
             }
-            if (SENDMSG( combo ? CB_DIR32 : LB_DIR32,
+            if (SENDMSG( combo ? CB_DIR : LB_DIR,
                        (attrib & (DDL_DIRECTORY | DDL_DRIVES)) | DDL_EXCLUSIVE,
                          (LPARAM)"*.*" ) == LB_ERR)
                 return FALSE;
         }
         else
         {
-            if (SENDMSG( combo ? CB_DIR32 : LB_DIR32, attrib,
+            if (SENDMSG( combo ? CB_DIR : LB_DIR, attrib,
                          (LPARAM)spec ) == LB_ERR)
                 return FALSE;
         }
     }
 
-    if (idStatic && ((hwnd = GetDlgItem32( hDlg, idStatic )) != 0))
+    if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0))
     {
         char temp[512];
         int drive = DRIVE_GetCurrentDrive();
         strcpy( temp, "A:\\" );
         temp[0] += drive;
-        lstrcpyn32A( temp + 3, DRIVE_GetDosCwd(drive), sizeof(temp)-3 );
-        CharLower32A( temp );
+        lstrcpynA( temp + 3, DRIVE_GetDosCwd(drive), sizeof(temp)-3 );
+        CharLowerA( temp );
         /* Can't use PostMessage() here, because the string is on the stack */
-        SetDlgItemText32A( hDlg, idStatic, temp );
+        SetDlgItemTextA( hDlg, idStatic, temp );
     }
 
     if (orig_spec && (spec != orig_spec))
@@ -1911,13 +1911,13 @@ static INT32 DIALOG_DlgDirList( HWND32 hDlg, LPSTR spec, INT32 idLBox,
  *
  * Helper function for DlgDirList*32W
  */
-static INT32 DIALOG_DlgDirListW( HWND32 hDlg, LPWSTR spec, INT32 idLBox,
-                                 INT32 idStatic, UINT32 attrib, BOOL32 combo )
+static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
+                                 INT idStatic, UINT attrib, BOOL combo )
 {
     if (spec)
     {
         LPSTR specA = HEAP_strdupWtoA( GetProcessHeap(), 0, spec );
-        INT32 ret = DIALOG_DlgDirList( hDlg, specA, idLBox, idStatic,
+        INT ret = DIALOG_DlgDirList( hDlg, specA, idLBox, idStatic,
                                        attrib, combo );
         lstrcpyAtoW( spec, specA );
         HeapFree( GetProcessHeap(), 0, specA );
@@ -1930,7 +1930,7 @@ static INT32 DIALOG_DlgDirListW( HWND32 hDlg, LPWSTR spec, INT32 idLBox,
 /**********************************************************************
  *	    DlgDirSelect    (USER.99)
  */
-BOOL16 WINAPI DlgDirSelect( HWND16 hwnd, LPSTR str, INT16 id )
+BOOL16 WINAPI DlgDirSelect16( HWND16 hwnd, LPSTR str, INT16 id )
 {
     return DlgDirSelectEx16( hwnd, str, 128, id );
 }
@@ -1939,7 +1939,7 @@ BOOL16 WINAPI DlgDirSelect( HWND16 hwnd, LPSTR str, INT16 id )
 /**********************************************************************
  *	    DlgDirSelectComboBox    (USER.194)
  */
-BOOL16 WINAPI DlgDirSelectComboBox( HWND16 hwnd, LPSTR str, INT16 id )
+BOOL16 WINAPI DlgDirSelectComboBox16( HWND16 hwnd, LPSTR str, INT16 id )
 {
     return DlgDirSelectComboBoxEx16( hwnd, str, 128, id );
 }
@@ -1957,7 +1957,7 @@ BOOL16 WINAPI DlgDirSelectEx16( HWND16 hwnd, LPSTR str, INT16 len, INT16 id )
 /**********************************************************************
  *           DlgDirSelectEx32A    (USER32.149)
  */
-BOOL32 WINAPI DlgDirSelectEx32A( HWND32 hwnd, LPSTR str, INT32 len, INT32 id )
+BOOL WINAPI DlgDirSelectExA( HWND hwnd, LPSTR str, INT len, INT id )
 {
     return DIALOG_DlgDirSelect( hwnd, str, len, id, TRUE, FALSE, FALSE );
 }
@@ -1966,7 +1966,7 @@ BOOL32 WINAPI DlgDirSelectEx32A( HWND32 hwnd, LPSTR str, INT32 len, INT32 id )
 /**********************************************************************
  *           DlgDirSelectEx32W    (USER32.150)
  */
-BOOL32 WINAPI DlgDirSelectEx32W( HWND32 hwnd, LPWSTR str, INT32 len, INT32 id )
+BOOL WINAPI DlgDirSelectExW( HWND hwnd, LPWSTR str, INT len, INT id )
 {
     return DIALOG_DlgDirSelect( hwnd, (LPSTR)str, len, id, TRUE, TRUE, FALSE );
 }
@@ -1985,8 +1985,8 @@ BOOL16 WINAPI DlgDirSelectComboBoxEx16( HWND16 hwnd, LPSTR str, INT16 len,
 /**********************************************************************
  *           DlgDirSelectComboBoxEx32A    (USER32.147)
  */
-BOOL32 WINAPI DlgDirSelectComboBoxEx32A( HWND32 hwnd, LPSTR str, INT32 len,
-                                         INT32 id )
+BOOL WINAPI DlgDirSelectComboBoxExA( HWND hwnd, LPSTR str, INT len,
+                                         INT id )
 {
     return DIALOG_DlgDirSelect( hwnd, str, len, id, TRUE, FALSE, TRUE );
 }
@@ -1995,8 +1995,8 @@ BOOL32 WINAPI DlgDirSelectComboBoxEx32A( HWND32 hwnd, LPSTR str, INT32 len,
 /**********************************************************************
  *           DlgDirSelectComboBoxEx32W    (USER32.148)
  */
-BOOL32 WINAPI DlgDirSelectComboBoxEx32W( HWND32 hwnd, LPWSTR str, INT32 len,
-                                         INT32 id)
+BOOL WINAPI DlgDirSelectComboBoxExW( HWND hwnd, LPWSTR str, INT len,
+                                         INT id)
 {
     return DIALOG_DlgDirSelect( hwnd, (LPSTR)str, len, id, TRUE, TRUE, TRUE );
 }
@@ -2015,8 +2015,8 @@ INT16 WINAPI DlgDirList16( HWND16 hDlg, LPSTR spec, INT16 idLBox,
 /**********************************************************************
  *	    DlgDirList32A    (USER32.143)
  */
-INT32 WINAPI DlgDirList32A( HWND32 hDlg, LPSTR spec, INT32 idLBox,
-                            INT32 idStatic, UINT32 attrib )
+INT WINAPI DlgDirListA( HWND hDlg, LPSTR spec, INT idLBox,
+                            INT idStatic, UINT attrib )
 {
     return DIALOG_DlgDirList( hDlg, spec, idLBox, idStatic, attrib, FALSE );
 }
@@ -2025,8 +2025,8 @@ INT32 WINAPI DlgDirList32A( HWND32 hDlg, LPSTR spec, INT32 idLBox,
 /**********************************************************************
  *	    DlgDirList32W    (USER32.146)
  */
-INT32 WINAPI DlgDirList32W( HWND32 hDlg, LPWSTR spec, INT32 idLBox,
-                            INT32 idStatic, UINT32 attrib )
+INT WINAPI DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
+                            INT idStatic, UINT attrib )
 {
     return DIALOG_DlgDirListW( hDlg, spec, idLBox, idStatic, attrib, FALSE );
 }
@@ -2045,8 +2045,8 @@ INT16 WINAPI DlgDirListComboBox16( HWND16 hDlg, LPSTR spec, INT16 idCBox,
 /**********************************************************************
  *	    DlgDirListComboBox32A    (USER32.144)
  */
-INT32 WINAPI DlgDirListComboBox32A( HWND32 hDlg, LPSTR spec, INT32 idCBox,
-                                    INT32 idStatic, UINT32 attrib )
+INT WINAPI DlgDirListComboBoxA( HWND hDlg, LPSTR spec, INT idCBox,
+                                    INT idStatic, UINT attrib )
 {
     return DIALOG_DlgDirList( hDlg, spec, idCBox, idStatic, attrib, TRUE );
 }
@@ -2055,8 +2055,8 @@ INT32 WINAPI DlgDirListComboBox32A( HWND32 hDlg, LPSTR spec, INT32 idCBox,
 /**********************************************************************
  *	    DlgDirListComboBox32W    (USER32.145)
  */
-INT32 WINAPI DlgDirListComboBox32W( HWND32 hDlg, LPWSTR spec, INT32 idCBox,
-                                    INT32 idStatic, UINT32 attrib )
+INT WINAPI DlgDirListComboBoxW( HWND hDlg, LPWSTR spec, INT idCBox,
+                                    INT idStatic, UINT attrib )
 {
     return DIALOG_DlgDirListW( hDlg, spec, idCBox, idStatic, attrib, TRUE );
 }
diff --git a/windows/dinput.c b/windows/dinput.c
index feb0c89ea36..7812ca6c49c 100644
--- a/windows/dinput.c
+++ b/windows/dinput.c
@@ -78,7 +78,7 @@ struct SysMouseAImpl
         /* Previous position for relative moves */
         LONG prevX, prevY;
         LPMOUSE_EVENT_PROC prev_handler;
-        HWND32 win;
+        HWND win;
         int xwin;
         DWORD win_centerX, win_centerY;
         LPDIDEVICEOBJECTDATA data_queue;
@@ -138,7 +138,7 @@ struct IDirectInputAImpl
 /******************************************************************************
  *	DirectInputCreate32A
  */
-HRESULT WINAPI DirectInputCreate32A(HINSTANCE32 hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter)
+HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter)
 {
 	IDirectInputAImpl* This;
 	TRACE(dinput, "(0x%08lx,%04lx,%p,%p)\n",
@@ -154,17 +154,17 @@ HRESULT WINAPI DirectInputCreate32A(HINSTANCE32 hinst, DWORD dwVersion, LPDIRECT
  *	IDirectInputA_EnumDevices
  */
 static HRESULT WINAPI IDirectInputAImpl_EnumDevices(
-	LPDIRECTINPUTA iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACK32A lpCallback,
+	LPDIRECTINPUTA iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKA lpCallback,
 	LPVOID pvRef, DWORD dwFlags
 )
 {
   ICOM_THIS(IDirectInputAImpl,iface);
-  DIDEVICEINSTANCE32A devInstance;
+  DIDEVICEINSTANCEA devInstance;
   int ret;
 
   TRACE(dinput, "(this=%p,0x%04lx,%p,%p,%04lx)\n", This, dwDevType, lpCallback, pvRef, dwFlags);
 
-  devInstance.dwSize = sizeof(DIDEVICEINSTANCE32A);
+  devInstance.dwSize = sizeof(DIDEVICEINSTANCEA);
   
   if ((dwDevType == 0) || (dwDevType == DIDEVTYPE_KEYBOARD)) {
   /* Return keyboard */
@@ -269,7 +269,7 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(
 }
 
 static HRESULT WINAPI IDirectInputAImpl_Initialize(
-	LPDIRECTINPUTA iface,HINSTANCE32 hinst,DWORD x
+	LPDIRECTINPUTA iface,HINSTANCE hinst,DWORD x
 ) {
 	return DIERR_ALREADYINITIALIZED;
 }
@@ -286,7 +286,7 @@ static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUTA iface,
 }
 
 static HRESULT WINAPI IDirectInputAImpl_RunControlPanel(LPDIRECTINPUTA iface,
-							HWND32 hwndOwner,
+							HWND hwndOwner,
 							DWORD dwFlags) {
   ICOM_THIS(IDirectInputAImpl,iface);
   FIXME(dinput,"(%p)->(%08lx,%08lx): stub\n",This, (DWORD) hwndOwner, dwFlags);
@@ -339,7 +339,7 @@ static HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(
 }
 
 static HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(
-	LPDIRECTINPUTDEVICE2A iface,HWND32 hwnd,DWORD dwflags
+	LPDIRECTINPUTDEVICE2A iface,HWND hwnd,DWORD dwflags
 ) {
 	ICOM_THIS(IDirectInputDevice2AImpl,iface);
 	FIXME(dinput,"(this=%p,0x%08lx,0x%08lx): stub\n",This,(DWORD)hwnd,dwflags);
@@ -349,7 +349,7 @@ static HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(
 }
 
 static HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(
-	LPDIRECTINPUTDEVICE2A iface,HANDLE32 hnd
+	LPDIRECTINPUTDEVICE2A iface,HANDLE hnd
 ) {
 	ICOM_THIS(IDirectInputDevice2AImpl,iface);
 	FIXME(dinput,"(this=%p,0x%08lx): stub\n",This,(DWORD)hnd);
@@ -520,7 +520,7 @@ static HRESULT WINAPI IDirectInputDevice2AImpl_GetCapabilities(
 
 static HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(
 	LPDIRECTINPUTDEVICE2A iface,
-	LPDIENUMDEVICEOBJECTSCALLBACK32A lpCallback,
+	LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback,
 	LPVOID lpvRef,
 	DWORD dwFlags)
 {
@@ -543,7 +543,7 @@ static HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(
 
 static HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo(
 	LPDIRECTINPUTDEVICE2A iface,
-	LPDIDEVICEOBJECTINSTANCE32A pdidoi,
+	LPDIDEVICEOBJECTINSTANCEA pdidoi,
 	DWORD dwObj,
 	DWORD dwHow)
 {
@@ -553,7 +553,7 @@ static HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo(
 	
 static HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo(
 	LPDIRECTINPUTDEVICE2A iface,
-	LPDIDEVICEINSTANCE32A pdidi)
+	LPDIDEVICEINSTANCEA pdidi)
 {
 	FIXME(dinput, "stub!\n");
 	return DI_OK;
@@ -561,7 +561,7 @@ static HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo(
 	
 static HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(
 	LPDIRECTINPUTDEVICE2A iface,
-	HWND32 hwndOwner,
+	HWND hwndOwner,
 	DWORD dwFlags)
 {
 	FIXME(dinput, "stub!\n");
@@ -570,7 +570,7 @@ static HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(
 	
 static HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(
 	LPDIRECTINPUTDEVICE2A iface,
-	HINSTANCE32 hinst,
+	HINSTANCE hinst,
 	DWORD dwVersion,
 	REFGUID rguid)
 {
@@ -702,7 +702,7 @@ static ULONG WINAPI SysMouseAImpl_Release(LPDIRECTINPUTDEVICE2A iface)
   *   grabbing.
   */
 static HRESULT WINAPI SysMouseAImpl_SetCooperativeLevel(
-	LPDIRECTINPUTDEVICE2A iface,HWND32 hwnd,DWORD dwflags
+	LPDIRECTINPUTDEVICE2A iface,HWND hwnd,DWORD dwflags
 )
 {
   ICOM_THIS(SysMouseAImpl,iface);
@@ -791,7 +791,7 @@ static void WINAPI dinput_mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
   DWORD posX, posY, keyState, time, extra;
   SysMouseAImpl* This = (SysMouseAImpl*) current_lock;
   
-  if (   !IsBadReadPtr32( (LPVOID)dwExtraInfo, sizeof(WINE_MOUSEEVENT) )
+  if (   !IsBadReadPtr( (LPVOID)dwExtraInfo, sizeof(WINE_MOUSEEVENT) )
       && ((WINE_MOUSEEVENT *)dwExtraInfo)->magic == WINE_MOUSEEVENT_MAGIC ) {
     WINE_MOUSEEVENT *wme = (WINE_MOUSEEVENT *)dwExtraInfo;
     keyState = wme->keyState;
@@ -886,7 +886,7 @@ static void WINAPI dinput_mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
 static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE2A iface)
 {
   ICOM_THIS(SysMouseAImpl,iface);
-  RECT32	rect;
+  RECT	rect;
   
   TRACE(dinput,"(this=%p)\n",This);
 
@@ -902,7 +902,7 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE2A iface)
     MOUSE_Enable(dinput_mouse_event);
     
     /* Get the window dimension and find the center */
-    GetWindowRect32(This->win, &rect);
+    GetWindowRect(This->win, &rect);
     This->xwin = ((X11DRV_WND_DATA *) WIN_FindWndPtr(This->win)->pDriverData)->window;
     This->win_centerX = (rect.right  - rect.left) / 2;
     This->win_centerY = (rect.bottom - rect.top ) / 2;
diff --git a/windows/display.c b/windows/display.c
index b1c8299f8da..c40fdc28bfe 100644
--- a/windows/display.c
+++ b/windows/display.c
@@ -67,7 +67,7 @@ VOID WINAPI DISPLAY_CheckCursor()
 /***********************************************************************
  *           UserRepaintDisable			(DISPLAY.500)
  */
-VOID WINAPI UserRepaintDisable( BOOL16 disable )
+VOID WINAPI UserRepaintDisable16( BOOL16 disable )
 {
     TRACE( cursor, "(%d): stub\n", disable );
 }
diff --git a/windows/driver.c b/windows/driver.c
index d375f076559..cce1911fa74 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -34,12 +34,12 @@ static void DRIVER_LoadStartupDrivers(void)
     char  	str[256];
     LPSTR	ptr;
 
-    if (GetPrivateProfileString32A("drivers", NULL, "", str, sizeof(str), "SYSTEM.INI") < 2) {
+    if (GetPrivateProfileStringA("drivers", NULL, "", str, sizeof(str), "SYSTEM.INI") < 2) {
     	ERR(driver,"Can't find drivers section in system.ini\n");
 	return;
     }
 
-    for (ptr = str; lstrlen32A(ptr) != 0; ptr += lstrlen32A(ptr) + 1) {
+    for (ptr = str; lstrlenA(ptr) != 0; ptr += lstrlenA(ptr) + 1) {
 	TRACE(driver, "str='%s'\n", ptr);
 	hDrv = OpenDriver16(ptr, "drivers", 0L);
 	TRACE(driver, "hDrv=%04x\n", hDrv);
@@ -128,11 +128,11 @@ int	DRIVER_MapMsg16To32(WORD wMsg, DWORD* lParam1, DWORD* lParam2)
     case DRV_INSTALL:
 	/* lParam1 is a handle to a window (or not used), lParam2 is a pointer to DRVCONFIGINFO */
 	if (*lParam2) {
-            LPDRVCONFIGINFO32	dci32 = HeapAlloc(SystemHeap, 0, sizeof(DRVCONFIGINFO32));
+            LPDRVCONFIGINFO	dci32 = HeapAlloc(SystemHeap, 0, sizeof(DRVCONFIGINFO));
             LPDRVCONFIGINFO16	dci16 = PTR_SEG_TO_LIN(*lParam2);
 
 	    if (dci32) {
-		dci32->dwDCISize = sizeof(DRVCONFIGINFO32);
+		dci32->dwDCISize = sizeof(DRVCONFIGINFO);
 		dci32->lpszDCISectionName = HEAP_strdupAtoW(SystemHeap, 0, PTR_SEG_TO_LIN(dci16->lpszDCISectionName));
 		dci32->lpszDCIAliasName   = HEAP_strdupAtoW(SystemHeap, 0, PTR_SEG_TO_LIN(dci16->lpszDCIAliasName));
 		if (dci32->lpszDCISectionName == NULL || dci32->lpszDCIAliasName == NULL)
@@ -184,7 +184,7 @@ int	DRIVER_UnMapMsg16To32(WORD wMsg, DWORD lParam1, DWORD lParam2)
     case DRV_INSTALL:
 	/* lParam1 is a handle to a window (or not used), lParam2 is a pointer to DRVCONFIGINFO, lParam2 */
 	if (lParam2) {
-	    LPDRVCONFIGINFO32	dci32 = (LPDRVCONFIGINFO32)lParam2;
+	    LPDRVCONFIGINFO	dci32 = (LPDRVCONFIGINFO)lParam2;
 	    HeapFree(SystemHeap, 0, (LPVOID)dci32->lpszDCISectionName);
 	    HeapFree(SystemHeap, 0, (LPVOID)dci32->lpszDCIAliasName);
 	    HeapFree(SystemHeap, 0, dci32);
@@ -243,7 +243,7 @@ int	DRIVER_MapMsg32To16(WORD wMsg, DWORD* lParam1, DWORD* lParam2)
 	/* lParam1 is a handle to a window (or not used), lParam2 is a pointer to DRVCONFIGINFO */
 	if (*lParam2) {
             LPDRVCONFIGINFO16	dci16 = (LPDRVCONFIGINFO16)SEGPTR_ALLOC(sizeof(DRVCONFIGINFO16));
-            LPDRVCONFIGINFO32	dci32 = (LPDRVCONFIGINFO32)lParam2;
+            LPDRVCONFIGINFO	dci32 = (LPDRVCONFIGINFO)lParam2;
 
 	    if (dci16) {
 		LPSTR	str1, str2;
@@ -369,7 +369,7 @@ LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
 /**************************************************************************
  *				SendDriverMessage		[WINMM.19]
  */
-LRESULT WINAPI SendDriverMessage32(HDRVR32 hDriver, UINT32 msg, LPARAM lParam1,
+LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1,
                                    LPARAM lParam2)
 {
     LPWINE_DRIVER	lpDrv = (LPWINE_DRIVER)hDriver;
@@ -411,15 +411,15 @@ LRESULT WINAPI SendDriverMessage32(HDRVR32 hDriver, UINT32 msg, LPARAM lParam1,
  * Adds a driver struct to the list of open drivers.
  * Generates all the logic to handle driver creation / open.
  */
-static	BOOL32	DRIVER_AddToList(LPWINE_DRIVER lpNewDrv, LPARAM lParam)
+static	BOOL	DRIVER_AddToList(LPWINE_DRIVER lpNewDrv, LPARAM lParam)
 {
     /* First driver to be loaded for this module, need to load correctly the module */
     if (DRIVER_GetNumberOfModuleRefs(lpNewDrv) == 0) {
-	if (SendDriverMessage32((HDRVR32)lpNewDrv, DRV_LOAD,   0L, 0L) != DRV_SUCCESS) {
+	if (SendDriverMessage((HDRVR)lpNewDrv, DRV_LOAD,   0L, 0L) != DRV_SUCCESS) {
 	    TRACE(driver, "DRV_LOAD failed on driver 0x%08lx\n", (DWORD)lpNewDrv);
 	    return FALSE;
 	}
-	if (SendDriverMessage32((HDRVR32)lpNewDrv, DRV_ENABLE, 0L, 0L) != DRV_SUCCESS) {
+	if (SendDriverMessage((HDRVR)lpNewDrv, DRV_ENABLE, 0L, 0L) != DRV_SUCCESS) {
 	    TRACE(driver, "DRV_ENABLE failed on driver 0x%08lx\n", (DWORD)lpNewDrv);
 	    return FALSE;
 	}
@@ -431,7 +431,7 @@ static	BOOL32	DRIVER_AddToList(LPWINE_DRIVER lpNewDrv, LPARAM lParam)
      * + and we send it through SendDriverMessage32 as a 32 bit value...
      * => so we might have trouble with this little guy (FIXME ???)
      */
-    lpNewDrv->dwDriverID = SendDriverMessage32((HDRVR32)lpNewDrv, DRV_OPEN, (DWORD)lpNewDrv->szAliasName, lParam);
+    lpNewDrv->dwDriverID = SendDriverMessage((HDRVR)lpNewDrv, DRV_OPEN, (DWORD)lpNewDrv->szAliasName, lParam);
     if (lpNewDrv->dwDriverID == 0) {
 	TRACE(driver, "DRV_OPEN failed on driver 0x%08lx\n", (DWORD)lpNewDrv);
 	return FALSE;
@@ -458,14 +458,14 @@ static	BOOL32	DRIVER_AddToList(LPWINE_DRIVER lpNewDrv, LPARAM lParam)
  * Generates all the logic to handle driver closure / deletion
  * Removes a driver struct to the list of open drivers.
  */
-static	BOOL32	DRIVER_RemoveFromList(LPWINE_DRIVER lpDrv, LPARAM lParam1, LPARAM lParam2)
+static	BOOL	DRIVER_RemoveFromList(LPWINE_DRIVER lpDrv, LPARAM lParam1, LPARAM lParam2)
 {
-    SendDriverMessage32((HDRVR32)lpDrv, DRV_CLOSE, lParam1, lParam2);
+    SendDriverMessage((HDRVR)lpDrv, DRV_CLOSE, lParam1, lParam2);
 
     lpDrv->dwDriverID = 0;
     if (DRIVER_GetNumberOfModuleRefs(lpDrv) == 1) {
-	SendDriverMessage16((HDRVR32)lpDrv, DRV_DISABLE, 0L, 0L);
-	SendDriverMessage16((HDRVR32)lpDrv, DRV_FREE,    0L, 0L);
+	SendDriverMessage16((HDRVR)lpDrv, DRV_DISABLE, 0L, 0L);
+	SendDriverMessage16((HDRVR)lpDrv, DRV_FREE,    0L, 0L);
 
 	if (lpDrv->lpPrevItem)
 	    lpDrv->lpPrevItem->lpNextItem = lpDrv->lpNextItem;
@@ -518,7 +518,7 @@ LPWINE_DRIVER DRIVER_RegisterDriver16(LPCSTR lpName, HMODULE16 hModule, DRIVERPR
  * Creates all the WINE internal representations for a 32 bit driver.
  * The driver is also open by sending the correct messages.
  */
-LPWINE_DRIVER DRIVER_RegisterDriver32(LPCSTR lpName, HMODULE32 hModule, DRIVERPROC32 lpProc, LPARAM lParam)
+LPWINE_DRIVER DRIVER_RegisterDriver32(LPCSTR lpName, HMODULE hModule, DRIVERPROC lpProc, LPARAM lParam)
 {
     LPWINE_DRIVER	lpDrv;
 
@@ -553,7 +553,7 @@ static	HDRVR16	DRIVER_TryOpenDriver16(LPCSTR lpFileName, LPARAM lParam)
 
     TRACE(driver,"('%s', %08lX);\n", lpFileName, lParam);
 
-    if (lstrlen32A(lpFileName) < 1) 
+    if (lstrlenA(lpFileName) < 1) 
 	return 0;
 
     lpSFN = strrchr(lpFileName, '\\');
@@ -576,23 +576,23 @@ static	HDRVR16	DRIVER_TryOpenDriver16(LPCSTR lpFileName, LPARAM lParam)
  *
  * Tries to load a 32 bit driver whose DLL's (module) name is lpFileName.
  */
-static	HDRVR32	DRIVER_TryOpenDriver32(LPCSTR lpFileName, LPARAM lParam)
+static	HDRVR	DRIVER_TryOpenDriver32(LPCSTR lpFileName, LPARAM lParam)
 {
     LPWINE_DRIVER 	lpDrv = NULL;
     LPCSTR		lpSFN;
-    HMODULE32		hModule;
-    DRIVERPROC32	lpProc;
+    HMODULE		hModule;
+    DRIVERPROC	lpProc;
 
     TRACE(driver,"('%s', %08lX);\n", lpFileName, lParam);
 
-    if (lstrlen32A(lpFileName) < 1) 
+    if (lstrlenA(lpFileName) < 1) 
 	return 0;
 
     lpSFN = strrchr(lpFileName, '\\');
     lpSFN = (lpSFN) ? (lpSFN + 1) : lpFileName;
 
-    if ((hModule = LoadLibrary32A(lpFileName)) != 0) {
-	if ((lpProc = GetProcAddress32(hModule, "DriverProc")) != NULL) {
+    if ((hModule = LoadLibraryA(lpFileName)) != 0) {
+	if ((lpProc = GetProcAddress(hModule, "DriverProc")) != NULL) {
 	    lpDrv = DRIVER_RegisterDriver32(lpSFN, hModule, lpProc, lParam);
 	} else {
 	    TRACE(driver, "No DriverProc found\n");
@@ -600,7 +600,7 @@ static	HDRVR32	DRIVER_TryOpenDriver32(LPCSTR lpFileName, LPARAM lParam)
     } else {
 	TRACE(driver, "Unable to load module (%s)\n", lpFileName);
     }
-    return (HDRVR32)lpDrv;
+    return (HDRVR)lpDrv;
 }
 
 /**************************************************************************
@@ -620,7 +620,7 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
 	    lpSectionName = "Drivers";
 	}
     }
-    if (!hDriver && GetPrivateProfileString32A(lpSectionName, lpDriverName, "", 
+    if (!hDriver && GetPrivateProfileStringA(lpSectionName, lpDriverName, "", 
 					       drvName, sizeof(drvName), "SYSTEM.INI") > 0) {
 	hDriver = DRIVER_TryOpenDriver16(drvName, lParam);
     }
@@ -633,9 +633,9 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
  * (0,1,DRV_ENABLE,0       ,0)
  * (0,1,DRV_OPEN  ,buf[256],0)
  */
-HDRVR32 WINAPI OpenDriver32A(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam) 
+HDRVR WINAPI OpenDriverA(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam) 
 {
-    HDRVR32 		hDriver = 0;
+    HDRVR 		hDriver = 0;
     char 		drvName[128];
 
     TRACE(driver,"('%s', '%s', %08lX);\n", lpDriverName, lpSectionName, lParam);
@@ -648,21 +648,21 @@ HDRVR32 WINAPI OpenDriver32A(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM l
 	    hDriver = DRIVER_TryOpenDriver16(lpDriverName, lParam);
 	}
 	if (!hDriver) {
-	    if (GetPrivateProfileString32A("Drivers32", lpDriverName, "", drvName,
+	    if (GetPrivateProfileStringA("Drivers32", lpDriverName, "", drvName,
 					   sizeof(drvName), "SYSTEM.INI")) {
 		hDriver = DRIVER_TryOpenDriver32(drvName, lParam);
 		
 	    }
 	}
 	if (!hDriver) {
-	    if (GetPrivateProfileString32A("Drivers", lpDriverName, "", drvName,
+	    if (GetPrivateProfileStringA("Drivers", lpDriverName, "", drvName,
 					   sizeof(drvName), "SYSTEM.INI")) {
 		hDriver = DRIVER_TryOpenDriver16(drvName, lParam);
 		
 	    }
 	}
     } else {
-	if (GetPrivateProfileString32A(lpSectionName, lpDriverName, "", drvName,
+	if (GetPrivateProfileStringA(lpSectionName, lpDriverName, "", drvName,
 				       sizeof(drvName), "SYSTEM.INI")) {
 	    hDriver = DRIVER_TryOpenDriver32(drvName, lParam);
 	}
@@ -675,11 +675,11 @@ HDRVR32 WINAPI OpenDriver32A(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM l
 /**************************************************************************
  *				OpenDriver32W		        [WINMM.15]
  */
-HDRVR32 WINAPI OpenDriver32W(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lParam)
+HDRVR WINAPI OpenDriverW(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lParam)
 {
     LPSTR 	dn = HEAP_strdupWtoA(GetProcessHeap(), 0, lpDriverName);
     LPSTR 	sn = HEAP_strdupWtoA(GetProcessHeap(), 0, lpSectionName);
-    HDRVR32	ret = OpenDriver32A(dn, sn, lParam);
+    HDRVR	ret = OpenDriverA(dn, sn, lParam);
 
     if (dn) HeapFree(GetProcessHeap(), 0, dn);
     if (sn) HeapFree(GetProcessHeap(), 0, sn);
@@ -707,7 +707,7 @@ LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
 /**************************************************************************
  *			CloseDriver32				[WINMM.4]
  */
-LRESULT WINAPI CloseDriver32(HDRVR32 hDrvr, LPARAM lParam1, LPARAM lParam2)
+LRESULT WINAPI CloseDriver(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2)
 {
     LPWINE_DRIVER lpDrv;
 
@@ -744,10 +744,10 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
 /**************************************************************************
  *				GetDriverModuleHandle	[USER.254]
  */
-HMODULE32 WINAPI GetDriverModuleHandle32(HDRVR32 hDrvr)
+HMODULE WINAPI GetDriverModuleHandle(HDRVR hDrvr)
 {
     LPWINE_DRIVER 	lpDrv = (LPWINE_DRIVER)hDrvr;
-    HMODULE32		hModule = 0;
+    HMODULE		hModule = 0;
 
     TRACE(driver, "(%04x);\n", hDrvr);
 
@@ -771,7 +771,7 @@ LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
     case DRV_ENABLE:		return (LRESULT)0L;
     case DRV_DISABLE:		return (LRESULT)0L;
     case DRV_QUERYCONFIGURE:	return (LRESULT)0L;
-    case DRV_CONFIGURE:		MessageBox32A(0, "Driver isn't configurable !", "Wine Driver", MB_OK); return (LRESULT)0L;
+    case DRV_CONFIGURE:		MessageBoxA(0, "Driver isn't configurable !", "Wine Driver", MB_OK); return (LRESULT)0L;
     case DRV_INSTALL:		return (LRESULT)DRVCNF_RESTART;
     case DRV_REMOVE:		return (LRESULT)DRVCNF_RESTART;
     default:			return (LRESULT)0L;
@@ -781,7 +781,7 @@ LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
 /**************************************************************************
  *				GetDriverInfo			[USER.256]
  */
-BOOL16 WINAPI GetDriverInfo(HDRVR16 hDrvr, LPDRIVERINFOSTRUCT16 lpDrvInfo)
+BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, LPDRIVERINFOSTRUCT16 lpDrvInfo)
 {
     LPWINE_DRIVER 	lpDrv;
     BOOL16		ret = FALSE;
@@ -806,7 +806,7 @@ BOOL16 WINAPI GetDriverInfo(HDRVR16 hDrvr, LPDRIVERINFOSTRUCT16 lpDrvInfo)
 /**************************************************************************
  *				GetNextDriver			[USER.257]
  */
-HDRVR16 WINAPI GetNextDriver(HDRVR16 hDrvr, DWORD dwFlags)
+HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags)
 {
     HDRVR16 		hRetDrv = 0;
     LPWINE_DRIVER 	lpDrv;
diff --git a/windows/event.c b/windows/event.c
index eeefc6ecc3f..636cb113ec1 100644
--- a/windows/event.c
+++ b/windows/event.c
@@ -32,7 +32,7 @@ EVENT_DRIVER *EVENT_GetDriver(void)
  *
  * Initialize network IO.
  */
-BOOL32 EVENT_Init(void)
+BOOL EVENT_Init(void)
 {
   return EVENT_GetDriver()->pInit();
 }
@@ -60,7 +60,7 @@ void EVENT_DeleteIO(int fd, unsigned io_type)
  * Return TRUE if an event is pending, FALSE on timeout or error
  * (for instance lost connection with the server).
  */
-BOOL32 EVENT_WaitNetEvent(BOOL32 sleep, BOOL32 peek)
+BOOL EVENT_WaitNetEvent(BOOL sleep, BOOL peek)
 {
   return EVENT_GetDriver()->pWaitNetEvent(sleep, peek);
 }
@@ -78,7 +78,7 @@ void EVENT_Synchronize(void)
 /**********************************************************************
  *		EVENT_CheckFocus
  */
-BOOL32 EVENT_CheckFocus(void)
+BOOL EVENT_CheckFocus(void)
 {
   return EVENT_GetDriver()->pCheckFocus();
 }
@@ -86,7 +86,7 @@ BOOL32 EVENT_CheckFocus(void)
 /***********************************************************************
  *		EVENT_QueryPointer
  */
-BOOL32 EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state)
+BOOL EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state)
 {
   return EVENT_GetDriver()->pQueryPointer(posX, posY, state);
 }
@@ -105,7 +105,7 @@ void EVENT_DummyMotionNotify(void)
 /**********************************************************************
  *		X11DRV_EVENT_Pending
  */
-BOOL32 EVENT_Pending()
+BOOL EVENT_Pending()
 {
   return EVENT_GetDriver()->pPending();
 }
@@ -115,7 +115,7 @@ BOOL32 EVENT_Pending()
  *
  * Check if we have pending X events.
  */
-BOOL16 WINAPI IsUserIdle(void)
+BOOL16 WINAPI IsUserIdle16(void)
 {
   return EVENT_GetDriver()->pIsUserIdle();
 }
diff --git a/windows/focus.c b/windows/focus.c
index 55b6430b24b..69d68a11b5a 100644
--- a/windows/focus.c
+++ b/windows/focus.c
@@ -19,14 +19,14 @@
  *	         FOCUS_SwitchFocus 
  * pMsgQ is the queue whose perQData focus is to be modified
  */
-void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND32 hFocusFrom, HWND32 hFocusTo )
+void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND hFocusFrom, HWND hFocusTo )
 {
     WND *pFocusTo = WIN_FindWndPtr( hFocusTo );
 
     PERQDATA_SetFocusWnd( pMsgQ->pQData, hFocusTo );
     
 #if 0
-    if (hFocusFrom) SendMessage32A( hFocusFrom, WM_KILLFOCUS, hFocusTo, 0 );
+    if (hFocusFrom) SendMessageA( hFocusFrom, WM_KILLFOCUS, hFocusTo, 0 );
 #else
     /* FIXME: must be SendMessage16() because 32A doesn't do
      * intertask at this time */
@@ -42,7 +42,7 @@ void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND32 hFocusFrom, HWND32 hFocusTo
     pFocusTo->pDriver->pSetFocus(pFocusTo);
 
 #if 0
-    SendMessage32A( hFocusTo, WM_SETFOCUS, hFocusFrom, 0 );
+    SendMessageA( hFocusTo, WM_SETFOCUS, hFocusFrom, 0 );
 #else
     SendMessage16( hFocusTo, WM_SETFOCUS, hFocusFrom, 0 );
 #endif
@@ -54,22 +54,22 @@ void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND32 hFocusFrom, HWND32 hFocusTo
  */
 HWND16 WINAPI SetFocus16( HWND16 hwnd )
 {
-    return (HWND16)SetFocus32( hwnd );
+    return (HWND16)SetFocus( hwnd );
 }
 
 
 /*****************************************************************
  *               SetFocus32   (USER32.481)
  */
-HWND32 WINAPI SetFocus32( HWND32 hwnd )
+HWND WINAPI SetFocus( HWND hwnd )
 {
-    HWND32 hWndFocus = 0, hwndTop = hwnd;
+    HWND hWndFocus = 0, hwndTop = hwnd;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
     MESSAGEQUEUE *pMsgQ = 0, *pCurMsgQ = 0;
     BOOL16 bRet = 0;
 
     /* Get the messageQ for the current thread */
-    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() )))
+    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
     {
         WARN( win, "\tCurrent message queue not found. Exiting!\n" );
         goto CLEANUP;
@@ -119,11 +119,11 @@ HWND32 WINAPI SetFocus32( HWND32 hwnd )
 	    goto CLEANUP;
 
         /* activate hwndTop if needed. */
-	if (hwndTop != GetActiveWindow32())
+	if (hwndTop != GetActiveWindow())
 	{
 	    if (!WINPOS_SetActiveWindow(hwndTop, 0, 0)) goto CLEANUP;
 
-	    if (!IsWindow32( hwnd )) goto CLEANUP;  /* Abort if window destroyed */
+	    if (!IsWindow( hwnd )) goto CLEANUP;  /* Abort if window destroyed */
 	}
 
         /* Get the current focus window from the perQ data */
@@ -163,20 +163,20 @@ CLEANUP:
  */
 HWND16 WINAPI GetFocus16(void)
 {
-    return (HWND16)GetFocus32();
+    return (HWND16)GetFocus();
 }
 
 
 /*****************************************************************
  *               GetFocus32   (USER32.240)
  */
-HWND32 WINAPI GetFocus32(void)
+HWND WINAPI GetFocus(void)
 {
     MESSAGEQUEUE *pCurMsgQ = 0;
-    HWND32 hwndFocus = 0;
+    HWND hwndFocus = 0;
 
     /* Get the messageQ for the current thread */
-    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() )))
+    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
     {
         WARN( win, "\tCurrent message queue not found. Exiting!\n" );
         return 0;
diff --git a/windows/hook.c b/windows/hook.c
index c03a40d55bf..81feb35b664 100644
--- a/windows/hook.c
+++ b/windows/hook.c
@@ -32,7 +32,7 @@
 typedef struct
 {
     HANDLE16   next;               /* 00 Next hook in chain */
-    HOOKPROC32 proc WINE_PACKED;   /* 02 Hook procedure */
+    HOOKPROC proc WINE_PACKED;   /* 02 Hook procedure */
     INT16      id;                 /* 06 Hook id (WH_xxx) */
     HQUEUE16   ownerQueue;         /* 08 Owner queue (0 for system hook) */
     HMODULE16  ownerModule;        /* 0a Owner module */
@@ -46,15 +46,15 @@ typedef struct
   /* This should probably reside in USER heap */
 static HANDLE16 HOOK_systemHooks[WH_NB_HOOKS] = { 0, };
 
-typedef VOID (*HOOK_MapFunc)(INT32, INT32, WPARAM32 *, LPARAM *);
-typedef VOID (*HOOK_UnMapFunc)(INT32, INT32, WPARAM32, LPARAM, WPARAM32,
+typedef VOID (*HOOK_MapFunc)(INT, INT, WPARAM *, LPARAM *);
+typedef VOID (*HOOK_UnMapFunc)(INT, INT, WPARAM, LPARAM, WPARAM,
 			       LPARAM);
 
 /***********************************************************************
  *           HOOK_Map16To32Common
  */
-static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
-				 LPARAM *plParam, BOOL32 bA )
+static void HOOK_Map16To32Common(INT id, INT code, WPARAM *pwParam,
+				 LPARAM *plParam, BOOL bA )
 {
 
    switch( id )
@@ -65,7 +65,7 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 	case WH_JOURNALRECORD:
         {
             LPMSG16 lpmsg16 = PTR_SEG_TO_LIN(*plParam);
-            LPMSG32 lpmsg32 = HeapAlloc( SystemHeap, 0, sizeof(*lpmsg32) );
+            LPMSG lpmsg32 = HeapAlloc( SystemHeap, 0, sizeof(*lpmsg32) );
 	
             STRUCT32_MSG16to32( lpmsg16, lpmsg32 );
             *plParam = (LPARAM)lpmsg32;
@@ -75,7 +75,7 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 	case WH_JOURNALPLAYBACK:
         {
             LPEVENTMSG16 lpem16 = PTR_SEG_TO_LIN(*plParam);
-            LPEVENTMSG32 lpem32 = HeapAlloc( SystemHeap, 0, sizeof(*lpem32) );
+            LPEVENTMSG lpem32 = HeapAlloc( SystemHeap, 0, sizeof(*lpem32) );
 
             lpem32->message = lpem16->message;
             lpem32->paramL = lpem16->paramL;
@@ -90,7 +90,7 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 	case WH_CALLWNDPROC:
 	{
 	    LPCWPSTRUCT16   lpcwp16 = PTR_SEG_TO_LIN(*plParam);
-	    LPCWPSTRUCT32   lpcwp32 = HeapAlloc( SystemHeap, 0, sizeof(*lpcwp32) );
+	    LPCWPSTRUCT   lpcwp32 = HeapAlloc( SystemHeap, 0, sizeof(*lpcwp32) );
 	    
 	    lpcwp32->hwnd = lpcwp16->hwnd;
 	    lpcwp32->lParam = lpcwp16->lParam;
@@ -112,13 +112,13 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 	    {
 		LPCBT_CREATEWND16  lpcbtcw16 = PTR_SEG_TO_LIN(*plParam);
 		LPCREATESTRUCT16   lpcs16 = PTR_SEG_TO_LIN(lpcbtcw16->lpcs);
-		LPCBT_CREATEWND32A lpcbtcw32 = HeapAlloc( SystemHeap, 0,
+		LPCBT_CREATEWNDA lpcbtcw32 = HeapAlloc( SystemHeap, 0,
 							  sizeof(*lpcbtcw32) );
 		lpcbtcw32->lpcs = HeapAlloc( SystemHeap, 0,
 					     sizeof(*lpcbtcw32->lpcs) );
 
 		STRUCT32_CREATESTRUCT16to32A( lpcs16,
-					     (LPCREATESTRUCT32A)lpcbtcw32->lpcs );
+					     (LPCREATESTRUCTA)lpcbtcw32->lpcs );
 
 		if (HIWORD(lpcs16->lpszName))
 		    lpcbtcw32->lpcs->lpszName = 
@@ -144,7 +144,7 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 	    case HCBT_ACTIVATE:
             {
                 LPCBTACTIVATESTRUCT16 lpcas16 = PTR_SEG_TO_LIN(*plParam);
-                LPCBTACTIVATESTRUCT32 lpcas32 = HeapAlloc( SystemHeap, 0,
+                LPCBTACTIVATESTRUCT lpcas32 = HeapAlloc( SystemHeap, 0,
                                                            sizeof(*lpcas32) );
                 lpcas32->fMouse = lpcas16->fMouse;
                 lpcas32->hWndActive = lpcas16->hWndActive;
@@ -154,14 +154,14 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
             case HCBT_CLICKSKIPPED:
             {
                 LPMOUSEHOOKSTRUCT16 lpms16 = PTR_SEG_TO_LIN(*plParam);
-                LPMOUSEHOOKSTRUCT32 lpms32 = HeapAlloc( SystemHeap, 0,
+                LPMOUSEHOOKSTRUCT lpms32 = HeapAlloc( SystemHeap, 0,
                                                         sizeof(*lpms32) );
 
                 CONV_POINT16TO32( &lpms16->pt, &lpms32->pt );
 
                 /* wHitTestCode may be negative, so convince compiler to do
                    correct sign extension. Yay. :| */
-                lpms32->wHitTestCode = (INT32)((INT16)lpms16->wHitTestCode);
+                lpms32->wHitTestCode = (INT)((INT16)lpms16->wHitTestCode);
 
                 lpms32->dwExtraInfo = lpms16->dwExtraInfo;
                 lpms32->hwnd = lpms16->hwnd;
@@ -171,7 +171,7 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
             case HCBT_MOVESIZE:
             {
                 LPRECT16 lprect16 = PTR_SEG_TO_LIN(*plParam);
-                LPRECT32 lprect32 = HeapAlloc( SystemHeap, 0,
+                LPRECT lprect32 = HeapAlloc( SystemHeap, 0,
                                                sizeof(*lprect32) );
 
                 CONV_RECT16TO32( lprect16, lprect32 );
@@ -184,14 +184,14 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 	case WH_MOUSE:
         {
             LPMOUSEHOOKSTRUCT16 lpms16 = PTR_SEG_TO_LIN(*plParam);
-            LPMOUSEHOOKSTRUCT32 lpms32 = HeapAlloc( SystemHeap, 0,
+            LPMOUSEHOOKSTRUCT lpms32 = HeapAlloc( SystemHeap, 0,
                                                     sizeof(*lpms32) );
 
             CONV_POINT16TO32( &lpms16->pt, &lpms32->pt );
 
             /* wHitTestCode may be negative, so convince compiler to do
                correct sign extension. Yay. :| */
-            lpms32->wHitTestCode = (INT32)((INT16)lpms16->wHitTestCode);
+            lpms32->wHitTestCode = (INT)((INT16)lpms16->wHitTestCode);
             lpms32->dwExtraInfo = lpms16->dwExtraInfo;
             lpms32->hwnd = lpms16->hwnd;
             *plParam = (LPARAM)lpms32;
@@ -201,7 +201,7 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 	case WH_DEBUG:
         {
             LPDEBUGHOOKINFO16 lpdh16 = PTR_SEG_TO_LIN(*plParam);
-            LPDEBUGHOOKINFO32 lpdh32 = HeapAlloc( SystemHeap, 0,
+            LPDEBUGHOOKINFO lpdh32 = HeapAlloc( SystemHeap, 0,
                                                   sizeof(*lpdh32) );
 
             lpdh32->idThread = 0;               /* FIXME */
@@ -232,7 +232,7 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 /***********************************************************************
  *           HOOK_Map16To32A
  */
-static void HOOK_Map16To32A(INT32 id, INT32 code, WPARAM32 *pwParam,
+static void HOOK_Map16To32A(INT id, INT code, WPARAM *pwParam,
 			    LPARAM *plParam)
 {
     HOOK_Map16To32Common( id, code, pwParam, plParam, TRUE );
@@ -242,7 +242,7 @@ static void HOOK_Map16To32A(INT32 id, INT32 code, WPARAM32 *pwParam,
 /***********************************************************************
  *           HOOK_Map16To32W
  */
-static void HOOK_Map16To32W(INT32 id, INT32 code, WPARAM32 *pwParam,
+static void HOOK_Map16To32W(INT id, INT code, WPARAM *pwParam,
 			    LPARAM *plParam)
 {
     HOOK_Map16To32Common( id, code, pwParam, plParam, FALSE );
@@ -252,9 +252,9 @@ static void HOOK_Map16To32W(INT32 id, INT32 code, WPARAM32 *pwParam,
 /***********************************************************************
  *           HOOK_UnMap16To32Common
  */
-static void HOOK_UnMap16To32Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
-				   LPARAM lParamOrig, WPARAM32 wParam,
-				   LPARAM lParam, BOOL32 bA)
+static void HOOK_UnMap16To32Common(INT id, INT code, WPARAM wParamOrig,
+				   LPARAM lParamOrig, WPARAM wParam,
+				   LPARAM lParam, BOOL bA)
 {
     switch (id)
     {
@@ -268,7 +268,7 @@ static void HOOK_UnMap16To32Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
 
 	case WH_CALLWNDPROC:
 	{
-            LPCWPSTRUCT32   lpcwp32 = (LPCWPSTRUCT32)lParam;
+            LPCWPSTRUCT   lpcwp32 = (LPCWPSTRUCT)lParam;
             if (bA) WINPROC_UnmapMsg16To32A( lpcwp32->hwnd,lpcwp32->message, lpcwp32->wParam,
                                              lpcwp32->lParam, 0 );
             else WINPROC_UnmapMsg16To32W( lpcwp32->hwnd,lpcwp32->message, lpcwp32->wParam,
@@ -280,7 +280,7 @@ static void HOOK_UnMap16To32Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
 	case WH_GETMESSAGE:
         {
 	    LPMSG16 lpmsg16 = PTR_SEG_TO_LIN(lParamOrig);
-	    STRUCT32_MSG32to16( (LPMSG32)lParam, lpmsg16 );
+	    STRUCT32_MSG32to16( (LPMSG)lParam, lpmsg16 );
 	    HeapFree( SystemHeap, 0, (LPVOID)lParam );
 	    break;
         }
@@ -296,7 +296,7 @@ static void HOOK_UnMap16To32Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
   	    {
 	      case HCBT_CREATEWND:
 	      {
-		LPCBT_CREATEWND32A lpcbtcw32 = (LPCBT_CREATEWND32A)lParam;
+		LPCBT_CREATEWNDA lpcbtcw32 = (LPCBT_CREATEWNDA)lParam;
 		LPCBT_CREATEWND16  lpcbtcw16 = PTR_SEG_TO_LIN(lParamOrig);
 
 		if( !bA )
@@ -337,8 +337,8 @@ static void HOOK_UnMap16To32Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
 /***********************************************************************
  *           HOOK_UnMap16To32A
  */
-static void HOOK_UnMap16To32A(INT32 id, INT32 code, WPARAM32 wParamOrig,
-			      LPARAM lParamOrig, WPARAM32 wParam,
+static void HOOK_UnMap16To32A(INT id, INT code, WPARAM wParamOrig,
+			      LPARAM lParamOrig, WPARAM wParam,
 			      LPARAM lParam)
 {
     HOOK_UnMap16To32Common( id, code, wParamOrig, lParamOrig, wParam,
@@ -349,8 +349,8 @@ static void HOOK_UnMap16To32A(INT32 id, INT32 code, WPARAM32 wParamOrig,
 /***********************************************************************
  *           HOOK_UnMap16To32W
  */
-static void HOOK_UnMap16To32W(INT32 id, INT32 code, WPARAM32 wParamOrig,
-			      LPARAM lParamOrig, WPARAM32 wParam,
+static void HOOK_UnMap16To32W(INT id, INT code, WPARAM wParamOrig,
+			      LPARAM lParamOrig, WPARAM wParam,
 			      LPARAM lParam)
 {
     HOOK_UnMap16To32Common( id, code, wParamOrig, lParamOrig, wParam, 
@@ -361,8 +361,8 @@ static void HOOK_UnMap16To32W(INT32 id, INT32 code, WPARAM32 wParamOrig,
 /***********************************************************************
  *           HOOK_Map32To16Common
  */
-static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
-				 LPARAM *plParam, BOOL32 bA)
+static void HOOK_Map32To16Common(INT id, INT code, WPARAM *pwParam,
+				 LPARAM *plParam, BOOL bA)
 {
     switch (id)
     {
@@ -371,7 +371,7 @@ static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
       case WH_GETMESSAGE:
       case WH_JOURNALRECORD:
       {
-	  LPMSG32 lpmsg32 = (LPMSG32)*plParam;
+	  LPMSG lpmsg32 = (LPMSG)*plParam;
 	  LPMSG16 lpmsg16 = SEGPTR_NEW( MSG16 );
 
 	  STRUCT32_MSG32to16( lpmsg32, lpmsg16 );
@@ -382,7 +382,7 @@ static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 
       case WH_JOURNALPLAYBACK:
       {
-	  LPEVENTMSG32 lpem32 = (LPEVENTMSG32)*plParam;
+	  LPEVENTMSG lpem32 = (LPEVENTMSG)*plParam;
 	  LPEVENTMSG16 lpem16 = SEGPTR_NEW( EVENTMSG16 );
 
 	  lpem16->message = lpem32->message;
@@ -396,7 +396,7 @@ static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 
       case WH_CALLWNDPROC:
       {
-          LPCWPSTRUCT32   lpcwp32 = (LPCWPSTRUCT32)*plParam;
+          LPCWPSTRUCT   lpcwp32 = (LPCWPSTRUCT)*plParam;
 	  LPCWPSTRUCT16   lpcwp16 = SEGPTR_NEW( CWPSTRUCT16 );
 
           lpcwp16->hwnd = lpcwp32->hwnd;
@@ -417,7 +417,7 @@ static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 	{
 	  case HCBT_ACTIVATE:
 	  {
-	      LPCBTACTIVATESTRUCT32 lpcas32 = (LPCBTACTIVATESTRUCT32)*plParam;
+	      LPCBTACTIVATESTRUCT lpcas32 = (LPCBTACTIVATESTRUCT)*plParam;
 	      LPCBTACTIVATESTRUCT16 lpcas16 =SEGPTR_NEW( CBTACTIVATESTRUCT16 );
 
 	      lpcas16->fMouse     = lpcas32->fMouse;
@@ -429,7 +429,7 @@ static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 	      
 	  case HCBT_CLICKSKIPPED:
 	  {
-	      LPMOUSEHOOKSTRUCT32 lpms32 = (LPMOUSEHOOKSTRUCT32)*plParam;
+	      LPMOUSEHOOKSTRUCT lpms32 = (LPMOUSEHOOKSTRUCT)*plParam;
 	      LPMOUSEHOOKSTRUCT16 lpms16 = SEGPTR_NEW( MOUSEHOOKSTRUCT16 );
 
 	      CONV_POINT32TO16( &lpms32->pt, &lpms16->pt );
@@ -444,7 +444,7 @@ static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 
 	  case HCBT_MOVESIZE:
 	  {
-	      LPRECT32 lprect32 = (LPRECT32)*plParam;
+	      LPRECT lprect32 = (LPRECT)*plParam;
 	      LPRECT16 lprect16 = SEGPTR_NEW( RECT16 );
 
 	      CONV_RECT32TO16( lprect32, lprect16 );
@@ -457,7 +457,7 @@ static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 
       case WH_MOUSE:
       {
-	  LPMOUSEHOOKSTRUCT32 lpms32 = (LPMOUSEHOOKSTRUCT32)*plParam;
+	  LPMOUSEHOOKSTRUCT lpms32 = (LPMOUSEHOOKSTRUCT)*plParam;
 	  LPMOUSEHOOKSTRUCT16 lpms16 = SEGPTR_NEW( MOUSEHOOKSTRUCT16 );
 
 	  CONV_POINT32TO16( &lpms32->pt, &lpms16->pt );
@@ -472,7 +472,7 @@ static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 
       case WH_DEBUG:
       {
-	  LPDEBUGHOOKINFO32 lpdh32 = (LPDEBUGHOOKINFO32)*plParam;
+	  LPDEBUGHOOKINFO lpdh32 = (LPDEBUGHOOKINFO)*plParam;
 	  LPDEBUGHOOKINFO16 lpdh16 = SEGPTR_NEW( DEBUGHOOKINFO16 );
 
 	  lpdh16->hModuleHook = 0;	/* FIXME */
@@ -500,12 +500,12 @@ static void HOOK_Map32To16Common(INT32 id, INT32 code, WPARAM32 *pwParam,
 /***********************************************************************
  *           HOOK_Map32ATo16
  */
-static void HOOK_Map32ATo16(INT32 id, INT32 code, WPARAM32 *pwParam,
+static void HOOK_Map32ATo16(INT id, INT code, WPARAM *pwParam,
 			    LPARAM *plParam)
 {
     if (id == WH_CBT && code == HCBT_CREATEWND)
     {
-	LPCBT_CREATEWND32A lpcbtcw32 = (LPCBT_CREATEWND32A)*plParam;
+	LPCBT_CREATEWNDA lpcbtcw32 = (LPCBT_CREATEWNDA)*plParam;
 	LPCBT_CREATEWND16 lpcbtcw16 = SEGPTR_NEW( CBT_CREATEWND16 );
 	LPCREATESTRUCT16 lpcs16 = SEGPTR_NEW( CREATESTRUCT16 );
 
@@ -535,18 +535,18 @@ static void HOOK_Map32ATo16(INT32 id, INT32 code, WPARAM32 *pwParam,
 /***********************************************************************
  *           HOOK_Map32WTo16
  */
-static void HOOK_Map32WTo16(INT32 id, INT32 code, WPARAM32 *pwParam,
+static void HOOK_Map32WTo16(INT id, INT code, WPARAM *pwParam,
 			    LPARAM *plParam)
 {
     if (id == WH_CBT && code == HCBT_CREATEWND)
     {
         LPSTR name, cls;
-	LPCBT_CREATEWND32W lpcbtcw32 = (LPCBT_CREATEWND32W)*plParam;
+	LPCBT_CREATEWNDW lpcbtcw32 = (LPCBT_CREATEWNDW)*plParam;
 	LPCBT_CREATEWND16 lpcbtcw16 = SEGPTR_NEW( CBT_CREATEWND16 );
 	LPCREATESTRUCT16 lpcs16 = SEGPTR_NEW( CREATESTRUCT16 );
 
 	lpcbtcw16->lpcs = (LPCREATESTRUCT16)SEGPTR_GET( lpcs16 );
-	STRUCT32_CREATESTRUCT32Ato16( (LPCREATESTRUCT32A)lpcbtcw32->lpcs,
+	STRUCT32_CREATESTRUCT32Ato16( (LPCREATESTRUCTA)lpcbtcw32->lpcs,
 				      lpcs16 );
 
         name = SEGPTR_STRDUP_WtoA( lpcbtcw32->lpcs->lpszName );
@@ -564,9 +564,9 @@ static void HOOK_Map32WTo16(INT32 id, INT32 code, WPARAM32 *pwParam,
 /***********************************************************************
  *           HOOK_UnMap32To16Common
  */
-static void HOOK_UnMap32To16Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
-				   LPARAM lParamOrig, WPARAM32 wParam,
-				   LPARAM lParam, BOOL32 bA)
+static void HOOK_UnMap32To16Common(INT id, INT code, WPARAM wParamOrig,
+				   LPARAM lParamOrig, WPARAM wParam,
+				   LPARAM lParam, BOOL bA)
 {
     switch (id)
     {
@@ -582,7 +582,7 @@ static void HOOK_UnMap32To16Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
       case WH_CALLWNDPROC:
       {
           LPCWPSTRUCT16   lpcwp16 = (LPCWPSTRUCT16)PTR_SEG_TO_LIN(lParam);
-	  LPCWPSTRUCT32   lpcwp32 = (LPCWPSTRUCT32)lParamOrig;
+	  LPCWPSTRUCT   lpcwp32 = (LPCWPSTRUCT)lParamOrig;
 	  MSGPARAM16	  mp16 = { lpcwp16->wParam, lpcwp16->lParam, 0 };
 
           if (bA) WINPROC_UnmapMsg32ATo16( lpcwp32->hwnd,lpcwp32->message, lpcwp32->wParam,
@@ -595,7 +595,7 @@ static void HOOK_UnMap32To16Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
 
       case WH_GETMESSAGE:
       {
-	  LPMSG32 lpmsg32 = (LPMSG32)lParamOrig;
+	  LPMSG lpmsg32 = (LPMSG)lParamOrig;
 
 	  STRUCT32_MSG16to32( (LPMSG16)PTR_SEG_TO_LIN(lParam), lpmsg32 );
 	  SEGPTR_FREE( PTR_SEG_TO_LIN(lParam) );
@@ -607,7 +607,7 @@ static void HOOK_UnMap32To16Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
 	{
 	  case HCBT_CREATEWND:
 	  {
-	       LPCBT_CREATEWND32A lpcbtcw32 = (LPCBT_CREATEWND32A)(lParamOrig);
+	       LPCBT_CREATEWNDA lpcbtcw32 = (LPCBT_CREATEWNDA)(lParamOrig);
                LPCBT_CREATEWND16 lpcbtcw16 = PTR_SEG_TO_LIN(lParam);
                LPCREATESTRUCT16  lpcs16 = PTR_SEG_TO_LIN(lpcbtcw16->lpcs);
 
@@ -646,8 +646,8 @@ static void HOOK_UnMap32To16Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
 /***********************************************************************
  *           HOOK_UnMap32ATo16
  */
-static void HOOK_UnMap32ATo16(INT32 id, INT32 code, WPARAM32 wParamOrig,
-			      LPARAM lParamOrig, WPARAM32 wParam,
+static void HOOK_UnMap32ATo16(INT id, INT code, WPARAM wParamOrig,
+			      LPARAM lParamOrig, WPARAM wParam,
 			      LPARAM lParam)
 {
     HOOK_UnMap32To16Common( id, code, wParamOrig, lParamOrig, wParam,
@@ -658,8 +658,8 @@ static void HOOK_UnMap32ATo16(INT32 id, INT32 code, WPARAM32 wParamOrig,
 /***********************************************************************
  *           HOOK_UnMap32WTo16
  */
-static void HOOK_UnMap32WTo16(INT32 id, INT32 code, WPARAM32 wParamOrig,
-			      LPARAM lParamOrig, WPARAM32 wParam,
+static void HOOK_UnMap32WTo16(INT id, INT code, WPARAM wParamOrig,
+			      LPARAM lParamOrig, WPARAM wParam,
 			      LPARAM lParam)
 {
     HOOK_UnMap32To16Common( id, code, wParamOrig, lParamOrig, wParam,
@@ -670,18 +670,18 @@ static void HOOK_UnMap32WTo16(INT32 id, INT32 code, WPARAM32 wParamOrig,
 /***********************************************************************
  *           HOOK_Map32ATo32W
  */
-static void HOOK_Map32ATo32W(INT32 id, INT32 code, WPARAM32 *pwParam,
+static void HOOK_Map32ATo32W(INT id, INT code, WPARAM *pwParam,
 			     LPARAM *plParam)
 {
     if (id == WH_CBT && code == HCBT_CREATEWND)
     {
-	LPCBT_CREATEWND32A lpcbtcwA = (LPCBT_CREATEWND32A)*plParam;
-	LPCBT_CREATEWND32W lpcbtcwW = HeapAlloc( SystemHeap, 0,
+	LPCBT_CREATEWNDA lpcbtcwA = (LPCBT_CREATEWNDA)*plParam;
+	LPCBT_CREATEWNDW lpcbtcwW = HeapAlloc( SystemHeap, 0,
 						 sizeof(*lpcbtcwW) );
 	lpcbtcwW->lpcs = HeapAlloc( SystemHeap, 0, sizeof(*lpcbtcwW->lpcs) );
 
 	lpcbtcwW->hwndInsertAfter = lpcbtcwA->hwndInsertAfter;
-	*lpcbtcwW->lpcs = *(LPCREATESTRUCT32W)lpcbtcwA->lpcs;
+	*lpcbtcwW->lpcs = *(LPCREATESTRUCTW)lpcbtcwA->lpcs;
 
 	if (HIWORD(lpcbtcwA->lpcs->lpszName))
 	{
@@ -707,13 +707,13 @@ static void HOOK_Map32ATo32W(INT32 id, INT32 code, WPARAM32 *pwParam,
 /***********************************************************************
  *           HOOK_UnMap32ATo32W
  */
-static void HOOK_UnMap32ATo32W(INT32 id, INT32 code, WPARAM32 wParamOrig,
-			       LPARAM lParamOrig, WPARAM32 wParam,
+static void HOOK_UnMap32ATo32W(INT id, INT code, WPARAM wParamOrig,
+			       LPARAM lParamOrig, WPARAM wParam,
 			       LPARAM lParam)
 {
     if (id == WH_CBT && code == HCBT_CREATEWND)
     {
-	LPCBT_CREATEWND32W lpcbtcwW = (LPCBT_CREATEWND32W)lParam;
+	LPCBT_CREATEWNDW lpcbtcwW = (LPCBT_CREATEWNDW)lParam;
 	if (HIWORD(lpcbtcwW->lpcs->lpszName))
             HeapFree( SystemHeap, 0, (LPWSTR)lpcbtcwW->lpcs->lpszName );
 	if (HIWORD(lpcbtcwW->lpcs->lpszClass))
@@ -728,18 +728,18 @@ static void HOOK_UnMap32ATo32W(INT32 id, INT32 code, WPARAM32 wParamOrig,
 /***********************************************************************
  *           HOOK_Map32WTo32A
  */
-static void HOOK_Map32WTo32A(INT32 id, INT32 code, WPARAM32 *pwParam,
+static void HOOK_Map32WTo32A(INT id, INT code, WPARAM *pwParam,
 			     LPARAM *plParam)
 {
     if (id == WH_CBT && code == HCBT_CREATEWND)
     {
-	LPCBT_CREATEWND32W lpcbtcwW = (LPCBT_CREATEWND32W)*plParam;
-	LPCBT_CREATEWND32A lpcbtcwA = HeapAlloc( SystemHeap, 0,
+	LPCBT_CREATEWNDW lpcbtcwW = (LPCBT_CREATEWNDW)*plParam;
+	LPCBT_CREATEWNDA lpcbtcwA = HeapAlloc( SystemHeap, 0,
 						 sizeof(*lpcbtcwA) );
 	lpcbtcwA->lpcs = HeapAlloc( SystemHeap, 0, sizeof(*lpcbtcwA->lpcs) );
 
 	lpcbtcwA->hwndInsertAfter = lpcbtcwW->hwndInsertAfter;
-	*lpcbtcwA->lpcs = *(LPCREATESTRUCT32A)lpcbtcwW->lpcs;
+	*lpcbtcwA->lpcs = *(LPCREATESTRUCTA)lpcbtcwW->lpcs;
 
 	if (HIWORD(lpcbtcwW->lpcs->lpszName))
 	  lpcbtcwA->lpcs->lpszName = HEAP_strdupWtoA( SystemHeap, 0,
@@ -761,13 +761,13 @@ static void HOOK_Map32WTo32A(INT32 id, INT32 code, WPARAM32 *pwParam,
 /***********************************************************************
  *           HOOK_UnMap32WTo32A
  */
-static void HOOK_UnMap32WTo32A(INT32 id, INT32 code, WPARAM32 wParamOrig,
-			       LPARAM lParamOrig, WPARAM32 wParam,
+static void HOOK_UnMap32WTo32A(INT id, INT code, WPARAM wParamOrig,
+			       LPARAM lParamOrig, WPARAM wParam,
 			       LPARAM lParam)
 {
     if (id == WH_CBT && code == HCBT_CREATEWND)
     {
-	LPCBT_CREATEWND32A lpcbtcwA = (LPCBT_CREATEWND32A)lParam;
+	LPCBT_CREATEWNDA lpcbtcwA = (LPCBT_CREATEWNDA)lParam;
 	if (HIWORD(lpcbtcwA->lpcs->lpszName))
             HeapFree( SystemHeap, 0, (LPSTR)lpcbtcwA->lpcs->lpszName );
 	if (HIWORD(lpcbtcwA->lpcs->lpszClass))
@@ -843,7 +843,7 @@ static HANDLE16 HOOK_GetHook( INT16 id, HQUEUE16 hQueue )
  *
  * Install a given hook.
  */
-static HHOOK HOOK_SetHook( INT16 id, LPVOID proc, INT32 type,
+static HHOOK HOOK_SetHook( INT16 id, LPVOID proc, INT type,
 		           HMODULE16 hModule, DWORD dwThreadId )
 {
     HOOKDATA *data;
@@ -853,18 +853,18 @@ static HHOOK HOOK_SetHook( INT16 id, LPVOID proc, INT32 type,
     if ((id < WH_MINHOOK) || (id > WH_MAXHOOK)) return 0;
 
     TRACE(hook, "Setting hook %d: %08x %04x %08lx\n",
-                  id, (UINT32)proc, hModule, dwThreadId );
+                  id, (UINT)proc, hModule, dwThreadId );
 
     /* Create task queue if none present */
-    GetFastQueue();
+    GetFastQueue16();
 
-    if (id == WH_JOURNALPLAYBACK) EnableHardwareInput(FALSE);
+    if (id == WH_JOURNALPLAYBACK) EnableHardwareInput16(FALSE);
 
     if (dwThreadId)  /* Task-specific hook */
     {
 	if ((id == WH_JOURNALRECORD) || (id == WH_JOURNALPLAYBACK) ||
 	    (id == WH_SYSMSGFILTER)) return 0;  /* System-only hooks */
-        if (!(hQueue = GetThreadQueue( dwThreadId )))
+        if (!(hQueue = GetThreadQueue16( dwThreadId )))
             return 0;
     }
 
@@ -904,7 +904,7 @@ static HHOOK HOOK_SetHook( INT16 id, LPVOID proc, INT32 type,
  *
  * Remove a hook from the list.
  */
-static BOOL32 HOOK_RemoveHook( HANDLE16 hook )
+static BOOL HOOK_RemoveHook( HANDLE16 hook )
 {
     HOOKDATA *data;
     HANDLE16 *prevHook;
@@ -916,11 +916,11 @@ static BOOL32 HOOK_RemoveHook( HANDLE16 hook )
     {
         /* Mark it for deletion later on */
         WARN(hook, "Hook still running, deletion delayed\n" );
-        data->proc = (HOOKPROC32)0;
+        data->proc = (HOOKPROC)0;
         return TRUE;
     }
 
-    if (data->id == WH_JOURNALPLAYBACK) EnableHardwareInput(TRUE);
+    if (data->id == WH_JOURNALPLAYBACK) EnableHardwareInput16(TRUE);
      
     /* Remove it from the linked list */
 
@@ -964,15 +964,15 @@ static HANDLE16 HOOK_FindValidHook( HANDLE16 hook )
  *
  * Call a hook procedure.
  */
-static LRESULT HOOK_CallHook( HANDLE16 hook, INT32 fromtype, INT32 code,
-                              WPARAM32 wParam, LPARAM lParam )
+static LRESULT HOOK_CallHook( HANDLE16 hook, INT fromtype, INT code,
+                              WPARAM wParam, LPARAM lParam )
 {
     MESSAGEQUEUE *queue;
     HANDLE16 prevHook;
     HOOKDATA *data = (HOOKDATA *)USER_HEAP_LIN_ADDR(hook);
     LRESULT ret;
 
-    WPARAM32 wParamOrig = wParam;
+    WPARAM wParamOrig = wParam;
     LPARAM lParamOrig = lParam;
     HOOK_MapFunc MapFunc;
     HOOK_UnMapFunc UnMapFunc;
@@ -985,7 +985,7 @@ static LRESULT HOOK_CallHook( HANDLE16 hook, INT32 fromtype, INT32 code,
 
     /* Now call it */
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() ))) return 0;
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() ))) return 0;
     prevHook = queue->hCurHook;
     queue->hCurHook = hook;
     data->flags |= HOOK_INUSE;
@@ -1034,12 +1034,12 @@ HOOKPROC16 HOOK_GetProc16( HHOOK hhook )
  *
  * Replacement for calling HOOK_GetHook from other modules.
  */
-BOOL32 HOOK_IsHooked( INT16 id )
+BOOL HOOK_IsHooked( INT16 id )
 {
     /* Hmmm. Use GetThreadQueue(0) instead of GetFastQueue() here to 
        avoid queue being created if someone wants to merely check ... */
 
-    return HOOK_GetHook( id, GetThreadQueue(0) ) != 0;
+    return HOOK_GetHook( id, GetThreadQueue16(0) ) != 0;
 }
 
 
@@ -1053,7 +1053,7 @@ LRESULT HOOK_CallHooks16( INT16 id, INT16 code, WPARAM16 wParam,
 {
     HANDLE16 hook; 
 
-    if (!(hook = HOOK_GetHook( id, GetFastQueue() ))) return 0;
+    if (!(hook = HOOK_GetHook( id, GetFastQueue16() ))) return 0;
     if (!(hook = HOOK_FindValidHook(hook))) return 0;
     return HOOK_CallHook( hook, HOOK_WIN16, code, wParam, lParam );
 }
@@ -1063,12 +1063,12 @@ LRESULT HOOK_CallHooks16( INT16 id, INT16 code, WPARAM16 wParam,
  *
  * Call a hook chain.
  */
-LRESULT HOOK_CallHooks32A( INT32 id, INT32 code, WPARAM32 wParam,
+LRESULT HOOK_CallHooksA( INT id, INT code, WPARAM wParam,
                            LPARAM lParam )
 {
     HANDLE16 hook; 
 
-    if (!(hook = HOOK_GetHook( id, GetFastQueue() ))) return 0;
+    if (!(hook = HOOK_GetHook( id, GetFastQueue16() ))) return 0;
     if (!(hook = HOOK_FindValidHook(hook))) return 0;
     return HOOK_CallHook( hook, HOOK_WIN32A, code, wParam, lParam );
 }
@@ -1078,12 +1078,12 @@ LRESULT HOOK_CallHooks32A( INT32 id, INT32 code, WPARAM32 wParam,
  *
  * Call a hook chain.
  */
-LRESULT HOOK_CallHooks32W( INT32 id, INT32 code, WPARAM32 wParam,
+LRESULT HOOK_CallHooksW( INT id, INT code, WPARAM wParam,
                            LPARAM lParam )
 {
     HANDLE16 hook; 
 
-    if (!(hook = HOOK_GetHook( id, GetFastQueue() ))) return 0;
+    if (!(hook = HOOK_GetHook( id, GetFastQueue16() ))) return 0;
     if (!(hook = HOOK_FindValidHook(hook))) return 0;
     return HOOK_CallHook( hook, HOOK_WIN32W, code, wParam,
 			  lParam );
@@ -1183,7 +1183,7 @@ void HOOK_FreeQueueHooks( HQUEUE16 hQueue )
  */
 FARPROC16 WINAPI SetWindowsHook16( INT16 id, HOOKPROC16 proc )
 {
-    HINSTANCE16 hInst = FarGetOwner( HIWORD(proc) );
+    HINSTANCE16 hInst = FarGetOwner16( HIWORD(proc) );
 
     /* WH_MSGFILTER is the only task-specific hook for SetWindowsHook() */
     HTASK16 hTask = (id == WH_MSGFILTER) ? GetCurrentTask() : 0;
@@ -1194,17 +1194,17 @@ FARPROC16 WINAPI SetWindowsHook16( INT16 id, HOOKPROC16 proc )
 /***********************************************************************
  *           SetWindowsHook32A   (USER32.525)
  */
-HHOOK WINAPI SetWindowsHook32A( INT32 id, HOOKPROC32 proc )
+HHOOK WINAPI SetWindowsHookA( INT id, HOOKPROC proc )
 {
-    return SetWindowsHookEx32A( id, proc, 0, GetCurrentThreadId() );
+    return SetWindowsHookExA( id, proc, 0, GetCurrentThreadId() );
 }
 
 /***********************************************************************
  *           SetWindowsHook32W   (USER32.528)
  */
-HHOOK WINAPI SetWindowsHook32W( INT32 id, HOOKPROC32 proc )
+HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc )
 {
-    return SetWindowsHookEx32W( id, proc, 0, GetCurrentThreadId() );
+    return SetWindowsHookExW( id, proc, 0, GetCurrentThreadId() );
 }
 
 
@@ -1225,7 +1225,7 @@ HHOOK WINAPI SetWindowsHookEx16( INT16 id, HOOKPROC16 proc, HINSTANCE16 hInst,
 /***********************************************************************
  *           SetWindowsHookEx32A   (USER32.526)
  */
-HHOOK WINAPI SetWindowsHookEx32A( INT32 id, HOOKPROC32 proc, HINSTANCE32 hInst,
+HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE hInst,
                                   DWORD dwThreadId )
 {
     return HOOK_SetHook( id, proc, HOOK_WIN32A, MapHModuleLS(hInst), dwThreadId );
@@ -1234,7 +1234,7 @@ HHOOK WINAPI SetWindowsHookEx32A( INT32 id, HOOKPROC32 proc, HINSTANCE32 hInst,
 /***********************************************************************
  *           SetWindowsHookEx32W   (USER32.527)
  */
-HHOOK WINAPI SetWindowsHookEx32W( INT32 id, HOOKPROC32 proc, HINSTANCE32 hInst,
+HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE hInst,
                                   DWORD dwThreadId )
 {
     return HOOK_SetHook( id, proc, HOOK_WIN32W, MapHModuleLS(hInst), dwThreadId );
@@ -1246,15 +1246,15 @@ HHOOK WINAPI SetWindowsHookEx32W( INT32 id, HOOKPROC32 proc, HINSTANCE32 hInst,
  */
 BOOL16 WINAPI UnhookWindowsHook16( INT16 id, HOOKPROC16 proc )
 {
-    return UnhookWindowsHook32( id, (HOOKPROC32)proc );
+    return UnhookWindowsHook( id, (HOOKPROC)proc );
 }
 
 /***********************************************************************
  *           UnhookWindowsHook32   (USER32.557)
  */
-BOOL32 WINAPI UnhookWindowsHook32( INT32 id, HOOKPROC32 proc )
+BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc )
 {
-    HANDLE16 hook = HOOK_GetHook( id, GetFastQueue() );
+    HANDLE16 hook = HOOK_GetHook( id, GetFastQueue16() );
 
     TRACE(hook, "%d %08lx\n", id, (DWORD)proc );
 
@@ -1274,13 +1274,13 @@ BOOL32 WINAPI UnhookWindowsHook32( INT32 id, HOOKPROC32 proc )
  */
 BOOL16 WINAPI UnhookWindowsHookEx16( HHOOK hhook )
 {
-    return UnhookWindowsHookEx32( hhook );
+    return UnhookWindowsHookEx( hhook );
 }
 
 /***********************************************************************
  *           UnhookWindowHookEx32   (USER32.558)
  */
-BOOL32 WINAPI UnhookWindowsHookEx32( HHOOK hhook )
+BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook )
 {
     if (HIWORD(hhook) != HOOK_MAGIC) return FALSE;  /* Not a new format hook */
     return HOOK_RemoveHook( LOWORD(hhook) );
@@ -1310,11 +1310,11 @@ LRESULT WINAPI CallNextHookEx16( HHOOK hhook, INT16 code, WPARAM16 wParam,
  *
  * There aren't ANSI and UNICODE versions of this.
  */
-LRESULT WINAPI CallNextHookEx32( HHOOK hhook, INT32 code, WPARAM32 wParam,
+LRESULT WINAPI CallNextHookEx( HHOOK hhook, INT code, WPARAM wParam,
                                  LPARAM lParam )
 {
     HANDLE16 next;
-    INT32 fromtype;	/* figure out Ansi/Unicode */
+    INT fromtype;	/* figure out Ansi/Unicode */
     HOOKDATA *oldhook;
 
     if (HIWORD(hhook) != HOOK_MAGIC) return 0;  /* Not a new format hook */
@@ -1341,7 +1341,7 @@ LRESULT WINAPI DefHookProc16( INT16 code, WPARAM16 wParam, LPARAM lParam,
     MESSAGEQUEUE *queue;
     LRESULT ret;
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() ))) return 0;
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() ))) return 0;
     ret = CallNextHookEx16( queue->hCurHook, code, wParam, lParam );
     QUEUE_Unlock( queue );
     return ret;
@@ -1362,9 +1362,9 @@ BOOL16 WINAPI CallMsgFilter16( SEGPTR msg, INT16 code )
 /***********************************************************************
  *           WIN16_CallMsgFilter32   (USER.823)
  */
-BOOL16 WINAPI WIN16_CallMsgFilter32( SEGPTR msg16_32, INT16 code, BOOL16 wHaveParamHigh )
+BOOL16 WINAPI CallMsgFilter32_16( SEGPTR msg16_32, INT16 code, BOOL16 wHaveParamHigh )
 {
-    MSG16_32 *lpmsg16_32 = (MSG16_32 *)PTR_SEG_TO_LIN(msg16_32);
+    MSG32_16 *lpmsg16_32 = (MSG32_16 *)PTR_SEG_TO_LIN(msg16_32);
 
     if (wHaveParamHigh == FALSE)
     {
@@ -1374,7 +1374,7 @@ BOOL16 WINAPI WIN16_CallMsgFilter32( SEGPTR msg16_32, INT16 code, BOOL16 wHavePa
     }
     else
     {
-        MSG32 msg32;
+        MSG msg32;
         BOOL16 ret;
 
         msg32.hwnd		= lpmsg16_32->msg.hwnd;
@@ -1383,10 +1383,10 @@ BOOL16 WINAPI WIN16_CallMsgFilter32( SEGPTR msg16_32, INT16 code, BOOL16 wHavePa
                      MAKELONG(lpmsg16_32->msg.wParam, lpmsg16_32->wParamHigh);
         msg32.lParam	= lpmsg16_32->msg.lParam;
         msg32.time		= lpmsg16_32->msg.time;
-        msg32.pt.x		= (INT32)lpmsg16_32->msg.pt.x;
-        msg32.pt.y      = (INT32)lpmsg16_32->msg.pt.y;
+        msg32.pt.x		= (INT)lpmsg16_32->msg.pt.x;
+        msg32.pt.y      = (INT)lpmsg16_32->msg.pt.y;
         
-        ret = (BOOL16)CallMsgFilter32A(&msg32, (INT32)code);
+        ret = (BOOL16)CallMsgFilterA(&msg32, (INT)code);
 
         lpmsg16_32->msg.hwnd    = msg32.hwnd;
         lpmsg16_32->msg.message = msg32.message;
@@ -1409,23 +1409,23 @@ BOOL16 WINAPI WIN16_CallMsgFilter32( SEGPTR msg16_32, INT16 code, BOOL16 wHavePa
  * FIXME: There are ANSI and UNICODE versions of this, plus an unspecified
  * version, plus USER (the 16bit one) has a CallMsgFilter32 function.
  */
-BOOL32 WINAPI CallMsgFilter32A( LPMSG32 msg, INT32 code )
+BOOL WINAPI CallMsgFilterA( LPMSG msg, INT code )
 {
     if (GetSysModalWindow16()) return FALSE;	/* ??? */
-    if (HOOK_CallHooks32A( WH_SYSMSGFILTER, code, 0, (LPARAM)msg ))
+    if (HOOK_CallHooksA( WH_SYSMSGFILTER, code, 0, (LPARAM)msg ))
       return TRUE;
-    return HOOK_CallHooks32A( WH_MSGFILTER, code, 0, (LPARAM)msg );
+    return HOOK_CallHooksA( WH_MSGFILTER, code, 0, (LPARAM)msg );
 }
 
 
 /***********************************************************************
  *           CallMsgFilter32W   (USER32.16)
  */
-BOOL32 WINAPI CallMsgFilter32W( LPMSG32 msg, INT32 code )
+BOOL WINAPI CallMsgFilterW( LPMSG msg, INT code )
 {
     if (GetSysModalWindow16()) return FALSE;	/* ??? */
-    if (HOOK_CallHooks32W( WH_SYSMSGFILTER, code, 0, (LPARAM)msg ))
+    if (HOOK_CallHooksW( WH_SYSMSGFILTER, code, 0, (LPARAM)msg ))
       return TRUE;
-    return HOOK_CallHooks32W( WH_MSGFILTER, code, 0, (LPARAM)msg );
+    return HOOK_CallHooksW( WH_MSGFILTER, code, 0, (LPARAM)msg );
 }
 
diff --git a/windows/input.c b/windows/input.c
index f1660f50af6..8fd22a260da 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -32,11 +32,11 @@
 #include "winerror.h"
 #include "task.h"
 
-static BOOL32 InputEnabled = TRUE;
-static BOOL32 SwappedButtons = FALSE;
+static BOOL InputEnabled = TRUE;
+static BOOL SwappedButtons = FALSE;
 
-BOOL32 MouseButtonsStates[3];
-BOOL32 AsyncMouseButtonsStates[3];
+BOOL MouseButtonsStates[3];
+BOOL AsyncMouseButtonsStates[3];
 BYTE InputKeyStateTable[256];
 BYTE QueueKeyStateTable[256];
 BYTE AsyncKeyStateTable[256];
@@ -76,7 +76,7 @@ void WINAPI keybd_event( BYTE bVk, BYTE bScan,
      * Otherwise, we need to determine that info ourselves (probably
      * less accurate, but we can't help that ...).
      */
-    if (   !IsBadReadPtr32( (LPVOID)dwExtraInfo, sizeof(WINE_KEYBDEVENT) )
+    if (   !IsBadReadPtr( (LPVOID)dwExtraInfo, sizeof(WINE_KEYBDEVENT) )
         && ((WINE_KEYBDEVENT *)dwExtraInfo)->magic == WINE_KEYBDEVENT_MAGIC )
     {
         WINE_KEYBDEVENT *wke = (WINE_KEYBDEVENT *)dwExtraInfo;
@@ -106,7 +106,7 @@ void WINAPI keybd_event( BYTE bVk, BYTE bScan,
 
     if ( dwFlags & KEYEVENTF_KEYUP )
     {
-        BOOL32 sysKey = (InputKeyStateTable[VK_MENU] & 0x80)
+        BOOL sysKey = (InputKeyStateTable[VK_MENU] & 0x80)
                 && !(InputKeyStateTable[VK_CONTROL] & 0x80)
                 && !(dwFlags & KEYEVENTF_WINE_FORCEEXTENDED); /* for Alt from AltGr */
 
@@ -155,7 +155,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
      * Otherwise, we need to determine that info ourselves (probably
      * less accurate, but we can't help that ...).
      */
-    if (   !IsBadReadPtr32( (LPVOID)dwExtraInfo, sizeof(WINE_MOUSEEVENT) )
+    if (   !IsBadReadPtr( (LPVOID)dwExtraInfo, sizeof(WINE_MOUSEEVENT) )
         && ((WINE_MOUSEEVENT *)dwExtraInfo)->magic == WINE_MOUSEEVENT_MAGIC )
     {
         WINE_MOUSEEVENT *wme = (WINE_MOUSEEVENT *)dwExtraInfo;
@@ -188,7 +188,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
                 posY += dy;
             }
             /* We have to actually move the cursor */
-            SetCursorPos32( posX, posY );
+            SetCursorPos( posX, posY );
         }
     }
 
@@ -238,7 +238,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
 /**********************************************************************
  *                      EnableHardwareInput   (USER.331)
  */
-BOOL16 WINAPI EnableHardwareInput(BOOL16 bEnable)
+BOOL16 WINAPI EnableHardwareInput16(BOOL16 bEnable)
 {
   BOOL16 bOldState = InputEnabled;
   FIXME(event,"(%d) - stub\n", bEnable);
@@ -261,9 +261,9 @@ BOOL16 WINAPI SwapMouseButton16( BOOL16 fSwap )
 /***********************************************************************
  *           SwapMouseButton32   (USER32.537)
  */
-BOOL32 WINAPI SwapMouseButton32( BOOL32 fSwap )
+BOOL WINAPI SwapMouseButton( BOOL fSwap )
 {
-    BOOL32 ret = SwappedButtons;
+    BOOL ret = SwappedButtons;
     SwappedButtons = fSwap;
     return ret;
 }
@@ -274,15 +274,15 @@ BOOL32 WINAPI SwapMouseButton32( BOOL32 fSwap )
  * We need this to be able to generate double click messages
  * when menu code captures mouse in the window without CS_DBLCLK style.
  */
-HWND32 EVENT_Capture(HWND32 hwnd, INT16 ht)
+HWND EVENT_Capture(HWND hwnd, INT16 ht)
 {
-    HWND32 capturePrev = 0, captureWnd = 0;
+    HWND capturePrev = 0, captureWnd = 0;
     MESSAGEQUEUE *pMsgQ = 0, *pCurMsgQ = 0;
     WND* wndPtr = 0;
     INT16 captureHT = 0;
 
     /* Get the messageQ for the current thread */
-    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() )))
+    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
     {
         WARN( win, "\tCurrent message queue not found. Exiting!\n" );
         goto CLEANUP;
@@ -334,7 +334,7 @@ HWND32 EVENT_Capture(HWND32 hwnd, INT16 ht)
     {
         WND* wndPtr = WIN_FindWndPtr( capturePrev );
         if( wndPtr && (wndPtr->flags & WIN_ISWIN32) )
-            SendMessage32A( capturePrev, WM_CAPTURECHANGED, 0L, hwnd);
+            SendMessageA( capturePrev, WM_CAPTURECHANGED, 0L, hwnd);
     }
 }
 
@@ -361,7 +361,7 @@ HWND16 WINAPI SetCapture16( HWND16 hwnd )
 /**********************************************************************
  *              SetCapture32   (USER32.464)
  */
-HWND32 WINAPI SetCapture32( HWND32 hwnd )
+HWND WINAPI SetCapture( HWND hwnd )
 {
     return EVENT_Capture( hwnd, HTCLIENT );
 }
@@ -381,19 +381,19 @@ void WINAPI ReleaseCapture(void)
  */
 HWND16 WINAPI GetCapture16(void)
 {
-    return (HWND16)GetCapture32();
+    return (HWND16)GetCapture();
 }
 
 /**********************************************************************
  *              GetCapture32   (USER32.208)
  */
-HWND32 WINAPI GetCapture32(void)
+HWND WINAPI GetCapture(void)
 {
     MESSAGEQUEUE *pCurMsgQ = 0;
-    HWND32 hwndCapture = 0;
+    HWND hwndCapture = 0;
 
     /* Get the messageQ for the current thread */
-    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() )))
+    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
 {
         TRACE( win, "GetCapture32:  Current message queue not found. Exiting!\n" );
         return 0;
@@ -411,7 +411,7 @@ HWND32 WINAPI GetCapture32(void)
  */
 INT16 WINAPI GetKeyState16(INT16 vkey)
 {
-    return GetKeyState32(vkey);
+    return GetKeyState(vkey);
 }
 
 /**********************************************************************
@@ -421,9 +421,9 @@ INT16 WINAPI GetKeyState16(INT16 vkey)
  * keyboard-input message.  This function retrieves the state of the key
  * at the time the input message was generated.  (SDK 3.1 Vol 2. p 390)
  */
-INT16 WINAPI GetKeyState32(INT32 vkey)
+INT16 WINAPI GetKeyState(INT vkey)
 {
-    INT32 retval;
+    INT retval;
 
     switch (vkey)
 	{
@@ -491,7 +491,7 @@ VOID WINAPI SetKeyboardState(LPBYTE lpKeyState)
  * mouse or key had been depressed since the last call to 
  * GetAsyncKeyState.
  */
-WORD WINAPI GetAsyncKeyState32(INT32 nKey)
+WORD WINAPI GetAsyncKeyState(INT nKey)
 {
     short retval;	
 
@@ -527,7 +527,7 @@ WORD WINAPI GetAsyncKeyState32(INT32 nKey)
  */
 WORD WINAPI GetAsyncKeyState16(INT16 nKey)
 {
-    return GetAsyncKeyState32(nKey);
+    return GetAsyncKeyState(nKey);
 }
 
 /**********************************************************************
@@ -535,10 +535,10 @@ WORD WINAPI GetAsyncKeyState16(INT16 nKey)
  *
  * FIXME: should send some WM_INITMENU or/and WM_INITMENUPOPUP  -messages
  */
-static BOOL32 KBD_translate_accelerator(HWND32 hWnd,LPMSG32 msg,
+static BOOL KBD_translate_accelerator(HWND hWnd,LPMSG msg,
                                         BYTE fVirt,WORD key,WORD cmd)
 {
-    BOOL32	sendmsg = FALSE;
+    BOOL	sendmsg = FALSE;
 
     if(msg->wParam == key) 
     {
@@ -551,12 +551,12 @@ static BOOL32 KBD_translate_accelerator(HWND32 hWnd,LPMSG32 msg,
    	}  
       } else {
        if(fVirt & FVIRTKEY) {
-	INT32 mask = 0;
+	INT mask = 0;
         TRACE(accel,"found accel for virt_key %04x (scan %04x)\n",
   	                       msg->wParam,0xff & HIWORD(msg->lParam));                
-	if(GetKeyState32(VK_SHIFT) & 0x8000) mask |= FSHIFT;
-	if(GetKeyState32(VK_CONTROL) & 0x8000) mask |= FCONTROL;
-	if(GetKeyState32(VK_MENU) & 0x8000) mask |= FALT;
+	if(GetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT;
+	if(GetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL;
+	if(GetKeyState(VK_MENU) & 0x8000) mask |= FALT;
 	if(mask == (fVirt & (FSHIFT | FCONTROL | FALT)))
           sendmsg=TRUE;			    
         else
@@ -583,19 +583,19 @@ static BOOL32 KBD_translate_accelerator(HWND32 hWnd,LPMSG32 msg,
         if (msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP)
           mesg=1;
         else 
-         if (GetCapture32())
+         if (GetCapture())
            mesg=2;
          else
-          if (!IsWindowEnabled32(hWnd))
+          if (!IsWindowEnabled(hWnd))
             mesg=3;
           else
           {
 	    WND* wndPtr = WIN_FindWndPtr(hWnd);
 
-            hMenu = (wndPtr->dwStyle & WS_CHILD) ? 0 : (HMENU32)wndPtr->wIDmenu;
-	    iSysStat = (wndPtr->hSysMenu) ? GetMenuState32(GetSubMenu16(wndPtr->hSysMenu, 0),
+            hMenu = (wndPtr->dwStyle & WS_CHILD) ? 0 : (HMENU)wndPtr->wIDmenu;
+	    iSysStat = (wndPtr->hSysMenu) ? GetMenuState(GetSubMenu16(wndPtr->hSysMenu, 0),
 					    cmd, MF_BYCOMMAND) : -1 ;
-	    iStat = (hMenu) ? GetMenuState32(hMenu,
+	    iStat = (hMenu) ? GetMenuState(hMenu,
 					    cmd, MF_BYCOMMAND) : -1 ;
 
             if (iSysStat!=-1)
@@ -609,7 +609,7 @@ static BOOL32 KBD_translate_accelerator(HWND32 hWnd,LPMSG32 msg,
             {
               if (iStat!=-1)
               {
-                if (IsIconic32(hWnd))
+                if (IsIconic(hWnd))
                   mesg=5;
                 else
                 {
@@ -628,7 +628,7 @@ static BOOL32 KBD_translate_accelerator(HWND32 hWnd,LPMSG32 msg,
               TRACE(accel,", sending %s, wParam=%0x\n",
                   mesg==WM_COMMAND ? "WM_COMMAND" : "WM_SYSCOMMAND",
                   cmd);
-	      SendMessage32A(hWnd, mesg, cmd, 0x00010000L);
+	      SendMessageA(hWnd, mesg, cmd, 0x00010000L);
 	  }
 	  else
 	  {
@@ -654,7 +654,7 @@ static BOOL32 KBD_translate_accelerator(HWND32 hWnd,LPMSG32 msg,
 /**********************************************************************
  *      TranslateAccelerator32      (USER32.551)(USER32.552)(USER32.553)
  */
-INT32 WINAPI TranslateAccelerator32(HWND32 hWnd, HACCEL32 hAccel, LPMSG32 msg)
+INT WINAPI TranslateAccelerator(HWND hWnd, HACCEL hAccel, LPMSG msg)
 {
     /* YES, Accel16! */
     LPACCEL16	lpAccelTbl = (LPACCEL16)LockResource16(hAccel);
@@ -695,7 +695,7 @@ INT16 WINAPI TranslateAccelerator16(HWND16 hWnd, HACCEL16 hAccel, LPMSG16 msg)
 {
     LPACCEL16	lpAccelTbl = (LPACCEL16)LockResource16(hAccel);
     int 	i;
-    MSG32	msg32;
+    MSG	msg32;
     
     if (hAccel == 0 || msg == NULL ||
 	(msg->message != WM_KEYDOWN &&
@@ -728,7 +728,7 @@ msg->hwnd=%04x, msg->message=%04x\n", hAccel,hWnd,msg->hwnd,msg->message);
 /**********************************************************************
  *           VkKeyScanA      (USER32.573)
  */
-WORD WINAPI VkKeyScan32A(CHAR cChar)
+WORD WINAPI VkKeyScanA(CHAR cChar)
 {
 	return VkKeyScan16(cChar);
 }
@@ -736,15 +736,15 @@ WORD WINAPI VkKeyScan32A(CHAR cChar)
 /******************************************************************************
  *    	VkKeyScanW      (USER32.576)
  */
-WORD WINAPI VkKeyScan32W(WCHAR cChar)
+WORD WINAPI VkKeyScanW(WCHAR cChar)
 {
-	return VkKeyScan32A((CHAR)cChar); /* FIXME: check unicode */
+	return VkKeyScanA((CHAR)cChar); /* FIXME: check unicode */
 }
 
 /******************************************************************************
  *    	GetKeyboardType32      (USER32.255)
  */
-INT32 WINAPI GetKeyboardType32(INT32 nTypeFlag)
+INT WINAPI GetKeyboardType(INT nTypeFlag)
 {
   return GetKeyboardType16(nTypeFlag);
 }
@@ -752,7 +752,7 @@ INT32 WINAPI GetKeyboardType32(INT32 nTypeFlag)
 /******************************************************************************
  *    	MapVirtualKey32A      (USER32.383)
  */
-UINT32 WINAPI MapVirtualKey32A(UINT32 code, UINT32 maptype)
+UINT WINAPI MapVirtualKeyA(UINT code, UINT maptype)
 {
     return MapVirtualKey16(code,maptype);
 }
@@ -760,7 +760,7 @@ UINT32 WINAPI MapVirtualKey32A(UINT32 code, UINT32 maptype)
 /******************************************************************************
  *    	MapVirtualKey32W      (USER32.385)
  */
-UINT32 WINAPI MapVirtualKey32W(UINT32 code, UINT32 maptype)
+UINT WINAPI MapVirtualKeyW(UINT code, UINT maptype)
 {
     return MapVirtualKey16(code,maptype);
 }
@@ -768,7 +768,7 @@ UINT32 WINAPI MapVirtualKey32W(UINT32 code, UINT32 maptype)
 /******************************************************************************
  *    	MapVirtualKeyEx32A      (USER32.384)
  */
-UINT32 WINAPI MapVirtualKeyEx32A(UINT32 code, UINT32 maptype, HKL32 hkl)
+UINT WINAPI MapVirtualKeyEx32A(UINT code, UINT maptype, HKL hkl)
 {
     if (hkl)
     	FIXME(keyboard,"(%d,%d,0x%08lx), hkl unhandled!\n",code,maptype,(DWORD)hkl);
@@ -778,7 +778,7 @@ UINT32 WINAPI MapVirtualKeyEx32A(UINT32 code, UINT32 maptype, HKL32 hkl)
 /****************************************************************************
  *	GetKBCodePage32   (USER32.246)
  */
-UINT32 WINAPI GetKBCodePage32(void)
+UINT WINAPI GetKBCodePage(void)
 {
     return GetKBCodePage16();
 }
@@ -788,13 +788,13 @@ UINT32 WINAPI GetKBCodePage32(void)
  */
 INT16 WINAPI GetKeyboardLayoutName16(LPSTR pwszKLID)
 {
-	return GetKeyboardLayoutName32A(pwszKLID);
+	return GetKeyboardLayoutNameA(pwszKLID);
 }
 
 /****************************************************************************
  *	GetKeyboardLayoutName32A   (USER32.252)
  */
-INT32 WINAPI GetKeyboardLayoutName32A(LPSTR pwszKLID)
+INT WINAPI GetKeyboardLayoutNameA(LPSTR pwszKLID)
 {
         FIXME(keyboard,"always returns primary U.S. English layout\n");
         strcpy(pwszKLID,"00000409");
@@ -804,10 +804,10 @@ INT32 WINAPI GetKeyboardLayoutName32A(LPSTR pwszKLID)
 /****************************************************************************
  *	GetKeyboardLayoutName32W   (USER32.253)
  */
-INT32 WINAPI GetKeyboardLayoutName32W(LPWSTR pwszKLID)
+INT WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID)
 {
 	LPSTR buf = HEAP_xalloc( GetProcessHeap(), 0, strlen("00000409")+1);
-	int res = GetKeyboardLayoutName32A(buf);
+	int res = GetKeyboardLayoutNameA(buf);
 	lstrcpyAtoW(pwszKLID,buf);
 	HeapFree( GetProcessHeap(), 0, buf );
 	return res;
@@ -816,7 +816,7 @@ INT32 WINAPI GetKeyboardLayoutName32W(LPWSTR pwszKLID)
 /****************************************************************************
  *	GetKeyNameText32A   (USER32.247)
  */
-INT32 WINAPI GetKeyNameText32A(LONG lParam, LPSTR lpBuffer, INT32 nSize)
+INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize)
 {
 	return GetKeyNameText16(lParam,lpBuffer,nSize);
 }
@@ -824,10 +824,10 @@ INT32 WINAPI GetKeyNameText32A(LONG lParam, LPSTR lpBuffer, INT32 nSize)
 /****************************************************************************
  *	GetKeyNameText32W   (USER32.248)
  */
-INT32 WINAPI GetKeyNameText32W(LONG lParam, LPWSTR lpBuffer, INT32 nSize)
+INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize)
 {
 	LPSTR buf = HEAP_xalloc( GetProcessHeap(), 0, nSize );
-	int res = GetKeyNameText32A(lParam,buf,nSize);
+	int res = GetKeyNameTextA(lParam,buf,nSize);
 
 	lstrcpynAtoW(lpBuffer,buf,nSize);
 	HeapFree( GetProcessHeap(), 0, buf );
@@ -837,8 +837,8 @@ INT32 WINAPI GetKeyNameText32W(LONG lParam, LPWSTR lpBuffer, INT32 nSize)
 /****************************************************************************
  *	ToAscii32      (USER32.546)
  */
-INT32 WINAPI ToAscii32( UINT32 virtKey,UINT32 scanCode,LPBYTE lpKeyState,
-                        LPWORD lpChar,UINT32 flags )
+INT WINAPI ToAscii( UINT virtKey,UINT scanCode,LPBYTE lpKeyState,
+                        LPWORD lpChar,UINT flags )
 {
     return ToAscii16(virtKey,scanCode,lpKeyState,lpChar,flags);
 }
@@ -846,9 +846,9 @@ INT32 WINAPI ToAscii32( UINT32 virtKey,UINT32 scanCode,LPBYTE lpKeyState,
 /***********************************************************************
  *           GetKeyboardLayout			(USER32.250)
  */
-HKL32 WINAPI GetKeyboardLayout(DWORD dwLayout)
+HKL WINAPI GetKeyboardLayout(DWORD dwLayout)
 {
-        HKL32 layout;
+        HKL layout;
 	FIXME(keyboard,"(%ld): stub\n",dwLayout);
         layout = (0xcafe<<16)|GetSystemDefaultLCID(); /* FIXME */
         TRACE(keyboard,"returning %x\n",layout);
@@ -858,7 +858,7 @@ HKL32 WINAPI GetKeyboardLayout(DWORD dwLayout)
 /**********************************************************************
  *           ActivateKeyboardLayout32      (USER32.1)
  */
-HKL32 WINAPI ActivateKeyboardLayout32(HKL32 hLayout, UINT32 flags)
+HKL WINAPI ActivateKeyboardLayout(HKL hLayout, UINT flags)
 {
     FIXME(keyboard, "(%d, %d): stub\n", hLayout, flags);
 
@@ -870,7 +870,7 @@ HKL32 WINAPI ActivateKeyboardLayout32(HKL32 hLayout, UINT32 flags)
  *           GetKeyboardLayoutList		(USER32.251)
  * FIXME
  */
-INT32 WINAPI GetKeyboardLayoutList(INT32 nBuff,HKL32 *layouts)
+INT WINAPI GetKeyboardLayoutList(INT nBuff,HKL *layouts)
 {
 	FIXME(keyboard,"(%d,%p): stub\n",nBuff,layouts);
 	if (layouts)
@@ -882,7 +882,7 @@ INT32 WINAPI GetKeyboardLayoutList(INT32 nBuff,HKL32 *layouts)
 /***********************************************************************
  *           RegisterHotKey			(USER32.433)
  */
-BOOL32 WINAPI RegisterHotKey(HWND32 hwnd,INT32 id,UINT32 modifiers,UINT32 vk) {
+BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) {
 	FIXME(keyboard,"(0x%08x,%d,0x%08x,%d): stub\n",hwnd,id,modifiers,vk);
 	return TRUE;
 }
@@ -890,7 +890,7 @@ BOOL32 WINAPI RegisterHotKey(HWND32 hwnd,INT32 id,UINT32 modifiers,UINT32 vk) {
 /***********************************************************************
  *           UnregisterHotKey			(USER32.565)
  */
-BOOL32 WINAPI UnregisterHotKey(HWND32 hwnd,INT32 id) {
+BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) {
 	FIXME(keyboard,"(0x%08x,%d): stub\n",hwnd,id);
 	return TRUE;
 }
@@ -899,13 +899,13 @@ BOOL32 WINAPI UnregisterHotKey(HWND32 hwnd,INT32 id) {
 /***********************************************************************
  *           ToUnicode32                       (USER32.548)
  */
-INT32 WINAPI ToUnicode32(
-  UINT32 wVirtKey,
-  UINT32 wScanCode,
+INT WINAPI ToUnicode(
+  UINT wVirtKey,
+  UINT wScanCode,
   PBYTE  lpKeyState,
   LPWSTR pwszBuff,
   int    cchBuff,
-  UINT32 wFlags) {
+  UINT wFlags) {
 
        FIXME(keyboard,": stub\n");
        return 0;
@@ -914,7 +914,7 @@ INT32 WINAPI ToUnicode32(
 /***********************************************************************
  *           LoadKeyboardLayout32A                (USER32.367)
  */
-HKL32 WINAPI LoadKeyboardLayout32A(LPCSTR pwszKLID, UINT32 Flags)
+HKL WINAPI LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags)
 {
   FIXME(keyboard, "%s, %d): stub\n", pwszKLID, Flags);
   return 0; 
@@ -923,7 +923,7 @@ HKL32 WINAPI LoadKeyboardLayout32A(LPCSTR pwszKLID, UINT32 Flags)
 /***********************************************************************
  *           LoadKeyboardLayout32W                (USER32.368)
  */
-HKL32 WINAPI LoadKeyboardLayout32W(LPCWSTR pwszKLID, UINT32 Flags)
+HKL WINAPI LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags)
 {
   FIXME(keyboard, "%p, %d): stub\n", pwszKLID, Flags);
   return 0;
diff --git a/windows/keyboard.c b/windows/keyboard.c
index 7b500edb25a..9df57fa1e19 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -67,7 +67,7 @@ WORD WINAPI KEYBOARD_Inquire(LPKBINFO kbInfo)
 VOID WINAPI KEYBOARD_Enable( LPKEYBD_EVENT_PROC lpKeybEventProc, 
                              LPBYTE lpKeyState )
 {
-  static BOOL32 initDone = FALSE;
+  static BOOL initDone = FALSE;
   
   DefKeybEventProc = lpKeybEventProc;
   pKeyStateTable = lpKeyState;
@@ -111,7 +111,7 @@ void KEYBOARD_SendEvent( BYTE bVk, BYTE bScan, DWORD dwFlags,
 /**********************************************************************
  *           ScreenSwitchEnable      (KEYBOARD.100)
  */
-VOID WINAPI ScreenSwitchEnable(WORD unused)
+VOID WINAPI ScreenSwitchEnable16(WORD unused)
 {
   FIXME(keyboard,"(%04x): stub\n",unused);
 }
diff --git a/windows/mdi.c b/windows/mdi.c
index 5204be05658..10c9ff33ef0 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -33,33 +33,33 @@
 static HBITMAP16 hBmpClose   = 0;
 static HBITMAP16 hBmpRestore = 0;
 
-INT32 SCROLL_SetNCSbState(WND*,int,int,int,int,int,int);
+INT SCROLL_SetNCSbState(WND*,int,int,int,int,int,int);
 
 /* ----------------- declarations ----------------- */
-static void MDI_UpdateFrameText(WND *, HWND32, BOOL32, LPCSTR);
-static BOOL32 MDI_AugmentFrameMenu(MDICLIENTINFO*, WND *, HWND32);
-static BOOL32 MDI_RestoreFrameMenu(WND *, HWND32);
+static void MDI_UpdateFrameText(WND *, HWND, BOOL, LPCSTR);
+static BOOL MDI_AugmentFrameMenu(MDICLIENTINFO*, WND *, HWND);
+static BOOL MDI_RestoreFrameMenu(WND *, HWND);
 
-static LONG MDI_ChildActivate( WND*, HWND32 );
+static LONG MDI_ChildActivate( WND*, HWND );
 
 /* -------- Miscellaneous service functions ----------
  *
  *			MDI_GetChildByID
  */
 
-static HWND32 MDI_GetChildByID(WND* wndPtr, INT32 id)
+static HWND MDI_GetChildByID(WND* wndPtr, INT id)
 {
     for (wndPtr = wndPtr->child; wndPtr; wndPtr = wndPtr->next)
         if (wndPtr->wIDmenu == id) return wndPtr->hwndSelf;
     return 0;
 }
 
-static void MDI_PostUpdate(HWND32 hwnd, MDICLIENTINFO* ci, WORD recalc)
+static void MDI_PostUpdate(HWND hwnd, MDICLIENTINFO* ci, WORD recalc)
 {
     if( !(ci->mdiFlags & MDIF_NEEDUPDATE) )
     {
 	ci->mdiFlags |= MDIF_NEEDUPDATE;
-	PostMessage32A( hwnd, WM_MDICALCCHILDSCROLL, 0, 0);
+	PostMessageA( hwnd, WM_MDICALCCHILDSCROLL, 0, 0);
     }
     ci->sbRecalc = recalc;
 }
@@ -67,41 +67,41 @@ static void MDI_PostUpdate(HWND32 hwnd, MDICLIENTINFO* ci, WORD recalc)
 /**********************************************************************
  *			MDI_MenuModifyItem
  */
-static BOOL32 MDI_MenuModifyItem(WND* clientWnd, HWND32 hWndChild )
+static BOOL MDI_MenuModifyItem(WND* clientWnd, HWND hWndChild )
 {
     char            buffer[128];
     MDICLIENTINFO  *clientInfo = (MDICLIENTINFO*)clientWnd->wExtra;
     WND            *wndPtr     = WIN_FindWndPtr(hWndChild);
-    UINT32	    n          = sprintf(buffer, "%d ",
+    UINT	    n          = sprintf(buffer, "%d ",
 				 wndPtr->wIDmenu - clientInfo->idFirstChild + 1);
-    BOOL32	    bRet	    = 0;
+    BOOL	    bRet	    = 0;
 
     if( !clientInfo->hWindowMenu ) return 0;
 
-    if (wndPtr->text) lstrcpyn32A(buffer + n, wndPtr->text, sizeof(buffer) - n );
+    if (wndPtr->text) lstrcpynA(buffer + n, wndPtr->text, sizeof(buffer) - n );
 
-    n    = GetMenuState32(clientInfo->hWindowMenu,wndPtr->wIDmenu ,MF_BYCOMMAND); 
-    bRet = ModifyMenu32A(clientInfo->hWindowMenu , wndPtr->wIDmenu, 
+    n    = GetMenuState(clientInfo->hWindowMenu,wndPtr->wIDmenu ,MF_BYCOMMAND); 
+    bRet = ModifyMenuA(clientInfo->hWindowMenu , wndPtr->wIDmenu, 
                       MF_BYCOMMAND | MF_STRING, wndPtr->wIDmenu, buffer );
-    CheckMenuItem32(clientInfo->hWindowMenu ,wndPtr->wIDmenu , n & MF_CHECKED);
+    CheckMenuItem(clientInfo->hWindowMenu ,wndPtr->wIDmenu , n & MF_CHECKED);
     return bRet;
 }
 
 /**********************************************************************
  *			MDI_MenuDeleteItem
  */
-static BOOL32 MDI_MenuDeleteItem(WND* clientWnd, HWND32 hWndChild )
+static BOOL MDI_MenuDeleteItem(WND* clientWnd, HWND hWndChild )
 {
     char    	 buffer[128];
     MDICLIENTINFO *clientInfo = (MDICLIENTINFO*)clientWnd->wExtra;
     WND    	*wndPtr     = WIN_FindWndPtr(hWndChild);
-    UINT32	 index      = 0,id,n;
+    UINT	 index      = 0,id,n;
 
     if( !clientInfo->nActiveChildren ||
 	!clientInfo->hWindowMenu ) return 0;
 
     id = wndPtr->wIDmenu;
-    DeleteMenu32(clientInfo->hWindowMenu,id,MF_BYCOMMAND);
+    DeleteMenu(clientInfo->hWindowMenu,id,MF_BYCOMMAND);
 
  /* walk the rest of MDI children to prevent gaps in the id 
   * sequence and in the menu child list */
@@ -121,10 +121,10 @@ static BOOL32 MDI_MenuDeleteItem(WND* clientWnd, HWND32 hWndChild )
 
 	n = sprintf(buffer, "%d ",index - clientInfo->idFirstChild);
 	if (wndPtr->text)
-            lstrcpyn32A(buffer + n, wndPtr->text, sizeof(buffer) - n );	
+            lstrcpynA(buffer + n, wndPtr->text, sizeof(buffer) - n );	
 
 	/* change menu */
-	ModifyMenu32A(clientInfo->hWindowMenu ,index ,MF_BYCOMMAND | MF_STRING,
+	ModifyMenuA(clientInfo->hWindowMenu ,index ,MF_BYCOMMAND | MF_STRING,
                       index - 1 , buffer ); 
     }
     return 1;
@@ -135,7 +135,7 @@ static BOOL32 MDI_MenuDeleteItem(WND* clientWnd, HWND32 hWndChild )
  *
  * returns "activateable" child different from the current or zero
  */
-static HWND32 MDI_GetWindow(WND *clientWnd, HWND32 hWnd, BOOL32 bNext,
+static HWND MDI_GetWindow(WND *clientWnd, HWND hWnd, BOOL bNext,
                             DWORD dwStyleMask )
 {
     MDICLIENTINFO *clientInfo = (MDICLIENTINFO*)clientWnd->wExtra;
@@ -166,13 +166,13 @@ static HWND32 MDI_GetWindow(WND *clientWnd, HWND32 hWnd, BOOL32 bNext,
  *
  *  It seems that the default height is about 2/3 of the client rect
  */
-static void MDI_CalcDefaultChildPos( WND* w, WORD n, LPPOINT32 lpPos,
-                                     INT32 delta)
+static void MDI_CalcDefaultChildPos( WND* w, WORD n, LPPOINT lpPos,
+                                     INT delta)
 {
-    INT32  nstagger;
-    RECT32 rect = w->rectClient;
-    INT32  spacing = GetSystemMetrics32(SM_CYCAPTION) +
-		     GetSystemMetrics32(SM_CYFRAME) - 1; 
+    INT  nstagger;
+    RECT rect = w->rectClient;
+    INT  spacing = GetSystemMetrics(SM_CYCAPTION) +
+		     GetSystemMetrics(SM_CYFRAME) - 1; 
 
     if( rect.bottom - rect.top - delta >= spacing ) 
 	rect.bottom -= delta;
@@ -186,13 +186,13 @@ static void MDI_CalcDefaultChildPos( WND* w, WORD n, LPPOINT32 lpPos,
 /**********************************************************************
  *            MDISetMenu
  */
-static LRESULT MDISetMenu( HWND32 hwnd, HMENU32 hmenuFrame,
-                           HMENU32 hmenuWindow)
+static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame,
+                           HMENU hmenuWindow)
 {
     WND *w = WIN_FindWndPtr(hwnd);
     MDICLIENTINFO *ci;
-    HWND32 hwndFrame = GetParent32(hwnd);
-    HMENU32 oldFrameMenu = GetMenu32(hwndFrame);
+    HWND hwndFrame = GetParent(hwnd);
+    HMENU oldFrameMenu = GetMenu(hwndFrame);
 
     TRACE(mdi, "%04x %04x %04x\n",
                 hwnd, hmenuFrame, hmenuWindow);
@@ -207,40 +207,40 @@ static LRESULT MDISetMenu( HWND32 hwnd, HMENU32 hmenuFrame,
         /* delete menu items from ci->hWindowMenu 
          * and add them to hmenuWindow */
 
-        INT32 i = GetMenuItemCount32(ci->hWindowMenu) - 1;
-        INT32 pos = GetMenuItemCount32(hmenuWindow) + 1;
+        INT i = GetMenuItemCount(ci->hWindowMenu) - 1;
+        INT pos = GetMenuItemCount(hmenuWindow) + 1;
 
-        AppendMenu32A( hmenuWindow, MF_SEPARATOR, 0, NULL);
+        AppendMenuA( hmenuWindow, MF_SEPARATOR, 0, NULL);
 
         if( ci->nActiveChildren )
         {
-            INT32 j = i - ci->nActiveChildren + 1;
+            INT j = i - ci->nActiveChildren + 1;
             char buffer[100];
-            UINT32 id,state;
+            UINT id,state;
 
             for( ; i >= j ; i-- )
             {
-                id = GetMenuItemID32(ci->hWindowMenu,i );
-                state = GetMenuState32(ci->hWindowMenu,i,MF_BYPOSITION); 
+                id = GetMenuItemID(ci->hWindowMenu,i );
+                state = GetMenuState(ci->hWindowMenu,i,MF_BYPOSITION); 
 
-                GetMenuString32A(ci->hWindowMenu, i, buffer, 100, MF_BYPOSITION);
+                GetMenuStringA(ci->hWindowMenu, i, buffer, 100, MF_BYPOSITION);
 
-                DeleteMenu32(ci->hWindowMenu, i , MF_BYPOSITION);
-                InsertMenu32A(hmenuWindow, pos, MF_BYPOSITION | MF_STRING,
+                DeleteMenu(ci->hWindowMenu, i , MF_BYPOSITION);
+                InsertMenuA(hmenuWindow, pos, MF_BYPOSITION | MF_STRING,
                               id, buffer);
-                CheckMenuItem32(hmenuWindow ,pos , MF_BYPOSITION | (state & MF_CHECKED));
+                CheckMenuItem(hmenuWindow ,pos , MF_BYPOSITION | (state & MF_CHECKED));
             }
         }
 
         /* remove separator */
-        DeleteMenu32(ci->hWindowMenu, i, MF_BYPOSITION); 
+        DeleteMenu(ci->hWindowMenu, i, MF_BYPOSITION); 
 
         ci->hWindowMenu = hmenuWindow;
     } 
 
     if( hmenuFrame && hmenuFrame!=oldFrameMenu)
     {
-        SetMenu32(hwndFrame, hmenuFrame);
+        SetMenu(hwndFrame, hmenuFrame);
         if( ci->hwndChildMaximized )
             MDI_AugmentFrameMenu(ci, w->parent, ci->hwndChildMaximized );
         return oldFrameMenu;
@@ -251,11 +251,11 @@ static LRESULT MDISetMenu( HWND32 hwnd, HMENU32 hmenuFrame,
 /**********************************************************************
  *            MDIRefreshMenu
  */
-static LRESULT MDIRefreshMenu( HWND32 hwnd, HMENU32 hmenuFrame,
-                           HMENU32 hmenuWindow)
+static LRESULT MDIRefreshMenu( HWND hwnd, HMENU hmenuFrame,
+                           HMENU hmenuWindow)
 {
-    HWND32 hwndFrame = GetParent32(hwnd);
-    HMENU32 oldFrameMenu = GetMenu32(hwndFrame);
+    HWND hwndFrame = GetParent(hwnd);
+    HMENU oldFrameMenu = GetMenu(hwndFrame);
 
     TRACE(mdi, "%04x %04x %04x\n",
                 hwnd, hmenuFrame, hmenuWindow);
@@ -272,12 +272,12 @@ static LRESULT MDIRefreshMenu( HWND32 hwnd, HMENU32 hmenuFrame,
 /**********************************************************************
  *					MDICreateChild
  */
-static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent, 
-                              LPMDICREATESTRUCT32A cs )
+static HWND MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND parent, 
+                              LPMDICREATESTRUCTA cs )
 {
-    POINT32          pos[2]; 
+    POINT          pos[2]; 
     DWORD	     style = cs->style | (WS_CHILD | WS_CLIPSIBLINGS);
-    HWND32 	     hwnd, hwndMax = 0;
+    HWND 	     hwnd, hwndMax = 0;
     WORD	     wIDmenu = ci->idFirstChild + ci->nActiveChildren;
     char	     lpstrDef[]="junk!";
 
@@ -286,10 +286,10 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
     /* calculate placement */
     MDI_CalcDefaultChildPos(w, ci->nTotalCreated++, pos, 0);
 
-    if (cs->cx == CW_USEDEFAULT32 || !cs->cx) cs->cx = pos[1].x;
-    if (cs->cy == CW_USEDEFAULT32 || !cs->cy) cs->cy = pos[1].y;
+    if (cs->cx == CW_USEDEFAULT || !cs->cx) cs->cx = pos[1].x;
+    if (cs->cy == CW_USEDEFAULT || !cs->cy) cs->cy = pos[1].y;
 
-    if( cs->x == CW_USEDEFAULT32 )
+    if( cs->x == CW_USEDEFAULT )
     {
  	cs->x = pos[0].x;
 	cs->y = pos[0].y;
@@ -299,15 +299,15 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
     if( style & WS_VISIBLE && ci->hwndChildMaximized )
     {
 	if( style & WS_MAXIMIZE )
-	    SendMessage32A(w->hwndSelf, WM_SETREDRAW, FALSE, 0L );
+	    SendMessageA(w->hwndSelf, WM_SETREDRAW, FALSE, 0L );
 	hwndMax = ci->hwndChildMaximized;
-	ShowWindow32( hwndMax, SW_SHOWNOACTIVATE );
+	ShowWindow( hwndMax, SW_SHOWNOACTIVATE );
 	if( style & WS_MAXIMIZE )
-	    SendMessage32A(w->hwndSelf, WM_SETREDRAW, TRUE, 0L );
+	    SendMessageA(w->hwndSelf, WM_SETREDRAW, TRUE, 0L );
     }
 
     /* this menu is needed to set a check mark in MDI_ChildActivate */
-    AppendMenu32A(ci->hWindowMenu ,MF_STRING ,wIDmenu, lpstrDef );
+    AppendMenuA(ci->hWindowMenu ,MF_STRING ,wIDmenu, lpstrDef );
 
     ci->nActiveChildren++;
 
@@ -321,7 +321,7 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
 
     if( w->flags & WIN_ISWIN32 )
     {
-	hwnd = CreateWindow32A( cs->szClass, cs->szTitle, style, 
+	hwnd = CreateWindowA( cs->szClass, cs->szTitle, style, 
                                 cs->x, cs->y, cs->cx, cs->cy, parent, 
                                 (HMENU16)wIDmenu, cs->hOwner, cs );
     }
@@ -339,7 +339,7 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
 
 	hwnd = CreateWindow16( cs->szClass, cs->szTitle, style, 
 			       cs16->x, cs16->y, cs16->cx, cs16->cy, parent, 
-			       (HMENU32)wIDmenu, cs16->hOwner,
+			       (HMENU)wIDmenu, cs16->hOwner,
                                (LPVOID)SEGPTR_GET(cs16) );
         SEGPTR_FREE( title );
         SEGPTR_FREE( cls );
@@ -354,7 +354,7 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
 
 	MDI_MenuModifyItem(w ,hwnd); 
 	if( wnd->dwStyle & WS_MINIMIZE && ci->hwndActiveChild )
-	    ShowWindow32( hwnd, SW_SHOWMINNOACTIVE );
+	    ShowWindow( hwnd, SW_SHOWMINNOACTIVE );
 	else
 	{
             /* WS_VISIBLE is clear if a) the MDI client has
@@ -368,7 +368,7 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
              */
             wnd->dwStyle &= ~WS_VISIBLE;
             if(showflag){
-                SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE );
+                SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE );
 
                 /* Set maximized state here in case hwnd didn't receive WM_SIZE
                  * during CreateWindow - bad!
@@ -382,7 +382,7 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
                 }
             }else
                 /* needed, harmless ? */
-                SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE );
+                SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE );
 
 	}
         TRACE(mdi, "created child - %04x\n",hwnd);
@@ -390,9 +390,9 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
     else
     {
 	ci->nActiveChildren--;
-	DeleteMenu32(ci->hWindowMenu,wIDmenu,MF_BYCOMMAND);
-	if( IsWindow32(hwndMax) )
-	    ShowWindow32(hwndMax, SW_SHOWMAXIMIZED);
+	DeleteMenu(ci->hWindowMenu,wIDmenu,MF_BYCOMMAND);
+	if( IsWindow(hwndMax) )
+	    ShowWindow(hwndMax, SW_SHOWMAXIMIZED);
     }
 	
     return hwnd;
@@ -404,15 +404,15 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
  * Note: The rule here is that client rect of the maximized MDI child 
  *	 is equal to the client rect of the MDI client window.
  */
-static void MDI_ChildGetMinMaxInfo( WND* clientWnd, HWND32 hwnd,
+static void MDI_ChildGetMinMaxInfo( WND* clientWnd, HWND hwnd,
                                     MINMAXINFO16* lpMinMax )
 {
     WND*	childWnd = WIN_FindWndPtr(hwnd);
-    RECT32	rect 	 = clientWnd->rectClient;
+    RECT	rect 	 = clientWnd->rectClient;
 
-    MapWindowPoints32( clientWnd->parent->hwndSelf, 
-		     ((MDICLIENTINFO*)clientWnd->wExtra)->self, (LPPOINT32)&rect, 2);
-    AdjustWindowRectEx32( &rect, childWnd->dwStyle, 0, childWnd->dwExStyle );
+    MapWindowPoints( clientWnd->parent->hwndSelf, 
+		     ((MDICLIENTINFO*)clientWnd->wExtra)->self, (LPPOINT)&rect, 2);
+    AdjustWindowRectEx( &rect, childWnd->dwStyle, 0, childWnd->dwExStyle );
 
     lpMinMax->ptMaxSize.x = rect.right -= rect.left;
     lpMinMax->ptMaxSize.y = rect.bottom -= rect.top;
@@ -430,12 +430,12 @@ static void MDI_ChildGetMinMaxInfo( WND* clientWnd, HWND32 hwnd,
  * Note: SetWindowPos sends WM_CHILDACTIVATE to the child window that is
  *       being activated 
  */
-static void MDI_SwitchActiveChild( HWND32 clientHwnd, HWND32 childHwnd,
-                                   BOOL32 bNextWindow )
+static void MDI_SwitchActiveChild( HWND clientHwnd, HWND childHwnd,
+                                   BOOL bNextWindow )
 {
     WND		  *w	     = WIN_FindWndPtr(clientHwnd);
-    HWND32	   hwndTo    = 0;
-    HWND32	   hwndPrev  = 0;
+    HWND	   hwndTo    = 0;
+    HWND	   hwndPrev  = 0;
     MDICLIENTINFO *ci;
 
     hwndTo = MDI_GetWindow(w, childHwnd, bNextWindow, 0);
@@ -450,7 +450,7 @@ static void MDI_SwitchActiveChild( HWND32 clientHwnd, HWND32 childHwnd,
 
     if ( hwndTo != hwndPrev )
     {
-	BOOL32 bOptimize = 0;
+	BOOL bOptimize = 0;
 
 	if( ci->hwndChildMaximized )
 	{
@@ -458,14 +458,14 @@ static void MDI_SwitchActiveChild( HWND32 clientHwnd, HWND32 childHwnd,
 	    w->dwStyle &= ~WS_VISIBLE;
 	}
 
-	SetWindowPos32( hwndTo, HWND_TOP, 0, 0, 0, 0, 
+	SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, 
 			SWP_NOMOVE | SWP_NOSIZE );
 
 	if( bNextWindow && hwndPrev )
-	    SetWindowPos32( hwndPrev, HWND_BOTTOM, 0, 0, 0, 0, 
+	    SetWindowPos( hwndPrev, HWND_BOTTOM, 0, 0, 0, 0, 
 		  	    SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE );
 	if( bOptimize )
-	    ShowWindow32( clientHwnd, SW_SHOW );
+	    ShowWindow( clientHwnd, SW_SHOW );
     }
 }
 
@@ -474,8 +474,8 @@ static void MDI_SwitchActiveChild( HWND32 clientHwnd, HWND32 childHwnd,
  *                                      MDIDestroyChild
  */
 static LRESULT MDIDestroyChild( WND *w_parent, MDICLIENTINFO *ci,
-                                HWND32 parent, HWND32 child,
-                                BOOL32 flagDestroy )
+                                HWND parent, HWND child,
+                                BOOL flagDestroy )
 {
     WND         *childPtr = WIN_FindWndPtr(child);
 
@@ -487,7 +487,7 @@ static LRESULT MDIDestroyChild( WND *w_parent, MDICLIENTINFO *ci,
 
 	    if( child == ci->hwndActiveChild )
 	    {
-		ShowWindow32( child, SW_HIDE);
+		ShowWindow( child, SW_HIDE);
 		if( child == ci->hwndChildMaximized )
 		{
 		    MDI_RestoreFrameMenu(w_parent->parent, child);
@@ -506,8 +506,8 @@ static LRESULT MDIDestroyChild( WND *w_parent, MDICLIENTINFO *ci,
 
         if (flagDestroy)
 	{
-	    MDI_PostUpdate(GetParent32(child), ci, SB_BOTH+1);
-            DestroyWindow32(child);
+	    MDI_PostUpdate(GetParent(child), ci, SB_BOTH+1);
+            DestroyWindow(child);
 	}
     }
 
@@ -520,13 +520,13 @@ static LRESULT MDIDestroyChild( WND *w_parent, MDICLIENTINFO *ci,
  *
  * Note: hWndChild is NULL when last child is being destroyed
  */
-static LONG MDI_ChildActivate( WND *clientPtr, HWND32 hWndChild )
+static LONG MDI_ChildActivate( WND *clientPtr, HWND hWndChild )
 {
     MDICLIENTINFO       *clientInfo = (MDICLIENTINFO*)clientPtr->wExtra; 
-    HWND32               prevActiveWnd = clientInfo->hwndActiveChild;
+    HWND               prevActiveWnd = clientInfo->hwndActiveChild;
     WND                 *wndPtr = WIN_FindWndPtr( hWndChild );
     WND			*wndPrev = WIN_FindWndPtr( prevActiveWnd );
-    BOOL32		 isActiveFrameWnd = 0;	 
+    BOOL		 isActiveFrameWnd = 0;	 
 
     if( hWndChild == prevActiveWnd ) return 0L;
 
@@ -535,19 +535,19 @@ static LONG MDI_ChildActivate( WND *clientPtr, HWND32 hWndChild )
 
     TRACE(mdi,"%04x\n", hWndChild);
 
-    if( GetActiveWindow32() == clientPtr->parent->hwndSelf )
+    if( GetActiveWindow() == clientPtr->parent->hwndSelf )
         isActiveFrameWnd = TRUE;
 	
     /* deactivate prev. active child */
     if( wndPrev )
     {
 	wndPrev->dwStyle |= WS_SYSMENU;
-	SendMessage32A( prevActiveWnd, WM_NCACTIVATE, FALSE, 0L );
-        SendMessage32A( prevActiveWnd, WM_MDIACTIVATE, (WPARAM32)prevActiveWnd,
+	SendMessageA( prevActiveWnd, WM_NCACTIVATE, FALSE, 0L );
+        SendMessageA( prevActiveWnd, WM_MDIACTIVATE, (WPARAM)prevActiveWnd,
                         (LPARAM)hWndChild);
         /* uncheck menu item */
        	if( clientInfo->hWindowMenu )
-       	        CheckMenuItem32( clientInfo->hWindowMenu,
+       	        CheckMenuItem( clientInfo->hWindowMenu,
                                  wndPrev->wIDmenu, 0);
     }
 
@@ -557,9 +557,9 @@ static LONG MDI_ChildActivate( WND *clientPtr, HWND32 hWndChild )
       if( clientInfo->hwndChildMaximized != hWndChild ) {
         if( hWndChild ) {
 		  clientInfo->hwndActiveChild = hWndChild;
-		  ShowWindow32( hWndChild, SW_SHOWMAXIMIZED);
+		  ShowWindow( hWndChild, SW_SHOWMAXIMIZED);
 	} else
-		ShowWindow32( clientInfo->hwndActiveChild, SW_SHOWNORMAL );
+		ShowWindow( clientInfo->hwndActiveChild, SW_SHOWNORMAL );
       }
     }
 
@@ -569,28 +569,28 @@ static LONG MDI_ChildActivate( WND *clientPtr, HWND32 hWndChild )
     if( !hWndChild )
     {
 	if( isActiveFrameWnd )
-	    SetFocus32( clientInfo->self );
+	    SetFocus( clientInfo->self );
 	return 0;
     }
 	
     /* check menu item */
     if( clientInfo->hWindowMenu )
-              CheckMenuItem32( clientInfo->hWindowMenu,
+              CheckMenuItem( clientInfo->hWindowMenu,
                                wndPtr->wIDmenu, MF_CHECKED);
 
     /* bring active child to the top */
-    SetWindowPos32( hWndChild, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
+    SetWindowPos( hWndChild, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
 
     if( isActiveFrameWnd )
     {
-	    SendMessage32A( hWndChild, WM_NCACTIVATE, TRUE, 0L);
-	    if( GetFocus32() == clientInfo->self )
-		SendMessage32A( clientInfo->self, WM_SETFOCUS, 
-                                (WPARAM32)clientInfo->self, 0L );
+	    SendMessageA( hWndChild, WM_NCACTIVATE, TRUE, 0L);
+	    if( GetFocus() == clientInfo->self )
+		SendMessageA( clientInfo->self, WM_SETFOCUS, 
+                                (WPARAM)clientInfo->self, 0L );
 	    else
-		SetFocus32( clientInfo->self );
+		SetFocus( clientInfo->self );
     }
-    SendMessage32A( hWndChild, WM_MDIACTIVATE, (WPARAM32)prevActiveWnd,
+    SendMessageA( hWndChild, WM_MDIACTIVATE, (WPARAM)prevActiveWnd,
                     (LPARAM)hWndChild );
     return 1;
 }
@@ -602,31 +602,31 @@ static LONG MDI_ChildActivate( WND *clientPtr, HWND32 hWndChild )
  */
 static HBITMAP16 CreateMDIMenuBitmap(void)
 {
- HDC32 		hDCSrc  = CreateCompatibleDC32(0);
- HDC32		hDCDest	= CreateCompatibleDC32(hDCSrc);
+ HDC 		hDCSrc  = CreateCompatibleDC(0);
+ HDC		hDCDest	= CreateCompatibleDC(hDCSrc);
  HBITMAP16	hbClose = LoadBitmap16(0, MAKEINTRESOURCE16(OBM_CLOSE) );
  HBITMAP16	hbCopy;
  HANDLE16	hobjSrc, hobjDest;
 
- hobjSrc = SelectObject32(hDCSrc, hbClose);
- hbCopy = CreateCompatibleBitmap32(hDCSrc,SYSMETRICS_CXSIZE,SYSMETRICS_CYSIZE);
- hobjDest = SelectObject32(hDCDest, hbCopy);
+ hobjSrc = SelectObject(hDCSrc, hbClose);
+ hbCopy = CreateCompatibleBitmap(hDCSrc,SYSMETRICS_CXSIZE,SYSMETRICS_CYSIZE);
+ hobjDest = SelectObject(hDCDest, hbCopy);
 
- BitBlt32(hDCDest, 0, 0, SYSMETRICS_CXSIZE, SYSMETRICS_CYSIZE,
+ BitBlt(hDCDest, 0, 0, SYSMETRICS_CXSIZE, SYSMETRICS_CYSIZE,
           hDCSrc, SYSMETRICS_CXSIZE, 0, SRCCOPY);
   
- SelectObject32(hDCSrc, hobjSrc);
- DeleteObject32(hbClose);
- DeleteDC32(hDCSrc);
+ SelectObject(hDCSrc, hobjSrc);
+ DeleteObject(hbClose);
+ DeleteDC(hDCSrc);
 
- hobjSrc = SelectObject32( hDCDest, GetStockObject32(BLACK_PEN) );
+ hobjSrc = SelectObject( hDCDest, GetStockObject(BLACK_PEN) );
 
- MoveToEx32( hDCDest, SYSMETRICS_CXSIZE - 1, 0, NULL );
- LineTo32( hDCDest, SYSMETRICS_CXSIZE - 1, SYSMETRICS_CYSIZE - 1);
+ MoveToEx( hDCDest, SYSMETRICS_CXSIZE - 1, 0, NULL );
+ LineTo( hDCDest, SYSMETRICS_CXSIZE - 1, SYSMETRICS_CYSIZE - 1);
 
- SelectObject32(hDCDest, hobjSrc );
- SelectObject32(hDCDest, hobjDest);
- DeleteDC32(hDCDest);
+ SelectObject(hDCDest, hobjSrc );
+ SelectObject(hDCDest, hobjDest);
+ DeleteDC(hDCDest);
 
  return hbCopy;
 }
@@ -637,11 +637,11 @@ static HBITMAP16 CreateMDIMenuBitmap(void)
 static LONG MDICascade(WND* clientWnd, MDICLIENTINFO *ci)
 {
     WND**	ppWnd;
-    UINT32	total;
+    UINT	total;
   
     if (ci->hwndChildMaximized)
-        SendMessage32A( clientWnd->hwndSelf, WM_MDIRESTORE,
-                        (WPARAM32)ci->hwndChildMaximized, 0);
+        SendMessageA( clientWnd->hwndSelf, WM_MDIRESTORE,
+                        (WPARAM)ci->hwndChildMaximized, 0);
 
     if (ci->nActiveChildren == 0) return 0;
 
@@ -651,8 +651,8 @@ static LONG MDICascade(WND* clientWnd, MDICLIENTINFO *ci)
 	WND**	heapPtr = ppWnd;
 	if( total )
 	{
-	    INT32	delta = 0, n = 0;
-	    POINT32	pos[2];
+	    INT	delta = 0, n = 0;
+	    POINT	pos[2];
 	    if( total < ci->nActiveChildren )
 		delta = SYSMETRICS_CYICONSPACING + SYSMETRICS_CYICON;
 
@@ -665,7 +665,7 @@ static LONG MDICascade(WND* clientWnd, MDICLIENTINFO *ci)
                             (*ppWnd)->hwndSelf, pos[0].x, pos[0].y, pos[1].x, pos[1].y);
 
 		MDI_CalcDefaultChildPos(clientWnd, n++, pos, delta);
-		SetWindowPos32( (*ppWnd)->hwndSelf, 0, pos[0].x, pos[0].y,
+		SetWindowPos( (*ppWnd)->hwndSelf, 0, pos[0].x, pos[0].y,
                                 pos[1].x, pos[1].y,
                                 SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER);
 	    }
@@ -674,21 +674,21 @@ static LONG MDICascade(WND* clientWnd, MDICLIENTINFO *ci)
     }
 
     if( total < ci->nActiveChildren )
-        ArrangeIconicWindows32( clientWnd->hwndSelf );
+        ArrangeIconicWindows( clientWnd->hwndSelf );
     return 0;
 }
 
 /**********************************************************************
  *					MDITile
  */
-static void MDITile( WND* wndClient, MDICLIENTINFO *ci, WPARAM32 wParam )
+static void MDITile( WND* wndClient, MDICLIENTINFO *ci, WPARAM wParam )
 {
     WND**	ppWnd;
-    UINT32	total = 0;
+    UINT	total = 0;
 
     if (ci->hwndChildMaximized)
-        SendMessage32A( wndClient->hwndSelf, WM_MDIRESTORE,
-                        (WPARAM32)ci->hwndChildMaximized, 0);
+        SendMessageA( wndClient->hwndSelf, WM_MDIRESTORE,
+                        (WPARAM)ci->hwndChildMaximized, 0);
 
     if (ci->nActiveChildren == 0) return;
 
@@ -703,7 +703,7 @@ static void MDITile( WND* wndClient, MDICLIENTINFO *ci, WPARAM32 wParam )
 
 	if( total )
 	{
-	    RECT32	rect;
+	    RECT	rect;
 	    int		x, y, xsize, ysize;
 	    int		rows, columns, r, c, i;
 
@@ -738,7 +738,7 @@ static void MDITile( WND* wndClient, MDICLIENTINFO *ci, WPARAM32 wParam )
 		y = 0;
 		for (r = 1; r <= rows && *ppWnd; r++, i++)
 		{
-		    SetWindowPos32((*ppWnd)->hwndSelf, 0, x, y, xsize, ysize, 
+		    SetWindowPos((*ppWnd)->hwndSelf, 0, x, y, xsize, ysize, 
 				   SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER);
                     y += ysize;
 		    ppWnd++;
@@ -749,7 +749,7 @@ static void MDITile( WND* wndClient, MDICLIENTINFO *ci, WPARAM32 wParam )
 	HeapFree( SystemHeap, 0, heapPtr );
     }
   
-    if( total < ci->nActiveChildren ) ArrangeIconicWindows32( wndClient->hwndSelf );
+    if( total < ci->nActiveChildren ) ArrangeIconicWindows( wndClient->hwndSelf );
 }
 
 /* ----------------------- Frame window ---------------------------- */
@@ -758,11 +758,11 @@ static void MDITile( WND* wndClient, MDICLIENTINFO *ci, WPARAM32 wParam )
 /**********************************************************************
  *					MDI_AugmentFrameMenu
  */
-static BOOL32 MDI_AugmentFrameMenu( MDICLIENTINFO* ci, WND *frame,
-                                    HWND32 hChild )
+static BOOL MDI_AugmentFrameMenu( MDICLIENTINFO* ci, WND *frame,
+                                    HWND hChild )
 {
     WND*	child = WIN_FindWndPtr(hChild);
-    HMENU32  	hSysPopup = 0;
+    HMENU  	hSysPopup = 0;
 
     TRACE(mdi,"frame %p,child %04x\n",frame,hChild);
 
@@ -770,38 +770,38 @@ static BOOL32 MDI_AugmentFrameMenu( MDICLIENTINFO* ci, WND *frame,
 
     /* create a copy of sysmenu popup and insert it into frame menu bar */
 
-    if (!(hSysPopup = LoadMenuIndirect32A(SYSRES_GetResPtr(SYSRES_MENU_SYSMENU))))
+    if (!(hSysPopup = LoadMenuIndirectA(SYSRES_GetResPtr(SYSRES_MENU_SYSMENU))))
 	return 0;
  
     TRACE(mdi,"\tgot popup %04x in sysmenu %04x\n", 
 		hSysPopup, child->hSysMenu);
  
-    AppendMenu32A(frame->wIDmenu,MF_HELP | MF_BITMAP,
+    AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
                    SC_MINIMIZE, (LPSTR)(DWORD)MAGIC_REDUCE ) ;
-    AppendMenu32A(frame->wIDmenu,MF_HELP | MF_BITMAP,
+    AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
                    SC_RESTORE, (LPSTR)(DWORD)MAGIC_RESTORE );
 
-    if( !InsertMenu32A(frame->wIDmenu,0,MF_BYPOSITION | MF_BITMAP | MF_POPUP,
+    if( !InsertMenuA(frame->wIDmenu,0,MF_BYPOSITION | MF_BITMAP | MF_POPUP,
                     hSysPopup, (LPSTR)(DWORD)hBmpClose ))
     {  
         TRACE(mdi,"not inserted\n");
-	DestroyMenu32(hSysPopup); 
+	DestroyMenu(hSysPopup); 
 	return 0; 
     }
 
      // The close button is only present in Win 95 look
     if(TWEAK_WineLook > WIN31_LOOK)
     {
-        AppendMenu32A(frame->wIDmenu,MF_HELP | MF_BITMAP,
+        AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
                        SC_CLOSE, (LPSTR)(DWORD)MAGIC_CLOSE );
     }
 
-    EnableMenuItem32(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED);
-    EnableMenuItem32(hSysPopup, SC_MOVE, MF_BYCOMMAND | MF_GRAYED);
-    EnableMenuItem32(hSysPopup, SC_MAXIMIZE, MF_BYCOMMAND | MF_GRAYED);
+    EnableMenuItem(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED);
+    EnableMenuItem(hSysPopup, SC_MOVE, MF_BYCOMMAND | MF_GRAYED);
+    EnableMenuItem(hSysPopup, SC_MAXIMIZE, MF_BYCOMMAND | MF_GRAYED);
 
     /* redraw menu */
-    DrawMenuBar32(frame->hwndSelf);
+    DrawMenuBar(frame->hwndSelf);
 
     return 1;
 }
@@ -809,10 +809,10 @@ static BOOL32 MDI_AugmentFrameMenu( MDICLIENTINFO* ci, WND *frame,
 /**********************************************************************
  *					MDI_RestoreFrameMenu
  */
-static BOOL32 MDI_RestoreFrameMenu( WND *frameWnd, HWND32 hChild )
+static BOOL MDI_RestoreFrameMenu( WND *frameWnd, HWND hChild )
 {
-    INT32 nItems = GetMenuItemCount32(frameWnd->wIDmenu) - 1;
-    UINT32 iId = GetMenuItemID32(frameWnd->wIDmenu,nItems) ;
+    INT nItems = GetMenuItemCount(frameWnd->wIDmenu) - 1;
+    UINT iId = GetMenuItemID(frameWnd->wIDmenu,nItems) ;
 
     TRACE(mdi,"frameWnd %p,child %04x\n",frameWnd,hChild);
 
@@ -820,19 +820,19 @@ static BOOL32 MDI_RestoreFrameMenu( WND *frameWnd, HWND32 hChild )
 	return 0; 
 
     // app button
-    RemoveMenu32(frameWnd->wIDmenu,0,MF_BYPOSITION);
+    RemoveMenu(frameWnd->wIDmenu,0,MF_BYPOSITION);
 
     if(TWEAK_WineLook > WIN31_LOOK)
     {
         // close
-    DeleteMenu32(frameWnd->wIDmenu,GetMenuItemCount32(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
+    DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
     }
     // restore
-    DeleteMenu32(frameWnd->wIDmenu,GetMenuItemCount32(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
+    DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
     // minimize
-    DeleteMenu32(frameWnd->wIDmenu,GetMenuItemCount32(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
+    DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
 
-    DrawMenuBar32(frameWnd->hwndSelf);
+    DrawMenuBar(frameWnd->hwndSelf);
 
     return 1;
 }
@@ -845,8 +845,8 @@ static BOOL32 MDI_RestoreFrameMenu( WND *frameWnd, HWND32 hChild )
  *
  * Note: lpTitle can be NULL
  */
-static void MDI_UpdateFrameText( WND *frameWnd, HWND32 hClient,
-                                 BOOL32 repaint, LPCSTR lpTitle )
+static void MDI_UpdateFrameText( WND *frameWnd, HWND hClient,
+                                 BOOL repaint, LPCSTR lpTitle )
 {
     char   lpBuffer[MDI_MAXTITLELENGTH+1];
     WND*   clientWnd = WIN_FindWndPtr(hClient);
@@ -879,7 +879,7 @@ static void MDI_UpdateFrameText( WND *frameWnd, HWND32 hClient,
 	    int	i_frame_text_length = strlen(ci->frameTitle);
 	    int	i_child_text_length = strlen(childWnd->text);
 
-	    lstrcpyn32A( lpBuffer, ci->frameTitle, MDI_MAXTITLELENGTH);
+	    lstrcpynA( lpBuffer, ci->frameTitle, MDI_MAXTITLELENGTH);
 
 	    if( i_frame_text_length + 6 < MDI_MAXTITLELENGTH )
             {
@@ -892,7 +892,7 @@ static void MDI_UpdateFrameText( WND *frameWnd, HWND32 hClient,
 		}
 		else
 		{
-		    lstrcpyn32A( lpBuffer + i_frame_text_length + 4, 
+		    lstrcpynA( lpBuffer + i_frame_text_length + 4, 
 				 childWnd->text, MDI_MAXTITLELENGTH - i_frame_text_length - 5 );
 		    strcat( lpBuffer, "]" );
 		}
@@ -909,7 +909,7 @@ static void MDI_UpdateFrameText( WND *frameWnd, HWND32 hClient,
 
     DEFWND_SetText( frameWnd, lpBuffer );
     if( repaint == MDI_REPAINTFRAME)
-	SetWindowPos32( frameWnd->hwndSelf, 0,0,0,0,0, SWP_FRAMECHANGED |
+	SetWindowPos( frameWnd->hwndSelf, 0,0,0,0,0, SWP_FRAMECHANGED |
 			SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER );
 }
 
@@ -922,15 +922,15 @@ static void MDI_UpdateFrameText( WND *frameWnd, HWND32 hClient,
  *
  * This function handles all MDI requests.
  */
-LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
+LRESULT WINAPI MDIClientWndProc( HWND hwnd, UINT message, WPARAM wParam,
                                  LPARAM lParam )
 {
-    LPCREATESTRUCT32A    cs;
+    LPCREATESTRUCTA    cs;
     MDICLIENTINFO       *ci;
-    RECT32		 rect;
+    RECT		 rect;
     WND                 *w 	  = WIN_FindWndPtr(hwnd);
     WND			*frameWnd = w->parent;
-    INT32 nItems;
+    INT nItems;
     
     ci = (MDICLIENTINFO *) w->wExtra;
     
@@ -938,14 +938,14 @@ LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
     {
       case WM_CREATE:
 
-	cs = (LPCREATESTRUCT32A)lParam;
+	cs = (LPCREATESTRUCTA)lParam;
 
 	/* Translation layer doesn't know what's in the cs->lpCreateParams
 	 * so we have to keep track of what environment we're in. */
 
 	if( w->flags & WIN_ISWIN32 )
 	{
-#define ccs ((LPCLIENTCREATESTRUCT32)cs->lpCreateParams)
+#define ccs ((LPCLIENTCREATESTRUCT)cs->lpCreateParams)
 	    ci->hWindowMenu	= ccs->hWindowMenu;
 	    ci->idFirstChild	= ccs->idFirstChild;
 #undef ccs
@@ -973,9 +973,9 @@ LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
         }
 	MDI_UpdateFrameText(frameWnd, hwnd, MDI_NOFRAMEREPAINT,frameWnd->text);
 
-	AppendMenu32A( ci->hWindowMenu, MF_SEPARATOR, 0, NULL );
+	AppendMenuA( ci->hWindowMenu, MF_SEPARATOR, 0, NULL );
 
-	GetClientRect32(frameWnd->hwndSelf, &rect);
+	GetClientRect(frameWnd->hwndSelf, &rect);
 	NC_HandleNCCalcSize( w, &rect );
 	w->rectClient = rect;
 
@@ -986,18 +986,18 @@ LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
       
       case WM_DESTROY:
 	if( ci->hwndChildMaximized ) MDI_RestoreFrameMenu(w, frameWnd->hwndSelf);
-	if((nItems = GetMenuItemCount32(ci->hWindowMenu)) > 0) 
+	if((nItems = GetMenuItemCount(ci->hWindowMenu)) > 0) 
 	{
     	    ci->idFirstChild = nItems - 1;
 	    ci->nActiveChildren++; 		/* to delete a separator */
 	    while( ci->nActiveChildren-- )
-	        DeleteMenu32(ci->hWindowMenu,MF_BYPOSITION,ci->idFirstChild--);
+	        DeleteMenu(ci->hWindowMenu,MF_BYPOSITION,ci->idFirstChild--);
 	}
 	return 0;
 
       case WM_MDIACTIVATE:
-        if( ci->hwndActiveChild != (HWND32)wParam )
-	    SetWindowPos32((HWND32)wParam, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE);
+        if( ci->hwndActiveChild != (HWND)wParam )
+	    SetWindowPos((HWND)wParam, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE);
 	return 0;
 
       case WM_MDICASCADE:
@@ -1005,44 +1005,44 @@ LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 
       case WM_MDICREATE:
         if (lParam) return MDICreateChild( w, ci, hwnd,
-                                           (MDICREATESTRUCT32A*)lParam );
+                                           (MDICREATESTRUCTA*)lParam );
 	return 0;
 
       case WM_MDIDESTROY:
-	return MDIDestroyChild( w, ci, hwnd, (HWND32)wParam, TRUE );
+	return MDIDestroyChild( w, ci, hwnd, (HWND)wParam, TRUE );
 
       case WM_MDIGETACTIVE:
-          if (lParam) *(BOOL32 *)lParam = (ci->hwndChildMaximized > 0);
+          if (lParam) *(BOOL *)lParam = (ci->hwndChildMaximized > 0);
           return ci->hwndActiveChild;
 
       case WM_MDIICONARRANGE:
 	ci->mdiFlags |= MDIF_NEEDUPDATE;
-        ArrangeIconicWindows32(hwnd);
+        ArrangeIconicWindows(hwnd);
 	ci->sbRecalc = SB_BOTH+1;
-	SendMessage32A(hwnd, WM_MDICALCCHILDSCROLL, 0, 0L);
+	SendMessageA(hwnd, WM_MDICALCCHILDSCROLL, 0, 0L);
 	return 0;
 	
       case WM_MDIMAXIMIZE:
-	ShowWindow32( (HWND32)wParam, SW_MAXIMIZE );
+	ShowWindow( (HWND)wParam, SW_MAXIMIZE );
 	return 0;
 
       case WM_MDINEXT: /* lParam != 0 means previous window */
-	MDI_SwitchActiveChild(hwnd, (HWND32)wParam, (lParam)? FALSE : TRUE );
+	MDI_SwitchActiveChild(hwnd, (HWND)wParam, (lParam)? FALSE : TRUE );
 	break;
 	
       case WM_MDIRESTORE:
-        SendMessage32A( (HWND32)wParam, WM_SYSCOMMAND, SC_RESTORE, 0);
+        SendMessageA( (HWND)wParam, WM_SYSCOMMAND, SC_RESTORE, 0);
 	return 0;
 
       case WM_MDISETMENU:
-          return MDISetMenu( hwnd, (HMENU32)wParam, (HMENU32)lParam );
+          return MDISetMenu( hwnd, (HMENU)wParam, (HMENU)lParam );
 	
       case WM_MDIREFRESHMENU:
-          return MDIRefreshMenu( hwnd, (HMENU32)wParam, (HMENU32)lParam );
+          return MDIRefreshMenu( hwnd, (HMENU)wParam, (HMENU)lParam );
 
       case WM_MDITILE:
 	ci->mdiFlags |= MDIF_NEEDUPDATE;
-	ShowScrollBar32(hwnd,SB_BOTH,FALSE);
+	ShowScrollBar(hwnd,SB_BOTH,FALSE);
 	MDITile(w, ci, wParam);
         ci->mdiFlags &= ~MDIF_NEEDUPDATE;
         return 0;
@@ -1050,7 +1050,7 @@ LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
       case WM_VSCROLL:
       case WM_HSCROLL:
 	ci->mdiFlags |= MDIF_NEEDUPDATE;
-        ScrollChildren32(hwnd, message, wParam, lParam);
+        ScrollChildren(hwnd, message, wParam, lParam);
 	ci->mdiFlags &= ~MDIF_NEEDUPDATE;
         return 0;
 
@@ -1059,13 +1059,13 @@ LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 	{
 	   w = WIN_FindWndPtr( ci->hwndActiveChild );
 	   if( !(w->dwStyle & WS_MINIMIZE) )
-	       SetFocus32( ci->hwndActiveChild );
+	       SetFocus( ci->hwndActiveChild );
 	} 
 	return 0;
 	
       case WM_NCACTIVATE:
         if( ci->hwndActiveChild )
-	     SendMessage32A(ci->hwndActiveChild, message, wParam, lParam);
+	     SendMessageA(ci->hwndActiveChild, message, wParam, lParam);
 	break;
 	
       case WM_PARENTNOTIFY:
@@ -1077,18 +1077,18 @@ LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 	    TRACE(mdi,"notification from %04x (%i,%i)\n",child,pt.x,pt.y);
 
             if( child && child != hwnd && child != ci->hwndActiveChild )
-                SetWindowPos32(child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE );
+                SetWindowPos(child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE );
         }
         return 0;
 
       case WM_SIZE:
-        if( IsWindow32(ci->hwndChildMaximized) )
+        if( IsWindow(ci->hwndChildMaximized) )
 	{
 	    WND*	child = WIN_FindWndPtr(ci->hwndChildMaximized);
-	    RECT32	rect  = { 0, 0, LOWORD(lParam), HIWORD(lParam) };
+	    RECT	rect  = { 0, 0, LOWORD(lParam), HIWORD(lParam) };
 
-	    AdjustWindowRectEx32(&rect, child->dwStyle, 0, child->dwExStyle);
-	    MoveWindow32(ci->hwndChildMaximized, rect.left, rect.top,
+	    AdjustWindowRectEx(&rect, child->dwStyle, 0, child->dwExStyle);
+	    MoveWindow(ci->hwndChildMaximized, rect.left, rect.top,
 			 rect.right - rect.left, rect.bottom - rect.top, 1);
 	}
 	else
@@ -1099,14 +1099,14 @@ LRESULT WINAPI MDIClientWndProc( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
       case WM_MDICALCCHILDSCROLL:
 	if( (ci->mdiFlags & MDIF_NEEDUPDATE) && ci->sbRecalc )
 	{
-	    CalcChildScroll(hwnd, ci->sbRecalc-1);
+	    CalcChildScroll16(hwnd, ci->sbRecalc-1);
 	    ci->sbRecalc = 0;
 	    ci->mdiFlags &= ~MDIF_NEEDUPDATE;
 	}
 	return 0;
     }
     
-    return DefWindowProc32A( hwnd, message, wParam, lParam );
+    return DefWindowProcA( hwnd, message, wParam, lParam );
 }
 
 
@@ -1171,7 +1171,7 @@ LRESULT WINAPI DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient,
 	    return 0;
 	
 	  case WM_SETFOCUS:
-	    SetFocus32(hwndMDIClient);
+	    SetFocus(hwndMDIClient);
 	    break;
 
 	  case WM_SIZE:
@@ -1211,8 +1211,8 @@ LRESULT WINAPI DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient,
 /***********************************************************************
  *           DefFrameProc32A   (USER32.122)
  */
-LRESULT WINAPI DefFrameProc32A( HWND32 hwnd, HWND32 hwndMDIClient,
-                                UINT32 message, WPARAM32 wParam, LPARAM lParam)
+LRESULT WINAPI DefFrameProcA( HWND hwnd, HWND hwndMDIClient,
+                                UINT message, WPARAM wParam, LPARAM lParam)
 {
     if (hwndMDIClient)
     {
@@ -1224,7 +1224,7 @@ LRESULT WINAPI DefFrameProc32A( HWND32 hwnd, HWND32 hwndMDIClient,
                               MAKELPARAM( (HWND16)lParam, HIWORD(wParam) ) );
 
 	  case WM_NCACTIVATE:
-	    SendMessage32A(hwndMDIClient, message, wParam, lParam);
+	    SendMessageA(hwndMDIClient, message, wParam, lParam);
 	    break;
 
 	  case WM_SETTEXT: {
@@ -1245,15 +1245,15 @@ LRESULT WINAPI DefFrameProc32A( HWND32 hwnd, HWND32 hwndMDIClient,
 	}
     }
     
-    return DefWindowProc32A(hwnd, message, wParam, lParam);
+    return DefWindowProcA(hwnd, message, wParam, lParam);
 }
 
 
 /***********************************************************************
  *           DefFrameProc32W   (USER32.123)
  */
-LRESULT WINAPI DefFrameProc32W( HWND32 hwnd, HWND32 hwndMDIClient,
-                                UINT32 message, WPARAM32 wParam, LPARAM lParam)
+LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient,
+                                UINT message, WPARAM wParam, LPARAM lParam)
 {
     if (hwndMDIClient)
     {
@@ -1265,13 +1265,13 @@ LRESULT WINAPI DefFrameProc32W( HWND32 hwnd, HWND32 hwndMDIClient,
                               MAKELPARAM( (HWND16)lParam, HIWORD(wParam) ) );
 
 	  case WM_NCACTIVATE:
-	    SendMessage32W(hwndMDIClient, message, wParam, lParam);
+	    SendMessageW(hwndMDIClient, message, wParam, lParam);
 	    break;
 
 	  case WM_SETTEXT: 
 	  {
 	      LPSTR txt = HEAP_strdupWtoA(GetProcessHeap(),0,(LPWSTR)lParam);
-	      LRESULT ret = DefFrameProc32A( hwnd, hwndMDIClient, message,
+	      LRESULT ret = DefFrameProcA( hwnd, hwndMDIClient, message,
                                      wParam, (DWORD)txt );
 	      HeapFree(GetProcessHeap(),0,txt);
 	      return ret;
@@ -1279,12 +1279,12 @@ LRESULT WINAPI DefFrameProc32W( HWND32 hwnd, HWND32 hwndMDIClient,
 	  case WM_NEXTMENU:
 	  case WM_SETFOCUS:
 	  case WM_SIZE:
-              return DefFrameProc32A( hwnd, hwndMDIClient, message,
+              return DefFrameProcA( hwnd, hwndMDIClient, message,
                                       wParam, lParam );
 	}
     }
     
-    return DefWindowProc32W( hwnd, message, wParam, lParam );
+    return DefWindowProcW( hwnd, message, wParam, lParam );
 }
 
 
@@ -1446,8 +1446,8 @@ LRESULT WINAPI DefMDIChildProc16( HWND16 hwnd, UINT16 message,
 /***********************************************************************
  *           DefMDIChildProc32A   (USER32.124)
  */
-LRESULT WINAPI DefMDIChildProc32A( HWND32 hwnd, UINT32 message,
-                                   WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message,
+                                   WPARAM wParam, LPARAM lParam )
 {
     MDICLIENTINFO       *ci;
     WND                 *clientWnd;
@@ -1458,7 +1458,7 @@ LRESULT WINAPI DefMDIChildProc32A( HWND32 hwnd, UINT32 message,
     switch (message)
     {
       case WM_SETTEXT:
-	DefWindowProc32A(hwnd, message, wParam, lParam);
+	DefWindowProcA(hwnd, message, wParam, lParam);
 	MDI_MenuModifyItem(clientWnd,hwnd);
 	if( ci->hwndChildMaximized == hwnd )
 	    MDI_UpdateFrameText( clientWnd->parent, ci->self,
@@ -1468,9 +1468,9 @@ LRESULT WINAPI DefMDIChildProc32A( HWND32 hwnd, UINT32 message,
       case WM_GETMINMAXINFO:
         {
             MINMAXINFO16 mmi;
-            STRUCT32_MINMAXINFO32to16( (MINMAXINFO32 *)lParam, &mmi );
+            STRUCT32_MINMAXINFO32to16( (MINMAXINFO *)lParam, &mmi );
             MDI_ChildGetMinMaxInfo( clientWnd, hwnd, &mmi );
-            STRUCT32_MINMAXINFO16to32( &mmi, (MINMAXINFO32 *)lParam );
+            STRUCT32_MINMAXINFO16to32( &mmi, (MINMAXINFO *)lParam );
         }
 	return 0;
 
@@ -1494,20 +1494,20 @@ LRESULT WINAPI DefMDIChildProc32A( HWND32 hwnd, UINT32 message,
       case WM_SYSCHAR:
       	   if (wParam == '-')
 	   {
-	   	SendMessage32A(hwnd,WM_SYSCOMMAND,
-			(WPARAM32)SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
+	   	SendMessageA(hwnd,WM_SYSCOMMAND,
+			(WPARAM)SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
 		return 0;
 	   }
     }
-    return DefWindowProc32A(hwnd, message, wParam, lParam);
+    return DefWindowProcA(hwnd, message, wParam, lParam);
 }
 
 
 /***********************************************************************
  *           DefMDIChildProc32W   (USER32.125)
  */
-LRESULT WINAPI DefMDIChildProc32W( HWND32 hwnd, UINT32 message,
-                                   WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
+                                   WPARAM wParam, LPARAM lParam )
 {
     MDICLIENTINFO       *ci;
     WND                 *clientWnd;
@@ -1518,7 +1518,7 @@ LRESULT WINAPI DefMDIChildProc32W( HWND32 hwnd, UINT32 message,
     switch (message)
     {
       case WM_SETTEXT:
-	DefWindowProc32W(hwnd, message, wParam, lParam);
+	DefWindowProcW(hwnd, message, wParam, lParam);
 	MDI_MenuModifyItem(clientWnd,hwnd);
 	if( ci->hwndChildMaximized == hwnd )
 	    MDI_UpdateFrameText( clientWnd->parent, ci->self,
@@ -1535,17 +1535,17 @@ LRESULT WINAPI DefMDIChildProc32W( HWND32 hwnd, UINT32 message,
       case WM_SETVISIBLE:
       case WM_SIZE:
       case WM_NEXTMENU:
-          return DefMDIChildProc32A( hwnd, message, (WPARAM16)wParam, lParam );
+          return DefMDIChildProcA( hwnd, message, (WPARAM16)wParam, lParam );
 
       case WM_SYSCHAR:
       	   if (wParam == '-')
 	   {
-	   	SendMessage32W(hwnd,WM_SYSCOMMAND,
-			(WPARAM32)SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
+	   	SendMessageW(hwnd,WM_SYSCOMMAND,
+			(WPARAM)SC_KEYMENU, (LPARAM)(DWORD)VK_SPACE);
 		return 0;
 	   }
     }
-    return DefWindowProc32W(hwnd, message, wParam, lParam);
+    return DefWindowProcW(hwnd, message, wParam, lParam);
 }
 
 
@@ -1557,20 +1557,20 @@ LRESULT WINAPI DefMDIChildProc32W( HWND32 hwnd, UINT32 message,
  *    Success: Handle to created window
  *    Failure: NULL
  */
-HWND32 WINAPI CreateMDIWindow32A(
+HWND WINAPI CreateMDIWindowA(
     LPCSTR lpClassName,    /* [in] Pointer to registered child class name */
     LPCSTR lpWindowName,   /* [in] Pointer to window name */
     DWORD dwStyle,         /* [in] Window style */
-    INT32 X,               /* [in] Horizontal position of window */
-    INT32 Y,               /* [in] Vertical position of window */
-    INT32 nWidth,          /* [in] Width of window */
-    INT32 nHeight,         /* [in] Height of window */
-    HWND32 hWndParent,     /* [in] Handle to parent window */
-    HINSTANCE32 hInstance, /* [in] Handle to application instance */
+    INT X,               /* [in] Horizontal position of window */
+    INT Y,               /* [in] Vertical position of window */
+    INT nWidth,          /* [in] Width of window */
+    INT nHeight,         /* [in] Height of window */
+    HWND hWndParent,     /* [in] Handle to parent window */
+    HINSTANCE hInstance, /* [in] Handle to application instance */
     LPARAM lParam)         /* [in] Application-defined value */
 {
     WARN(mdi,"is only single threaded!\n");
-    return MDI_CreateMDIWindow32A(lpClassName, lpWindowName, dwStyle, X, Y, 
+    return MDI_CreateMDIWindowA(lpClassName, lpWindowName, dwStyle, X, Y, 
             nWidth, nHeight, hWndParent, hInstance, lParam);
 }
  
@@ -1579,20 +1579,20 @@ HWND32 WINAPI CreateMDIWindow32A(
  * single threaded version of CreateMDIWindowA
  * called by CreateWindowEx32A
  */
-HWND32 MDI_CreateMDIWindow32A(
+HWND MDI_CreateMDIWindowA(
     LPCSTR lpClassName,
     LPCSTR lpWindowName,
     DWORD dwStyle,
-    INT32 X,
-    INT32 Y,
-    INT32 nWidth,
-    INT32 nHeight,
-    HWND32 hWndParent,
-    HINSTANCE32 hInstance,
+    INT X,
+    INT Y,
+    INT nWidth,
+    INT nHeight,
+    HWND hWndParent,
+    HINSTANCE hInstance,
     LPARAM lParam)
 {
     MDICLIENTINFO* pCi;
-    MDICREATESTRUCT32A cs;
+    MDICREATESTRUCTA cs;
     WND *pWnd=WIN_FindWndPtr(hWndParent);
 
     TRACE(mdi, "(%s,%s,%ld,%d,%d,%d,%d,%x,%d,%ld)\n",
@@ -1625,22 +1625,22 @@ HWND32 MDI_CreateMDIWindow32A(
  *    Success: Handle to created window
  *    Failure: NULL
  */
-HWND32 WINAPI CreateMDIWindow32W(
+HWND WINAPI CreateMDIWindowW(
     LPCWSTR lpClassName,    /* [in] Pointer to registered child class name */
     LPCWSTR lpWindowName,   /* [in] Pointer to window name */
     DWORD dwStyle,         /* [in] Window style */
-    INT32 X,               /* [in] Horizontal position of window */
-    INT32 Y,               /* [in] Vertical position of window */
-    INT32 nWidth,          /* [in] Width of window */
-    INT32 nHeight,         /* [in] Height of window */
-    HWND32 hWndParent,     /* [in] Handle to parent window */
-    HINSTANCE32 hInstance, /* [in] Handle to application instance */
+    INT X,               /* [in] Horizontal position of window */
+    INT Y,               /* [in] Vertical position of window */
+    INT nWidth,          /* [in] Width of window */
+    INT nHeight,         /* [in] Height of window */
+    HWND hWndParent,     /* [in] Handle to parent window */
+    HINSTANCE hInstance, /* [in] Handle to application instance */
     LPARAM lParam)         /* [in] Application-defined value */
 {
     FIXME(mdi, "(%s,%s,%ld,%d,%d,%d,%d,%x,%d,%ld): stub\n",
           debugstr_w(lpClassName),debugstr_w(lpWindowName),dwStyle,X,Y,
           nWidth,nHeight,hWndParent,hInstance,lParam);
-    return (HWND32)NULL;
+    return (HWND)NULL;
 }
 
 
@@ -1649,29 +1649,29 @@ HWND32 WINAPI CreateMDIWindow32W(
  * single threaded version of CreateMDIWindow
  * called by CreateWindowEx32W(). 
  */
-HWND32 MDI_CreateMDIWindow32W(
+HWND MDI_CreateMDIWindowW(
     LPCWSTR lpClassName,   /* [in] Pointer to registered child class name */
     LPCWSTR lpWindowName,  /* [in] Pointer to window name */
     DWORD dwStyle,         /* [in] Window style */
-    INT32 X,               /* [in] Horizontal position of window */
-    INT32 Y,               /* [in] Vertical position of window */
-    INT32 nWidth,          /* [in] Width of window */
-    INT32 nHeight,         /* [in] Height of window */
-    HWND32 hWndParent,     /* [in] Handle to parent window */
-    HINSTANCE32 hInstance, /* [in] Handle to application instance */
+    INT X,               /* [in] Horizontal position of window */
+    INT Y,               /* [in] Vertical position of window */
+    INT nWidth,          /* [in] Width of window */
+    INT nHeight,         /* [in] Height of window */
+    HWND hWndParent,     /* [in] Handle to parent window */
+    HINSTANCE hInstance, /* [in] Handle to application instance */
     LPARAM lParam)         /* [in] Application-defined value */
 {
     FIXME(mdi, "(%s,%s,%ld,%d,%d,%d,%d,%x,%d,%ld): stub\n",
           debugstr_w(lpClassName),debugstr_w(lpWindowName),dwStyle,X,Y,
           nWidth,nHeight,hWndParent,hInstance,lParam);
-    return (HWND32)NULL;
+    return (HWND)NULL;
 }
 
 
 /**********************************************************************
  *             TranslateMDISysAccel32   (USER32.555)
  */
-BOOL32 WINAPI TranslateMDISysAccel32( HWND32 hwndClient, LPMSG32 msg )
+BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg )
 {
     MSG16 msg16;
  
@@ -1701,14 +1701,14 @@ BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg )
 
 	    /* translate if the Ctrl key is down and Alt not. */
   
-	    if( (GetKeyState32(VK_CONTROL) & 0x8000) && 
-	       !(GetKeyState32(VK_MENU) & 0x8000))
+	    if( (GetKeyState(VK_CONTROL) & 0x8000) && 
+	       !(GetKeyState(VK_MENU) & 0x8000))
 	    {
 		switch( msg->wParam )
 		{
 		    case VK_F6:
 		    case VK_TAB:
-			 wParam = ( GetKeyState32(VK_SHIFT) & 0x8000 )
+			 wParam = ( GetKeyState(VK_SHIFT) & 0x8000 )
 				  ? SC_NEXTWINDOW : SC_PREVWINDOW;
 			 break;
 		    case VK_F4:
@@ -1732,27 +1732,27 @@ BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg )
 /***********************************************************************
  *           CalcChildScroll   (USER.462)
  */
-void WINAPI CalcChildScroll( HWND16 hwnd, WORD scroll )
+void WINAPI CalcChildScroll16( HWND16 hwnd, WORD scroll )
 {
     SCROLLINFO info;
-    RECT32 childRect, clientRect;
-    INT32  vmin, vmax, hmin, hmax, vpos, hpos;
+    RECT childRect, clientRect;
+    INT  vmin, vmax, hmin, hmax, vpos, hpos;
     WND *pWnd, *Wnd;
 
     if (!(Wnd = pWnd = WIN_FindWndPtr( hwnd ))) return;
-    GetClientRect32( hwnd, &clientRect );
-    SetRectEmpty32( &childRect );
+    GetClientRect( hwnd, &clientRect );
+    SetRectEmpty( &childRect );
 
     for ( pWnd = pWnd->child; pWnd; pWnd = pWnd->next )
     {
 	  if( pWnd->dwStyle & WS_MAXIMIZE )
 	  {
-	      ShowScrollBar32(hwnd, SB_BOTH, FALSE);
+	      ShowScrollBar(hwnd, SB_BOTH, FALSE);
 	      return;
 	  }
-	  UnionRect32( &childRect, &pWnd->rectWindow, &childRect );
+	  UnionRect( &childRect, &pWnd->rectWindow, &childRect );
     } 
-    UnionRect32( &childRect, &clientRect, &childRect );
+    UnionRect( &childRect, &clientRect, &childRect );
 
     hmin = childRect.left; hmax = childRect.right - clientRect.right;
     hpos = clientRect.left - childRect.left;
@@ -1767,7 +1767,7 @@ void WINAPI CalcChildScroll( HWND16 hwnd, WORD scroll )
 			info.cbSize = sizeof(info);
 			info.nMax = vmax; info.nMin = vmin; info.nPos = vpos;
 			info.fMask = SIF_POS | SIF_RANGE;
-			SetScrollInfo32(hwnd, scroll, &info, TRUE);
+			SetScrollInfo(hwnd, scroll, &info, TRUE);
 			break;
 	case SB_BOTH:
 			SCROLL_SetNCSbState( Wnd, vmin, vmax, vpos,
@@ -1781,33 +1781,33 @@ void WINAPI CalcChildScroll( HWND16 hwnd, WORD scroll )
  */
 void WINAPI ScrollChildren16(HWND16 hWnd, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam)
 {
-    return ScrollChildren32( hWnd, uMsg, wParam, lParam );
+    return ScrollChildren( hWnd, uMsg, wParam, lParam );
 }
 
 
 /***********************************************************************
  *           ScrollChildren32   (USER32.448)
  */
-void WINAPI ScrollChildren32(HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
+void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
                              LPARAM lParam)
 {
     WND	*wndPtr = WIN_FindWndPtr(hWnd);
-    INT32 newPos = -1;
-    INT32 curPos, length, minPos, maxPos, shift;
+    INT newPos = -1;
+    INT curPos, length, minPos, maxPos, shift;
 
     if( !wndPtr ) return;
 
     if( uMsg == WM_HSCROLL )
     {
-	GetScrollRange32(hWnd,SB_HORZ,&minPos,&maxPos);
-	curPos = GetScrollPos32(hWnd,SB_HORZ);
+	GetScrollRange(hWnd,SB_HORZ,&minPos,&maxPos);
+	curPos = GetScrollPos(hWnd,SB_HORZ);
 	length = (wndPtr->rectClient.right - wndPtr->rectClient.left)/2;
 	shift = SYSMETRICS_CYHSCROLL;
     }
     else if( uMsg == WM_VSCROLL )
     {
-	GetScrollRange32(hWnd,SB_VERT,&minPos,&maxPos);
-	curPos = GetScrollPos32(hWnd,SB_VERT);
+	GetScrollRange(hWnd,SB_VERT,&minPos,&maxPos);
+	curPos = GetScrollPos(hWnd,SB_VERT);
 	length = (wndPtr->rectClient.bottom - wndPtr->rectClient.top)/2;
 	shift = SYSMETRICS_CXVSCROLL;
     }
@@ -1842,7 +1842,7 @@ void WINAPI ScrollChildren32(HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
 			newPos = maxPos;
 			break;
 	case SB_ENDSCROLL:
-			CalcChildScroll(hWnd,(uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ);
+			CalcChildScroll16(hWnd,(uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ);
 			return;
     }
 
@@ -1852,13 +1852,13 @@ void WINAPI ScrollChildren32(HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
 	if( newPos < minPos )
 	    newPos = minPos;
 
-    SetScrollPos32(hWnd, (uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ , newPos, TRUE);
+    SetScrollPos(hWnd, (uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ , newPos, TRUE);
 
     if( uMsg == WM_VSCROLL )
-	ScrollWindowEx32(hWnd ,0 ,curPos - newPos, NULL, NULL, 0, NULL, 
+	ScrollWindowEx(hWnd ,0 ,curPos - newPos, NULL, NULL, 0, NULL, 
 			SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN );
     else
-	ScrollWindowEx32(hWnd ,curPos - newPos, 0, NULL, NULL, 0, NULL,
+	ScrollWindowEx(hWnd ,curPos - newPos, 0, NULL, NULL, 0, NULL,
 			SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN );
 }
 
@@ -1871,8 +1871,8 @@ void WINAPI ScrollChildren32(HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
  *    Failure: 0
  */
 WORD WINAPI
-CascadeWindows (HWND32 hwndParent, UINT32 wFlags, const LPRECT32 lpRect,
-		UINT32 cKids, const HWND32 *lpKids)
+CascadeWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect,
+		UINT cKids, const HWND *lpKids)
 {
     FIXME (mdi, "(0x%08x,0x%08x,...,%u,...): stub\n",
 	   hwndParent, wFlags, cKids);
@@ -1889,8 +1889,8 @@ CascadeWindows (HWND32 hwndParent, UINT32 wFlags, const LPRECT32 lpRect,
  *    Failure: 0
  */
 WORD WINAPI
-TileWindows (HWND32 hwndParent, UINT32 wFlags, const LPRECT32 lpRect,
-	     UINT32 cKids, const HWND32 *lpKids)
+TileWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect,
+	     UINT cKids, const HWND *lpKids)
 {
     FIXME (mdi, "(0x%08x,0x%08x,...,%u,...): stub\n",
 	   hwndParent, wFlags, cKids);
diff --git a/windows/message.c b/windows/message.c
index b703e042fe3..089b08caac0 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -42,13 +42,13 @@ extern HQUEUE16 hCursorQueue;			 /* queue.c */
 
 DWORD MSG_WineStartTicks; /* Ticks at Wine startup */
 
-static UINT32 doubleClickSpeed = 452;
+static UINT doubleClickSpeed = 452;
 
 
 /***********************************************************************
  *           MSG_CheckFilter
  */
-BOOL32 MSG_CheckFilter(DWORD uMsg, DWORD first, DWORD last)
+BOOL MSG_CheckFilter(DWORD uMsg, DWORD first, DWORD last)
 {
    if( first || last )
        return (uMsg >= first && uMsg <= last);
@@ -74,7 +74,7 @@ static void MSG_SendParentNotify(WND* wndPtr, WORD event, WORD idChild, LPARAM l
 	lppt->x += wndPtr->rectClient.left;
 	lppt->y += wndPtr->rectClient.top;
 	wndPtr = wndPtr->parent;
-	SendMessage32A( wndPtr->hwndSelf, WM_PARENTNOTIFY,
+	SendMessageA( wndPtr->hwndSelf, WM_PARENTNOTIFY,
 			MAKEWPARAM( event, idChild ), lValue );
     }
 #undef lppt
@@ -89,8 +89,8 @@ static void MSG_SendParentNotify(WND* wndPtr, WORD event, WORD idChild, LPARAM l
  * to the user, left in the queue, or skipped entirely (in this case
  * HIWORD contains hit test code).
  */
-static DWORD MSG_TranslateMouseMsg( HWND32 hTopWnd, DWORD first, DWORD last,
-				    MSG32 *msg, BOOL32 remove, WND* pWndScope )
+static DWORD MSG_TranslateMouseMsg( HWND hTopWnd, DWORD first, DWORD last,
+				    MSG *msg, BOOL remove, WND* pWndScope )
 {
     static DWORD   dblclk_time_limit = 0;
     static UINT16     clk_message = 0;
@@ -98,14 +98,14 @@ static DWORD MSG_TranslateMouseMsg( HWND32 hTopWnd, DWORD first, DWORD last,
     static POINT16    clk_pos = { 0, 0 };
 
     WND *pWnd;
-    HWND32 hWnd;
+    HWND hWnd;
     INT16 ht, hittest, sendSC = 0;
-    UINT32 message = msg->message;
+    UINT message = msg->message;
     POINT16 screen_pt, pt;
-    HANDLE16 hQ = GetFastQueue();
+    HANDLE16 hQ = GetFastQueue16();
     MESSAGEQUEUE *queue = (MESSAGEQUEUE *)QUEUE_Lock(hQ);
-    BOOL32 eatMsg = FALSE;
-    BOOL32 mouseClick = ((message == WM_LBUTTONDOWN) ||
+    BOOL eatMsg = FALSE;
+    BOOL mouseClick = ((message == WM_LBUTTONDOWN) ||
 		         (message == WM_RBUTTONDOWN) ||
 		         (message == WM_MBUTTONDOWN))?1:0;
     SYSQ_STATUS ret = 0;
@@ -115,7 +115,7 @@ static DWORD MSG_TranslateMouseMsg( HWND32 hTopWnd, DWORD first, DWORD last,
     CONV_POINT32TO16( &msg->pt, &pt );
     
     ht = hittest = HTCLIENT;
-    hWnd = GetCapture32();
+    hWnd = GetCapture();
     if( !hWnd )
     {
 	ht = hittest = WINPOS_WindowFromPoint( pWndScope, pt, &pWnd );
@@ -148,7 +148,7 @@ static DWORD MSG_TranslateMouseMsg( HWND32 hTopWnd, DWORD first, DWORD last,
 	/* check if hWnd is within hWndScope */
 
     if( hTopWnd && hWnd != hTopWnd )
-        if( !IsChild32(hTopWnd, hWnd) )
+        if( !IsChild(hTopWnd, hWnd) )
         {
             QUEUE_Unlock( queue );
             return SYSQ_MSG_CONTINUE;
@@ -214,7 +214,7 @@ static DWORD MSG_TranslateMouseMsg( HWND32 hTopWnd, DWORD first, DWORD last,
 	eatMsg = sendSC = 1;
     else if( remove && mouseClick )
     {
-        HWND32 hwndTop = WIN_GetTopParent( hWnd );
+        HWND hwndTop = WIN_GetTopParent( hWnd );
 
 	if( mouseClick == 1 )
 	{
@@ -238,16 +238,16 @@ static DWORD MSG_TranslateMouseMsg( HWND32 hTopWnd, DWORD first, DWORD last,
 
             /* Activate the window if needed */
 
-            if (hWnd != GetActiveWindow32() && hWnd != GetDesktopWindow32())
+            if (hWnd != GetActiveWindow() && hWnd != GetDesktopWindow())
             {
-                LONG ret = SendMessage32A( hWnd, WM_MOUSEACTIVATE, hwndTop,
+                LONG ret = SendMessageA( hWnd, WM_MOUSEACTIVATE, hwndTop,
                                           MAKELONG( hittest, message ) );
 
                 if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
                          eatMsg = TRUE;
 
                 if (((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT)) 
-                      && hwndTop != GetActiveWindow32() )
+                      && hwndTop != GetActiveWindow() )
                       if (!WINPOS_SetActiveWindow( hwndTop, TRUE , TRUE ))
 			 eatMsg = TRUE;
             }
@@ -257,7 +257,7 @@ static DWORD MSG_TranslateMouseMsg( HWND32 hTopWnd, DWORD first, DWORD last,
      /* Send the WM_SETCURSOR message */
 
     if (sendSC)
-        SendMessage32A( hWnd, WM_SETCURSOR, hWnd,
+        SendMessageA( hWnd, WM_SETCURSOR, hWnd,
                        MAKELONG( hittest, message ));
     if (eatMsg) return MAKELONG( (UINT16)SYSQ_MSG_SKIP, hittest);
 
@@ -273,11 +273,11 @@ static DWORD MSG_TranslateMouseMsg( HWND32 hTopWnd, DWORD first, DWORD last,
  *
  * Translate an keyboard hardware event into a real message.
  */
-static DWORD MSG_TranslateKbdMsg( HWND32 hTopWnd, DWORD first, DWORD last,
-				  MSG32 *msg, BOOL32 remove )
+static DWORD MSG_TranslateKbdMsg( HWND hTopWnd, DWORD first, DWORD last,
+				  MSG *msg, BOOL remove )
 {
     WORD message = msg->message;
-    HWND32 hWnd = GetFocus32();
+    HWND hWnd = GetFocus();
     WND *pWnd;
 
       /* Should check Ctrl-Esc and PrintScreen here */
@@ -287,16 +287,16 @@ static DWORD MSG_TranslateKbdMsg( HWND32 hTopWnd, DWORD first, DWORD last,
 	  /* Send the message to the active window instead,  */
 	  /* translating messages to their WM_SYS equivalent */
 
-	hWnd = GetActiveWindow32();
+	hWnd = GetActiveWindow();
 
 	if( message < WM_SYSKEYDOWN )
 	    message += WM_SYSKEYDOWN - WM_KEYDOWN;
     }
     pWnd = WIN_FindWndPtr( hWnd );
-    if (pWnd && (pWnd->hmemTaskQ != GetFastQueue()))
+    if (pWnd && (pWnd->hmemTaskQ != GetFastQueue16()))
     {
         /* Not for the current task */
-        MESSAGEQUEUE *queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() );
+        MESSAGEQUEUE *queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() );
         if (queue) QUEUE_ClearWakeBit( queue, QS_KEY );
         QUEUE_Unlock( queue );
         
@@ -308,7 +308,7 @@ static DWORD MSG_TranslateKbdMsg( HWND32 hTopWnd, DWORD first, DWORD last,
     }
 
     if (hTopWnd && hWnd != hTopWnd)
-	if (!IsChild32(hTopWnd, hWnd)) return SYSQ_MSG_CONTINUE;
+	if (!IsChild(hTopWnd, hWnd)) return SYSQ_MSG_CONTINUE;
     if (!MSG_CheckFilter(message, first, last)) return SYSQ_MSG_CONTINUE;
 
     msg->hwnd = hWnd;
@@ -325,9 +325,9 @@ static DWORD MSG_TranslateKbdMsg( HWND32 hTopWnd, DWORD first, DWORD last,
  *
  * Build an EVENTMSG structure and call JOURNALRECORD hook
  */
-static void MSG_JournalRecordMsg( MSG32 *msg )
+static void MSG_JournalRecordMsg( MSG *msg )
 {
-    EVENTMSG32 *event = (EVENTMSG32 *) HeapAlloc(SystemHeap, 0, sizeof(EVENTMSG32));
+    EVENTMSG *event = (EVENTMSG *) HeapAlloc(SystemHeap, 0, sizeof(EVENTMSG));
     if (!event) return;
     event->message = msg->message;
     event->time = msg->time;
@@ -337,14 +337,14 @@ static void MSG_JournalRecordMsg( MSG32 *msg )
         event->paramH = msg->lParam & 0x7FFF;  
         if (HIWORD(msg->lParam) & 0x0100)
             event->paramH |= 0x8000;               /* special_key - bit */
-        HOOK_CallHooks32A( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)event );
+        HOOK_CallHooksA( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)event );
     }
     else if ((msg->message >= WM_MOUSEFIRST) && (msg->message <= WM_MOUSELAST))
     {
         event->paramL = LOWORD(msg->lParam);       /* X pos */
         event->paramH = HIWORD(msg->lParam);       /* Y pos */ 
         ClientToScreen16( msg->hwnd, (LPPOINT16)&event->paramL );
-        HOOK_CallHooks32A( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)event );
+        HOOK_CallHooksA( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)event );
     }
     else if ((msg->message >= WM_NCMOUSEFIRST) &&
              (msg->message <= WM_NCMOUSELAST))
@@ -352,7 +352,7 @@ static void MSG_JournalRecordMsg( MSG32 *msg )
         event->paramL = LOWORD(msg->lParam);       /* X pos */
         event->paramH = HIWORD(msg->lParam);       /* Y pos */ 
         event->message += WM_MOUSEMOVE-WM_NCMOUSEMOVE;/* give no info about NC area */
-        HOOK_CallHooks32A( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)event );
+        HOOK_CallHooksA( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)event );
     }
     
     HeapFree(SystemHeap, 0, event);
@@ -365,16 +365,16 @@ static void MSG_JournalRecordMsg( MSG32 *msg )
  */
 static int MSG_JournalPlayBackMsg(void)
 {
- EVENTMSG32 *tmpMsg;
+ EVENTMSG *tmpMsg;
  long wtime,lParam,wParam;
  WORD keyDown,i,result=0;
 
  if ( HOOK_IsHooked( WH_JOURNALPLAYBACK ) )
  {
-  tmpMsg = (EVENTMSG32 *) HeapAlloc(SystemHeap, 0, sizeof(EVENTMSG32));
+  tmpMsg = (EVENTMSG *) HeapAlloc(SystemHeap, 0, sizeof(EVENTMSG));
   if (!tmpMsg) return result;
   
-  wtime=HOOK_CallHooks32A( WH_JOURNALPLAYBACK, HC_GETNEXT, 0,
+  wtime=HOOK_CallHooksA( WH_JOURNALPLAYBACK, HC_GETNEXT, 0,
                            (LPARAM) tmpMsg );
   /*  TRACE(msg,"Playback wait time =%ld\n",wtime); */
   if (wtime<=0)
@@ -427,7 +427,7 @@ static int MSG_JournalPlayBackMsg(void)
      AsyncKeyStateTable[VK_LBUTTON]= InputKeyStateTable[VK_LBUTTON] = MouseButtonsStates[0] ? 0x80 : 0;
      AsyncKeyStateTable[VK_MBUTTON]= InputKeyStateTable[VK_MBUTTON] = MouseButtonsStates[1] ? 0x80 : 0;
      AsyncKeyStateTable[VK_RBUTTON]= InputKeyStateTable[VK_RBUTTON] = MouseButtonsStates[2] ? 0x80 : 0;
-     SetCursorPos32(tmpMsg->paramL,tmpMsg->paramH);
+     SetCursorPos(tmpMsg->paramL,tmpMsg->paramH);
      lParam=MAKELONG(tmpMsg->paramL,tmpMsg->paramH);
      wParam=0;             
      if (MouseButtonsStates[0]) wParam |= MK_LBUTTON;
@@ -437,7 +437,7 @@ static int MSG_JournalPlayBackMsg(void)
                      tmpMsg->paramL, tmpMsg->paramH, tmpMsg->time, 0 );
     }
    }
-   HOOK_CallHooks32A( WH_JOURNALPLAYBACK, HC_SKIP, 0,
+   HOOK_CallHooksA( WH_JOURNALPLAYBACK, HC_SKIP, 0,
                       (LPARAM) tmpMsg);
   }
   else
@@ -445,7 +445,7 @@ static int MSG_JournalPlayBackMsg(void)
       
     if( tmpMsg->message == WM_QUEUESYNC )
         if (HOOK_IsHooked( WH_CBT ))
-            HOOK_CallHooks32A( WH_CBT, HCBT_QS, 0, 0L);
+            HOOK_CallHooksA( WH_CBT, HCBT_QS, 0, 0L);
 
     result= QS_MOUSE | QS_KEY; /* ? */
   }
@@ -459,8 +459,8 @@ static int MSG_JournalPlayBackMsg(void)
  *
  * Peek for a hardware message matching the hwnd and message filters.
  */
-static BOOL32 MSG_PeekHardwareMsg( MSG32 *msg, HWND32 hwnd, DWORD first, DWORD last,
-                                   BOOL32 remove )
+static BOOL MSG_PeekHardwareMsg( MSG *msg, HWND hwnd, DWORD first, DWORD last,
+                                   BOOL remove )
 {
     /* FIXME: should deal with MSG32 instead of MSG16 */
     
@@ -492,10 +492,10 @@ static BOOL32 MSG_PeekHardwareMsg( MSG32 *msg, HWND32 hwnd, DWORD first, DWORD l
 
         if ((msg->message >= WM_MOUSEFIRST) && (msg->message <= WM_MOUSELAST))
         {
-            HWND32 hWndScope = (HWND32)qmsg->extraInfo;
+            HWND hWndScope = (HWND)qmsg->extraInfo;
 
 	    status = MSG_TranslateMouseMsg(hwnd, first, last, msg, remove,
-					  (Options.managed && IsWindow32(hWndScope) ) 
+					  (Options.managed && IsWindow(hWndScope) ) 
 					   ? WIN_FindWndPtr(hWndScope) : WIN_GetDesktop() );
 	    kbd_msg = 0;
         }
@@ -509,7 +509,7 @@ static BOOL32 MSG_PeekHardwareMsg( MSG32 *msg, HWND32 hwnd, DWORD first, DWORD l
             HARDWAREHOOKSTRUCT16 *hook;
             if ((hook = SEGPTR_NEW(HARDWAREHOOKSTRUCT16)))
             {
-                BOOL32 ret;
+                BOOL ret;
                 hook->hWnd     = msg->hwnd;
                 hook->wMessage = msg->message & 0xffff;
                 hook->wParam   = LOWORD (msg->wParam);
@@ -584,14 +584,14 @@ static BOOL32 MSG_PeekHardwareMsg( MSG32 *msg, HWND32 hwnd, DWORD first, DWORD l
  */
 void WINAPI SetDoubleClickTime16( UINT16 interval )
 {
-    SetDoubleClickTime32( interval );
+    SetDoubleClickTime( interval );
 }		
 
 
 /**********************************************************************
  *           SetDoubleClickTime32   (USER32.480)
  */
-BOOL32 WINAPI SetDoubleClickTime32( UINT32 interval )
+BOOL WINAPI SetDoubleClickTime( UINT interval )
 {
     doubleClickSpeed = interval ? interval : 500;
     return TRUE;
@@ -610,7 +610,7 @@ UINT16 WINAPI GetDoubleClickTime16(void)
 /**********************************************************************
  *           GetDoubleClickTime32   (USER32.239)
  */
-UINT32 WINAPI GetDoubleClickTime32(void)
+UINT WINAPI GetDoubleClickTime(void)
 {
     return doubleClickSpeed;
 }		
@@ -621,21 +621,21 @@ UINT32 WINAPI GetDoubleClickTime32(void)
  *
  * Implementation of an inter-task SendMessage.
  */
-static LRESULT MSG_SendMessage( HQUEUE16 hDestQueue, HWND32 hwnd, UINT32 msg,
-                                WPARAM32 wParam, LPARAM lParam, WORD flags )
+static LRESULT MSG_SendMessage( HQUEUE16 hDestQueue, HWND hwnd, UINT msg,
+                                WPARAM wParam, LPARAM lParam, WORD flags )
 {
     MESSAGEQUEUE *queue, *destQ;
     SMSG         *smsg;
     LRESULT      lResult = 0;
 
-    if (IsTaskLocked() || !IsWindow32(hwnd))
+    if (IsTaskLocked16() || !IsWindow(hwnd))
         return 0;
 
     /* create a SMSG structure to hold SendMessage() parameters */
     if (! (smsg = (SMSG *) HeapAlloc( SystemHeap, 0, sizeof(SMSG) )) )
         return 0;
           
-    if (!(queue = (MESSAGEQUEUE*)QUEUE_Lock( GetFastQueue() ))) return 0;
+    if (!(queue = (MESSAGEQUEUE*)QUEUE_Lock( GetFastQueue16() ))) return 0;
 
     if (!(destQ = (MESSAGEQUEUE*)QUEUE_Lock( hDestQueue )))
     {
@@ -653,7 +653,7 @@ static LRESULT MSG_SendMessage( HQUEUE16 hDestQueue, HWND32 hwnd, UINT32 msg,
     smsg->lParam = lParam;
     
     smsg->lResult = 0;
-    smsg->hSrcQueue = GetFastQueue();
+    smsg->hSrcQueue = GetFastQueue16();
     smsg->hDstQueue = hDestQueue;
     smsg->flags = flags;
 
@@ -669,7 +669,7 @@ static LRESULT MSG_SendMessage( HQUEUE16 hDestQueue, HWND32 hwnd, UINT32 msg,
     {
         /* force destination task to run next, if 16 bit threads */
         if (THREAD_IsWin16(THREAD_Current()) && THREAD_IsWin16(destQ->thdb) )
-            DirectedYield( destQ->thdb->teb.htask16 );
+            DirectedYield16( destQ->thdb->teb.htask16 );
 
         QUEUE_WaitBits( QS_SMRESULT );
 
@@ -730,20 +730,20 @@ static LRESULT MSG_SendMessage( HQUEUE16 hDestQueue, HWND32 hwnd, UINT32 msg,
  */
 void WINAPI ReplyMessage16( LRESULT result )
 {
-    ReplyMessage32( result );
+    ReplyMessage( result );
 }
 
 /***********************************************************************
  *           ReplyMessage   (USER.115)
  */
-BOOL32 WINAPI ReplyMessage32( LRESULT result )
+BOOL WINAPI ReplyMessage( LRESULT result )
 {
     MESSAGEQUEUE *senderQ = 0;
     MESSAGEQUEUE *queue = 0;
     SMSG         *smsg;
-    BOOL32       ret = FALSE;
+    BOOL       ret = FALSE;
 
-    if (!(queue = (MESSAGEQUEUE*)QUEUE_Lock( GetFastQueue() ))) return FALSE;
+    if (!(queue = (MESSAGEQUEUE*)QUEUE_Lock( GetFastQueue16() ))) return FALSE;
 
     TRACE(sendmsg,"ReplyMessage, queue %04x\n", queue->self);
 
@@ -793,7 +793,7 @@ BOOL32 WINAPI ReplyMessage32( LRESULT result )
 
     /* switch directly to sending task (16 bit thread only) */
     if (THREAD_IsWin16( THREAD_Current() ))
-        DirectedYield( senderQ->thdb->teb.htask16 );
+        DirectedYield16( senderQ->thdb->teb.htask16 );
 
     ret = TRUE;
     
@@ -809,8 +809,8 @@ ReplyMessageDone:
 /***********************************************************************
  *           MSG_PeekMessage
  */
-static BOOL32 MSG_PeekMessage( LPMSG32 msg, HWND32 hwnd, DWORD first, DWORD last,
-                               WORD flags, BOOL32 peek )
+static BOOL MSG_PeekMessage( LPMSG msg, HWND hwnd, DWORD first, DWORD last,
+                               WORD flags, BOOL peek )
 {
     int mask;
     MESSAGEQUEUE *msgQueue;
@@ -834,7 +834,7 @@ static BOOL32 MSG_PeekMessage( LPMSG32 msg, HWND32 hwnd, DWORD first, DWORD last
     }
     else mask |= QS_MOUSE | QS_KEY | QS_TIMER | QS_PAINT;
 
-    if (IsTaskLocked()) flags |= PM_NOYIELD;
+    if (IsTaskLocked16()) flags |= PM_NOYIELD;
 
     /* Never yield on Win32 threads */
     if (!THREAD_IsWin16(THREAD_Current())) flags |= PM_NOYIELD;
@@ -843,7 +843,7 @@ static BOOL32 MSG_PeekMessage( LPMSG32 msg, HWND32 hwnd, DWORD first, DWORD last
     {    
         QMSG *qmsg;
         
-	hQueue   = GetFastQueue();
+	hQueue   = GetFastQueue16();
         msgQueue = (MESSAGEQUEUE *)QUEUE_Lock( hQueue );
         if (!msgQueue) return FALSE;
         msgQueue->changeBits = 0;
@@ -938,7 +938,7 @@ static BOOL32 MSG_PeekMessage( LPMSG32 msg, HWND32 hwnd, DWORD first, DWORD last
 
         if (!(flags & PM_NOYIELD))
         {
-            UserYield();
+            UserYield16();
             while (msgQueue->wakeBits & QS_SENDMESSAGE)
                 QUEUE_ReceiveMessage( msgQueue );
         }
@@ -949,7 +949,7 @@ static BOOL32 MSG_PeekMessage( LPMSG32 msg, HWND32 hwnd, DWORD first, DWORD last
 
         if (peek)
         {
-            if (!(flags & PM_NOYIELD)) UserYield();
+            if (!(flags & PM_NOYIELD)) UserYield16();
             
             QUEUE_Unlock( msgQueue );
             return FALSE;
@@ -991,8 +991,8 @@ static BOOL32 MSG_PeekMessage( LPMSG32 msg, HWND32 hwnd, DWORD first, DWORD last
  * 'hwnd' must be the handle of the dialog or menu window.
  * 'code' is the message filter value (MSGF_??? codes).
  */
-BOOL32 MSG_InternalGetMessage( MSG32 *msg, HWND32 hwnd, HWND32 hwndOwner,
-                               WPARAM32 code, WORD flags, BOOL32 sendIdle ) 
+BOOL MSG_InternalGetMessage( MSG *msg, HWND hwnd, HWND hwndOwner,
+                               WPARAM code, WORD flags, BOOL sendIdle ) 
 {
     for (;;)
     {
@@ -1001,8 +1001,8 @@ BOOL32 MSG_InternalGetMessage( MSG32 *msg, HWND32 hwnd, HWND32 hwndOwner,
 	    if (!MSG_PeekMessage( msg, 0, 0, 0, flags, TRUE ))
 	    {
 		  /* No message present -> send ENTERIDLE and wait */
-                if (IsWindow32(hwndOwner))
-                    SendMessage32A( hwndOwner, WM_ENTERIDLE,
+                if (IsWindow(hwndOwner))
+                    SendMessageA( hwndOwner, WM_ENTERIDLE,
                                    code, (LPARAM)hwnd );
 		MSG_PeekMessage( msg, 0, 0, 0, flags, FALSE );
 	    }
@@ -1014,14 +1014,14 @@ BOOL32 MSG_InternalGetMessage( MSG32 *msg, HWND32 hwnd, HWND32 hwndOwner,
 
         if (HOOK_IsHooked( WH_SYSMSGFILTER ) || HOOK_IsHooked( WH_MSGFILTER ))
         {
-            MSG32 *pmsg = HeapAlloc( SystemHeap, 0, sizeof(MSG32) );
+            MSG *pmsg = HeapAlloc( SystemHeap, 0, sizeof(MSG) );
             if (pmsg)
             {
-                BOOL32 ret;
+                BOOL ret;
                 *pmsg = *msg;
-                ret = (HOOK_CallHooks32A( WH_SYSMSGFILTER, code, 0,
+                ret = (HOOK_CallHooksA( WH_SYSMSGFILTER, code, 0,
                                           (LPARAM) pmsg ) ||
-                       HOOK_CallHooks32A( WH_MSGFILTER, code, 0,
+                       HOOK_CallHooksA( WH_MSGFILTER, code, 0,
                                           (LPARAM) pmsg ));
                        
                 HeapFree( SystemHeap, 0, pmsg );
@@ -1047,9 +1047,9 @@ BOOL32 MSG_InternalGetMessage( MSG32 *msg, HWND32 hwnd, HWND32 hwndOwner,
 BOOL16 WINAPI PeekMessage16( LPMSG16 lpmsg, HWND16 hwnd, UINT16 first,
                              UINT16 last, UINT16 flags )
 {
-    MSG32 msg32;
+    MSG msg32;
     BOOL16 ret;
-    ret = PeekMessage32A(&msg32, hwnd, first, last, flags);
+    ret = PeekMessageA(&msg32, hwnd, first, last, flags);
     STRUCT32_MSG32to16(&msg32, lpmsg);
     return ret;
 }
@@ -1057,7 +1057,7 @@ BOOL16 WINAPI PeekMessage16( LPMSG16 lpmsg, HWND16 hwnd, UINT16 first,
 /***********************************************************************
  *         WIN16_PeekMessage32   (USER.819)
  */
-BOOL16 WINAPI WIN16_PeekMessage32( LPMSG16_32 lpmsg16_32, HWND16 hwnd,
+BOOL16 WINAPI PeekMessage32_16( LPMSG16_32 lpmsg16_32, HWND16 hwnd,
                UINT16 first, UINT16 last, UINT16 flags, BOOL16 wHaveParamHigh )
 {
     if (wHaveParamHigh == FALSE)
@@ -1067,11 +1067,11 @@ BOOL16 WINAPI WIN16_PeekMessage32( LPMSG16_32 lpmsg16_32, HWND16 hwnd,
     }
     else
     {
-        MSG32 msg32;
+        MSG msg32;
         BOOL16 ret;
 
-        ret = (BOOL16)PeekMessage32A(&msg32, (HWND32)hwnd,
-                                   (UINT32)first, (UINT32)last, (UINT32)flags);
+        ret = (BOOL16)PeekMessageA(&msg32, (HWND)hwnd,
+                                   (UINT)first, (UINT)last, (UINT)flags);
         lpmsg16_32->msg.hwnd    = msg32.hwnd;
         lpmsg16_32->msg.message = msg32.message;
         lpmsg16_32->msg.wParam  = LOWORD(msg32.wParam);
@@ -1088,8 +1088,8 @@ BOOL16 WINAPI WIN16_PeekMessage32( LPMSG16_32 lpmsg16_32, HWND16 hwnd,
 /***********************************************************************
  *         PeekMessageA
  */
-BOOL32 WINAPI PeekMessage32A( LPMSG32 lpmsg, HWND32 hwnd,
-                              UINT32 min,UINT32 max,UINT32 wRemoveMsg)
+BOOL WINAPI PeekMessageA( LPMSG lpmsg, HWND hwnd,
+                              UINT min,UINT max,UINT wRemoveMsg)
 {
     return MSG_PeekMessage( lpmsg, hwnd, min, max, wRemoveMsg, TRUE );
 }
@@ -1121,15 +1121,15 @@ BOOL32 WINAPI PeekMessage32A( LPMSG32 lpmsg, HWND32 hwnd,
  * ECMA-234, Win32
  *
  */
-BOOL32 WINAPI PeekMessage32W( 
-  LPMSG32 lpmsg,    /* buffer to receive message */
-  HWND32 hwnd,      /* restrict to messages for hwnd */
-  UINT32 min,       /* minimum message to receive */
-  UINT32 max,       /* maximum message to receive */
-  UINT32 wRemoveMsg /* removal flags */ 
+BOOL WINAPI PeekMessageW( 
+  LPMSG lpmsg,    /* buffer to receive message */
+  HWND hwnd,      /* restrict to messages for hwnd */
+  UINT min,       /* minimum message to receive */
+  UINT max,       /* maximum message to receive */
+  UINT wRemoveMsg /* removal flags */ 
 ) {
 	/* FIXME: Should perform Unicode translation on specific messages */
-	return PeekMessage32A(lpmsg,hwnd,min,max,wRemoveMsg);
+	return PeekMessageA(lpmsg,hwnd,min,max,wRemoveMsg);
 }
 
 /***********************************************************************
@@ -1137,11 +1137,11 @@ BOOL32 WINAPI PeekMessage32W(
  */
 BOOL16 WINAPI GetMessage16( SEGPTR msg, HWND16 hwnd, UINT16 first, UINT16 last)
 {
-    BOOL32 ret;
+    BOOL ret;
     MSG16 *lpmsg = (MSG16 *)PTR_SEG_TO_LIN(msg);
-    MSG32 msg32;
+    MSG msg32;
         
-    ret = GetMessage32A( &msg32, hwnd, first, last );
+    ret = GetMessageA( &msg32, hwnd, first, last );
 
     STRUCT32_MSG32to16( &msg32, lpmsg );
 
@@ -1154,10 +1154,10 @@ BOOL16 WINAPI GetMessage16( SEGPTR msg, HWND16 hwnd, UINT16 first, UINT16 last)
 /***********************************************************************
  *          WIN16_GetMessage32   (USER.820)
  */
-BOOL16 WINAPI WIN16_GetMessage32( SEGPTR msg16_32, HWND16 hWnd, UINT16 first,
+BOOL16 WINAPI GetMessage32_16( SEGPTR msg16_32, HWND16 hWnd, UINT16 first,
                      UINT16 last, BOOL16 wHaveParamHigh )
 {
-    MSG16_32 *lpmsg16_32 = (MSG16_32 *)PTR_SEG_TO_LIN(msg16_32);
+    MSG32_16 *lpmsg16_32 = (MSG32_16 *)PTR_SEG_TO_LIN(msg16_32);
 
     if (wHaveParamHigh == FALSE) /* normal GetMessage16 call */
     {
@@ -1168,10 +1168,10 @@ BOOL16 WINAPI WIN16_GetMessage32( SEGPTR msg16_32, HWND16 hWnd, UINT16 first,
     }
     else
     {
-        MSG32 msg32;
+        MSG msg32;
         BOOL16 ret;
 
-        ret = (BOOL16)GetMessage32A(&msg32, hWnd, first, last);
+        ret = (BOOL16)GetMessageA(&msg32, hWnd, first, last);
         lpmsg16_32->msg.hwnd	= msg32.hwnd;
         lpmsg16_32->msg.message	= msg32.message;
         lpmsg16_32->msg.wParam	= LOWORD(msg32.wParam);
@@ -1187,14 +1187,14 @@ BOOL16 WINAPI WIN16_GetMessage32( SEGPTR msg16_32, HWND16 hWnd, UINT16 first,
 /***********************************************************************
  *          GetMessage32A   (USER32.270)
  */
-BOOL32 WINAPI GetMessage32A(MSG32* lpmsg,HWND32 hwnd,UINT32 min,UINT32 max)
+BOOL WINAPI GetMessageA(MSG* lpmsg,HWND hwnd,UINT min,UINT max)
 {
     MSG_PeekMessage( lpmsg, hwnd, min, max, PM_REMOVE, FALSE );
     
     TRACE(msg,"message %04x, hwnd %04x, filter(%04x - %04x)\n", lpmsg->message,
           hwnd, min, max );
     
-    HOOK_CallHooks32A( WH_GETMESSAGE, HC_ACTION, 0, (LPARAM)lpmsg );
+    HOOK_CallHooksA( WH_GETMESSAGE, HC_ACTION, 0, (LPARAM)lpmsg );
 
     return (lpmsg->message != WM_QUIT);
 }
@@ -1226,14 +1226,14 @@ BOOL32 WINAPI GetMessage32A(MSG32* lpmsg,HWND32 hwnd,UINT32 min,UINT32 max)
  * ECMA-234, Win32
  * 
  */
-BOOL32 WINAPI GetMessage32W(
-  MSG32* lpmsg, /* buffer to receive message */
-  HWND32 hwnd,  /* restrict to messages for hwnd */
-  UINT32 min,   /* minimum message to receive */
-  UINT32 max    /* maximum message to receive */
+BOOL WINAPI GetMessageW(
+  MSG* lpmsg, /* buffer to receive message */
+  HWND hwnd,  /* restrict to messages for hwnd */
+  UINT min,   /* minimum message to receive */
+  UINT max    /* maximum message to receive */
 ) {
     /* FIXME */
-    return GetMessage32A(lpmsg, hwnd, min, max);
+    return GetMessageA(lpmsg, hwnd, min, max);
 }
 
 
@@ -1243,17 +1243,17 @@ BOOL32 WINAPI GetMessage32W(
 BOOL16 WINAPI PostMessage16( HWND16 hwnd, UINT16 message, WPARAM16 wParam,
                              LPARAM lParam )
 {
-    return (BOOL16) PostMessage32A( hwnd, message, wParam, lParam );
+    return (BOOL16) PostMessageA( hwnd, message, wParam, lParam );
 }
 
 
 /***********************************************************************
  *           PostMessage32A   (USER32.419)
  */
-BOOL32 WINAPI PostMessage32A( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
+BOOL WINAPI PostMessageA( HWND hwnd, UINT message, WPARAM wParam,
                               LPARAM lParam )
 {
-    MSG32       msg;
+    MSG       msg;
     WND 	*wndPtr;
 
     msg.hwnd    = hwnd;
@@ -1278,7 +1278,7 @@ BOOL32 WINAPI PostMessage32A( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
             {
                 TRACE(msg,"BROADCAST Message to hWnd=%04x m=%04X w=%04X l=%08lX !\n",
                             wndPtr->hwndSelf, message, wParam, lParam);
-                PostMessage32A( wndPtr->hwndSelf, message, wParam, lParam );
+                PostMessageA( wndPtr->hwndSelf, message, wParam, lParam );
             }
         }
         TRACE(msg,"End of HWND_BROADCAST !\n");
@@ -1295,11 +1295,11 @@ BOOL32 WINAPI PostMessage32A( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 /***********************************************************************
  *           PostMessage32W   (USER32.420)
  */
-BOOL32 WINAPI PostMessage32W( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
+BOOL WINAPI PostMessageW( HWND hwnd, UINT message, WPARAM wParam,
                               LPARAM lParam )
 {
   /* FIXME */
-  return PostMessage32A( hwnd, message, wParam, lParam );
+  return PostMessageA( hwnd, message, wParam, lParam );
 }
 
 
@@ -1309,9 +1309,9 @@ BOOL32 WINAPI PostMessage32W( HWND32 hwnd, UINT32 message, WPARAM32 wParam,
 BOOL16 WINAPI PostAppMessage16( HTASK16 hTask, UINT16 message, WPARAM16 wParam,
                                 LPARAM lParam )
 {
-    MSG32 msg;
+    MSG msg;
 
-    if (GetTaskQueue(hTask) == 0) return FALSE;
+    if (GetTaskQueue16(hTask) == 0) return FALSE;
     msg.hwnd    = 0;
     msg.message = message;
     msg.wParam  = wParam;
@@ -1320,7 +1320,7 @@ BOOL16 WINAPI PostAppMessage16( HTASK16 hTask, UINT16 message, WPARAM16 wParam,
     msg.pt.x    = 0;
     msg.pt.y    = 0;
 
-    return QUEUE_AddMsg( GetTaskQueue(hTask), &msg, 0 );
+    return QUEUE_AddMsg( GetTaskQueue16(hTask), &msg, 0 );
 }
 
 
@@ -1347,7 +1347,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
         for (ppWnd = list; *ppWnd; ppWnd++)
         {
             wndPtr = *ppWnd;
-            if (!IsWindow32(wndPtr->hwndSelf)) continue;
+            if (!IsWindow(wndPtr->hwndSelf)) continue;
             if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
             {
                 TRACE(msg,"BROADCAST Message to hWnd=%04x m=%04X w=%04lX l=%08lX !\n",
@@ -1390,7 +1390,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 
     SPY_EnterMessage( SPY_SENDMESSAGE16, hwnd, msg, wParam, lParam );
 
-    if (wndPtr->hmemTaskQ != GetFastQueue())
+    if (wndPtr->hmemTaskQ != GetFastQueue16())
         ret = MSG_SendMessage( wndPtr->hmemTaskQ, hwnd, msg,
                                wParam, lParam, 0 );
     else
@@ -1404,17 +1404,17 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 /************************************************************************
  *	     MSG_CallWndProcHook32
  */
-static void  MSG_CallWndProcHook32( LPMSG32 pmsg, BOOL32 bUnicode )
+static void  MSG_CallWndProcHook( LPMSG pmsg, BOOL bUnicode )
 {
-   CWPSTRUCT32 cwp;
+   CWPSTRUCT cwp;
 
    cwp.lParam = pmsg->lParam;
    cwp.wParam = pmsg->wParam;
    cwp.message = pmsg->message;
    cwp.hwnd = pmsg->hwnd;
 
-   if (bUnicode) HOOK_CallHooks32W(WH_CALLWNDPROC, HC_ACTION, 1, (LPARAM)&cwp);
-   else HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 1, (LPARAM)&cwp );
+   if (bUnicode) HOOK_CallHooksW(WH_CALLWNDPROC, HC_ACTION, 1, (LPARAM)&cwp);
+   else HOOK_CallHooksA( WH_CALLWNDPROC, HC_ACTION, 1, (LPARAM)&cwp );
 
    pmsg->lParam = cwp.lParam;
    pmsg->wParam = cwp.wParam;
@@ -1430,13 +1430,13 @@ static void  MSG_CallWndProcHook32( LPMSG32 pmsg, BOOL32 bUnicode )
  *  Thread-local message queues are not supported.
  * 
  */
-BOOL32 WINAPI PostThreadMessage32A(DWORD idThread , UINT32 message,
-                                   WPARAM32 wParam, LPARAM lParam )
+BOOL WINAPI PostThreadMessageA(DWORD idThread , UINT message,
+                                   WPARAM wParam, LPARAM lParam )
 {
-    MSG32 msg;
+    MSG msg;
     HQUEUE16 hQueue;
 
-    if ((hQueue = GetThreadQueue(idThread)) == 0)
+    if ((hQueue = GetThreadQueue16(idThread)) == 0)
         return FALSE;
     
     msg.hwnd    = 0;
@@ -1458,17 +1458,17 @@ BOOL32 WINAPI PostThreadMessage32A(DWORD idThread , UINT32 message,
  *  Thread-local message queues are not supported.
  * 
  */
-BOOL32 WINAPI PostThreadMessage32W(DWORD idThread , UINT32 message,
-                                   WPARAM32 wParam, LPARAM lParam )
+BOOL WINAPI PostThreadMessageW(DWORD idThread , UINT message,
+                                   WPARAM wParam, LPARAM lParam )
 {
    FIXME(sendmsg, "(...): Should do unicode/ascii conversion!\n");
-   return PostThreadMessage32A(idThread, message, wParam, lParam);
+   return PostThreadMessageA(idThread, message, wParam, lParam);
 }
 
 /***********************************************************************
  *           SendMessage32A   (USER32.454)
  */
-LRESULT WINAPI SendMessage32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
+LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wParam,
                                LPARAM lParam )
 {
     WND * wndPtr;
@@ -1482,16 +1482,16 @@ LRESULT WINAPI SendMessage32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
         for (ppWnd = list; *ppWnd; ppWnd++)
         {
             wndPtr = *ppWnd;
-            if (!IsWindow32(wndPtr->hwndSelf)) continue;
+            if (!IsWindow(wndPtr->hwndSelf)) continue;
             if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
-                SendMessage32A( wndPtr->hwndSelf, msg, wParam, lParam );
+                SendMessageA( wndPtr->hwndSelf, msg, wParam, lParam );
         }
 	HeapFree( SystemHeap, 0, list );
         return TRUE;
     }
 
     if (HOOK_IsHooked( WH_CALLWNDPROC ))
-	MSG_CallWndProcHook32( (LPMSG32)&hwnd, FALSE);
+	MSG_CallWndProcHook( (LPMSG)&hwnd, FALSE);
 
     if (!(wndPtr = WIN_FindWndPtr( hwnd )))
     {
@@ -1502,16 +1502,16 @@ LRESULT WINAPI SendMessage32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
     if (QUEUE_IsExitingQueue(wndPtr->hmemTaskQ))
         return 0;  /* Don't send anything if the task is dying */
 
-    SPY_EnterMessage( SPY_SENDMESSAGE32, hwnd, msg, wParam, lParam );
+    SPY_EnterMessage( SPY_SENDMESSAGE, hwnd, msg, wParam, lParam );
 
-    if (wndPtr->hmemTaskQ != GetFastQueue())
+    if (wndPtr->hmemTaskQ != GetFastQueue16())
         ret = MSG_SendMessage( wndPtr->hmemTaskQ, hwnd, msg, wParam, lParam,
                                SMSG_WIN32 );
     else
-        ret = CallWindowProc32A( (WNDPROC32)wndPtr->winproc,
+        ret = CallWindowProcA( (WNDPROC)wndPtr->winproc,
                                  hwnd, msg, wParam, lParam );
 
-    SPY_ExitMessage( SPY_RESULT_OK32, hwnd, msg, ret );
+    SPY_ExitMessage( SPY_RESULT_OK, hwnd, msg, ret );
     return ret;
 }
 
@@ -1535,12 +1535,12 @@ LRESULT WINAPI SendMessage32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
  * 
  *  ECMA-234, Win32 
  */
-LRESULT WINAPI SendMessage32W( 
-  HWND32 hwnd,    /* Window to send message to. If HWND_BROADCAST, 
+LRESULT WINAPI SendMessageW( 
+  HWND hwnd,    /* Window to send message to. If HWND_BROADCAST, 
                  the message will be sent to all top-level windows. */
 
-  UINT32 msg,      /* message */
-  WPARAM32 wParam, /* message parameter */
+  UINT msg,      /* message */
+  WPARAM wParam, /* message parameter */
   LPARAM lParam    /* additional message parameter */
 ) {
     WND * wndPtr;
@@ -1554,16 +1554,16 @@ LRESULT WINAPI SendMessage32W(
         for (ppWnd = list; *ppWnd; ppWnd++)
         {
             wndPtr = *ppWnd;
-            if (!IsWindow32(wndPtr->hwndSelf)) continue;
+            if (!IsWindow(wndPtr->hwndSelf)) continue;
             if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
-                SendMessage32W( wndPtr->hwndSelf, msg, wParam, lParam );
+                SendMessageW( wndPtr->hwndSelf, msg, wParam, lParam );
         }
 	HeapFree( SystemHeap, 0, list );
         return TRUE;
     }
 
     if (HOOK_IsHooked( WH_CALLWNDPROC ))
-        MSG_CallWndProcHook32( (LPMSG32)&hwnd, TRUE);
+        MSG_CallWndProcHook( (LPMSG)&hwnd, TRUE);
 
     if (!(wndPtr = WIN_FindWndPtr( hwnd )))
     {
@@ -1573,16 +1573,16 @@ LRESULT WINAPI SendMessage32W(
     if (QUEUE_IsExitingQueue(wndPtr->hmemTaskQ))
         return 0;  /* Don't send anything if the task is dying */
 
-    SPY_EnterMessage( SPY_SENDMESSAGE32, hwnd, msg, wParam, lParam );
+    SPY_EnterMessage( SPY_SENDMESSAGE, hwnd, msg, wParam, lParam );
 
-    if (wndPtr->hmemTaskQ != GetFastQueue())
+    if (wndPtr->hmemTaskQ != GetFastQueue16())
         ret = MSG_SendMessage( wndPtr->hmemTaskQ, hwnd, msg, wParam, lParam,
                                 SMSG_WIN32 | SMSG_UNICODE );
     else
-        ret = CallWindowProc32W( (WNDPROC32)wndPtr->winproc,
+        ret = CallWindowProcW( (WNDPROC)wndPtr->winproc,
                                  hwnd, msg, wParam, lParam );
 
-    SPY_ExitMessage( SPY_RESULT_OK32, hwnd, msg, ret );
+    SPY_ExitMessage( SPY_RESULT_OK, hwnd, msg, ret );
     return ret;
 }
 
@@ -1602,24 +1602,24 @@ LRESULT WINAPI SendMessageTimeout16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 /***********************************************************************
  *           SendMessageTimeout32A   (USER32.457)
  */
-LRESULT WINAPI SendMessageTimeout32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
-				      LPARAM lParam, UINT32 flags,
-				      UINT32 timeout, LPDWORD resultp)
+LRESULT WINAPI SendMessageTimeoutA( HWND hwnd, UINT msg, WPARAM wParam,
+				      LPARAM lParam, UINT flags,
+				      UINT timeout, LPDWORD resultp)
 {
   FIXME(sendmsg, "(...): semistub\n");
-  return SendMessage32A (hwnd, msg, wParam, lParam);
+  return SendMessageA (hwnd, msg, wParam, lParam);
 }
 
 
 /***********************************************************************
  *           SendMessageTimeout32W   (USER32.458)
  */
-LRESULT WINAPI SendMessageTimeout32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
-				      LPARAM lParam, UINT32 flags,
-				      UINT32 timeout, LPDWORD resultp)
+LRESULT WINAPI SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wParam,
+				      LPARAM lParam, UINT flags,
+				      UINT timeout, LPDWORD resultp)
 {
   FIXME(sendmsg, "(...): semistub\n");
-  return SendMessage32W (hwnd, msg, wParam, lParam);
+  return SendMessageW (hwnd, msg, wParam, lParam);
 }
 
 
@@ -1648,15 +1648,15 @@ void WINAPI WaitMessage( void )
 /***********************************************************************
  *           MsgWaitForMultipleObjects    (USER32.400)
  */
-DWORD WINAPI MsgWaitForMultipleObjects( DWORD nCount, HANDLE32 *pHandles,
-                                        BOOL32 fWaitAll, DWORD dwMilliseconds,
+DWORD WINAPI MsgWaitForMultipleObjects( DWORD nCount, HANDLE *pHandles,
+                                        BOOL fWaitAll, DWORD dwMilliseconds,
                                         DWORD dwWakeMask )
 {
     DWORD i;
-    HANDLE32 handles[MAXIMUM_WAIT_OBJECTS];
+    HANDLE handles[MAXIMUM_WAIT_OBJECTS];
     DWORD ret;
 
-    HQUEUE16 hQueue = GetFastQueue();
+    HQUEUE16 hQueue = GetFastQueue16();
     MESSAGEQUEUE *msgQueue = (MESSAGEQUEUE *)QUEUE_Lock( hQueue );
     if (!msgQueue) return WAIT_FAILED;
 
@@ -1683,7 +1683,7 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD nCount, HANDLE32 *pHandles,
        * This will all go away when the real Win32 threads are implemented for all
        * the threads of an applications. Including the main thread.
        */
-      DWORD curTime = GetCurrentTime32();
+      DWORD curTime = GetCurrentTime();
 
       do
       {
@@ -1715,7 +1715,7 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD nCount, HANDLE32 *pHandles,
 	/*
 	 * And continue doing this until we hit the timeout.
 	 */
-      } while ((dwMilliseconds == INFINITE32) || (GetCurrentTime32()-curTime < dwMilliseconds) );
+      } while ((dwMilliseconds == INFINITE) || (GetCurrentTime()-curTime < dwMilliseconds) );
     }
     else
     {
@@ -1864,8 +1864,8 @@ static const struct accent_char accent_chars[] =
  * This produces WM_CHAR messages only for keys mapped to ASCII characters
  * by the keyboard driver.
  */
-static BOOL32 MSG_DoTranslateMessage( UINT32 message, HWND32 hwnd,
-                                      WPARAM32 wParam, LPARAM lParam )
+static BOOL MSG_DoTranslateMessage( UINT message, HWND hwnd,
+                                      WPARAM wParam, LPARAM lParam )
 {
     static int dead_char;
     BYTE wp[2];
@@ -1883,7 +1883,7 @@ static BOOL32 MSG_DoTranslateMessage( UINT32 message, HWND32 hwnd,
                  wParam, HIWORD(lParam) );
 
     /* FIXME : should handle ToAscii yielding 2 */
-    switch (ToAscii32(wParam, HIWORD(lParam),
+    switch (ToAscii(wParam, HIWORD(lParam),
                       QueueKeyStateTable,(LPWORD)wp, 0)) 
     {
     case 1 :
@@ -1939,14 +1939,14 @@ BOOL16 WINAPI TranslateMessage16( const MSG16 *msg )
 /***********************************************************************
  *           WIN16_TranslateMessage32   (USER.821)
  */
-BOOL16 WINAPI WIN16_TranslateMessage32( const MSG16_32 *msg, BOOL16 wHaveParamHigh )
+BOOL16 WINAPI TranslateMessage32_16( const MSG32_16 *msg, BOOL16 wHaveParamHigh )
 {
-    WPARAM32 wParam;
+    WPARAM wParam;
 
     if (wHaveParamHigh)
         wParam = MAKELONG(msg->msg.wParam, msg->wParamHigh);
     else
-        wParam = (WPARAM32)msg->msg.wParam;
+        wParam = (WPARAM)msg->msg.wParam;
 
     return MSG_DoTranslateMessage( msg->msg.message, msg->msg.hwnd,
                                    wParam, msg->msg.lParam );
@@ -1955,7 +1955,7 @@ BOOL16 WINAPI WIN16_TranslateMessage32( const MSG16_32 *msg, BOOL16 wHaveParamHi
 /***********************************************************************
  *           TranslateMessage32   (USER32.556)
  */
-BOOL32 WINAPI TranslateMessage32( const MSG32 *msg )
+BOOL WINAPI TranslateMessage( const MSG *msg )
 {
     return MSG_DoTranslateMessage( msg->message, msg->hwnd,
                                    msg->wParam, msg->lParam );
@@ -2001,7 +2001,7 @@ LONG WINAPI DispatchMessage16( const MSG16* msg )
 	    msg->hwnd);
 	wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
         /* Validate the update region to avoid infinite WM_PAINT loop */
-        ValidateRect32( msg->hwnd, NULL );
+        ValidateRect( msg->hwnd, NULL );
     }
     return retval;
 }
@@ -2010,29 +2010,29 @@ LONG WINAPI DispatchMessage16( const MSG16* msg )
 /***********************************************************************
  *           WIN16_DispatchMessage32   (USER.822)
  */
-LONG WINAPI WIN16_DispatchMessage32( const MSG16_32* lpmsg16_32, BOOL16 wHaveParamHigh )
+LONG WINAPI DispatchMessage32_16( const MSG32_16* lpmsg16_32, BOOL16 wHaveParamHigh )
 {
     if (wHaveParamHigh == FALSE)
         return DispatchMessage16(&(lpmsg16_32->msg));
     else
     {
-        MSG32 msg;
+        MSG msg;
 
         msg.hwnd = lpmsg16_32->msg.hwnd;
         msg.message = lpmsg16_32->msg.message;
         msg.wParam = MAKELONG(lpmsg16_32->msg.wParam, lpmsg16_32->wParamHigh);
         msg.lParam = lpmsg16_32->msg.lParam;
         msg.time = lpmsg16_32->msg.time;
-        msg.pt.x = (INT32)lpmsg16_32->msg.pt.x;
-        msg.pt.y = (INT32)lpmsg16_32->msg.pt.y;
-        return DispatchMessage32A(&msg);
+        msg.pt.x = (INT)lpmsg16_32->msg.pt.x;
+        msg.pt.y = (INT)lpmsg16_32->msg.pt.y;
+        return DispatchMessageA(&msg);
     }
 }
 
 /***********************************************************************
  *           DispatchMessage32A   (USER32.141)
  */
-LONG WINAPI DispatchMessage32A( const MSG32* msg )
+LONG WINAPI DispatchMessageA( const MSG* msg )
 {
     WND * wndPtr;
     LONG retval;
@@ -2044,7 +2044,7 @@ LONG WINAPI DispatchMessage32A( const MSG32* msg )
 	if (msg->lParam)
         {
 /*            HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
-	    return CallWindowProc32A( (WNDPROC32)msg->lParam, msg->hwnd,
+	    return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd,
                                    msg->message, msg->wParam, GetTickCount() );
         }
     }
@@ -2056,12 +2056,12 @@ LONG WINAPI DispatchMessage32A( const MSG32* msg )
     if (painting) wndPtr->flags |= WIN_NEEDS_BEGINPAINT;
 /*    HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
 
-    SPY_EnterMessage( SPY_DISPATCHMESSAGE32, msg->hwnd, msg->message,
+    SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message,
                       msg->wParam, msg->lParam );
-    retval = CallWindowProc32A( (WNDPROC32)wndPtr->winproc,
+    retval = CallWindowProcA( (WNDPROC)wndPtr->winproc,
                                 msg->hwnd, msg->message,
                                 msg->wParam, msg->lParam );
-    SPY_ExitMessage( SPY_RESULT_OK32, msg->hwnd, msg->message, retval );
+    SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval );
 
     if (painting && (wndPtr = WIN_FindWndPtr( msg->hwnd )) &&
         (wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
@@ -2070,7 +2070,7 @@ LONG WINAPI DispatchMessage32A( const MSG32* msg )
 	    msg->hwnd);
 	wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
         /* Validate the update region to avoid infinite WM_PAINT loop */
-        ValidateRect32( msg->hwnd, NULL );
+        ValidateRect( msg->hwnd, NULL );
     }
     return retval;
 }
@@ -2097,7 +2097,7 @@ LONG WINAPI DispatchMessage32A( const MSG32* msg )
  *   ECMA-234, Win32 
  *
  */
-LONG WINAPI DispatchMessage32W( const MSG32* msg )
+LONG WINAPI DispatchMessageW( const MSG* msg )
 {
     WND * wndPtr;
     LONG retval;
@@ -2109,7 +2109,7 @@ LONG WINAPI DispatchMessage32W( const MSG32* msg )
 	if (msg->lParam)
         {
 /*            HOOK_CallHooks32W( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
-	    return CallWindowProc32W( (WNDPROC32)msg->lParam, msg->hwnd,
+	    return CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd,
                                    msg->message, msg->wParam, GetTickCount() );
         }
     }
@@ -2121,12 +2121,12 @@ LONG WINAPI DispatchMessage32W( const MSG32* msg )
     if (painting) wndPtr->flags |= WIN_NEEDS_BEGINPAINT;
 /*    HOOK_CallHooks32W( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
 
-    SPY_EnterMessage( SPY_DISPATCHMESSAGE32, msg->hwnd, msg->message,
+    SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message,
                       msg->wParam, msg->lParam );
-    retval = CallWindowProc32W( (WNDPROC32)wndPtr->winproc,
+    retval = CallWindowProcW( (WNDPROC)wndPtr->winproc,
                                 msg->hwnd, msg->message,
                                 msg->wParam, msg->lParam );
-    SPY_ExitMessage( SPY_RESULT_OK32, msg->hwnd, msg->message, retval );
+    SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval );
 
     if (painting && (wndPtr = WIN_FindWndPtr( msg->hwnd )) &&
         (wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
@@ -2135,7 +2135,7 @@ LONG WINAPI DispatchMessage32W( const MSG32* msg )
 	    msg->hwnd);
 	wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
         /* Validate the update region to avoid infinite WM_PAINT loop */
-        ValidateRect32( msg->hwnd, NULL );
+        ValidateRect( msg->hwnd, NULL );
     }
     return retval;
 }
@@ -2154,20 +2154,20 @@ WORD WINAPI RegisterWindowMessage16( SEGPTR str )
 /***********************************************************************
  *           RegisterWindowMessage32A   (USER32.437)
  */
-WORD WINAPI RegisterWindowMessage32A( LPCSTR str )
+WORD WINAPI RegisterWindowMessageA( LPCSTR str )
 {
     TRACE(msg, "%s\n", str );
-    return GlobalAddAtom32A( str );
+    return GlobalAddAtomA( str );
 }
 
 
 /***********************************************************************
  *           RegisterWindowMessage32W   (USER32.438)
  */
-WORD WINAPI RegisterWindowMessage32W( LPCWSTR str )
+WORD WINAPI RegisterWindowMessageW( LPCWSTR str )
 {
     TRACE(msg, "%p\n", str );
-    return GlobalAddAtom32W( str );
+    return GlobalAddAtomW( str );
 }
 
 
@@ -2205,21 +2205,21 @@ DWORD WINAPI GetCurrentTime16(void)
  */
 BOOL16 WINAPI InSendMessage16(void)
 {
-    return InSendMessage32();
+    return InSendMessage();
 }
 
 
 /***********************************************************************
  *           InSendMessage32    (USER32.320)
  */
-BOOL32 WINAPI InSendMessage32(void)
+BOOL WINAPI InSendMessage(void)
 {
     MESSAGEQUEUE *queue;
-    BOOL32 ret;
+    BOOL ret;
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() )))
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
         return 0;
-    ret = (BOOL32)queue->smWaiting;
+    ret = (BOOL)queue->smWaiting;
 
     QUEUE_Unlock( queue );
     return ret;
@@ -2229,7 +2229,7 @@ BOOL32 WINAPI InSendMessage32(void)
  *           BroadcastSystemMessage    (USER32.12)
  */
 LONG WINAPI BroadcastSystemMessage(
-	DWORD dwFlags,LPDWORD recipients,UINT32 uMessage,WPARAM32 wParam,
+	DWORD dwFlags,LPDWORD recipients,UINT uMessage,WPARAM wParam,
 	LPARAM lParam
 ) {
 	FIXME(sendmsg,"(%08lx,%08lx,%08x,%08x,%08lx): stub!\n",
@@ -2245,16 +2245,16 @@ LONG WINAPI BroadcastSystemMessage(
  *  with a higher priority as the other "Posted" messages.
  *  QUEUE_AddMsg has to be modifyed.
  */
-BOOL32 WINAPI SendNotifyMessage32A(HWND32 hwnd,UINT32 msg,WPARAM32 wParam,LPARAM lParam)
-{	BOOL32 ret = TRUE;
+BOOL WINAPI SendNotifyMessageA(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
+{	BOOL ret = TRUE;
 	FIXME(msg,"(%04x,%08x,%08x,%08lx) not complete\n",
 	      hwnd, msg, wParam, lParam);
 	      
 	if ( GetCurrentThreadId() == GetWindowThreadProcessId ( hwnd, NULL))
-	{	ret=SendMessage32A ( hwnd, msg, wParam, lParam );
+	{	ret=SendMessageA ( hwnd, msg, wParam, lParam );
 	}
 	else
-	{	PostMessage32A ( hwnd, msg, wParam, lParam );
+	{	PostMessageA ( hwnd, msg, wParam, lParam );
 	}
 	return ret;
 }
@@ -2266,16 +2266,16 @@ BOOL32 WINAPI SendNotifyMessage32A(HWND32 hwnd,UINT32 msg,WPARAM32 wParam,LPARAM
  *  with a higher priority as the other "Posted" messages.
  *  QUEUE_AddMsg has to be modifyed.
  */
-BOOL32 WINAPI SendNotifyMessage32W(HWND32 hwnd,UINT32 msg,WPARAM32 wParam,LPARAM lParam)
-{       BOOL32 ret = TRUE;
+BOOL WINAPI SendNotifyMessageW(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
+{       BOOL ret = TRUE;
 	FIXME(msg,"(%04x,%08x,%08x,%08lx) not complete\n",
 	      hwnd, msg, wParam, lParam);
 
 	if ( GetCurrentThreadId() == GetWindowThreadProcessId ( hwnd, NULL))
-	{       ret=SendMessage32W ( hwnd, msg, wParam, lParam );
+	{       ret=SendMessageW ( hwnd, msg, wParam, lParam );
 	}
 	else
-	{       PostMessage32W ( hwnd, msg, wParam, lParam );
+	{       PostMessageW ( hwnd, msg, wParam, lParam );
 	}
 	return ret;
 }
@@ -2286,17 +2286,17 @@ BOOL32 WINAPI SendNotifyMessage32W(HWND32 hwnd,UINT32 msg,WPARAM32 wParam,LPARAM
  * is processed. We have to modify the message processing for a exact
  * implementation...
  */
-BOOL32 WINAPI SendMessageCallBack32A(
-	HWND32 hWnd,UINT32 Msg,WPARAM32 wParam,LPARAM lParam,
-	FARPROC32 lpResultCallBack,DWORD dwData)
+BOOL WINAPI SendMessageCallBackA(
+	HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam,
+	FARPROC lpResultCallBack,DWORD dwData)
 {	
 	FIXME(msg,"(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
 		hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
 	if ( hWnd == HWND_BROADCAST)
-	{	PostMessage32A( hWnd, Msg, wParam, lParam);
+	{	PostMessageA( hWnd, Msg, wParam, lParam);
 		FIXME(msg,"Broadcast: Callback will not be called!\n");
 		return TRUE;
 	}
-	(lpResultCallBack)( hWnd, Msg, dwData, SendMessage32A ( hWnd, Msg, wParam, lParam ));
+	(lpResultCallBack)( hWnd, Msg, dwData, SendMessageA ( hWnd, Msg, wParam, lParam ));
 		return TRUE;
 }
diff --git a/windows/mouse.c b/windows/mouse.c
index aa641b01068..64f49983f92 100644
--- a/windows/mouse.c
+++ b/windows/mouse.c
@@ -15,7 +15,7 @@
 
 /**********************************************************************/
 
-extern BOOL32 X11DRV_MOUSE_DisableWarpPointer;
+extern BOOL X11DRV_MOUSE_DisableWarpPointer;
 
 static LPMOUSE_EVENT_PROC DefMouseEventProc = NULL;
 
@@ -57,7 +57,7 @@ VOID WINAPI MOUSE_Disable(VOID)
  *           MOUSE_SendEvent
  */
 void MOUSE_SendEvent( DWORD mouseStatus, DWORD posX, DWORD posY, 
-                      DWORD keyState, DWORD time, HWND32 hWnd )
+                      DWORD keyState, DWORD time, HWND hWnd )
 {
     int width  = MONITOR_GetWidth (&MONITOR_PrimaryMonitor);
     int height = MONITOR_GetHeight(&MONITOR_PrimaryMonitor);
diff --git a/windows/msgbox.c b/windows/msgbox.c
index 1a1aa5d5a9b..826d82e81c0 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -20,62 +20,62 @@
  *
  * Dialog procedure for message boxes.
  */
-static LRESULT CALLBACK MSGBOX_DlgProc( HWND32 hwnd, UINT32 message,
-                                        WPARAM32 wParam, LPARAM lParam )
+static LRESULT CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
+                                        WPARAM wParam, LPARAM lParam )
 {
-  static HFONT32 hFont = 0;
-  LPMSGBOXPARAMS32A lpmb;
+  static HFONT hFont = 0;
+  LPMSGBOXPARAMSA lpmb;
 
-  RECT32 rect, textrect;
-  HWND32 hItem;
-  HDC32 hdc;
+  RECT rect, textrect;
+  HWND hItem;
+  HDC hdc;
   LRESULT lRet;
   int i, buttons, bwidth, bheight, theight, wwidth, bpos;
   int borheight, iheight, tiheight;
   
   switch(message) {
    case WM_INITDIALOG:
-    lpmb = (LPMSGBOXPARAMS32A)lParam;
+    lpmb = (LPMSGBOXPARAMSA)lParam;
     if (TWEAK_WineLook >= WIN95_LOOK) {
-	NONCLIENTMETRICS32A nclm;
-	INT32 i;
-	nclm.cbSize = sizeof(NONCLIENTMETRICS32A);
-	SystemParametersInfo32A (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
-	hFont = CreateFontIndirect32A (&nclm.lfMessageFont);
+	NONCLIENTMETRICSA nclm;
+	INT i;
+	nclm.cbSize = sizeof(NONCLIENTMETRICSA);
+	SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
+	hFont = CreateFontIndirectA (&nclm.lfMessageFont);
         /* set button font */
 	for (i=1; i < 8; i++)
-	    SendDlgItemMessage32A (hwnd, i, WM_SETFONT, (WPARAM32)hFont, 0);
+	    SendDlgItemMessageA (hwnd, i, WM_SETFONT, (WPARAM)hFont, 0);
         /* set text font */
-	SendDlgItemMessage32A (hwnd, 100, WM_SETFONT, (WPARAM32)hFont, 0);
+	SendDlgItemMessageA (hwnd, 100, WM_SETFONT, (WPARAM)hFont, 0);
     }
-    if (lpmb->lpszCaption) SetWindowText32A(hwnd, lpmb->lpszCaption);
-    SetWindowText32A(GetDlgItem32(hwnd, 100), lpmb->lpszText);
+    if (lpmb->lpszCaption) SetWindowTextA(hwnd, lpmb->lpszCaption);
+    SetWindowTextA(GetDlgItem(hwnd, 100), lpmb->lpszText);
     /* Hide not selected buttons */
     switch(lpmb->dwStyle & MB_TYPEMASK) {
      case MB_OK:
-      ShowWindow32(GetDlgItem32(hwnd, 2), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 2), SW_HIDE);
       /* fall through */
      case MB_OKCANCEL:
-      ShowWindow32(GetDlgItem32(hwnd, 3), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 4), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 5), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 6), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 7), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 3), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 4), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 5), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 6), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 7), SW_HIDE);
       break;
      case MB_ABORTRETRYIGNORE:
-      ShowWindow32(GetDlgItem32(hwnd, 1), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 2), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 6), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 7), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 1), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 2), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 6), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 7), SW_HIDE);
       break;
      case MB_YESNO:
-      ShowWindow32(GetDlgItem32(hwnd, 2), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 2), SW_HIDE);
       /* fall through */
      case MB_YESNOCANCEL:
-      ShowWindow32(GetDlgItem32(hwnd, 1), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 3), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 4), SW_HIDE);
-      ShowWindow32(GetDlgItem32(hwnd, 5), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 1), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 3), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 4), SW_HIDE);
+      ShowWindow(GetDlgItem(hwnd, 5), SW_HIDE);
       break;
     }
     /* Set the icon */
@@ -100,69 +100,69 @@ static LRESULT CALLBACK MSGBOX_DlgProc( HWND32 hwnd, UINT32 message,
     }
     
     /* Position everything */
-    GetWindowRect32(hwnd, &rect);
+    GetWindowRect(hwnd, &rect);
     borheight = rect.bottom - rect.top;
     wwidth = rect.right - rect.left;
-    GetClientRect32(hwnd, &rect);
+    GetClientRect(hwnd, &rect);
     borheight -= rect.bottom - rect.top;
 
     /* Get the icon height */
-    GetWindowRect32(GetDlgItem32(hwnd, 1088), &rect);
+    GetWindowRect(GetDlgItem(hwnd, 1088), &rect);
     iheight = rect.bottom - rect.top;
     
     /* Get the number of visible buttons and their width */
-    GetWindowRect32(GetDlgItem32(hwnd, 2), &rect);
+    GetWindowRect(GetDlgItem(hwnd, 2), &rect);
     bheight = rect.bottom - rect.top;
     bwidth = rect.left;
-    GetWindowRect32(GetDlgItem32(hwnd, 1), &rect);
+    GetWindowRect(GetDlgItem(hwnd, 1), &rect);
     bwidth -= rect.left;
     for (buttons = 0, i = 1; i < 8; i++)
     {
-      hItem = GetDlgItem32(hwnd, i);
-      if (GetWindowLong32A(hItem, GWL_STYLE) & WS_VISIBLE) buttons++;
+      hItem = GetDlgItem(hwnd, i);
+      if (GetWindowLongA(hItem, GWL_STYLE) & WS_VISIBLE) buttons++;
     }
     
     /* Get the text size */
-    hItem = GetDlgItem32(hwnd, 100);
-    GetWindowRect32(hItem, &textrect);
-    MapWindowPoints32(0, hwnd, (LPPOINT32)&textrect, 2);
+    hItem = GetDlgItem(hwnd, 100);
+    GetWindowRect(hItem, &textrect);
+    MapWindowPoints(0, hwnd, (LPPOINT)&textrect, 2);
     
-    GetClientRect32(hItem, &rect);
-    hdc = GetDC32(hItem);
-    lRet = DrawText32A( hdc, lpmb->lpszText, -1, &rect,
+    GetClientRect(hItem, &rect);
+    hdc = GetDC(hItem);
+    lRet = DrawTextA( hdc, lpmb->lpszText, -1, &rect,
                         DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT);
     theight = rect.bottom  - rect.top;
     tiheight = 16 + MAX(iheight, theight);
-    ReleaseDC32(hItem, hdc);
+    ReleaseDC(hItem, hdc);
     
     /* Position the text */
-    SetWindowPos32(hItem, 0, textrect.left, (tiheight - theight) / 2, 
+    SetWindowPos(hItem, 0, textrect.left, (tiheight - theight) / 2, 
 		   rect.right - rect.left, theight,
 		   SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW);
     
     /* Position the icon */
-    hItem = GetDlgItem32(hwnd, 1088);
-    GetWindowRect32(hItem, &rect);
-    MapWindowPoints32(0, hwnd, (LPPOINT32)&rect, 2);
-    SetWindowPos32(hItem, 0, rect.left, (tiheight - iheight) / 2, 0, 0,
+    hItem = GetDlgItem(hwnd, 1088);
+    GetWindowRect(hItem, &rect);
+    MapWindowPoints(0, hwnd, (LPPOINT)&rect, 2);
+    SetWindowPos(hItem, 0, rect.left, (tiheight - iheight) / 2, 0, 0,
 		   SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW);
     
     /* Resize the window */
-    SetWindowPos32(hwnd, 0, 0, 0, wwidth, 8 + tiheight + bheight + borheight,
+    SetWindowPos(hwnd, 0, 0, 0, wwidth, 8 + tiheight + bheight + borheight,
 		   SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW);
     
     /* Position the buttons */
     bpos = (wwidth - bwidth * buttons) / 2;
-    GetWindowRect32(GetDlgItem32(hwnd, 1), &rect);
+    GetWindowRect(GetDlgItem(hwnd, 1), &rect);
     for (buttons = i = 0; i < 7; i++) {
       /* some arithmetic to get the right order for YesNoCancel windows */
-      hItem = GetDlgItem32(hwnd, (i + 5) % 7 + 1);
-      if (GetWindowLong32A(hItem, GWL_STYLE) & WS_VISIBLE) {
+      hItem = GetDlgItem(hwnd, (i + 5) % 7 + 1);
+      if (GetWindowLongA(hItem, GWL_STYLE) & WS_VISIBLE) {
 	if (buttons++ == ((lpmb->dwStyle & MB_DEFMASK) >> 8)) {
-	  SetFocus32(hItem);
-	  SendMessage32A( hItem, BM_SETSTYLE32, BS_DEFPUSHBUTTON, TRUE );
+	  SetFocus(hItem);
+	  SendMessageA( hItem, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE );
 	}
-	SetWindowPos32(hItem, 0, bpos, tiheight, 0, 0,
+	SetWindowPos(hItem, 0, bpos, tiheight, 0, 0,
 		       SWP_NOSIZE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOREDRAW);
 	bpos += bwidth;
       }
@@ -181,8 +181,8 @@ static LRESULT CALLBACK MSGBOX_DlgProc( HWND32 hwnd, UINT32 message,
      case IDYES:
      case IDNO:
       if ((TWEAK_WineLook > WIN31_LOOK) && hFont)
-        DeleteObject32 (hFont);
-      EndDialog32(hwnd, wParam);
+        DeleteObject (hFont);
+      EndDialog(hwnd, wParam);
       break;
     }
 
@@ -201,7 +201,7 @@ static LRESULT CALLBACK MSGBOX_DlgProc( HWND32 hwnd, UINT32 message,
 INT16 WINAPI MessageBox16( HWND16 hwnd, LPCSTR text, LPCSTR title, UINT16 type)
 {
     WARN(dialog,"Messagebox\n");
-    return MessageBox32A( hwnd, text, title, type );
+    return MessageBoxA( hwnd, text, title, type );
 }
 
 
@@ -212,9 +212,9 @@ INT16 WINAPI MessageBox16( HWND16 hwnd, LPCSTR text, LPCSTR title, UINT16 type)
  *   The WARN is here to help debug erroneous MessageBoxes
  *   Use: -debugmsg warn+dialog,+relay
  */
-INT32 WINAPI MessageBox32A(HWND32 hWnd, LPCSTR text, LPCSTR title, UINT32 type)
+INT WINAPI MessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type)
 {
-    MSGBOXPARAMS32A mbox;
+    MSGBOXPARAMSA mbox;
     WARN(dialog,"Messagebox\n");
     if (!text) text="<WINE-NULL>";
     if (!title)
@@ -222,25 +222,25 @@ INT32 WINAPI MessageBox32A(HWND32 hWnd, LPCSTR text, LPCSTR title, UINT32 type)
     mbox.lpszCaption = title;
     mbox.lpszText  = text;
     mbox.dwStyle  = type;
-    return DialogBoxIndirectParam32A( WIN_GetWindowInstance(hWnd),
+    return DialogBoxIndirectParamA( WIN_GetWindowInstance(hWnd),
                                       SYSRES_GetResPtr( SYSRES_DIALOG_MSGBOX ),
-                                      hWnd, (DLGPROC32)MSGBOX_DlgProc, (LPARAM)&mbox );
+                                      hWnd, (DLGPROC)MSGBOX_DlgProc, (LPARAM)&mbox );
 }
 
 
 /**************************************************************************
  *           MessageBox32W   (USER32.396)
  */
-INT32 WINAPI MessageBox32W( HWND32 hwnd, LPCWSTR text, LPCWSTR title,
-                            UINT32 type )
+INT WINAPI MessageBoxW( HWND hwnd, LPCWSTR text, LPCWSTR title,
+                            UINT type )
 {
     LPSTR titleA = HEAP_strdupWtoA( GetProcessHeap(), 0, title );
     LPSTR textA  = HEAP_strdupWtoA( GetProcessHeap(), 0, text );
-    INT32 ret;
+    INT ret;
     
     WARN(dialog,"Messagebox\n");
 
-    ret = MessageBox32A( hwnd, textA, titleA, type );
+    ret = MessageBoxA( hwnd, textA, titleA, type );
     HeapFree( GetProcessHeap(), 0, titleA );
     HeapFree( GetProcessHeap(), 0, textA );
     return ret;
@@ -250,23 +250,23 @@ INT32 WINAPI MessageBox32W( HWND32 hwnd, LPCWSTR text, LPCWSTR title,
 /**************************************************************************
  *           MessageBoxEx32A   (USER32.392)
  */
-INT32 WINAPI MessageBoxEx32A( HWND32 hWnd, LPCSTR text, LPCSTR title,
-                              UINT32 type, WORD langid )
+INT WINAPI MessageBoxExA( HWND hWnd, LPCSTR text, LPCSTR title,
+                              UINT type, WORD langid )
 {
     WARN(dialog,"Messagebox\n");
     /* ignore language id for now */
-    return MessageBox32A(hWnd,text,title,type);
+    return MessageBoxA(hWnd,text,title,type);
 }
 
 /**************************************************************************
  *           MessageBoxEx32W   (USER32.393)
  */
-INT32 WINAPI MessageBoxEx32W( HWND32 hWnd, LPCWSTR text, LPCWSTR title,
-                              UINT32 type, WORD langid )
+INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title,
+                              UINT type, WORD langid )
 {
     WARN(dialog,"Messagebox\n");
     /* ignore language id for now */
-    return MessageBox32W(hWnd,text,title,type);
+    return MessageBoxW(hWnd,text,title,type);
 }
 
 /**************************************************************************
@@ -274,7 +274,7 @@ INT32 WINAPI MessageBoxEx32W( HWND32 hWnd, LPCWSTR text, LPCWSTR title,
  */
 INT16 WINAPI MessageBoxIndirect16( LPMSGBOXPARAMS16 msgbox )
 {
-    MSGBOXPARAMS32A msgbox32;
+    MSGBOXPARAMSA msgbox32;
     WARN(dialog,"Messagebox\n");    
     
     msgbox32.cbSize		= msgbox->cbSize;
@@ -288,30 +288,30 @@ INT16 WINAPI MessageBoxIndirect16( LPMSGBOXPARAMS16 msgbox )
     msgbox32.lpfnMsgBoxCallback	= msgbox->lpfnMsgBoxCallback;
     msgbox32.dwLanguageId	= msgbox->dwLanguageId;
 
-    return DialogBoxIndirectParam32A( msgbox32.hInstance,
+    return DialogBoxIndirectParamA( msgbox32.hInstance,
                                       SYSRES_GetResPtr( SYSRES_DIALOG_MSGBOX ),
-                                      msgbox32.hwndOwner, (DLGPROC32)MSGBOX_DlgProc,
+                                      msgbox32.hwndOwner, (DLGPROC)MSGBOX_DlgProc,
                                       (LPARAM)&msgbox32 );
 }
 
 /**************************************************************************
  *           MessageBoxIndirect32A   (USER32.394)
  */
-INT32 WINAPI MessageBoxIndirect32A( LPMSGBOXPARAMS32A msgbox )
+INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox )
 {
     WARN(dialog,"Messagebox\n");
-    return DialogBoxIndirectParam32A( msgbox->hInstance,
+    return DialogBoxIndirectParamA( msgbox->hInstance,
    				      SYSRES_GetResPtr( SYSRES_DIALOG_MSGBOX ),
-                                      msgbox->hwndOwner, (DLGPROC32)MSGBOX_DlgProc,
+                                      msgbox->hwndOwner, (DLGPROC)MSGBOX_DlgProc,
 				      (LPARAM)msgbox );
 }
 
 /**************************************************************************
  *           MessageBoxIndirect32W   (USER32.395)
  */
-INT32 WINAPI MessageBoxIndirect32W( LPMSGBOXPARAMS32W msgbox )
+INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox )
 {
-    MSGBOXPARAMS32A	msgboxa;
+    MSGBOXPARAMSA	msgboxa;
     WARN(dialog,"Messagebox\n");
 
     memcpy(&msgboxa,msgbox,sizeof(msgboxa));
@@ -320,7 +320,7 @@ INT32 WINAPI MessageBoxIndirect32W( LPMSGBOXPARAMS32W msgbox )
     if (msgbox->lpszText)	
       lstrcpyWtoA((LPSTR)msgboxa.lpszText,msgbox->lpszText);
 
-    return MessageBoxIndirect32A(&msgboxa);
+    return MessageBoxIndirectA(&msgboxa);
 }
 
 
@@ -330,17 +330,17 @@ INT32 WINAPI MessageBoxIndirect32W( LPMSGBOXPARAMS32W msgbox )
 void WINAPI FatalAppExit16( UINT16 action, LPCSTR str )
 {
     WARN(dialog,"AppExit\n");
-    FatalAppExit32A( action, str );
+    FatalAppExitA( action, str );
 }
 
 
 /**************************************************************************
  *           FatalAppExit32A   (KERNEL32.108)
  */
-void WINAPI FatalAppExit32A( UINT32 action, LPCSTR str )
+void WINAPI FatalAppExitA( UINT action, LPCSTR str )
 {
     WARN(dialog,"AppExit\n");
-    MessageBox32A( 0, str, NULL, MB_SYSTEMMODAL | MB_OK );
+    MessageBoxA( 0, str, NULL, MB_SYSTEMMODAL | MB_OK );
     ExitProcess(0);
 }
 
@@ -348,10 +348,10 @@ void WINAPI FatalAppExit32A( UINT32 action, LPCSTR str )
 /**************************************************************************
  *           FatalAppExit32W   (KERNEL32.109)
  */
-void WINAPI FatalAppExit32W( UINT32 action, LPCWSTR str )
+void WINAPI FatalAppExitW( UINT action, LPCWSTR str )
 {
     WARN(dialog,"AppExit\n");
-    MessageBox32W( 0, str, NULL, MB_SYSTEMMODAL | MB_OK );
+    MessageBoxW( 0, str, NULL, MB_SYSTEMMODAL | MB_OK );
     ExitProcess(0);
 }
 
diff --git a/windows/multimon.c b/windows/multimon.c
index a85d8f432ff..12ba4281865 100644
--- a/windows/multimon.c
+++ b/windows/multimon.c
@@ -56,42 +56,42 @@ int MONITOR_GetDepth(MONITOR *pMonitor)
 
 /**********************************************************************/
 
-HMONITOR WINAPI MonitorFromPoint(POINT32 ptScreenCoords, DWORD dwFlags)
+HMONITOR WINAPI MonitorFromPoint(POINT ptScreenCoords, DWORD dwFlags)
 {
     if ((dwFlags & (MONITOR_DEFAULTTOPRIMARY | MONITOR_DEFAULTTONEAREST)) ||
         ((ptScreenCoords.x >= 0) &&
-        (ptScreenCoords.x < GetSystemMetrics32(SM_CXSCREEN)) &&
+        (ptScreenCoords.x < GetSystemMetrics(SM_CXSCREEN)) &&
         (ptScreenCoords.y >= 0) &&
-        (ptScreenCoords.y < GetSystemMetrics32(SM_CYSCREEN))))
+        (ptScreenCoords.y < GetSystemMetrics(SM_CYSCREEN))))
     {
         return xPRIMARY_MONITOR;
     }
         return NULL;
 }
 
-HMONITOR WINAPI MonitorFromRect(LPRECT32 lprcScreenCoords, DWORD dwFlags)
+HMONITOR WINAPI MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags)
 {
     if ((dwFlags & (MONITOR_DEFAULTTOPRIMARY | MONITOR_DEFAULTTONEAREST)) ||
         ((lprcScreenCoords->right > 0) &&
         (lprcScreenCoords->bottom > 0) &&
-        (lprcScreenCoords->left < GetSystemMetrics32(SM_CXSCREEN)) &&
-        (lprcScreenCoords->top < GetSystemMetrics32(SM_CYSCREEN))))
+        (lprcScreenCoords->left < GetSystemMetrics(SM_CXSCREEN)) &&
+        (lprcScreenCoords->top < GetSystemMetrics(SM_CYSCREEN))))
     {
         return xPRIMARY_MONITOR;
     }
     return NULL;
 }
 
-HMONITOR WINAPI MonitorFromWindow(HWND32 hWnd, DWORD dwFlags)
+HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags)
 {
-    WINDOWPLACEMENT32 wp;
+    WINDOWPLACEMENT wp;
 
     if (dwFlags & (MONITOR_DEFAULTTOPRIMARY | MONITOR_DEFAULTTONEAREST))
         return xPRIMARY_MONITOR;
 
-    if (IsIconic32(hWnd) ? 
-            GetWindowPlacement32(hWnd, &wp) : 
-            GetWindowRect32(hWnd, &wp.rcNormalPosition)) {
+    if (IsIconic(hWnd) ? 
+            GetWindowPlacement(hWnd, &wp) : 
+            GetWindowRect(hWnd, &wp.rcNormalPosition)) {
 
         return MonitorFromRect(&wp.rcNormalPosition, dwFlags);
     }
@@ -99,24 +99,24 @@ HMONITOR WINAPI MonitorFromWindow(HWND32 hWnd, DWORD dwFlags)
     return NULL;
 }
 
-BOOL32 WINAPI GetMonitorInfo32A(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
+BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 {
-    RECT32 rcWork;
+    RECT rcWork;
 
     if ((hMonitor == xPRIMARY_MONITOR) &&
         lpMonitorInfo &&
         (lpMonitorInfo->cbSize >= sizeof(MONITORINFO)) &&
-        SystemParametersInfo32A(SPI_GETWORKAREA, 0, &rcWork, 0))
+        SystemParametersInfoA(SPI_GETWORKAREA, 0, &rcWork, 0))
     {
         lpMonitorInfo->rcMonitor.left = 0;
         lpMonitorInfo->rcMonitor.top  = 0;
-        lpMonitorInfo->rcMonitor.right  = GetSystemMetrics32(SM_CXSCREEN);
-        lpMonitorInfo->rcMonitor.bottom = GetSystemMetrics32(SM_CYSCREEN);
+        lpMonitorInfo->rcMonitor.right  = GetSystemMetrics(SM_CXSCREEN);
+        lpMonitorInfo->rcMonitor.bottom = GetSystemMetrics(SM_CYSCREEN);
         lpMonitorInfo->rcWork = rcWork;
         lpMonitorInfo->dwFlags = MONITORINFOF_PRIMARY;
 	
-	if (lpMonitorInfo->cbSize >= sizeof(MONITORINFOEX32A))
-            lstrcpy32A(((MONITORINFOEX32A*)lpMonitorInfo)->szDevice, "DISPLAY");
+	if (lpMonitorInfo->cbSize >= sizeof(MONITORINFOEXA))
+            lstrcpyA(((MONITORINFOEXA*)lpMonitorInfo)->szDevice, "DISPLAY");
 
         return TRUE;
     }
@@ -124,24 +124,24 @@ BOOL32 WINAPI GetMonitorInfo32A(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
     return FALSE;
 }
 
-BOOL32 WINAPI GetMonitorInfo32W(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
+BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 {
-    RECT32 rcWork;
+    RECT rcWork;
 
     if ((hMonitor == xPRIMARY_MONITOR) &&
         lpMonitorInfo &&
         (lpMonitorInfo->cbSize >= sizeof(MONITORINFO)) &&
-        SystemParametersInfo32W(SPI_GETWORKAREA, 0, &rcWork, 0))
+        SystemParametersInfoW(SPI_GETWORKAREA, 0, &rcWork, 0))
     {
         lpMonitorInfo->rcMonitor.left = 0;
         lpMonitorInfo->rcMonitor.top  = 0;
-        lpMonitorInfo->rcMonitor.right  = GetSystemMetrics32(SM_CXSCREEN);
-        lpMonitorInfo->rcMonitor.bottom = GetSystemMetrics32(SM_CYSCREEN);
+        lpMonitorInfo->rcMonitor.right  = GetSystemMetrics(SM_CXSCREEN);
+        lpMonitorInfo->rcMonitor.bottom = GetSystemMetrics(SM_CYSCREEN);
         lpMonitorInfo->rcWork = rcWork;
         lpMonitorInfo->dwFlags = MONITORINFOF_PRIMARY;
 
-        if (lpMonitorInfo->cbSize >= sizeof(MONITORINFOEX32W))
-            lstrcpy32W(((MONITORINFOEX32W*)lpMonitorInfo)->szDevice, (LPCWSTR)"D\0I\0S\0P\0L\0A\0Y\0\0");
+        if (lpMonitorInfo->cbSize >= sizeof(MONITORINFOEXW))
+            lstrcpyW(((MONITORINFOEXW*)lpMonitorInfo)->szDevice, (LPCWSTR)"D\0I\0S\0P\0L\0A\0Y\0\0");
 
         return TRUE;
     }
@@ -149,37 +149,37 @@ BOOL32 WINAPI GetMonitorInfo32W(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
     return FALSE;
 }
 
-BOOL32 WINAPI EnumDisplayMonitors(
-        HDC32             hdcOptionalForPainting,
-        LPRECT32         lprcEnumMonitorsThatIntersect,
+BOOL WINAPI EnumDisplayMonitors(
+        HDC             hdcOptionalForPainting,
+        LPRECT         lprcEnumMonitorsThatIntersect,
         MONITORENUMPROC lpfnEnumProc,
         LPARAM          dwData)
 {
-    RECT32 rcLimit;
+    RECT rcLimit;
 
     if (!lpfnEnumProc)
         return FALSE;
 
     rcLimit.left   = 0;
     rcLimit.top    = 0;
-    rcLimit.right  = GetSystemMetrics32(SM_CXSCREEN);
-    rcLimit.bottom = GetSystemMetrics32(SM_CYSCREEN);
+    rcLimit.right  = GetSystemMetrics(SM_CXSCREEN);
+    rcLimit.bottom = GetSystemMetrics(SM_CYSCREEN);
 
     if (hdcOptionalForPainting)
     {
-        RECT32    rcClip;
-        POINT32   ptOrg;
+        RECT    rcClip;
+        POINT   ptOrg;
 
-        switch (GetClipBox32(hdcOptionalForPainting, &rcClip))
+        switch (GetClipBox(hdcOptionalForPainting, &rcClip))
         {
         default:
             if (!GetDCOrgEx(hdcOptionalForPainting, &ptOrg))
                 return FALSE;
 
-            OffsetRect32(&rcLimit, -ptOrg.x, -ptOrg.y);
-            if (IntersectRect32(&rcLimit, &rcLimit, &rcClip) &&
+            OffsetRect(&rcLimit, -ptOrg.x, -ptOrg.y);
+            if (IntersectRect(&rcLimit, &rcLimit, &rcClip) &&
                 (!lprcEnumMonitorsThatIntersect ||
-                     IntersectRect32(&rcLimit, &rcLimit, lprcEnumMonitorsThatIntersect))) {
+                     IntersectRect(&rcLimit, &rcLimit, lprcEnumMonitorsThatIntersect))) {
 
                 break;
             }
@@ -191,7 +191,7 @@ BOOL32 WINAPI EnumDisplayMonitors(
         }
     } else {
         if (    lprcEnumMonitorsThatIntersect &&
-                !IntersectRect32(&rcLimit, &rcLimit, lprcEnumMonitorsThatIntersect)) {
+                !IntersectRect(&rcLimit, &rcLimit, lprcEnumMonitorsThatIntersect)) {
 
             return TRUE;
         }
diff --git a/windows/nonclient.c b/windows/nonclient.c
index 89f7af59edd..e14d008be18 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -73,7 +73,7 @@ static HBITMAP16 hbitmapRestoreD = 0;
  * Compute the size of the window rectangle from the size of the
  * client rectangle.
  */
-static void NC_AdjustRect( LPRECT16 rect, DWORD style, BOOL32 menu,
+static void NC_AdjustRect( LPRECT16 rect, DWORD style, BOOL menu,
                            DWORD exStyle )
 {
     if (TWEAK_WineLook > WIN31_LOOK)
@@ -142,7 +142,7 @@ static void NC_AdjustRect( LPRECT16 rect, DWORD style, BOOL32 menu,
  *****************************************************************************/
 
 static void
-NC_AdjustRectOuter95 (LPRECT16 rect, DWORD style, BOOL32 menu, DWORD exStyle)
+NC_AdjustRectOuter95 (LPRECT16 rect, DWORD style, BOOL menu, DWORD exStyle)
 {
     if(style & WS_ICONIC) return;
 
@@ -236,12 +236,12 @@ NC_AdjustRectInner95 (LPRECT16 rect, DWORD style, DWORD exStyle)
 BOOL16 WINAPI
 DrawCaption16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, UINT16 uFlags)
 {
-    RECT32 rect32;
+    RECT rect32;
 
     if (rect)
 	CONV_RECT16TO32 (rect, &rect32);
 
-    return (BOOL16)DrawCaptionTemp32A (hwnd, hdc, rect ? &rect32 : NULL,
+    return (BOOL16)DrawCaptionTempA (hwnd, hdc, rect ? &rect32 : NULL,
 				       0, 0, NULL, uFlags & 0x1F);
 }
 
@@ -260,10 +260,10 @@ DrawCaption16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, UINT16 uFlags)
  *     Failure:
  */
 
-BOOL32 WINAPI
-DrawCaption32 (HWND32 hwnd, HDC32 hdc, const RECT32 *lpRect, UINT32 uFlags)
+BOOL WINAPI
+DrawCaption (HWND hwnd, HDC hdc, const RECT *lpRect, UINT uFlags)
 {
-    return DrawCaptionTemp32A (hwnd, hdc, lpRect, 0, 0, NULL, uFlags & 0x1F);
+    return DrawCaptionTempA (hwnd, hdc, lpRect, 0, 0, NULL, uFlags & 0x1F);
 }
 
 
@@ -281,12 +281,12 @@ BOOL16 WINAPI
 DrawCaptionTemp16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, HFONT16 hFont,
 		   HICON16 hIcon, LPCSTR str, UINT16 uFlags)
 {
-    RECT32 rect32;
+    RECT rect32;
 
     if (rect)
 	CONV_RECT16TO32(rect,&rect32);
 
-    return (BOOL16)DrawCaptionTemp32A (hwnd, hdc, rect?&rect32:NULL, hFont,
+    return (BOOL16)DrawCaptionTempA (hwnd, hdc, rect?&rect32:NULL, hFont,
 				       hIcon, str, uFlags & 0x1F);
 }
 
@@ -301,53 +301,53 @@ DrawCaptionTemp16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, HFONT16 hFont,
  *     Failure:
  */
 
-BOOL32 WINAPI
-DrawCaptionTemp32A (HWND32 hwnd, HDC32 hdc, const RECT32 *rect, HFONT32 hFont,
-		    HICON32 hIcon, LPCSTR str, UINT32 uFlags)
+BOOL WINAPI
+DrawCaptionTempA (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
+		    HICON hIcon, LPCSTR str, UINT uFlags)
 {
-    RECT32   rc = *rect;
+    RECT   rc = *rect;
 
     TRACE (nonclient, "(%08x,%08x,%p,%08x,%08x,\"%s\",%08x)\n",
 	   hwnd, hdc, rect, hFont, hIcon, str, uFlags);
 
     /* drawing background */
     if (uFlags & DC_INBUTTON) {
-	FillRect32 (hdc, &rc, GetSysColorBrush32 (COLOR_3DFACE));
+	FillRect (hdc, &rc, GetSysColorBrush (COLOR_3DFACE));
 
 	if (uFlags & DC_ACTIVE) {
-	    HBRUSH32 hbr = SelectObject32 (hdc, CACHE_GetPattern55AABrush ());
-	    PatBlt32 (hdc, rc.left, rc.top,
+	    HBRUSH hbr = SelectObject (hdc, CACHE_GetPattern55AABrush ());
+	    PatBlt (hdc, rc.left, rc.top,
 		      rc.right-rc.left, rc.bottom-rc.top, 0xFA0089);
-	    SelectObject32 (hdc, hbr);
+	    SelectObject (hdc, hbr);
 	}
     }
     else {
-	FillRect32 (hdc, &rc, GetSysColorBrush32 ((uFlags & DC_ACTIVE) ?
+	FillRect (hdc, &rc, GetSysColorBrush ((uFlags & DC_ACTIVE) ?
 		    COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION));
     }
 
 
     /* drawing icon */
     if ((uFlags & DC_ICON) && !(uFlags & DC_SMALLCAP)) {
-	POINT32 pt;
+	POINT pt;
 
 	pt.x = rc.left + 2;
 	pt.y = (rc.bottom + rc.top - sysMetrics[SM_CYSMICON]) / 2;
 
 	if (hIcon) {
-	    DrawIconEx32 (hdc, pt.x, pt.y, hIcon, sysMetrics[SM_CXSMICON],
+	    DrawIconEx (hdc, pt.x, pt.y, hIcon, sysMetrics[SM_CXSMICON],
 			  sysMetrics[SM_CYSMICON], 0, 0, DI_NORMAL);
 	}
 	else {
 	    WND *wndPtr = WIN_FindWndPtr(hwnd);
-	    HICON32 hAppIcon = 0;
+	    HICON hAppIcon = 0;
 
 	    if (wndPtr->class->hIconSm)
 		hAppIcon = wndPtr->class->hIconSm;
 	    else if (wndPtr->class->hIcon)
 		hAppIcon = wndPtr->class->hIcon;
 
-	    DrawIconEx32 (hdc, pt.x, pt.y, hAppIcon, sysMetrics[SM_CXSMICON],
+	    DrawIconEx (hdc, pt.x, pt.y, hAppIcon, sysMetrics[SM_CXSMICON],
 			  sysMetrics[SM_CYSMICON], 0, 0, DI_NORMAL);
 	}
 
@@ -356,44 +356,44 @@ DrawCaptionTemp32A (HWND32 hwnd, HDC32 hdc, const RECT32 *rect, HFONT32 hFont,
 
     /* drawing text */
     if (uFlags & DC_TEXT) {
-	HFONT32 hOldFont;
+	HFONT hOldFont;
 
 	if (uFlags & DC_INBUTTON)
-	    SetTextColor32 (hdc, GetSysColor32 (COLOR_BTNTEXT));
+	    SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT));
 	else if (uFlags & DC_ACTIVE)
-	    SetTextColor32 (hdc, GetSysColor32 (COLOR_CAPTIONTEXT));
+	    SetTextColor (hdc, GetSysColor (COLOR_CAPTIONTEXT));
 	else
-	    SetTextColor32 (hdc, GetSysColor32 (COLOR_INACTIVECAPTIONTEXT));
+	    SetTextColor (hdc, GetSysColor (COLOR_INACTIVECAPTIONTEXT));
 
-	SetBkMode32 (hdc, TRANSPARENT);
+	SetBkMode (hdc, TRANSPARENT);
 
 	if (hFont)
-	    hOldFont = SelectObject32 (hdc, hFont);
+	    hOldFont = SelectObject (hdc, hFont);
 	else {
-	    NONCLIENTMETRICS32A nclm;
-	    HFONT32 hNewFont;
-	    nclm.cbSize = sizeof(NONCLIENTMETRICS32A);
-	    SystemParametersInfo32A (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
-	    hNewFont = CreateFontIndirect32A ((uFlags & DC_SMALLCAP) ?
+	    NONCLIENTMETRICSA nclm;
+	    HFONT hNewFont;
+	    nclm.cbSize = sizeof(NONCLIENTMETRICSA);
+	    SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
+	    hNewFont = CreateFontIndirectA ((uFlags & DC_SMALLCAP) ?
 		&nclm.lfSmCaptionFont : &nclm.lfCaptionFont);
-	    hOldFont = SelectObject32 (hdc, hNewFont);
+	    hOldFont = SelectObject (hdc, hNewFont);
 	}
 
 	if (str)
-	    DrawText32A (hdc, str, -1, &rc,
+	    DrawTextA (hdc, str, -1, &rc,
 			 DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT);
 	else {
 	    CHAR szText[128];
-	    INT32 nLen;
-	    nLen = GetWindowText32A (hwnd, szText, 128);
-	    DrawText32A (hdc, szText, nLen, &rc,
+	    INT nLen;
+	    nLen = GetWindowTextA (hwnd, szText, 128);
+	    DrawTextA (hdc, szText, nLen, &rc,
 			 DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT);
 	}
 
 	if (hFont)
-	    SelectObject32 (hdc, hOldFont);
+	    SelectObject (hdc, hOldFont);
 	else
-	    DeleteObject32 (SelectObject32 (hdc, hOldFont));
+	    DeleteObject (SelectObject (hdc, hOldFont));
     }
 
     /* drawing focus ??? */
@@ -414,12 +414,12 @@ DrawCaptionTemp32A (HWND32 hwnd, HDC32 hdc, const RECT32 *rect, HFONT32 hFont,
  *     Failure:
  */
 
-BOOL32 WINAPI
-DrawCaptionTemp32W (HWND32 hwnd, HDC32 hdc, const RECT32 *rect, HFONT32 hFont,
-		    HICON32 hIcon, LPCWSTR str, UINT32 uFlags)
+BOOL WINAPI
+DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
+		    HICON hIcon, LPCWSTR str, UINT uFlags)
 {
     LPSTR p = HEAP_strdupWtoA (GetProcessHeap (), 0, str);
-    BOOL32 res = DrawCaptionTemp32A (hwnd, hdc, rect, hFont, hIcon, p, uFlags);
+    BOOL res = DrawCaptionTempA (hwnd, hdc, rect, hFont, hIcon, p, uFlags);
     HeapFree (GetProcessHeap (), 0, p);
     return res;
 }
@@ -437,9 +437,9 @@ BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu )
 /***********************************************************************
  *           AdjustWindowRect32    (USER32.2)
  */
-BOOL32 WINAPI AdjustWindowRect32( LPRECT32 rect, DWORD style, BOOL32 menu )
+BOOL WINAPI AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu )
 {
-    return AdjustWindowRectEx32( rect, style, menu, 0 );
+    return AdjustWindowRectEx( rect, style, menu, 0 );
 }
 
 
@@ -476,11 +476,11 @@ BOOL16 WINAPI AdjustWindowRectEx16( LPRECT16 rect, DWORD style,
 /***********************************************************************
  *           AdjustWindowRectEx32    (USER32.3)
  */
-BOOL32 WINAPI AdjustWindowRectEx32( LPRECT32 rect, DWORD style,
-                                    BOOL32 menu, DWORD exStyle )
+BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style,
+                                    BOOL menu, DWORD exStyle )
 {
     RECT16 rect16;
-    BOOL32 ret;
+    BOOL ret;
 
     CONV_RECT32TO16( rect, &rect16 );
     ret = AdjustWindowRectEx16( &rect16, style, (BOOL16)menu, exStyle );
@@ -494,7 +494,7 @@ BOOL32 WINAPI AdjustWindowRectEx32( LPRECT32 rect, DWORD style,
  *
  * Handle a WM_NCCALCSIZE message. Called from DefWindowProc().
  */
-LONG NC_HandleNCCalcSize( WND *pWnd, RECT32 *winRect )
+LONG NC_HandleNCCalcSize( WND *pWnd, RECT *winRect )
 {
     RECT16 tmpRect = { 0, 0, 0, 0 };
     LONG result = 0;
@@ -546,7 +546,7 @@ LONG NC_HandleNCCalcSize( WND *pWnd, RECT32 *winRect )
  * but without the borders (if any).
  * The rectangle is in window coordinates (for drawing with GetWindowDC()).
  */
-static void NC_GetInsideRect( HWND32 hwnd, RECT32 *rect )
+static void NC_GetInsideRect( HWND hwnd, RECT *rect )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
 
@@ -559,16 +559,16 @@ static void NC_GetInsideRect( HWND32 hwnd, RECT32 *rect )
     /* Remove frame from rectangle */
     if (HAS_DLGFRAME( wndPtr->dwStyle, wndPtr->dwExStyle ))
     {
-	InflateRect32( rect, -SYSMETRICS_CXDLGFRAME, -SYSMETRICS_CYDLGFRAME);
+	InflateRect( rect, -SYSMETRICS_CXDLGFRAME, -SYSMETRICS_CYDLGFRAME);
 	if (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME)
-            InflateRect32( rect, -1, 0 );
+            InflateRect( rect, -1, 0 );
     }
     else
     {
 	if (HAS_THICKFRAME( wndPtr->dwStyle ))
-	    InflateRect32( rect, -SYSMETRICS_CXFRAME, -SYSMETRICS_CYFRAME );
+	    InflateRect( rect, -SYSMETRICS_CXFRAME, -SYSMETRICS_CYFRAME );
 	if (wndPtr->dwStyle & WS_BORDER)
-	    InflateRect32( rect, -SYSMETRICS_CXBORDER, -SYSMETRICS_CYBORDER );
+	    InflateRect( rect, -SYSMETRICS_CXBORDER, -SYSMETRICS_CYBORDER );
     }
 
     return;
@@ -584,7 +584,7 @@ static void NC_GetInsideRect( HWND32 hwnd, RECT32 *rect )
  */
 
 static void
-NC_GetInsideRect95 (HWND32 hwnd, RECT32 *rect)
+NC_GetInsideRect95 (HWND hwnd, RECT *rect)
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
 
@@ -597,11 +597,11 @@ NC_GetInsideRect95 (HWND32 hwnd, RECT32 *rect)
     /* Remove frame from rectangle */
     if (HAS_FIXEDFRAME (wndPtr->dwStyle, wndPtr->dwExStyle ))
     {
-	InflateRect32( rect, -SYSMETRICS_CXFIXEDFRAME, -SYSMETRICS_CYFIXEDFRAME);
+	InflateRect( rect, -SYSMETRICS_CXFIXEDFRAME, -SYSMETRICS_CYFIXEDFRAME);
     }
     else if (HAS_SIZEFRAME (wndPtr->dwStyle))
     {
-	InflateRect32( rect, -SYSMETRICS_CXSIZEFRAME, -SYSMETRICS_CYSIZEFRAME );
+	InflateRect( rect, -SYSMETRICS_CXSIZEFRAME, -SYSMETRICS_CYSIZEFRAME );
 
 /*	if (wndPtr->dwStyle & WS_BORDER)
           InflateRect32( rect, -SYSMETRICS_CXBORDER, -SYSMETRICS_CYBORDER );*/
@@ -609,10 +609,10 @@ NC_GetInsideRect95 (HWND32 hwnd, RECT32 *rect)
 
     if (wndPtr->dwStyle & WS_CHILD) {
 	if (wndPtr->dwExStyle & WS_EX_CLIENTEDGE)
-	    InflateRect32 (rect, -SYSMETRICS_CXEDGE, -SYSMETRICS_CYEDGE);
+	    InflateRect (rect, -SYSMETRICS_CXEDGE, -SYSMETRICS_CYEDGE);
 
 	if (wndPtr->dwExStyle & WS_EX_STATICEDGE)
-	    InflateRect32 (rect, -SYSMETRICS_CXBORDER, -SYSMETRICS_CYBORDER);
+	    InflateRect (rect, -SYSMETRICS_CXBORDER, -SYSMETRICS_CYBORDER);
     }
 
     return;
@@ -905,7 +905,7 @@ NC_DoNCHitTest95 (WND *wndPtr, POINT16 pt )
  * Handle a WM_NCHITTEST message. Called from DefWindowProc().
  */
 LONG
-NC_HandleNCHitTest (HWND32 hwnd , POINT16 pt)
+NC_HandleNCHitTest (HWND hwnd , POINT16 pt)
 {
     WND *wndPtr = WIN_FindWndPtr (hwnd);
 
@@ -922,23 +922,23 @@ NC_HandleNCHitTest (HWND32 hwnd , POINT16 pt)
 /***********************************************************************
  *           NC_DrawSysButton
  */
-void NC_DrawSysButton( HWND32 hwnd, HDC32 hdc, BOOL32 down )
+void NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down )
 {
-    RECT32 rect;
-    HDC32 hdcMem;
-    HBITMAP32 hbitmap;
+    RECT rect;
+    HDC hdcMem;
+    HBITMAP hbitmap;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
 
     if( !(wndPtr->flags & WIN_MANAGED) )
     {
       NC_GetInsideRect( hwnd, &rect );
-      hdcMem = CreateCompatibleDC32( hdc );
-      hbitmap = SelectObject32( hdcMem, hbitmapClose );
-      BitBlt32(hdc, rect.left, rect.top, SYSMETRICS_CXSIZE, SYSMETRICS_CYSIZE,
+      hdcMem = CreateCompatibleDC( hdc );
+      hbitmap = SelectObject( hdcMem, hbitmapClose );
+      BitBlt(hdc, rect.left, rect.top, SYSMETRICS_CXSIZE, SYSMETRICS_CYSIZE,
                hdcMem, (wndPtr->dwStyle & WS_CHILD) ? SYSMETRICS_CXSIZE : 0, 0,
                down ? NOTSRCCOPY : SRCCOPY );
-      SelectObject32( hdcMem, hbitmap );
-      DeleteDC32( hdcMem );
+      SelectObject( hdcMem, hbitmap );
+      DeleteDC( hdcMem );
     }
 }
 
@@ -946,23 +946,23 @@ void NC_DrawSysButton( HWND32 hwnd, HDC32 hdc, BOOL32 down )
 /***********************************************************************
  *           NC_DrawMaxButton
  */
-static void NC_DrawMaxButton( HWND32 hwnd, HDC16 hdc, BOOL32 down )
+static void NC_DrawMaxButton( HWND hwnd, HDC16 hdc, BOOL down )
 {
-    RECT32 rect;
+    RECT rect;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
-    HDC32 hdcMem;
+    HDC hdcMem;
 
     if( !(wndPtr->flags & WIN_MANAGED) )
     {
       NC_GetInsideRect( hwnd, &rect );
-      hdcMem = CreateCompatibleDC32( hdc );
-      SelectObject32( hdcMem,  (IsZoomed32(hwnd) 
+      hdcMem = CreateCompatibleDC( hdc );
+      SelectObject( hdcMem,  (IsZoomed(hwnd) 
 			     ? (down ? hbitmapRestoreD : hbitmapRestore)
 			     : (down ? hbitmapMaximizeD : hbitmapMaximize)) );
-      BitBlt32( hdc, rect.right - SYSMETRICS_CXSIZE - 1, rect.top,
+      BitBlt( hdc, rect.right - SYSMETRICS_CXSIZE - 1, rect.top,
 		SYSMETRICS_CXSIZE + 1, SYSMETRICS_CYSIZE, hdcMem, 0, 0,
 		SRCCOPY );
-      DeleteDC32( hdcMem );
+      DeleteDC( hdcMem );
     }
 }
 
@@ -970,22 +970,22 @@ static void NC_DrawMaxButton( HWND32 hwnd, HDC16 hdc, BOOL32 down )
 /***********************************************************************
  *           NC_DrawMinButton
  */
-static void NC_DrawMinButton( HWND32 hwnd, HDC16 hdc, BOOL32 down )
+static void NC_DrawMinButton( HWND hwnd, HDC16 hdc, BOOL down )
 {
-    RECT32 rect;
+    RECT rect;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
-    HDC32 hdcMem;
+    HDC hdcMem;
 
     if( !(wndPtr->flags & WIN_MANAGED) )
     {
       NC_GetInsideRect( hwnd, &rect );
-      hdcMem = CreateCompatibleDC32( hdc );
-      SelectObject32( hdcMem, (down ? hbitmapMinimizeD : hbitmapMinimize) );
+      hdcMem = CreateCompatibleDC( hdc );
+      SelectObject( hdcMem, (down ? hbitmapMinimizeD : hbitmapMinimize) );
       if (wndPtr->dwStyle & WS_MAXIMIZEBOX) rect.right -= SYSMETRICS_CXSIZE+1;
-      BitBlt32( hdc, rect.right - SYSMETRICS_CXSIZE - 1, rect.top,
+      BitBlt( hdc, rect.right - SYSMETRICS_CXSIZE - 1, rect.top,
 		SYSMETRICS_CXSIZE + 1, SYSMETRICS_CYSIZE, hdcMem, 0, 0,
 		SRCCOPY );
-      DeleteDC32( hdcMem );
+      DeleteDC( hdcMem );
     }
 }
 
@@ -1007,15 +1007,15 @@ static void NC_DrawMinButton( HWND32 hwnd, HDC16 hdc, BOOL32 down )
  *
  *****************************************************************************/
 
-BOOL32
-NC_DrawSysButton95 (HWND32 hwnd, HDC32 hdc, BOOL32 down)
+BOOL
+NC_DrawSysButton95 (HWND hwnd, HDC hdc, BOOL down)
 {
     WND *wndPtr = WIN_FindWndPtr( hwnd );
 
     if( !(wndPtr->flags & WIN_MANAGED) )
     {
-	HICON32  hIcon = 0;
-	RECT32 rect;
+	HICON  hIcon = 0;
+	RECT rect;
 
 	NC_GetInsideRect95( hwnd, &rect );
 
@@ -1025,7 +1025,7 @@ NC_DrawSysButton95 (HWND32 hwnd, HDC32 hdc, BOOL32 down)
 	    hIcon = wndPtr->class->hIcon;
 
 	if (hIcon)
-	    DrawIconEx32 (hdc, rect.left + 2, rect.top + 2, hIcon,
+	    DrawIconEx (hdc, rect.left + 2, rect.top + 2, hIcon,
 			  sysMetrics[SM_CXSMICON],
 			  sysMetrics[SM_CYSMICON],
 			  0, 0, DI_NORMAL);
@@ -1051,29 +1051,29 @@ NC_DrawSysButton95 (HWND32 hwnd, HDC32 hdc, BOOL32 down)
  *
  *****************************************************************************/
 
-void NC_DrawCloseButton95 (HWND32 hwnd, HDC32 hdc, BOOL32 down)
+void NC_DrawCloseButton95 (HWND hwnd, HDC hdc, BOOL down)
 {
-    RECT32 rect;
-    HDC32 hdcMem;
+    RECT rect;
+    HDC hdcMem;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
 
     if( !(wndPtr->flags & WIN_MANAGED) )
     {
-	BITMAP32 bmp;
-	HBITMAP32 hBmp, hOldBmp;
+	BITMAP bmp;
+	HBITMAP hBmp, hOldBmp;
 
 	NC_GetInsideRect95( hwnd, &rect );
 
-	hdcMem = CreateCompatibleDC32( hdc );
+	hdcMem = CreateCompatibleDC( hdc );
 	hBmp = down ? hbitmapCloseD : hbitmapClose;
-	hOldBmp = SelectObject32 (hdcMem, hBmp);
-	GetObject32A (hBmp, sizeof(BITMAP32), &bmp);
-	BitBlt32 (hdc, rect.right - (sysMetrics[SM_CYCAPTION] + 1 + bmp.bmWidth) / 2,
+	hOldBmp = SelectObject (hdcMem, hBmp);
+	GetObjectA (hBmp, sizeof(BITMAP), &bmp);
+	BitBlt (hdc, rect.right - (sysMetrics[SM_CYCAPTION] + 1 + bmp.bmWidth) / 2,
 		  rect.top + (sysMetrics[SM_CYCAPTION] - 1 - bmp.bmHeight) / 2,
 		  bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, down ? NOTSRCCOPY : SRCCOPY);
 
-	SelectObject32 (hdcMem, hOldBmp);
-	DeleteDC32 (hdcMem);
+	SelectObject (hdcMem, hOldBmp);
+	DeleteDC (hdcMem);
     }
 }
 
@@ -1097,33 +1097,33 @@ void NC_DrawCloseButton95 (HWND32 hwnd, HDC32 hdc, BOOL32 down)
  *
  *****************************************************************************/
 
-static void  NC_DrawMaxButton95(HWND32 hwnd,HDC16 hdc,BOOL32 down )
+static void  NC_DrawMaxButton95(HWND hwnd,HDC16 hdc,BOOL down )
 {
-    RECT32 rect;
-    HDC32 hdcMem;
+    RECT rect;
+    HDC hdcMem;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
 
     if( !(wndPtr->flags & WIN_MANAGED))
     {
-        BITMAP32  bmp;
-        HBITMAP32  hBmp,hOldBmp;
+        BITMAP  bmp;
+        HBITMAP  hBmp,hOldBmp;
 
 	NC_GetInsideRect95( hwnd, &rect );
-	hdcMem = CreateCompatibleDC32( hdc );
-       hBmp = IsZoomed32(hwnd) ?
+	hdcMem = CreateCompatibleDC( hdc );
+       hBmp = IsZoomed(hwnd) ?
 				(down ? hbitmapRestoreD : hbitmapRestore ) :
                                (down ? hbitmapMaximizeD: hbitmapMaximize);
-	hOldBmp=SelectObject32( hdcMem, hBmp );
-	GetObject32A (hBmp, sizeof(BITMAP32), &bmp);
+	hOldBmp=SelectObject( hdcMem, hBmp );
+	GetObjectA (hBmp, sizeof(BITMAP), &bmp);
 
 	if (wndPtr->dwStyle & WS_SYSMENU)
 	    rect.right -= sysMetrics[SM_CYCAPTION] + 1;
 	
-	BitBlt32( hdc, rect.right - (sysMetrics[SM_CXSIZE] + bmp.bmWidth) / 2,
+	BitBlt( hdc, rect.right - (sysMetrics[SM_CXSIZE] + bmp.bmWidth) / 2,
 		  rect.top + (sysMetrics[SM_CYCAPTION] - 1 - bmp.bmHeight) / 2,
 		  bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY );
-	SelectObject32 (hdcMem, hOldBmp);
-	DeleteDC32( hdcMem );
+	SelectObject (hdcMem, hOldBmp);
+	DeleteDC( hdcMem );
     }
 }
 
@@ -1146,24 +1146,24 @@ static void  NC_DrawMaxButton95(HWND32 hwnd,HDC16 hdc,BOOL32 down )
  *
  *****************************************************************************/
 
-static void  NC_DrawMinButton95(HWND32 hwnd,HDC16 hdc,BOOL32 down )
+static void  NC_DrawMinButton95(HWND hwnd,HDC16 hdc,BOOL down )
 {
-    RECT32 rect;
-    HDC32 hdcMem;
+    RECT rect;
+    HDC hdcMem;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
 
     if( !(wndPtr->flags & WIN_MANAGED))
         
     {
-       BITMAP32  bmp;
-       HBITMAP32  hBmp,hOldBmp;
+       BITMAP  bmp;
+       HBITMAP  hBmp,hOldBmp;
 	
 	NC_GetInsideRect95( hwnd, &rect );
 
-       hdcMem = CreateCompatibleDC32( hdc );
+       hdcMem = CreateCompatibleDC( hdc );
        hBmp = down ? hbitmapMinimizeD : hbitmapMinimize;
-       hOldBmp= SelectObject32( hdcMem, hBmp );
-	GetObject32A (hBmp, sizeof(BITMAP32), &bmp);
+       hOldBmp= SelectObject( hdcMem, hBmp );
+	GetObjectA (hBmp, sizeof(BITMAP), &bmp);
 
 	if (wndPtr->dwStyle & WS_SYSMENU)
 	    rect.right -= sysMetrics[SM_CYCAPTION] + 1;
@@ -1171,12 +1171,12 @@ static void  NC_DrawMinButton95(HWND32 hwnd,HDC16 hdc,BOOL32 down )
 	if (wndPtr->dwStyle & WS_MAXIMIZEBOX)
 	    rect.right += -1 - (sysMetrics[SM_CXSIZE] + bmp.bmWidth) / 2;
 
-	BitBlt32( hdc, rect.right - (sysMetrics[SM_CXSIZE] + bmp.bmWidth) / 2,
+	BitBlt( hdc, rect.right - (sysMetrics[SM_CXSIZE] + bmp.bmWidth) / 2,
 		  rect.top + (sysMetrics[SM_CYCAPTION] - 1 - bmp.bmHeight) / 2,
 		  bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY );
 
-       SelectObject32 (hdcMem, hOldBmp);
-	DeleteDC32( hdcMem );
+       SelectObject (hdcMem, hOldBmp);
+	DeleteDC( hdcMem );
     }
 }
 
@@ -1186,10 +1186,10 @@ static void  NC_DrawMinButton95(HWND32 hwnd,HDC16 hdc,BOOL32 down )
  * Draw a window frame inside the given rectangle, and update the rectangle.
  * The correct pen for the frame must be selected in the DC.
  */
-static void NC_DrawFrame( HDC32 hdc, RECT32 *rect, BOOL32 dlgFrame,
-                          BOOL32 active )
+static void NC_DrawFrame( HDC hdc, RECT *rect, BOOL dlgFrame,
+                          BOOL active )
 {
-    INT32 width, height;
+    INT width, height;
 
     if (TWEAK_WineLook != WIN31_LOOK)
 	ERR (nonclient, "Called in Win95 mode. Aiee! Please report this.\n" );
@@ -1198,63 +1198,63 @@ static void NC_DrawFrame( HDC32 hdc, RECT32 *rect, BOOL32 dlgFrame,
     {
 	width = SYSMETRICS_CXDLGFRAME - 1;
 	height = SYSMETRICS_CYDLGFRAME - 1;
-        SelectObject32( hdc, GetSysColorBrush32(active ? COLOR_ACTIVECAPTION :
+        SelectObject( hdc, GetSysColorBrush(active ? COLOR_ACTIVECAPTION :
 						COLOR_INACTIVECAPTION) );
     }
     else
     {
 	width = SYSMETRICS_CXFRAME - 1;
 	height = SYSMETRICS_CYFRAME - 1;
-        SelectObject32( hdc, GetSysColorBrush32(active ? COLOR_ACTIVEBORDER :
+        SelectObject( hdc, GetSysColorBrush(active ? COLOR_ACTIVEBORDER :
 						COLOR_INACTIVEBORDER) );
     }
 
       /* Draw frame */
-    PatBlt32( hdc, rect->left, rect->top,
+    PatBlt( hdc, rect->left, rect->top,
               rect->right - rect->left, height, PATCOPY );
-    PatBlt32( hdc, rect->left, rect->top,
+    PatBlt( hdc, rect->left, rect->top,
               width, rect->bottom - rect->top, PATCOPY );
-    PatBlt32( hdc, rect->left, rect->bottom,
+    PatBlt( hdc, rect->left, rect->bottom,
               rect->right - rect->left, -height, PATCOPY );
-    PatBlt32( hdc, rect->right, rect->top,
+    PatBlt( hdc, rect->right, rect->top,
               -width, rect->bottom - rect->top, PATCOPY );
 
     if (dlgFrame)
     {
-	InflateRect32( rect, -width, -height );
+	InflateRect( rect, -width, -height );
     } 
     else
     {
-        INT32 decYOff = SYSMETRICS_CXFRAME + SYSMETRICS_CXSIZE;
-	INT32 decXOff = SYSMETRICS_CYFRAME + SYSMETRICS_CYSIZE;
+        INT decYOff = SYSMETRICS_CXFRAME + SYSMETRICS_CXSIZE;
+	INT decXOff = SYSMETRICS_CYFRAME + SYSMETRICS_CYSIZE;
 
       /* Draw inner rectangle */
 
-	SelectObject32( hdc, GetStockObject32(NULL_BRUSH) );
-	Rectangle32( hdc, rect->left + width, rect->top + height,
+	SelectObject( hdc, GetStockObject(NULL_BRUSH) );
+	Rectangle( hdc, rect->left + width, rect->top + height,
 		     rect->right - width , rect->bottom - height );
 
       /* Draw the decorations */
 
-	MoveToEx32( hdc, rect->left, rect->top + decYOff, NULL );
-	LineTo32( hdc, rect->left + width, rect->top + decYOff );
-	MoveToEx32( hdc, rect->right - 1, rect->top + decYOff, NULL );
-	LineTo32( hdc, rect->right - width - 1, rect->top + decYOff );
-	MoveToEx32( hdc, rect->left, rect->bottom - decYOff, NULL );
-	LineTo32( hdc, rect->left + width, rect->bottom - decYOff );
-	MoveToEx32( hdc, rect->right - 1, rect->bottom - decYOff, NULL );
-	LineTo32( hdc, rect->right - width - 1, rect->bottom - decYOff );
-
-	MoveToEx32( hdc, rect->left + decXOff, rect->top, NULL );
-	LineTo32( hdc, rect->left + decXOff, rect->top + height);
-	MoveToEx32( hdc, rect->left + decXOff, rect->bottom - 1, NULL );
-	LineTo32( hdc, rect->left + decXOff, rect->bottom - height - 1 );
-	MoveToEx32( hdc, rect->right - decXOff, rect->top, NULL );
-	LineTo32( hdc, rect->right - decXOff, rect->top + height );
-	MoveToEx32( hdc, rect->right - decXOff, rect->bottom - 1, NULL );
-	LineTo32( hdc, rect->right - decXOff, rect->bottom - height - 1 );
-
-	InflateRect32( rect, -width - 1, -height - 1 );
+	MoveToEx( hdc, rect->left, rect->top + decYOff, NULL );
+	LineTo( hdc, rect->left + width, rect->top + decYOff );
+	MoveToEx( hdc, rect->right - 1, rect->top + decYOff, NULL );
+	LineTo( hdc, rect->right - width - 1, rect->top + decYOff );
+	MoveToEx( hdc, rect->left, rect->bottom - decYOff, NULL );
+	LineTo( hdc, rect->left + width, rect->bottom - decYOff );
+	MoveToEx( hdc, rect->right - 1, rect->bottom - decYOff, NULL );
+	LineTo( hdc, rect->right - width - 1, rect->bottom - decYOff );
+
+	MoveToEx( hdc, rect->left + decXOff, rect->top, NULL );
+	LineTo( hdc, rect->left + decXOff, rect->top + height);
+	MoveToEx( hdc, rect->left + decXOff, rect->bottom - 1, NULL );
+	LineTo( hdc, rect->left + decXOff, rect->bottom - height - 1 );
+	MoveToEx( hdc, rect->right - decXOff, rect->top, NULL );
+	LineTo( hdc, rect->right - decXOff, rect->top + height );
+	MoveToEx( hdc, rect->right - decXOff, rect->bottom - 1, NULL );
+	LineTo( hdc, rect->right - decXOff, rect->bottom - height - 1 );
+
+	InflateRect( rect, -width - 1, -height - 1 );
     }
 }
 
@@ -1290,12 +1290,12 @@ static void NC_DrawFrame( HDC32 hdc, RECT32 *rect, BOOL32 dlgFrame,
  *****************************************************************************/
 
 static void  NC_DrawFrame95(
-    HDC32  hdc,
-    RECT32  *rect,
-    BOOL32  dlgFrame,
-    BOOL32  active )
+    HDC  hdc,
+    RECT  *rect,
+    BOOL  dlgFrame,
+    BOOL  active )
 {
-    INT32 width, height;
+    INT width, height;
 
     if (dlgFrame)
     {
@@ -1308,20 +1308,20 @@ static void  NC_DrawFrame95(
 	height = sysMetrics[SM_CYFRAME] - sysMetrics[SM_CYEDGE];
     }
 
-    SelectObject32( hdc, GetSysColorBrush32(active ? COLOR_ACTIVEBORDER :
+    SelectObject( hdc, GetSysColorBrush(active ? COLOR_ACTIVEBORDER :
 		COLOR_INACTIVEBORDER) );
 
     /* Draw frame */
-    PatBlt32( hdc, rect->left, rect->top,
+    PatBlt( hdc, rect->left, rect->top,
               rect->right - rect->left, height, PATCOPY );
-    PatBlt32( hdc, rect->left, rect->top,
+    PatBlt( hdc, rect->left, rect->top,
               width, rect->bottom - rect->top, PATCOPY );
-    PatBlt32( hdc, rect->left, rect->bottom,
+    PatBlt( hdc, rect->left, rect->bottom,
               rect->right - rect->left, -height, PATCOPY );
-    PatBlt32( hdc, rect->right, rect->top,
+    PatBlt( hdc, rect->right, rect->top,
               -width, rect->bottom - rect->top, PATCOPY );
 
-    InflateRect32( rect, -width, -height );
+    InflateRect( rect, -width, -height );
 }
 
 /***********************************************************************
@@ -1331,16 +1331,16 @@ static void  NC_DrawFrame95(
  *
  * FIXME:  This causes problems in Win95 mode.  (why?)
  */
-static void NC_DrawMovingFrame( HDC32 hdc, RECT32 *rect, BOOL32 thickframe )
+static void NC_DrawMovingFrame( HDC hdc, RECT *rect, BOOL thickframe )
 {
     if (thickframe)
     {
         RECT16 r16;
         CONV_RECT32TO16( rect, &r16 );
-        FastWindowFrame( hdc, &r16, SYSMETRICS_CXFRAME,
+        FastWindowFrame16( hdc, &r16, SYSMETRICS_CXFRAME,
                          SYSMETRICS_CYFRAME, PATINVERT );
     }
-    else DrawFocusRect32( hdc, rect );
+    else DrawFocusRect( hdc, rect );
 }
 
 
@@ -1350,10 +1350,10 @@ static void NC_DrawMovingFrame( HDC32 hdc, RECT32 *rect, BOOL32 thickframe )
  * Draw the window caption.
  * The correct pen for the window frame must be selected in the DC.
  */
-static void NC_DrawCaption( HDC32 hdc, RECT32 *rect, HWND32 hwnd,
-			    DWORD style, BOOL32 active )
+static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd,
+			    DWORD style, BOOL active )
 {
-    RECT32 r = *rect;
+    RECT r = *rect;
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     char buffer[256];
 
@@ -1374,24 +1374,24 @@ static void NC_DrawCaption( HDC32 hdc, RECT32 *rect, HWND32 hwnd,
     
     if (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME)
     {
-        HBRUSH32 hbrushOld = SelectObject32(hdc, GetSysColorBrush32(COLOR_WINDOW) );
-	PatBlt32( hdc, r.left, r.top, 1, r.bottom-r.top+1,PATCOPY );
-	PatBlt32( hdc, r.right-1, r.top, 1, r.bottom-r.top+1, PATCOPY );
-	PatBlt32( hdc, r.left, r.top-1, r.right-r.left, 1, PATCOPY );
+        HBRUSH hbrushOld = SelectObject(hdc, GetSysColorBrush(COLOR_WINDOW) );
+	PatBlt( hdc, r.left, r.top, 1, r.bottom-r.top+1,PATCOPY );
+	PatBlt( hdc, r.right-1, r.top, 1, r.bottom-r.top+1, PATCOPY );
+	PatBlt( hdc, r.left, r.top-1, r.right-r.left, 1, PATCOPY );
 	r.left++;
 	r.right--;
-	SelectObject32( hdc, hbrushOld );
+	SelectObject( hdc, hbrushOld );
     }
 
-    MoveTo( hdc, r.left, r.bottom );
-    LineTo32( hdc, r.right, r.bottom );
+    MoveTo16( hdc, r.left, r.bottom );
+    LineTo( hdc, r.right, r.bottom );
 
     if (style & WS_SYSMENU)
     {
 	NC_DrawSysButton( hwnd, hdc, FALSE );
 	r.left += SYSMETRICS_CXSIZE + 1;
-	MoveTo( hdc, r.left - 1, r.top );
-	LineTo32( hdc, r.left - 1, r.bottom );
+	MoveTo16( hdc, r.left - 1, r.top );
+	LineTo( hdc, r.left - 1, r.bottom );
     }
     if (style & WS_MAXIMIZEBOX)
     {
@@ -1404,15 +1404,15 @@ static void NC_DrawCaption( HDC32 hdc, RECT32 *rect, HWND32 hwnd,
 	r.right -= SYSMETRICS_CXSIZE + 1;
     }
 
-    FillRect32( hdc, &r, GetSysColorBrush32(active ? COLOR_ACTIVECAPTION :
+    FillRect( hdc, &r, GetSysColorBrush(active ? COLOR_ACTIVECAPTION :
 					    COLOR_INACTIVECAPTION) );
 
-    if (GetWindowText32A( hwnd, buffer, sizeof(buffer) ))
+    if (GetWindowTextA( hwnd, buffer, sizeof(buffer) ))
     {
-	if (active) SetTextColor32( hdc, GetSysColor32( COLOR_CAPTIONTEXT ) );
-	else SetTextColor32( hdc, GetSysColor32( COLOR_INACTIVECAPTIONTEXT ) );
-	SetBkMode32( hdc, TRANSPARENT );
-	DrawText32A( hdc, buffer, -1, &r,
+	if (active) SetTextColor( hdc, GetSysColor( COLOR_CAPTIONTEXT ) );
+	else SetTextColor( hdc, GetSysColor( COLOR_INACTIVECAPTIONTEXT ) );
+	SetBkMode( hdc, TRANSPARENT );
+	DrawTextA( hdc, buffer, -1, &r,
                      DT_SINGLELINE | DT_CENTER | DT_VCENTER | DT_NOPREFIX );
     }
 }
@@ -1443,27 +1443,27 @@ static void NC_DrawCaption( HDC32 hdc, RECT32 *rect, HWND32 hwnd,
  *****************************************************************************/
 
 static void  NC_DrawCaption95(
-    HDC32  hdc,
-    RECT32 *rect,
-    HWND32 hwnd,
+    HDC  hdc,
+    RECT *rect,
+    HWND hwnd,
     DWORD  style,
     DWORD  exStyle,
-    BOOL32 active )
+    BOOL active )
 {
-    RECT32  r = *rect;
+    RECT  r = *rect;
     WND     *wndPtr = WIN_FindWndPtr( hwnd );
     char    buffer[256];
-    HPEN32  hPrevPen;
+    HPEN  hPrevPen;
 
     if (wndPtr->flags & WIN_MANAGED) return;
 
-    hPrevPen = SelectObject32( hdc, GetSysColorPen32(COLOR_3DFACE) );
-    MoveToEx32( hdc, r.left, r.bottom - 1, NULL );
-    LineTo32( hdc, r.right, r.bottom - 1 );
-    SelectObject32( hdc, hPrevPen );
+    hPrevPen = SelectObject( hdc, GetSysColorPen(COLOR_3DFACE) );
+    MoveToEx( hdc, r.left, r.bottom - 1, NULL );
+    LineTo( hdc, r.right, r.bottom - 1 );
+    SelectObject( hdc, hPrevPen );
     r.bottom--;
 
-    FillRect32( hdc, &r, GetSysColorBrush32(active ? COLOR_ACTIVECAPTION :
+    FillRect( hdc, &r, GetSysColorBrush(active ? COLOR_ACTIVECAPTION :
 					    COLOR_INACTIVECAPTION) );
 
     if (!hbitmapClose) {
@@ -1495,23 +1495,23 @@ static void  NC_DrawCaption95(
 	r.right -= SYSMETRICS_CXSIZE + 1;
     }
 
-    if (GetWindowText32A( hwnd, buffer, sizeof(buffer) )) {
-	NONCLIENTMETRICS32A nclm;
-	HFONT32 hFont, hOldFont;
-	nclm.cbSize = sizeof(NONCLIENTMETRICS32A);
-	SystemParametersInfo32A (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
+    if (GetWindowTextA( hwnd, buffer, sizeof(buffer) )) {
+	NONCLIENTMETRICSA nclm;
+	HFONT hFont, hOldFont;
+	nclm.cbSize = sizeof(NONCLIENTMETRICSA);
+	SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
 	if (exStyle & WS_EX_TOOLWINDOW)
-	    hFont = CreateFontIndirect32A (&nclm.lfSmCaptionFont);
+	    hFont = CreateFontIndirectA (&nclm.lfSmCaptionFont);
 	else
-	    hFont = CreateFontIndirect32A (&nclm.lfCaptionFont);
-	hOldFont = SelectObject32 (hdc, hFont);
-	if (active) SetTextColor32( hdc, GetSysColor32( COLOR_CAPTIONTEXT ) );
-	else SetTextColor32( hdc, GetSysColor32( COLOR_INACTIVECAPTIONTEXT ) );
-	SetBkMode32( hdc, TRANSPARENT );
+	    hFont = CreateFontIndirectA (&nclm.lfCaptionFont);
+	hOldFont = SelectObject (hdc, hFont);
+	if (active) SetTextColor( hdc, GetSysColor( COLOR_CAPTIONTEXT ) );
+	else SetTextColor( hdc, GetSysColor( COLOR_INACTIVECAPTIONTEXT ) );
+	SetBkMode( hdc, TRANSPARENT );
 	r.left += 2;
-	DrawText32A( hdc, buffer, -1, &r,
+	DrawTextA( hdc, buffer, -1, &r,
 		     DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT );
-	DeleteObject32 (SelectObject32 (hdc, hOldFont));
+	DeleteObject (SelectObject (hdc, hOldFont));
     }
 }
 
@@ -1522,12 +1522,12 @@ static void  NC_DrawCaption95(
  *
  * Paint the non-client area. clip is currently unused.
  */
-void NC_DoNCPaint( WND* wndPtr, HRGN32 clip, BOOL32 suppress_menupaint )
+void NC_DoNCPaint( WND* wndPtr, HRGN clip, BOOL suppress_menupaint )
 {
-    HDC32 hdc;
-    RECT32 rect;
-    BOOL32 active;
-    HWND32 hwnd = wndPtr->hwndSelf;
+    HDC hdc;
+    RECT rect;
+    BOOL active;
+    HWND hwnd = wndPtr->hwndSelf;
 
     if ( wndPtr->dwStyle & WS_MINIMIZE ||
 	!WIN_IsWindowDrawable( wndPtr, 0 )) return; /* Nothing to do */
@@ -1536,15 +1536,15 @@ void NC_DoNCPaint( WND* wndPtr, HRGN32 clip, BOOL32 suppress_menupaint )
 
     TRACE(nonclient, "%04x %d\n", hwnd, active );
 
-    if (!(hdc = GetDCEx32( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ))) return;
+    if (!(hdc = GetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ))) return;
 
-    if (ExcludeVisRect( hdc, wndPtr->rectClient.left-wndPtr->rectWindow.left,
+    if (ExcludeVisRect16( hdc, wndPtr->rectClient.left-wndPtr->rectWindow.left,
 		        wndPtr->rectClient.top-wndPtr->rectWindow.top,
 		        wndPtr->rectClient.right-wndPtr->rectWindow.left,
 		        wndPtr->rectClient.bottom-wndPtr->rectWindow.top )
 	== NULLREGION)
     {
-	ReleaseDC32( hwnd, hdc );
+	ReleaseDC( hwnd, hdc );
 	return;
     }
 
@@ -1552,16 +1552,16 @@ void NC_DoNCPaint( WND* wndPtr, HRGN32 clip, BOOL32 suppress_menupaint )
     rect.right  = wndPtr->rectWindow.right - wndPtr->rectWindow.left;
     rect.bottom = wndPtr->rectWindow.bottom - wndPtr->rectWindow.top;
 
-    SelectObject32( hdc, GetSysColorPen32(COLOR_WINDOWFRAME) );
+    SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
 
     if (!(wndPtr->flags & WIN_MANAGED))
     {
         if ((wndPtr->dwStyle & WS_BORDER) || (wndPtr->dwStyle & WS_DLGFRAME) ||
             (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME))
         {
-	    SelectObject32( hdc, GetStockObject32(NULL_BRUSH) );
-            Rectangle32( hdc, 0, 0, rect.right, rect.bottom );
-            InflateRect32( &rect, -1, -1 );
+	    SelectObject( hdc, GetStockObject(NULL_BRUSH) );
+            Rectangle( hdc, 0, 0, rect.right, rect.bottom );
+            InflateRect( &rect, -1, -1 );
         }
 
         if (HAS_DLGFRAME( wndPtr->dwStyle, wndPtr->dwExStyle )) 
@@ -1571,7 +1571,7 @@ void NC_DoNCPaint( WND* wndPtr, HRGN32 clip, BOOL32 suppress_menupaint )
 
         if ((wndPtr->dwStyle & WS_CAPTION) == WS_CAPTION)
         {
-            RECT32 r = rect;
+            RECT r = rect;
             r.bottom = rect.top + SYSMETRICS_CYSIZE;
             rect.top += SYSMETRICS_CYSIZE + SYSMETRICS_CYBORDER;
             NC_DrawCaption( hdc, &r, hwnd, wndPtr->dwStyle, active );
@@ -1580,7 +1580,7 @@ void NC_DoNCPaint( WND* wndPtr, HRGN32 clip, BOOL32 suppress_menupaint )
 
     if (HAS_MENU(wndPtr))
     {
-	RECT32 r = rect;
+	RECT r = rect;
 	r.bottom = rect.top + SYSMETRICS_CYMENU;  /* default height */
 	rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint );
     }
@@ -1596,17 +1596,17 @@ void NC_DoNCPaint( WND* wndPtr, HRGN32 clip, BOOL32 suppress_menupaint )
 
     if ((wndPtr->dwStyle & WS_VSCROLL) && (wndPtr->dwStyle & WS_HSCROLL))
     {
-        RECT32 r = rect;
+        RECT r = rect;
         r.left = r.right - SYSMETRICS_CXVSCROLL + 1;
         r.top  = r.bottom - SYSMETRICS_CYHSCROLL + 1;
 	if(wndPtr->dwStyle & WS_BORDER) {
 	  r.left++;
 	  r.top++;
 	}
-        FillRect32( hdc, &r, GetSysColorBrush32(COLOR_SCROLLBAR) );
+        FillRect( hdc, &r, GetSysColorBrush(COLOR_SCROLLBAR) );
     }    
 
-    ReleaseDC32( hwnd, hdc );
+    ReleaseDC( hwnd, hdc );
 }
 
 
@@ -1634,13 +1634,13 @@ void NC_DoNCPaint( WND* wndPtr, HRGN32 clip, BOOL32 suppress_menupaint )
 
 void  NC_DoNCPaint95(
     WND  *wndPtr,
-    HRGN32  clip,
-    BOOL32  suppress_menupaint )
+    HRGN  clip,
+    BOOL  suppress_menupaint )
 {
-    HDC32 hdc;
-    RECT32 rect;
-    BOOL32 active;
-    HWND32 hwnd = wndPtr->hwndSelf;
+    HDC hdc;
+    RECT rect;
+    BOOL active;
+    HWND hwnd = wndPtr->hwndSelf;
 
     if ( wndPtr->dwStyle & WS_MINIMIZE ||
 	!WIN_IsWindowDrawable( wndPtr, 0 )) return; /* Nothing to do */
@@ -1649,15 +1649,15 @@ void  NC_DoNCPaint95(
 
     TRACE(nonclient, "%04x %d\n", hwnd, active );
 
-    if (!(hdc = GetDCEx32( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ))) return;
+    if (!(hdc = GetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ))) return;
 
-    if (ExcludeVisRect( hdc, wndPtr->rectClient.left-wndPtr->rectWindow.left,
+    if (ExcludeVisRect16( hdc, wndPtr->rectClient.left-wndPtr->rectWindow.left,
 		        wndPtr->rectClient.top-wndPtr->rectWindow.top,
 		        wndPtr->rectClient.right-wndPtr->rectWindow.left,
 		        wndPtr->rectClient.bottom-wndPtr->rectWindow.top )
 	== NULLREGION)
     {
-	ReleaseDC32( hwnd, hdc );
+	ReleaseDC( hwnd, hdc );
 	return;
     }
 
@@ -1665,12 +1665,12 @@ void  NC_DoNCPaint95(
     rect.right  = wndPtr->rectWindow.right - wndPtr->rectWindow.left;
     rect.bottom = wndPtr->rectWindow.bottom - wndPtr->rectWindow.top;
 
-    SelectObject32( hdc, GetSysColorPen32(COLOR_WINDOWFRAME) );
+    SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
 
     if(!(wndPtr->flags & WIN_MANAGED)) {
         if ((wndPtr->dwStyle & WS_BORDER) && ((wndPtr->dwStyle & WS_DLGFRAME) ||
 	    (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME) || (wndPtr->dwStyle & WS_THICKFRAME))) {
-            DrawEdge32 (hdc, &rect, EDGE_RAISED, BF_RECT | BF_ADJUST);
+            DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT | BF_ADJUST);
         }
 
         if (HAS_FIXEDFRAME( wndPtr->dwStyle, wndPtr->dwExStyle )) 
@@ -1680,7 +1680,7 @@ void  NC_DoNCPaint95(
 
         if ((wndPtr->dwStyle & WS_CAPTION) == WS_CAPTION)
         {
-            RECT32  r = rect;
+            RECT  r = rect;
 	    if (wndPtr->dwExStyle & WS_EX_TOOLWINDOW) {
 		r.bottom = rect.top + sysMetrics[SM_CYSMCAPTION];
 		rect.top += sysMetrics[SM_CYSMCAPTION];
@@ -1696,7 +1696,7 @@ void  NC_DoNCPaint95(
 
     if (HAS_MENU(wndPtr))
     {
-	RECT32 r = rect;
+	RECT r = rect;
 	r.bottom = rect.top + sysMetrics[SM_CYMENU];
 	
 	TRACE(nonclient, "Calling DrawMenuBar with "
@@ -1710,10 +1710,10 @@ void  NC_DoNCPaint95(
 		       rect.left, rect.top, rect.right, rect.bottom );
 
     if (wndPtr->dwExStyle & WS_EX_CLIENTEDGE)
-	DrawEdge32 (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
+	DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
 
     if (wndPtr->dwExStyle & WS_EX_STATICEDGE)
-	DrawEdge32 (hdc, &rect, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
+	DrawEdge (hdc, &rect, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
 
     /* Draw the scroll-bars */
 
@@ -1725,13 +1725,13 @@ void  NC_DoNCPaint95(
     /* Draw the "size-box" */
     if ((wndPtr->dwStyle & WS_VSCROLL) && (wndPtr->dwStyle & WS_HSCROLL))
     {
-        RECT32 r = rect;
+        RECT r = rect;
         r.left = r.right - SYSMETRICS_CXVSCROLL + 1;
         r.top  = r.bottom - SYSMETRICS_CYHSCROLL + 1;
-        FillRect32( hdc, &r,  GetSysColorBrush32(COLOR_SCROLLBAR) );
+        FillRect( hdc, &r,  GetSysColorBrush(COLOR_SCROLLBAR) );
     }    
 
-    ReleaseDC32( hwnd, hdc );
+    ReleaseDC( hwnd, hdc );
 }
 
 
@@ -1742,7 +1742,7 @@ void  NC_DoNCPaint95(
  *
  * Handle a WM_NCPAINT message. Called from DefWindowProc().
  */
-LONG NC_HandleNCPaint( HWND32 hwnd , HRGN32 clip)
+LONG NC_HandleNCPaint( HWND hwnd , HRGN clip)
 {
     WND* wndPtr = WIN_FindWndPtr( hwnd );
 
@@ -1779,9 +1779,9 @@ LONG NC_HandleNCActivate( WND *wndPtr, WPARAM16 wParam )
 	if( wndPtr->dwStyle & WS_MINIMIZE ) 
 	    WINPOS_RedrawIconTitle( wndPtr->hwndSelf );
 	else if (TWEAK_WineLook == WIN31_LOOK)
-	    NC_DoNCPaint( wndPtr, (HRGN32)1, FALSE );
+	    NC_DoNCPaint( wndPtr, (HRGN)1, FALSE );
 	else
-	    NC_DoNCPaint95( wndPtr, (HRGN32)1, FALSE );
+	    NC_DoNCPaint95( wndPtr, (HRGN)1, FALSE );
     }
     return TRUE;
 }
@@ -1792,9 +1792,9 @@ LONG NC_HandleNCActivate( WND *wndPtr, WPARAM16 wParam )
  *
  * Handle a WM_SETCURSOR message. Called from DefWindowProc().
  */
-LONG NC_HandleSetCursor( HWND32 hwnd, WPARAM16 wParam, LPARAM lParam )
+LONG NC_HandleSetCursor( HWND hwnd, WPARAM16 wParam, LPARAM lParam )
 {
-    if (hwnd != (HWND32)wParam) return 0;  /* Don't set the cursor for child windows */
+    if (hwnd != (HWND)wParam) return 0;  /* Don't set the cursor for child windows */
 
     switch(LOWORD(lParam))
     {
@@ -1803,7 +1803,7 @@ LONG NC_HandleSetCursor( HWND32 hwnd, WPARAM16 wParam, LPARAM lParam )
 	    WORD msg = HIWORD( lParam );
 	    if ((msg == WM_LBUTTONDOWN) || (msg == WM_MBUTTONDOWN) ||
 		(msg == WM_RBUTTONDOWN))
-		MessageBeep32(0);
+		MessageBeep(0);
 	}
 	break;
 
@@ -1843,21 +1843,21 @@ LONG NC_HandleSetCursor( HWND32 hwnd, WPARAM16 wParam, LPARAM lParam )
 /***********************************************************************
  *           NC_GetSysPopupPos
  */
-BOOL32 NC_GetSysPopupPos( WND* wndPtr, RECT32* rect )
+BOOL NC_GetSysPopupPos( WND* wndPtr, RECT* rect )
 {
   if( wndPtr->hSysMenu )
   {
       if( wndPtr->dwStyle & WS_MINIMIZE )
-	  GetWindowRect32( wndPtr->hwndSelf, rect );
+	  GetWindowRect( wndPtr->hwndSelf, rect );
       else
       {
           if (TWEAK_WineLook == WIN31_LOOK)
               NC_GetInsideRect( wndPtr->hwndSelf, rect );
           else
               NC_GetInsideRect95( wndPtr->hwndSelf, rect );
-  	  OffsetRect32( rect, wndPtr->rectWindow.left, wndPtr->rectWindow.top);
+  	  OffsetRect( rect, wndPtr->rectWindow.left, wndPtr->rectWindow.top);
   	  if (wndPtr->dwStyle & WS_CHILD)
-     	      ClientToScreen32( wndPtr->parent->hwndSelf, (POINT32 *)rect );
+     	      ClientToScreen( wndPtr->parent->hwndSelf, (POINT *)rect );
           if (TWEAK_WineLook == WIN31_LOOK) {
             rect->right = rect->left + SYSMETRICS_CXSIZE;
             rect->bottom = rect->top + SYSMETRICS_CYSIZE;
@@ -1883,12 +1883,12 @@ static LONG NC_StartSizeMove( WND* wndPtr, WPARAM16 wParam,
 {
     LONG hittest = 0;
     POINT16 pt;
-    MSG32 msg;
+    MSG msg;
 
     if ((wParam & 0xfff0) == SC_MOVE)
     {
 	  /* Move pointer at the center of the caption */
-	RECT32 rect;
+	RECT rect;
         if (TWEAK_WineLook == WIN31_LOOK)
             NC_GetInsideRect( wndPtr->hwndSelf, &rect );
         else
@@ -1951,7 +1951,7 @@ static LONG NC_StartSizeMove( WND* wndPtr, WPARAM16 wParam,
 	}
 	*capturePoint = pt;
     }
-    SetCursorPos32( pt.x, pt.y );
+    SetCursorPos( pt.x, pt.y );
     NC_HandleSetCursor( wndPtr->hwndSelf, 
 			wndPtr->hwndSelf, MAKELONG( hittest, WM_MOUSEMOVE ));
     return hittest;
@@ -1963,24 +1963,24 @@ static LONG NC_StartSizeMove( WND* wndPtr, WPARAM16 wParam,
  *
  * Perform SC_MOVE and SC_SIZE commands.               `
  */
-static void NC_DoSizeMove( HWND32 hwnd, WORD wParam )
+static void NC_DoSizeMove( HWND hwnd, WORD wParam )
 {
-    MSG32 msg;
-    RECT32 sizingRect, mouseRect;
-    HDC32 hdc;
+    MSG msg;
+    RECT sizingRect, mouseRect;
+    HDC hdc;
     LONG hittest = (LONG)(wParam & 0x0f);
     HCURSOR16 hDragCursor = 0, hOldCursor = 0;
-    POINT32 minTrack, maxTrack;
+    POINT minTrack, maxTrack;
     POINT16 capturePoint, pt;
     WND *     wndPtr = WIN_FindWndPtr( hwnd );
-    BOOL32    thickframe = HAS_THICKFRAME( wndPtr->dwStyle );
-    BOOL32    iconic = wndPtr->dwStyle & WS_MINIMIZE;
-    BOOL32    moved = FALSE;
+    BOOL    thickframe = HAS_THICKFRAME( wndPtr->dwStyle );
+    BOOL    iconic = wndPtr->dwStyle & WS_MINIMIZE;
+    BOOL    moved = FALSE;
     DWORD     dwPoint = GetMessagePos ();
 
     capturePoint = pt = *(POINT16*)&dwPoint;
 
-    if (IsZoomed32(hwnd) || !IsWindowVisible32(hwnd) ||
+    if (IsZoomed(hwnd) || !IsWindowVisible(hwnd) ||
         (wndPtr->flags & WIN_MANAGED)) return;
 
     if ((wParam & 0xfff0) == SC_MOVE)
@@ -1996,7 +1996,7 @@ static void NC_DoSizeMove( HWND32 hwnd, WORD wParam )
 	if ( hittest && hittest != HTSYSMENU ) hittest += 2;
 	else
 	{
-	    SetCapture32(hwnd);
+	    SetCapture(hwnd);
 	    hittest = NC_StartSizeMove( wndPtr, wParam, &capturePoint );
 	    if (!hittest)
 	    {
@@ -2011,9 +2011,9 @@ static void NC_DoSizeMove( HWND32 hwnd, WORD wParam )
     WINPOS_GetMinMaxInfo( wndPtr, NULL, NULL, &minTrack, &maxTrack );
     sizingRect = wndPtr->rectWindow;
     if (wndPtr->dwStyle & WS_CHILD)
-	GetClientRect32( wndPtr->parent->hwndSelf, &mouseRect );
+	GetClientRect( wndPtr->parent->hwndSelf, &mouseRect );
     else 
-        SetRect32(&mouseRect, 0, 0, SYSMETRICS_CXSCREEN, SYSMETRICS_CYSCREEN);
+        SetRect(&mouseRect, 0, 0, SYSMETRICS_CXSCREEN, SYSMETRICS_CYSCREEN);
     if (ON_LEFT_BORDER(hittest))
     {
 	mouseRect.left  = MAX( mouseRect.left, sizingRect.right-maxTrack.x );
@@ -2036,21 +2036,21 @@ static void NC_DoSizeMove( HWND32 hwnd, WORD wParam )
     }
     if (wndPtr->dwStyle & WS_CHILD)
     {
-	MapWindowPoints32( wndPtr->parent->hwndSelf, 0, 
-		(LPPOINT32)&mouseRect, 2 );
+	MapWindowPoints( wndPtr->parent->hwndSelf, 0, 
+		(LPPOINT)&mouseRect, 2 );
     }
     SendMessage16( hwnd, WM_ENTERSIZEMOVE, 0, 0 );
 
-    if (GetCapture32() != hwnd) SetCapture32( hwnd );    
+    if (GetCapture() != hwnd) SetCapture( hwnd );    
 
     if (wndPtr->dwStyle & WS_CHILD)
     {
           /* Retrieve a default cache DC (without using the window style) */
-        hdc = GetDCEx32( wndPtr->parent->hwndSelf, 0, DCX_CACHE );
+        hdc = GetDCEx( wndPtr->parent->hwndSelf, 0, DCX_CACHE );
     }
     else
     {  /* Grab the server only when moving top-level windows without desktop */
-	hdc = GetDC32( 0 );
+	hdc = GetDC( 0 );
     }
 
     wndPtr->pDriver->pPreSizeMove(wndPtr);
@@ -2105,18 +2105,18 @@ static void NC_DoSizeMove( HWND32 hwnd, WORD wParam )
 		moved = TRUE;
         	if( iconic ) /* ok, no system popup tracking */
 		{
-		    hOldCursor = SetCursor32(hDragCursor);
-		    ShowCursor32( TRUE );
+		    hOldCursor = SetCursor(hDragCursor);
+		    ShowCursor( TRUE );
 		    WINPOS_ShowIconTitle( wndPtr, FALSE );
 		}
 	    }
 
-	    if (msg.message == WM_KEYDOWN) SetCursorPos32( pt.x, pt.y );
+	    if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y );
 	    else
 	    {
-		RECT32 newRect = sizingRect;
+		RECT newRect = sizingRect;
 
-		if (hittest == HTCAPTION) OffsetRect32( &newRect, dx, dy );
+		if (hittest == HTCAPTION) OffsetRect( &newRect, dx, dy );
 		if (ON_LEFT_BORDER(hittest)) newRect.left += dx;
 		else if (ON_RIGHT_BORDER(hittest)) newRect.right += dx;
 		if (ON_TOP_BORDER(hittest)) newRect.top += dy;
@@ -2137,19 +2137,19 @@ static void NC_DoSizeMove( HWND32 hwnd, WORD wParam )
     {
 	if( moved ) /* restore cursors, show icon title later on */
 	{
-	    ShowCursor32( FALSE );
-	    SetCursor32( hOldCursor );
+	    ShowCursor( FALSE );
+	    SetCursor( hOldCursor );
 	}
-        DestroyCursor32( hDragCursor );
+        DestroyCursor( hDragCursor );
     }
     else
 	NC_DrawMovingFrame( hdc, &sizingRect, thickframe );
 
     if (wndPtr->dwStyle & WS_CHILD)
-        ReleaseDC32( wndPtr->parent->hwndSelf, hdc );
+        ReleaseDC( wndPtr->parent->hwndSelf, hdc );
     else
     {
-	ReleaseDC32( 0, hdc );
+	ReleaseDC( 0, hdc );
     }
 
     wndPtr->pDriver->pPostSizeMove(wndPtr);
@@ -2174,13 +2174,13 @@ static void NC_DoSizeMove( HWND32 hwnd, WORD wParam )
     if( moved && !((msg.message == WM_KEYDOWN) && (msg.wParam == VK_ESCAPE)) )
     {
 	/* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */
-	SetWindowPos32( hwnd, 0, sizingRect.left, sizingRect.top,
+	SetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top,
 			sizingRect.right - sizingRect.left,
 			sizingRect.bottom - sizingRect.top,
 		      ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
     }
 
-    if( IsWindow32(hwnd) )
+    if( IsWindow(hwnd) )
 	if( wndPtr->dwStyle & WS_MINIMIZE )
 	{
 	    /* Single click brings up the system menu when iconized */
@@ -2201,15 +2201,15 @@ static void NC_DoSizeMove( HWND32 hwnd, WORD wParam )
  *
  * Track a mouse button press on the minimize or maximize box.
  */
-static void NC_TrackMinMaxBox( HWND32 hwnd, WORD wParam )
+static void NC_TrackMinMaxBox( HWND hwnd, WORD wParam )
 {
-    MSG32 msg;
+    MSG msg;
     POINT16 pt16;
-    HDC32 hdc = GetWindowDC32( hwnd );
-    BOOL32 pressed = TRUE;
-    void  (*paintButton)(HWND32, HDC16, BOOL32);
+    HDC hdc = GetWindowDC( hwnd );
+    BOOL pressed = TRUE;
+    void  (*paintButton)(HWND, HDC16, BOOL);
 
-    SetCapture32( hwnd );
+    SetCapture( hwnd );
     if (wParam == HTMINBUTTON)
 	paintButton =
 	    (TWEAK_WineLook == WIN31_LOOK) ? &NC_DrawMinButton : &NC_DrawMinButton95;
@@ -2221,7 +2221,7 @@ static void NC_TrackMinMaxBox( HWND32 hwnd, WORD wParam )
 
     do
     {
-	BOOL32 oldstate = pressed;
+	BOOL oldstate = pressed;
         MSG_InternalGetMessage( &msg, 0, 0, 0, PM_REMOVE, FALSE );
         CONV_POINT32TO16( &msg.pt, &pt16 );
 
@@ -2233,14 +2233,14 @@ static void NC_TrackMinMaxBox( HWND32 hwnd, WORD wParam )
     (*paintButton)( hwnd, hdc, FALSE );
 
     ReleaseCapture();
-    ReleaseDC32( hwnd, hdc );
+    ReleaseDC( hwnd, hdc );
     if (!pressed) return;
 
     if (wParam == HTMINBUTTON) 
 	SendMessage16( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, *(LONG*)&pt16 );
     else
 	SendMessage16( hwnd, WM_SYSCOMMAND, 
-		  IsZoomed32(hwnd) ? SC_RESTORE:SC_MAXIMIZE, *(LONG*)&pt16 );
+		  IsZoomed(hwnd) ? SC_RESTORE:SC_MAXIMIZE, *(LONG*)&pt16 );
 }
 
 
@@ -2250,20 +2250,20 @@ static void NC_TrackMinMaxBox( HWND32 hwnd, WORD wParam )
  * Track a mouse button press on the Win95 close button.
  */
 static void
-NC_TrackCloseButton95 (HWND32 hwnd, WORD wParam)
+NC_TrackCloseButton95 (HWND hwnd, WORD wParam)
 {
-    MSG32 msg;
+    MSG msg;
     POINT16 pt16;
-    HDC32 hdc = GetWindowDC32( hwnd );
-    BOOL32 pressed = TRUE;
+    HDC hdc = GetWindowDC( hwnd );
+    BOOL pressed = TRUE;
 
-    SetCapture32( hwnd );
+    SetCapture( hwnd );
 
     NC_DrawCloseButton95 (hwnd, hdc, TRUE);
 
     do
     {
-	BOOL32 oldstate = pressed;
+	BOOL oldstate = pressed;
         MSG_InternalGetMessage( &msg, 0, 0, 0, PM_REMOVE, FALSE );
         CONV_POINT32TO16( &msg.pt, &pt16 );
 
@@ -2275,7 +2275,7 @@ NC_TrackCloseButton95 (HWND32 hwnd, WORD wParam)
     NC_DrawCloseButton95 (hwnd, hdc, FALSE);
 
     ReleaseCapture();
-    ReleaseDC32( hwnd, hdc );
+    ReleaseDC( hwnd, hdc );
     if (!pressed) return;
 
     SendMessage16( hwnd, WM_SYSCOMMAND, SC_CLOSE, *(LONG*)&pt16 );
@@ -2287,10 +2287,10 @@ NC_TrackCloseButton95 (HWND32 hwnd, WORD wParam)
  *
  * Track a mouse button press on the horizontal or vertical scroll-bar.
  */
-static void NC_TrackScrollBar( HWND32 hwnd, WPARAM32 wParam, POINT32 pt )
+static void NC_TrackScrollBar( HWND hwnd, WPARAM wParam, POINT pt )
 {
     MSG16 *msg;
-    INT32 scrollbar;
+    INT scrollbar;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
 
     if ((wParam & 0xfff0) == SC_HSCROLL)
@@ -2307,7 +2307,7 @@ static void NC_TrackScrollBar( HWND32 hwnd, WPARAM32 wParam, POINT32 pt )
     if (!(msg = SEGPTR_NEW(MSG16))) return;
     pt.x -= wndPtr->rectWindow.left;
     pt.y -= wndPtr->rectWindow.top;
-    SetCapture32( hwnd );
+    SetCapture( hwnd );
     SCROLL_HandleScrollEvent( hwnd, scrollbar, WM_LBUTTONDOWN, pt );
 
     do
@@ -2329,7 +2329,7 @@ static void NC_TrackScrollBar( HWND32 hwnd, WPARAM32 wParam, POINT32 pt )
             DispatchMessage16( msg );
             break;
 	}
-        if (!IsWindow32( hwnd ))
+        if (!IsWindow( hwnd ))
         {
             ReleaseCapture();
             break;
@@ -2345,14 +2345,14 @@ static void NC_TrackScrollBar( HWND32 hwnd, WPARAM32 wParam, POINT32 pt )
  */
 LONG NC_HandleNCLButtonDown( WND* pWnd, WPARAM16 wParam, LPARAM lParam )
 {
-    HWND32 hwnd = pWnd->hwndSelf;
+    HWND hwnd = pWnd->hwndSelf;
 
     switch(wParam)  /* Hit test */
     {
     case HTCAPTION:
 	 hwnd = WIN_GetTopParent(hwnd);
 
-	 if( WINPOS_SetActiveWindow(hwnd, TRUE, TRUE) || (GetActiveWindow32() == hwnd) )
+	 if( WINPOS_SetActiveWindow(hwnd, TRUE, TRUE) || (GetActiveWindow() == hwnd) )
 		SendMessage16( pWnd->hwndSelf, WM_SYSCOMMAND, SC_MOVE + HTCAPTION, lParam );
 	 break;
 
@@ -2361,12 +2361,12 @@ LONG NC_HandleNCLButtonDown( WND* pWnd, WPARAM16 wParam, LPARAM lParam )
 	 {
 	     if( !(pWnd->dwStyle & WS_MINIMIZE) )
 	     {
-		HDC32 hDC = GetWindowDC32(hwnd);
+		HDC hDC = GetWindowDC(hwnd);
 		if (TWEAK_WineLook == WIN31_LOOK)
 		    NC_DrawSysButton( hwnd, hDC, TRUE );
 		else
 		    NC_DrawSysButton95( hwnd, hDC, TRUE );
-		ReleaseDC32( hwnd, hDC );
+		ReleaseDC( hwnd, hDC );
 	     }
 	     SendMessage16( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, lParam );
 	 }
@@ -2464,10 +2464,10 @@ LONG NC_HandleNCLButtonDblClk( WND *pWnd, WPARAM16 wParam, LPARAM lParam )
  *
  * Handle a WM_SYSCOMMAND message. Called from DefWindowProc().
  */
-LONG NC_HandleSysCommand( HWND32 hwnd, WPARAM16 wParam, POINT16 pt )
+LONG NC_HandleSysCommand( HWND hwnd, WPARAM16 wParam, POINT16 pt )
 {
     WND *wndPtr = WIN_FindWndPtr( hwnd );
-    POINT32 pt32;
+    POINT pt32;
     UINT16 uCommand = wParam & 0xFFF0;
 
     TRACE(nonclient, "Handling WM_SYSCOMMAND %x %d,%d\n", 
@@ -2484,15 +2484,15 @@ LONG NC_HandleSysCommand( HWND32 hwnd, WPARAM16 wParam, POINT16 pt )
 	break;
 
     case SC_MINIMIZE:
-	ShowWindow32( hwnd, SW_MINIMIZE ); 
+	ShowWindow( hwnd, SW_MINIMIZE ); 
 	break;
 
     case SC_MAXIMIZE:
-	ShowWindow32( hwnd, SW_MAXIMIZE );
+	ShowWindow( hwnd, SW_MAXIMIZE );
 	break;
 
     case SC_RESTORE:
-	ShowWindow32( hwnd, SW_RESTORE );
+	ShowWindow( hwnd, SW_RESTORE );
 	break;
 
     case SC_CLOSE:
@@ -2514,12 +2514,12 @@ LONG NC_HandleSysCommand( HWND32 hwnd, WPARAM16 wParam, POINT16 pt )
 	break;
 	
     case SC_TASKLIST:
-	WinExec32( "taskman.exe", SW_SHOWNORMAL ); 
+	WinExec( "taskman.exe", SW_SHOWNORMAL ); 
 	break;
 
     case SC_SCREENSAVE:
 	if (wParam == SC_ABOUTWINE)
-            ShellAbout32A(hwnd,"Wine", WINE_RELEASE_INFO, 0);
+            ShellAboutA(hwnd,"Wine", WINE_RELEASE_INFO, 0);
 	else 
 	  if (wParam == SC_PUTMARK)
             TRACE(shell,"Mark requested by user\n");
diff --git a/windows/painting.c b/windows/painting.c
index 1f7f89b4f92..9af95e279b3 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -23,10 +23,10 @@
  *           WIN_UpdateNCArea
  *
  */
-void WIN_UpdateNCArea(WND* wnd, BOOL32 bUpdate)
+void WIN_UpdateNCArea(WND* wnd, BOOL bUpdate)
 {
     POINT16 pt = {0, 0}; 
-    HRGN32 hClip = 1;
+    HRGN hClip = 1;
 
     TRACE(nonclient,"hwnd %04x, hrgnUpdate %04x\n", 
                       wnd->hwndSelf, wnd->hrgnUpdate );
@@ -42,46 +42,46 @@ void WIN_UpdateNCArea(WND* wnd, BOOL32 bUpdate)
     {
 	ClientToScreen16(wnd->hwndSelf, &pt);
 
-        hClip = CreateRectRgn32( 0, 0, 0, 0 );
-        if (!CombineRgn32( hClip, wnd->hrgnUpdate, 0, RGN_COPY ))
+        hClip = CreateRectRgn( 0, 0, 0, 0 );
+        if (!CombineRgn( hClip, wnd->hrgnUpdate, 0, RGN_COPY ))
         {
-            DeleteObject32(hClip);
+            DeleteObject(hClip);
             hClip = 1;
         }
 	else
-	    OffsetRgn32( hClip, pt.x, pt.y );
+	    OffsetRgn( hClip, pt.x, pt.y );
 
         if (bUpdate)
         {
 	    /* exclude non-client area from update region */
-            HRGN32 hrgn = CreateRectRgn32( 0, 0,
+            HRGN hrgn = CreateRectRgn( 0, 0,
                                  wnd->rectClient.right - wnd->rectClient.left,
                                  wnd->rectClient.bottom - wnd->rectClient.top);
 
-            if (hrgn && (CombineRgn32( wnd->hrgnUpdate, wnd->hrgnUpdate,
+            if (hrgn && (CombineRgn( wnd->hrgnUpdate, wnd->hrgnUpdate,
                                        hrgn, RGN_AND) == NULLREGION))
             {
-                DeleteObject32( wnd->hrgnUpdate );
+                DeleteObject( wnd->hrgnUpdate );
                 wnd->hrgnUpdate = 1;
             }
 
-            DeleteObject32( hrgn );
+            DeleteObject( hrgn );
         }
     }
 
     wnd->flags &= ~WIN_NEEDS_NCPAINT;
 
-    if ((wnd->hwndSelf == GetActiveWindow32()) &&
+    if ((wnd->hwndSelf == GetActiveWindow()) &&
         !(wnd->flags & WIN_NCACTIVATED))
     {
         wnd->flags |= WIN_NCACTIVATED;
-        if( hClip > 1) DeleteObject32( hClip );
+        if( hClip > 1) DeleteObject( hClip );
         hClip = 1;
     }
 
     if (hClip) SendMessage16( wnd->hwndSelf, WM_NCPAINT, hClip, 0L );
 
-    if (hClip > 1) DeleteObject32( hClip );
+    if (hClip > 1) DeleteObject( hClip );
 }
 
 
@@ -90,8 +90,8 @@ void WIN_UpdateNCArea(WND* wnd, BOOL32 bUpdate)
  */
 HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps ) 
 {
-    BOOL32 bIcon;
-    HRGN32 hrgnUpdate;
+    BOOL bIcon;
+    HRGN hrgnUpdate;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
     if (!wndPtr) return 0;
 
@@ -108,7 +108,7 @@ HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps )
     wndPtr->hrgnUpdate = 0;
     wndPtr->flags &= ~WIN_INTERNAL_PAINT;
 
-    HideCaret32( hwnd );
+    HideCaret( hwnd );
 
     TRACE(win,"hrgnUpdate = %04x, \n", hrgnUpdate);
 
@@ -120,7 +120,7 @@ HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps )
     {
         /* Don't clip the output to the update region for CS_PARENTDC window */
 	if(hrgnUpdate > 1)
-	    DeleteObject32(hrgnUpdate);
+	    DeleteObject(hrgnUpdate);
         lps->hdc = GetDCEx16( hwnd, 0, DCX_WINDOWPAINT | DCX_USESTYLE |
                               (bIcon ? DCX_WINDOW : 0) );
     }
@@ -160,12 +160,12 @@ TRACE(win,"box = (%i,%i - %i,%i)\n", lps->rcPaint.left, lps->rcPaint.top,
 /***********************************************************************
  *           BeginPaint32    (USER32.10)
  */
-HDC32 WINAPI BeginPaint32( HWND32 hwnd, PAINTSTRUCT32 *lps )
+HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps )
 {
     PAINTSTRUCT16 ps;
 
     BeginPaint16( hwnd, &ps );
-    lps->hdc            = (HDC32)ps.hdc;
+    lps->hdc            = (HDC)ps.hdc;
     lps->fErase         = ps.fErase;
     lps->rcPaint.top    = ps.rcPaint.top;
     lps->rcPaint.left   = ps.rcPaint.left;
@@ -183,7 +183,7 @@ HDC32 WINAPI BeginPaint32( HWND32 hwnd, PAINTSTRUCT32 *lps )
 BOOL16 WINAPI EndPaint16( HWND16 hwnd, const PAINTSTRUCT16* lps )
 {
     ReleaseDC16( hwnd, lps->hdc );
-    ShowCaret32( hwnd );
+    ShowCaret( hwnd );
     return TRUE;
 }
 
@@ -191,10 +191,10 @@ BOOL16 WINAPI EndPaint16( HWND16 hwnd, const PAINTSTRUCT16* lps )
 /***********************************************************************
  *           EndPaint32    (USER32.176)
  */
-BOOL32 WINAPI EndPaint32( HWND32 hwnd, const PAINTSTRUCT32 *lps )
+BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps )
 {
-    ReleaseDC32( hwnd, lps->hdc );
-    ShowCaret32( hwnd );
+    ReleaseDC( hwnd, lps->hdc );
+    ShowCaret( hwnd );
     return TRUE;
 }
 
@@ -202,23 +202,23 @@ BOOL32 WINAPI EndPaint32( HWND32 hwnd, const PAINTSTRUCT32 *lps )
 /***********************************************************************
  *           FillWindow    (USER.324)
  */
-void WINAPI FillWindow( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc, HBRUSH16 hbrush )
+void WINAPI FillWindow16( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc, HBRUSH16 hbrush )
 {
     RECT16 rect;
     GetClientRect16( hwnd, &rect );
     DPtoLP16( hdc, (LPPOINT16)&rect, 2 );
-    PaintRect( hwndParent, hwnd, hdc, hbrush, &rect );
+    PaintRect16( hwndParent, hwnd, hdc, hbrush, &rect );
 }
 
 
 /***********************************************************************
  *	     PAINT_GetControlBrush
  */
-static HBRUSH16 PAINT_GetControlBrush( HWND32 hParent, HWND32 hWnd, HDC16 hDC, UINT16 ctlType )
+static HBRUSH16 PAINT_GetControlBrush( HWND hParent, HWND hWnd, HDC16 hDC, UINT16 ctlType )
 {
-    HBRUSH16 bkgBrush = (HBRUSH16)SendMessage32A( hParent, WM_CTLCOLORMSGBOX + ctlType, 
-							     (WPARAM32)hDC, (LPARAM)hWnd );
-    if( !IsGDIObject(bkgBrush) )
+    HBRUSH16 bkgBrush = (HBRUSH16)SendMessageA( hParent, WM_CTLCOLORMSGBOX + ctlType, 
+							     (WPARAM)hDC, (LPARAM)hWnd );
+    if( !IsGDIObject16(bkgBrush) )
 	bkgBrush = DEFWND_ControlColor( hDC, ctlType );
     return bkgBrush;
 }
@@ -227,7 +227,7 @@ static HBRUSH16 PAINT_GetControlBrush( HWND32 hParent, HWND32 hWnd, HDC16 hDC, U
 /***********************************************************************
  *           PaintRect    (USER.325)
  */
-void WINAPI PaintRect( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc,
+void WINAPI PaintRect16( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc,
                        HBRUSH16 hbrush, const RECT16 *rect)
 {
     if( hbrush <= CTLCOLOR_MAX ) 
@@ -245,7 +245,7 @@ void WINAPI PaintRect( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc,
 /***********************************************************************
  *           GetControlBrush    (USER.326)
  */
-HBRUSH16 WINAPI GetControlBrush( HWND16 hwnd, HDC16 hdc, UINT16 ctlType )
+HBRUSH16 WINAPI GetControlBrush16( HWND16 hwnd, HDC16 hdc, UINT16 ctlType )
 {
     WND* wndPtr = WIN_FindWndPtr( hwnd );
 
@@ -278,16 +278,16 @@ HBRUSH16 WINAPI GetControlBrush( HWND16 hwnd, HDC16 hdc, UINT16 ctlType )
  *
  * All in all, a prime candidate for a rewrite.
  */
-BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
-                           HRGN32 hrgnUpdate, UINT32 flags, UINT32 control )
+BOOL PAINT_RedrawWindow( HWND hwnd, const RECT *rectUpdate,
+                           HRGN hrgnUpdate, UINT flags, UINT control )
 {
-    BOOL32 bIcon;
-    HRGN32 hrgn;
-    RECT32 rectClient;
+    BOOL bIcon;
+    HRGN hrgn;
+    RECT rectClient;
     WND* wndPtr;
     WND **list, **ppWnd;
 
-    if (!hwnd) hwnd = GetDesktopWindow32();
+    if (!hwnd) hwnd = GetDesktopWindow();
     if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
     if (!WIN_IsWindowDrawable( wndPtr, !(flags & RDW_FRAME) ) )
         return TRUE;  /* No redraw needed */
@@ -304,7 +304,7 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
         TRACE(win, "%04x NULL %04x flags=%04x\n", hwnd, hrgnUpdate, flags);
     }
 
-    GetClientRect32( hwnd, &rectClient );
+    GetClientRect( hwnd, &rectClient );
 
     if (flags & RDW_INVALIDATE)  /* Invalidate */
     {
@@ -313,11 +313,11 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
         if (wndPtr->hrgnUpdate > 1)  /* Is there already an update region? */
         {
             if ((hrgn = hrgnUpdate) == 0)
-                hrgn = CreateRectRgnIndirect32( rectUpdate ? rectUpdate :
+                hrgn = CreateRectRgnIndirect( rectUpdate ? rectUpdate :
                                                 &rectClient );
-            rgnNotEmpty = CombineRgn32( wndPtr->hrgnUpdate, wndPtr->hrgnUpdate,
+            rgnNotEmpty = CombineRgn( wndPtr->hrgnUpdate, wndPtr->hrgnUpdate,
                                         hrgn, RGN_OR );
-            if (!hrgnUpdate) DeleteObject32( hrgn );
+            if (!hrgnUpdate) DeleteObject( hrgn );
         }
         else  /* No update region yet */
         {
@@ -325,11 +325,11 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
                 QUEUE_IncPaintCount( wndPtr->hmemTaskQ );
             if (hrgnUpdate)
             {
-                wndPtr->hrgnUpdate = CreateRectRgn32( 0, 0, 0, 0 );
-                rgnNotEmpty = CombineRgn32( wndPtr->hrgnUpdate, hrgnUpdate,
+                wndPtr->hrgnUpdate = CreateRectRgn( 0, 0, 0, 0 );
+                rgnNotEmpty = CombineRgn( wndPtr->hrgnUpdate, hrgnUpdate,
                                             0, RGN_COPY );
             }
-            else wndPtr->hrgnUpdate = CreateRectRgnIndirect32( rectUpdate ?
+            else wndPtr->hrgnUpdate = CreateRectRgnIndirect( rectUpdate ?
                                                     rectUpdate : &rectClient );
         }
 	
@@ -338,17 +338,17 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
         /* restrict update region to client area (FIXME: correct?) */
         if (wndPtr->hrgnUpdate)
         {
-            HRGN32 clientRgn = CreateRectRgnIndirect32( &rectClient );
-            rgnNotEmpty = CombineRgn32( wndPtr->hrgnUpdate, clientRgn, 
+            HRGN clientRgn = CreateRectRgnIndirect( &rectClient );
+            rgnNotEmpty = CombineRgn( wndPtr->hrgnUpdate, clientRgn, 
                                         wndPtr->hrgnUpdate, RGN_AND );
-            DeleteObject32( clientRgn );
+            DeleteObject( clientRgn );
         }
 
 	/* check for bogus update region */ 
 	if ( rgnNotEmpty == NULLREGION )
 	   {
 	     wndPtr->flags &= ~WIN_NEEDS_ERASEBKGND;
-	     DeleteObject32( wndPtr->hrgnUpdate );
+	     DeleteObject( wndPtr->hrgnUpdate );
 	     wndPtr->hrgnUpdate=0;
              if (!(wndPtr->flags & WIN_INTERNAL_PAINT))
                    QUEUE_DecPaintCount( wndPtr->hmemTaskQ );
@@ -365,20 +365,20 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
             if (!hrgnUpdate && !rectUpdate)
             {
                   /* Special case: validate everything */
-                DeleteObject32( wndPtr->hrgnUpdate );
+                DeleteObject( wndPtr->hrgnUpdate );
                 wndPtr->hrgnUpdate = 0;
             }
             else
             {
                 if ((hrgn = hrgnUpdate) == 0)
-                    hrgn = CreateRectRgnIndirect32( rectUpdate );
-                if (CombineRgn32( wndPtr->hrgnUpdate, wndPtr->hrgnUpdate,
+                    hrgn = CreateRectRgnIndirect( rectUpdate );
+                if (CombineRgn( wndPtr->hrgnUpdate, wndPtr->hrgnUpdate,
                                   hrgn, RGN_DIFF ) == NULLREGION)
                 {
-                    DeleteObject32( wndPtr->hrgnUpdate );
+                    DeleteObject( wndPtr->hrgnUpdate );
                     wndPtr->hrgnUpdate = 0;
                 }
-                if (!hrgnUpdate) DeleteObject32( hrgn );
+                if (!hrgnUpdate) DeleteObject( hrgn );
             }
             if (!wndPtr->hrgnUpdate)  /* No more update region */
 		if (!(wndPtr->flags & WIN_INTERNAL_PAINT))
@@ -417,7 +417,7 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
 
         if (wndPtr->flags & WIN_NEEDS_ERASEBKGND)
         {
-            HDC32 hdc = GetDCEx32( hwnd, wndPtr->hrgnUpdate,
+            HDC hdc = GetDCEx( hwnd, wndPtr->hrgnUpdate,
                                    DCX_INTERSECTRGN | DCX_USESTYLE |
                                    DCX_KEEPCLIPRGN | DCX_WINDOWPAINT |
                                    (bIcon ? DCX_WINDOW : 0) );
@@ -427,7 +427,7 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
 						: WM_ERASEBKGND,
                                   (WPARAM16)hdc, 0 ))
                   wndPtr->flags &= ~WIN_NEEDS_ERASEBKGND;
-               ReleaseDC32( hwnd, hdc );
+               ReleaseDC( hwnd, hdc );
             }
         }
     }
@@ -440,13 +440,13 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
     {
         if ( hrgnUpdate || rectUpdate )
 	{
-	   if (!(hrgn = CreateRectRgn32( 0, 0, 0, 0 ))) return TRUE;
+	   if (!(hrgn = CreateRectRgn( 0, 0, 0, 0 ))) return TRUE;
 	   if( !hrgnUpdate )
            {
 	        control |= (RDW_C_DELETEHRGN | RDW_C_USEHRGN);
- 	        if( !(hrgnUpdate = CreateRectRgnIndirect32( rectUpdate )) )
+ 	        if( !(hrgnUpdate = CreateRectRgnIndirect( rectUpdate )) )
                 {
-                    DeleteObject32( hrgn );
+                    DeleteObject( hrgn );
                     return TRUE;
                 }
            }
@@ -455,15 +455,15 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
 		for (ppWnd = list; *ppWnd; ppWnd++)
 		{
 		    wndPtr = *ppWnd;
-		    if (!IsWindow32(wndPtr->hwndSelf)) continue;
+		    if (!IsWindow(wndPtr->hwndSelf)) continue;
 		    if (wndPtr->dwStyle & WS_VISIBLE)
 		    {
-			SetRectRgn32( hrgn, 
+			SetRectRgn( hrgn, 
 				wndPtr->rectWindow.left, wndPtr->rectWindow.top, 
 				wndPtr->rectWindow.right, wndPtr->rectWindow.bottom );
-			if (CombineRgn32( hrgn, hrgn, hrgnUpdate, RGN_AND ))
+			if (CombineRgn( hrgn, hrgn, hrgnUpdate, RGN_AND ))
 			{
-			    OffsetRgn32( hrgn, -wndPtr->rectClient.left,
+			    OffsetRgn( hrgn, -wndPtr->rectClient.left,
                                         -wndPtr->rectClient.top );
 			    PAINT_RedrawWindow( wndPtr->hwndSelf, NULL, hrgn, flags,
                                          RDW_C_USEHRGN );
@@ -472,8 +472,8 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
 		}
 		HeapFree( SystemHeap, 0, list );
 	   }
-	   DeleteObject32( hrgn );
-	   if (control & RDW_C_DELETEHRGN) DeleteObject32( hrgnUpdate );
+	   DeleteObject( hrgn );
+	   if (control & RDW_C_DELETEHRGN) DeleteObject( hrgnUpdate );
 	}
         else
         {
@@ -482,7 +482,7 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
 		for (ppWnd = list; *ppWnd; ppWnd++)
 		{
 		    wndPtr = *ppWnd;
-		    if (IsWindow32( wndPtr->hwndSelf ))
+		    if (IsWindow( wndPtr->hwndSelf ))
 			PAINT_RedrawWindow( wndPtr->hwndSelf, NULL, 0, flags, 0 );
 		}
 	        HeapFree( SystemHeap, 0, list );
@@ -497,8 +497,8 @@ BOOL32 PAINT_RedrawWindow( HWND32 hwnd, const RECT32 *rectUpdate,
 /***********************************************************************
  *           RedrawWindow32    (USER32.426)
  */
-BOOL32 WINAPI RedrawWindow32( HWND32 hwnd, const RECT32 *rectUpdate,
-                              HRGN32 hrgnUpdate, UINT32 flags )
+BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rectUpdate,
+                              HRGN hrgnUpdate, UINT flags )
 {
     return PAINT_RedrawWindow( hwnd, rectUpdate, hrgnUpdate, flags, 0 );
 }
@@ -512,12 +512,12 @@ BOOL16 WINAPI RedrawWindow16( HWND16 hwnd, const RECT16 *rectUpdate,
 {
     if (rectUpdate)
     {
-        RECT32 r;
+        RECT r;
         CONV_RECT16TO32( rectUpdate, &r );
-        return (BOOL16)RedrawWindow32( (HWND32)hwnd, &r, hrgnUpdate, flags );
+        return (BOOL16)RedrawWindow( (HWND)hwnd, &r, hrgnUpdate, flags );
     }
-    return (BOOL16)PAINT_RedrawWindow( (HWND32)hwnd, NULL, 
-				       (HRGN32)hrgnUpdate, flags, 0 );
+    return (BOOL16)PAINT_RedrawWindow( (HWND)hwnd, NULL, 
+				       (HRGN)hrgnUpdate, flags, 0 );
 }
 
 
@@ -532,7 +532,7 @@ void WINAPI UpdateWindow16( HWND16 hwnd )
 /***********************************************************************
  *           UpdateWindow32   (USER32.567)
  */
-void WINAPI UpdateWindow32( HWND32 hwnd )
+void WINAPI UpdateWindow( HWND hwnd )
 {
     PAINT_RedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW | RDW_NOCHILDREN, 0 );
 }
@@ -542,7 +542,7 @@ void WINAPI UpdateWindow32( HWND32 hwnd )
  */
 void WINAPI InvalidateRgn16( HWND16 hwnd, HRGN16 hrgn, BOOL16 erase )
 {
-    PAINT_RedrawWindow((HWND32)hwnd, NULL, (HRGN32)hrgn, 
+    PAINT_RedrawWindow((HWND)hwnd, NULL, (HRGN)hrgn, 
 		       RDW_INVALIDATE | (erase ? RDW_ERASE : 0), 0 );
 }
 
@@ -550,7 +550,7 @@ void WINAPI InvalidateRgn16( HWND16 hwnd, HRGN16 hrgn, BOOL16 erase )
 /***********************************************************************
  *           InvalidateRgn32   (USER32.329)
  */
-BOOL32 WINAPI InvalidateRgn32( HWND32 hwnd, HRGN32 hrgn, BOOL32 erase )
+BOOL WINAPI InvalidateRgn( HWND hwnd, HRGN hrgn, BOOL erase )
 {
     return PAINT_RedrawWindow(hwnd, NULL, hrgn, RDW_INVALIDATE | (erase ? RDW_ERASE : 0), 0 );
 }
@@ -568,7 +568,7 @@ void WINAPI InvalidateRect16( HWND16 hwnd, const RECT16 *rect, BOOL16 erase )
 /***********************************************************************
  *           InvalidateRect32   (USER32.328)
  */
-BOOL32 WINAPI InvalidateRect32( HWND32 hwnd, const RECT32 *rect, BOOL32 erase )
+BOOL WINAPI InvalidateRect( HWND hwnd, const RECT *rect, BOOL erase )
 {
     return PAINT_RedrawWindow( hwnd, rect, 0, 
 			       RDW_INVALIDATE | (erase ? RDW_ERASE : 0), 0 );
@@ -580,7 +580,7 @@ BOOL32 WINAPI InvalidateRect32( HWND32 hwnd, const RECT32 *rect, BOOL32 erase )
  */
 void WINAPI ValidateRgn16( HWND16 hwnd, HRGN16 hrgn )
 {
-    PAINT_RedrawWindow( (HWND32)hwnd, NULL, (HRGN32)hrgn, 
+    PAINT_RedrawWindow( (HWND)hwnd, NULL, (HRGN)hrgn, 
 			RDW_VALIDATE | RDW_NOCHILDREN, 0 );
 }
 
@@ -588,7 +588,7 @@ void WINAPI ValidateRgn16( HWND16 hwnd, HRGN16 hrgn )
 /***********************************************************************
  *           ValidateRgn32   (USER32.572)
  */
-void WINAPI ValidateRgn32( HWND32 hwnd, HRGN32 hrgn )
+void WINAPI ValidateRgn( HWND hwnd, HRGN hrgn )
 {
     PAINT_RedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE | RDW_NOCHILDREN, 0 );
 }
@@ -606,7 +606,7 @@ void WINAPI ValidateRect16( HWND16 hwnd, const RECT16 *rect )
 /***********************************************************************
  *           ValidateRect32   (USER32.571)
  */
-void WINAPI ValidateRect32( HWND32 hwnd, const RECT32 *rect )
+void WINAPI ValidateRect( HWND hwnd, const RECT *rect )
 {
     PAINT_RedrawWindow( hwnd, rect, 0, RDW_VALIDATE | RDW_NOCHILDREN, 0 );
 }
@@ -617,11 +617,11 @@ void WINAPI ValidateRect32( HWND32 hwnd, const RECT32 *rect )
  */
 BOOL16 WINAPI GetUpdateRect16( HWND16 hwnd, LPRECT16 rect, BOOL16 erase )
 {
-    RECT32 r;
+    RECT r;
     BOOL16 ret;
 
-    if (!rect) return GetUpdateRect32( hwnd, NULL, erase );
-    ret = GetUpdateRect32( hwnd, &r, erase );
+    if (!rect) return GetUpdateRect( hwnd, NULL, erase );
+    ret = GetUpdateRect( hwnd, &r, erase );
     CONV_RECT32TO16( &r, rect );
     return ret;
 }
@@ -630,7 +630,7 @@ BOOL16 WINAPI GetUpdateRect16( HWND16 hwnd, LPRECT16 rect, BOOL16 erase )
 /***********************************************************************
  *           GetUpdateRect32   (USER32.297)
  */
-BOOL32 WINAPI GetUpdateRect32( HWND32 hwnd, LPRECT32 rect, BOOL32 erase )
+BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     if (!wndPtr) return FALSE;
@@ -639,19 +639,19 @@ BOOL32 WINAPI GetUpdateRect32( HWND32 hwnd, LPRECT32 rect, BOOL32 erase )
     {
 	if (wndPtr->hrgnUpdate > 1)
 	{
-	    HRGN32 hrgn = CreateRectRgn32( 0, 0, 0, 0 );
-	    if (GetUpdateRgn32( hwnd, hrgn, erase ) == ERROR) return FALSE;
-	    GetRgnBox32( hrgn, rect );
-	    DeleteObject32( hrgn );
+	    HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 );
+	    if (GetUpdateRgn( hwnd, hrgn, erase ) == ERROR) return FALSE;
+	    GetRgnBox( hrgn, rect );
+	    DeleteObject( hrgn );
 	    if (wndPtr->class->style & CS_OWNDC)
 	    {
-		if (GetMapMode32(wndPtr->dce->hDC) != MM_TEXT)
+		if (GetMapMode(wndPtr->dce->hDC) != MM_TEXT)
 		{
-		    DPtoLP32 (wndPtr->dce->hDC, (LPPOINT32)rect,  2);
+		    DPtoLP (wndPtr->dce->hDC, (LPPOINT)rect,  2);
 		}
 	    }
 	}
-	else SetRectEmpty32( rect );
+	else SetRectEmpty( rect );
     }
     return (wndPtr->hrgnUpdate > 1);
 }
@@ -662,26 +662,26 @@ BOOL32 WINAPI GetUpdateRect32( HWND32 hwnd, LPRECT32 rect, BOOL32 erase )
  */
 INT16 WINAPI GetUpdateRgn16( HWND16 hwnd, HRGN16 hrgn, BOOL16 erase )
 {
-    return GetUpdateRgn32( hwnd, hrgn, erase );
+    return GetUpdateRgn( hwnd, hrgn, erase );
 }
 
 
 /***********************************************************************
  *           GetUpdateRgn32   (USER32.298)
  */
-INT32 WINAPI GetUpdateRgn32( HWND32 hwnd, HRGN32 hrgn, BOOL32 erase )
+INT WINAPI GetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase )
 {
-    INT32 retval;
+    INT retval;
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     if (!wndPtr) return ERROR;
 
     if (wndPtr->hrgnUpdate <= 1)
     {
-        SetRectRgn32( hrgn, 0, 0, 0, 0 );
+        SetRectRgn( hrgn, 0, 0, 0, 0 );
         return NULLREGION;
     }
-    retval = CombineRgn32( hrgn, wndPtr->hrgnUpdate, 0, RGN_COPY );
-    if (erase) RedrawWindow32( hwnd, NULL, 0, RDW_ERASENOW | RDW_NOCHILDREN );
+    retval = CombineRgn( hrgn, wndPtr->hrgnUpdate, 0, RGN_COPY );
+    if (erase) RedrawWindow( hwnd, NULL, 0, RDW_ERASENOW | RDW_NOCHILDREN );
     return retval;
 }
 
@@ -691,37 +691,37 @@ INT32 WINAPI GetUpdateRgn32( HWND32 hwnd, HRGN32 hrgn, BOOL32 erase )
  */
 INT16 WINAPI ExcludeUpdateRgn16( HDC16 hdc, HWND16 hwnd )
 {
-    return ExcludeUpdateRgn32( hdc, hwnd );
+    return ExcludeUpdateRgn( hdc, hwnd );
 }
 
 
 /***********************************************************************
  *           ExcludeUpdateRgn32   (USER32.195)
  */
-INT32 WINAPI ExcludeUpdateRgn32( HDC32 hdc, HWND32 hwnd )
+INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd )
 {
-    RECT32 rect;
+    RECT rect;
     WND * wndPtr;
 
     if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return ERROR;
 
     if (wndPtr->hrgnUpdate)
     {
-	INT32 ret;
-	HRGN32 hrgn = CreateRectRgn32(wndPtr->rectWindow.left - wndPtr->rectClient.left,
+	INT ret;
+	HRGN hrgn = CreateRectRgn(wndPtr->rectWindow.left - wndPtr->rectClient.left,
 				      wndPtr->rectWindow.top - wndPtr->rectClient.top,
 				      wndPtr->rectClient.right - wndPtr->rectClient.left,
 				      wndPtr->rectClient.bottom - wndPtr->rectClient.top);
 	if( wndPtr->hrgnUpdate > 1 )
-	    CombineRgn32(hrgn, wndPtr->hrgnUpdate, 0, RGN_COPY);
+	    CombineRgn(hrgn, wndPtr->hrgnUpdate, 0, RGN_COPY);
 
 	/* do ugly coordinate translations in dce.c */
 
 	ret = DCE_ExcludeRgn( hdc, wndPtr, hrgn );
-	DeleteObject32( hrgn );
+	DeleteObject( hrgn );
 	return ret;
     } 
-    return GetClipBox32( hdc, &rect );
+    return GetClipBox( hdc, &rect );
 }
 
 
diff --git a/windows/property.c b/windows/property.c
index f2ffc8a621e..a7f7d9388d6 100644
--- a/windows/property.c
+++ b/windows/property.c
@@ -13,7 +13,7 @@
 typedef struct tagPROPERTY
 {
     struct tagPROPERTY *next;     /* Next property in window list */
-    HANDLE32            handle;   /* User's data */
+    HANDLE            handle;   /* User's data */
     LPSTR               string;   /* Property string (or atom) */
 } PROPERTY;
 
@@ -21,7 +21,7 @@ typedef struct tagPROPERTY
 /***********************************************************************
  *           PROP_FindProp
  */
-static PROPERTY *PROP_FindProp( HWND32 hwnd, LPCSTR str )
+static PROPERTY *PROP_FindProp( HWND hwnd, LPCSTR str )
 {
     ATOM atom;
     PROPERTY *prop;
@@ -30,12 +30,12 @@ static PROPERTY *PROP_FindProp( HWND32 hwnd, LPCSTR str )
     if (!pWnd) return NULL;
     if (HIWORD(str))
     {
-        atom = GlobalFindAtom32A( str );
+        atom = GlobalFindAtomA( str );
         for (prop = pWnd->pProp; prop; prop = prop->next)
         {
             if (HIWORD(prop->string))
             {
-                if (!lstrcmpi32A( prop->string, str )) return prop;
+                if (!lstrcmpiA( prop->string, str )) return prop;
             }
             else if (LOWORD(prop->string) == atom) return prop;
         }
@@ -47,7 +47,7 @@ static PROPERTY *PROP_FindProp( HWND32 hwnd, LPCSTR str )
         {
             if (HIWORD(prop->string))
             {
-                if (GlobalFindAtom32A( prop->string ) == atom) return prop;
+                if (GlobalFindAtomA( prop->string ) == atom) return prop;
             }
             else if (LOWORD(prop->string) == atom) return prop;
         }
@@ -61,14 +61,14 @@ static PROPERTY *PROP_FindProp( HWND32 hwnd, LPCSTR str )
  */
 HANDLE16 WINAPI GetProp16( HWND16 hwnd, LPCSTR str )
 {
-    return (HANDLE16)GetProp32A( hwnd, str );
+    return (HANDLE16)GetPropA( hwnd, str );
 }
 
 
 /***********************************************************************
  *           GetProp32A   (USER32.281)
  */
-HANDLE32 WINAPI GetProp32A( HWND32 hwnd, LPCSTR str )
+HANDLE WINAPI GetPropA( HWND hwnd, LPCSTR str )
 {
     PROPERTY *prop = PROP_FindProp( hwnd, str );
 
@@ -86,14 +86,14 @@ HANDLE32 WINAPI GetProp32A( HWND32 hwnd, LPCSTR str )
 /***********************************************************************
  *           GetProp32W   (USER32.282)
  */
-HANDLE32 WINAPI GetProp32W( HWND32 hwnd, LPCWSTR str )
+HANDLE WINAPI GetPropW( HWND hwnd, LPCWSTR str )
 {
     LPSTR strA;
-    HANDLE32 ret;
+    HANDLE ret;
 
-    if (!HIWORD(str)) return GetProp32A( hwnd, (LPCSTR)(UINT32)LOWORD(str) );
+    if (!HIWORD(str)) return GetPropA( hwnd, (LPCSTR)(UINT)LOWORD(str) );
     strA = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-    ret = GetProp32A( hwnd, strA );
+    ret = GetPropA( hwnd, strA );
     HeapFree( GetProcessHeap(), 0, strA );
     return ret;
 }
@@ -104,14 +104,14 @@ HANDLE32 WINAPI GetProp32W( HWND32 hwnd, LPCWSTR str )
  */
 BOOL16 WINAPI SetProp16( HWND16 hwnd, LPCSTR str, HANDLE16 handle )
 {
-    return (BOOL16)SetProp32A( hwnd, str, handle );
+    return (BOOL16)SetPropA( hwnd, str, handle );
 }
 
 
 /***********************************************************************
  *           SetProp32A   (USER32.497)
  */
-BOOL32 WINAPI SetProp32A( HWND32 hwnd, LPCSTR str, HANDLE32 handle )
+BOOL WINAPI SetPropA( HWND hwnd, LPCSTR str, HANDLE handle )
 {
     PROPERTY *prop;
 
@@ -143,15 +143,15 @@ BOOL32 WINAPI SetProp32A( HWND32 hwnd, LPCSTR str, HANDLE32 handle )
 /***********************************************************************
  *           SetProp32W   (USER32.498)
  */
-BOOL32 WINAPI SetProp32W( HWND32 hwnd, LPCWSTR str, HANDLE32 handle )
+BOOL WINAPI SetPropW( HWND hwnd, LPCWSTR str, HANDLE handle )
 {
-    BOOL32 ret;
+    BOOL ret;
     LPSTR strA;
 
     if (!HIWORD(str))
-        return SetProp32A( hwnd, (LPCSTR)(UINT32)LOWORD(str), handle );
+        return SetPropA( hwnd, (LPCSTR)(UINT)LOWORD(str), handle );
     strA = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-    ret = SetProp32A( hwnd, strA, handle );
+    ret = SetPropA( hwnd, strA, handle );
     HeapFree( GetProcessHeap(), 0, strA );
     return ret;
 }
@@ -162,17 +162,17 @@ BOOL32 WINAPI SetProp32W( HWND32 hwnd, LPCWSTR str, HANDLE32 handle )
  */
 HANDLE16 WINAPI RemoveProp16( HWND16 hwnd, LPCSTR str )
 {
-    return (HANDLE16)RemoveProp32A( hwnd, str );
+    return (HANDLE16)RemovePropA( hwnd, str );
 }
 
 
 /***********************************************************************
  *           RemoveProp32A   (USER32.442)
  */
-HANDLE32 WINAPI RemoveProp32A( HWND32 hwnd, LPCSTR str )
+HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str )
 {
     ATOM atom;
-    HANDLE32 handle;
+    HANDLE handle;
     PROPERTY **pprop, *prop;
     WND *pWnd = WIN_FindWndPtr( hwnd );
 
@@ -182,15 +182,15 @@ HANDLE32 WINAPI RemoveProp32A( HWND32 hwnd, LPCSTR str )
       TRACE(prop, "%04x #%04x\n", hwnd, LOWORD(str));
 
 
-    if (!pWnd) return (HANDLE32)0;
+    if (!pWnd) return (HANDLE)0;
     if (HIWORD(str))
     {
-        atom = GlobalFindAtom32A( str );
+        atom = GlobalFindAtomA( str );
         for (pprop=(PROPERTY**)&pWnd->pProp; (*pprop); pprop = &(*pprop)->next)
         {
             if (HIWORD((*pprop)->string))
             {
-                if (!lstrcmpi32A( (*pprop)->string, str )) break;
+                if (!lstrcmpiA( (*pprop)->string, str )) break;
             }
             else if (LOWORD((*pprop)->string) == atom) break;
         }
@@ -202,7 +202,7 @@ HANDLE32 WINAPI RemoveProp32A( HWND32 hwnd, LPCSTR str )
         {
             if (HIWORD((*pprop)->string))
             {
-                if (GlobalFindAtom32A( (*pprop)->string ) == atom) break;
+                if (GlobalFindAtomA( (*pprop)->string ) == atom) break;
             }
             else if (LOWORD((*pprop)->string) == atom) break;
         }
@@ -220,15 +220,15 @@ HANDLE32 WINAPI RemoveProp32A( HWND32 hwnd, LPCSTR str )
 /***********************************************************************
  *           RemoveProp32W   (USER32.443)
  */
-HANDLE32 WINAPI RemoveProp32W( HWND32 hwnd, LPCWSTR str )
+HANDLE WINAPI RemovePropW( HWND hwnd, LPCWSTR str )
 {
     LPSTR strA;
-    HANDLE32 ret;
+    HANDLE ret;
 
     if (!HIWORD(str))
-        return RemoveProp32A( hwnd, (LPCSTR)(UINT32)LOWORD(str) );
+        return RemovePropA( hwnd, (LPCSTR)(UINT)LOWORD(str) );
     strA = HEAP_strdupWtoA( GetProcessHeap(), 0, str );
-    ret = RemoveProp32A( hwnd, strA );
+    ret = RemovePropA( hwnd, strA );
     HeapFree( GetProcessHeap(), 0, strA );
     return ret;
 }
@@ -262,7 +262,7 @@ INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
     WND *pWnd;
     INT16 ret = -1;
 
-    TRACE(prop, "%04x %08x\n", hwnd, (UINT32)func );
+    TRACE(prop, "%04x %08x\n", hwnd, (UINT)func );
     if (!(pWnd = WIN_FindWndPtr( hwnd ))) return -1;
     for (prop = pWnd->pProp; (prop); prop = next)
     {
@@ -282,32 +282,32 @@ INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
 /***********************************************************************
  *           EnumProps32A   (USER32.186)
  */
-INT32 WINAPI EnumProps32A( HWND32 hwnd, PROPENUMPROC32A func )
+INT WINAPI EnumPropsA( HWND hwnd, PROPENUMPROCA func )
 {
-    return EnumPropsEx32A( hwnd, (PROPENUMPROCEX32A)func, 0 );
+    return EnumPropsExA( hwnd, (PROPENUMPROCEXA)func, 0 );
 }
 
 
 /***********************************************************************
  *           EnumProps32W   (USER32.189)
  */
-INT32 WINAPI EnumProps32W( HWND32 hwnd, PROPENUMPROC32W func )
+INT WINAPI EnumPropsW( HWND hwnd, PROPENUMPROCW func )
 {
-    return EnumPropsEx32W( hwnd, (PROPENUMPROCEX32W)func, 0 );
+    return EnumPropsExW( hwnd, (PROPENUMPROCEXW)func, 0 );
 }
 
 
 /***********************************************************************
  *           EnumPropsEx32A   (USER32.187)
  */
-INT32 WINAPI EnumPropsEx32A(HWND32 hwnd, PROPENUMPROCEX32A func, LPARAM lParam)
+INT WINAPI EnumPropsExA(HWND hwnd, PROPENUMPROCEXA func, LPARAM lParam)
 {
     PROPERTY *prop, *next;
     WND *pWnd;
-    INT32 ret = -1;
+    INT ret = -1;
 
     TRACE(prop, "%04x %08x %08lx\n",
-                  hwnd, (UINT32)func, lParam );
+                  hwnd, (UINT)func, lParam );
     if (!(pWnd = WIN_FindWndPtr( hwnd ))) return -1;
     for (prop = pWnd->pProp; (prop); prop = next)
     {
@@ -327,14 +327,14 @@ INT32 WINAPI EnumPropsEx32A(HWND32 hwnd, PROPENUMPROCEX32A func, LPARAM lParam)
 /***********************************************************************
  *           EnumPropsEx32W   (USER32.188)
  */
-INT32 WINAPI EnumPropsEx32W(HWND32 hwnd, PROPENUMPROCEX32W func, LPARAM lParam)
+INT WINAPI EnumPropsExW(HWND hwnd, PROPENUMPROCEXW func, LPARAM lParam)
 {
     PROPERTY *prop, *next;
     WND *pWnd;
-    INT32 ret = -1;
+    INT ret = -1;
 
     TRACE(prop, "%04x %08x %08lx\n",
-                  hwnd, (UINT32)func, lParam );
+                  hwnd, (UINT)func, lParam );
     if (!(pWnd = WIN_FindWndPtr( hwnd ))) return -1;
     for (prop = pWnd->pProp; (prop); prop = next)
     {
@@ -351,7 +351,7 @@ INT32 WINAPI EnumPropsEx32W(HWND32 hwnd, PROPENUMPROCEX32W func, LPARAM lParam)
             HeapFree( GetProcessHeap(), 0, str );
         }
         else
-            ret = func( hwnd, (LPCWSTR)(UINT32)LOWORD( prop->string ),
+            ret = func( hwnd, (LPCWSTR)(UINT)LOWORD( prop->string ),
                         prop->handle, lParam );
         if (!ret) break;
     }
diff --git a/windows/queue.c b/windows/queue.c
index 988016a90bf..d801e5c2d25 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -150,9 +150,9 @@ ULONG PERQDATA_Release( PERQUEUEDATA *pQData )
  *
  * Get the focus hwnd member in a threadsafe manner
  */
-HWND32 PERQDATA_GetFocusWnd( PERQUEUEDATA *pQData )
+HWND PERQDATA_GetFocusWnd( PERQUEUEDATA *pQData )
 {
-    HWND32 hWndFocus;
+    HWND hWndFocus;
     assert(pQData != 0 );
 
     EnterCriticalSection( &pQData->cSection );
@@ -168,9 +168,9 @@ HWND32 PERQDATA_GetFocusWnd( PERQUEUEDATA *pQData )
  *
  * Set the focus hwnd member in a threadsafe manner
  */
-HWND32 PERQDATA_SetFocusWnd( PERQUEUEDATA *pQData, HWND32 hWndFocus )
+HWND PERQDATA_SetFocusWnd( PERQUEUEDATA *pQData, HWND hWndFocus )
 {
-    HWND32 hWndFocusPrv;
+    HWND hWndFocusPrv;
     assert(pQData != 0 );
 
     EnterCriticalSection( &pQData->cSection );
@@ -187,9 +187,9 @@ HWND32 PERQDATA_SetFocusWnd( PERQUEUEDATA *pQData, HWND32 hWndFocus )
  *
  * Get the active hwnd member in a threadsafe manner
  */
-HWND32 PERQDATA_GetActiveWnd( PERQUEUEDATA *pQData )
+HWND PERQDATA_GetActiveWnd( PERQUEUEDATA *pQData )
 {
-    HWND32 hWndActive;
+    HWND hWndActive;
     assert(pQData != 0 );
 
     EnterCriticalSection( &pQData->cSection );
@@ -205,9 +205,9 @@ HWND32 PERQDATA_GetActiveWnd( PERQUEUEDATA *pQData )
  *
  * Set the active focus hwnd member in a threadsafe manner
  */
-HWND32 PERQDATA_SetActiveWnd( PERQUEUEDATA *pQData, HWND32 hWndActive )
+HWND PERQDATA_SetActiveWnd( PERQUEUEDATA *pQData, HWND hWndActive )
 {
-    HWND32 hWndActivePrv;
+    HWND hWndActivePrv;
     assert(pQData != 0 );
 
     EnterCriticalSection( &pQData->cSection );
@@ -224,9 +224,9 @@ HWND32 PERQDATA_SetActiveWnd( PERQUEUEDATA *pQData, HWND32 hWndActive )
  *
  * Get the capture hwnd member in a threadsafe manner
  */
-HWND32 PERQDATA_GetCaptureWnd( PERQUEUEDATA *pQData )
+HWND PERQDATA_GetCaptureWnd( PERQUEUEDATA *pQData )
 {
-    HWND32 hWndCapture;
+    HWND hWndCapture;
     assert(pQData != 0 );
 
     EnterCriticalSection( &pQData->cSection );
@@ -242,9 +242,9 @@ HWND32 PERQDATA_GetCaptureWnd( PERQUEUEDATA *pQData )
  *
  * Set the capture hwnd member in a threadsafe manner
  */
-HWND32 PERQDATA_SetCaptureWnd( PERQUEUEDATA *pQData, HWND32 hWndCapture )
+HWND PERQDATA_SetCaptureWnd( PERQUEUEDATA *pQData, HWND hWndCapture )
 {
-    HWND32 hWndCapturePrv;
+    HWND hWndCapturePrv;
     assert(pQData != 0 );
 
     EnterCriticalSection( &pQData->cSection );
@@ -397,7 +397,7 @@ void QUEUE_WalkQueues(void)
             WARN( msg, "Bad queue handle %04x\n", hQueue );
             return;
         }
-        if (!GetModuleName( queue->thdb->process->task, module, sizeof(module )))
+        if (!GetModuleName16( queue->thdb->process->task, module, sizeof(module )))
             strcpy( module, "???" );
         DUMP( "%04x %4d %p %04x %s\n", hQueue,queue->msgCount,
               queue->thdb, queue->thdb->process->task, module );
@@ -411,7 +411,7 @@ void QUEUE_WalkQueues(void)
 /***********************************************************************
  *	     QUEUE_IsExitingQueue
  */
-BOOL32 QUEUE_IsExitingQueue( HQUEUE16 hQueue )
+BOOL QUEUE_IsExitingQueue( HQUEUE16 hQueue )
 {
     return (hExitingQueue && (hQueue == hExitingQueue));
 }
@@ -458,7 +458,7 @@ static HQUEUE16 QUEUE_CreateMsgQueue( BOOL16 bCreatePerQData )
        only */
     if ( !THREAD_IsWin16( THREAD_Current() ) )
     {
-        msgQueue->hEvent = CreateEvent32A( NULL, FALSE, FALSE, NULL);
+        msgQueue->hEvent = CreateEventA( NULL, FALSE, FALSE, NULL);
 
         if (msgQueue->hEvent == 0)
         {
@@ -526,7 +526,7 @@ void QUEUE_FlushMessages( MESSAGEQUEUE *queue )
  * Note: We need to mask asynchronous events to make sure PostMessage works
  * even in the signal handler.
  */
-BOOL32 QUEUE_DeleteMsgQueue( HQUEUE16 hQueue )
+BOOL QUEUE_DeleteMsgQueue( HQUEUE16 hQueue )
 {
     MESSAGEQUEUE * msgQueue = (MESSAGEQUEUE*)QUEUE_Lock(hQueue);
     HQUEUE16 *pPrev;
@@ -591,7 +591,7 @@ BOOL32 QUEUE_DeleteMsgQueue( HQUEUE16 hQueue )
  * Create the system message queue, and set the double-click speed.
  * Must be called only once.
  */
-BOOL32 QUEUE_CreateSysMsgQueue( int size )
+BOOL QUEUE_CreateSysMsgQueue( int size )
 {
     /* Note: We dont need perQ data for the system message queue */
     if (!(hmemSysMsgQueue = QUEUE_CreateMsgQueue( FALSE )))
@@ -617,11 +617,11 @@ MESSAGEQUEUE *QUEUE_GetSysQueue(void)
 static void QUEUE_Wait( DWORD wait_mask )
 {
     if ( THREAD_IsWin16( THREAD_Current() ) )
-        WaitEvent( 0 );
+        WaitEvent16( 0 );
     else
     {
         TRACE(msg, "current task is 32-bit, calling SYNC_DoWait\n");
-        MsgWaitForMultipleObjects( 0, NULL, FALSE, INFINITE32, wait_mask );
+        MsgWaitForMultipleObjects( 0, NULL, FALSE, INFINITE, wait_mask );
     }
 }
 
@@ -646,7 +646,7 @@ void QUEUE_SetWakeBit( MESSAGEQUEUE *queue, WORD bit )
         
         /* Wake up thread waiting for message */
         if ( THREAD_IsWin16( queue->thdb ) )
-            PostEvent( queue->thdb->process->task );
+            PostEvent16( queue->thdb->process->task );
         else
         {
             SetEvent( queue->hEvent );
@@ -674,11 +674,11 @@ void QUEUE_WaitBits( WORD bits )
 {
     MESSAGEQUEUE *queue;
 
-    TRACE(msg,"q %04x waiting for %04x\n", GetFastQueue(), bits);
+    TRACE(msg,"q %04x waiting for %04x\n", GetFastQueue16(), bits);
 
     for (;;)
     {
-        if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() ))) return;
+        if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() ))) return;
 
         if (queue->changeBits & bits)
         {
@@ -719,7 +719,7 @@ void QUEUE_WaitBits( WORD bits )
  * This routine is called when a SMSG need to be added to one of the three
  * SM list.  (SM_PROCESSING_LIST, SM_PENDING_LIST, SM_WAITING_LIST)
  */
-BOOL32 QUEUE_AddSMSG( MESSAGEQUEUE *queue, int list, SMSG *smsg )
+BOOL QUEUE_AddSMSG( MESSAGEQUEUE *queue, int list, SMSG *smsg )
 {
     TRACE(sendmsg,"queue=%x, list=%d, smsg=%p msg=%s\n", queue->self, list,
           smsg, SPY_GetMsgName(smsg->msg));
@@ -881,7 +881,7 @@ void QUEUE_ReceiveMessage( MESSAGEQUEUE *queue )
     TRACE(sendmsg,"RM: %s [%04x] (%04x -> %04x)\n",
        	    SPY_GetMsgName(smsg->msg), smsg->msg, smsg->hSrcQueue, smsg->hDstQueue );
 
-    if (IsWindow32( smsg->hWnd ))
+    if (IsWindow( smsg->hWnd ))
     {
         WND *wndPtr = WIN_FindWndPtr( smsg->hWnd );
         DWORD extraInfo = queue->GetMessageExtraInfoVal; /* save ExtraInfo */
@@ -899,11 +899,11 @@ void QUEUE_ReceiveMessage( MESSAGEQUEUE *queue )
         {
             TRACE(sendmsg, "\trcm: msg is Win32\n" );
             if (smsg->flags & SMSG_UNICODE)
-                result = CallWindowProc32W( wndPtr->winproc,
+                result = CallWindowProcW( wndPtr->winproc,
                                             smsg->hWnd, smsg->msg,
                                             smsg->wParam, smsg->lParam );
             else
-                result = CallWindowProc32A( wndPtr->winproc,
+                result = CallWindowProcA( wndPtr->winproc,
                                             smsg->hWnd, smsg->msg,
                                             smsg->wParam, smsg->lParam );
         }
@@ -965,7 +965,7 @@ void QUEUE_ReceiveMessage( MESSAGEQUEUE *queue )
         /* set SMSG_SENDING_REPLY flag to tell ReplyMessage16, it's not
          an early reply */
         smsg->flags |= SMSG_SENDING_REPLY;
-        ReplyMessage32( result );
+        ReplyMessage( result );
   }  
 
     TRACE( sendmsg,"done! \n" );
@@ -978,7 +978,7 @@ void QUEUE_ReceiveMessage( MESSAGEQUEUE *queue )
  *
  * Add a message to the queue. Return FALSE if queue is full.
  */
-BOOL32 QUEUE_AddMsg( HQUEUE16 hQueue, MSG32 *msg, DWORD extraInfo )
+BOOL QUEUE_AddMsg( HQUEUE16 hQueue, MSG *msg, DWORD extraInfo )
 {
     MESSAGEQUEUE *msgQueue;
     QMSG         *qmsg;
@@ -1028,7 +1028,7 @@ BOOL32 QUEUE_AddMsg( HQUEUE16 hQueue, MSG32 *msg, DWORD extraInfo )
  *
  * Find a message matching the given parameters. Return -1 if none available.
  */
-QMSG* QUEUE_FindMsg( MESSAGEQUEUE * msgQueue, HWND32 hwnd, int first, int last )
+QMSG* QUEUE_FindMsg( MESSAGEQUEUE * msgQueue, HWND hwnd, int first, int last )
 {
     QMSG* qmsg;
 
@@ -1043,7 +1043,7 @@ QMSG* QUEUE_FindMsg( MESSAGEQUEUE * msgQueue, HWND32 hwnd, int first, int last )
         /* look in linked list for message matching first and last criteria */
         for (qmsg = msgQueue->firstMsg; qmsg; qmsg = qmsg->nextMsg)
     {
-            MSG32 *msg = &(qmsg->msg);
+            MSG *msg = &(qmsg->msg);
 
 	if (!hwnd || (msg->hwnd == hwnd))
 	{
@@ -1100,11 +1100,11 @@ void QUEUE_RemoveMsg( MESSAGEQUEUE * msgQueue, QMSG *qmsg )
  *
  * Wake a queue upon reception of a hardware event.
  */
-static void QUEUE_WakeSomeone( UINT32 message )
+static void QUEUE_WakeSomeone( UINT message )
 {
     WND*	  wndPtr = NULL;
     WORD          wakeBit;
-    HWND32 hwnd;
+    HWND hwnd;
     HQUEUE16     hQueue = 0;
     MESSAGEQUEUE *queue = NULL;
 
@@ -1120,7 +1120,7 @@ static void QUEUE_WakeSomeone( UINT32 message )
     else 
     {
        wakeBit = (message == WM_MOUSEMOVE) ? QS_MOUSEMOVE : QS_MOUSEBUTTON;
-       if( (hwnd = GetCapture32()) )
+       if( (hwnd = GetCapture()) )
 	 if( (wndPtr = WIN_FindWndPtr( hwnd )) ) 
            {
                hQueue = wndPtr->hmemTaskQ;
@@ -1168,7 +1168,7 @@ static void QUEUE_WakeSomeone( UINT32 message )
 void hardware_event( WORD message, WORD wParam, LONG lParam,
 		     int xPos, int yPos, DWORD time, DWORD extraInfo )
 {
-    MSG32 *msg;
+    MSG *msg;
     QMSG  *qmsg = sysMsgQueue->lastMsg;
     int  mergeMsg = 0;
 
@@ -1309,7 +1309,7 @@ void QUEUE_DecTimerCount( HQUEUE16 hQueue )
  */
 void WINAPI PostQuitMessage16( INT16 exitCode )
 {
-    PostQuitMessage32( exitCode );
+    PostQuitMessage( exitCode );
 }
 
 
@@ -1327,11 +1327,11 @@ void WINAPI PostQuitMessage16( INT16 exitCode )
  *
  *  ECMA-234, Win32
  */
-void WINAPI PostQuitMessage32( INT32 exitCode )
+void WINAPI PostQuitMessage( INT exitCode )
 {
     MESSAGEQUEUE *queue;
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() ))) return;
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() ))) return;
     queue->wPostQMsg = TRUE;
     queue->wExitCode = (WORD)exitCode;
     QUEUE_Unlock( queue );
@@ -1352,7 +1352,7 @@ HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )
 /***********************************************************************
  *           GetWindowThreadProcessId   (USER32.313)
  */
-DWORD WINAPI GetWindowThreadProcessId( HWND32 hwnd, LPDWORD process )
+DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process )
 {
     HTASK16 htask;
     TDB	*tdb;
@@ -1373,20 +1373,20 @@ DWORD WINAPI GetWindowThreadProcessId( HWND32 hwnd, LPDWORD process )
  */
 BOOL16 WINAPI SetMessageQueue16( INT16 size )
 {
-    return SetMessageQueue32( size );
+    return SetMessageQueue( size );
 }
 
 
 /***********************************************************************
  *           SetMessageQueue32   (USER32.494)
  */
-BOOL32 WINAPI SetMessageQueue32( INT32 size )
+BOOL WINAPI SetMessageQueue( INT size )
 {
     /* now obsolete the message queue will be expanded dynamically
      as necessary */
 
     /* access the queue to create it if it's not existing */
-    GetFastQueue();
+    GetFastQueue16();
 
     return TRUE;
 }
@@ -1394,7 +1394,7 @@ BOOL32 WINAPI SetMessageQueue32( INT32 size )
 /***********************************************************************
  *           InitThreadInput   (USER.409)
  */
-HQUEUE16 WINAPI InitThreadInput( WORD unknown, WORD flags )
+HQUEUE16 WINAPI InitThreadInput16( WORD unknown, WORD flags )
 {
     HQUEUE16 hQueue;
     MESSAGEQUEUE *queuePtr;
@@ -1420,7 +1420,7 @@ HQUEUE16 WINAPI InitThreadInput( WORD unknown, WORD flags )
         queuePtr->thdb = THREAD_Current();
 
         SYSTEM_LOCK();
-        SetThreadQueue( 0, hQueue );
+        SetThreadQueue16( 0, hQueue );
         thdb->teb.queue = hQueue;
             
         queuePtr->next  = hFirstQueue;
@@ -1441,7 +1441,7 @@ DWORD WINAPI GetQueueStatus16( UINT16 flags )
     MESSAGEQUEUE *queue;
     DWORD ret;
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() ))) return 0;
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() ))) return 0;
     ret = MAKELONG( queue->changeBits, queue->wakeBits );
     queue->changeBits = 0;
     QUEUE_Unlock( queue );
@@ -1452,12 +1452,12 @@ DWORD WINAPI GetQueueStatus16( UINT16 flags )
 /***********************************************************************
  *           GetQueueStatus32   (USER32.283)
  */
-DWORD WINAPI GetQueueStatus32( UINT32 flags )
+DWORD WINAPI GetQueueStatus( UINT flags )
 {
     MESSAGEQUEUE *queue;
     DWORD ret;
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() ))) return 0;
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() ))) return 0;
     ret = MAKELONG( queue->changeBits, queue->wakeBits );
     queue->changeBits = 0;
     QUEUE_Unlock( queue );
@@ -1471,13 +1471,13 @@ DWORD WINAPI GetQueueStatus32( UINT32 flags )
  */
 BOOL16 WINAPI GetInputState16(void)
 {
-    return GetInputState32();
+    return GetInputState();
 }
 
 /***********************************************************************
  *           WaitForInputIdle   (USER32.577)
  */
-DWORD WINAPI WaitForInputIdle (HANDLE32 hProcess, DWORD dwTimeOut)
+DWORD WINAPI WaitForInputIdle (HANDLE hProcess, DWORD dwTimeOut)
 {
   FIXME (msg, "(hProcess=%d, dwTimeOut=%ld): stub\n", hProcess, dwTimeOut);
 
@@ -1488,12 +1488,12 @@ DWORD WINAPI WaitForInputIdle (HANDLE32 hProcess, DWORD dwTimeOut)
 /***********************************************************************
  *           GetInputState32   (USER32.244)
  */
-BOOL32 WINAPI GetInputState32(void)
+BOOL WINAPI GetInputState(void)
 {
     MESSAGEQUEUE *queue;
-    BOOL32 ret;
+    BOOL ret;
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() )))
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
         return FALSE;
     ret = queue->wakeBits & (QS_KEY | QS_MOUSEBUTTON);
     QUEUE_Unlock( queue );
@@ -1504,7 +1504,7 @@ BOOL32 WINAPI GetInputState32(void)
 /***********************************************************************
  *           UserYield  (USER.332)
  */
-void WINAPI UserYield(void)
+void WINAPI UserYield16(void)
 {
     TDB *pCurTask = (TDB *)GlobalLock16( GetCurrentTask() );
     MESSAGEQUEUE *queue = (MESSAGEQUEUE *)QUEUE_Lock( pCurTask->hQueue );
@@ -1522,7 +1522,7 @@ void WINAPI UserYield(void)
 
     QUEUE_Unlock( queue );
     
-    OldYield();
+    OldYield16();
 
     queue = (MESSAGEQUEUE *)QUEUE_Lock( pCurTask->hQueue );
     while (queue && (queue->wakeBits & QS_SENDMESSAGE))
@@ -1557,7 +1557,7 @@ DWORD WINAPI GetMessagePos(void)
     MESSAGEQUEUE *queue;
     DWORD ret;
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() ))) return 0;
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() ))) return 0;
     ret = queue->GetMessagePosVal;
     QUEUE_Unlock( queue );
 
@@ -1589,7 +1589,7 @@ LONG WINAPI GetMessageTime(void)
     MESSAGEQUEUE *queue;
     LONG ret;
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() ))) return 0;
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() ))) return 0;
     ret = queue->GetMessageTimeVal;
     QUEUE_Unlock( queue );
     
@@ -1605,7 +1605,7 @@ LONG WINAPI GetMessageExtraInfo(void)
     MESSAGEQUEUE *queue;
     LONG ret;
 
-    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() ))) return 0;
+    if (!(queue = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() ))) return 0;
     ret = queue->GetMessageExtraInfoVal;
     QUEUE_Unlock( queue );
 
diff --git a/windows/rect.c b/windows/rect.c
index 4c0043b570c..e7f924c88cf 100644
--- a/windows/rect.c
+++ b/windows/rect.c
@@ -25,8 +25,8 @@ void WINAPI SetRect16( LPRECT16 rect, INT16 left, INT16 top,
 /***********************************************************************
  *           SetRect32    (USER32.499)
  */
-BOOL32 WINAPI SetRect32( LPRECT32 rect, INT32 left, INT32 top,
-                       INT32 right, INT32 bottom )
+BOOL WINAPI SetRect( LPRECT rect, INT left, INT top,
+                       INT right, INT bottom )
 {
     rect->left   = left;
     rect->right  = right;
@@ -48,7 +48,7 @@ void WINAPI SetRectEmpty16( LPRECT16 rect )
 /***********************************************************************
  *           SetRectEmpty32    (USER32.500)
  */
-BOOL32 WINAPI SetRectEmpty32( LPRECT32 rect )
+BOOL WINAPI SetRectEmpty( LPRECT rect )
 {
     rect->left = rect->right = rect->top = rect->bottom = 0;
     return TRUE;
@@ -68,7 +68,7 @@ BOOL16 WINAPI CopyRect16( RECT16 *dest, const RECT16 *src )
 /***********************************************************************
  *           CopyRect32    (USER32.62)
  */
-BOOL32 WINAPI CopyRect32( RECT32 *dest, const RECT32 *src )
+BOOL WINAPI CopyRect( RECT *dest, const RECT *src )
 {
     *dest = *src;
     return TRUE;
@@ -87,7 +87,7 @@ BOOL16 WINAPI IsRectEmpty16( const RECT16 *rect )
 /***********************************************************************
  *           IsRectEmpty32    (USER32.347)
  */
-BOOL32 WINAPI IsRectEmpty32( const RECT32 *rect )
+BOOL WINAPI IsRectEmpty( const RECT *rect )
 {
     return ((rect->left == rect->right) || (rect->top == rect->bottom));
 }
@@ -106,7 +106,7 @@ BOOL16 WINAPI PtInRect16( const RECT16 *rect, POINT16 pt )
 /***********************************************************************
  *           PtInRect32    (USER32.424)
  */
-BOOL32 WINAPI PtInRect32( const RECT32 *rect, POINT32 pt )
+BOOL WINAPI PtInRect( const RECT *rect, POINT pt )
 {
     return ((pt.x >= rect->left) && (pt.x < rect->right) &&
 	    (pt.y >= rect->top) && (pt.y < rect->bottom));
@@ -128,7 +128,7 @@ void WINAPI OffsetRect16( LPRECT16 rect, INT16 x, INT16 y )
 /***********************************************************************
  *           OffsetRect32    (USER32.406)
  */
-BOOL32 WINAPI OffsetRect32( LPRECT32 rect, INT32 x, INT32 y )
+BOOL WINAPI OffsetRect( LPRECT rect, INT x, INT y )
 {
     rect->left   += x;
     rect->right  += x;
@@ -153,7 +153,7 @@ void WINAPI InflateRect16( LPRECT16 rect, INT16 x, INT16 y )
 /***********************************************************************
  *           InflateRect32    (USER32.321)
  */
-BOOL32 WINAPI InflateRect32( LPRECT32 rect, INT32 x, INT32 y )
+BOOL WINAPI InflateRect( LPRECT rect, INT x, INT y )
 {
     rect->left   -= x;
     rect->top 	 -= y;
@@ -187,14 +187,14 @@ BOOL16 WINAPI IntersectRect16( LPRECT16 dest, const RECT16 *src1,
 /***********************************************************************
  *           IntersectRect32    (USER32.327)
  */
-BOOL32 WINAPI IntersectRect32( LPRECT32 dest, const RECT32 *src1,
-                               const RECT32 *src2 )
+BOOL WINAPI IntersectRect( LPRECT dest, const RECT *src1,
+                               const RECT *src2 )
 {
-    if (IsRectEmpty32(src1) || IsRectEmpty32(src2) ||
+    if (IsRectEmpty(src1) || IsRectEmpty(src2) ||
 	(src1->left >= src2->right) || (src2->left >= src1->right) ||
 	(src1->top >= src2->bottom) || (src2->top >= src1->bottom))
     {
-	SetRectEmpty32( dest );
+	SetRectEmpty( dest );
 	return FALSE;
     }
     dest->left   = MAX( src1->left, src2->left );
@@ -238,21 +238,21 @@ BOOL16 WINAPI UnionRect16( LPRECT16 dest, const RECT16 *src1,
 /***********************************************************************
  *           UnionRect32    (USER32.559)
  */
-BOOL32 WINAPI UnionRect32( LPRECT32 dest, const RECT32 *src1,
-                           const RECT32 *src2 )
+BOOL WINAPI UnionRect( LPRECT dest, const RECT *src1,
+                           const RECT *src2 )
 {
-    if (IsRectEmpty32(src1))
+    if (IsRectEmpty(src1))
     {
-	if (IsRectEmpty32(src2))
+	if (IsRectEmpty(src2))
 	{
-	    SetRectEmpty32( dest );
+	    SetRectEmpty( dest );
 	    return FALSE;
 	}
 	else *dest = *src2;
     }
     else
     {
-	if (IsRectEmpty32(src2)) *dest = *src1;
+	if (IsRectEmpty(src2)) *dest = *src1;
 	else
 	{
 	    dest->left   = MIN( src1->left, src2->left );
@@ -278,7 +278,7 @@ BOOL16 WINAPI EqualRect16( const RECT16* rect1, const RECT16* rect2 )
 /***********************************************************************
  *           EqualRect32    (USER32.194)
  */
-BOOL32 WINAPI EqualRect32( const RECT32* rect1, const RECT32* rect2 )
+BOOL WINAPI EqualRect( const RECT* rect1, const RECT* rect2 )
 {
     return ((rect1->left == rect2->left) && (rect1->right == rect2->right) &&
 	    (rect1->top == rect2->top) && (rect1->bottom == rect2->bottom));
@@ -324,22 +324,22 @@ BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1,
 /***********************************************************************
  *           SubtractRect32    (USER32.536)
  */
-BOOL32 WINAPI SubtractRect32( LPRECT32 dest, const RECT32 *src1,
-                              const RECT32 *src2 )
+BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1,
+                              const RECT *src2 )
 {
-    RECT32 tmp;
+    RECT tmp;
 
-    if (IsRectEmpty32( src1 ))
+    if (IsRectEmpty( src1 ))
     {
-	SetRectEmpty32( dest );
+	SetRectEmpty( dest );
 	return FALSE;
     }
     *dest = *src1;
-    if (IntersectRect32( &tmp, src1, src2 ))
+    if (IntersectRect( &tmp, src1, src2 ))
     {
-	if (EqualRect32( &tmp, dest ))
+	if (EqualRect( &tmp, dest ))
 	{
-	    SetRectEmpty32( dest );
+	    SetRectEmpty( dest );
 	    return FALSE;
 	}
 	if ((tmp.top == dest->top) && (tmp.bottom == dest->bottom))
diff --git a/windows/scroll.c b/windows/scroll.c
index fee224eb5af..c54b49de37e 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -24,11 +24,11 @@
 void WINAPI ScrollWindow16(HWND16 hwnd, INT16 dx, INT16 dy, const RECT16 *rect,
                            const RECT16 *clipRect )
 {
-    RECT32 rect32, clipRect32;
+    RECT rect32, clipRect32;
 
     if (rect) CONV_RECT16TO32( rect, &rect32 );
     if (clipRect) CONV_RECT16TO32( clipRect, &clipRect32 );
-    ScrollWindow32( hwnd, dx, dy, rect ? &rect32 : NULL,
+    ScrollWindow( hwnd, dx, dy, rect ? &rect32 : NULL,
                     clipRect ? &clipRect32 : NULL );
 }
 
@@ -36,11 +36,11 @@ void WINAPI ScrollWindow16(HWND16 hwnd, INT16 dx, INT16 dy, const RECT16 *rect,
  *             ScrollWindow32   (USER32.450)
  *
  */
-BOOL32 WINAPI ScrollWindow32( HWND32 hwnd, INT32 dx, INT32 dy,
-                              const RECT32 *rect, const RECT32 *clipRect )
+BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy,
+                              const RECT *rect, const RECT *clipRect )
 {
     return
-        (ERROR != ScrollWindowEx32( hwnd, dx, dy, rect, clipRect, 0, NULL,
+        (ERROR != ScrollWindowEx( hwnd, dx, dy, rect, clipRect, 0, NULL,
                                     (rect ? 0 : SW_SCROLLCHILDREN) |
                                     SW_INVALIDATE ));
 }
@@ -52,12 +52,12 @@ BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect,
                           const RECT16 *cliprc, HRGN16 hrgnUpdate,
                           LPRECT16 rcUpdate )
 {
-    RECT32 rect32, clipRect32, rcUpdate32;
+    RECT rect32, clipRect32, rcUpdate32;
     BOOL16 ret;
 
     if (rect) CONV_RECT16TO32( rect, &rect32 );
     if (cliprc) CONV_RECT16TO32( cliprc, &clipRect32 );
-    ret = ScrollDC32( hdc, dx, dy, rect ? &rect32 : NULL,
+    ret = ScrollDC( hdc, dx, dy, rect ? &rect32 : NULL,
                       cliprc ? &clipRect32 : NULL, hrgnUpdate, &rcUpdate32 );
     if (rcUpdate) CONV_RECT32TO16( &rcUpdate32, rcUpdate );
     return ret;
@@ -71,12 +71,12 @@ BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect,
  *   rcUpdate must be returned in logical coordinate to comply with win API.
  *
  */
-BOOL32 WINAPI ScrollDC32( HDC32 hdc, INT32 dx, INT32 dy, const RECT32 *rc,
-                          const RECT32 *prLClip, HRGN32 hrgnUpdate,
-                          LPRECT32 rcUpdate )
+BOOL WINAPI ScrollDC( HDC hdc, INT dx, INT dy, const RECT *rc,
+                          const RECT *prLClip, HRGN hrgnUpdate,
+                          LPRECT rcUpdate )
 {
-    RECT32 rect, rClip, rSrc;
-    POINT32 src, dest;
+    RECT rect, rClip, rSrc;
+    POINT src, dest;
     DC *dc = (DC *)GDI_GetObjPtr(hdc, DC_MAGIC);
 
     TRACE(scroll,"%04x %d,%d hrgnUpdate=%04x rcUpdate = %p cliprc = (%d,%d-%d,%d), rc=(%d,%d-%d,%d)\n",
@@ -98,27 +98,27 @@ BOOL32 WINAPI ScrollDC32( HDC32 hdc, INT32 dx, INT32 dy, const RECT32 *rc,
     if ( rc )
 	rect = *rc;
     else /* maybe we should just return FALSE? */
-	GetClipBox32( hdc, &rect );
+	GetClipBox( hdc, &rect );
 
     if (prLClip)
-	IntersectRect32( &rClip,&rect,prLClip );
+	IntersectRect( &rClip,&rect,prLClip );
     else
         rClip = rect;
 
     rSrc = rClip;
-    OffsetRect32( &rSrc, -dx, -dy );
-    IntersectRect32( &rSrc, &rSrc, &rect );
+    OffsetRect( &rSrc, -dx, -dy );
+    IntersectRect( &rSrc, &rSrc, &rect );
 
     if(dc->w.hVisRgn)
     {
-        if (!IsRectEmpty32(&rSrc))
+        if (!IsRectEmpty(&rSrc))
         {
             dest.x = (src.x = rSrc.left) + dx;
             dest.y = (src.y = rSrc.top) + dy;
 
             /* copy bits */
 
-            if (!BitBlt32( hdc, dest.x, dest.y,
+            if (!BitBlt( hdc, dest.x, dest.y,
                            rSrc.right - rSrc.left, rSrc.bottom - rSrc.top,
                            hdc, src.x, src.y, SRCCOPY))
             {
@@ -131,40 +131,40 @@ BOOL32 WINAPI ScrollDC32( HDC32 hdc, INT32 dx, INT32 dy, const RECT32 *rc,
 
         if (hrgnUpdate || rcUpdate)
         {
-            HRGN32 hrgn =
-              (hrgnUpdate) ? hrgnUpdate : CreateRectRgn32( 0,0,0,0 );
-            HRGN32 hrgn2;
+            HRGN hrgn =
+              (hrgnUpdate) ? hrgnUpdate : CreateRectRgn( 0,0,0,0 );
+            HRGN hrgn2;
 
             dx = XLPTODP ( dc, rect.left + dx) - XLPTODP ( dc, rect.left);
             dy = YLPTODP ( dc, rect.top + dy) - YLPTODP ( dc, rect.top);
-            LPtoDP32( hdc, (LPPOINT32)&rect, 2 );
-            LPtoDP32( hdc, (LPPOINT32)&rClip, 2 );
-            hrgn2 = CreateRectRgnIndirect32( &rect );
-            OffsetRgn32( hrgn2, dc->w.DCOrgX, dc->w.DCOrgY );
-            CombineRgn32( hrgn2, hrgn2, dc->w.hVisRgn, RGN_AND );
-            OffsetRgn32( hrgn2, -dc->w.DCOrgX, -dc->w.DCOrgY );
-            SetRectRgn32( hrgn, rClip.left, rClip.top,
+            LPtoDP( hdc, (LPPOINT)&rect, 2 );
+            LPtoDP( hdc, (LPPOINT)&rClip, 2 );
+            hrgn2 = CreateRectRgnIndirect( &rect );
+            OffsetRgn( hrgn2, dc->w.DCOrgX, dc->w.DCOrgY );
+            CombineRgn( hrgn2, hrgn2, dc->w.hVisRgn, RGN_AND );
+            OffsetRgn( hrgn2, -dc->w.DCOrgX, -dc->w.DCOrgY );
+            SetRectRgn( hrgn, rClip.left, rClip.top,
                           rClip.right, rClip.bottom );
-            CombineRgn32( hrgn, hrgn, hrgn2, RGN_AND );
-            OffsetRgn32( hrgn2, dx, dy );
-            CombineRgn32( hrgn, hrgn, hrgn2, RGN_DIFF );
+            CombineRgn( hrgn, hrgn, hrgn2, RGN_AND );
+            OffsetRgn( hrgn2, dx, dy );
+            CombineRgn( hrgn, hrgn, hrgn2, RGN_DIFF );
 
             if( rcUpdate )
 	    {
-		GetRgnBox32( hrgn, rcUpdate );
+		GetRgnBox( hrgn, rcUpdate );
 
 		//Put the rcUpdate in logical coordinate
-		DPtoLP32( hdc, (LPPOINT32)rcUpdate, 2 );
+		DPtoLP( hdc, (LPPOINT)rcUpdate, 2 );
 	    }
-            if (!hrgnUpdate) DeleteObject32( hrgn );
-            DeleteObject32( hrgn2 );
+            if (!hrgnUpdate) DeleteObject( hrgn );
+            DeleteObject( hrgn2 );
 
         }
     }
     else
     {
-       if (hrgnUpdate) SetRectRgn32(hrgnUpdate, 0, 0, 0, 0);
-       if (rcUpdate) SetRectEmpty32(rcUpdate);
+       if (hrgnUpdate) SetRectRgn(hrgnUpdate, 0, 0, 0, 0);
+       if (rcUpdate) SetRectEmpty(rcUpdate);
     }
 
     GDI_HEAP_UNLOCK( hdc );
@@ -180,12 +180,12 @@ INT16 WINAPI ScrollWindowEx16( HWND16 hwnd, INT16 dx, INT16 dy,
                                HRGN16 hrgnUpdate, LPRECT16 rcUpdate,
                                UINT16 flags )
 {
-    RECT32 rect32, clipRect32, rcUpdate32;
+    RECT rect32, clipRect32, rcUpdate32;
     BOOL16 ret;
 
     if (rect) CONV_RECT16TO32( rect, &rect32 );
     if (clipRect) CONV_RECT16TO32( clipRect, &clipRect32 );
-    ret = ScrollWindowEx32( hwnd, dx, dy, rect ? &rect32 : NULL,
+    ret = ScrollWindowEx( hwnd, dx, dy, rect ? &rect32 : NULL,
                             clipRect ? &clipRect32 : NULL, hrgnUpdate,
                             (rcUpdate) ? &rcUpdate32 : NULL, flags );
     if (rcUpdate) CONV_RECT32TO16( &rcUpdate32, rcUpdate );
@@ -195,24 +195,24 @@ INT16 WINAPI ScrollWindowEx16( HWND16 hwnd, INT16 dx, INT16 dy,
 /*************************************************************************
  *             SCROLL_FixCaret
  */
-static BOOL32 SCROLL_FixCaret(HWND32 hWnd, LPRECT32 lprc, UINT32 flags)
+static BOOL SCROLL_FixCaret(HWND hWnd, LPRECT lprc, UINT flags)
 {
-   HWND32 hCaret = CARET_GetHwnd();
+   HWND hCaret = CARET_GetHwnd();
 
    if( hCaret )
    {
-       RECT32	rc;
+       RECT	rc;
        CARET_GetRect( &rc );
        if( hCaret == hWnd ||
-          (flags & SW_SCROLLCHILDREN && IsChild32(hWnd, hCaret)) )
+          (flags & SW_SCROLLCHILDREN && IsChild(hWnd, hCaret)) )
        {
-           POINT32     pt;
+           POINT     pt;
 
            pt.x = rc.left; pt.y = rc.top;
-           MapWindowPoints32( hCaret, hWnd, (LPPOINT32)&rc, 2 );
-           if( IntersectRect32(lprc, lprc, &rc) )
+           MapWindowPoints( hCaret, hWnd, (LPPOINT)&rc, 2 );
+           if( IntersectRect(lprc, lprc, &rc) )
            {
-               HideCaret32(0);
+               HideCaret(0);
   	       lprc->left = pt.x; lprc->top = pt.y;
 	       return TRUE;
            }
@@ -226,32 +226,32 @@ static BOOL32 SCROLL_FixCaret(HWND32 hWnd, LPRECT32 lprc, UINT32 flags)
  *
  * NOTE: Use this function instead of ScrollWindow32
  */
-INT32 WINAPI ScrollWindowEx32( HWND32 hwnd, INT32 dx, INT32 dy,
-                               const RECT32 *rect, const RECT32 *clipRect,
-                               HRGN32 hrgnUpdate, LPRECT32 rcUpdate,
-                               UINT32 flags )
+INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy,
+                               const RECT *rect, const RECT *clipRect,
+                               HRGN hrgnUpdate, LPRECT rcUpdate,
+                               UINT flags )
 {
-    INT32  retVal = NULLREGION;
-    BOOL32 bCaret = FALSE, bOwnRgn = TRUE;
-    RECT32 rc, cliprc;
+    INT  retVal = NULLREGION;
+    BOOL bCaret = FALSE, bOwnRgn = TRUE;
+    RECT rc, cliprc;
     WND*   wnd = WIN_FindWndPtr( hwnd );
 
     if( !wnd || !WIN_IsWindowDrawable( wnd, TRUE )) return ERROR;
 
-    GetClientRect32(hwnd, &rc);
-    if (rect) IntersectRect32(&rc, &rc, rect);
+    GetClientRect(hwnd, &rc);
+    if (rect) IntersectRect(&rc, &rc, rect);
 
-    if (clipRect) IntersectRect32(&cliprc,&rc,clipRect);
+    if (clipRect) IntersectRect(&cliprc,&rc,clipRect);
     else cliprc = rc;
 
-    if (!IsRectEmpty32(&cliprc) && (dx || dy))
+    if (!IsRectEmpty(&cliprc) && (dx || dy))
     {
 	DC*	dc;
-	HDC32	hDC;
-	BOOL32  bUpdate = (rcUpdate || hrgnUpdate || flags & (SW_INVALIDATE | SW_ERASE));
-	HRGN32  hrgnClip = CreateRectRgnIndirect32(&cliprc);
-        HRGN32  hrgnTemp = CreateRectRgnIndirect32(&rc);
-        RECT32  caretrc;
+	HDC	hDC;
+	BOOL  bUpdate = (rcUpdate || hrgnUpdate || flags & (SW_INVALIDATE | SW_ERASE));
+	HRGN  hrgnClip = CreateRectRgnIndirect(&cliprc);
+        HRGN  hrgnTemp = CreateRectRgnIndirect(&rc);
+        RECT  caretrc;
 
 TRACE(scroll,"%04x, %d,%d hrgnUpdate=%04x rcUpdate = %p \
 cliprc = (%d,%d-%d,%d), rc=(%d,%d-%d,%d) %04x\n",             
@@ -263,9 +263,9 @@ rc.left, rc.top, rc.right, rc.bottom, (UINT16)flags );
 	bCaret = SCROLL_FixCaret(hwnd, &caretrc, flags);
 
 	if( hrgnUpdate ) bOwnRgn = FALSE;
-        else if( bUpdate ) hrgnUpdate = CreateRectRgn32( 0, 0, 0, 0 );
+        else if( bUpdate ) hrgnUpdate = CreateRectRgn( 0, 0, 0, 0 );
 
-	hDC = GetDCEx32( hwnd, hrgnClip, DCX_CACHE | DCX_USESTYLE |
+	hDC = GetDCEx( hwnd, hrgnClip, DCX_CACHE | DCX_USESTYLE |
                          DCX_KEEPCLIPRGN | DCX_INTERSECTRGN |
 		       ((flags & SW_SCROLLCHILDREN) ? DCX_NOCLIPCHILDREN : 0) );
 	if( (dc = (DC *)GDI_GetObjPtr(hDC, DC_MAGIC)) )
@@ -275,21 +275,21 @@ rc.left, rc.top, rc.right, rc.bottom, (UINT16)flags );
 
                 if( bUpdate )
                     {
-                        OffsetRgn32( hrgnTemp, dc->w.DCOrgX, dc->w.DCOrgY );
-                        CombineRgn32( hrgnTemp, hrgnTemp, dc->w.hVisRgn,
+                        OffsetRgn( hrgnTemp, dc->w.DCOrgX, dc->w.DCOrgY );
+                        CombineRgn( hrgnTemp, hrgnTemp, dc->w.hVisRgn,
                                       RGN_AND );
-                        OffsetRgn32( hrgnTemp, -dc->w.DCOrgX, -dc->w.DCOrgY );
-                        CombineRgn32( hrgnUpdate, hrgnTemp, hrgnClip,
+                        OffsetRgn( hrgnTemp, -dc->w.DCOrgX, -dc->w.DCOrgY );
+                        CombineRgn( hrgnUpdate, hrgnTemp, hrgnClip,
                                       RGN_AND );
-                        OffsetRgn32( hrgnTemp, dx, dy );
+                        OffsetRgn( hrgnTemp, dx, dy );
                         retVal =
-                            CombineRgn32( hrgnUpdate, hrgnUpdate, hrgnTemp,
+                            CombineRgn( hrgnUpdate, hrgnUpdate, hrgnTemp,
                                           RGN_DIFF );
 
-                        if( rcUpdate ) GetRgnBox32( hrgnUpdate, rcUpdate );
+                        if( rcUpdate ) GetRgnBox( hrgnUpdate, rcUpdate );
                     }
             }
-            ReleaseDC32(hwnd, hDC);
+            ReleaseDC(hwnd, hDC);
             GDI_HEAP_UNLOCK( hDC );
         }
 
@@ -297,21 +297,21 @@ rc.left, rc.top, rc.right, rc.bottom, (UINT16)flags );
 	{
             /* Takes into account the fact that some damages may have
                occured during the scroll. */
-            CombineRgn32( hrgnTemp, wnd->hrgnUpdate, 0, RGN_COPY );
-            OffsetRgn32( hrgnTemp, dx, dy );
-            CombineRgn32( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND );
-            CombineRgn32( wnd->hrgnUpdate, wnd->hrgnUpdate, hrgnTemp, RGN_OR );
+            CombineRgn( hrgnTemp, wnd->hrgnUpdate, 0, RGN_COPY );
+            OffsetRgn( hrgnTemp, dx, dy );
+            CombineRgn( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND );
+            CombineRgn( wnd->hrgnUpdate, wnd->hrgnUpdate, hrgnTemp, RGN_OR );
 	}
 
 	if( flags & SW_SCROLLCHILDREN )
 	{
-	    RECT32	r;
+	    RECT	r;
 	    WND* 	w;
 	    for( w = wnd->child; w; w = w->next )
 	    {
 		 CONV_RECT16TO32( &w->rectWindow, &r );
-	         if( IntersectRect32(&r, &r, &rc) )
-		     SetWindowPos32(w->hwndSelf, 0, w->rectWindow.left + dx,
+	         if( IntersectRect(&r, &r, &rc) )
+		     SetWindowPos(w->hwndSelf, 0, w->rectWindow.left + dx,
 				    w->rectWindow.top  + dy, 0,0, SWP_NOZORDER |
 				    SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOREDRAW |
 				    SWP_DEFERERASE );
@@ -324,13 +324,13 @@ rc.left, rc.top, rc.right, rc.bottom, (UINT16)flags );
 
 	if( bCaret )
 	{
-	    SetCaretPos32( caretrc.left + dx, caretrc.top + dy );
-	    ShowCaret32(0);
+	    SetCaretPos( caretrc.left + dx, caretrc.top + dy );
+	    ShowCaret(0);
 	}
 
-	if( bOwnRgn && hrgnUpdate ) DeleteObject32( hrgnUpdate );
-	DeleteObject32( hrgnClip );
-        DeleteObject32( hrgnTemp );
+	if( bOwnRgn && hrgnUpdate ) DeleteObject( hrgnUpdate );
+	DeleteObject( hrgnClip );
+        DeleteObject( hrgnTemp );
     }
     return retVal;
 }
diff --git a/windows/syscolor.c b/windows/syscolor.c
index 19a597af4e9..b2222ca6e08 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -85,11 +85,11 @@ static const char * const DefSysColors95[] =
 #define NUM_SYS_COLORS     (COLOR_GRADIENTINACTIVECAPTION+1)
 
 static COLORREF SysColors[NUM_SYS_COLORS];
-static HBRUSH32 SysColorBrushes[NUM_SYS_COLORS];
-static HPEN32   SysColorPens[NUM_SYS_COLORS];
+static HBRUSH SysColorBrushes[NUM_SYS_COLORS];
+static HPEN   SysColorPens[NUM_SYS_COLORS];
 
 #define MAKE_SOLID(color) \
-       (PALETTEINDEX(GetNearestPaletteIndex32(STOCK_DEFAULT_PALETTE,(color))))
+       (PALETTEINDEX(GetNearestPaletteIndex(STOCK_DEFAULT_PALETTE,(color))))
 
 /*************************************************************************
  *             SYSCOLOR_SetColor
@@ -98,10 +98,10 @@ static void SYSCOLOR_SetColor( int index, COLORREF color )
 {
     if (index < 0 || index >= NUM_SYS_COLORS) return;
     SysColors[index] = color;
-    if (SysColorBrushes[index]) DeleteObject32( SysColorBrushes[index] );
-    SysColorBrushes[index] = CreateSolidBrush32( color );
-    if (SysColorPens[index]) DeleteObject32( SysColorPens[index] ); 
-    SysColorPens[index] = CreatePen32( PS_SOLID, 1, color );
+    if (SysColorBrushes[index]) DeleteObject( SysColorBrushes[index] );
+    SysColorBrushes[index] = CreateSolidBrush( color );
+    if (SysColorPens[index]) DeleteObject( SysColorPens[index] ); 
+    SysColorPens[index] = CreatePen( PS_SOLID, 1, color );
 }
 
 
@@ -117,7 +117,7 @@ void SYSCOLOR_Init(void)
     p = (TWEAK_WineLook == WIN31_LOOK) ? DefSysColors : DefSysColors95;
     for (i = 0; i < NUM_SYS_COLORS; i++, p += 2)
     {
-	GetProfileString32A( "colors", p[0], p[1], buffer, 100 );
+	GetProfileStringA( "colors", p[0], p[1], buffer, 100 );
 	if (sscanf( buffer, " %d %d %d", &r, &g, &b ) != 3) r = g = b = 0;
 	SYSCOLOR_SetColor( i, RGB(r,g,b) );
     }
@@ -129,14 +129,14 @@ void SYSCOLOR_Init(void)
  */
 COLORREF WINAPI GetSysColor16( INT16 nIndex )
 {
-    return GetSysColor32 (nIndex);
+    return GetSysColor (nIndex);
 }
 
 
 /*************************************************************************
  *             GetSysColor32   (USER32.289)
  */
-COLORREF WINAPI GetSysColor32( INT32 nIndex )
+COLORREF WINAPI GetSysColor( INT nIndex )
 {
     if (nIndex >= 0 && nIndex < NUM_SYS_COLORS)
 	return SysColors[nIndex];
@@ -160,11 +160,11 @@ VOID WINAPI SetSysColors16( INT16 nChanges, const INT16 *lpSysColor,
 
     /* Send WM_SYSCOLORCHANGE message to all windows */
 
-    SendMessage32A( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0 );
+    SendMessageA( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0 );
 
     /* Repaint affected portions of all visible windows */
 
-    RedrawWindow32( GetDesktopWindow32(), NULL, 0,
+    RedrawWindow( GetDesktopWindow(), NULL, 0,
                 RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN );
 }
 
@@ -172,7 +172,7 @@ VOID WINAPI SetSysColors16( INT16 nChanges, const INT16 *lpSysColor,
 /*************************************************************************
  *             SetSysColors32   (USER32.505)
  */
-BOOL32 WINAPI SetSysColors32( INT32 nChanges, const INT32 *lpSysColor,
+BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor,
                               const COLORREF *lpColorValues )
 {
     int i;
@@ -184,11 +184,11 @@ BOOL32 WINAPI SetSysColors32( INT32 nChanges, const INT32 *lpSysColor,
 
     /* Send WM_SYSCOLORCHANGE message to all windows */
 
-    SendMessage32A( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0 );
+    SendMessageA( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0 );
 
     /* Repaint affected portions of all visible windows */
 
-    RedrawWindow32( GetDesktopWindow32(), NULL, 0,
+    RedrawWindow( GetDesktopWindow(), NULL, 0,
                 RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN );
     return TRUE;
 }
@@ -199,19 +199,19 @@ BOOL32 WINAPI SetSysColors32( INT32 nChanges, const INT32 *lpSysColor,
  */
 HBRUSH16 WINAPI GetSysColorBrush16( INT16 index )
 {
-    return (HBRUSH16)GetSysColorBrush32(index);
+    return (HBRUSH16)GetSysColorBrush(index);
 }
 
 
 /***********************************************************************
  *           GetSysColorBrush32    (USER32.290)
  */
-HBRUSH32 WINAPI GetSysColorBrush32( INT32 index )
+HBRUSH WINAPI GetSysColorBrush( INT index )
 {
     if (0 <= index && index < NUM_SYS_COLORS)
         return SysColorBrushes[index];
     WARN(syscolor, "Unknown index(%d)\n", index );
-    return GetStockObject32(LTGRAY_BRUSH);
+    return GetStockObject(LTGRAY_BRUSH);
 }
 
 
@@ -220,7 +220,7 @@ HBRUSH32 WINAPI GetSysColorBrush32( INT32 index )
  */
 HPEN16 WINAPI GetSysColorPen16( INT16 index )
 {
-    return (HPEN16)GetSysColorPen32(index);
+    return (HPEN16)GetSysColorPen(index);
 }
 
 
@@ -231,7 +231,7 @@ HPEN16 WINAPI GetSysColorPen16( INT16 index )
  * Windows. However, it is a natural complement for GetSysColorBrush
  * in the Win32 API and is needed quite a bit inside Wine.
  */
-HPEN32 WINAPI GetSysColorPen32( INT32 index )
+HPEN WINAPI GetSysColorPen( INT index )
 {
     /* We can assert here, because this function is internal to Wine */
     assert (0 <= index && index < NUM_SYS_COLORS);
diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c
index 37b53e20639..8803fa56ec7 100644
--- a/windows/sysmetrics.c
+++ b/windows/sysmetrics.c
@@ -88,20 +88,20 @@ void SYSMETRICS_Init(void)
 
     sysMetrics[SM_CXSIZE] = sysMetrics[SM_CYCAPTION] - 2;
     sysMetrics[SM_CYSIZE] = sysMetrics[SM_CXSIZE];
-    sysMetrics[SM_CXFRAME] = GetProfileInt32A("Windows", "BorderWidth", 4);
+    sysMetrics[SM_CXFRAME] = GetProfileIntA("Windows", "BorderWidth", 4);
     sysMetrics[SM_CYFRAME] = sysMetrics[SM_CXFRAME];
     sysMetrics[SM_CXMINTRACK] = sysMetrics[SM_CXMIN];
     sysMetrics[SM_CYMINTRACK] = sysMetrics[SM_CYMIN];
     sysMetrics[SM_CXDOUBLECLK] =
-	(GetProfileInt32A("Windows", "DoubleClickWidth", 4) + 1) & ~1;
+	(GetProfileIntA("Windows", "DoubleClickWidth", 4) + 1) & ~1;
     sysMetrics[SM_CYDOUBLECLK] =
-	(GetProfileInt32A("Windows","DoubleClickHeight", 4) + 1) & ~1;
+	(GetProfileIntA("Windows","DoubleClickHeight", 4) + 1) & ~1;
     sysMetrics[SM_CXICONSPACING] =
-	GetProfileInt32A("Desktop","IconSpacing", 75);
+	GetProfileIntA("Desktop","IconSpacing", 75);
     sysMetrics[SM_CYICONSPACING] =
-	GetProfileInt32A("Desktop", "IconVerticalSpacing", 75);
+	GetProfileIntA("Desktop", "IconVerticalSpacing", 75);
     sysMetrics[SM_MENUDROPALIGNMENT] =
-	GetProfileInt32A("Windows", "MenuDropAlignment", 0);
+	GetProfileIntA("Windows", "MenuDropAlignment", 0);
     sysMetrics[SM_PENWINDOWS] = 0;
     sysMetrics[SM_DBCSENABLED] = 0;
 
@@ -170,14 +170,14 @@ void SYSMETRICS_Init(void)
  */
 INT16 WINAPI GetSystemMetrics16( INT16 index )
 {
-    return (INT16)GetSystemMetrics32(index);
+    return (INT16)GetSystemMetrics(index);
 }
 
 
 /***********************************************************************
  *           GetSystemMetrics32    (USER32.292)
  */
-INT32 WINAPI GetSystemMetrics32( INT32 index )
+INT WINAPI GetSystemMetrics( INT index )
 {
     if ((index < 0) || (index > SM_CMETRICS)) return 0;
     else return sysMetrics[index];    
diff --git a/windows/timer.c b/windows/timer.c
index c09c434f60c..e75e7c7580e 100644
--- a/windows/timer.c
+++ b/windows/timer.c
@@ -13,11 +13,11 @@
 
 typedef struct tagTIMER
 {
-    HWND32           hwnd;
+    HWND           hwnd;
     HQUEUE16         hq;
     UINT16           msg;  /* WM_TIMER or WM_SYSTIMER */
-    UINT32           id;
-    UINT32           timeout;
+    UINT           id;
+    UINT           timeout;
     struct tagTIMER *next;
     DWORD            expires;  /* Next expiration, or 0 if already expired */
     HWINDOWPROC      proc;
@@ -110,7 +110,7 @@ void TIMER_SwitchQueue( HQUEUE16 old, HQUEUE16 new )
  *
  * Remove all timers for a given window.
  */
-void TIMER_RemoveWindowTimers( HWND32 hwnd )
+void TIMER_RemoveWindowTimers( HWND hwnd )
 {
     int i;
     TIMER *pTimer;
@@ -187,8 +187,8 @@ void TIMER_ExpireTimers(void)
  *
  * Build a message for an expired timer.
  */
-BOOL32 TIMER_GetTimerMsg( MSG32 *msg, HWND32 hwnd,
-                          HQUEUE16 hQueue, BOOL32 remove )
+BOOL TIMER_GetTimerMsg( MSG *msg, HWND hwnd,
+                          HQUEUE16 hQueue, BOOL remove )
 {
     TIMER *pTimer = pNextTimer;
     DWORD curTime = GetTickCount();
@@ -217,8 +217,8 @@ BOOL32 TIMER_GetTimerMsg( MSG32 *msg, HWND32 hwnd,
 /***********************************************************************
  *           TIMER_SetTimer
  */
-static UINT32 TIMER_SetTimer( HWND32 hwnd, UINT32 id, UINT32 timeout,
-                              WNDPROC16 proc, WINDOWPROCTYPE type, BOOL32 sys )
+static UINT TIMER_SetTimer( HWND hwnd, UINT id, UINT timeout,
+                              WNDPROC16 proc, WINDOWPROCTYPE type, BOOL sys )
 {
     int i;
     TIMER * pTimer;
@@ -255,8 +255,8 @@ static UINT32 TIMER_SetTimer( HWND32 hwnd, UINT32 id, UINT32 timeout,
       /* Add the timer */
 
     pTimer->hwnd    = hwnd;
-    pTimer->hq	    = (hwnd) ? GetThreadQueue( GetWindowThreadProcessId( hwnd, NULL ) )
-			     : GetFastQueue( );
+    pTimer->hq	    = (hwnd) ? GetThreadQueue16( GetWindowThreadProcessId( hwnd, NULL ) )
+			     : GetFastQueue16( );
     pTimer->msg     = sys ? WM_SYSTIMER : WM_TIMER;
     pTimer->id      = id;
     pTimer->timeout = timeout;
@@ -275,7 +275,7 @@ static UINT32 TIMER_SetTimer( HWND32 hwnd, UINT32 id, UINT32 timeout,
 /***********************************************************************
  *           TIMER_KillTimer
  */
-static BOOL32 TIMER_KillTimer( HWND32 hwnd, UINT32 id, BOOL32 sys )
+static BOOL TIMER_KillTimer( HWND hwnd, UINT id, BOOL sys )
 {
     int i;
     TIMER * pTimer;
@@ -313,8 +313,8 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
 /***********************************************************************
  *           SetTimer32   (USER32.511)
  */
-UINT32 WINAPI SetTimer32( HWND32 hwnd, UINT32 id, UINT32 timeout,
-                          TIMERPROC32 proc )
+UINT WINAPI SetTimer( HWND hwnd, UINT id, UINT timeout,
+                          TIMERPROC proc )
 {
     TRACE(timer, "%04x %d %d %08lx\n",
                    hwnd, id, timeout, (LONG)proc );
@@ -339,8 +339,8 @@ UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
 /***********************************************************************
  *           SetSystemTimer32   (USER32.509)
  */
-UINT32 WINAPI SetSystemTimer32( HWND32 hwnd, UINT32 id, UINT32 timeout,
-                                TIMERPROC32 proc )
+UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
+                                TIMERPROC proc )
 {
     TRACE(timer, "%04x %d %d %08lx\n", 
                    hwnd, id, timeout, (LONG)proc );
@@ -362,7 +362,7 @@ BOOL16 WINAPI KillTimer16( HWND16 hwnd, UINT16 id )
 /***********************************************************************
  *           KillTimer32   (USER32.354)
  */
-BOOL32 WINAPI KillTimer32( HWND32 hwnd, UINT32 id )
+BOOL WINAPI KillTimer( HWND hwnd, UINT id )
 {
     TRACE(timer, "%04x %d\n", hwnd, id );
     return TIMER_KillTimer( hwnd, id, FALSE );
@@ -382,7 +382,7 @@ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id )
 /***********************************************************************
  *           KillSystemTimer32   (USER32.353)
  */
-BOOL32 WINAPI KillSystemTimer32( HWND32 hwnd, UINT32 id )
+BOOL WINAPI KillSystemTimer( HWND hwnd, UINT id )
 {
     TRACE(timer, "%04x %d\n", hwnd, id );
     return TIMER_KillTimer( hwnd, id, TRUE );
diff --git a/windows/ttydrv/clipboard.c b/windows/ttydrv/clipboard.c
index ac5941315cd..f6c0c3c1c46 100644
--- a/windows/ttydrv/clipboard.c
+++ b/windows/ttydrv/clipboard.c
@@ -27,14 +27,14 @@ void TTYDRV_CLIPBOARD_EmptyClipboard()
 /***********************************************************************
  *		TTYDRV_CLIPBOARD_SetClipboardData
  */
-void TTYDRV_CLIPBOARD_SetClipboardData(UINT32 wFormat)
+void TTYDRV_CLIPBOARD_SetClipboardData(UINT wFormat)
 {
 }
 
 /***********************************************************************
  *		TTYDRV_CLIPBOARD_RequestSelection
  */
-BOOL32 TTYDRV_CLIPBOARD_RequestSelection()
+BOOL TTYDRV_CLIPBOARD_RequestSelection()
 {
   return FALSE;
 }
@@ -42,6 +42,6 @@ BOOL32 TTYDRV_CLIPBOARD_RequestSelection()
 /***********************************************************************
  *		TTYDRV_CLIPBOARD_ResetOwner
  */
-void TTYDRV_CLIPBOARD_ResetOwner(WND *pWnd, BOOL32 bFooBar)
+void TTYDRV_CLIPBOARD_ResetOwner(WND *pWnd, BOOL bFooBar)
 {
 }
diff --git a/windows/ttydrv/event.c b/windows/ttydrv/event.c
index 9d73e86b5b6..0ab61ea9a75 100644
--- a/windows/ttydrv/event.c
+++ b/windows/ttydrv/event.c
@@ -9,7 +9,7 @@
 /***********************************************************************
  *		TTYDRV_EVENT_Init
  */
-BOOL32 TTYDRV_EVENT_Init(void)
+BOOL TTYDRV_EVENT_Init(void)
 {
   return TRUE;
 }
@@ -31,7 +31,7 @@ void TTYDRV_EVENT_DeleteIO(int fd, unsigned flag)
 /***********************************************************************
  *		TTYDRV_EVENT_WaitNetEvent
  */
-BOOL32 TTYDRV_EVENT_WaitNetEvent(BOOL32 sleep, BOOL32 peek)
+BOOL TTYDRV_EVENT_WaitNetEvent(BOOL sleep, BOOL peek)
 {
   return TRUE;
 }
@@ -46,7 +46,7 @@ void TTYDRV_EVENT_Synchronize(void)
 /***********************************************************************
  *		TTYDRV_EVENT_CheckFocus
  */
-BOOL32 TTYDRV_EVENT_CheckFocus(void)
+BOOL TTYDRV_EVENT_CheckFocus(void)
 {
   return TRUE;
 }
@@ -54,7 +54,7 @@ BOOL32 TTYDRV_EVENT_CheckFocus(void)
 /***********************************************************************
  *		TTYDRV_EVENT_QueryPointer
  */
-BOOL32 TTYDRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state)
+BOOL TTYDRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state)
 {
   if(posX)
     *posX = 0;
@@ -78,7 +78,7 @@ void TTYDRV_EVENT_DummyMotionNotify(void)
 /***********************************************************************
  *		TTYDRV_EVENT_Pending
  */
-BOOL32 TTYDRV_EVENT_Pending(void)
+BOOL TTYDRV_EVENT_Pending(void)
 {
   return FALSE;
 }
diff --git a/windows/ttydrv/wnd.c b/windows/ttydrv/wnd.c
index d6e2e6e5ef3..da2b18446cb 100644
--- a/windows/ttydrv/wnd.c
+++ b/windows/ttydrv/wnd.c
@@ -26,7 +26,7 @@ void TTYDRV_WND_Finalize(WND *wndPtr)
 /**********************************************************************
  *		TTYDRV_WND_CreateDesktopWindow
  */
-BOOL32 TTYDRV_WND_CreateDesktopWindow(WND *wndPtr, CLASS *classPtr, BOOL32 bUnicode)
+BOOL TTYDRV_WND_CreateDesktopWindow(WND *wndPtr, CLASS *classPtr, BOOL bUnicode)
 {
   return FALSE;
 }
@@ -34,7 +34,7 @@ BOOL32 TTYDRV_WND_CreateDesktopWindow(WND *wndPtr, CLASS *classPtr, BOOL32 bUnic
 /**********************************************************************
  *		TTYDRV_WND_CreateWindow
  */
-BOOL32 TTYDRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCT32A *cs, BOOL32 bUnicode)
+BOOL TTYDRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BOOL bUnicode)
 {
   return FALSE;
 }
@@ -42,7 +42,7 @@ BOOL32 TTYDRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCT32A *cs
 /***********************************************************************
  *		TTYDRV_WND_DestroyWindow
  */
-BOOL32 TTYDRV_WND_DestroyWindow(WND *wndPtr)
+BOOL TTYDRV_WND_DestroyWindow(WND *wndPtr)
 {
   return FALSE;
 }
@@ -67,7 +67,7 @@ void TTYDRV_WND_ForceWindowRaise(WND *wndPtr)
  *
  * SetWindowPos() for an X window. Used by the real SetWindowPos().
  */
-void TTYDRV_WND_SetWindowPos(WND *wndPtr, const WINDOWPOS32 *winpos, BOOL32 bSMC_SETXPOS)
+void TTYDRV_WND_SetWindowPos(WND *wndPtr, const WINDOWPOS *winpos, BOOL bSMC_SETXPOS)
 {
 }
 
@@ -104,22 +104,22 @@ void TTYDRV_WND_PostSizeMove(WND *wndPtr)
  *		 TTYDRV_WND_ScrollWindow
  */
 void TTYDRV_WND_ScrollWindow(
-  WND *wndPtr, DC *dcPtr, INT32 dx, INT32 dy, 
-  const RECT32 *clipRect, BOOL32 bUpdate)
+  WND *wndPtr, DC *dcPtr, INT dx, INT dy, 
+  const RECT *clipRect, BOOL bUpdate)
 {
 }
 
 /***********************************************************************
  *		TTYDRV_WND_SetDrawable
  */
-void TTYDRV_WND_SetDrawable(WND *wndPtr, DC *dc, WORD flags, BOOL32 bSetClipOrigin)
+void TTYDRV_WND_SetDrawable(WND *wndPtr, DC *dc, WORD flags, BOOL bSetClipOrigin)
 {
 }
 
 /***********************************************************************
  *		TTYDRV_WND_IsSelfClipping
  */
-BOOL32 TTYDRV_WND_IsSelfClipping(WND *wndPtr)
+BOOL TTYDRV_WND_IsSelfClipping(WND *wndPtr)
 {
   return FALSE;
 }
diff --git a/windows/user.c b/windows/user.c
index 489e62617c9..4c5d320f635 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -31,7 +31,7 @@
 /***********************************************************************
  *           GetFreeSystemResources   (USER.284)
  */
-WORD WINAPI GetFreeSystemResources( WORD resType )
+WORD WINAPI GetFreeSystemResources16( WORD resType )
 {
     int userPercent, gdiPercent;
 
@@ -66,10 +66,10 @@ WORD WINAPI GetFreeSystemResources( WORD resType )
 /***********************************************************************
  *           SystemHeapInfo   (TOOLHELP.71)
  */
-BOOL16 WINAPI SystemHeapInfo( SYSHEAPINFO *pHeapInfo )
+BOOL16 WINAPI SystemHeapInfo16( SYSHEAPINFO *pHeapInfo )
 {
-    pHeapInfo->wUserFreePercent = GetFreeSystemResources( GFSR_USERRESOURCES );
-    pHeapInfo->wGDIFreePercent  = GetFreeSystemResources( GFSR_GDIRESOURCES );
+    pHeapInfo->wUserFreePercent = GetFreeSystemResources16( GFSR_USERRESOURCES );
+    pHeapInfo->wGDIFreePercent  = GetFreeSystemResources16( GFSR_GDIRESOURCES );
     pHeapInfo->hUserSegment = USER_HeapSel;
     pHeapInfo->hGDISegment  = GDI_HeapSel;
     return TRUE;
@@ -79,7 +79,7 @@ BOOL16 WINAPI SystemHeapInfo( SYSHEAPINFO *pHeapInfo )
 /***********************************************************************
  *           TimerCount   (TOOLHELP.80)
  */
-BOOL16 WINAPI TimerCount( TIMERINFO *pTimerInfo )
+BOOL16 WINAPI TimerCount16( TIMERINFO *pTimerInfo )
 {
     /* FIXME
      * In standard mode, dwmsSinceStart = dwmsThisVM 
@@ -118,11 +118,11 @@ static void USER_InstallRsrcHandler( HINSTANCE16 hInstance )
     /* SetResourceHandler() returns previous function which is set
      * when a module's resource table is loaded. */
 
-    proc = SetResourceHandler( hInstance, RT_ICON16,
+    proc = SetResourceHandler16( hInstance, RT_ICON16,
                                MODULE_GetWndProcEntry16("LoadDIBIconHandler") );
     if (!__r16loader) __r16loader = proc;
 
-    proc = SetResourceHandler( hInstance, RT_CURSOR16,
+    proc = SetResourceHandler16( hInstance, RT_CURSOR16,
                                MODULE_GetWndProcEntry16("LoadDIBCursorHandler") );
     if (!__r16loader) __r16loader = proc;
 }
@@ -130,7 +130,7 @@ static void USER_InstallRsrcHandler( HINSTANCE16 hInstance )
 /**********************************************************************
  *           InitApp   (USER.5)
  */
-INT16 WINAPI InitApp( HINSTANCE16 hInstance )
+INT16 WINAPI InitApp16( HINSTANCE16 hInstance )
 {
       /* InitTask() calls LibMain()'s of implicitly loaded DLLs 
        * prior to InitApp() so there is no clean way to do
@@ -146,7 +146,7 @@ INT16 WINAPI InitApp( HINSTANCE16 hInstance )
     INT_SetPMHandler( 0, INT_GetPMHandler( 0xff ) );
 
     /* Create task message queue */
-    if ( !GetFastQueue() ) return 0;
+    if ( !GetFastQueue16() ) return 0;
 
     return 1;
 }
@@ -199,14 +199,14 @@ static void USER_AppExit( HTASK16 hTask, HINSTANCE16 hInstance, HQUEUE16 hQueue
 
     /* Patch desktop window */
     if( desktop->hmemTaskQ == hQueue )
-        desktop->hmemTaskQ = GetTaskQueue(TASK_GetNextTask(hTask));
+        desktop->hmemTaskQ = GetTaskQueue16(TASK_GetNextTask(hTask));
                   
     USER_QueueCleanup(hQueue);
 
     /* ModuleUnload() in "Internals" */
 
     hInstance = GetExePtr( hInstance );
-    if( GetModuleUsage( hInstance ) <= 1 ) 
+    if( GetModuleUsage16( hInstance ) <= 1 ) 
 	USER_ModuleUnload( hInstance );
 }
 
@@ -222,7 +222,7 @@ void USER_ExitWindows(void)
 {
     /* Do the clean-up stuff */
 
-    WriteOutProfiles();
+    WriteOutProfiles16();
     SHELL_SaveRegistry();
 
     exit(0);
@@ -280,10 +280,10 @@ BOOL16 WINAPI ExitWindowsExec16( LPCSTR lpszExe, LPCSTR lpszParams )
 /***********************************************************************
  *           ExitWindowsEx   (USER32.196)
  */
-BOOL32 WINAPI ExitWindowsEx( UINT32 flags, DWORD reserved )
+BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reserved )
 {
     int i;
-    BOOL32 result;
+    BOOL result;
     WND **list, **ppWnd;
         
     /* We have to build a list of all windows first, as in EnumWindows */
@@ -295,7 +295,7 @@ BOOL32 WINAPI ExitWindowsEx( UINT32 flags, DWORD reserved )
     for (ppWnd = list, i = 0; *ppWnd; ppWnd++, i++)
     {
         /* Make sure that the window still exists */
-        if (!IsWindow32( (*ppWnd)->hwndSelf )) continue;
+        if (!IsWindow( (*ppWnd)->hwndSelf )) continue;
 	if (!SendMessage16( (*ppWnd)->hwndSelf, WM_QUERYENDSESSION, 0, 0 ))
             break;
     }
@@ -305,7 +305,7 @@ BOOL32 WINAPI ExitWindowsEx( UINT32 flags, DWORD reserved )
 
     for (ppWnd = list; i > 0; i--, ppWnd++)
     {
-        if (!IsWindow32( (*ppWnd)->hwndSelf )) continue;
+        if (!IsWindow( (*ppWnd)->hwndSelf )) continue;
 	SendMessage16( (*ppWnd)->hwndSelf, WM_ENDSESSION, result, 0 );
     }
     HeapFree( SystemHeap, 0, list );
@@ -318,7 +318,7 @@ BOOL32 WINAPI ExitWindowsEx( UINT32 flags, DWORD reserved )
 /***********************************************************************
  *           ChangeDisplaySettingA    (USER32.589)
  */
-LONG WINAPI ChangeDisplaySettings32A( LPDEVMODE32A devmode, DWORD flags )
+LONG WINAPI ChangeDisplaySettingsA( LPDEVMODEA devmode, DWORD flags )
 {
   FIXME(system, ": stub\n");
   if (devmode==NULL)
@@ -350,10 +350,10 @@ LONG WINAPI ChangeDisplaySettings32A( LPDEVMODE32A devmode, DWORD flags )
  *	TRUE if nth setting exists found (described in the LPDEVMODE32A struct)
  *	FALSE if we do not have the nth setting
  */
-BOOL32 WINAPI EnumDisplaySettings32A(
+BOOL WINAPI EnumDisplaySettingsA(
 	LPCSTR name,		/* [in] huh? */
 	DWORD n,		/* [in] nth entry in display settings list*/
-	LPDEVMODE32A devmode	/* [out] devmode for that setting */
+	LPDEVMODEA devmode	/* [out] devmode for that setting */
 ) {
 #define NRMODES 5
 #define NRDEPTHS 4
@@ -381,10 +381,10 @@ BOOL32 WINAPI EnumDisplaySettings32A(
 /***********************************************************************
  *           EnumDisplaySettingsW   (USER32.593)
  */
-BOOL32 WINAPI EnumDisplaySettings32W(LPCWSTR name,DWORD n,LPDEVMODE32W devmode) {
+BOOL WINAPI EnumDisplaySettingsW(LPCWSTR name,DWORD n,LPDEVMODEW devmode) {
 	LPSTR nameA = HEAP_strdupWtoA(GetProcessHeap(),0,name);
-	DEVMODE32A	devmodeA; 
-	BOOL32 ret = EnumDisplaySettings32A(nameA,n,&devmodeA); 
+	DEVMODEA	devmodeA; 
+	BOOL ret = EnumDisplaySettingsA(nameA,n,&devmodeA); 
 
 	if (ret) {
 		devmode->dmBitsPerPel	= devmodeA.dmBitsPerPel;
@@ -401,16 +401,16 @@ BOOL32 WINAPI EnumDisplaySettings32W(LPCWSTR name,DWORD n,LPDEVMODE32W devmode)
  *
  *	Used by Turbo Debugger for Windows
  */
-FARPROC16 WINAPI SetEventHook(FARPROC16 lpfnEventHook)
+FARPROC16 WINAPI SetEventHook16(FARPROC16 lpfnEventHook)
 {
-	FIXME(hook, "(lpfnEventHook=%08x): stub\n", (UINT32)lpfnEventHook);
+	FIXME(hook, "(lpfnEventHook=%08x): stub\n", (UINT)lpfnEventHook);
 	return NULL;
 }
 
 /***********************************************************************
  *           UserSeeUserDo   (USER.216)
  */
-DWORD WINAPI UserSeeUserDo(WORD wReqType, WORD wParam1, WORD wParam2, WORD wParam3)
+DWORD WINAPI UserSeeUserDo16(WORD wReqType, WORD wParam1, WORD wParam2, WORD wParam3)
 {
     switch (wReqType)
     {
@@ -434,7 +434,7 @@ DWORD WINAPI UserSeeUserDo(WORD wReqType, WORD wParam1, WORD wParam2, WORD wPara
 /***********************************************************************
  *           RegisterLogonProcess   (USER32.434)
  */
-DWORD WINAPI RegisterLogonProcess(HANDLE32 hprocess,BOOL32 x) {
+DWORD WINAPI RegisterLogonProcess(HANDLE hprocess,BOOL x) {
 	FIXME(win32,"(%d,%d),stub!\n",hprocess,x);
 	return 1;
 }
@@ -442,7 +442,7 @@ DWORD WINAPI RegisterLogonProcess(HANDLE32 hprocess,BOOL32 x) {
 /***********************************************************************
  *           CreateWindowStation32W   (USER32.86)
  */
-HWINSTA32 WINAPI CreateWindowStation32W(
+HWINSTA WINAPI CreateWindowStationW(
 	LPWSTR winstation,DWORD res1,DWORD desiredaccess,
 	LPSECURITY_ATTRIBUTES lpsa
 ) {
@@ -455,7 +455,7 @@ HWINSTA32 WINAPI CreateWindowStation32W(
 /***********************************************************************
  *           SetProcessWindowStation   (USER32.496)
  */
-BOOL32 WINAPI SetProcessWindowStation(HWINSTA32 hWinSta) {
+BOOL WINAPI SetProcessWindowStation(HWINSTA hWinSta) {
 	FIXME(win32,"(%d),stub!\n",hWinSta);
 	return TRUE;
 }
@@ -463,8 +463,8 @@ BOOL32 WINAPI SetProcessWindowStation(HWINSTA32 hWinSta) {
 /***********************************************************************
  *           SetUserObjectSecurity   (USER32.514)
  */
-BOOL32 WINAPI SetUserObjectSecurity(
-	HANDLE32 hObj,
+BOOL WINAPI SetUserObjectSecurity(
+	HANDLE hObj,
 	/*LPSECURITY_INFORMATION*/LPVOID pSIRequested,
 	PSECURITY_DESCRIPTOR pSID
 ) {
@@ -475,8 +475,8 @@ BOOL32 WINAPI SetUserObjectSecurity(
 /***********************************************************************
  *           CreateDesktop32W   (USER32.69)
  */
-HDESK32 WINAPI CreateDesktop32W(
-	LPWSTR lpszDesktop,LPWSTR lpszDevice,LPDEVMODE32W pDevmode,
+HDESK WINAPI CreateDesktopW(
+	LPWSTR lpszDesktop,LPWSTR lpszDevice,LPDEVMODEW pDevmode,
 	DWORD dwFlags,DWORD dwDesiredAccess,LPSECURITY_ATTRIBUTES lpsa
 ) {
 	FIXME(win32,"(%s,%s,%p,0x%08lx,0x%08lx,%p),stub!\n",
@@ -497,7 +497,7 @@ DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) {
 /***********************************************************************
  *           SetLogonNotifyWindow   (USER32.486)
  */
-DWORD WINAPI SetLogonNotifyWindow(HWINSTA32 hwinsta,HWND32 hwnd) {
+DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) {
 	FIXME(win32,"(0x%x,%04x),stub!\n",hwinsta,hwnd);
 	return 1;
 }
@@ -512,21 +512,21 @@ VOID WINAPI LoadLocalFonts(VOID) {
 /***********************************************************************
  *           GetUserObjectInformation32A   (USER32.299)
  */
-BOOL32 WINAPI GetUserObjectInformation32A( HANDLE32 hObj, int nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen )
+BOOL WINAPI GetUserObjectInformationA( HANDLE hObj, int nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen )
 {	FIXME(win32,"(0x%x %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen );
 	return TRUE;
 }
 /***********************************************************************
  *           GetUserObjectInformation32W   (USER32.300)
  */
-BOOL32 WINAPI GetUserObjectInformation32W( HANDLE32 hObj, int nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen )
+BOOL WINAPI GetUserObjectInformationW( HANDLE hObj, int nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen )
 {	FIXME(win32,"(0x%x %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen );
 	return TRUE;
 }
 /***********************************************************************
  *           GetUserObjectSecurity32   (USER32.300)
  */
-BOOL32 WINAPI GetUserObjectSecurity32(HANDLE32 hObj, SECURITY_INFORMATION * pSIRequested,
+BOOL WINAPI GetUserObjectSecurity(HANDLE hObj, SECURITY_INFORMATION * pSIRequested,
 	PSECURITY_DESCRIPTOR pSID, DWORD nLength, LPDWORD lpnLengthNeeded)
 {	FIXME(win32,"(0x%x %p %p len=%ld %p),stub!\n",  hObj, pSIRequested, pSID, nLength, lpnLengthNeeded);
 	return TRUE;
diff --git a/windows/win.c b/windows/win.c
index e6a515799ca..e86e0175d52 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -47,7 +47,7 @@ extern WND_DRIVER TTYDRV_WND_Driver;
 /* Desktop window */
 static WND *pWndDesktop = NULL;
 
-static HWND32 hwndSysModal = 0;
+static HWND hwndSysModal = 0;
 
 static WORD wDragWidth = 4;
 static WORD wDragHeight= 3;
@@ -119,7 +119,7 @@ void WIN_Unlock(int ipreviousLocks)
  *
  * Return a pointer to the WND structure corresponding to a HWND.
  */
-WND * WIN_FindWndPtr( HWND32 hwnd )
+WND * WIN_FindWndPtr( HWND hwnd )
 {
     WND * ptr;
     
@@ -176,7 +176,7 @@ void WIN_ReleaseWndPtr(WND *wndPtr)
  *
  * Dump the content of a window structure to stderr.
  */
-void WIN_DumpWindow( HWND32 hwnd )
+void WIN_DumpWindow( HWND hwnd )
 {
     WND *ptr;
     char className[80];
@@ -188,7 +188,7 @@ void WIN_DumpWindow( HWND32 hwnd )
         return;
     }
 
-    if (!GetClassName32A( hwnd, className, sizeof(className ) ))
+    if (!GetClassNameA( hwnd, className, sizeof(className ) ))
         strcpy( className, "#NULL#" );
 
     TRACE( win, "Window %04x (%p):\n", hwnd, ptr );
@@ -200,7 +200,7 @@ void WIN_DumpWindow( HWND32 hwnd )
              ptr->next, ptr->child, ptr->parent, ptr->owner,
              ptr->class, className, ptr->hInstance, ptr->hmemTaskQ,
              ptr->hrgnUpdate, ptr->hwndLastActive, ptr->dce, ptr->wIDmenu,
-             ptr->dwStyle, ptr->dwExStyle, (UINT32)ptr->winproc,
+             ptr->dwStyle, ptr->dwExStyle, (UINT)ptr->winproc,
              ptr->text ? ptr->text : "",
              ptr->rectClient.left, ptr->rectClient.top, ptr->rectClient.right,
              ptr->rectClient.bottom, ptr->rectWindow.left, ptr->rectWindow.top,
@@ -223,7 +223,7 @@ void WIN_DumpWindow( HWND32 hwnd )
  *
  * Walk the windows tree and print each window on stderr.
  */
-void WIN_WalkWindows( HWND32 hwnd, int indent )
+void WIN_WalkWindows( HWND hwnd, int indent )
 {
     WND *ptr;
     char className[80];
@@ -248,7 +248,7 @@ void WIN_WalkWindows( HWND32 hwnd, int indent )
         
         DUMP( "%08lx %-6.4x %-17.17s %08x %08x %.14s\n",
                  (DWORD)ptr, ptr->hmemTaskQ, className,
-                 (UINT32)ptr->dwStyle, (UINT32)ptr->winproc,
+                 (UINT)ptr->dwStyle, (UINT)ptr->winproc,
                  ptr->text?ptr->text:"<null>");
         
         if (ptr->child) WIN_WalkWindows( ptr->child->hwndSelf, indent+1 );
@@ -261,7 +261,7 @@ void WIN_WalkWindows( HWND32 hwnd, int indent )
  *
  * Remove a window from the siblings linked list.
  */
-BOOL32 WIN_UnlinkWindow( HWND32 hwnd )
+BOOL WIN_UnlinkWindow( HWND hwnd )
 {    
     WND *wndPtr, **ppWnd;
 
@@ -280,7 +280,7 @@ BOOL32 WIN_UnlinkWindow( HWND32 hwnd )
  * The window is inserted after the specified window, which can also
  * be specified as HWND_TOP or HWND_BOTTOM.
  */
-BOOL32 WIN_LinkWindow( HWND32 hwnd, HWND32 hwndInsertAfter )
+BOOL WIN_LinkWindow( HWND hwnd, HWND hwndInsertAfter )
 {    
     WND *wndPtr, **ppWnd;
 
@@ -309,9 +309,9 @@ BOOL32 WIN_LinkWindow( HWND32 hwnd, HWND32 hwndInsertAfter )
  *
  * Find a window that needs repaint.
  */
-HWND32 WIN_FindWinToRepaint( HWND32 hwnd, HQUEUE16 hQueue )
+HWND WIN_FindWinToRepaint( HWND hwnd, HQUEUE16 hQueue )
 {
-    HWND32 hwndRet;
+    HWND hwndRet;
     WND *pWnd = pWndDesktop;
 
     /* Note: the desktop window never gets WM_PAINT messages 
@@ -360,7 +360,7 @@ HWND32 WIN_FindWinToRepaint( HWND32 hwnd, HQUEUE16 hQueue )
  */
 static WND* WIN_DestroyWindow( WND* wndPtr )
 {
-    HWND32 hwnd = wndPtr->hwndSelf;
+    HWND hwnd = wndPtr->hwndSelf;
     WND *pWnd;
 
     TRACE(win, "%04x\n", wndPtr->hwndSelf );
@@ -375,12 +375,12 @@ static WND* WIN_DestroyWindow( WND* wndPtr )
     while ((pWnd = wndPtr->child))
         wndPtr->child = WIN_DestroyWindow( pWnd );
 
-    SendMessage32A( wndPtr->hwndSelf, WM_NCDESTROY, 0, 0);
+    SendMessageA( wndPtr->hwndSelf, WM_NCDESTROY, 0, 0);
 
     /* FIXME: do we need to fake QS_MOUSEMOVE wakebit? */
 
     WINPOS_CheckInternalPos( wndPtr );
-    if( hwnd == GetCapture32()) ReleaseCapture();
+    if( hwnd == GetCapture()) ReleaseCapture();
 
     /* free resources associated with the window */
 
@@ -391,7 +391,7 @@ static WND* WIN_DestroyWindow( WND* wndPtr )
 
     if ((wndPtr->hrgnUpdate) || (wndPtr->flags & WIN_INTERNAL_PAINT))
     {
-        if (wndPtr->hrgnUpdate > 1) DeleteObject32( wndPtr->hrgnUpdate );
+        if (wndPtr->hrgnUpdate > 1) DeleteObject( wndPtr->hrgnUpdate );
         QUEUE_DecPaintCount( wndPtr->hmemTaskQ );
     }
 
@@ -399,8 +399,8 @@ static WND* WIN_DestroyWindow( WND* wndPtr )
 
     if( wndPtr->hmemTaskQ )
     {
-	BOOL32	      bPostQuit = FALSE;
-	WPARAM32      wQuitParam = 0;
+	BOOL	      bPostQuit = FALSE;
+	WPARAM      wQuitParam = 0;
         MESSAGEQUEUE* msgQ = (MESSAGEQUEUE*) QUEUE_Lock(wndPtr->hmemTaskQ);
         QMSG *qmsg;
 
@@ -417,13 +417,13 @@ static WND* WIN_DestroyWindow( WND* wndPtr )
         QUEUE_Unlock(msgQ);
         
 	/* repost WM_QUIT to make sure this app exits its message loop */
-	if( bPostQuit ) PostQuitMessage32(wQuitParam);
+	if( bPostQuit ) PostQuitMessage(wQuitParam);
 	wndPtr->hmemTaskQ = 0;
     }
 
     if (!(wndPtr->dwStyle & WS_CHILD))
-       if (wndPtr->wIDmenu) DestroyMenu32( (HMENU32)wndPtr->wIDmenu );
-    if (wndPtr->hSysMenu) DestroyMenu32( wndPtr->hSysMenu );
+       if (wndPtr->wIDmenu) DestroyMenu( (HMENU)wndPtr->wIDmenu );
+    if (wndPtr->hSysMenu) DestroyMenu( wndPtr->hSysMenu );
     wndPtr->pDriver->pDestroyWindow( wndPtr );
     DCE_FreeWindowDCE( wndPtr );    /* Always do this to catch orphaned DCs */ 
     WINPROC_FreeProc( wndPtr->winproc, WIN_PROC_WINDOW );
@@ -443,9 +443,9 @@ static WND* WIN_DestroyWindow( WND* wndPtr )
  * Reset the queue of all the children of a given window.
  * Return TRUE if something was done.
  */
-BOOL32 WIN_ResetQueueWindows( WND* wnd, HQUEUE16 hQueue, HQUEUE16 hNew )
+BOOL WIN_ResetQueueWindows( WND* wnd, HQUEUE16 hQueue, HQUEUE16 hNew )
 {
-    BOOL32 ret = FALSE;
+    BOOL ret = FALSE;
 
     if (hNew)  /* Set a new queue */
     {
@@ -470,7 +470,7 @@ BOOL32 WIN_ResetQueueWindows( WND* wnd, HQUEUE16 hQueue, HQUEUE16 hNew )
             {
                 if (tmp->hmemTaskQ == hQueue)
                 {
-                    DestroyWindow32( tmp->hwndSelf );
+                    DestroyWindow( tmp->hwndSelf );
                     ret = TRUE;
                     break;
                 }
@@ -490,10 +490,10 @@ BOOL32 WIN_ResetQueueWindows( WND* wnd, HQUEUE16 hQueue, HQUEUE16 hNew )
  *
  * Create the desktop window.
  */
-BOOL32 WIN_CreateDesktopWindow(void)
+BOOL WIN_CreateDesktopWindow(void)
 {
     CLASS *class;
-    HWND32 hwndDesktop;
+    HWND hwndDesktop;
     DESKTOP *pDesktop;
 
     TRACE(win,"Creating desktop window\n");
@@ -533,7 +533,7 @@ BOOL32 WIN_CreateDesktopWindow(void)
     pWndDesktop->rectWindow.bottom = SYSMETRICS_CYSCREEN;
     pWndDesktop->rectClient        = pWndDesktop->rectWindow;
     pWndDesktop->text              = NULL;
-    pWndDesktop->hmemTaskQ         = GetFastQueue();
+    pWndDesktop->hmemTaskQ         = GetFastQueue16();
     pWndDesktop->hrgnUpdate        = 0;
     pWndDesktop->hwndLastActive    = hwndDesktop;
     pWndDesktop->dwStyle           = WS_VISIBLE | WS_CLIPCHILDREN |
@@ -554,7 +554,7 @@ BOOL32 WIN_CreateDesktopWindow(void)
     if(!pWndDesktop->pDriver->pCreateDesktopWindow(pWndDesktop, class, FALSE))
       return FALSE;
     
-    SendMessage32A( hwndDesktop, WM_NCCREATE, 0, 0 );
+    SendMessageA( hwndDesktop, WM_NCCREATE, 0, 0 );
     pWndDesktop->flags |= WIN_NEEDS_ERASEBKGND;
     return TRUE;
 }
@@ -565,14 +565,14 @@ BOOL32 WIN_CreateDesktopWindow(void)
  *
  * Implementation of CreateWindowEx().
  */
-static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
-                                  BOOL32 win32, BOOL32 unicode )
+static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom,
+                                  BOOL win32, BOOL unicode )
 {
     CLASS *classPtr;
     WND *wndPtr;
     HWND16 hwnd, hwndLinkAfter;
-    POINT32 maxSize, maxPos, minTrack, maxTrack;
-    LRESULT (CALLBACK *localSend32)(HWND32, UINT32, WPARAM32, LPARAM);
+    POINT maxSize, maxPos, minTrack, maxTrack;
+    LRESULT (CALLBACK *localSend32)(HWND, UINT, WPARAM, LPARAM);
 
     TRACE(win, "%s %s %08lx %08lx %d,%d %dx%d %04x %04x %08x %p\n",
           unicode ? debugres_w((LPWSTR)cs->lpszName) : debugres_a(cs->lpszName), 
@@ -585,7 +585,7 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
     if (cs->hwndParent)
     {
 	/* Make sure parent is valid */
-        if (!IsWindow32( cs->hwndParent ))
+        if (!IsWindow( cs->hwndParent ))
         {
             WARN( win, "Bad parent %04x\n", cs->hwndParent );
 	    return 0;
@@ -599,16 +599,16 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
     if (!(classPtr = CLASS_FindClassByAtom( classAtom, win32?cs->hInstance:GetExePtr(cs->hInstance) )))
     {
         char buffer[256];
-        GlobalGetAtomName32A( classAtom, buffer, sizeof(buffer) );
+        GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
         WARN( win, "Bad class '%s'\n", buffer );
         return 0;
     }
 
     /* Fix the coordinates */
 
-    if (cs->x == CW_USEDEFAULT32) 
+    if (cs->x == CW_USEDEFAULT) 
     {
-        PDB32 *pdb = PROCESS_Current();
+        PDB *pdb = PROCESS_Current();
         if (   !(cs->style & (WS_CHILD | WS_POPUP))
             &&  (pdb->env_db->startup_info->dwFlags & STARTF_USEPOSITION) )
         {
@@ -621,9 +621,9 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
             cs->y = 0;
         }
     }
-    if (cs->cx == CW_USEDEFAULT32)
+    if (cs->cx == CW_USEDEFAULT)
     {
-        PDB32 *pdb = PROCESS_Current();
+        PDB *pdb = PROCESS_Current();
         if (   !(cs->style & (WS_CHILD | WS_POPUP))
             &&  (pdb->env_db->startup_info->dwFlags & STARTF_USESIZE) )
         {
@@ -675,7 +675,7 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
     wndPtr->hwndSelf       = hwnd;
     wndPtr->hInstance      = cs->hInstance;
     wndPtr->text           = NULL;
-    wndPtr->hmemTaskQ      = GetFastQueue();
+    wndPtr->hmemTaskQ      = GetFastQueue16();
     wndPtr->hrgnUpdate     = 0;
     wndPtr->hwndLastActive = hwnd;
     wndPtr->dwStyle        = cs->style & ~WS_VISIBLE;
@@ -699,13 +699,13 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
 
     if (HOOK_IsHooked( WH_CBT ))
     {
-	CBT_CREATEWND32A cbtc;
+	CBT_CREATEWNDA cbtc;
         LRESULT ret;
 
 	cbtc.lpcs = cs;
 	cbtc.hwndInsertAfter = hwndLinkAfter;
-        ret = unicode ? HOOK_CallHooks32W(WH_CBT, HCBT_CREATEWND, hwnd, (LPARAM)&cbtc)
-                      : HOOK_CallHooks32A(WH_CBT, HCBT_CREATEWND, hwnd, (LPARAM)&cbtc);
+        ret = unicode ? HOOK_CallHooksW(WH_CBT, HCBT_CREATEWND, hwnd, (LPARAM)&cbtc)
+                      : HOOK_CallHooksA(WH_CBT, HCBT_CREATEWND, hwnd, (LPARAM)&cbtc);
         if (ret)
 	{
 	    TRACE(win, "CBT-hook returned 0\n");
@@ -769,7 +769,7 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
 
     if ((wndPtr->dwStyle & (WS_CAPTION | WS_CHILD)) == WS_CAPTION )
     {
-        if (cs->hMenu) SetMenu32(hwnd, cs->hMenu);
+        if (cs->hMenu) SetMenu(hwnd, cs->hMenu);
         else
         {
 #if 0  /* FIXME: should check if classPtr->menuNameW can be used as is */
@@ -782,16 +782,16 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
             if (menuName)
             {
                 if (HIWORD(cs->hInstance))
-                    cs->hMenu = LoadMenu32A(cs->hInstance,PTR_SEG_TO_LIN(menuName));
+                    cs->hMenu = LoadMenuA(cs->hInstance,PTR_SEG_TO_LIN(menuName));
                 else
                     cs->hMenu = LoadMenu16(cs->hInstance,menuName);
 
-                if (cs->hMenu) SetMenu32( hwnd, cs->hMenu );
+                if (cs->hMenu) SetMenu( hwnd, cs->hMenu );
             }
 #endif
         }
     }
-    else wndPtr->wIDmenu = (UINT32)cs->hMenu;
+    else wndPtr->wIDmenu = (UINT)cs->hMenu;
 
     /* Send the WM_CREATE message 
      * Perhaps we shouldn't allow width/height changes as well. 
@@ -800,7 +800,7 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
 
     maxPos.x = wndPtr->rectWindow.left; maxPos.y = wndPtr->rectWindow.top;
 
-    localSend32 = unicode ? SendMessage32W : SendMessage32A;
+    localSend32 = unicode ? SendMessageW : SendMessageA;
     if( (*localSend32)( hwnd, WM_NCCREATE, 0, (LPARAM)cs) )
     {
         /* Insert the window in the linked list */
@@ -809,7 +809,7 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
 
         WINPOS_SendNCCalcSize( hwnd, FALSE, &wndPtr->rectWindow,
                                NULL, NULL, 0, &wndPtr->rectClient );
-        OffsetRect32(&wndPtr->rectWindow, maxPos.x - wndPtr->rectWindow.left,
+        OffsetRect(&wndPtr->rectWindow, maxPos.x - wndPtr->rectWindow.left,
                                           maxPos.y - wndPtr->rectWindow.top);
         if( ((*localSend32)( hwnd, WM_CREATE, 0, (LPARAM)cs )) != -1 )
         {
@@ -823,10 +823,10 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
 		  WARN(win,"sending bogus WM_SIZE message 0x%08lx\n",
 			MAKELONG(wndPtr->rectClient.right-wndPtr->rectClient.left,
 				 wndPtr->rectClient.bottom-wndPtr->rectClient.top));
-                SendMessage32A( hwnd, WM_SIZE, SIZE_RESTORED,
+                SendMessageA( hwnd, WM_SIZE, SIZE_RESTORED,
                                 MAKELONG(wndPtr->rectClient.right-wndPtr->rectClient.left,
                                          wndPtr->rectClient.bottom-wndPtr->rectClient.top));
-                SendMessage32A( hwnd, WM_MOVE, 0,
+                SendMessageA( hwnd, WM_MOVE, 0,
                                 MAKELONG( wndPtr->rectClient.left,
                                           wndPtr->rectClient.top ) );
             }
@@ -839,10 +839,10 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
 		UINT16 swFlag = (wndPtr->dwStyle & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE;
                 wndPtr->dwStyle &= ~(WS_MAXIMIZE | WS_MINIMIZE);
 		WINPOS_MinMaximize( wndPtr, swFlag, &newPos );
-                swFlag = ((wndPtr->dwStyle & WS_CHILD) || GetActiveWindow32())
+                swFlag = ((wndPtr->dwStyle & WS_CHILD) || GetActiveWindow())
                     ? SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED
                     : SWP_NOZORDER | SWP_FRAMECHANGED;
-                SetWindowPos32( hwnd, 0, newPos.left, newPos.top,
+                SetWindowPos( hwnd, 0, newPos.left, newPos.top,
                                 newPos.right, newPos.bottom, swFlag );
             }
 
@@ -850,12 +850,12 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
 	    {
 		/* Notify the parent window only */
 
-		SendMessage32A( wndPtr->parent->hwndSelf, WM_PARENTNOTIFY,
+		SendMessageA( wndPtr->parent->hwndSelf, WM_PARENTNOTIFY,
 				MAKEWPARAM(WM_CREATE, wndPtr->wIDmenu), (LPARAM)hwnd );
-		if( !IsWindow32(hwnd) ) return 0;
+		if( !IsWindow(hwnd) ) return 0;
 	    }
 
-            if (cs->style & WS_VISIBLE) ShowWindow32( hwnd, SW_SHOW );
+            if (cs->style & WS_VISIBLE) ShowWindow( hwnd, SW_SHOW );
 
             /* Call WH_SHELL hook */
 
@@ -899,11 +899,11 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className,
                                 HINSTANCE16 instance, LPVOID data ) 
 {
     ATOM classAtom;
-    CREATESTRUCT32A cs;
+    CREATESTRUCTA cs;
 
     /* Find the class atom */
 
-    if (!(classAtom = GlobalFindAtom32A( className )))
+    if (!(classAtom = GlobalFindAtomA( className )))
     {
         fprintf( stderr, "CreateWindowEx16: bad class name " );
         if (!HIWORD(className)) fprintf( stderr, "%04x\n", LOWORD(className) );
@@ -913,17 +913,17 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className,
 
     /* Fix the coordinates */
 
-    cs.x  = (x == CW_USEDEFAULT16) ? CW_USEDEFAULT32 : (INT32)x;
-    cs.y  = (y == CW_USEDEFAULT16) ? CW_USEDEFAULT32 : (INT32)y;
-    cs.cx = (width == CW_USEDEFAULT16) ? CW_USEDEFAULT32 : (INT32)width;
-    cs.cy = (height == CW_USEDEFAULT16) ? CW_USEDEFAULT32 : (INT32)height;
+    cs.x  = (x == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)x;
+    cs.y  = (y == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)y;
+    cs.cx = (width == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)width;
+    cs.cy = (height == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)height;
 
     /* Create the window */
 
     cs.lpCreateParams = data;
-    cs.hInstance      = (HINSTANCE32)instance;
-    cs.hMenu          = (HMENU32)menu;
-    cs.hwndParent     = (HWND32)parent;
+    cs.hInstance      = (HINSTANCE)instance;
+    cs.hMenu          = (HMENU)menu;
+    cs.hwndParent     = (HWND)parent;
     cs.style          = style;
     cs.lpszName       = windowName;
     cs.lpszClass      = className;
@@ -935,20 +935,20 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className,
 /***********************************************************************
  *           CreateWindowEx32A   (USER32.83)
  */
-HWND32 WINAPI CreateWindowEx32A( DWORD exStyle, LPCSTR className,
-                                 LPCSTR windowName, DWORD style, INT32 x,
-                                 INT32 y, INT32 width, INT32 height,
-                                 HWND32 parent, HMENU32 menu,
-                                 HINSTANCE32 instance, LPVOID data )
+HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className,
+                                 LPCSTR windowName, DWORD style, INT x,
+                                 INT y, INT width, INT height,
+                                 HWND parent, HMENU menu,
+                                 HINSTANCE instance, LPVOID data )
 {
     ATOM classAtom;
-    CREATESTRUCT32A cs;
+    CREATESTRUCTA cs;
 
     if(exStyle & WS_EX_MDICHILD)
-        return MDI_CreateMDIWindow32A(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
+        return MDI_CreateMDIWindowA(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
     /* Find the class atom */
 
-    if (!(classAtom = GlobalFindAtom32A( className )))
+    if (!(classAtom = GlobalFindAtomA( className )))
     {
         fprintf( stderr, "CreateWindowEx32A: bad class name " );
         if (!HIWORD(className)) fprintf( stderr, "%04x\n", LOWORD(className) );
@@ -977,21 +977,21 @@ HWND32 WINAPI CreateWindowEx32A( DWORD exStyle, LPCSTR className,
 /***********************************************************************
  *           CreateWindowEx32W   (USER32.84)
  */
-HWND32 WINAPI CreateWindowEx32W( DWORD exStyle, LPCWSTR className,
-                                 LPCWSTR windowName, DWORD style, INT32 x,
-                                 INT32 y, INT32 width, INT32 height,
-                                 HWND32 parent, HMENU32 menu,
-                                 HINSTANCE32 instance, LPVOID data )
+HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className,
+                                 LPCWSTR windowName, DWORD style, INT x,
+                                 INT y, INT width, INT height,
+                                 HWND parent, HMENU menu,
+                                 HINSTANCE instance, LPVOID data )
 {
     ATOM classAtom;
-    CREATESTRUCT32W cs;
+    CREATESTRUCTW cs;
 
     if(exStyle & WS_EX_MDICHILD)
-        return MDI_CreateMDIWindow32W(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
+        return MDI_CreateMDIWindowW(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
 
     /* Find the class atom */
 
-    if (!(classAtom = GlobalFindAtom32W( className )))
+    if (!(classAtom = GlobalFindAtomW( className )))
     {
     	if (HIWORD(className))
         {
@@ -1020,7 +1020,7 @@ HWND32 WINAPI CreateWindowEx32W( DWORD exStyle, LPCWSTR className,
     cs.dwExStyle      = exStyle;
     /* Note: we rely on the fact that CREATESTRUCT32A and */
     /* CREATESTRUCT32W have the same layout. */
-    return WIN_CreateWindowEx( (CREATESTRUCT32A *)&cs, classAtom, TRUE, TRUE );
+    return WIN_CreateWindowEx( (CREATESTRUCTA *)&cs, classAtom, TRUE, TRUE );
 }
 
 
@@ -1040,12 +1040,12 @@ static void WIN_SendDestroyMsg( WND* pWnd )
 {
     WIN_CheckFocus(pWnd);
 
-    if( CARET_GetHwnd() == pWnd->hwndSelf ) DestroyCaret32();
+    if( CARET_GetHwnd() == pWnd->hwndSelf ) DestroyCaret();
     CLIPBOARD_GetDriver()->pResetOwner( pWnd, TRUE ); 
   
-    SendMessage32A( pWnd->hwndSelf, WM_DESTROY, 0, 0);
+    SendMessageA( pWnd->hwndSelf, WM_DESTROY, 0, 0);
 
-    if( IsWindow32(pWnd->hwndSelf) )
+    if( IsWindow(pWnd->hwndSelf) )
     {
 	WND* pChild = pWnd->child;
 	while( pChild )
@@ -1065,14 +1065,14 @@ static void WIN_SendDestroyMsg( WND* pWnd )
  */
 BOOL16 WINAPI DestroyWindow16( HWND16 hwnd )
 {
-    return DestroyWindow32(hwnd);
+    return DestroyWindow(hwnd);
 }
 
 
 /***********************************************************************
  *           DestroyWindow32   (USER32.135)
  */
-BOOL32 WINAPI DestroyWindow32( HWND32 hwnd )
+BOOL WINAPI DestroyWindow( HWND hwnd )
 {
     WND * wndPtr;
 
@@ -1098,9 +1098,9 @@ BOOL32 WINAPI DestroyWindow32( HWND32 hwnd )
 	if( wndPtr->dwStyle & WS_CHILD && !(wndPtr->dwExStyle & WS_EX_NOPARENTNOTIFY) )
 	{
 	    /* Notify the parent window only */
-	    SendMessage32A( wndPtr->parent->hwndSelf, WM_PARENTNOTIFY,
+	    SendMessageA( wndPtr->parent->hwndSelf, WM_PARENTNOTIFY,
 			    MAKEWPARAM(WM_DESTROY, wndPtr->wIDmenu), (LPARAM)hwnd );
-	    if( !IsWindow32(hwnd) ) return TRUE;
+	    if( !IsWindow(hwnd) ) return TRUE;
 	}
 
     CLIPBOARD_GetDriver()->pResetOwner( wndPtr, FALSE ); /* before the window is unmapped */
@@ -1109,10 +1109,10 @@ BOOL32 WINAPI DestroyWindow32( HWND32 hwnd )
 
     if (wndPtr->dwStyle & WS_VISIBLE)
     {
-        SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_HIDEWINDOW |
+        SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_HIDEWINDOW |
 		        SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|
 		        ((QUEUE_IsExitingQueue(wndPtr->hmemTaskQ))?SWP_DEFERERASE:0) );
-	if (!IsWindow32(hwnd)) return TRUE;
+	if (!IsWindow(hwnd)) return TRUE;
     }
 
       /* Recursively destroy owned windows */
@@ -1136,7 +1136,7 @@ BOOL32 WINAPI DestroyWindow32( HWND32 hwnd )
 	    }
             siblingPtr = siblingPtr->next;
         }
-        if (siblingPtr) DestroyWindow32( siblingPtr->hwndSelf );
+        if (siblingPtr) DestroyWindow( siblingPtr->hwndSelf );
         else break;
       }
 
@@ -1151,7 +1151,7 @@ BOOL32 WINAPI DestroyWindow32( HWND32 hwnd )
       /* Send destroy messages */
 
     WIN_SendDestroyMsg( wndPtr );
-    if (!IsWindow32(hwnd)) return TRUE;
+    if (!IsWindow(hwnd)) return TRUE;
 
       /* Unlink now so we won't bother with the children later on */
 
@@ -1169,18 +1169,18 @@ BOOL32 WINAPI DestroyWindow32( HWND32 hwnd )
  */
 BOOL16 WINAPI CloseWindow16( HWND16 hwnd )
 {
-    return CloseWindow32( hwnd );
+    return CloseWindow( hwnd );
 }
 
  
 /***********************************************************************
  *           CloseWindow32   (USER32.56)
  */
-BOOL32 WINAPI CloseWindow32( HWND32 hwnd )
+BOOL WINAPI CloseWindow( HWND hwnd )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     if (!wndPtr || (wndPtr->dwStyle & WS_CHILD)) return FALSE;
-    ShowWindow32( hwnd, SW_MINIMIZE );
+    ShowWindow( hwnd, SW_MINIMIZE );
     return TRUE;
 }
 
@@ -1190,17 +1190,17 @@ BOOL32 WINAPI CloseWindow32( HWND32 hwnd )
  */
 BOOL16 WINAPI OpenIcon16( HWND16 hwnd )
 {
-    return OpenIcon32( hwnd );
+    return OpenIcon( hwnd );
 }
 
 
 /***********************************************************************
  *           OpenIcon32   (USER32.410)
  */
-BOOL32 WINAPI OpenIcon32( HWND32 hwnd )
+BOOL WINAPI OpenIcon( HWND hwnd )
 {
-    if (!IsIconic32( hwnd )) return FALSE;
-    ShowWindow32( hwnd, SW_SHOWNORMAL );
+    if (!IsIconic( hwnd )) return FALSE;
+    ShowWindow( hwnd, SW_SHOWNORMAL );
     return TRUE;
 }
 
@@ -1210,7 +1210,7 @@ BOOL32 WINAPI OpenIcon32( HWND32 hwnd )
  *
  * Implementation of FindWindow() and FindWindowEx().
  */
-static HWND32 WIN_FindWindow( HWND32 parent, HWND32 child, ATOM className,
+static HWND WIN_FindWindow( HWND parent, HWND child, ATOM className,
                               LPCSTR title )
 {
     WND *pWnd;
@@ -1298,9 +1298,9 @@ HWND16 WINAPI FindWindowEx16( HWND16 parent, HWND16 child,
 /***********************************************************************
  *           FindWindow32A   (USER32.198)
  */
-HWND32 WINAPI FindWindow32A( LPCSTR className, LPCSTR title )
+HWND WINAPI FindWindowA( LPCSTR className, LPCSTR title )
 {
-    HWND32 ret = FindWindowEx32A( 0, 0, className, title );
+    HWND ret = FindWindowExA( 0, 0, className, title );
     if (!ret) SetLastError (ERROR_CANNOT_FIND_WND_CLASS);
     return ret;
 }
@@ -1309,7 +1309,7 @@ HWND32 WINAPI FindWindow32A( LPCSTR className, LPCSTR title )
 /***********************************************************************
  *           FindWindowEx32A   (USER32.199)
  */
-HWND32 WINAPI FindWindowEx32A( HWND32 parent, HWND32 child,
+HWND WINAPI FindWindowExA( HWND parent, HWND child,
                                LPCSTR className, LPCSTR title )
 {
     ATOM atom = 0;
@@ -1318,7 +1318,7 @@ HWND32 WINAPI FindWindowEx32A( HWND32 parent, HWND32 child,
     {
         /* If the atom doesn't exist, then no class */
         /* with this name exists either. */
-        if (!(atom = GlobalFindAtom32A( className ))) 
+        if (!(atom = GlobalFindAtomA( className ))) 
         {
             SetLastError (ERROR_CANNOT_FIND_WND_CLASS);
             return 0;
@@ -1331,18 +1331,18 @@ HWND32 WINAPI FindWindowEx32A( HWND32 parent, HWND32 child,
 /***********************************************************************
  *           FindWindowEx32W   (USER32.200)
  */
-HWND32 WINAPI FindWindowEx32W( HWND32 parent, HWND32 child,
+HWND WINAPI FindWindowExW( HWND parent, HWND child,
                                LPCWSTR className, LPCWSTR title )
 {
     ATOM atom = 0;
     char *buffer;
-    HWND32 hwnd;
+    HWND hwnd;
 
     if (className)
     {
         /* If the atom doesn't exist, then no class */
         /* with this name exists either. */
-        if (!(atom = GlobalFindAtom32W( className )))
+        if (!(atom = GlobalFindAtomW( className )))
         {
             SetLastError (ERROR_CANNOT_FIND_WND_CLASS);
             return 0;
@@ -1358,9 +1358,9 @@ HWND32 WINAPI FindWindowEx32W( HWND32 parent, HWND32 child,
 /***********************************************************************
  *           FindWindow32W   (USER32.201)
  */
-HWND32 WINAPI FindWindow32W( LPCWSTR className, LPCWSTR title )
+HWND WINAPI FindWindowW( LPCWSTR className, LPCWSTR title )
 {
-    return FindWindowEx32W( 0, 0, className, title );
+    return FindWindowExW( 0, 0, className, title );
 }
 
 
@@ -1385,7 +1385,7 @@ HWND16 WINAPI GetDesktopWindow16(void)
 /**********************************************************************
  *           GetDesktopWindow32   (USER32.232)
  */
-HWND32 WINAPI GetDesktopWindow32(void)
+HWND WINAPI GetDesktopWindow(void)
 {
     return pWndDesktop->hwndSelf;
 }
@@ -1397,7 +1397,7 @@ HWND32 WINAPI GetDesktopWindow32(void)
  * Exactly the same thing as GetDesktopWindow(), but not documented.
  * Don't ask me why...
  */
-HWND16 WINAPI GetDesktopHwnd(void)
+HWND16 WINAPI GetDesktopHwnd16(void)
 {
     return (HWND16)pWndDesktop->hwndSelf;
 }
@@ -1408,14 +1408,14 @@ HWND16 WINAPI GetDesktopHwnd(void)
  */
 BOOL16 WINAPI EnableWindow16( HWND16 hwnd, BOOL16 enable )
 {
-    return EnableWindow32( hwnd, enable );
+    return EnableWindow( hwnd, enable );
 }
 
 
 /*******************************************************************
  *           EnableWindow32   (USER32.172)
  */
-BOOL32 WINAPI EnableWindow32( HWND32 hwnd, BOOL32 enable )
+BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable )
 {
     WND *wndPtr;
 
@@ -1426,22 +1426,22 @@ BOOL32 WINAPI EnableWindow32( HWND32 hwnd, BOOL32 enable )
     {
 	  /* Enable window */
 	wndPtr->dwStyle &= ~WS_DISABLED;
-	SendMessage32A( hwnd, WM_ENABLE, TRUE, 0 );
+	SendMessageA( hwnd, WM_ENABLE, TRUE, 0 );
 	return TRUE;
     }
     else if (!enable && !(wndPtr->dwStyle & WS_DISABLED))
     {
 	  /* Disable window */
 	wndPtr->dwStyle |= WS_DISABLED;
-	if ((hwnd == GetFocus32()) || IsChild32( hwnd, GetFocus32() ))
+	if ((hwnd == GetFocus()) || IsChild( hwnd, GetFocus() ))
         {
-	    SetFocus32( 0 );  /* A disabled window can't have the focus */
+	    SetFocus( 0 );  /* A disabled window can't have the focus */
         }
-	if ((hwnd == GetCapture32()) || IsChild32( hwnd, GetCapture32() ))
+	if ((hwnd == GetCapture()) || IsChild( hwnd, GetCapture() ))
         {
 	    ReleaseCapture();  /* A disabled window can't capture the mouse */
         }
-	SendMessage32A( hwnd, WM_ENABLE, FALSE, 0 );
+	SendMessageA( hwnd, WM_ENABLE, FALSE, 0 );
 	return FALSE;
     }
     return ((wndPtr->dwStyle & WS_DISABLED) != 0);
@@ -1453,14 +1453,14 @@ BOOL32 WINAPI EnableWindow32( HWND32 hwnd, BOOL32 enable )
  */ 
 BOOL16 WINAPI IsWindowEnabled16(HWND16 hWnd)
 {
-    return IsWindowEnabled32(hWnd);
+    return IsWindowEnabled(hWnd);
 }
 
 
 /***********************************************************************
  *           IsWindowEnabled32   (USER32.349)
  */ 
-BOOL32 WINAPI IsWindowEnabled32(HWND32 hWnd)
+BOOL WINAPI IsWindowEnabled(HWND hWnd)
 {
     WND * wndPtr; 
 
@@ -1472,7 +1472,7 @@ BOOL32 WINAPI IsWindowEnabled32(HWND32 hWnd)
 /***********************************************************************
  *           IsWindowUnicode   (USER32.350)
  */
-BOOL32 WINAPI IsWindowUnicode( HWND32 hwnd )
+BOOL WINAPI IsWindowUnicode( HWND hwnd )
 {
     WND * wndPtr; 
 
@@ -1486,14 +1486,14 @@ BOOL32 WINAPI IsWindowUnicode( HWND32 hwnd )
  */
 WORD WINAPI GetWindowWord16( HWND16 hwnd, INT16 offset )
 {
-    return GetWindowWord32( hwnd, offset );
+    return GetWindowWord( hwnd, offset );
 }
 
 
 /**********************************************************************
  *	     GetWindowWord32    (USER32.314)
  */
-WORD WINAPI GetWindowWord32( HWND32 hwnd, INT32 offset )
+WORD WINAPI GetWindowWord( HWND hwnd, INT offset )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     if (!wndPtr) return 0;
@@ -1514,7 +1514,7 @@ WORD WINAPI GetWindowWord32( HWND32 hwnd, INT32 offset )
                     wndPtr->wIDmenu);
     	return (WORD)wndPtr->wIDmenu;
     case GWW_HWNDPARENT: 
-    	return GetParent32( hwnd );
+    	return GetParent( hwnd );
     case GWW_HINSTANCE:  
     	if (HIWORD(wndPtr->hInstance))
     		WARN(win,"GWW_HINSTANCE: discards high bits of 0x%08x!\n",
@@ -1530,10 +1530,10 @@ WORD WINAPI GetWindowWord32( HWND32 hwnd, INT32 offset )
 /**********************************************************************
  *	     WIN_GetWindowInstance
  */
-HINSTANCE32 WIN_GetWindowInstance( HWND32 hwnd )
+HINSTANCE WIN_GetWindowInstance( HWND hwnd )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
-    if (!wndPtr) return (HINSTANCE32)0;
+    if (!wndPtr) return (HINSTANCE)0;
     return wndPtr->hInstance;
 }
 
@@ -1543,14 +1543,14 @@ HINSTANCE32 WIN_GetWindowInstance( HWND32 hwnd )
  */
 WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval )
 {
-    return SetWindowWord32( hwnd, offset, newval );
+    return SetWindowWord( hwnd, offset, newval );
 }
 
 
 /**********************************************************************
  *	     SetWindowWord32    (USER32.524)
  */
-WORD WINAPI SetWindowWord32( HWND32 hwnd, INT32 offset, WORD newval )
+WORD WINAPI SetWindowWord( HWND hwnd, INT offset, WORD newval )
 {
     WORD *ptr, retval;
     WND * wndPtr = WIN_FindWndPtr( hwnd );
@@ -1568,7 +1568,7 @@ WORD WINAPI SetWindowWord32( HWND32 hwnd, INT32 offset, WORD newval )
     {
 	case GWW_ID:        ptr = (WORD *)&wndPtr->wIDmenu; break;
 	case GWW_HINSTANCE: ptr = (WORD *)&wndPtr->hInstance; break;
-	case GWW_HWNDPARENT: return SetParent32( hwnd, newval );
+	case GWW_HWNDPARENT: return SetParent( hwnd, newval );
 	default:
             WARN( win, "Invalid offset %d\n", offset );
             return 0;
@@ -1584,7 +1584,7 @@ WORD WINAPI SetWindowWord32( HWND32 hwnd, INT32 offset, WORD newval )
  *
  * Helper function for GetWindowLong().
  */
-static LONG WIN_GetWindowLong( HWND32 hwnd, INT32 offset, WINDOWPROCTYPE type )
+static LONG WIN_GetWindowLong( HWND hwnd, INT offset, WINDOWPROCTYPE type )
 {
     LONG retval;
     WND * wndPtr = WIN_FindWndPtr( hwnd );
@@ -1610,7 +1610,7 @@ static LONG WIN_GetWindowLong( HWND32 hwnd, INT32 offset, WINDOWPROCTYPE type )
         case GWL_ID:         return (LONG)wndPtr->wIDmenu;
         case GWL_WNDPROC:    return (LONG)WINPROC_GetProc( wndPtr->winproc,
                                                            type );
-        case GWL_HWNDPARENT: return GetParent32(hwnd);
+        case GWL_HWNDPARENT: return GetParent(hwnd);
         case GWL_HINSTANCE:  return wndPtr->hInstance;
         default:
             WARN( win, "Unknown offset %d\n", offset );
@@ -1630,7 +1630,7 @@ static LONG WIN_GetWindowLong( HWND32 hwnd, INT32 offset, WINDOWPROCTYPE type )
  * FIXME: The error values for SetLastError may not be right. Can
  *        someone check with the real thing?
  */
-static LONG WIN_SetWindowLong( HWND32 hwnd, INT32 offset, LONG newval,
+static LONG WIN_SetWindowLong( HWND hwnd, INT offset, LONG newval,
                                WINDOWPROCTYPE type )
 {
     LONG *ptr, retval;
@@ -1673,7 +1673,7 @@ static LONG WIN_SetWindowLong( HWND32 hwnd, INT32 offset, LONG newval,
 		ptr = (DWORD*)&wndPtr->wIDmenu;
 		break;
 	case GWL_HINSTANCE:
-		return SetWindowWord32( hwnd, offset, newval );
+		return SetWindowWord( hwnd, offset, newval );
 	case GWL_WNDPROC:
 					retval = (LONG)WINPROC_GetProc( wndPtr->winproc, type );
 		WINPROC_SetProc( &wndPtr->winproc, (WNDPROC16)newval, 
@@ -1685,10 +1685,10 @@ static LONG WIN_SetWindowLong( HWND32 hwnd, INT32 offset, LONG newval,
 		style.styleNew = newval | (style.styleOld & (WS_VISIBLE | WS_CHILD));
 
 		if (wndPtr->flags & WIN_ISWIN32)
-			SendMessage32A(hwnd,WM_STYLECHANGING,GWL_STYLE,(LPARAM)&style);
+			SendMessageA(hwnd,WM_STYLECHANGING,GWL_STYLE,(LPARAM)&style);
 		wndPtr->dwStyle = style.styleNew;
 		if (wndPtr->flags & WIN_ISWIN32)
-			SendMessage32A(hwnd,WM_STYLECHANGED,GWL_STYLE,(LPARAM)&style);
+			SendMessageA(hwnd,WM_STYLECHANGED,GWL_STYLE,(LPARAM)&style);
 		return style.styleOld;
 		    
         case GWL_USERDATA: 
@@ -1698,10 +1698,10 @@ static LONG WIN_SetWindowLong( HWND32 hwnd, INT32 offset, LONG newval,
 	        style.styleOld = wndPtr->dwExStyle;
 		style.styleNew = newval;
 		if (wndPtr->flags & WIN_ISWIN32)
-			SendMessage32A(hwnd,WM_STYLECHANGING,GWL_EXSTYLE,(LPARAM)&style);
+			SendMessageA(hwnd,WM_STYLECHANGING,GWL_EXSTYLE,(LPARAM)&style);
 		wndPtr->dwExStyle = newval;
 		if (wndPtr->flags & WIN_ISWIN32)
-			SendMessage32A(hwnd,WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&style);
+			SendMessageA(hwnd,WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&style);
 		return style.styleOld;
 
 	default:
@@ -1723,14 +1723,14 @@ static LONG WIN_SetWindowLong( HWND32 hwnd, INT32 offset, LONG newval,
  */
 LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset )
 {
-    return WIN_GetWindowLong( (HWND32)hwnd, offset, WIN_PROC_16 );
+    return WIN_GetWindowLong( (HWND)hwnd, offset, WIN_PROC_16 );
 }
 
 
 /**********************************************************************
  *	     GetWindowLong32A    (USER32.305)
  */
-LONG WINAPI GetWindowLong32A( HWND32 hwnd, INT32 offset )
+LONG WINAPI GetWindowLongA( HWND hwnd, INT offset )
 {
     return WIN_GetWindowLong( hwnd, offset, WIN_PROC_32A );
 }
@@ -1739,7 +1739,7 @@ LONG WINAPI GetWindowLong32A( HWND32 hwnd, INT32 offset )
 /**********************************************************************
  *	     GetWindowLong32W    (USER32.306)
  */
-LONG WINAPI GetWindowLong32W( HWND32 hwnd, INT32 offset )
+LONG WINAPI GetWindowLongW( HWND hwnd, INT offset )
 {
     return WIN_GetWindowLong( hwnd, offset, WIN_PROC_32W );
 }
@@ -1757,7 +1757,7 @@ LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval )
 /**********************************************************************
  *	     SetWindowLong32A    (USER32.517)
  */
-LONG WINAPI SetWindowLong32A( HWND32 hwnd, INT32 offset, LONG newval )
+LONG WINAPI SetWindowLongA( HWND hwnd, INT offset, LONG newval )
 {
     return WIN_SetWindowLong( hwnd, offset, newval, WIN_PROC_32A );
 }
@@ -1838,9 +1838,9 @@ LONG WINAPI SetWindowLong32A( HWND32 hwnd, INT32 offset, LONG newval )
  * ECMA-234, Win32 
  *
  */
-LONG WINAPI SetWindowLong32W( 
-    HWND32 hwnd, /* window to alter */
-    INT32 offset, /* offset, in bytes, of location to alter */
+LONG WINAPI SetWindowLongW( 
+    HWND hwnd, /* window to alter */
+    INT offset, /* offset, in bytes, of location to alter */
     LONG newval  /* new value of location */
 ) {
     return WIN_SetWindowLong( hwnd, offset, newval, WIN_PROC_32W );
@@ -1859,28 +1859,28 @@ INT16 WINAPI GetWindowText16( HWND16 hwnd, SEGPTR lpString, INT16 nMaxCount )
 /*******************************************************************
  *	     GetWindowText32A    (USER32.309)
  */
-INT32 WINAPI GetWindowText32A( HWND32 hwnd, LPSTR lpString, INT32 nMaxCount )
+INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount )
 {
-    return (INT32)SendMessage32A( hwnd, WM_GETTEXT, nMaxCount,
+    return (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount,
                                   (LPARAM)lpString );
 }
 
 /*******************************************************************
  *	     InternalGetWindowText    (USER32.326)
  */
-INT32 WINAPI InternalGetWindowText(HWND32 hwnd,LPWSTR lpString,INT32 nMaxCount )
+INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount )
 {
     FIXME(win,"(0x%08x,%p,0x%x),stub!\n",hwnd,lpString,nMaxCount);
-    return GetWindowText32W(hwnd,lpString,nMaxCount);
+    return GetWindowTextW(hwnd,lpString,nMaxCount);
 }
 
 
 /*******************************************************************
  *	     GetWindowText32W    (USER32.312)
  */
-INT32 WINAPI GetWindowText32W( HWND32 hwnd, LPWSTR lpString, INT32 nMaxCount )
+INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount )
 {
-    return (INT32)SendMessage32W( hwnd, WM_GETTEXT, nMaxCount,
+    return (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount,
                                   (LPARAM)lpString );
 }
 
@@ -1897,18 +1897,18 @@ BOOL16 WINAPI SetWindowText16( HWND16 hwnd, SEGPTR lpString )
 /*******************************************************************
  *	     SetWindowText32A    (USER32.521)
  */
-BOOL32 WINAPI SetWindowText32A( HWND32 hwnd, LPCSTR lpString )
+BOOL WINAPI SetWindowTextA( HWND hwnd, LPCSTR lpString )
 {
-    return (BOOL32)SendMessage32A( hwnd, WM_SETTEXT, 0, (LPARAM)lpString );
+    return (BOOL)SendMessageA( hwnd, WM_SETTEXT, 0, (LPARAM)lpString );
 }
 
 
 /*******************************************************************
  *	     SetWindowText32W    (USER32.523)
  */
-BOOL32 WINAPI SetWindowText32W( HWND32 hwnd, LPCWSTR lpString )
+BOOL WINAPI SetWindowTextW( HWND hwnd, LPCWSTR lpString )
 {
-    return (BOOL32)SendMessage32W( hwnd, WM_SETTEXT, 0, (LPARAM)lpString );
+    return (BOOL)SendMessageW( hwnd, WM_SETTEXT, 0, (LPARAM)lpString );
 }
 
 
@@ -1924,17 +1924,17 @@ INT16 WINAPI GetWindowTextLength16( HWND16 hwnd )
 /*******************************************************************
  *         GetWindowTextLength32A   (USER32.310)
  */
-INT32 WINAPI GetWindowTextLength32A( HWND32 hwnd )
+INT WINAPI GetWindowTextLengthA( HWND hwnd )
 {
-    return SendMessage32A( hwnd, WM_GETTEXTLENGTH, 0, 0 );
+    return SendMessageA( hwnd, WM_GETTEXTLENGTH, 0, 0 );
 }
 
 /*******************************************************************
  *         GetWindowTextLength32W   (USER32.311)
  */
-INT32 WINAPI GetWindowTextLength32W( HWND32 hwnd )
+INT WINAPI GetWindowTextLengthW( HWND hwnd )
 {
-    return SendMessage32W( hwnd, WM_GETTEXTLENGTH, 0, 0 );
+    return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 );
 }
 
 
@@ -1943,7 +1943,7 @@ INT32 WINAPI GetWindowTextLength32W( HWND32 hwnd )
  */
 BOOL16 WINAPI IsWindow16( HWND16 hwnd )
 {
-    return IsWindow32( hwnd );
+    return IsWindow( hwnd );
 }
 
 void WINAPI WIN16_IsWindow16( CONTEXT *context )
@@ -1951,7 +1951,7 @@ void WINAPI WIN16_IsWindow16( CONTEXT *context )
     WORD *stack = PTR_SEG_OFF_TO_LIN(SS_reg(context), SP_reg(context));
     HWND16 hwnd = (HWND16)stack[2];
 
-    AX_reg(context) = IsWindow32( hwnd );
+    AX_reg(context) = IsWindow( hwnd );
     ES_reg(context) = USER_HeapSel;
 }
 
@@ -1959,7 +1959,7 @@ void WINAPI WIN16_IsWindow16( CONTEXT *context )
 /*******************************************************************
  *         IsWindow32   (USER32.348)
  */
-BOOL32 WINAPI IsWindow32( HWND32 hwnd )
+BOOL WINAPI IsWindow( HWND hwnd )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     return ((wndPtr != NULL) && (wndPtr->dwMagic == WND_MAGIC));
@@ -1971,14 +1971,14 @@ BOOL32 WINAPI IsWindow32( HWND32 hwnd )
  */
 HWND16 WINAPI GetParent16( HWND16 hwnd )
 {
-    return (HWND16)GetParent32( hwnd );
+    return (HWND16)GetParent( hwnd );
 }
 
 
 /*****************************************************************
  *         GetParent32   (USER32.278)
  */
-HWND32 WINAPI GetParent32( HWND32 hwnd )
+HWND WINAPI GetParent( HWND hwnd )
 {
     WND *wndPtr = WIN_FindWndPtr(hwnd);
     if ((!wndPtr) || (!(wndPtr->dwStyle & (WS_POPUP|WS_CHILD)))) return 0;
@@ -2002,7 +2002,7 @@ WND* WIN_GetTopParentPtr( WND* pWnd )
  *
  * Get the top-level parent for a child window.
  */
-HWND32 WIN_GetTopParent( HWND32 hwnd )
+HWND WIN_GetTopParent( HWND hwnd )
 {
     WND *wndPtr = WIN_GetTopParentPtr ( WIN_FindWndPtr( hwnd ) );
     return wndPtr ? wndPtr->hwndSelf : 0;
@@ -2014,14 +2014,14 @@ HWND32 WIN_GetTopParent( HWND32 hwnd )
  */
 HWND16 WINAPI SetParent16( HWND16 hwndChild, HWND16 hwndNewParent )
 {
-    return SetParent32( hwndChild, hwndNewParent );
+    return SetParent( hwndChild, hwndNewParent );
 }
 
 
 /*****************************************************************
  *         SetParent32   (USER32.495)
  */
-HWND32 WINAPI SetParent32( HWND32 hwndChild, HWND32 hwndNewParent )
+HWND WINAPI SetParent( HWND hwndChild, HWND hwndNewParent )
 {
   WND *wndPtr = WIN_FindWndPtr( hwndChild );
   DWORD dwStyle = (wndPtr)?(wndPtr->dwStyle):0;
@@ -2032,7 +2032,7 @@ HWND32 WINAPI SetParent32( HWND32 hwndChild, HWND32 hwndNewParent )
   /* Windows hides the window first, then shows it again
    * including the WM_SHOWWINDOW messages and all */
   if (dwStyle & WS_VISIBLE)
-      ShowWindow32( hwndChild, SW_HIDE );
+      ShowWindow( hwndChild, SW_HIDE );
 
   pWndOldParent = (wndPtr)?(*wndPtr->pDriver->pSetParent)(wndPtr, pWndNewParent):NULL;
 
@@ -2040,7 +2040,7 @@ HWND32 WINAPI SetParent32( HWND32 hwndChild, HWND32 hwndNewParent )
      in the x-order and send the expected WM_WINDOWPOSCHANGING and
      WM_WINDOWPOSCHANGED notification messages. 
   */
-  SetWindowPos32( hwndChild, HWND_TOPMOST, 0, 0, 0, 0,
+  SetWindowPos( hwndChild, HWND_TOPMOST, 0, 0, 0, 0,
       SWP_NOMOVE|SWP_NOSIZE|((dwStyle & WS_VISIBLE)?SWP_SHOWWINDOW:0));
   /* FIXME: a WM_MOVE is also generated (in the DefWindowProc handler
    * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE */
@@ -2053,14 +2053,14 @@ HWND32 WINAPI SetParent32( HWND32 hwndChild, HWND32 hwndNewParent )
  */
 BOOL16 WINAPI IsChild16( HWND16 parent, HWND16 child )
 {
-    return IsChild32(parent,child);
+    return IsChild(parent,child);
 }
 
 
 /*******************************************************************
  *         IsChild32    (USER32.339)
  */
-BOOL32 WINAPI IsChild32( HWND32 parent, HWND32 child )
+BOOL WINAPI IsChild( HWND parent, HWND child )
 {
     WND * wndPtr = WIN_FindWndPtr( child );
     while (wndPtr && (wndPtr->dwStyle & WS_CHILD))
@@ -2077,14 +2077,14 @@ BOOL32 WINAPI IsChild32( HWND32 parent, HWND32 child )
  */
 BOOL16 WINAPI IsWindowVisible16( HWND16 hwnd )
 {
-    return IsWindowVisible32(hwnd);
+    return IsWindowVisible(hwnd);
 }
 
 
 /***********************************************************************
  *           IsWindowVisible32   (USER32.351)
  */
-BOOL32 WINAPI IsWindowVisible32( HWND32 hwnd )
+BOOL WINAPI IsWindowVisible( HWND hwnd )
 {
     WND *wndPtr = WIN_FindWndPtr( hwnd );
     while (wndPtr && (wndPtr->dwStyle & WS_CHILD))
@@ -2103,7 +2103,7 @@ BOOL32 WINAPI IsWindowVisible32( HWND32 hwnd )
  * minimized, and it is itself not minimized unless we are
  * trying to draw its default class icon.
  */
-BOOL32 WIN_IsWindowDrawable( WND* wnd, BOOL32 icon )
+BOOL WIN_IsWindowDrawable( WND* wnd, BOOL icon )
 {
   if( (wnd->dwStyle & WS_MINIMIZE &&
        icon && wnd->class->hIcon) ||
@@ -2120,14 +2120,14 @@ BOOL32 WIN_IsWindowDrawable( WND* wnd, BOOL32 icon )
  */
 HWND16 WINAPI GetTopWindow16( HWND16 hwnd )
 {
-    return GetTopWindow32(hwnd);
+    return GetTopWindow(hwnd);
 }
 
 
 /*******************************************************************
  *         GetTopWindow32    (USER.229)
  */
-HWND32 WINAPI GetTopWindow32( HWND32 hwnd )
+HWND WINAPI GetTopWindow( HWND hwnd )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     if (wndPtr && wndPtr->child) return wndPtr->child->hwndSelf;
@@ -2140,14 +2140,14 @@ HWND32 WINAPI GetTopWindow32( HWND32 hwnd )
  */
 HWND16 WINAPI GetWindow16( HWND16 hwnd, WORD rel )
 {
-    return GetWindow32( hwnd,rel );
+    return GetWindow( hwnd,rel );
 }
 
 
 /*******************************************************************
  *         GetWindow32    (USER32.302)
  */
-HWND32 WINAPI GetWindow32( HWND32 hwnd, WORD rel )
+HWND WINAPI GetWindow( HWND hwnd, WORD rel )
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     if (!wndPtr) return 0;
@@ -2201,21 +2201,21 @@ HWND16 WINAPI GetNextWindow16( HWND16 hwnd, WORD flag )
  */
 void WINAPI ShowOwnedPopups16( HWND16 owner, BOOL16 fShow )
 {
-    ShowOwnedPopups32( owner, fShow );
+    ShowOwnedPopups( owner, fShow );
 }
 
 
 /*******************************************************************
  *         ShowOwnedPopups32  (USER32.531)
  */
-BOOL32 WINAPI ShowOwnedPopups32( HWND32 owner, BOOL32 fShow )
+BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL fShow )
 {
     WND *pWnd = pWndDesktop->child;
     while (pWnd)
     {
         if (pWnd->owner && (pWnd->owner->hwndSelf == owner) &&
             (pWnd->dwStyle & WS_POPUP))
-            ShowWindow32( pWnd->hwndSelf, fShow ? SW_SHOW : SW_HIDE );
+            ShowWindow( pWnd->hwndSelf, fShow ? SW_SHOW : SW_HIDE );
         pWnd = pWnd->next;
     }
     return TRUE;
@@ -2227,13 +2227,13 @@ BOOL32 WINAPI ShowOwnedPopups32( HWND32 owner, BOOL32 fShow )
  */
 HWND16 WINAPI GetLastActivePopup16( HWND16 hwnd )
 {
-    return GetLastActivePopup32( hwnd );
+    return GetLastActivePopup( hwnd );
 }
 
 /*******************************************************************
  *         GetLastActivePopup32   (USER32.256)
  */
-HWND32 WINAPI GetLastActivePopup32( HWND32 hwnd )
+HWND WINAPI GetLastActivePopup( HWND hwnd )
 {
     WND *wndPtr;
     wndPtr = WIN_FindWndPtr(hwnd);
@@ -2249,11 +2249,11 @@ HWND32 WINAPI GetLastActivePopup32( HWND32 hwnd )
  * The array must be freed with HeapFree(SystemHeap). Return NULL
  * when no windows are found.
  */
-WND **WIN_BuildWinArray( WND *wndPtr, UINT32 bwaFlags, UINT32* pTotal )
+WND **WIN_BuildWinArray( WND *wndPtr, UINT bwaFlags, UINT* pTotal )
 {
     WND **list, **ppWnd;
     WND *pWnd;
-    UINT32 count, skipOwned, skipHidden;
+    UINT count, skipOwned, skipHidden;
     DWORD skipFlags;
 
     skipHidden = bwaFlags & BWA_SKIPHIDDEN;
@@ -2313,7 +2313,7 @@ BOOL16 WINAPI EnumWindows16( WNDENUMPROC16 lpEnumFunc, LPARAM lParam )
     for (ppWnd = list; *ppWnd; ppWnd++)
     {
         /* Make sure that the window still exists */
-        if (!IsWindow32((*ppWnd)->hwndSelf)) continue;
+        if (!IsWindow((*ppWnd)->hwndSelf)) continue;
         if (!lpEnumFunc( (*ppWnd)->hwndSelf, lParam )) break;
     }
     HeapFree( SystemHeap, 0, list );
@@ -2324,9 +2324,9 @@ BOOL16 WINAPI EnumWindows16( WNDENUMPROC16 lpEnumFunc, LPARAM lParam )
 /*******************************************************************
  *           EnumWindows32   (USER32.193)
  */
-BOOL32 WINAPI EnumWindows32( WNDENUMPROC32 lpEnumFunc, LPARAM lParam )
+BOOL WINAPI EnumWindows( WNDENUMPROC lpEnumFunc, LPARAM lParam )
 {
-    return (BOOL32)EnumWindows16( (WNDENUMPROC16)lpEnumFunc, lParam );
+    return (BOOL)EnumWindows16( (WNDENUMPROC16)lpEnumFunc, lParam );
 }
 
 
@@ -2348,7 +2348,7 @@ BOOL16 WINAPI EnumTaskWindows16( HTASK16 hTask, WNDENUMPROC16 func,
     for (ppWnd = list; *ppWnd; ppWnd++)
     {
         /* Make sure that the window still exists */
-        if (!IsWindow32((*ppWnd)->hwndSelf)) continue;
+        if (!IsWindow((*ppWnd)->hwndSelf)) continue;
         if (QUEUE_GetQueueTask((*ppWnd)->hmemTaskQ) != hTask) continue;
         if (!func( (*ppWnd)->hwndSelf, lParam )) break;
     }
@@ -2360,7 +2360,7 @@ BOOL16 WINAPI EnumTaskWindows16( HTASK16 hTask, WNDENUMPROC16 func,
 /**********************************************************************
  *           EnumThreadWindows   (USER32.190)
  */
-BOOL32 WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC32 func, LPARAM lParam )
+BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam )
 {
     THDB	*tdb = THREAD_ID_TO_THDB(id);
 
@@ -2382,7 +2382,7 @@ static BOOL16 WIN_EnumChildWindows( WND **ppWnd, WNDENUMPROC16 func,
     for ( ; *ppWnd; ppWnd++)
     {
         /* Make sure that the window still exists */
-        if (!IsWindow32((*ppWnd)->hwndSelf)) continue;
+        if (!IsWindow((*ppWnd)->hwndSelf)) continue;
         /* Build children list first */
         childList = WIN_BuildWinArray( *ppWnd, BWA_SKIPOWNED, NULL );
         ret = func( (*ppWnd)->hwndSelf, lParam );
@@ -2416,10 +2416,10 @@ BOOL16 WINAPI EnumChildWindows16( HWND16 parent, WNDENUMPROC16 func,
 /**********************************************************************
  *           EnumChildWindows32   (USER32.178)
  */
-BOOL32 WINAPI EnumChildWindows32( HWND32 parent, WNDENUMPROC32 func,
+BOOL WINAPI EnumChildWindows( HWND parent, WNDENUMPROC func,
                                   LPARAM lParam )
 {
-    return (BOOL32)EnumChildWindows16( (HWND16)parent, (WNDENUMPROC16)func,
+    return (BOOL)EnumChildWindows16( (HWND16)parent, (WNDENUMPROC16)func,
                                        lParam );
 }
 
@@ -2429,14 +2429,14 @@ BOOL32 WINAPI EnumChildWindows32( HWND32 parent, WNDENUMPROC32 func,
  */
 BOOL16 WINAPI AnyPopup16(void)
 {
-    return AnyPopup32();
+    return AnyPopup();
 }
 
 
 /*******************************************************************
  *           AnyPopup32   (USER32.4)
  */
-BOOL32 WINAPI AnyPopup32(void)
+BOOL WINAPI AnyPopup(void)
 {
     WND *wndPtr;
     for (wndPtr = pWndDesktop->child; wndPtr; wndPtr = wndPtr->next)
@@ -2450,14 +2450,14 @@ BOOL32 WINAPI AnyPopup32(void)
  */
 BOOL16 WINAPI FlashWindow16( HWND16 hWnd, BOOL16 bInvert )
 {
-    return FlashWindow32( hWnd, bInvert );
+    return FlashWindow( hWnd, bInvert );
 }
 
 
 /*******************************************************************
  *            FlashWindow32   (USER32.202)
  */
-BOOL32 WINAPI FlashWindow32( HWND32 hWnd, BOOL32 bInvert )
+BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert )
 {
     WND *wndPtr = WIN_FindWndPtr(hWnd);
 
@@ -2469,12 +2469,12 @@ BOOL32 WINAPI FlashWindow32( HWND32 hWnd, BOOL32 bInvert )
     {
         if (bInvert && !(wndPtr->flags & WIN_NCACTIVATED))
         {
-            HDC32 hDC = GetDC32(hWnd);
+            HDC hDC = GetDC(hWnd);
             
             if (!SendMessage16( hWnd, WM_ERASEBKGND, (WPARAM16)hDC, 0 ))
                 wndPtr->flags |= WIN_NEEDS_ERASEBKGND;
             
-            ReleaseDC32( hWnd, hDC );
+            ReleaseDC( hWnd, hDC );
             wndPtr->flags |= WIN_NCACTIVATED;
         }
         else
@@ -2489,7 +2489,7 @@ BOOL32 WINAPI FlashWindow32( HWND32 hWnd, BOOL32 bInvert )
     {
         WPARAM16 wparam;
         if (bInvert) wparam = !(wndPtr->flags & WIN_NCACTIVATED);
-        else wparam = (hWnd == GetActiveWindow32());
+        else wparam = (hWnd == GetActiveWindow());
 
         SendMessage16( hWnd, WM_NCACTIVATE, wparam, (LPARAM)0 );
         return wparam;
@@ -2502,7 +2502,7 @@ BOOL32 WINAPI FlashWindow32( HWND32 hWnd, BOOL32 bInvert )
  */
 HWND16 WINAPI SetSysModalWindow16( HWND16 hWnd )
 {
-    HWND32 hWndOldModal = hwndSysModal;
+    HWND hWndOldModal = hwndSysModal;
     hwndSysModal = hWnd;
     FIXME(win, "EMPTY STUB !! SetSysModalWindow(%04x) !\n", hWnd);
     return hWndOldModal;
@@ -2521,7 +2521,7 @@ HWND16 WINAPI GetSysModalWindow16(void)
 /*******************************************************************
  *           GetWindowContextHelpId   (USER32.303)
  */
-DWORD WINAPI GetWindowContextHelpId( HWND32 hwnd )
+DWORD WINAPI GetWindowContextHelpId( HWND hwnd )
 {
     WND *wnd = WIN_FindWndPtr( hwnd );
     if (!wnd) return 0;
@@ -2532,7 +2532,7 @@ DWORD WINAPI GetWindowContextHelpId( HWND32 hwnd )
 /*******************************************************************
  *           SetWindowContextHelpId   (USER32.515)
  */
-BOOL32 WINAPI SetWindowContextHelpId( HWND32 hwnd, DWORD id )
+BOOL WINAPI SetWindowContextHelpId( HWND hwnd, DWORD id )
 {
     WND *wnd = WIN_FindWndPtr( hwnd );
     if (!wnd) return FALSE;
@@ -2547,21 +2547,21 @@ BOOL32 WINAPI SetWindowContextHelpId( HWND32 hwnd, DWORD id )
  * recursively find a child that contains spDragInfo->pt point 
  * and send WM_QUERYDROPOBJECT
  */
-BOOL16 DRAG_QueryUpdate( HWND32 hQueryWnd, SEGPTR spDragInfo, BOOL32 bNoSend )
+BOOL16 DRAG_QueryUpdate( HWND hQueryWnd, SEGPTR spDragInfo, BOOL bNoSend )
 {
  BOOL16		wParam,bResult = 0;
- POINT32        pt;
+ POINT        pt;
  LPDRAGINFO	ptrDragInfo = (LPDRAGINFO) PTR_SEG_TO_LIN(spDragInfo);
  WND 	       *ptrQueryWnd = WIN_FindWndPtr(hQueryWnd),*ptrWnd;
- RECT32		tempRect;
+ RECT		tempRect;
 
  if( !ptrQueryWnd || !ptrDragInfo ) return 0;
 
  CONV_POINT16TO32( &ptrDragInfo->pt, &pt );
 
- GetWindowRect32(hQueryWnd,&tempRect); 
+ GetWindowRect(hQueryWnd,&tempRect); 
 
- if( !PtInRect32(&tempRect,pt) ||
+ if( !PtInRect(&tempRect,pt) ||
      (ptrQueryWnd->dwStyle & WS_DISABLED) )
 	return 0;
 
@@ -2569,18 +2569,18 @@ BOOL16 DRAG_QueryUpdate( HWND32 hQueryWnd, SEGPTR spDragInfo, BOOL32 bNoSend )
    {
      tempRect = ptrQueryWnd->rectClient;
      if(ptrQueryWnd->dwStyle & WS_CHILD)
-        MapWindowPoints32( ptrQueryWnd->parent->hwndSelf, 0,
-                           (LPPOINT32)&tempRect, 2 );
+        MapWindowPoints( ptrQueryWnd->parent->hwndSelf, 0,
+                           (LPPOINT)&tempRect, 2 );
 
-     if (PtInRect32( &tempRect, pt))
+     if (PtInRect( &tempRect, pt))
 	{
 	 wParam = 0;
          
 	 for (ptrWnd = ptrQueryWnd->child; ptrWnd ;ptrWnd = ptrWnd->next)
              if( ptrWnd->dwStyle & WS_VISIBLE )
 	     {
-                 GetWindowRect32( ptrWnd->hwndSelf, &tempRect );
-                 if (PtInRect32( &tempRect, pt )) break;
+                 GetWindowRect( ptrWnd->hwndSelf, &tempRect );
+                 if (PtInRect( &tempRect, pt )) break;
 	     }
 
 	 if(ptrWnd)
@@ -2618,15 +2618,15 @@ BOOL16 DRAG_QueryUpdate( HWND32 hQueryWnd, SEGPTR spDragInfo, BOOL32 bNoSend )
  */
 BOOL16 WINAPI DragDetect16( HWND16 hWnd, POINT16 pt )
 {
-    POINT32 pt32;
+    POINT pt32;
     CONV_POINT16TO32( &pt, &pt32 );
-    return DragDetect32( hWnd, pt32 );
+    return DragDetect( hWnd, pt32 );
 }
 
 /*******************************************************************
  *             DragDetect32   (USER32.151)
  */
-BOOL32 WINAPI DragDetect32( HWND32 hWnd, POINT32 pt )
+BOOL WINAPI DragDetect( HWND hWnd, POINT pt )
 {
     MSG16 msg;
     RECT16  rect;
@@ -2637,7 +2637,7 @@ BOOL32 WINAPI DragDetect32( HWND32 hWnd, POINT32 pt )
     rect.top = pt.y - wDragHeight;
     rect.bottom = pt.y + wDragHeight;
 
-    SetCapture32(hWnd);
+    SetCapture(hWnd);
 
     while(1)
     {
@@ -2701,7 +2701,7 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj,
 	if( hDragCursor == hCursor ) hDragCursor = 0;
 	else hCursor = hDragCursor;
 
-	hOldCursor = SetCursor32(hDragCursor);
+	hOldCursor = SetCursor(hDragCursor);
     }
 
     lpDragInfo->hWnd   = hWnd;
@@ -2711,8 +2711,8 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj,
     lpDragInfo->hOfStruct = hOfStruct;
     lpDragInfo->l = 0L; 
 
-    SetCapture32(hWnd);
-    ShowCursor32( TRUE );
+    SetCapture(hWnd);
+    ShowCursor( TRUE );
 
     do
     {
@@ -2734,7 +2734,7 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj,
             lpDragInfo->hScope = 0;
 	}
 	if( hCurrentCursor )
-	    SetCursor32(hCurrentCursor);
+	    SetCursor(hCurrentCursor);
 
 	/* send WM_DRAGLOOP */
 	SendMessage16( hWnd, WM_DRAGLOOP, (WPARAM16)(hCurrentCursor != hBummer), 
@@ -2757,12 +2757,12 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj,
     } while( msg.message != WM_LBUTTONUP && msg.message != WM_NCLBUTTONUP );
 
     ReleaseCapture();
-    ShowCursor32( FALSE );
+    ShowCursor( FALSE );
 
     if( hCursor )
     {
-	SetCursor32( hOldCursor );
-	if (hDragCursor) DestroyCursor32( hDragCursor );
+	SetCursor( hOldCursor );
+	if (hDragCursor) DestroyCursor( hDragCursor );
     }
 
     if( hCurrentCursor != hBummer ) 
diff --git a/windows/winhelp.c b/windows/winhelp.c
index c8ac99849aa..991ac5fc7bf 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -19,7 +19,7 @@
 BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand,
                          DWORD dwData )
 {
-    return WinHelp32A( hWnd, lpHelpFile, wCommand,
+    return WinHelpA( hWnd, lpHelpFile, wCommand,
                        (DWORD)PTR_SEG_TO_LIN(dwData) );
 }
 
@@ -27,17 +27,17 @@ BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand,
 /**********************************************************************
  *             WinHelp32A   (USER32.579)
  */
-BOOL32 WINAPI WinHelp32A( HWND32 hWnd, LPCSTR lpHelpFile, UINT32 wCommand,
+BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand,
                           DWORD dwData )
 {
 	static WORD WM_WINHELP = 0;
-	HWND32 hDest;
+	HWND hDest;
 	LPWINHELP lpwh;
 	HGLOBAL16 hwh;
 	int size,dsize,nlen;
         if (wCommand != HELP_QUIT)  /* FIXME */
 	{
-            if (WinExec32("winhelp.exe -x",SW_SHOWNORMAL) <= 32)
+            if (WinExec("winhelp.exe -x",SW_SHOWNORMAL) <= 32)
 		return FALSE;
 
 	    /* NOTE: Probably, this should be directed yield, 
@@ -47,12 +47,12 @@ BOOL32 WINAPI WinHelp32A( HWND32 hWnd, LPCSTR lpHelpFile, UINT32 wCommand,
 
 	if(!WM_WINHELP) 
 	{
-		WM_WINHELP=RegisterWindowMessage32A("WM_WINHELP");
+		WM_WINHELP=RegisterWindowMessageA("WM_WINHELP");
 		if(!WM_WINHELP)
 			return FALSE;
 	}
 
-	hDest = FindWindow32A( "MS_WINHELP", NULL );
+	hDest = FindWindowA( "MS_WINHELP", NULL );
 	if(!hDest)
         {
 		if(wCommand == HELP_QUIT)
@@ -115,11 +115,11 @@ BOOL32 WINAPI WinHelp32A( HWND32 hWnd, LPCSTR lpHelpFile, UINT32 wCommand,
 /**********************************************************************
  *             WinHelp32W   (USER32.580)
  */
-BOOL32 WINAPI WinHelp32W( HWND32 hWnd, LPCWSTR helpFile, UINT32 command,
+BOOL WINAPI WinHelpW( HWND hWnd, LPCWSTR helpFile, UINT command,
                           DWORD dwData )
 {
     LPSTR file = HEAP_strdupWtoA( GetProcessHeap(), 0, helpFile );
-    BOOL32 ret = WinHelp32A( hWnd, file, command, dwData );
+    BOOL ret = WinHelpA( hWnd, file, command, dwData );
     HeapFree( GetProcessHeap(), 0, file );
     return ret;
 }
diff --git a/windows/winpos.c b/windows/winpos.c
index 7a4ff6ae5a7..590cf211e4b 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -53,8 +53,8 @@
 
 /* ----- internal variables ----- */
 
-static HWND32 hwndPrevActive  = 0;  /* Previously active window */
-static HWND32 hGlobalShellWindow=0; /*the shell*/
+static HWND hwndPrevActive  = 0;  /* Previously active window */
+static HWND hGlobalShellWindow=0; /*the shell*/
 
 static LPCSTR atomInternalPos;
 
@@ -63,10 +63,10 @@ extern HQUEUE16 hActiveQueue;
 /***********************************************************************
  *           WINPOS_CreateInternalPosAtom
  */
-BOOL32 WINPOS_CreateInternalPosAtom()
+BOOL WINPOS_CreateInternalPosAtom()
 {
     LPSTR str = "SysIP";
-    atomInternalPos = (LPCSTR)(DWORD)GlobalAddAtom32A(str);
+    atomInternalPos = (LPCSTR)(DWORD)GlobalAddAtomA(str);
     return (atomInternalPos) ? TRUE : FALSE;
 }
 
@@ -79,9 +79,9 @@ void WINPOS_CheckInternalPos( WND* wndPtr )
 {
     LPINTERNALPOS lpPos;
     MESSAGEQUEUE *pMsgQ = 0;
-    HWND32 hwnd = wndPtr->hwndSelf;
+    HWND hwnd = wndPtr->hwndSelf;
 
-    lpPos = (LPINTERNALPOS) GetProp32A( hwnd, atomInternalPos );
+    lpPos = (LPINTERNALPOS) GetPropA( hwnd, atomInternalPos );
 
     /* Retrieve the message queue associated with this window */
     pMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( wndPtr->hmemTaskQ );
@@ -101,8 +101,8 @@ void WINPOS_CheckInternalPos( WND* wndPtr )
 
     if( lpPos )
     {
-	if( IsWindow32(lpPos->hwndIconTitle) ) 
-	    DestroyWindow32( lpPos->hwndIconTitle );
+	if( IsWindow(lpPos->hwndIconTitle) ) 
+	    DestroyWindow( lpPos->hwndIconTitle );
 	HeapFree( SystemHeap, 0, lpPos );
     }
 
@@ -164,33 +164,33 @@ static POINT16 WINPOS_FindIconPos( WND* wndPtr, POINT16 pt )
  */
 UINT16 WINAPI ArrangeIconicWindows16( HWND16 parent) 
 {
-    return ArrangeIconicWindows32(parent);
+    return ArrangeIconicWindows(parent);
 }
 /***********************************************************************
  *           ArrangeIconicWindows32   (USER32.7)
  */
-UINT32 WINAPI ArrangeIconicWindows32( HWND32 parent )
+UINT WINAPI ArrangeIconicWindows( HWND parent )
 {
-    RECT32 rectParent;
-    HWND32 hwndChild;
-    INT32 x, y, xspacing, yspacing;
+    RECT rectParent;
+    HWND hwndChild;
+    INT x, y, xspacing, yspacing;
 
-    GetClientRect32( parent, &rectParent );
+    GetClientRect( parent, &rectParent );
     x = rectParent.left;
     y = rectParent.bottom;
     xspacing = SYSMETRICS_CXICONSPACING;
     yspacing = SYSMETRICS_CYICONSPACING;
 
-    hwndChild = GetWindow32( parent, GW_CHILD );
+    hwndChild = GetWindow( parent, GW_CHILD );
     while (hwndChild)
     {
-        if( IsIconic32( hwndChild ) )
+        if( IsIconic( hwndChild ) )
         {
 	    WINPOS_ShowIconTitle( WIN_FindWndPtr(hwndChild), FALSE );
-            SetWindowPos32( hwndChild, 0, x + (xspacing - SYSMETRICS_CXICON) / 2,
+            SetWindowPos( hwndChild, 0, x + (xspacing - SYSMETRICS_CXICON) / 2,
                             y - yspacing - SYSMETRICS_CYICON/2, 0, 0,
                             SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
-	    if( IsWindow32(hwndChild) )
+	    if( IsWindow(hwndChild) )
 	        WINPOS_ShowIconTitle( WIN_FindWndPtr(hwndChild), TRUE );
             if (x <= rectParent.right - xspacing) x += xspacing;
             else
@@ -199,7 +199,7 @@ UINT32 WINAPI ArrangeIconicWindows32( HWND32 parent )
                 y -= yspacing;
             }
         }
-        hwndChild = GetWindow32( hwndChild, GW_HWNDNEXT );
+        hwndChild = GetWindow( hwndChild, GW_HWNDNEXT );
     }
     return yspacing;
 }
@@ -210,16 +210,16 @@ UINT32 WINAPI ArrangeIconicWindows32( HWND32 parent )
  */
 void WINAPI SwitchToThisWindow16( HWND16 hwnd, BOOL16 restore )
 {
-    SwitchToThisWindow32( hwnd, restore );
+    SwitchToThisWindow( hwnd, restore );
 }
 
 
 /***********************************************************************
  *             SwitchToThisWindow32   (USER32.539)
  */
-void WINAPI SwitchToThisWindow32( HWND32 hwnd, BOOL32 restore )
+void WINAPI SwitchToThisWindow( HWND hwnd, BOOL restore )
 {
-    ShowWindow32( hwnd, restore ? SW_RESTORE : SW_SHOWMINIMIZED );
+    ShowWindow( hwnd, restore ? SW_RESTORE : SW_SHOWMINIMIZED );
 }
 
 
@@ -240,14 +240,14 @@ void WINAPI GetWindowRect16( HWND16 hwnd, LPRECT16 rect )
 /***********************************************************************
  *           GetWindowRect32   (USER32.308)
  */
-BOOL32 WINAPI GetWindowRect32( HWND32 hwnd, LPRECT32 rect ) 
+BOOL WINAPI GetWindowRect( HWND hwnd, LPRECT rect ) 
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd ); 
     if (!wndPtr) return FALSE;
     
     *rect = wndPtr->rectWindow;
     if (wndPtr->dwStyle & WS_CHILD)
-	MapWindowPoints32( wndPtr->parent->hwndSelf, 0, (POINT32 *)rect, 2 );
+	MapWindowPoints( wndPtr->parent->hwndSelf, 0, (POINT *)rect, 2 );
     return TRUE;
 }
 
@@ -255,10 +255,10 @@ BOOL32 WINAPI GetWindowRect32( HWND32 hwnd, LPRECT32 rect )
 /***********************************************************************
  *           GetWindowRgn32 
  */
-BOOL32 WINAPI GetWindowRgn32 ( HWND32 hwnd, HRGN32 hrgn )
+BOOL WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn )
 
 {
-  RECT32    rect;
+  RECT    rect;
   WND * wndPtr = WIN_FindWndPtr( hwnd ); 
   if (!wndPtr) return (ERROR);
 
@@ -266,11 +266,11 @@ BOOL32 WINAPI GetWindowRgn32 ( HWND32 hwnd, HRGN32 hrgn )
   
   memset (&rect, 0, sizeof(rect));
 
-  GetWindowRect32 ( hwnd, &rect );
+  GetWindowRect ( hwnd, &rect );
 
   FIXME (win, "Check whether a valid region here\n");
 
-  SetRectRgn32 ( hrgn, rect.left, rect.top, rect.right, rect.bottom );
+  SetRectRgn ( hrgn, rect.left, rect.top, rect.right, rect.bottom );
 
   return (SIMPLEREGION);
 }
@@ -278,7 +278,7 @@ BOOL32 WINAPI GetWindowRgn32 ( HWND32 hwnd, HRGN32 hrgn )
 /***********************************************************************
  *           SetWindowRgn32 
  */
-INT32 WINAPI SetWindowRgn32( HWND32 hwnd, HRGN32 hrgn,BOOL32 bRedraw)
+INT WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn,BOOL bRedraw)
 
 {
 
@@ -317,7 +317,7 @@ void WINAPI GetClientRect16( HWND16 hwnd, LPRECT16 rect )
 /***********************************************************************
  *           GetClientRect32   (USER32.220)
  */
-BOOL32 WINAPI GetClientRect32( HWND32 hwnd, LPRECT32 rect ) 
+BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) 
 {
     WND * wndPtr = WIN_FindWndPtr( hwnd );
 
@@ -341,9 +341,9 @@ void WINAPI ClientToScreen16( HWND16 hwnd, LPPOINT16 lppnt )
 /*******************************************************************
  *         ClientToScreen32   (USER32.52)
  */
-BOOL32 WINAPI ClientToScreen32( HWND32 hwnd, LPPOINT32 lppnt )
+BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt )
 {
-    MapWindowPoints32( hwnd, 0, lppnt, 1 );
+    MapWindowPoints( hwnd, 0, lppnt, 1 );
     return TRUE;
 }
 
@@ -360,9 +360,9 @@ void WINAPI ScreenToClient16( HWND16 hwnd, LPPOINT16 lppnt )
 /*******************************************************************
  *         ScreenToClient32   (USER32.447)
  */
-BOOL32 WINAPI ScreenToClient32( HWND32 hwnd, LPPOINT32 lppnt )
+BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt )
 {
-    MapWindowPoints32( 0, hwnd, lppnt, 1 );
+    MapWindowPoints( 0, hwnd, lppnt, 1 );
     return TRUE;
 }
 
@@ -429,7 +429,7 @@ hittest:
         if (!*ppWnd) *ppWnd = wndScope;
 
         /* Send the WM_NCHITTEST message (only if to the same task) */
-        if ((*ppWnd)->hmemTaskQ == GetFastQueue())
+        if ((*ppWnd)->hmemTaskQ == GetFastQueue16())
 	{
             hittest = (INT16)SendMessage16( (*ppWnd)->hwndSelf, WM_NCHITTEST, 
 						 0, MAKELONG( pt.x, pt.y ) );
@@ -465,13 +465,13 @@ HWND16 WINAPI WindowFromPoint16( POINT16 pt )
 /*******************************************************************
  *         WindowFromPoint32   (USER32.582)
  */
-HWND32 WINAPI WindowFromPoint32( POINT32 pt )
+HWND WINAPI WindowFromPoint( POINT pt )
 {
     WND *pWnd;
     POINT16 pt16;
     CONV_POINT32TO16( &pt, &pt16 );
     WINPOS_WindowFromPoint( WIN_GetDesktop(), pt16, &pWnd );
-    return (HWND32)pWnd->hwndSelf;
+    return (HWND)pWnd->hwndSelf;
 }
 
 
@@ -480,21 +480,21 @@ HWND32 WINAPI WindowFromPoint32( POINT32 pt )
  */
 HWND16 WINAPI ChildWindowFromPoint16( HWND16 hwndParent, POINT16 pt )
 {
-    POINT32 pt32;
+    POINT pt32;
     CONV_POINT16TO32( &pt, &pt32 );
-    return (HWND16)ChildWindowFromPoint32( hwndParent, pt32 );
+    return (HWND16)ChildWindowFromPoint( hwndParent, pt32 );
 }
 
 
 /*******************************************************************
  *         ChildWindowFromPoint32   (USER32.49)
  */
-HWND32 WINAPI ChildWindowFromPoint32( HWND32 hwndParent, POINT32 pt )
+HWND WINAPI ChildWindowFromPoint( HWND hwndParent, POINT pt )
 {
     /* pt is in the client coordinates */
 
     WND* wnd = WIN_FindWndPtr(hwndParent);
-    RECT32 rect;
+    RECT rect;
 
     if( !wnd ) return 0;
 
@@ -503,12 +503,12 @@ HWND32 WINAPI ChildWindowFromPoint32( HWND32 hwndParent, POINT32 pt )
     rect.right = wnd->rectClient.right - wnd->rectClient.left;
     rect.bottom = wnd->rectClient.bottom - wnd->rectClient.top;
 
-    if (!PtInRect32( &rect, pt )) return 0;
+    if (!PtInRect( &rect, pt )) return 0;
 
     wnd = wnd->child;
     while ( wnd )
     {
-        if (PtInRect32( &wnd->rectWindow, pt )) return wnd->hwndSelf;
+        if (PtInRect( &wnd->rectWindow, pt )) return wnd->hwndSelf;
         wnd = wnd->next;
     }
     return hwndParent;
@@ -519,22 +519,22 @@ HWND32 WINAPI ChildWindowFromPoint32( HWND32 hwndParent, POINT32 pt )
  */
 HWND16 WINAPI ChildWindowFromPointEx16( HWND16 hwndParent, POINT16 pt, UINT16 uFlags)
 {
-    POINT32 pt32;
+    POINT pt32;
     CONV_POINT16TO32( &pt, &pt32 );
-    return (HWND16)ChildWindowFromPointEx32( hwndParent, pt32, uFlags );
+    return (HWND16)ChildWindowFromPointEx( hwndParent, pt32, uFlags );
 }
 
 
 /*******************************************************************
  *         ChildWindowFromPointEx32   (USER32.50)
  */
-HWND32 WINAPI ChildWindowFromPointEx32( HWND32 hwndParent, POINT32 pt,
-		UINT32 uFlags)
+HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt,
+		UINT uFlags)
 {
     /* pt is in the client coordinates */
 
     WND* wnd = WIN_FindWndPtr(hwndParent);
-    RECT32 rect;
+    RECT rect;
 
     if( !wnd ) return 0;
 
@@ -543,12 +543,12 @@ HWND32 WINAPI ChildWindowFromPointEx32( HWND32 hwndParent, POINT32 pt,
     rect.right = wnd->rectClient.right - wnd->rectClient.left;
     rect.bottom = wnd->rectClient.bottom - wnd->rectClient.top;
 
-    if (!PtInRect32( &rect, pt )) return 0;
+    if (!PtInRect( &rect, pt )) return 0;
 
     wnd = wnd->child;
     while ( wnd )
     {
-        if (PtInRect32( &wnd->rectWindow, pt )) {
+        if (PtInRect( &wnd->rectWindow, pt )) {
 		if ( (uFlags & CWP_SKIPINVISIBLE) && 
 				!(wnd->dwStyle & WS_VISIBLE) )
 		        wnd = wnd->next;
@@ -572,8 +572,8 @@ HWND32 WINAPI ChildWindowFromPointEx32( HWND32 hwndParent, POINT32 pt,
  * Calculate the offset between the origin of the two windows. Used
  * to implement MapWindowPoints.
  */
-static void WINPOS_GetWinOffset( HWND32 hwndFrom, HWND32 hwndTo,
-                                 POINT32 *offset )
+static void WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo,
+                                 POINT *offset )
 {
     WND * wndPtr;
 
@@ -620,7 +620,7 @@ static void WINPOS_GetWinOffset( HWND32 hwndFrom, HWND32 hwndTo,
 void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo,
                                LPPOINT16 lppt, UINT16 count )
 {
-    POINT32 offset;
+    POINT offset;
 
     WINPOS_GetWinOffset( hwndFrom, hwndTo, &offset );
     while (count--)
@@ -635,10 +635,10 @@ void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo,
 /*******************************************************************
  *         MapWindowPoints32   (USER32.386)
  */
-INT32 WINAPI MapWindowPoints32( HWND32 hwndFrom, HWND32 hwndTo,
-                               LPPOINT32 lppt, UINT32 count )
+INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo,
+                               LPPOINT lppt, UINT count )
 {
-    POINT32 offset;
+    POINT offset;
 
     WINPOS_GetWinOffset( hwndFrom, hwndTo, &offset );
     while (count--)
@@ -656,14 +656,14 @@ INT32 WINAPI MapWindowPoints32( HWND32 hwndFrom, HWND32 hwndTo,
  */
 BOOL16 WINAPI IsIconic16(HWND16 hWnd)
 {
-    return IsIconic32(hWnd);
+    return IsIconic(hWnd);
 }
 
 
 /***********************************************************************
  *           IsIconic32   (USER32.345)
  */
-BOOL32 WINAPI IsIconic32(HWND32 hWnd)
+BOOL WINAPI IsIconic(HWND hWnd)
 {
     WND * wndPtr = WIN_FindWndPtr(hWnd);
     if (wndPtr == NULL) return FALSE;
@@ -676,14 +676,14 @@ BOOL32 WINAPI IsIconic32(HWND32 hWnd)
  */
 BOOL16 WINAPI IsZoomed16(HWND16 hWnd)
 {
-    return IsZoomed32(hWnd);
+    return IsZoomed(hWnd);
 }
 
 
 /***********************************************************************
  *           IsZoomed   (USER32.352)
  */
-BOOL32 WINAPI IsZoomed32(HWND32 hWnd)
+BOOL WINAPI IsZoomed(HWND hWnd)
 {
     WND * wndPtr = WIN_FindWndPtr(hWnd);
     if (wndPtr == NULL) return FALSE;
@@ -696,19 +696,19 @@ BOOL32 WINAPI IsZoomed32(HWND32 hWnd)
  */
 HWND16 WINAPI GetActiveWindow16(void)
 {
-    return (HWND16)GetActiveWindow32();
+    return (HWND16)GetActiveWindow();
 }
 
 /*******************************************************************
  *         GetActiveWindow    (USER32.205)
  */
-HWND32 WINAPI GetActiveWindow32(void)
+HWND WINAPI GetActiveWindow(void)
 {
     MESSAGEQUEUE *pCurMsgQ = 0;
-    HWND32 hwndActive = 0;
+    HWND hwndActive = 0;
 
     /* Get the messageQ for the current thread */
-    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() )))
+    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
 {
         WARN( win, "\tCurrent message queue not found. Exiting!\n" );
         return 0;
@@ -725,7 +725,7 @@ HWND32 WINAPI GetActiveWindow32(void)
 /*******************************************************************
  *         WINPOS_CanActivate
  */
-static BOOL32 WINPOS_CanActivate(WND* pWnd)
+static BOOL WINPOS_CanActivate(WND* pWnd)
 {
     if( pWnd && ((pWnd->dwStyle & (WS_DISABLED | WS_VISIBLE | WS_CHILD)) 
 	== WS_VISIBLE) ) return TRUE;
@@ -738,23 +738,23 @@ static BOOL32 WINPOS_CanActivate(WND* pWnd)
  */
 HWND16 WINAPI SetActiveWindow16( HWND16 hwnd )
 {
-    return SetActiveWindow32(hwnd);
+    return SetActiveWindow(hwnd);
 }
 
 
 /*******************************************************************
  *         SetActiveWindow32    (USER32.463)
  */
-HWND32 WINAPI SetActiveWindow32( HWND32 hwnd )
+HWND WINAPI SetActiveWindow( HWND hwnd )
 {
-    HWND32 prev = 0;
+    HWND prev = 0;
     WND *wndPtr = WIN_FindWndPtr( hwnd );
     MESSAGEQUEUE *pMsgQ = 0, *pCurMsgQ = 0;
 
     if ( !WINPOS_CanActivate(wndPtr) ) return 0;
 
     /* Get the messageQ for the current thread */
-    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue() )))
+    if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
     {
         WARN( win, "\tCurrent message queue not found. Exiting!\n" );
         goto CLEANUP;
@@ -795,7 +795,7 @@ CLEANUP:
  */
 HWND16 WINAPI GetForegroundWindow16(void)
 {
-    return (HWND16)GetForegroundWindow32();
+    return (HWND16)GetForegroundWindow();
 }
 
 
@@ -804,25 +804,25 @@ HWND16 WINAPI GetForegroundWindow16(void)
  */
 BOOL16 WINAPI SetForegroundWindow16( HWND16 hwnd )
 {
-    return SetForegroundWindow32( hwnd );
+    return SetForegroundWindow( hwnd );
 }
 
 
 /*******************************************************************
  *         GetForegroundWindow32    (USER32.241)
  */
-HWND32 WINAPI GetForegroundWindow32(void)
+HWND WINAPI GetForegroundWindow(void)
 {
-    return GetActiveWindow32();
+    return GetActiveWindow();
 }
 
 
 /*******************************************************************
  *         SetForegroundWindow32    (USER32.482)
  */
-BOOL32 WINAPI SetForegroundWindow32( HWND32 hwnd )
+BOOL WINAPI SetForegroundWindow( HWND hwnd )
 {
-    SetActiveWindow32( hwnd );
+    SetActiveWindow( hwnd );
     return TRUE;
 }
 
@@ -832,13 +832,13 @@ BOOL32 WINAPI SetForegroundWindow32( HWND32 hwnd )
  */
 HWND16 WINAPI GetShellWindow16(void)
 {
-    return GetShellWindow32();
+    return GetShellWindow();
 }
 
 /*******************************************************************
  *         SetShellWindow32    (USER32.504)
  */
-HWND32 WINAPI SetShellWindow32(HWND32 hwndshell)
+HWND WINAPI SetShellWindow(HWND hwndshell)
 {   WARN(win, "(hWnd=%08x) semi stub\n",hwndshell );
 
     hGlobalShellWindow = hwndshell;
@@ -849,7 +849,7 @@ HWND32 WINAPI SetShellWindow32(HWND32 hwndshell)
 /*******************************************************************
  *         GetShellWindow32    (USER32.287)
  */
-HWND32 WINAPI GetShellWindow32(void)
+HWND WINAPI GetShellWindow(void)
 {   WARN(win, "(hWnd=%x) semi stub\n",hGlobalShellWindow );
 
     return hGlobalShellWindow;
@@ -861,16 +861,16 @@ HWND32 WINAPI GetShellWindow32(void)
  */
 BOOL16 WINAPI BringWindowToTop16( HWND16 hwnd )
 {
-    return BringWindowToTop32(hwnd);
+    return BringWindowToTop(hwnd);
 }
 
 
 /***********************************************************************
  *           BringWindowToTop32   (USER32.11)
  */
-BOOL32 WINAPI BringWindowToTop32( HWND32 hwnd )
+BOOL WINAPI BringWindowToTop( HWND hwnd )
 {
-    return SetWindowPos32( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE );
+    return SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE );
 }
 
 
@@ -880,30 +880,30 @@ BOOL32 WINAPI BringWindowToTop32( HWND32 hwnd )
 BOOL16 WINAPI MoveWindow16( HWND16 hwnd, INT16 x, INT16 y, INT16 cx, INT16 cy,
                             BOOL16 repaint )
 {
-    return MoveWindow32(hwnd,x,y,cx,cy,repaint);
+    return MoveWindow(hwnd,x,y,cx,cy,repaint);
 }
 
 
 /***********************************************************************
  *           MoveWindow32   (USER32.399)
  */
-BOOL32 WINAPI MoveWindow32( HWND32 hwnd, INT32 x, INT32 y, INT32 cx, INT32 cy,
-                            BOOL32 repaint )
+BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy,
+                            BOOL repaint )
 {    
     int flags = SWP_NOZORDER | SWP_NOACTIVATE;
     if (!repaint) flags |= SWP_NOREDRAW;
     TRACE(win, "%04x %d,%d %dx%d %d\n", 
 	    hwnd, x, y, cx, cy, repaint );
-    return SetWindowPos32( hwnd, 0, x, y, cx, cy, flags );
+    return SetWindowPos( hwnd, 0, x, y, cx, cy, flags );
 }
 
 /***********************************************************************
  *           WINPOS_InitInternalPos
  */
-static LPINTERNALPOS WINPOS_InitInternalPos( WND* wnd, POINT32 pt, 
-					     LPRECT32 restoreRect )
+static LPINTERNALPOS WINPOS_InitInternalPos( WND* wnd, POINT pt, 
+					     LPRECT restoreRect )
 {
-    LPINTERNALPOS lpPos = (LPINTERNALPOS) GetProp32A( wnd->hwndSelf,
+    LPINTERNALPOS lpPos = (LPINTERNALPOS) GetPropA( wnd->hwndSelf,
                                                       atomInternalPos );
     if( !lpPos )
     {
@@ -913,10 +913,10 @@ static LPINTERNALPOS WINPOS_InitInternalPos( WND* wnd, POINT32 pt,
 	lpPos = HeapAlloc( SystemHeap, 0, sizeof(INTERNALPOS) );
 	if( !lpPos ) return NULL;
 
-	SetProp32A( wnd->hwndSelf, atomInternalPos, (HANDLE32)lpPos );
+	SetPropA( wnd->hwndSelf, atomInternalPos, (HANDLE)lpPos );
 	lpPos->hwndIconTitle = 0; /* defer until needs to be shown */
         CONV_RECT32TO16( &wnd->rectWindow, &lpPos->rectNormal );
-	*(UINT32*)&lpPos->ptIconPos = *(UINT32*)&lpPos->ptMaxPos = 0xFFFFFFFF;
+	*(UINT*)&lpPos->ptIconPos = *(UINT*)&lpPos->ptMaxPos = 0xFFFFFFFF;
     }
 
     if( wnd->dwStyle & WS_MINIMIZE ) 
@@ -932,15 +932,15 @@ static LPINTERNALPOS WINPOS_InitInternalPos( WND* wnd, POINT32 pt,
 /***********************************************************************
  *           WINPOS_RedrawIconTitle
  */
-BOOL32 WINPOS_RedrawIconTitle( HWND32 hWnd )
+BOOL WINPOS_RedrawIconTitle( HWND hWnd )
 {
-    LPINTERNALPOS lpPos = (LPINTERNALPOS)GetProp32A( hWnd, atomInternalPos );
+    LPINTERNALPOS lpPos = (LPINTERNALPOS)GetPropA( hWnd, atomInternalPos );
     if( lpPos )
     {
 	if( lpPos->hwndIconTitle )
 	{
-	    SendMessage32A( lpPos->hwndIconTitle, WM_SHOWWINDOW, TRUE, 0);
-	    InvalidateRect32( lpPos->hwndIconTitle, NULL, TRUE );
+	    SendMessageA( lpPos->hwndIconTitle, WM_SHOWWINDOW, TRUE, 0);
+	    InvalidateRect( lpPos->hwndIconTitle, NULL, TRUE );
 	    return TRUE;
 	}
     }
@@ -950,9 +950,9 @@ BOOL32 WINPOS_RedrawIconTitle( HWND32 hWnd )
 /***********************************************************************
  *           WINPOS_ShowIconTitle
  */
-BOOL32 WINPOS_ShowIconTitle( WND* pWnd, BOOL32 bShow )
+BOOL WINPOS_ShowIconTitle( WND* pWnd, BOOL bShow )
 {
-    LPINTERNALPOS lpPos = (LPINTERNALPOS)GetProp32A( pWnd->hwndSelf, atomInternalPos );
+    LPINTERNALPOS lpPos = (LPINTERNALPOS)GetPropA( pWnd->hwndSelf, atomInternalPos );
 
     if( lpPos && !(pWnd->flags & WIN_MANAGED))
     {
@@ -968,12 +968,12 @@ BOOL32 WINPOS_ShowIconTitle( WND* pWnd, BOOL32 bShow )
 
 	    if( !(pWnd->dwStyle & WS_VISIBLE) )
 	    {
-		SendMessage32A( hWnd, WM_SHOWWINDOW, TRUE, 0 );
-		SetWindowPos32( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
+		SendMessageA( hWnd, WM_SHOWWINDOW, TRUE, 0 );
+		SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
 			        SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW );
 	    }
 	}
-	else ShowWindow32( hWnd, SW_HIDE );
+	else ShowWindow( hWnd, SW_HIDE );
     }
     return FALSE;
 }
@@ -983,12 +983,12 @@ BOOL32 WINPOS_ShowIconTitle( WND* pWnd, BOOL32 bShow )
  *
  * Get the minimized and maximized information for a window.
  */
-void WINPOS_GetMinMaxInfo( WND *wndPtr, POINT32 *maxSize, POINT32 *maxPos,
-			   POINT32 *minTrack, POINT32 *maxTrack )
+void WINPOS_GetMinMaxInfo( WND *wndPtr, POINT *maxSize, POINT *maxPos,
+			   POINT *minTrack, POINT *maxTrack )
 {
     LPINTERNALPOS lpPos;
-    MINMAXINFO32 MinMax;
-    INT32 xinc, yinc;
+    MINMAXINFO MinMax;
+    INT xinc, yinc;
 
     /* Compute default values */
 
@@ -1022,7 +1022,7 @@ void WINPOS_GetMinMaxInfo( WND *wndPtr, POINT32 *maxSize, POINT32 *maxPos,
     MinMax.ptMaxSize.x += 2 * xinc;
     MinMax.ptMaxSize.y += 2 * yinc;
 
-    lpPos = (LPINTERNALPOS)GetProp32A( wndPtr->hwndSelf, atomInternalPos );
+    lpPos = (LPINTERNALPOS)GetPropA( wndPtr->hwndSelf, atomInternalPos );
     if( lpPos && !EMPTYPOINT(lpPos->ptMaxPos) )
 	CONV_POINT16TO32( &lpPos->ptMaxPos, &MinMax.ptMaxPosition );
     else
@@ -1031,7 +1031,7 @@ void WINPOS_GetMinMaxInfo( WND *wndPtr, POINT32 *maxSize, POINT32 *maxPos,
         MinMax.ptMaxPosition.y = -yinc;
     }
 
-    SendMessage32A( wndPtr->hwndSelf, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax );
+    SendMessageA( wndPtr->hwndSelf, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax );
 
       /* Some sanity checks */
 
@@ -1061,8 +1061,8 @@ void WINPOS_GetMinMaxInfo( WND *wndPtr, POINT32 *maxSize, POINT32 *maxPos,
 UINT16 WINPOS_MinMaximize( WND* wndPtr, UINT16 cmd, LPRECT16 lpRect )
 {
     UINT16 swpFlags = 0;
-    POINT32 pt;
-    POINT32 size = { wndPtr->rectWindow.left, wndPtr->rectWindow.top };
+    POINT pt;
+    POINT size = { wndPtr->rectWindow.left, wndPtr->rectWindow.top };
     LPINTERNALPOS lpPos = WINPOS_InitInternalPos( wndPtr, size,
                                                   &wndPtr->rectWindow );
 
@@ -1072,7 +1072,7 @@ UINT16 WINPOS_MinMaximize( WND* wndPtr, UINT16 cmd, LPRECT16 lpRect )
     {
 	if( wndPtr->dwStyle & WS_MINIMIZE )
 	{
-	    if( !SendMessage32A( wndPtr->hwndSelf, WM_QUERYOPEN, 0, 0L ) )
+	    if( !SendMessageA( wndPtr->hwndSelf, WM_QUERYOPEN, 0, 0L ) )
 		return (SWP_NOSIZE | SWP_NOMOVE);
 	    swpFlags |= SWP_NOCOPYBITS;
 	}
@@ -1149,10 +1149,10 @@ UINT16 WINPOS_MinMaximize( WND* wndPtr, UINT16 cmd, LPRECT16 lpRect )
  * doesn't wait; returns immediately.
  * used by threads to toggle windows in other (possibly hanging) threads
  */
-BOOL32 WINAPI ShowWindowAsync32( HWND32 hwnd, INT32 cmd )
+BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd )
 {
     /* FIXME: does ShowWindow32() return immediately ? */
-    return ShowWindow32(hwnd, cmd);
+    return ShowWindow(hwnd, cmd);
 }
 
 
@@ -1161,17 +1161,17 @@ BOOL32 WINAPI ShowWindowAsync32( HWND32 hwnd, INT32 cmd )
  */
 BOOL16 WINAPI ShowWindow16( HWND16 hwnd, INT16 cmd ) 
 {    
-    return ShowWindow32(hwnd,cmd);
+    return ShowWindow(hwnd,cmd);
 }
 
 
 /***********************************************************************
  *           ShowWindow32   (USER32.534)
  */
-BOOL32 WINAPI ShowWindow32( HWND32 hwnd, INT32 cmd ) 
+BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) 
 {    
     WND* 	wndPtr = WIN_FindWndPtr( hwnd );
-    BOOL32 	wasVisible, showFlag;
+    BOOL 	wasVisible, showFlag;
     RECT16 	newPos = {0, 0, 0, 0};
     int 	swp = 0;
 
@@ -1187,10 +1187,10 @@ BOOL32 WINAPI ShowWindow32( HWND32 hwnd, INT32 cmd )
             if (!wasVisible) return FALSE;
 	    swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE | 
 		        SWP_NOACTIVATE | SWP_NOZORDER;
-            if ((hwnd == GetFocus32()) || IsChild32( hwnd, GetFocus32()))
+            if ((hwnd == GetFocus()) || IsChild( hwnd, GetFocus()))
             {
                 /* Revert focus to parent */
-                SetFocus32( GetParent32(hwnd) );
+                SetFocus( GetParent(hwnd) );
             }
 	    break;
 
@@ -1223,7 +1223,7 @@ BOOL32 WINAPI ShowWindow32( HWND32 hwnd, INT32 cmd )
 
 	case SW_SHOWNOACTIVATE:
             swp |= SWP_NOZORDER;
-            if (GetActiveWindow32()) swp |= SWP_NOACTIVATE;
+            if (GetActiveWindow()) swp |= SWP_NOACTIVATE;
             /* fall through */
 	case SW_SHOWNORMAL:  /* same as SW_NORMAL: */
 	case SW_SHOWDEFAULT: /* FIXME: should have its own handler */
@@ -1239,12 +1239,12 @@ BOOL32 WINAPI ShowWindow32( HWND32 hwnd, INT32 cmd )
     showFlag = (cmd != SW_HIDE);
     if (showFlag != wasVisible)
     {
-        SendMessage32A( hwnd, WM_SHOWWINDOW, showFlag, 0 );
-        if (!IsWindow32( hwnd )) return wasVisible;
+        SendMessageA( hwnd, WM_SHOWWINDOW, showFlag, 0 );
+        if (!IsWindow( hwnd )) return wasVisible;
     }
 
     if ((wndPtr->dwStyle & WS_CHILD) &&
-        !IsWindowVisible32( wndPtr->parent->hwndSelf ) &&
+        !IsWindowVisible( wndPtr->parent->hwndSelf ) &&
         (swp & (SWP_NOSIZE | SWP_NOMOVE)) == (SWP_NOSIZE | SWP_NOMOVE) )
     {
         /* Don't call SetWindowPos32() on invisible child windows */
@@ -1255,9 +1255,9 @@ BOOL32 WINAPI ShowWindow32( HWND32 hwnd, INT32 cmd )
     {
         /* We can't activate a child window */
         if (wndPtr->dwStyle & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
-        SetWindowPos32( hwnd, HWND_TOP, 
+        SetWindowPos( hwnd, HWND_TOP, 
 			newPos.left, newPos.top, newPos.right, newPos.bottom, swp );
-        if (!IsWindow32( hwnd )) return wasVisible;
+        if (!IsWindow( hwnd )) return wasVisible;
 	else if( wndPtr->dwStyle & WS_MINIMIZE ) WINPOS_ShowIconTitle( wndPtr, TRUE );
     }
 
@@ -1269,10 +1269,10 @@ BOOL32 WINAPI ShowWindow32( HWND32 hwnd, INT32 cmd )
 	wndPtr->flags &= ~WIN_NEED_SIZE;
 	if (wndPtr->dwStyle & WS_MAXIMIZE) wParam = SIZE_MAXIMIZED;
 	else if (wndPtr->dwStyle & WS_MINIMIZE) wParam = SIZE_MINIMIZED;
-	SendMessage32A( hwnd, WM_SIZE, wParam,
+	SendMessageA( hwnd, WM_SIZE, wParam,
 		     MAKELONG(wndPtr->rectClient.right-wndPtr->rectClient.left,
 			    wndPtr->rectClient.bottom-wndPtr->rectClient.top));
-	SendMessage32A( hwnd, WM_MOVE, 0,
+	SendMessageA( hwnd, WM_MOVE, 0,
 		   MAKELONG(wndPtr->rectClient.left, wndPtr->rectClient.top) );
     }
 
@@ -1300,11 +1300,11 @@ UINT16 WINAPI GetInternalWindowPos16( HWND16 hwnd, LPRECT16 rectWnd,
 /***********************************************************************
  *           GetInternalWindowPos32   (USER32.245)
  */
-UINT32 WINAPI GetInternalWindowPos32( HWND32 hwnd, LPRECT32 rectWnd,
-                                      LPPOINT32 ptIcon )
+UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd,
+                                      LPPOINT ptIcon )
 {
-    WINDOWPLACEMENT32 wndpl;
-    if (GetWindowPlacement32( hwnd, &wndpl ))
+    WINDOWPLACEMENT wndpl;
+    if (GetWindowPlacement( hwnd, &wndpl ))
     {
 	if (rectWnd) *rectWnd = wndpl.rcNormalPosition;
 	if (ptIcon)  *ptIcon = wndpl.ptMinPosition;
@@ -1322,7 +1322,7 @@ BOOL16 WINAPI GetWindowPlacement16( HWND16 hwnd, WINDOWPLACEMENT16 *wndpl )
     if( pWnd )
     {
 	LPINTERNALPOS lpPos = (LPINTERNALPOS)WINPOS_InitInternalPos( pWnd,
-			     *(LPPOINT32)&pWnd->rectWindow.left, &pWnd->rectWindow );
+			     *(LPPOINT)&pWnd->rectWindow.left, &pWnd->rectWindow );
 	wndpl->length  = sizeof(*wndpl);
 	if( pWnd->dwStyle & WS_MINIMIZE )
 	    wndpl->showCmd = SW_SHOWMINIMIZED;
@@ -1348,7 +1348,7 @@ BOOL16 WINAPI GetWindowPlacement16( HWND16 hwnd, WINDOWPLACEMENT16 *wndpl )
  * Win95:
  * Fails if wndpl->length of Win95 (!) apps is invalid.
  */
-BOOL32 WINAPI GetWindowPlacement32( HWND32 hwnd, WINDOWPLACEMENT32 *pwpl32 )
+BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *pwpl32 )
 {
     if( pwpl32 )
     {
@@ -1372,14 +1372,14 @@ BOOL32 WINAPI GetWindowPlacement32( HWND32 hwnd, WINDOWPLACEMENT32 *pwpl32 )
 /***********************************************************************
  *           WINPOS_SetPlacement
  */
-static BOOL32 WINPOS_SetPlacement( HWND32 hwnd, const WINDOWPLACEMENT16 *wndpl,
-						UINT32 flags )
+static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT16 *wndpl,
+						UINT flags )
 {
     WND *pWnd = WIN_FindWndPtr( hwnd );
     if( pWnd )
     {
 	LPINTERNALPOS lpPos = (LPINTERNALPOS)WINPOS_InitInternalPos( pWnd,
-			     *(LPPOINT32)&pWnd->rectWindow.left, &pWnd->rectWindow );
+			     *(LPPOINT)&pWnd->rectWindow.left, &pWnd->rectWindow );
 
 	if( flags & PLACE_MIN ) lpPos->ptIconPos = wndpl->ptMinPosition;
 	if( flags & PLACE_MAX ) lpPos->ptMaxPos = wndpl->ptMaxPosition;
@@ -1389,23 +1389,23 @@ static BOOL32 WINPOS_SetPlacement( HWND32 hwnd, const WINDOWPLACEMENT16 *wndpl,
 	{
 	    WINPOS_ShowIconTitle( pWnd, FALSE );
 	    if( wndpl->flags & WPF_SETMINPOSITION && !EMPTYPOINT(lpPos->ptIconPos))
-		SetWindowPos32( hwnd, 0, lpPos->ptIconPos.x, lpPos->ptIconPos.y,
+		SetWindowPos( hwnd, 0, lpPos->ptIconPos.x, lpPos->ptIconPos.y,
 				0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
 	} 
 	else if( pWnd->dwStyle & WS_MAXIMIZE )
 	{
 	    if( !EMPTYPOINT(lpPos->ptMaxPos) )
-		SetWindowPos32( hwnd, 0, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y,
+		SetWindowPos( hwnd, 0, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y,
 				0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
 	}
 	else if( flags & PLACE_RECT )
-		SetWindowPos32( hwnd, 0, lpPos->rectNormal.left, lpPos->rectNormal.top,
+		SetWindowPos( hwnd, 0, lpPos->rectNormal.left, lpPos->rectNormal.top,
 				lpPos->rectNormal.right - lpPos->rectNormal.left,
 				lpPos->rectNormal.bottom - lpPos->rectNormal.top,
 				SWP_NOZORDER | SWP_NOACTIVATE );
 
-	ShowWindow32( hwnd, wndpl->showCmd );
-	if( IsWindow32(hwnd) && pWnd->dwStyle & WS_MINIMIZE )
+	ShowWindow( hwnd, wndpl->showCmd );
+	if( IsWindow(hwnd) && pWnd->dwStyle & WS_MINIMIZE )
 	{
 	    if( pWnd->dwStyle & WS_VISIBLE ) WINPOS_ShowIconTitle( pWnd, TRUE );
 
@@ -1433,7 +1433,7 @@ BOOL16 WINAPI SetWindowPlacement16(HWND16 hwnd, const WINDOWPLACEMENT16 *wndpl)
  * Win95:
  * Fails if wndpl->length of Win95 (!) apps is invalid.
  */
-BOOL32 WINAPI SetWindowPlacement32( HWND32 hwnd, const WINDOWPLACEMENT32 *pwpl32 )
+BOOL WINAPI SetWindowPlacement( HWND hwnd, const WINDOWPLACEMENT *pwpl32 )
 {
     if( pwpl32 )
     {
@@ -1459,7 +1459,7 @@ void WINAPI SetInternalWindowPos16( HWND16 hwnd, UINT16 showCmd,
     if( IsWindow16(hwnd) )
     {
 	WINDOWPLACEMENT16 wndpl;
-	UINT32 flags;
+	UINT flags;
 
 	wndpl.length  = sizeof(wndpl);
 	wndpl.showCmd = showCmd;
@@ -1484,13 +1484,13 @@ void WINAPI SetInternalWindowPos16( HWND16 hwnd, UINT16 showCmd,
 /***********************************************************************
  *           SetInternalWindowPos32   (USER32.483)
  */
-void WINAPI SetInternalWindowPos32( HWND32 hwnd, UINT32 showCmd,
-                                    LPRECT32 rect, LPPOINT32 pt )
+void WINAPI SetInternalWindowPos( HWND hwnd, UINT showCmd,
+                                    LPRECT rect, LPPOINT pt )
 {
-    if( IsWindow32(hwnd) )
+    if( IsWindow(hwnd) )
     {
 	WINDOWPLACEMENT16 wndpl;
-	UINT32 flags;
+	UINT flags;
 
 	wndpl.length  = sizeof(wndpl);
 	wndpl.showCmd = showCmd;
@@ -1518,15 +1518,15 @@ void WINAPI SetInternalWindowPos32( HWND32 hwnd, UINT32 showCmd,
  * can assign active status to a window. It must be called only
  * for the top level windows.
  */
-BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
+BOOL WINPOS_SetActiveWindow( HWND hWnd, BOOL fMouse, BOOL fChangeFocus)
 {
     CBTACTIVATESTRUCT16* cbtStruct;
     WND*     wndPtr, *wndTemp;
     HQUEUE16 hOldActiveQueue, hNewActiveQueue;
     MESSAGEQUEUE *pOldActiveQueue = 0, *pNewActiveQueue = 0;
     WORD     wIconized = 0;
-    HWND32   hwndActive = 0;
-    BOOL32   bRet = 0;
+    HWND   hwndActive = 0;
+    BOOL   bRet = 0;
 
     /* Get current active window from the active queue */
     if ( hActiveQueue )
@@ -1537,7 +1537,7 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
     }
 
     /* paranoid checks */
-    if( hWnd == GetDesktopWindow32() || hWnd == hwndActive ) goto CLEANUP;
+    if( hWnd == GetDesktopWindow() || hWnd == hwndActive ) goto CLEANUP;
 
 /*  if (wndPtr && (GetFastQueue() != wndPtr->hmemTaskQ))
  *	return 0;
@@ -1569,18 +1569,18 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
     }
 
     /* set prev active wnd to current active wnd and send notification */
-    if ((hwndPrevActive = hwndActive) && IsWindow32(hwndPrevActive))
+    if ((hwndPrevActive = hwndActive) && IsWindow(hwndPrevActive))
     {
         MESSAGEQUEUE *pTempActiveQueue = 0;
         
-        if (!SendMessage32A( hwndPrevActive, WM_NCACTIVATE, FALSE, 0 ))
+        if (!SendMessageA( hwndPrevActive, WM_NCACTIVATE, FALSE, 0 ))
         {
 	    if (GetSysModalWindow16() != hWnd) goto CLEANUP;
 	    /* disregard refusal if hWnd is sysmodal */
         }
 
 #if 1
-	SendMessage32A( hwndPrevActive, WM_ACTIVATE,
+	SendMessageA( hwndPrevActive, WM_ACTIVATE,
                         MAKEWPARAM( WA_INACTIVE, wIconized ),
                         (LPARAM)hWnd );
 #else
@@ -1614,7 +1614,7 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
 	SendMessage16((HWND16)-1, WM_PALETTEISCHANGING, (WPARAM16)hWnd, 0L );
 
     /* if prev wnd is minimized redraw icon title */
-    if( IsIconic32( hwndPrevActive ) ) WINPOS_RedrawIconTitle(hwndPrevActive);
+    if( IsIconic( hwndPrevActive ) ) WINPOS_RedrawIconTitle(hwndPrevActive);
 
     /* managed windows will get ConfigureNotify event */  
     if (wndPtr && !(wndPtr->dwStyle & WS_CHILD) && !(wndPtr->flags & WIN_MANAGED))
@@ -1624,9 +1624,9 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
 	    if (wndTemp->dwStyle & WS_VISIBLE) break;
 
 	if( wndTemp != wndPtr )
-	    SetWindowPos32(hWnd, HWND_TOP, 0,0,0,0, 
+	    SetWindowPos(hWnd, HWND_TOP, 0,0,0,0, 
 			   SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE );
-        if (!IsWindow32(hWnd))  goto CLEANUP;
+        if (!IsWindow(hWnd))  goto CLEANUP;
     }
 
     /* Get a handle to the new active queue */
@@ -1641,7 +1641,7 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
         {
             for (ppWnd = list; *ppWnd; ppWnd++)
             {
-                if (!IsWindow32( (*ppWnd)->hwndSelf )) continue;
+                if (!IsWindow( (*ppWnd)->hwndSelf )) continue;
 
                 if ((*ppWnd)->hmemTaskQ == hOldActiveQueue)
                    SendMessage16( (*ppWnd)->hwndSelf, WM_ACTIVATEAPP,
@@ -1656,7 +1656,7 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
         {
             for (ppWnd = list; *ppWnd; ppWnd++)
             {
-                if (!IsWindow32( (*ppWnd)->hwndSelf )) continue;
+                if (!IsWindow( (*ppWnd)->hwndSelf )) continue;
 
                 if ((*ppWnd)->hmemTaskQ == hNewActiveQueue)
                    SendMessage16( (*ppWnd)->hwndSelf, WM_ACTIVATEAPP,
@@ -1665,7 +1665,7 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
             HeapFree( SystemHeap, 0, list );
         }
         
-	if (!IsWindow32(hWnd)) goto CLEANUP;
+	if (!IsWindow(hWnd)) goto CLEANUP;
     }
 
     if (hWnd)
@@ -1677,9 +1677,9 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
         wndTemp->hwndLastActive = hWnd;
 
         wIconized = HIWORD(wndTemp->dwStyle & WS_MINIMIZE);
-        SendMessage32A( hWnd, WM_NCACTIVATE, TRUE, 0 );
+        SendMessageA( hWnd, WM_NCACTIVATE, TRUE, 0 );
 #if 1
-        SendMessage32A( hWnd, WM_ACTIVATE,
+        SendMessageA( hWnd, WM_ACTIVATE,
 		 MAKEWPARAM( (fMouse) ? WA_CLICKACTIVE : WA_ACTIVE, wIconized),
 		 (LPARAM)hwndPrevActive );
 #else
@@ -1687,13 +1687,13 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
                       MAKELPARAM( (HWND16)hwndPrevActive, wIconized) );
 #endif
 
-        if( !IsWindow32(hWnd) ) goto CLEANUP;
+        if( !IsWindow(hWnd) ) goto CLEANUP;
     }
 
     /* change focus if possible */
-    if( fChangeFocus && GetFocus32() )
-	if( WIN_GetTopParent(GetFocus32()) != hwndActive )
-	    FOCUS_SwitchFocus( pNewActiveQueue, GetFocus32(),
+    if( fChangeFocus && GetFocus() )
+	if( WIN_GetTopParent(GetFocus()) != hwndActive )
+	    FOCUS_SwitchFocus( pNewActiveQueue, GetFocus(),
 			       (wndPtr && (wndPtr->dwStyle & WS_MINIMIZE))?
 			       0:
 			       hwndActive
@@ -1703,7 +1703,7 @@ BOOL32 WINPOS_SetActiveWindow( HWND32 hWnd, BOOL32 fMouse, BOOL32 fChangeFocus)
         (*wndPtr->pDriver->pForceWindowRaise)(wndPtr);
 
     /* if active wnd is minimized redraw icon title */
-    if( IsIconic32(hwndActive) ) WINPOS_RedrawIconTitle(hwndActive);
+    if( IsIconic(hwndActive) ) WINPOS_RedrawIconTitle(hwndActive);
 
     bRet = 1;  // Success
     
@@ -1722,11 +1722,11 @@ CLEANUP:
  *
  *  Activates window other than pWnd.
  */
-BOOL32 WINPOS_ActivateOtherWindow(WND* pWnd)
+BOOL WINPOS_ActivateOtherWindow(WND* pWnd)
 {
-  BOOL32	bRet = 0;
+  BOOL	bRet = 0;
   WND*  	pWndTo = NULL;
-    HWND32       hwndActive = 0;
+    HWND       hwndActive = 0;
 
     /* Get current active window from the active queue */
     if ( hActiveQueue )
@@ -1776,10 +1776,10 @@ BOOL32 WINPOS_ActivateOtherWindow(WND* pWnd)
  *	   WINPOS_ChangeActiveWindow
  *
  */
-BOOL32 WINPOS_ChangeActiveWindow( HWND32 hWnd, BOOL32 mouseMsg )
+BOOL WINPOS_ChangeActiveWindow( HWND hWnd, BOOL mouseMsg )
 {
     WND *wndPtr = WIN_FindWndPtr(hWnd);
-    HWND32 hwndActive = 0;
+    HWND hwndActive = 0;
 
     /* Get current active window from the active queue */
     if ( hActiveQueue )
@@ -1798,7 +1798,7 @@ BOOL32 WINPOS_ChangeActiveWindow( HWND32 hWnd, BOOL32 mouseMsg )
 
     /* child windows get WM_CHILDACTIVATE message */
     if( (wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD )
-	return SendMessage32A(hWnd, WM_CHILDACTIVATE, 0, 0L);
+	return SendMessageA(hWnd, WM_CHILDACTIVATE, 0, 0L);
 
         /* owned popups imply owner activation - not sure */
     if ((wndPtr->dwStyle & WS_POPUP) && wndPtr->owner &&
@@ -1830,13 +1830,13 @@ BOOL32 WINPOS_ChangeActiveWindow( HWND32 hWnd, BOOL32 mouseMsg )
  * oldWindowRect, oldClientRect and winpos must be non-NULL only
  * when calcValidRect is TRUE.
  */
-LONG WINPOS_SendNCCalcSize( HWND32 hwnd, BOOL32 calcValidRect,
-                            RECT32 *newWindowRect, RECT32 *oldWindowRect,
-                            RECT32 *oldClientRect, WINDOWPOS32 *winpos,
-                            RECT32 *newClientRect )
+LONG WINPOS_SendNCCalcSize( HWND hwnd, BOOL calcValidRect,
+                            RECT *newWindowRect, RECT *oldWindowRect,
+                            RECT *oldClientRect, WINDOWPOS *winpos,
+                            RECT *newClientRect )
 {
-    NCCALCSIZE_PARAMS32 params;
-    WINDOWPOS32 winposCopy;
+    NCCALCSIZE_PARAMS params;
+    WINDOWPOS winposCopy;
     LONG result;
 
     params.rgrc[0] = *newWindowRect;
@@ -1847,7 +1847,7 @@ LONG WINPOS_SendNCCalcSize( HWND32 hwnd, BOOL32 calcValidRect,
 	params.rgrc[2] = *oldClientRect;
 	params.lppos = &winposCopy;
     }
-    result = SendMessage32A( hwnd, WM_NCCALCSIZE, calcValidRect,
+    result = SendMessageA( hwnd, WM_NCCALCSIZE, calcValidRect,
                              (LPARAM)&params );
     TRACE(win, "%d,%d-%d,%d\n",
                  params.rgrc[0].left, params.rgrc[0].top,
@@ -1864,7 +1864,7 @@ LONG WINPOS_SendNCCalcSize( HWND32 hwnd, BOOL32 calcValidRect,
  */
 LONG WINPOS_HandleWindowPosChanging16( WND *wndPtr, WINDOWPOS16 *winpos )
 {
-    POINT32 maxSize, minTrack;
+    POINT maxSize, minTrack;
     if (winpos->flags & SWP_NOSIZE) return 0;
     if ((wndPtr->dwStyle & WS_THICKFRAME) ||
 	((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) == 0))
@@ -1887,9 +1887,9 @@ LONG WINPOS_HandleWindowPosChanging16( WND *wndPtr, WINDOWPOS16 *winpos )
  *
  * Default handling for a WM_WINDOWPOSCHANGING. Called from DefWindowProc().
  */
-LONG WINPOS_HandleWindowPosChanging32( WND *wndPtr, WINDOWPOS32 *winpos )
+LONG WINPOS_HandleWindowPosChanging( WND *wndPtr, WINDOWPOS *winpos )
 {
-    POINT32 maxSize;
+    POINT maxSize;
     if (winpos->flags & SWP_NOSIZE) return 0;
     if ((wndPtr->dwStyle & WS_THICKFRAME) ||
 	((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) == 0))
@@ -1908,9 +1908,9 @@ LONG WINPOS_HandleWindowPosChanging32( WND *wndPtr, WINDOWPOS32 *winpos )
  * Move a window in Z order, invalidating everything that needs it.
  * Only necessary for windows without associated X window.
  */
-static void WINPOS_MoveWindowZOrder( HWND32 hwnd, HWND32 hwndAfter )
+static void WINPOS_MoveWindowZOrder( HWND hwnd, HWND hwndAfter )
 {
-    BOOL32 movingUp;
+    BOOL movingUp;
     WND *pWndAfter, *pWndCur, *wndPtr = WIN_FindWndPtr( hwnd );
 
     /* We have two possible cases:
@@ -1949,11 +1949,11 @@ static void WINPOS_MoveWindowZOrder( HWND32 hwnd, HWND32 hwndAfter )
         pWndCur = wndPtr->next;
         while (pWndCur != pWndPrevAfter)
         {
-            RECT32 rect = { pWndCur->rectWindow.left,
+            RECT rect = { pWndCur->rectWindow.left,
 			    pWndCur->rectWindow.top,
 			    pWndCur->rectWindow.right,
 			    pWndCur->rectWindow.bottom };
-            OffsetRect32( &rect, -wndPtr->rectClient.left,
+            OffsetRect( &rect, -wndPtr->rectClient.left,
                           -wndPtr->rectClient.top );
             PAINT_RedrawWindow( hwnd, &rect, 0, RDW_INVALIDATE | RDW_ALLCHILDREN |
                               RDW_FRAME | RDW_ERASE, 0 );
@@ -1967,11 +1967,11 @@ static void WINPOS_MoveWindowZOrder( HWND32 hwnd, HWND32 hwndAfter )
         WIN_LinkWindow( hwnd, hwndAfter );
         while (pWndCur != wndPtr)
         {
-            RECT32 rect = { pWndCur->rectWindow.left,
+            RECT rect = { pWndCur->rectWindow.left,
                             pWndCur->rectWindow.top,
                             pWndCur->rectWindow.right,
                             pWndCur->rectWindow.bottom };
-            OffsetRect32( &rect, -pWndCur->rectClient.left,
+            OffsetRect( &rect, -pWndCur->rectClient.left,
                           -pWndCur->rectClient.top );
             PAINT_RedrawWindow( pWndCur->hwndSelf, &rect, 0, RDW_INVALIDATE |
                               RDW_ALLCHILDREN | RDW_FRAME | RDW_ERASE, 0 );
@@ -1986,7 +1986,7 @@ static void WINPOS_MoveWindowZOrder( HWND32 hwnd, HWND32 hwndAfter )
  * fix Z order taking into account owned popups -
  * basically we need to maintain them above the window that owns them
  */
-HWND32 WINPOS_ReorderOwnedPopups(HWND32 hwndInsertAfter,WND* wndPtr,WORD flags)
+HWND WINPOS_ReorderOwnedPopups(HWND hwndInsertAfter,WND* wndPtr,WORD flags)
 {
  WND* 	w = WIN_GetDesktop()->child;
 
@@ -1994,7 +1994,7 @@ HWND32 WINPOS_ReorderOwnedPopups(HWND32 hwndInsertAfter,WND* wndPtr,WORD flags)
   {
    /* implement "local z-order" between the top and owner window */
 
-     HWND32 hwndLocalPrev = HWND_TOP;
+     HWND hwndLocalPrev = HWND_TOP;
 
      if( hwndInsertAfter != HWND_TOP )
      {
@@ -2017,7 +2017,7 @@ HWND32 WINPOS_ReorderOwnedPopups(HWND32 hwndInsertAfter,WND* wndPtr,WORD flags)
 
     if( w->dwStyle & WS_POPUP && w->owner == wndPtr )
     {
-      SetWindowPos32(w->hwndSelf, hwndInsertAfter, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE |
+      SetWindowPos(w->hwndSelf, hwndInsertAfter, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE |
                      SWP_NOACTIVATE | SWP_NOSENDCHANGING | SWP_DEFERERASE);
       hwndInsertAfter = w->hwndSelf;
     }
@@ -2041,12 +2041,12 @@ HWND32 WINPOS_ReorderOwnedPopups(HWND32 hwndInsertAfter,WND* wndPtr,WORD flags)
  * FIXME: Move visible and update regions to the same coordinate system
  *	 (either parent client or window). This is a lot of work though.
  */
-static UINT32 WINPOS_SizeMoveClean( WND* Wnd, HRGN32 oldVisRgn,
-                                    LPRECT32 lpOldWndRect,
-                                    LPRECT32 lpOldClientRect, UINT32 uFlags )
+static UINT WINPOS_SizeMoveClean( WND* Wnd, HRGN oldVisRgn,
+                                    LPRECT lpOldWndRect,
+                                    LPRECT lpOldClientRect, UINT uFlags )
 {
- HRGN32 newVisRgn = DCE_GetVisRgn(Wnd->hwndSelf,DCX_WINDOW | DCX_CLIPSIBLINGS,0,0);
- HRGN32 dirtyRgn = CreateRectRgn32(0,0,0,0);
+ HRGN newVisRgn = DCE_GetVisRgn(Wnd->hwndSelf,DCX_WINDOW | DCX_CLIPSIBLINGS,0,0);
+ HRGN dirtyRgn = CreateRectRgn(0,0,0,0);
  int  other, my;
 
  TRACE(win,"cleaning up...new wnd=(%i %i-%i %i) old wnd=(%i %i-%i %i)\n",
@@ -2064,28 +2064,28 @@ static UINT32 WINPOS_SizeMoveClean( WND* Wnd, HRGN32 oldVisRgn,
      (lpOldWndRect->bottom - lpOldWndRect->top) != (Wnd->rectWindow.bottom - Wnd->rectWindow.top) )
      uFlags |= SMC_DRAWFRAME;
 
- CombineRgn32( dirtyRgn, newVisRgn, 0, RGN_COPY);
+ CombineRgn( dirtyRgn, newVisRgn, 0, RGN_COPY);
 
  if( !(uFlags & SMC_NOCOPY) )
-   CombineRgn32( newVisRgn, newVisRgn, oldVisRgn, RGN_AND ); 
+   CombineRgn( newVisRgn, newVisRgn, oldVisRgn, RGN_AND ); 
 
  /* map regions to the parent client area */
  
- OffsetRgn32( dirtyRgn, Wnd->rectWindow.left, Wnd->rectWindow.top );
- OffsetRgn32( oldVisRgn, lpOldWndRect->left, lpOldWndRect->top );
+ OffsetRgn( dirtyRgn, Wnd->rectWindow.left, Wnd->rectWindow.top );
+ OffsetRgn( oldVisRgn, lpOldWndRect->left, lpOldWndRect->top );
 
  /* compute invalidated region outside Wnd - (in client coordinates of the parent window) */
 
- other = CombineRgn32(dirtyRgn, oldVisRgn, dirtyRgn, RGN_DIFF);
+ other = CombineRgn(dirtyRgn, oldVisRgn, dirtyRgn, RGN_DIFF);
 
  /* map visible region to the Wnd client area */
 
- OffsetRgn32( newVisRgn, Wnd->rectWindow.left - Wnd->rectClient.left,
+ OffsetRgn( newVisRgn, Wnd->rectWindow.left - Wnd->rectClient.left,
                          Wnd->rectWindow.top - Wnd->rectClient.top );
 
  /* substract previously invalidated region from the Wnd visible region */
 
- my =  (Wnd->hrgnUpdate > 1) ? CombineRgn32( newVisRgn, newVisRgn,
+ my =  (Wnd->hrgnUpdate > 1) ? CombineRgn( newVisRgn, newVisRgn,
                                              Wnd->hrgnUpdate, RGN_DIFF)
                              : COMPLEXREGION;
 
@@ -2099,9 +2099,9 @@ static UINT32 WINPOS_SizeMoveClean( WND* Wnd, HRGN32 oldVisRgn,
    }
  else			/* bitblt old client area */
    { 
-     HDC32 hDC;
+     HDC hDC;
      int   update;
-     HRGN32 updateRgn;
+     HRGN updateRgn;
      int   xfrom,yfrom,xto,yto,width,height;
 
      if( uFlags & SMC_DRAWFRAME )
@@ -2111,9 +2111,9 @@ static UINT32 WINPOS_SizeMoveClean( WND* Wnd, HRGN32 oldVisRgn,
          xfrom = lpOldClientRect->left; yfrom = lpOldClientRect->top;
          xto = Wnd->rectClient.left; yto = Wnd->rectClient.top;
          width = lpOldClientRect->right - xfrom; height = lpOldClientRect->bottom - yfrom;
-	 updateRgn = CreateRectRgn32( 0, 0, width, height );
-	 CombineRgn32( newVisRgn, newVisRgn, updateRgn, RGN_AND );
-	 SetRectRgn32( updateRgn, 0, 0, Wnd->rectClient.right - xto,
+	 updateRgn = CreateRectRgn( 0, 0, width, height );
+	 CombineRgn( newVisRgn, newVisRgn, updateRgn, RGN_AND );
+	 SetRectRgn( updateRgn, 0, 0, Wnd->rectClient.right - xto,
                        Wnd->rectClient.bottom - yto );
        }
      else
@@ -2121,17 +2121,17 @@ static UINT32 WINPOS_SizeMoveClean( WND* Wnd, HRGN32 oldVisRgn,
          xfrom = lpOldWndRect->left; yfrom = lpOldWndRect->top;
          xto = Wnd->rectWindow.left; yto = Wnd->rectWindow.top;
          width = lpOldWndRect->right - xfrom; height = lpOldWndRect->bottom - yfrom;
-	 updateRgn = CreateRectRgn32( xto - Wnd->rectClient.left,
+	 updateRgn = CreateRectRgn( xto - Wnd->rectClient.left,
 				      yto - Wnd->rectClient.top,
 				Wnd->rectWindow.right - Wnd->rectClient.left,
 			        Wnd->rectWindow.bottom - Wnd->rectClient.top );
        }
 
-     CombineRgn32( newVisRgn, newVisRgn, updateRgn, RGN_AND );
+     CombineRgn( newVisRgn, newVisRgn, updateRgn, RGN_AND );
 
      /* substract new visRgn from target rect to get a region that won't be copied */
 
-     update = CombineRgn32( updateRgn, updateRgn, newVisRgn, RGN_DIFF );
+     update = CombineRgn( updateRgn, updateRgn, newVisRgn, RGN_DIFF );
 
      /* Blt valid bits using parent window DC */
 
@@ -2140,22 +2140,22 @@ static UINT32 WINPOS_SizeMoveClean( WND* Wnd, HRGN32 oldVisRgn,
 	 
 	 /* compute clipping region in parent client coordinates */
 
-	 OffsetRgn32( newVisRgn, Wnd->rectClient.left, Wnd->rectClient.top );
-	 CombineRgn32( oldVisRgn, oldVisRgn, newVisRgn, RGN_OR );
+	 OffsetRgn( newVisRgn, Wnd->rectClient.left, Wnd->rectClient.top );
+	 CombineRgn( oldVisRgn, oldVisRgn, newVisRgn, RGN_OR );
 
-         hDC = GetDCEx32( Wnd->parent->hwndSelf, oldVisRgn,
+         hDC = GetDCEx( Wnd->parent->hwndSelf, oldVisRgn,
                           DCX_KEEPCLIPRGN | DCX_INTERSECTRGN |
                           DCX_CACHE | DCX_CLIPSIBLINGS);
 
-         BitBlt32( hDC, xto, yto, width, height, hDC, xfrom, yfrom, SRCCOPY );
-         ReleaseDC32( Wnd->parent->hwndSelf, hDC); 
+         BitBlt( hDC, xto, yto, width, height, hDC, xfrom, yfrom, SRCCOPY );
+         ReleaseDC( Wnd->parent->hwndSelf, hDC); 
        }
 
      if( update != NULLREGION )
          PAINT_RedrawWindow( Wnd->hwndSelf, NULL, updateRgn, RDW_INVALIDATE |
                          RDW_FRAME | RDW_ALLCHILDREN | RDW_ERASE, RDW_C_USEHRGN );
      else if( uFlags & SMC_DRAWFRAME ) Wnd->flags |= WIN_NEEDS_NCPAINT;
-     DeleteObject32( updateRgn );
+     DeleteObject( updateRgn );
    }
 
  /* erase uncovered areas */
@@ -2163,8 +2163,8 @@ static UINT32 WINPOS_SizeMoveClean( WND* Wnd, HRGN32 oldVisRgn,
  if( !(uFlags & SMC_NOPARENTERASE) && (other != NULLREGION ) )
       PAINT_RedrawWindow( Wnd->parent->hwndSelf, NULL, dirtyRgn,
                         RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_ERASE, RDW_C_USEHRGN );
- DeleteObject32(dirtyRgn);
- DeleteObject32(newVisRgn);
+ DeleteObject(dirtyRgn);
+ DeleteObject(newVisRgn);
  return uFlags;
 }
 
@@ -2174,24 +2174,24 @@ static UINT32 WINPOS_SizeMoveClean( WND* Wnd, HRGN32 oldVisRgn,
 BOOL16 WINAPI SetWindowPos16( HWND16 hwnd, HWND16 hwndInsertAfter,
                               INT16 x, INT16 y, INT16 cx, INT16 cy, WORD flags)
 {
-    return SetWindowPos32(hwnd,(INT32)(INT16)hwndInsertAfter,x,y,cx,cy,flags);
+    return SetWindowPos(hwnd,(INT)(INT16)hwndInsertAfter,x,y,cx,cy,flags);
 }
 
 /***********************************************************************
  *           SetWindowPos   (USER32.520)
  */
-BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
-                              INT32 x, INT32 y, INT32 cx, INT32 cy, WORD flags)
+BOOL WINAPI SetWindowPos( HWND hwnd, HWND hwndInsertAfter,
+                              INT x, INT y, INT cx, INT cy, WORD flags)
 {
-    WINDOWPOS32 winpos;
+    WINDOWPOS winpos;
     WND *	wndPtr;
-    RECT32 	newWindowRect, newClientRect, oldWindowRect;
-    HRGN32	visRgn = 0;
-    HWND32	tempInsertAfter= 0;
+    RECT 	newWindowRect, newClientRect, oldWindowRect;
+    HRGN	visRgn = 0;
+    HWND	tempInsertAfter= 0;
     int 	result = 0;
-    UINT32 	uFlags = 0;
-    BOOL32      resync = FALSE;
-    HWND32      hwndActive = 0;
+    UINT 	uFlags = 0;
+    BOOL      resync = FALSE;
+    HWND      hwndActive = 0;
 
     /* Get current active window from the active queue */
     if ( hActiveQueue )
@@ -2208,7 +2208,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
 						 hwnd, x, y, x+cx, y+cy, flags);  
       /* Check window handle */
 
-    if (hwnd == GetDesktopWindow32()) return FALSE;
+    if (hwnd == GetDesktopWindow()) return FALSE;
     if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
 
     if(wndPtr->dwStyle & WS_VISIBLE)
@@ -2285,7 +2285,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
       /* Send WM_WINDOWPOSCHANGING message */
 
     if (!(winpos.flags & SWP_NOSENDCHANGING))
-	SendMessage32A( hwnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)&winpos );
+	SendMessageA( hwnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)&winpos );
 
       /* Calculate new position and size */
 
@@ -2305,7 +2305,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
         newWindowRect.right  += winpos.x - wndPtr->rectWindow.left;
         newWindowRect.bottom += winpos.y - wndPtr->rectWindow.top;
 
-	OffsetRect32( &newClientRect, winpos.x - wndPtr->rectWindow.left, 
+	OffsetRect( &newClientRect, winpos.x - wndPtr->rectWindow.left, 
                                       winpos.y - wndPtr->rectWindow.top );
     }
 
@@ -2367,9 +2367,9 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
 					 wndPtr->dwStyle & WS_VISIBLE) || 
 	(flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW)) ) 
     {
-        RECT32 rect;
+        RECT rect;
 
-        UnionRect32(&rect, &newWindowRect, &wndPtr->rectWindow);
+        UnionRect(&rect, &newWindowRect, &wndPtr->rectWindow);
 	DCE_InvalidateDCE(wndPtr, &rect);
     }
 
@@ -2379,7 +2379,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
 
     if (X11DRV_WND_GetXWindow(wndPtr))
     {
-        RECT32 oldClientRect = wndPtr->rectClient;
+        RECT oldClientRect = wndPtr->rectClient;
 
         tempInsertAfter = winpos.hwndInsertAfter;
 
@@ -2418,7 +2418,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
 	      if( winpos.flags & SWP_FRAMECHANGED )
 	      {
 		WORD wErase = 0;
-		RECT32 rect;
+		RECT rect;
 
 	        if( newClientRect.right > oldClientRect.right ) /* redraw exposed client area on the right */
                 {
@@ -2449,7 +2449,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
     }
     else /* not an X window */
     {
-	RECT32 oldClientRect = wndPtr->rectClient;
+	RECT oldClientRect = wndPtr->rectClient;
 
         wndPtr->rectWindow = newWindowRect;
         wndPtr->rectClient = newClientRect;
@@ -2477,7 +2477,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
 		if( winpos.flags & SWP_NOZORDER ) uFlags |= SMC_NOPARENTERASE;
 	    }
 	}
-        DeleteObject32(visRgn);
+        DeleteObject(visRgn);
     }
 
     if (flags & SWP_SHOWWINDOW)
@@ -2485,7 +2485,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
 	wndPtr->dwStyle |= WS_VISIBLE;
         if (X11DRV_WND_GetXWindow(wndPtr))
         {
-	    HWND32 focus, curr;
+	    HWND focus, curr;
 
 	    wndPtr->pDriver->pSetWindowPos(wndPtr, &winpos, uFlags & SMC_SETXPOS );
 	    if( uFlags & SMC_SETXPOS )
@@ -2496,7 +2496,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
             if (wndPtr->flags & WIN_MANAGED) resync = TRUE;
 
 	    /* If focus was set to an unmapped window, reset X focus now */
-	    focus = curr = GetFocus32();
+	    focus = curr = GetFocus();
 	    while (curr) {
 		if (curr == hwnd) {
 		    WND *pFocus = WIN_FindWndPtr( focus );
@@ -2504,7 +2504,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
 			pFocus->pDriver->pSetFocus(pFocus);
 		    break;
 		}
-		curr = GetParent32(curr);
+		curr = GetParent(curr);
 	    }
         }
         else
@@ -2535,7 +2535,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
 	    uFlags |= SMC_NOPARENTERASE;
         }
 
-	if (hwnd == CARET_GetHwnd()) DestroyCaret32();
+	if (hwnd == CARET_GetHwnd()) DestroyCaret();
 
         /* FIXME: This will cause the window to be activated irrespective
          * of whether it is owned by the same thread.
@@ -2555,7 +2555,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
     if (X11DRV_WND_GetXWindow(wndPtr))
         EVENT_Synchronize();  /* Wait for all expose events */
 
-    if (!GetCapture32() && ((wndPtr->dwStyle & WS_VISIBLE) || (flags & SWP_HIDEWINDOW)))
+    if (!GetCapture() && ((wndPtr->dwStyle & WS_VISIBLE) || (flags & SWP_HIDEWINDOW)))
         EVENT_DummyMotionNotify(); /* Simulate a mouse event to set the cursor */
 
     if (!(flags & SWP_DEFERERASE) && !(uFlags & SMC_NOPARENTERASE) )
@@ -2571,7 +2571,7 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
         (((winpos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) && 
          !(winpos.flags & SWP_NOSENDCHANGING)) )
     {
-        SendMessage32A( winpos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)&winpos );
+        SendMessageA( winpos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)&winpos );
         if (resync) EVENT_Synchronize ();
     }
 
@@ -2584,20 +2584,20 @@ BOOL32 WINAPI SetWindowPos32( HWND32 hwnd, HWND32 hwndInsertAfter,
  */
 HDWP16 WINAPI BeginDeferWindowPos16( INT16 count )
 {
-    return BeginDeferWindowPos32( count );
+    return BeginDeferWindowPos( count );
 }
 
 
 /***********************************************************************
  *           BeginDeferWindowPos32   (USER32.9)
  */
-HDWP32 WINAPI BeginDeferWindowPos32( INT32 count )
+HDWP WINAPI BeginDeferWindowPos( INT count )
 {
-    HDWP32 handle;
+    HDWP handle;
     DWP *pDWP;
 
     if (count <= 0) return 0;
-    handle = USER_HEAP_ALLOC( sizeof(DWP) + (count-1)*sizeof(WINDOWPOS32) );
+    handle = USER_HEAP_ALLOC( sizeof(DWP) + (count-1)*sizeof(WINDOWPOS) );
     if (!handle) return 0;
     pDWP = (DWP *) USER_HEAP_LIN_ADDR( handle );
     pDWP->actualCount    = 0;
@@ -2616,7 +2616,7 @@ HDWP16 WINAPI DeferWindowPos16( HDWP16 hdwp, HWND16 hwnd, HWND16 hwndAfter,
                                 INT16 x, INT16 y, INT16 cx, INT16 cy,
                                 UINT16 flags )
 {
-    return DeferWindowPos32( hdwp, hwnd, (INT32)(INT16)hwndAfter,
+    return DeferWindowPos( hdwp, hwnd, (INT)(INT16)hwndAfter,
                              x, y, cx, cy, flags );
 }
 
@@ -2624,19 +2624,19 @@ HDWP16 WINAPI DeferWindowPos16( HDWP16 hdwp, HWND16 hwnd, HWND16 hwndAfter,
 /***********************************************************************
  *           DeferWindowPos32   (USER32.128)
  */
-HDWP32 WINAPI DeferWindowPos32( HDWP32 hdwp, HWND32 hwnd, HWND32 hwndAfter,
-                                INT32 x, INT32 y, INT32 cx, INT32 cy,
-                                UINT32 flags )
+HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter,
+                                INT x, INT y, INT cx, INT cy,
+                                UINT flags )
 {
     DWP *pDWP;
     int i;
-    HDWP32 newhdwp = hdwp;
+    HDWP newhdwp = hdwp;
     /* HWND32 parent; */
     WND *pWnd;
 
     pDWP = (DWP *) USER_HEAP_LIN_ADDR( hdwp );
     if (!pDWP) return 0;
-    if (hwnd == GetDesktopWindow32()) return 0;
+    if (hwnd == GetDesktopWindow()) return 0;
 
     if (!(pWnd=WIN_FindWndPtr( hwnd ))) {
         USER_HEAP_FREE( hdwp );
@@ -2689,7 +2689,7 @@ HDWP32 WINAPI DeferWindowPos32( HDWP32 hdwp, HWND32 hwnd, HWND32 hwndAfter,
     if (pDWP->actualCount >= pDWP->suggestedCount)
     {
         newhdwp = USER_HEAP_REALLOC( hdwp,
-                      sizeof(DWP) + pDWP->suggestedCount*sizeof(WINDOWPOS32) );
+                      sizeof(DWP) + pDWP->suggestedCount*sizeof(WINDOWPOS) );
         if (!newhdwp) return 0;
         pDWP = (DWP *) USER_HEAP_LIN_ADDR( newhdwp );
         pDWP->suggestedCount++;
@@ -2711,25 +2711,25 @@ HDWP32 WINAPI DeferWindowPos32( HDWP32 hdwp, HWND32 hwnd, HWND32 hwndAfter,
  */
 BOOL16 WINAPI EndDeferWindowPos16( HDWP16 hdwp )
 {
-    return EndDeferWindowPos32( hdwp );
+    return EndDeferWindowPos( hdwp );
 }
 
 
 /***********************************************************************
  *           EndDeferWindowPos32   (USER32.173)
  */
-BOOL32 WINAPI EndDeferWindowPos32( HDWP32 hdwp )
+BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
 {
     DWP *pDWP;
-    WINDOWPOS32 *winpos;
-    BOOL32 res = TRUE;
+    WINDOWPOS *winpos;
+    BOOL res = TRUE;
     int i;
 
     pDWP = (DWP *) USER_HEAP_LIN_ADDR( hdwp );
     if (!pDWP) return FALSE;
     for (i = 0, winpos = pDWP->winPos; i < pDWP->actualCount; i++, winpos++)
     {
-        if (!(res = SetWindowPos32( winpos->hwnd, winpos->hwndInsertAfter,
+        if (!(res = SetWindowPos( winpos->hwnd, winpos->hwndInsertAfter,
                                     winpos->x, winpos->y, winpos->cx,
                                     winpos->cy, winpos->flags ))) break;
     }
@@ -2741,7 +2741,7 @@ BOOL32 WINAPI EndDeferWindowPos32( HDWP32 hdwp )
 /***********************************************************************
  *           TileChildWindows   (USER.199)
  */
-void WINAPI TileChildWindows( HWND16 parent, WORD action )
+void WINAPI TileChildWindows16( HWND16 parent, WORD action )
 {
     FIXME(win, "(%04x, %d): stub\n", parent, action);
 }
@@ -2749,7 +2749,7 @@ void WINAPI TileChildWindows( HWND16 parent, WORD action )
 /***********************************************************************
  *           CascageChildWindows   (USER.198)
  */
-void WINAPI CascadeChildWindows( HWND16 parent, WORD action )
+void WINAPI CascadeChildWindows16( HWND16 parent, WORD action )
 {
     FIXME(win, "(%04x, %d): stub\n", parent, action);
 }
diff --git a/windows/winproc.c b/windows/winproc.c
index 3cbb3803197..e994b4467bb 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -26,7 +26,7 @@ typedef struct
 {
     BYTE       popl_eax;             /* popl  %eax (return address) */
     BYTE       pushl_func;           /* pushl $proc */
-    WNDPROC32  proc WINE_PACKED;
+    WNDPROC  proc WINE_PACKED;
     BYTE       pushl_eax;            /* pushl %eax */
     WORD       pushw_bp WINE_PACKED; /* pushw %bp */
     BYTE       pushl_thunk;          /* pushl $thunkfrom16 */
@@ -53,7 +53,7 @@ typedef struct
 typedef struct
 {
     BYTE       jmp;                  /* jmp  proc (relative jump) */
-    WNDPROC32  proc WINE_PACKED;
+    WNDPROC  proc WINE_PACKED;
 } WINPROC_JUMP;
 
 typedef union
@@ -67,7 +67,7 @@ typedef struct tagWINDOWPROC
     WINPROC_THUNK         thunk;    /* Thunk */
     WINPROC_JUMP          jmp;      /* Jump */
     struct tagWINDOWPROC *next;     /* Next window proc */
-    UINT32                magic;    /* Magic number */
+    UINT                magic;    /* Magic number */
     WINDOWPROCTYPE        type;     /* Function type */
     WINDOWPROCUSER        user;     /* Function user */
 } WINDOWPROC;
@@ -79,26 +79,26 @@ typedef struct tagWINDOWPROC
           (WNDPROC16)((pproc)->thunk.t_from32.proc) : \
           (WNDPROC16)((pproc)->thunk.t_from16.proc))
 
-static LRESULT WINAPI WINPROC_CallProc32ATo16( WNDPROC16 func, HWND32 hwnd,
-                                               UINT32 msg, WPARAM32 wParam,
+static LRESULT WINAPI WINPROC_CallProc32ATo16( WNDPROC16 func, HWND hwnd,
+                                               UINT msg, WPARAM wParam,
                                                LPARAM lParam );
-static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND32 hwnd,
-                                               UINT32 msg, WPARAM32 wParam,
+static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd,
+                                               UINT msg, WPARAM wParam,
                                                LPARAM lParam );
 static LRESULT WINPROC_CallProc16To32A( HWND16 hwnd, UINT16 msg,
 					WPARAM16 wParam, LPARAM lParam,
-					WNDPROC32 func );
+					WNDPROC func );
 static LRESULT WINPROC_CallProc16To32W( HWND16 hwnd, UINT16 msg,
 					WPARAM16 wParam, LPARAM lParam,
-					WNDPROC32 func );
+					WNDPROC func );
 
-static HANDLE32 WinProcHeap;
+static HANDLE WinProcHeap;
 
 
 /**********************************************************************
  *	     WINPROC_Init
  */
-BOOL32 WINPROC_Init(void)
+BOOL WINPROC_Init(void)
 {
     WinProcHeap = HeapCreate( HEAP_WINE_SEGPTR | HEAP_WINE_CODESEG, 0, 0 );
     if (!WinProcHeap)
@@ -115,8 +115,8 @@ BOOL32 WINPROC_Init(void)
  *
  * Call a 32-bit WndProc.
  */
-static LRESULT WINPROC_CallWndProc32( WNDPROC32 proc, HWND32 hwnd, UINT32 msg,
-                                      WPARAM32 wParam, LPARAM lParam )
+static LRESULT WINPROC_CallWndProc( WNDPROC proc, HWND hwnd, UINT msg,
+                                      WPARAM wParam, LPARAM lParam )
 {
     TRACE(relay, "(wndproc=%p,hwnd=%08x,msg=%s,wp=%08x,lp=%08lx)\n",
                    proc, hwnd, SPY_GetMsgName(msg), wParam, lParam );
@@ -204,7 +204,7 @@ static WINDOWPROC *WINPROC_AllocWinProc( WNDPROC16 func, WINDOWPROCTYPE type,
         case WIN_PROC_32W:
             proc->thunk.t_from16.popl_eax    = 0x58;   /* popl  %eax */
             proc->thunk.t_from16.pushl_func  = 0x68;   /* pushl $proc */
-            proc->thunk.t_from16.proc        = (FARPROC32)func;
+            proc->thunk.t_from16.proc        = (FARPROC)func;
             proc->thunk.t_from16.pushl_eax   = 0x50;   /* pushl %eax */
             proc->thunk.t_from16.pushw_bp    = 0x5566; /* pushw %bp */
             proc->thunk.t_from16.pushl_thunk = 0x68;   /* pushl $thunkfrom16 */
@@ -216,7 +216,7 @@ static WINDOWPROC *WINPROC_AllocWinProc( WNDPROC16 func, WINDOWPROCTYPE type,
             GET_CS(proc->thunk.t_from16.cs);
             proc->jmp.jmp  = 0xe9;
             /* Fixup relative jump */
-            proc->jmp.proc = (WNDPROC32)((DWORD)func -
+            proc->jmp.proc = (WNDPROC)((DWORD)func -
                                                  (DWORD)(&proc->jmp.proc + 1));
             break;
         default:
@@ -229,7 +229,7 @@ static WINDOWPROC *WINPROC_AllocWinProc( WNDPROC16 func, WINDOWPROCTYPE type,
     }
     proc->next  = NULL;
     TRACE(win, "(%08x,%d): returning %08x\n",
-                 (UINT32)func, type, (UINT32)proc );
+                 (UINT)func, type, (UINT)proc );
     return proc;
 }
 
@@ -285,10 +285,10 @@ WNDPROC16 WINPROC_GetProc( HWINDOWPROC proc, WINDOWPROCTYPE type )
  * window is destroyed.
  *
  */
-BOOL32 WINPROC_SetProc( HWINDOWPROC *pFirst, WNDPROC16 func,
+BOOL WINPROC_SetProc( HWINDOWPROC *pFirst, WNDPROC16 func,
                         WINDOWPROCTYPE type, WINDOWPROCUSER user )
 {
-    BOOL32 bRecycle = FALSE;
+    BOOL bRecycle = FALSE;
     WINDOWPROC *proc, **ppPrev;
 
     /* Check if function is already in the list */
@@ -348,7 +348,7 @@ BOOL32 WINPROC_SetProc( HWINDOWPROC *pFirst, WNDPROC16 func,
     /* Add the win proc at the head of the list */
 
     TRACE(win, "(%08x,%08x,%d): res=%08x\n",
-                 (UINT32)*pFirst, (UINT32)func, type, (UINT32)proc );
+                 (UINT)*pFirst, (UINT)func, type, (UINT)proc );
     proc->next  = *(WINDOWPROC **)pFirst;
     *(WINDOWPROC **)pFirst = proc;
     return TRUE;
@@ -366,7 +366,7 @@ void WINPROC_FreeProc( HWINDOWPROC proc, WINDOWPROCUSER user )
     {
         WINDOWPROC *next = ((WINDOWPROC *)proc)->next;
         if (((WINDOWPROC *)proc)->user != user) break;
-        TRACE(win, "freeing %08x\n", (UINT32)proc);
+        TRACE(win, "freeing %08x\n", (UINT)proc);
         HeapFree( WinProcHeap, 0, proc );
         proc = next;
     }
@@ -390,7 +390,7 @@ WINDOWPROCTYPE WINPROC_GetProcType( HWINDOWPROC proc )
  *
  * Return TRUE if the lparam is a string
  */
-BOOL32 WINPROC_TestCBForStr ( HWND32 hwnd )
+BOOL WINPROC_TestCBForStr ( HWND hwnd )
 {	WND * wnd = WIN_FindWndPtr(hwnd); 
 	return ( !(LOWORD(wnd->dwStyle) & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) ||
 	      (LOWORD(wnd->dwStyle) & CBS_HASSTRINGS) );
@@ -400,7 +400,7 @@ BOOL32 WINPROC_TestCBForStr ( HWND32 hwnd )
  *
  * Return TRUE if the lparam is a string
  */
-BOOL32 WINPROC_TestLBForStr ( HWND32 hwnd )
+BOOL WINPROC_TestLBForStr ( HWND hwnd )
 {	WND * wnd = WIN_FindWndPtr(hwnd); 
 	return ( !(LOWORD(wnd->dwStyle) & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) || 
 	    (LOWORD(wnd->dwStyle) & LBS_HASSTRINGS) );
@@ -419,7 +419,7 @@ BOOL32 WINPROC_TestLBForStr ( HWND32 hwnd )
  *  the first four bytes are the handle of the icon 
  *  when the WM_SETTEXT message has been used to set the icon
  */
-INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
+INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM *plparam )
 {
     switch(msg)
     {
@@ -434,25 +434,25 @@ INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
 
     case WM_SETTEXT:
-    case CB_DIR32:
-    case CB_FINDSTRING32:
-    case CB_FINDSTRINGEXACT32:
-    case CB_SELECTSTRING32:
-    case LB_DIR32:
-    case LB_ADDFILE32:
-    case LB_FINDSTRING32:
-    case LB_SELECTSTRING32:
-    case EM_REPLACESEL32:
+    case CB_DIR:
+    case CB_FINDSTRING:
+    case CB_FINDSTRINGEXACT:
+    case CB_SELECTSTRING:
+    case LB_DIR:
+    case LB_ADDFILE:
+    case LB_FINDSTRING:
+    case LB_SELECTSTRING:
+    case EM_REPLACESEL:
         *plparam = (LPARAM)HEAP_strdupAtoW( SystemHeap, 0, (LPCSTR)*plparam );
         return (*plparam ? 1 : -1);
 
     case WM_NCCREATE:
     case WM_CREATE:
         {
-            CREATESTRUCT32W *cs = (CREATESTRUCT32W *)HeapAlloc( SystemHeap, 0,
+            CREATESTRUCTW *cs = (CREATESTRUCTW *)HeapAlloc( SystemHeap, 0,
                                                                 sizeof(*cs) );
             if (!cs) return -1;
-            *cs = *(CREATESTRUCT32W *)*plparam;
+            *cs = *(CREATESTRUCTW *)*plparam;
             if (HIWORD(cs->lpszName))
                 cs->lpszName = HEAP_strdupAtoW( SystemHeap, 0,
                                                 (LPCSTR)cs->lpszName );
@@ -464,10 +464,10 @@ INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
     case WM_MDICREATE:
         {
-            MDICREATESTRUCT32W *cs =
-                (MDICREATESTRUCT32W *)HeapAlloc( SystemHeap, 0, sizeof(*cs) );
+            MDICREATESTRUCTW *cs =
+                (MDICREATESTRUCTW *)HeapAlloc( SystemHeap, 0, sizeof(*cs) );
             if (!cs) return -1;
-            *cs = *(MDICREATESTRUCT32W *)*plparam;
+            *cs = *(MDICREATESTRUCTW *)*plparam;
             if (HIWORD(cs->szClass))
                 cs->szClass = HEAP_strdupAtoW( SystemHeap, 0,
                                                (LPCSTR)cs->szClass );
@@ -479,13 +479,13 @@ INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
 
 /* Listbox */
-    case LB_ADDSTRING32:
-    case LB_INSERTSTRING32:
+    case LB_ADDSTRING:
+    case LB_INSERTSTRING:
 	if ( WINPROC_TestLBForStr( hwnd ))
           *plparam = (LPARAM)HEAP_strdupAtoW( SystemHeap, 0, (LPCSTR)*plparam );
         return (*plparam ? 1 : -1);
 
-    case LB_GETTEXT32:		    /* fixme: fixed sized buffer */
+    case LB_GETTEXT:		    /* fixme: fixed sized buffer */
         { if ( WINPROC_TestLBForStr( hwnd ))
 	  { LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0, 256 * sizeof(WCHAR) + sizeof(LPARAM) );
             if (!ptr) return -1;
@@ -496,13 +496,13 @@ INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
 
 /* Combobox */
-    case CB_ADDSTRING32:
-    case CB_INSERTSTRING32:
+    case CB_ADDSTRING:
+    case CB_INSERTSTRING:
 	if ( WINPROC_TestCBForStr( hwnd ))
           *plparam = (LPARAM)HEAP_strdupAtoW( SystemHeap, 0, (LPCSTR)*plparam );
         return (*plparam ? 1 : -1);
 
-    case CB_GETLBTEXT32:    /* fixme: fixed sized buffer */
+    case CB_GETLBTEXT:    /* fixme: fixed sized buffer */
         { if ( WINPROC_TestCBForStr( hwnd ))
           { LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0, 256 * sizeof(WCHAR) + sizeof(LPARAM) );
             if (!ptr) return -1;
@@ -513,7 +513,7 @@ INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
 
 /* Multiline edit */
-    case EM_GETLINE32:
+    case EM_GETLINE:
         { WORD len = (WORD)*plparam;
 	  LPARAM *ptr = (LPARAM *) HEAP_xalloc( SystemHeap, 0, sizeof(LPARAM) + sizeof (WORD) + len*sizeof(WCHAR) );
           if (!ptr) return -1;
@@ -528,7 +528,7 @@ INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
     case WM_WININICHANGE:
-    case EM_SETPASSWORDCHAR32:
+    case EM_SETPASSWORDCHAR:
         FIXME(msg, "message %s (0x%x) needs translation, please report\n", SPY_GetMsgName(msg), msg );
         return -1;
     default:  /* No translation needed */
@@ -542,7 +542,7 @@ INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
  *
  * Unmap a message that was mapped from Ansi to Unicode.
  */
-void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam )
+void WINPROC_UnmapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
 {
     switch(msg)
     {
@@ -557,7 +557,7 @@ void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
     case WM_NCCREATE:
     case WM_CREATE:
         {
-            CREATESTRUCT32W *cs = (CREATESTRUCT32W *)lParam;
+            CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam;
             if (HIWORD(cs->lpszName))
                 HeapFree( SystemHeap, 0, (LPVOID)cs->lpszName );
             if (HIWORD(cs->lpszClass))
@@ -568,7 +568,7 @@ void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
 
     case WM_MDICREATE:
         {
-            MDICREATESTRUCT32W *cs = (MDICREATESTRUCT32W *)lParam;
+            MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)lParam;
             if (HIWORD(cs->szTitle))
                 HeapFree( SystemHeap, 0, (LPVOID)cs->szTitle );
             if (HIWORD(cs->szClass))
@@ -578,26 +578,26 @@ void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
         break;
 
     case WM_SETTEXT:
-    case CB_DIR32:
-    case CB_FINDSTRING32:
-    case CB_FINDSTRINGEXACT32:
-    case CB_SELECTSTRING32:
-    case LB_DIR32:
-    case LB_ADDFILE32:
-    case LB_FINDSTRING32:
-    case LB_SELECTSTRING32:
-    case EM_REPLACESEL32:
+    case CB_DIR:
+    case CB_FINDSTRING:
+    case CB_FINDSTRINGEXACT:
+    case CB_SELECTSTRING:
+    case LB_DIR:
+    case LB_ADDFILE:
+    case LB_FINDSTRING:
+    case LB_SELECTSTRING:
+    case EM_REPLACESEL:
         HeapFree( SystemHeap, 0, (void *)lParam );
         break;
 
 /* Listbox */
-    case LB_ADDSTRING32:
-    case LB_INSERTSTRING32:
+    case LB_ADDSTRING:
+    case LB_INSERTSTRING:
 	if ( WINPROC_TestLBForStr( hwnd ))
           HeapFree( SystemHeap, 0, (void *)lParam );
         break;
 
-    case LB_GETTEXT32:
+    case LB_GETTEXT:
         { if ( WINPROC_TestLBForStr( hwnd ))
           { LPARAM *ptr = (LPARAM *)lParam - 1;
 	    lstrcpyWtoA( (LPSTR)*ptr, (LPWSTR)(lParam) );
@@ -607,13 +607,13 @@ void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
         break;
 
 /* Combobox */
-    case CB_ADDSTRING32:
-    case CB_INSERTSTRING32:
+    case CB_ADDSTRING:
+    case CB_INSERTSTRING:
 	if ( WINPROC_TestCBForStr( hwnd ))
           HeapFree( SystemHeap, 0, (void *)lParam );
         break;
 
-    case CB_GETLBTEXT32:
+    case CB_GETLBTEXT:
         { if ( WINPROC_TestCBForStr( hwnd ))
 	  { LPARAM *ptr = (LPARAM *)lParam - 1;
             lstrcpyWtoA( (LPSTR)*ptr, (LPWSTR)(lParam) );
@@ -623,7 +623,7 @@ void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
         break;
 
 /* Multiline edit */
-    case EM_GETLINE32:
+    case EM_GETLINE:
         { LPARAM * ptr = (LPARAM *)lParam - 1;  /* get the old lParam */
 	  WORD len = *(WORD *) lParam;
           lstrcpynWtoA( (LPSTR)*ptr , (LPWSTR)lParam, len );
@@ -640,7 +640,7 @@ void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
  * Map a message from Unicode to Ansi.
  * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed.
  */
-INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
+INT WINPROC_MapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM *plparam )
 {   switch(msg)
     {
     case WM_GETTEXT:
@@ -654,25 +654,25 @@ INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
 
     case WM_SETTEXT:
-    case CB_DIR32:
-    case CB_FINDSTRING32:
-    case CB_FINDSTRINGEXACT32:
-    case CB_SELECTSTRING32:
-    case LB_DIR32:
-    case LB_ADDFILE32:
-    case LB_FINDSTRING32:
-    case LB_SELECTSTRING32:
-    case EM_REPLACESEL32:
+    case CB_DIR:
+    case CB_FINDSTRING:
+    case CB_FINDSTRINGEXACT:
+    case CB_SELECTSTRING:
+    case LB_DIR:
+    case LB_ADDFILE:
+    case LB_FINDSTRING:
+    case LB_SELECTSTRING:
+    case EM_REPLACESEL:
         *plparam = (LPARAM)HEAP_strdupWtoA( SystemHeap, 0, (LPCWSTR)*plparam );
         return (*plparam ? 1 : -1);
 
     case WM_NCCREATE:
     case WM_CREATE:
         {
-            CREATESTRUCT32A *cs = (CREATESTRUCT32A *)HeapAlloc( SystemHeap, 0,
+            CREATESTRUCTA *cs = (CREATESTRUCTA *)HeapAlloc( SystemHeap, 0,
                                                                 sizeof(*cs) );
             if (!cs) return -1;
-            *cs = *(CREATESTRUCT32A *)*plparam;
+            *cs = *(CREATESTRUCTA *)*plparam;
             if (HIWORD(cs->lpszName))
                 cs->lpszName  = HEAP_strdupWtoA( SystemHeap, 0,
                                                  (LPCWSTR)cs->lpszName );
@@ -684,10 +684,10 @@ INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
     case WM_MDICREATE:
         {
-            MDICREATESTRUCT32A *cs =
-                (MDICREATESTRUCT32A *)HeapAlloc( SystemHeap, 0, sizeof(*cs) );
+            MDICREATESTRUCTA *cs =
+                (MDICREATESTRUCTA *)HeapAlloc( SystemHeap, 0, sizeof(*cs) );
             if (!cs) return -1;
-            *cs = *(MDICREATESTRUCT32A *)*plparam;
+            *cs = *(MDICREATESTRUCTA *)*plparam;
             if (HIWORD(cs->szTitle))
                 cs->szTitle = HEAP_strdupWtoA( SystemHeap, 0,
                                                (LPCWSTR)cs->szTitle );
@@ -699,13 +699,13 @@ INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
 
 /* Listbox */
-    case LB_ADDSTRING32:
-    case LB_INSERTSTRING32:
+    case LB_ADDSTRING:
+    case LB_INSERTSTRING:
 	if ( WINPROC_TestLBForStr( hwnd ))
           *plparam = (LPARAM)HEAP_strdupWtoA( SystemHeap, 0, (LPCWSTR)*plparam );
         return (*plparam ? 1 : -1);
 
-    case LB_GETTEXT32:			/* fixme: fixed sized buffer */
+    case LB_GETTEXT:			/* fixme: fixed sized buffer */
         { if ( WINPROC_TestLBForStr( hwnd ))
 	  { LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0, 256 + sizeof(LPARAM) );
             if (!ptr) return -1;
@@ -716,13 +716,13 @@ INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
 
 /* Combobox */
-    case CB_ADDSTRING32:
-    case CB_INSERTSTRING32:
+    case CB_ADDSTRING:
+    case CB_INSERTSTRING:
 	if ( WINPROC_TestCBForStr( hwnd ))
           *plparam = (LPARAM)HEAP_strdupWtoA( SystemHeap, 0, (LPCWSTR)*plparam );
         return (*plparam ? 1 : -1);
 
-    case CB_GETLBTEXT32:		/* fixme: fixed sized buffer */
+    case CB_GETLBTEXT:		/* fixme: fixed sized buffer */
         { if ( WINPROC_TestCBForStr( hwnd ))
 	  { LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0, 256 + sizeof(LPARAM) );
             if (!ptr) return -1;
@@ -733,7 +733,7 @@ INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
         return 1;
 
 /* Multiline edit */
-    case EM_GETLINE32:
+    case EM_GETLINE:
         { WORD len = (WORD)*plparam;
 	  LPARAM *ptr = (LPARAM *) HEAP_xalloc( SystemHeap, 0, sizeof(LPARAM) + sizeof (WORD) + len*sizeof(CHAR) );
           if (!ptr) return -1;
@@ -748,7 +748,7 @@ INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
     case WM_WININICHANGE:
-    case EM_SETPASSWORDCHAR32:
+    case EM_SETPASSWORDCHAR:
         FIXME(msg, "message %s (%04x) needs translation, please report\n",SPY_GetMsgName(msg),msg );
         return -1;
     default:  /* No translation needed */
@@ -762,7 +762,7 @@ INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *
  *
  * Unmap a message that was mapped from Unicode to Ansi.
  */
-void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam )
+void WINPROC_UnmapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
 {
     switch(msg)
     {
@@ -775,22 +775,22 @@ void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
         break;
 
     case WM_SETTEXT:
-    case CB_DIR32:
-    case CB_FINDSTRING32:
-    case CB_FINDSTRINGEXACT32:
-    case CB_SELECTSTRING32:
-    case LB_DIR32:
-    case LB_ADDFILE32:
-    case LB_FINDSTRING32:
-    case LB_SELECTSTRING32:
-    case EM_REPLACESEL32:
+    case CB_DIR:
+    case CB_FINDSTRING:
+    case CB_FINDSTRINGEXACT:
+    case CB_SELECTSTRING:
+    case LB_DIR:
+    case LB_ADDFILE:
+    case LB_FINDSTRING:
+    case LB_SELECTSTRING:
+    case EM_REPLACESEL:
         HeapFree( SystemHeap, 0, (void *)lParam );
         break;
 
     case WM_NCCREATE:
     case WM_CREATE:
         {
-            CREATESTRUCT32A *cs = (CREATESTRUCT32A *)lParam;
+            CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam;
             if (HIWORD(cs->lpszName))
                 HeapFree( SystemHeap, 0, (LPVOID)cs->lpszName );
             if (HIWORD(cs->lpszClass))
@@ -801,7 +801,7 @@ void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
 
     case WM_MDICREATE:
         {
-            MDICREATESTRUCT32A *cs = (MDICREATESTRUCT32A *)lParam;
+            MDICREATESTRUCTA *cs = (MDICREATESTRUCTA *)lParam;
             if (HIWORD(cs->szTitle))
                 HeapFree( SystemHeap, 0, (LPVOID)cs->szTitle );
             if (HIWORD(cs->szClass))
@@ -811,13 +811,13 @@ void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
         break;
 
 /* Listbox */
-    case LB_ADDSTRING32:
-    case LB_INSERTSTRING32:
+    case LB_ADDSTRING:
+    case LB_INSERTSTRING:
 	if ( WINPROC_TestLBForStr( hwnd ))
           HeapFree( SystemHeap, 0, (void *)lParam );
         break;
 
-    case LB_GETTEXT32:
+    case LB_GETTEXT:
         { if ( WINPROC_TestLBForStr( hwnd ))
           { LPARAM *ptr = (LPARAM *)lParam - 1;
             lstrcpyAtoW( (LPWSTR)*ptr, (LPSTR)(lParam) );
@@ -827,13 +827,13 @@ void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
         break;
 
 /* Combobox */
-    case CB_ADDSTRING32:
-    case CB_INSERTSTRING32:
+    case CB_ADDSTRING:
+    case CB_INSERTSTRING:
 	if ( WINPROC_TestCBForStr( hwnd ))
           HeapFree( SystemHeap, 0, (void *)lParam );
         break;
 
-    case CB_GETLBTEXT32:
+    case CB_GETLBTEXT:
         { if ( WINPROC_TestCBForStr( hwnd ))
           { LPARAM *ptr = (LPARAM *)lParam - 1;
             lstrcpyAtoW( (LPWSTR)*ptr, (LPSTR)(lParam) );
@@ -843,7 +843,7 @@ void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
         break;
 
 /* Multiline edit */
-    case EM_GETLINE32:
+    case EM_GETLINE:
         { LPARAM * ptr = (LPARAM *)lParam - 1;  /* get the old lparam */
 	  WORD len = *(WORD *)ptr;
           lstrcpynAtoW( (LPWSTR) *ptr, (LPSTR)lParam, len );
@@ -860,11 +860,11 @@ void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM
  * Map a message from 16- to 32-bit Ansi.
  * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed.
  */
-INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
-                             WPARAM32 *pwparam32, LPARAM *plparam )
+INT WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32,
+                             WPARAM *pwparam32, LPARAM *plparam )
 {
-    *pmsg32 = (UINT32)msg16;
-    *pwparam32 = (WPARAM32)wParam16;
+    *pmsg32 = (UINT)msg16;
+    *pwparam32 = (WPARAM)wParam16;
     switch(msg16)
     {
     case WM_ACTIVATE:
@@ -872,23 +872,23 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
     case WM_COMMAND:
     case WM_VKEYTOITEM:
         *pwparam32 = MAKEWPARAM( wParam16, HIWORD(*plparam) );
-        *plparam   = (LPARAM)(HWND32)LOWORD(*plparam);
+        *plparam   = (LPARAM)(HWND)LOWORD(*plparam);
         return 0;
     case WM_HSCROLL:
     case WM_VSCROLL:
         *pwparam32 = MAKEWPARAM( wParam16, LOWORD(*plparam) );
-        *plparam   = (LPARAM)(HWND32)HIWORD(*plparam);
+        *plparam   = (LPARAM)(HWND)HIWORD(*plparam);
         return 0;
     case WM_CTLCOLOR:
     	if ( HIWORD(*plparam) > CTLCOLOR_STATIC ) return -1;
         *pmsg32    = WM_CTLCOLORMSGBOX + HIWORD(*plparam);
-        *pwparam32 = (WPARAM32)(HDC32)wParam16;
-        *plparam   = (LPARAM)(HWND32)LOWORD(*plparam);
+        *pwparam32 = (WPARAM)(HDC)wParam16;
+        *plparam   = (LPARAM)(HWND)LOWORD(*plparam);
         return 0;
     case WM_COMPAREITEM:
         {
             COMPAREITEMSTRUCT16* cis16 = (COMPAREITEMSTRUCT16 *)PTR_SEG_TO_LIN(*plparam);
-            COMPAREITEMSTRUCT32 *cis = (COMPAREITEMSTRUCT32 *)
+            COMPAREITEMSTRUCT *cis = (COMPAREITEMSTRUCT *)
                                         HeapAlloc(SystemHeap, 0, sizeof(*cis));
             if (!cis) return -1;
             cis->CtlType    = cis16->CtlType;
@@ -905,7 +905,7 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
     case WM_DELETEITEM:
         {
             DELETEITEMSTRUCT16* dis16 = (DELETEITEMSTRUCT16 *)PTR_SEG_TO_LIN(*plparam);
-            DELETEITEMSTRUCT32 *dis = (DELETEITEMSTRUCT32 *)
+            DELETEITEMSTRUCT *dis = (DELETEITEMSTRUCT *)
                                         HeapAlloc(SystemHeap, 0, sizeof(*dis));
             if (!dis) return -1;
             dis->CtlType  = dis16->CtlType;
@@ -918,7 +918,7 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
     case WM_MEASUREITEM:
         {
             MEASUREITEMSTRUCT16* mis16 = (MEASUREITEMSTRUCT16 *)PTR_SEG_TO_LIN(*plparam);
-            MEASUREITEMSTRUCT32 *mis = (MEASUREITEMSTRUCT32 *)
+            MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)
                                         HeapAlloc(SystemHeap, 0,
                                                 sizeof(*mis) + sizeof(LPARAM));
             if (!mis) return -1;
@@ -935,7 +935,7 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
     case WM_DRAWITEM:
         {
             DRAWITEMSTRUCT16* dis16 = (DRAWITEMSTRUCT16 *)PTR_SEG_TO_LIN(*plparam);
-            DRAWITEMSTRUCT32 *dis = (DRAWITEMSTRUCT32*)HeapAlloc(SystemHeap, 0,
+            DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT*)HeapAlloc(SystemHeap, 0,
                                                                  sizeof(*dis));
             if (!dis) return -1;
             dis->CtlType    = dis16->CtlType;
@@ -952,7 +952,7 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
         return 1;
     case WM_GETMINMAXINFO:
         {
-            MINMAXINFO32 *mmi = (MINMAXINFO32 *)HeapAlloc( SystemHeap, 0,
+            MINMAXINFO *mmi = (MINMAXINFO *)HeapAlloc( SystemHeap, 0,
                                                 sizeof(*mmi) + sizeof(LPARAM));
             if (!mmi) return -1;
             STRUCT32_MINMAXINFO16to32( (MINMAXINFO16*)PTR_SEG_TO_LIN(*plparam),
@@ -969,8 +969,8 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
         {
             MDICREATESTRUCT16 *cs16 =
                 (MDICREATESTRUCT16 *)PTR_SEG_TO_LIN(*plparam);
-            MDICREATESTRUCT32A *cs =
-                (MDICREATESTRUCT32A *)HeapAlloc( SystemHeap, 0,
+            MDICREATESTRUCTA *cs =
+                (MDICREATESTRUCTA *)HeapAlloc( SystemHeap, 0,
                                                 sizeof(*cs) + sizeof(LPARAM) );
             if (!cs) return -1;
             STRUCT32_MDICREATESTRUCT16to32A( cs16, cs );
@@ -981,25 +981,25 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
         }
         return 1;
     case WM_MDIGETACTIVE:
-        *plparam = (LPARAM)HeapAlloc( SystemHeap, 0, sizeof(BOOL32) );
-        *(BOOL32*)(*plparam) = 0;
+        *plparam = (LPARAM)HeapAlloc( SystemHeap, 0, sizeof(BOOL) );
+        *(BOOL*)(*plparam) = 0;
         return 1;
     case WM_MDISETMENU:
         if(wParam16==TRUE)
            *pmsg32=WM_MDIREFRESHMENU;
-        *pwparam32 = (WPARAM32)(HMENU32)LOWORD(*plparam);
-        *plparam   = (LPARAM)(HMENU32)HIWORD(*plparam);
+        *pwparam32 = (WPARAM)(HMENU)LOWORD(*plparam);
+        *plparam   = (LPARAM)(HMENU)HIWORD(*plparam);
         return 0;
     case WM_MENUCHAR:
     case WM_MENUSELECT:
         *pwparam32 = MAKEWPARAM( wParam16, LOWORD(*plparam) );
-        *plparam   = (LPARAM)(HMENU32)HIWORD(*plparam);
+        *plparam   = (LPARAM)(HMENU)HIWORD(*plparam);
         return 0;
     case WM_MDIACTIVATE:
 	if( *plparam )
 	{
-	    *pwparam32 = (WPARAM32)(HWND32)HIWORD(*plparam);
-	    *plparam   = (LPARAM)(HWND32)LOWORD(*plparam);
+	    *pwparam32 = (WPARAM)(HWND)HIWORD(*plparam);
+	    *plparam   = (LPARAM)(HWND)LOWORD(*plparam);
 	}
 	else /* message sent to MDI client */
 	    *pwparam32 = wParam16;
@@ -1007,16 +1007,16 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
     case WM_NCCALCSIZE:
         {
             NCCALCSIZE_PARAMS16 *nc16;
-            NCCALCSIZE_PARAMS32 *nc;
+            NCCALCSIZE_PARAMS *nc;
 
-            nc = (NCCALCSIZE_PARAMS32 *)HeapAlloc( SystemHeap, 0,
+            nc = (NCCALCSIZE_PARAMS *)HeapAlloc( SystemHeap, 0,
                                                 sizeof(*nc) + sizeof(LPARAM) );
             if (!nc) return -1;
             nc16 = (NCCALCSIZE_PARAMS16 *)PTR_SEG_TO_LIN(*plparam);
             CONV_RECT16TO32( &nc16->rgrc[0], &nc->rgrc[0] );
             if (wParam16)
             {
-                nc->lppos = (WINDOWPOS32 *)HeapAlloc( SystemHeap, 0,
+                nc->lppos = (WINDOWPOS *)HeapAlloc( SystemHeap, 0,
                                                       sizeof(*nc->lppos) );
                 CONV_RECT16TO32( &nc16->rgrc[1], &nc->rgrc[1] );
                 CONV_RECT16TO32( &nc16->rgrc[2], &nc->rgrc[2] );
@@ -1030,7 +1030,7 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
     case WM_CREATE:
         {
             CREATESTRUCT16 *cs16 = (CREATESTRUCT16 *)PTR_SEG_TO_LIN(*plparam);
-            CREATESTRUCT32A *cs = (CREATESTRUCT32A *)HeapAlloc( SystemHeap, 0,
+            CREATESTRUCTA *cs = (CREATESTRUCTA *)HeapAlloc( SystemHeap, 0,
                                                 sizeof(*cs) + sizeof(LPARAM) );
             if (!cs) return -1;
             STRUCT32_CREATESTRUCT16to32A( cs16, cs );
@@ -1044,13 +1044,13 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
         if ((wParam16 == WM_CREATE) || (wParam16 == WM_DESTROY))
         {
             *pwparam32 = MAKEWPARAM( wParam16, HIWORD(*plparam) );
-            *plparam   = (LPARAM)(HWND32)LOWORD(*plparam);
+            *plparam   = (LPARAM)(HWND)LOWORD(*plparam);
         }
         return 0;
     case WM_WINDOWPOSCHANGING:
     case WM_WINDOWPOSCHANGED:
         {
-            WINDOWPOS32 *wp = (WINDOWPOS32 *)HeapAlloc( SystemHeap, 0,
+            WINDOWPOS *wp = (WINDOWPOS *)HeapAlloc( SystemHeap, 0,
                                                 sizeof(*wp) + sizeof(LPARAM) );
             if (!wp) return -1;
             STRUCT32_WINDOWPOS16to32( (WINDOWPOS16 *)PTR_SEG_TO_LIN(*plparam),
@@ -1063,7 +1063,7 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
         if (*plparam)
         {
             LPMSG16 msg16 = (LPMSG16)PTR_SEG_TO_LIN(*plparam);
-            LPMSG32 msg32 = (LPMSG32)HeapAlloc( SystemHeap, 0, sizeof(MSG32) );
+            LPMSG msg32 = (LPMSG)HeapAlloc( SystemHeap, 0, sizeof(MSG) );
 
             if (!msg32) return -1;
             msg32->hwnd = msg16->hwnd;
@@ -1114,7 +1114,7 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
  *
  * Unmap a message that was mapped from 16- to 32-bit Ansi.
  */
-LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam,
+LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
                                  LRESULT result )
 {
     switch(msg)
@@ -1127,7 +1127,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
     case WM_MEASUREITEM:
         {
             MEASUREITEMSTRUCT16 *mis16;
-            MEASUREITEMSTRUCT32 *mis = (MEASUREITEMSTRUCT32 *)lParam;
+            MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam;
             lParam = *(LPARAM *)(mis + 1);
             mis16 = (MEASUREITEMSTRUCT16 *)PTR_SEG_TO_LIN(lParam);
             mis16->itemWidth  = (UINT16)mis->itemWidth;
@@ -1137,7 +1137,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
         break;
     case WM_GETMINMAXINFO:
         {
-            MINMAXINFO32 *mmi = (MINMAXINFO32 *)lParam;
+            MINMAXINFO *mmi = (MINMAXINFO *)lParam;
             lParam = *(LPARAM *)(mmi + 1);
             STRUCT32_MINMAXINFO32to16( mmi,
                                        (MINMAXINFO16 *)PTR_SEG_TO_LIN(lParam));
@@ -1146,7 +1146,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
         break;
     case WM_MDICREATE:
         {
-            MDICREATESTRUCT32A *cs = (MDICREATESTRUCT32A *)lParam;
+            MDICREATESTRUCTA *cs = (MDICREATESTRUCTA *)lParam;
             lParam = *(LPARAM *)(cs + 1);
             STRUCT32_MDICREATESTRUCT32Ato16( cs,
                                  (MDICREATESTRUCT16 *)PTR_SEG_TO_LIN(lParam) );
@@ -1154,13 +1154,13 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
         }
         break;
     case WM_MDIGETACTIVE:
-        result = MAKELONG( LOWORD(result), (BOOL16)(*(BOOL32 *)lParam) );
-        HeapFree( SystemHeap, 0, (BOOL32 *)lParam );
+        result = MAKELONG( LOWORD(result), (BOOL16)(*(BOOL *)lParam) );
+        HeapFree( SystemHeap, 0, (BOOL *)lParam );
         break;
     case WM_NCCALCSIZE:
         {
             NCCALCSIZE_PARAMS16 *nc16;
-            NCCALCSIZE_PARAMS32 *nc = (NCCALCSIZE_PARAMS32 *)lParam;
+            NCCALCSIZE_PARAMS *nc = (NCCALCSIZE_PARAMS *)lParam;
             lParam = *(LPARAM *)(nc + 1);
             nc16 = (NCCALCSIZE_PARAMS16 *)PTR_SEG_TO_LIN(lParam);
             CONV_RECT32TO16( &nc->rgrc[0], &nc16->rgrc[0] );
@@ -1181,7 +1181,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
     case WM_NCCREATE:
     case WM_CREATE:
         {
-            CREATESTRUCT32A *cs = (CREATESTRUCT32A *)lParam;
+            CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam;
             lParam = *(LPARAM *)(cs + 1);
             STRUCT32_CREATESTRUCT32Ato16( cs,
                                     (CREATESTRUCT16 *)PTR_SEG_TO_LIN(lParam) );
@@ -1191,7 +1191,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
     case WM_WINDOWPOSCHANGING:
     case WM_WINDOWPOSCHANGED:
         {
-            WINDOWPOS32 *wp = (WINDOWPOS32 *)lParam;
+            WINDOWPOS *wp = (WINDOWPOS *)lParam;
             lParam = *(LPARAM *)(wp + 1);
             STRUCT32_WINDOWPOS32to16(wp,(WINDOWPOS16 *)PTR_SEG_TO_LIN(lParam));
             HeapFree( SystemHeap, 0, wp );
@@ -1200,7 +1200,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
     case WM_GETDLGCODE:
         if (lParam)
         {
-            LPMSG32 msg32 = (LPMSG32)lParam;
+            LPMSG msg32 = (LPMSG)lParam;
 
             WINPROC_UnmapMsg16To32A( hwnd, msg32->message, msg32->wParam, msg32->lParam,
                                      result);
@@ -1218,8 +1218,8 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
  * Map a message from 16- to 32-bit Unicode.
  * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed.
  */
-INT32 WINPROC_MapMsg16To32W( HWND16 hwnd, UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
-                             WPARAM32 *pwparam32, LPARAM *plparam )
+INT WINPROC_MapMsg16To32W( HWND16 hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32,
+                             WPARAM *pwparam32, LPARAM *plparam )
 {
     switch(msg16)
     {
@@ -1231,10 +1231,10 @@ INT32 WINPROC_MapMsg16To32W( HWND16 hwnd, UINT16 msg16, WPARAM16 wParam16, UINT3
     case WM_CREATE:
         {
             CREATESTRUCT16 *cs16 = (CREATESTRUCT16 *)PTR_SEG_TO_LIN(*plparam);
-            CREATESTRUCT32W *cs = (CREATESTRUCT32W *)HeapAlloc( SystemHeap, 0,
+            CREATESTRUCTW *cs = (CREATESTRUCTW *)HeapAlloc( SystemHeap, 0,
                                                 sizeof(*cs) + sizeof(LPARAM) );
             if (!cs) return -1;
-            STRUCT32_CREATESTRUCT16to32A( cs16, (CREATESTRUCT32A *)cs );
+            STRUCT32_CREATESTRUCT16to32A( cs16, (CREATESTRUCTA *)cs );
             cs->lpszName  = (LPCWSTR)PTR_SEG_TO_LIN(cs16->lpszName);
             cs->lpszClass = (LPCWSTR)PTR_SEG_TO_LIN(cs16->lpszClass);
             if (HIWORD(cs->lpszName))
@@ -1251,11 +1251,11 @@ INT32 WINPROC_MapMsg16To32W( HWND16 hwnd, UINT16 msg16, WPARAM16 wParam16, UINT3
         {
             MDICREATESTRUCT16 *cs16 =
                 (MDICREATESTRUCT16 *)PTR_SEG_TO_LIN(*plparam);
-            MDICREATESTRUCT32W *cs =
-                (MDICREATESTRUCT32W *)HeapAlloc( SystemHeap, 0,
+            MDICREATESTRUCTW *cs =
+                (MDICREATESTRUCTW *)HeapAlloc( SystemHeap, 0,
                                                 sizeof(*cs) + sizeof(LPARAM) );
             if (!cs) return -1;
-            STRUCT32_MDICREATESTRUCT16to32A( cs16, (MDICREATESTRUCT32A *)cs );
+            STRUCT32_MDICREATESTRUCT16to32A( cs16, (MDICREATESTRUCTA *)cs );
             cs->szTitle = (LPCWSTR)PTR_SEG_TO_LIN(cs16->szTitle);
             cs->szClass = (LPCWSTR)PTR_SEG_TO_LIN(cs16->szClass);
             if (HIWORD(cs->szTitle))
@@ -1272,7 +1272,7 @@ INT32 WINPROC_MapMsg16To32W( HWND16 hwnd, UINT16 msg16, WPARAM16 wParam16, UINT3
         if (*plparam)
         {
             LPMSG16 msg16 = (LPMSG16)PTR_SEG_TO_LIN(*plparam);
-            LPMSG32 msg32 = (LPMSG32)HeapAlloc( SystemHeap, 0, sizeof(MSG32) );
+            LPMSG msg32 = (LPMSG)HeapAlloc( SystemHeap, 0, sizeof(MSG) );
 
             if (!msg32) return -1;
             msg32->hwnd = msg16->hwnd;
@@ -1302,7 +1302,7 @@ INT32 WINPROC_MapMsg16To32W( HWND16 hwnd, UINT16 msg16, WPARAM16 wParam16, UINT3
  *
  * Unmap a message that was mapped from 16- to 32-bit Unicode.
  */
-LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam,
+LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
                                  LRESULT result )
 {
     switch(msg)
@@ -1314,9 +1314,9 @@ LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
     case WM_NCCREATE:
     case WM_CREATE:
         {
-            CREATESTRUCT32W *cs = (CREATESTRUCT32W *)lParam;
+            CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam;
             lParam = *(LPARAM *)(cs + 1);
-            STRUCT32_CREATESTRUCT32Ato16( (CREATESTRUCT32A *)cs,
+            STRUCT32_CREATESTRUCT32Ato16( (CREATESTRUCTA *)cs,
                                     (CREATESTRUCT16 *)PTR_SEG_TO_LIN(lParam) );
             if (HIWORD(cs->lpszName))
                 HeapFree( SystemHeap, 0, (LPVOID)cs->lpszName );
@@ -1327,9 +1327,9 @@ LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
         break;
     case WM_MDICREATE:
         {
-            MDICREATESTRUCT32W *cs = (MDICREATESTRUCT32W *)lParam;
+            MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)lParam;
             lParam = *(LPARAM *)(cs + 1);
-            STRUCT32_MDICREATESTRUCT32Ato16( (MDICREATESTRUCT32A *)cs,
+            STRUCT32_MDICREATESTRUCT32Ato16( (MDICREATESTRUCTA *)cs,
                                  (MDICREATESTRUCT16 *)PTR_SEG_TO_LIN(lParam) );
             if (HIWORD(cs->szTitle))
                 HeapFree( SystemHeap, 0, (LPVOID)cs->szTitle );
@@ -1341,7 +1341,7 @@ LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
     case WM_GETDLGCODE:
         if (lParam)
         {
-            LPMSG32 msg32 = (LPMSG32)lParam;
+            LPMSG msg32 = (LPMSG)lParam;
 
             WINPROC_UnmapMsg16To32W( hwnd, msg32->message, msg32->wParam, msg32->lParam,
                                      result);
@@ -1361,7 +1361,7 @@ LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARA
  * Map a message from 32-bit Ansi to 16-bit.
  * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed.
  */
-INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
+INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32,
                              UINT16 *pmsg16, WPARAM16 *pwparam16,
                              LPARAM *plparam )
 {
@@ -1369,126 +1369,126 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
     *pwparam16 = (WPARAM16)LOWORD(wParam32);
     switch(msg32)
     {
-    case BM_GETCHECK32:
-    case BM_SETCHECK32:
-    case BM_GETSTATE32:
-    case BM_SETSTATE32:
-    case BM_SETSTYLE32:
-        *pmsg16 = (UINT16)msg32 + (BM_GETCHECK16 - BM_GETCHECK32);
+    case BM_GETCHECK:
+    case BM_SETCHECK:
+    case BM_GETSTATE:
+    case BM_SETSTATE:
+    case BM_SETSTYLE:
+        *pmsg16 = (UINT16)msg32 + (BM_GETCHECK16 - BM_GETCHECK);
         return 0;
 
-    case EM_GETSEL32:
-    case EM_GETRECT32:
-    case EM_SETRECT32:
-    case EM_SETRECTNP32:
-    case EM_SCROLL32:
-    case EM_LINESCROLL32:
-    case EM_SCROLLCARET32:
-    case EM_GETMODIFY32:
-    case EM_SETMODIFY32:
-    case EM_GETLINECOUNT32:
-    case EM_LINEINDEX32:
-    case EM_SETHANDLE32:
-    case EM_GETHANDLE32:
-    case EM_GETTHUMB32:
-    case EM_LINELENGTH32:
-    case EM_REPLACESEL32:
-    case EM_GETLINE32:
-    case EM_LIMITTEXT32:
-    case EM_CANUNDO32:
-    case EM_UNDO32:
-    case EM_FMTLINES32:
-    case EM_LINEFROMCHAR32:
-    case EM_SETTABSTOPS32:
-    case EM_SETPASSWORDCHAR32:
-    case EM_EMPTYUNDOBUFFER32:
-    case EM_GETFIRSTVISIBLELINE32:
-    case EM_SETREADONLY32:
-    case EM_SETWORDBREAKPROC32:
-    case EM_GETWORDBREAKPROC32:
-    case EM_GETPASSWORDCHAR32:
-        *pmsg16 = (UINT16)msg32 + (EM_GETSEL16 - EM_GETSEL32);
+    case EM_GETSEL:
+    case EM_GETRECT:
+    case EM_SETRECT:
+    case EM_SETRECTNP:
+    case EM_SCROLL:
+    case EM_LINESCROLL:
+    case EM_SCROLLCARET:
+    case EM_GETMODIFY:
+    case EM_SETMODIFY:
+    case EM_GETLINECOUNT:
+    case EM_LINEINDEX:
+    case EM_SETHANDLE:
+    case EM_GETHANDLE:
+    case EM_GETTHUMB:
+    case EM_LINELENGTH:
+    case EM_REPLACESEL:
+    case EM_GETLINE:
+    case EM_LIMITTEXT:
+    case EM_CANUNDO:
+    case EM_UNDO:
+    case EM_FMTLINES:
+    case EM_LINEFROMCHAR:
+    case EM_SETTABSTOPS:
+    case EM_SETPASSWORDCHAR:
+    case EM_EMPTYUNDOBUFFER:
+    case EM_GETFIRSTVISIBLELINE:
+    case EM_SETREADONLY:
+    case EM_SETWORDBREAKPROC:
+    case EM_GETWORDBREAKPROC:
+    case EM_GETPASSWORDCHAR:
+        *pmsg16 = (UINT16)msg32 + (EM_GETSEL16 - EM_GETSEL);
         return 0;
 
-    case LB_CARETOFF32:
-    case LB_CARETON32:
-    case LB_DELETESTRING32:
-    case LB_GETANCHORINDEX32:
-    case LB_GETCARETINDEX32:
-    case LB_GETCOUNT32:
-    case LB_GETCURSEL32:
-    case LB_GETHORIZONTALEXTENT32:
-    case LB_GETITEMDATA32:
-    case LB_GETITEMHEIGHT32:
-    case LB_GETSEL32:
-    case LB_GETSELCOUNT32:
-    case LB_GETTEXTLEN32:
-    case LB_GETTOPINDEX32:
-    case LB_RESETCONTENT32:
-    case LB_SELITEMRANGE32:
-    case LB_SELITEMRANGEEX32:
-    case LB_SETANCHORINDEX32:
-    case LB_SETCARETINDEX32:
-    case LB_SETCOLUMNWIDTH32:
-    case LB_SETCURSEL32:
-    case LB_SETHORIZONTALEXTENT32:
-    case LB_SETITEMDATA32:
-    case LB_SETITEMHEIGHT32:
-    case LB_SETSEL32:
-    case LB_SETTOPINDEX32:
-        *pmsg16 = (UINT16)msg32 + (LB_ADDSTRING16 - LB_ADDSTRING32);
+    case LB_CARETOFF:
+    case LB_CARETON:
+    case LB_DELETESTRING:
+    case LB_GETANCHORINDEX:
+    case LB_GETCARETINDEX:
+    case LB_GETCOUNT:
+    case LB_GETCURSEL:
+    case LB_GETHORIZONTALEXTENT:
+    case LB_GETITEMDATA:
+    case LB_GETITEMHEIGHT:
+    case LB_GETSEL:
+    case LB_GETSELCOUNT:
+    case LB_GETTEXTLEN:
+    case LB_GETTOPINDEX:
+    case LB_RESETCONTENT:
+    case LB_SELITEMRANGE:
+    case LB_SELITEMRANGEEX:
+    case LB_SETANCHORINDEX:
+    case LB_SETCARETINDEX:
+    case LB_SETCOLUMNWIDTH:
+    case LB_SETCURSEL:
+    case LB_SETHORIZONTALEXTENT:
+    case LB_SETITEMDATA:
+    case LB_SETITEMHEIGHT:
+    case LB_SETSEL:
+    case LB_SETTOPINDEX:
+        *pmsg16 = (UINT16)msg32 + (LB_ADDSTRING16 - LB_ADDSTRING);
         return 0;
-    case CB_DELETESTRING32:
-    case CB_GETCOUNT32:
-    case CB_GETLBTEXTLEN32:
-    case CB_LIMITTEXT32:
-    case CB_RESETCONTENT32:
-    case CB_SETEDITSEL32:
-    case CB_GETCURSEL32:
-    case CB_SETCURSEL32:
-    case CB_SHOWDROPDOWN32:
-    case CB_SETITEMDATA32:
-    case CB_SETITEMHEIGHT32:
-    case CB_GETITEMHEIGHT32:
-    case CB_SETEXTENDEDUI32:
-    case CB_GETEXTENDEDUI32:
-    case CB_GETDROPPEDSTATE32:
-	*pmsg16 = (UINT16)msg32 + (CB_GETEDITSEL16 - CB_GETEDITSEL32);
+    case CB_DELETESTRING:
+    case CB_GETCOUNT:
+    case CB_GETLBTEXTLEN:
+    case CB_LIMITTEXT:
+    case CB_RESETCONTENT:
+    case CB_SETEDITSEL:
+    case CB_GETCURSEL:
+    case CB_SETCURSEL:
+    case CB_SHOWDROPDOWN:
+    case CB_SETITEMDATA:
+    case CB_SETITEMHEIGHT:
+    case CB_GETITEMHEIGHT:
+    case CB_SETEXTENDEDUI:
+    case CB_GETEXTENDEDUI:
+    case CB_GETDROPPEDSTATE:
+	*pmsg16 = (UINT16)msg32 + (CB_GETEDITSEL16 - CB_GETEDITSEL);
 	return 0;
-    case CB_GETEDITSEL32:
+    case CB_GETEDITSEL:
 	*pmsg16 = CB_GETEDITSEL16;
 	return 1;
 
-    case LB_ADDSTRING32:
-    case LB_FINDSTRING32:
-    case LB_FINDSTRINGEXACT32:
-    case LB_INSERTSTRING32:
-    case LB_SELECTSTRING32:
-    case LB_DIR32:
-    case LB_ADDFILE32:
+    case LB_ADDSTRING:
+    case LB_FINDSTRING:
+    case LB_FINDSTRINGEXACT:
+    case LB_INSERTSTRING:
+    case LB_SELECTSTRING:
+    case LB_DIR:
+    case LB_ADDFILE:
         {
             LPSTR str = SEGPTR_STRDUP( (LPSTR)*plparam );
             if (!str) return -1;
             *plparam = (LPARAM)SEGPTR_GET(str);
         }
-        *pmsg16 = (UINT16)msg32 + (LB_ADDSTRING16 - LB_ADDSTRING32);
+        *pmsg16 = (UINT16)msg32 + (LB_ADDSTRING16 - LB_ADDSTRING);
         return 1;
 
-    case CB_ADDSTRING32:
-    case CB_FINDSTRING32:
-    case CB_FINDSTRINGEXACT32:
-    case CB_INSERTSTRING32:
-    case CB_SELECTSTRING32:
-    case CB_DIR32:
+    case CB_ADDSTRING:
+    case CB_FINDSTRING:
+    case CB_FINDSTRINGEXACT:
+    case CB_INSERTSTRING:
+    case CB_SELECTSTRING:
+    case CB_DIR:
 	{
 	    LPSTR str = SEGPTR_STRDUP( (LPSTR)*plparam );
 	    if (!str) return -1;
 	    *plparam = (LPARAM)SEGPTR_GET(str);
 	}
-	*pmsg16 = (UINT16)msg32 + (CB_GETEDITSEL16 - CB_GETEDITSEL32);
+	*pmsg16 = (UINT16)msg32 + (CB_GETEDITSEL16 - CB_GETEDITSEL);
 	return 1;
 
-    case LB_GETITEMRECT32:
+    case LB_GETITEMRECT:
         {
             RECT16 *rect;
             rect = (RECT16 *)SEGPTR_ALLOC( sizeof(RECT16) + sizeof(LPARAM) );
@@ -1498,7 +1498,7 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
         }
 	*pmsg16 = LB_GETITEMRECT16;
         return 1;
-    case LB_GETSELITEMS32:
+    case LB_GETSELITEMS:
         {
             LPINT16 items;
             *pwparam16 = (WPARAM16)MIN( wParam32, 0x7f80 ); /* Must be < 64K */
@@ -1509,22 +1509,22 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
         }
 	*pmsg16 = LB_GETSELITEMS16;
         return 1;
-    case LB_SETTABSTOPS32:
+    case LB_SETTABSTOPS:
         if (wParam32)
         {
-            INT32 i;
+            INT i;
             LPINT16 stops;
             *pwparam16 = (WPARAM16)MIN( wParam32, 0x7f80 ); /* Must be < 64K */
             if (!(stops = SEGPTR_ALLOC( *pwparam16 * sizeof(INT16)
                                         + sizeof(LPARAM)))) return -1;
-            for (i = 0; i < *pwparam16; i++) stops[i] = *((LPINT32)*plparam+i);
+            for (i = 0; i < *pwparam16; i++) stops[i] = *((LPINT)*plparam+i);
             *plparam = (LPARAM)SEGPTR_GET(stops);
             return 1;
         }
         *pmsg16 = LB_SETTABSTOPS16;
         return 0;
 
-    case CB_GETDROPPEDCONTROLRECT32:
+    case CB_GETDROPPEDCONTROLRECT:
         {
 	    RECT16 *rect;
 	    rect = (RECT16 *)SEGPTR_ALLOC( sizeof(RECT16) + sizeof(LPARAM) );
@@ -1535,19 +1535,19 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
 	*pmsg16 = CB_GETDROPPEDCONTROLRECT16;
         return 1;
 
-    case LB_GETTEXT32:
+    case LB_GETTEXT:
 	*plparam = (LPARAM)MapLS( (LPVOID)(*plparam) );
 	*pmsg16 = LB_GETTEXT16;
 	return 1;
 
-    case CB_GETLBTEXT32:
+    case CB_GETLBTEXT:
 	*plparam = (LPARAM)MapLS( (LPVOID)(*plparam) );
 	*pmsg16 = CB_GETLBTEXT16;
 	return 1;
 
-    case EM_SETSEL32:
+    case EM_SETSEL:
 	*pwparam16 = 0;
-	*plparam = MAKELONG( (INT16)(INT32)wParam32, (INT16)*plparam );
+	*plparam = MAKELONG( (INT16)(INT)wParam32, (INT16)*plparam );
 	*pmsg16 = EM_SETSEL16;
 	return 0;
 
@@ -1574,7 +1574,7 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
         return 0;
     case WM_COMPAREITEM:
         {
-            COMPAREITEMSTRUCT32 *cis32 = (COMPAREITEMSTRUCT32 *)*plparam;
+            COMPAREITEMSTRUCT *cis32 = (COMPAREITEMSTRUCT *)*plparam;
             COMPAREITEMSTRUCT16 *cis = SEGPTR_NEW(COMPAREITEMSTRUCT16);
             if (!cis) return -1;
             cis->CtlType    = (UINT16)cis32->CtlType;
@@ -1589,7 +1589,7 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
         return 1;
     case WM_DELETEITEM:
         {
-            DELETEITEMSTRUCT32 *dis32 = (DELETEITEMSTRUCT32 *)*plparam;
+            DELETEITEMSTRUCT *dis32 = (DELETEITEMSTRUCT *)*plparam;
             DELETEITEMSTRUCT16 *dis = SEGPTR_NEW(DELETEITEMSTRUCT16);
             if (!dis) return -1;
             dis->CtlType  = (UINT16)dis32->CtlType;
@@ -1602,7 +1602,7 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
         return 1;
     case WM_DRAWITEM:
         {
-            DRAWITEMSTRUCT32 *dis32 = (DRAWITEMSTRUCT32 *)*plparam;
+            DRAWITEMSTRUCT *dis32 = (DRAWITEMSTRUCT *)*plparam;
             DRAWITEMSTRUCT16 *dis = SEGPTR_NEW(DRAWITEMSTRUCT16);
             if (!dis) return -1;
             dis->CtlType    = (UINT16)dis32->CtlType;
@@ -1619,7 +1619,7 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
         return 1;
     case WM_MEASUREITEM:
         {
-            MEASUREITEMSTRUCT32 *mis32 = (MEASUREITEMSTRUCT32 *)*plparam;
+            MEASUREITEMSTRUCT *mis32 = (MEASUREITEMSTRUCT *)*plparam;
             MEASUREITEMSTRUCT16 *mis = (MEASUREITEMSTRUCT16 *)
                                      SEGPTR_ALLOC(sizeof(*mis)+sizeof(LPARAM));
             if (!mis) return -1;
@@ -1638,7 +1638,7 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
             MINMAXINFO16 *mmi = (MINMAXINFO16 *)SEGPTR_ALLOC( sizeof(*mmi) +
                                                               sizeof(LPARAM) );
             if (!mmi) return -1;
-            STRUCT32_MINMAXINFO32to16( (MINMAXINFO32 *)*plparam, mmi );
+            STRUCT32_MINMAXINFO32to16( (MINMAXINFO *)*plparam, mmi );
             *(LPARAM *)(mmi + 1) = *plparam;  /* Store the previous lParam */
             *plparam = (LPARAM)SEGPTR_GET(mmi);
         }
@@ -1655,7 +1655,7 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
     case WM_MDICREATE:
         {
             MDICREATESTRUCT16 *cs;
-            MDICREATESTRUCT32A *cs32 = (MDICREATESTRUCT32A *)*plparam;
+            MDICREATESTRUCTA *cs32 = (MDICREATESTRUCTA *)*plparam;
             LPSTR name, cls;
 
             if (!(cs = SEGPTR_NEW(MDICREATESTRUCT16))) return -1;
@@ -1679,21 +1679,21 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
         *plparam = MAKELPARAM( HIWORD(wParam32), (HMENU16)*plparam );
         return 0;
     case WM_MDIACTIVATE:
-	if( WIDGETS_IsControl32(WIN_FindWndPtr(hwnd), BIC32_MDICLIENT) )
+	if( WIDGETS_IsControl(WIN_FindWndPtr(hwnd), BIC32_MDICLIENT) )
 	{
-	    *pwparam16 = (HWND32)wParam32;
+	    *pwparam16 = (HWND)wParam32;
 	    *plparam = 0;
 	}
 	else
 	{
-	    *pwparam16 = ((HWND32)*plparam == hwnd);
+	    *pwparam16 = ((HWND)*plparam == hwnd);
 	    *plparam = MAKELPARAM( (HWND16)LOWORD(*plparam),
 				   (HWND16)LOWORD(wParam32) );
 	}
         return 0;
     case WM_NCCALCSIZE:
         {
-            NCCALCSIZE_PARAMS32 *nc32 = (NCCALCSIZE_PARAMS32 *)*plparam;
+            NCCALCSIZE_PARAMS *nc32 = (NCCALCSIZE_PARAMS *)*plparam;
             NCCALCSIZE_PARAMS16 *nc = (NCCALCSIZE_PARAMS16 *)SEGPTR_ALLOC( sizeof(*nc) + sizeof(LPARAM) );
             if (!nc) return -1;
 
@@ -1719,7 +1719,7 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
     case WM_CREATE:
         {
             CREATESTRUCT16 *cs;
-            CREATESTRUCT32A *cs32 = (CREATESTRUCT32A *)*plparam;
+            CREATESTRUCTA *cs32 = (CREATESTRUCTA *)*plparam;
             LPSTR name, cls;
 
             if (!(cs = SEGPTR_NEW(CREATESTRUCT16))) return -1;
@@ -1752,14 +1752,14 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
             WINDOWPOS16 *wp = (WINDOWPOS16 *)SEGPTR_ALLOC( sizeof(*wp) +
                                                            sizeof(LPARAM) );
             if (!wp) return -1;
-            STRUCT32_WINDOWPOS32to16( (WINDOWPOS32 *)*plparam, wp );
+            STRUCT32_WINDOWPOS32to16( (WINDOWPOS *)*plparam, wp );
             *(LPARAM *)(wp + 1) = *plparam;  /* Store the previous lParam */
             *plparam = (LPARAM)SEGPTR_GET(wp);
         }
         return 1;
     case WM_GETDLGCODE:
          if (*plparam) {
-            LPMSG32 msg32 = (LPMSG32) *plparam;
+            LPMSG msg32 = (LPMSG) *plparam;
             LPMSG16 msg16 = (LPMSG16) SEGPTR_NEW( MSG16 );
 
             if (!msg16) return -1;
@@ -1801,25 +1801,25 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
  *
  * Unmap a message that was mapped from 32-bit Ansi to 16-bit.
  */
-void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam,
+void WINPROC_UnmapMsg32ATo16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
                               MSGPARAM16* p16 ) 
 {
     switch(msg)
     {
-    case LB_ADDFILE32:
-    case LB_ADDSTRING32:
-    case LB_DIR32:
-    case LB_FINDSTRING32:
-    case LB_FINDSTRINGEXACT32:
-    case LB_INSERTSTRING32:
-    case LB_SELECTSTRING32:
-    case LB_SETTABSTOPS32:
-    case CB_ADDSTRING32:
-    case CB_FINDSTRING32:
-    case CB_FINDSTRINGEXACT32:
-    case CB_INSERTSTRING32:
-    case CB_SELECTSTRING32:
-    case CB_DIR32:
+    case LB_ADDFILE:
+    case LB_ADDSTRING:
+    case LB_DIR:
+    case LB_FINDSTRING:
+    case LB_FINDSTRINGEXACT:
+    case LB_INSERTSTRING:
+    case LB_SELECTSTRING:
+    case LB_SETTABSTOPS:
+    case CB_ADDSTRING:
+    case CB_FINDSTRING:
+    case CB_FINDSTRINGEXACT:
+    case CB_INSERTSTRING:
+    case CB_SELECTSTRING:
+    case CB_DIR:
     case WM_COMPAREITEM:
     case WM_DELETEITEM:
     case WM_DRAWITEM:
@@ -1827,41 +1827,41 @@ void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM l
         SEGPTR_FREE( PTR_SEG_TO_LIN(p16->lParam) );
         break;
 
-    case CB_GETDROPPEDCONTROLRECT32:
-    case LB_GETITEMRECT32:
+    case CB_GETDROPPEDCONTROLRECT:
+    case LB_GETITEMRECT:
         {
             RECT16 *rect = (RECT16 *)PTR_SEG_TO_LIN(p16->lParam);
             p16->lParam = *(LPARAM *)(rect + 1);
-            CONV_RECT16TO32( rect, (RECT32 *)(p16->lParam));
+            CONV_RECT16TO32( rect, (RECT *)(p16->lParam));
             SEGPTR_FREE( rect );
         }
         break;
-    case LB_GETSELITEMS32:
+    case LB_GETSELITEMS:
         {
-            INT32 i;
+            INT i;
             LPINT16 items = (LPINT16)PTR_SEG_TO_LIN(lParam);
             p16->lParam = *((LPARAM *)items - 1);
-            for (i = 0; i < p16->wParam; i++) *((LPINT32)(p16->lParam) + i) = items[i];
+            for (i = 0; i < p16->wParam; i++) *((LPINT)(p16->lParam) + i) = items[i];
             SEGPTR_FREE( (LPARAM *)items - 1 );
         }
         break;
 
-    case CB_GETEDITSEL32:
+    case CB_GETEDITSEL:
 	if( wParam )
-	    *((LPUINT32)(wParam)) = LOWORD(p16->lResult);
+	    *((LPUINT)(wParam)) = LOWORD(p16->lResult);
 	if( lParam )
-	    *((LPUINT32)(lParam)) = HIWORD(p16->lResult);	/* FIXME: substract 1? */
+	    *((LPUINT)(lParam)) = HIWORD(p16->lResult);	/* FIXME: substract 1? */
 	break;
 
-    case LB_GETTEXT32:
-    case CB_GETLBTEXT32:
+    case LB_GETTEXT:
+    case CB_GETLBTEXT:
 	UnMapLS( (SEGPTR)(p16->lParam) );
 	break;
 
     case WM_MEASUREITEM:
         {
             MEASUREITEMSTRUCT16 *mis = (MEASUREITEMSTRUCT16 *)PTR_SEG_TO_LIN(p16->lParam);
-            MEASUREITEMSTRUCT32 *mis32 = *(MEASUREITEMSTRUCT32 **)(mis + 1);
+            MEASUREITEMSTRUCT *mis32 = *(MEASUREITEMSTRUCT **)(mis + 1);
             mis32->itemWidth  = mis->itemWidth;
             mis32->itemHeight = mis->itemHeight;
             SEGPTR_FREE(mis);
@@ -1871,7 +1871,7 @@ void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM l
         {
             MINMAXINFO16 *mmi = (MINMAXINFO16 *)PTR_SEG_TO_LIN(p16->lParam);
             p16->lParam = *(LPARAM *)(mmi + 1);
-            STRUCT32_MINMAXINFO16to32( mmi, (MINMAXINFO32 *)(p16->lParam) );
+            STRUCT32_MINMAXINFO16to32( mmi, (MINMAXINFO *)(p16->lParam) );
             SEGPTR_FREE(mmi);
         }
         break;
@@ -1879,7 +1879,7 @@ void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM l
         {
             LPSTR str = (LPSTR)PTR_SEG_TO_LIN(p16->lParam);
             p16->lParam = *((LPARAM *)str - 1);
-            lstrcpyn32A( (LPSTR)(p16->lParam), str, p16->wParam );
+            lstrcpynA( (LPSTR)(p16->lParam), str, p16->wParam );
             SEGPTR_FREE( (LPARAM *)str - 1 );
         }
         break;
@@ -1892,15 +1892,15 @@ void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM l
         }
         break;
     case WM_MDIGETACTIVE:
-        if (lParam) *(BOOL32 *)lParam = (BOOL16)HIWORD(p16->lResult);
-        p16->lResult = (HWND32)LOWORD(p16->lResult);
+        if (lParam) *(BOOL *)lParam = (BOOL16)HIWORD(p16->lResult);
+        p16->lResult = (HWND)LOWORD(p16->lResult);
         break;
     case WM_NCCALCSIZE:
         {
-            NCCALCSIZE_PARAMS32 *nc32;
+            NCCALCSIZE_PARAMS *nc32;
             NCCALCSIZE_PARAMS16 *nc = (NCCALCSIZE_PARAMS16 *)PTR_SEG_TO_LIN(p16->lParam);
             p16->lParam = *(LPARAM *)(nc + 1);
-            nc32 = (NCCALCSIZE_PARAMS32 *)(p16->lParam);
+            nc32 = (NCCALCSIZE_PARAMS *)(p16->lParam);
             CONV_RECT16TO32( &nc->rgrc[0], &nc32->rgrc[0] );
             if (p16->wParam)
             {
@@ -1927,7 +1927,7 @@ void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM l
         {
             WINDOWPOS16 *wp = (WINDOWPOS16 *)PTR_SEG_TO_LIN(p16->lParam);
             p16->lParam = *(LPARAM *)(wp + 1);
-            STRUCT32_WINDOWPOS16to32( wp, (WINDOWPOS32 *)p16->lParam );
+            STRUCT32_WINDOWPOS16to32( wp, (WINDOWPOS *)p16->lParam );
             SEGPTR_FREE(wp);
         }
         break;
@@ -1941,8 +1941,8 @@ void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM l
             MSGPARAM16 msgp16;
             msgp16.wParam=msg16->wParam;
             msgp16.lParam=msg16->lParam;
-            WINPROC_UnmapMsg32ATo16(((LPMSG32)lParam)->hwnd, ((LPMSG32)lParam)->message,
-                    ((LPMSG32)lParam)->wParam, ((LPMSG32)lParam)->lParam,
+            WINPROC_UnmapMsg32ATo16(((LPMSG)lParam)->hwnd, ((LPMSG)lParam)->message,
+                    ((LPMSG)lParam)->wParam, ((LPMSG)lParam)->lParam,
                     &msgp16 );
             SEGPTR_FREE(msg16);
         }
@@ -1957,52 +1957,52 @@ void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM l
  * Map a message from 32-bit Unicode to 16-bit.
  * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed.
  */
-INT32 WINPROC_MapMsg32WTo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
+INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32, WPARAM wParam32,
                              UINT16 *pmsg16, WPARAM16 *pwparam16,
                              LPARAM *plparam )
 {
     switch(msg32)
     {
-    case LB_ADDSTRING32:
-    case LB_FINDSTRING32:
-    case LB_FINDSTRINGEXACT32:
-    case LB_INSERTSTRING32:
-    case LB_SELECTSTRING32:
-    case LB_DIR32:
-    case LB_ADDFILE32:
+    case LB_ADDSTRING:
+    case LB_FINDSTRING:
+    case LB_FINDSTRINGEXACT:
+    case LB_INSERTSTRING:
+    case LB_SELECTSTRING:
+    case LB_DIR:
+    case LB_ADDFILE:
         {
             LPSTR str = SEGPTR_STRDUP_WtoA( (LPWSTR)*plparam );
             if (!str) return -1;
             *pwparam16 = (WPARAM16)LOWORD(wParam32);
             *plparam   = (LPARAM)SEGPTR_GET(str);
         }
-	*pmsg16 = (UINT16)msg32 + (LB_ADDSTRING16 - LB_ADDSTRING32);
+	*pmsg16 = (UINT16)msg32 + (LB_ADDSTRING16 - LB_ADDSTRING);
         return 1;
 
-    case CB_ADDSTRING32:
-    case CB_FINDSTRING32:
-    case CB_FINDSTRINGEXACT32:
-    case CB_INSERTSTRING32:
-    case CB_SELECTSTRING32:
-    case CB_DIR32:
+    case CB_ADDSTRING:
+    case CB_FINDSTRING:
+    case CB_FINDSTRINGEXACT:
+    case CB_INSERTSTRING:
+    case CB_SELECTSTRING:
+    case CB_DIR:
         {
             LPSTR str = SEGPTR_STRDUP_WtoA( (LPWSTR)*plparam );
             if (!str) return -1;
             *pwparam16 = (WPARAM16)LOWORD(wParam32);
             *plparam   = (LPARAM)SEGPTR_GET(str);
         }
-	*pmsg16 = (UINT16)msg32 + (CB_ADDSTRING16 - CB_ADDSTRING32);
+	*pmsg16 = (UINT16)msg32 + (CB_ADDSTRING16 - CB_ADDSTRING);
         return 1;
 
     case WM_NCCREATE:
     case WM_CREATE:
         {
             CREATESTRUCT16 *cs;
-            CREATESTRUCT32W *cs32 = (CREATESTRUCT32W *)*plparam;
+            CREATESTRUCTW *cs32 = (CREATESTRUCTW *)*plparam;
             LPSTR name, cls;
 
             if (!(cs = SEGPTR_NEW(CREATESTRUCT16))) return -1;
-            STRUCT32_CREATESTRUCT32Ato16( (CREATESTRUCT32A *)cs32, cs );
+            STRUCT32_CREATESTRUCT32Ato16( (CREATESTRUCTA *)cs32, cs );
             name = SEGPTR_STRDUP_WtoA( cs32->lpszName );
             cls  = SEGPTR_STRDUP_WtoA( cs32->lpszClass );
             cs->lpszName  = SEGPTR_GET(name);
@@ -2015,11 +2015,11 @@ INT32 WINPROC_MapMsg32WTo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
     case WM_MDICREATE:
         {
             MDICREATESTRUCT16 *cs;
-            MDICREATESTRUCT32W *cs32 = (MDICREATESTRUCT32W *)*plparam;
+            MDICREATESTRUCTW *cs32 = (MDICREATESTRUCTW *)*plparam;
             LPSTR name, cls;
 
             if (!(cs = SEGPTR_NEW(MDICREATESTRUCT16))) return -1;
-            STRUCT32_MDICREATESTRUCT32Ato16( (MDICREATESTRUCT32A *)cs32, cs );
+            STRUCT32_MDICREATESTRUCT32Ato16( (MDICREATESTRUCTA *)cs32, cs );
             name = SEGPTR_STRDUP_WtoA( cs32->szTitle );
             cls  = SEGPTR_STRDUP_WtoA( cs32->szClass );
             cs->szTitle = SEGPTR_GET(name);
@@ -2050,7 +2050,7 @@ INT32 WINPROC_MapMsg32WTo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
  *
  * Unmap a message that was mapped from 32-bit Unicode to 16-bit.
  */
-void WINPROC_UnmapMsg32WTo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam,
+void WINPROC_UnmapMsg32WTo16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
                               MSGPARAM16* p16 )
 {
     switch(msg)
@@ -2075,14 +2075,14 @@ void WINPROC_UnmapMsg32WTo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM l
  *
  * Call a window procedure, translating args from Ansi to Unicode.
  */
-static LRESULT WINPROC_CallProc32ATo32W( WNDPROC32 func, HWND32 hwnd,
-                                         UINT32 msg, WPARAM32 wParam,
+static LRESULT WINPROC_CallProc32ATo32W( WNDPROC func, HWND hwnd,
+                                         UINT msg, WPARAM wParam,
                                          LPARAM lParam )
 {
     LRESULT result;
 
     if (WINPROC_MapMsg32ATo32W( hwnd, msg, wParam, &lParam ) == -1) return 0;
-    result = WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam );
+    result = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
     WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam );
     return result;
 }
@@ -2093,14 +2093,14 @@ static LRESULT WINPROC_CallProc32ATo32W( WNDPROC32 func, HWND32 hwnd,
  *
  * Call a window procedure, translating args from Unicode to Ansi.
  */
-static LRESULT WINPROC_CallProc32WTo32A( WNDPROC32 func, HWND32 hwnd,
-                                         UINT32 msg, WPARAM32 wParam,
+static LRESULT WINPROC_CallProc32WTo32A( WNDPROC func, HWND hwnd,
+                                         UINT msg, WPARAM wParam,
                                          LPARAM lParam )
 {
     LRESULT result;
 
     if (WINPROC_MapMsg32WTo32A( hwnd, msg, wParam, &lParam ) == -1) return 0;
-    result = WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam );
+    result = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
     WINPROC_UnmapMsg32WTo32A( hwnd, msg, wParam, lParam );
     return result;
 }
@@ -2113,15 +2113,15 @@ static LRESULT WINPROC_CallProc32WTo32A( WNDPROC32 func, HWND32 hwnd,
  */
 LRESULT WINPROC_CallProc16To32A( HWND16 hwnd, UINT16 msg,
                                  WPARAM16 wParam, LPARAM lParam,
-                                 WNDPROC32 func )
+                                 WNDPROC func )
 {
     LRESULT result;
-    UINT32 msg32;
-    WPARAM32 wParam32;
+    UINT msg32;
+    WPARAM wParam32;
 
     if (WINPROC_MapMsg16To32A( msg, wParam, &msg32, &wParam32, &lParam ) == -1)
         return 0;
-    result = WINPROC_CallWndProc32( func, hwnd, msg32, wParam32, lParam );
+    result = WINPROC_CallWndProc( func, hwnd, msg32, wParam32, lParam );
     return WINPROC_UnmapMsg16To32A( hwnd, msg32, wParam32, lParam, result );
 }
 
@@ -2133,15 +2133,15 @@ LRESULT WINPROC_CallProc16To32A( HWND16 hwnd, UINT16 msg,
  */
 LRESULT WINPROC_CallProc16To32W( HWND16 hwnd, UINT16 msg,
                                  WPARAM16 wParam, LPARAM lParam,
-                                 WNDPROC32 func )
+                                 WNDPROC func )
 {
     LRESULT result;
-    UINT32 msg32;
-    WPARAM32 wParam32;
+    UINT msg32;
+    WPARAM wParam32;
 
     if (WINPROC_MapMsg16To32W( hwnd, msg, wParam, &msg32, &wParam32, &lParam ) == -1)
         return 0;
-    result = WINPROC_CallWndProc32( func, hwnd, msg32, wParam32, lParam );
+    result = WINPROC_CallWndProc( func, hwnd, msg32, wParam32, lParam );
     return WINPROC_UnmapMsg16To32W( hwnd, msg32, wParam32, lParam, result );
 }
 
@@ -2151,8 +2151,8 @@ LRESULT WINPROC_CallProc16To32W( HWND16 hwnd, UINT16 msg,
  *
  * Call a 16-bit window procedure, translating the 32-bit args.
  */
-static LRESULT WINAPI WINPROC_CallProc32ATo16( WNDPROC16 func, HWND32 hwnd,
-                                               UINT32 msg, WPARAM32 wParam,
+static LRESULT WINAPI WINPROC_CallProc32ATo16( WNDPROC16 func, HWND hwnd,
+                                               UINT msg, WPARAM wParam,
                                                LPARAM lParam )
 {
     UINT16 msg16;
@@ -2174,8 +2174,8 @@ static LRESULT WINAPI WINPROC_CallProc32ATo16( WNDPROC16 func, HWND32 hwnd,
  *
  * Call a 16-bit window procedure, translating the 32-bit args.
  */
-static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND32 hwnd,
-                                               UINT32 msg, WPARAM32 wParam,
+static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd,
+                                               UINT msg, WPARAM wParam,
                                                LPARAM lParam )
 {
     UINT16 msg16;
@@ -2253,20 +2253,20 @@ LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,
  *
  *   ECMA-234, Win32 
  */
-LRESULT WINAPI CallWindowProc32A( 
-    WNDPROC32 func, /* window procedure */
-    HWND32 hwnd, /* target window */
-    UINT32 msg,  /* message */
-    WPARAM32 wParam, /* message dependent parameter */
+LRESULT WINAPI CallWindowProcA( 
+    WNDPROC func, /* window procedure */
+    HWND hwnd, /* target window */
+    UINT msg,  /* message */
+    WPARAM wParam, /* message dependent parameter */
     LPARAM lParam    /* message dependent parameter */
 ) {
     WINDOWPROC *proc = WINPROC_GetPtr( (WNDPROC16)func );
 
-    if (!proc) return WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam );
+    if (!proc) return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
 
 #if testing
     func = WINPROC_GetProc( (HWINDOWPROC)proc, WIN_PROC_32A );
-    return WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam );
+    return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
 #endif
 
     switch(proc->type)
@@ -2277,7 +2277,7 @@ LRESULT WINAPI CallWindowProc32A(
                                         hwnd, msg, wParam, lParam );
     case WIN_PROC_32A:
         if (!proc->thunk.t_from16.proc) return 0;
-        return WINPROC_CallWndProc32( proc->thunk.t_from16.proc,
+        return WINPROC_CallWndProc( proc->thunk.t_from16.proc,
                                       hwnd, msg, wParam, lParam );
     case WIN_PROC_32W:
         if (!proc->thunk.t_from16.proc) return 0;
@@ -2293,16 +2293,16 @@ LRESULT WINAPI CallWindowProc32A(
 /**********************************************************************
  *	     CallWindowProc32W    (USER32.19)
  */
-LRESULT WINAPI CallWindowProc32W( WNDPROC32 func, HWND32 hwnd, UINT32 msg,
-                                  WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg,
+                                  WPARAM wParam, LPARAM lParam )
 {
     WINDOWPROC *proc = WINPROC_GetPtr( (WNDPROC16)func );
 
-    if (!proc) return WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam );
+    if (!proc) return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
 
 #if testing
     func = WINPROC_GetProc( (HWINDOWPROC)proc, WIN_PROC_32W );
-    return WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam );
+    return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
 #endif
 
     switch(proc->type)
@@ -2317,7 +2317,7 @@ LRESULT WINAPI CallWindowProc32W( WNDPROC32 func, HWND32 hwnd, UINT32 msg,
                                          hwnd, msg, wParam, lParam );
     case WIN_PROC_32W:
         if (!proc->thunk.t_from16.proc) return 0;
-        return WINPROC_CallWndProc32( proc->thunk.t_from16.proc,
+        return WINPROC_CallWndProc( proc->thunk.t_from16.proc,
                                       hwnd, msg, wParam, lParam );
     default:
         WARN( relay, "Invalid proc %p\n", proc );
diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c
index 29e5bc9e132..e1a64991798 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -19,9 +19,9 @@
 #include "wintypes.h"
 #include "x11drv.h"
 
-extern HWND32 hWndClipOwner;
-extern HWND32 hWndClipWindow;
-extern CLIPFORMAT ClipFormats[];
+extern HWND hWndClipOwner;
+extern HWND hWndClipWindow;
+extern WINE_CLIPFORMAT ClipFormats[];
 
 static Bool   selectionWait = False;
 static Bool   selectionAcquired = False;
@@ -71,8 +71,8 @@ static void X11DRV_CLIPBOARD_CheckSelection(WND* pWnd)
  */
 void X11DRV_CLIPBOARD_ReadSelection(Window w,Atom prop)
 {
-    HANDLE32 	 hText = 0;
-    LPCLIPFORMAT lpFormat = ClipFormats; 
+    HANDLE 	 hText = 0;
+    LPWINE_CLIPFORMAT lpFormat = ClipFormats; 
 
     TRACE(clipboard,"ReadSelection callback\n");
 
@@ -107,8 +107,8 @@ void X11DRV_CLIPBOARD_ReadSelection(Window w,Atom prop)
 
 	      if( nitems )
 	      {
-	        hText=GlobalAlloc32(GMEM_MOVEABLE, nitems + inlcount + 1);
-	        if( (lpstr = (char*)GlobalLock32(hText)) )
+	        hText=GlobalAlloc(GMEM_MOVEABLE, nitems + inlcount + 1);
+	        if( (lpstr = (char*)GlobalLock(hText)) )
 	          for(i=0,inlcount=0; i <= nitems; i++)
 	          {
 	  	     if( val[i] == '\n' ) lpstr[inlcount++]='\r';
@@ -146,7 +146,7 @@ void X11DRV_CLIPBOARD_ReadSelection(Window w,Atom prop)
  * Wine might have lost XA_PRIMARY selection because of
  * EmptyClipboard() or other client. 
  */
-void X11DRV_CLIPBOARD_ReleaseSelection(Window w, HWND32 hwnd)
+void X11DRV_CLIPBOARD_ReleaseSelection(Window w, HWND hwnd)
 {
     /* w is the window that lost selection,
      * 
@@ -199,7 +199,7 @@ void X11DRV_CLIPBOARD_EmptyClipboard()
 /**************************************************************************
  *		X11DRV_CLIPBOARD_SetClipboardData
  */
-void X11DRV_CLIPBOARD_SetClipboardData(UINT32 wFormat)
+void X11DRV_CLIPBOARD_SetClipboardData(UINT wFormat)
 {
     Window       owner;
 
@@ -209,7 +209,7 @@ void X11DRV_CLIPBOARD_SetClipboardData(UINT32 wFormat)
 	(wFormat == CF_TEXT || wFormat == CF_OEMTEXT) )
     {
 	owner = X11DRV_WND_FindXWindow( 
-	    WIN_FindWndPtr( hWndClipWindow ? hWndClipWindow : AnyPopup32() ) 
+	    WIN_FindWndPtr( hWndClipWindow ? hWndClipWindow : AnyPopup() ) 
 	);
 
 	TSXSetSelectionOwner(display,XA_PRIMARY, owner, CurrentTime);
@@ -227,9 +227,9 @@ void X11DRV_CLIPBOARD_SetClipboardData(UINT32 wFormat)
 /**************************************************************************
  *		X11DRV_CLIPBOARD_RequestSelection
  */
-BOOL32 X11DRV_CLIPBOARD_RequestSelection()
+BOOL X11DRV_CLIPBOARD_RequestSelection()
 {
-    HWND32 hWnd = (hWndClipWindow) ? hWndClipWindow : GetActiveWindow32();
+    HWND hWnd = (hWndClipWindow) ? hWndClipWindow : GetActiveWindow();
 
     if( selectionAcquired )
       return TRUE;
@@ -260,7 +260,7 @@ BOOL32 X11DRV_CLIPBOARD_RequestSelection()
     TRACE(clipboard,"\tgot CF_OEMTEXT = %i\n", 
 		      ClipFormats[CF_OEMTEXT-1].wDataPresent);
 
-    return (BOOL32)ClipFormats[CF_OEMTEXT-1].wDataPresent;
+    return (BOOL)ClipFormats[CF_OEMTEXT-1].wDataPresent;
 }
 
 /**************************************************************************
@@ -268,9 +268,9 @@ BOOL32 X11DRV_CLIPBOARD_RequestSelection()
  *
  * Called from DestroyWindow().
  */
-void X11DRV_CLIPBOARD_ResetOwner(WND *pWnd, BOOL32 bFooBar)
+void X11DRV_CLIPBOARD_ResetOwner(WND *pWnd, BOOL bFooBar)
 {
-    LPCLIPFORMAT lpFormat = ClipFormats;
+    LPWINE_CLIPFORMAT lpFormat = ClipFormats;
 
     if(bFooBar && X11DRV_WND_GetXWindow(pWnd))
       return;
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index a0329324435..7d41561d9df 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -98,7 +98,7 @@ static void EVENT_SelectionRequest( WND *pWnd, XSelectionRequestEvent *event);
 static void EVENT_SelectionNotify( XSelectionEvent *event);
 static void EVENT_SelectionClear( WND *pWnd, XSelectionClearEvent *event);
 static void EVENT_ClientMessage( WND *pWnd, XClientMessageEvent *event );
-static void EVENT_MapNotify( HWND32 hwnd, XMapEvent *event );
+static void EVENT_MapNotify( HWND hwnd, XMapEvent *event );
 
 /* Usable only with OLVWM - compile option perhaps?
 static void EVENT_EnterNotify( WND *pWnd, XCrossingEvent *event );
@@ -113,7 +113,7 @@ static void EVENT_GetGeometry( Window win, int *px, int *py,
  *
  * Initialize network IO.
  */
-BOOL32 X11DRV_EVENT_Init(void)
+BOOL X11DRV_EVENT_Init(void)
 {
   int  i;
   for( i = 0; i < 3; i++ )
@@ -199,7 +199,7 @@ void EVENT_ReadWakeUpPipe(void)
  * 'peek' mode, FALSE otherwise.
  */
 
-BOOL32 X11DRV_EVENT_WaitNetEvent( BOOL32 sleep, BOOL32 peek )
+BOOL X11DRV_EVENT_WaitNetEvent( BOOL sleep, BOOL peek )
 {
   XEvent event;
   LONG maxWait = sleep ? TIMER_GetNextExpiration() : 0;
@@ -513,7 +513,7 @@ static void EVENT_ProcessEvent( XEvent *event )
  * Try to synchronize internal z-order with the window manager's.
  * Probably a futile endeavor.
  */
-static BOOL32 __check_query_condition( WND** pWndA, WND** pWndB )
+static BOOL __check_query_condition( WND** pWndA, WND** pWndB )
 {
   /* return TRUE if we have at least two managed windows */
   
@@ -567,10 +567,10 @@ static unsigned __td_lookup( Window w, Window* list, unsigned max )
   return i;
 }
 
-static BOOL32 EVENT_QueryZOrder( WND* pWndCheck )
+static BOOL EVENT_QueryZOrder( WND* pWndCheck )
 {
-  BOOL32      bRet = FALSE;
-  HWND32      hwndInsertAfter = HWND_TOP;
+  BOOL      bRet = FALSE;
+  HWND      hwndInsertAfter = HWND_TOP;
   WND*        pWnd, *pWndZ = WIN_GetDesktop()->child;
   Window      w, parent, *children = NULL;
   unsigned    total, check, pos, best;
@@ -633,7 +633,7 @@ static WORD EVENT_XStateToKeyState( int state )
 /***********************************************************************
  *           X11DRV_EVENT_QueryPointer
  */
-BOOL32 X11DRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state)
+BOOL X11DRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state)
 {
   Window root, child;
   int rootX, rootY, winX, winY;
@@ -658,7 +658,7 @@ BOOL32 X11DRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state)
  */
 static void EVENT_Expose( WND *pWnd, XExposeEvent *event )
 {
-  RECT32 rect;
+  RECT rect;
 
   /* Make position relative to client area instead of window */
   rect.left   = event->x - (pWnd? (pWnd->rectClient.left - pWnd->rectWindow.left) : 0);
@@ -666,7 +666,7 @@ static void EVENT_Expose( WND *pWnd, XExposeEvent *event )
   rect.right  = rect.left + event->width;
   rect.bottom = rect.top + event->height;
  
-  Callout.RedrawWindow32( pWnd? pWnd->hwndSelf : 0, &rect, 0,
+  Callout.RedrawWindow( pWnd? pWnd->hwndSelf : 0, &rect, 0,
                           RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN | RDW_ERASE |
                           (event->count ? 0 : RDW_ERASENOW) );
 }
@@ -680,7 +680,7 @@ static void EVENT_Expose( WND *pWnd, XExposeEvent *event )
  */
 static void EVENT_GraphicsExpose( WND *pWnd, XGraphicsExposeEvent *event )
 {
-  RECT32 rect;
+  RECT rect;
   
   /* Make position relative to client area instead of window */
   rect.left   = event->x - (pWnd? (pWnd->rectClient.left - pWnd->rectWindow.left) : 0);
@@ -688,7 +688,7 @@ static void EVENT_GraphicsExpose( WND *pWnd, XGraphicsExposeEvent *event )
   rect.right  = rect.left + event->width;
   rect.bottom = rect.top + event->height;
   
-  Callout.RedrawWindow32( pWnd? pWnd->hwndSelf : 0, &rect, 0,
+  Callout.RedrawWindow( pWnd? pWnd->hwndSelf : 0, &rect, 0,
                           RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_ERASE |
                           (event->count ? 0 : RDW_ERASENOW) );
 }
@@ -837,15 +837,15 @@ static void EVENT_FocusIn( WND *pWnd, XFocusChangeEvent *event )
   
   if (event->detail != NotifyPointer)
     { 
-      HWND32	hwnd = pWnd->hwndSelf;
+      HWND	hwnd = pWnd->hwndSelf;
 
-      if (hwnd != GetActiveWindow32()) 
+      if (hwnd != GetActiveWindow()) 
         {
 	  WINPOS_ChangeActiveWindow( hwnd, FALSE );
 	  X11DRV_KEYBOARD_UpdateState();
         }
-      if ((hwnd != GetFocus32()) && !IsChild32( hwnd, GetFocus32()))
-            SetFocus32( hwnd );
+      if ((hwnd != GetFocus()) && !IsChild( hwnd, GetFocus()))
+            SetFocus( hwnd );
     }
 }
 
@@ -859,19 +859,19 @@ static void EVENT_FocusOut( WND *pWnd, XFocusChangeEvent *event )
 {
   if (event->detail != NotifyPointer)
     {
-      HWND32	hwnd = pWnd->hwndSelf;
+      HWND	hwnd = pWnd->hwndSelf;
       
-      if (hwnd == GetActiveWindow32()) 
+      if (hwnd == GetActiveWindow()) 
 	WINPOS_ChangeActiveWindow( 0, FALSE );
-      if ((hwnd == GetFocus32()) || IsChild32( hwnd, GetFocus32()))
-	SetFocus32( 0 );
+      if ((hwnd == GetFocus()) || IsChild( hwnd, GetFocus()))
+	SetFocus( 0 );
     }
 }
 
 /**********************************************************************
  *              X11DRV_EVENT_CheckFocus
  */
-BOOL32 X11DRV_EVENT_CheckFocus(void)
+BOOL X11DRV_EVENT_CheckFocus(void)
 {
   WND*   pWnd;
   Window xW;
@@ -928,9 +928,9 @@ static void EVENT_GetGeometry( Window win, int *px, int *py,
  */
 static void EVENT_ConfigureNotify( WND *pWnd, XConfigureEvent *event )
 {
-  WINDOWPOS32 winpos;
-  RECT32 newWindowRect, newClientRect;
-  HRGN32 hrgnOldPos, hrgnNewPos;
+  WINDOWPOS winpos;
+  RECT newWindowRect, newClientRect;
+  HRGN hrgnOldPos, hrgnNewPos;
   Window above = event->above;
   int x, y;
   unsigned int width, height;
@@ -959,13 +959,13 @@ static void EVENT_ConfigureNotify( WND *pWnd, XConfigureEvent *event )
     winpos.flags |= SWP_NOSIZE;
   else
     {
-      RECT32 rect = { 0, 0, pWnd->rectWindow.right - pWnd->rectWindow.left,
+      RECT rect = { 0, 0, pWnd->rectWindow.right - pWnd->rectWindow.left,
 		      pWnd->rectWindow.bottom - pWnd->rectWindow.top };
       DCE_InvalidateDCE( pWnd, &rect );
     }
   
   /* Send WM_WINDOWPOSCHANGING */
-  SendMessage32A( winpos.hwnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)&winpos );
+  SendMessageA( winpos.hwnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)&winpos );
   
   /* Calculate new position and size */
   newWindowRect.left = x;
@@ -977,18 +977,18 @@ static void EVENT_ConfigureNotify( WND *pWnd, XConfigureEvent *event )
 			 &pWnd->rectWindow, &pWnd->rectClient,
 			 &winpos, &newClientRect );
   
-  hrgnOldPos = CreateRectRgnIndirect32( &pWnd->rectWindow );
-  hrgnNewPos = CreateRectRgnIndirect32( &newWindowRect );
-  CombineRgn32( hrgnOldPos, hrgnOldPos, hrgnNewPos, RGN_DIFF );
-  DeleteObject32(hrgnOldPos);
-  DeleteObject32(hrgnNewPos);
+  hrgnOldPos = CreateRectRgnIndirect( &pWnd->rectWindow );
+  hrgnNewPos = CreateRectRgnIndirect( &newWindowRect );
+  CombineRgn( hrgnOldPos, hrgnOldPos, hrgnNewPos, RGN_DIFF );
+  DeleteObject(hrgnOldPos);
+  DeleteObject(hrgnNewPos);
   
   /* Set new size and position */
   pWnd->rectWindow = newWindowRect;
   pWnd->rectClient = newClientRect;
-  SendMessage32A( winpos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)&winpos );
+  SendMessageA( winpos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)&winpos );
   
-  if (!IsWindow32( winpos.hwnd )) return;
+  if (!IsWindow( winpos.hwnd )) return;
   if( above == None )			/* absolute bottom */
     {
       WIN_UnlinkWindow( winpos.hwnd );
@@ -1023,7 +1023,7 @@ static void EVENT_SelectionRequest( WND *pWnd, XSelectionRequestEvent *event )
 	{
 	  /* open to make sure that clipboard is available */
 
-	  BOOL32 couldOpen = OpenClipboard32( pWnd->hwndSelf );
+	  BOOL couldOpen = OpenClipboard( pWnd->hwndSelf );
 	  char* lpstr = 0;
 	  
 	  hText = GetClipboardData16(CF_TEXT);
@@ -1048,7 +1048,7 @@ static void EVENT_SelectionRequest( WND *pWnd, XSelectionRequestEvent *event )
 	  
 	  /* close only if we opened before */
 	  
-	  if(couldOpen) CloseClipboard32();
+	  if(couldOpen) CloseClipboard();
 	}
     }
   
@@ -1102,7 +1102,7 @@ static void EVENT_DropFromOffiX( WND *pWnd, XClientMessageEvent *event )
   unsigned char*	p_data = NULL;
   union {
     Atom		atom_aux;
-    POINT32	pt_aux;
+    POINT	pt_aux;
     int		i;
   }		u;
   int			x, y;
@@ -1156,7 +1156,7 @@ static void EVENT_DropFromOffiX( WND *pWnd, XClientMessageEvent *event )
 	      if( u.i == -1 ) *p = -1;	/* mark as "bad" */
 	      else
 		{
-		  INT32 len = GetShortPathName32A( p, NULL, 0 );
+		  INT len = GetShortPathNameA( p, NULL, 0 );
 		  if (len) aux_long += len + 1;
 		  else *p = -1;
 		}
@@ -1187,7 +1187,7 @@ static void EVENT_DropFromOffiX( WND *pWnd, XClientMessageEvent *event )
 		    {
 		      if( *p != -1 )	/* use only "good" entries */
 			{
-                          GetShortPathName32A( p, p_drop, 65535 );
+                          GetShortPathNameA( p, p_drop, 65535 );
                           p_drop += strlen( p_drop ) + 1;
 			}
 		      p += strlen(p) + 1;
@@ -1222,13 +1222,13 @@ static void EVENT_DropURLs( WND *pWnd, XClientMessageEvent *event )
   int		x, y, drop32 = FALSE ;
   union {
     Atom	atom_aux;
-    POINT32	pt_aux;
+    POINT	pt_aux;
     int         i;
     Window      w_aux;
   }		u; /* unused */
   union {
     HDROP16     h16;
-    HDROP32     h32;
+    HDROP     h32;
   } hDrop;
 
   drop32 = pWnd->flags & WIN_ISWIN32;
@@ -1251,7 +1251,7 @@ static void EVENT_DropURLs( WND *pWnd, XClientMessageEvent *event )
     while (p) {
       if (next) *next=0;
       if (strncmp(p,"file:",5) == 0 ) {
-	INT32 len = GetShortPathName32A( p+5, NULL, 0 );
+	INT len = GetShortPathNameA( p+5, NULL, 0 );
 	if (len) drop_len += len + 1;
       }
       if (next) { 
@@ -1269,22 +1269,22 @@ static void EVENT_DropURLs( WND *pWnd, XClientMessageEvent *event )
       pDropWnd = WIN_FindWndPtr( pWnd->hwndSelf );
       
       if (drop32) {
-	LPDROPFILESTRUCT32        lpDrop;
-	drop_len += sizeof(DROPFILESTRUCT32) + 1; 
-	hDrop.h32 = (HDROP32)GlobalAlloc32( GMEM_SHARE, drop_len );
-	lpDrop = (LPDROPFILESTRUCT32) GlobalLock32( hDrop.h32 );
+	LPDROPFILESTRUCT        lpDrop;
+	drop_len += sizeof(DROPFILESTRUCT) + 1; 
+	hDrop.h32 = (HDROP)GlobalAlloc( GMEM_SHARE, drop_len );
+	lpDrop = (LPDROPFILESTRUCT) GlobalLock( hDrop.h32 );
 	
 	if( lpDrop ) {
-	  lpDrop->lSize = sizeof(DROPFILESTRUCT32);
-	  lpDrop->ptMousePos.x = (INT32)x;
-	  lpDrop->ptMousePos.y = (INT32)y;
-	  lpDrop->fInNonClientArea = (BOOL32) 
+	  lpDrop->lSize = sizeof(DROPFILESTRUCT);
+	  lpDrop->ptMousePos.x = (INT)x;
+	  lpDrop->ptMousePos.y = (INT)y;
+	  lpDrop->fInNonClientArea = (BOOL) 
 	    ( x < (pDropWnd->rectClient.left - pDropWnd->rectWindow.left)  ||
 	      y < (pDropWnd->rectClient.top - pDropWnd->rectWindow.top)    ||
 	      x > (pDropWnd->rectClient.right - pDropWnd->rectWindow.left) ||
 	      y > (pDropWnd->rectClient.bottom - pDropWnd->rectWindow.top) );
 	  lpDrop->fWideChar = FALSE;
-	  p_drop = ((char*)lpDrop) + sizeof(DROPFILESTRUCT32);
+	  p_drop = ((char*)lpDrop) + sizeof(DROPFILESTRUCT);
 	}
       } else {
 	LPDROPFILESTRUCT16        lpDrop;
@@ -1312,7 +1312,7 @@ static void EVENT_DropURLs( WND *pWnd, XClientMessageEvent *event )
 	while (p) {
 	  if (next) *next=0;
 	  if (strncmp(p,"file:",5) == 0 ) {
-	    INT32 len = GetShortPathName32A( p+5, p_drop, 65535 );
+	    INT len = GetShortPathNameA( p+5, p_drop, 65535 );
 	    if (len) {
 	      TRACE(event, "drop file %s as %s\n", p+5, p_drop);
 	      p_drop += len+1;
@@ -1336,9 +1336,9 @@ static void EVENT_DropURLs( WND *pWnd, XClientMessageEvent *event )
 	  /* can not use PostMessage32A because it is currently based on 
 	   * PostMessage16 and WPARAM32 would be truncated to WPARAM16
 	   */
-	  GlobalUnlock32(hDrop.h32);
-	  SendMessage32A( pWnd->hwndSelf, WM_DROPFILES,
-			  (WPARAM32)hDrop.h32, 0L );
+	  GlobalUnlock(hDrop.h32);
+	  SendMessageA( pWnd->hwndSelf, WM_DROPFILES,
+			  (WPARAM)hDrop.h32, 0L );
 	} else {
 	  GlobalUnlock16(hDrop.h16);
 	  PostMessage16( pWnd->hwndSelf, WM_DROPFILES,
@@ -1398,7 +1398,7 @@ static void EVENT_ClientMessage( WND *pWnd, XClientMessageEvent *event )
 void EVENT_EnterNotify( WND *pWnd, XCrossingEvent *event )
 {
   if( !Options.managed && X11DRV_GetXRootWindow() == DefaultRootWindow(display) &&
-      (COLOR_GetSystemPaletteFlags() & COLOR_PRIVATE) && GetFocus32() )
+      (COLOR_GetSystemPaletteFlags() & COLOR_PRIVATE) && GetFocus() )
     TSXInstallColormap( display, X11DRV_COLOR_GetColormap() );
 }
 #endif
@@ -1406,11 +1406,11 @@ void EVENT_EnterNotify( WND *pWnd, XCrossingEvent *event )
 /**********************************************************************
  *		EVENT_MapNotify
  */
-void EVENT_MapNotify( HWND32 hWnd, XMapEvent *event )
+void EVENT_MapNotify( HWND hWnd, XMapEvent *event )
 {
-  HWND32 hwndFocus = GetFocus32();
+  HWND hwndFocus = GetFocus();
   
-  if (hwndFocus && IsChild32( hWnd, hwndFocus ))
+  if (hwndFocus && IsChild( hWnd, hwndFocus ))
     X11DRV_WND_SetFocus( WIN_FindWndPtr( hwndFocus ) );
   
   return;
@@ -1419,7 +1419,7 @@ void EVENT_MapNotify( HWND32 hWnd, XMapEvent *event )
 /**********************************************************************
  *		X11DRV_EVENT_Pending
  */
-BOOL32 X11DRV_EVENT_Pending()
+BOOL X11DRV_EVENT_Pending()
 {
   return TSXPending(display);
 }
diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c
index cb71a37d47a..b71b2a7e167 100644
--- a/windows/x11drv/keyboard.c
+++ b/windows/x11drv/keyboard.c
@@ -96,7 +96,7 @@ static WORD EVENT_event_to_vkey( XKeyEvent *e)
     return keyc2vkey[e->keycode];
 }
 
-static BOOL32 NumState=FALSE, CapsState=FALSE;
+static BOOL NumState=FALSE, CapsState=FALSE;
 
 /**********************************************************************
  *		KEYBOARD_GenerateMsg
@@ -106,10 +106,10 @@ static BOOL32 NumState=FALSE, CapsState=FALSE;
  * Convention : called with vkey only VK_NUMLOCK or VK_CAPITAL
  *
  */
-void KEYBOARD_GenerateMsg( WORD vkey, int Evtype, INT32 event_x, INT32 event_y,
+void KEYBOARD_GenerateMsg( WORD vkey, int Evtype, INT event_x, INT event_y,
                            DWORD event_time )
 {
-  BOOL32 * State = (vkey==VK_NUMLOCK? &NumState : &CapsState);
+  BOOL * State = (vkey==VK_NUMLOCK? &NumState : &CapsState);
 
   if (*State) {
     /* The INTERMEDIARY state means : just after a 'press' event, if a 'release' event comes,
@@ -211,12 +211,12 @@ void X11DRV_KEYBOARD_HandleEvent( WND *pWnd, XKeyEvent *event )
     KeySym keysym;
     WORD vkey = 0, bScan;
     DWORD dwFlags;
-    static BOOL32 force_extended = FALSE; /* hack for AltGr translation */
+    static BOOL force_extended = FALSE; /* hack for AltGr translation */
     
     int ascii_chars;
 
-    INT32 event_x = (pWnd? pWnd->rectWindow.left : 0) + event->x;
-    INT32 event_y = (pWnd? pWnd->rectWindow.top  : 0) + event->y;
+    INT event_x = (pWnd? pWnd->rectWindow.left : 0) + event->x;
+    INT event_y = (pWnd? pWnd->rectWindow.top  : 0) + event->y;
     DWORD event_time = event->time - MSG_WineStartTicks;
 
     /* this allows support for dead keys */
@@ -618,7 +618,7 @@ INT16 X11DRV_KEYBOARD_GetKeyNameText(LONG lParam, LPSTR lpBuffer, INT16 nSize)
   
   for (i = 0 ; i != KeyTableSize ; i++) 
     if (KeyTable[i].scancode == lParam)  {
-      lstrcpyn32A( lpBuffer, KeyTable[i].name, nSize );
+      lstrcpynA( lpBuffer, KeyTable[i].name, nSize );
       return strlen(lpBuffer);
     }
 #endif
@@ -652,7 +652,7 @@ INT16 X11DRV_KEYBOARD_ToAscii(
     XKeyEvent e;
     KeySym keysym;
     static XComposeStatus cs;
-    INT32 ret;
+    INT ret;
     int keyc;
 
     if (scanCode==0) {
diff --git a/windows/x11drv/mouse.c b/windows/x11drv/mouse.c
index fa4f8868ef9..26c08d20237 100644
--- a/windows/x11drv/mouse.c
+++ b/windows/x11drv/mouse.c
@@ -21,12 +21,12 @@
 
 Cursor X11DRV_MOUSE_XCursor = None;    /* Current X cursor */
 
-BOOL32 X11DRV_MOUSE_DisableWarpPointer = FALSE;  /* hack; see DISPLAY_MoveCursor */
+BOOL X11DRV_MOUSE_DisableWarpPointer = FALSE;  /* hack; see DISPLAY_MoveCursor */
 
 /***********************************************************************
  *		X11DRV_MOUSE_DoSetCursor
  */
-static BOOL32 X11DRV_MOUSE_DoSetCursor( CURSORICONINFO *ptr )
+static BOOL X11DRV_MOUSE_DoSetCursor( CURSORICONINFO *ptr )
 {
     Pixmap pixmapBits, pixmapMask, pixmapAll;
     XColor fg, bg;
@@ -151,13 +151,13 @@ static BOOL32 X11DRV_MOUSE_DoSetCursor( CURSORICONINFO *ptr )
         /* FIXME: this won't work correctly with native USER !*/
 
         /* Set the same cursor for all top-level windows */
-        HWND32 hwnd = GetWindow32( GetDesktopWindow32(), GW_CHILD );
+        HWND hwnd = GetWindow( GetDesktopWindow(), GW_CHILD );
         while(hwnd)
         {
             Window win = X11DRV_WND_FindXWindow( WIN_FindWndPtr( hwnd ) );
             if (win && win!=DefaultRootWindow(display))
                 XDefineCursor( display, win, cursor );
-            hwnd = GetWindow32( hwnd, GW_HWNDNEXT );
+            hwnd = GetWindow( hwnd, GW_HWNDNEXT );
         }
     }
     return TRUE;
diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c
index 2e9cac3c284..c30686edede 100644
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@@ -142,7 +142,7 @@ void X11DRV_WND_Finalize(WND *wndPtr)
 /**********************************************************************
  *		X11DRV_WND_CreateDesktopWindow
  */
-BOOL32 X11DRV_WND_CreateDesktopWindow(WND *wndPtr, CLASS *classPtr, BOOL32 bUnicode)
+BOOL X11DRV_WND_CreateDesktopWindow(WND *wndPtr, CLASS *classPtr, BOOL bUnicode)
 {
     if (wmProtocols == None)
         wmProtocols = TSXInternAtom( display, "WM_PROTOCOLS", True );
@@ -163,7 +163,7 @@ BOOL32 X11DRV_WND_CreateDesktopWindow(WND *wndPtr, CLASS *classPtr, BOOL32 bUnic
 /**********************************************************************
  *		X11DRV_WND_CreateWindow
  */
-BOOL32 X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCT32A *cs, BOOL32 bUnicode)
+BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BOOL bUnicode)
 {
   /* Create the X window (only for top-level windows, and then only */
   /* when there's no desktop window) */
@@ -245,7 +245,7 @@ BOOL32 X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCT32A *cs
 /***********************************************************************
  *		X11DRV_WND_DestroyWindow
  */
-BOOL32 X11DRV_WND_DestroyWindow(WND *wndPtr)
+BOOL X11DRV_WND_DestroyWindow(WND *wndPtr)
 {
    if (X11DRV_WND_GetXWindow(wndPtr))
      {
@@ -290,7 +290,7 @@ WND *X11DRV_WND_SetParent(WND *wndPtr, WND *pWndParent)
                 wndPtr->wIDmenu = 0;
                 if( X11DRV_WND_GetXRootWindow(wndPtr) == DefaultRootWindow(display) )
                 {
-                    CREATESTRUCT32A cs;
+                    CREATESTRUCTA cs;
                     cs.lpCreateParams = NULL;
                     cs.hInstance = 0; /* not used if following call */
                     cs.hMenu = 0; /* not used in following call */
@@ -314,7 +314,7 @@ WND *X11DRV_WND_SetParent(WND *wndPtr, WND *pWndParent)
                     wndPtr->dwStyle |= WS_CHILD;
                     if( wndPtr->wIDmenu != 0)
                     {
-                        DestroyMenu32( (HMENU32) wndPtr->wIDmenu );
+                        DestroyMenu( (HMENU) wndPtr->wIDmenu );
                         wndPtr->wIDmenu = 0;
                     }
                 }
@@ -389,7 +389,7 @@ static Window X11DRV_WND_FindDesktopXWindow( WND *wndPtr )
  *
  * SetWindowPos() for an X window. Used by the real SetWindowPos().
  */
-void X11DRV_WND_SetWindowPos(WND *wndPtr, const WINDOWPOS32 *winpos, BOOL32 bSMC_SETXPOS)
+void X11DRV_WND_SetWindowPos(WND *wndPtr, const WINDOWPOS *winpos, BOOL bSMC_SETXPOS)
 {
   XWindowChanges winChanges;
   int changeMask = 0;
@@ -490,7 +490,7 @@ void X11DRV_WND_SetText(WND *wndPtr, LPCSTR text)
  */
 void X11DRV_WND_SetFocus(WND *wndPtr)
 {
-  HWND32 hwnd =  wndPtr->hwndSelf;
+  HWND hwnd =  wndPtr->hwndSelf;
   XWindowAttributes win_attr;
   Window win;
   
@@ -544,11 +544,11 @@ void X11DRV_WND_PostSizeMove(WND *wndPtr)
  *		 X11DRV_WND_ScrollWindow
  */
 void X11DRV_WND_ScrollWindow(
-  WND *wndPtr, DC *dcPtr, INT32 dx, INT32 dy, 
-  const RECT32 *rect, BOOL32 bUpdate)
+  WND *wndPtr, DC *dcPtr, INT dx, INT dy, 
+  const RECT *rect, BOOL bUpdate)
 {
   X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dcPtr->physDev;
-  POINT32 dst, src;
+  POINT dst, src;
   
   dst.x = (src.x = dcPtr->w.DCOrgX + rect->left) + dx;
   dst.y = (src.y = dcPtr->w.DCOrgY + rect->top) + dy;
@@ -574,7 +574,7 @@ void X11DRV_WND_ScrollWindow(
  * Set the drawable, origin and dimensions for the DC associated to
  * a given window.
  */
-void X11DRV_WND_SetDrawable(WND *wndPtr, DC *dc, WORD flags, BOOL32 bSetClipOrigin)
+void X11DRV_WND_SetDrawable(WND *wndPtr, DC *dc, WORD flags, BOOL bSetClipOrigin)
 {
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
@@ -622,7 +622,7 @@ void X11DRV_WND_SetDrawable(WND *wndPtr, DC *dc, WORD flags, BOOL32 bSetClipOrig
 /***********************************************************************
  *		X11DRV_WND_IsSelfClipping
  */
-BOOL32 X11DRV_WND_IsSelfClipping(WND *wndPtr)
+BOOL X11DRV_WND_IsSelfClipping(WND *wndPtr)
 {
   if( X11DRV_WND_GetXWindow(wndPtr) ) 
       return TRUE; /* X itself will do the clipping */
-- 
GitLab