Cleanup

skyjake · Oct 7, 2012 · 46d9a72 · 46d9a72
1 parent 53ebf9f
commit 46d9a72
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/doomsday/engine/portable/include/abstractfile.h b/doomsday/engine/portable/include/abstractfile.h
@@ -48,6 +48,7 @@ typedef enum {
 
 #ifdef __cplusplus
 
+#include <de/str.h>
 #include "dfile.h"
 #include "lumpinfo.h"
 

diff --git a/doomsday/engine/portable/include/lumpindex.h b/doomsday/engine/portable/include/lumpindex.h
@@ -30,6 +30,7 @@
 #ifndef LIBDENG_FILESYS_LUMPINDEX_H
 #define LIBDENG_FILESYS_LUMPINDEX_H
 
+#include "de_base.h" /// For lumpnum_t (@todo which should be moved here)
 #include "abstractfile.h"
 #include "lumpinfo.h"
 

diff --git a/doomsday/engine/portable/src/lumpfile.cpp b/doomsday/engine/portable/src/lumpfile.cpp
@@ -20,16 +20,9 @@
  * 02110-1301 USA</small>
  */
 
-#include "de_base.h"
-#include "de_filesys.h"
 #include "lumpindex.h"
-
 #include "lumpfile.h"
 
-#include <de/Error>
-#include <de/Log>
-#include <de/memory.h>
-
 using namespace de;
 using de::DFile;
 using de::PathDirectoryNode;
@@ -87,7 +80,6 @@ LumpFile& LumpFile::unlockLump(int /*lumpIdx*/)
 
 int LumpFile::publishLumpsToIndex(LumpIndex& index)
 {
-    LOG_AS("LumpFile");
     // This *is* the lump, so insert ourself as a lump of our container in the index.
     index.catalogLumps(container(), info().lumpIdx, 1);
     return 1;