Waveform optimization has recently been shown to be a key technique to boost the efficiency and range of far-field wireless power transfer (WPT). Current research has optimized transmit waveform adaptive to channel state information (CSI) and accounting for energy harvester (EH)’s non-linearity but under the assumption of linear high power amplifiers (HPA) at the transmitter. This paper proposes a channel-adaptive waveform design strategy that optimizes the transmitter's input waveform considering both HPA and EH non-linearities. Simulations demonstrate that HPA’s non-linearity degrades the energy harvesting efficiency of WPT significantly, while the performance loss can be compensated by using the proposed optimal input waveform.