diff --git a/setup.py b/setup.py
index 85ade1e..34f646b 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,11 @@ if py2exe is not None:
                                   ('', ['config.js', 'COPYING.txt', 'README.rst']),
                                   ('web_assets', glob.glob('web_assets/*'))]
     setup_kwargs['zipfile'] = None
-    setup_kwargs['options']['py2exe'] = {'bundle_files' : 1, 'excludes': 'Tkinter'}
+    if platform.system() == 'Windows' and '64bit' in platform.architecture():
+        b = 3
+    else:
+        b = 1
+    setup_kwargs['options']['py2exe'] = {'bundle_files' : b, 'excludes': 'Tkinter'}
 
 #
 # c_overviewer extension
diff --git a/src/composite.c b/src/composite.c
index f7186f6..4a03d23 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -272,7 +272,7 @@ alpha_over_wrap(PyObject *self, PyObject *args)
 /* like alpha_over, but instead of src image it takes a source color
  * also, it multiplies instead of doing an over operation
  */
-inline PyObject *
+PyObject *
 tint_with_mask(PyObject *dest, unsigned char sr, unsigned char sg, unsigned char sb,
                PyObject *mask, int dx, int dy, int xsize, int ysize) {
     /* libImaging handles */