From 20febaafd23016b7a944795cb1cfefce981fc796 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 21 Jan 2014 17:58:34 +0000
Subject: [PATCH] [COMCTL32] * Move some inclusions to the main header. *
 Remove inclusions and definitions that already exist in the main
 header/resource file. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61745
---
 reactos/dll/win32/comctl32/comctl32.h        |  7 +++----
 reactos/dll/win32/comctl32/datetime.c        |  4 ++--
 reactos/dll/win32/comctl32/dpa.c             |  2 --
 reactos/dll/win32/comctl32/imagelist.c       |  1 -
 reactos/dll/win32/comctl32/lang/comctl_Bg.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Cs.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Da.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_De.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_El.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_En.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Eo.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Es.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Fr.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_He.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Hu.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_It.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Ja.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Ko.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Lt.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Nl.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_No.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Pl.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Pt.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Ro.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Ru.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Si.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Sk.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Sr.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Sv.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Th.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Tr.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Uk.rc |  2 --
 reactos/dll/win32/comctl32/lang/comctl_Zh.rc |  2 --
 reactos/dll/win32/comctl32/listview.c        | 10 +++++-----
 34 files changed, 10 insertions(+), 72 deletions(-)

diff --git a/reactos/dll/win32/comctl32/comctl32.h b/reactos/dll/win32/comctl32/comctl32.h
index 70e162a9dc4..b570c7f97f4 100644
--- a/reactos/dll/win32/comctl32/comctl32.h
+++ b/reactos/dll/win32/comctl32/comctl32.h
@@ -24,7 +24,7 @@
 #ifndef __WINE_COMCTL32_H
 #define __WINE_COMCTL32_H
 
-#include <config.h>
+#include <wine/config.h>
 
 #include <stdarg.h>
 #include <assert.h>
@@ -32,17 +32,16 @@
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
-#define COBJMACROS
-
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
 #include <winuser.h>
 #include <winreg.h>
-#include <commctrl.h>
+#include <objbase.h>
 #include <uxtheme.h>
 #include <vssym32.h>
 
diff --git a/reactos/dll/win32/comctl32/datetime.c b/reactos/dll/win32/comctl32/datetime.c
index 6a13f55f4b5..3709b77da2a 100644
--- a/reactos/dll/win32/comctl32/datetime.c
+++ b/reactos/dll/win32/comctl32/datetime.c
@@ -39,10 +39,10 @@
  *    -- FORMATCALLBACK
  */
 
-#include <math.h>
-
 #include "comctl32.h"
 
+#include <math.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(datetime);
 
 typedef struct
diff --git a/reactos/dll/win32/comctl32/dpa.c b/reactos/dll/win32/comctl32/dpa.c
index 19fbe45c80b..11b13bd1777 100644
--- a/reactos/dll/win32/comctl32/dpa.c
+++ b/reactos/dll/win32/comctl32/dpa.c
@@ -31,8 +31,6 @@
 
 #include "comctl32.h"
 
-#include <objbase.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(dpa);
 
 typedef struct _DPA
diff --git a/reactos/dll/win32/comctl32/imagelist.c b/reactos/dll/win32/comctl32/imagelist.c
index 27d98aefdac..32209910b7b 100644
--- a/reactos/dll/win32/comctl32/imagelist.c
+++ b/reactos/dll/win32/comctl32/imagelist.c
@@ -39,7 +39,6 @@
 
 #include "comctl32.h"
 
