Merge branch 'improve-include-consistency' of github.com:akohlmey/lammps into...

Merge branch 'improve-include-consistency' of github.com:akohlmey/lammps into improve-include-consistency

# Conflicts:
#	src/USER-OMP/angle_cosine_shift_omp.cpp
#	src/USER-OMP/angle_fourier_omp.cpp
#	src/USER-OMP/angle_quartic_omp.cpp
#	src/USER-OMP/bond_gromos_omp.cpp
#	src/USER-OMP/dihedral_table_omp.cpp
#	src/USER-OMP/fix_gravity_omp.cpp
#	src/USER-OMP/fix_nvt_sllod_omp.cpp
#	src/USER-OMP/fix_qeq_reax_omp.cpp
#	src/USER-OMP/fix_rigid_nph_omp.cpp
#	src/USER-OMP/fix_rigid_npt_omp.cpp
#	src/USER-OMP/fix_rigid_omp.cpp
#	src/USER-OMP/msm_cg_omp.cpp
#	src/USER-OMP/msm_omp.cpp
#	src/USER-OMP/npair_half_bin_atomonly_newton_omp.cpp
#	src/USER-OMP/pppm_cg_omp.cpp
#	src/USER-OMP/pppm_disp_omp.cpp
#	src/USER-OMP/pppm_disp_tip4p_omp.cpp
#	src/USER-OMP/pppm_omp.cpp