diff --git a/CMakeLists.txt b/CMakeLists.txt
index 570f202..f540e52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,11 +4,9 @@ IF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
     ADD_DEFINITIONS(-DLTC_NO_ROLC)
 ENDIF ()
 
-IF (WIN32)
-    ADD_DEFINITIONS(-DLTC_NO_PROTOTYPES)
-    ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-    ADD_DEFINITIONS(-DLTC_SOURCE)
-ENDIF()
+ADD_DEFINITIONS(-DLTC_NO_PROTOTYPES)
+ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+ADD_DEFINITIONS(-DLTC_SOURCE)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/headers)
 
@@ -52,12 +50,6 @@ elseif ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xIntel")
     endif ()
 endif ()
 
-if (MSVC_LIKE_COMPILER)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /FI tomcrypt.h")
-else ()
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include tomcrypt.h -fPIC")
-endif ()
-
 SET_SOURCE_FILES_PROPERTIES(ALL_HEADER_FILES PROPERTIES HEADER_FILE_ONLY TRUE)
 LIST(APPEND ALL_SOURCE_FILES ${ALL_HEADER_FILES})
 
diff --git a/create_build.sh b/create_build.sh
index d91401c..94db84e 100755
--- a/create_build.sh
+++ b/create_build.sh
@@ -4,5 +4,5 @@
 [[ -z "${tommath_include}" ]] && tommath_include="../tommath/"
 
 make -f makefile clean
-CFLAGS="-fPIC -DUSE_LTM -DLTM_DESC -I${tommath_include}" make -f makefile EXTRALIBS="${tommath_library}"
+make -f makefile CFLAGS="-fPIC -DUSE_LTM -DLTM_DESC -I${tommath_include}" EXTRALIBS="${tommath_library}" VERBOSE=1 ${CMAKE_MAKE_OPTIONS}
 make PREFIX=./out/${build_os_type}_${build_os_arch}/ install