-#include <objbase.h>
 #include <commoncontrols.h>
 #include <wine/exception.h>
 
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Bg.rc b/reactos/dll/win32/comctl32/lang/comctl_Bg.rc
index e1234ad9045..0b347774a66 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Bg.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Bg.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Cs.rc b/reactos/dll/win32/comctl32/lang/comctl_Cs.rc
index 184956be04d..10a163bf63c 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Cs.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Cs.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Da.rc b/reactos/dll/win32/comctl32/lang/comctl_Da.rc
index 8a443054f2d..27d29dea3fd 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Da.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Da.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_De.rc b/reactos/dll/win32/comctl32/lang/comctl_De.rc
index ac759351c16..98e3edc4866 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_De.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_De.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_El.rc b/reactos/dll/win32/comctl32/lang/comctl_El.rc
index bb230b7dfcf..fbfdf7d6e2e 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_El.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_El.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_En.rc b/reactos/dll/win32/comctl32/lang/comctl_En.rc
index 66038681b44..21cb9ea08e9 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_En.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_En.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Eo.rc b/reactos/dll/win32/comctl32/lang/comctl_Eo.rc
index cb9d088d666..c4894a4482c 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Eo.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Eo.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Es.rc b/reactos/dll/win32/comctl32/lang/comctl_Es.rc
index f94f152361d..b8134efbe2e 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Es.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Es.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Fr.rc b/reactos/dll/win32/comctl32/lang/comctl_Fr.rc
index d07b963d5ad..703ed25e496 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Fr.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Fr.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_He.rc b/reactos/dll/win32/comctl32/lang/comctl_He.rc
index 3ed9771b3a4..d71c98a6179 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_He.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_He.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Hu.rc b/reactos/dll/win32/comctl32/lang/comctl_Hu.rc
index e604fcf8940..5d0d197f8ae 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Hu.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Hu.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_It.rc b/reactos/dll/win32/comctl32/lang/comctl_It.rc
index ffabff3cda5..9ea74c4aac1 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_It.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_It.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Ja.rc b/reactos/dll/win32/comctl32/lang/comctl_Ja.rc
index 634222bc6b3..267d7f9b688 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Ja.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Ja.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Ko.rc b/reactos/dll/win32/comctl32/lang/comctl_Ko.rc
index e0a514b2793..3fc05c59d2c 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Ko.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Ko.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Lt.rc b/reactos/dll/win32/comctl32/lang/comctl_Lt.rc
index a1b58c2d452..1e33fd40e0f 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Lt.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Lt.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Nl.rc b/reactos/dll/win32/comctl32/lang/comctl_Nl.rc
index 5806d9cf03e..9bc6cbac2c2 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Nl.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Nl.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_No.rc b/reactos/dll/win32/comctl32/lang/comctl_No.rc
index cd05512c80c..b3358902758 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_No.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_No.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Pl.rc b/reactos/dll/win32/comctl32/lang/comctl_Pl.rc
index e0eab02dcd3..d5ac5f0d209 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Pl.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Pl.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Pt.rc b/reactos/dll/win32/comctl32/lang/comctl_Pt.rc
index 37b5c2eea9d..b7580302c81 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Pt.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Pt.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Ro.rc b/reactos/dll/win32/comctl32/lang/comctl_Ro.rc
index 53d7f2097d6..a42295126e5 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Ro.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Ro.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Ru.rc b/reactos/dll/win32/comctl32/lang/comctl_Ru.rc
index ecbf097cd3b..27e52b2d408 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Ru.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Ru.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Si.rc b/reactos/dll/win32/comctl32/lang/comctl_Si.rc
index 6e29c22dd48..667d09a70a5 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Si.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Si.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Sk.rc b/reactos/dll/win32/comctl32/lang/comctl_Sk.rc
index d30a3057748..5aff52cfd9b 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Sk.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Sk.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Sr.rc b/reactos/dll/win32/comctl32/lang/comctl_Sr.rc
index 141c1c5c0d4..49d09d5e2cf 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Sr.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Sr.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Sv.rc b/reactos/dll/win32/comctl32/lang/comctl_Sv.rc
index 7c3315be01d..69899116838 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Sv.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Sv.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Th.rc b/reactos/dll/win32/comctl32/lang/comctl_Th.rc
index 5908ecb05d8..49531071469 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Th.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Th.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Tr.rc b/reactos/dll/win32/comctl32/lang/comctl_Tr.rc
index 034978660ef..c497f029641 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Tr.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Tr.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Uk.rc b/reactos/dll/win32/comctl32/lang/comctl_Uk.rc
index e5bb6b2201c..9d1808858b4 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Uk.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Uk.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/lang/comctl_Zh.rc b/reactos/dll/win32/comctl32/lang/comctl_Zh.rc
index ec6b4f6f85e..e5a0fdb9a5d 100644
--- a/reactos/dll/win32/comctl32/lang/comctl_Zh.rc
+++ b/reactos/dll/win32/comctl32/lang/comctl_Zh.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "comctl32.h"
-
 LANGUAGE LANG_CHINESE, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/comctl32/listview.c b/reactos/dll/win32/comctl32/listview.c
index 0d98cda8ee5..421e74cf693 100644
--- a/reactos/dll/win32/comctl32/listview.c
+++ b/reactos/dll/win32/comctl32/listview.c
@@ -134,10 +134,10 @@
  *   -- LVGroupComparE
  */
 
-#include <stdio.h>
-
 #include "comctl32.h"
 
+#include <stdio.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(listview);
 
 typedef struct tagCOLUMN_INFO
@@ -8597,7 +8597,7 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy)
     return oldspacing;
 }
 
-static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small)
+static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL is_small)
 {
     INT cx, cy;
     
@@ -8608,8 +8608,8 @@ static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small)
     }
     else
     {
-	size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON);
-	size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON);
+	size->cx = GetSystemMetrics(is_small ? SM_CXSMICON : SM_CXICON);
+	size->cy = GetSystemMetrics(is_small ? SM_CYSMICON : SM_CYICON);
     }
 }