diff --git a/src/cff/Jamfile b/src/cff/Jamfile
index e6dd05fc1..f665a0b25 100644
--- a/src/cff/Jamfile
+++ b/src/cff/Jamfile
@@ -23,15 +23,6 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) cff ;
                cffobjs
                cffparse
                cffpic
-               cf2arrst
-               cf2blues
-               cf2error
-               cf2font
-               cf2ft
-               cf2hints
-               cf2intrp
-               cf2read
-               cf2stack
                ;
   }
   else
diff --git a/src/cff/cff.c b/src/cff/cff.c
index 397f6dfaf..e9b3264b8 100644
--- a/src/cff/cff.c
+++ b/src/cff/cff.c
@@ -27,15 +27,4 @@
 #include "cffload.c"
 #include "cffobjs.c"
 
-#include "cf2arrst.c"
-#include "cf2blues.c"
-#include "cf2error.c"
-#include "cf2font.c"
-#include "cf2ft.c"
-#include "cf2hints.c"
-#include "cf2intrp.c"
-#include "cf2read.c"
-#include "cf2stack.c"
-
-
 /* END */
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 20f3a2c28..9200d20cf 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -27,7 +27,6 @@
 #include "cffobjs.h"
 #include "cffload.h"
 #include "cffgload.h"
-#include "cf2ft.h"      /* for cf2_decoder_parse_charstrings */
 
 #include "cfferrs.h"
 
diff --git a/src/cff/rules.mk b/src/cff/rules.mk
index 86840bfe3..feecf4611 100644
--- a/src/cff/rules.mk
+++ b/src/cff/rules.mk
@@ -32,16 +32,7 @@ CFF_DRV_SRC := $(CFF_DIR)/cffcmap.c  \
                $(CFF_DIR)/cffload.c  \
                $(CFF_DIR)/cffobjs.c  \
                $(CFF_DIR)/cffparse.c \
-               $(CFF_DIR)/cffpic.c   \
-               $(CFF_DIR)/cf2arrst.c \
-               $(CFF_DIR)/cf2blues.c \
-               $(CFF_DIR)/cf2error.c \
-               $(CFF_DIR)/cf2font.c  \
-               $(CFF_DIR)/cf2ft.c    \
-               $(CFF_DIR)/cf2hints.c \
-               $(CFF_DIR)/cf2intrp.c \
-               $(CFF_DIR)/cf2read.c  \
-               $(CFF_DIR)/cf2stack.c
+               $(CFF_DIR)/cffpic.c
 
 
 # CFF driver headers
@@ -49,10 +40,7 @@ CFF_DRV_SRC := $(CFF_DIR)/cffcmap.c  \
 CFF_DRV_H := $(CFF_DRV_SRC:%.c=%.h) \
              $(CFF_DIR)/cfferrs.h   \
              $(CFF_DIR)/cfftoken.h  \
-             $(CFF_DIR)/cfftypes.h  \
-             $(CFF_DIR)/cf2fixed.h  \
-             $(CFF_DIR)/cf2glue.h   \
-             $(CFF_DIR)/cf2types.h
+             $(CFF_DIR)/cfftypes.h 
 
 
 # CFF driver object(s)
diff --git a/src/psaux/Jamfile b/src/psaux/Jamfile
index 798b73d1c..8ca518959 100644
--- a/src/psaux/Jamfile
+++ b/src/psaux/Jamfile
@@ -22,6 +22,15 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) psaux ;
                psobjs
                t1cmap
                t1decode
+               cf2arrst
+               cf2blues
+               cf2error
+               cf2font
+               cf2ft
+               cf2hints
+               cf2intrp
+               cf2read
+               cf2stack
                ;
   }
   else
