13 files changed, 5 insertions, 41 deletions
diff --git a/cuda/2d/algo.h b/cuda/2d/algo.h
index dc3bb05..4a75907 100644
--- a/cuda/2d/algo.h
+++ b/cuda/2d/algo.h
@@ -28,7 +28,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_ALGO_H
 #define _CUDA_ALGO_H
 
-#include "util.h"
+#include "astra/Globals.h"
+#include "dims.h"
 
 namespace astraCUDA {
 
diff --git a/cuda/2d/astra.h b/cuda/2d/astra.h
index 78d00e3..c9e0762 100644
--- a/cuda/2d/astra.h
+++ b/cuda/2d/astra.h
@@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_ASTRA_H
 #define _CUDA_ASTRA_H
 
-#include "fft.h"
 #include "fbp_filters.h"
 #include "dims.h"
 #include "algo.h"
diff --git a/cuda/2d/cgls.h b/cuda/2d/cgls.h
index 804f943..c45b5a4 100644
--- a/cuda/2d/cgls.h
+++ b/cuda/2d/cgls.h
@@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_CGLS_H
 #define _CUDA_CGLS_H
 
-#include "util.h"
 #include "algo.h"
 
 namespace astraCUDA {
diff --git a/cuda/2d/darthelper.h b/cuda/2d/darthelper.h
index a2f1f45..9a2837c 100644
--- a/cuda/2d/darthelper.h
+++ b/cuda/2d/darthelper.h
@@ -28,7 +28,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_ARITH2_H
 #define _CUDA_ARITH2_H
 
-#include "util.h"
+#include "astra/Globals.h"
 
 namespace astraCUDA {
 
diff --git a/cuda/2d/em.h b/cuda/2d/em.h
index f99e798..15795f7 100644
--- a/cuda/2d/em.h
+++ b/cuda/2d/em.h
@@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_EM_H
 #define _CUDA_EM_H
 
-#include "util.h"
 #include "algo.h"
 
 namespace astraCUDA {
diff --git a/cuda/2d/sart.h b/cuda/2d/sart.h
index ab99e66..06051ae 100644
--- a/cuda/2d/sart.h
+++ b/cuda/2d/sart.h
@@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_SART_H
 #define _CUDA_SART_H
 
-#include "util.h"
 #include "algo.h"
 
 namespace astraCUDA {
diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h
index 488ab0a..7c440d5 100644
--- a/cuda/2d/sirt.h
+++ b/cuda/2d/sirt.h
@@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_SIRT_H
 #define _CUDA_SIRT_H
 
-#include "util.h"
 #include "algo.h"
 
 namespace astraCUDA {
diff --git a/cuda/2d/util.h b/cuda/2d/util.h
index 31fcfbd..6e36b6e 100644
--- a/cuda/2d/util.h
+++ b/cuda/2d/util.h
@@ -32,21 +32,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #include <driver_types.h>
 #include <string>
 
-#ifdef _MSC_VER
-
-#ifdef DLL_EXPORTS
-#define _AstraExport __declspec(dllexport)
-#define EXPIMP_TEMPLATE
-#else
-#define _AstraExport __declspec(dllimport)
-#define EXPIMP_TEMPLATE extern
-#endif
-
-#else
-
-#define _AstraExport
-
-#endif
+#include "astra/Globals.h"
 
 #include "dims.h"
 
diff --git a/cuda/3d/cgls3d.h b/cuda/3d/cgls3d.h
index e09fcfb..2ed2b1d 100644
--- a/cuda/3d/cgls3d.h
+++ b/cuda/3d/cgls3d.h
@@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_CGLS3D_H
 #define _CUDA_CGLS3D_H
 
-#include "util3d.h"
 #include "algo3d.h"
 
 namespace astraCUDA3d {
diff --git a/cuda/3d/darthelper3d.h b/cuda/3d/darthelper3d.h
index 71ea5b0..539fa06 100644
--- a/cuda/3d/darthelper3d.h
+++ b/cuda/3d/darthelper3d.h
@@ -28,10 +28,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_DARTHELPER3_H
 #define _CUDA_DARTHELPER3_H
 
-#include <cuda.h>
-#include <driver_types.h>
-#include "util3d.h"
-#include "algo3d.h"
+#include "dims3d.h"
 
 namespace astraCUDA3d {
 
diff --git a/cuda/3d/sirt3d.h b/cuda/3d/sirt3d.h
index 69031b8..337ca89 100644
--- a/cuda/3d/sirt3d.h
+++ b/cuda/3d/sirt3d.h
@@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_SIRT3D_H
 #define _CUDA_SIRT3D_H
 
-#include "util3d.h"
 #include "algo3d.h"
 
 namespace astraCUDA3d {
diff --git a/include/astra/CudaFilteredBackProjectionAlgorithm.h b/include/astra/CudaFilteredBackProjectionAlgorithm.h
index 057843e..164b51b 100644
--- a/include/astra/CudaFilteredBackProjectionAlgorithm.h
+++ b/include/astra/CudaFilteredBackProjectionAlgorithm.h
@@ -70,10 +70,6 @@ public:
 	static int calcIdealRealFilterWidth(int _iDetectorCount);
 	static int calcIdealFourierFilterWidth(int _iDetectorCount);
 	
-	//debug
-	static void testGenFilter(E_FBPFILTER _eFilter, float _fD, int _iProjectionCount, cufftComplex * _pFilter, int _iFFTRealDetectorCount, int _iFFTFourierDetectorCount);
-	static int getGPUCount();
-
 	/** Get a description of the class.
 	 *
 	 * @return description string
diff --git a/src/CudaFilteredBackProjectionAlgorithm.cpp b/src/CudaFilteredBackProjectionAlgorithm.cpp
index 7e2df79..a5d7b93 100644
--- a/src/CudaFilteredBackProjectionAlgorithm.cpp
+++ b/src/CudaFilteredBackProjectionAlgorithm.cpp
@@ -517,12 +517,3 @@ E_FBPFILTER CCudaFilteredBackProjectionAlgorithm::_convertStringToFilter(const c
 	return output;
 }
 
-void CCudaFilteredBackProjectionAlgorithm::testGenFilter(E_FBPFILTER _eFilter, float _fD, int _iProjectionCount, cufftComplex * _pFilter, int _iFFTRealDetectorCount, int _iFFTFourierDetectorCount)
-{
-	genFilter(_eFilter, _fD, _iProjectionCount, _pFilter, _iFFTRealDetectorCount, _iFFTFourierDetectorCount);
-}
-
-int CCudaFilteredBackProjectionAlgorithm::getGPUCount()
-{
-	return 0;
-}