diff --git a/CMakeLists.txt b/CMakeLists.txt
index 511c618495..9b13398f24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,11 @@
 cmake_minimum_required( VERSION 2.4 )
 
+IF( NOT CMAKE_BUILD_TYPE )
+	SET( CMAKE_BUILD_TYPE Debug CACHE STRING
+		"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
+		FORCE )
+ENDIF( NOT CMAKE_BUILD_TYPE )
+
 set( ZDOOM_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where zdoom.pk3 and the executable will be created" )
 set( ZDOOM_EXE_NAME "zdoom" CACHE FILEPATH "Name of the executable to create" )
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 02f1c65f80..6efae63d29 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -141,7 +141,7 @@ endif( NOT FMOD_LIB_NAME )
 
 # Search for FMOD include files
 
-find_path( FMOD_INCLUDE_DIR fmod.h
+find_path( FMOD_INCLUDE_DIR fmod.hpp
 	PATHS ${FMOD_SEARCH_PATHS}
 	${FMOD_INC_PATH_SUFFIXES} )