Kill wrapper .h, add #include to libbpf.h

Signed-off-by: Brenden Blanco <bblanco@plumgrid.com>

src/cc/CMakeLists.txt

@@ -45,4 +45,3 @@ install(TARGETS bpfprog LIBRARY DESTINATION lib${LIBSUFFIX})
 install(DIRECTORY export/ DESTINATION share/bcc/include/bcc
   FILES_MATCHING PATTERN "*.h")
 install(FILES bpf_common.h ../libbpf.h DESTINATION include/bcc)
-install(FILES bcc.h DESTINATION include)

src/cc/bcc.h

-/*
- * Copyright (c) 2015 PLUMgrid, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BCC_H
-#define BCC_H
-
-#include <bcc/bpf_common.h>
-#include <linux/bpf.h>
-#include <bcc/libbpf.h>
-
-#endif

src/libbpf.h

@@ -18,6 +18,8 @@
 #ifndef LIBBPF_H
 #define LIBBPF_H
 
+#include <linux/bpf.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif