diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed9d943e5..0e84c600c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -419,19 +419,6 @@ ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h")
 
 ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS "${BIN2RES}")
 
-IF(WIN32)
-	SET(WINRC "${CMAKE_BINARY_DIR}/lmmsrc.obj")
-	ADD_CUSTOM_COMMAND(OUTPUT "${WINRC}"
-				COMMAND "${WINDRES}"
-					"-I\"${CMAKE_SOURCE_DIR}\""
-					"-o\"${CMAKE_BINARY_DIR}/lmmsrc.obj\""
-					"-i\"${CMAKE_BINARY_DIR}/lmms.rc\""
-				DEPENDS "${CMAKE_BINARY_DIR}/lmms.rc")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
-ELSE(WIN32)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
-ENDIF(WIN32)
-
 # set up apple vars before traversing into data/scripts
 SET(MACOSX_BUNDLE_ICON_FILE "lmms.icns")
 SET(MACOSX_BUNDLE_GUI_IDENTIFIER "LMMS")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4746264ea..bcddade20 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,19 +2,30 @@ SET(LMMS_SRCS "")
 SET(LMMS_UIS "")
 
 SET(CMAKE_AUTOMOC ON)
-#SET(CMAKE_AUTOMOC_MOC_OPTIONS -I${CMAKE_BINARY_DIR})
 
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(tracks)
 
 IF(QT5)
-	#QT5_WRAP_UI(LMMS_UI_OUT ${LMMS_UIS})
+	QT5_WRAP_UI(LMMS_UI_OUT ${LMMS_UIS})
 ELSE()
-	#QT4_WRAP_CPP(LMMS_MOC_OUT ${LMMS_INCLUDES} OPTIONS -nw -I${CMAKE_BINARY_DIR})
-	#QT4_WRAP_UI(LMMS_UI_OUT ${LMMS_UIS})
+	QT4_WRAP_UI(LMMS_UI_OUT ${LMMS_UIS})
 ENDIF()
 
+IF(WIN32)
+	SET(WINRC "${CMAKE_BINARY_DIR}/lmmsrc.obj")
+	ADD_CUSTOM_COMMAND(OUTPUT "${WINRC}"
+				COMMAND "${WINDRES}"
+					"-I\"${CMAKE_SOURCE_DIR}\""
+					"-o\"${CMAKE_BINARY_DIR}/lmmsrc.obj\""
+					"-i\"${CMAKE_BINARY_DIR}/lmms.rc\""
+				DEPENDS "${CMAKE_BINARY_DIR}/lmms.rc")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
+ELSE(WIN32)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
+ENDIF(WIN32)
+
 # Paths relative to lmms executable
 FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}")
 FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE "/${BIN_DIR}" "/${PLUGIN_DIR}")
@@ -50,11 +61,10 @@ ADD_EXECUTABLE(lmms
 	${LMMS_SRCS}
 	${LMMS_INCLUDES}
 	${LMMS_UI_OUT}
-	${LMMS_MOC_OUT}
 	"${WINRC}"
 )
 
-#SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_out} lmmsconfig.h lmms.1.gz")
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_out} lmmsconfig.h lmms.1.gz")
 
 IF(LMMS_BUILD_WIN32)
 	SET(EXTRA_LIBRARIES "-lwinmm")
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 96aae3ee5..548e4ad14 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -84,6 +84,7 @@ SET(LMMS_SRCS
 )
 
 set(LMMS_UIS
+	${LMMS_UIS}
 	gui/dialogs/about_dialog.ui
 	gui/dialogs/export_project.ui