diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index e309dff4e..ab0ccf5b2 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -5137,4 +5137,16 @@ HFONT CreateFont(
   <define name="FillMemory" value="RtlFillMemory"/>
   <define name="ZeroMemory" value="RtlZeroMemory"/>
   <define name="SecureZeroMemory" value="RtlSecureZeroMemory"/>
+  <!-- WORD MAKEWORD(BYTE bLow, BYTE bHigh); -->
+  <define name="MAKEWORD(bLow, bHigh)" value="((WORD)(((BYTE)(((DWORD_PTR)(bLow)) &amp; 0xff)) | ((WORD)((BYTE)(((DWORD_PTR)(bHigh)) &amp; 0xff))) &lt;&lt; 8))"/>
+  <!-- DWORD MAKELONG(WORD wLow, WORD wHigh); -->
+  <define name="MAKELONG(wLow, wHigh)" value="((LONG)(((WORD)(((DWORD_PTR)(wLow)) &amp; 0xffff)) | ((DWORD)((WORD)(((DWORD_PTR)(wHigh)) &amp; 0xffff))) &lt;&lt; 16))"/>
+  <!-- WORD LOWORD(DWORD dwValue); -->
+  <define name="LOWORD(dwValue)" value="((WORD)(((DWORD_PTR)(dwValue)) &amp; 0xffff))"/>
+  <!-- WORD HIWORD(DWORD dwValue); -->
+  <define name="HIWORD(dwValue)" value="((WORD)((((DWORD_PTR)(dwValue)) &gt;&gt; 16) &amp; 0xffff))"/>
+  <!-- BYTE LOBYTE(WORD wValue); -->
+  <define name="LOBYTE(wValue)" value="((BYTE)(((DWORD_PTR)(wValue)) &amp; 0xff))"/>
+  <!-- BYTE HIBYTE(WORD wValue); -->
+  <define name="HIBYTE(wValue)" value="((BYTE)((((DWORD_PTR)(wValue)) &gt;&gt; 8) &amp; 0xff))"/>
 </def>
diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index 1ff18b78c..8ce3a7278 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -11,6 +11,10 @@
 
 void validCode()
 {
+    DWORD dwordInit = 0;
+    WORD wordInit = 0;
+    BYTE byteInit = 0;
+
     // Valid Semaphore usage, no leaks, valid arguments
     HANDLE hSemaphore1;
     hSemaphore1 = CreateSemaphore(NULL, 0, 1, NULL);
@@ -116,7 +120,6 @@ void validCode()
     _stprintf(bufTC, _countof(bufTC), TEXT("%d"), 2);
     _tprintf(TEXT("%s"), bufTC);
 
-    DWORD dwordInit = 0;
     GetUserName(NULL, &dwordInit);
     dwordInit = 10;
     GetUserName(bufTC, _countof(bufTC));
@@ -131,6 +134,16 @@ void validCode()
     }
     WSACleanup();
 
+    wordInit = MAKEWORD(1, 2);
+    dwordInit = MAKELONG(1, 2);
+    // cppcheck-suppress redundantAssignment
+    wordInit = LOWORD(dwordInit);
+    byteInit = LOBYTE(wordInit);
+    wordInit = HIWORD(dwordInit);
+    // cppcheck-suppress redundantAssignment
+    byteInit = HIBYTE(wordInit);
+    if (byteInit) {}
+
     bool boolVar;
     uint8_t byteBuf[5] = {0};
     uint8_t byteBuf2[10] = {0};