diff --git a/Makefile b/Makefile
index 87bd5b9..e46e668 100755
--- a/Makefile
+++ b/Makefile
@@ -11,15 +11,15 @@ MODULES  := $(wildcard $(SRC_DIR)/*.cpp)
 OBJECTS  := $(MODULES:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)
 
 U2FDevice: $(OBJECTS) libuECC.o libcppb64.o
-	g++ $(LDFLAGS) -o $@ $^
+	$(CXX) $(LDFLAGS) -o $@ $^
 
 install: U2FDevice
 	install -m775 -t /usr/bin U2FDevice
 	install -m775 -t /etc/systemd/system Services/U2FDevice.service
 	install -d /usr/share/U2FDevice/
 
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(OBJ_DIR)
-	g++ $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp | $(OBJ_DIR)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
 $(OBJ_DIR):
 	mkdir $(OBJ_DIR)
@@ -28,9 +28,10 @@ $(OBJ_DIR):
 
 clean:
 	rm $(OBJ_DIR)/*
-	rm U2FDevice
+	rm U2FDevice libuECC.o libcppb64.o
+
+.PHONY: clean install
 
-.PHONY: libuECC.o libcppb64.o clean install
 libuECC.o:
 	$(MAKE) -C micro-ecc
 	cp micro-ecc/libuECC.o libuECC.o
diff --git a/Scripts/cpp-base64-Makefile b/Scripts/cpp-base64-Makefile
index 190eb49..b8db2b0 100755
--- a/Scripts/cpp-base64-Makefile
+++ b/Scripts/cpp-base64-Makefile
@@ -11,10 +11,10 @@ MODULESC := $(SRC_DIR)/base64.cpp
 OBJECTS := $(MODULESC:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)
 
 libcppb64.o: $(OBJECTS)
-	ld $(LDFLAGS) -o $@ $^
+	$(CXX) $(LDFLAGS) -o $@ $^
 
 $(OBJECTS): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
 	@mkdir -p $(@D)
-	@g++ $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
 -include $(OBJECTS:.o=.d)
diff --git a/Scripts/uECC-Makefile b/Scripts/uECC-Makefile
index 2115639..fd6ddcc 100755
--- a/Scripts/uECC-Makefile
+++ b/Scripts/uECC-Makefile
@@ -14,14 +14,14 @@ OBJECTSI := $(MODULESI:$(SRC_DIR)/%.inc=$(OBJ_DIR)/%.o)
 OBJECTS  := $(OBJECTSC) $(OBJECTSI)
 
 libuECC.o: $(OBJECTS)
-	ld $(LDFLAGS) -o $@ $^
+	$(CXX) $(LDFLAGS) -o $@ $^
 
 $(OBJECTSC): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@mkdir -p $(@D)
-	@g++ $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
 $(OBJECTSI): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.inc
 	@mkdir -p $(@D)
-	@g++ -x c $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+	@$(CXX) -x c $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
 -include $(OBJECTS:.o=.d)