diff -ur FbdReader.orig/inc/FbdReader.hxx FbdReader/inc/FbdReader.hxx
--- FbdReader.orig/inc/FbdReader.hxx	2022-08-04 11:46:15.000000000 -0500
+++ FbdReader/inc/FbdReader.hxx	2022-08-04 11:48:11.000000000 -0500
@@ -71,7 +71,6 @@
 
 #include <GeomPlate_CurveConstraint.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_HCurve.hxx>
 #include <GeomPlate_CurveConstraint.hxx>
 #include <GeomPlate_BuildPlateSurface.hxx>
 #include <GeomPlate_MakeApprox.hxx>
diff -ur FbdReader.orig/src/Makefile FbdReader/src/Makefile
--- FbdReader.orig/src/Makefile	2022-08-03 14:44:50.000000000 -0500
+++ FbdReader/src/Makefile	2022-08-03 14:56:35.000000000 -0500
@@ -9,31 +9,31 @@
 #Example makefile: (Source: https://www.cs.swarthmore.edu/~newhall/unixhelp/howto_makefiles.html)
 
 #Define path to Open Cascade library
-OCCT = /usr/local/opencascade-7.1.0/bin/lin64/gcc/lib
+OCCT = @PREFIX@/lib
 #Define path to Open Cascade headers
-OCCINC = /usr/local/opencascade-7.1.0/inc
+OCCINC = @PREFIX@/include/opencascade
 #Define path to CadReader
-PROGPATH = /usr/local/cgxCadTools/FbdReader
+PROGPATH = ../../FbdReader
 
 # define the C compiler to use
-CC = gcc
+CXX =
 
 # define any compile-time flags
-CFLAGS = -Wall -std=c++11
+CXXFLAGS += -Wall
 
 # define directories containing header files: The OpenCASCADE Libraries are in the inc direcory of OpenCASCADE
 INCLUDES = -I$(PROGPATH)/inc -I$(OCCINC) 
 
 # define library path
-LFLAGS = -L$(PROGPATH)/inc
+LDFLAGS += -L$(PROGPATH)/inc -L$(OCCT)
 
 # define any libraries to link into executable: The OpenCASCADE Libraries are in the lib direcory of OpenCASCADE
-LIBS =  -L$(OCCT) \
- -L/usr/local/opencascade-7.1.0/bin/lin64/gcc/lib -lTKBinL -lTKBin -lTKBinTObj -lTKBinXCAF -lTKBool -lTKBO -lTKBRep -lTKCAF \
+LIBS = \
+ -lTKBinL -lTKBin -lTKBinTObj -lTKBinXCAF -lTKBool -lTKBO -lTKBRep -lTKCAF \
 -lTKCDF -lTKDCAF -lTKDraw -lTKernel -lTKFeat -lTKFillet -lTKG2d -lTKG3d -lTKGeomAlgo -lTKGeomBase -lTKHLR -lTKIGES -lTKLCAF -lTKMath  -lTKMesh \
 -lTKMeshVS -lTKOffset -lTKOpenGl -lTKPrim -lTKQADraw -lTKService -lTKShHealing -lTKStdL -lTKStd -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKSTEP \
 -lTKSTL  -lTKTObjDRAW -lTKTObj -lTKTopAlgo -lTKTopTest -lTKV3d -lTKVCAF -lTKViewerTest -lTKVRML -lTKXCAF -lTKXDEDRAW -lTKXDEIGES -lTKXDESTEP \
--lTKXMesh -lTKXmlL -lTKXml -lTKXmlTObj -lTKXmlXCAF -lTKXSBase -lTKXSDRAW -lstdc++ -lm
+-lTKXMesh -lTKXmlL -lTKXml -lTKXmlTObj -lTKXmlXCAF -lTKXSBase -lTKXSDRAW -lm
 
 
 # define the C++ source files
@@ -72,14 +72,14 @@
 	@echo fbd2cad has been compiled successfully
 
 $(MAIN): $(OBJS) 
-	$(CC) $(CFLAGS) $(INCLUDES) -o $(MAIN) $(OBJS) $(LFLAGS) $(LIBS)
+	$(CXX) $(CXXFLAGS) $(INCLUDES) -o $(MAIN) $(OBJS) $(LDFLAGS) $(LIBS)
 
 # this is a suffix replacement rule for building .o's from .c's
 # it uses automatic variables $<: the name of the prerequisite of
 # the rule(a .c file) and $@: the name of the target of the rule (a .o file) 
 # (see the gnu make manual section about automatic variables)
 .cpp.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c $<  -o $@
+	$(CXX) $(CXXFLAGS) $(INCLUDES) -c $<  -o $@
 
 clean:
 	$(RM) *.o *~ $(MAIN)