PRIVATE: refactor headers

engines/private/cursors.h

@@ -20,15 +20,14 @@
  *
  */
 
+#ifndef PRIVATE_CURSORS_H
+#define PRIVATE_CURSORS_H
+
 #include "common/scummsys.h"
 #include "common/str.h"
 #include "common/hash-str.h"
 #include "common/rect.h"
 
-#ifndef PRIVATE_CURSORS_H
-#define PRIVATE_CURSORS_H
-
-
 namespace Private {
 
 typedef Common::HashMap<Common::String, const byte *> CursorDataMap;

engines/private/detection.cpp

@@ -29,7 +29,6 @@ static const PlainGameDescriptor privateGames[] = {
     { 0, 0 }
 };
 
-
 static const ADGameDescription gameDescriptions[] = {
     {
         "private-eye",  // US release

engines/private/grammar.h

@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef PRIVATE_GRAMMAR_H
+#define PRIVATE_GRAMMAR_H
+
 #include "common/str.h"
 #include "common/hash-str.h"
 #include "common/hash-ptr.h"
@@ -27,15 +30,12 @@
 #include "common/list.h"
 #include "common/array.h"
 #include "common/rect.h"
-#include "private/symbol.h"
 
-#ifndef PRIVATE_GRAMMAR_H
+#include "private/symbol.h"
-#define PRIVATE_GRAMMAR_H
 
 #define NSTACK 256
 #define NPROG  10000
 
-
 namespace Private {
 
 typedef struct Datum {  /* interpreter stack type */

engines/private/grammar.y

@@ -25,7 +25,6 @@
 %output "engines/private/grammar.cpp"
 %define api.prefix {PRIVATE_}
 
-
 %{
 
 #include "private/grammar.h"

engines/private/metaengine.cpp

@@ -20,9 +20,10 @@
  *
  */
 
-#include "private/private.h"
 #include "engines/advancedDetector.h"
 
+#include "private/private.h"
+
 class PrivateMetaEngine : public AdvancedMetaEngine {
 public:
     const char *getName() const override {

engines/private/private.cpp

@@ -20,11 +20,8 @@
  *
  */
 
-#include "common/scummsys.h"
-
 #include "audio/decoders/wave.h"
 #include "audio/audiostream.h"
-
 #include "common/archive.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
@@ -33,12 +30,12 @@
 #include "common/events.h"
 #include "common/file.h"
 #include "common/fs.h"
+#include "common/savefile.h"
+#include "common/scummsys.h"
 #include "common/system.h"
 #include "common/str.h"
-#include "common/savefile.h"
 #include "common/timer.h"
 #include "engines/util.h"
-
 #include "image/bmp.h"
 #include "graphics/cursorman.h"
 

engines/private/private.h

@@ -23,17 +23,12 @@
 #ifndef PRIVATE_H
 #define PRIVATE_H
 
+#include "common/installshieldv3_archive.h"
 #include "common/random.h"
 #include "common/serializer.h"
-#include "engines/advancedDetector.h"
 #include "engines/engine.h"
-
-#include "common/installshieldv3_archive.h"
-
-#include "audio/mixer.h"
-#include "video/smk_decoder.h"
-#include "graphics/palette.h"
 #include "graphics/managed_surface.h"
+#include "video/smk_decoder.h"
 
 #include "private/grammar.h"
 

engines/private/symbol.cpp

@@ -20,9 +20,8 @@
  *
  */
 
-#include "common/debug.h"
-#include "private/private.h"
 #include "private/grammar.h"
+#include "private/private.h"
 #include "private/tokens.h"
 
 namespace Private {
@@ -89,7 +88,6 @@ Symbol *lookupName(char *n) {
 
 }
 
-
 void installAll(char *n) {
     Common::String *s;
     Common::Rect *r;

engines/private/symbol.h

@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef PRIVATE_SYMBOL_H
+#define PRIVATE_SYMBOL_H
+
 #include "common/str.h"
 #include "common/hash-str.h"
 #include "common/hash-ptr.h"
@@ -28,9 +31,6 @@
 #include "common/array.h"
 #include "common/rect.h"
 
-#ifndef PRIVATE_SYMBOL_H
-#define PRIVATE_SYMBOL_H
-
 namespace Private {
 
 typedef struct Symbol {     /* symbol table entry */