9 files changed, 43 insertions, 8 deletions
diff --git a/src/algebra/any.spad.pamphlet b/src/algebra/any.spad.pamphlet
index 0854e8e4..7bc2d368 100644
--- a/src/algebra/any.spad.pamphlet
+++ b/src/algebra/any.spad.pamphlet
@@ -87,6 +87,7 @@ Maybe(T: CoercibleTo OutputForm): Public == Private where
 \section{package NONE1 NoneFunctions1}
 
 <<package NONE1 NoneFunctions1>>=
+import Type
 import None
 )abbrev package NONE1 NoneFunctions1
 ++ Author:
diff --git a/src/algebra/domain.spad.pamphlet b/src/algebra/domain.spad.pamphlet
index 0b4d5847..e4f11843 100644
--- a/src/algebra/domain.spad.pamphlet
+++ b/src/algebra/domain.spad.pamphlet
@@ -13,6 +13,7 @@
 
 \section{domain Category}
 <<domain CATEGORY Category>>=
+import CoercibleTo OutputForm
 )abbrev domain CATEGORY Category
 ++ Author: Gabriel Dos Reis
 ++ Date Create: February 16, 2008.
@@ -30,6 +31,9 @@ Category(): Public == Private where
 
 \section{domain Domain}
 <<domain DOMAIN Domain>>=
+import SetCategory
+import Void
+import ConstructorCall
 )abbrev domain DOMAIN Domain
 ++ Author: Gabriel Dos Reis
 ++ Date Create: October 18, 2007.
diff --git a/src/algebra/drawopt.spad.pamphlet b/src/algebra/drawopt.spad.pamphlet
index 26437f52..107d5d3d 100644
--- a/src/algebra/drawopt.spad.pamphlet
+++ b/src/algebra/drawopt.spad.pamphlet
@@ -1,15 +1,17 @@
 \documentclass{article}
 \usepackage{axiom}
 \begin{document}
-\title{\$SPAD/src/algebra drawopt.spad}
+\title{src/algebra drawopt.spad}
 \author{Stephen M. Watt, Jim Wen}
 \maketitle
+
 \begin{abstract}
 \end{abstract}
-\eject
 \tableofcontents
 \eject
+
 \section{domain DROPT DrawOption}
+
 <<domain DROPT DrawOption>>=
 )abbrev domain DROPT DrawOption
 ++ Author: Stephen Watt
@@ -222,6 +224,7 @@ DrawOption(): Exports == Implementation where
 \section{package DROPT1 DrawOptionFunctions1}
 
 <<package DROPT1 DrawOptionFunctions1>>=
+import Type
 import Symbol
 import List DrawOption
 )abbrev package DROPT1 DrawOptionFunctions1
diff --git a/src/algebra/fortran.spad.pamphlet b/src/algebra/fortran.spad.pamphlet
index e4012eeb..92b1f238 100644
--- a/src/algebra/fortran.spad.pamphlet
+++ b/src/algebra/fortran.spad.pamphlet
@@ -1,16 +1,23 @@
 \documentclass{article}
 \usepackage{axiom}
 \begin{document}
-\title{\$SPAD/src/algebra fortran.spad}
+\title{src/algebra fortran.spad}
 \author{Didier Pinchon, Mike Dewar, William Naylor}
 \maketitle
+
 \begin{abstract}
 \end{abstract}
-\eject
 \tableofcontents
 \eject
+
 \section{domain RESULT Result}
+
 <<domain RESULT Result>>=
+import Boolean
+import Symbol
+import OutputForm
+import Any
+import TableAggregate
 )abbrev domain RESULT Result
 ++ Author: Didier Pinchon and Mike Dewar
 ++ Date Created:  8 April 1994
@@ -39,6 +46,7 @@ Result():Exports==Implementation where
     finiteAggregate
 
   Implementation ==> Table(Symbol,Any) add
+    import SExpression
 
     -- Constant
     colon := ": "::Symbol::O
@@ -78,8 +86,13 @@ Result():Exports==Implementation where
     showScalarValues(b:Boolean):Boolean == showScalarValuesFlag := b
 
 @
+
 \section{domain FC FortranCode}
+
 <<domain FC FortranCode>>=
+import Void
+import List
+import Fraction
 )abbrev domain FC FortranCode 
 -- The FortranCode domain is used to represent operations which are to be
 -- translated into FORTRAN.
