diff --git a/scripts/IFCImporter/entitylist.txt b/scripts/IFCImporter/entitylist.txt
index 9d073867a..a83e3c3df 100644
--- a/scripts/IFCImporter/entitylist.txt
+++ b/scripts/IFCImporter/entitylist.txt
@@ -8,190 +8,95 @@
 # code generator. Also, the names of all used entities need to be present 
 # in the source code for this to work.
 
-IfcCartesianTransformationOperator3DnonUniform
-IfcFeatureElementSubtraction
-IfcRelVoidsElement
-IfcOpeningElement
-# IfcRelFillsElement
-IfcPolygonalBoundedHalfSpace
-IfcPlane
-IfcHalfSpaceSolid
+IfcAnnotation
+IfcArbitraryClosedProfileDef
+IfcArbitraryOpenProfileDef
 IfcAxis1Placement
-IfcMeasureWithUnit
-IfcConversionBasedUnit
-IfcRevolvedAreaSolid
+IfcAxis2Placement
+IfcAxis2Placement2D
+IfcAxis2Placement3D
+IfcBooleanClippingResult
+IfcBooleanResult
+IfcBoundedCurve
+IfcBoundingBox
+IfcBSplineCurve
+IfcBuilding
+IfcCartesianPoint
+IfcCartesianTransformationOperator
+IfcCartesianTransformationOperator3D
+IfcCartesianTransformationOperator3DnonUniform
+IfcCircle
 IfcCircleHollowProfileDef
-IfcRepresentationMap
-IfcProductRepresentation
-IfcUnitAssignment
+IfcCircleProfileDef
 IfcClosedShell
+IfcColourOrFactor
+IfcColourRgb
+IfcCompositeCurve
+IfcCompositeCurveSegment
+IfcConic
+IfcConnectedFaceSet
+IfcConversionBasedUnit
+IfcCurve
+IfcDirection
 IfcDoor
-IfcProject
-IfcRepresentationItem
-IfcAxis2Placement
-IfcProduct
-IfcProject
-IfcSIUnit
-IfcColourRgb
-IfcColourOrFactor
-IfcColourRgb
-IfcCartesianPoint
-IfcDirection
-IfcAxis2Placement3D
-IfcAxis2Placement2D
-IfcAxis2Placement
-IfcAxis2Placement3D
-IfcAxis2Placement2D
-IfcRepresentationContext
-IfcGeometricRepresentationContext
-IfcCartesianTransformationOperator
-IfcCartesianTransformationOperator3D
-IfcPolyLoop
-IfcCartesianPoint
-IfcConnectedFaceSet
+IfcEllipse
+IfcExtrudedAreaSolid
 IfcFace
+IfcFaceBasedSurfaceModel
 IfcFaceBound
+IfcFaceOuterBound
+IfcFeatureElementSubtraction
+IfcGeometricRepresentationContext
+IfcGeometricRepresentationItem
+IfcHalfSpaceSolid
+IfcLine
+IfcLocalPlacement
+IfcManifoldSolidBrep
+IfcMappedItem
+IfcMeasureWithUnit
+IfcNamedUnit
+IfcObjectDefinition
+IfcObjectPlacement
+IfcOpeningElement
+IfcParameterizedProfileDef
+IfcPlane
+IfcPolygonalBoundedHalfSpace
+IfcPolyline
 IfcPolyLoop
-IfcPolyline
-IfcCartesianPoint
-IfcArbitraryClosedProfileDef
-IfcPolyline
-IfcArbitraryOpenProfileDef
-IfcPolyline
-IfcParameterizedProfileDef
-IfcRectangleProfileDef
-IfcExtrudedAreaSolid
-IfcArbitraryClosedProfileDef
-IfcArbitraryOpenProfileDef
-IfcParameterizedProfileDef
-IfcSweptAreaSolid
-IfcExtrudedAreaSolid
-IfcBooleanResult
-IfcBooleanClippingResult
-IfcBooleanResult
-IfcSweptAreaSolid
-IfcRepresentationItem
-IfcStyledItem
 IfcPresentationStyleAssignment
 IfcPresentationStyleSelect
-IfcSurfaceStyle
-IfcSurfaceStyleElementSelect
-IfcSurfaceStyleShading
-IfcSurfaceStyleRendering
-IfcSurfaceStyleWithTextures
-IfcTopologicalRepresentationItem
-IfcConnectedFaceSet
-IfcGeometricRepresentationItem
-IfcShellBasedSurfaceModel
-IfcShell
-IfcConnectedFaceSet
-IfcSweptAreaSolid
-IfcManifoldSolidBrep
-IfcBooleanResult
-IfcRepresentationItem
-IfcTopologicalRepresentationItem
-IfcGeometricRepresentationItem
-IfcObjectPlacement
-IfcLocalPlacement
-IfcMappedItem
-IfcRepresentation
-IfcRepresentationItem
 IfcProduct
