7 files changed, 10 insertions, 9 deletions
diff --git a/engines/hdb/console.cpp b/engines/hdb/console.cpp
index 479cde0761..5cb45cf823 100644
--- a/engines/hdb/console.cpp
+++ b/engines/hdb/console.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/debugger.h"
 
-#include "hdb.h"
-#include "console.h"
+#include "hdb/hdb.h"
+#include "hdb/console.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/detection.cpp b/engines/hdb/detection.cpp
index 744d4304be..c65583258f 100644
--- a/engines/hdb/detection.cpp
+++ b/engines/hdb/detection.cpp
@@ -24,7 +24,7 @@
 
 #include "engines/advancedDetector.h"
 
-#include "hdb.h"
+#include "hdb/hdb.h"
 
 namespace HDB {
 const char *HDBGame::getGameId() const { return _gameDescription->gameId; }
diff --git a/engines/hdb/draw-manager.cpp b/engines/hdb/draw-manager.cpp
index 80ba1c77d5..1ab2868d9a 100644
--- a/engines/hdb/draw-manager.cpp
+++ b/engines/hdb/draw-manager.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "draw-manager.h"
+#include "hdb/hdb.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/draw-manager.h b/engines/hdb/draw-manager.h
index 9845ffa16e..8dcca5ee72 100644
--- a/engines/hdb/draw-manager.h
+++ b/engines/hdb/draw-manager.h
@@ -28,7 +28,6 @@
 #include "graphics/surface.h"
 
 #include "hdb/hdb.h"
-#include "hdb/file-manager.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/file-manager.cpp b/engines/hdb/file-manager.cpp
index 3ad0e93216..f2a21095eb 100644
--- a/engines/hdb/file-manager.cpp
+++ b/engines/hdb/file-manager.cpp
@@ -19,11 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include "hdb/file-manager.h"
 #include "common/debug.h"
 #include "common/file.h"
 #include "common/error.h"
 
+#include "hdb/hdb.h"
+
 namespace HDB {
 
 FileMan::FileMan() {
diff --git a/engines/hdb/hdb.cpp b/engines/hdb/hdb.cpp
index 5c816bff3f..edd77a26d5 100644
--- a/engines/hdb/hdb.cpp
+++ b/engines/hdb/hdb.cpp
@@ -31,8 +31,8 @@
 #include "common/stream.h"
 #include "common/memstream.h"
 
-#include "hdb.h"
-#include "console.h"
+#include "hdb/hdb.h"
+#include "hdb/console.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/lua-script.h b/engines/hdb/lua-script.h
index 78b5dc08dd..c96ba451b8 100644
--- a/engines/hdb/lua-script.h
+++ b/engines/hdb/lua-script.h
@@ -23,7 +23,7 @@
 #include "common/system.h"
 #include "common/file.h"
 
-#include "hdb/file-manager.h"
+#include "hdb/hdb.h"
 
 #ifndef HDB_LUA_SCRIPT_H
 #define HDB_LUA_SCRIPT_H
@@ -49,6 +49,7 @@ private:
 	bool registerExtensions();
 	bool executeChunk(const char *chunk, uint chunkSize, const Common::String &chunkName) const;
 	void stripComments(char *chunk);
+	
 };
 
 }