diff --git a/src/interfaces/modular/GaussianProcess.i b/src/interfaces/modular/GaussianProcess.i
index 141ea0d4618..901832a2703 100644
--- a/src/interfaces/modular/GaussianProcess.i
+++ b/src/interfaces/modular/GaussianProcess.i
@@ -9,10 +9,6 @@
 
 /* Remove C Prefix */
 #ifdef HAVE_EIGEN3
-%rename(GaussianProcessMachine) CGaussianProcessMachine;
-%rename(GaussianProcessBinaryClassification) CGaussianProcessBinaryClassification;
-%rename(GaussianProcessBinaryRegression) CGaussianProcessBinaryRegression;
-
 %rename(MeanFunction) CMeanFunction;
 %rename(ZeroMean) CZeroMean;
 
@@ -27,16 +23,16 @@
 %rename(GaussianLikelihood) CGaussianLikelihood;
 %rename(StudentsTLikelihood) CStudentsTLikelihood;
 
+%rename(GaussianProcessMachine) CGaussianProcessMachine;
+%rename(GaussianProcessBinaryClassification) CGaussianProcessBinaryClassification;
+%rename(GaussianProcessBinaryRegression) CGaussianProcessBinaryRegression;
+
 #endif //HAVE_EIGEN3
 
 /* These functions return new Objects */
 
 /* Include Class Headers to make them visible from within the target language */
 #ifdef HAVE_EIGEN3
-%include <shogun/machine/GaussianProcessMachine.h>
-%include <shogun/classifier/GaussianProcessBinaryClassification.h>
-%include <shogun/regression/GaussianProcessRegression.h>
- 
 %include <shogun/evaluation/DifferentiableFunction.h>
 %include <shogun/machine/gp/LikelihoodModel.h>
 %include <shogun/machine/gp/ProbitLikelihood.h>
@@ -52,6 +48,10 @@
 %include <shogun/machine/gp/ExactInferenceMethod.h>
 %include <shogun/machine/gp/LaplacianInferenceMethod.h>
 %include <shogun/machine/gp/FITCInferenceMethod.h>
+
+%include <shogun/machine/GaussianProcessMachine.h>
+%include <shogun/classifier/GaussianProcessBinaryClassification.h>
+%include <shogun/regression/GaussianProcessRegression.h>
  
 %include <shogun/machine/gp/MeanFunction.h>
 %include <shogun/machine/gp/ZeroMean.h>
diff --git a/src/interfaces/modular/GaussianProcess_includes.i b/src/interfaces/modular/GaussianProcess_includes.i
index 3f8406442d8..1f8a8fcefc2 100644
--- a/src/interfaces/modular/GaussianProcess_includes.i
+++ b/src/interfaces/modular/GaussianProcess_includes.i
@@ -1,9 +1,5 @@
 %{
 #ifdef HAVE_EIGEN3
- #include <shogun/machine/GaussianProcessMachine.h>
- 
- #include <shogun/classifier/GaussianProcessBinaryClassification.h>
- #include <shogun/regression/GaussianProcessRegression.h>
  
  #include <shogun/evaluation/DifferentiableFunction.h>
  #include <shogun/machine/gp/LikelihoodModel.h>
@@ -23,5 +19,9 @@
  
  #include <shogun/machine/gp/MeanFunction.h>
  #include <shogun/machine/gp/ZeroMean.h>
+ 
+ #include <shogun/machine/GaussianProcessMachine.h>
+ #include <shogun/classifier/GaussianProcessBinaryClassification.h>
+ #include <shogun/regression/GaussianProcessRegression.h>
 #endif //HAVE_EIGEN3
 %}