diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 6496caba5..411b7ccf1 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -1787,7 +1787,7 @@ void Notepad_plus::command(int id)
 					::SendMessage(_pPublicInterface->getHSelf(), WM_SIZE, 0, 0);
 
 					udd->display(false);
-					_mainWindowStatus &= ~WindowUserActive;
+					_mainWindowStatus &= static_cast<UCHAR>(~WindowUserActive);
 				}
 				else if ((isUDDlgDocked)&&(!isUDDlgVisible))
 				{
diff --git a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp
index 3e499772a..ce7db1868 100644
--- a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp
+++ b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp
@@ -674,7 +674,6 @@ void DrawCursor(HWND hWnd, int SI)
 	if (BGHS[SI].cursorcol < BGHS[SI].homecol) { return; }
 
 	rect = GetCellRect(hWnd, SI, BGHS[SI].cursorrow, BGHS[SI].cursorcol);
-	RECT rectwhole = rect;
 	HDC gdc = GetDC(hWnd);
 	BGHS[SI].activecellrect = rect;
 	int rop = GetROP2(gdc);
diff --git a/PowerEditor/src/dpiManagerV2.cpp b/PowerEditor/src/dpiManagerV2.cpp
index 0a967ba99..611e80abd 100644
--- a/PowerEditor/src/dpiManagerV2.cpp
+++ b/PowerEditor/src/dpiManagerV2.cpp
@@ -17,7 +17,7 @@
 
 #include "dpiManagerV2.h"
 
-#include <CommCtrl.h>
+#include <commctrl.h>
 
 
 #if defined(__GNUC__) && __GNUC__ > 8