3 files changed, 19 insertions, 4 deletions
diff --git a/packages/fv/fpmake.pp b/packages/fv/fpmake.pp
index 0522f326d1..d96243091e 100644
--- a/packages/fv/fpmake.pp
+++ b/packages/fv/fpmake.pp
@@ -208,7 +208,7 @@ begin
       with T.Dependencies do
         begin
           AddInclude('unixsmsg.inc',AllUnixOSes);
-          AddInclude('win32smsg.inc',[win32,win64]);
+          AddInclude('w32smsg.inc',[win32,win64]);
           AddInclude('go32smsg.inc',[go32v2]);
         end;
     T:=P.Targets.AddUnit('tabs.pas');
diff --git a/packages/graph/fpmake.pp b/packages/graph/fpmake.pp
index 627eaad4c1..bf6edc9aa7 100644
--- a/packages/graph/fpmake.pp
+++ b/packages/graph/fpmake.pp
@@ -24,6 +24,11 @@ begin
     P.Description := 'A portable, yet usable substitute for the Turbo Pascal Graph unit.';
     P.NeedLibC:= false;  // true for headers that indirectly link to libc? OS specific?
 
+    P.CPUs:=[i386,powerpc];
+    P.OSes:=[win32,linux,freebsd,darwin];
+
+    P.Dependencies.Add('sdl',[i386,powerpc],[win32,linux,freebsd,darwin]);
+
     P.SourcePath.Add('src');
     P.SourcePath.Add('src/macosx',[darwin]);
     P.SourcePath.Add('src/amiga',[amiga]);
@@ -61,7 +66,7 @@ begin
           AddInclude('gtext.inc');
           AddInclude('graph16.inc',[freebsd,linux]);
         end;
-    T:=P.Targets.AddUnit('sdlgraph.pp');
+    T:=P.Targets.AddUnit('src/sdlgraph/sdlgraph.pp',[i386,powerpc],[win32,linux,freebsd,darwin]);
       with T.Dependencies do
         begin
           AddInclude('graphh.inc');
@@ -76,6 +81,16 @@ begin
           AddUnit('sdlutils');
           AddUnit('logger');
         end;
+    T:=P.Targets.AddUnit('wincrt.pp',[win32]);
+      with T.Dependencies do
+        begin
+          AddUnit('graph');
+        end;
+    T:=P.Targets.AddUnit('winmouse.pp',[win32]);
+      with T.Dependencies do
+        begin
+          AddUnit('graph');
+        end;
 
 
 {$ifndef ALLPACKAGES}
diff --git a/packages/ptc/fpmake.pp b/packages/ptc/fpmake.pp
index 1ea24095d8..34a561a9fc 100644
--- a/packages/ptc/fpmake.pp
+++ b/packages/ptc/fpmake.pp
@@ -40,7 +40,6 @@ begin
   T:=P.Targets.AddUnit('ptc.pp');
   with T.Dependencies do
     begin
-      AddInclude('extensions.inc');
       AddInclude('coreinterface.inc');
       AddInclude('aread.inc');
       AddInclude('colord.inc');
@@ -77,7 +76,8 @@ begin
       AddInclude('baseconsolei.inc');
       AddInclude('surfacei.inc');
       AddInclude('timeri.inc');
-      AddInclude('includes.inc');
+      AddInclude('includes.inc',allunixoses+[WinCE]);
+      AddInclude('extensions.inc',allunixoses);
       AddInclude('x11modesd.inc',allunixoses);
       AddInclude('x11imaged.inc',allunixoses);
       AddInclude('x11displayd.inc',allunixoses);