diff --git a/WickedEngine/shaders/objectHF.hlsli b/WickedEngine/shaders/objectHF.hlsli
index 008ff2857..f00d72ee4 100644
--- a/WickedEngine/shaders/objectHF.hlsli
+++ b/WickedEngine/shaders/objectHF.hlsli
@@ -329,17 +329,14 @@ struct PixelInput
 	half4 color : COLOR;
 #endif // OBJECTSHADER_USE_COLOR
 
-#ifndef OBJECTSHADER_COMPILE_MS
+#if !defined(OBJECTSHADER_COMPILE_PS) && !defined(OBJECTSHADER_COMPILE_MS)
 #ifdef OBJECTSHADER_USE_RENDERTARGETARRAYINDEX
 	uint RTIndex : SV_RenderTargetArrayIndex;
 #endif // OBJECTSHADER_USE_RENDERTARGETARRAYINDEX
-#endif // OBJECTSHADER_COMPILE_MS
-
-#ifndef OBJECTSHADER_COMPILE_MS
 #ifdef OBJECTSHADER_USE_VIEWPORTARRAYINDEX
 	uint VPIndex : SV_ViewportArrayIndex;
 #endif // OBJECTSHADER_USE_VIEWPORTARRAYINDEX
-#endif // OBJECTSHADER_COMPILE_MS
+#endif // !defined(OBJECTSHADER_COMPILE_PS) && !defined(OBJECTSHADER_COMPILE_MS)
 
 #ifdef OBJECTSHADER_USE_INSTANCEINDEX
 	inline uint GetInstanceIndex()
@@ -450,17 +447,14 @@ PixelInput vertex_to_pixel_export(VertexInput input)
 	Out.tan = surface.tangent;
 #endif // OBJECTSHADER_USE_TANGENT
 
+#if !defined(OBJECTSHADER_COMPILE_PS) && !defined(OBJECTSHADER_COMPILE_MS)
 #ifdef OBJECTSHADER_USE_RENDERTARGETARRAYINDEX
-#ifndef OBJECTSHADER_COMPILE_MS
 	Out.RTIndex = camera.output_index;
-#endif // OBJECTSHADER_COMPILE_MS
 #endif // OBJECTSHADER_USE_RENDERTARGETARRAYINDEX
-
 #ifdef OBJECTSHADER_USE_VIEWPORTARRAYINDEX
-#ifndef OBJECTSHADER_COMPILE_MS
 	Out.VPIndex = camera.output_index;
-#endif // OBJECTSHADER_COMPILE_MS
 #endif // OBJECTSHADER_USE_VIEWPORTARRAYINDEX
+#endif // !defined(OBJECTSHADER_COMPILE_PS) && !defined(OBJECTSHADER_COMPILE_MS)
 
 	return Out;
 }