diff --git a/src/base/judy/src/judy.c b/src/base/judy/src/judy.c
index 468c82ba..fb5fb5fe 100644
--- a/src/base/judy/src/judy.c
+++ b/src/base/judy/src/judy.c
@@ -62,10 +62,11 @@
 
 #include "judy.h"
 
-#if defined(STANDALONE) || defined(ASKITIS)
 #include <string.h>
 #include <stdio.h>
 
+#if defined(STANDALONE) || defined(ASKITIS)
+
 extern unsigned int MaxMem;
 
 // void judy_abort (char *msg) __attribute__ ((noreturn)); // Tell static analyser that this function will not return
diff --git a/src/base/sc_benchmark.h b/src/base/sc_benchmark.h
index 3c0c7162..4721b2ae 100644
--- a/src/base/sc_benchmark.h
+++ b/src/base/sc_benchmark.h
@@ -6,6 +6,7 @@
 
 #ifdef __cplusplus
 #include <iostream>
+#include <iosfwd>
 #include <string>
 
 #include "sc_memmgr.h"
diff --git a/src/cllazyfile/lazyRefs.h b/src/cllazyfile/lazyRefs.h
index c644051f..f94f41e7 100644
--- a/src/cllazyfile/lazyRefs.h
+++ b/src/cllazyfile/lazyRefs.h
@@ -10,7 +10,6 @@
 #include "lazyTypes.h"
 #include "lazyInstMgr.h"
 #include "ExpDict.h"
-#include "sdaiApplication_instance.h"
 #include "SubSuperIterators.h"
 #include <STEPattribute.h>
 #include <STEPaggregate.h>
@@ -19,7 +18,7 @@
 #define strcasecmp _strcmpi
 #endif // _WIN32
 
-
+class SDAI_Application_instance;
 /*
  * given inverted attr ia:
  * attr method                     value
@@ -132,7 +131,7 @@ class SC_LAZYFILE_EXPORT lazyRefs {
             bool found = false;
             if( sa.getADesc()->IsAggrType() ) {
                 //aggregate - search for current inst id
-                EntityAggregate * aggr = dynamic_cast< EntityAggregate * >( sa.Aggregate());
+                EntityAggregate * aggr = dynamic_cast< EntityAggregate * >( sa.Aggregate() );
                 assert( aggr );
                 EntityNode * en = ( EntityNode * ) aggr->GetHead();
                 while( en ) {
@@ -180,7 +179,7 @@ class SC_LAZYFILE_EXPORT lazyRefs {
             }
             std::cerr << "Error! inverse attr " << ia->Name() << " (" << ia << ") not found in iAMap for entity " << inst->getEDesc()->Name() << std::endl;
             abort();
-            iAstruct nil;
+            iAstruct nil = {nullptr};
             return nil;
         }
 
diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc
index 4f77ba35..a3b61b79 100644
--- a/src/clstepcore/sdaiApplication_instance.cc
+++ b/src/clstepcore/sdaiApplication_instance.cc
@@ -946,7 +946,7 @@ const SDAI_Application_instance::iAMap_t::value_type SDAI_Application_instance::
     }
     iAstruct z;
     memset( &z, 0, sizeof z );
-    iAMap_t::value_type nil( nullptr, z );
+    iAMap_t::value_type nil( (Inverse_attribute *) nullptr, z );
     return nil;
 }
 
diff --git a/src/clstepcore/sdaiApplication_instance.h b/src/clstepcore/sdaiApplication_instance.h
index ea591b94..e451f97b 100644
--- a/src/clstepcore/sdaiApplication_instance.h
+++ b/src/clstepcore/sdaiApplication_instance.h
@@ -1,5 +1,5 @@
 #ifndef STEPENTITY_H
-#define STEPENTITY_H 1
+#define STEPENTITY_H
 
 /*
 * NIST STEP Core Class Library
@@ -197,4 +197,4 @@ class SC_CORE_EXPORT SDAI_Application_instance  : public SDAI_DAObject_SDAI  {
 typedef SDAI_Application_instance * SDAI_Application_instance_ptr;
 typedef SDAI_Application_instance_ptr SDAI_Application_instance_var;
 
-#endif
+#endif //STEPENTITY_H