diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c
index 96ac6b4c19f..d43de0888dd 100644
--- a/dlls/shell32/dataobject.c
+++ b/dlls/shell32/dataobject.c
@@ -11,7 +11,6 @@
 #include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
 #include "wine/obj_dataobject.h"
-#include "objbase.h"
 #include "pidl.h"
 #include "winerror.h"
 #include "shell32_main.h"
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index baa3a7492db..b419e82b3fe 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -74,7 +74,7 @@ LPENUMIDLIST IEnumIDList_Constructor( LPCSTR lpszPath, DWORD dwFlags)
 }
 
 /**************************************************************************
- *  EnumIDList::QueryInterface
+ *  EnumIDList_QueryInterface
  */
 static HRESULT WINAPI IEnumIDList_QueryInterface(
   LPENUMIDLIST this, REFIID riid, LPVOID *ppvObj)
diff --git a/include/objidl.h b/include/objidl.h
index 260a1e6f4aa..a89858b0ed7 100644
--- a/include/objidl.h
+++ b/include/objidl.h
@@ -9,9 +9,9 @@
 #include "wine/obj_channel.h"
 #include "wine/obj_clientserver.h"
 #include "wine/obj_storage.h"
-#include "wine/obj_marshal.h"
 
 /* the following depend on obj_storage.h */
+#include "wine/obj_marshal.h"
 #include "wine/obj_moniker.h"
 #include "wine/obj_propertystorage.h"
 
diff --git a/include/wine/obj_moniker.h b/include/wine/obj_moniker.h
index 83c055be024..b0f4504533b 100644
--- a/include/wine/obj_moniker.h
+++ b/include/wine/obj_moniker.h
@@ -1,7 +1,7 @@
 /*
  * Defines the COM interfaces and APIs related to the moniker functionality.
  *
- * This file depends on 'obj_storage.h' and 'obj_base.h'.
+ * This file depends on 'obj_storage.h' and 'obj_base.h' and 'obj_misc.h' (IEnumString).
  */
 
 
diff --git a/ole/compobj.c b/ole/compobj.c
index 73a4153ff09..1919ccbae60 100644
--- a/ole/compobj.c
+++ b/ole/compobj.c
@@ -714,7 +714,7 @@ HRESULT WINAPI CLSIDFromString32(
 }
 
 /******************************************************************************
- *		WINE_StringFromCLSID	[???]
+ *		WINE_StringFromCLSID	[Internal]
  * Converts a GUID into the respective string representation.
  *
  * NOTES