diff --git a/LICENSE b/LICENSE
index 2650f3c..b3d15cf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Dr-Noob
+Copyright (c) 2021 Dr-Noob
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
index 3054930..0de21b8 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ PREFIX ?= /usr
 
 SRC_COMMON=src/common/
 
-COMMON_SRC = $(SRC_COMMON)main.c $(SRC_COMMON)args.c $(SRC_COMMON)global.c
-COMMON_HDR = $(SRC_COMMON)args.h $(SRC_COMMON)global.h
+COMMON_SRC = $(SRC_COMMON)main.cpp $(SRC_COMMON)args.cpp $(SRC_COMMON)global.cpp
+COMMON_HDR = $(SRC_COMMON)args.hpp $(SRC_COMMON)global.hpp
 
 SOURCE += $(COMMON_SRC)
 HEADERS += $(COMMON_HDR)
diff --git a/src/common/args.c b/src/common/args.cpp
similarity index 98%
rename from src/common/args.c
rename to src/common/args.cpp
index 4c238dc..7022a14 100644
--- a/src/common/args.c
+++ b/src/common/args.cpp
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "args.h"
-#include "global.h"
+#include "args.hpp"
+#include "global.hpp"
 
 struct args_struct {
   bool help_flag;
diff --git a/src/common/args.h b/src/common/args.hpp
similarity index 100%
rename from src/common/args.h
rename to src/common/args.hpp
diff --git a/src/common/global.c b/src/common/global.cpp
similarity index 98%
rename from src/common/global.c
rename to src/common/global.cpp
index 507d101..d6c5f87 100644
--- a/src/common/global.c
+++ b/src/common/global.cpp
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "global.h"
+#include "global.hpp"
 
 #ifdef _WIN32
 
diff --git a/src/common/global.h b/src/common/global.hpp
similarity index 100%
rename from src/common/global.h
rename to src/common/global.hpp
diff --git a/src/common/main.c b/src/common/main.cpp
similarity index 97%
rename from src/common/main.c
rename to src/common/main.cpp
index 6b72c1d..87a1dec 100644
--- a/src/common/main.c
+++ b/src/common/main.cpp
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "args.h"
-#include "global.h"
+#include "args.hpp"
+#include "global.hpp"
 
 static const char* VERSION = "0.01";