diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp
index bcb794e1e..a19731a6c 100644
--- a/src/lib/platform/MSWindowsScreen.cpp
+++ b/src/lib/platform/MSWindowsScreen.cpp
@@ -858,7 +858,7 @@ void
 MSWindowsScreen::destroyClass(ATOM windowClass) const
 {
     if (windowClass != 0) {
-        UnregisterClass(reinterpret_cast<LPCTSTR>(windowClass), s_windowInstance);
+        UnregisterClass(MAKEINTATOM(windowClass), s_windowInstance);
     }
 }
 
@@ -889,7 +889,7 @@ MSWindowsScreen::createDropWindow(ATOM windowClass, const char* name) const
         WS_EX_TOPMOST |
         WS_EX_TRANSPARENT |
         WS_EX_ACCEPTFILES,
-        reinterpret_cast<LPCTSTR>(m_class),
+        MAKEINTATOM(m_class),
         name,
         WS_POPUP,
         0, 0, m_dropWindowSize, m_dropWindowSize,