diff --git a/SPIRV/spvIR.h b/SPIRV/spvIR.h
index 91a434fa..c16df104 100644
--- a/SPIRV/spvIR.h
+++ b/SPIRV/spvIR.h
@@ -54,7 +54,7 @@
 
 #include <vector>
 #include <iostream>
-#include <cassert>
+#include <assert.h>
 
 namespace spv {
 
diff --git a/glslang/MachineIndependent/preprocessor/PpTokens.cpp b/glslang/MachineIndependent/preprocessor/PpTokens.cpp
index 56cbbe79..b7cc0d37 100644
--- a/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+++ b/glslang/MachineIndependent/preprocessor/PpTokens.cpp
@@ -221,7 +221,7 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *ppToken)
         case CPP_UINTCONSTANT:
             strcpy(ppToken->name, tokenText);
             if (len > 0 && tokenText[0] == '0') {
-                if (len > 1 && tokenText[1] == 'x' || tokenText[1] == 'X')
+                if (len > 1 && (tokenText[1] == 'x' || tokenText[1] == 'X'))
                     ppToken->ival = strtol(ppToken->name, 0, 16);
                 else
                     ppToken->ival = strtol(ppToken->name, 0, 8);