diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt
index aa862fa236e..6516663e7fb 100644
--- a/base/setup/reactos/CMakeLists.txt
+++ b/base/setup/reactos/CMakeLists.txt
@@ -17,8 +17,8 @@ list(APPEND SOURCE
 file(GLOB reactos_rc_deps res/*.*)
 add_rc_deps(reactos.rc ${reactos_rc_deps})
 add_executable(reactos ${SOURCE} reactos.rc)
-set_module_type(reactos win32gui UNICODE)
 add_pch(reactos reactos.h SOURCE)
+set_module_type(reactos win32gui UNICODE)
 target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib)
 target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation
 add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll)
diff --git a/base/setup/reactos/treelist.h b/base/setup/reactos/treelist.h
index c37993cf135..d5b4969ce84 100644
--- a/base/setup/reactos/treelist.h
+++ b/base/setup/reactos/treelist.h
@@ -457,10 +457,21 @@ extern BOOL	TreeListUnregister(HINSTANCE hInstance);
 
 /* Compat with my old code... */
 #define TLCOLUMN TVCOLUMN
-#define HTLITEM HTREEITEM
+#define HTLITEM  HTREEITEM
+
 #define TL_INSERTSTRUCTA TV_INSERTSTRUCTA
+#define TLINSERTSTRUCTA  TVINSERTSTRUCTA
 #define TL_INSERTSTRUCTW TV_INSERTSTRUCTW
-#define TL_INSERTSTRUCT TV_INSERTSTRUCT
+#define TLINSERTSTRUCTW  TVINSERTSTRUCTW
+#define TL_INSERTSTRUCT  TV_INSERTSTRUCT
+#define TLINSERTSTRUCT   TVINSERTSTRUCT
+
+#define TL_ITEMA TV_ITEMA
+#define TLITEMA  TVITEMA
+#define TL_ITEMW TV_ITEMW
+#define TLITEMW  TVITEMW
+#define TL_ITEM  TV_ITEM
+#define TLITEM   TVITEM
 
 /* New stuff */
 #ifndef __REACTOS__