Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / toppush.c

diff --git a/src/gromacs/gmxpreprocess/toppush.c b/src/gromacs/gmxpreprocess/toppush.c
index fd2a8a1595bbed7f9349c10757948f2d25bd5855..541985dcb36e5eea560cfdd25209eea6ed8bef74 100644 (file)
--- a/src/gromacs/gmxpreprocess/toppush.c
+++ b/src/gromacs/gmxpreprocess/toppush.c
@@ -38,25 +38,26 @@
 #include <config.h>
 #endif
 
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
-#include <assert.h>
+#include <stdlib.h>
 
-#include "sysstuff.h"
-#include "gromacs/utility/smalloc.h"
 #include "macros.h"
-#include "gromacs/utility/cstringutil.h"
 #include "names.h"
 #include "toputil.h"
 #include "toppush.h"
 #include "topdirs.h"
 #include "readir.h"
-#include "symtab.h"
-#include "gmx_fatal.h"
 #include "warninp.h"
 #include "gpp_atomtype.h"
 #include "gpp_bond_atomtype.h"
 
+#include "gromacs/topology/symtab.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
+
 void generate_nbparams(int comb, int ftype, t_params *plist, gpp_atomtype_t atype,
                        warninp_t wi)
 {