diff --git a/Test/baseResults/spv.deviceGroup.frag.out b/Test/baseResults/spv.deviceGroup.frag.out
index e8a69920..9c234436 100755
--- a/Test/baseResults/spv.deviceGroup.frag.out
+++ b/Test/baseResults/spv.deviceGroup.frag.out
@@ -10,7 +10,7 @@ Warning, version 450 is not yet complete; most version-specific features are pre
                               Extension  "SPV_KHR_device_group"
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 9 12
+                              EntryPoint Fragment 4  "main" 9
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
                               SourceExtension  "GL_EXT_device_group"
@@ -25,8 +25,8 @@ Warning, version 450 is not yet complete; most version-specific features are pre
                8:             TypePointer Output 7(fvec4)
         9(color):      8(ptr) Variable Output
               10:             TypeInt 32 1
-              11:             TypePointer Input 10(int)
-12(gl_DeviceIndex):     11(ptr) Variable Input
+              11:             TypePointer UniformConstant 10(int)
+12(gl_DeviceIndex):     11(ptr) Variable UniformConstant
               15:    6(float) Constant 0
          4(main):           2 Function None 3
                5:             Label
diff --git a/Test/baseResults/spv.multiView.frag.out b/Test/baseResults/spv.multiView.frag.out
index 8ec97b08..95716172 100755
--- a/Test/baseResults/spv.multiView.frag.out
+++ b/Test/baseResults/spv.multiView.frag.out
@@ -10,7 +10,7 @@ Warning, version 450 is not yet complete; most version-specific features are pre
                               Extension  "SPV_KHR_multiview"
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 9 12
+                              EntryPoint Fragment 4  "main" 9
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
                               SourceExtension  "GL_EXT_multiview"
@@ -25,8 +25,8 @@ Warning, version 450 is not yet complete; most version-specific features are pre
                8:             TypePointer Output 7(fvec4)
         9(color):      8(ptr) Variable Output
               10:             TypeInt 32 1
-              11:             TypePointer Input 10(int)
-12(gl_ViewIndex):     11(ptr) Variable Input
+              11:             TypePointer UniformConstant 10(int)
+12(gl_ViewIndex):     11(ptr) Variable UniformConstant
               15:    6(float) Constant 0
          4(main):           2 Function None 3
                5:             Label
diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index 9e6ffb24..a67e1f74 100644
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -2,5 +2,5 @@
 // For the version, it uses the latest git tag followed by the number of commits.
 // For the date, it uses the current date (when then script is run).
 
-#define GLSLANG_REVISION "Overload400-PrecQual.1906"
+#define GLSLANG_REVISION "Overload400-PrecQual.1907"
 #define GLSLANG_DATE "13-Mar-2017"
diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index e904cf82..60cff601 100644
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -3702,8 +3702,8 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
     }
 
     if (profile != EEsProfile) {
-        commonBuiltins.append("in int gl_ViewIndex;");
-        commonBuiltins.append("in int gl_DeviceIndex;");  // GL_EXT_device_group
+        commonBuiltins.append("uniform int gl_ViewIndex;");
+        commonBuiltins.append("uniform int gl_DeviceIndex;");  // GL_EXT_device_group
     }
 
     // printf("%s\n", commonBuiltins.c_str());