diff --git a/.gitignore b/.gitignore
index 95af8ed..518cae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,4 @@ tiny_libmaker
 *~
 \#*
 .#*
-win32/include/*
-win32/lib/*
-win32/vs2015/*
+win32/*
diff --git a/tcc.h b/tcc.h
index 8e90496..09c27d8 100644
--- a/tcc.h
+++ b/tcc.h
@@ -1263,6 +1263,8 @@ ST_FUNC void preprocess_delete(void);
 ST_FUNC int tcc_preprocess(TCCState *s1);
 ST_FUNC void skip(int c);
 ST_FUNC NORETURN void expect(const char *msg);
+ST_FUNC char *trimfront(char *p);
+ST_FUNC char *trimback(char *a, char *e);
 
 /* ------------ tccgen.c ------------ */
 
diff --git a/tccpe.c b/tccpe.c
index eb13d2d..2484e4f 100644
--- a/tccpe.c
+++ b/tccpe.c
@@ -1563,22 +1563,6 @@ quit:
     return ret;
 }
 
-/* ------------------------------------------------------------- */
-static char *trimfront(char *p)
-{
-    while (*p && (unsigned char)*p <= ' ')
-        ++p;
-    return p;
-}
-
-static char *trimback(char *a, char *e)
-{
-    while (e > a && (unsigned char)e[-1] <= ' ')
-        --e;
-    *e = 0;;
-    return a;
-}
-
 /* ------------------------------------------------------------- */
 static int pe_load_def(TCCState *s1, int fd)
 {
diff --git a/tccpp.c b/tccpp.c
index 58eb5f6..4164c7e 100644
--- a/tccpp.c
+++ b/tccpp.c
@@ -3490,3 +3490,18 @@ ST_FUNC int tcc_preprocess(TCCState *s1)
 
     return 0;
 }
+
+ST_FUNC char *trimfront(char *p)
+{
+    while (*p && (unsigned char)*p <= ' ')
+        ++p;
+    return p;
+}
+
+ST_FUNC char *trimback(char *a, char *e)
+{
+    while (e > a && (unsigned char)e[-1] <= ' ')
+        --e;
+    *e = 0;;
+    return a;
+}