diff --git a/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
index 31e01ff6..5ab32dd7 100644
--- a/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
@@ -155,7 +155,6 @@ bool CXXRecordVisitor::VisitCXXRecordDecl( clang::CXXRecordDecl *rec ) {
          !hsd.isPathInUserDir(rp)  ||
           hsd.isPathInExclude(rp) ||
           hsd.isPathInICGExclude(rp) ||
-          hsd.isPathInExtLib(rp) ||
           cs.hasICGNo(header_file_name) ) {
         return false ;
     }
diff --git a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
index fa6e5fc1..84f2a369 100644
--- a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
@@ -280,8 +280,12 @@ void PrintAttributes::printClass( ClassValues * cv ) {
                 }
 
                 // if we are successful in opening the map file
-                if ( isFileIncluded( cv->getFileName())) {
-                     printer->printClassMap(class_map_outfile, cv) ;
+                char * rp = almostRealPath(cv->getFileName().c_str()) ;
+                if ( rp != NULL ) {
+                    if ( isFileIncluded( cv->getFileName()) or hsd.isPathInExtLib(rp)) {
+                         printer->printClassMap(class_map_outfile, cv) ;
+                    }
+                    free(rp) ;
                 }
             }
         }