Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / mdatom.c

diff --git a/src/gromacs/mdlib/mdatom.c b/src/gromacs/mdlib/mdatom.c
index b8d51a76da80566855c2088a159bc843d3a78e4e..d1722dedf172989c6616e38b7ff59f2d8746c115 100644 (file)
--- a/src/gromacs/mdlib/mdatom.c
+++ b/src/gromacs/mdlib/mdatom.c
@@ -34,19 +34,16 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
 
 #include <math.h>
 
-#include "typedefs.h"
-#include "mdatoms.h"
+#include "gromacs/legacyheaders/gmx_omp_nthreads.h"
+#include "gromacs/legacyheaders/mdatoms.h"
+#include "gromacs/legacyheaders/qmmm.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/topology/mtop_util.h"
 #include "gromacs/utility/smalloc.h"
-#include "main.h"
-#include "qmmm.h"
-#include "mtop_util.h"
-#include "gmx_omp_nthreads.h"
 
 #define ALMOST_ZERO 1e-30