Index: boot/generic/align.h
===================================================================
--- boot/generic/align.h	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
+++ boot/generic/align.h	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BOOT_ALIGN_H_
+#define BOOT_ALIGN_H_
+
+/** Align to the nearest higher address.
+ *
+ * @param addr  Address or size to be aligned.
+ * @param align Size of alignment, must be power of 2.
+ */
+#define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
+
+#endif
Index: boot/generic/gentypes.h
===================================================================
--- boot/generic/gentypes.h	(revision fb0e6f03f428e14b816f7a37cb110f0b908727d5)
+++ boot/generic/gentypes.h	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
@@ -27,6 +27,6 @@
  */
 
-#ifndef GENTYPES_H__
-#define GENTYPES_H__
+#ifndef BOOT_GENTYPES_H_
+#define BOOT_GENTYPES_H_
 
 #define NULL 0
Index: boot/generic/printf.h
===================================================================
--- boot/generic/printf.h	(revision fb0e6f03f428e14b816f7a37cb110f0b908727d5)
+++ boot/generic/printf.h	(revision a5f767584d0c1da9ca8f67e0c356a22afa42dc3b)
@@ -27,6 +27,6 @@
  */
 
-#ifndef PRINTF_H__
-#define PRINTF_H__
+#ifndef BOOT_PRINTF_H_
+#define BOOT_PRINTF_H_
 
 #define INT8	1