diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee1a8db..b377c22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ set(CMAKE_EXE_LINKER_FLAGS_STATIC "-static-libgcc -static-libstdc++")
 
 set(EXECUTABLE_OUTPUT_PATH "bin")
 
-file(GLOB SOURCES "crypto/*.c" "*.cpp")
+file(GLOB SOURCES "crypto/*.c" "crypto/*.cpp" "*.cpp")
 
 add_executable(xmr-stak-cpu ${SOURCES})
 target_link_libraries(xmr-stak-cpu pthread microhttpd)
diff --git a/xmr-stak-cpu.cbp b/xmr-stak-cpu.cbp
index 27a0313..0246e37 100644
--- a/xmr-stak-cpu.cbp
+++ b/xmr-stak-cpu.cbp
@@ -92,12 +92,7 @@
 		</Unit>
 		<Unit filename="crypto/c_skein.h" />
 		<Unit filename="crypto/cryptonight.h" />
-		<Unit filename="crypto/cryptonight_aesni.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="crypto/cryptonight_common.c">
-			<Option compilerVar="CC" />
-		</Unit>
+		<Unit filename="crypto/cryptonight_common.cpp" />
 		<Unit filename="crypto/groestl_tables.h" />
 		<Unit filename="crypto/hash.h" />
 		<Unit filename="crypto/int-util.h" />