* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __FREELDR_H
#include <reactos.h>
#include <registry.h>
#include <winldr.h>
-#include <fsrec.h>
/* file system headers */
#include <fs/ext2.h>
#include <fs/fat.h>
#include <ui/tui.h>
/* arch files */
#if defined(_M_IX86)
+#include <arch/i386/custom.h>
+#include <arch/i386/drivemap.h>
#include <arch/i386/hardware.h>
#include <arch/i386/i386.h>
#include <arch/i386/machpc.h>
#include <arch/i386/machxbox.h>
+#include <arch/i386/miscboot.h>
#include <internal/i386/intrin_i.h>
#include <internal/i386/ke.h>
#elif defined(_M_PPC)
/* Needed by boot manager */
#include <bootmgr.h>
#include <oslist.h>
-#include <drivemap.h>
-#include <miscboot.h>
#include <options.h>
#include <linux.h>
/* Externals */
/* Swap */
#include <bytesex.h>
-/* arch defines */
-#ifdef _X86_
-#define Ke386EraseFlags(x) __asm__ __volatile__("pushl $0 ; popfl\n")
-#endif
-
-#ifdef _M_AMD64
-#define KeAmd64EraseFlags(x) __asm__ __volatile__("pushq $0 ; popfq\n")
-#endif
-
VOID BootMain(LPSTR CmdLine);
VOID RunLoader(VOID);