Better header matching

2 files changed, 4 insertions, 3 deletions

diff --git a/qt5_4.imp b/qt5_4.imp
index 5d75fd9e..0c688042 100644
--- a/qt5_4.imp
+++ b/qt5_4.imp
@@ -2464,6 +2464,7 @@
     { include: [ "@\"(QtCore/)?qnamespace\\.h\"", "private", "<Qt>", "public" ] },
     { include: [ "@\"(QtCore/)?qlogging\\.h\"", "private", "<QtDebug>", "public" ] }, #qDebug, qWarning, etc
     { include: [ "@\"(QtCore/)?qalgorithms\\.h\"", "private", "<QAlgorithms>", "public" ] }, #qSort, etc
+    { include: [ "@\"(QtWinExtras/)?qwinfunctions\\.h\"", "private", "<QtWin>", "public" ] },  // for fromHICON
 
 # These ones are just madness. For instance, why with the above do we get
 #    #include "QtCore/qcoreevent.h"      // for QEvent (ptr only), etc
@@ -2473,6 +2474,5 @@
 #include "QtCore/qtypetraits.h"  // for remove_reference<>::type
 #include "QtCore/qsharedpointer_impl.h"            // for swap
 #include "QtCore/qatomic_msvc.h"
-#include "qwinfunctions.h"  // for fromHICON
 
 ]
diff --git a/win.imp b/win.imp
index 90e8e69c..cbecdc43 100644
--- a/win.imp
+++ b/win.imp
@@ -9,9 +9,10 @@
     { include: [ "<sys/stat.inl>", "private", "<sys/stat.h>", "public" ] },
 
 # Windows
-# Looks like the doucmentation says the 1st char is u/c the rest are l/c
+# Looks like the documentation says the 1st char is u/c the rest are l/c
+
 # You have to be kidding me. ULONG is defined in winsmcrd.h?
-    { symbol: [ "ULONG",    "private", "<windef.h>", "private" ] },
+    { symbol: [ "ULONG", "private", "<windef.h>", "private" ] },
 
     { include: [ "<winnls.h>", "private", "<stringapiset.h>", "private" ] }, # Stringapiset.h
     { include: [ "<stringapiset.h>", "private", "<Windows.h>", "public" ] },