Diffraction data may be measured using approaches that lead to ambiguity in the interpretation of scattering distributions. Thus, the encoding and decoding of coherent scattering distributions have been considered with a view to enabling unequivocal data interpretation. Two encoding regimes are considered, where encoding occurs between the X-ray source and sample, and where the encoder is placed between the sample and detector. In the first case, the successful recovery of diffraction data formed from the interrogation of powder samples with annular incident beams is presented using a coded aperture approach. In the second regime, encoding of Debye cones is shown to enable recovery of the sample position relative to the detector. The errors associated with both regimes are considered and the advantages of combining the two discussed