From c4e92de3b131b16253c1f7fbca73ab4a8ed7b46d Mon Sep 17 00:00:00 2001
From: Teemu Murtola <teemu.murtola@gmail.com>
Date: Mon, 18 Aug 2014 21:50:38 +0300
Subject: [PATCH] Introduce gmxpre.h for truly global definitions

Bulk of the changes is done by applying an awk script using
  admin/reformat_all.sh --filter=copyright \
      --pattern=src/\*.{cpp,cu,c} list-files | xargs add_gmxpre.h
where add_gmxpre.h contains
  #!/bin/bash
  for f in "$@" ; do
    awk 'BEGIN {add=1}
         /gmxpre\.h/ {add=0}
         /#include/ {if (add) print "#include \"gmxpre.h\"\n"; add=0}
         {print}' $f >$f.tmp
    mv $f.tmp $f
  done
In other words, by adding a gmxpre.h include before the first #include
statement.

Manual changes on top of that:
 - Adapt reformat_all.sh to support the --pattern option used above.
 - Manually edit the files directly under src/ to move some necessary
   defines from config.h to gmxpre.h, and to adapt the build system to
   generate the latter.
 - Move the inserted include outside the HAVE_CONFIG_H #ifdef in
   gmx_cpuid.c.
 - Adapt nbnxn kernel generator files to insert the #include at the
   proper place and regenerate the kernels.
 - Adapt group kernel generators to insert the #include at the proper
   place, and remove unnecessary include guards from generated _source_
   files.

Adaptation for scanner.l and parser.y in the selection code will come
later, together with a checker that checks that gmxpre.h is actually
included everywhere.

Motivation for the change is documented in the file comment for
gmxpre.h.  This file could potentially be used also for precompiled
headers to speed up the build, but that would require a lot more effort
than this...

Change-Id: I02f08c6765dd7179ce9db135b2d502172700f180
---
 admin/reformat_all.sh                         |  8 ++-
 src/CMakeLists.txt                            |  1 +
 src/config.h.cmakein                          | 18 ------
 src/gmxpre-config.h.cmakein                   | 56 ++++++++++++++++
 src/gmxpre.h                                  | 64 +++++++++++++++++++
 src/gromacs/analysisdata/abstractdata.cpp     |  4 +-
 src/gromacs/analysisdata/analysisdata.cpp     |  4 +-
 src/gromacs/analysisdata/arraydata.cpp        |  2 +
 src/gromacs/analysisdata/dataframe.cpp        |  2 +
 src/gromacs/analysisdata/datamodule.cpp       |  4 +-
 .../analysisdata/datamodulemanager.cpp        |  4 +-
 src/gromacs/analysisdata/dataproxy.cpp        |  4 +-
 src/gromacs/analysisdata/datastorage.cpp      |  2 +
 src/gromacs/analysisdata/modules/average.cpp  |  4 +-
 .../analysisdata/modules/displacement.cpp     |  2 +
 .../analysisdata/modules/frameaverager.cpp    |  4 +-
 .../analysisdata/modules/histogram.cpp        |  4 +-
 src/gromacs/analysisdata/modules/lifetime.cpp |  4 +-
 src/gromacs/analysisdata/modules/plot.cpp     |  2 +
 .../analysisdata/tests/analysisdata.cpp       |  2 +
 src/gromacs/analysisdata/tests/arraydata.cpp  |  2 +
 src/gromacs/analysisdata/tests/average.cpp    |  2 +
 src/gromacs/analysisdata/tests/datatest.cpp   |  2 +
 src/gromacs/analysisdata/tests/histogram.cpp  |  2 +
 src/gromacs/analysisdata/tests/lifetime.cpp   |  2 +
 .../analysisdata/tests/mock_datamodule.cpp    |  2 +
 .../commandline/cmdlinehelpcontext.cpp        |  2 +
 src/gromacs/commandline/cmdlinehelpmodule.cpp |  2 +
 src/gromacs/commandline/cmdlinehelpwriter.cpp |  2 +
 src/gromacs/commandline/cmdlineinit.cpp       |  2 +
 .../commandline/cmdlinemodulemanager.cpp      |  2 +
 src/gromacs/commandline/cmdlineparser.cpp     |  4 +-
 .../commandline/cmdlineprogramcontext.cpp     |  2 +
 src/gromacs/commandline/pargs.cpp             |  2 +
 src/gromacs/commandline/shellcompletions.cpp  |  2 +
 .../commandline/tests/cmdlinehelpwriter.cpp   |  2 +
 .../tests/cmdlinemodulemanager.cpp            |  2 +
 .../commandline/tests/cmdlineparser.cpp       |  2 +
 .../tests/cmdlineprogramcontext.cpp           |  2 +
 src/gromacs/commandline/tests/pargs.cpp       |  2 +
 src/gromacs/essentialdynamics/edsam.c         |  2 +
 src/gromacs/fft/fft.c                         |  2 +
 src/gromacs/fft/fft5d.cpp                     |  2 +
 src/gromacs/fft/fft_fftpack.c                 |  2 +
 src/gromacs/fft/fft_fftw3.cpp                 |  2 +
 src/gromacs/fft/fft_mkl.c                     |  2 +
 src/gromacs/fft/parallel_3dfft.c              |  2 +
 src/gromacs/fft/tests/fft.cpp                 |  2 +
 src/gromacs/fileio/confio.c                   |  2 +
 src/gromacs/fileio/enxio.c                    |  2 +
 src/gromacs/fileio/filenm.c                   |  2 +
 src/gromacs/fileio/gmx_system_xdr.c           |  2 +
 src/gromacs/fileio/gmxfio.c                   |  2 +
 src/gromacs/fileio/gmxfio_asc.c               |  2 +
 src/gromacs/fileio/gmxfio_bin.c               |  2 +
 src/gromacs/fileio/gmxfio_rw.c                |  2 +
 src/gromacs/fileio/gmxfio_xdr.c               |  2 +
 src/gromacs/fileio/libxdrf.c                  |  2 +
 src/gromacs/fileio/matio.cpp                  |  2 +
 src/gromacs/fileio/md5.c                      |  2 +
 src/gromacs/fileio/mdoutf.c                   |  2 +
 src/gromacs/fileio/mtxio.c                    |  2 +
 src/gromacs/fileio/pdbio.c                    |  2 +
 src/gromacs/fileio/strdb.c                    |  2 +
 src/gromacs/fileio/tests/tngio.cpp            |  2 +
 src/gromacs/fileio/timecontrol.c              |  2 +
 src/gromacs/fileio/tngio.cpp                  |  2 +
 src/gromacs/fileio/tngio_for_tools.cpp        |  2 +
 src/gromacs/fileio/tpxio.c                    |  2 +
 src/gromacs/fileio/trajectory_writing.c       |  2 +
 src/gromacs/fileio/trnio.c                    |  2 +
 src/gromacs/fileio/trxio.c                    |  2 +
 src/gromacs/fileio/vmdio.c                    |  2 +
 src/gromacs/fileio/writeps.c                  |  2 +
 src/gromacs/fileio/xdrd.c                     |  2 +
 src/gromacs/fileio/xtcio.c                    |  2 +
 src/gromacs/fileio/xvgr.cpp                   |  2 +
 src/gromacs/gmxana/anadih.c                   |  2 +
 src/gromacs/gmxana/autocorr.c                 |  2 +
 src/gromacs/gmxana/binsearch.c                |  2 +
 src/gromacs/gmxana/cmat.c                     |  2 +
 src/gromacs/gmxana/correl.c                   |  2 +
 src/gromacs/gmxana/dens_filter.c              |  2 +
 src/gromacs/gmxana/dlist.c                    |  2 +
 src/gromacs/gmxana/edittop.c                  |  2 +
 src/gromacs/gmxana/eigio.c                    |  2 +
 src/gromacs/gmxana/expfit.c                   |  2 +
 src/gromacs/gmxana/fitahx.c                   |  2 +
 src/gromacs/gmxana/geminate.c                 |  2 +
 src/gromacs/gmxana/gmx_anadock.c              |  2 +
 src/gromacs/gmxana/gmx_anaeig.c               |  2 +
 src/gromacs/gmxana/gmx_analyze.c              |  2 +
 src/gromacs/gmxana/gmx_angle.c                |  2 +
 src/gromacs/gmxana/gmx_bar.c                  |  2 +
 src/gromacs/gmxana/gmx_bundle.c               |  2 +
 src/gromacs/gmxana/gmx_chi.c                  |  2 +
 src/gromacs/gmxana/gmx_cluster.c              |  2 +
 src/gromacs/gmxana/gmx_clustsize.c            |  2 +
 src/gromacs/gmxana/gmx_confrms.c              |  2 +
 src/gromacs/gmxana/gmx_covar.c                |  2 +
 src/gromacs/gmxana/gmx_current.c              |  2 +
 src/gromacs/gmxana/gmx_density.c              |  2 +
 src/gromacs/gmxana/gmx_densmap.c              |  2 +
 src/gromacs/gmxana/gmx_densorder.cpp          |  2 +
 src/gromacs/gmxana/gmx_dielectric.c           |  2 +
 src/gromacs/gmxana/gmx_dipoles.cpp            |  2 +
 src/gromacs/gmxana/gmx_disre.c                |  2 +
 src/gromacs/gmxana/gmx_do_dssp.c              |  2 +
 src/gromacs/gmxana/gmx_dos.c                  |  2 +
 src/gromacs/gmxana/gmx_dyecoupl.c             |  2 +
 src/gromacs/gmxana/gmx_dyndom.c               |  2 +
 src/gromacs/gmxana/gmx_editconf.c             |  2 +
 src/gromacs/gmxana/gmx_eneconv.c              |  2 +
 src/gromacs/gmxana/gmx_enemat.c               |  2 +
 src/gromacs/gmxana/gmx_energy.c               |  2 +
 src/gromacs/gmxana/gmx_filter.c               |  2 +
 src/gromacs/gmxana/gmx_genion.c               |  2 +
 src/gromacs/gmxana/gmx_genpr.c                |  2 +
 src/gromacs/gmxana/gmx_gyrate.c               |  2 +
 src/gromacs/gmxana/gmx_h2order.c              |  2 +
 src/gromacs/gmxana/gmx_hbond.c                |  2 +
 src/gromacs/gmxana/gmx_helix.c                |  2 +
 src/gromacs/gmxana/gmx_helixorient.c          |  2 +
 src/gromacs/gmxana/gmx_hydorder.c             |  2 +
 src/gromacs/gmxana/gmx_lie.c                  |  2 +
 src/gromacs/gmxana/gmx_make_edi.c             |  2 +
 src/gromacs/gmxana/gmx_make_ndx.c             |  2 +
 src/gromacs/gmxana/gmx_mdmat.c                |  2 +
 src/gromacs/gmxana/gmx_mindist.c              |  2 +
 src/gromacs/gmxana/gmx_mk_angndx.c            |  2 +
 src/gromacs/gmxana/gmx_morph.c                |  2 +
 src/gromacs/gmxana/gmx_msd.c                  |  2 +
 src/gromacs/gmxana/gmx_nmeig.c                |  2 +
 src/gromacs/gmxana/gmx_nmens.c                |  2 +
 src/gromacs/gmxana/gmx_nmtraj.c               |  2 +
 src/gromacs/gmxana/gmx_options.c              |  2 +
 src/gromacs/gmxana/gmx_order.c                |  2 +
 src/gromacs/gmxana/gmx_pme_error.cpp          |  2 +
 src/gromacs/gmxana/gmx_polystat.c             |  2 +
 src/gromacs/gmxana/gmx_potential.c            |  2 +
 src/gromacs/gmxana/gmx_principal.c            |  2 +
 src/gromacs/gmxana/gmx_rama.c                 |  2 +
 src/gromacs/gmxana/gmx_rdf.c                  |  2 +
 src/gromacs/gmxana/gmx_rms.c                  |  2 +
 src/gromacs/gmxana/gmx_rmsdist.c              |  2 +
 src/gromacs/gmxana/gmx_rmsf.c                 |  2 +
 src/gromacs/gmxana/gmx_rotacf.c               |  2 +
 src/gromacs/gmxana/gmx_rotmat.c               |  2 +
 src/gromacs/gmxana/gmx_saltbr.c               |  2 +
 src/gromacs/gmxana/gmx_sans.c                 |  2 +
 src/gromacs/gmxana/gmx_saxs.c                 |  2 +
 src/gromacs/gmxana/gmx_sham.c                 |  2 +
 src/gromacs/gmxana/gmx_sigeps.c               |  2 +
 src/gromacs/gmxana/gmx_sorient.c              |  2 +
 src/gromacs/gmxana/gmx_spatial.c              |  2 +
 src/gromacs/gmxana/gmx_spol.c                 |  2 +
 src/gromacs/gmxana/gmx_tcaf.c                 |  2 +
 src/gromacs/gmxana/gmx_traj.c                 |  2 +
 src/gromacs/gmxana/gmx_trjcat.c               |  2 +
 src/gromacs/gmxana/gmx_trjconv.c              |  2 +
 src/gromacs/gmxana/gmx_trjorder.c             |  2 +
 src/gromacs/gmxana/gmx_tune_pme.c             |  2 +
 src/gromacs/gmxana/gmx_vanhove.c              |  2 +
 src/gromacs/gmxana/gmx_velacc.c               |  2 +
 src/gromacs/gmxana/gmx_wham.cpp               |  2 +
 src/gromacs/gmxana/gmx_wheel.c                |  2 +
 src/gromacs/gmxana/gmx_xpm2ps.c               |  2 +
 src/gromacs/gmxana/hxprops.c                  |  2 +
 .../gmxana/legacytests/gmx_traj_tests.cpp     |  2 +
 src/gromacs/gmxana/levenmar.c                 |  2 +
 src/gromacs/gmxana/nrama.c                    |  2 +
 src/gromacs/gmxana/nsfactor.c                 |  2 +
 src/gromacs/gmxana/polynomials.c              |  2 +
 src/gromacs/gmxana/powerspect.c               |  2 +
 src/gromacs/gmxana/pp2shift.c                 |  2 +
 src/gromacs/gmxana/princ.c                    |  2 +
 src/gromacs/gmxana/sfactor.c                  |  2 +
 src/gromacs/gmxlib/bondfree.c                 |  2 +
 src/gromacs/gmxlib/calcgrid.c                 |  2 +
 src/gromacs/gmxlib/chargegroup.c              |  2 +
 src/gromacs/gmxlib/checkpoint.cpp             |  2 +
 src/gromacs/gmxlib/conformation-utilities.c   |  2 +
 src/gromacs/gmxlib/copyrite.cpp               |  2 +
 src/gromacs/gmxlib/cuda_tools/copyrite_gpu.cu |  2 +
 src/gromacs/gmxlib/cuda_tools/cudautils.cu    |  2 +
 src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu |  2 +
 src/gromacs/gmxlib/disre.c                    |  2 +
 src/gromacs/gmxlib/ewald_util.c               |  2 +
 src/gromacs/gmxlib/gmx_cpuid.c                |  4 +-
 src/gromacs/gmxlib/gmx_detect_hardware.cpp    |  2 +
 src/gromacs/gmxlib/gmx_omp_nthreads.c         |  2 +
 src/gromacs/gmxlib/gmx_thread_affinity.c      |  2 +
 src/gromacs/gmxlib/gpu_utils/gpu_utils.cu     |  2 +
 src/gromacs/gmxlib/ifunc.c                    |  2 +
 src/gromacs/gmxlib/inputrec.c                 |  2 +
 src/gromacs/gmxlib/main.cpp                   |  2 +
 src/gromacs/gmxlib/md_logging.c               |  2 +
 src/gromacs/gmxlib/mvdata.c                   |  2 +
 src/gromacs/gmxlib/names.c                    |  2 +
 src/gromacs/gmxlib/network.c                  |  2 +
 src/gromacs/gmxlib/nonbonded/nb_free_energy.c |  2 +
 src/gromacs/gmxlib/nonbonded/nb_generic.c     |  2 +
 .../gmxlib/nonbonded/nb_generic_adress.c      |  2 +
 src/gromacs/gmxlib/nonbonded/nb_generic_cg.c  |  2 +
 src/gromacs/gmxlib/nonbonded/nb_kernel.c      |  2 +
 .../make_nb_kernel_adress_c.py                |  8 +--
 .../nb_kernel_adress_template_c.pre           |  2 +
 .../make_nb_kernel_avx_128_fma_double.py      |  6 +-
 ...Tab_VdwCSTab_GeomP1P1_avx_128_fma_double.c |  2 +
 ...Tab_VdwCSTab_GeomW3P1_avx_128_fma_double.c |  2 +
 ...Tab_VdwCSTab_GeomW3W3_avx_128_fma_double.c |  2 +
 ...Tab_VdwCSTab_GeomW4P1_avx_128_fma_double.c |  2 +
 ...Tab_VdwCSTab_GeomW4W4_avx_128_fma_double.c |  2 +
 ...cCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c |  2 +
 ...cCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c |  2 +
 ...cCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c |  2 +
 ...cCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c |  2 +
 ...cCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c |  2 +
 ...STab_VdwNone_GeomP1P1_avx_128_fma_double.c |  2 +
 ...STab_VdwNone_GeomW3P1_avx_128_fma_double.c |  2 +
 ...STab_VdwNone_GeomW3W3_avx_128_fma_double.c |  2 +
 ...STab_VdwNone_GeomW4P1_avx_128_fma_double.c |  2 +
 ...STab_VdwNone_GeomW4W4_avx_128_fma_double.c |  2 +
 ...oul_VdwCSTab_GeomP1P1_avx_128_fma_double.c |  2 +
 ...oul_VdwCSTab_GeomW3P1_avx_128_fma_double.c |  2 +
 ...oul_VdwCSTab_GeomW3W3_avx_128_fma_double.c |  2 +
 ...oul_VdwCSTab_GeomW4P1_avx_128_fma_double.c |  2 +
 ...oul_VdwCSTab_GeomW4W4_avx_128_fma_double.c |  2 +
 ...ecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c |  2 +
 ...ecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c |  2 +
 ...ecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c |  2 +
 ...ecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c |  2 +
 ...Coul_VdwNone_GeomP1P1_avx_128_fma_double.c |  2 +
 ...Coul_VdwNone_GeomW3P1_avx_128_fma_double.c |  2 +
 ...Coul_VdwNone_GeomW3W3_avx_128_fma_double.c |  2 +
 ...Coul_VdwNone_GeomW4P1_avx_128_fma_double.c |  2 +
 ...Coul_VdwNone_GeomW4W4_avx_128_fma_double.c |  2 +
 ...Sh_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c |  2 +
 ...Sh_VdwLJEwSh_GeomW3P1_avx_128_fma_double.c |  2 +
 ...Sh_VdwLJEwSh_GeomW3W3_avx_128_fma_double.c |  2 +
 ...Sh_VdwLJEwSh_GeomW4P1_avx_128_fma_double.c |  2 +
 ...Sh_VdwLJEwSh_GeomW4W4_avx_128_fma_double.c |  2 +
 ...EwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c |  2 +
 ...EwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c |  2 +
 ...EwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c |  2 +
 ...EwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c |  2 +
 ...EwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c |  2 +
 ...EwSh_VdwNone_GeomP1P1_avx_128_fma_double.c |  2 +
 ...EwSh_VdwNone_GeomW3P1_avx_128_fma_double.c |  2 +
 ...EwSh_VdwNone_GeomW3W3_avx_128_fma_double.c |  2 +
 ...EwSh_VdwNone_GeomW4P1_avx_128_fma_double.c |  2 +
 ...EwSh_VdwNone_GeomW4W4_avx_128_fma_double.c |  2 +
 ...EwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c |  2 +
 ...EwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c |  2 +
 ...EwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c |  2 +
 ...EwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c |  2 +
 ...EwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c |  2 +
 ...EwSw_VdwNone_GeomP1P1_avx_128_fma_double.c |  2 +
 ...EwSw_VdwNone_GeomW3P1_avx_128_fma_double.c |  2 +
 ...EwSw_VdwNone_GeomW3W3_avx_128_fma_double.c |  2 +
 ...EwSw_VdwNone_GeomW4P1_avx_128_fma_double.c |  2 +
 ...EwSw_VdwNone_GeomW4W4_avx_128_fma_double.c |  2 +
 ...cEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c |  2 +
 ...cEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c |  2 +
 ...cEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c |  2 +
 ...cEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c |  2 +
 ...cEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c |  2 +
 ...ecEw_VdwLJEw_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ecEw_VdwLJEw_GeomW3P1_avx_128_fma_double.c |  2 +
 ...ecEw_VdwLJEw_GeomW3W3_avx_128_fma_double.c |  2 +
 ...ecEw_VdwLJEw_GeomW4P1_avx_128_fma_double.c |  2 +
 ...ecEw_VdwLJEw_GeomW4W4_avx_128_fma_double.c |  2 +
 ...ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c |  2 +
 ...ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c |  2 +
 ...ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c |  2 +
 ...ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c |  2 +
 ...ecEw_VdwNone_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ecEw_VdwNone_GeomW3P1_avx_128_fma_double.c |  2 +
 ...ecEw_VdwNone_GeomW3W3_avx_128_fma_double.c |  2 +
 ...ecEw_VdwNone_GeomW4P1_avx_128_fma_double.c |  2 +
 ...ecEw_VdwNone_GeomW4W4_avx_128_fma_double.c |  2 +
 ...cGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ecGB_VdwNone_GeomP1P1_avx_128_fma_double.c |  2 +
 ...one_VdwCSTab_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ne_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c |  2 +
 ...None_VdwLJEw_GeomP1P1_avx_128_fma_double.c |  2 +
 ...None_VdwLJSh_GeomP1P1_avx_128_fma_double.c |  2 +
 ...None_VdwLJSw_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ecNone_VdwLJ_GeomP1P1_avx_128_fma_double.c |  2 +
 ...Cut_VdwCSTab_GeomP1P1_avx_128_fma_double.c |  2 +
 ...Cut_VdwCSTab_GeomW3P1_avx_128_fma_double.c |  2 +
 ...Cut_VdwCSTab_GeomW3W3_avx_128_fma_double.c |  2 +
 ...Cut_VdwCSTab_GeomW4P1_avx_128_fma_double.c |  2 +
 ...Cut_VdwCSTab_GeomW4W4_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c |  2 +
 ...FCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c |  2 +
 ...FCut_VdwNone_GeomP1P1_avx_128_fma_double.c |  2 +
 ...FCut_VdwNone_GeomW3P1_avx_128_fma_double.c |  2 +
 ...FCut_VdwNone_GeomW3W3_avx_128_fma_double.c |  2 +
 ...FCut_VdwNone_GeomW4P1_avx_128_fma_double.c |  2 +
 ...FCut_VdwNone_GeomW4W4_avx_128_fma_double.c |  2 +
 ...cRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c |  2 +
 ...cRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c |  2 +
 ...cRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c |  2 +
 ...cRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c |  2 +
 ...cRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c |  2 +
 ...ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c |  2 +
 ...ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c |  2 +
 ...ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c |  2 +
 ...ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c |  2 +
 ...ecRF_VdwNone_GeomP1P1_avx_128_fma_double.c |  2 +
 ...ecRF_VdwNone_GeomW3P1_avx_128_fma_double.c |  2 +
 ...ecRF_VdwNone_GeomW3W3_avx_128_fma_double.c |  2 +
 ...ecRF_VdwNone_GeomW4P1_avx_128_fma_double.c |  2 +
 ...ecRF_VdwNone_GeomW4W4_avx_128_fma_double.c |  2 +
 .../nb_kernel_avx_128_fma_double.c            |  5 +-
 .../nb_kernel_template_avx_128_fma_double.pre |  2 +
 .../make_nb_kernel_avx_128_fma_single.py      |  6 +-
 ...Tab_VdwCSTab_GeomP1P1_avx_128_fma_single.c |  2 +
 ...Tab_VdwCSTab_GeomW3P1_avx_128_fma_single.c |  2 +
 ...Tab_VdwCSTab_GeomW3W3_avx_128_fma_single.c |  2 +
 ...Tab_VdwCSTab_GeomW4P1_avx_128_fma_single.c |  2 +
 ...Tab_VdwCSTab_GeomW4W4_avx_128_fma_single.c |  2 +
 ...cCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c |  2 +
 ...cCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c |  2 +
 ...cCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c |  2 +
 ...cCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c |  2 +
 ...cCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c |  2 +
 ...STab_VdwNone_GeomP1P1_avx_128_fma_single.c |  2 +
 ...STab_VdwNone_GeomW3P1_avx_128_fma_single.c |  2 +
 ...STab_VdwNone_GeomW3W3_avx_128_fma_single.c |  2 +
 ...STab_VdwNone_GeomW4P1_avx_128_fma_single.c |  2 +
 ...STab_VdwNone_GeomW4W4_avx_128_fma_single.c |  2 +
 ...oul_VdwCSTab_GeomP1P1_avx_128_fma_single.c |  2 +
 ...oul_VdwCSTab_GeomW3P1_avx_128_fma_single.c |  2 +
 ...oul_VdwCSTab_GeomW3W3_avx_128_fma_single.c |  2 +
 ...oul_VdwCSTab_GeomW4P1_avx_128_fma_single.c |  2 +
 ...oul_VdwCSTab_GeomW4W4_avx_128_fma_single.c |  2 +
 ...ecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c |  2 +
 ...ecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c |  2 +
 ...ecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c |  2 +
 ...ecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c |  2 +
 ...Coul_VdwNone_GeomP1P1_avx_128_fma_single.c |  2 +
 ...Coul_VdwNone_GeomW3P1_avx_128_fma_single.c |  2 +
 ...Coul_VdwNone_GeomW3W3_avx_128_fma_single.c |  2 +
 ...Coul_VdwNone_GeomW4P1_avx_128_fma_single.c |  2 +
 ...Coul_VdwNone_GeomW4W4_avx_128_fma_single.c |  2 +
 ...Sh_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c |  2 +
 ...Sh_VdwLJEwSh_GeomW3P1_avx_128_fma_single.c |  2 +
 ...Sh_VdwLJEwSh_GeomW3W3_avx_128_fma_single.c |  2 +
 ...Sh_VdwLJEwSh_GeomW4P1_avx_128_fma_single.c |  2 +
 ...Sh_VdwLJEwSh_GeomW4W4_avx_128_fma_single.c |  2 +
 ...EwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c |  2 +
 ...EwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c |  2 +
 ...EwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c |  2 +
 ...EwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c |  2 +
 ...EwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c |  2 +
 ...EwSh_VdwNone_GeomP1P1_avx_128_fma_single.c |  2 +
 ...EwSh_VdwNone_GeomW3P1_avx_128_fma_single.c |  2 +
 ...EwSh_VdwNone_GeomW3W3_avx_128_fma_single.c |  2 +
 ...EwSh_VdwNone_GeomW4P1_avx_128_fma_single.c |  2 +
 ...EwSh_VdwNone_GeomW4W4_avx_128_fma_single.c |  2 +
 ...EwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c |  2 +
 ...EwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c |  2 +
 ...EwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c |  2 +
 ...EwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c |  2 +
 ...EwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c |  2 +
 ...EwSw_VdwNone_GeomP1P1_avx_128_fma_single.c |  2 +
 ...EwSw_VdwNone_GeomW3P1_avx_128_fma_single.c |  2 +
 ...EwSw_VdwNone_GeomW3W3_avx_128_fma_single.c |  2 +
 ...EwSw_VdwNone_GeomW4P1_avx_128_fma_single.c |  2 +
 ...EwSw_VdwNone_GeomW4W4_avx_128_fma_single.c |  2 +
 ...cEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c |  2 +
 ...cEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c |  2 +
 ...cEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c |  2 +
 ...cEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c |  2 +
 ...cEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c |  2 +
 ...ecEw_VdwLJEw_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ecEw_VdwLJEw_GeomW3P1_avx_128_fma_single.c |  2 +
 ...ecEw_VdwLJEw_GeomW3W3_avx_128_fma_single.c |  2 +
 ...ecEw_VdwLJEw_GeomW4P1_avx_128_fma_single.c |  2 +
 ...ecEw_VdwLJEw_GeomW4W4_avx_128_fma_single.c |  2 +
 ...ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c |  2 +
 ...ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c |  2 +
 ...ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c |  2 +
 ...ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c |  2 +
 ...ecEw_VdwNone_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ecEw_VdwNone_GeomW3P1_avx_128_fma_single.c |  2 +
 ...ecEw_VdwNone_GeomW3W3_avx_128_fma_single.c |  2 +
 ...ecEw_VdwNone_GeomW4P1_avx_128_fma_single.c |  2 +
 ...ecEw_VdwNone_GeomW4W4_avx_128_fma_single.c |  2 +
 ...cGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ecGB_VdwNone_GeomP1P1_avx_128_fma_single.c |  2 +
 ...one_VdwCSTab_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ne_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c |  2 +
 ...None_VdwLJEw_GeomP1P1_avx_128_fma_single.c |  2 +
 ...None_VdwLJSh_GeomP1P1_avx_128_fma_single.c |  2 +
 ...None_VdwLJSw_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ecNone_VdwLJ_GeomP1P1_avx_128_fma_single.c |  2 +
 ...Cut_VdwCSTab_GeomP1P1_avx_128_fma_single.c |  2 +
 ...Cut_VdwCSTab_GeomW3P1_avx_128_fma_single.c |  2 +
 ...Cut_VdwCSTab_GeomW3W3_avx_128_fma_single.c |  2 +
 ...Cut_VdwCSTab_GeomW4P1_avx_128_fma_single.c |  2 +
 ...Cut_VdwCSTab_GeomW4W4_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c |  2 +
 ...FCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c |  2 +
 ...FCut_VdwNone_GeomP1P1_avx_128_fma_single.c |  2 +
 ...FCut_VdwNone_GeomW3P1_avx_128_fma_single.c |  2 +
 ...FCut_VdwNone_GeomW3W3_avx_128_fma_single.c |  2 +
 ...FCut_VdwNone_GeomW4P1_avx_128_fma_single.c |  2 +
 ...FCut_VdwNone_GeomW4W4_avx_128_fma_single.c |  2 +
 ...cRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c |  2 +
 ...cRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c |  2 +
 ...cRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c |  2 +
 ...cRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c |  2 +
 ...cRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c |  2 +
 ...ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c |  2 +
 ...ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c |  2 +
 ...ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c |  2 +
 ...ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c |  2 +
 ...ecRF_VdwNone_GeomP1P1_avx_128_fma_single.c |  2 +
 ...ecRF_VdwNone_GeomW3P1_avx_128_fma_single.c |  2 +
 ...ecRF_VdwNone_GeomW3W3_avx_128_fma_single.c |  2 +
 ...ecRF_VdwNone_GeomW4P1_avx_128_fma_single.c |  2 +
 ...ecRF_VdwNone_GeomW4W4_avx_128_fma_single.c |  2 +
 .../nb_kernel_avx_128_fma_single.c            |  5 +-
 .../nb_kernel_template_avx_128_fma_single.pre |  2 +
 .../make_nb_kernel_avx_256_double.py          |  6 +-
 ...ecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c |  2 +
 ...ecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c |  2 +
 ...ecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c |  2 +
 ...ecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c |  2 +
 ...ecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c |  2 +
 ...lecCSTab_VdwNone_GeomP1P1_avx_256_double.c |  2 +
 ...lecCSTab_VdwNone_GeomW3P1_avx_256_double.c |  2 +
 ...lecCSTab_VdwNone_GeomW3W3_avx_256_double.c |  2 +
 ...lecCSTab_VdwNone_GeomW4P1_avx_256_double.c |  2 +
 ...lecCSTab_VdwNone_GeomW4W4_avx_256_double.c |  2 +
 ...lecCoul_VdwCSTab_GeomP1P1_avx_256_double.c |  2 +
 ...lecCoul_VdwCSTab_GeomW3P1_avx_256_double.c |  2 +
 ...lecCoul_VdwCSTab_GeomW3W3_avx_256_double.c |  2 +
 ...lecCoul_VdwCSTab_GeomW4P1_avx_256_double.c |  2 +
 ...lecCoul_VdwCSTab_GeomW4W4_avx_256_double.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c |  2 +
 ...ElecCoul_VdwNone_GeomP1P1_avx_256_double.c |  2 +
 ...ElecCoul_VdwNone_GeomW3P1_avx_256_double.c |  2 +
 ...ElecCoul_VdwNone_GeomW3W3_avx_256_double.c |  2 +
 ...ElecCoul_VdwNone_GeomW4P1_avx_256_double.c |  2 +
 ...ElecCoul_VdwNone_GeomW4W4_avx_256_double.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomP1P1_avx_256_double.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomW3P1_avx_256_double.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomW3W3_avx_256_double.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomW4P1_avx_256_double.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomW4W4_avx_256_double.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c |  2 +
 ...ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c |  2 +
 ...ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c |  2 +
 ...ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c |  2 +
 ...ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c |  2 +
 ...ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c |  2 +
 ...ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c |  2 +
 ...ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c |  2 +
 ...ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c |  2 +
 ...ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c |  2 +
 ...ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c |  2 +
 ..._ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c |  2 +
 ..._ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c |  2 +
 ..._ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c |  2 +
 ..._ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c |  2 +
 ..._ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomP1P1_avx_256_double.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomW3P1_avx_256_double.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomW3W3_avx_256_double.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomW4P1_avx_256_double.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomW4W4_avx_256_double.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c |  2 +
 ...l_ElecEw_VdwNone_GeomP1P1_avx_256_double.c |  2 +
 ...l_ElecEw_VdwNone_GeomW3P1_avx_256_double.c |  2 +
 ...l_ElecEw_VdwNone_GeomW3W3_avx_256_double.c |  2 +
 ...l_ElecEw_VdwNone_GeomW4P1_avx_256_double.c |  2 +
 ...l_ElecEw_VdwNone_GeomW4W4_avx_256_double.c |  2 +
 ..._ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c |  2 +
 ...nel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c |  2 +
 ...l_ElecGB_VdwNone_GeomP1P1_avx_256_double.c |  2 +
 ...lecNone_VdwCSTab_GeomP1P1_avx_256_double.c |  2 +
 ...ecNone_VdwLJEwSh_GeomP1P1_avx_256_double.c |  2 +
 ...ElecNone_VdwLJEw_GeomP1P1_avx_256_double.c |  2 +
 ...ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c |  2 +
 ...ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c |  2 +
 ...l_ElecNone_VdwLJ_GeomP1P1_avx_256_double.c |  2 +
 ...ecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c |  2 +
 ...ecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c |  2 +
 ...ecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c |  2 +
 ...ecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c |  2 +
 ...ecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c |  2 +
 ...lecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c |  2 +
 ...lecRFCut_VdwNone_GeomP1P1_avx_256_double.c |  2 +
 ...lecRFCut_VdwNone_GeomW3P1_avx_256_double.c |  2 +
 ...lecRFCut_VdwNone_GeomW3W3_avx_256_double.c |  2 +
 ...lecRFCut_VdwNone_GeomW4P1_avx_256_double.c |  2 +
 ...lecRFCut_VdwNone_GeomW4W4_avx_256_double.c |  2 +
 ..._ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c |  2 +
 ..._ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c |  2 +
 ..._ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c |  2 +
 ..._ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c |  2 +
 ..._ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c |  2 +
 ...l_ElecRF_VdwNone_GeomP1P1_avx_256_double.c |  2 +
 ...l_ElecRF_VdwNone_GeomW3P1_avx_256_double.c |  2 +
 ...l_ElecRF_VdwNone_GeomW3W3_avx_256_double.c |  2 +
 ...l_ElecRF_VdwNone_GeomW4P1_avx_256_double.c |  2 +
 ...l_ElecRF_VdwNone_GeomW4W4_avx_256_double.c |  2 +
 .../nb_kernel_avx_256_double.c                |  5 +-
 .../nb_kernel_template_avx_256_double.pre     |  2 +
 .../make_nb_kernel_avx_256_single.py          |  6 +-
 ...ecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c |  2 +
 ...ecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c |  2 +
 ...ecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c |  2 +
 ...ecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c |  2 +
 ...ecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c |  2 +
 ..._ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c |  2 +
 ...lecCSTab_VdwNone_GeomP1P1_avx_256_single.c |  2 +
 ...lecCSTab_VdwNone_GeomW3P1_avx_256_single.c |  2 +
 ...lecCSTab_VdwNone_GeomW3W3_avx_256_single.c |  2 +
 ...lecCSTab_VdwNone_GeomW4P1_avx_256_single.c |  2 +
 ...lecCSTab_VdwNone_GeomW4W4_avx_256_single.c |  2 +
 ...lecCoul_VdwCSTab_GeomP1P1_avx_256_single.c |  2 +
 ...lecCoul_VdwCSTab_GeomW3P1_avx_256_single.c |  2 +
 ...lecCoul_VdwCSTab_GeomW3W3_avx_256_single.c |  2 +
 ...lecCoul_VdwCSTab_GeomW4P1_avx_256_single.c |  2 +
 ...lecCoul_VdwCSTab_GeomW4W4_avx_256_single.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c |  2 +
 ...l_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c |  2 +
 ...ElecCoul_VdwNone_GeomP1P1_avx_256_single.c |  2 +
 ...ElecCoul_VdwNone_GeomW3P1_avx_256_single.c |  2 +
 ...ElecCoul_VdwNone_GeomW3W3_avx_256_single.c |  2 +
 ...ElecCoul_VdwNone_GeomW4P1_avx_256_single.c |  2 +
 ...ElecCoul_VdwNone_GeomW4W4_avx_256_single.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomP1P1_avx_256_single.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomW3P1_avx_256_single.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomW3W3_avx_256_single.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomW4P1_avx_256_single.c |  2 +
 ...ecEwSh_VdwLJEwSh_GeomW4W4_avx_256_single.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c |  2 +
 ...ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c |  2 +
 ...ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c |  2 +
 ...ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c |  2 +
 ...ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c |  2 +
 ...ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c |  2 +
 ...ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c |  2 +
 ...ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c |  2 +
 ...ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c |  2 +
 ...ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c |  2 +
 ...ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c |  2 +
 ...ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c |  2 +
 ...ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c |  2 +
 ..._ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c |  2 +
 ..._ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c |  2 +
 ..._ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c |  2 +
 ..._ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c |  2 +
 ..._ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomP1P1_avx_256_single.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomW3P1_avx_256_single.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomW3W3_avx_256_single.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomW4P1_avx_256_single.c |  2 +
 ...l_ElecEw_VdwLJEw_GeomW4W4_avx_256_single.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c |  2 +
 ...nel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c |  2 +
 ...l_ElecEw_VdwNone_GeomP1P1_avx_256_single.c |  2 +
 ...l_ElecEw_VdwNone_GeomW3P1_avx_256_single.c |  2 +
 ...l_ElecEw_VdwNone_GeomW3W3_avx_256_single.c |  2 +
 ...l_ElecEw_VdwNone_GeomW4P1_avx_256_single.c |  2 +
 ...l_ElecEw_VdwNone_GeomW4W4_avx_256_single.c |  2 +
 ..._ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c |  2 +
 ...nel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c |  2 +
 ...l_ElecGB_VdwNone_GeomP1P1_avx_256_single.c |  2 +
 ...lecNone_VdwCSTab_GeomP1P1_avx_256_single.c |  2 +
 ...ecNone_VdwLJEwSh_GeomP1P1_avx_256_single.c |  2 +
 ...ElecNone_VdwLJEw_GeomP1P1_avx_256_single.c |  2 +
 ...ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c |  2 +
 ...ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c |  2 +
 ...l_ElecNone_VdwLJ_GeomP1P1_avx_256_single.c |  2 +
 ...ecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c |  2 +
 ...ecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c |  2 +
 ...ecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c |  2 +
 ...ecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c |  2 +
 ...ecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c |  2 +
 ...lecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c |  2 +
 ...lecRFCut_VdwNone_GeomP1P1_avx_256_single.c |  2 +
 ...lecRFCut_VdwNone_GeomW3P1_avx_256_single.c |  2 +
 ...lecRFCut_VdwNone_GeomW3W3_avx_256_single.c |  2 +
 ...lecRFCut_VdwNone_GeomW4P1_avx_256_single.c |  2 +
 ...lecRFCut_VdwNone_GeomW4W4_avx_256_single.c |  2 +
 ..._ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c |  2 +
 ..._ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c |  2 +
 ..._ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c |  2 +
 ..._ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c |  2 +
 ..._ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c |  2 +
 ...nel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c |  2 +
 ...l_ElecRF_VdwNone_GeomP1P1_avx_256_single.c |  2 +
 ...l_ElecRF_VdwNone_GeomW3P1_avx_256_single.c |  2 +
 ...l_ElecRF_VdwNone_GeomW3W3_avx_256_single.c |  2 +
 ...l_ElecRF_VdwNone_GeomW4P1_avx_256_single.c |  2 +
 ...l_ElecRF_VdwNone_GeomW4W4_avx_256_single.c |  2 +
 .../nb_kernel_avx_256_single.c                |  5 +-
 .../nb_kernel_template_avx_256_single.pre     |  2 +
 .../nonbonded/nb_kernel_c/make_nb_kernel_c.py |  6 +-
 .../nb_kernel_ElecCSTab_VdwBham_GeomP1P1_c.c  |  2 +
 .../nb_kernel_ElecCSTab_VdwBham_GeomW3P1_c.c  |  2 +
 .../nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c  |  2 +
 .../nb_kernel_ElecCSTab_VdwBham_GeomW4P1_c.c  |  2 +
 .../nb_kernel_ElecCSTab_VdwBham_GeomW4W4_c.c  |  2 +
 .../nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_c.c |  2 +
 .../nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_c.c |  2 +
 .../nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c |  2 +
 .../nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_c.c |  2 +
 .../nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_c.c |  2 +
 .../nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_c.c    |  2 +
 .../nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_c.c    |  2 +
 .../nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_c.c    |  2 +
 .../nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_c.c    |  2 +
 .../nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_c.c    |  2 +
 .../nb_kernel_ElecCSTab_VdwNone_GeomP1P1_c.c  |  2 +
 .../nb_kernel_ElecCSTab_VdwNone_GeomW3P1_c.c  |  2 +
 .../nb_kernel_ElecCSTab_VdwNone_GeomW3W3_c.c  |  2 +
 .../nb_kernel_ElecCSTab_VdwNone_GeomW4P1_c.c  |  2 +
 .../nb_kernel_ElecCSTab_VdwNone_GeomW4W4_c.c  |  2 +
 .../nb_kernel_ElecCoul_VdwBham_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecCoul_VdwBham_GeomW3P1_c.c   |  2 +
 .../nb_kernel_ElecCoul_VdwBham_GeomW3W3_c.c   |  2 +
 .../nb_kernel_ElecCoul_VdwBham_GeomW4P1_c.c   |  2 +
 .../nb_kernel_ElecCoul_VdwBham_GeomW4W4_c.c   |  2 +
 .../nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_c.c  |  2 +
 .../nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_c.c  |  2 +
 .../nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_c.c  |  2 +
 .../nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_c.c  |  2 +
 .../nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_c.c  |  2 +
 .../nb_kernel_ElecCoul_VdwLJ_GeomP1P1_c.c     |  2 +
 .../nb_kernel_ElecCoul_VdwLJ_GeomW3P1_c.c     |  2 +
 .../nb_kernel_ElecCoul_VdwLJ_GeomW3W3_c.c     |  2 +
 .../nb_kernel_ElecCoul_VdwLJ_GeomW4P1_c.c     |  2 +
 .../nb_kernel_ElecCoul_VdwLJ_GeomW4W4_c.c     |  2 +
 .../nb_kernel_ElecCoul_VdwNone_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecCoul_VdwNone_GeomW3P1_c.c   |  2 +
 .../nb_kernel_ElecCoul_VdwNone_GeomW3W3_c.c   |  2 +
 .../nb_kernel_ElecCoul_VdwNone_GeomW4P1_c.c   |  2 +
 .../nb_kernel_ElecCoul_VdwNone_GeomW4W4_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_c.c |  2 +
 .../nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwNone_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwNone_GeomW3P1_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwNone_GeomW3W3_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwNone_GeomW4P1_c.c   |  2 +
 .../nb_kernel_ElecEwSh_VdwNone_GeomW4W4_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_c.c |  2 +
 .../nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_c.c |  2 +
 .../nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_c.c |  2 +
 .../nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_c.c |  2 +
 .../nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_c.c |  2 +
 .../nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwNone_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwNone_GeomW3P1_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwNone_GeomW3W3_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwNone_GeomW4P1_c.c   |  2 +
 .../nb_kernel_ElecEwSw_VdwNone_GeomW4W4_c.c   |  2 +
 .../nb_kernel_ElecEw_VdwBham_GeomP1P1_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwBham_GeomW3P1_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwBham_GeomW3W3_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwBham_GeomW4P1_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwBham_GeomW4W4_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwCSTab_GeomP1P1_c.c    |  2 +
 .../nb_kernel_ElecEw_VdwCSTab_GeomW3P1_c.c    |  2 +
 .../nb_kernel_ElecEw_VdwCSTab_GeomW3W3_c.c    |  2 +
 .../nb_kernel_ElecEw_VdwCSTab_GeomW4P1_c.c    |  2 +
 .../nb_kernel_ElecEw_VdwCSTab_GeomW4W4_c.c    |  2 +
 .../nb_kernel_ElecEw_VdwLJEw_GeomP1P1_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwLJEw_GeomW3P1_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwLJEw_GeomW3W3_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwLJEw_GeomW4P1_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwLJEw_GeomW4W4_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwLJ_GeomP1P1_c.c       |  2 +
 .../nb_kernel_ElecEw_VdwLJ_GeomW3P1_c.c       |  2 +
 .../nb_kernel_ElecEw_VdwLJ_GeomW3W3_c.c       |  2 +
 .../nb_kernel_ElecEw_VdwLJ_GeomW4P1_c.c       |  2 +
 .../nb_kernel_ElecEw_VdwLJ_GeomW4W4_c.c       |  2 +
 .../nb_kernel_ElecEw_VdwNone_GeomP1P1_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwNone_GeomW3P1_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwNone_GeomW3W3_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwNone_GeomW4P1_c.c     |  2 +
 .../nb_kernel_ElecEw_VdwNone_GeomW4W4_c.c     |  2 +
 .../nb_kernel_ElecGB_VdwBham_GeomP1P1_c.c     |  2 +
 .../nb_kernel_ElecGB_VdwCSTab_GeomP1P1_c.c    |  2 +
 .../nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c       |  2 +
 .../nb_kernel_ElecGB_VdwNone_GeomP1P1_c.c     |  2 +
 .../nb_kernel_ElecNone_VdwBhamSh_GeomP1P1_c.c |  2 +
 .../nb_kernel_ElecNone_VdwBhamSw_GeomP1P1_c.c |  2 +
 .../nb_kernel_ElecNone_VdwBham_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecNone_VdwCSTab_GeomP1P1_c.c  |  2 +
 .../nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_c.c |  2 +
 .../nb_kernel_ElecNone_VdwLJEw_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecNone_VdwLJSh_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecNone_VdwLJSw_GeomP1P1_c.c   |  2 +
 .../nb_kernel_ElecNone_VdwLJ_GeomP1P1_c.c     |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_c.c |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_c.c |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_c.c |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_c.c |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_c.c |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_c.c |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_c.c |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_c.c |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_c.c |  2 +
 ...nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_c.c |  2 +
 .../nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_c.c |  2 +
 .../nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_c.c |  2 +
 .../nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_c.c |  2 +
 .../nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_c.c |  2 +
 .../nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_c.c |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwNone_GeomP1P1_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwNone_GeomW3P1_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwNone_GeomW3W3_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwNone_GeomW4P1_c.c  |  2 +
 .../nb_kernel_ElecRFCut_VdwNone_GeomW4W4_c.c  |  2 +
 .../nb_kernel_ElecRF_VdwBham_GeomP1P1_c.c     |  2 +
 .../nb_kernel_ElecRF_VdwBham_GeomW3P1_c.c     |  2 +
 .../nb_kernel_ElecRF_VdwBham_GeomW3W3_c.c     |  2 +
 .../nb_kernel_ElecRF_VdwBham_GeomW4P1_c.c     |  2 +
 .../nb_kernel_ElecRF_VdwBham_GeomW4W4_c.c     |  2 +
 .../nb_kernel_ElecRF_VdwCSTab_GeomP1P1_c.c    |  2 +
 .../nb_kernel_ElecRF_VdwCSTab_GeomW3P1_c.c    |  2 +
 .../nb_kernel_ElecRF_VdwCSTab_GeomW3W3_c.c    |  2 +
 .../nb_kernel_ElecRF_VdwCSTab_GeomW4P1_c.c    |  2 +
 .../nb_kernel_ElecRF_VdwCSTab_GeomW4W4_c.c    |  2 +
 .../nb_kernel_ElecRF_VdwLJ_GeomP1P1_c.c       |  2 +
 .../nb_kernel_ElecRF_VdwLJ_GeomW3P1_c.c       |  2 +
 .../nb_kernel_ElecRF_VdwLJ_GeomW3W3_c.c       |  2 +
 .../nb_kernel_ElecRF_VdwLJ_GeomW4P1_c.c       |  2 +
 .../nb_kernel_ElecRF_VdwLJ_GeomW4W4_c.c       |  2 +
 .../nb_kernel_ElecRF_VdwNone_GeomP1P1_c.c     |  2 +
 .../nb_kernel_ElecRF_VdwNone_GeomW3P1_c.c     |  2 +
 .../nb_kernel_ElecRF_VdwNone_GeomW3W3_c.c     |  2 +
 .../nb_kernel_ElecRF_VdwNone_GeomW4P1_c.c     |  2 +
 .../nb_kernel_ElecRF_VdwNone_GeomW4W4_c.c     |  2 +
 .../nb_kernel_c/nb_kernel_allvsall.c          |  2 +
 .../nb_kernel_c/nb_kernel_allvsallgb.c        |  2 +
 .../nonbonded/nb_kernel_c/nb_kernel_c.c       |  5 +-
 .../nb_kernel_c/nb_kernel_template_c.pre      |  2 +
 .../make_nb_kernel_sparc64_hpc_ace_double.py  |  6 +-
 ...VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ...ab_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...ab_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...ab_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...ab_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...ab_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ...ul_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...ul_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...ul_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...ul_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...ul_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ...dwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...dwLJEwSh_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...dwLJEwSh_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...dwLJEwSh_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...dwLJEwSh_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJEw_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJEw_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJEw_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJEw_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ...Ew_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...Ew_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...Ew_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...Ew_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...Ew_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...GB_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...dwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...ne_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ...RF_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ...RF_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ...RF_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ...RF_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ...RF_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomP1P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW3W3_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4P1_sparc64_hpc_ace_double.c |  2 +
 ..._VdwNone_GeomW4W4_sparc64_hpc_ace_double.c |  2 +
 .../nb_kernel_sparc64_hpc_ace_double.c        |  5 +-
 ...kernel_template_sparc64_hpc_ace_double.pre |  2 +
 .../make_nb_kernel_sse2_double.py             |  6 +-
 ..._ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c |  2 +
 ..._ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c |  2 +
 ..._ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c |  2 +
 ..._ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c |  2 +
 ..._ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c |  2 +
 ...el_ElecCoul_VdwNone_GeomP1P1_sse2_double.c |  2 +
 ...el_ElecCoul_VdwNone_GeomW3P1_sse2_double.c |  2 +
 ...el_ElecCoul_VdwNone_GeomW3W3_sse2_double.c |  2 +
 ...el_ElecCoul_VdwNone_GeomW4P1_sse2_double.c |  2 +
 ...el_ElecCoul_VdwNone_GeomW4W4_sse2_double.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_double.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_double.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_double.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_double.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomP1P1_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomW3P1_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomW3W3_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomW4P1_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomW4W4_sse2_double.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomP1P1_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomW3P1_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomW3W3_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomW4P1_sse2_double.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomW4W4_sse2_double.c |  2 +
 ...nel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c |  2 +
 ...kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c |  2 +
 ...rnel_ElecGB_VdwNone_GeomP1P1_sse2_double.c |  2 +
 ...l_ElecNone_VdwCSTab_GeomP1P1_sse2_double.c |  2 +
 ..._ElecNone_VdwLJEwSh_GeomP1P1_sse2_double.c |  2 +
 ...el_ElecNone_VdwLJEw_GeomP1P1_sse2_double.c |  2 +
 ...el_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c |  2 +
 ...el_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c |  2 +
 ...rnel_ElecNone_VdwLJ_GeomP1P1_sse2_double.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomP1P1_sse2_double.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomW3P1_sse2_double.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomW3W3_sse2_double.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomW4P1_sse2_double.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomW4W4_sse2_double.c |  2 +
 .../nb_kernel_sse2_double.c                   |  5 +-
 .../nb_kernel_template_sse2_double.pre        |  2 +
 .../make_nb_kernel_sse2_single.py             |  6 +-
 ..._ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c |  2 +
 ..._ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c |  2 +
 ..._ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c |  2 +
 ..._ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c |  2 +
 ..._ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c |  2 +
 ...nel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c |  2 +
 ...l_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c |  2 +
 ...l_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c |  2 +
 ...rnel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c |  2 +
 ...el_ElecCoul_VdwNone_GeomP1P1_sse2_single.c |  2 +
 ...el_ElecCoul_VdwNone_GeomW3P1_sse2_single.c |  2 +
 ...el_ElecCoul_VdwNone_GeomW3W3_sse2_single.c |  2 +
 ...el_ElecCoul_VdwNone_GeomW4P1_sse2_single.c |  2 +
 ...el_ElecCoul_VdwNone_GeomW4W4_sse2_single.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_single.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_single.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_single.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_single.c |  2 +
 ..._ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c |  2 +
 ...el_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c |  2 +
 ...el_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c |  2 +
 ...nel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomP1P1_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomW3P1_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomW3W3_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomW4P1_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwLJEw_GeomW4W4_sse2_single.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c |  2 +
 ...kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomP1P1_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomW3P1_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomW3W3_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomW4P1_sse2_single.c |  2 +
 ...rnel_ElecEw_VdwNone_GeomW4W4_sse2_single.c |  2 +
 ...nel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c |  2 +
 ...kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c |  2 +
 ...rnel_ElecGB_VdwNone_GeomP1P1_sse2_single.c |  2 +
 ...l_ElecNone_VdwCSTab_GeomP1P1_sse2_single.c |  2 +
 ..._ElecNone_VdwLJEwSh_GeomP1P1_sse2_single.c |  2 +
 ...el_ElecNone_VdwLJEw_GeomP1P1_sse2_single.c |  2 +
 ...el_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c |  2 +
 ...el_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c |  2 +
 ...rnel_ElecNone_VdwLJ_GeomP1P1_sse2_single.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c |  2 +
 ..._ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c |  2 +
 ...l_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c |  2 +
 ...nel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c |  2 +
 ...kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomP1P1_sse2_single.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomW3P1_sse2_single.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomW3W3_sse2_single.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomW4P1_sse2_single.c |  2 +
 ...rnel_ElecRF_VdwNone_GeomW4W4_sse2_single.c |  2 +
 .../nb_kernel_sse2_single.c                   |  5 +-
 .../nb_kernel_template_sse2_single.pre        |  2 +
 .../make_nb_kernel_sse4_1_double.py           |  6 +-
 ...lecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c |  2 +
 ...lecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c |  2 +
 ...lecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c |  2 +
 ...lecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c |  2 +
 ...lecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c |  2 +
 ...ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c |  2 +
 ...ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c |  2 +
 ...ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c |  2 +
 ...ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c |  2 +
 ...ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c |  2 +
 ...ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c |  2 +
 ...ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c |  2 +
 ...ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c |  2 +
 ...ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c |  2 +
 ...ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c |  2 +
 ..._ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c |  2 +
 ..._ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c |  2 +
 ..._ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c |  2 +
 ..._ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c |  2 +
 ..._ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_double.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_double.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_double.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_double.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c |  2 +
 ..._ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c |  2 +
 ..._ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomP1P1_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomW3P1_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomW3W3_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomW4P1_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomW4W4_sse4_1_double.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c |  2 +
 ...el_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c |  2 +
 ...l_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c |  2 +
 ...rnel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c |  2 +
 ...el_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c |  2 +
 ...ElecNone_VdwCSTab_GeomP1P1_sse4_1_double.c |  2 +
 ...lecNone_VdwLJEwSh_GeomP1P1_sse4_1_double.c |  2 +
 ..._ElecNone_VdwLJEw_GeomP1P1_sse4_1_double.c |  2 +
 ..._ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c |  2 +
 ..._ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c |  2 +
 ...el_ElecNone_VdwLJ_GeomP1P1_sse4_1_double.c |  2 +
 ...lecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c |  2 +
 ...lecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c |  2 +
 ...lecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c |  2 +
 ...lecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c |  2 +
 ...lecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c |  2 +
 ...ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c |  2 +
 ...el_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c |  2 +
 ...el_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c |  2 +
 ...el_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c |  2 +
 ...el_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c |  2 +
 ...el_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c |  2 +
 .../nb_kernel_sse4_1_double.c                 |  5 +-
 .../nb_kernel_template_sse4_1_double.pre      |  2 +
 .../make_nb_kernel_sse4_1_single.py           |  6 +-
 ...lecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c |  2 +
 ...lecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c |  2 +
 ...lecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c |  2 +
 ...lecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c |  2 +
 ...lecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c |  2 +
 ...l_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c |  2 +
 ...ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c |  2 +
 ...ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c |  2 +
 ...ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c |  2 +
 ...ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c |  2 +
 ...ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c |  2 +
 ...ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c |  2 +
 ...ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c |  2 +
 ...ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c |  2 +
 ...ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c |  2 +
 ...ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c |  2 +
 ...el_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c |  2 +
 ..._ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c |  2 +
 ..._ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c |  2 +
 ..._ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c |  2 +
 ..._ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c |  2 +
 ..._ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_single.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_single.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_single.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_single.c |  2 +
 ...lecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c |  2 +
 ..._ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c |  2 +
 ..._ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c |  2 +
 ...l_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomP1P1_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomW3P1_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomW3W3_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomW4P1_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwLJEw_GeomW4W4_sse4_1_single.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c |  2 +
 ...rnel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c |  2 +
 ...el_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c |  2 +
 ...l_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c |  2 +
 ...rnel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c |  2 +
 ...el_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c |  2 +
 ...ElecNone_VdwCSTab_GeomP1P1_sse4_1_single.c |  2 +
 ...lecNone_VdwLJEwSh_GeomP1P1_sse4_1_single.c |  2 +
 ..._ElecNone_VdwLJEw_GeomP1P1_sse4_1_single.c |  2 +
 ..._ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c |  2 +
 ..._ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c |  2 +
 ...el_ElecNone_VdwLJ_GeomP1P1_sse4_1_single.c |  2 +
 ...lecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c |  2 +
 ...lecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c |  2 +
 ...lecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c |  2 +
 ...lecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c |  2 +
 ...lecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c |  2 +
 ...ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c |  2 +
 ...l_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c |  2 +
 ...rnel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c |  2 +
 ...el_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c |  2 +
 ...el_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c |  2 +
 ...el_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c |  2 +
 ...el_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c |  2 +
 ...el_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c |  2 +
 .../nb_kernel_sse4_1_single.c                 |  5 +-
 .../nb_kernel_template_sse4_1_single.pre      |  2 +
 src/gromacs/gmxlib/nonbonded/nonbonded.c      |  2 +
 src/gromacs/gmxlib/nrnb.c                     |  2 +
 src/gromacs/gmxlib/oenv.cpp                   |  2 +
 src/gromacs/gmxlib/orires.c                   |  2 +
 src/gromacs/gmxlib/rbin.c                     |  2 +
 src/gromacs/gmxlib/readinp.c                  |  2 +
 src/gromacs/gmxlib/restcbt.c                  |  2 +
 src/gromacs/gmxlib/sighandler.c               |  2 +
 src/gromacs/gmxlib/splitter.c                 |  2 +
 src/gromacs/gmxlib/txtdump.c                  |  2 +
 src/gromacs/gmxlib/typedefs.c                 |  2 +
 src/gromacs/gmxlib/viewit.c                   |  2 +
 src/gromacs/gmxlib/warninp.c                  |  2 +
 src/gromacs/gmxpreprocess/add_par.c           |  2 +
 src/gromacs/gmxpreprocess/addconf.c           |  2 +
 src/gromacs/gmxpreprocess/calc_verletbuf.c    |  2 +
 src/gromacs/gmxpreprocess/calch.c             |  2 +
 src/gromacs/gmxpreprocess/compute_io.c        |  2 +
 src/gromacs/gmxpreprocess/convparm.c          |  2 +
 src/gromacs/gmxpreprocess/fflibutil.cpp       |  2 +
 src/gromacs/gmxpreprocess/gen_ad.c            |  2 +
 .../gmxpreprocess/gen_maxwell_velocities.c    |  2 +
 src/gromacs/gmxpreprocess/gen_vsite.c         |  2 +
 src/gromacs/gmxpreprocess/genconf.c           |  2 +
 src/gromacs/gmxpreprocess/genhydro.c          |  2 +
 src/gromacs/gmxpreprocess/gmxcpp.c            |  2 +
 src/gromacs/gmxpreprocess/gpp_atomtype.c      |  2 +
 src/gromacs/gmxpreprocess/gpp_bond_atomtype.c |  2 +
 src/gromacs/gmxpreprocess/gpp_nextnb.c        |  2 +
 src/gromacs/gmxpreprocess/grompp.c            |  2 +
 src/gromacs/gmxpreprocess/h_db.c              |  2 +
 src/gromacs/gmxpreprocess/hackblock.c         |  2 +
 src/gromacs/gmxpreprocess/hizzie.c            |  2 +
 .../gmxpreprocess/insert-molecules.cpp        |  2 +
 src/gromacs/gmxpreprocess/nm2type.c           |  2 +
 src/gromacs/gmxpreprocess/pdb2gmx.c           |  2 +
 src/gromacs/gmxpreprocess/pdb2top.cpp         |  2 +
 src/gromacs/gmxpreprocess/pgutil.c            |  2 +
 src/gromacs/gmxpreprocess/protonate.c         |  2 +
 .../gmxpreprocess/read-conformation.cpp       |  2 +
 src/gromacs/gmxpreprocess/readadress.c        |  2 +
 src/gromacs/gmxpreprocess/readir.c            |  2 +
 src/gromacs/gmxpreprocess/readpull.c          |  2 +
 src/gromacs/gmxpreprocess/readrot.c           |  2 +
 src/gromacs/gmxpreprocess/resall.c            |  2 +
 src/gromacs/gmxpreprocess/solvate.cpp         |  2 +
 src/gromacs/gmxpreprocess/sortwater.c         |  2 +
 src/gromacs/gmxpreprocess/specbond.c          |  2 +
 src/gromacs/gmxpreprocess/ter_db.c            |  2 +
 .../gmxpreprocess/tests/insert-molecules.cpp  |  2 +
 src/gromacs/gmxpreprocess/tests/solvate.cpp   |  2 +
 src/gromacs/gmxpreprocess/tomorse.c           |  2 +
 src/gromacs/gmxpreprocess/topdirs.c           |  2 +
 src/gromacs/gmxpreprocess/topio.c             |  2 +
 src/gromacs/gmxpreprocess/toppush.c           |  2 +
 src/gromacs/gmxpreprocess/topshake.c          |  2 +
 src/gromacs/gmxpreprocess/toputil.c           |  2 +
 src/gromacs/gmxpreprocess/vsite_parm.c        |  2 +
 src/gromacs/gmxpreprocess/x2top.c             |  2 +
 src/gromacs/gmxpreprocess/xlate.c             |  2 +
 src/gromacs/imd/imd.c                         |  2 +
 src/gromacs/imd/imdsocket.c                   |  2 +
 src/gromacs/linearalgebra/eigensolver.c       |  2 +
 src/gromacs/linearalgebra/gmx_arpack.c        |  2 +
 src/gromacs/linearalgebra/matrix.c            |  2 +
 src/gromacs/linearalgebra/nrjac.c             |  2 +
 src/gromacs/linearalgebra/sparsematrix.c      |  2 +
 src/gromacs/math/3dtransforms.cpp             |  2 +
 src/gromacs/math/do_fit.c                     |  2 +
 src/gromacs/math/invsqrt.c                    |  2 +
 src/gromacs/math/units.c                      |  2 +
 src/gromacs/math/utilities.c                  |  2 +
 src/gromacs/mdlib/adress.c                    |  2 +
 src/gromacs/mdlib/calcmu.c                    |  2 +
 src/gromacs/mdlib/calcvir.c                   |  2 +
 src/gromacs/mdlib/clincs.c                    |  2 +
 src/gromacs/mdlib/constr.c                    |  2 +
 src/gromacs/mdlib/coupling.c                  |  2 +
 src/gromacs/mdlib/csettle.c                   |  2 +
 src/gromacs/mdlib/domdec.c                    |  2 +
 src/gromacs/mdlib/domdec_box.c                |  2 +
 src/gromacs/mdlib/domdec_con.c                |  2 +
 src/gromacs/mdlib/domdec_network.c            |  2 +
 src/gromacs/mdlib/domdec_setup.c              |  2 +
 src/gromacs/mdlib/domdec_top.c                |  2 +
 src/gromacs/mdlib/ebin.c                      |  2 +
 src/gromacs/mdlib/ewald.c                     |  2 +
 src/gromacs/mdlib/expanded.c                  |  2 +
 src/gromacs/mdlib/force.c                     |  2 +
 src/gromacs/mdlib/forcerec.c                  |  2 +
 src/gromacs/mdlib/genborn.c                   |  2 +
 src/gromacs/mdlib/genborn_allvsall.c          |  2 +
 .../mdlib/genborn_allvsall_sse2_double.c      |  2 +
 .../mdlib/genborn_allvsall_sse2_single.c      |  2 +
 src/gromacs/mdlib/genborn_sse2_double.c       |  2 +
 src/gromacs/mdlib/genborn_sse2_single.c       |  2 +
 src/gromacs/mdlib/groupcoord.c                |  2 +
 src/gromacs/mdlib/init.c                      |  2 +
 src/gromacs/mdlib/iteratedconstraints.c       |  2 +
 src/gromacs/mdlib/md_support.cpp              |  2 +
 src/gromacs/mdlib/mdatom.c                    |  2 +
 src/gromacs/mdlib/mdebin.c                    |  2 +
 src/gromacs/mdlib/mdebin_bar.c                |  2 +
 src/gromacs/mdlib/minimize.c                  |  2 +
 src/gromacs/mdlib/nbnxn_atomdata.c            |  2 +
 src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu    |  2 +
 .../mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu  |  2 +
 .../mdlib/nbnxn_kernels/nbnxn_kernel_common.c |  2 +
 .../nbnxn_kernel_simd_2xnn_kernel.c.pre       |  4 +-
 .../nbnxn_kernel_simd_4xn_kernel.c.pre        |  4 +-
 .../nbnxn_kernel_simd_template.c.pre          |  2 +
 .../nbnxn_kernels/nbnxn_kernel_gpu_ref.c      |  2 +
 .../mdlib/nbnxn_kernels/nbnxn_kernel_ref.c    |  2 +
 ...ernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c |  2 +
 ...rnel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c |  2 +
 ...l_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c |  2 +
 ..._kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c |  2 +
 ...kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c |  2 +
 ...nel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c |  2 +
 ...nel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c |  2 +
 ...el_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c |  2 +
 ...ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c |  2 +
 ...nxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c |  2 +
 ...xn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c |  2 +
 ...kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c |  2 +
 ...nxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c |  2 +
 ...xn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c |  2 +
 ...kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c |  2 +
 ...nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c |  2 +
 ...xn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c |  2 +
 ...nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c |  2 +
 ...bnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c |  2 +
 ...n_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c  |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c |  2 +
 ...nxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c |  2 +
 ...nxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c |  2 +
 ...xn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c |  2 +
 ...kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c     |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c    |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c     |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c    |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c        |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c       |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c    |  2 +
 ...el_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c |  2 +
 ...l_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c |  2 +
 ...lecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c |  2 +
 ...rnel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c |  2 +
 ...nel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c |  2 +
 ..._ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c |  2 +
 ..._ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c |  2 +
 ...ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c |  2 +
 ...cQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c |  2 +
 ..._kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c |  2 +
 ...kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c |  2 +
 ...nel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c |  2 +
 ..._kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c |  2 +
 ...kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c |  2 +
 ...nel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c |  2 +
 ...nxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c |  2 +
 ...xn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c |  2 +
 ...kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c |  2 +
 ...xn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c |  2 +
 ...n_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c |  2 +
 ...ernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c |  2 +
 ...bnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c |  2 +
 ...nxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c |  2 +
 ..._kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c |  2 +
 ..._kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c |  2 +
 ...kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c |  2 +
 ...nel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c  |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c |  2 +
 ...nxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c  |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c |  2 +
 ...nxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c     |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c    |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c |  2 +
 ...nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c |  2 +
 ...bnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c |  2 +
 ...n_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c  |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c |  2 +
 ...nxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c |  2 +
 ...nxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c |  2 +
 ...xn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c |  2 +
 ...kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c     |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c    |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c     |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c    |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c        |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c       |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c    |  2 +
 .../simd_2xnn/nbnxn_kernel_simd_2xnn.c        |  2 +
 ...kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c |  2 +
 ...ernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c |  2 +
 ...el_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c |  2 +
 ...n_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c |  2 +
 ..._kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c |  2 +
 ...rnel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c |  2 +
 ...rnel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c |  2 +
 ...nel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c |  2 +
 ..._ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c |  2 +
 ...bnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c |  2 +
 ...nxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c |  2 +
 ..._kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c |  2 +
 ...bnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c |  2 +
 ...nxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c |  2 +
 ..._kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c |  2 +
 .../nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c  |  2 +
 .../nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c |  2 +
 ...nxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c |  2 +
 ...nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c |  2 +
 ...xn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c   |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c  |  2 +
 ...bnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c |  2 +
 ...bnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c |  2 +
 ...nxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c |  2 +
 ..._kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c      |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c     |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c  |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c      |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c     |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c  |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c         |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c        |  2 +
 .../nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c     |  2 +
 ...nel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c |  2 +
 ...el_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c |  2 +
 ...ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c |  2 +
 ...ernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c |  2 +
 ...rnel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c |  2 +
 ...l_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c |  2 +
 ...l_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c |  2 +
 ..._ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c |  2 +
 ...ecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c |  2 +
 ...n_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c |  2 +
 ..._kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c |  2 +
 ...rnel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c |  2 +
 ...n_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c |  2 +
 ..._kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c |  2 +
 ...rnel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c |  2 +
 ...bnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c |  2 +
 ...nxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c |  2 +
 ..._kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c |  2 +
 ...nxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c |  2 +
 ...xn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c |  2 +
 ...kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c |  2 +
 ...nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c |  2 +
 ...bnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c |  2 +
 ...n_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c |  2 +
 ...n_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c |  2 +
 ..._kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c |  2 +
 ...rnel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c   |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c  |  2 +
 ...bnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c   |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c  |  2 +
 ...bnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c      |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c     |  2 +
 .../nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c  |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c |  2 +
 ...nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c |  2 +
 ...xn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c   |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c  |  2 +
 ...bnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c |  2 +
 ...bnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c |  2 +
 ...nxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c |  2 +
 ..._kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c      |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c     |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c  |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c      |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c     |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c  |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c         |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c        |  2 +
 .../nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c     |  2 +
 .../simd_4xn/nbnxn_kernel_simd_4xn.c          |  2 +
 src/gromacs/mdlib/nbnxn_search.c              |  2 +
 src/gromacs/mdlib/nlistheuristics.c           |  2 +
 src/gromacs/mdlib/ns.c                        |  2 +
 src/gromacs/mdlib/nsgrid.c                    |  2 +
 src/gromacs/mdlib/perf_est.c                  |  2 +
 src/gromacs/mdlib/pme.c                       |  2 +
 src/gromacs/mdlib/pme_pp.c                    |  2 +
 src/gromacs/mdlib/qm_gamess.c                 |  2 +
 src/gromacs/mdlib/qm_gaussian.c               |  2 +
 src/gromacs/mdlib/qm_mopac.c                  |  2 +
 src/gromacs/mdlib/qm_orca.c                   |  2 +
 src/gromacs/mdlib/qmmm.c                      |  2 +
 src/gromacs/mdlib/rf_util.c                   |  2 +
 src/gromacs/mdlib/shakef.c                    |  2 +
 src/gromacs/mdlib/shellfc.c                   |  2 +
 src/gromacs/mdlib/sim_util.c                  |  2 +
 src/gromacs/mdlib/stat.c                      |  2 +
 src/gromacs/mdlib/tables.c                    |  2 +
 src/gromacs/mdlib/tgroup.c                    |  2 +
 src/gromacs/mdlib/tpi.c                       |  2 +
 src/gromacs/mdlib/update.c                    |  2 +
 src/gromacs/mdlib/vcm.c                       |  2 +
 src/gromacs/mdlib/vsite.c                     |  2 +
 src/gromacs/mdlib/wall.c                      |  2 +
 src/gromacs/mdlib/wnblist.c                   |  2 +
 src/gromacs/onlinehelp/helpformat.cpp         |  2 +
 src/gromacs/onlinehelp/helpmanager.cpp        |  4 +-
 src/gromacs/onlinehelp/helptopic.cpp          |  4 +-
 src/gromacs/onlinehelp/helpwritercontext.cpp  |  2 +
 src/gromacs/onlinehelp/tests/helpformat.cpp   |  2 +
 src/gromacs/onlinehelp/tests/helpmanager.cpp  |  2 +
 .../onlinehelp/tests/mock_helptopic.cpp       |  2 +
 src/gromacs/options/abstractoption.cpp        |  2 +
 src/gromacs/options/basicoptions.cpp          |  2 +
 src/gromacs/options/filenameoption.cpp        |  2 +
 src/gromacs/options/filenameoptionmanager.cpp |  2 +
 src/gromacs/options/options.cpp               |  2 +
 src/gromacs/options/optionsassigner.cpp       |  4 +-
 src/gromacs/options/optionsvisitor.cpp        |  4 +-
 .../options/tests/abstractoptionstorage.cpp   |  2 +
 src/gromacs/options/tests/filenameoption.cpp  |  2 +
 .../options/tests/filenameoptionmanager.cpp   |  2 +
 src/gromacs/options/tests/option.cpp          |  4 +-
 src/gromacs/options/tests/optionsassigner.cpp |  2 +
 src/gromacs/options/tests/timeunitmanager.cpp |  4 +-
 src/gromacs/options/timeunitmanager.cpp       |  2 +
 src/gromacs/pbcutil/mshift.cpp                |  2 +
 src/gromacs/pbcutil/pbc.c                     |  2 +
 src/gromacs/pbcutil/rmpbc.c                   |  2 +
 src/gromacs/pulling/pull.c                    |  2 +
 src/gromacs/pulling/pull_rotation.c           |  2 +
 src/gromacs/pulling/pullutil.c                |  2 +
 src/gromacs/random/random.c                   |  2 +
 src/gromacs/random/tests/random.cpp           |  2 +
 src/gromacs/selection/centerofmass.cpp        |  2 +
 src/gromacs/selection/compiler.cpp            |  2 +
 src/gromacs/selection/evaluate.cpp            |  2 +
 src/gromacs/selection/indexutil.cpp           |  2 +
 src/gromacs/selection/mempool.cpp             |  2 +
 src/gromacs/selection/nbsearch.cpp            |  2 +
 src/gromacs/selection/params.cpp              |  2 +
 src/gromacs/selection/parsetree.cpp           |  2 +
 src/gromacs/selection/poscalc.cpp             |  2 +
 src/gromacs/selection/position.cpp            |  2 +
 src/gromacs/selection/scanner_internal.cpp    |  2 +
 src/gromacs/selection/selection.cpp           |  2 +
 src/gromacs/selection/selectioncollection.cpp |  2 +
 src/gromacs/selection/selectionoption.cpp     |  2 +
 .../selection/selectionoptionmanager.cpp      |  2 +
 src/gromacs/selection/selelem.cpp             |  2 +
 src/gromacs/selection/selhelp.cpp             |  2 +
 src/gromacs/selection/selmethod.cpp           |  2 +
 src/gromacs/selection/selvalue.cpp            |  2 +
 src/gromacs/selection/sm_compare.cpp          |  2 +
 src/gromacs/selection/sm_distance.cpp         |  2 +
 src/gromacs/selection/sm_insolidangle.cpp     |  2 +
 src/gromacs/selection/sm_keywords.cpp         |  2 +
 src/gromacs/selection/sm_merge.cpp            |  2 +
 src/gromacs/selection/sm_permute.cpp          |  2 +
 src/gromacs/selection/sm_position.cpp         |  2 +
 src/gromacs/selection/sm_same.cpp             |  2 +
 src/gromacs/selection/sm_simple.cpp           |  2 +
 src/gromacs/selection/symrec.cpp              |  2 +
 src/gromacs/selection/tests/indexutil.cpp     |  2 +
 src/gromacs/selection/tests/nbsearch.cpp      |  2 +
 src/gromacs/selection/tests/poscalc.cpp       |  2 +
 .../selection/tests/selectioncollection.cpp   |  2 +
 .../selection/tests/selectionoption.cpp       |  2 +
 src/gromacs/selection/tests/toputils.cpp      |  2 +
 src/gromacs/simd/tests/base.cpp               |  2 +
 .../simd/tests/bootstrap_loadstore.cpp        |  2 +
 src/gromacs/simd/tests/simd.cpp               |  2 +
 src/gromacs/simd/tests/simd4.cpp              |  2 +
 .../simd/tests/simd4_floatingpoint.cpp        |  2 +
 src/gromacs/simd/tests/simd4_math.cpp         |  2 +
 .../simd/tests/simd4_vector_operations.cpp    |  2 +
 src/gromacs/simd/tests/simd_floatingpoint.cpp |  2 +
 src/gromacs/simd/tests/simd_integer.cpp       |  2 +
 src/gromacs/simd/tests/simd_math.cpp          |  2 +
 .../simd/tests/simd_vector_operations.cpp     |  2 +
 src/gromacs/statistics/statistics.c           |  2 +
 src/gromacs/statistics/statistics_test.c      |  2 +
 src/gromacs/swap/swapcoords.c                 |  2 +
 src/gromacs/timing/cyclecounter.c             |  2 +
 src/gromacs/timing/wallcycle.c                |  2 +
 src/gromacs/timing/walltime_accounting.c      |  2 +
 src/gromacs/tools/check.c                     |  2 +
 src/gromacs/tools/compare.c                   |  2 +
 src/gromacs/tools/convert_tpr.c               |  2 +
 src/gromacs/tools/dump.c                      |  2 +
 src/gromacs/topology/atomprop.cpp             |  2 +
 src/gromacs/topology/atoms.cpp                |  2 +
 src/gromacs/topology/block.cpp                |  2 +
 src/gromacs/topology/index.cpp                |  2 +
 src/gromacs/topology/invblock.c               |  2 +
 src/gromacs/topology/mtop_util.c              |  2 +
 src/gromacs/topology/residuetypes.cpp         |  2 +
 src/gromacs/topology/symtab.cpp               |  2 +
 src/gromacs/topology/topology.cpp             |  2 +
 src/gromacs/topology/topsort.c                |  2 +
 .../trajectoryanalysis/analysismodule.cpp     |  2 +
 .../trajectoryanalysis/analysissettings.cpp   |  2 +
 .../trajectoryanalysis/cmdlinerunner.cpp      |  2 +
 src/gromacs/trajectoryanalysis/modules.cpp    |  2 +
 .../trajectoryanalysis/modules/angle.cpp      |  2 +
 .../trajectoryanalysis/modules/distance.cpp   |  2 +
 .../trajectoryanalysis/modules/freevolume.cpp |  2 +
 src/gromacs/trajectoryanalysis/modules/nsc.c  |  2 +
 .../trajectoryanalysis/modules/sasa.cpp       |  2 +
 .../trajectoryanalysis/modules/select.cpp     |  2 +
 .../trajectoryanalysis/runnercommon.cpp       |  2 +
 .../trajectoryanalysis/tests/angle.cpp        |  2 +
 .../trajectoryanalysis/tests/distance.cpp     |  2 +
 .../trajectoryanalysis/tests/freevolume.cpp   |  2 +
 .../trajectoryanalysis/tests/moduletest.cpp   |  2 +
 src/gromacs/trajectoryanalysis/tests/sasa.cpp |  2 +
 .../trajectoryanalysis/tests/select.cpp       |  2 +
 .../tests/test_selection.cpp                  |  2 +
 src/gromacs/utility/basenetwork.cpp           |  2 +
 src/gromacs/utility/baseversion.cpp           |  2 +
 src/gromacs/utility/cstringutil.c             |  2 +
 src/gromacs/utility/errorcodes.cpp            |  2 +
 src/gromacs/utility/errorformat.cpp           |  2 +
 src/gromacs/utility/exceptions.cpp            |  2 +
 src/gromacs/utility/fatalerror.cpp            |  2 +
 src/gromacs/utility/file.cpp                  |  2 +
 src/gromacs/utility/futil.cpp                 |  2 +
 src/gromacs/utility/gmxassert.cpp             |  4 +-
 src/gromacs/utility/gmxomp.cpp                |  2 +
 src/gromacs/utility/gmxregex.cpp              |  2 +
 src/gromacs/utility/init.cpp                  |  2 +
 .../utility/messagestringcollector.cpp        |  4 +-
 src/gromacs/utility/path.cpp                  |  2 +
 src/gromacs/utility/programcontext.cpp        |  2 +
 src/gromacs/utility/qsort_threadsafe.c        |  2 +
 src/gromacs/utility/smalloc.c                 |  2 +
 src/gromacs/utility/stringutil.cpp            |  2 +
 src/gromacs/utility/tests/stringutil.cpp      |  2 +
 src/programs/gmx.cpp                          |  2 +
 src/programs/legacymodules.cpp                |  2 +
 src/programs/mdrun/md.cpp                     |  2 +
 src/programs/mdrun/mdrun.cpp                  |  2 +
 src/programs/mdrun/membed.c                   |  2 +
 src/programs/mdrun/pme_loadbal.c              |  2 +
 src/programs/mdrun/repl_ex.cpp                |  2 +
 src/programs/mdrun/runner.cpp                 |  2 +
 .../mdrun/tests/compressed_x_output.cpp       |  2 +
 src/programs/mdrun/tests/interactiveMD.cpp    |  2 +
 src/programs/mdrun/tests/moduletest.cpp       |  2 +
 src/programs/mdrun/tests/replicaexchange.cpp  |  2 +
 src/programs/mdrun/tests/rerun.cpp            |  2 +
 src/programs/mdrun/tests/swapcoords.cpp       |  2 +
 .../mdrun/tests/trajectory_writing.cpp        |  2 +
 src/programs/mdrun_main.cpp                   |  4 +-
 src/programs/view/3dview.cpp                  |  2 +
 src/programs/view/buttons.cpp                 |  2 +
 src/programs/view/dialogs.cpp                 |  2 +
 src/programs/view/fgrid.cpp                   |  2 +
 src/programs/view/filter.cpp                  |  2 +
 src/programs/view/logo.cpp                    |  2 +
 src/programs/view/manager.cpp                 |  2 +
 src/programs/view/molps.cpp                   |  2 +
 src/programs/view/nleg.cpp                    |  2 +
 src/programs/view/nmol.cpp                    |  2 +
 src/programs/view/popup.cpp                   |  2 +
 src/programs/view/pulldown.cpp                |  2 +
 src/programs/view/view.cpp                    |  2 +
 src/programs/view/x11.cpp                     |  2 +
 src/programs/view/xdlg.cpp                    |  2 +
 src/programs/view/xdlghi.cpp                  |  2 +
 src/programs/view/xdlgitem.cpp                |  2 +
 src/programs/view/xmb.cpp                     |  2 +
 src/programs/view/xutil.cpp                   |  2 +
 src/testutils/cmdlinetest.cpp                 |  2 +
 src/testutils/integrationtests.cpp            |  2 +
 src/testutils/mpi-printer.cpp                 |  4 +-
 src/testutils/refdata.cpp                     |  2 +
 src/testutils/stringtest.cpp                  |  2 +
 src/testutils/testasserts.cpp                 |  2 +
 src/testutils/testfilemanager.cpp             |  2 +
 src/testutils/testoptions.cpp                 |  2 +
 src/testutils/tests/refdata_tests.cpp         |  2 +
 src/testutils/tests/testasserts_tests.cpp     |  2 +
 src/testutils/unittest_main.cpp               |  2 +
 1972 files changed, 4075 insertions(+), 128 deletions(-)
 create mode 100644 src/gmxpre-config.h.cmakein
 create mode 100644 src/gmxpre.h

diff --git a/admin/reformat_all.sh b/admin/reformat_all.sh
index 23611ea70a..764c44868f 100755
--- a/admin/reformat_all.sh
+++ b/admin/reformat_all.sh
@@ -35,12 +35,14 @@
 
 function usage() {
     echo "usage: reformat_all.sh [-f|--force]"
-    echo "           [--filter=(uncrustify|copyright)] [<action>]"
+    echo "           [--filter=(uncrustify|copyright)] [--pattern=<pattern>]"
+    echo "           [<action>]"
     echo "<action>: (list-files|uncrustify*|copyright) (*=default)"
 }
 
 filter=default
 force=
+patterns=()
 action=uncrustify
 for arg in "$@" ; do
     if [[ "$arg" == "list-files" || "$arg" == "uncrustify" ||
@@ -48,6 +50,8 @@ for arg in "$@" ; do
         action=$arg
     elif [[ "$arg" == --filter=* ]] ; then
         filter=${arg#--filter=}
+    elif [[ "$arg" == --pattern=* ]] ; then
+        patterns[${#patterns[@]}]=${arg#--pattern=}
     elif [[ "$arg" == "-f" || "$arg" == "--force" ]] ; then
         force=1
     else
@@ -111,7 +115,7 @@ esac
 
 cd `git rev-parse --show-toplevel`
 
-if ! git ls-tree -r --name-only HEAD | git check-attr --stdin filter | \
+if ! git ls-files "${patterns[@]}" | git check-attr --stdin filter | \
     sed -nEe "/${filter_re}$/ {s/:.*//;p;}" | $command ; then
     echo "The reformatting command failed! Please check the output."
     exit 1
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8c0db4ed84..fb69a91cfe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,6 +43,7 @@ if(GMX_GPU)
 endif()
 
 configure_file(config.h.cmakein config.h)
+configure_file(gmxpre-config.h.cmakein gmxpre-config.h)
 configure_file(buildinfo.h.cmakein buildinfo.h ESCAPE_QUOTES)
 
 if (BUILD_TESTING)
diff --git a/src/config.h.cmakein b/src/config.h.cmakein
index b80401ff66..8a18d942b2 100644
--- a/src/config.h.cmakein
+++ b/src/config.h.cmakein
@@ -328,27 +328,9 @@
 /* Define if SIGUSR1 is present */
 #cmakedefine HAVE_SIGUSR1
 
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#cmakedefine _LARGEFILE_SOURCE
-
-/* Define for large files, on AIX-style hosts. */
-#cmakedefine _LARGE_FILES
-
-/* Some systems requires this to be set to 64 for large file support */
-#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
-
-/* Build special-purpose mdrun library */
-#cmakedefine GMX_FAHCORE   
-
 /* Enable gromacs quotes */
 #cmakedefine GMX_COOL_QUOTES
 
-#ifdef GMX_FAHCORE
-#define FULLINDIRECT 1
-#define USE_FAH_XDR  1
-#include "swindirect.h"
-#endif
-
 /* default name mangling maybe wrong on exotic plattforms */
 #define F77_FUNC(name,NAME) name ## _
 
diff --git a/src/gmxpre-config.h.cmakein b/src/gmxpre-config.h.cmakein
new file mode 100644
index 0000000000..0fb239f949
--- /dev/null
+++ b/src/gmxpre-config.h.cmakein
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the GROMACS molecular simulation package.
+ *
+ * Copyright (c) 2014, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
+ *
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * GROMACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ *
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
+ *
+ * To help us fund GROMACS development, we humbly ask that you cite
+ * the research papers on the package. Check out http://www.gromacs.org.
+ */
+/*! \internal \file
+ * \brief
+ * Configuration macros from the build system for gmxpre.h.
+ *
+ * This header is an internal implementation detail of gmxpre.h, and should not
+ * be included from anywhere else.
+ *
+ * \see gmxpre.h
+ */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#cmakedefine _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#cmakedefine _LARGE_FILES
+
+/* Some systems requires this to be set to 64 for large file support */
+#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
+
+/* Build special-purpose mdrun library */
+#cmakedefine GMX_FAHCORE
+
diff --git a/src/gmxpre.h b/src/gmxpre.h
new file mode 100644
index 0000000000..baccdc1f48
--- /dev/null
+++ b/src/gmxpre.h
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the GROMACS molecular simulation package.
+ *
+ * Copyright (c) 2014, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
+ *
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * GROMACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ *
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
+ *
+ * To help us fund GROMACS development, we humbly ask that you cite
+ * the research papers on the package. Check out http://www.gromacs.org.
+ */
+/*! \libinternal \file
+ * \brief
+ * Prerequisite header file for \Gromacs build.
+ *
+ * This header should be included as the first header in all source files, but
+ * not in header files.  It is intended to contain definitions that must appear
+ * before any other code to work properly (e.g., macro definitions that
+ * influence behavior of system headers).  This frees other code from include
+ * order dependencies that may raise from requirements of getting these
+ * definitions from some header.
+ *
+ * The definitions here should be kept to a minimum, and should be as static as
+ * possible (typically not change as a result of user choices in the build
+ * system), as any change will trigger a full rebuild.  Avoid including any
+ * actual headers to not hide problems with include-what-you-use, and to keep
+ * build times to a minimum.  Also, installer headers should avoid relying on
+ * the definitions from here (if possible), as this header will not be
+ * available to the user.
+ *
+ * \inlibraryapi
+ */
+#ifdef HAVE_CONFIG_H
+#include "gmxpre-config.h"
+#endif
+
+#ifdef GMX_FAHCORE
+#define FULLINDIRECT 1
+#define USE_FAH_XDR  1
+#include "swindirect.h"
+#endif
diff --git a/src/gromacs/analysisdata/abstractdata.cpp b/src/gromacs/analysisdata/abstractdata.cpp
index 3562cdf2ee..bdc43b4536 100644
--- a/src/gromacs/analysisdata/abstractdata.cpp
+++ b/src/gromacs/analysisdata/abstractdata.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "gromacs/analysisdata/abstractdata.h"
 
 #include <vector>
diff --git a/src/gromacs/analysisdata/analysisdata.cpp b/src/gromacs/analysisdata/analysisdata.cpp
index 7a4727435d..1d9f023999 100644
--- a/src/gromacs/analysisdata/analysisdata.cpp
+++ b/src/gromacs/analysisdata/analysisdata.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "gromacs/analysisdata/analysisdata.h"
 
 #include "gromacs/analysisdata/dataframe.h"
diff --git a/src/gromacs/analysisdata/arraydata.cpp b/src/gromacs/analysisdata/arraydata.cpp
index 55dc204df5..6124ce6d67 100644
--- a/src/gromacs/analysisdata/arraydata.cpp
+++ b/src/gromacs/analysisdata/arraydata.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "gromacs/analysisdata/arraydata.h"
 
 #include <algorithm>
diff --git a/src/gromacs/analysisdata/dataframe.cpp b/src/gromacs/analysisdata/dataframe.cpp
index cfa09e86a3..e080f5f1ab 100644
--- a/src/gromacs/analysisdata/dataframe.cpp
+++ b/src/gromacs/analysisdata/dataframe.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "dataframe.h"
 
 #include "gromacs/utility/gmxassert.h"
diff --git a/src/gromacs/analysisdata/datamodule.cpp b/src/gromacs/analysisdata/datamodule.cpp
index e10859259a..694aeff0e8 100644
--- a/src/gromacs/analysisdata/datamodule.cpp
+++ b/src/gromacs/analysisdata/datamodule.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "gromacs/analysisdata/datamodule.h"
 
 #include "gromacs/analysisdata/paralleloptions.h"
diff --git a/src/gromacs/analysisdata/datamodulemanager.cpp b/src/gromacs/analysisdata/datamodulemanager.cpp
index 779e7ec05c..3a22614b7d 100644
--- a/src/gromacs/analysisdata/datamodulemanager.cpp
+++ b/src/gromacs/analysisdata/datamodulemanager.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "gromacs/analysisdata/datamodulemanager.h"
 
 #include <vector>
diff --git a/src/gromacs/analysisdata/dataproxy.cpp b/src/gromacs/analysisdata/dataproxy.cpp
index 57040f6fef..f493e89b41 100644
--- a/src/gromacs/analysisdata/dataproxy.cpp
+++ b/src/gromacs/analysisdata/dataproxy.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "dataproxy.h"
 
 #include "gromacs/analysisdata/dataframe.h"
diff --git a/src/gromacs/analysisdata/datastorage.cpp b/src/gromacs/analysisdata/datastorage.cpp
index 57dfea17c7..450e8f3b08 100644
--- a/src/gromacs/analysisdata/datastorage.cpp
+++ b/src/gromacs/analysisdata/datastorage.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "datastorage.h"
 
 #include <algorithm>
diff --git a/src/gromacs/analysisdata/modules/average.cpp b/src/gromacs/analysisdata/modules/average.cpp
index b8ee98259a..b4b02b9bd5 100644
--- a/src/gromacs/analysisdata/modules/average.cpp
+++ b/src/gromacs/analysisdata/modules/average.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "average.h"
 
 #include <cmath>
diff --git a/src/gromacs/analysisdata/modules/displacement.cpp b/src/gromacs/analysisdata/modules/displacement.cpp
index 52fd4193ed..1320d40eaf 100644
--- a/src/gromacs/analysisdata/modules/displacement.cpp
+++ b/src/gromacs/analysisdata/modules/displacement.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "gromacs/analysisdata/modules/displacement.h"
 
 #include "gromacs/analysisdata/dataframe.h"
diff --git a/src/gromacs/analysisdata/modules/frameaverager.cpp b/src/gromacs/analysisdata/modules/frameaverager.cpp
index 061b5fd8a5..53ffd297c9 100644
--- a/src/gromacs/analysisdata/modules/frameaverager.cpp
+++ b/src/gromacs/analysisdata/modules/frameaverager.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "frameaverager.h"
 
 #include "gromacs/analysisdata/dataframe.h"
diff --git a/src/gromacs/analysisdata/modules/histogram.cpp b/src/gromacs/analysisdata/modules/histogram.cpp
index e48ea1b4bd..48df0079f7 100644
--- a/src/gromacs/analysisdata/modules/histogram.cpp
+++ b/src/gromacs/analysisdata/modules/histogram.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "gromacs/analysisdata/modules/histogram.h"
 
 #include <cmath>
diff --git a/src/gromacs/analysisdata/modules/lifetime.cpp b/src/gromacs/analysisdata/modules/lifetime.cpp
index c6af8d597e..b375fcf5b8 100644
--- a/src/gromacs/analysisdata/modules/lifetime.cpp
+++ b/src/gromacs/analysisdata/modules/lifetime.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "lifetime.h"
 
 #include <cmath>
diff --git a/src/gromacs/analysisdata/modules/plot.cpp b/src/gromacs/analysisdata/modules/plot.cpp
index 846248897a..9ef70050f5 100644
--- a/src/gromacs/analysisdata/modules/plot.cpp
+++ b/src/gromacs/analysisdata/modules/plot.cpp
@@ -39,6 +39,8 @@
  * \ingroup module_analysisdata
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  */
+#include "gmxpre.h"
+
 #include "gromacs/analysisdata/modules/plot.h"
 
 #include <string>
diff --git a/src/gromacs/analysisdata/tests/analysisdata.cpp b/src/gromacs/analysisdata/tests/analysisdata.cpp
index 6a7a5bc483..1d99f44b1a 100644
--- a/src/gromacs/analysisdata/tests/analysisdata.cpp
+++ b/src/gromacs/analysisdata/tests/analysisdata.cpp
@@ -45,6 +45,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
diff --git a/src/gromacs/analysisdata/tests/arraydata.cpp b/src/gromacs/analysisdata/tests/arraydata.cpp
index 08db023952..eec3aa3f08 100644
--- a/src/gromacs/analysisdata/tests/arraydata.cpp
+++ b/src/gromacs/analysisdata/tests/arraydata.cpp
@@ -44,6 +44,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/analysisdata/arraydata.h"
diff --git a/src/gromacs/analysisdata/tests/average.cpp b/src/gromacs/analysisdata/tests/average.cpp
index f54d6badf8..64d3eeccdd 100644
--- a/src/gromacs/analysisdata/tests/average.cpp
+++ b/src/gromacs/analysisdata/tests/average.cpp
@@ -46,6 +46,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/analysisdata/analysisdata.h"
diff --git a/src/gromacs/analysisdata/tests/datatest.cpp b/src/gromacs/analysisdata/tests/datatest.cpp
index 5093cdffec..b2a787bbbe 100644
--- a/src/gromacs/analysisdata/tests/datatest.cpp
+++ b/src/gromacs/analysisdata/tests/datatest.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "datatest.h"
 
 #include <gmock/gmock.h>
diff --git a/src/gromacs/analysisdata/tests/histogram.cpp b/src/gromacs/analysisdata/tests/histogram.cpp
index b3a2634fb5..7998927e48 100644
--- a/src/gromacs/analysisdata/tests/histogram.cpp
+++ b/src/gromacs/analysisdata/tests/histogram.cpp
@@ -46,6 +46,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/analysisdata/analysisdata.h"
diff --git a/src/gromacs/analysisdata/tests/lifetime.cpp b/src/gromacs/analysisdata/tests/lifetime.cpp
index 1ea1551fd5..c154213922 100644
--- a/src/gromacs/analysisdata/tests/lifetime.cpp
+++ b/src/gromacs/analysisdata/tests/lifetime.cpp
@@ -45,6 +45,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/analysisdata/analysisdata.h"
diff --git a/src/gromacs/analysisdata/tests/mock_datamodule.cpp b/src/gromacs/analysisdata/tests/mock_datamodule.cpp
index ce4887ede0..a4749df187 100644
--- a/src/gromacs/analysisdata/tests/mock_datamodule.cpp
+++ b/src/gromacs/analysisdata/tests/mock_datamodule.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
+#include "gmxpre.h"
+
 #include "mock_datamodule.h"
 
 #include <gmock/gmock.h>
diff --git a/src/gromacs/commandline/cmdlinehelpcontext.cpp b/src/gromacs/commandline/cmdlinehelpcontext.cpp
index b2ae873e47..e90ede652c 100644
--- a/src/gromacs/commandline/cmdlinehelpcontext.cpp
+++ b/src/gromacs/commandline/cmdlinehelpcontext.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include "cmdlinehelpcontext.h"
 
 #include "gromacs/commandline/shellcompletions.h"
diff --git a/src/gromacs/commandline/cmdlinehelpmodule.cpp b/src/gromacs/commandline/cmdlinehelpmodule.cpp
index 37a8496fed..585413df04 100644
--- a/src/gromacs/commandline/cmdlinehelpmodule.cpp
+++ b/src/gromacs/commandline/cmdlinehelpmodule.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include "gromacs/commandline/cmdlinehelpmodule.h"
 
 #include <string>
diff --git a/src/gromacs/commandline/cmdlinehelpwriter.cpp b/src/gromacs/commandline/cmdlinehelpwriter.cpp
index 792d30d949..b410e904af 100644
--- a/src/gromacs/commandline/cmdlinehelpwriter.cpp
+++ b/src/gromacs/commandline/cmdlinehelpwriter.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include "cmdlinehelpwriter.h"
 
 #include <cstring>
diff --git a/src/gromacs/commandline/cmdlineinit.cpp b/src/gromacs/commandline/cmdlineinit.cpp
index afac7d982b..017f2b31c8 100644
--- a/src/gromacs/commandline/cmdlineinit.cpp
+++ b/src/gromacs/commandline/cmdlineinit.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include "gromacs/commandline/cmdlineinit.h"
 
 #include <cstring>
diff --git a/src/gromacs/commandline/cmdlinemodulemanager.cpp b/src/gromacs/commandline/cmdlinemodulemanager.cpp
index a32903f516..18e44a07f9 100644
--- a/src/gromacs/commandline/cmdlinemodulemanager.cpp
+++ b/src/gromacs/commandline/cmdlinemodulemanager.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include "cmdlinemodulemanager.h"
 
 #include <cstdio>
diff --git a/src/gromacs/commandline/cmdlineparser.cpp b/src/gromacs/commandline/cmdlineparser.cpp
index e93ec92f0a..3bb9dfd20d 100644
--- a/src/gromacs/commandline/cmdlineparser.cpp
+++ b/src/gromacs/commandline/cmdlineparser.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include "cmdlineparser.h"
 
 #include <cstdlib>
diff --git a/src/gromacs/commandline/cmdlineprogramcontext.cpp b/src/gromacs/commandline/cmdlineprogramcontext.cpp
index 5528630b79..da36eeddbd 100644
--- a/src/gromacs/commandline/cmdlineprogramcontext.cpp
+++ b/src/gromacs/commandline/cmdlineprogramcontext.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include "cmdlineprogramcontext.h"
 
 #include "config.h"
diff --git a/src/gromacs/commandline/pargs.cpp b/src/gromacs/commandline/pargs.cpp
index 66c0f2abad..b7018901da 100644
--- a/src/gromacs/commandline/pargs.cpp
+++ b/src/gromacs/commandline/pargs.cpp
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "gromacs/commandline/pargs.h"
 
 #include "config.h"
diff --git a/src/gromacs/commandline/shellcompletions.cpp b/src/gromacs/commandline/shellcompletions.cpp
index f5b705944f..e047cf2560 100644
--- a/src/gromacs/commandline/shellcompletions.cpp
+++ b/src/gromacs/commandline/shellcompletions.cpp
@@ -41,6 +41,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include "gromacs/commandline/shellcompletions.h"
 
 #include <cstdio>
diff --git a/src/gromacs/commandline/tests/cmdlinehelpwriter.cpp b/src/gromacs/commandline/tests/cmdlinehelpwriter.cpp
index 5d0e7debab..c5db3a916c 100644
--- a/src/gromacs/commandline/tests/cmdlinehelpwriter.cpp
+++ b/src/gromacs/commandline/tests/cmdlinehelpwriter.cpp
@@ -45,6 +45,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/commandline/cmdlinehelpcontext.h"
diff --git a/src/gromacs/commandline/tests/cmdlinemodulemanager.cpp b/src/gromacs/commandline/tests/cmdlinemodulemanager.cpp
index cd4628fc51..eaa8ecfdd6 100644
--- a/src/gromacs/commandline/tests/cmdlinemodulemanager.cpp
+++ b/src/gromacs/commandline/tests/cmdlinemodulemanager.cpp
@@ -40,6 +40,8 @@
  * \ingroup module_commandline
  */
 // For GMX_BINARY_SUFFIX
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <vector>
diff --git a/src/gromacs/commandline/tests/cmdlineparser.cpp b/src/gromacs/commandline/tests/cmdlineparser.cpp
index d46af114e2..6e408528c5 100644
--- a/src/gromacs/commandline/tests/cmdlineparser.cpp
+++ b/src/gromacs/commandline/tests/cmdlineparser.cpp
@@ -42,6 +42,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/src/gromacs/commandline/tests/cmdlineprogramcontext.cpp b/src/gromacs/commandline/tests/cmdlineprogramcontext.cpp
index df9559608d..c7ee818a48 100644
--- a/src/gromacs/commandline/tests/cmdlineprogramcontext.cpp
+++ b/src/gromacs/commandline/tests/cmdlineprogramcontext.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include <string>
 #include <vector>
 
diff --git a/src/gromacs/commandline/tests/pargs.cpp b/src/gromacs/commandline/tests/pargs.cpp
index 79e203658a..c11259b77d 100644
--- a/src/gromacs/commandline/tests/pargs.cpp
+++ b/src/gromacs/commandline/tests/pargs.cpp
@@ -42,6 +42,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_commandline
  */
+#include "gmxpre.h"
+
 #include "gromacs/commandline/pargs.h"
 
 #include <string>
diff --git a/src/gromacs/essentialdynamics/edsam.c b/src/gromacs/essentialdynamics/edsam.c
index d85d430823..38c2617593 100644
--- a/src/gromacs/essentialdynamics/edsam.c
+++ b/src/gromacs/essentialdynamics/edsam.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/fft/fft.c b/src/gromacs/fft/fft.c
index 27b409cfb4..26ac29acbe 100644
--- a/src/gromacs/fft/fft.c
+++ b/src/gromacs/fft/fft.c
@@ -33,6 +33,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/fft/fft.h"
 
 #include "config.h"
diff --git a/src/gromacs/fft/fft5d.cpp b/src/gromacs/fft/fft5d.cpp
index 6f29773e69..27d42915fb 100644
--- a/src/gromacs/fft/fft5d.cpp
+++ b/src/gromacs/fft/fft5d.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <algorithm>
diff --git a/src/gromacs/fft/fft_fftpack.c b/src/gromacs/fft/fft_fftpack.c
index 15094da1b1..4703911cc6 100644
--- a/src/gromacs/fft/fft_fftpack.c
+++ b/src/gromacs/fft/fft_fftpack.c
@@ -33,6 +33,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/fft/fft.h"
 
 #include "config.h"
diff --git a/src/gromacs/fft/fft_fftw3.cpp b/src/gromacs/fft/fft_fftw3.cpp
index a93ec1d5a6..e9de7eb0d1 100644
--- a/src/gromacs/fft/fft_fftw3.cpp
+++ b/src/gromacs/fft/fft_fftw3.cpp
@@ -33,6 +33,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <errno.h>
diff --git a/src/gromacs/fft/fft_mkl.c b/src/gromacs/fft/fft_mkl.c
index 406eae30b5..1cf35884ca 100644
--- a/src/gromacs/fft/fft_mkl.c
+++ b/src/gromacs/fft/fft_mkl.c
@@ -33,6 +33,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <errno.h>
diff --git a/src/gromacs/fft/parallel_3dfft.c b/src/gromacs/fft/parallel_3dfft.c
index 6ecf7a79de..b1917bd4c2 100644
--- a/src/gromacs/fft/parallel_3dfft.c
+++ b/src/gromacs/fft/parallel_3dfft.c
@@ -33,6 +33,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/fft/tests/fft.cpp b/src/gromacs/fft/tests/fft.cpp
index bc3dd9ce71..e0d80ad974 100644
--- a/src/gromacs/fft/tests/fft.cpp
+++ b/src/gromacs/fft/tests/fft.cpp
@@ -42,6 +42,8 @@
  * \author Roland Schulz <roland@utk.edu>
  * \ingroup module_fft
  */
+#include "gmxpre.h"
+
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/src/gromacs/fileio/confio.c b/src/gromacs/fileio/confio.c
index 17df734ecd..841317695e 100644
--- a/src/gromacs/fileio/confio.c
+++ b/src/gromacs/fileio/confio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "confio.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/enxio.c b/src/gromacs/fileio/enxio.c
index eee590e3b2..9c01b1ccad 100644
--- a/src/gromacs/fileio/enxio.c
+++ b/src/gromacs/fileio/enxio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "enxio.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/filenm.c b/src/gromacs/fileio/filenm.c
index dad39b9f23..d132e44d66 100644
--- a/src/gromacs/fileio/filenm.c
+++ b/src/gromacs/fileio/filenm.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "filenm.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/gmx_system_xdr.c b/src/gromacs/fileio/gmx_system_xdr.c
index 776e5d73d3..cb10ba0abb 100644
--- a/src/gromacs/fileio/gmx_system_xdr.c
+++ b/src/gromacs/fileio/gmx_system_xdr.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #ifdef GMX_INTERNAL_XDR
diff --git a/src/gromacs/fileio/gmxfio.c b/src/gromacs/fileio/gmxfio.c
index 21ba9e6bc5..3a38bf87f3 100644
--- a/src/gromacs/fileio/gmxfio.c
+++ b/src/gromacs/fileio/gmxfio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <errno.h>
diff --git a/src/gromacs/fileio/gmxfio_asc.c b/src/gromacs/fileio/gmxfio_asc.c
index 16a5ed7a8a..28ea2377ee 100644
--- a/src/gromacs/fileio/gmxfio_asc.c
+++ b/src/gromacs/fileio/gmxfio_asc.c
@@ -36,6 +36,8 @@
  */
 
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/fileio/gmxfio_bin.c b/src/gromacs/fileio/gmxfio_bin.c
index c4b7607de2..e8db04822e 100644
--- a/src/gromacs/fileio/gmxfio_bin.c
+++ b/src/gromacs/fileio/gmxfio_bin.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <errno.h>
diff --git a/src/gromacs/fileio/gmxfio_rw.c b/src/gromacs/fileio/gmxfio_rw.c
index 455e8e040f..1b74123e3b 100644
--- a/src/gromacs/fileio/gmxfio_rw.c
+++ b/src/gromacs/fileio/gmxfio_rw.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/fileio/gmxfio_xdr.c b/src/gromacs/fileio/gmxfio_xdr.c
index d05f9fe6bc..77ca2f9f16 100644
--- a/src/gromacs/fileio/gmxfio_xdr.c
+++ b/src/gromacs/fileio/gmxfio_xdr.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <errno.h>
diff --git a/src/gromacs/fileio/libxdrf.c b/src/gromacs/fileio/libxdrf.c
index c92c7b18e6..e93bded448 100644
--- a/src/gromacs/fileio/libxdrf.c
+++ b/src/gromacs/fileio/libxdrf.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <limits.h>
diff --git a/src/gromacs/fileio/matio.cpp b/src/gromacs/fileio/matio.cpp
index 94007d1216..c7d1dbb1e1 100644
--- a/src/gromacs/fileio/matio.cpp
+++ b/src/gromacs/fileio/matio.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "matio.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/md5.c b/src/gromacs/fileio/md5.c
index 3a41174104..ad3c36aaad 100644
--- a/src/gromacs/fileio/md5.c
+++ b/src/gromacs/fileio/md5.c
@@ -36,6 +36,8 @@
  * the use of GMX_INTEGER_BIG_ENDIAN, and the renaming of the
  * functions md5_init, md5_append and md5_finish to have a gmx_ prefix
  * (to avoid name clashes). */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #ifdef GMX_INTEGER_BIG_ENDIAN
diff --git a/src/gromacs/fileio/mdoutf.c b/src/gromacs/fileio/mdoutf.c
index af75164678..da67416fb8 100644
--- a/src/gromacs/fileio/mdoutf.c
+++ b/src/gromacs/fileio/mdoutf.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "mdoutf.h"
 
 #include "gromacs/legacyheaders/mdrun.h"
diff --git a/src/gromacs/fileio/mtxio.c b/src/gromacs/fileio/mtxio.c
index d1eeb88590..99120369eb 100644
--- a/src/gromacs/fileio/mtxio.c
+++ b/src/gromacs/fileio/mtxio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "mtxio.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/pdbio.c b/src/gromacs/fileio/pdbio.c
index d1b8e63cca..5ca147c230 100644
--- a/src/gromacs/fileio/pdbio.c
+++ b/src/gromacs/fileio/pdbio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "pdbio.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/strdb.c b/src/gromacs/fileio/strdb.c
index b8811a5fb4..47b04b99a9 100644
--- a/src/gromacs/fileio/strdb.c
+++ b/src/gromacs/fileio/strdb.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "strdb.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/tests/tngio.cpp b/src/gromacs/fileio/tests/tngio.cpp
index 6fa34d8f8c..1eab0e4c86 100644
--- a/src/gromacs/fileio/tests/tngio.cpp
+++ b/src/gromacs/fileio/tests/tngio.cpp
@@ -39,6 +39,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  * \ingroup module_fileio
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 #include <string>
 
diff --git a/src/gromacs/fileio/timecontrol.c b/src/gromacs/fileio/timecontrol.c
index c730f04399..c4c3cbbe4b 100644
--- a/src/gromacs/fileio/timecontrol.c
+++ b/src/gromacs/fileio/timecontrol.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/fileio/timecontrol.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/tngio.cpp b/src/gromacs/fileio/tngio.cpp
index 6d5a929531..e0a7f42e41 100644
--- a/src/gromacs/fileio/tngio.cpp
+++ b/src/gromacs/fileio/tngio.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "tngio.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/tngio_for_tools.cpp b/src/gromacs/fileio/tngio_for_tools.cpp
index 6cc4600ffc..89f9d6703c 100644
--- a/src/gromacs/fileio/tngio_for_tools.cpp
+++ b/src/gromacs/fileio/tngio_for_tools.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "tngio_for_tools.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/tpxio.c b/src/gromacs/fileio/tpxio.c
index 3636c4248c..9dd4f30ec2 100644
--- a/src/gromacs/fileio/tpxio.c
+++ b/src/gromacs/fileio/tpxio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 /* This file is completely threadsafe - keep it that way! */
diff --git a/src/gromacs/fileio/trajectory_writing.c b/src/gromacs/fileio/trajectory_writing.c
index 569bf58fbc..ba842ce3f6 100644
--- a/src/gromacs/fileio/trajectory_writing.c
+++ b/src/gromacs/fileio/trajectory_writing.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/fileio/trnio.c b/src/gromacs/fileio/trnio.c
index 662f970cc9..a01cd2da6b 100644
--- a/src/gromacs/fileio/trnio.c
+++ b/src/gromacs/fileio/trnio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/fileio/trxio.c b/src/gromacs/fileio/trxio.c
index 1d3d6fded8..b515578ef3 100644
--- a/src/gromacs/fileio/trxio.c
+++ b/src/gromacs/fileio/trxio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "trxio.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/vmdio.c b/src/gromacs/fileio/vmdio.c
index 63fe52f99d..670aef0d7b 100644
--- a/src/gromacs/fileio/vmdio.c
+++ b/src/gromacs/fileio/vmdio.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "vmdio.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/writeps.c b/src/gromacs/fileio/writeps.c
index 6b76543a6d..953bf4e24b 100644
--- a/src/gromacs/fileio/writeps.c
+++ b/src/gromacs/fileio/writeps.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "writeps.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/xdrd.c b/src/gromacs/fileio/xdrd.c
index 2d9b26bbf1..794c46ca2f 100644
--- a/src/gromacs/fileio/xdrd.c
+++ b/src/gromacs/fileio/xdrd.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "xdrf.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/xtcio.c b/src/gromacs/fileio/xtcio.c
index e72749346a..a6b39b4800 100644
--- a/src/gromacs/fileio/xtcio.c
+++ b/src/gromacs/fileio/xtcio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "xtcio.h"
 
 #include "config.h"
diff --git a/src/gromacs/fileio/xvgr.cpp b/src/gromacs/fileio/xvgr.cpp
index dddc4afc89..dddebce5a1 100644
--- a/src/gromacs/fileio/xvgr.cpp
+++ b/src/gromacs/fileio/xvgr.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/fileio/xvgr.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxana/anadih.c b/src/gromacs/gmxana/anadih.c
index e295e024bf..88785cc38a 100644
--- a/src/gromacs/gmxana/anadih.c
+++ b/src/gromacs/gmxana/anadih.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/autocorr.c b/src/gromacs/gmxana/autocorr.c
index fc51fcbcdc..3b52f0d305 100644
--- a/src/gromacs/gmxana/autocorr.c
+++ b/src/gromacs/gmxana/autocorr.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/binsearch.c b/src/gromacs/gmxana/binsearch.c
index 726d3aeccc..4228e35faa 100644
--- a/src/gromacs/gmxana/binsearch.c
+++ b/src/gromacs/gmxana/binsearch.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxana/cmat.c b/src/gromacs/gmxana/cmat.c
index 5bc4d59905..1015377ed8 100644
--- a/src/gromacs/gmxana/cmat.c
+++ b/src/gromacs/gmxana/cmat.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "cmat.h"
diff --git a/src/gromacs/gmxana/correl.c b/src/gromacs/gmxana/correl.c
index f34c501fe1..6860f3a1e5 100644
--- a/src/gromacs/gmxana/correl.c
+++ b/src/gromacs/gmxana/correl.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxana/dens_filter.c b/src/gromacs/gmxana/dens_filter.c
index feb7be5979..c594218956 100644
--- a/src/gromacs/gmxana/dens_filter.c
+++ b/src/gromacs/gmxana/dens_filter.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 /* dens_filter.c
  * Routines for Filters and convolutions
diff --git a/src/gromacs/gmxana/dlist.c b/src/gromacs/gmxana/dlist.c
index 173a481494..0940e62715 100644
--- a/src/gromacs/gmxana/dlist.c
+++ b/src/gromacs/gmxana/dlist.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/edittop.c b/src/gromacs/gmxana/edittop.c
index c39d14ee62..cefa9692b7 100644
--- a/src/gromacs/gmxana/edittop.c
+++ b/src/gromacs/gmxana/edittop.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxana/eigio.c b/src/gromacs/gmxana/eigio.c
index 37e8506e76..d426a0a5c1 100644
--- a/src/gromacs/gmxana/eigio.c
+++ b/src/gromacs/gmxana/eigio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxana/expfit.c b/src/gromacs/gmxana/expfit.c
index 8b292b72a7..116c7e3793 100644
--- a/src/gromacs/gmxana/expfit.c
+++ b/src/gromacs/gmxana/expfit.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/fitahx.c b/src/gromacs/gmxana/fitahx.c
index 6687380616..16700170b2 100644
--- a/src/gromacs/gmxana/fitahx.c
+++ b/src/gromacs/gmxana/fitahx.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "fitahx.h"
diff --git a/src/gromacs/gmxana/geminate.c b/src/gromacs/gmxana/geminate.c
index 3f9dd4eebb..19699c0b34 100644
--- a/src/gromacs/gmxana/geminate.c
+++ b/src/gromacs/gmxana/geminate.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_anadock.c b/src/gromacs/gmxana/gmx_anadock.c
index f8233a5e8b..a81a80a8f0 100644
--- a/src/gromacs/gmxana/gmx_anadock.c
+++ b/src/gromacs/gmxana/gmx_anadock.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/gmx_anaeig.c b/src/gromacs/gmxana/gmx_anaeig.c
index 4f5bab1388..f594138563 100644
--- a/src/gromacs/gmxana/gmx_anaeig.c
+++ b/src/gromacs/gmxana/gmx_anaeig.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_analyze.c b/src/gromacs/gmxana/gmx_analyze.c
index b51d534787..08ecac0d83 100644
--- a/src/gromacs/gmxana/gmx_analyze.c
+++ b/src/gromacs/gmxana/gmx_analyze.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_angle.c b/src/gromacs/gmxana/gmx_angle.c
index 80cc138076..137d636708 100644
--- a/src/gromacs/gmxana/gmx_angle.c
+++ b/src/gromacs/gmxana/gmx_angle.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 #include <math.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_bar.c b/src/gromacs/gmxana/gmx_bar.c
index 8abbc3f0e1..7d603873a2 100644
--- a/src/gromacs/gmxana/gmx_bar.c
+++ b/src/gromacs/gmxana/gmx_bar.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxana/gmx_bundle.c b/src/gromacs/gmxana/gmx_bundle.c
index 3c8db4a1ed..140850583f 100644
--- a/src/gromacs/gmxana/gmx_bundle.c
+++ b/src/gromacs/gmxana/gmx_bundle.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 #include <math.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_chi.c b/src/gromacs/gmxana/gmx_chi.c
index 5d2ceb9aa6..49ed9850d5 100644
--- a/src/gromacs/gmxana/gmx_chi.c
+++ b/src/gromacs/gmxana/gmx_chi.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_cluster.c b/src/gromacs/gmxana/gmx_cluster.c
index efec7d7479..17a480a495 100644
--- a/src/gromacs/gmxana/gmx_cluster.c
+++ b/src/gromacs/gmxana/gmx_cluster.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_clustsize.c b/src/gromacs/gmxana/gmx_clustsize.c
index 87e6aa17f0..fff7aa361c 100644
--- a/src/gromacs/gmxana/gmx_clustsize.c
+++ b/src/gromacs/gmxana/gmx_clustsize.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_confrms.c b/src/gromacs/gmxana/gmx_confrms.c
index 8fcf879027..9c939ead5c 100644
--- a/src/gromacs/gmxana/gmx_confrms.c
+++ b/src/gromacs/gmxana/gmx_confrms.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_covar.c b/src/gromacs/gmxana/gmx_covar.c
index cd1ab020c2..51d29e38ef 100644
--- a/src/gromacs/gmxana/gmx_covar.c
+++ b/src/gromacs/gmxana/gmx_covar.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_current.c b/src/gromacs/gmxana/gmx_current.c
index 11e895437c..1697d39bb0 100644
--- a/src/gromacs/gmxana/gmx_current.c
+++ b/src/gromacs/gmxana/gmx_current.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/gmxana/gmx_density.c b/src/gromacs/gmxana/gmx_density.c
index dd4d441d09..b50a4304c2 100644
--- a/src/gromacs/gmxana/gmx_density.c
+++ b/src/gromacs/gmxana/gmx_density.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxana/gmx_densmap.c b/src/gromacs/gmxana/gmx_densmap.c
index ada22bd284..e4158880e9 100644
--- a/src/gromacs/gmxana/gmx_densmap.c
+++ b/src/gromacs/gmxana/gmx_densmap.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_densorder.cpp b/src/gromacs/gmxana/gmx_densorder.cpp
index 30e900efef..79db631c1e 100644
--- a/src/gromacs/gmxana/gmx_densorder.cpp
+++ b/src/gromacs/gmxana/gmx_densorder.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxana/gmx_dielectric.c b/src/gromacs/gmxana/gmx_dielectric.c
index 5d84c4ecf6..ccc35446b1 100644
--- a/src/gromacs/gmxana/gmx_dielectric.c
+++ b/src/gromacs/gmxana/gmx_dielectric.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_dipoles.cpp b/src/gromacs/gmxana/gmx_dipoles.cpp
index d7338e58d4..ae7a8ac8d7 100644
--- a/src/gromacs/gmxana/gmx_dipoles.cpp
+++ b/src/gromacs/gmxana/gmx_dipoles.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 #include <string.h>
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_disre.c b/src/gromacs/gmxana/gmx_disre.c
index ac43e495a4..904dd8e50a 100644
--- a/src/gromacs/gmxana/gmx_disre.c
+++ b/src/gromacs/gmxana/gmx_disre.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_do_dssp.c b/src/gromacs/gmxana/gmx_do_dssp.c
index 6f09b6b61a..909bcd700d 100644
--- a/src/gromacs/gmxana/gmx_do_dssp.c
+++ b/src/gromacs/gmxana/gmx_do_dssp.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/gmx_dos.c b/src/gromacs/gmxana/gmx_dos.c
index 69341f05b0..767525eaa4 100644
--- a/src/gromacs/gmxana/gmx_dos.c
+++ b/src/gromacs/gmxana/gmx_dos.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_dyecoupl.c b/src/gromacs/gmxana/gmx_dyecoupl.c
index 74fcc2d796..c495cf2e75 100644
--- a/src/gromacs/gmxana/gmx_dyecoupl.c
+++ b/src/gromacs/gmxana/gmx_dyecoupl.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/fileio/filenm.h"
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxana/gmx_dyndom.c b/src/gromacs/gmxana/gmx_dyndom.c
index f53e8fe27a..8a82998ab3 100644
--- a/src/gromacs/gmxana/gmx_dyndom.c
+++ b/src/gromacs/gmxana/gmx_dyndom.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/topology/index.h"
diff --git a/src/gromacs/gmxana/gmx_editconf.c b/src/gromacs/gmxana/gmx_editconf.c
index 27440d9b34..a17427cff3 100644
--- a/src/gromacs/gmxana/gmx_editconf.c
+++ b/src/gromacs/gmxana/gmx_editconf.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_eneconv.c b/src/gromacs/gmxana/gmx_eneconv.c
index f73f160322..750e91ed08 100644
--- a/src/gromacs/gmxana/gmx_eneconv.c
+++ b/src/gromacs/gmxana/gmx_eneconv.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_enemat.c b/src/gromacs/gmxana/gmx_enemat.c
index f4484f7e40..8426aef8d6 100644
--- a/src/gromacs/gmxana/gmx_enemat.c
+++ b/src/gromacs/gmxana/gmx_enemat.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 #include <string.h>
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_energy.c b/src/gromacs/gmxana/gmx_energy.c
index 209d4121c2..7b339fc415 100644
--- a/src/gromacs/gmxana/gmx_energy.c
+++ b/src/gromacs/gmxana/gmx_energy.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_filter.c b/src/gromacs/gmxana/gmx_filter.c
index 2f0d88a6ed..13955d0c67 100644
--- a/src/gromacs/gmxana/gmx_filter.c
+++ b/src/gromacs/gmxana/gmx_filter.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 #include <math.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_genion.c b/src/gromacs/gmxana/gmx_genion.c
index 09a875d5a7..00bf735f4c 100644
--- a/src/gromacs/gmxana/gmx_genion.c
+++ b/src/gromacs/gmxana/gmx_genion.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxana/gmx_genpr.c b/src/gromacs/gmxana/gmx_genpr.c
index 7756a7f878..c0a983c441 100644
--- a/src/gromacs/gmxana/gmx_genpr.c
+++ b/src/gromacs/gmxana/gmx_genpr.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_gyrate.c b/src/gromacs/gmxana/gmx_gyrate.c
index cb3ea229aa..d4ab33fb52 100644
--- a/src/gromacs/gmxana/gmx_gyrate.c
+++ b/src/gromacs/gmxana/gmx_gyrate.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_h2order.c b/src/gromacs/gmxana/gmx_h2order.c
index c6f7ff0e5c..96ab2b82f2 100644
--- a/src/gromacs/gmxana/gmx_h2order.c
+++ b/src/gromacs/gmxana/gmx_h2order.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_hbond.c b/src/gromacs/gmxana/gmx_hbond.c
index 75de1df19b..4d421b1cf0 100644
--- a/src/gromacs/gmxana/gmx_hbond.c
+++ b/src/gromacs/gmxana/gmx_hbond.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 #include <math.h>
 
diff --git a/src/gromacs/gmxana/gmx_helix.c b/src/gromacs/gmxana/gmx_helix.c
index c1e06dcd98..9b3a0dcf34 100644
--- a/src/gromacs/gmxana/gmx_helix.c
+++ b/src/gromacs/gmxana/gmx_helix.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_helixorient.c b/src/gromacs/gmxana/gmx_helixorient.c
index 6bc1738ea0..89727f537e 100644
--- a/src/gromacs/gmxana/gmx_helixorient.c
+++ b/src/gromacs/gmxana/gmx_helixorient.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_hydorder.c b/src/gromacs/gmxana/gmx_hydorder.c
index aebbcf52e4..8cb65d7f68 100644
--- a/src/gromacs/gmxana/gmx_hydorder.c
+++ b/src/gromacs/gmxana/gmx_hydorder.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_lie.c b/src/gromacs/gmxana/gmx_lie.c
index b0174530aa..e48ff5eac6 100644
--- a/src/gromacs/gmxana/gmx_lie.c
+++ b/src/gromacs/gmxana/gmx_lie.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_make_edi.c b/src/gromacs/gmxana/gmx_make_edi.c
index 994b607fc2..1825f5803c 100644
--- a/src/gromacs/gmxana/gmx_make_edi.c
+++ b/src/gromacs/gmxana/gmx_make_edi.c
@@ -36,6 +36,8 @@
  * on the code from g_anaeig. You can reach him as olange@gwdg.de. He
  * probably also holds copyright to the following code.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_make_ndx.c b/src/gromacs/gmxana/gmx_make_ndx.c
index f380595f0c..3415ff59db 100644
--- a/src/gromacs/gmxana/gmx_make_ndx.c
+++ b/src/gromacs/gmxana/gmx_make_ndx.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxana/gmx_mdmat.c b/src/gromacs/gmxana/gmx_mdmat.c
index 145efb1cea..2f47160860 100644
--- a/src/gromacs/gmxana/gmx_mdmat.c
+++ b/src/gromacs/gmxana/gmx_mdmat.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_mindist.c b/src/gromacs/gmxana/gmx_mindist.c
index 7933324f4f..8ca072ecb8 100644
--- a/src/gromacs/gmxana/gmx_mindist.c
+++ b/src/gromacs/gmxana/gmx_mindist.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_mk_angndx.c b/src/gromacs/gmxana/gmx_mk_angndx.c
index fea732fac0..6cc12dcc5b 100644
--- a/src/gromacs/gmxana/gmx_mk_angndx.c
+++ b/src/gromacs/gmxana/gmx_mk_angndx.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_morph.c b/src/gromacs/gmxana/gmx_morph.c
index f5661411af..a4bf81f835 100644
--- a/src/gromacs/gmxana/gmx_morph.c
+++ b/src/gromacs/gmxana/gmx_morph.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxana/gmx_msd.c b/src/gromacs/gmxana/gmx_msd.c
index f3367c594d..69421e61bc 100644
--- a/src/gromacs/gmxana/gmx_msd.c
+++ b/src/gromacs/gmxana/gmx_msd.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_nmeig.c b/src/gromacs/gmxana/gmx_nmeig.c
index 41e5bda4e6..fdacf8662e 100644
--- a/src/gromacs/gmxana/gmx_nmeig.c
+++ b/src/gromacs/gmxana/gmx_nmeig.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_nmens.c b/src/gromacs/gmxana/gmx_nmens.c
index 3622811ff6..66814b62e5 100644
--- a/src/gromacs/gmxana/gmx_nmens.c
+++ b/src/gromacs/gmxana/gmx_nmens.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_nmtraj.c b/src/gromacs/gmxana/gmx_nmtraj.c
index d40f7d7066..a100bf4b04 100644
--- a/src/gromacs/gmxana/gmx_nmtraj.c
+++ b/src/gromacs/gmxana/gmx_nmtraj.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_options.c b/src/gromacs/gmxana/gmx_options.c
index bf995703a8..874d4082d0 100644
--- a/src/gromacs/gmxana/gmx_options.c
+++ b/src/gromacs/gmxana/gmx_options.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxana/gmx_order.c b/src/gromacs/gmxana/gmx_order.c
index 0de0e43e90..b73f747f59 100644
--- a/src/gromacs/gmxana/gmx_order.c
+++ b/src/gromacs/gmxana/gmx_order.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_pme_error.cpp b/src/gromacs/gmxana/gmx_pme_error.cpp
index cb3bff6a9d..0d33fa3d70 100644
--- a/src/gromacs/gmxana/gmx_pme_error.cpp
+++ b/src/gromacs/gmxana/gmx_pme_error.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include <algorithm>
 
 #include "gromacs/commandline/pargs.h"
diff --git a/src/gromacs/gmxana/gmx_polystat.c b/src/gromacs/gmxana/gmx_polystat.c
index ee045a3b25..3e0443128d 100644
--- a/src/gromacs/gmxana/gmx_polystat.c
+++ b/src/gromacs/gmxana/gmx_polystat.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_potential.c b/src/gromacs/gmxana/gmx_potential.c
index 623b49f184..95a79ae2f1 100644
--- a/src/gromacs/gmxana/gmx_potential.c
+++ b/src/gromacs/gmxana/gmx_potential.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxana/gmx_principal.c b/src/gromacs/gmxana/gmx_principal.c
index c32f288277..9b8d2d4e34 100644
--- a/src/gromacs/gmxana/gmx_principal.c
+++ b/src/gromacs/gmxana/gmx_principal.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_rama.c b/src/gromacs/gmxana/gmx_rama.c
index f128e08926..89efb681cb 100644
--- a/src/gromacs/gmxana/gmx_rama.c
+++ b/src/gromacs/gmxana/gmx_rama.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_rdf.c b/src/gromacs/gmxana/gmx_rdf.c
index 3b44647147..62a75a1220 100644
--- a/src/gromacs/gmxana/gmx_rdf.c
+++ b/src/gromacs/gmxana/gmx_rdf.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_rms.c b/src/gromacs/gmxana/gmx_rms.c
index 6fc6c91204..72f2df8ac4 100644
--- a/src/gromacs/gmxana/gmx_rms.c
+++ b/src/gromacs/gmxana/gmx_rms.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_rmsdist.c b/src/gromacs/gmxana/gmx_rmsdist.c
index 4637d4e93d..b89fc27633 100644
--- a/src/gromacs/gmxana/gmx_rmsdist.c
+++ b/src/gromacs/gmxana/gmx_rmsdist.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_rmsf.c b/src/gromacs/gmxana/gmx_rmsf.c
index 99a9bfcb46..2cf9302095 100644
--- a/src/gromacs/gmxana/gmx_rmsf.c
+++ b/src/gromacs/gmxana/gmx_rmsf.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_rotacf.c b/src/gromacs/gmxana/gmx_rotacf.c
index fa5625dd4f..eade0cfb54 100644
--- a/src/gromacs/gmxana/gmx_rotacf.c
+++ b/src/gromacs/gmxana/gmx_rotacf.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_rotmat.c b/src/gromacs/gmxana/gmx_rotmat.c
index 580ab0c0e5..fee97eae34 100644
--- a/src/gromacs/gmxana/gmx_rotmat.c
+++ b/src/gromacs/gmxana/gmx_rotmat.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_saltbr.c b/src/gromacs/gmxana/gmx_saltbr.c
index 85b70d4c21..d6048c2fc4 100644
--- a/src/gromacs/gmxana/gmx_saltbr.c
+++ b/src/gromacs/gmxana/gmx_saltbr.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 #include <math.h>
 #include <string.h>
diff --git a/src/gromacs/gmxana/gmx_sans.c b/src/gromacs/gmxana/gmx_sans.c
index 47161af786..4adcefb7ef 100644
--- a/src/gromacs/gmxana/gmx_sans.c
+++ b/src/gromacs/gmxana/gmx_sans.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxana/gmx_saxs.c b/src/gromacs/gmxana/gmx_saxs.c
index a1e66f7bf7..531786db03 100644
--- a/src/gromacs/gmxana/gmx_saxs.c
+++ b/src/gromacs/gmxana/gmx_saxs.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_sham.c b/src/gromacs/gmxana/gmx_sham.c
index 3847ae6c37..fab870832b 100644
--- a/src/gromacs/gmxana/gmx_sham.c
+++ b/src/gromacs/gmxana/gmx_sham.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_sigeps.c b/src/gromacs/gmxana/gmx_sigeps.c
index 4b2ee347b1..559e16c233 100644
--- a/src/gromacs/gmxana/gmx_sigeps.c
+++ b/src/gromacs/gmxana/gmx_sigeps.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_sorient.c b/src/gromacs/gmxana/gmx_sorient.c
index 6b24842a55..4723f9a130 100644
--- a/src/gromacs/gmxana/gmx_sorient.c
+++ b/src/gromacs/gmxana/gmx_sorient.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxana/gmx_spatial.c b/src/gromacs/gmxana/gmx_spatial.c
index 55953dd619..01fccfc1d9 100644
--- a/src/gromacs/gmxana/gmx_spatial.c
+++ b/src/gromacs/gmxana/gmx_spatial.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_spol.c b/src/gromacs/gmxana/gmx_spol.c
index 53b6be27c2..bc7895724a 100644
--- a/src/gromacs/gmxana/gmx_spol.c
+++ b/src/gromacs/gmxana/gmx_spol.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxana/gmx_tcaf.c b/src/gromacs/gmxana/gmx_tcaf.c
index 3da758d4ab..4505de841e 100644
--- a/src/gromacs/gmxana/gmx_tcaf.c
+++ b/src/gromacs/gmxana/gmx_tcaf.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_traj.c b/src/gromacs/gmxana/gmx_traj.c
index e1de52752d..779d07ff61 100644
--- a/src/gromacs/gmxana/gmx_traj.c
+++ b/src/gromacs/gmxana/gmx_traj.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_trjcat.c b/src/gromacs/gmxana/gmx_trjcat.c
index d887cc8670..84939f36d9 100644
--- a/src/gromacs/gmxana/gmx_trjcat.c
+++ b/src/gromacs/gmxana/gmx_trjcat.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_trjconv.c b/src/gromacs/gmxana/gmx_trjconv.c
index 3f1a01eb2f..5ee96528d2 100644
--- a/src/gromacs/gmxana/gmx_trjconv.c
+++ b/src/gromacs/gmxana/gmx_trjconv.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_trjorder.c b/src/gromacs/gmxana/gmx_trjorder.c
index beb76289fd..3d9c647c6b 100644
--- a/src/gromacs/gmxana/gmx_trjorder.c
+++ b/src/gromacs/gmxana/gmx_trjorder.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_tune_pme.c b/src/gromacs/gmxana/gmx_tune_pme.c
index 60dd976325..7956218555 100644
--- a/src/gromacs/gmxana/gmx_tune_pme.c
+++ b/src/gromacs/gmxana/gmx_tune_pme.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/gmx_vanhove.c b/src/gromacs/gmxana/gmx_vanhove.c
index f03d78eb21..f399578dd9 100644
--- a/src/gromacs/gmxana/gmx_vanhove.c
+++ b/src/gromacs/gmxana/gmx_vanhove.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/gmxana/gmx_velacc.c b/src/gromacs/gmxana/gmx_velacc.c
index 4e0c5bbe27..fe148a17bb 100644
--- a/src/gromacs/gmxana/gmx_velacc.c
+++ b/src/gromacs/gmxana/gmx_velacc.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_wham.cpp b/src/gromacs/gmxana/gmx_wham.cpp
index e7a076835e..8d93fb6c41 100644
--- a/src/gromacs/gmxana/gmx_wham.cpp
+++ b/src/gromacs/gmxana/gmx_wham.cpp
@@ -41,6 +41,8 @@
  *  \author Jochen Hub <jhub@gwdg.de>
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxana/gmx_wheel.c b/src/gromacs/gmxana/gmx_wheel.c
index 7c8173213a..3bb86d9cc8 100644
--- a/src/gromacs/gmxana/gmx_wheel.c
+++ b/src/gromacs/gmxana/gmx_wheel.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/gmx_xpm2ps.c b/src/gromacs/gmxana/gmx_xpm2ps.c
index 1610e51269..779313cc70 100644
--- a/src/gromacs/gmxana/gmx_xpm2ps.c
+++ b/src/gromacs/gmxana/gmx_xpm2ps.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxana/hxprops.c b/src/gromacs/gmxana/hxprops.c
index 4f68cc2e62..c789aa964f 100644
--- a/src/gromacs/gmxana/hxprops.c
+++ b/src/gromacs/gmxana/hxprops.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/legacytests/gmx_traj_tests.cpp b/src/gromacs/gmxana/legacytests/gmx_traj_tests.cpp
index 87996bc8af..5bde38bf21 100644
--- a/src/gromacs/gmxana/legacytests/gmx_traj_tests.cpp
+++ b/src/gromacs/gmxana/legacytests/gmx_traj_tests.cpp
@@ -39,6 +39,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  */
 
+#include "gmxpre.h"
+
 #include "gromacs/gmxana/gmx_ana.h"
 #include "testutils/integrationtests.h"
 #include "testutils/cmdlinetest.h"
diff --git a/src/gromacs/gmxana/levenmar.c b/src/gromacs/gmxana/levenmar.c
index f8e6c55405..99e06dabe3 100644
--- a/src/gromacs/gmxana/levenmar.c
+++ b/src/gromacs/gmxana/levenmar.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/nrama.c b/src/gromacs/gmxana/nrama.c
index 2e6be79b5d..46373597c7 100644
--- a/src/gromacs/gmxana/nrama.c
+++ b/src/gromacs/gmxana/nrama.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxana/nsfactor.c b/src/gromacs/gmxana/nsfactor.c
index c8e70dd921..5525de64df 100644
--- a/src/gromacs/gmxana/nsfactor.c
+++ b/src/gromacs/gmxana/nsfactor.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "nsfactor.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxana/polynomials.c b/src/gromacs/gmxana/polynomials.c
index f5782fa766..e0be0a32f9 100644
--- a/src/gromacs/gmxana/polynomials.c
+++ b/src/gromacs/gmxana/polynomials.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxana/powerspect.c b/src/gromacs/gmxana/powerspect.c
index 928220ae10..91936a56b2 100644
--- a/src/gromacs/gmxana/powerspect.c
+++ b/src/gromacs/gmxana/powerspect.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxana/pp2shift.c b/src/gromacs/gmxana/pp2shift.c
index d0de6ac262..9ad592fb62 100644
--- a/src/gromacs/gmxana/pp2shift.c
+++ b/src/gromacs/gmxana/pp2shift.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxana/princ.c b/src/gromacs/gmxana/princ.c
index bf2d550e50..b202935ecb 100644
--- a/src/gromacs/gmxana/princ.c
+++ b/src/gromacs/gmxana/princ.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxana/sfactor.c b/src/gromacs/gmxana/sfactor.c
index e9b39a49fc..ff62732e7a 100644
--- a/src/gromacs/gmxana/sfactor.c
+++ b/src/gromacs/gmxana/sfactor.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxlib/bondfree.c b/src/gromacs/gmxlib/bondfree.c
index f48251ae99..55f30ef299 100644
--- a/src/gromacs/gmxlib/bondfree.c
+++ b/src/gromacs/gmxlib/bondfree.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/gmxlib/calcgrid.c b/src/gromacs/gmxlib/calcgrid.c
index 66e8312a84..9e1f1704d3 100644
--- a/src/gromacs/gmxlib/calcgrid.c
+++ b/src/gromacs/gmxlib/calcgrid.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/chargegroup.c b/src/gromacs/gmxlib/chargegroup.c
index 5197f80392..f291d1f3af 100644
--- a/src/gromacs/gmxlib/chargegroup.c
+++ b/src/gromacs/gmxlib/chargegroup.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/checkpoint.cpp b/src/gromacs/gmxlib/checkpoint.cpp
index c2034ae93b..9162172255 100644
--- a/src/gromacs/gmxlib/checkpoint.cpp
+++ b/src/gromacs/gmxlib/checkpoint.cpp
@@ -35,6 +35,8 @@
 
 /* The source code in this file should be thread-safe.
    Please keep it that way. */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/checkpoint.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxlib/conformation-utilities.c b/src/gromacs/gmxlib/conformation-utilities.c
index ef1ce04429..5b78f1b89b 100644
--- a/src/gromacs/gmxlib/conformation-utilities.c
+++ b/src/gromacs/gmxlib/conformation-utilities.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "conformation-utilities.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxlib/copyrite.cpp b/src/gromacs/gmxlib/copyrite.cpp
index 0ef4a73f10..c4e5e9ae1c 100644
--- a/src/gromacs/gmxlib/copyrite.cpp
+++ b/src/gromacs/gmxlib/copyrite.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/copyrite.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxlib/cuda_tools/copyrite_gpu.cu b/src/gromacs/gmxlib/cuda_tools/copyrite_gpu.cu
index 0258141ef1..364c1597c7 100644
--- a/src/gromacs/gmxlib/cuda_tools/copyrite_gpu.cu
+++ b/src/gromacs/gmxlib/cuda_tools/copyrite_gpu.cu
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxlib/cuda_tools/cudautils.cu b/src/gromacs/gmxlib/cuda_tools/cudautils.cu
index f6fb250065..f92a53f07d 100644
--- a/src/gromacs/gmxlib/cuda_tools/cudautils.cu
+++ b/src/gromacs/gmxlib/cuda_tools/cudautils.cu
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include <stdlib.h>
 
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu b/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu
index f00d212727..cc221cfe24 100644
--- a/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu
+++ b/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include <stdlib.h>
 
 #include "cudautils.cuh"
diff --git a/src/gromacs/gmxlib/disre.c b/src/gromacs/gmxlib/disre.c
index aa7fff414a..7bcc116fda 100644
--- a/src/gromacs/gmxlib/disre.c
+++ b/src/gromacs/gmxlib/disre.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/ewald_util.c b/src/gromacs/gmxlib/ewald_util.c
index d72b954c77..56215773bc 100644
--- a/src/gromacs/gmxlib/ewald_util.c
+++ b/src/gromacs/gmxlib/ewald_util.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxlib/gmx_cpuid.c b/src/gromacs/gmxlib/gmx_cpuid.c
index 9d8670ed4e..bdbda35b85 100644
--- a/src/gromacs/gmxlib/gmx_cpuid.c
+++ b/src/gromacs/gmxlib/gmx_cpuid.c
@@ -32,8 +32,10 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #ifdef HAVE_SCHED_H
diff --git a/src/gromacs/gmxlib/gmx_detect_hardware.cpp b/src/gromacs/gmxlib/gmx_detect_hardware.cpp
index 3de2f6b696..3158d79f0d 100644
--- a/src/gromacs/gmxlib/gmx_detect_hardware.cpp
+++ b/src/gromacs/gmxlib/gmx_detect_hardware.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string>
diff --git a/src/gromacs/gmxlib/gmx_omp_nthreads.c b/src/gromacs/gmxlib/gmx_omp_nthreads.c
index 3fbfc3b567..14f4de9356 100644
--- a/src/gromacs/gmxlib/gmx_omp_nthreads.c
+++ b/src/gromacs/gmxlib/gmx_omp_nthreads.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/gromacs/gmxlib/gmx_thread_affinity.c b/src/gromacs/gmxlib/gmx_thread_affinity.c
index bf0074fd6c..385856f71d 100644
--- a/src/gromacs/gmxlib/gmx_thread_affinity.c
+++ b/src/gromacs/gmxlib/gmx_thread_affinity.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 #if defined(HAVE_SCHED_H)
 #  ifndef _GNU_SOURCE
diff --git a/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu b/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
index f7246f893a..542e3a8fb9 100644
--- a/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
+++ b/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/src/gromacs/gmxlib/ifunc.c b/src/gromacs/gmxlib/ifunc.c
index edd983f760..d85fa96c50 100644
--- a/src/gromacs/gmxlib/ifunc.c
+++ b/src/gromacs/gmxlib/ifunc.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 
diff --git a/src/gromacs/gmxlib/inputrec.c b/src/gromacs/gmxlib/inputrec.c
index 34b55f7c50..43283e1025 100644
--- a/src/gromacs/gmxlib/inputrec.c
+++ b/src/gromacs/gmxlib/inputrec.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 
diff --git a/src/gromacs/gmxlib/main.cpp b/src/gromacs/gmxlib/main.cpp
index 26f78b4d66..799a41fa5a 100644
--- a/src/gromacs/gmxlib/main.cpp
+++ b/src/gromacs/gmxlib/main.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxlib/md_logging.c b/src/gromacs/gmxlib/md_logging.c
index b91f265f8b..5dc7866d4e 100644
--- a/src/gromacs/gmxlib/md_logging.c
+++ b/src/gromacs/gmxlib/md_logging.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxlib/mvdata.c b/src/gromacs/gmxlib/mvdata.c
index bd90af3cab..9db70030d2 100644
--- a/src/gromacs/gmxlib/mvdata.c
+++ b/src/gromacs/gmxlib/mvdata.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/gmxlib/names.c b/src/gromacs/gmxlib/names.c
index 043fd6b36d..a72b2a1d74 100644
--- a/src/gromacs/gmxlib/names.c
+++ b/src/gromacs/gmxlib/names.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxlib/network.c b/src/gromacs/gmxlib/network.c
index 28793d9511..f43d778943 100644
--- a/src/gromacs/gmxlib/network.c
+++ b/src/gromacs/gmxlib/network.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/network.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxlib/nonbonded/nb_free_energy.c b/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
index 89f88e4366..eb63d9a865 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_free_energy.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_generic.c b/src/gromacs/gmxlib/nonbonded/nb_generic.c
index b9a5287058..54a7d3af71 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_generic.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_generic.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_generic_adress.c b/src/gromacs/gmxlib/nonbonded/nb_generic_adress.c
index 4a8304414a..5c4d0013bb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_generic_adress.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_generic_adress.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c b/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c
index fd23c11a99..85c32b473e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel.c b/src/gromacs/gmxlib/nonbonded/nb_kernel.c
index 91d6b0c4d5..158dc5eef8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/make_nb_kernel_adress_c.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/make_nb_kernel_adress_c.py
index f76f24deff..5f5685b0d9 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/make_nb_kernel_adress_c.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/make_nb_kernel_adress_c.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012,2013, by the GROMACS development team, led by
+# Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
 # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
 # and including many others, as listed in the AUTHORS file in the
 # top-level source directory and at http://www.gromacs.org.
@@ -454,8 +454,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -538,6 +537,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel_adress_template_c.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel_adress_template_c.pre
index e2e9f9e5cb..742a62020c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel_adress_template_c.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel_adress_template_c.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py
index b24fe652fa..cbfc8269ab 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_double.c
index 9379543543..5fd8ddd077 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_double.c
index 953ddb2842..0cdebbb8e9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_double.c
index 70b5ba5a37..7740f00337 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_double.c
index d7036a06ea..91e7ac0a55 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_double.c
index 529ae577fd..d07b478932 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c
index 39e90e5a56..0c11fa03bf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c
index 2e9f60b516..ef30e51336 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c
index bdc0506bec..5fe7141b33 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c
index af5d4303dd..c45eb9be9e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c
index 033e330e1a..207023e749 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_double.c
index e1b56a4296..156baecf06 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_double.c
index 43e3ae55b4..879cdd0bff 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_double.c
index e69c4dc88e..811aaec5dc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_double.c
index a461ddfe83..2b55b3e4df 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_double.c
index 0d1b2fbebd..bd38195b21 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_double.c
index f85d4f6127..c9d420994c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_double.c
index d47e384238..7948f810c7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_double.c
index 62b0b288f5..c96aaceace 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_double.c
index 93467e5c86..2976066636 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_double.c
index bb6a18131c..1a4be5a8d0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c
index cc1b946220..3ab7c849c7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c
index dd6217656e..d2bbb2af4a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c
index c4cc7b2b51..d50b68e3d7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c
index 5ec7b81874..c2552783c0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c
index b364d8d40e..7ab8c806db 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_double.c
index 2eea473749..eeb43e2c6b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_double.c
index 0080246152..65b60aaf07 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_double.c
index cc9db5d90b..9e387fed85 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_double.c
index 48db088517..fb3ecd1b0c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_double.c
index 9a81247ae7..d2f3c89ab7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c
index 2eaf9be4ea..8e34091ca3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_double.c
index 813e9da7f1..6ace8811f7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_double.c
index 528802f769..ca05e99446 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_double.c
index 6b393ff81e..8b0ffee8c0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_double.c
index 598f2a754f..43b9365120 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c
index 49e6332409..6f654be9fe 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c
index 522dd645a8..5cc7686666 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c
index 51f90300de..cf359cad6d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c
index d191d3ca4c..8c22555796 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c
index e6e77b9c78..b10adb3289 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_double.c
index d9444cb3e9..ada3db8b9d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_double.c
index c18655af1b..ef9b9a5bff 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_double.c
index b640a855af..ff65f3311b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_double.c
index f3aa667f41..692f088472 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_double.c
index 45378b861d..e9cccd58af 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c
index 82de4ce620..5f95c6ec48 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c
index 4d1e3e8878..d31e4a1897 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c
index b68bedeae8..74fddbca1c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c
index 6e823ceefe..22ebd85848 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c
index d3af9afe4b..17f7c22570 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_double.c
index 9067b0e01b..027fa1ef84 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_double.c
index 823291cb08..ff8a0eb720 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_double.c
index 9951cbf784..b42f7fea6e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_double.c
index 2a99cf8667..73f4e2f282 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_double.c
index 99c6d4366d..ef154b5526 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c
index 0aacc259cf..d6b7b977d1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c
index efbbde6326..efc95ec1b7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c
index a5ecb768c8..48c4f2e6e9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c
index 83c24e0f61..d7b9113436 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c
index 58042b404e..f919193521 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_double.c
index 984fcf8a23..cf325f6b1a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_double.c
index d652a679f2..6c78b95ffc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_double.c
index 03496cc0c4..d892f243ff 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_double.c
index cbc912d646..7f179460d3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_double.c
index 59757336e6..691edfc1b2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c
index 90bf2b901e..f53389e1f8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c
index 3548f2ccdb..8eb827787d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c
index 569bf6c985..a52e4d6c6c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c
index 554a2c3186..de80c05756 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c
index 5914b3d780..dbe93b91a5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_double.c
index da0dfda25e..db5a394d2a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_double.c
index 4d6f47239c..a44ac02588 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_double.c
index 8aceb30b40..c39bb48d04 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_double.c
index e321c8c9e5..d5917e896e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_double.c
index 1c33904fae..00d50f02fc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c
index 08bc72105a..6e6dadb0f1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c
index 72d72cd0f7..0826a6ab8c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_double.c
index b25a69f5bd..e01aacad46 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_double.c
index 51d0029456..75de92f978 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c
index 769a8490d7..e311fa9ed7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_double.c
index 4462664244..ade4a231bc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_double.c
index e7d6ab50f4..639e5cdfe3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_double.c
index 384eed16bd..bf884759cc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_double.c
index 9b1dbb5b38..1fd19a1710 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_double.c
index 6945b42a5e..cabbba9d5a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_double.c
index 5145916a7f..9e1d8d4176 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_double.c
index dbb0bbee17..7c9099999c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_double.c
index 8aaba81033..92c650f233 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_double.c
index 3323c7e63c..1a500b9c64 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c
index a0337b54aa..ff15343cdd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c
index b4ce43e875..fa18eb779c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c
index fc8177d52a..aef5a1b2a5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c
index 0b0b465ff6..931b89e094 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c
index f0650754c8..1ae1841a91 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c
index 5f4daaf41b..87d4406806 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c
index 73d8ab4256..a2f3424e96 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c
index fca85cf597..7a38350382 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c
index 5e595572b6..8b0706d726 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c
index c7f06cf9c1..0fa140296f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_double.c
index 805631293d..363d0f9e6b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_double.c
index 3330cd806b..818c54f47c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_double.c
index ba44ae19c5..69088fb7a6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_double.c
index 0021321fdf..c93e3f2795 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_double.c
index cb28ba986d..c370951cb0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c
index 0282822460..891980c7b9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c
index 892b949e0b..40fe5bf857 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c
index 595cac60e3..87cab43283 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c
index b779479b17..654b1e6f6c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c
index e99781c8b1..461e8f06e4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c
index 2577596f41..8acd6b51eb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c
index d3461cc371..bc65e6baa1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c
index 4808da7f9e..5652e4c406 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c
index 9fd618b9c5..be1492610d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c
index fd12e2438b..5cf6f4689f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_double.c
index 3f155fc8e8..0122487f3f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_double.c
index 14bc2b17e5..23ba0fd188 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_double.c
index b9b353be74..322dbfa7c2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_double.c
index 1e55b771ef..b36857e622 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_double.c
index e9c870b7c7..09b3c28b3d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c
index 9ad88affd3..bfadf92430 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_double kernel generator.
  */
-#ifndef nb_kernel_avx_128_fma_double_h
-#define nb_kernel_avx_128_fma_double_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -525,5 +524,3 @@ nb_kernel_info_t
 
 int
     kernellist_avx_128_fma_double_size = sizeof(kernellist_avx_128_fma_double)/sizeof(kernellist_avx_128_fma_double[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_template_avx_128_fma_double.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_template_avx_128_fma_double.pre
index e1d60b95ab..7a0248a1af 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_template_avx_128_fma_double.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_template_avx_128_fma_double.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py
index 92b7b72a73..98f0806bc2 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_single.c
index 0871e8e92b..8b6216d9c8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_single.c
index 3f1a82314f..bbe1da7e9f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_single.c
index 9f07ef61f9..483b345c3d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_single.c
index c0f14db859..552d75bd72 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_single.c
index c25fed5c15..0b3c9f54ce 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c
index e043575976..f554627afd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c
index 85664199e9..d49dcd023c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c
index 702ffab3b1..2ad8d502ba 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c
index 1f7dac3096..7d6ee07a7e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c
index 76e918e956..ad91a2d6f8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_single.c
index ffce96fc86..481f5744ec 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_single.c
index 3410075d6a..b14f2892cd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_single.c
index 1ebefd9a89..b09aa6c131 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_single.c
index 6640fd1e63..0c03c13716 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_single.c
index e10dcc3407..ba2cab28e4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_single.c
index 883efe5530..7b9b030e7e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_single.c
index b3a787ad17..8d51bef3e4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_single.c
index e0a1c41c7d..a2a3299df7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_single.c
index 822a3a4e1e..0d686334c0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_single.c
index 409d90d550..d602db4b8f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c
index a96ca6b50e..830a0d1a0a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c
index 6da89ac7a2..84b89b139a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c
index 6d2613901e..3685a8cdd2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c
index 15a1915274..cadf0c6447 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c
index 3b6a62115d..2837bd1d7b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_single.c
index 1ba53ce476..3e23c240c4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_single.c
index dbb24278f2..f69e0f3c61 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_single.c
index 9253a097c9..392961db15 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_single.c
index 774726a9df..56855a918c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_single.c
index afa961d9d2..9a0e80a5d1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c
index 47450141f1..a65334f53c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_single.c
index 4d4e3303b6..064ed3ff0f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_single.c
index 5b3b769dbe..0a7d3bd242 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_single.c
index 4f1a1f20b0..0e2f39afd1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_single.c
index 2832483dab..7b71e0bc4b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c
index a6a9bfe1b1..667f08d138 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c
index 89a4500d19..1e6826c7ec 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c
index 80390ee591..e3a739ed4b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c
index 2173c33a5d..b8054650a9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c
index 26d93d8a3c..c3a6846251 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_single.c
index 9f66730bf8..0f15ddb4c4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_single.c
index 9db500f392..476b3dace6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_single.c
index 918e2b1108..6f70e14add 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_single.c
index 76d9ac0a5d..ba95dd882c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_single.c
index 60d8d27441..693710d13b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c
index 32c654ece8..986ee692c7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c
index f83be6bead..f00a125a41 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c
index 73e6292625..5473f77f46 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c
index 8caf015fd8..abe976535b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c
index 228999c2c6..5faa7f485b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_single.c
index b83c8901fb..68c116c115 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_single.c
index 8f94ac5709..c64162b099 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_single.c
index 15f951133a..e96a948e6d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_single.c
index 6cc10ada4f..b7ec8d125e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_single.c
index 89f07947a6..3b97803496 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c
index 941dabfbb8..772485c2d8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c
index fe377f3e03..e19e34e0e6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c
index 9752963709..52cfa64686 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c
index 1973afe0fd..976f20922c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c
index 28453eadd8..ed0c2b7059 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_single.c
index 8fc5afe2dd..55c72515d0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_single.c
index 3dd8b5a920..598e140086 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_single.c
index 411c069107..2dfbe40ab6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_single.c
index 1ec721195c..0f8d6d9de3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_single.c
index d81061d117..c7aa543493 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c
index 0a300dc820..6721e66463 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c
index f218981f20..2674a6c280 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c
index 640c749988..f58339e5cc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c
index 0ded1b4a54..f56814bd51 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c
index 6e1f635082..0e977af0ad 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_single.c
index 8cbde765cd..04ab828708 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_single.c
index 95647473d0..578e05fda7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_single.c
index 78b2119062..4a1ea82dd7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_single.c
index 0253bd3e6a..999472b411 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_single.c
index 6826614543..2655ef08f1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c
index e31f8534d3..32a9a93669 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c
index 212990bfed..0a45953547 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_single.c
index e202f673f6..21003ce9f1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_single.c
index 2a4265fef2..c37dcedad6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c
index dc384afae6..88ec2a3081 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_single.c
index 37a9fbb9f5..dbfc3b7cbc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_single.c
index 85ab7006b1..2048e04d54 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_single.c
index 36ebd852d0..13e9018f27 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_single.c
index de6c414d55..4c58b3c6c2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_single.c
index 8e6b26d261..af57b92ae7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_single.c
index cda65ac378..aab497f43b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_single.c
index 6427562366..2f414688e9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_single.c
index 422a0f0f1c..1ef818256c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_single.c
index 04f1db7d9f..69ca5ba372 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c
index ba4ca56fbe..31b1507e08 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c
index d5626cd069..dd4506306f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c
index b2abfc1680..b1b532ccca 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c
index 5f89125ce2..07be7b5ac8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c
index 705f55d020..8efdbbc47d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c
index e1437071fe..da988a250b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c
index 00da82908f..ec4380cc5e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c
index 25c7310c14..c51bc2cfc5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c
index 7f65164d6e..dc6f4951bb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c
index b4ece86e57..7b9f2246b6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_single.c
index 27a6102ad4..1168f76f2f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_single.c
index 27b1a1e9b5..4c7b4d8a25 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_single.c
index da6c53be8c..ca01f6b63b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_single.c
index 027956ed9b..04d289bb0a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_single.c
index 57dd7666f3..c4b51920b9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c
index 8b2bc51998..55f329dedc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c
index 7dddf230ce..a400981021 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c
index 8447608f51..25099d0919 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c
index 8f5368ce15..8c552648e9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c
index c9b3c73481..d1d3cdd3b8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c
index 8ba487600b..9786c4e350 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c
index cc2f3de4bc..2bccb2cfe7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c
index 5083515116..524df012b1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c
index 6a367371f6..0c22c15aa2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c
index 538bc54620..32c964fdf3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_single.c
index c3b4830dd3..8b1e6fce7e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_single.c
index 0294ba84a2..8286676768 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_single.c
index 4c15b6634f..b3ef05ac51 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_single.c
index 1974624ec7..396e3f9a4d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_single.c
index cf7ab9299c..e522fe370f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c
index 9f19625365..1a7c473b67 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS avx_128_fma_single kernel generator.
  */
-#ifndef nb_kernel_avx_128_fma_single_h
-#define nb_kernel_avx_128_fma_single_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -525,5 +524,3 @@ nb_kernel_info_t
 
 int
     kernellist_avx_128_fma_single_size = sizeof(kernellist_avx_128_fma_single)/sizeof(kernellist_avx_128_fma_single[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_template_avx_128_fma_single.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_template_avx_128_fma_single.pre
index dfaf4620ba..a7bcfe03f9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_template_avx_128_fma_single.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_template_avx_128_fma_single.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py
index c19ba73cc3..d529dcd019 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c
index 4dc581544f..1812327ebe 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c
index 4330172690..92050af614 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c
index fef0e6fceb..30d868cc4b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c
index 5d72b40ec7..fa88af6497 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c
index 0d4182062b..bbfec367e2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c
index a20f740a07..e41556c06a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c
index 25a3e173a4..9347451094 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c
index 06e6190425..ce6a5fd171 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c
index 870b3ffd76..480c8dcf91 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c
index 274177e575..639565bc49 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_double.c
index ec43ab4c5a..4437b10246 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_double.c
index 04bf11255b..458889777b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_double.c
index 697cfd6374..92cbdc89ca 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_double.c
index 8ff10897ff..245e0ac439 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_double.c
index d20f95336d..429bc22b04 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_double.c
index ca32459a96..3eded00b2f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_double.c
index 2a6ab66575..830ca0e03d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_double.c
index 615b93e73d..13706abf11 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_double.c
index 8fb95c9e3d..2a07685a43 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_double.c
index 786f1fd85b..17ec0100cc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c
index 53ba3432fc..6781c3d171 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c
index 17938f4117..7716eedcc4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c
index 7925ec1125..f7a2fc2edd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c
index b30168d80a..c369db5699 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c
index 953ab4f740..cdce1df694 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_double.c
index 09a03d9567..1801ea297c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_double.c
index 8916aa9c8d..c0887358f0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_double.c
index 829e3cb6e9..7aba8b430e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_double.c
index 5174d0af5c..0cc88adb49 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_double.c
index d87eac708f..bada00a182 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_double.c
index 7a074103ae..70aa6f87bb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_double.c
index f037f1e1ab..a32b1fa1bc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_double.c
index a774c4c107..1e3120b9bc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_double.c
index fb76faf1a9..ea28c3af3d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_double.c
index b11abb8fa4..6de7239747 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c
index 24150a5760..1fa2e9b0de 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c
index e801de779a..4e241cb085 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c
index 0561bd97c1..8e2762c5f4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c
index 2f90d1e663..f61fa2ec44 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c
index 303bf5430b..6b50b8dcee 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c
index 5e671afdd5..511c467b1c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c
index cc45e59045..a705c686d4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c
index 06d7804b70..48835ce17a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c
index 577c9de03a..61132e9b45 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c
index e582476452..ee0847edb9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c
index b3e3f03edf..8ab7581bd6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c
index 15ec8d9b2e..db0daef6ce 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c
index 0f9b46652a..b628463209 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c
index b080ffd7fd..594494635e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c
index 8708b5bd47..ae7192c471 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c
index 98fda560cf..a7a270d82c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c
index ecaea70235..b28d855ba5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c
index 46ff41c8f3..680196937d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c
index 84d93297ea..ef1524dc12 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c
index 7a2c9bd0a8..cf4d5a8a09 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c
index 131724b043..21ea776621 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c
index 110634a894..4673789472 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c
index e1d19980b8..eeb9e6e05e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c
index 0dc5098b28..93f60cd4b1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c
index b3280fb522..e157f789f0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_double.c
index 02209feebd..e24a762c1d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_double.c
index 0f78ff1aa3..ab6a0615f3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_double.c
index be41d5fb21..cf7c18fef4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_double.c
index 5818d1538b..c4307c0d51 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_double.c
index 9a6afb02dc..ddf2d7d1bf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c
index d17592d73d..c0366e4983 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c
index 04c79c2f9c..9d60874143 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c
index 1764908d00..e34f9e9f80 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c
index b44e4c6b4f..fd8b348974 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c
index 6e874529e6..40ab27febf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_double.c
index 1f4d60787a..81ba1104ec 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_double.c
index 700606de56..33613e64d6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_double.c
index 67660ca189..325bb89506 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_double.c
index 87b44fe080..1a12aabd39 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_double.c
index 16ac3fbc8d..55036a6457 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c
index 7eccd3b84a..c7d3b2e228 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c
index c24ba3b8a9..0cec5a037e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c
index 0c99f0e6b0..b1b32ab6d8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_double.c
index 7cbba9203d..3746403332 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_double.c
index 96953f2db9..aab22ad117 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_double.c
index 91d8b6c6fa..d709d7e429 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c
index a5e6036808..dfce8c8ce3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c
index 4119766c36..c5774657da 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_double.c
index 29002904ac..a07db1ba1f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c
index d2d2616ed5..c9ec83021c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c
index 80225b3acd..f9b7a3f765 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c
index 741d3e161d..aa50ee59bd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c
index 169fe4b392..ade570405c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c
index fd82684ca2..a584d2496e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c
index d3a1d506d7..1fe2cca13b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c
index 4028363290..8626adce70 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c
index 8800235278..0159210009 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c
index 919a45bc41..4e9615fb61 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c
index f181196ba7..a150ec3f66 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c
index 6b76aac80e..62b0d7aaca 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c
index 78d4e0114a..32fb755723 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c
index 6a08758868..9363d65a42 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c
index dabf1e3fe4..c12bfb6a23 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c
index f7db279d6c..28fc769f47 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_double.c
index 69b7549af9..a67bcb2a32 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_double.c
index 112354c11c..e2352e94d1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_double.c
index f452c8761e..36218579e6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_double.c
index 02bf74b72b..ffd29cbf03 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_double.c
index 9f9ee1e39c..09358f1d85 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c
index 8fa189c33a..00a36f40f1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c
index a5f8ba6a6c..10da1f16d1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c
index 819d0c5b5b..7c9313ab81 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c
index bf82389c6b..fddf82b951 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c
index 4215199056..fa0cbb4f22 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c
index d7a8fd24dd..d5b743785f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c
index 6b0c841708..37c00564c8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c
index 9696452ed2..7e3a85ba7c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c
index 3dcae62df6..c2a681c5dc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c
index 324c00846d..47a90cc7cc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_double.c
index f402fd954e..3634f92e18 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_double.c
index 1d69b3e189..a59799cb55 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_double.c
index 389323c510..ddcd71589a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_double.c
index 9bd8b2e70b..3aac60db19 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_double.c
index 2898cd3088..8c399d3d5b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c
index 94d6e3d1c9..dfa412bf84 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_double kernel generator.
  */
-#ifndef nb_kernel_avx_256_double_h
-#define nb_kernel_avx_256_double_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -525,5 +524,3 @@ nb_kernel_info_t
 
 int
     kernellist_avx_256_double_size = sizeof(kernellist_avx_256_double)/sizeof(kernellist_avx_256_double[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre
index 7001ba8b20..a620795367 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py
index 5ac78ff6b8..7a190dde8b 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c
index 8294b27aba..3697ba2593 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c
index 26719cb8a3..267200d42b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c
index add9c83758..6e8af0bbb3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c
index 484e135475..d4a3fcbfb8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c
index 961b246002..aa2d063de1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c
index 2548797f5c..ff98ee27fb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c
index e7aabf73a6..f0ff0f115d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c
index 573fd72c44..2cac31f4e4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c
index 4f7c265ccd..35ad386cec 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c
index ec24915560..36f1b9c55c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_single.c
index ebea42c57f..74034d60b9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_single.c
index 6ed5cc8436..cae9b3e9b7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_single.c
index 0521e21079..4bddba1277 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_single.c
index 8a2fc6c7a4..766833835b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_single.c
index 18964f4006..1ca0510033 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_single.c
index f6da146986..17ead9e889 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_single.c
index 4d27a15a3f..119899324d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_single.c
index a835dfddff..9454d34ed2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_single.c
index c5082f4cb0..eb0a65bb38 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_single.c
index f419f9c96c..d2ebaa8b6f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c
index a64a4f9070..e78a8983aa 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c
index de1ce52e3e..c6591cb416 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c
index 4ae9efdf1b..fa395d7a33 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c
index 58f54e53cb..f6ba31b1b5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c
index 6686aff9ff..1f585ffd24 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_single.c
index cb094b0e45..e9fd9ad538 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_single.c
index 8b5d88db3d..66fa12dad8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_single.c
index d603384396..8c564f36b9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_single.c
index fd2c7b1cc0..1b971d25e9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_single.c
index eeae444cf0..ec67f7ccbf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_single.c
index 9018dcfdb0..e9981e567b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_single.c
index 3ab76a4e96..6a699a5da8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_single.c
index 0218ba1b7a..1d608b53ed 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_single.c
index f4b23595c2..f7732fff19 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_single.c
index 282f1d4645..4cbc7aafdd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c
index 059d2f2bc8..c15eb022a6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c
index 826c2d7247..e1cc7bdc19 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c
index c5b969ee8b..c05d3a87b4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c
index e4a89bf1c8..e7b5ba6e10 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c
index d0bc7df101..0d7de90d42 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c
index f2441b0588..6856042f83 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c
index 3dd0103a57..f8c7dfb9be 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c
index f49241a644..aa0dcc2718 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c
index bc7961c54c..0bcd625f37 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c
index eeee653a22..645972b0c3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c
index 9f9b13296a..5fda5f1e3c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c
index 86432092c9..6f61398cbf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c
index 0e7ff5defd..721cb3427f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c
index 6ec23aefee..e14334055d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c
index 0c4128b09f..337d13d11a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c
index 3842b02bdb..ff65c00109 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c
index 3ae1447ffa..6b95093c22 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c
index 87b9c4e70e..93ed08a618 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c
index 4a7c7ff96e..398af45985 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c
index ce0427bb96..02d49c27a6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c
index e4793dce24..b59af266b4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c
index b1dffd9d00..18d171ee8e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c
index f97b694047..2e531ba637 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c
index f97e62bae3..da31f53a6b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c
index fb92b344f1..cdfbb0351f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_single.c
index c84d0d7206..68a3f3118b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_single.c
index c023348869..382eccbea7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_single.c
index ff05fcca1d..22b4d3e25c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_single.c
index e99ef10214..8fe5bbbe7c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_single.c
index 1352c1f1f6..ec92f02937 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c
index 231c7f8bed..9b26daa6cf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c
index a39f524944..0ccf2aac38 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c
index 35706c5e9b..7e40da1408 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c
index a7dd01ea83..e896b0e0bb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c
index 8a195a0ae0..6a31955d6d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_single.c
index deb54f3ecd..eef02235fb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_single.c
index 015960e090..bca128b5c3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_single.c
index 604d59932e..9fddcddcbe 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_single.c
index e2d0fac6c0..11d94712bf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_single.c
index 23fd0aa388..b8f165f095 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c
index 60ec58b517..eb5adf87ba 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c
index c68e062c8e..7b86ad971c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_single.c
index ced0a2914e..bd6af602f6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_single.c
index cc578326cb..6acac1d656 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_single.c
index 62d3426e36..14b58412e0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_single.c
index 076f297716..850b87efd7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c
index ba3cfd5f81..56c998ce75 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c
index f94ec257c5..2703377a90 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_single.c
index 9632a4c83b..b23ec8e84a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c
index 4230ca1fd7..ea89d0d649 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c
index 264da2d8a8..c72a83e7ce 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c
index fb94e1dcb6..b41f83a032 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c
index 11b7383991..4c16ded714 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c
index f08085ec3a..857448c94f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c
index a07b7a2bb1..b0a67b7115 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c
index 3a51c5dc30..acb345097b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c
index 6233b85878..0f96a3f180 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c
index de152e3719..f49aae4c68 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c
index de209ba853..b6ee4e0870 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c
index dfab87ad60..b4155eeb9f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c
index 10f8ef9bc1..205bf8e151 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c
index d0ffbce1c6..8288d2ce66 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c
index 8f4846e4a6..18f71907d0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c
index f1267a147f..693a9ab699 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_single.c
index c623006730..4a67327ca1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_single.c
index c0b99d7596..7b3b3db98f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_single.c
index 300a13f895..b7a5ffa162 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_single.c
index 11fe0bd5b8..31e890b59c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_single.c
index 7b20011eeb..9a04c7ba4e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c
index dcdf93d4ec..15f169e9d2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c
index f4643b1939..0ec8412bbc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c
index 6ac9fcd71d..8cc22f7184 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c
index c34a13fb4c..5ed047b939 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c
index 307bfaf053..3345287da2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c
index 3b4dac4662..48616c125b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c
index 784ed4666f..5338f49007 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c
index 81f79e5277..c72295c867 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c
index 852bff3c20..efab21cd87 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c
index 603c9e36f9..918553f954 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_single.c
index 2852a94b12..fdecafa0c0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_single.c
index 014a28b013..42ede680ce 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_single.c
index c55319e65c..0e3b8dcd75 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_single.c
index b45404c5fe..b6c646e6c9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_single.c
index 358d840d6b..fd089922cc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c
index e94a4d3e33..77093dad3f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS avx_256_single kernel generator.
  */
-#ifndef nb_kernel_avx_256_single_h
-#define nb_kernel_avx_256_single_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -525,5 +524,3 @@ nb_kernel_info_t
 
 int
     kernellist_avx_256_single_size = sizeof(kernellist_avx_256_single)/sizeof(kernellist_avx_256_single[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_template_avx_256_single.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_template_avx_256_single.pre
index 6512c144a9..e81e342bfd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_template_avx_256_single.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_template_avx_256_single.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py
index 26104e654f..a2cef9459b 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomP1P1_c.c
index d3bdbb1770..95476dd3f9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3P1_c.c
index d6479bbacd..893ae9dca2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c
index f21fd38eae..b3c253a879 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4P1_c.c
index bad468ecfe..69c04dac51 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4W4_c.c
index b993d3ba4d..0157aa88d5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_c.c
index c46ab87524..bf97ec9fb6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_c.c
index bc33c3b86a..89ef3a6c6d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c
index 4938703cfc..c312d87647 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_c.c
index 788ec59f31..a61d74e6aa 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_c.c
index 8ec16139cc..94f31352fc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_c.c
index 5ca8794b1b..26141cee63 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_c.c
index 7316c7c72c..5d79745a7f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_c.c
index a1e3502170..9379eeb7e9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_c.c
index 911edaad2e..d010e3241e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_c.c
index dac9e62473..fae967bf0b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_c.c
index 277ef6c770..32caed0798 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_c.c
index 142963cba2..f5854a9532 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_c.c
index 081ff4f364..3175f25012 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_c.c
index 3d6fec6c1e..7f8b8d3610 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_c.c
index d04e2ecbe1..e99ddffe27 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomP1P1_c.c
index 8e48652f9e..b91ee73148 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3P1_c.c
index a3b149e52e..d56c1000e6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3W3_c.c
index 5c10a4c615..59204ff3b5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4P1_c.c
index 197b57a70f..5716c6e70d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4W4_c.c
index ce30969d0c..22bb33baeb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_c.c
index c442b33e44..63dc686b56 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_c.c
index 0e48077fcc..f485121eb3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_c.c
index f0f2d149fe..e140fd389d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_c.c
index 4bf63b6e14..76955fc554 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_c.c
index 99d7c1b25b..33545b56c8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_c.c
index 0e55733f05..41a0d7761c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_c.c
index e064c3a9e2..0f026188bb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_c.c
index 6e9ecc22dd..3f433bd35a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_c.c
index bb886f6b0d..95e1eb0631 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_c.c
index 2f504f05fc..2df3aa1982 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomP1P1_c.c
index b39c532879..a65ffa8a18 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3P1_c.c
index 96cd89f39e..3cd3cc0ddf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3W3_c.c
index 57d57d8414..e263a08c26 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4P1_c.c
index 36fcc20d2a..319215d549 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4W4_c.c
index 1ce40b8668..5914dde65d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_c.c
index ed1ef2904c..c7f4a41b65 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_c.c
index 427513f967..7d97974b59 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_c.c
index 3ae721a3e8..6026812bd5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_c.c
index c0b6e00651..136f785b01 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_c.c
index e76ccb17e0..fc257b402f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_c.c
index 7cf851525d..2e5c2a7fe0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_c.c
index 40dede5912..1841006652 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_c.c
index d6cb4cea44..8a60c3415c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_c.c
index 140c1edb0f..943f062bac 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_c.c
index 02815c4b7f..eb4b45a327 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_c.c
index bd39e7af13..72806de29e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_c.c
index aac40790ba..062bd64f5b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_c.c
index 7e06ab8554..2bc1042272 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_c.c
index bf716bcc06..36f2f7c6a7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_c.c
index 502a2aa6cb..37c6abe43f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_c.c
index c6d605ecbd..33df24126a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_c.c
index 6861a538f8..2163846c91 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_c.c
index 60fa2e4f12..4316eaa2eb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_c.c
index 08ddae63d7..72fc8e46e2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_c.c
index bf01b7478f..5a67ba2cfd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_c.c
index d89fc12ff3..2ca78589dd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_c.c
index 9656078064..91e8960a6d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_c.c
index 6aafb317b1..9c16597123 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_c.c
index 6df5731349..5ac405e7f2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_c.c
index e3eca9ca4f..e77bed7e36 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_c.c
index 95cfb023a6..24a50eedf6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_c.c
index 2cce1a4a26..48acef108d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_c.c
index 7c7ecd66e1..47437e00d3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_c.c
index a735741797..13b1cec003 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_c.c
index 2ab794568f..04b130ddc4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_c.c
index 12989c4934..ae6f467a8e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_c.c
index a6a14dabff..4988f9f55d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_c.c
index 6974536714..f90f14899b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_c.c
index 5523dd0eba..c60f6085f1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_c.c
index 5e082f6a8e..2c82631c00 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomP1P1_c.c
index 17beef9075..13fa6a2f6d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3P1_c.c
index 95f47d4824..f2b37d8863 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3W3_c.c
index 926dc9a5b2..ec2293034e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4P1_c.c
index fe4d70927b..835b834519 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4W4_c.c
index 2071966147..903c632436 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_c.c
index 1fdf797dab..e74a9e97cb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_c.c
index 0f571e61b7..bce64af9be 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_c.c
index fb89d9c173..9335b57bc8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_c.c
index e20e8a5ec7..ce303f1a52 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_c.c
index c4d193a46b..7aee8dc36c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_c.c
index 04e94bd903..3487ee46f5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_c.c
index a28cfdde5f..53c497ac7d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_c.c
index 3f9d54890f..b3ce840f30 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_c.c
index 90d4843ffd..86c2fb138e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_c.c
index 0d660dc261..b1b710aef4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomP1P1_c.c
index 2ea105900d..c9fc24aa12 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3P1_c.c
index 4f0ebad171..6b3dcc0597 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3W3_c.c
index c3c24b8e3d..e246c5cc78 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4P1_c.c
index de8af580d1..0350aa8b49 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4W4_c.c
index e0695e7f5f..d45a0e0cd2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomP1P1_c.c
index 295396a966..3a35105f41 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3P1_c.c
index d2ea63dc55..41d1664dfe 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3W3_c.c
index 0c28e9d303..70b1e1983f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4P1_c.c
index 020bec779a..27478026ba 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4W4_c.c
index 1e6fbb848b..b6c9169404 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwBham_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwBham_GeomP1P1_c.c
index 0b4b5108db..c7a3218abf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwBham_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwBham_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_c.c
index 77f9439578..92057a12de 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c
index 13bc3fd79e..666feda856 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwNone_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwNone_GeomP1P1_c.c
index 7cb397d1bb..ff5d750495 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwNone_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwNone_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSh_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSh_GeomP1P1_c.c
index ed032ca3d4..ac83597a4f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSh_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSh_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSw_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSw_GeomP1P1_c.c
index 0f34d59431..e1ddc0fbc8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSw_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSw_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBham_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBham_GeomP1P1_c.c
index c46204dd14..13e5862b15 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBham_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBham_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_c.c
index f52556aa24..a9ab4fd819 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_c.c
index 5619a2438f..6bb5e1d39b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_c.c
index 9e60dfbaf2..b7ae5dca87 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_c.c
index d644052171..ca9cf97186 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_c.c
index 4b3d3ed1fb..3b35ed8536 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJ_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJ_GeomP1P1_c.c
index aef3f4a408..47680500e0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJ_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJ_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_c.c
index 4d13337acc..a6335f733c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_c.c
index db775e61e2..9d210e6bf3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_c.c
index 4d7bad68c1..fca64e2964 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_c.c
index 83c39cff95..3eefd31617 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_c.c
index 1b1187f2f2..f09c2a33ad 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_c.c
index ece5a36692..420a8da856 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_c.c
index eed0f6f95a..8d99adce80 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_c.c
index fcc780bca1..b2ee15a031 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_c.c
index 90cbf2a61b..3407b41fd9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_c.c
index 65af0fe6ba..6d27764c3f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_c.c
index 7249e76b77..524079959d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_c.c
index a5eb4d39af..ccec3d5ba0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_c.c
index ad5042e76e..61c2dba318 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_c.c
index 66287a2007..24397afa4d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_c.c
index 5a1bb06984..5bab0d21ff 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_c.c
index 1f5dabe5cf..b76347d1ee 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_c.c
index 6e6b9647bc..68a35521d7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_c.c
index dbe42abac6..fa9ed7f408 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_c.c
index a56a0f66a8..b3f092011f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_c.c
index 07ea25a2ee..065c56aee0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_c.c
index 3b401fcd4d..e16de79d58 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_c.c
index 3e1f581712..75357a083e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_c.c
index d5ab10c3dc..265fd21a7f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_c.c
index d62b967998..d7d4eb7703 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_c.c
index 25e00703bf..541e158164 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_c.c
index f940a0cd16..324252d81c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_c.c
index 729fccf9a8..4ab05b53d1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_c.c
index 40d96391bb..24fc750c8a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_c.c
index c109041b2b..fce42f82f7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_c.c
index 263a135845..6105c0ca40 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomP1P1_c.c
index e917bdfc7a..e78dc90895 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3P1_c.c
index 25e789d07d..24e09b6d3d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3W3_c.c
index 50fce5fbee..58810ed7b0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4P1_c.c
index 772d959f42..4327622c09 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4W4_c.c
index afe518e2d9..95530e1e9f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_c.c
index d0935afdcc..f95eb64213 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_c.c
index 2966eb210d..e7faeb574e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_c.c
index a20f8fa7df..1cc983deed 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_c.c
index e49fbaec17..8ce7546c19 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_c.c
index 1f0d312da3..59095117d5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomP1P1_c.c
index 7837b8a90f..b35c88b792 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3P1_c.c
index 1b71a1dfbc..603164110a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3W3_c.c
index 1fc7a222f0..1177a1ecab 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4P1_c.c
index 9266819a07..3cc87f2739 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4W4_c.c
index 9e9ace75e9..c2c96ce756 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomP1P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomP1P1_c.c
index 91c442b74d..57179ed20b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomP1P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomP1P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3P1_c.c
index ff8d2ebd98..556646b40b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3W3_c.c
index 85506dfb16..af70ba1a0b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3W3_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4P1_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4P1_c.c
index 4628ae455d..5a84f8c2b7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4P1_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4P1_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4W4_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4W4_c.c
index 5fa71a1494..52d8e6a885 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4W4_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4W4_c.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsall.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsall.c
index 4d6a9e7220..0c0dcb7205 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsall.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsall.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsallgb.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsallgb.c
index 2baadf2782..3557e825e6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsallgb.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsallgb.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c
index dab6b617a0..361dd233a0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS c kernel generator.
  */
-#ifndef nb_kernel_c_h
-#define nb_kernel_c_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -701,5 +700,3 @@ nb_kernel_info_t
 
 int
     kernellist_c_size = sizeof(kernellist_c)/sizeof(kernellist_c[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_template_c.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_template_c.pre
index 269b2d5075..47836de969 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_template_c.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_template_c.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/make_nb_kernel_sparc64_hpc_ace_double.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/make_nb_kernel_sparc64_hpc_ace_double.py
index 6a567035f6..d1b1ba034d 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/make_nb_kernel_sparc64_hpc_ace_double.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/make_nb_kernel_sparc64_hpc_ace_double.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
index 51ad028627..2e87bd52bd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
index 857a7290f2..fbd62bab82 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
index 5b1efb7197..e75545b19f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
index c92a759455..5135e7bad0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
index b1ddcbb4cb..e636578026 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
index 6b05e4052e..e5c35edec6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
index dcc2805adc..8c6b0ab5b8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
index e1e6204dbe..d418a8a074 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
index 653fd803ac..9ae48ae105 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
index 2c0a1af6d3..828d306d14 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
index 62abc0e9a1..fc9b969382 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
index c738f827d0..eb44c5d549 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
index 9dc992c2c6..77c10b735e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
index a4d18a51d8..924cc2b757 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
index c557e8ebe1..94bec0b486 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
index 17b90c94c6..86f6597555 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
index df9c4e414b..473ac3463e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
index 571ae9e5a5..7b70741ef9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
index 4224c6db0e..32c465bdee 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
index cf18bcc367..0aabab14a3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
index 4edc80f6c8..c323d53405 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
index b959420b78..af0cf054c2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
index 40afe10fc2..6db09d2164 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
index 7c1b231846..95667b3a43 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
index cab36da6ad..5b465030cb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
index 1ae520625f..464605bf08 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
index cab151d0b6..bcf4eea35b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
index 5017c1a5e5..9ad2ee3b4f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
index af0cc1d998..681da4c523 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
index b09083c52c..2db36131cd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c
index c47981c188..881a610e68 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sparc64_hpc_ace_double.c
index b6590e1790..c2b63eb9fa 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sparc64_hpc_ace_double.c
index eca058381a..c270f75362 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sparc64_hpc_ace_double.c
index d821dd8763..90c02266aa 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sparc64_hpc_ace_double.c
index 1368008961..7f3df8cfb4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
index a370e184ca..444fd809fb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c
index dede47c17b..97519cd9ba 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c
index 6b86dcadb1..8329ecb662 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c
index e6712d410f..2e14a949d6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c
index 03b4b2bb33..17a4bba9bf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
index ad3abd6115..80422bec6b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
index 3696288c73..0b74781b15 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
index 3149f024de..2b55794f84 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
index cf2825181f..42585716a1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
index e15e3fcd7e..ecc042a93e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
index ea2b21699b..e794bdbecf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c
index 76ac7fa977..51771ffc56 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c
index a9b5c90ea1..59afe496e6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c
index a14afe9db6..1ce2359ed6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c
index 0615061c81..c88ce13e18 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
index 45b6c0e02c..c97585adc0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
index 1a9504397b..0140bbcf50 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
index aefa98e235..f2ecede525 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
index 940d7fbaa7..34fe2a3714 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
index ac113e069d..24fc1a0ff9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
index 6104ba7a57..976003f3e7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
index 4f36953596..1b40bdd173 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
index 61b16d9f01..39c769a470 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
index 5514860419..37ce31c72a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
index 5c0de54743..61cb2912d8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c
index 3dfc0b2246..ebd45fa7e7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sparc64_hpc_ace_double.c
index 106d570f4c..8208eccb87 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sparc64_hpc_ace_double.c
index cec1974ba3..c51a737d84 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sparc64_hpc_ace_double.c
index db1c793de4..7eae21170b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sparc64_hpc_ace_double.c
index 428e9934ec..c4e4135fa9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
index 86241e2c37..e03a0ef48d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
index d388199f22..754f61ed6a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
index d845ec4558..2bc7583c01 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
index b26851ace0..b596997fa0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
index 28c84fe392..4244fdee39 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
index 4c5ce33ca5..21bf192cd7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
index 30cfb0b674..30fb395ac2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
index 681f4c70df..fbe123ec50 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
index 843e063ebd..155a200228 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
index 9794b3a2d1..62c99cf8d1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
index 2aac2728d6..0b371e50b7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
index 43cde66357..e4740b92f1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
index 65fb87c595..84b37d2bd9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
index ebed8c63dd..002a7f36d6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c
index d6d05335a1..74146bbff0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c
index cd9bae45f9..1328f231c3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
index 91bec6f61b..c23fe6ee27 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
index 9ab941b9bf..64bf5ad01c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
index ea87ae2a47..61c4e88351 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
index 0417895b92..979df716bc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
index 40955cf471..3e63f54045 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
index 42e2b4b00e..38314a5e37 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
index 0579caa078..c99ca20f97 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
index 26239edac4..552dedd8a7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
index 11ccbda7e5..1d1a34200d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c
index ccc55ea98f..7743a69904 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c
index fc6f2f0214..b8d25867b2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c
index 664565b3a3..0f9b342119 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c
index eaa381f463..e4e8ba52b2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
index a4d8917644..334a041e6d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c
index f53fb4c20e..cc18c0aa47 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c
index 3e2fa6127f..565215b1b4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c
index efba2fade1..cf9c1edbb3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c
index e0faa0da4b..3b2c311863 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
index 380c669618..0aac09cdbf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
index 0f6033a929..022cb3335e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
index 21c8bbfdd4..e4baf4cf91 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
index 0de224a0fc..fcfe02cc63 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
index 033c95a4ed..59d91c053d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
index f71300d4c0..4bedaed7d9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
index 415754b1c8..fdcc647dfa 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
index 6de1743939..39fa7d1982 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
index 07c4155c42..c7fa4c6f07 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
index 1008fc48ab..5eb7b89618 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
index a227ef8b5d..7d497dab08 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
index 56c0f4f12d..c3524155aa 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
index 3609ddde8d..87a4a22d04 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
index d95751cba8..e9e38c2b4c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
index 31c643c13d..e6b7ee77c8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
index 438ff02060..b896d64294 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
index 32c1f6afc8..0479c74ff0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
index 5f0b6c12d4..cbae5f02b5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
index d83b31aaf3..1ac2bd8322 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
index 85e0e1bd06..b89b6eafcf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_sparc64_hpc_ace_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_sparc64_hpc_ace_double.c
index 5055ed655c..c63a233ef7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_sparc64_hpc_ace_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_sparc64_hpc_ace_double.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS sparc64_hpc_ace_double kernel generator.
  */
-#ifndef nb_kernel_sparc64_hpc_ace_double_h
-#define nb_kernel_sparc64_hpc_ace_double_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -525,5 +524,3 @@ nb_kernel_info_t
 
 int
     kernellist_sparc64_hpc_ace_double_size = sizeof(kernellist_sparc64_hpc_ace_double)/sizeof(kernellist_sparc64_hpc_ace_double[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_template_sparc64_hpc_ace_double.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_template_sparc64_hpc_ace_double.pre
index 155a462646..07fed742c8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_template_sparc64_hpc_ace_double.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_template_sparc64_hpc_ace_double.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py
index 19caa7f288..661ade730b 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c
index ef8bb0fb82..63a2604c58 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c
index 0d88c15dc5..f7f093aba5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c
index 478ee393d3..de4611e6fb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c
index 444e574316..fa4d616f68 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c
index 9b9f5e1587..3997922505 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c
index c9703ff7fe..d3a9f7a104 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c
index a9d5a42707..7f9dca6ac2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c
index 321259ab74..b25c39117c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c
index af876a35e2..4f1be0faa7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c
index ad677143e5..62b0772c5f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c
index 5748ea5b7b..6b791863fe 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c
index 364c7c41f4..79fdfab184 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c
index bc23de0a37..b9cdf0beb6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c
index 04ea07758a..36fbbbb831 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c
index 39e902386c..6911f50868 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c
index 780945106f..4eba9275a8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c
index dc88f58626..0723259f6d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c
index b1893b21e0..d632a13bf9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c
index 3a369c2f4a..80c450dbb4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c
index 67a6393f42..6e1da3c192 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c
index 560a29882e..d9cdefa143 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c
index 852f2cd818..991f25a230 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c
index c995deda53..5fc9db2ba5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c
index 332e47b8dc..e6918101bf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c
index 46334a3787..9e2423c18f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_double.c
index f3c5da1cc6..ba462de670 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_double.c
index f01c12df33..5ee6294710 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_double.c
index 11e40660d7..430faf18c1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_double.c
index 0ca6c2c217..95b3a82ceb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_double.c
index 161027f971..5f0f02190f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_double.c
index f7d554b147..183d693824 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_double.c
index 9dc670e7a4..c3c86fc614 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_double.c
index 77d3aefe6c..edb0cd7690 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_double.c
index f5de2e356e..9c13e466e9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_double.c
index 588e6f9d55..ecacdd118d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c
index 10a510c680..42e6eeca2f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c
index 6d19a706af..4b1eaaa273 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c
index 0655365068..7b450945eb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c
index 21191cc661..6646e46451 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c
index 9a2d3df0e1..66f86fbfeb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c
index 9a24e8da02..a3666e28fb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c
index 6e50bfbeb5..e9b0d4eac0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c
index 2b217206c8..a28206aa3d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c
index 3d5719dd93..3dd418e0ad 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c
index 7c87c2f2bd..585487eb10 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c
index 9dff2bca5a..0d789f78be 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c
index 486030379d..32c76d549f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c
index d83ca1cf3a..5a81b6b110 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c
index 1303ca3ddb..a3b867c6cf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c
index 9173e13f1d..3e5a7c6477 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c
index 855444bf29..c8515d13b8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c
index fadca6fd0f..aa02641a70 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c
index b4ddb3b4b1..340a6e869d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c
index 0702bb1e45..26f7c30af6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c
index 986b2f93f7..0523eaa159 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c
index 73b58c4896..8c970cf420 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c
index 51c062a12e..f3ccb22e27 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c
index 9ebc0a1a98..8bb40100d3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c
index 6ef60cf4ab..b16cf86ce7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c
index b5afe52610..2ebd6b3d28 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_double.c
index cb1a9dd954..e70cd1d455 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_double.c
index 950612c18d..b25868bbbf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_double.c
index 145947fd4e..b2d37db580 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_double.c
index b49125afdc..13f189a801 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_double.c
index 091c623b19..388a53c2af 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c
index 909c733ef3..36f85f1a80 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c
index 8ce28abbb6..5471507e14 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c
index 2793888dab..22f757253f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c
index 8b88531e40..168564c0e1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c
index 5487ebd9f8..94be8c4c94 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_double.c
index d22244a42c..58e425b7f4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_double.c
index 3617adef1f..34f3ed2c15 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_double.c
index 088b3534cb..001ba67966 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_double.c
index e5dd2693f1..03779c266c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_double.c
index 9d3175f3ef..bdecac3550 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c
index 650ccb8975..c58ef6c5d1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c
index e3e18d7d16..83589e20f9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_double.c
index e8cf706f0d..22fa08bb28 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_double.c
index f5a88979a0..761b35d876 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_double.c
index e01c57027a..237ad5e4f0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_double.c
index bc0c988be9..852a3f3012 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c
index d45c11d314..6d000c9d0c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c
index 51a2fd07ed..654c8085bc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_double.c
index b6a9c41c49..1dde2c73ba 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c
index f8c224cb62..4698a0b755 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c
index 2f47061416..e05d98f14a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c
index 6069302692..988052fece 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c
index 4843675266..817d907830 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c
index 07918b7cb0..d34af153fe 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c
index 41616a11b5..bfc332ef97 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c
index 92f873e244..d6fa3d72e5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c
index 5a82ca1614..a0e2e952d0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c
index 297f165f29..4a76c9a12f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c
index beb805ca41..6613880653 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c
index 651ef57251..836540639d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c
index d6af35e71b..52a7477859 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c
index 18be36a131..1fac8647f8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c
index 15b9065761..7e54372475 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c
index d379762b1c..b339c3774e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c
index 8a34077a18..a50084b4bd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c
index fd1d9e47c4..0fffbed363 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c
index 96db9a992b..c64afcaab0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c
index ca1398ce10..1152b6be2e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c
index f9220d6362..a7b2d8ac71 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c
index 3de6e18775..e2acda3db4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c
index 69f3713f5e..5f1385ac29 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c
index 7c0bd32681..5d878fdc4f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c
index 13d2dc5dcb..2cbd1dd78e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c
index d2b81903c7..4d905a284b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c
index 5d1df7c0ad..7fc34aaebd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c
index f4dceefd5c..ba1030630c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c
index 0efecaa288..7c405a7d5c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c
index 42d9e6cb71..36d145d8d4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c
index a4396c4cae..0be6f86c8c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_double.c
index 3cbd14010d..190d78d854 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_double.c
index 4c8d241832..3ddfa25b2e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_double.c
index 15dcef9a7f..43709697e6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_double.c
index 369ed6bd4f..3b88c1b4d4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_double.c
index d4cde51da0..7d81423714 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c
index b997aea7ed..02ce4ef417 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS sse2_double kernel generator.
  */
-#ifndef nb_kernel_sse2_double_h
-#define nb_kernel_sse2_double_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -525,5 +524,3 @@ nb_kernel_info_t
 
 int
     kernellist_sse2_double_size = sizeof(kernellist_sse2_double)/sizeof(kernellist_sse2_double[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_template_sse2_double.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_template_sse2_double.pre
index eb7735a30a..da75ea30cc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_template_sse2_double.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_template_sse2_double.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py
index e6972d8fae..e398e3c7ec 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c
index 796ea16e5f..944968a0ad 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c
index 1c91c0def7..b69fb42a99 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c
index dd89e6c7a3..f4109e7b52 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c
index e78c3a3287..fca9e0aca5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c
index a1dfefba7d..d9182b5023 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c
index 9cd7af987b..6b8e6694b5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c
index 1310cce5d7..7cada150ef 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c
index 53a146c0af..6048064eb7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c
index 135f38b55f..f92df505d1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c
index 083beee761..5fb31193a5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c
index 5b4383c20e..a51ce74203 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c
index 29c109189a..e56aba56a3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c
index 9e9c308681..feff2fc604 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c
index 7ac70cdddc..bce8e04dca 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c
index 0548575500..bec922ca11 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c
index eecac92e83..3372771529 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c
index 6efae291f5..b8fab59079 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c
index ed3dff6303..751a7d5413 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c
index 61b53671ac..bf153478a8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c
index b5a72ada85..f74316e422 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c
index 14ddaa742e..939d7cc889 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c
index cd96980500..f1b29dee54 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c
index e834573ca7..f9e44170f5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c
index ec58d82758..3525cc6f35 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c
index 0fdf631404..24e086ff26 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_single.c
index b610f473a1..3a591e67d1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_single.c
index c7be83e493..5c3955fe60 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_single.c
index d95cdb8cd9..c0133adf4e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_single.c
index f3097c7ef8..a274a6359c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_single.c
index 26b9aa2dca..ceeeb5cba9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_single.c
index 8995e7bf66..eb5d22c512 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_single.c
index 17992cf306..879ce0d511 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_single.c
index 52635bf814..eb02d47fa4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_single.c
index e7106a2bf7..a3b178926e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_single.c
index 598507841c..13e3bee65c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c
index 27b91d6a59..5ed743adc6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c
index f91f8cb229..1e494f4b31 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c
index 2519b4cdc5..929d502a45 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c
index d73265d7d0..fb04ee1bfb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c
index 31533c10b8..b3d0172dd7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c
index a4e9680d37..47375a6824 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c
index 8d0f032b85..11b79ec64b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c
index f89847030f..eb33806fe7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c
index 6dd85692a5..82766940b1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c
index 0e01343035..4bcb1380f6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c
index 6c5d6b7e89..c935859b4c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c
index c34d7e355b..ef354cc6ac 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c
index 298f4bf173..d7b9a7a17d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c
index d2a798338f..b0a63e6db7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c
index 8c3b9f16fb..c63d7720f4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c
index b52deed263..555cd4a539 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c
index 83a9e66d25..139b8e7c7f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c
index d5193f1f5d..d7e5020c38 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c
index da3573a17b..2dcc45e448 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c
index cc1f3c7b3f..379442cc74 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c
index 9c5b645c89..3998cbfd3b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c
index 1bbb8ad520..0660012f97 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c
index 00a6f42493..1de10558d2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c
index db157b874b..98321a47f2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c
index f253c439fd..9efdacb650 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_single.c
index 0dd7d28d3c..1a077a7156 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_single.c
index 2762c7b372..eb8c17a18e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_single.c
index 9ddedcc4bd..aaded0432a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_single.c
index 7c74cf4f77..35fa010837 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_single.c
index 2acfb102ae..b142f4124d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c
index d919990a8e..181a6ccc91 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c
index 102361add6..104939ec04 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c
index d4568761f7..ec72a5baff 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c
index 0c55154cee..a9cdeea360 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c
index d82b752184..d15b26af78 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_single.c
index b67d77114c..923a5b917a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_single.c
index 66d7e1b9b5..ec91199223 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_single.c
index 86c3ad5719..d7644a4ea6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_single.c
index aebbadfbc3..63fde3c0ea 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_single.c
index e85efc2417..ea2d9975d5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c
index 75519186a3..10042fda8f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c
index 4d045ebe1a..d732129dca 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_single.c
index 18d6902374..79724c1ef3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_single.c
index 025cbd873b..b95d697418 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_single.c
index 309f10f316..836bfeca69 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_single.c
index 4fa809ae16..923346a829 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c
index 42beebae30..58f43d74ab 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c
index 626fac2909..3311659b28 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_single.c
index be03c2bacc..665837010c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c
index c6843af9a0..640629db5e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c
index 9625e3d955..75efe61710 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c
index 945700ec90..9a11ef53f3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c
index 30f819fc23..50196ee77e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c
index f01f9b7ba2..d738201f61 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c
index 7933538adb..a096c464fd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c
index 9ee1bd0514..acd708d528 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c
index 09571acb63..febb58aa12 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c
index 65a2ceac36..bb4663ac92 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c
index 08af64fc85..96f0deec5b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c
index da55cd5377..3324e6e95b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c
index 01cb73f37f..3988b53be8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c
index d02d066b5b..0bebdc8d65 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c
index f343c5cb48..d70c420ded 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c
index 344fc0562f..85912be6cc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c
index cc3fc72a05..c47f10ff2f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c
index c8c64c937a..307063b082 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c
index 6effea2674..5b30b0b1d7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c
index 06e07af9f0..b44941d137 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c
index 88363bd3b0..f4c5985c3d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c
index 63536fbaf1..121699b128 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c
index d8340caa3b..6829f4f561 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c
index 02503b55ce..86801bc1d6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c
index 0805245576..7db65db9df 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c
index c8383fdd80..0eb5f98a9f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c
index 518f413a3d..b9528802c9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c
index b6439c3d0d..b6180869cf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c
index ed2d36535f..cd52143eff 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c
index 8e9e2f5cde..adad370a92 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c
index 5a2b605c29..bd472c5e3e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_single.c
index 779029dfd8..690771e068 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_single.c
index a71baf54a5..784f627abe 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_single.c
index 75f8805fb0..38d449d60a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_single.c
index 7dec0fdb33..eb35a819dd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_single.c
index 072352339a..ac7153fbb3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c
index 546d1c87bc..a66eb382cd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS sse2_single kernel generator.
  */
-#ifndef nb_kernel_sse2_single_h
-#define nb_kernel_sse2_single_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -525,5 +524,3 @@ nb_kernel_info_t
 
 int
     kernellist_sse2_single_size = sizeof(kernellist_sse2_single)/sizeof(kernellist_sse2_single[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_template_sse2_single.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_template_sse2_single.pre
index 5f779e15ac..d6c90187a4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_template_sse2_single.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_template_sse2_single.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py
index beb4e0721a..21d8185246 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c
index 995dbac81f..d5082e3690 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c
index acf4a5129b..8e67c2568b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c
index 959358f370..df651699f7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c
index 2051220cd1..f6763438b6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c
index f6e2aa8297..554acbea8d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c
index 0be45d84c4..d87a47ab9e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c
index 05c8f06685..f322f37b9e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c
index f13d4ecfe3..f974ebf581 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c
index 24b84c4dec..ee500cdd8d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c
index 5e3d03956d..fc2b427c28 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c
index c954bf9291..806d0ed5d5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c
index a8c2882ec0..b38f1a374d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c
index 7dc09000a1..29ac20de5c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c
index 593df9aff4..f5bc6d3946 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c
index 9af81bc435..99b30f4e16 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c
index c3e7906c4b..ccee20148d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c
index 03119af271..ae05ac1c2d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c
index 31c21afd78..fd5a8a8866 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c
index d78e79df95..385b45c31a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c
index e217187e13..6cd3892216 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c
index fb1166bd03..f55b556f35 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c
index 8200319544..79f3ffa0cb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c
index 2e0c7c1211..87232c18d8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c
index 1f3f22d634..662925f185 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c
index a2345dbd5d..2630c85cac 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c
index 95071b2b15..4c21e1d192 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c
index 2d204091fe..736cfc0dd8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c
index 55eb106ab1..ce93b70270 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c
index 3fcf8db3f9..38004be885 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c
index c659407d42..5c2ddb39c7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_double.c
index 1a0e658d22..92ab88e871 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_double.c
index 6f29dc83c6..a51df1a66b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_double.c
index 72baf99fc8..4e4ecc86ae 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_double.c
index cf6ae97558..8c20eef2f2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_double.c
index 9615a68d03..8f8b43d3a6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c
index 5127fc1880..48bf43175e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c
index c79d0a88b9..0431849f45 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c
index 7c8e3e57cb..e58d875fde 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c
index 1f944ce4c4..db66778da2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c
index 635eda8165..e4e29cb398 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c
index 16654bfc27..36e4aff5e9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c
index 1a16ae0d02..5adf2f62ed 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c
index bbca8dfcee..78ad836241 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c
index 55c581e172..aaf06d532f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c
index 6ec0c5e9ad..1c1340c0f8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c
index 578896f7f0..7208380d21 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c
index 03b7829ad1..9dc8782c41 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c
index 8d99950ec3..4974b8ff0a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c
index ce124bf358..a3af3e19d5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c
index 042f5efdad..30136172a1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c
index 2403fbbba3..ce3df76b1b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c
index f804dd4da1..1da494b522 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c
index 1688c56535..2bcfcd95cf 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c
index 6b3cc51d5e..80b4c0a4b1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c
index f94a0988cd..042d9c870d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c
index 7f3734d6da..f0e1f03d0e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c
index 98df053599..f877772ed2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c
index 63d6519b7b..9136ae2f2f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c
index 7b748ae43d..ebef2a29d5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c
index 98cb2045df..1d6303767d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_double.c
index d02eeda5be..87f5ba40f2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_double.c
index 7096461417..cc39f25821 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_double.c
index 008fb30985..95005506ab 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_double.c
index 839cfdd078..26bd9e3e3b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_double.c
index 7d1c3a39fa..3fee5c3f94 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c
index 10632d14b0..7d6fdecaca 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c
index 30c321f032..62481eafc8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c
index 763170a81f..2a32c2ba3b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c
index b66aedac51..60946b3769 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c
index 3fcc61f275..129cc8f5ba 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c
index 2d4eff8d09..3b7d9b969a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c
index fd93179197..ff60956e7f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c
index 1d2f29064e..aacb4d14c9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c
index 00a632fee9..33dd117fd9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c
index 55d9a50889..3939909702 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c
index 92fe60b291..32cc891e28 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c
index c885a9a5d4..22b76eb384 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c
index aed6e61e2f..ad340a4d50 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_double.c
index 68c8ba4d70..891cb053a9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_double.c
index 47beafe2cf..44ce23f612 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_double.c
index b69794d885..6ee522c237 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c
index 9f20d83385..f4858f9f7f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c
index 30eaabe35d..21b2eb7e1f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_double.c
index cbd441f438..aec4a84830 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c
index 96ad020a95..215b9ec357 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c
index 32931f89d8..5c854bd661 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c
index a156d52a6b..8cafa21553 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c
index 9024e23525..9b413fe68c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c
index ac3a23f752..a555931a28 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c
index a3aa3e47a6..20af2723d7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c
index 4858f39e50..733e317ef4 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c
index bac31ebfbf..6c255ca524 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c
index 443b522bf1..08ef5a5866 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c
index 0a1f5a061a..71e757dd0f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c
index 502bad9115..320f53ef14 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c
index 856a15d70f..3a7fb48728 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c
index 71bc869f25..7e67092a16 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c
index d0025c2b5d..c017e078e9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c
index ad63e11772..23a0f28031 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c
index d95f8d5ec4..85140ccfcc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c
index 085fcc492a..4426bb9375 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c
index 5ae8a82a0f..4e59d60578 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c
index 9a68da3925..7fa1c5bf4e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c
index afc299df5e..7d44421dad 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c
index e6a73193e6..08fbaf536e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c
index ba0522952d..c072f9ef5c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c
index 6aa5d4f8f4..a4ffb0ee87 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c
index 4d3e062a15..8b5e748a66 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c
index 87c36ac274..c37481c7f5 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c
index f84c80583a..8d0600eaca 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c
index fc4a1092f4..be462c91b6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c
index 6a604ba00b..d06413122d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c
index 9af113975b..440c7e4fba 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c
index cb8eb3fef9..9c68223e15 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c
index 815578ce6e..5802eeb6a9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c
index dfed065c5f..591f6ff192 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c
index d1c49810c5..e9c617ca51 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c
index d70ff6f480..949decb794 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c
index 86529f37a8..7b4156fb81 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c
index 56d5b777fc..c30d800547 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_double kernel generator.
  */
-#ifndef nb_kernel_sse4_1_double_h
-#define nb_kernel_sse4_1_double_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -525,5 +524,3 @@ nb_kernel_info_t
 
 int
     kernellist_sse4_1_double_size = sizeof(kernellist_sse4_1_double)/sizeof(kernellist_sse4_1_double[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_template_sse4_1_double.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_template_sse4_1_double.pre
index ef7c19f1f1..70671c7a61 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_template_sse4_1_double.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_template_sse4_1_double.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py
index 0d3b164f6b..a376f9c237 100755
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py
@@ -428,8 +428,7 @@ numKernels = 0
 
 fpdecl = open('nb_kernel_' + Arch + '.c','w')
 fpdecl.write( FileHeader )
-fpdecl.write( '#ifndef nb_kernel_' + Arch + '_h\n' )
-fpdecl.write( '#define nb_kernel_' + Arch + '_h\n\n' )
+fpdecl.write( '#include "gmxpre.h"\n\n' )
 fpdecl.write( '#include "../nb_kernel.h"\n\n' )
 
 for KernelElec in ElectrostaticsList:
@@ -512,6 +511,5 @@ for decl in kerneldecl[0:-1]:
 fpdecl.write( kerneldecl[-1] + '\n' )
 fpdecl.write( '};\n\n' )
 fpdecl.write( 'int\n' )
-fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n\n')
-fpdecl.write( '#endif\n')
+fpdecl.write( '    kernellist_'+Arch+'_size = sizeof(kernellist_'+Arch+')/sizeof(kernellist_'+Arch+'[0]);\n')
 fpdecl.close()
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c
index 9a6488beef..43765245bd 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c
index ea97af50a4..b8e72a607e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c
index e4bd52ff9c..b2e6ccde64 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c
index b0127fd796..e07f8fcba8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c
index 60b502daac..ce7eb9f3ad 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c
index 0b54db73d1..6cc9759e42 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c
index fc4f5d5169..6400ff6bc2 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c
index 423ce07d87..aa399e7104 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c
index 07ee37780c..8ad52029ce 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c
index ade8f539ab..9f3b5d7b20 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c
index 3d4af76267..2ee9b98a3f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c
index 552de5f263..cc047944de 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c
index ab9ab509c4..2b86508706 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c
index 2dc7174487..3ffda8d358 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c
index ce89e8dcca..f85dfcb91c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c
index 9d30cf10f2..5e2ae641c1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c
index dc77d8999c..a90fd1e0d3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c
index 04db4b5e6c..a247f55e12 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c
index f108437b73..d6d0f12b5e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c
index 1f7514fff9..8b28dc20f3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c
index 59596e7bab..b1f0d5aa60 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c
index dad866d30e..6034d6537f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c
index 6b9e6be619..f5722d0fea 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c
index a2e3272fb7..04997ef4d8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c
index f7f7f74928..db8b18bfd7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c
index 6fef7b2803..74dc97d9da 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c
index 99f3a9c228..41427b7266 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c
index 469e54296c..ccc1b2a87c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c
index 2308ed2437..0f7044f547 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c
index 18fc8ee7a6..ef9734ff0c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_single.c
index aa2ba19dd7..24d2053360 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_single.c
index 5e6e13fdee..e463cc6901 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_single.c
index 0fd2347ba1..dfb43c5a67 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_single.c
index 81f8521d30..3221f6515a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_single.c
index 4a1ded8480..12b30a2048 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c
index a545909350..0c6d97b53c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c
index f6e9f6c7fa..de65927f91 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c
index b2b21ea941..4ff84568ad 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c
index 72845419ea..e1c15f338a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c
index c61f41838e..5287d17b7c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c
index 74f0241ca0..0fadfe61d0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c
index 08acafa9c4..fcff5a021d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c
index f03ba735c4..945094263e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c
index 8ecccdb386..fec8538685 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c
index 12502780c3..4e4c898705 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c
index c88493259c..153f2b464e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c
index 27b5990147..7bd4946425 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c
index e4aca9bc39..f35fac4be1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c
index 56a775f45d..813563ff3d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c
index 02928c0698..715ba61813 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c
index add6732ada..2bb60ec499 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c
index 51f15bad00..18e77c8f0d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c
index 22d70a9345..20985718c1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c
index b097738103..e721b74a52 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c
index c96e68b353..7e1bb0501e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c
index ad4517f8dd..b50f08da8d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c
index e77040ba42..1ff9d9ecba 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c
index e6577fa776..33ab639938 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c
index 32f4faf4c6..5785d3e9dc 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c
index 158a7358c8..11e5baeb95 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_single.c
index 60b1d5f0b2..a826217890 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_single.c
index e799a6a77b..45ec13c2ad 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_single.c
index 0b6d1b87c3..bc43a5c590 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_single.c
index e41b2d1d4c..8ef3ba8ff1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_single.c
index 99af2154b6..76feb5f4d3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c
index c56bf97c96..8908bcbbeb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c
index 89d9c5a9b0..6a7d818e66 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c
index 78f57bc4de..4d2a3285f9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c
index d40633c864..730983f728 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c
index a578db0443..d98e86cbe0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c
index 241b05688c..efc3398f80 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c
index a35dd3dc5d..172cfc0321 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c
index f43659ed3f..965229819e 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c
index eed47339c6..55e4dd3d89 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c
index 4a9c9c4a0c..eddf312fc7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c
index 59e4669e51..9874ad9f37 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c
index b6c9bcee01..9ca39e2379 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c
index a17ccc3bbc..c59b96e831 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_single.c
index 3d1b29b793..c7966d162a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_single.c
index ffa993baa3..e08da92bcb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_single.c
index f3390379e8..0eb8240113 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c
index 2eb9bba510..e6e3d62048 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c
index 5afa387e73..79ae8ae687 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_single.c
index e8e0ad9953..f817b106ce 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c
index 3128f6021d..b22eeaa5f9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c
index 4893b7c4cb..6bd167aeb8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c
index 0782766d16..ee8d0db230 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c
index db438b7880..d8412ae8a0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c
index 3d8474e631..03f57d3fc8 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c
index ff6d1b64e3..d461b8fe6d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c
index 4903eea6d3..cf2aa83797 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c
index bbdc4921f1..70427d9a6c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c
index 8e754efb14..b03544fb23 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c
index 463b6e93d7..1b3fae491f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c
index 4ac4d18b6a..c13d51e018 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c
index 5a04b8274e..ec6752defb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c
index b36747e517..108e9a6db6 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c
index 095754c928..d1650146ca 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c
index 0a2f3a69bf..3ee4362aa1 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c
index d308faee02..73ca6d784f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c
index 5de8ab5553..c058a2416d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c
index 812b41b310..9f0a7da559 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c
index 8133607496..ea92b80ef7 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c
index bd7e8c4231..f7d36faf8c 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c
index 568833d8c0..3cf7e6f05d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c
index ffb71de001..74a95ef306 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c
index d8020e2011..2d476057ba 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c
index 32748779e3..b280db2beb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c
index df71226dbd..fb494e0299 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c
index 3370c15c4d..99cf0847bb 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c
index 3bfb4e74c2..ade73613a3 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c
index efa061e59a..1a82b3244a 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c
index 8a56a1b986..a693a9670f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c
index 62f6fff153..d53c11fb4d 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c
index fe94def45b..69eff6bd67 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c
index f09877a05f..d8f13947f9 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c
index 3afbcbc7fa..54bcbc6f80 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c
index 6010916a81..48abc0115b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c
index 37889aab1a..15b9c682f0 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c
@@ -35,6 +35,8 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c
index 811107d564..95b0055d6b 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c
@@ -35,8 +35,7 @@
 /*
  * Note: this file was generated by the GROMACS sse4_1_single kernel generator.
  */
-#ifndef nb_kernel_sse4_1_single_h
-#define nb_kernel_sse4_1_single_h
+#include "gmxpre.h"
 
 #include "../nb_kernel.h"
 
@@ -525,5 +524,3 @@ nb_kernel_info_t
 
 int
     kernellist_sse4_1_single_size = sizeof(kernellist_sse4_1_single)/sizeof(kernellist_sse4_1_single[0]);
-
-#endif
diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_template_sse4_1_single.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_template_sse4_1_single.pre
index 0c22f92ba6..b055fa9a6f 100644
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_template_sse4_1_single.pre
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_template_sse4_1_single.pre
@@ -36,6 +36,8 @@
 #error This file must be processed with the Gromacs pre-preprocessor
 /* #endif */
 /* #if INCLUDE_HEADER */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxlib/nonbonded/nonbonded.c b/src/gromacs/gmxlib/nonbonded/nonbonded.c
index 41ce139f1e..b6f56da6bd 100644
--- a/src/gromacs/gmxlib/nonbonded/nonbonded.c
+++ b/src/gromacs/gmxlib/nonbonded/nonbonded.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxlib/nrnb.c b/src/gromacs/gmxlib/nrnb.c
index 7e6ff03ff5..bd3078ee11 100644
--- a/src/gromacs/gmxlib/nrnb.c
+++ b/src/gromacs/gmxlib/nrnb.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxlib/oenv.cpp b/src/gromacs/gmxlib/oenv.cpp
index 900ea1b4e5..3241c0bfc6 100644
--- a/src/gromacs/gmxlib/oenv.cpp
+++ b/src/gromacs/gmxlib/oenv.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/oenv.h"
 
 #include "gromacs/utility/smalloc.h"
diff --git a/src/gromacs/gmxlib/orires.c b/src/gromacs/gmxlib/orires.c
index 6ffda6c9db..52ca63071c 100644
--- a/src/gromacs/gmxlib/orires.c
+++ b/src/gromacs/gmxlib/orires.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxlib/rbin.c b/src/gromacs/gmxlib/rbin.c
index e47c898df0..5d71c14628 100644
--- a/src/gromacs/gmxlib/rbin.c
+++ b/src/gromacs/gmxlib/rbin.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/gmxlib/readinp.c b/src/gromacs/gmxlib/readinp.c
index e2d874899e..ff55b9dc7b 100644
--- a/src/gromacs/gmxlib/readinp.c
+++ b/src/gromacs/gmxlib/readinp.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxlib/restcbt.c b/src/gromacs/gmxlib/restcbt.c
index 01a4eac83a..64c0d00839 100644
--- a/src/gromacs/gmxlib/restcbt.c
+++ b/src/gromacs/gmxlib/restcbt.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include <math.h>
 
 #include "gromacs/math/units.h"
diff --git a/src/gromacs/gmxlib/sighandler.c b/src/gromacs/gmxlib/sighandler.c
index aca2619473..2149787465 100644
--- a/src/gromacs/gmxlib/sighandler.c
+++ b/src/gromacs/gmxlib/sighandler.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxlib/splitter.c b/src/gromacs/gmxlib/splitter.c
index b89bcb6d3d..98ab01916f 100644
--- a/src/gromacs/gmxlib/splitter.c
+++ b/src/gromacs/gmxlib/splitter.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/splitter.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxlib/txtdump.c b/src/gromacs/gmxlib/txtdump.c
index 5704cc119e..dbda154892 100644
--- a/src/gromacs/gmxlib/txtdump.c
+++ b/src/gromacs/gmxlib/txtdump.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 /* This file is completely threadsafe - please keep it that way! */
diff --git a/src/gromacs/gmxlib/typedefs.c b/src/gromacs/gmxlib/typedefs.c
index 22c4776d4c..a1508fc9b8 100644
--- a/src/gromacs/gmxlib/typedefs.c
+++ b/src/gromacs/gmxlib/typedefs.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/typedefs.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxlib/viewit.c b/src/gromacs/gmxlib/viewit.c
index 48f21b0010..c728453439 100644
--- a/src/gromacs/gmxlib/viewit.c
+++ b/src/gromacs/gmxlib/viewit.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/viewit.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxlib/warninp.c b/src/gromacs/gmxlib/warninp.c
index 795c5cd705..bdf882dafd 100644
--- a/src/gromacs/gmxlib/warninp.c
+++ b/src/gromacs/gmxlib/warninp.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/add_par.c b/src/gromacs/gmxpreprocess/add_par.c
index a1db3207fb..15971725d1 100644
--- a/src/gromacs/gmxpreprocess/add_par.c
+++ b/src/gromacs/gmxpreprocess/add_par.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/addconf.c b/src/gromacs/gmxpreprocess/addconf.c
index bb2407f463..57928b5f64 100644
--- a/src/gromacs/gmxpreprocess/addconf.c
+++ b/src/gromacs/gmxpreprocess/addconf.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "addconf.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxpreprocess/calc_verletbuf.c b/src/gromacs/gmxpreprocess/calc_verletbuf.c
index f36575101c..6074ed84db 100644
--- a/src/gromacs/gmxpreprocess/calc_verletbuf.c
+++ b/src/gromacs/gmxpreprocess/calc_verletbuf.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/gmxpreprocess/calch.c b/src/gromacs/gmxpreprocess/calch.c
index 05b55f40aa..4eff9edc42 100644
--- a/src/gromacs/gmxpreprocess/calch.c
+++ b/src/gromacs/gmxpreprocess/calch.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxpreprocess/compute_io.c b/src/gromacs/gmxpreprocess/compute_io.c
index 33c2fcfa05..a9ff5768a2 100644
--- a/src/gromacs/gmxpreprocess/compute_io.c
+++ b/src/gromacs/gmxpreprocess/compute_io.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <signal.h>
diff --git a/src/gromacs/gmxpreprocess/convparm.c b/src/gromacs/gmxpreprocess/convparm.c
index c53b46dae8..8369a030c5 100644
--- a/src/gromacs/gmxpreprocess/convparm.c
+++ b/src/gromacs/gmxpreprocess/convparm.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxpreprocess/fflibutil.cpp b/src/gromacs/gmxpreprocess/fflibutil.cpp
index 4bd99c0f5e..c08255fa8c 100644
--- a/src/gromacs/gmxpreprocess/fflibutil.cpp
+++ b/src/gromacs/gmxpreprocess/fflibutil.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxpreprocess/gen_ad.c b/src/gromacs/gmxpreprocess/gen_ad.c
index 4a6833b757..b5c55421c1 100644
--- a/src/gromacs/gmxpreprocess/gen_ad.c
+++ b/src/gromacs/gmxpreprocess/gen_ad.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxpreprocess/gen_maxwell_velocities.c b/src/gromacs/gmxpreprocess/gen_maxwell_velocities.c
index bee5b5736c..ee0d106f64 100644
--- a/src/gromacs/gmxpreprocess/gen_maxwell_velocities.c
+++ b/src/gromacs/gmxpreprocess/gen_maxwell_velocities.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxpreprocess/gen_vsite.c b/src/gromacs/gmxpreprocess/gen_vsite.c
index 534e64c212..30dace6b29 100644
--- a/src/gromacs/gmxpreprocess/gen_vsite.c
+++ b/src/gromacs/gmxpreprocess/gen_vsite.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxpreprocess/genconf.c b/src/gromacs/gmxpreprocess/genconf.c
index 92013170fd..13ee605036 100644
--- a/src/gromacs/gmxpreprocess/genconf.c
+++ b/src/gromacs/gmxpreprocess/genconf.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "genconf.h"
 
 #include "gromacs/math/utilities.h"
diff --git a/src/gromacs/gmxpreprocess/genhydro.c b/src/gromacs/gmxpreprocess/genhydro.c
index 1e5bad50e0..50be75ef54 100644
--- a/src/gromacs/gmxpreprocess/genhydro.c
+++ b/src/gromacs/gmxpreprocess/genhydro.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/gmxcpp.c b/src/gromacs/gmxpreprocess/gmxcpp.c
index 7123c8c566..edfb7d8249 100644
--- a/src/gromacs/gmxpreprocess/gmxcpp.c
+++ b/src/gromacs/gmxpreprocess/gmxcpp.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <sys/types.h>
diff --git a/src/gromacs/gmxpreprocess/gpp_atomtype.c b/src/gromacs/gmxpreprocess/gpp_atomtype.c
index 8e392922ce..3a12a4dd82 100644
--- a/src/gromacs/gmxpreprocess/gpp_atomtype.c
+++ b/src/gromacs/gmxpreprocess/gpp_atomtype.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxpreprocess/gpp_bond_atomtype.c b/src/gromacs/gmxpreprocess/gpp_bond_atomtype.c
index 6d9ed91334..a8e949e3da 100644
--- a/src/gromacs/gmxpreprocess/gpp_bond_atomtype.c
+++ b/src/gromacs/gmxpreprocess/gpp_bond_atomtype.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/gmxpreprocess/gpp_nextnb.c b/src/gromacs/gmxpreprocess/gpp_nextnb.c
index 0b4022b3c4..a5002347d0 100644
--- a/src/gromacs/gmxpreprocess/gpp_nextnb.c
+++ b/src/gromacs/gmxpreprocess/gpp_nextnb.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxpreprocess/grompp.c b/src/gromacs/gmxpreprocess/grompp.c
index c3f28d27d0..0f47a5a612 100644
--- a/src/gromacs/gmxpreprocess/grompp.c
+++ b/src/gromacs/gmxpreprocess/grompp.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "grompp.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxpreprocess/h_db.c b/src/gromacs/gmxpreprocess/h_db.c
index 50028e470b..398a53689e 100644
--- a/src/gromacs/gmxpreprocess/h_db.c
+++ b/src/gromacs/gmxpreprocess/h_db.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxpreprocess/hackblock.c b/src/gromacs/gmxpreprocess/hackblock.c
index 9f18d5ab3c..e80b140b38 100644
--- a/src/gromacs/gmxpreprocess/hackblock.c
+++ b/src/gromacs/gmxpreprocess/hackblock.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/hizzie.c b/src/gromacs/gmxpreprocess/hizzie.c
index 336fd2ef53..936a434fee 100644
--- a/src/gromacs/gmxpreprocess/hizzie.c
+++ b/src/gromacs/gmxpreprocess/hizzie.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxpreprocess/insert-molecules.cpp b/src/gromacs/gmxpreprocess/insert-molecules.cpp
index 65b87389a9..f17357e2a1 100644
--- a/src/gromacs/gmxpreprocess/insert-molecules.cpp
+++ b/src/gromacs/gmxpreprocess/insert-molecules.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "insert-molecules.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxpreprocess/nm2type.c b/src/gromacs/gmxpreprocess/nm2type.c
index ae258ca390..a29def7c81 100644
--- a/src/gromacs/gmxpreprocess/nm2type.c
+++ b/src/gromacs/gmxpreprocess/nm2type.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/pdb2gmx.c b/src/gromacs/gmxpreprocess/pdb2gmx.c
index b1ad9566e1..ec26e5f22c 100644
--- a/src/gromacs/gmxpreprocess/pdb2gmx.c
+++ b/src/gromacs/gmxpreprocess/pdb2gmx.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "pdb2gmx.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxpreprocess/pdb2top.cpp b/src/gromacs/gmxpreprocess/pdb2top.cpp
index c0febe34f0..9dfbfdffbb 100644
--- a/src/gromacs/gmxpreprocess/pdb2top.cpp
+++ b/src/gromacs/gmxpreprocess/pdb2top.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxpreprocess/pgutil.c b/src/gromacs/gmxpreprocess/pgutil.c
index 739c165885..811360c522 100644
--- a/src/gromacs/gmxpreprocess/pgutil.c
+++ b/src/gromacs/gmxpreprocess/pgutil.c
@@ -36,6 +36,8 @@
  */
 /* This file is completely threadsafe - keep it that way! */
 
+#include "gmxpre.h"
+
 #include "config.h"
 #include "gromacs/utility/cstringutil.h"
 #include "pgutil.h"
diff --git a/src/gromacs/gmxpreprocess/protonate.c b/src/gromacs/gmxpreprocess/protonate.c
index 51224df083..86c87d6826 100644
--- a/src/gromacs/gmxpreprocess/protonate.c
+++ b/src/gromacs/gmxpreprocess/protonate.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "protonate.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxpreprocess/read-conformation.cpp b/src/gromacs/gmxpreprocess/read-conformation.cpp
index fa4d8c5b78..b792b95c17 100644
--- a/src/gromacs/gmxpreprocess/read-conformation.cpp
+++ b/src/gromacs/gmxpreprocess/read-conformation.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "read-conformation.h"
 
 #include "gromacs/fileio/confio.h"
diff --git a/src/gromacs/gmxpreprocess/readadress.c b/src/gromacs/gmxpreprocess/readadress.c
index d650e6ef0e..bc46c5802e 100644
--- a/src/gromacs/gmxpreprocess/readadress.c
+++ b/src/gromacs/gmxpreprocess/readadress.c
@@ -33,6 +33,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/gmxpreprocess/readir.c b/src/gromacs/gmxpreprocess/readir.c
index 802c3d8bb0..1dfa19a18e 100644
--- a/src/gromacs/gmxpreprocess/readir.c
+++ b/src/gromacs/gmxpreprocess/readir.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxpreprocess/readpull.c b/src/gromacs/gmxpreprocess/readpull.c
index 313527d8c9..687ae35ef3 100644
--- a/src/gromacs/gmxpreprocess/readpull.c
+++ b/src/gromacs/gmxpreprocess/readpull.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/gmxpreprocess/readrot.c b/src/gromacs/gmxpreprocess/readrot.c
index d7c795ae1b..3ed1bdb01e 100644
--- a/src/gromacs/gmxpreprocess/readrot.c
+++ b/src/gromacs/gmxpreprocess/readrot.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/gmxpreprocess/resall.c b/src/gromacs/gmxpreprocess/resall.c
index dee3472671..a80bcd6231 100644
--- a/src/gromacs/gmxpreprocess/resall.c
+++ b/src/gromacs/gmxpreprocess/resall.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxpreprocess/solvate.cpp b/src/gromacs/gmxpreprocess/solvate.cpp
index 0644c4c94c..b29018ea2b 100644
--- a/src/gromacs/gmxpreprocess/solvate.cpp
+++ b/src/gromacs/gmxpreprocess/solvate.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "solvate.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxpreprocess/sortwater.c b/src/gromacs/gmxpreprocess/sortwater.c
index 62dbd2a943..aea7ac8d3e 100644
--- a/src/gromacs/gmxpreprocess/sortwater.c
+++ b/src/gromacs/gmxpreprocess/sortwater.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/gmxpreprocess/specbond.c b/src/gromacs/gmxpreprocess/specbond.c
index 5eec78ca72..60baa77405 100644
--- a/src/gromacs/gmxpreprocess/specbond.c
+++ b/src/gromacs/gmxpreprocess/specbond.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxpreprocess/ter_db.c b/src/gromacs/gmxpreprocess/ter_db.c
index 6b0a740961..e55ec6d115 100644
--- a/src/gromacs/gmxpreprocess/ter_db.c
+++ b/src/gromacs/gmxpreprocess/ter_db.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxpreprocess/tests/insert-molecules.cpp b/src/gromacs/gmxpreprocess/tests/insert-molecules.cpp
index a6af1e1d94..913208d7b5 100644
--- a/src/gromacs/gmxpreprocess/tests/insert-molecules.cpp
+++ b/src/gromacs/gmxpreprocess/tests/insert-molecules.cpp
@@ -39,6 +39,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  */
 
+#include "gmxpre.h"
+
 #include "../insert-molecules.h"
 #include "testutils/integrationtests.h"
 #include "testutils/cmdlinetest.h"
diff --git a/src/gromacs/gmxpreprocess/tests/solvate.cpp b/src/gromacs/gmxpreprocess/tests/solvate.cpp
index ae99c0e0a4..947729b78e 100644
--- a/src/gromacs/gmxpreprocess/tests/solvate.cpp
+++ b/src/gromacs/gmxpreprocess/tests/solvate.cpp
@@ -39,6 +39,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  */
 
+#include "gmxpre.h"
+
 #include "../solvate.h"
 #include "testutils/integrationtests.h"
 #include "testutils/cmdlinetest.h"
diff --git a/src/gromacs/gmxpreprocess/tomorse.c b/src/gromacs/gmxpreprocess/tomorse.c
index 0f2c5c7b50..16110bdbca 100644
--- a/src/gromacs/gmxpreprocess/tomorse.c
+++ b/src/gromacs/gmxpreprocess/tomorse.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxpreprocess/topdirs.c b/src/gromacs/gmxpreprocess/topdirs.c
index ecfdb68aac..9435cb36e0 100644
--- a/src/gromacs/gmxpreprocess/topdirs.c
+++ b/src/gromacs/gmxpreprocess/topdirs.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/gmxpreprocess/topio.c b/src/gromacs/gmxpreprocess/topio.c
index 4871aff43b..e96195737b 100644
--- a/src/gromacs/gmxpreprocess/topio.c
+++ b/src/gromacs/gmxpreprocess/topio.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/gmxpreprocess/toppush.c b/src/gromacs/gmxpreprocess/toppush.c
index 0069c8c781..53616ab2a6 100644
--- a/src/gromacs/gmxpreprocess/toppush.c
+++ b/src/gromacs/gmxpreprocess/toppush.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/gmxpreprocess/topshake.c b/src/gromacs/gmxpreprocess/topshake.c
index dcf47858a4..3428638542 100644
--- a/src/gromacs/gmxpreprocess/topshake.c
+++ b/src/gromacs/gmxpreprocess/topshake.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/gmxpreprocess/toputil.c b/src/gromacs/gmxpreprocess/toputil.c
index f040a5611d..7b3fff08a2 100644
--- a/src/gromacs/gmxpreprocess/toputil.c
+++ b/src/gromacs/gmxpreprocess/toputil.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/gmxpreprocess/vsite_parm.c b/src/gromacs/gmxpreprocess/vsite_parm.c
index af6759781c..0671ee4027 100644
--- a/src/gromacs/gmxpreprocess/vsite_parm.c
+++ b/src/gromacs/gmxpreprocess/vsite_parm.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/gmxpreprocess/x2top.c b/src/gromacs/gmxpreprocess/x2top.c
index f9ad5c0d10..4a720a95cf 100644
--- a/src/gromacs/gmxpreprocess/x2top.c
+++ b/src/gromacs/gmxpreprocess/x2top.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "x2top.h"
 
 #include "config.h"
diff --git a/src/gromacs/gmxpreprocess/xlate.c b/src/gromacs/gmxpreprocess/xlate.c
index 535632cc66..5cbf20e8ed 100644
--- a/src/gromacs/gmxpreprocess/xlate.c
+++ b/src/gromacs/gmxpreprocess/xlate.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/gromacs/imd/imd.c b/src/gromacs/imd/imd.c
index a52351f517..3392fe1388 100644
--- a/src/gromacs/imd/imd.c
+++ b/src/gromacs/imd/imd.c
@@ -46,6 +46,8 @@
  * \ingroup module_imd
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <errno.h>
diff --git a/src/gromacs/imd/imdsocket.c b/src/gromacs/imd/imdsocket.c
index 308ae718c0..e322523845 100644
--- a/src/gromacs/imd/imdsocket.c
+++ b/src/gromacs/imd/imdsocket.c
@@ -46,6 +46,8 @@
  * \ingroup module_imd
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <errno.h>
diff --git a/src/gromacs/linearalgebra/eigensolver.c b/src/gromacs/linearalgebra/eigensolver.c
index 731baeaeda..37e6bc7022 100644
--- a/src/gromacs/linearalgebra/eigensolver.c
+++ b/src/gromacs/linearalgebra/eigensolver.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "eigensolver.h"
 
 #include "gromacs/linearalgebra/sparsematrix.h"
diff --git a/src/gromacs/linearalgebra/gmx_arpack.c b/src/gromacs/linearalgebra/gmx_arpack.c
index 8fb3f17584..b7a424a733 100644
--- a/src/gromacs/linearalgebra/gmx_arpack.c
+++ b/src/gromacs/linearalgebra/gmx_arpack.c
@@ -33,6 +33,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include <math.h>
 #include <string.h>
 
diff --git a/src/gromacs/linearalgebra/matrix.c b/src/gromacs/linearalgebra/matrix.c
index 82aa7bcc83..e646067ed7 100644
--- a/src/gromacs/linearalgebra/matrix.c
+++ b/src/gromacs/linearalgebra/matrix.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "matrix.h"
 
 #include "config.h"
diff --git a/src/gromacs/linearalgebra/nrjac.c b/src/gromacs/linearalgebra/nrjac.c
index 485f1ad973..2b023bcd79 100644
--- a/src/gromacs/linearalgebra/nrjac.c
+++ b/src/gromacs/linearalgebra/nrjac.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "nrjac.h"
 
 #include <math.h>
diff --git a/src/gromacs/linearalgebra/sparsematrix.c b/src/gromacs/linearalgebra/sparsematrix.c
index d2bb9495f4..34f5fd4443 100644
--- a/src/gromacs/linearalgebra/sparsematrix.c
+++ b/src/gromacs/linearalgebra/sparsematrix.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "sparsematrix.h"
 
 #include <assert.h>
diff --git a/src/gromacs/math/3dtransforms.cpp b/src/gromacs/math/3dtransforms.cpp
index 18be95347f..b2247bdbfb 100644
--- a/src/gromacs/math/3dtransforms.cpp
+++ b/src/gromacs/math/3dtransforms.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/math/3dtransforms.h"
 
 #include <math.h>
diff --git a/src/gromacs/math/do_fit.c b/src/gromacs/math/do_fit.c
index 6353a3da54..95d4b03fb6 100644
--- a/src/gromacs/math/do_fit.c
+++ b/src/gromacs/math/do_fit.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "do_fit.h"
 
 #include "gromacs/linearalgebra/nrjac.h"
diff --git a/src/gromacs/math/invsqrt.c b/src/gromacs/math/invsqrt.c
index f8a96b2594..782f6568e9 100644
--- a/src/gromacs/math/invsqrt.c
+++ b/src/gromacs/math/invsqrt.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "gromacs/math/vec.h"
 
 /** Exponential lookup table - 256 floats */
diff --git a/src/gromacs/math/units.c b/src/gromacs/math/units.c
index 17ef79c286..8c631d8b1f 100644
--- a/src/gromacs/math/units.c
+++ b/src/gromacs/math/units.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "units.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/math/utilities.c b/src/gromacs/math/utilities.c
index 962c08cc5c..4e40b88d1d 100644
--- a/src/gromacs/math/utilities.c
+++ b/src/gromacs/math/utilities.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/math/utilities.h"
 
 #include "config.h"
diff --git a/src/gromacs/mdlib/adress.c b/src/gromacs/mdlib/adress.c
index cb3c8da55f..dce59d513d 100644
--- a/src/gromacs/mdlib/adress.c
+++ b/src/gromacs/mdlib/adress.c
@@ -34,6 +34,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "adress.h"
 #include "gromacs/math/utilities.h"
 #include "gromacs/pbcutil/pbc.h"
diff --git a/src/gromacs/mdlib/calcmu.c b/src/gromacs/mdlib/calcmu.c
index 30da5e66ec..34a95d1dc1 100644
--- a/src/gromacs/mdlib/calcmu.c
+++ b/src/gromacs/mdlib/calcmu.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/mdlib/calcvir.c b/src/gromacs/mdlib/calcvir.c
index d8f8c394ab..61345f9fbe 100644
--- a/src/gromacs/mdlib/calcvir.c
+++ b/src/gromacs/mdlib/calcvir.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/force.h"
diff --git a/src/gromacs/mdlib/clincs.c b/src/gromacs/mdlib/clincs.c
index 55940d7ea4..6bb939a41f 100644
--- a/src/gromacs/mdlib/clincs.c
+++ b/src/gromacs/mdlib/clincs.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/constr.c b/src/gromacs/mdlib/constr.c
index 91b3d193e9..6b2d983df5 100644
--- a/src/gromacs/mdlib/constr.c
+++ b/src/gromacs/mdlib/constr.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/mdlib/coupling.c b/src/gromacs/mdlib/coupling.c
index 90eb74f314..2519f11141 100644
--- a/src/gromacs/mdlib/coupling.c
+++ b/src/gromacs/mdlib/coupling.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 #include <assert.h>
 
diff --git a/src/gromacs/mdlib/csettle.c b/src/gromacs/mdlib/csettle.c
index d72498ef38..fe270bff09 100644
--- a/src/gromacs/mdlib/csettle.c
+++ b/src/gromacs/mdlib/csettle.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/domdec.c b/src/gromacs/mdlib/domdec.c
index c0e2609eb3..c871588c01 100644
--- a/src/gromacs/mdlib/domdec.c
+++ b/src/gromacs/mdlib/domdec.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/mdlib/domdec_box.c b/src/gromacs/mdlib/domdec_box.c
index af5c834b55..5a30255b7d 100644
--- a/src/gromacs/mdlib/domdec_box.c
+++ b/src/gromacs/mdlib/domdec_box.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/domdec_con.c b/src/gromacs/mdlib/domdec_con.c
index f449bfdbf7..ba6baf6fbc 100644
--- a/src/gromacs/mdlib/domdec_con.c
+++ b/src/gromacs/mdlib/domdec_con.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 #include <assert.h>
 
diff --git a/src/gromacs/mdlib/domdec_network.c b/src/gromacs/mdlib/domdec_network.c
index 098ff0c462..8c1ef5153d 100644
--- a/src/gromacs/mdlib/domdec_network.c
+++ b/src/gromacs/mdlib/domdec_network.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/mdlib/domdec_setup.c b/src/gromacs/mdlib/domdec_setup.c
index 89c97084d2..a8c4443f2c 100644
--- a/src/gromacs/mdlib/domdec_setup.c
+++ b/src/gromacs/mdlib/domdec_setup.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/mdlib/domdec_top.c b/src/gromacs/mdlib/domdec_top.c
index 3d3af6d837..2e752241d5 100644
--- a/src/gromacs/mdlib/domdec_top.c
+++ b/src/gromacs/mdlib/domdec_top.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/mdlib/ebin.c b/src/gromacs/mdlib/ebin.c
index 7a03266f9b..8dbebee9de 100644
--- a/src/gromacs/mdlib/ebin.c
+++ b/src/gromacs/mdlib/ebin.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/ewald.c b/src/gromacs/mdlib/ewald.c
index 02d6753046..e4b789df76 100644
--- a/src/gromacs/mdlib/ewald.c
+++ b/src/gromacs/mdlib/ewald.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/expanded.c b/src/gromacs/mdlib/expanded.c
index 73aff1cb08..78eba4f50a 100644
--- a/src/gromacs/mdlib/expanded.c
+++ b/src/gromacs/mdlib/expanded.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/force.c b/src/gromacs/mdlib/force.c
index a96d4453c1..b1ab06b301 100644
--- a/src/gromacs/mdlib/force.c
+++ b/src/gromacs/mdlib/force.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/mdlib/forcerec.c b/src/gromacs/mdlib/forcerec.c
index 8913bcb804..7f57b28083 100644
--- a/src/gromacs/mdlib/forcerec.c
+++ b/src/gromacs/mdlib/forcerec.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/mdlib/genborn.c b/src/gromacs/mdlib/genborn.c
index 73b90e65ee..53c5128dd3 100644
--- a/src/gromacs/mdlib/genborn.c
+++ b/src/gromacs/mdlib/genborn.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/genborn_allvsall.c b/src/gromacs/mdlib/genborn_allvsall.c
index 586c48a8a7..fe9d4c8e6c 100644
--- a/src/gromacs/mdlib/genborn_allvsall.c
+++ b/src/gromacs/mdlib/genborn_allvsall.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/genborn_allvsall_sse2_double.c b/src/gromacs/mdlib/genborn_allvsall_sse2_double.c
index 71257f1e5d..7484cdd182 100644
--- a/src/gromacs/mdlib/genborn_allvsall_sse2_double.c
+++ b/src/gromacs/mdlib/genborn_allvsall_sse2_double.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/genborn_allvsall_sse2_single.c b/src/gromacs/mdlib/genborn_allvsall_sse2_single.c
index b2862e6037..938b6c16a2 100644
--- a/src/gromacs/mdlib/genborn_allvsall_sse2_single.c
+++ b/src/gromacs/mdlib/genborn_allvsall_sse2_single.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/genborn_sse2_double.c b/src/gromacs/mdlib/genborn_sse2_double.c
index de349d2ba1..c8836ae5f5 100644
--- a/src/gromacs/mdlib/genborn_sse2_double.c
+++ b/src/gromacs/mdlib/genborn_sse2_double.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/genborn_sse2_single.c b/src/gromacs/mdlib/genborn_sse2_single.c
index 0a8112353e..f71b22075a 100644
--- a/src/gromacs/mdlib/genborn_sse2_single.c
+++ b/src/gromacs/mdlib/genborn_sse2_single.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/groupcoord.c b/src/gromacs/mdlib/groupcoord.c
index 114ca33dd9..6b6c44bb02 100644
--- a/src/gromacs/mdlib/groupcoord.c
+++ b/src/gromacs/mdlib/groupcoord.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 
diff --git a/src/gromacs/mdlib/init.c b/src/gromacs/mdlib/init.c
index 356084d876..98b72dda5f 100644
--- a/src/gromacs/mdlib/init.c
+++ b/src/gromacs/mdlib/init.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/mdlib/iteratedconstraints.c b/src/gromacs/mdlib/iteratedconstraints.c
index e0768692b9..c7e6cc0800 100644
--- a/src/gromacs/mdlib/iteratedconstraints.c
+++ b/src/gromacs/mdlib/iteratedconstraints.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/md_support.cpp b/src/gromacs/mdlib/md_support.cpp
index 3bb87512ad..5e2b4702a7 100644
--- a/src/gromacs/mdlib/md_support.cpp
+++ b/src/gromacs/mdlib/md_support.cpp
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include <algorithm>
 
 #include "config.h"
diff --git a/src/gromacs/mdlib/mdatom.c b/src/gromacs/mdlib/mdatom.c
index 5139416bcc..a3d29d00ce 100644
--- a/src/gromacs/mdlib/mdatom.c
+++ b/src/gromacs/mdlib/mdatom.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/mdebin.c b/src/gromacs/mdlib/mdebin.c
index c9bf43c109..755671ad7e 100644
--- a/src/gromacs/mdlib/mdebin.c
+++ b/src/gromacs/mdlib/mdebin.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <float.h>
diff --git a/src/gromacs/mdlib/mdebin_bar.c b/src/gromacs/mdlib/mdebin_bar.c
index 3bac0f4a8c..d65fd5bd1d 100644
--- a/src/gromacs/mdlib/mdebin_bar.c
+++ b/src/gromacs/mdlib/mdebin_bar.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/mdlib/minimize.c b/src/gromacs/mdlib/minimize.c
index c4649fba08..83533b671f 100644
--- a/src/gromacs/mdlib/minimize.c
+++ b/src/gromacs/mdlib/minimize.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/nbnxn_atomdata.c b/src/gromacs/mdlib/nbnxn_atomdata.c
index 4c8fe4dc05..dd0e53d9c2 100644
--- a/src/gromacs/mdlib/nbnxn_atomdata.c
+++ b/src/gromacs/mdlib/nbnxn_atomdata.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
index 99867a4e4b..2d48a302ba 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
+++ b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
index 0c2808c832..fead7a37b4 100644
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
+++ b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.c b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.c
index beb6216619..01ac896878 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/pbcutil/ishift.h"
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.c.pre b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.c.pre
index 3aa7ae025e..3df39d1b35 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.c.pre
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.c.pre
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -38,6 +38,8 @@
  * {0}, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE {7}
 #include "{4}"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.c.pre b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.c.pre
index 622f011f53..1cea2e52db 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.c.pre
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.c.pre
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -38,6 +38,8 @@
  * {0}, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE {7}
 #include "{4}"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre
index bf7fdfaf45..01de457ba7 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.c b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.c
index 2b9263f70d..30cfb49890 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.c b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.c
index 3528e7c258..efcafd3f1d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c
index 76b056ec75..92fa205924 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c
index 44671ee1ad..a185b34ae1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c
index 7f1513fab6..2bd610475a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c
index 369bfbfe28..f8df0d1608 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c
index 61d29bba95..60b44eaad7 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c
index 769037be60..98d9a76743 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c
index bb32524cb1..a0bdcaf9da 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c
index 5c53c287bb..cf16f338da 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c
index df6ca901bb..c9f31aac3e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c
index dc919db9e1..c9db2f695e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c
index 42650bcfc8..492fdf47b6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c
index 3ba6f95959..9a61c3587a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c
index c1f0727b92..0dbe141f1c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c
index c627bacf2c..b3dbe7df32 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c
index c83c7a6549..a2607afccc 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c
index fe72d654c0..6486f87398 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c
index d60902913c..e78d7efbab 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c
index 4d4db8b382..7be3d0d382 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c
index 9a35731fc1..e55c12ba31 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c
index 92b0afbd10..02b0770e1b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c
index 26c75477df..e36e0b7a5c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c
index ea8cf655db..2bb3d60974 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c
index ad64932b61..71a1d8f726 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c
index ba3512160c..9ce999afe1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c
index cb67816b7e..2630368ef6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c
index f71bb45808..a36d02901e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c
index a57df6e663..36bdb2edeb 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c
index 59f709a399..b1f8efab0c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c
index c5c4c14ef6..9c6436c01d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c
index 885f4f4f28..17ac8b6bac 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c
index 4ff834e209..78bb68c6d5 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c
index 926a8b6bbb..e7a92694b2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c
index 0997b57c5b..be8310d57a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c
index 68aa2b3963..595a4e17c3 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c
index 71d77c1255..4b5e396930 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c
index a2e613257a..9c615fc056 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c
index 16448b72ba..ac1bac3559 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c
index 22315ee333..8ca1201c63 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c
index 64ce413cc9..7d287bb470 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c
index 5c89c4fb3b..3104a954bb 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c
index d4e17ecfdd..43c39692c6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c
index 3c75e0801b..e776859785 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c
index ae5d693ffc..8d56d5fbef 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c
index 5d991b37e6..85f4c82af4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c
index bc09bbddab..27597daf25 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c
index bd8436c676..8d94349b59 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c
index 28b27d3a8a..a1445b9728 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c
index 2077c6dd05..b3355d178e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c
index a6e4f45b44..3e50b33502 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c
index 2972fcfe35..a252346e1b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c
index d267d8e678..7689552cb8 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c
index 118dc553fb..01b4a1fed1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c
index e04c3d911e..28da502b13 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c
index e0af6c8177..6a5e1caa72 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c
index 78ecf6966c..ca80a2c5a2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c
index f2136020bd..a3dcc895e9 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c
index 2ddcb859b5..8230bd5231 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c
index 0182f56c95..7da7b8b028 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c
index 23ed646115..a501786277 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c
index 54c5d56a28..04955a9f4a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c
index 2fa3ed90af..d57d9ea30e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c
index ba086c8a92..e3873090df 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c
index 7906b80fe1..60dc327d9c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c
index 18f5ab376c..fde68ab89c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c
index e61100d102..da22fa6c61 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c
index 2276f91a5c..afa5cf4527 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c
index ef13e59a2e..a9956bec68 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c
index c7f15d611c..932b8613e0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c
index c10f52cad3..a025333737 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c
index def30cfc19..7e692d8502 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c
index a996b1a885..df0e6015ee 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c
index 459729abbd..d6851b72fb 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c
index 42222b7bb7..312f517b48 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c
index f6e9e6fffc..6514acf3d3 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c
index 0d03367d14..744a8499ed 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c
index 7bd991cf80..304bbedfc3 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c
index 8b7415b0e5..466e022b1a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c
index 44cc1e9a15..065842ee12 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c
index e220d69377..d8fd357f21 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c
index 630ec030dd..a4617e519e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c
index c18876d614..6ebd8b599a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c
index d6600ae047..c2750861f3 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c
index edf6fddfc0..466a32fc36 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c
index e43052880d..019637174f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c
index 198955942f..5b445bc227 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c
index ccb52a8b1f..c247be24e5 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c
index bec4d4c39a..936249a191 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c
index 9eec2b3032..7fb0aafa4e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c
index 46a2417fd3..6ba517b12f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c
index 90b38d6263..0006e37314 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_2XNN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 2
 #include "nbnxn_kernel_simd_2xnn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c
index 6dfe854a95..37ca75a469 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c
@@ -37,6 +37,8 @@
  * kernel type 2xnn.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c
index 8e0ce57385..b6912b1ce0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c
index e877eea039..4d589ded9e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c
index 079eba6952..cd44b55d63 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c
index 6da840273a..ec4c2ad9c2 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c
index db2d2ebef9..071b439555 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c
index 6ea91013e8..a1d43fbc8d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c
index 85d4cb9689..7d1b2a0790 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c
index 55fd27a07a..05dd5803d4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c
index fe173b32a0..923eefdfc1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c
index 199fb5c623..5c594bf235 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c
index aefb1ae61a..11ed136c49 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c
index 1f21e2613a..50548c7ac3 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c
index 8f95cb7e1a..0a46f1f338 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c
index f7fb96448e..e8a021dda4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c
index bb9c907dd0..b87c169c8d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c
index 20ab0c5e14..75ee506ec0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c
index 5e982d5eb3..daa4077604 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c
index b68109cde3..e34e4fae8f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c
index 8c59343b3e..674921906f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c
index 014a837702..e7d3ae2397 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c
index ae3950f048..bdfcaad849 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c
index 9045ae46c9..c2b8077f29 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c
index 9020fd4d0b..388c77b797 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c
index 806e259223..585e6fa629 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c
index eb6df02565..ab7dedeea0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c
index db3f1cd84b..370fbfc1be 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c
index 487d76842e..af5b8890bc 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c
index ea145640cc..1fbc70dbdf 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c
index 16ed3130c3..7da6ae093f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c
index e440224f0f..7977cb675c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c
index ba18cfb1be..f5ea20ada6 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c
index 452bf4b9d0..6b20f3a2be 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c
index 2a754765e0..a51fe16829 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c
index 7f9dd0af81..8ab3354b20 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c
index 504e91db22..d6ca4d86dd 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c
index 71c5db2ba5..548cd68b30 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c
index fb90fe0406..878f847f7b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c
index 0b18b0b573..d884c0dd01 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c
index 56b173331d..933385105a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c
index 94ca416349..0bf9f70973 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c
index 7eded238af..c48d03a142 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c
index 0657e0e4bf..b1a9bba85b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c
index 58cebd8fed..1362cd0bd0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c
index 1ff9cddc5b..9b984eb98c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c
index 9c211d4950..f76e070c2c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c
index f37b271857..c4ece087fe 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c
index 22b395bfe7..4c1a1266cc 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c
index faef66891c..f8fcee805e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c
index bd495ebcb8..386bbf0f19 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c
index ee2e69b9e7..238c9ee0bf 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c
index 8ce952c1cf..6a08aefae1 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c
index eea95fb0bd..6c28e93511 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c
index 3c78488ab4..e1d764c5be 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c
index f347e81186..048c895d02 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c
index 0830a5d3d4..ebd3ef988b 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c
index 45a1660512..0a223cd91f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c
index 803070fca8..7dfdb7463d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c
index ed0d1b4cc0..c369001f27 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c
index 3936c1e233..0f9f9a88cb 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c
index defe4535ca..a7fc39cfdd 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c
index ce52c0e291..7ac56575f4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c
index ab580a8b51..79a56a2fa4 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c
index d23c22e43a..8f2002026c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c
index 2667a84575..2a7dec2304 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c
index 9bb1c64890..84d1db5b2f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c
index 1568dd540d..acff6ca1e0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c
index 8f1ce9210f..2c3c2ca24d 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c
index d1c7ea4697..db9ace5eb3 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c
index 472c06690f..a1b62d83bc 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c
index 2b604bb7fc..e5221fe728 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c
index 33e92d77a3..4fb8c18bc3 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c
index eafdb1615a..1fa4a051dd 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c
index a77ee987a3..b04a7f7f40 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c
index 8b7c2e3396..71a287186e 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c
index 57e35f7997..584ce4b7bf 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c
index 6b47f07dca..6e74f582ac 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c
index 41a404314c..167ca686ba 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c
index 9ccd2b7a53..9244e71767 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c
index 0f3ac29b4a..83d33f6fc5 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c
index c1403ce23c..82d9f04a9f 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c
index 7d6e2fc64d..b62a2d1aaf 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c
index bc1873f650..42a6afc879 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c
index 16f3094608..12acfa0e43 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c
index 7ee74d34ab..d3898338ef 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c
index 19213cc2f8..edc207a38a 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c
index 2a11985b2f..7fee136be7 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c
index 9e0233f841..a6d6d2a629 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c
index cdb8bbfd4b..5dfa958973 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c
index 0ea279ab33..86ece6a26c 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c
index 21b243907e..daed2c5eb0 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c
@@ -43,6 +43,8 @@
  * GMX_NBNXN_SIMD_4XN, so that this file reduces to a stub
  * function definition when the kernel will never be called.
  */
+#include "gmxpre.h"
+
 #define GMX_SIMD_J_UNROLL_SIZE 1
 #include "nbnxn_kernel_simd_4xn.h"
 
diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c
index 987e179cea..be21910a62 100644
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c
@@ -37,6 +37,8 @@
  * kernel type 4xn.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/nbnxn_search.c b/src/gromacs/mdlib/nbnxn_search.c
index 0b7579fd3a..8108297b36 100644
--- a/src/gromacs/mdlib/nbnxn_search.c
+++ b/src/gromacs/mdlib/nbnxn_search.c
@@ -33,6 +33,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/nlistheuristics.c b/src/gromacs/mdlib/nlistheuristics.c
index 4c498ec17e..a7c4e38930 100644
--- a/src/gromacs/mdlib/nlistheuristics.c
+++ b/src/gromacs/mdlib/nlistheuristics.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/ns.c b/src/gromacs/mdlib/ns.c
index 941fd4481c..f9ec98676e 100644
--- a/src/gromacs/mdlib/ns.c
+++ b/src/gromacs/mdlib/ns.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/nsgrid.c b/src/gromacs/mdlib/nsgrid.c
index 6d564c49c1..392c68c8e7 100644
--- a/src/gromacs/mdlib/nsgrid.c
+++ b/src/gromacs/mdlib/nsgrid.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/mdlib/perf_est.c b/src/gromacs/mdlib/perf_est.c
index 182ff35cd7..305fac80d2 100644
--- a/src/gromacs/mdlib/perf_est.c
+++ b/src/gromacs/mdlib/perf_est.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/pme.c b/src/gromacs/mdlib/pme.c
index 982e4f2b8d..81821d9708 100644
--- a/src/gromacs/mdlib/pme.c
+++ b/src/gromacs/mdlib/pme.c
@@ -57,6 +57,8 @@
  * /Erik 001109
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/mdlib/pme_pp.c b/src/gromacs/mdlib/pme_pp.c
index fc4ea6598e..6ed1d563fb 100644
--- a/src/gromacs/mdlib/pme_pp.c
+++ b/src/gromacs/mdlib/pme_pp.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 
diff --git a/src/gromacs/mdlib/qm_gamess.c b/src/gromacs/mdlib/qm_gamess.c
index e74e75af4f..a1cda55476 100644
--- a/src/gromacs/mdlib/qm_gamess.c
+++ b/src/gromacs/mdlib/qm_gamess.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #ifdef GMX_QMMM_GAMESS
diff --git a/src/gromacs/mdlib/qm_gaussian.c b/src/gromacs/mdlib/qm_gaussian.c
index 40ec23e003..a24a67f325 100644
--- a/src/gromacs/mdlib/qm_gaussian.c
+++ b/src/gromacs/mdlib/qm_gaussian.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #ifdef GMX_QMMM_GAUSSIAN
diff --git a/src/gromacs/mdlib/qm_mopac.c b/src/gromacs/mdlib/qm_mopac.c
index ba8de50900..8e9f6a4e58 100644
--- a/src/gromacs/mdlib/qm_mopac.c
+++ b/src/gromacs/mdlib/qm_mopac.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #ifdef GMX_QMMM_MOPAC
diff --git a/src/gromacs/mdlib/qm_orca.c b/src/gromacs/mdlib/qm_orca.c
index 809bfdcf4f..c48b419b01 100644
--- a/src/gromacs/mdlib/qm_orca.c
+++ b/src/gromacs/mdlib/qm_orca.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/qmmm.c b/src/gromacs/mdlib/qmmm.c
index ce866c2b21..f6679a552a 100644
--- a/src/gromacs/mdlib/qmmm.c
+++ b/src/gromacs/mdlib/qmmm.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/rf_util.c b/src/gromacs/mdlib/rf_util.c
index 3af2ad3a50..3db4e4dce7 100644
--- a/src/gromacs/mdlib/rf_util.c
+++ b/src/gromacs/mdlib/rf_util.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/typedefs.h"
diff --git a/src/gromacs/mdlib/shakef.c b/src/gromacs/mdlib/shakef.c
index 6410760165..a14538b115 100644
--- a/src/gromacs/mdlib/shakef.c
+++ b/src/gromacs/mdlib/shakef.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/shellfc.c b/src/gromacs/mdlib/shellfc.c
index acda83b9cd..e5b7a3d75f 100644
--- a/src/gromacs/mdlib/shellfc.c
+++ b/src/gromacs/mdlib/shellfc.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/mdlib/sim_util.c b/src/gromacs/mdlib/sim_util.c
index c2c7e7a58b..0cdb28b885 100644
--- a/src/gromacs/mdlib/sim_util.c
+++ b/src/gromacs/mdlib/sim_util.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/mdlib/stat.c b/src/gromacs/mdlib/stat.c
index 4257332087..246728091d 100644
--- a/src/gromacs/mdlib/stat.c
+++ b/src/gromacs/mdlib/stat.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/gromacs/mdlib/tables.c b/src/gromacs/mdlib/tables.c
index d5d1a59ba0..5a45deedb3 100644
--- a/src/gromacs/mdlib/tables.c
+++ b/src/gromacs/mdlib/tables.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/tgroup.c b/src/gromacs/mdlib/tgroup.c
index dece3b06c9..7e7816e1e7 100644
--- a/src/gromacs/mdlib/tgroup.c
+++ b/src/gromacs/mdlib/tgroup.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 
diff --git a/src/gromacs/mdlib/tpi.c b/src/gromacs/mdlib/tpi.c
index d023e0b98a..6c4c0294d5 100644
--- a/src/gromacs/mdlib/tpi.c
+++ b/src/gromacs/mdlib/tpi.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/update.c b/src/gromacs/mdlib/update.c
index 43712bfee9..8561506e9a 100644
--- a/src/gromacs/mdlib/update.c
+++ b/src/gromacs/mdlib/update.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 
diff --git a/src/gromacs/mdlib/vcm.c b/src/gromacs/mdlib/vcm.c
index 0bf1083d54..8a6267009a 100644
--- a/src/gromacs/mdlib/vcm.c
+++ b/src/gromacs/mdlib/vcm.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/mdlib/vsite.c b/src/gromacs/mdlib/vsite.c
index 22335e5952..861c9ef299 100644
--- a/src/gromacs/mdlib/vsite.c
+++ b/src/gromacs/mdlib/vsite.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/mdlib/wall.c b/src/gromacs/mdlib/wall.c
index 034dce862c..be08c6bb63 100644
--- a/src/gromacs/mdlib/wall.c
+++ b/src/gromacs/mdlib/wall.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/mdlib/wnblist.c b/src/gromacs/mdlib/wnblist.c
index ef3314c74e..da8f9a2470 100644
--- a/src/gromacs/mdlib/wnblist.c
+++ b/src/gromacs/mdlib/wnblist.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/onlinehelp/helpformat.cpp b/src/gromacs/onlinehelp/helpformat.cpp
index e98f6a63a9..e5f7212393 100644
--- a/src/gromacs/onlinehelp/helpformat.cpp
+++ b/src/gromacs/onlinehelp/helpformat.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_onlinehelp
  */
+#include "gmxpre.h"
+
 #include "helpformat.h"
 
 #include <algorithm>
diff --git a/src/gromacs/onlinehelp/helpmanager.cpp b/src/gromacs/onlinehelp/helpmanager.cpp
index 733509737d..45193dcd51 100644
--- a/src/gromacs/onlinehelp/helpmanager.cpp
+++ b/src/gromacs/onlinehelp/helpmanager.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012, by the GROMACS development team, led by
+ * Copyright (c) 2012,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_onlinehelp
  */
+#include "gmxpre.h"
+
 #include "helpmanager.h"
 
 #include <string>
diff --git a/src/gromacs/onlinehelp/helptopic.cpp b/src/gromacs/onlinehelp/helptopic.cpp
index 10a86d8553..8bcaa6ac94 100644
--- a/src/gromacs/onlinehelp/helptopic.cpp
+++ b/src/gromacs/onlinehelp/helptopic.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_onlinehelp
  */
+#include "gmxpre.h"
+
 #include "helptopic.h"
 
 #include <map>
diff --git a/src/gromacs/onlinehelp/helpwritercontext.cpp b/src/gromacs/onlinehelp/helpwritercontext.cpp
index 2eff412668..8ede31c71a 100644
--- a/src/gromacs/onlinehelp/helpwritercontext.cpp
+++ b/src/gromacs/onlinehelp/helpwritercontext.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_onlinehelp
  */
+#include "gmxpre.h"
+
 #include "helpwritercontext.h"
 
 #include <cctype>
diff --git a/src/gromacs/onlinehelp/tests/helpformat.cpp b/src/gromacs/onlinehelp/tests/helpformat.cpp
index b7a03e94ac..f74a80da34 100644
--- a/src/gromacs/onlinehelp/tests/helpformat.cpp
+++ b/src/gromacs/onlinehelp/tests/helpformat.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_onlinehelp
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/onlinehelp/helpformat.h"
diff --git a/src/gromacs/onlinehelp/tests/helpmanager.cpp b/src/gromacs/onlinehelp/tests/helpmanager.cpp
index b3ce50e09f..09b22225f1 100644
--- a/src/gromacs/onlinehelp/tests/helpmanager.cpp
+++ b/src/gromacs/onlinehelp/tests/helpmanager.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_onlinehelp
  */
+#include "gmxpre.h"
+
 #include "gromacs/onlinehelp/helpmanager.h"
 
 #include <string>
diff --git a/src/gromacs/onlinehelp/tests/mock_helptopic.cpp b/src/gromacs/onlinehelp/tests/mock_helptopic.cpp
index f982a7ac16..5d7484d1f9 100644
--- a/src/gromacs/onlinehelp/tests/mock_helptopic.cpp
+++ b/src/gromacs/onlinehelp/tests/mock_helptopic.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_onlinehelp
  */
+#include "gmxpre.h"
+
 #include "mock_helptopic.h"
 
 #include <gmock/gmock.h>
diff --git a/src/gromacs/options/abstractoption.cpp b/src/gromacs/options/abstractoption.cpp
index 0db9950f98..c81d0e2a56 100644
--- a/src/gromacs/options/abstractoption.cpp
+++ b/src/gromacs/options/abstractoption.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "gromacs/options/abstractoption.h"
 
 #include "gromacs/options/abstractoptionstorage.h"
diff --git a/src/gromacs/options/basicoptions.cpp b/src/gromacs/options/basicoptions.cpp
index 30eb023026..2b2c086335 100644
--- a/src/gromacs/options/basicoptions.cpp
+++ b/src/gromacs/options/basicoptions.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "basicoptions.h"
 #include "basicoptionstorage.h"
 
diff --git a/src/gromacs/options/filenameoption.cpp b/src/gromacs/options/filenameoption.cpp
index 8c06ea6887..4689f66d3c 100644
--- a/src/gromacs/options/filenameoption.cpp
+++ b/src/gromacs/options/filenameoption.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "filenameoption.h"
 #include "filenameoptionstorage.h"
 
diff --git a/src/gromacs/options/filenameoptionmanager.cpp b/src/gromacs/options/filenameoptionmanager.cpp
index 390f399818..834ec2cc78 100644
--- a/src/gromacs/options/filenameoptionmanager.cpp
+++ b/src/gromacs/options/filenameoptionmanager.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "filenameoptionmanager.h"
 
 #include <cstring>
diff --git a/src/gromacs/options/options.cpp b/src/gromacs/options/options.cpp
index b208ecb744..9aa05a27ff 100644
--- a/src/gromacs/options/options.cpp
+++ b/src/gromacs/options/options.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "gromacs/options/options.h"
 
 #include "gromacs/options/abstractoption.h"
diff --git a/src/gromacs/options/optionsassigner.cpp b/src/gromacs/options/optionsassigner.cpp
index a5ed703bee..6274213a55 100644
--- a/src/gromacs/options/optionsassigner.cpp
+++ b/src/gromacs/options/optionsassigner.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "gromacs/options/optionsassigner.h"
 
 #include <deque>
diff --git a/src/gromacs/options/optionsvisitor.cpp b/src/gromacs/options/optionsvisitor.cpp
index 4d0b3f678b..9f74f946d6 100644
--- a/src/gromacs/options/optionsvisitor.cpp
+++ b/src/gromacs/options/optionsvisitor.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2012, by the GROMACS development team, led by
+ * Copyright (c) 2010,2012,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "gromacs/options/optionsvisitor.h"
 
 #include "gromacs/options/abstractoptionstorage.h"
diff --git a/src/gromacs/options/tests/abstractoptionstorage.cpp b/src/gromacs/options/tests/abstractoptionstorage.cpp
index ed1b4c6c21..cdd5bbaf1b 100644
--- a/src/gromacs/options/tests/abstractoptionstorage.cpp
+++ b/src/gromacs/options/tests/abstractoptionstorage.cpp
@@ -42,6 +42,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include <vector>
 #include <string>
 
diff --git a/src/gromacs/options/tests/filenameoption.cpp b/src/gromacs/options/tests/filenameoption.cpp
index 75eb2be5f8..cefed8dec3 100644
--- a/src/gromacs/options/tests/filenameoption.cpp
+++ b/src/gromacs/options/tests/filenameoption.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "gromacs/options/filenameoption.h"
 
 #include <gtest/gtest.h>
diff --git a/src/gromacs/options/tests/filenameoptionmanager.cpp b/src/gromacs/options/tests/filenameoptionmanager.cpp
index ab75cd5b2d..f0e2ecd5d8 100644
--- a/src/gromacs/options/tests/filenameoptionmanager.cpp
+++ b/src/gromacs/options/tests/filenameoptionmanager.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "gromacs/options/filenameoptionmanager.h"
 
 #include <gtest/gtest.h>
diff --git a/src/gromacs/options/tests/option.cpp b/src/gromacs/options/tests/option.cpp
index 97e7d9a5f7..2cc756bc94 100644
--- a/src/gromacs/options/tests/option.cpp
+++ b/src/gromacs/options/tests/option.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -42,6 +42,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include <vector>
 #include <string>
 
diff --git a/src/gromacs/options/tests/optionsassigner.cpp b/src/gromacs/options/tests/optionsassigner.cpp
index 8fb44f0bd4..91331d0768 100644
--- a/src/gromacs/options/tests/optionsassigner.cpp
+++ b/src/gromacs/options/tests/optionsassigner.cpp
@@ -45,6 +45,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include <limits>
 #include <vector>
 
diff --git a/src/gromacs/options/tests/timeunitmanager.cpp b/src/gromacs/options/tests/timeunitmanager.cpp
index 5f19d51b9c..11989bc002 100644
--- a/src/gromacs/options/tests/timeunitmanager.cpp
+++ b/src/gromacs/options/tests/timeunitmanager.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -41,6 +41,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/options/basicoptions.h"
diff --git a/src/gromacs/options/timeunitmanager.cpp b/src/gromacs/options/timeunitmanager.cpp
index 721a61c01d..d77e10700c 100644
--- a/src/gromacs/options/timeunitmanager.cpp
+++ b/src/gromacs/options/timeunitmanager.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
+#include "gmxpre.h"
+
 #include "gromacs/options/timeunitmanager.h"
 
 #include <cstdlib>
diff --git a/src/gromacs/pbcutil/mshift.cpp b/src/gromacs/pbcutil/mshift.cpp
index 94db47bd07..0c94f2321a 100644
--- a/src/gromacs/pbcutil/mshift.cpp
+++ b/src/gromacs/pbcutil/mshift.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/pbcutil/mshift.h"
 
 #include "config.h"
diff --git a/src/gromacs/pbcutil/pbc.c b/src/gromacs/pbcutil/pbc.c
index 755c0fe901..41a4256f4e 100644
--- a/src/gromacs/pbcutil/pbc.c
+++ b/src/gromacs/pbcutil/pbc.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/pbcutil/pbc.h"
 
 #include "config.h"
diff --git a/src/gromacs/pbcutil/rmpbc.c b/src/gromacs/pbcutil/rmpbc.c
index ee5e2d9239..fd732c653d 100644
--- a/src/gromacs/pbcutil/rmpbc.c
+++ b/src/gromacs/pbcutil/rmpbc.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/pbcutil/rmpbc.h"
 
 #include "config.h"
diff --git a/src/gromacs/pulling/pull.c b/src/gromacs/pulling/pull.c
index e234c50c96..bfadaa93e0 100644
--- a/src/gromacs/pulling/pull.c
+++ b/src/gromacs/pulling/pull.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/pulling/pull_rotation.c b/src/gromacs/pulling/pull_rotation.c
index 4b07b06004..0aa84dbcce 100644
--- a/src/gromacs/pulling/pull_rotation.c
+++ b/src/gromacs/pulling/pull_rotation.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/pulling/pullutil.c b/src/gromacs/pulling/pullutil.c
index f601f2fcca..97287aa708 100644
--- a/src/gromacs/pulling/pullutil.c
+++ b/src/gromacs/pulling/pullutil.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/random/random.c b/src/gromacs/random/random.c
index 724012e725..4004db7ad5 100644
--- a/src/gromacs/random/random.c
+++ b/src/gromacs/random/random.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "random.h"
diff --git a/src/gromacs/random/tests/random.cpp b/src/gromacs/random/tests/random.cpp
index 835a638011..e52a67d7a4 100644
--- a/src/gromacs/random/tests/random.cpp
+++ b/src/gromacs/random/tests/random.cpp
@@ -39,6 +39,8 @@
  * \author Roland Schulz <roland@utk.edu>
  * \ingroup module_random
  */
+#include "gmxpre.h"
+
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/src/gromacs/selection/centerofmass.cpp b/src/gromacs/selection/centerofmass.cpp
index a50e15d660..a3fa6c369a 100644
--- a/src/gromacs/selection/centerofmass.cpp
+++ b/src/gromacs/selection/centerofmass.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/selection/centerofmass.h"
 
 #include <errno.h>
diff --git a/src/gromacs/selection/compiler.cpp b/src/gromacs/selection/compiler.cpp
index fc968633d1..293073fd50 100644
--- a/src/gromacs/selection/compiler.cpp
+++ b/src/gromacs/selection/compiler.cpp
@@ -269,6 +269,8 @@
  * calculated.
  * Currently, no other processing is done.
  */
+#include "gmxpre.h"
+
 #include "compiler.h"
 
 #include <algorithm>
diff --git a/src/gromacs/selection/evaluate.cpp b/src/gromacs/selection/evaluate.cpp
index 9191823b8d..1a38971544 100644
--- a/src/gromacs/selection/evaluate.cpp
+++ b/src/gromacs/selection/evaluate.cpp
@@ -50,6 +50,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <string.h>
 
 #include "gromacs/math/utilities.h"
diff --git a/src/gromacs/selection/indexutil.cpp b/src/gromacs/selection/indexutil.cpp
index ad377e9b61..6fd4666a01 100644
--- a/src/gromacs/selection/indexutil.cpp
+++ b/src/gromacs/selection/indexutil.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/selection/indexutil.h"
 
 #include <cstdlib>
diff --git a/src/gromacs/selection/mempool.cpp b/src/gromacs/selection/mempool.cpp
index 177ff0f77b..99dd91dba6 100644
--- a/src/gromacs/selection/mempool.cpp
+++ b/src/gromacs/selection/mempool.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <stdlib.h>
 
 #include <new>
diff --git a/src/gromacs/selection/nbsearch.cpp b/src/gromacs/selection/nbsearch.cpp
index 1e8f1cfdad..758d97aa12 100644
--- a/src/gromacs/selection/nbsearch.cpp
+++ b/src/gromacs/selection/nbsearch.cpp
@@ -55,6 +55,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/selection/nbsearch.h"
 
 #include <cmath>
diff --git a/src/gromacs/selection/params.cpp b/src/gromacs/selection/params.cpp
index 73b190d121..b8cac2501a 100644
--- a/src/gromacs/selection/params.cpp
+++ b/src/gromacs/selection/params.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <algorithm>
 #include <string>
 
diff --git a/src/gromacs/selection/parsetree.cpp b/src/gromacs/selection/parsetree.cpp
index 926aae201d..a978356c70 100644
--- a/src/gromacs/selection/parsetree.cpp
+++ b/src/gromacs/selection/parsetree.cpp
@@ -219,6 +219,8 @@
  * Each element has exactly two children (one for unary negation elements),
  * which are in the order given in the input.
  */
+#include "gmxpre.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 
diff --git a/src/gromacs/selection/poscalc.cpp b/src/gromacs/selection/poscalc.cpp
index 61a8977ba8..822791a6a0 100644
--- a/src/gromacs/selection/poscalc.cpp
+++ b/src/gromacs/selection/poscalc.cpp
@@ -59,6 +59,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <string.h>
 
 #include <algorithm>
diff --git a/src/gromacs/selection/position.cpp b/src/gromacs/selection/position.cpp
index c33cdc3d86..e71a9aad98 100644
--- a/src/gromacs/selection/position.cpp
+++ b/src/gromacs/selection/position.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/selection/position.h"
 
 #include <string.h>
diff --git a/src/gromacs/selection/scanner_internal.cpp b/src/gromacs/selection/scanner_internal.cpp
index 1b5ecb4037..ce4114854f 100644
--- a/src/gromacs/selection/scanner_internal.cpp
+++ b/src/gromacs/selection/scanner_internal.cpp
@@ -51,6 +51,8 @@
  * \ingroup module_selection
  * \endcond
  */
+#include "gmxpre.h"
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/gromacs/selection/selection.cpp b/src/gromacs/selection/selection.cpp
index f317486fe2..c114a4fa59 100644
--- a/src/gromacs/selection/selection.cpp
+++ b/src/gromacs/selection/selection.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "selection.h"
 
 #include "gromacs/topology/topology.h"
diff --git a/src/gromacs/selection/selectioncollection.cpp b/src/gromacs/selection/selectioncollection.cpp
index 2ba4fb5fe7..288bcea5e0 100644
--- a/src/gromacs/selection/selectioncollection.cpp
+++ b/src/gromacs/selection/selectioncollection.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "selectioncollection.h"
 
 #include <cctype>
diff --git a/src/gromacs/selection/selectionoption.cpp b/src/gromacs/selection/selectionoption.cpp
index 4063cc85a3..923384d7e7 100644
--- a/src/gromacs/selection/selectionoption.cpp
+++ b/src/gromacs/selection/selectionoption.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "selectionoption.h"
 #include "selectionfileoption.h"
 #include "selectionoptionstorage.h"
diff --git a/src/gromacs/selection/selectionoptionmanager.cpp b/src/gromacs/selection/selectionoptionmanager.cpp
index effb758ba0..a545c67363 100644
--- a/src/gromacs/selection/selectionoptionmanager.cpp
+++ b/src/gromacs/selection/selectionoptionmanager.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "selectionoptionmanager.h"
 
 #include <cstdio>
diff --git a/src/gromacs/selection/selelem.cpp b/src/gromacs/selection/selelem.cpp
index b396fa1a11..c52adbd769 100644
--- a/src/gromacs/selection/selelem.cpp
+++ b/src/gromacs/selection/selelem.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <cstring>
 
 #include "gromacs/selection/indexutil.h"
diff --git a/src/gromacs/selection/selhelp.cpp b/src/gromacs/selection/selhelp.cpp
index b0dd12f445..0b707c8b27 100644
--- a/src/gromacs/selection/selhelp.cpp
+++ b/src/gromacs/selection/selhelp.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <string>
 #include <vector>
 #include <utility>
diff --git a/src/gromacs/selection/selmethod.cpp b/src/gromacs/selection/selmethod.cpp
index fc74d4a556..b8a8645a9b 100644
--- a/src/gromacs/selection/selmethod.cpp
+++ b/src/gromacs/selection/selmethod.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <ctype.h>
 #include <stdarg.h>
 
diff --git a/src/gromacs/selection/selvalue.cpp b/src/gromacs/selection/selvalue.cpp
index 18a51f0a26..c41ba668a9 100644
--- a/src/gromacs/selection/selvalue.cpp
+++ b/src/gromacs/selection/selvalue.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/selection/indexutil.h"
 #include "gromacs/selection/position.h"
 #include "gromacs/selection/selvalue.h"
diff --git a/src/gromacs/selection/sm_compare.cpp b/src/gromacs/selection/sm_compare.cpp
index 7c12dd9a5f..8e4af8ba70 100644
--- a/src/gromacs/selection/sm_compare.cpp
+++ b/src/gromacs/selection/sm_compare.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <cmath>
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/selection/sm_distance.cpp b/src/gromacs/selection/sm_distance.cpp
index 40858a7d71..a7725533f3 100644
--- a/src/gromacs/selection/sm_distance.cpp
+++ b/src/gromacs/selection/sm_distance.cpp
@@ -42,6 +42,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/macros.h"
 
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/selection/sm_insolidangle.cpp b/src/gromacs/selection/sm_insolidangle.cpp
index 88ce74419b..1c37cb4b32 100644
--- a/src/gromacs/selection/sm_insolidangle.cpp
+++ b/src/gromacs/selection/sm_insolidangle.cpp
@@ -112,6 +112,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <algorithm>
 
 #include <math.h>
diff --git a/src/gromacs/selection/sm_keywords.cpp b/src/gromacs/selection/sm_keywords.cpp
index ecf721beac..13d126ca45 100644
--- a/src/gromacs/selection/sm_keywords.cpp
+++ b/src/gromacs/selection/sm_keywords.cpp
@@ -40,6 +40,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <cctype>
 #include <cstring>
 
diff --git a/src/gromacs/selection/sm_merge.cpp b/src/gromacs/selection/sm_merge.cpp
index f0bc60597a..828bea37d4 100644
--- a/src/gromacs/selection/sm_merge.cpp
+++ b/src/gromacs/selection/sm_merge.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/macros.h"
 
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/selection/sm_permute.cpp b/src/gromacs/selection/sm_permute.cpp
index 94f82b64d5..ebd7c72b5a 100644
--- a/src/gromacs/selection/sm_permute.cpp
+++ b/src/gromacs/selection/sm_permute.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/macros.h"
 
 #include "gromacs/math/vec.h"
diff --git a/src/gromacs/selection/sm_position.cpp b/src/gromacs/selection/sm_position.cpp
index 31f3c0a8b2..b010881846 100644
--- a/src/gromacs/selection/sm_position.cpp
+++ b/src/gromacs/selection/sm_position.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/legacyheaders/macros.h"
 
 #include "gromacs/selection/indexutil.h"
diff --git a/src/gromacs/selection/sm_same.cpp b/src/gromacs/selection/sm_same.cpp
index 71192b842d..5009ede957 100644
--- a/src/gromacs/selection/sm_same.cpp
+++ b/src/gromacs/selection/sm_same.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <stdlib.h>
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/selection/sm_simple.cpp b/src/gromacs/selection/sm_simple.cpp
index 0f118367c1..709aa247b7 100644
--- a/src/gromacs/selection/sm_simple.cpp
+++ b/src/gromacs/selection/sm_simple.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <cctype>
 
 #include "gromacs/legacyheaders/macros.h"
diff --git a/src/gromacs/selection/symrec.cpp b/src/gromacs/selection/symrec.cpp
index 38808d9771..3df67883db 100644
--- a/src/gromacs/selection/symrec.cpp
+++ b/src/gromacs/selection/symrec.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <map>
 #include <string>
 #include <utility>
diff --git a/src/gromacs/selection/tests/indexutil.cpp b/src/gromacs/selection/tests/indexutil.cpp
index e1c4edec0a..caf5d0462d 100644
--- a/src/gromacs/selection/tests/indexutil.cpp
+++ b/src/gromacs/selection/tests/indexutil.cpp
@@ -42,6 +42,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/selection/indexutil.h"
diff --git a/src/gromacs/selection/tests/nbsearch.cpp b/src/gromacs/selection/tests/nbsearch.cpp
index 0d7c0db1e8..06601be1e4 100644
--- a/src/gromacs/selection/tests/nbsearch.cpp
+++ b/src/gromacs/selection/tests/nbsearch.cpp
@@ -44,6 +44,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "gromacs/selection/nbsearch.h"
 
 #include <gtest/gtest.h>
diff --git a/src/gromacs/selection/tests/poscalc.cpp b/src/gromacs/selection/tests/poscalc.cpp
index db01535ba1..4ca53be929 100644
--- a/src/gromacs/selection/tests/poscalc.cpp
+++ b/src/gromacs/selection/tests/poscalc.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include <vector>
diff --git a/src/gromacs/selection/tests/selectioncollection.cpp b/src/gromacs/selection/tests/selectioncollection.cpp
index 143385fd6d..4e252346f9 100644
--- a/src/gromacs/selection/tests/selectioncollection.cpp
+++ b/src/gromacs/selection/tests/selectioncollection.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/fileio/trx.h"
diff --git a/src/gromacs/selection/tests/selectionoption.cpp b/src/gromacs/selection/tests/selectionoption.cpp
index dc5c3ec799..072170fccf 100644
--- a/src/gromacs/selection/tests/selectionoption.cpp
+++ b/src/gromacs/selection/tests/selectionoption.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/options/options.h"
diff --git a/src/gromacs/selection/tests/toputils.cpp b/src/gromacs/selection/tests/toputils.cpp
index ec090acc22..b27c636f09 100644
--- a/src/gromacs/selection/tests/toputils.cpp
+++ b/src/gromacs/selection/tests/toputils.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
+#include "gmxpre.h"
+
 #include "toputils.h"
 
 #include <cstring>
diff --git a/src/gromacs/simd/tests/base.cpp b/src/gromacs/simd/tests/base.cpp
index 52b267e429..5ac13acd8d 100644
--- a/src/gromacs/simd/tests/base.cpp
+++ b/src/gromacs/simd/tests/base.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/simd/tests/bootstrap_loadstore.cpp b/src/gromacs/simd/tests/bootstrap_loadstore.cpp
index ea06588b47..8cc0295bab 100644
--- a/src/gromacs/simd/tests/bootstrap_loadstore.cpp
+++ b/src/gromacs/simd/tests/bootstrap_loadstore.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 /*! \internal \file
diff --git a/src/gromacs/simd/tests/simd.cpp b/src/gromacs/simd/tests/simd.cpp
index 89293ca34b..81121cc3d6 100644
--- a/src/gromacs/simd/tests/simd.cpp
+++ b/src/gromacs/simd/tests/simd.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "simd.h"
diff --git a/src/gromacs/simd/tests/simd4.cpp b/src/gromacs/simd/tests/simd4.cpp
index 38be4ea97c..a2d51c16f2 100644
--- a/src/gromacs/simd/tests/simd4.cpp
+++ b/src/gromacs/simd/tests/simd4.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "simd4.h"
diff --git a/src/gromacs/simd/tests/simd4_floatingpoint.cpp b/src/gromacs/simd/tests/simd4_floatingpoint.cpp
index 335281539a..cde24e81af 100644
--- a/src/gromacs/simd/tests/simd4_floatingpoint.cpp
+++ b/src/gromacs/simd/tests/simd4_floatingpoint.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/simd/tests/simd4_math.cpp b/src/gromacs/simd/tests/simd4_math.cpp
index e2546fd367..89db4cd4eb 100644
--- a/src/gromacs/simd/tests/simd4_math.cpp
+++ b/src/gromacs/simd/tests/simd4_math.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <vector>
diff --git a/src/gromacs/simd/tests/simd4_vector_operations.cpp b/src/gromacs/simd/tests/simd4_vector_operations.cpp
index cc241635ad..5ed13a05c7 100644
--- a/src/gromacs/simd/tests/simd4_vector_operations.cpp
+++ b/src/gromacs/simd/tests/simd4_vector_operations.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/simd/tests/simd_floatingpoint.cpp b/src/gromacs/simd/tests/simd_floatingpoint.cpp
index 415d4adcf3..5be60b44b6 100644
--- a/src/gromacs/simd/tests/simd_floatingpoint.cpp
+++ b/src/gromacs/simd/tests/simd_floatingpoint.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/simd/tests/simd_integer.cpp b/src/gromacs/simd/tests/simd_integer.cpp
index ea2cd0e802..e3142f656a 100644
--- a/src/gromacs/simd/tests/simd_integer.cpp
+++ b/src/gromacs/simd/tests/simd_integer.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "simd.h"
diff --git a/src/gromacs/simd/tests/simd_math.cpp b/src/gromacs/simd/tests/simd_math.cpp
index a3213c99a5..8a0d202941 100644
--- a/src/gromacs/simd/tests/simd_math.cpp
+++ b/src/gromacs/simd/tests/simd_math.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <vector>
diff --git a/src/gromacs/simd/tests/simd_vector_operations.cpp b/src/gromacs/simd/tests/simd_vector_operations.cpp
index f28afdaea1..68d09637ae 100644
--- a/src/gromacs/simd/tests/simd_vector_operations.cpp
+++ b/src/gromacs/simd/tests/simd_vector_operations.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/statistics/statistics.c b/src/gromacs/statistics/statistics.c
index 797176b41e..24ba98b3af 100644
--- a/src/gromacs/statistics/statistics.c
+++ b/src/gromacs/statistics/statistics.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "statistics.h"
 
 #include "config.h"
diff --git a/src/gromacs/statistics/statistics_test.c b/src/gromacs/statistics/statistics_test.c
index 7d7562933b..28a26925e9 100644
--- a/src/gromacs/statistics/statistics_test.c
+++ b/src/gromacs/statistics/statistics_test.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "statistics.h"
 
 #include "config.h"
diff --git a/src/gromacs/swap/swapcoords.c b/src/gromacs/swap/swapcoords.c
index 855c26a8bb..0fe76d3b1f 100644
--- a/src/gromacs/swap/swapcoords.c
+++ b/src/gromacs/swap/swapcoords.c
@@ -39,6 +39,8 @@
  * \author Carsten Kutzner <ckutzne@gwdg.de>
  * \ingroup module_swap
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/timing/cyclecounter.c b/src/gromacs/timing/cyclecounter.c
index f445e52f31..037d3952c1 100644
--- a/src/gromacs/timing/cyclecounter.c
+++ b/src/gromacs/timing/cyclecounter.c
@@ -33,6 +33,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/timing/cyclecounter.h"
 
 #include "config.h"
diff --git a/src/gromacs/timing/wallcycle.c b/src/gromacs/timing/wallcycle.c
index 74b44d88a7..e353096686 100644
--- a/src/gromacs/timing/wallcycle.c
+++ b/src/gromacs/timing/wallcycle.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/timing/wallcycle.h"
 
 #include "config.h"
diff --git a/src/gromacs/timing/walltime_accounting.c b/src/gromacs/timing/walltime_accounting.c
index f59fcc2a56..8dc9ac17be 100644
--- a/src/gromacs/timing/walltime_accounting.c
+++ b/src/gromacs/timing/walltime_accounting.c
@@ -33,6 +33,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/timing/walltime_accounting.h"
 
 #include "config.h"
diff --git a/src/gromacs/tools/check.c b/src/gromacs/tools/check.c
index 2b260f72a8..bc0df3faad 100644
--- a/src/gromacs/tools/check.c
+++ b/src/gromacs/tools/check.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/tools/compare.c b/src/gromacs/tools/compare.c
index 199dd21cf8..a46b8e51c1 100644
--- a/src/gromacs/tools/compare.c
+++ b/src/gromacs/tools/compare.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/tools/convert_tpr.c b/src/gromacs/tools/convert_tpr.c
index 614aaab8c0..58921b2cc2 100644
--- a/src/gromacs/tools/convert_tpr.c
+++ b/src/gromacs/tools/convert_tpr.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/gromacs/tools/dump.c b/src/gromacs/tools/dump.c
index 0bd5f91b3d..86ba6ff95a 100644
--- a/src/gromacs/tools/dump.c
+++ b/src/gromacs/tools/dump.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <assert.h>
diff --git a/src/gromacs/topology/atomprop.cpp b/src/gromacs/topology/atomprop.cpp
index 926826b5ff..91b860b70f 100644
--- a/src/gromacs/topology/atomprop.cpp
+++ b/src/gromacs/topology/atomprop.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/topology/atomprop.h"
 
 #include "config.h"
diff --git a/src/gromacs/topology/atoms.cpp b/src/gromacs/topology/atoms.cpp
index f98f92e366..0f4fada235 100644
--- a/src/gromacs/topology/atoms.cpp
+++ b/src/gromacs/topology/atoms.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/topology/atoms.h"
 
 #include <cstring>
diff --git a/src/gromacs/topology/block.cpp b/src/gromacs/topology/block.cpp
index 52fd431ac8..9acf7ebe29 100644
--- a/src/gromacs/topology/block.cpp
+++ b/src/gromacs/topology/block.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include <algorithm>
 #include "gromacs/topology/block.h"
 
diff --git a/src/gromacs/topology/index.cpp b/src/gromacs/topology/index.cpp
index 65f9b2abae..b4440fc13c 100644
--- a/src/gromacs/topology/index.cpp
+++ b/src/gromacs/topology/index.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/topology/index.h"
 
 #include "config.h"
diff --git a/src/gromacs/topology/invblock.c b/src/gromacs/topology/invblock.c
index bd48fe81e1..c41dd0c0f8 100644
--- a/src/gromacs/topology/invblock.c
+++ b/src/gromacs/topology/invblock.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "gromacs/topology/invblock.h"
 
 #include "gromacs/legacyheaders/types/simple.h"
diff --git a/src/gromacs/topology/mtop_util.c b/src/gromacs/topology/mtop_util.c
index 92dcafecae..9f707ebbc4 100644
--- a/src/gromacs/topology/mtop_util.c
+++ b/src/gromacs/topology/mtop_util.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/topology/mtop_util.h"
 
 #include "config.h"
diff --git a/src/gromacs/topology/residuetypes.cpp b/src/gromacs/topology/residuetypes.cpp
index 26fcff3e0c..5bf67099a3 100644
--- a/src/gromacs/topology/residuetypes.cpp
+++ b/src/gromacs/topology/residuetypes.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/topology/residuetypes.h"
 
 #include <cassert>
diff --git a/src/gromacs/topology/symtab.cpp b/src/gromacs/topology/symtab.cpp
index 98a99e3a9a..27b3a0c11e 100644
--- a/src/gromacs/topology/symtab.cpp
+++ b/src/gromacs/topology/symtab.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "symtab.h"
 
 #include "config.h"
diff --git a/src/gromacs/topology/topology.cpp b/src/gromacs/topology/topology.cpp
index 213d3ceecd..e554a94240 100644
--- a/src/gromacs/topology/topology.cpp
+++ b/src/gromacs/topology/topology.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/topology/topology.h"
 
 #include "gromacs/topology/symtab.h"
diff --git a/src/gromacs/topology/topsort.c b/src/gromacs/topology/topsort.c
index ab2669c678..05d3faa3e0 100644
--- a/src/gromacs/topology/topsort.c
+++ b/src/gromacs/topology/topsort.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/topology/topsort.h"
 
 #include "config.h"
diff --git a/src/gromacs/trajectoryanalysis/analysismodule.cpp b/src/gromacs/trajectoryanalysis/analysismodule.cpp
index a9ccfd833c..01d73254f6 100644
--- a/src/gromacs/trajectoryanalysis/analysismodule.cpp
+++ b/src/gromacs/trajectoryanalysis/analysismodule.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "gromacs/trajectoryanalysis/analysismodule.h"
 
 #include <utility>
diff --git a/src/gromacs/trajectoryanalysis/analysissettings.cpp b/src/gromacs/trajectoryanalysis/analysissettings.cpp
index b6e00a0173..da9031abb8 100644
--- a/src/gromacs/trajectoryanalysis/analysissettings.cpp
+++ b/src/gromacs/trajectoryanalysis/analysissettings.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "analysissettings.h"
 
 #include "gromacs/fileio/trxio.h"
diff --git a/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp b/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
index 9374c26c46..944945b99d 100644
--- a/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
+++ b/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "cmdlinerunner.h"
 
 #include "config.h"
diff --git a/src/gromacs/trajectoryanalysis/modules.cpp b/src/gromacs/trajectoryanalysis/modules.cpp
index bea3ad50ab..423d585e82 100644
--- a/src/gromacs/trajectoryanalysis/modules.cpp
+++ b/src/gromacs/trajectoryanalysis/modules.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "gromacs/trajectoryanalysis/modules.h"
 
 #include "gromacs/commandline/cmdlinemodulemanager.h"
diff --git a/src/gromacs/trajectoryanalysis/modules/angle.cpp b/src/gromacs/trajectoryanalysis/modules/angle.cpp
index 977840e6fa..e63cb502d6 100644
--- a/src/gromacs/trajectoryanalysis/modules/angle.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/angle.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "angle.h"
 
 #include <algorithm>
diff --git a/src/gromacs/trajectoryanalysis/modules/distance.cpp b/src/gromacs/trajectoryanalysis/modules/distance.cpp
index a8f3f624f5..cd74a302cd 100644
--- a/src/gromacs/trajectoryanalysis/modules/distance.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/distance.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "distance.h"
 
 #include <string>
diff --git a/src/gromacs/trajectoryanalysis/modules/freevolume.cpp b/src/gromacs/trajectoryanalysis/modules/freevolume.cpp
index b8084b433a..31785088a3 100644
--- a/src/gromacs/trajectoryanalysis/modules/freevolume.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/freevolume.cpp
@@ -39,6 +39,8 @@
  * \author David van der Spoel <david.vanderspoel@icm.uu.se>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "freevolume.h"
 
 #include <string>
diff --git a/src/gromacs/trajectoryanalysis/modules/nsc.c b/src/gromacs/trajectoryanalysis/modules/nsc.c
index d89b5a8c7b..c73d05273a 100644
--- a/src/gromacs/trajectoryanalysis/modules/nsc.c
+++ b/src/gromacs/trajectoryanalysis/modules/nsc.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/gromacs/trajectoryanalysis/modules/sasa.cpp b/src/gromacs/trajectoryanalysis/modules/sasa.cpp
index 2128e3f245..015e1e043d 100644
--- a/src/gromacs/trajectoryanalysis/modules/sasa.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/sasa.cpp
@@ -41,6 +41,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com> (C++ conversion)
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "sasa.h"
 
 #include <algorithm>
diff --git a/src/gromacs/trajectoryanalysis/modules/select.cpp b/src/gromacs/trajectoryanalysis/modules/select.cpp
index 9fe80ec551..909c70d6af 100644
--- a/src/gromacs/trajectoryanalysis/modules/select.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/select.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "select.h"
 
 #include <cstdio>
diff --git a/src/gromacs/trajectoryanalysis/runnercommon.cpp b/src/gromacs/trajectoryanalysis/runnercommon.cpp
index da204274f5..6ab20735e1 100644
--- a/src/gromacs/trajectoryanalysis/runnercommon.cpp
+++ b/src/gromacs/trajectoryanalysis/runnercommon.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "runnercommon.h"
 
 #include "config.h"
diff --git a/src/gromacs/trajectoryanalysis/tests/angle.cpp b/src/gromacs/trajectoryanalysis/tests/angle.cpp
index 11c51d1f67..70a6aec5a3 100644
--- a/src/gromacs/trajectoryanalysis/tests/angle.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/angle.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/trajectoryanalysis/modules/angle.h"
diff --git a/src/gromacs/trajectoryanalysis/tests/distance.cpp b/src/gromacs/trajectoryanalysis/tests/distance.cpp
index 14db4b20b9..2719c1a1b4 100644
--- a/src/gromacs/trajectoryanalysis/tests/distance.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/distance.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/trajectoryanalysis/modules/distance.h"
diff --git a/src/gromacs/trajectoryanalysis/tests/freevolume.cpp b/src/gromacs/trajectoryanalysis/tests/freevolume.cpp
index a4879651e0..4b85fd956f 100644
--- a/src/gromacs/trajectoryanalysis/tests/freevolume.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/freevolume.cpp
@@ -39,6 +39,8 @@
  * \author David van der Spoel <david.vanderspoel@icm.uu.se>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/trajectoryanalysis/modules/freevolume.h"
diff --git a/src/gromacs/trajectoryanalysis/tests/moduletest.cpp b/src/gromacs/trajectoryanalysis/tests/moduletest.cpp
index dc1a265127..b12f0a4418 100644
--- a/src/gromacs/trajectoryanalysis/tests/moduletest.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/moduletest.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "moduletest.h"
 
 #include <map>
diff --git a/src/gromacs/trajectoryanalysis/tests/sasa.cpp b/src/gromacs/trajectoryanalysis/tests/sasa.cpp
index 129597991d..6a9c975900 100644
--- a/src/gromacs/trajectoryanalysis/tests/sasa.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/sasa.cpp
@@ -52,6 +52,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/trajectoryanalysis/modules/sasa.h"
diff --git a/src/gromacs/trajectoryanalysis/tests/select.cpp b/src/gromacs/trajectoryanalysis/tests/select.cpp
index 0b101b29c7..5232cc9e60 100644
--- a/src/gromacs/trajectoryanalysis/tests/select.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/select.cpp
@@ -47,6 +47,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "gromacs/trajectoryanalysis/modules/select.h"
diff --git a/src/gromacs/trajectoryanalysis/tests/test_selection.cpp b/src/gromacs/trajectoryanalysis/tests/test_selection.cpp
index de0ed42872..e8153b6e2e 100644
--- a/src/gromacs/trajectoryanalysis/tests/test_selection.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/test_selection.cpp
@@ -38,6 +38,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_trajectoryanalysis
  */
+#include "gmxpre.h"
+
 #include "gromacs/options/basicoptions.h"
 #include "gromacs/options/options.h"
 #include "gromacs/selection/selection.h"
diff --git a/src/gromacs/utility/basenetwork.cpp b/src/gromacs/utility/basenetwork.cpp
index d96dd292b0..b1747df93b 100644
--- a/src/gromacs/utility/basenetwork.cpp
+++ b/src/gromacs/utility/basenetwork.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "basenetwork.h"
 
 #include "config.h"
diff --git a/src/gromacs/utility/baseversion.cpp b/src/gromacs/utility/baseversion.cpp
index 84315b7c46..dff527782c 100644
--- a/src/gromacs/utility/baseversion.cpp
+++ b/src/gromacs/utility/baseversion.cpp
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "baseversion.h"
 #include "baseversion-gen.h"
 
diff --git a/src/gromacs/utility/cstringutil.c b/src/gromacs/utility/cstringutil.c
index ca835d4c10..0733dc3771 100644
--- a/src/gromacs/utility/cstringutil.c
+++ b/src/gromacs/utility/cstringutil.c
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "cstringutil.h"
 
 #include "config.h"
diff --git a/src/gromacs/utility/errorcodes.cpp b/src/gromacs/utility/errorcodes.cpp
index f03bf2d38b..4d513a1365 100644
--- a/src/gromacs/utility/errorcodes.cpp
+++ b/src/gromacs/utility/errorcodes.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "gromacs/utility/errorcodes.h"
 
 #include <cstdlib>
diff --git a/src/gromacs/utility/errorformat.cpp b/src/gromacs/utility/errorformat.cpp
index 4157db4fd5..a5ba90bf01 100644
--- a/src/gromacs/utility/errorformat.cpp
+++ b/src/gromacs/utility/errorformat.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "errorformat.h"
diff --git a/src/gromacs/utility/exceptions.cpp b/src/gromacs/utility/exceptions.cpp
index 2445b8939b..5ccd830707 100644
--- a/src/gromacs/utility/exceptions.cpp
+++ b/src/gromacs/utility/exceptions.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "exceptions.h"
 
 #include "config.h"
diff --git a/src/gromacs/utility/fatalerror.cpp b/src/gromacs/utility/fatalerror.cpp
index d37329b6e0..1dd7e79edd 100644
--- a/src/gromacs/utility/fatalerror.cpp
+++ b/src/gromacs/utility/fatalerror.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "fatalerror.h"
 
 #include "config.h"
diff --git a/src/gromacs/utility/file.cpp b/src/gromacs/utility/file.cpp
index 787cb72c5a..30c900e7a0 100644
--- a/src/gromacs/utility/file.cpp
+++ b/src/gromacs/utility/file.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "file.h"
 
 #include <cerrno>
diff --git a/src/gromacs/utility/futil.cpp b/src/gromacs/utility/futil.cpp
index 81936755eb..e7d840f355 100644
--- a/src/gromacs/utility/futil.cpp
+++ b/src/gromacs/utility/futil.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/utility/futil.h"
 
 #include "config.h"
diff --git a/src/gromacs/utility/gmxassert.cpp b/src/gromacs/utility/gmxassert.cpp
index eba0f964eb..ef61240a76 100644
--- a/src/gromacs/utility/gmxassert.cpp
+++ b/src/gromacs/utility/gmxassert.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2011,2012, by the GROMACS development team, led by
+ * Copyright (c) 2011,2012,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "gmxassert.h"
 
 #include <cstdio>
diff --git a/src/gromacs/utility/gmxomp.cpp b/src/gromacs/utility/gmxomp.cpp
index 7da093b534..04abd12a8e 100644
--- a/src/gromacs/utility/gmxomp.cpp
+++ b/src/gromacs/utility/gmxomp.cpp
@@ -38,6 +38,8 @@
  *
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "gromacs/utility/gmxomp.h"
 
 #include "config.h"
diff --git a/src/gromacs/utility/gmxregex.cpp b/src/gromacs/utility/gmxregex.cpp
index a5674e02de..cf0fc9746b 100644
--- a/src/gromacs/utility/gmxregex.cpp
+++ b/src/gromacs/utility/gmxregex.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "gmxregex.h"
 
 #include "config.h"
diff --git a/src/gromacs/utility/init.cpp b/src/gromacs/utility/init.cpp
index 21a0ceb38e..3fbc8c554c 100644
--- a/src/gromacs/utility/init.cpp
+++ b/src/gromacs/utility/init.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "gromacs/utility/init.h"
 
 #include "config.h"
diff --git a/src/gromacs/utility/messagestringcollector.cpp b/src/gromacs/utility/messagestringcollector.cpp
index 5bc53b8a2e..9d631acbce 100644
--- a/src/gromacs/utility/messagestringcollector.cpp
+++ b/src/gromacs/utility/messagestringcollector.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2011,2012, by the GROMACS development team, led by
+ * Copyright (c) 2011,2012,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "gromacs/utility/messagestringcollector.h"
 
 #include <vector>
diff --git a/src/gromacs/utility/path.cpp b/src/gromacs/utility/path.cpp
index d5d247bb02..6257d2875a 100644
--- a/src/gromacs/utility/path.cpp
+++ b/src/gromacs/utility/path.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "path.h"
 
 #include <cctype>
diff --git a/src/gromacs/utility/programcontext.cpp b/src/gromacs/utility/programcontext.cpp
index 5af68f1424..5b73060158 100644
--- a/src/gromacs/utility/programcontext.cpp
+++ b/src/gromacs/utility/programcontext.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "gromacs/utility/programcontext.h"
 
 #include <cstddef>
diff --git a/src/gromacs/utility/qsort_threadsafe.c b/src/gromacs/utility/qsort_threadsafe.c
index 347080bfe7..0f0849076d 100644
--- a/src/gromacs/utility/qsort_threadsafe.c
+++ b/src/gromacs/utility/qsort_threadsafe.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "qsort_threadsafe.h"
 
 #include <stdlib.h>
diff --git a/src/gromacs/utility/smalloc.c b/src/gromacs/utility/smalloc.c
index 86de09c485..3580a0e0a0 100644
--- a/src/gromacs/utility/smalloc.c
+++ b/src/gromacs/utility/smalloc.c
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "gromacs/utility/smalloc.h"
 
 #include "config.h"
diff --git a/src/gromacs/utility/stringutil.cpp b/src/gromacs/utility/stringutil.cpp
index 6104225d3f..3f33caeb1d 100644
--- a/src/gromacs/utility/stringutil.cpp
+++ b/src/gromacs/utility/stringutil.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include "stringutil.h"
 
 #include <cctype>
diff --git a/src/gromacs/utility/tests/stringutil.cpp b/src/gromacs/utility/tests/stringutil.cpp
index 348ffa8964..c63a9c4559 100644
--- a/src/gromacs/utility/tests/stringutil.cpp
+++ b/src/gromacs/utility/tests/stringutil.cpp
@@ -43,6 +43,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
+#include "gmxpre.h"
+
 #include <string>
 #include <vector>
 
diff --git a/src/programs/gmx.cpp b/src/programs/gmx.cpp
index a0bcc6fb27..74c409b32b 100644
--- a/src/programs/gmx.cpp
+++ b/src/programs/gmx.cpp
@@ -37,6 +37,8 @@
  *
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  */
+#include "gmxpre.h"
+
 #include "gromacs/commandline/cmdlinemodulemanager.h"
 #include "gromacs/commandline/cmdlineinit.h"
 #include "gromacs/selection/selhelp.h"
diff --git a/src/programs/legacymodules.cpp b/src/programs/legacymodules.cpp
index 11c1097edc..92e3d317af 100644
--- a/src/programs/legacymodules.cpp
+++ b/src/programs/legacymodules.cpp
@@ -37,6 +37,8 @@
  *
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  */
+#include "gmxpre.h"
+
 #include "legacymodules.h"
 
 #include <cstdio>
diff --git a/src/programs/mdrun/md.cpp b/src/programs/mdrun/md.cpp
index 513718fd9b..3bf621fe6d 100644
--- a/src/programs/mdrun/md.cpp
+++ b/src/programs/mdrun/md.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/programs/mdrun/mdrun.cpp b/src/programs/mdrun/mdrun.cpp
index c5df1ada6a..e2bc90d50d 100644
--- a/src/programs/mdrun/mdrun.cpp
+++ b/src/programs/mdrun/mdrun.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "mdrun_main.h"
 
 #include "config.h"
diff --git a/src/programs/mdrun/membed.c b/src/programs/mdrun/membed.c
index 126341473e..d6d41aae34 100644
--- a/src/programs/mdrun/membed.c
+++ b/src/programs/mdrun/membed.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <signal.h>
diff --git a/src/programs/mdrun/pme_loadbal.c b/src/programs/mdrun/pme_loadbal.c
index a24e45bc3d..17702f02a8 100644
--- a/src/programs/mdrun/pme_loadbal.c
+++ b/src/programs/mdrun/pme_loadbal.c
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include "gromacs/legacyheaders/types/commrec.h"
diff --git a/src/programs/mdrun/repl_ex.cpp b/src/programs/mdrun/repl_ex.cpp
index 473d6aa2c7..726886cfeb 100644
--- a/src/programs/mdrun/repl_ex.cpp
+++ b/src/programs/mdrun/repl_ex.cpp
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "repl_ex.h"
 
 #include "config.h"
diff --git a/src/programs/mdrun/runner.cpp b/src/programs/mdrun/runner.cpp
index e1c9b734f1..0afd51b194 100644
--- a/src/programs/mdrun/runner.cpp
+++ b/src/programs/mdrun/runner.cpp
@@ -35,6 +35,8 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <algorithm>
diff --git a/src/programs/mdrun/tests/compressed_x_output.cpp b/src/programs/mdrun/tests/compressed_x_output.cpp
index bfaf6b8cf5..98862f5f41 100644
--- a/src/programs/mdrun/tests/compressed_x_output.cpp
+++ b/src/programs/mdrun/tests/compressed_x_output.cpp
@@ -40,6 +40,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  * \ingroup module_mdrun
  */
+#include "gmxpre.h"
+
 #include "moduletest.h"
 #include <gtest/gtest.h>
 #include <string>
diff --git a/src/programs/mdrun/tests/interactiveMD.cpp b/src/programs/mdrun/tests/interactiveMD.cpp
index bb610a7a17..ecd31972b9 100644
--- a/src/programs/mdrun/tests/interactiveMD.cpp
+++ b/src/programs/mdrun/tests/interactiveMD.cpp
@@ -40,6 +40,8 @@
  * \author Carsten Kutzner <ckutzne@gwdg.de>
  * \ingroup module_mdrun
  */
+#include "gmxpre.h"
+
 #include "moduletest.h"
 
 namespace gmx
diff --git a/src/programs/mdrun/tests/moduletest.cpp b/src/programs/mdrun/tests/moduletest.cpp
index 5f98b053b2..6ecdbd5bc6 100644
--- a/src/programs/mdrun/tests/moduletest.cpp
+++ b/src/programs/mdrun/tests/moduletest.cpp
@@ -39,6 +39,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  * \ingroup module_mdrun
  */
+#include "gmxpre.h"
+
 #include "moduletest.h"
 
 #include "config.h"
diff --git a/src/programs/mdrun/tests/replicaexchange.cpp b/src/programs/mdrun/tests/replicaexchange.cpp
index fe8c3c2e17..d972b859da 100644
--- a/src/programs/mdrun/tests/replicaexchange.cpp
+++ b/src/programs/mdrun/tests/replicaexchange.cpp
@@ -40,6 +40,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  * \ingroup module_mdrun
  */
+#include "gmxpre.h"
+
 #include "moduletest.h"
 
 #include <math.h>
diff --git a/src/programs/mdrun/tests/rerun.cpp b/src/programs/mdrun/tests/rerun.cpp
index d1df11f8a3..eac4fc8e59 100644
--- a/src/programs/mdrun/tests/rerun.cpp
+++ b/src/programs/mdrun/tests/rerun.cpp
@@ -40,6 +40,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  * \ingroup module_mdrun
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 #include "moduletest.h"
 #include "gromacs/options/filenameoption.h"
diff --git a/src/programs/mdrun/tests/swapcoords.cpp b/src/programs/mdrun/tests/swapcoords.cpp
index d1d199ac6c..7f12d33b1b 100644
--- a/src/programs/mdrun/tests/swapcoords.cpp
+++ b/src/programs/mdrun/tests/swapcoords.cpp
@@ -40,6 +40,8 @@
  * \author Carsten Kutzner <ckutzne@gwdg.de>
  * \ingroup module_mdrun
  */
+#include "gmxpre.h"
+
 #include "moduletest.h"
 
 namespace gmx
diff --git a/src/programs/mdrun/tests/trajectory_writing.cpp b/src/programs/mdrun/tests/trajectory_writing.cpp
index 73e7759823..6b45499e20 100644
--- a/src/programs/mdrun/tests/trajectory_writing.cpp
+++ b/src/programs/mdrun/tests/trajectory_writing.cpp
@@ -40,6 +40,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  * \ingroup module_mdrun
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 #include "moduletest.h"
 #include "gromacs/options/filenameoption.h"
diff --git a/src/programs/mdrun_main.cpp b/src/programs/mdrun_main.cpp
index 17d4b708fd..9c67328b3e 100644
--- a/src/programs/mdrun_main.cpp
+++ b/src/programs/mdrun_main.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "mdrun/mdrun_main.h"
 
 #include "gromacs/commandline/cmdlinemodulemanager.h"
diff --git a/src/programs/view/3dview.cpp b/src/programs/view/3dview.cpp
index 77532cb96b..01cc064241 100644
--- a/src/programs/view/3dview.cpp
+++ b/src/programs/view/3dview.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "3dview.h"
 
 #include <math.h>
diff --git a/src/programs/view/buttons.cpp b/src/programs/view/buttons.cpp
index bdc29c7a74..74b2ec0321 100644
--- a/src/programs/view/buttons.cpp
+++ b/src/programs/view/buttons.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/programs/view/dialogs.cpp b/src/programs/view/dialogs.cpp
index 9e75d2345a..f05937af48 100644
--- a/src/programs/view/dialogs.cpp
+++ b/src/programs/view/dialogs.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/programs/view/fgrid.cpp b/src/programs/view/fgrid.cpp
index a4a2f5a7f0..ae840e1f00 100644
--- a/src/programs/view/fgrid.cpp
+++ b/src/programs/view/fgrid.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/programs/view/filter.cpp b/src/programs/view/filter.cpp
index 356320b78b..ccd6763ca8 100644
--- a/src/programs/view/filter.cpp
+++ b/src/programs/view/filter.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/programs/view/logo.cpp b/src/programs/view/logo.cpp
index 417e06c98d..89424d59d6 100644
--- a/src/programs/view/logo.cpp
+++ b/src/programs/view/logo.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/programs/view/manager.cpp b/src/programs/view/manager.cpp
index 7c49ac7bd1..b7f89c2c67 100644
--- a/src/programs/view/manager.cpp
+++ b/src/programs/view/manager.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/programs/view/molps.cpp b/src/programs/view/molps.cpp
index 5cc43a1a44..9975baf1f3 100644
--- a/src/programs/view/molps.cpp
+++ b/src/programs/view/molps.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/programs/view/nleg.cpp b/src/programs/view/nleg.cpp
index e752b3576f..53cb169be0 100644
--- a/src/programs/view/nleg.cpp
+++ b/src/programs/view/nleg.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/programs/view/nmol.cpp b/src/programs/view/nmol.cpp
index cfdcf6fb32..fc80cdfe93 100644
--- a/src/programs/view/nmol.cpp
+++ b/src/programs/view/nmol.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/programs/view/popup.cpp b/src/programs/view/popup.cpp
index 67d35fe565..c2d02e1b2f 100644
--- a/src/programs/view/popup.cpp
+++ b/src/programs/view/popup.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <math.h>
diff --git a/src/programs/view/pulldown.cpp b/src/programs/view/pulldown.cpp
index 8ad16a199d..6d340e5680 100644
--- a/src/programs/view/pulldown.cpp
+++ b/src/programs/view/pulldown.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <string.h>
diff --git a/src/programs/view/view.cpp b/src/programs/view/view.cpp
index fee5b8bd43..23a58df929 100644
--- a/src/programs/view/view.cpp
+++ b/src/programs/view/view.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/programs/view/x11.cpp b/src/programs/view/x11.cpp
index 131f52c833..c068628815 100644
--- a/src/programs/view/x11.cpp
+++ b/src/programs/view/x11.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/programs/view/xdlg.cpp b/src/programs/view/xdlg.cpp
index e713b52ed3..dfdadc2a8b 100644
--- a/src/programs/view/xdlg.cpp
+++ b/src/programs/view/xdlg.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/programs/view/xdlghi.cpp b/src/programs/view/xdlghi.cpp
index d2d22b60f8..aeeb9089c2 100644
--- a/src/programs/view/xdlghi.cpp
+++ b/src/programs/view/xdlghi.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdlib.h>
diff --git a/src/programs/view/xdlgitem.cpp b/src/programs/view/xdlgitem.cpp
index 2883948b8b..5a043422ad 100644
--- a/src/programs/view/xdlgitem.cpp
+++ b/src/programs/view/xdlgitem.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <ctype.h>
diff --git a/src/programs/view/xmb.cpp b/src/programs/view/xmb.cpp
index b12d1cd996..2cbd4a4688 100644
--- a/src/programs/view/xmb.cpp
+++ b/src/programs/view/xmb.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/programs/view/xutil.cpp b/src/programs/view/xutil.cpp
index 08be9e18b1..d567c4b6b9 100644
--- a/src/programs/view/xutil.cpp
+++ b/src/programs/view/xutil.cpp
@@ -34,6 +34,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/testutils/cmdlinetest.cpp b/src/testutils/cmdlinetest.cpp
index a848d330d0..205324a3f0 100644
--- a/src/testutils/cmdlinetest.cpp
+++ b/src/testutils/cmdlinetest.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "cmdlinetest.h"
 
 #include <cstdlib>
diff --git a/src/testutils/integrationtests.cpp b/src/testutils/integrationtests.cpp
index 437dd16885..db626c4a3d 100644
--- a/src/testutils/integrationtests.cpp
+++ b/src/testutils/integrationtests.cpp
@@ -39,6 +39,8 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "integrationtests.h"
 
 #include "testutils/testoptions.h"
diff --git a/src/testutils/mpi-printer.cpp b/src/testutils/mpi-printer.cpp
index 334bc74592..3f2309647f 100644
--- a/src/testutils/mpi-printer.cpp
+++ b/src/testutils/mpi-printer.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -32,6 +32,8 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#include "gmxpre.h"
+
 #include "mpi-printer.h"
 
 #include "config.h"
diff --git a/src/testutils/refdata.cpp b/src/testutils/refdata.cpp
index befecc2013..9221676e63 100644
--- a/src/testutils/refdata.cpp
+++ b/src/testutils/refdata.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "refdata.h"
 
 #include <cstdio>
diff --git a/src/testutils/stringtest.cpp b/src/testutils/stringtest.cpp
index 586cb9f183..81a556bb6a 100644
--- a/src/testutils/stringtest.cpp
+++ b/src/testutils/stringtest.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "testutils/stringtest.h"
 
 #include "gromacs/options/basicoptions.h"
diff --git a/src/testutils/testasserts.cpp b/src/testutils/testasserts.cpp
index 4768c7321a..5025018b76 100644
--- a/src/testutils/testasserts.cpp
+++ b/src/testutils/testasserts.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "testutils/testasserts.h"
 
 #include <cmath>
diff --git a/src/testutils/testfilemanager.cpp b/src/testutils/testfilemanager.cpp
index 6a1b4c27bd..f28d8c0b38 100644
--- a/src/testutils/testfilemanager.cpp
+++ b/src/testutils/testfilemanager.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "testfilemanager.h"
 
 #include <cstdio>
diff --git a/src/testutils/testoptions.cpp b/src/testutils/testoptions.cpp
index f45871e3fe..ba5b848fbd 100644
--- a/src/testutils/testoptions.cpp
+++ b/src/testutils/testoptions.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "testoptions.h"
 
 #include <cstdio>
diff --git a/src/testutils/tests/refdata_tests.cpp b/src/testutils/tests/refdata_tests.cpp
index ccc442127a..349ac57f1e 100644
--- a/src/testutils/tests/refdata_tests.cpp
+++ b/src/testutils/tests/refdata_tests.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "testutils/refdata.h"
 
 #include <vector>
diff --git a/src/testutils/tests/testasserts_tests.cpp b/src/testutils/tests/testasserts_tests.cpp
index 111bbc5e62..258052d50b 100644
--- a/src/testutils/tests/testasserts_tests.cpp
+++ b/src/testutils/tests/testasserts_tests.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "testutils/testasserts.h"
 
 #include <gtest/gtest.h>
diff --git a/src/testutils/unittest_main.cpp b/src/testutils/unittest_main.cpp
index c4ceeadd26..f9acf247bf 100644
--- a/src/testutils/unittest_main.cpp
+++ b/src/testutils/unittest_main.cpp
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include <gtest/gtest.h>
 
 #include "testutils/testoptions.h"
-- 
2.22.0