* Added support for X11 modules.
* Makefile: change location of FORMS library.
* posixmodule.c: turn #if 0 into #ifdef MSDOS (stuff in unistd.h or not)
* Almost all .h files: added CPP magic to avoid duplicate inclusions and
  to support inclusion from C++.
diff --git a/Include/token.h b/Include/token.h
index 053ceab..6939cc8 100644
--- a/Include/token.h
+++ b/Include/token.h
@@ -1,3 +1,9 @@
+#ifndef Py_TOKEN_H
+#define Py_TOKEN_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***********************************************************
 Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
 Amsterdam, The Netherlands.
@@ -77,3 +83,8 @@
 extern char *tok_name[]; /* Token names */
 extern int tok_1char PROTO((int));
 extern int tok_2char PROTO((int, int));
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_TOKEN_H */