Index: src/main.cc
===================================================================
--- src/main.cc	(revision d029162ed7c3324fe3e753735837a666625caeda)
+++ src/main.cc	(revision 9a92216db9c7162ec36c8c23009ecae6063c9474)
@@ -10,5 +10,5 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 14:04:49 2016
+// Last Modified On : Fri May 06 14:20:26 2016
 // Update Count     : 203
 //
@@ -186,4 +186,10 @@
 			// if running cfa-cpp directly, might forget to pass -F option (and really shouldn't have to)
 			if ( filename == NULL ) filename = argv[ optind ];
+			// prepend libcfa prefix to disambiguate library code from user programs
+			if ( libcfap ) {
+				filename = "libcfa/prelude.cf";
+			} else if ( treep ) {
+				filename = (*new string(string("libcfa/") + filename)).c_str();
+			}
 			optind += 1;
 		} else {