Index: generic/gentclAPI.tcl
===================================================================
diff -u -r9f1d59741223795c836a0e8230a891781ecfc09e -r485f041db31fc83046fbeba0d3e64beeb1abca1f
--- generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 9f1d59741223795c836a0e8230a891781ecfc09e)
+++ generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 485f041db31fc83046fbeba0d3e64beeb1abca1f)
@@ -280,7 +280,7 @@
      lappend namespaces "\"$value\"" 
   }
   set namespaceString [join $namespaces ",\n  "]
-  puts "char *method_command_namespace_names\[\] = {\n  $namespaceString\n};"
+  puts "static char *method_command_namespace_names\[\] = {\n  $namespaceString\n};"
   puts $stubDecls
   puts $decls
   set enumString [join $enums ",\n "]
Index: generic/tclAPI.h
===================================================================
diff -u -rf11b03a9a764254c5a1ba45480ebf5eb19e2bf8d -r485f041db31fc83046fbeba0d3e64beeb1abca1f
--- generic/tclAPI.h	(.../tclAPI.h)	(revision f11b03a9a764254c5a1ba45480ebf5eb19e2bf8d)
+++ generic/tclAPI.h	(.../tclAPI.h)	(revision 485f041db31fc83046fbeba0d3e64beeb1abca1f)
@@ -35,7 +35,7 @@
 /* just to define the symbol */
 static methodDefinition method_definitions[];
   
-char *method_command_namespace_names[] = {
+static char *method_command_namespace_names[] = {
   "::xotcl::cmd::ObjectInfo",
   "::xotcl::cmd::Object",
   "::xotcl::cmd::ClassInfo",
Index: generic/xotcl.c
===================================================================
diff -u -rf11b03a9a764254c5a1ba45480ebf5eb19e2bf8d -r485f041db31fc83046fbeba0d3e64beeb1abca1f
--- generic/xotcl.c	(.../xotcl.c)	(revision f11b03a9a764254c5a1ba45480ebf5eb19e2bf8d)
+++ generic/xotcl.c	(.../xotcl.c)	(revision 485f041db31fc83046fbeba0d3e64beeb1abca1f)
@@ -160,12 +160,14 @@
 } parseContext;
 
 #if defined(CANONICAL_ARGS)
-int ProcessMethodArguments(parseContext *pcPtr, Tcl_Interp *interp, 
-                           XOTclObject *obj, int pushFrame, XOTclParamDefs *paramDefs,
-                           char *methodName, int objc, Tcl_Obj *CONST objv[]);
+static int 
+ProcessMethodArguments(parseContext *pcPtr, Tcl_Interp *interp, 
+                       XOTclObject *obj, int pushFrame, XOTclParamDefs *paramDefs,
+                       char *methodName, int objc, Tcl_Obj *CONST objv[]);
 #endif
 
-void parseContextInit(parseContext *pc, int objc, XOTclObject *obj, Tcl_Obj *procName) {
+static void 
+parseContextInit(parseContext *pc, int objc, XOTclObject *obj, Tcl_Obj *procName) {
   if (objc < PARSE_CONTEXT_PREALLOC) {
     /* the single larger memset below .... */
     memset(pc, 0, sizeof(parseContext));
@@ -189,7 +191,7 @@
   pc->obj = obj;
 }
 
-void parseContextExtendObjv(parseContext *pc, int from, int elts, Tcl_Obj *CONST source[]) {
+static void parseContextExtendObjv(parseContext *pc, int from, int elts, Tcl_Obj *CONST source[]) {
   int requiredSize = from + elts;
   
   /*XOTclPrintObjv("BEFORE: ", pc->objc, pc->full_objv);*/
@@ -214,7 +216,7 @@
   /*XOTclPrintObjv("AFTER:  ", pc->objc, pc->full_objv);*/
 }
 
-void parseContextRelease(parseContext *pc) {
+static void parseContextRelease(parseContext *pc) {
   if (pc->mustDecr) {
     int i;
     for (i = 0; i < pc->lastobjc; i++) {
@@ -1459,7 +1461,7 @@
   *	        Tcl_Interp *interp, CONST char * name, Tcl_Namespace *context,
   *	        int flags, Tcl_Var *rPtr));
   */
-int
+static int
 varResolver(Tcl_Interp *interp, CONST char *name, Tcl_Namespace *nsPtr, int flags, Tcl_Var *varPtr) {
   int new;
   Tcl_Obj *key;
@@ -8886,7 +8888,7 @@
   return TCL_ERROR;
 }
 
-int
+static int
 ArgumentDefaults(parseContext *pcPtr, Tcl_Interp *interp, 
                  XOTclParam CONST *ifd, int nrParams) {
   XOTclParam CONST *pPtr;
@@ -11823,7 +11825,7 @@
 #endif
 
 #if defined(CANONICAL_ARGS)
-int
+static int
 ProcessMethodArguments(parseContext *pcPtr, Tcl_Interp *interp, 
                        XOTclObject *obj, int pushFrame,
                        XOTclParamDefs *paramDefs,
Index: generic/xotclStack.c
===================================================================
diff -u -r7cb7c751d63fe0eece5756910e3f0b18e61a4d16 -r485f041db31fc83046fbeba0d3e64beeb1abca1f
--- generic/xotclStack.c	(.../xotclStack.c)	(revision 7cb7c751d63fe0eece5756910e3f0b18e61a4d16)
+++ generic/xotclStack.c	(.../xotclStack.c)	(revision 485f041db31fc83046fbeba0d3e64beeb1abca1f)
@@ -253,7 +253,7 @@
  * if "exit" is called and we were jumping out of the
  * callframe
  */
-void CallStackPopAll(Tcl_Interp *interp) {
+static void CallStackPopAll(Tcl_Interp *interp) {
   XOTclCallStack *cs = &RUNTIME_STATE(interp)->cs;
 
   while (cs->top > cs->content)
Index: generic/xotclStack85.c
===================================================================
diff -u -r023406d3ec3ce8115b89ae42b0c48c317c63ae0a -r485f041db31fc83046fbeba0d3e64beeb1abca1f
--- generic/xotclStack85.c	(.../xotclStack85.c)	(revision 023406d3ec3ce8115b89ae42b0c48c317c63ae0a)
+++ generic/xotclStack85.c	(.../xotclStack85.c)	(revision 485f041db31fc83046fbeba0d3e64beeb1abca1f)
@@ -30,7 +30,7 @@
   }
 }
 
-Tcl_CallFrame *
+static Tcl_CallFrame *
 nonXotclObjectProcFrame(Tcl_CallFrame *framePtr) {
   for (; framePtr; framePtr = Tcl_CallFrame_callerPtr(framePtr)) {
     int flag = Tcl_CallFrame_isProcCallFrame(framePtr);
@@ -45,7 +45,7 @@
   return framePtr;
 }
 
-Tcl_CallFrame *
+static Tcl_CallFrame *
 nextFrameOfType(Tcl_CallFrame *framePtr, int flags) {
   for (; framePtr; framePtr = Tcl_CallFrame_callerPtr(framePtr)) {
     if (Tcl_CallFrame_isProcCallFrame(framePtr) & flags) 
@@ -280,7 +280,7 @@
  * if "exit" is called and we were jumping out of the
  * callframe
  */
-void CallStackPopAll(Tcl_Interp *interp) {
+static void CallStackPopAll(Tcl_Interp *interp) {
 
   while (1) {
     Tcl_CallFrame *framePtr = Tcl_Interp_framePtr(interp);