diff --git a/src/cff/cf2arrst.c b/src/psaux/cf2arrst.c
similarity index 100%
rename from src/cff/cf2arrst.c
rename to src/psaux/cf2arrst.c
diff --git a/src/cff/cf2arrst.h b/src/psaux/cf2arrst.h
similarity index 100%
rename from src/cff/cf2arrst.h
rename to src/psaux/cf2arrst.h
diff --git a/src/cff/cf2blues.c b/src/psaux/cf2blues.c
similarity index 100%
rename from src/cff/cf2blues.c
rename to src/psaux/cf2blues.c
diff --git a/src/cff/cf2blues.h b/src/psaux/cf2blues.h
similarity index 100%
rename from src/cff/cf2blues.h
rename to src/psaux/cf2blues.h
diff --git a/src/cff/cf2error.c b/src/psaux/cf2error.c
similarity index 100%
rename from src/cff/cf2error.c
rename to src/psaux/cf2error.c
diff --git a/src/cff/cf2error.h b/src/psaux/cf2error.h
similarity index 100%
rename from src/cff/cf2error.h
rename to src/psaux/cf2error.h
diff --git a/src/cff/cf2fixed.h b/src/psaux/cf2fixed.h
similarity index 100%
rename from src/cff/cf2fixed.h
rename to src/psaux/cf2fixed.h
diff --git a/src/cff/cf2font.c b/src/psaux/cf2font.c
similarity index 100%
rename from src/cff/cf2font.c
rename to src/psaux/cf2font.c
diff --git a/src/cff/cf2font.h b/src/psaux/cf2font.h
similarity index 100%
rename from src/cff/cf2font.h
rename to src/psaux/cf2font.h
diff --git a/src/cff/cf2ft.c b/src/psaux/cf2ft.c
similarity index 100%
rename from src/cff/cf2ft.c
rename to src/psaux/cf2ft.c
diff --git a/src/cff/cf2ft.h b/src/psaux/cf2ft.h
similarity index 100%
rename from src/cff/cf2ft.h
rename to src/psaux/cf2ft.h
diff --git a/src/cff/cf2glue.h b/src/psaux/cf2glue.h
similarity index 100%
rename from src/cff/cf2glue.h
rename to src/psaux/cf2glue.h
diff --git a/src/cff/cf2hints.c b/src/psaux/cf2hints.c
similarity index 100%
rename from src/cff/cf2hints.c
rename to src/psaux/cf2hints.c
diff --git a/src/cff/cf2hints.h b/src/psaux/cf2hints.h
similarity index 100%
rename from src/cff/cf2hints.h
rename to src/psaux/cf2hints.h
diff --git a/src/cff/cf2intrp.c b/src/psaux/cf2intrp.c
similarity index 100%
rename from src/cff/cf2intrp.c
rename to src/psaux/cf2intrp.c
diff --git a/src/cff/cf2intrp.h b/src/psaux/cf2intrp.h
similarity index 100%
rename from src/cff/cf2intrp.h
rename to src/psaux/cf2intrp.h
diff --git a/src/cff/cf2read.c b/src/psaux/cf2read.c
similarity index 100%
rename from src/cff/cf2read.c
rename to src/psaux/cf2read.c
diff --git a/src/cff/cf2read.h b/src/psaux/cf2read.h
similarity index 100%
rename from src/cff/cf2read.h
rename to src/psaux/cf2read.h
diff --git a/src/cff/cf2stack.c b/src/psaux/cf2stack.c
similarity index 100%
rename from src/cff/cf2stack.c
rename to src/psaux/cf2stack.c
diff --git a/src/cff/cf2stack.h b/src/psaux/cf2stack.h
similarity index 100%
rename from src/cff/cf2stack.h
rename to src/psaux/cf2stack.h
diff --git a/src/cff/cf2types.h b/src/psaux/cf2types.h
similarity index 100%
rename from src/cff/cf2types.h
rename to src/psaux/cf2types.h
diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c
index c373aa7d5..2d301252f 100644
--- a/src/psaux/psaux.c
+++ b/src/psaux/psaux.c
@@ -26,5 +26,15 @@
 #include "t1cmap.c"
 #include "t1decode.c"
 
+#include "cf2arrst.c"
+#include "cf2blues.c"
+#include "cf2error.c"
+#include "cf2font.c"
+#include "cf2ft.c"
+#include "cf2hints.c"
+#include "cf2intrp.c"
+#include "cf2read.c"
+#include "cf2stack.c"
+
 
 /* END */
diff --git a/src/psaux/rules.mk b/src/psaux/rules.mk
index 542ae12d2..5658811db 100644
--- a/src/psaux/rules.mk
+++ b/src/psaux/rules.mk
@@ -33,12 +33,24 @@ PSAUX_DRV_SRC := $(PSAUX_DIR)/psobjs.c   \
                  $(PSAUX_DIR)/t1cmap.c   \
                  $(PSAUX_DIR)/afmparse.c \
                  $(PSAUX_DIR)/psconv.c   \
-                 $(PSAUX_DIR)/psauxmod.c
+                 $(PSAUX_DIR)/psauxmod.c \
+                 $(PSAUX_DIR)/cf2arrst.c \
+                 $(PSAUX_DIR)/cf2blues.c \
+                 $(PSAUX_DIR)/cf2error.c \
+                 $(PSAUX_DIR)/cf2font.c  \
+                 $(PSAUX_DIR)/cf2ft.c    \
+                 $(PSAUX_DIR)/cf2hints.c \
+                 $(PSAUX_DIR)/cf2intrp.c \
+                 $(PSAUX_DIR)/cf2read.c  \
+                 $(PSAUX_DIR)/cf2stack.c 
 
 # PSAUX driver headers
 #
 PSAUX_DRV_H := $(PSAUX_DRV_SRC:%c=%h)  \
-               $(PSAUX_DIR)/psauxerr.h
+               $(PSAUX_DIR)/psauxerr.h \
+               $(PSAUX_DIR)/cf2fixed.h \
+               $(PSAUX_DIR)/cf2glue.h  \
+               $(PSAUX_DIR)/cf2types.h
 
 
 # PSAUX driver object(s)