A heat exchanger includes a shell housing a plurality of tubes and defining an exhaust fluid flow path within a first volume enclosed by the shell. The outer surfaces of the plurality of tubes are in fluid communication with the exhaust fluid flow path. The heat exchanger includes a cap attached to a first end of the shell and defining a second volume. A header is configured to separate the first volume from the second volume, flex with thermal expansion, and define tube inlet and outlet positions. The tube inlets and outlets are in fluid communication with a source fluid flow path, and each tube is substantially U-shaped and defines a flow path of the source fluid within the exhaust fluid flow path. The heat exchanger includes at least one longitudinal flow baffle within the shell configured to reduce an amount of exhaust fluid that may bypass the tubes.