diff --git a/src/algebra/ituple.spad.pamphlet b/src/algebra/ituple.spad.pamphlet
index 7e18b0ba..c47f99be 100644
--- a/src/algebra/ituple.spad.pamphlet
+++ b/src/algebra/ituple.spad.pamphlet
@@ -60,6 +60,7 @@ InfiniteTuple(S:Type): Exports == Implementation where
 <<package ITFUN2 InfiniteTupleFunctions2>>=
 import Type
 import InfiniteTuple
+import Stream
 )abbrev package ITFUN2 InfiniteTupleFunctions2
 InfiniteTupleFunctions2(A:Type,B:Type): Exports == Implementation where
   ++ Functions defined on streams with entries in two sets.
diff --git a/src/algebra/mkfunc.spad.pamphlet b/src/algebra/mkfunc.spad.pamphlet
index 4e49cf43..fae62a96 100644
--- a/src/algebra/mkfunc.spad.pamphlet
+++ b/src/algebra/mkfunc.spad.pamphlet
@@ -256,7 +256,9 @@ MakeFunction(S:ConvertibleTo InputForm): Exports == Implementation where
 \section{package MKUCFUNC MakeUnaryCompiledFunction}
 
 <<package MKUCFUNC MakeUnaryCompiledFunction>>=
+import Type
 import Symbol
+import ConvertibleTo InputForm
 )abbrev package MKUCFUNC MakeUnaryCompiledFunction
 ++ Tools for making compiled functions from top-level expressions
 ++ Author: Manuel Bronstein
@@ -297,6 +299,8 @@ MakeUnaryCompiledFunction(S, D, I): Exports == Implementation where
 \section{package MKBCFUNC MakeBinaryCompiledFunction}
 
 <<package MKBCFUNC MakeBinaryCompiledFunction>>=
+import Type
+import CoercibleTo InputForm
 import Symbol
 )abbrev package MKBCFUNC MakeBinaryCompiledFunction
 ++ Tools for making compiled functions from top-level expressions
diff --git a/src/algebra/mkrecord.spad.pamphlet b/src/algebra/mkrecord.spad.pamphlet
index 0087800c..ac6bf4b1 100644
--- a/src/algebra/mkrecord.spad.pamphlet
+++ b/src/algebra/mkrecord.spad.pamphlet
@@ -1,16 +1,19 @@
 \documentclass{article}
 \usepackage{axiom}
 \begin{document}
-\title{\$SPAD/src/algebra mkrecord.spad}
+\title{src/algebra mkrecord.spad}
 \author{The Axiom Team}
 \maketitle
+
 \begin{abstract}
 \end{abstract}
-\eject
 \tableofcontents
 \eject
+
 \section{package MKRECORD MakeRecord}
+
 <<package MKRECORD MakeRecord>>=
+import Type
 )abbrev package MKRECORD MakeRecord
 ++ Description:
 ++  MakeRecord is used internally by the interpreter to create record
@@ -27,7 +30,11 @@ MakeRecord(S: Type, T: Type): public == private where
 @
 
 \section{domain PAIR Pair}
+
 <<domain PAIR Pair>>=
+import Type
+import CoercibleTo OutputForm
+import SetCategory
 )abbrev domain PAIR Pair
 ++ Author: Gabriel Dos Reis
 ++ Date Created: January 16, 2008
diff --git a/src/algebra/plot.spad.pamphlet b/src/algebra/plot.spad.pamphlet
index 979e635e..5b5eefd3 100644
--- a/src/algebra/plot.spad.pamphlet
+++ b/src/algebra/plot.spad.pamphlet
@@ -572,8 +572,10 @@ Plot(): Exports == Implementation where
 \section{package PLOT1 PlotFunctions1}
 
 <<package PLOT1 PlotFunctions1>>=
+import ConvertibleTo InputForm
 import Symbol
-import Segment DoubleFloat
+import DoubleFloat
+import Segment
 import Plot
 )abbrev package PLOT1 PlotFunctions1
 ++ Authors: R.T.M. Bronstein, C.J. Williamson
diff --git a/src/algebra/wtpol.spad.pamphlet b/src/algebra/wtpol.spad.pamphlet
index 7f64a69f..d4b28f47 100644
--- a/src/algebra/wtpol.spad.pamphlet
+++ b/src/algebra/wtpol.spad.pamphlet
@@ -58,7 +58,7 @@ WeightedPolynomials(R:Ring,VarSet: OrderedSet, E:OrderedAbelianMonoidSup,
    if #vl ~= #wl then error "incompatible length lists in WeightedPolynomial"
    lookupList:=[[v,n] for v in vl for n in wl]
    -- local operation
-   innercoerce:(p,z) -> $
+   innercoerce: (P,Integer) -> $
    lookup:VarSet -> NonNegativeInteger
    lookup v ==
       l:=lookupList