diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp
index b29acf3bf9..4834de5070 100644
--- a/stepmania/src/ActorUtil.cpp
+++ b/stepmania/src/ActorUtil.cpp
@@ -18,10 +18,10 @@
 #include "BGAnimation.h"
 #include "IniFile.h"
 #include "ThemeManager.h"
-#include "RageUtil_FileDB.h"
 #include "RageDisplay.h"
 #include "RageLog.h"
 #include "arch/ArchHooks/ArchHooks.h"
+#include "RageFileManager.h"
 
 
 static Actor* LoadActor( CString sPath )
diff --git a/stepmania/src/AnnouncerManager.cpp b/stepmania/src/AnnouncerManager.cpp
index b7de5af968..7e158cfdd5 100644
--- a/stepmania/src/AnnouncerManager.cpp
+++ b/stepmania/src/AnnouncerManager.cpp
@@ -12,6 +12,7 @@
 
 #include "AnnouncerManager.h"
 #include "RageLog.h"
+#include "RageFile.h"
 #include "arch/arch.h"
 
 
@@ -136,7 +137,8 @@ CString AnnouncerManager::GetPathTo( CString sAnnouncerName, CString sFolderName
 	LOG->Trace( "The announcer in '%s' is missing the folder '%s'.",
 		AnnouncerPath.c_str(), sFolderName.c_str() );
 //	MessageBeep( MB_OK );
-	CreateDirectories( AnnouncerPath+sFolderName );
+	RageFile temp;
+	temp.Open( AnnouncerPath+sFolderName + "/announcer files go here.txt", RageFile::WRITE );
 #endif
 	
 	return "";
diff --git a/stepmania/src/BannerCache.cpp b/stepmania/src/BannerCache.cpp
index 07ab398ade..25c0e3a959 100644
--- a/stepmania/src/BannerCache.cpp
+++ b/stepmania/src/BannerCache.cpp
@@ -118,7 +118,6 @@ void BannerCache::UnloadAllBanners()
 
 BannerCache::BannerCache()
 {
-	CreateDirectories( CACHE_DIR "Banners" SLASH );
 	BannerData.SetPath( CACHE_DIR "banners.cache" );
 	BannerData.ReadFile();	// don't care if this fails
 }
diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index 54cee5656b..95b0abbbb4 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -113,8 +113,6 @@ bool ProfileManager::CreateProfile( CString sProfileDir, CString sName )
 {
 	bool bResult;
 
-	CreateDirectories( sProfileDir );
-	
 	Profile pro;
 	pro.m_sName = sName;
 	bResult = pro.SaveToIni( sProfileDir + PROFILE_FILE );
@@ -272,13 +270,10 @@ bool ProfileManager::CreateMachineProfile( CString sName )
 		return false;
 	sProfileDir += SLASH;
 
-	bool bResult;
-	bResult = CreateDirectories( sProfileDir );
-	if( !bResult )
-		return false;
-
 	Profile pro;
 	pro.m_sName = sName;
+
+	bool bResult;
 	bResult = pro.SaveToIni( sProfileDir + PROFILE_FILE );
 	if( !bResult )
 		return false;
diff --git a/stepmania/src/SongCacheIndex.cpp b/stepmania/src/SongCacheIndex.cpp
index 36988b6f7b..f211956f49 100644
--- a/stepmania/src/SongCacheIndex.cpp
+++ b/stepmania/src/SongCacheIndex.cpp
@@ -15,7 +15,6 @@ SongCacheIndex *SONGINDEX;
 
 SongCacheIndex::SongCacheIndex()
 {
-	CreateDirectories( CACHE_DIR "Songs" );
 	CacheIndex.SetPath( CACHE_DIR "index.cache" );
 	ReadCacheIndex();
 }
@@ -33,6 +32,7 @@ static void EmptyDir( CString dir )
 	ASSERT(dir[dir.size()-1] == '/');
 #endif
 
+	/* XXX RageFile */
 	CStringArray asCacheFileNames;
 	GetDirListing( dir, asCacheFileNames );
 	for( unsigned i=0; i<asCacheFileNames.size(); i++ )