--- a/private.rc	Fri Aug 08 15:16:54 1997 +0200
+++ b/private.rc	Fri Aug 08 17:50:41 1997 +0200
@@ -62,7 +62,7 @@
 ].
 !
 
-|whoAmI domain thisIsMySystem conf systemType|
+|whoAmI domain thisIsMySystem conf systemType incDir includes|
 
 'private.rc [info]: reading ''keyboard.rc'' ...' infoPrintCR.
 Smalltalk fileIn:'keyboard.rc'.
@@ -192,7 +192,7 @@
 "/ this is a temporary kludge: specify the flags to be used
 "/ when compiling via stc. Primitive compilation (from within the browser)
 "/ is still experimental. So you better not care (yet)
-"/ BTW: its only supported on ELF systems and Linux - anyway 
+"/ BTW: its only supported on ELF and Linux systems - anyway 
 "/      (and not in the free demo release).
 "/
 
@@ -214,7 +214,24 @@
     ].
     Compiler ccCompilationOptions:'-O'.
 ].
-Compiler stcCompilationIncludes:'-I../../include'.
+
+includes=''.
+('../../include' asFilename exists) ifTrue:[
+    "/ running in a development environment ...
+    includes := includes , '-I../../include '.
+].
+incDir := Smalltalk getSystemFileName:'include'.
+incDir notNil ifTrue:[
+    incDir asFilename exists ifTrue:[
+        includes := includes , '-I' , incDir asFilename pathName , ' '
+    ]
+].
+('/usr/local/lib/smalltalk/include' asFilename exists) ifTrue:[
+    "/ running in a shared environment ...
+    includes := includes , '-I/usr/local/lib/smalltalk/include '.
+].
+
+Compiler stcCompilationIncludes:includes.
 
 
 thisIsMySystem ifTrue:[