diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 1369de917..2ccbbd1ae 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -901,7 +901,7 @@ use_precompiled_header(".")
 add_executable( ${PROJECT_NAME} WIN32 MACOSX_BUNDLE
 	${HEADER_FILES}
 	${NOT_COMPILED_SOURCE_FILES}
-	common/objects/__autostart.cpp
+	__autostart.cpp
 	${SYSTEM_SOURCES}
 	${FASTMATH_SOURCES}
 	${PCH_SOURCES}
@@ -927,7 +927,7 @@ add_executable( ${PROJECT_NAME} WIN32 MACOSX_BUNDLE
 	common/thirdparty/math/tan.c
 	common/thirdparty/math/tanh.c
 	common/thirdparty/math/fastsin.cpp
-	common/objects/zzautozend.cpp
+	zzautozend.cpp
 )
 
 #set_source_files_properties( ${FASTMATH_SOURCES} PROPERTIES COMPILE_FLAGS ${DEM_FASTMATH_FLAG} )
@@ -1115,8 +1115,8 @@ source_group("Common\\Scripting\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_S
 source_group("Common\\Scripting\\Core" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/core/.+")
 source_group("Common\\Scripting\\JIT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/jit/.+")
 source_group("Common\\Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/vm/.+")
-source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/.+")
-source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl_load/.+")
+source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/.+")
+source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl_load/.+")
 source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+")
 source_group("Common\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/formats.+")
 source_group("Common\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/.+")
diff --git a/source/common/objects/__autostart.cpp b/source/__autostart.cpp
similarity index 100%
rename from source/common/objects/__autostart.cpp
rename to source/__autostart.cpp
diff --git a/source/common/audio/sound/oalsound.cpp b/source/common/audio/sound/oalsound.cpp
index 86fbc303a..69d00151c 100644
--- a/source/common/audio/sound/oalsound.cpp
+++ b/source/common/audio/sound/oalsound.cpp
@@ -2066,6 +2066,7 @@ FSoundChan *OpenALSoundRenderer::FindLowestChannel()
 	return lowest;
 }
 
+#endif // NO_OPENAL
 
 #include "menu/menu.h"
 
@@ -2121,4 +2122,3 @@ void I_BuildALResamplersList(FOptionValues* opt)
 #endif
 }
 
-#endif // NO_OPENAL
diff --git a/source/common/engine/m_random.h b/source/common/engine/m_random.h
index edcc82c9a..d9eec6c44 100644
--- a/source/common/engine/m_random.h
+++ b/source/common/engine/m_random.h
@@ -37,7 +37,7 @@
 
 #include <stdio.h>
 #include "basics.h"
-#include "SFMT/SFMTObj.h"
+#include "sfmt/SFMTObj.h"
 
 class FSerializer;
 
diff --git a/source/common/objects/dobject.h b/source/common/objects/dobject.h
index 4048889ff..3c98d144b 100644
--- a/source/common/objects/dobject.h
+++ b/source/common/objects/dobject.h
@@ -36,7 +36,7 @@
 
 #include <stdlib.h>
 #include <type_traits>
-
+#include "m_alloc.h"
 #include "vectors.h"
 #include "name.h"
 #include "palentry.h"
diff --git a/source/common/objects/dobjtype.h b/source/common/objects/dobjtype.h
index db0893b14..16adbf72f 100644
--- a/source/common/objects/dobjtype.h
+++ b/source/common/objects/dobjtype.h
@@ -5,6 +5,8 @@
 #error You must #include "dobject.h" to get dobjtype.h
 #endif
 
+#include <limits.h>
+
 typedef std::pair<const class PType *, unsigned> FTypeAndOffset;
 
 #if 0
diff --git a/source/common/objects/zzautozend.cpp b/source/zzautozend.cpp
similarity index 100%
rename from source/common/objects/zzautozend.cpp
rename to source/zzautozend.cpp