Fixes, cpplint

Change-Id: I598cabec287f87f254b9d5d58f8cf0f0a81e8610

cpp/src/arrow/api.h

@@ -21,13 +21,13 @@
 #define ARROW_API_H
 
 #include "arrow/array.h"
+#include "arrow/buffer.h"
 #include "arrow/builder.h"
 #include "arrow/column.h"
+#include "arrow/memory_pool.h"
 #include "arrow/schema.h"
+#include "arrow/status.h"
 #include "arrow/table.h"
 #include "arrow/type.h"
-#include "arrow/buffer.h"
-#include "arrow/memory_pool.h"
-#include "arrow/status.h"
 
 #endif  // ARROW_API_H

cpp/src/arrow/array.h

@@ -20,6 +20,8 @@
 
 #include <cstdint>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "arrow/buffer.h"
 #include "arrow/type.h"

cpp/src/arrow/buffer.cc

@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/util/buffer.h"
+#include "arrow/buffer.h"
 
 #include <cstdint>
 #include <limits>
 
+#include "arrow/memory_pool.h"
+#include "arrow/status.h"
 #include "arrow/util/bit-util.h"
 #include "arrow/util/logging.h"
-#include "arrow/util/memory-pool.h"
-#include "arrow/util/status.h"
 
 namespace arrow {
 

cpp/src/arrow/builder.cc

@@ -17,7 +17,9 @@
 
 #include "arrow/builder.h"
 
+#include <cstdint>
 #include <cstring>
+#include <limits>
 
 #include "arrow/array.h"
 #include "arrow/type.h"

cpp/src/arrow/builder.h

@@ -20,6 +20,7 @@
 
 #include <cstdint>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "arrow/buffer.h"

cpp/src/arrow/memory_pool.cc

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/util/memory-pool.h"
+#include "arrow/memory_pool.h"
 
 #include <cstdlib>
 #include <mutex>

cpp/src/arrow/status.cc

@@ -10,7 +10,7 @@
 // non-const method, all threads accessing the same Status must use
 // external synchronization.
 
-#include "arrow/util/status.h"
+#include "arrow/status.h"
 
 #include <assert.h>