© 2017 Author(s). Due to the usually complicated and anisotropic nature of the fast-ion distribution function, diagnostic velocity-space weight functions, which indicate the sensitivity of a diagnostic to different fast-ion velocities, are used to facilitate the analysis of experimental data. Additionally, when velocity-space weight functions are discretized, a linear equation relating the fast-ion density and the expected diagnostic signal is formed. In a technique known as velocity-space tomography, many measurements can be combined to create an ill-conditioned system of linear equations that can be solved using various computational methods. However, when velocity-space weight functions (which by definition ignore spatial dependencies) are used, velocity-space tomography is restricted, both by the accuracy of its forward model and also by the availability of spatially overlapping diagnostic measurements. In this work, we extend velocity-space weight functions to a full 6D generalized coordinate system and then show how to reduce them to a 3D orbit-space without loss of generality using an action-angle formulation. Furthermore, we show how diagnostic orbit-weight functions can be used to infer the full fast-ion distribution function, i.e., orbit tomography. In depth derivations of orbit weight functions for the neutron, neutral particle analyzer, and fast-ion D-α diagnostics are also shown.