diff --git a/qpms/__init__.py b/qpms/__init__.py
index d978158..fb7026d 100644
--- a/qpms/__init__.py
+++ b/qpms/__init__.py
@@ -1,13 +1,14 @@
 from pkg_resources import get_distribution
 __version__ = get_distribution('qpms').version
 
-from .qpms_c import *
+from .qpms_c import PointGroup, FinitePointGroup, FinitePointGroupElement, Particle, scatsystem_set_nthreads, ScatteringSystem, ScatteringMatrix
 from .qpms_p import *
 from .cyquaternions import CQuat, IRot3
 from .cybspec import VSWFNorm, BaseSpec
 from .cytmatrices import CTMatrix, TMatrixInterpolator
 from .cytranslations import trans_calculator
 from .cymaterials import MaterialInterpolator
+from .cycommon import dbgmsg_enable, dbgmsg_disable, dbgmsg_active, BesselType
 from .lattices2d import *
 from .hexpoints import *
 from .tmatrices import *
diff --git a/qpms/qpms_c.pyx b/qpms/qpms_c.pyx
index 9da3624..57aba57 100644
--- a/qpms/qpms_c.pyx
+++ b/qpms/qpms_c.pyx
@@ -8,20 +8,14 @@ to make them available in Python.
 # -----------------------------
 
 import numpy as np
-import cmath
 from qpms_cdefs cimport *
-from cyquaternions cimport *
-#from cyquaternions import *
-from cybspec cimport *
-#from cybspec import *
-from cycommon import *
+from cyquaternions cimport IRot3, CQuat
+from cybspec cimport BaseSpec
 from cycommon cimport make_c_string
+from cycommon import string_c2py, PointGroupClass
+#import cycommon # Just to link make_c_string
 from cytmatrices cimport CTMatrix
-cimport cython
-import enum
-import warnings
-import os
-from libc.stdlib cimport malloc, free, calloc, abort
+from libc.stdlib cimport malloc, free, calloc
 
 cdef class PointGroup:
     cdef readonly qpms_pointgroup_t G