diff --git a/pyext/ctatools.i b/pyext/ctatools.i
index c3b7f93..2221ded 100755
--- a/pyext/ctatools.i
+++ b/pyext/ctatools.i
@@ -1,7 +1,7 @@
 /***************************************************************************
  *                         ctatools - SWIG file                            *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010 by Jurgen Knodlseder                                *
+ *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -11,14 +11,17 @@
  *                                                                         *
  * ----------------------------------------------------------------------- *
  * Usage:                                                                  *
- * swig -c++ -python -Wall -includeall ctatools.i                          *
+ * swig -c++ -python -Wall ctatools.i                                      *
  ***************************************************************************/
 %module ctatools
 
-/***********************************************************************//**
- * @brief Include all CTA tools
- ***************************************************************************/
-#include "ctobssim.i"
-#include "ctselect.i"
-#include "ctbin.i"
-#include "ctlike.i"
+/* __ Support module _____________________________________________________ */
+%include "stl.i"
+%include "exception.i"
+%include "GApplication.i"
+
+/* __ CTA tools __________________________________________________________ */
+%include "ctobssim.i"
+%include "ctselect.i"
+%include "ctbin.i"
+%include "ctlike.i"
diff --git a/pyext/ctbin.i b/pyext/ctbin.i
index a8aa1e3..22a1ebc 100644
--- a/pyext/ctbin.i
+++ b/pyext/ctbin.i
@@ -20,7 +20,6 @@
 #include "ctbin.hpp"
 #include "GTools.hpp"
 %}
-%include gammalib.i
 
 
 /***********************************************************************//**
diff --git a/pyext/ctlike.i b/pyext/ctlike.i
index d658ddc..23b6fd7 100644
--- a/pyext/ctlike.i
+++ b/pyext/ctlike.i
@@ -20,7 +20,6 @@
 #include "ctlike.hpp"
 #include "GTools.hpp"
 %}
-%include gammalib.i
 
 
 /***********************************************************************//**
diff --git a/pyext/ctobssim.i b/pyext/ctobssim.i
index 5e237d7..35d5aa9 100644
--- a/pyext/ctobssim.i
+++ b/pyext/ctobssim.i
@@ -20,7 +20,6 @@
 #include "ctobssim.hpp"
 #include "GTools.hpp"
 %}
-%include gammalib.i
 
 
 /***********************************************************************//**
diff --git a/pyext/ctselect.i b/pyext/ctselect.i
index 461f8ff..c47ca7c 100644
--- a/pyext/ctselect.i
+++ b/pyext/ctselect.i
@@ -20,7 +20,6 @@
 #include "ctselect.hpp"
 #include "GTools.hpp"
 %}
-%include gammalib.i
 
 
 /***********************************************************************//**