diff --git a/rosapps/applications/devutils/gdihv/CMakeLists.txt b/rosapps/applications/devutils/gdihv/CMakeLists.txt
index 1ede06a42f1..44ae22821f9 100644
--- a/rosapps/applications/devutils/gdihv/CMakeLists.txt
+++ b/rosapps/applications/devutils/gdihv/CMakeLists.txt
@@ -7,6 +7,6 @@ list(APPEND SOURCE
 	proclist.c)
 
 add_executable(gdihv ${SOURCE})
-set_module_type(gdihv win32cui)
+set_module_type(gdihv win32cui UNICODE)
 add_importlibs(gdihv user32 comctl32 psapi msvcrt kernel32)
 add_cd_file(TARGET gdihv DESTINATION reactos/system32 FOR all)
diff --git a/rosapps/applications/devutils/gdihv/gdihv.c b/rosapps/applications/devutils/gdihv/gdihv.c
index 23b2f65baf2..2a2b8153b6c 100644
--- a/rosapps/applications/devutils/gdihv/gdihv.c
+++ b/rosapps/applications/devutils/gdihv/gdihv.c
@@ -34,9 +34,9 @@ MyGdiQueryTable()
 	return pPeb->GdiSharedHandleTable;
 }
 
-int WINAPI WinMain (HINSTANCE hThisInstance,
+int WINAPI _tWinMain (HINSTANCE hThisInstance,
                     HINSTANCE hPrevInstance,
-                    LPSTR lpszArgument,
+                    LPTSTR lpszArgument,
                     int nStyle)
 
 {
diff --git a/rosapps/applications/devutils/gdihv/gdihv.h b/rosapps/applications/devutils/gdihv/gdihv.h
index fda16778560..3a8415817d7 100644
--- a/rosapps/applications/devutils/gdihv/gdihv.h
+++ b/rosapps/applications/devutils/gdihv/gdihv.h
@@ -1,8 +1,7 @@
 #ifndef _GDIHV_H
 #define _GDIHV_H
 
-#define UNICODE
-
+#include <tchar.h>
 #define WIN32_NO_STATUS
 #include <windows.h>
 #include <commctrl.h>