X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=10f7feb0034cc2f8703a7586a01e11b7a77d4e9c;hp=02992b34be34b70f1954a52a4cd22cdb6e0a77c9;hb=7ef485116d6859eb1e31753b3e3a89de44985272;hpb=2451ac413848718a1dd666ce6f6464e974680f47

diff --git a/include/ct.h b/include/ct.h
index 02992b3..10f7feb 100644
--- a/include/ct.h
+++ b/include/ct.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ct.h,v 1.12 2000/06/09 01:35:33 kevin Exp $
+**  $Id: ct.h,v 1.22 2000/06/22 10:42:39 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -45,22 +45,14 @@
   #include "png.h"
 #endif
 #ifdef HAVE_G2_H
-  #ifdef __cplusplus
-  extern "C" { 
-    #include "g2.h" 
-  }
-  #else
-  #include "g2.h"
-  #endif
-  #ifdef HAVE_X11
-    #ifdef __cplusplus
-      extern "C" {
-        #include "g2_X11.h"
-      }
-    #else
-        #include "g2_X11.h"
-    #endif
-  #endif
+extern "C" { 
+#include "g2.h" 
+}
+#ifdef HAVE_X11
+extern "C" {
+#include "g2_X11.h"
+}
+#endif
 #endif
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -117,30 +109,40 @@
 #include <stdint.h>             /* Standard ints on Linux */
 #endif
 
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <iterator>
+#include <algorithm>
+#include <exception>
+#include <stdexcept>
+#include <memory>
+
+using namespace std;
+
 #ifdef HAVE_MPI
 #include "mpi++.h"
 #include "mpiworld.h"
 #endif
 
-#include "kstddef.h"
-#include "kmath.h"
-#include "keyboard.h"
-#include "cio.h"
+#include "ctsupport.h"
+#include "fnetorderstream.h"
 
 #ifdef HAVE_SGP
   #include "ezplot.h"
   #include "sgp.h"
 #endif
 
-#include <iostream>
-#include <string>
-
-using namespace std;
-
 #include "array2d.h"
+#include "fnetorderstream.h"
 #include "imagefile.h"
-#include "ir.h"
-#include "backproj.h"
+#include "phantom.h"
+#include "scanner.h"
+#include "backprojectors.h"
+#include "filter.h"
+#include "projections.h"
+#include "trace.h"
 
 
 #endif