Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_wham.cpp

diff --git a/src/gromacs/gmxana/gmx_wham.cpp b/src/gromacs/gmxana/gmx_wham.cpp
index 3d7bd72465fe0e150f42b1a761865b7e74c30e58..a817f9c425b4b2fc498253415292e47ac689d9db 100644 (file)
--- a/src/gromacs/gmxana/gmx_wham.cpp
+++ b/src/gromacs/gmxana/gmx_wham.cpp
@@ -55,7 +55,7 @@
 #include "gromacs/commandline/pargs.h"
 #include "typedefs.h"
 #include "gromacs/utility/smalloc.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
 #include "copyrite.h"
 #include "gromacs/fileio/tpxio.h"
 #include "names.h"
@@ -63,9 +63,9 @@
 #include "gmx_ana.h"
 #include "macros.h"
 #include "gromacs/utility/cstringutil.h"
-#include "xvgr.h"
+#include "gromacs/fileio/xvgr.h"
 
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
 
 //! longest file names allowed in input files
 #define WHAM_MAXFILELEN 2048