[HB] Rename harfbuzz-buffer to hb-buffer

src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index dc92c7a..3f662db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,8 @@
 noinst_LTLIBRARIES = libharfbuzz-1.la
 
 HBSOURCES =  \
-	harfbuzz-buffer.c \
+	hb-buffer.c \
+	hb-buffer-private.h \
 	hb-private.h \
 	hb-ot-layout.cc \
 	hb-ot-layout-common-private.h \
@@ -25,7 +26,7 @@
 
 HBHEADERS = \
 	hb-common.h \
-	harfbuzz-buffer.h \
+	hb-buffer.h \
 	hb-ot-layout.h \
 	$(NULL)
 

src/hb-buffer-private.h

diff --git a/src/harfbuzz-buffer-private.h b/src/hb-buffer-private.h
similarity index 96%
rename from src/harfbuzz-buffer-private.h
rename to src/hb-buffer-private.h
index 752149f..dec3130 100644
--- a/src/harfbuzz-buffer-private.h
+++ b/src/hb-buffer-private.h
@@ -25,11 +25,11 @@
  * Red Hat Author(s): Owen Taylor, Behdad Esfahbod
  */
 
-#ifndef HARFBUZZ_BUFFER_PRIVATE_H
-#define HARFBUZZ_BUFFER_PRIVATE_H
+#ifndef HB_BUFFER_PRIVATE_H
+#define HB_BUFFER_PRIVATE_H
 
 #include "harfbuzz-impl.h"
-#include "harfbuzz-buffer.h"
+#include "hb-buffer.h"
 
 HB_BEGIN_HEADER
 
@@ -103,4 +103,4 @@
 
 HB_END_HEADER
 
-#endif /* HARFBUZZ_BUFFER_PRIVATE_H */
+#endif /* HB_BUFFER_PRIVATE_H */

src/hb-buffer.c

diff --git a/src/harfbuzz-buffer.c b/src/hb-buffer.c
similarity index 98%
rename from src/harfbuzz-buffer.c
rename to src/hb-buffer.c
index 133cb80..5998126 100644
--- a/src/harfbuzz-buffer.c
+++ b/src/hb-buffer.c
@@ -26,9 +26,7 @@
  */
 
 #include "harfbuzz-impl.h"
-#include "harfbuzz-buffer-private.h"
-#include "harfbuzz-gsub-private.h"
-#include "harfbuzz-gpos-private.h"
+#include "hb-buffer-private.h"
 
 /* Here is how the buffer works internally:
  *
@@ -161,7 +159,7 @@
 {
   HB_Error error;
   HB_GlyphItem glyph;
-  
+
   hb_buffer_ensure (buffer, buffer->in_length + 1);
 
   glyph = &buffer->in_string[buffer->in_length];

src/hb-buffer.h

diff --git a/src/harfbuzz-buffer.h b/src/hb-buffer.h
similarity index 96%
rename from src/harfbuzz-buffer.h
rename to src/hb-buffer.h
index 668753c..93ac3ee 100644
--- a/src/harfbuzz-buffer.h
+++ b/src/hb-buffer.h
@@ -25,8 +25,8 @@
  * Red Hat Author(s): Owen Taylor, Behdad Esfahbod
  */
 
-#ifndef HARFBUZZ_BUFFER_H
-#define HARFBUZZ_BUFFER_H
+#ifndef HB_BUFFER_H
+#define HB_BUFFER_H
 
 #include "hb-common.h"
 
@@ -65,7 +65,7 @@
   unsigned int out_length;
   unsigned int in_pos;
   unsigned int out_pos;
-  
+
   hb_bool_t     separate_out;
   HB_GlyphItem  in_string;
   HB_GlyphItem  out_string;
@@ -91,4 +91,4 @@
 
 HB_END_DECLS();
 
-#endif /* HARFBUZZ_BUFFER_H */
+#endif /* HB_BUFFER_H */

src/hb-ot-layout-gsubgpos-private.h

diff --git a/src/hb-ot-layout-gsubgpos-private.h b/src/hb-ot-layout-gsubgpos-private.h
index 758841c..2f5a94b 100644
--- a/src/hb-ot-layout-gsubgpos-private.h
+++ b/src/hb-ot-layout-gsubgpos-private.h
@@ -28,7 +28,7 @@
 #define HB_OT_LAYOUT_GSUBGPOS_PRIVATE_H
 
 #include "hb-ot-layout-gdef-private.h"
-#include "harfbuzz-buffer-private.h" /* XXX */
+#include "hb-buffer-private.h" /* XXX */
 
 
 #define APPLY_ARG_DEF \

src/hb-ot-layout-private.h

diff --git a/src/hb-ot-layout-private.h b/src/hb-ot-layout-private.h
index 80c36b4..a469119 100644
--- a/src/hb-ot-layout-private.h
+++ b/src/hb-ot-layout-private.h
@@ -31,7 +31,7 @@
 #include "hb-ot-layout.h"
 
 /* XXX */
-#include "harfbuzz-buffer.h"
+#include "hb-buffer.h"
 
 
 typedef unsigned int hb_ot_layout_class_t;

src/hb-ot-layout.cc

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 5e3b483..a98a34d 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -28,6 +28,9 @@
 
 #define HB_OT_LAYOUT_CC
 
+/* XXX */
+#include "hb-buffer-private.h"
+
 #include "hb-ot-layout.h"
 #include "hb-ot-layout-private.h"
 
@@ -36,8 +39,6 @@
 #include "hb-ot-layout-gsub-private.h"
 #include "hb-ot-layout-gpos-private.h"
 
-/* XXX */
-#include "harfbuzz-buffer-private.h"
 
 #include <stdlib.h>
 #include <string.h>

src/hb-ot-layout.h

diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h
index 6aa05fc..c1dbdca 100644
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@@ -28,7 +28,7 @@
 #define HB_OT_LAYOUT_H
 
 #include "hb-common.h"
-#include "harfbuzz-buffer.h"
+#include "hb-buffer.h"
 
 HB_BEGIN_DECLS();