More shared header cleanup.

src/xenia/kernel/kernel_state.h

@@ -23,23 +23,24 @@
 #include <xenia/kernel/user_profile.h>
 #include <xenia/kernel/fs/filesystem.h>
 
-
-XEDECLARECLASS1(xe, Emulator);
-XEDECLARECLASS2(xe, cpu, Processor);
-XEDECLARECLASS2(xe, kernel, Dispatcher);
-XEDECLARECLASS2(xe, kernel, XModule);
-XEDECLARECLASS2(xe, kernel, XNotifyListener);
-XEDECLARECLASS2(xe, kernel, XThread);
-XEDECLARECLASS2(xe, kernel, XUserModule);
-XEDECLARECLASS3(xe, kernel, fs, FileSystem);
-
+namespace xe {
+class Emulator;
+namespace cpu {
+class Processor;
+}  // namespace cpu
+}  // namespace xe
 
 namespace xe {
 namespace kernel {
 
+class Dispatcher;
+class XModule;
+class XNotifyListener;
+class XThread;
+class XUserModule;
 
 class KernelState {
-public:
+ public:
   KernelState(Emulator* emulator);
   ~KernelState();
 
@@ -72,33 +73,33 @@ public:
   void UnregisterNotifyListener(XNotifyListener* listener);
   void BroadcastNotification(XNotificationID id, uint32_t data);
 
-  void CompleteOverlapped(uint32_t overlapped_ptr, X_RESULT result, uint32_t length = 0);
-  void CompleteOverlappedImmediate(uint32_t overlapped_ptr, X_RESULT result, uint32_t length = 0);
+  void CompleteOverlapped(uint32_t overlapped_ptr, X_RESULT result,
+                          uint32_t length = 0);
+  void CompleteOverlappedImmediate(uint32_t overlapped_ptr, X_RESULT result,
+                                   uint32_t length = 0);
 
-private:
-  Emulator*       emulator_;
-  Memory*         memory_;
+ private:
+  Emulator* emulator_;
+  Memory* memory_;
   cpu::Processor* processor_;
   fs::FileSystem* file_system_;
 
-  Dispatcher*     dispatcher_;
+  Dispatcher* dispatcher_;
 
   std::unique_ptr<XAppManager> app_manager_;
   std::unique_ptr<UserProfile> user_profile_;
 
-  ObjectTable*    object_table_;
-  std::mutex      object_mutex_;
+  ObjectTable* object_table_;
+  std::mutex object_mutex_;
   std::unordered_map<uint32_t, XThread*> threads_by_id_;
   std::vector<XNotifyListener*> notify_listeners_;
 
-  XUserModule*    executable_module_;
+  XUserModule* executable_module_;
 
   friend class XObject;
 };
 
-
 }  // namespace kernel
 }  // namespace xe
 
-
 #endif  // XENIA_KERNEL_KERNEL_STATE_H_