diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index be650c56797..b09e3ace24b 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -439,6 +439,10 @@ BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dw
     return TRUE;
 }
 
+/******************************************************************************
+ * RegisterTraceGuidsW [ADVAPI32.@]
+ *
+ */
 ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress,
                 PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount,
                 PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath,
@@ -450,6 +454,10 @@ ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress,
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
+/******************************************************************************
+ * RegisterTraceGuidsA [ADVAPI32.@]
+ *
+ */
 ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress,
                 PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount,
                 PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath,
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 0ab7ab1b015..65a50a406dc 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -761,6 +761,33 @@ void ME_DestroyEditor(ME_TextEditor *editor)
   FREE_OBJ(editor);
 }
 
+static WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0};
+static WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0};
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+    TRACE("\n");
+    switch (fdwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+      DisableThreadLibraryCalls(hinstDLL);
+      me_heap = HeapCreate (0, 0x10000, 0);
+      ME_RegisterEditorClass(hinstDLL);
+      break;
+
+    case DLL_PROCESS_DETACH:
+      UnregisterClassW(wszClassName, 0);
+      UnregisterClassW(wszClassName50, 0);
+      UnregisterClassA("RichEdit20A", 0);
+      UnregisterClassA("RichEdit50A", 0);
+      HeapDestroy (me_heap);
+      me_heap = NULL;
+      break;
+    }
+    return TRUE;
+}
+
+
 #define UNSUPPORTED_MSG(e) \
   case e: \
     FIXME(#e ": stub\n"); \
@@ -1417,9 +1444,6 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, in
   return nWritten;  
 }
 
-static WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0};
-static WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0};
-
 void ME_RegisterEditorClass(HINSTANCE hInstance)
 {
   BOOL bResult;
@@ -1458,30 +1482,6 @@ void ME_RegisterEditorClass(HINSTANCE hInstance)
   bResult = RegisterClassA(&wcA);  
   assert(bResult);
 }
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("\n");
-    switch (fdwReason)
-    {
-    case DLL_PROCESS_ATTACH:
-      DisableThreadLibraryCalls(hinstDLL);
-      me_heap = HeapCreate (0, 0x10000, 0);
-      ME_RegisterEditorClass(hinstDLL);
-      break;
-
-    case DLL_PROCESS_DETACH:
-      UnregisterClassW(wszClassName, 0);
-      UnregisterClassW(wszClassName50, 0);
-      UnregisterClassA("RichEdit20A", 0);
-      UnregisterClassA("RichEdit50A", 0);
-      HeapDestroy (me_heap);
-      me_heap = NULL;
-      break;
-    }
-    return TRUE;
-}
-
 /******************************************************************
  *        CreateTextServices (RICHED20.4)
  *
diff --git a/dlls/richedit/richedit.c b/dlls/richedit/richedit.c
index 5bccedda845..d059b0791cd 100644
--- a/dlls/richedit/richedit.c
+++ b/dlls/richedit/richedit.c
@@ -40,26 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 extern LRESULT WINAPI RichEdit10ANSIWndProc(HWND, UINT, WPARAM, LPARAM);
 
 
-/***********************************************************************
- * DllGetVersion [RICHED32.2]
- *
- * Retrieves version information
- */
-HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi)
-{
-    TRACE("\n");
-
-    if (pdvi->cbSize != sizeof(DLLVERSIONINFO))
-	return E_INVALIDARG;
-
-    pdvi->dwMajorVersion = 4;
-    pdvi->dwMinorVersion = 0;
-    pdvi->dwBuildNumber = 0;
-    pdvi->dwPlatformID = 0;
-
-    return S_OK;
-}
-
 /* Unregisters the window class. */
 static BOOL RICHED32_Unregister(void)
 {
@@ -104,3 +84,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     }
     return TRUE;
 }
+
+/***********************************************************************
+ * DllGetVersion [RICHED32.2]
+ *
+ * Retrieves version information
+ */
+HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi)
+{
+    TRACE("\n");
+
+    if (pdvi->cbSize != sizeof(DLLVERSIONINFO))
+	return E_INVALIDARG;
+
+    pdvi->dwMajorVersion = 4;
+    pdvi->dwMinorVersion = 0;
+    pdvi->dwBuildNumber = 0;
+    pdvi->dwPlatformID = 0;
+
+    return S_OK;
+}
diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index a2d4a518b45..40f8dcc6d30 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -41,7 +41,11 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-LONG_PTR /* CLIENT_CALL_RETURN */ RPCRT4_NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, va_list args)
+/***********************************************************************
+ * Note: this should return a CLIENT_CALL_RETURN, but calling convention for
+ * returning structures/unions is different between Windows and gcc on i386.
+ */
+LONG_PTR RPCRT4_NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, va_list args)
 {
 
   RPC_CLIENT_INTERFACE *rpc_cli_if = (RPC_CLIENT_INTERFACE *)(pStubDesc->RpcInterfaceInformation);
@@ -83,8 +87,11 @@ LONG_PTR /* CLIENT_CALL_RETURN */ RPCRT4_NdrClientCall2(PMIDL_STUB_DESC pStubDes
 
 /***********************************************************************
  *           NdrClientCall2 [RPCRT4.@]
+ *
+ * Note: this should return a CLIENT_CALL_RETURN, but calling convention for
+ * returning structures/unions is different between Windows and gcc on i386.
  */
-LONG_PTR /* CLIENT_CALL_RETURN */ WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc,
+LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc,
   PFORMAT_STRING pFormat, ...)
 {
     LONG_PTR ret;