diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index c04f238..502727c 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -222,7 +222,7 @@
 
 /***********************************************************************
  *		AVIFileOpenA (AVIFIL32.@)
- *		AVIFileOpenA (AVIFILE.102)
+ *		AVIFileOpen  (AVIFILE.102)
  */
 HRESULT WINAPI AVIFileOpenA(
 	PAVIFILE * ppfile,LPCSTR szFile,UINT uMode,LPCLSID lpHandler
diff --git a/dlls/dinput/joystick/linux.c b/dlls/dinput/joystick/linux.c
index a58db60..6fad4dc 100644
--- a/dlls/dinput/joystick/linux.c
+++ b/dlls/dinput/joystick/linux.c
@@ -28,7 +28,9 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #include <errno.h>
 #ifdef HAVE_SYS_ERRNO_H
 # include <sys/errno.h>
diff --git a/dlls/dinput/joystick/linuxinput.c b/dlls/dinput/joystick/linuxinput.c
index 4e9d40e..729dce3 100644
--- a/dlls/dinput/joystick/linuxinput.c
+++ b/dlls/dinput/joystick/linuxinput.c
@@ -29,7 +29,9 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #include <errno.h>
 #ifdef HAVE_SYS_ERRNO_H
 # include <sys/errno.h>
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 614d693..318ce21 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -30,7 +30,8 @@
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /***********************************************************************
- *              DllCanUnloadNow (SHDOCVW.109) */
+ *              DllCanUnloadNow (SHDOCVW.@)
+ */
 HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void)
 {
     FIXME("(void): stub\n");
@@ -39,7 +40,7 @@
 }
 
 /*************************************************************************
- *              DllGetClassObject (SHDOCVW.312)
+ *              DllGetClassObject (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
@@ -58,7 +59,7 @@
 }
 
 /***********************************************************************
- *              DllGetVersion (SHDOCVW.113)
+ *              DllGetVersion (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllGetVersion (DLLVERSIONINFO *pdvi)
 {
@@ -67,7 +68,7 @@
 }
 
 /*************************************************************************
- *              DllInstall (SHDOCVW.114)
+ *              DllInstall (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
@@ -77,7 +78,7 @@
 }
 
 /***********************************************************************
- *		DllRegisterServer (SHDOCVW.124)
+ *		DllRegisterServer (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllRegisterServer()
 {
@@ -86,7 +87,7 @@
 }
 
 /***********************************************************************
- *		DllUnregisterServer (SHDOCVW.127)
+ *		DllUnregisterServer (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllUnregisterServer()
 {
diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c
index b085d75..896c3bc 100644
--- a/dlls/winedos/int31.c
+++ b/dlls/winedos/int31.c
@@ -510,8 +510,11 @@
 }
 
 
-/* DPMI Raw Mode Switch handler */
-
+/**********************************************************************
+ *	    RawModeSwitch   (WINEDOS.@)
+ *
+ * DPMI Raw Mode Switch handler
+ */
 void WINAPI DOSVM_RawModeSwitch( CONTEXT86 *context )
 {
   CONTEXT86 rm_ctx;
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index 107ca63..1db4fed 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -37,7 +37,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c
index cee7255..08dfb2e 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -31,7 +31,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c
index 8175a08..194c901 100644
--- a/dlls/winmm/wineoss/mixer.c
+++ b/dlls/winmm/wineoss/mixer.c
@@ -30,7 +30,10 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <assert.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+
 #include "windef.h"
 #include "mmddk.h"
 #include "oss.h"
diff --git a/dlls/winmm/wineoss/mmaux.c b/dlls/winmm/wineoss/mmaux.c
index d280b42..6cbad78 100644
--- a/dlls/winmm/wineoss/mmaux.c
+++ b/dlls/winmm/wineoss/mmaux.c
@@ -27,7 +27,10 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+
 #include "windef.h"
 #include "mmddk.h"
 #include "oss.h"
diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c
index 0239f23..50b282b 100644
--- a/dlls/winsock/async.c
+++ b/dlls/winsock/async.c
@@ -41,7 +41,9 @@
 #ifdef HAVE_SYS_IPC_H
 # include <sys/ipc.h>
 #endif
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_FILIO_H
 # include <sys/filio.h>
 #endif
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index 44dfa6e..3b19995 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -32,7 +32,9 @@
 #ifdef HAVE_SYS_IPC_H
 # include <sys/ipc.h>
 #endif
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_FILIO_H
 # include <sys/filio.h>
 #endif
diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index fe797c5..79ffb52 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -49,7 +49,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
diff --git a/dlls/x11drv/wineclipsrv.c b/dlls/x11drv/wineclipsrv.c
index e31c39d..f3d65f3 100644
--- a/dlls/x11drv/wineclipsrv.c
+++ b/dlls/x11drv/wineclipsrv.c
@@ -833,7 +833,9 @@
           break;
         
       case PropertyNotify:
-          // EVENT_PropertyNotify( (XPropertyEvent *)event );
+#if 0
+          EVENT_PropertyNotify( (XPropertyEvent *)event );
+#endif
           break;
 
       default: /* ignore all other events */
diff --git a/msdos/ppdev.c b/msdos/ppdev.c
index b413eb7..e7eec66 100644
--- a/msdos/ppdev.c
+++ b/msdos/ppdev.c
@@ -26,7 +26,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #include <errno.h>
 #include <linux/ppdev.h>