remove unused includes, now that Storage.h & Stable.h are included by Rts.h

diff --git a/rts/Adjustor.c b/rts/Adjustor.c
index 8c950f7..813fcfe 100644 (file)
--- a/rts/Adjustor.c
+++ b/rts/Adjustor.c
@@ -40,8 +40,6 @@ Haskell side.
 #include "Rts.h"
 #include "RtsExternal.h"
 #include "RtsUtils.h"
-#include "Storage.h"
-#include "Stable.h"
 #include <stdlib.h>
 
 #if defined(_WIN32)
@@ -115,7 +113,6 @@ extern void obscure_ccall_ret_code(void);
 #endif
 
 #if defined(ia64_HOST_ARCH)
-#include "Storage.h"
 
 /* Layout of a function descriptor */
 typedef struct _IA64FunDesc {

diff --git a/rts/Capability.c b/rts/Capability.c
index 1d282f0..f1c625e 100644 (file)
--- a/rts/Capability.c
+++ b/rts/Capability.c
@@ -23,7 +23,6 @@
 #include "STM.h"
 #include "OSThreads.h"
 #include "Capability.h"
-#include "Storage.h"
 #include "Schedule.h"
 #include "Sparks.h"
 #include "Trace.h"

diff --git a/rts/Disassembler.c b/rts/Disassembler.c
index 8777b81..f29cce2 100644 (file)
--- a/rts/Disassembler.c
+++ b/rts/Disassembler.c
@@ -16,7 +16,6 @@
 #include "RtsUtils.h"
 #include "Closures.h"
 #include "TSO.h"
-#include "Storage.h"
 #include "Schedule.h"
 
 #include "Bytecodes.h"

diff --git a/rts/FrontPanel.c b/rts/FrontPanel.c
index 579b75b..5dfe87a 100644 (file)
--- a/rts/FrontPanel.c
+++ b/rts/FrontPanel.c
@@ -15,7 +15,6 @@
 #include "RtsUtils.h"
 #include "MBlock.h"
 #include "FrontPanel.h"
-#include "Storage.h"
 #include "Stats.h"
 #include "RtsFlags.h"
 #include "Schedule.h"

diff --git a/rts/HsFFI.c b/rts/HsFFI.c
index d59c7a4..350bcfb 100644 (file)
--- a/rts/HsFFI.c
+++ b/rts/HsFFI.c
@@ -8,8 +8,6 @@
 
 #include "HsFFI.h"
 #include "Rts.h"
-#include "Storage.h"
-#include "Stable.h"
 
 // hs_init and hs_exit are defined in RtsStartup.c
 

diff --git a/rts/Interpreter.c b/rts/Interpreter.c
index 62fe505..fba9e3f 100644 (file)
--- a/rts/Interpreter.c
+++ b/rts/Interpreter.c
@@ -10,7 +10,6 @@
 #include "RtsUtils.h"
 #include "Closures.h"
 #include "TSO.h"
-#include "Storage.h"
 #include "Schedule.h"
 #include "RtsFlags.h"
 #include "LdvProfile.h"

diff --git a/rts/LdvProfile.c b/rts/LdvProfile.c
index 2f9f6ca..28aa326 100644 (file)
--- a/rts/LdvProfile.c
+++ b/rts/LdvProfile.c
@@ -14,7 +14,6 @@
 #include "RtsFlags.h"
 #include "Profiling.h"
 #include "Stats.h"
-#include "Storage.h"
 #include "RtsUtils.h"
 #include "Schedule.h"
 

diff --git a/rts/Linker.c b/rts/Linker.c
index 107db26..53def90 100644 (file)
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -21,8 +21,6 @@
 #include "RtsFlags.h"
 #include "HsFFI.h"
 #include "Hash.h"
-#include "Storage.h"
-#include "Stable.h"
 #include "Linker.h"
 #include "LinkerInternals.h"
 #include "RtsUtils.h"

diff --git a/rts/Printer.c b/rts/Printer.c
index 671d76f..666b7db 100644 (file)
--- a/rts/Printer.c
+++ b/rts/Printer.c
@@ -15,7 +15,6 @@
 
 #include "RtsFlags.h"
 #include "MBlock.h"
-#include "Storage.h"
 #include "Bytecodes.h"  /* for InstrPtr */
 #include "Disassembler.h"
 #include "Apply.h"

diff --git a/rts/ProfHeap.c b/rts/ProfHeap.c
index 1878d90..4aecd0b 100644 (file)
--- a/rts/ProfHeap.c
+++ b/rts/ProfHeap.c
@@ -19,7 +19,6 @@
 #include "RtsUtils.h"
 #include "RtsFlags.h"
 #include "Profiling.h"
-#include "Storage.h"
 #include "ProfHeap.h"
 #include "Stats.h"
 #include "Hash.h"

diff --git a/rts/Profiling.c b/rts/Profiling.c
index f865d0a..a865078 100644 (file)
--- a/rts/Profiling.c
+++ b/rts/Profiling.c
@@ -13,7 +13,6 @@
 #include "RtsUtils.h"
 #include "RtsFlags.h"
 #include "Profiling.h"
-#include "Storage.h"
 #include "Proftimer.h"
 #include "Timer.h"
 #include "ProfHeap.h"

diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c
index 4a405e7..d555953 100644 (file)
--- a/rts/RaiseAsync.c
+++ b/rts/RaiseAsync.c
@@ -12,7 +12,6 @@
 #include "Trace.h"
 #include "RaiseAsync.h"
 #include "SMP.h"
-#include "Storage.h"
 #include "Schedule.h"
 #include "LdvProfile.h"
 #include "Updates.h"

diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c
index 17f5afb..23d6f9d 100644 (file)
--- a/rts/RetainerProfile.c
+++ b/rts/RetainerProfile.c
@@ -20,9 +20,7 @@
 #include "RtsUtils.h"
 #include "RetainerProfile.h"
 #include "RetainerSet.h"
-#include "Storage.h"
 #include "Schedule.h"
-#include "Stable.h"
 #include "Printer.h"
 #include "RtsFlags.h"
 #include "Weak.h"

diff --git a/rts/RtsAPI.c b/rts/RtsAPI.c
index 1a18e9b..69fac8d 100644 (file)
--- a/rts/RtsAPI.c
+++ b/rts/RtsAPI.c
@@ -9,7 +9,6 @@
 #include "PosixSource.h"
 #include "Rts.h"
 #include "OSThreads.h"
-#include "Storage.h"
 #include "RtsAPI.h"
 #include "SchedAPI.h"
 #include "RtsFlags.h"

diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index 08debc0..3e9fd2a 100644 (file)
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -12,7 +12,6 @@
 #include "RtsUtils.h"
 #include "RtsFlags.h"  
 #include "OSThreads.h"
-#include "Storage.h"    /* initStorage, exitStorage */
 #include "Schedule.h"   /* initScheduler */
 #include "Stats.h"      /* initStats */
 #include "STM.h"        /* initSTM */

diff --git a/rts/Typeable.c b/rts/Typeable.c
index e0309d6..66e135c 100644 (file)
--- a/rts/Typeable.c
+++ b/rts/Typeable.c
@@ -8,8 +8,6 @@
 
 #include "RtsTypeable.h"
 #include "Rts.h"
-#include "Storage.h"
-#include "Stable.h"
 
 static StgPtr typeableStore = 0;
 #ifdef THREADED_RTS

diff --git a/rts/Weak.c b/rts/Weak.c
index a83cef9..569bffb 100644 (file)
--- a/rts/Weak.c
+++ b/rts/Weak.c
@@ -13,7 +13,6 @@
 #include "SchedAPI.h"
 #include "RtsFlags.h"
 #include "Weak.h"
-#include "Storage.h"
 #include "Schedule.h"
 #include "Prelude.h"
 #include "RtsAPI.h"

diff --git a/rts/posix/Signals.c b/rts/posix/Signals.c
index ded85f5..a5044cd 100644 (file)
--- a/rts/posix/Signals.c
+++ b/rts/posix/Signals.c
@@ -11,14 +11,12 @@
 */
 #include "Rts.h"
 #include "SchedAPI.h"
-#include "Storage.h"
 #include "Schedule.h"
 #include "RtsSignals.h"
 #include "posix/Signals.h"
 #include "RtsUtils.h"
 #include "RtsFlags.h"
 #include "Prelude.h"
-#include "Stable.h"
 
 #ifdef alpha_HOST_ARCH
 # if defined(linux_HOST_OS)

diff --git a/rts/sm/Compact.c b/rts/sm/Compact.c
index 844b770..683dfe6 100644 (file)
--- a/rts/sm/Compact.c
+++ b/rts/sm/Compact.c
@@ -16,8 +16,6 @@
 #include "RtsUtils.h"
 #include "RtsFlags.h"
 #include "OSThreads.h"
-#include "Storage.h"
-#include "Stable.h"
 #include "BlockAlloc.h"
 #include "MBlock.h"
 #include "GC.h"

diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index 7a82a6e..2870be1 100644 (file)
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -17,8 +17,6 @@
 #include "RtsUtils.h"
 #include "Apply.h"
 #include "OSThreads.h"
-#include "Storage.h"
-#include "Stable.h"
 #include "LdvProfile.h"
 #include "Updates.h"
 #include "Stats.h"

diff --git a/rts/win32/ConsoleHandler.c b/rts/win32/ConsoleHandler.c
index 12ab45d..afaa424 100644 (file)
--- a/rts/win32/ConsoleHandler.c
+++ b/rts/win32/ConsoleHandler.c
@@ -3,7 +3,6 @@
  *
  */
 #include "Rts.h"
-#include "Storage.h"
 #include <windows.h>
 #include "ConsoleHandler.h"
 #include "SchedAPI.h"
@@ -11,7 +10,6 @@
 #include "RtsUtils.h"
 #include "RtsFlags.h"
 #include "AsyncIO.h"
-#include "Stable.h"
 #include "RtsSignals.h"
 
 extern int stg_InstallConsoleEvent(int action, StgStablePtr *handler);