Neither of your pairs of sentences is a question, so you should not use interrogative word order. Therefore, option 2 is correct in both cases.
The word ‘what’ is not used as a question word in your sentences. Instead the meaning of ‘what’ is ‘that which’.
[color=darkblue]__________________________________________________________ [size=75]“Anyone who doesn’t take truth seriously in small matters cannot be trusted in large ones either.” ~ Albert Einstein[/size]