Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / utility / init.cpp

diff --git a/src/gromacs/utility/init.cpp b/src/gromacs/utility/init.cpp
index f996ae589f965166362567f0c22246e0c93e4d1e..c8d3f0f4963e135a8e92424879a874933405c4a2 100644 (file)
--- a/src/gromacs/utility/init.cpp
+++ b/src/gromacs/utility/init.cpp
@@ -39,21 +39,19 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_utility
  */
-#include "gromacs/utility/init.h"
+#include "gmxpre.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "init.h"
 
-#include "gromacs/legacyheaders/gmx_fatal.h"
+#include "config.h"
 
+#include "gromacs/utility/basedefinitions.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/gmxassert.h"
 #ifdef GMX_LIB_MPI
 #include "gromacs/utility/gmxmpi.h"
 #endif
 
-#include "gromacs/utility/common.h"
-#include "gromacs/utility/gmxassert.h"
-
 namespace gmx
 {