From ac2d7cad581cc2e562573f840417a7bd52e1231c Mon Sep 17 00:00:00 2001
From: Mark Jenkinson <mark@fmrib.ox.ac.uk>
Date: Sat, 22 Feb 2003 17:55:09 +0000
Subject: [PATCH] Fixed include paths for headers

---
 avw2ascii.c    |  4 ++--
 avwcpgeom.c    |  4 ++--
 avwcreatehd.c  |  4 ++--
 avwfixfloat.cc |  5 +----
 avwhd.c        |  4 ++--
 avwmerge.c     |  4 ----
 avwnvols.c     |  1 -
 avwroi.c       |  4 ++--
 avwsplit.c     |  4 ----
 fslcheck.cc    | 23 +++++++----------------
 fslcomplex.cc  |  2 +-
 fslmeants.cc   |  4 ++--
 fslswapdim.cc  |  4 ++--
 if2avw.c       |  5 ++---
 14 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/avw2ascii.c b/avw2ascii.c
index f686459..6c21f3a 100644
--- a/avw2ascii.c
+++ b/avw2ascii.c
@@ -11,8 +11,8 @@
 /* }}} */
 /* {{{ defines, includes and typedefs */
 
-#include "libss.h"
-#include "libavw.h"
+#include "libss/libss.h"
+#include "libss/libavw.h"
 
 void usage(void);
 
diff --git a/avwcpgeom.c b/avwcpgeom.c
index 61bd7c3..48056ae 100644
--- a/avwcpgeom.c
+++ b/avwcpgeom.c
@@ -11,8 +11,8 @@
 /* }}} */
 /* {{{ defines, includes and typedefs */
 
-#include "libss.h"
-#include "libavw.h"
+#include "libss/libss.h"
+#include "libss/libavw.h"
 
 void usage(void);
 
diff --git a/avwcreatehd.c b/avwcreatehd.c
index daa9c01..8a9f2ca 100644
--- a/avwcreatehd.c
+++ b/avwcreatehd.c
@@ -11,8 +11,8 @@
 /* }}} */
 /* {{{ defines, includes and typedefs */
 
-#include "libss.h"
-#include "libavw.h"
+#include "libss/libss.h"
+#include "libss/libavw.h"
 
 void usage(void);
 
diff --git a/avwfixfloat.cc b/avwfixfloat.cc
index a0a6069..94feb6a 100644
--- a/avwfixfloat.cc
+++ b/avwfixfloat.cc
@@ -1,7 +1,4 @@
-#include <math.h>
-#include <iostream>
-#include <string>
-#include "newimageall.h"
+#include "newimage/newimageall.h"
 
 using namespace NEWIMAGE;
 
diff --git a/avwhd.c b/avwhd.c
index 6afdbe5..d22e617 100644
--- a/avwhd.c
+++ b/avwhd.c
@@ -7,8 +7,8 @@
 /* }}} */
 /* {{{ defines, includes and typedefs */
 
-#include "libss.h"
-#include "libavw.h"
+#include "libss/libss.h"
+#include "libss/libavw.h"
 
 void usage(void);
 
diff --git a/avwmerge.c b/avwmerge.c
index 229b772..97bb7f6 100644
--- a/avwmerge.c
+++ b/avwmerge.c
@@ -11,11 +11,7 @@
 /* }}} */
 /* {{{ includes */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 
-#include <avwio.h>
 
 #define MAXINPUTS 10000
 
diff --git a/avwnvols.c b/avwnvols.c
index 2d4efe4..f17bb22 100644
--- a/avwnvols.c
+++ b/avwnvols.c
@@ -7,7 +7,6 @@
 
 /*  CCOPYRIGHT */
 
-#include <avwio.h>
 
 int main(int argc, char **argv)
 {
diff --git a/avwroi.c b/avwroi.c
index 54804d0..36efa50 100644
--- a/avwroi.c
+++ b/avwroi.c
@@ -11,8 +11,8 @@
 /* }}} */
 /* {{{ defines, includes and typedefs */
 
-#include "libss.h"
-#include "libavw.h"
+#include "libss/libss.h"
+#include "libss/libavw.h"
 
 void usage(void);
 
diff --git a/avwsplit.c b/avwsplit.c
index 5d27f4d..994473c 100644
--- a/avwsplit.c
+++ b/avwsplit.c
@@ -7,11 +7,7 @@
 
 /*  CCOPYRIGHT */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 
-#include <avwio.h>
 
 int main(int argc, char **argv)
 {
diff --git a/fslcheck.cc b/fslcheck.cc
index 12eca41..da1d807 100644
--- a/fslcheck.cc
+++ b/fslcheck.cc
@@ -7,22 +7,13 @@
 /*  CCOPYRIGHT */
 
 
-#include <math.h>
-#include <iostream.h>
-#include <iomanip>
-#include <fstream.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string>
-#include <strstream>
-#include <unistd.h>
-
-#include "optimise.h"
-#include "newmatap.h"
-#include "newmatio.h"
-#include "newimageall.h"
-#include "options.h"
-#include "fmribmain.h"
+
+#include "miscmaths/optimise.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
+#include "newimage/newimageall.h"
+#include "utils/options.h"
+#include "newimage/fmribmain.h"
 
 using namespace MISCMATHS;
 using namespace NEWMAT;
diff --git a/fslcomplex.cc b/fslcomplex.cc
index a9d5e90..7a4d560 100644
--- a/fslcomplex.cc
+++ b/fslcomplex.cc
@@ -6,7 +6,7 @@
 
 /*  CCOPYRIGHT  */
 
-#include "newimageall.h"
+#include "newimage/newimageall.h"
 
 using namespace NEWIMAGE;
 
diff --git a/fslmeants.cc b/fslmeants.cc
index 39fa855..6317a03 100644
--- a/fslmeants.cc
+++ b/fslmeants.cc
@@ -10,8 +10,8 @@
 // Creates a mean time series (ignoring zeros) from the input 4D volume
 // Saves the results as a column in a text file
 
-#include "newimageall.h"
-#include "miscmaths.h"
+#include "newimage/newimageall.h"
+#include "miscmaths/miscmaths.h"
 
 using namespace NEWIMAGE;
 using namespace MISCMATHS;
diff --git a/fslswapdim.cc b/fslswapdim.cc
index bee20db..e333787 100644
--- a/fslswapdim.cc
+++ b/fslswapdim.cc
@@ -6,8 +6,8 @@
 
 /*  CCOPYRIGHT  */
 
-#include "newimageall.h"
-#include "fmribmain.h"
+#include "newimage/newimageall.h"
+#include "newimage/fmribmain.h"
 
 using namespace NEWIMAGE;
 
diff --git a/if2avw.c b/if2avw.c
index 7e67dea..13ec3e5 100644
--- a/if2avw.c
+++ b/if2avw.c
@@ -11,9 +11,8 @@
 /* }}} */
 /* {{{ defines, includes and typedefs */
 
-#include "libssbase.h"
-#include "avwimage.h"
-#include <assert.h>
+#include "libss/libssbase.h"
+#include "image/avwimage.h"
 
 void usage(void);
 char *find_key(FILE *, char *, const char *);
-- 
GitLab