diff --git a/common/lc_lxf.cpp b/common/lc_lxf.cpp
index bc403e09..be599f73 100644
--- a/common/lc_lxf.cpp
+++ b/common/lc_lxf.cpp
@@ -78,7 +78,7 @@ static bool lcLoadLDrawXML(std::map<int, int>& MaterialTable, std::map<int, std:
 	return true;
 }
 
-bool lcImportLXFMLFile(const QString& FileData, lcArray<lcPiece*>& Pieces, lcArray<lcArray<lcPiece*>>& Groups)
+bool lcImportLXFMLFile(const QString& FileData, std::vector<lcPiece*>& Pieces, std::vector<std::vector<lcPiece*>>& Groups)
 {
 	std::map<int, int> MaterialTable;
 	std::map<int, std::string> BrickTable;
@@ -187,16 +187,16 @@ bool lcImportLXFMLFile(const QString& FileData, lcArray<lcPiece*>& Pieces, lcArr
 				Piece->SetPieceInfo(Info, QString(), false);
 				Piece->Initialize(lcMatrix44LDrawToLeoCAD(WorldMatrix), 1);
 				Piece->SetColorCode(ColorCode);
-				Pieces.Add(Piece);
+				Pieces.push_back(Piece);
 				NumBrickPieces++;
 			}
 		
 			if (NumBrickPieces > 1)
 			{
-				lcArray<lcPiece*> Group;
-				for (int PieceIdx = Pieces.GetSize() - NumBrickPieces; PieceIdx < Pieces.GetSize(); PieceIdx++)
-					Group.Add(Pieces[PieceIdx]);
-				Groups.Add(Group);
+				std::vector<lcPiece*> Group;
+				for (size_t PieceIdx = Pieces.size() - NumBrickPieces; PieceIdx < Pieces.size(); PieceIdx++)
+					Group.push_back(Pieces[PieceIdx]);
+				Groups.push_back(Group);
 			}
 		}
 	}
diff --git a/common/lc_lxf.h b/common/lc_lxf.h
index 10a8f182..cfc46a81 100644
--- a/common/lc_lxf.h
+++ b/common/lc_lxf.h
@@ -1,6 +1,4 @@
 #pragma once
 
-#include "lc_array.h"
-
-bool lcImportLXFMLFile(const QString& FileData, lcArray<lcPiece*>& Pieces, lcArray<lcArray<lcPiece*>>& Groups);
+bool lcImportLXFMLFile(const QString& FileData, std::vector<lcPiece*>& Pieces, std::vector<std::vector<lcPiece*>>& Groups);
 
diff --git a/common/lc_model.cpp b/common/lc_model.cpp
index 60d21b3e..f84883e9 100644
--- a/common/lc_model.cpp
+++ b/common/lc_model.cpp
@@ -980,8 +980,8 @@ bool lcModel::LoadBinary(lcFile* file)
 
 bool lcModel::LoadLDD(const QString& FileData)
 {
-	lcArray<lcPiece*> Pieces;
-	lcArray<lcArray<lcPiece*>> Groups;
+	std::vector<lcPiece*> Pieces;
+	std::vector<std::vector<lcPiece*>> Groups;
 	
 	if (!lcImportLXFMLFile(FileData, Pieces, Groups))
 		return false;
@@ -989,7 +989,7 @@ bool lcModel::LoadLDD(const QString& FileData)
 	for (lcPiece* Piece : Pieces)
 		AddPiece(Piece);
 
-	for (const lcArray<lcPiece*>& Group : Groups)
+	for (const std::vector<lcPiece*>& Group : Groups)
 	{
 		lcGroup* NewGroup = AddGroup(tr("Group #"), nullptr);
 		for (lcPiece* Piece : Group)