diff --git a/autopxd/__init__.py b/autopxd/__init__.py
index 20709bf..b018621 100644
--- a/autopxd/__init__.py
+++ b/autopxd/__init__.py
@@ -303,16 +303,15 @@ def lines(self):
 
 
 def preprocess(code, extra_cpp_args=[]):
-    proc = subprocess.Popen([
-        'cpp', '-nostdinc', '-D__attribute__(x)=', '-I', BUILTIN_HEADERS_DIR,
-    ] + extra_cpp_args + ['-'], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-    result = []
-    result.append(proc.communicate(input=code.encode('utf-8'))[0])
-    while proc.poll() is None:
-        result.append(proc.communicate()[0])
+    proc = subprocess.Popen(
+        ['cpp', '-nostdinc', '-D__attribute__(x)=',
+            '-I', BUILTIN_HEADERS_DIR] +
+        extra_cpp_args + ['-'],
+        stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
+    result = proc.communicate(input=code)[0]
     if proc.returncode:
         raise Exception('Invoking C preprocessor failed')
-    return b''.join(result).decode('utf-8')
+    return result
 
 
 def parse(code, extra_cpp_args=[]):
@@ -328,14 +327,14 @@ def parse(code, extra_cpp_args=[]):
 
 
 def translate(code, hdrname, extra_cpp_args=[]):
-    extra_incdir = os.path.dirname(hdrname)
+    extra_incdir = os.path.normpath(os.path.dirname(hdrname))
     p = AutoPxd(hdrname)
     p.visit(parse(code, extra_cpp_args=['-I', extra_incdir]))
     return str(p)
 
 
 @click.command()
-@click.argument('infile', type=click.File('rb'), default=sys.stdin)
-@click.argument('outfile', type=click.File('wb'), default=sys.stdout)
+@click.argument('infile', type=click.File(), default=sys.stdin)
+@click.argument('outfile', type=click.File('wt'), default=sys.stdout)
 def cli(infile, outfile):
     outfile.write(translate(infile.read(), infile.name))