12 files changed, 27 insertions, 23 deletions
diff --git a/backends/vkeybd/image-map.cpp b/backends/vkeybd/image-map.cpp
index b9f135c005..edb3087ee0 100644
--- a/backends/vkeybd/image-map.cpp
+++ b/backends/vkeybd/image-map.cpp
@@ -23,10 +23,10 @@
  *
  */
 
-#include "backends/vkeybd/image-map.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "backends/vkeybd/image-map.h"
+
 namespace Common {
 
 ImageMap::~ImageMap() {
diff --git a/backends/vkeybd/image-map.h b/backends/vkeybd/image-map.h
index 24d320a0c2..9401fa037d 100644
--- a/backends/vkeybd/image-map.h
+++ b/backends/vkeybd/image-map.h
@@ -26,10 +26,9 @@
 #ifndef COMMON_IMAGEMAP_H
 #define COMMON_IMAGEMAP_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "common/scummsys.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 #include "backends/vkeybd/polygon.h"
diff --git a/backends/vkeybd/imageman.cpp b/backends/vkeybd/imageman.cpp
index 5b9c011875..c4ea35c908 100644
--- a/backends/vkeybd/imageman.cpp
+++ b/backends/vkeybd/imageman.cpp
@@ -22,11 +22,13 @@
  * $Id$
  */
 
+#ifdef ENABLE_VKEYBD
+
 #include "backends/vkeybd/imageman.h"
-#include "graphics/imagedec.h"
-#include "graphics/surface.h"
 
 #include "common/unzip.h"
+#include "graphics/imagedec.h"
+#include "graphics/surface.h"
 
 DECLARE_SINGLETON(Graphics::ImageManager);
 
@@ -128,4 +130,8 @@ ImageManager::Iterator ImageManager::searchHandle(const Common::String &name) {
 	}
 	return pos;
 }
+
 } // end of namespace Graphics
+
+#endif // #ifdef ENABLE_VKEYBD
+
diff --git a/backends/vkeybd/imageman.h b/backends/vkeybd/imageman.h
index f555b4c844..725a0675fa 100644
--- a/backends/vkeybd/imageman.h
+++ b/backends/vkeybd/imageman.h
@@ -25,8 +25,9 @@
 #ifndef GRAPHICS_IMAGEMAN_H
 #define GRAPHICS_IMAGEMAN_H
 
-#include "common/scummsys.h"
+#ifdef ENABLE_VKEYBD
 
+#include "common/scummsys.h"
 #include "common/archive.h"
 #include "common/singleton.h"
 #include "common/str.h"
@@ -107,5 +108,6 @@ private:
 /** Shortcut for accessing the image manager. */
 #define ImageMan		(Graphics::ImageManager::instance())
 
-#endif
+#endif // #ifdef ENABLE_VKEYBD
 
+#endif
diff --git a/backends/vkeybd/polygon.cpp b/backends/vkeybd/polygon.cpp
index 14a804ddba..d12ee7f875 100644
--- a/backends/vkeybd/polygon.cpp
+++ b/backends/vkeybd/polygon.cpp
@@ -23,10 +23,10 @@
  *
  */
 
-#include "backends/vkeybd/polygon.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "backends/vkeybd/polygon.h"
+
 namespace Common {
 
 bool Polygon::contains(int16 x, int16 y) const {
diff --git a/backends/vkeybd/polygon.h b/backends/vkeybd/polygon.h
index 0645f04a04..e16133a050 100644
--- a/backends/vkeybd/polygon.h
+++ b/backends/vkeybd/polygon.h
@@ -26,10 +26,9 @@
 #ifndef COMMON_POLYGON_H
 #define COMMON_POLYGON_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
 
diff --git a/backends/vkeybd/virtual-keyboard-gui.cpp b/backends/vkeybd/virtual-keyboard-gui.cpp
index db7e726635..4cae71ec82 100644
--- a/backends/vkeybd/virtual-keyboard-gui.cpp
+++ b/backends/vkeybd/virtual-keyboard-gui.cpp
@@ -23,10 +23,10 @@
 *
 */
 
-#include "backends/vkeybd/virtual-keyboard-gui.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "backends/vkeybd/virtual-keyboard-gui.h"
+
 #include "graphics/cursorman.h"
 #include "gui/GuiManager.h"
 
diff --git a/backends/vkeybd/virtual-keyboard-gui.h b/backends/vkeybd/virtual-keyboard-gui.h
index cad53d1b75..7c2e4a88a6 100644
--- a/backends/vkeybd/virtual-keyboard-gui.h
+++ b/backends/vkeybd/virtual-keyboard-gui.h
@@ -26,11 +26,10 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_GUI_H
 #define COMMON_VIRTUAL_KEYBOARD_GUI_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
 #include "backends/vkeybd/virtual-keyboard.h"
+#include "common/scummsys.h"
 #include "common/rect.h"
 #include "common/system.h"
 #include "graphics/fontman.h"
diff --git a/backends/vkeybd/virtual-keyboard-parser.cpp b/backends/vkeybd/virtual-keyboard-parser.cpp
index 464dbdb651..5bc5cf53dd 100644
--- a/backends/vkeybd/virtual-keyboard-parser.cpp
+++ b/backends/vkeybd/virtual-keyboard-parser.cpp
@@ -23,10 +23,11 @@
  *
  */
 
-#include "backends/vkeybd/virtual-keyboard-parser.h"
 
 #ifdef ENABLE_VKEYBD
 
+#include "backends/vkeybd/virtual-keyboard-parser.h"
+
 #include "common/keyboard.h"
 #include "common/util.h"
 #include "common/system.h"
diff --git a/backends/vkeybd/virtual-keyboard-parser.h b/backends/vkeybd/virtual-keyboard-parser.h
index 19deff08e1..201f184193 100644
--- a/backends/vkeybd/virtual-keyboard-parser.h
+++ b/backends/vkeybd/virtual-keyboard-parser.h
@@ -26,10 +26,9 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_PARSER_H
 #define COMMON_VIRTUAL_KEYBOARD_PARSER_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "common/scummsys.h"
 #include "common/xmlparser.h"
 #include "backends/vkeybd/virtual-keyboard.h"
 
diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index 6a5924b968..22b1693220 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -23,10 +23,10 @@
  *
  */
 
-#include "backends/vkeybd/virtual-keyboard.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "backends/vkeybd/virtual-keyboard.h"
+
 #include "backends/vkeybd/imageman.h"
 #include "backends/vkeybd/virtual-keyboard-gui.h"
 #include "backends/vkeybd/virtual-keyboard-parser.h"
diff --git a/backends/vkeybd/virtual-keyboard.h b/backends/vkeybd/virtual-keyboard.h
index 6e044ee6da..266575e333 100644
--- a/backends/vkeybd/virtual-keyboard.h
+++ b/backends/vkeybd/virtual-keyboard.h
@@ -26,12 +26,11 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_H
 #define COMMON_VIRTUAL_KEYBOARD_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
 class OSystem;
 
+#include "common/scummsys.h"
 #include "common/events.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"