-IfcSpace
-IfcRepresentation
-IfcRepresentationItem
-IfcMappedItem
-IfcProduct
-IfcRelContainedInSpatialStructure
-IfcProduct
-IfcRelAggregates
-IfcObjectDefinition
-IfcProduct
-IfcSpatialStructureElement
-IfcRelAggregates
-IfcObjectDefinition
+IfcProductRepresentation
+IfcProfileDef
 IfcProject
-IfcRepresentationItem
-IfcAxis2Placement
-IfcProduct
-IfcProject
-IfcSIUnit
-IfcColourRgb
-IfcColourOrFactor
-IfcColourRgb
-IfcCartesianPoint
-IfcDirection
-IfcAxis2Placement3D
-IfcAxis2Placement2D
-IfcAxis2Placement
-IfcAxis2Placement3D
-IfcAxis2Placement2D
-IfcRepresentationContext
-IfcGeometricRepresentationContext
-IfcCartesianTransformationOperator
-IfcCartesianTransformationOperator3D
-IfcPolyLoop
-IfcCartesianPoint
-IfcConnectedFaceSet
-IfcFace
-IfcFaceBound
-IfcPolyLoop
-IfcPolyline
-IfcCartesianPoint
-IfcArbitraryClosedProfileDef
-IfcPolyline
-IfcArbitraryOpenProfileDef
-IfcPolyline
-IfcParameterizedProfileDef
 IfcRectangleProfileDef
-IfcExtrudedAreaSolid
-IfcArbitraryClosedProfileDef
-IfcArbitraryOpenProfileDef
-IfcParameterizedProfileDef
-IfcSweptAreaSolid
-IfcExtrudedAreaSolid
-IfcBooleanResult
-IfcBooleanClippingResult
-IfcBooleanResult
-IfcSweptAreaSolid
+IfcRelAggregates
+IfcRelContainedInSpatialStructure
+IfcRelFillsElement
+IfcRelVoidsElement
+IfcRepresentation
+IfcRepresentationContext
 IfcRepresentationItem
+IfcRepresentationMap
+IfcRevolvedAreaSolid
+IfcShell
+IfcShellBasedSurfaceModel
+IfcSite
+IfcSIUnit
+IfcSomething
+IfcSpace
+IfcSpatialStructureElement
+IfcSpatialStructureElements
 IfcStyledItem
-IfcPresentationStyleAssignment
-IfcPresentationStyleSelect
 IfcSurfaceStyle
 IfcSurfaceStyleElementSelect
-IfcSurfaceStyleShading
 IfcSurfaceStyleRendering
+IfcSurfaceStyleShading
 IfcSurfaceStyleWithTextures
-IfcTopologicalRepresentationItem
-IfcConnectedFaceSet
-IfcGeometricRepresentationItem
-IfcShellBasedSurfaceModel
-IfcShell
-IfcConnectedFaceSet
 IfcSweptAreaSolid
-IfcManifoldSolidBrep
-IfcBooleanResult
-IfcRepresentationItem
 IfcTopologicalRepresentationItem
-IfcGeometricRepresentationItem
-IfcObjectPlacement
-IfcLocalPlacement
-IfcMappedItem
-IfcRepresentation
-IfcRepresentationItem
-IfcProduct
-IfcSpace
-IfcRepresentation
-IfcRepresentationItem
-IfcMappedItem
-IfcProduct
-IfcRelContainedInSpatialStructure
-IfcProduct
-IfcRelAggregates
-IfcObjectDefinition
-IfcProduct
-IfcSpatialStructureElement
-IfcRelAggregates
-IfcObjectDefinition
+IfcTrimmedCurve
+IfcUnit
+IfcUnitAssignment
+IfcVector
 
diff --git a/scripts/IFCImporter/genentitylist.sh b/scripts/IFCImporter/genentitylist.sh
index f90e39a8c..e51959d22 100644
--- a/scripts/IFCImporter/genentitylist.sh
+++ b/scripts/IFCImporter/genentitylist.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
-grep -E 'IFC::Ifc([A-Z][a-z]*)+' -o ../../code/IFCLoader.cpp | uniq | sed s/IFC::// > output.txt
+cd ../../code
+grep -E 'Ifc([A-Z][a-z]*)+' -o IFCLoader.cpp IFCGeometry.cpp IFCCurve.cpp IFCProfile.cpp IFCMaterial.cpp | uniq | sed s/.*:// > ../scripts/IFCImporter/output.txt