diff --git a/trick_source/codegen/Interface_Code_Gen/BraceMacro.hh b/trick_source/codegen/Interface_Code_Gen/BraceMacro.hh
new file mode 100644
index 00000000..c533151a
--- /dev/null
+++ b/trick_source/codegen/Interface_Code_Gen/BraceMacro.hh
@@ -0,0 +1,10 @@
+#ifndef BRACEMACRO_HH
+#define BRACEMACRO_HH
+
+#if (LIBCLANG_MAJOR > 3) || ((LIBCLANG_MAJOR == 3) && (LIBCLANG_MINOR >= 9))
+#define RBRACELOC getBraceRange().getEnd
+#else
+#define RBRACELOC getRBraceLoc
+#endif
+
+#endif
diff --git a/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
index 1b04cea3..3bd544ee 100644
--- a/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
@@ -16,6 +16,7 @@
 #include "Utilities.hh"
 #include "CommentSaver.hh"
 #include "PrintAttributes.hh"
+#include "BraceMacro.hh"
 
 extern llvm::cl::opt< int > debug_level ;
 
@@ -56,7 +57,7 @@ bool CXXRecordVisitor::TraverseDecl(clang::Decl *d) {
             clang::RecordDecl * rd = crd->getDefinition() ;
             if ( rd != NULL ) {
                 if ( rd->getAccess() == clang::AS_public ) {
-                    if ( isInUserCode(ci , crd->getSourceRange().getEnd(), hsd) ) {
+                    if ( isInUserCode(ci , crd->RBRACELOC(), hsd) ) {
                         CXXRecordVisitor embedded_cvis(ci , cs, hsd , pa, true) ;
                         embedded_cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(d)) ;
                         pa.printClass(embedded_cvis.get_class_data()) ;
@@ -149,7 +150,7 @@ bool CXXRecordVisitor::VisitCXXRecordDecl( clang::CXXRecordDecl *rec ) {
     }
 
     // Return false to stop processing if this header file is excluded by one of many reasons.
-    std::string header_file_name = getFileName(ci , rec->getSourceRange().getEnd(), hsd) ;
+    std::string header_file_name = getFileName(ci , rec->RBRACELOC(), hsd) ;
     char * rp = almostRealPath(header_file_name.c_str()) ;
     if (  rp == NULL ||
          !hsd.isPathInUserDir(rp)  ||
@@ -205,13 +206,13 @@ bool CXXRecordVisitor::VisitCXXRecordDecl( clang::CXXRecordDecl *rec ) {
                 clang::RecordDecl * rd = rt->getDecl() ;
                 //std::cout << "    " << cval.getName() << " inherits from " << rd->getNameAsString() << "" << std::endl ;
                 //rd->dump() ; std::cout << std::endl ;
-                if ( isInUserOrTrickCode(ci , rd->getSourceRange().getEnd(), hsd) ) {
+                if ( isInUserOrTrickCode(ci , rd->RBRACELOC(), hsd) ) {
                     const clang::ASTRecordLayout &record_layout = rec->getASTContext().getASTRecordLayout(rec);
                     unsigned int inherit_class_offset ;
 
                     inherit_class_offset = record_layout.getBaseClassOffset(llvm::cast<clang::CXXRecordDecl>(rd)).getQuantity() ;
                     //std::cout << "    inherit_class_offset = " << inherit_class_offset << "" << std::endl ;
-                    //std::cout << "    " << getFileName(ci , rd->getSourceRange().getEnd(), hsd) << "" << std::endl ;
+                    //std::cout << "    " << getFileName(ci , rd->RBRACELOC(), hsd) << "" << std::endl ;
                     CXXRecordVisitor inherit_cvis(ci , cs, hsd , pa, false) ;
                     inherit_cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(rd)) ;
                     cval.addInheritedFieldDescriptions(inherit_cvis.get_class_data()->getFieldDescriptions(),
@@ -253,7 +254,7 @@ bool CXXRecordVisitor::VisitCXXRecordDecl( clang::CXXRecordDecl *rec ) {
                 //std::cout << "    " << cval.getName() << " virtually inherits from "
                 // << rd->getNameAsString() << "" << std::endl ;
                 //rd->dump() ; std::cout << std::endl ;
-                if ( isInUserOrTrickCode(ci , rd->getSourceRange().getEnd(), hsd) ) {
+                if ( isInUserOrTrickCode(ci , rd->RBRACELOC(), hsd) ) {
                     const clang::ASTRecordLayout &record_layout = rec->getASTContext().getASTRecordLayout(rec);
                     unsigned int inherit_class_offset ;
 
@@ -262,7 +263,7 @@ bool CXXRecordVisitor::VisitCXXRecordDecl( clang::CXXRecordDecl *rec ) {
                     inherit_class_offset = record_layout.getVBaseClassOffset(llvm::cast<clang::CXXRecordDecl>(rd)).getQuantity() ;
 
                     //std::cout << "    inherit_class_offset = " << inherit_class_offset << "" << std::endl ;
-                    //std::cout << "    " << getFileName(ci , rd->getSourceRange().getEnd(), hsd) << "" << std::endl ;
+                    //std::cout << "    " << getFileName(ci , rd->RBRACELOC(), hsd) << "" << std::endl ;
                     CXXRecordVisitor inherit_cvis(ci , cs, hsd , pa, false) ;
                     inherit_cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(rd)) ;
                     cval.addInheritedFieldDescriptions(inherit_cvis.get_class_data()->getFieldDescriptions(), inherit_class_offset, true) ;
diff --git a/trick_source/codegen/Interface_Code_Gen/EnumVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/EnumVisitor.cpp
index af1d54cd..58038fb3 100644
--- a/trick_source/codegen/Interface_Code_Gen/EnumVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/EnumVisitor.cpp
@@ -7,6 +7,7 @@
 #include "EnumVisitor.hh"
 #include "EnumValues.hh"
 #include "Utilities.hh"
+#include "BraceMacro.hh"
 
 extern llvm::cl::opt< int > debug_level ;
 
@@ -26,7 +27,7 @@ bool EnumVisitor::VisitType(clang::Type *t) {
 }
 
 bool EnumVisitor::VisitEnumDecl(clang::EnumDecl *ed) {
-    eval.setFileName(getFileName(ci , ed->getSourceRange().getEnd(), hsd)) ;
+    eval.setFileName(getFileName(ci , ed->RBRACELOC(), hsd)) ;
     return true;
 }
 
diff --git a/trick_source/codegen/Interface_Code_Gen/TranslationUnitVisitor.cpp b/trick_source/codegen/Interface_Code_Gen/TranslationUnitVisitor.cpp
index 0d46f2fe..f815301d 100644
--- a/trick_source/codegen/Interface_Code_Gen/TranslationUnitVisitor.cpp
+++ b/trick_source/codegen/Interface_Code_Gen/TranslationUnitVisitor.cpp
@@ -18,6 +18,7 @@
 #include "VariableVisitor.hh"
 #include "Utilities.hh"
 #include "PrintAttributes.hh"
+#include "BraceMacro.hh"
 
 TranslationUnitVisitor::TranslationUnitVisitor(clang::CompilerInstance & in_ci , HeaderSearchDirs & in_hsd ,
   CommentSaver & in_cs , PrintAttributes & in_pa ) :
@@ -47,11 +48,11 @@ bool TranslationUnitVisitor::TraverseDecl(clang::Decl *d) {
                in fact empty */
             clang::RecordDecl * rd = crd->getDefinition() ;
             if ( rd != NULL ) {
-                std::string rd_file = getFileName(ci , rd->getSourceRange().getEnd(), hsd) ;
-                std::string crd_file = getFileName(ci , crd->getSourceRange().getEnd(), hsd) ;
+                std::string rd_file = getFileName(ci , rd->RBRACELOC(), hsd) ;
+                std::string crd_file = getFileName(ci , crd->RBRACELOC(), hsd) ;
                 if (!crd_file.empty() and !crd_file.compare(rd_file)) {
                     //crd->dump() ; std::cout << std::endl ;
-                    if ( isInUserCode(ci , crd->getSourceRange().getEnd(), hsd) ) {
+                    if ( isInUserCode(ci , crd->RBRACELOC(), hsd) ) {
                         CXXRecordVisitor cvis(ci , cs, hsd , pa, true) ;
 
                         cvis.TraverseCXXRecordDecl(static_cast<clang::CXXRecordDecl *>(d)) ;
@@ -85,7 +86,7 @@ bool TranslationUnitVisitor::TraverseDecl(clang::Decl *d) {
         break ;
         case clang::Decl::Enum : {
             clang::EnumDecl * ed = static_cast<clang::EnumDecl *>(d) ;
-            if ( isInUserCode(ci , ed->getSourceRange().getEnd(), hsd) ) {
+            if ( isInUserCode(ci , ed->RBRACELOC(), hsd) ) {
                 EnumVisitor evis(ci, hsd) ;
                 evis.TraverseDecl(ed) ;
                 //if ( evis.get_enum_data() != NULL ) {